[7190] add \indexnofontsvalue macro

[gavinsmith0123]

Revision: 7190
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7190
Author:   gavin
Date:     2016-05-28 15:19:05 +0000 (Sat, 28 May 2016)
Log Message:
-----------
add \indexnofontsvalue macro

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-28 14:57:53 UTC (rev 7189)
+++ trunk/ChangeLog     2016-05-28 15:19:05 UTC (rev 7190)
@@ -1,5 +1,13 @@
 2016-05-26  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\indexnofontsvalue): New definition for a 
+       @value when expanded in an index entry sort key.
+       (\indexnofonts): Call it.
+       (\dummyvalue): If @value is undefined, pass through an 
+       unexpanded @value command to the auxiliary file.
+
+2016-05-26  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\commondummies): Move definitions of 
        \definedummyword, \definedummyletter, \definedummyaccent out of 
        \commondummies.  Reorder a comment to put content about control 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-05-28 14:57:53 UTC (rev 7189)
+++ trunk/doc/texinfo.tex       2016-05-28 15:19:05 UTC (rev 7190)
@@ -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{2016-05-28.15}
+\def\texinfoversion{2016-05-28.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4609,16 +4609,28 @@
 % Like \expandablevalue, but completely expandable (the \message in the
 % definition above operates at the execution level of TeX).  Used when
 % writing to auxiliary files, due to the expansion that \write does.
+% If flag is undefined, pass through an unexpanded @value command: maybe it 
+% will be set by the time it is read back in.
 %
 % NB flag names containing - or _ may not work here.
 \def\dummyvalue#1{%
   \expandafter\ifx\csname SET#1\endcsname\relax
-    [No value for ``#1'']%
+    \noexpand\value{#1}%
   \else
     \csname SET#1\endcsname
   \fi
 }
 
+% Used for @value's in index entries to form the sort key: expand the @value
+% if possible, otherwise sort late.
+\def\indexnofontsvalue#1{%
+  \expandafter\ifx\csname SET#1\endcsname\relax
+    ZZZZZZZ
+  \else
+    \csname SET#1\endcsname
+  \fi
+}
+
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
 % 
@@ -5133,6 +5145,7 @@
   % goes to end-of-line is not handled.
   %
   \macrolist
+  \let\value\indexnofontsvalue
 }