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

[Jay Belanger]

Index: emacs/man/calc.texi
diff -c emacs/man/calc.texi:1.45 emacs/man/calc.texi:1.46
*** emacs/man/calc.texi:1.45    Thu Feb 10 04:12:19 2005
--- emacs/man/calc.texi Thu Feb 10 18:54:10 2005
***************
*** 48,56 ****
  @macro cpiover{den}
  @expr{pi/\den\}
  @end macro
- @macro LaTeX{}
- address@hidden
- @end macro
  @end ifnottex
  
  
--- 48,53 ----
***************
*** 739,745 ****
  Type @kbd{d B} to view the solutions in more readable notation.
  Type @address@hidden C}} to view them in C language notation, @kbd{d T}
  to view them in the notation for the @TeX{} typesetting system,
! and @kbd{d L} to view them in the notation for the @LaTeX{} typesetting
  system.  Type @kbd{d N} to return to normal notation.
  
  @noindent
--- 736,742 ----
  Type @kbd{d B} to view the solutions in more readable notation.
  Type @address@hidden C}} to view them in C language notation, @kbd{d T}
  to view them in the notation for the @TeX{} typesetting system,
! and @kbd{d L} to view them in the notation for the address@hidden typesetting
  system.  Type @kbd{d N} to return to normal notation.
  
  @noindent
***************
*** 1124,1130 ****
  Calc has added annotations to the file to help it remember the modes
  that were used for this formula.  They are formatted like comments
  in the @TeX{} typesetting language, just in case you are using @TeX{} or
! @LaTeX{}. (In this example @TeX{} is not being used, so you might want
  to move these comments up to the top of the file or otherwise put them
  out of the way.)
  
--- 1121,1127 ----
  Calc has added annotations to the file to help it remember the modes
  that were used for this formula.  They are formatted like comments
  in the @TeX{} typesetting language, just in case you are using @TeX{} or
! address@hidden (In this example @TeX{} is not being used, so you might want
  to move these comments up to the top of the file or otherwise put them
  out of the way.)
  
***************
*** 5221,5227 ****
  Here things like powers, square roots, and quotients and fractions
  are displayed in a two-dimensional pictorial form.  Calc has other
  language modes as well, such as C mode, FORTRAN mode, @TeX{} mode
! and @LaTeX{} mode.
  
  @smallexample
  @group
--- 5218,5224 ----
  Here things like powers, square roots, and quotients and fractions
  are displayed in a two-dimensional pictorial form.  Calc has other
  language modes as well, such as C mode, FORTRAN mode, @TeX{} mode
! and address@hidden mode.
  
  @smallexample
  @group
***************
*** 13925,13931 ****
  @noindent
  The commands in this section change Calc to use a different notation for
  entry and display of formulas, corresponding to the conventions of some
! other common language such as Pascal or @LaTeX{}.  Objects displayed on the
  stack or yanked from the Calculator to an editing buffer will be formatted
  in the current language; objects entered in algebraic entry or yanked from
  another buffer will be interpreted according to the current language.
--- 13922,13928 ----
  @noindent
  The commands in this section change Calc to use a different notation for
  entry and display of formulas, corresponding to the conventions of some
! other common language such as Pascal or address@hidden  Objects displayed on 
the
  stack or yanked from the Calculator to an editing buffer will be formatted
  in the current language; objects entered in algebraic entry or yanked from
  another buffer will be interpreted according to the current language.
***************
*** 13950,13959 ****
  and would have written the formula back with notations (like implicit
  multiplication) which would not have been legal for a C program.
  
! As another example, suppose you are maintaining a C program and a @LaTeX{}
  document, each of which needs a copy of the same formula.  You can grab the
! formula from the program in C mode, switch to @LaTeX{} mode, and yank the
! formula into the document in @LaTeX{} math-mode format.
  
  Language modes are selected by typing the letter @kbd{d} followed by a
  shifted letter key.
--- 13947,13956 ----
  and would have written the formula back with notations (like implicit
  multiplication) which would not have been legal for a C program.
  
! As another example, suppose you are maintaining a C program and a 
address@hidden
  document, each of which needs a copy of the same formula.  You can grab the
