mirror of
https://git.savannah.gnu.org/git/make.git
synced 2025-01-09 07:47:54 +00:00
(\onepageout): Leave only one line space above the footline, to be more
like plain. Suggested by Stephen Gildea. (\evenfootline): Left one too many line spaces here, so reduce by two. (\ifnottex): Another ignore command. (\ifnothtml,\ifnotinfo): New commands. (\doignore): Ignore brace characters, so mismatched braces in ignored text do not cause complaints.
This commit is contained in:
parent
c297b2fbd5
commit
132e0eda6c
1 changed files with 17 additions and 7 deletions
24
texinfo.tex
24
texinfo.tex
|
@ -189,7 +189,7 @@
|
||||||
% Only leave this space if the footline is nonempty.
|
% Only leave this space if the footline is nonempty.
|
||||||
% (We lessened \vsize for it in \oddfootingxxx.)
|
% (We lessened \vsize for it in \oddfootingxxx.)
|
||||||
% The \baselineskip=24pt in plain's \makefootline has no effect.
|
% The \baselineskip=24pt in plain's \makefootline has no effect.
|
||||||
\vskip 2\baselineskip
|
\vskip\baselineskip
|
||||||
\unvbox\footlinebox
|
\unvbox\footlinebox
|
||||||
\fi
|
\fi
|
||||||
%
|
%
|
||||||
|
@ -735,10 +735,11 @@ where each line of input produces a line of output.}
|
||||||
%
|
%
|
||||||
\def\ignore{\doignore{ignore}}
|
\def\ignore{\doignore{ignore}}
|
||||||
|
|
||||||
% Also ignore @ifinfo, @ifhtml, @html, @menu, and @direntry text.
|
% Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text.
|
||||||
%
|
%
|
||||||
\def\ifinfo{\doignore{ifinfo}}
|
\def\ifinfo{\doignore{ifinfo}}
|
||||||
\def\ifhtml{\doignore{ifhtml}}
|
\def\ifhtml{\doignore{ifhtml}}
|
||||||
|
\def\ifnottex{\doignore{ifnottex}}
|
||||||
\def\html{\doignore{html}}
|
\def\html{\doignore{html}}
|
||||||
\def\menu{\doignore{menu}}
|
\def\menu{\doignore{menu}}
|
||||||
\def\direntry{\doignore{direntry}}
|
\def\direntry{\doignore{direntry}}
|
||||||
|
@ -765,6 +766,10 @@ where each line of input produces a line of output.}
|
||||||
% Make sure that spaces turn into tokens that match what \doignoretext wants.
|
% Make sure that spaces turn into tokens that match what \doignoretext wants.
|
||||||
\catcode32 = 10
|
\catcode32 = 10
|
||||||
%
|
%
|
||||||
|
% Ignore braces, too, so mismatched braces don't cause trouble.
|
||||||
|
\catcode`\{ = 9
|
||||||
|
\catcode`\} = 9
|
||||||
|
%
|
||||||
% And now expand that command.
|
% And now expand that command.
|
||||||
\doignoretext
|
\doignoretext
|
||||||
}
|
}
|
||||||
|
@ -856,7 +861,7 @@ where each line of input produces a line of output.}
|
||||||
\pretolerance = 10000
|
\pretolerance = 10000
|
||||||
%
|
%
|
||||||
% Do not execute instructions in @tex
|
% Do not execute instructions in @tex
|
||||||
\def\tex{\doignore{tex}}
|
\def\tex{\doignore{tex}}%
|
||||||
}
|
}
|
||||||
|
|
||||||
% @set VAR sets the variable VAR to an empty value.
|
% @set VAR sets the variable VAR to an empty value.
|
||||||
|
@ -932,11 +937,16 @@ where each line of input produces a line of output.}
|
||||||
\def\ifclearfail{\nestedignore{ifclear}}
|
\def\ifclearfail{\nestedignore{ifclear}}
|
||||||
\defineunmatchedend{ifclear}
|
\defineunmatchedend{ifclear}
|
||||||
|
|
||||||
% @iftex always succeeds; we read the text following, through @end
|
% @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text
|
||||||
% iftex). But `@end iftex' should be valid only after an @iftex.
|
% following, through the first @end iftex (etc.). Make `@end iftex'
|
||||||
|
% (etc.) valid only after an @iftex.
|
||||||
%
|
%
|
||||||
\def\iftex{\conditionalsucceed{iftex}}
|
\def\iftex{\conditionalsucceed{iftex}}
|
||||||
|
\def\ifnothtml{\conditionalsucceed{ifnothtml}}
|
||||||
|
\def\ifnotinfo{\conditionalsucceed{ifnotinfo}}
|
||||||
\defineunmatchedend{iftex}
|
\defineunmatchedend{iftex}
|
||||||
|
\defineunmatchedend{ifnothtml}
|
||||||
|
\defineunmatchedend{ifnotinfo}
|
||||||
|
|
||||||
% We can't just want to start a group at @iftex (for example) and end it
|
% We can't just want to start a group at @iftex (for example) and end it
|
||||||
% at @end iftex, since then @set commands inside the conditional have no
|
% at @end iftex, since then @set commands inside the conditional have no
|
||||||
|
@ -1531,8 +1541,8 @@ where each line of input produces a line of output.}
|
||||||
%
|
%
|
||||||
% Leave some space for the footline. Hopefully ok to assume
|
% Leave some space for the footline. Hopefully ok to assume
|
||||||
% @evenfooting will not be used by itself.
|
% @evenfooting will not be used by itself.
|
||||||
\global\advance\pageheight by -3\baselineskip
|
\global\advance\pageheight by -\baselineskip
|
||||||
\global\advance\vsize by -3\baselineskip
|
\global\advance\vsize by -\baselineskip
|
||||||
}
|
}
|
||||||
|
|
||||||
\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
|
\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
|
||||||
|
|
Loading…
Reference in a new issue