Partial fix for @funindex (doesn't break anything).

diff --git a/ChangeLog b/ChangeLog
index e6fd3e4e7f564152132d594b261fc10ccf62e0ae..75944f7d0e48057c14636e32ad0d5a21af5eb104 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-02  Graham Percival  <gpermus@gmail.com>
+
+       * tex/texinfo.tex: partial fix for @funindex.
+
+       * Documentation/user/macros.tely: uncomment @funindex (doesn't
+       break anything).
+
 2006-06-02  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * tex/texinfo.tex (sectionheading, q.v.): call \quoteexpand for

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index d19182bc2670af2ac6f5b6986afe6a5047c25c50..68b52bb51368db7ea2bab262a7113c35c66a1276 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -196,9 +196,9 @@ user manual, @internalsref{\NAME\}
 
 @end macro
 
-@c @macro funindex {WORD}
-@c @end macro
-@c @findex \WORD\
-@c @kindex \WORD\
+@macro funindex {WORD}
+@findex \WORD\
+@kindex \WORD\
+@end macro
 
 

diff --git a/tex/texinfo.tex b/tex/texinfo.tex
index ab6a1c4d21d61f7485bab85703b61a0d4f45ce35..ff07c36085a8c9d3762f72f1ee336e951bffec81 100644 (file)
--- a/tex/texinfo.tex
+++ b/tex/texinfo.tex
@@ -3234,6 +3234,32 @@ where each line of input produces a line of output.}
   \let\{ = \mylbrace
   \let\} = \myrbrace
   %
+  % I don't entirely understand this, but when an index entry is
+  % generated from a macro call, the \endinput which \scanmacro inserts
+  % causes processing to be prematurely terminated.  This is,
+  % apparently, because \indexsorttmp is fully expanded, and \endinput
+  % is an expandable command.  The redefinition below makes \endinput
+  % disappear altogether for that purpose -- although logging shows that
+  % processing continues to some further point.  On the other hand, it
+  % seems \endinput does not hurt in the printed index arg, since that
+  % is still getting written without apparent harm.
+  % 
+  % Sample source (mac-idx3.tex, reported by Graham Percival to
+  % help-texinfo, 22may06):
+  % @macro funindex {WORD}
+  % @findex xyz
+  % @end macro
+  % ...
+  % @funindex commtest
+  % 
+  % The above is not enough to reproduce the bug, but it gives the flavor.
+  % 
+  % Sample whatsit resulting:
+  % address@hidden@folio address@hidden address@hidden }}}
+  % 
+  % So:
+  \let\endinput = \empty
+  %
   % Do the redefinitions.
   \commondummies
 }