summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorJohn Mandereau <john.mandereau@gmail.com>2008-02-29 12:28:47 +0100
committerJohn Mandereau <john.mandereau@gmail.com>2008-02-29 12:28:47 +0100
commitbf2e5070a301fa2596a6ff32909841d4914aee56 (patch)
treec3f87c977016eaa3fd85e3a5e87d54e43712dcb1 /tex
parent48e61849cad1130931855563750b7a6543cf43b7 (diff)
Update texinfo.tex from Texinfo CVS (again)
This fix PDF docs compilation failure with previous texinfo.tex revision.
Diffstat (limited to 'tex')
-rw-r--r--tex/texinfo.tex14
1 files changed, 9 insertions, 5 deletions
diff --git a/tex/texinfo.tex b/tex/texinfo.tex
index da91e69acd..736cc48e26 100644
--- a/tex/texinfo.tex
+++ b/tex/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{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 @@ where each line of input produces a line of output.}
\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{%