From: Graham Percival <graham@percival-music.ca>
Date: Fri, 2 Jun 2006 02:44:37 +0000 (+0000)
Subject: Partial fix for @funindex (doesn't break anything).
X-Git-Tag: release/2.10.0-2~594
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ac668ac4e922be803190150671600ff19ad379bd;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index e6fd3e4e7f..75944f7d0e 100644
--- 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 d19182bc26..68b52bb513 100644
--- 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 ab6a1c4d21..ff07c36085 100644
--- 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
 }