X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Ftexinfo.tex;h=f4e638f598b51b97915f1c1bdbb5dfdca3983785;hb=9df4453b386268b137f71b0e9548f67e03565dd4;hp=cc761b459808a20edf41da3675418399ce3088d0;hpb=3dcbb359e857b2e7645d0ad33eb0ad9fbee02a16;p=gnulib.git

diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index cc761b459..f4e638f59 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -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{2005-07-01.11}
+\def\texinfoversion{2005-08-07.06}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
@@ -3249,7 +3249,6 @@ where each line of input produces a line of output.}
 % Called from \indexdummies and \atdummies.
 %
 \def\commondummies{%
-  \normalturnoffactive
   %
   % \definedummyword defines \#1 as \string\#1\space, thus effectively
   % preventing its expansion.  This is used only for control% words,
@@ -3319,15 +3318,14 @@ where each line of input produces a line of output.}
   \definedummyword\print
   \definedummyword\result
   %
+  % We want to disable all macros so that they are not expanded by \write.
+  \macrolist
+  %
+  \normalturnoffactive
+  %
   % Handle some cases of @value -- where it does not contain any
   % (non-fully-expandable) commands.
   \makevalueexpandable
-  %
-  % Normal spaces, not active ones.
-  \unsepspaces
-  %
-  % We want to disable all macros so that they are not expanded by \write.
-  \macrolist
 }
 
 % \commondummiesnofonts: common to \commondummies and \indexnofonts.
@@ -3380,6 +3378,8 @@ where each line of input produces a line of output.}
     \definedummyword\key
     \definedummyword\math
     \definedummyword\option
+    \definedummyword\pxref
+    \definedummyword\ref
     \definedummyword\samp
     \definedummyword\strong
     \definedummyword\tie
@@ -3388,6 +3388,7 @@ where each line of input produces a line of output.}
     \definedummyword\var
     \definedummyword\verb
     \definedummyword\w
+    \definedummyword\xref
   }
 }
 
@@ -6671,6 +6672,7 @@ where each line of input produces a line of output.}
       % caption if specified, else the full caption if specified, else nothing.
       {%
         \atdummies
+        %
         % since we read the caption text in the macro world, where ^^M
         % is turned into a normal character, we have to scan it back, so
         % we don't write the literal three characters "^^M" into the aux file.
@@ -6691,8 +6693,9 @@ where each line of input produces a line of output.}
   %
   % place the captured inserts
   %
-  % BEWARE: when the floats start float, we have to issue warning whenever an
-  % insert appears inside a float which could possibly float. --kasal, 26may04
+  % BEWARE: when the floats start floating, we have to issue warning
+  % whenever an insert appears inside a float which could possibly
+  % float. --kasal, 26may04
   %
   \checkinserts
 }