! formula from the program in C mode, switch to address@hidden mode, and yank 
the
! formula into the document in address@hidden math-mode format.
  
  Language modes are selected by typing the letter @kbd{d} followed by a
  shifted letter key.
***************
*** 14147,14153 ****
  convert to lower-case for display and input.
  
  @node TeX and LaTeX Language Modes, Eqn Language Mode, C FORTRAN Pascal, 
Language Modes
! @subsection @TeX{} and @LaTeX{} Language Modes
  
  @noindent
  @kindex d T
--- 14144,14150 ----
  convert to lower-case for display and input.
  
  @node TeX and LaTeX Language Modes, Eqn Language Mode, C FORTRAN Pascal, 
Language Modes
! @subsection @TeX{} and address@hidden Language Modes
  
  @noindent
  @kindex d T
***************
*** 14159,14196 ****
  The @kbd{d T} (@code{calc-tex-language}) command selects the conventions
  of ``math mode'' in Donald Knuth's @TeX{} typesetting language,
  and the @kbd{d L} (@code{calc-latex-language}) command selects the
! conventions of ``math mode'' in @LaTeX{}, a typesetting language that
! uses @TeX{} as its formatting engine.  Calc's @LaTeX{} language mode can
! read any formula that the @TeX{} language mode can, although @LaTeX{}
  mode may display it differently.
  
  Formulas are entered and displayed in the appropriate notation;
  @texline @math{\sin(a/b)}
  @infoline @expr{sin(a/b)}
  will appear as @samp{\sin\left( a \over b \right)} in @TeX{} mode and
! @samp{\sin\left(address@hidden@address@hidden@}\right)} in @LaTeX{} mode.
  Math formulas are often enclosed by @samp{$ $} signs in @TeX{} and
! @LaTeX{}; these should be omitted when interfacing with Calc.  To Calc,
  the @samp{$} sign has the same meaning it always does in algebraic
  formulas (a reference to an existing entry on the stack).
  
  Complex numbers are displayed as in @samp{3 + 4i}.  Fractions and
  quotients are written using @code{\over} in @TeX{} mode (as in 
! @address@hidden \over address@hidden) and @code{\frac} in @LaTeX{} mode (as in
  @address@hidden@address@hidden@}});  binomial coefficients are written with
  @code{\choose} in @TeX{} mode (as in @address@hidden \choose address@hidden) 
and
! @code{\binom} in @LaTeX{} mode (as in @address@hidden@address@hidden@}}).
  Interval forms are written with @code{\ldots}, and error forms are
  written with @code{\pm}. Absolute values are written as in 
  @samp{|x + 1|}, and the floor and ceiling functions are written with
  @code{\lfloor}, @code{\rfloor}, etc. The words @code{\left} and
! @code{\right} are ignored when reading formulas in @TeX{} and @LaTeX{}
  modes.  Both @code{inf} and @code{uinf} are written as @code{\infty};
  when read, @code{\infty} always translates to @code{inf}.
  
  Function calls are written the usual way, with the function name followed
  by the arguments in parentheses.  However, functions for which @TeX{}
! and @LaTeX{} have special names (like @code{\sin}) will use curly braces
  instead of parentheses for very simple arguments.  During input, curly
  braces and parentheses work equally well for grouping, but when the
  document is formatted the curly braces will be invisible.  Thus the
--- 14156,14193 ----
  The @kbd{d T} (@code{calc-tex-language}) command selects the conventions
  of ``math mode'' in Donald Knuth's @TeX{} typesetting language,
  and the @kbd{d L} (@code{calc-latex-language}) command selects the
! conventions of ``math mode'' in address@hidden, a typesetting language that
! uses @TeX{} as its formatting engine.  Calc's address@hidden language mode can
! read any formula that the @TeX{} language mode can, although address@hidden
  mode may display it differently.
  
  Formulas are entered and displayed in the appropriate notation;
  @texline @math{\sin(a/b)}
  @infoline @expr{sin(a/b)}
  will appear as @samp{\sin\left( a \over b \right)} in @TeX{} mode and
! @samp{\sin\left(address@hidden@address@hidden@}\right)} in address@hidden 
mode.
  Math formulas are often enclosed by @samp{$ $} signs in @TeX{} and
