texinfo update (Tue Oct 2 15:23:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.767
retrieving revision 1.768
diff -u -r1.767 -r1.768
--- ChangeLog   27 Sep 2007 06:41:18 -0000      1.767
+++ ChangeLog   2 Oct 2007 18:57:12 -0000       1.768
@@ -1,3 +1,8 @@
+2007-10-02  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (math): Make description more accurate.
+       Ideas by Patrice Dumas, 16 Sep 2007 12:02:46.
+
 2007-09-26  Karl Berry  <address@hidden>
 
        * makeinfo/index.c (count_strn_chars): new fn.
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- doc/texinfo.txi     25 Sep 2007 21:30:18 -0000      1.206
+++ doc/texinfo.txi     2 Oct 2007 18:57:12 -0000       1.207
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.206 2007/09/25 21:30:18 karl Exp $
address@hidden $Id: texinfo.txi,v 1.207 2007/10/02 18:57:12 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -10953,15 +10953,24 @@
 (a + b)(a + b) = a^2 + 2ab + b^2
 @end example
 
-Thus, the @code{@@math} command has no effect on the Info and HTML
-output; @command{makeinfo} just reproduces the input, it does not try
-to interpret the mathematics in any way.
-
address@hidden@@math} implies @code{@@tex}.  This not only makes it possible to
-write superscripts and subscripts (as in the above example), but also
-allows you to use any of the plain @TeX{} math control sequences.  It's
-conventional to use @samp{\} instead of @samp{@@} for these commands.
-As in:
+The @code{@@math} command has no special effect on the Info and HTML
+output.  @command{makeinfo} expands any @code{@@}-commands as usual,
+but it does not try to produce good mathematical formatting in any
+way.
+
+Plain @TeX{} commands are allowed in @code{@@math}.  This allows you
+to conveniently write superscripts and subscripts (as in the above
+example), and also to use all the plain @TeX{} math control sequences
+for symbols, functions, and so on, and thus get proper formatting in
+the @TeX{} output, at least.
+
+That is, as far as the @TeX{} output is concerned, @samp{\} is an
+escape character inside @code{@@math}, and in fact it's best to use
address@hidden instead of @samp{@@} for any such mathematical commands;
+otherwise, @command{makeinfo} will complain.  
+
+Here's an example:
+
 @example
 @@address@hidden 2\pi \equiv \cos address@hidden
 @end example
@@ -10982,11 +10991,10 @@
 @findex \ @r{(literal \ in @code{@@math})}
 Since @samp{\} is an escape character inside @code{@@math}, you can use
 @code{@@\} to get a literal backslash (@code{\\} will work in @TeX{},
-but you'll get the literal @samp{\\} in Info).  @code{@@\} is not
+but you'd get the literal @samp{\\} in Info).  @code{@@\} is not
 defined outside of @code{@@math}, since a @samp{\} ordinarily produces a
 literal @samp{\}.
 
-
 @cindex Displayed equations
 @cindex Equations, displayed
 For displayed equations, you must at present use @TeX{} directly
@@ -18883,7 +18891,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.206 2007/09/25 21:30:18 karl Exp $
+$Id: texinfo.txi,v 1.207 2007/10/02 18:57:12 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -18957,7 +18965,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.206 2007/09/25 21:30:18 karl Exp $
address@hidden $Id: texinfo.txi,v 1.207 2007/10/02 18:57:12 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
P ChangeLog
P doc/texinfo.txi