[7150] don't call \makevalueexpandable in \commondummies

[gavin]

Revision: 7150
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7150
Author:   gavin
Date:     2016-05-07 17:12:54 +0000 (Sat, 07 May 2016)
Log Message:
-----------
don't call \makevalueexpandable in \commondummies

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-07 13:37:27 UTC (rev 7149)
+++ trunk/ChangeLog     2016-05-07 17:12:54 UTC (rev 7150)
@@ -1,3 +1,14 @@
+2016-05-07  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\commondummies): Define \value as a dummy.
+       Do not call \makevalueexpandable.
+       (\xrdef, \refx, \xrefX): Give \value a definition so we can get 
+       rid of it when making a control sequence name for a 
+       cross-reference target.  Comments changed.
+
+       * doc/texinfo-tex-test.texi (Test of auxiliary files): New 
+       section testing uses of @value in index entries and anchors.
+
 2016-05-07  Masamichi Hosoda  <address@hidden>
 
        * doc/texinfo-ja.tex (\writetocentry):

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2016-05-07 13:37:27 UTC (rev 7149)
+++ trunk/doc/texinfo-tex-test.texi     2016-05-07 17:12:54 UTC (rev 7150)
@@ -666,6 +666,30 @@
 Have a look at the headline.
 
 
address@hidden Test of auxiliary files
+
+Need to test with @command{texi2dvi}.
+
+Undefined value in anchor: @address@hidden ho}
+
+Xref to said anchor: @address@hidden ho}.
+
address@hidden auxvalue this is the value
+Defined value in anchor: @address@hidden ho}
+
+Xref to said anchor: @address@hidden ho}.
+
address@hidden ax
+
+value in index entry
address@hidden @value{ho} in index entry
+
+defined value in index entry
address@hidden @value{auxvalue} in index entry
+
address@hidden ax
+
+
 @chapter Cross-references
 
 Check commas surrounding page number:

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-05-07 13:37:27 UTC (rev 7149)
+++ trunk/doc/texinfo.tex       2016-05-07 17:12:54 UTC (rev 7150)
@@ -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-07.13}
+\def\texinfoversion{2016-05-07.18}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4752,7 +4752,7 @@
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx}
 \def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}}
 
-% Used when writing an index entry out to an index file, to prevent
+% Used when writing an index entry out to an index file to prevent
 % expansion of Texinfo commands that can appear in an index entry.
 %
 \def\indexdummies{%
@@ -4888,12 +4888,9 @@
   %
   % We want to disable all macros so that they are not expanded by \write.
   \macrolist
+  \definedummyword\value
   %
   \normalturnoffactive
-  %
-  % Handle some cases of @value -- where it does not contain any
-  % (non-fully-expandable) commands.
-  \makevalueexpandable
 }
 
 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
@@ -8811,6 +8808,7 @@
      \else
        \txiescapepdf\pdfxrefdest  % escape PDF special chars
      \fi
+     \show\pdfxrefdest
      %
      \leavevmode
      \startlink attr{/Border [0 0 0]}%
@@ -8868,6 +8866,7 @@
     % include an _ in the xref name, etc.
     \indexnofonts
     \turnoffactive
+    \def\value##1{##1}%
     \expandafter\global\expandafter\let\expandafter\Xthisreftitle
       \csname XR#1-title\endcsname
   }%
@@ -9008,14 +9007,14 @@
   \fi\fi\fi
 }
 
-% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
-% If its value is nonempty, SUFFIX is output afterward.
-%
+% \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME.  SUFFIX 
+% is output afterwards if non-empty.
 \def\refx#1#2{%
   \requireauxfile
   {%
     \indexnofonts
     \otherbackslash
+    \def\value##1{##1}%
     \expandafter\global\expandafter\let\expandafter\thisrefX
       \csname XR#1\endcsname
   }%
@@ -9040,16 +9039,18 @@
   #2% Output the suffix in any case.
 }
 
-% This is the macro invoked by entries in the aux file.  Usually it's
-% just a \def (we prepend XR to the control sequence name to avoid
-% collisions).  But if this is a float type, we have more work to do.
+% This is the macro invoked by entries in the aux file.  Define a control 
+% sequence for a cross-reference target (we prepend XR to the control sequence 
+% name to avoid collisions).  The value is the page number.  If this is a 
float 
+% type, we have more work to do.
 %
 \def\xrdef#1#2{%
-  {% The node name might contain 8-bit characters, which in our current
-   % implementation are changed to commands like @'e.  Don't let these
-   % mess up the control sequence name.
+  {% Expand the node or anchor name to remove control sequences.
+   % \turnoffactive stops 8-bit characters being changed to commands
+   % like @'e.  \refx does the same to retrieve the value in the definition.
     \indexnofonts
     \turnoffactive
+    \def\value##1{##1}%
     \xdef\safexrefname{#1}%
   }%
   %