texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/02/16 18:47:35

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        (#line and TeX): reorganize -E alternatives as a list

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1326&r2=1.1327
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.420&r2=1.421

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1326
retrieving revision 1.1327
diff -u -b -r1.1326 -r1.1327
--- ChangeLog   16 Feb 2012 18:38:16 -0000      1.1326
+++ ChangeLog   16 Feb 2012 18:47:34 -0000      1.1327
@@ -5,6 +5,7 @@
        (#line Syntax Details): update regexp, discuss surprising
        false positives.
        (Contents): must come before any sectioning command.
+       (#line and TeX): reorganize as a list.
 
 2012-02-10  Patrice Dumas  <address@hidden>
 

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -b -r1.420 -r1.421
--- doc/texinfo.txi     16 Feb 2012 18:38:17 -0000      1.420
+++ doc/texinfo.txi     16 Feb 2012 18:47:35 -0000      1.421
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.420 2012/02/16 18:38:17 karl Exp $
address@hidden $Id: texinfo.txi,v 1.421 2012/02/16 18:47:35 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.
 
@@ -15089,31 +15089,41 @@
 @node #line and TeX
 @subsection @samp{#line} and @TeX{}
 @cindex @TeX{} and @samp{#line} directives
address@hidden @samp{#line} directives, not processing with @TeX{}
 
 As mentioned, @command{makeinfo} recognizes the @samp{#line}
 directives described in the previous section.  However,
 @file{texinfo.tex} does not and cannot.  Therefore, such a line will
 be incorrectly typeset verbatim if @TeX{} sees it.  The solution is to
-use the (Texinfo) macro expansion options.
+use the (@command{makeinfo}) macro expansion options before running
address@hidden  There are three approaches.
 
address@hidden @bullet
address@hidden
 If you run @command{texi2dvi} or its variants (@pxref{Format with
-texi2dvi,, Format with @code{texi2dvi}}), you can pass @option{-E}.
+texi2dvi,, Format with @code{texi2dvi}}), you can pass @option{-E} and
address@hidden will run @command{makeinfo} first to expand macros
+and eliminate @samp{#line}.
 
address@hidden
 If you run @command{makeinfo} or its variants (@pxref{Generic
-Translator texi2any,, A Generic Translator: @command{texi2any}}), you
-can pass @option{--no-ifinfo --iftex -E somefile.mac} or @option{--dvi
---Xopt -E}.  (Or @option{--pdf} instead of @option{--dvi}, of course.)
-With the former, you can then give @file{somefile.mac} to
address@hidden in a separate command; with the latter,
address@hidden will call @command{texi2dvi}.
+Translator texi2any,, @command{texi2any}: A Generic Translator}), you
+can specify @option{--no-ifinfo --iftex -E somefile.out}, you can then
+give @file{somefile.out} to @code{texi2dvi} in a separate command.
+
address@hidden
+Or you can run @option{makeinfo --dvi --Xopt -E}.  (Or @option{--pdf}
+instead of @option{--dvi}.)  @command{makeinfo} will then call
address@hidden -E}.
address@hidden itemize
 
 @findex address@hidden, and line numbers in @TeX{}}
-There is one other caveat regarding use with @TeX{}: since the
address@hidden directives are not recognized, the line numbers emitted
-by the @code{@@address@hidden@}} command (@pxref{Conditional Commands}),
-or by @TeX{} itself, are the (incorrect) line numbers from the derived
-file which @TeX{} is reading, rather than the preprocessor-specified
-line numbers.  This is another instance of why we recommend running
+One last caveat regarding use with @TeX{}: since the @code{#line}
+directives are not recognized, the line numbers emitted by the
address@hidden@@address@hidden@}} command (@pxref{Conditional Commands}), or by
address@hidden itself, are the (incorrect) line numbers from the derived file
+which @TeX{} is reading, rather than the preprocessor-specified line
+numbers.  This is another instance of why we recommend running
 @command{makeinfo} for the best diagnostics (@pxref{makeinfo
 advantages,, @code{makeinfo} Advantages}).
 
@@ -19353,6 +19363,7 @@
 use anchors (@pxref{anchor,, @code{anchor}}).  There is no effective
 difference between the two approaches.
 
+
 @node texi2any Output Customization
 @chapter @command{texi2any} Output Customization
 
@@ -21662,7 +21673,7 @@
 Revision Control System}) or other version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.420 2012/02/16 18:38:17 karl Exp $
+$Id: texinfo.txi,v 1.421 2012/02/16 18:47:35 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}