! address@hidden; these should be omitted when interfacing with Calc.  To Calc,
  the @samp{$} sign has the same meaning it always does in algebraic
  formulas (a reference to an existing entry on the stack).
  
  Complex numbers are displayed as in @samp{3 + 4i}.  Fractions and
  quotients are written using @code{\over} in @TeX{} mode (as in 
! @address@hidden \over address@hidden) and @code{\frac} in address@hidden mode 
(as in
  @address@hidden@address@hidden@}});  binomial coefficients are written with
  @code{\choose} in @TeX{} mode (as in @address@hidden \choose address@hidden) 
and
! @code{\binom} in address@hidden mode (as in 
@address@hidden@address@hidden@}}).
  Interval forms are written with @code{\ldots}, and error forms are
  written with @code{\pm}. Absolute values are written as in 
  @samp{|x + 1|}, and the floor and ceiling functions are written with
  @code{\lfloor}, @code{\rfloor}, etc. The words @code{\left} and
! @code{\right} are ignored when reading formulas in @TeX{} and address@hidden
  modes.  Both @code{inf} and @code{uinf} are written as @code{\infty};
  when read, @code{\infty} always translates to @code{inf}.
  
  Function calls are written the usual way, with the function name followed
  by the arguments in parentheses.  However, functions for which @TeX{}
! and address@hidden have special names (like @code{\sin}) will use curly braces
  instead of parentheses for very simple arguments.  During input, curly
  braces and parentheses work equally well for grouping, but when the
  document is formatted the curly braces will be invisible.  Thus the
***************
*** 14201,14214 ****
  @texline @math{\sin(2 + x)}.
  @infoline @expr{sin(2 + x)}.
  
! Function and variable names not treated specially by @TeX{} and @LaTeX{}
  are simply written out as-is, which will cause them to come out in
  italic letters in the printed document.  If you invoke @kbd{d T} or
  @kbd{d L} with a positive numeric prefix argument, names of more than
  one character will instead be enclosed in a protective commands that
  will prevent them from being typeset in the math italics; they will be
  written @address@hidden@address@hidden in @TeX{} mode and 
! @address@hidden@address@hidden in @LaTeX{} mode.  The
  @address@hidden @}} and @address@hidden @}} notations are ignored during
  reading.  If you use a negative prefix argument, such function names are
  written @address@hidden, and function names that begin with @code{\} during
--- 14198,14211 ----
  @texline @math{\sin(2 + x)}.
  @infoline @expr{sin(2 + x)}.
  
! Function and variable names not treated specially by @TeX{} and address@hidden
  are simply written out as-is, which will cause them to come out in
  italic letters in the printed document.  If you invoke @kbd{d T} or
  @kbd{d L} with a positive numeric prefix argument, names of more than
  one character will instead be enclosed in a protective commands that
  will prevent them from being typeset in the math italics; they will be
  written @address@hidden@address@hidden in @TeX{} mode and 
! @address@hidden@address@hidden in address@hidden mode.  The
  @address@hidden @}} and @address@hidden @}} notations are ignored during
  reading.  If you use a negative prefix argument, such function names are
  written @address@hidden, and function names that begin with @code{\} during
***************
*** 14219,14225 ****
  
  During reading, text of the form @address@hidden ...@: @}} is replaced
  by @samp{[ ...@: ]}.  The same also applies to @code{\pmatrix} and
! @code{\bmatrix}.  In @LaTeX{} mode this also applies to 
  @address@hidden@} ... address@hidden@}},
  @address@hidden@} ... address@hidden@}},
  @address@hidden@} ... address@hidden@}}, as well as
--- 14216,14222 ----
  
  During reading, text of the form @address@hidden ...@: @}} is replaced
  by @samp{[ ...@: ]}.  The same also applies to @code{\pmatrix} and
! @code{\bmatrix}.  In address@hidden mode this also applies to 
  @address@hidden@} ... address@hidden@}},
  @address@hidden@} ... address@hidden@}},
  @address@hidden@} ... address@hidden@}}, as well as
***************
*** 14229,14235 ****
  During output, matrices are displayed in @address@hidden a & b \\ c & 
