texinfo ChangeLog doc/texinfo.tex

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/03/11 22:04:34

Modified files:
        .              : ChangeLog 
        doc            : texinfo.tex 

Log message:
        allow @value in xref filenames; from Samuel Bronson

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1337&r2=1.1338
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.tex?cvsroot=texinfo&r1=1.361&r2=1.362

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1337
retrieving revision 1.1338
diff -u -b -r1.1337 -r1.1338
--- ChangeLog   29 Feb 2012 15:05:44 -0000      1.1337
+++ ChangeLog   11 Mar 2012 22:04:34 -0000      1.1338
@@ -1,3 +1,10 @@
+2012-03-11  Samuel Bronson  <address@hidden>  (tiny change)
+
+       * doc/texinfo.tex (\getfilename): \edef the argument first
+       so @value can be expanded.
+       (\xrefX): call \makevalueexpandable.
+       #35793, bug-texinfo 11 Mar 2012 21:17:45.
+
 2012-02-28  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (\center): use \centersub rather than \next.

Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -b -r1.361 -r1.362
--- doc/texinfo.tex     29 Feb 2012 15:05:44 -0000      1.361
+++ doc/texinfo.tex     11 Mar 2012 22:04:34 -0000      1.362
@@ -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{2012-02-28.16}
+\def\texinfoversion{2012-03-11.15}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1372,7 +1372,13 @@
       \fi
     \fi
     \nextsp}
-  \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+  \def\getfilename#1{%
+    \filenamelength=0
+    % If we don't expand the argument now, \skipspaces will get
+    % snagged on things like "@value{foo}".
+    \edef\temp{#1}%
+    \expandafter\skipspaces\temp|\relax
+  }
   \ifnum\pdftexversion < 14
     \let \startlink \pdfannotlink
   \else
@@ -7853,6 +7859,7 @@
   \ifpdf
     {\indexnofonts
      \turnoffactive
+     \makevalueexpandable
      % This expands tokens, so do it after making catcode changes, so _
      % etc. don't get their TeX definitions.
      \getfilename{#4}%