[Emacs-diffs] Changes to emacs/man/calc.texi

[Eli Zaretskii]

Index: emacs/man/calc.texi
diff -c emacs/man/calc.texi:1.8 emacs/man/calc.texi:1.9
*** emacs/man/calc.texi:1.8     Thu Jan  3 18:38:47 2002
--- emacs/man/calc.texi Fri Jan  4 06:35:55 2002
***************
*** 3,9 ****
  @c smallbook
  @setfilename ../info/calc
  @c [title]
! @settitle GNU Emacs Calc 2.02 Manual
  @setchapternewpage odd
  @dircategory Emacs
  @direntry
--- 3,9 ----
  @c smallbook
  @setfilename ../info/calc
  @c [title]
! @settitle GNU Emacs Calc 2.02g Manual
  @setchapternewpage odd
  @dircategory Emacs
  @direntry
***************
*** 81,153 ****
  @end ignore
  @end iftex
  
! @ifinfo
  This file documents Calc, the GNU Emacs calculator.
  
! Copyright (C) 1990, 1991 Free Software Foundation, Inc.
  
! Permission is granted to make and distribute verbatim copies of this
! manual provided the copyright notice and this permission notice are
! preserved on all copies.
! 
! @ignore
! Permission is granted to process this file through TeX and print the
! results, provided the printed document carries copying permission notice
! identical to this one except for the removal of this paragraph (this
! paragraph not being relevant to the printed manual).
! 
! @end ignore
! Permission is granted to copy and distribute modified versions of this
! manual under the conditions for verbatim copying, provided also that the
! section entitled ``GNU General Public License'' is included exactly as
! in the original, and provided that the entire resulting derived work is
! distributed under the terms of a permission notice identical to this one.
! 
! Permission is granted to copy and distribute translations of this manual
! into another language, under the above conditions for modified versions,
! except that the section entitled ``GNU General Public License'' may be
! included in a translation approved by the author instead of in the
! original English.
! @end ifinfo
  
  @titlepage
  @sp 6
  @center @titlefont{Calc Manual}
  @sp 4
! @center GNU Emacs Calc Version 2.02
  @c [volume]
  @sp 1
! @center January 1992
  @sp 5
  @center Dave Gillespie
  @center daveg@@synaptics.com
  @page
  
  @vskip 0pt plus 1filll
! Copyright @copyright{} 1990, 1991 Free Software Foundation, Inc.
  
! Permission is granted to make and distribute verbatim copies of
! this manual provided the copyright notice and this permission notice
! are preserved on all copies.
! 
! @ignore
! Permission is granted to process this file through TeX and print the
! results, provided the printed document carries copying permission notice
! identical to this one except for the removal of this paragraph (this
! paragraph not being relevant to the printed manual).
! 
! @end ignore
! Permission is granted to copy and distribute modified versions of this
! manual under the conditions for verbatim copying, provided also that the
! section entitled ``GNU General Public License'' is included exactly as
! in the original, and provided that the entire resulting derived work is
! distributed under the terms of a permission notice identical to this one.
! 
! Permission is granted to copy and distribute translations of this manual
! into another language, under the above conditions for modified versions,
! except that the section entitled ``GNU General Public License'' may be
! included in a translation approved by the author instead of in the
! original English.
  @end titlepage
  
  @c [begin]
--- 81,129 ----
  @end ignore
  @end iftex
  
! @ifnottex
  This file documents Calc, the GNU Emacs calculator.
  
! Copyright (C) 1990, 1991, 2001, 2002 Free Software Foundation, Inc.
  
