[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Further @include @value texinfo.tex fix
From: |
Joseph S. Myers |
Subject: |
Further @include @value texinfo.tex fix |
Date: |
Tue, 4 Mar 2008 22:48:40 +0000 (UTC) |
Further to my previous fix to texinfo.tex for @include @value
<http://lists.gnu.org/archive/html/bug-texinfo/2008-02/msg00000.html>, it
turns out there's still a problem if the expanded value contains the
character '+' (and probably other special characters). The use of
\filenamecatcodes only suffices for characters directly on the @include
line, since the @set argument will previously have been parsed with + and
other characters active. Thus \turnoffactive is needed so that the active
characters from the @value expansion just expand to themselves rather than
to more complicated expansions suitable for printing but not for file
names. I propose this patch. (For the testcase, see my previous message,
and change the include directory name to something like "i+d".)
2008-03-04 Joseph Myers <address@hidden>
* doc/texinfo.tex (\includezzz): Use \turnoffactive before
expanding @value.
--- texinfo.tex.orig 2008-03-04 22:24:15.000000000 +0000
+++ texinfo.tex 2008-03-04 22:38:43.000000000 +0000
@@ -925,6 +925,7 @@
\def\thisfile{#1}%
{%
\makevalueexpandable % we want to expand any @value in FILE.
+ \turnoffactive % But allow special characters in the expansion.
\edef\temp{\noexpand\input #1 }%
%
% This trickery is to read FILE outside of a group, in case it makes
--
Joseph S. Myers
address@hidden
- Further @include @value texinfo.tex fix,
Joseph S. Myers <=