texinfo update (Mon Mar 17 14:23:01 EDT 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.858
retrieving revision 1.859
diff -u -r1.858 -r1.859
--- ChangeLog   15 Mar 2008 00:27:57 -0000      1.858
+++ ChangeLog   17 Mar 2008 17:56:35 -0000      1.859
@@ -1,3 +1,9 @@
+2008-03-17  Karl Berry  <address@hidden>
+
+       * texinfo.tex (\xrefX): avoid TeX expansions of _ etc.
+       in the info filename argument (#4).
+       Report from Ralf Wildenhues, 15 Mar 2008 11:23:38.
+
 2008-03-14  Karl Berry  <address@hidden>
 
        * pretest 4.11.94.
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- doc/texinfo.tex     7 Mar 2008 18:23:05 -0000       1.262
+++ doc/texinfo.tex     17 Mar 2008 17:56:35 -0000      1.263
@@ -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{2008-03-07.10}
+\def\texinfoversion{2008-03-17.10}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -6967,20 +6967,22 @@
   %
   % Make link in pdf output.
   \ifpdf
-    \leavevmode
-    \getfilename{#4}%
     {\indexnofonts
      \turnoffactive
+     % This expands tokens, so do it after making catcode changes, so _
+     % etc. don't get their TeX definitions.
+     \getfilename{#4}%
+     %
      % See comments at \activebackslashdouble.
      {\activebackslashdouble \xdef\pdfxrefdest{#1}%
       \backslashparens\pdfxrefdest}%
      %
+     \leavevmode
+     \startlink attr{/Border [0 0 0]}%
      \ifnum\filenamelength>0
-       \startlink attr{/Border [0 0 0]}%
-         goto file{\the\filename.pdf} name{\pdfxrefdest}%
+       goto file{\the\filename.pdf} name{\pdfxrefdest}%
      \else
-       \startlink attr{/Border [0 0 0]}%
-         goto name{\pdfmkpgn{\pdfxrefdest}}%
+       goto name{\pdfmkpgn{\pdfxrefdest}}%
      \fi
     }%
     \setcolor{\linkcolor}%
P ChangeLog
P doc/texinfo.tex