address@hidden
  format in @TeX{} mode and in 
  @address@hidden@} a & b \\ c & d address@hidden@}} format in
! @LaTeX{} mode; you may need to edit this afterwards to change to your
  preferred matrix form.  If you invoke @kbd{d T} or @kbd{d L} with an
  argument of 2 or -2, then matrices will be displayed in two-dimensional
  form, such as 
--- 14226,14232 ----
  During output, matrices are displayed in @address@hidden a & b \\ c & 
address@hidden
  format in @TeX{} mode and in 
  @address@hidden@} a & b \\ c & d address@hidden@}} format in
! address@hidden mode; you may need to edit this afterwards to change to your
  preferred matrix form.  If you invoke @kbd{d T} or @kbd{d L} with an
  argument of 2 or -2, then matrices will be displayed in two-dimensional
  form, such as 
***************
*** 14253,14259 ****
  @end example
  
  @noindent
! While this wouldn't bother Calc, it is incorrect @LaTeX{}.
  (Similarly for @TeX{}.)
  
  Accents like @code{\tilde} and @code{\bar} translate into function
--- 14250,14256 ----
  @end example
  
  @noindent
! While this wouldn't bother Calc, it is incorrect address@hidden
  (Similarly for @TeX{}.)
  
  Accents like @code{\tilde} and @code{\bar} translate into function
***************
*** 14261,14267 ****
  sequence is treated as an accent.  The @code{\vec} accent corresponds
  to the function name @code{Vec}, because @code{vec} is the name of
  a built-in Calc function.  The following table shows the accents
! in Calc, @TeX{}, @LaTeX{} and @dfn{eqn} (described in the next section):
  
  @iftex
  @begingroup
--- 14258,14264 ----
  sequence is treated as an accent.  The @code{\vec} accent corresponds
  to the function name @code{Vec}, because @code{vec} is the name of
  a built-in Calc function.  The following table shows the accents
! in Calc, @TeX{}, address@hidden and @dfn{eqn} (described in the next section):
  
  @iftex
  @begingroup
***************
*** 14436,14442 ****
  @end example
  
  Note that, because these symbols are ignored, reading a @TeX{} or
! @LaTeX{} formula into Calc and writing it back out may lose spacing and
  font information. 
  
  Also, the ``discretionary multiplication sign'' @samp{\*} is read
--- 14433,14439 ----
  @end example
  
  Note that, because these symbols are ignored, reading a @TeX{} or
! address@hidden formula into Calc and writing it back out may lose spacing and
  font information. 
  
  Also, the ``discretionary multiplication sign'' @samp{\*} is read
***************
*** 14607,14613 ****
  symbol (these are used to introduce spaces of various widths into
  the typeset output of @dfn{eqn}).
  
! As in @LaTeX{} mode, Calc's formatter omits parentheses around the
  arguments of functions like @code{ln} and @code{sin} if they are
  ``simple-looking''; in this case Calc surrounds the argument with
  braces, separated by a @samp{~} from the function name: @address@hidden@}}.
--- 14604,14610 ----
  symbol (these are used to introduce spaces of various widths into
  the typeset output of @dfn{eqn}).
  
! As in address@hidden mode, Calc's formatter omits parentheses around the
  arguments of functions like @code{ln} and @code{sin} if they are
  ``simple-looking''; in this case Calc surrounds the argument with
  braces, separated by a @samp{~} from the function name: @address@hidden@}}.
***************
*** 15939,15945 ****
  @TeX{} language mode (@kbd{d T}; @pxref{TeX and LaTeX Language Modes}).
  
  @item LaTeX
! @LaTeX{} language mode (@kbd{d L}; @pxref{TeX and LaTeX Language Modes}).
  
  @item Eqn
  @dfn{Eqn} language mode (@kbd{d E}; @pxref{Eqn Language Mode}).
--- 15936,15942 ----
  @TeX{} language mode (@kbd{d T}; @pxref{TeX and LaTeX Language Modes}).
  
  @item LaTeX
! address@hidden language mode (@kbd{d L}; @pxref{TeX and LaTeX Language 
Modes}).
  
  @item Eqn
  @dfn{Eqn} language mode (@kbd{d E}; @pxref{Eqn Language Mode}).