! Permission is granted to copy, distribute and/or modify this document
! under the terms of the GNU Free Documentation License, Version 1.1 or
! any later version published by the Free Software Foundation; with the
! Invariant Sections being just ``GNU GENERAL PUBLIC LICENSE'', with the
! Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
! Texts as in (a) below.
! 
! (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
! this GNU Manual, like GNU software.  Copies published by the Free
! Software Foundation raise funds for GNU development.''
! @end ifnottex
  
  @titlepage
  @sp 6
  @center @titlefont{Calc Manual}
  @sp 4
! @center GNU Emacs Calc Version 2.02g
  @c [volume]
  @sp 1
! @center January 2002
  @sp 5
  @center Dave Gillespie
  @center daveg@@synaptics.com
  @page
  
  @vskip 0pt plus 1filll
! Copyright @copyright{} 1990, 1991, 2001, 2002 Free Software Foundation, Inc.
  
! Permission is granted to copy, distribute and/or modify this document
! under the terms of the GNU Free Documentation License, Version 1.1 or
! any later version published by the Free Software Foundation; with the
! Invariant Sections being just ``GNU GENERAL PUBLIC LICENSE'', with the
! Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
! Texts as in (a) below.
! 
! (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
! this GNU Manual, like GNU software.  Copies published by the Free
! Software Foundation raise funds for GNU development.''
  @end titlepage
  
  @c [begin]
***************
*** 156,169 ****
  @chapter The GNU Emacs Calculator
  
  @noindent
! @dfn{Calc 2.02} is an advanced desk calculator and mathematical tool
  that runs as part of the GNU Emacs environment.
  
! This manual is divided into three major parts: "Getting Started," the
! "Calc Tutorial," and the "Calc Reference."  The Tutorial introduces all
! the major aspects of Calculator use in an easy, hands-on way.  The
! remainder of the manual is a complete reference to the features of the
! Calculator.
  
  For help in the Emacs Info system (which you are using to read this
  file), type @kbd{?}.  (You can also type @kbd{h} to run through a
--- 132,145 ----
  @chapter The GNU Emacs Calculator
  
  @noindent
! @dfn{Calc} is an advanced desk calculator and mathematical tool
  that runs as part of the GNU Emacs environment.
  
! This manual is divided into three major parts: ``Getting Started,''
! the ``Calc Tutorial,'' and the ``Calc Reference.''  The Tutorial
! introduces all the major aspects of Calculator use in an easy,
! hands-on way.  The remainder of the manual is a complete reference to
! the features of the Calculator.
  
  For help in the Emacs Info system (which you are using to read this
  file), type @kbd{?}.  (You can also type @kbd{h} to run through a
***************
*** 11917,11926 ****
  
  @kindex address@hidden
  @pindex calc-pop-above
! The @address@hidden (@code{calc-pop-above}) command is to @key{DEL} what
  @key{LFD} is to @key{RET}:  It interprets the sign of the numeric
  prefix argument in the opposite way, and the default argument is 2.
! Thus @address@hidden by itself removes the second-from-top stack element,
  leaving the first, third, fourth, and so on; @kbd{M-3 address@hidden deletes
  the third stack element.
  
--- 11893,11902 ----
  
  @kindex address@hidden
  @pindex calc-pop-above
! The @address@hidden (@code{calc-pop-above}) command is to @key{DEL} what
  @key{LFD} is to @key{RET}:  It interprets the sign of the numeric
  prefix argument in the opposite way, and the default argument is 2.
! Thus @address@hidden by itself removes the second-from-top stack element,
  leaving the first, third, fourth, and so on; @kbd{M-3 address@hidden deletes
  the third stack element.
  
***************
*** 21653,21659 ****
  @xref{Selections with Rewrite Rules}.  The rules are stored in
  the Calc variable @code{DistribRules}.  A convenient way to view
  these rules is to use @kbd{s e} (@code{calc-edit-variable}) which
! displays and edits the stored value of a variable.  Press @key{M-# M-#}
  to return from editing mode; be careful not to make any actual changes
  or else you will affect the behavior of future @kbd{j D} commands!
  
--- 21629,21635 ----
  @xref{Selections with Rewrite Rules}.  The rules are stored in
  the Calc variable @code{DistribRules}.  A convenient way to view
  these rules is to use @kbd{s e} (@code{calc-edit-variable}) which
! displays and edits the stored value of a variable.  Press @kbd{M-# M-#}
  to return from editing mode; be careful not to make any actual changes
  or else you will affect the behavior of future @kbd{j D} commands!
  
***************
*** 27845,27851 ****
  or simplifying or evaluating the value.  It prompts for the name of
  the variable to edit.  If the variable has no stored value, the
  editing buffer will start out empty.  If the editing buffer is
! empty when you press @key{M-# M-#} to finish, the variable will
  be made void.  @xref{Editing Stack Entries}, for a general
  description of editing.
  
--- 27821,27827 ----
  or simplifying or evaluating the value.  It prompts for the name of
  the variable to edit.  If the variable has no stored value, the
  editing buffer will start out empty.  If the editing buffer is
! empty when you press @kbd{M-# M-#} to finish, the variable will
  be made void.  @xref{Editing Stack Entries}, for a general
  description of editing.
  
***************
*** 34271,34282 ****
  @file{texinfo.tex} file, both of which can be obtained from the FSF
  as part of the @code{texinfo} address@hidden
  
! To print the Calc manual in one huge 550 page tome, you will need the
  source code to this manual, @file{calc.texi}, available as part of the
! Emacs source.  Once you have this file, type @samp{tex calc.texi}
! twice.  (Running the manual through @TeX{} twice is necessary so that
! references to later parts of the manual will have correct page
! numbers.  (Don't worry if you get some ``overfull box'' warnings.)
  
  The result will be a device-independent output file called
  @file{calc.dvi}, which you must print in whatever way is right
--- 34247,34258 ----
  @file{texinfo.tex} file, both of which can be obtained from the FSF
  as part of the @code{texinfo} address@hidden
  
! To print the Calc manual in one huge 470 page tome, you will need the
  source code to this manual, @file{calc.texi}, available as part of the
! Emacs source.  Once you have this file, type @kbd{texi2dvi calc.texi}.
! Alternatively, change to the @file{man} subdirectory of the Emacs
! source distribution, and type @kbd{make calc.dvi}. (Don't worry if you
! get some ``overfull box'' warnings while @TeX{} runs.)
  
  The result will be a device-independent output file called
  @file{calc.dvi}, which you must print in whatever way is right
***************
*** 34286,34291 ****
--- 34262,34276 ----
  lpr -d calc.dvi
  @end example
  
+ @noindent
+ or
+ 
+ @example
+ dvips calc.dvi
+ @end example
+ 
+ @c the bumpoddpages macro was deleted
+ @ignore
  @cindex Marginal notes, adjusting
  Marginal notes for each function and key sequence normally alternate
  between the left and right sides of the page, which is correct if the
***************
*** 34293,34298 ****
--- 34278,34284 ----
  the file @file{calc.texi} you will find alternate definitions of
  the @code{\bumpoddpages} macro that put the marginal notes always on
  the same side, best if you plan to be binding single-sided pages.
+ @end ignore
  
  @appendixsec Settings File