texinfo update (Thu Feb 28 21:23:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- ChangeLog   29 Feb 2008 01:06:40 -0000      1.840
+++ ChangeLog   29 Feb 2008 02:06:13 -0000      1.841
@@ -1,5 +1,12 @@
 2008-02-28  Karl Berry  <address@hidden>
 
+       * doc/texinfo.tex (\includezzz): \edef the filename in order
+       to expand @value constructs (include-value).  This fix
+       from Joseph S. Myers, 1 Feb 2008 01:11:11.
+       Document that the \expandafter trickery is necessary in order to
+       read the file outside of a group (mac-incl).
+       This report from John Mandereau, 28 Feb 2008 22:12:34.
+
        * info/infodoc.c (info_internal_help_text): more tweaks.
        * info/infomap.c: move up/down to end, too.
        Suggestions from Benno Schulenberg, 27 Feb 2008 23:44:17
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- doc/texinfo.tex     15 Feb 2008 19:14:14 -0000      1.260
+++ doc/texinfo.tex     29 Feb 2008 02:06:14 -0000      1.261
@@ -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-02-15.11}
+\def\texinfoversion{2008-02-28.18}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -917,16 +917,20 @@
   \temp
 }
 
-% @include file    insert text of that file as input.
+% @include FILE -- \input text of FILE.
 %
 \def\include{\parseargusing\filenamecatcodes\includezzz}
 \def\includezzz#1{%
   \pushthisfilestack
   \def\thisfile{#1}%
   {%
-    \makevalueexpandable
-    \input #1
-  }%
+    \makevalueexpandable  % we want to expand any @value in FILE.  
+    \edef\temp{\noexpand\input #1 }%
+    %
+    % This trickery is to read FILE outside of a group, in case it makes
+    % definitions, etc.
+    \expandafter
+  }\temp
   \popthisfilestack
 }
 \def\filenamecatcodes{%
P ChangeLog
P doc/texinfo.tex