texinfo ChangeLog doc/texinfo.tex

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/12/24 01:31:37

Modified files:
        .              : ChangeLog 
        doc            : texinfo.tex 

Log message:
        \empty instead of \endinput to end \scanmacro

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1192&r2=1.1193
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.331&r2=1.332

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1192
retrieving revision 1.1193
diff -u -b -r1.1192 -r1.1193
--- ChangeLog   18 Dec 2010 17:01:35 -0000      1.1192
+++ ChangeLog   24 Dec 2010 01:31:37 -0000      1.1193
@@ -1,3 +1,9 @@
+2010-12-23  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\scanmacro): use \empty instead of \endinput,
+       since the actual meaning of \endinput turns out to have nothing to
+       do with it.  Doc fixes.
+
 2010-12-18  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Other Configuration Variables): continue.

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -b -r1.331 -r1.332
--- doc/texinfo.tex     7 Sep 2010 00:11:14 -0000       1.331
+++ doc/texinfo.tex     24 Dec 2010 01:31:37 -0000      1.332
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2010-09-06.17}
+\def\texinfoversion{2010-12-23.17}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -6891,25 +6891,28 @@
   }
 \fi
 
-\def\scanmacro#1{%
-  \begingroup
+\def\scanmacro#1{\begingroup
     \newlinechar`\^^M
     \let\xeatspaces\eatspaces
+  %
     % Undo catcode changes of \startcontents and \doprintindex
     % When called from @insertcopying or (short)caption, we need active
     % backslash to get it printed correctly.  Previously, we had
     % \catcode`\\=\other instead.  We'll see whether a problem appears
     % with macro expansion.                            --kasal, 19aug04
     address@hidden \catcode`\\=\active \escapechar=`\@
-    % ... and \example
+  %
+  % ... and for \example:
     \spaceisspace
     %
-    % Append \endinput to make sure that TeX does not see the ending newline.
-    % I've verified that it is necessary both for e-TeX and for ordinary TeX
-    %                                                  --kasal, 29nov03
-    \scantokens{#1\endinput}%
-  \endgroup
-}
+  % The \empty here causes a following catcode 5 newline to be eaten
+  % as part of reading whitespace after a control sequence.  It does
+  % not eat a catcode 13 newline.  There's no good way to handle the
+  % two cases.  See the Macro Details node in the manual for the
+  % workaround we currently have to recommend for macros and
+  % line-oriented commands.
+  \scantokens{#1\empty}%
+\endgroup}
 
 \def\scanexp#1{%
   \edef\temp{\noexpand\scanmacro{#1}}%