gnulib: build-aux/texinfo.tex comparison

comparison build-aux/texinfo.tex @ 18260:18755f45b6ca

update from texinfo

author	Karl Berry <karl@freefriends.org>
date	Sun, 06 Mar 2016 09:24:46 -0800
parents	21a53f24c390
children	6ecf8487ba63

comparison

equal deleted inserted replaced

-:04cddb00b2c9
+:18755f45b6ca
 % texinfo.tex -- TeX macros to handle Texinfo files.
 %
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2016-02-22.15}
+\def\texinfoversion{2016-03-05.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
 % 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
 % Free Software Foundation, Inc.
 % Used at the time of macro expansion.
 % Argument is macro body with arguments substituted
 \def\scanmacro#1{%
 \newlinechar`\^^M
-\def\xprocessmacroarg{\eatspaces}%
+\def\xeatspaces{\eatspaces}%
 %
 % Process the macro body under the current catcode regime.
 \scantokens{#1\texinfoc}\aftermacro%
 %
 % The \c is to remove the \newlinechar added by \scantokens, and
 %
 \def\parsemargdef#1;{%
 \paramno=0\def\paramlist{}%
 \let\hash\relax
 % \hash is redefined to `#' later to get it into definitions
-\let\processmacroarg\relax
+\let\xeatspaces\relax
 \parsemargdefxxx#1,;,%
 \ifnum\paramno<10\relax\else
 \paramno0\relax
 \parsemmanyargdef@@#1,;,% 10 or more arguments
 \fi
 \def\parsemargdefxxx#1,{%
 \if#1;\let\next=\relax
 \else \let\next=\parsemargdefxxx
 \advance\paramno by 1
 \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-{\processmacroarg{\hash\the\paramno}}%
+{\xeatspaces{\hash\the\paramno}}%
 \edef\paramlist{\paramlist\hash\the\paramno,}%
 \fi\next}
 % \parsemacbody, \parsermacbody
 %
 %%%%%%%%%%%%%% End of code for > 10 arguments %%%%%%%%%%%%%%%%%%
-% Remove following spaces at the expansion stage.
-% This works because spaces are discarded before each argument when TeX is
-% getting the arguments for a macro.
-% This must not be immediately followed by a }.
-\long\def\gobblespaces#1{#1}
 % This defines a Texinfo @macro or @rmacro, called by \parsemacbody.
 %    \macrobody has the body of the macro in it, with placeholders for
-% its parameters, looking like "\processmacroarg{\hash 1}".
+% its parameters, looking like "\xeatspaces{\hash 1}".
 %    \paramno is the number of parameters
 %    \paramlist is a TeX parameter text, e.g. "#1,#2,#3,"
 % There are eight cases: recursive and nonrecursive macros of zero, one,
 % up to nine, and many arguments.
 % \xdef is used so that macro definitions will survive the file
 % they're defined in: @include reads the file inside a group.
 %
 \def\defmacro{%
 \let\hash=##% convert placeholders to macro parameter chars
 \ifnum\paramno=1
-\def\processmacroarg{\gobblespaces}%
+\def\xeatspaces##1{##1}%
 % This removes the pair of braces around the argument.  We don't
 % use \eatspaces, because this can cause ends of lines to be lost
 % when the argument to \eatspaces is read, leading to line-based
 % commands like "@itemize" not being read correctly.
 \else
-\def\processmacroarg{\xprocessmacroarg}%
+\let\xeatspaces\relax % suppress expansion
-\let\xprocessmacroarg\relax
 \fi
 \ifrecursive   %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ifcase\paramno
 % 0
 \expandafter\xdef\csname\the\macname\endcsname{%
 \expandafter\xdef\csname\the\macname\endcsname{%
 \bgroup
 \noexpand\braceorline
 \expandafter\noexpand\csname\the\macname @@@\endcsname}%
 \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
-\expandafter\noexpand\csname\the\macname @@@@\endcsname{%
+\egroup
-\noexpand\gobblespaces##1\empty}%
+\noexpand\scanmacro{\macrobody}%
-% The \empty is for \gobblespaces in case #1 is empty
+}%
-}%
-\expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
-\egroup\noexpand\scanmacro{\macrobody}}%
 \else
 \ifnum\paramno<10\relax % at most 9
 % See non-recursive section below for comments
 \expandafter\xdef\csname\the\macname\endcsname{%
 \bgroup
 \expandafter\xdef\csname\the\macname\endcsname{%
 \bgroup
 \noexpand\braceorline
 \expandafter\noexpand\csname\the\macname @@@\endcsname}%
 \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
-\expandafter\noexpand\csname\the\macname @@@@\endcsname{%
-\noexpand\gobblespaces##1\empty}%
-% The \empty is for \gobblespaces in case #1 is empty
-}%
-\expandafter\xdef\csname\the\macname @@@@\endcsname##1{%
 \egroup
 \noexpand\scanmacro{\macrobody}%
 }%
 \else % at most 9
 \ifnum\paramno<10\relax

Mercurial > gnulib

comparison build-aux/texinfo.tex @ 18260:18755f45b6ca