mirror of
https://github.com/mirror/make.git
synced 2025-01-30 14:20:14 +08:00
* texinfo.tex (\enddoublecolumns): Move \pagegoal reset to after
the \endgroup so we get the restored single-column \vsize as intended.
This commit is contained in:
parent
71aacd9fe0
commit
c0ec561e37
17
texinfo.tex
17
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{1998-12-20}%
|
\def\texinfoversion{1999-01-05}%
|
||||||
%
|
%
|
||||||
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
|
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
|
||||||
% Free Software Foundation, Inc.
|
% Free Software Foundation, Inc.
|
||||||
@ -2836,7 +2836,7 @@ width0pt\relax} \fi
|
|||||||
\unvbox255
|
\unvbox255
|
||||||
\kern-\topskip \kern\baselineskip
|
\kern-\topskip \kern\baselineskip
|
||||||
}}%
|
}}%
|
||||||
\eject
|
\eject % run that output routine to set \partialpage
|
||||||
%
|
%
|
||||||
% Use the double-column output routine for subsequent pages.
|
% Use the double-column output routine for subsequent pages.
|
||||||
\output = {\doublecolumnout}%
|
\output = {\doublecolumnout}%
|
||||||
@ -2897,7 +2897,7 @@ width0pt\relax} \fi
|
|||||||
}
|
}
|
||||||
\def\enddoublecolumns{%
|
\def\enddoublecolumns{%
|
||||||
\output = {%
|
\output = {%
|
||||||
% Split the last of the double-column material. Leave on the
|
% Split the last of the double-column material. Leave it on the
|
||||||
% current page, no automatic page break.
|
% current page, no automatic page break.
|
||||||
\balancecolumns
|
\balancecolumns
|
||||||
%
|
%
|
||||||
@ -2909,14 +2909,15 @@ width0pt\relax} \fi
|
|||||||
% called on to balance too much material, but if it is, this makes
|
% called on to balance too much material, but if it is, this makes
|
||||||
% the output somewhat more palatable.)
|
% the output somewhat more palatable.)
|
||||||
\global\output = {\onepageout{\pagecontents\PAGE}}%
|
\global\output = {\onepageout{\pagecontents\PAGE}}%
|
||||||
%
|
|
||||||
% \pagegoal was set to the doubled \vsize above, since we restarted
|
|
||||||
% the current page. We're now back to normal single-column
|
|
||||||
% typesetting, so reset \pagegoal to the normal \vsize.
|
|
||||||
\pagegoal = \vsize
|
|
||||||
}%
|
}%
|
||||||
\eject
|
\eject
|
||||||
\endgroup % started in \begindoublecolumns
|
\endgroup % started in \begindoublecolumns
|
||||||
|
%
|
||||||
|
% \pagegoal was set to the doubled \vsize above, since we restarted
|
||||||
|
% the current page. We're now back to normal single-column
|
||||||
|
% typesetting, so reset \pagegoal to the normal \vsize (after the
|
||||||
|
% \endgroup where \vsize got restored).
|
||||||
|
\pagegoal = \vsize
|
||||||
}
|
}
|
||||||
\def\balancecolumns{%
|
\def\balancecolumns{%
|
||||||
% Called at the end of the double column material.
|
% Called at the end of the double column material.
|
||||||
|
Loading…
Reference in New Issue
Block a user