mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2025-02-06 20:42:58 +00:00
* texinfo.tex (\scanmacro): Use \endinput to avoid spurious space,
and various other space fixes. From: Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de>.
This commit is contained in:
parent
3634e15fe3
commit
281cdd5d74
1 changed files with 11 additions and 10 deletions
21
texinfo.tex
21
texinfo.tex
|
@ -3,7 +3,7 @@
|
||||||
% Load plain if necessary, i.e., if running under initex.
|
% Load plain if necessary, i.e., if running under initex.
|
||||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||||
%
|
%
|
||||||
\def\texinfoversion{1999-02-04}%
|
\def\texinfoversion{1999-02-08}%
|
||||||
%
|
%
|
||||||
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
|
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
|
||||||
% Free Software Foundation, Inc.
|
% Free Software Foundation, Inc.
|
||||||
|
@ -132,9 +132,9 @@
|
||||||
\ifx\putwordDefivar\undefined \gdef\putwordDefivar{Instance Variable}\fi
|
\ifx\putwordDefivar\undefined \gdef\putwordDefivar{Instance Variable}\fi
|
||||||
\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi
|
\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi
|
||||||
\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
|
\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
|
||||||
\ifx\putwordDeftypevar\undefined \gdef\putwordDeftypevar{Variable}\fi
|
\ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi
|
||||||
\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
|
\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
|
||||||
\ifx\putwordDeftypefun\undefined \gdef\putwordDeftypefun{Function}\fi
|
\ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi
|
||||||
|
|
||||||
% Ignore a token.
|
% Ignore a token.
|
||||||
%
|
%
|
||||||
|
@ -4521,7 +4521,8 @@ width0pt\relax} \fi
|
||||||
\begingroup \newlinechar`\^^M
|
\begingroup \newlinechar`\^^M
|
||||||
% Undo catcode changes of \startcontents and \doprintindex
|
% Undo catcode changes of \startcontents and \doprintindex
|
||||||
\catcode`\@=0 \catcode`\\=12 \escapechar=`\@
|
\catcode`\@=0 \catcode`\\=12 \escapechar=`\@
|
||||||
\toks0={#1}%
|
% Append \endinput to make sure that TeX does not see the ending newline.
|
||||||
|
\toks0={#1\endinput}%
|
||||||
\immediate\openout\macscribble=\jobname.tmp
|
\immediate\openout\macscribble=\jobname.tmp
|
||||||
\immediate\write\macscribble{\the\toks0}%
|
\immediate\write\macscribble{\the\toks0}%
|
||||||
\immediate\closeout\macscribble
|
\immediate\closeout\macscribble
|
||||||
|
@ -4534,7 +4535,7 @@ width0pt\relax} \fi
|
||||||
\begingroup \newlinechar`\^^M
|
\begingroup \newlinechar`\^^M
|
||||||
% Undo catcode changes of \startcontents and \doprintindex
|
% Undo catcode changes of \startcontents and \doprintindex
|
||||||
\catcode`\@=0 \catcode`\\=12 \escapechar=`\@
|
\catcode`\@=0 \catcode`\\=12 \escapechar=`\@
|
||||||
\let\xeatspaces\eatspaces\scantokens{#1}\endgroup}
|
\let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup}
|
||||||
\fi
|
\fi
|
||||||
|
|
||||||
\newcount\paramno % Count of parameters
|
\newcount\paramno % Count of parameters
|
||||||
|
@ -4648,7 +4649,7 @@ width0pt\relax} \fi
|
||||||
\global\expandafter\let \csname ismacro.#1\endcsname=0%
|
\global\expandafter\let \csname ismacro.#1\endcsname=0%
|
||||||
% Remove the macro name from \macrolist
|
% Remove the macro name from \macrolist
|
||||||
\begingroup
|
\begingroup
|
||||||
\edef\tempa{\expandafter\noexpand\csname#1\endcsname}
|
\edef\tempa{\expandafter\noexpand\csname#1\endcsname}%
|
||||||
\def\do##1{%
|
\def\do##1{%
|
||||||
\def\tempb{##1}%
|
\def\tempb{##1}%
|
||||||
\ifx\tempa\tempb
|
\ifx\tempa\tempb
|
||||||
|
@ -4656,7 +4657,7 @@ width0pt\relax} \fi
|
||||||
\else
|
\else
|
||||||
\toks0 = \expandafter{\newmacrolist\do}%
|
\toks0 = \expandafter{\newmacrolist\do}%
|
||||||
\edef\newmacrolist{\the\toks0\expandafter\noexpand\tempa}%
|
\edef\newmacrolist{\the\toks0\expandafter\noexpand\tempa}%
|
||||||
\fi}
|
\fi}%
|
||||||
\def\newmacrolist{}%
|
\def\newmacrolist{}%
|
||||||
% Execute macro list to define \newmacrolist
|
% Execute macro list to define \newmacrolist
|
||||||
\macrolist
|
\macrolist
|
||||||
|
@ -4729,7 +4730,7 @@ width0pt\relax} \fi
|
||||||
\else % many
|
\else % many
|
||||||
\expandafter\xdef\csname\the\macname\endcsname{%
|
\expandafter\xdef\csname\the\macname\endcsname{%
|
||||||
\bgroup\noexpand\macroargctxt
|
\bgroup\noexpand\macroargctxt
|
||||||
\noexpand\csname\the\macname xx\endcsname}
|
\noexpand\csname\the\macname xx\endcsname}%
|
||||||
\expandafter\xdef\csname\the\macname xx\endcsname##1{%
|
\expandafter\xdef\csname\the\macname xx\endcsname##1{%
|
||||||
\expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
|
\expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
|
||||||
\expandafter\expandafter
|
\expandafter\expandafter
|
||||||
|
@ -4756,7 +4757,7 @@ width0pt\relax} \fi
|
||||||
\else % many
|
\else % many
|
||||||
\expandafter\xdef\csname\the\macname\endcsname{%
|
\expandafter\xdef\csname\the\macname\endcsname{%
|
||||||
\bgroup\noexpand\macroargctxt
|
\bgroup\noexpand\macroargctxt
|
||||||
\expandafter\noexpand\csname\the\macname xx\endcsname}
|
\expandafter\noexpand\csname\the\macname xx\endcsname}%
|
||||||
\expandafter\xdef\csname\the\macname xx\endcsname##1{%
|
\expandafter\xdef\csname\the\macname xx\endcsname##1{%
|
||||||
\expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
|
\expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
|
||||||
\expandafter\expandafter
|
\expandafter\expandafter
|
||||||
|
@ -4843,7 +4844,7 @@ width0pt\relax} \fi
|
||||||
\indexdummies
|
\indexdummies
|
||||||
\dosetq{#1-title}{Ytitle}%
|
\dosetq{#1-title}{Ytitle}%
|
||||||
\dosetq{#1-pg}{Ypagenumber}%
|
\dosetq{#1-pg}{Ypagenumber}%
|
||||||
\dosetq{#1-snt}{#2}
|
\dosetq{#1-snt}{#2}%
|
||||||
}}
|
}}
|
||||||
|
|
||||||
% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
|
% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
|
||||||
|
|
Loading…
Reference in a new issue