summaryrefslogtreecommitdiff
path: root/doc/misc/texinfo.tex
diff options
context:
space:
mode:
Diffstat (limited to 'doc/misc/texinfo.tex')
-rw-r--r--doc/misc/texinfo.tex20
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 0ad0e85a005..0f301a2a716 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/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{2015-12-20.12}
+\def\texinfoversion{2015-12-17.20}
%
% Copyright 1985-1986, 1988, 1990-2016 Free Software Foundation, Inc.
%
@@ -5407,9 +5407,6 @@ end
}
\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
- % If not much space left on page, start a new page.
- \ifdim\pagetotal>0.8\vsize\vfill\eject\fi
- %
% Grab any single-column material above us.
\output = {%
%
@@ -5467,7 +5464,7 @@ end
% since nobody clobbers \vsize.)
\global\doublecolumntopgap = \topskip
\global\advance\doublecolumntopgap by -1\baselineskip
- \advance\vsize by -1\doublecolumntopgap
+ \global\advance\vsize by -1\doublecolumntopgap
\vsize = 2\vsize
\topskip=0pt
\global\entrylinedepth=0pt\relax
@@ -5537,20 +5534,23 @@ end
\penalty0
%
\output = {%
- % Split the last of the double-column material.
+ % Split the last of the double-column material. Leave it on the
+ % current page, no automatic page break.
\savemarks
\balancecolumns
%
- % Having called \balancecolumns once, we do not
+ % If we end up splitting too much material for the current page,
+ % though, there will be another page break right after this \output
+ % invocation ends. Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
- % definition right away.
+ % definition right away. (We hope \balancecolumns will never be
+ % called on to balance too much material, but if it is, this makes
+ % the output somewhat more palatable.)
\global\output = {\onepageout{\pagecontents\PAGE}}%
}%
\eject
\endgroup % started in \begindoublecolumns
\restoremarks
- % Leave the double-column material on the current page, no automatic
- % page break.
\box\balancedcolumns
%
% \pagegoal was set to the doubled \vsize above, since we restarted