From 18d702335dae2441737ef5745ec194c56125d9bc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Dec 2005 00:23:59 +0000 Subject: [PATCH] update from texinfo --- build-aux/texinfo.tex | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index da2d3a829..e81cd2e34 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-10-10.17} +\def\texinfoversion{2005-12-25.16} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software @@ -1385,9 +1385,17 @@ where each line of input produces a line of output.} \else \let \startlink \pdfstartlink \fi + % make a live url in pdf output. \def\pdfurl#1{% \begingroup - \normalturnoffactive\def\@{@}% + % it seems we really need yet another set of dummies; have not + % tried to figure out what each command should do in the context + % of @url. for now, just make @/ a no-op, that's the only one + % people have actually reported a problem with. + % + \normalturnoffactive + \def\@{@}% + \let\/=\empty \makevalueexpandable \leavevmode\Red \startlink attr{/Border [0 0 0]}% @@ -2963,8 +2971,11 @@ 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.) @@ -7102,7 +7113,7 @@ should work if nowhere else does.} % \otherifyactive is called near the end of this file. \def\otherifyactive{\catcode`+=\other \catcode`\_=\other} -% Same as @turnoffactive below, but backslash retains it's normal definition. +% Same as @turnoffactive below, but backslash retains its normal definition. % (Before 2005-08-15, this macro explicitly assigned @let\=@normalbackslash, % but it doesn't seem to be necessary. --kasal) \def\normalturnoffactive{% -- 2.11.0