From d995398d42b9a278b9e23d7fceeb897b2d1d51d3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Oct 2005 13:08:11 +0000 Subject: [PATCH] update from texinfo --- build-aux/texinfo.tex | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index dd253a14c..236ad20a9 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-08-15.08} +\def\texinfoversion{2005-10-09.06} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software @@ -2963,8 +2963,12 @@ where each line of input produces a line of output.} % #1 contains the command name as a string, e.g., `ifinfo'. % % Define a command to find the next `@end #1', which must be on a line - % by itself. - \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}% + % by itself. Ignore anything after the `#1'; this matters in + % verbatim environments, where otherwise the newline after an + % ignored conditional would result in a blank line in the output. + \long\def\doignoretext##1^^M@end #1##2^^M{% + \doignoretextyyy##1^^M@#1\_STOP_}% + % % And this command to find another #1 command, at the beginning of a % line. (Otherwise, we would consider a line `@c @ifset', for % example, to count as an @ifset for nesting.) @@ -7103,7 +7107,7 @@ should work if nowhere else does.} \def\otherifyactive{\catcode`+=\other \catcode`\_=\other} % Same as @turnoffactive below, but backslash retains it's normal definition. -% (Before 2004-08-15, this macro explicitly assigned @let\=@normalbackslash, +% (Before 2005-08-15, this macro explicitly assigned @let\=@normalbackslash, % but it doesn't seem to be necessary. --kasal) \def\normalturnoffactive{% \let"=\normaldoublequote -- 2.11.0