***************
*** 28353,28359 ****
  @cindex @samp{=>} operator
  The special algebraic symbol @samp{=>} is known as the @dfn{evaluates-to
  operator}.  (It will show up as an @code{evalto} function call in
! other language modes like Pascal and @LaTeX{}.)  This is a binary
  operator, that is, it has a lefthand and a righthand argument,
  although it can be entered with the righthand argument omitted.
  
--- 28350,28356 ----
  @cindex @samp{=>} operator
  The special algebraic symbol @samp{=>} is known as the @dfn{evaluates-to
  operator}.  (It will show up as an @code{evalto} function call in
! other language modes like Pascal and address@hidden)  This is a binary
  operator, that is, it has a lefthand and a righthand argument,
  although it can be entered with the righthand argument omitted.
  
***************
*** 30008,30023 ****
  When Embedded mode ``activates'' a formula, i.e., when it examines
  the formula for the first time since the buffer was created or
  loaded, Calc tries to sense the language in which the formula was
! written.  If the formula contains any @LaTeX{}-like @samp{\} sequences,
! it is parsed (i.e., read) in @LaTeX{} mode.  If the formula appears to
  be written in multi-line Big mode, it is parsed in Big mode.  Otherwise,
  it is parsed according to the current language mode.
  
  Note that Calc does not change the current language mode according
! to what it finds.  Even though it can read a @LaTeX{} formula when
! not in @LaTeX{} mode, it will immediately rewrite this formula using
  whatever language mode is in effect.  You must then type @kbd{d L}
! to switch Calc permanently into @LaTeX{} mode if that is what you
  desire.
  
  @tex
--- 30005,30020 ----
  When Embedded mode ``activates'' a formula, i.e., when it examines
  the formula for the first time since the buffer was created or
  loaded, Calc tries to sense the language in which the formula was
! written.  If the formula contains any address@hidden @samp{\} sequences,
! it is parsed (i.e., read) in address@hidden mode.  If the formula appears to
  be written in multi-line Big mode, it is parsed in Big mode.  Otherwise,
  it is parsed according to the current language mode.
  
  Note that Calc does not change the current language mode according
! to what it finds.  Even though it can read a address@hidden formula when
! not in address@hidden mode, it will immediately rewrite this formula using
  whatever language mode is in effect.  You must then type @kbd{d L}
! to switch Calc permanently into address@hidden mode if that is what you
  desire.
  
  @tex
***************
*** 30038,30045 ****
  
  Plain formulas are preceded and followed by @samp{%%%} signs
  by default.  This notation has the advantage that the @samp{%}
! character begins a comment in @TeX{} and @LaTeX{}, so if your formula is 
! embedded in a @TeX{} or @LaTeX{} document its plain version will be
  invisible in the final printed copy.  @xref{Customizing
  Embedded Mode}, to see how to change the ``plain'' formula
  delimiters, say to something that @dfn{eqn} or some other
--- 30035,30042 ----
  
  Plain formulas are preceded and followed by @samp{%%%} signs
  by default.  This notation has the advantage that the @samp{%}
! character begins a comment in @TeX{} and address@hidden, so if your formula 
is 
! embedded in a @TeX{} or address@hidden document its plain version will be
  invisible in the final printed copy.  @xref{Customizing
  Embedded Mode}, to see how to change the ``plain'' formula
  delimiters, say to something that @dfn{eqn} or some other
***************
*** 30329,30335 ****
  @noindent
  where the leading and trailing @samp{---} can be replaced by
  any suitable strings (which must be the same on all three lines)
! or omitted altogether; in a @TeX{} or @LaTeX{} file, @samp{%} would be a good
  leading string and no trailing string would be necessary.  In a
  C program, @samp{/*} and @samp{*/} would be good leading and
  trailing strings.
--- 30326,30332 ----
  @noindent
  where the leading and trailing @samp{---} can be replaced by
  any suitable strings (which must be the same on all three lines)
! or omitted altogether; in a @TeX{} or address@hidden file, @samp{%} would be 
a good
  leading string and no trailing string would be necessary.  In a
  C program, @samp{/*} and @samp{*/} would be good leading and
  trailing strings.