[7684] reduce \vsize in \begindoublecolumns

[gavinsmith0123]

Revision: 7684
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7684
Author:   gavin
Date:     2017-03-07 15:05:47 -0500 (Tue, 07 Mar 2017)
Log Message:
-----------
reduce \vsize in \begindoublecolumns

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-03-07 19:42:00 UTC (rev 7683)
+++ trunk/ChangeLog     2017-03-07 20:05:47 UTC (rev 7684)
@@ -1,3 +1,24 @@
+2017-03-07  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\begindoublecolumns): Reduce \vsize to
+       account for what has appeared on the page so far.
+       (\doublecolumnout): Do not subtract the height of what has
+       appeared on the page so far before dividing \vsize in two.
+       Add it back on again before exiting the output routine.
+       (\enddoublecolumns): Restore \vsize from \txipageheight.
+
+       This fixes a problem with the formatting when the index material 
+       would not fit on the page after the partial page, but there was
+       not enough of it to make the output routine (\doublecolumnout)
+       fire before the output routine was changed to \balancecolumns.
+       Hence \balancecolumns was caused to balance too much material 
+       and would output a box that was too tall for the page.
+
+2017-03-07  Gavin Smith  <address@hidden>
+
+       * doc/texinfo-tex-test.texi (Medium length index): New test
+       of index formatting.
+
 2017-03-06  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex (\doublecolumnout, \balancecolumns):

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2017-03-07 19:42:00 UTC (rev 7683)
+++ trunk/doc/texinfo.tex       2017-03-07 20:05:47 UTC (rev 7684)
@@ -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{2017-03-06.19}
+\def\texinfoversion{2017-03-07.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5888,8 +5888,8 @@
     \divide\doublecolumnhsize by 2
   \hsize = \doublecolumnhsize
   %
-  % Double the \vsize as well.  (We don't need a separate register here,
-  % since nobody clobbers \vsize.)
+  % Double the \vsize as well.
+  \advance\vsize by -\ht\partialpage
   \vsize = 2\vsize
   %
   % For the benefit of balancing columns
@@ -5907,10 +5907,10 @@
   % previous page.
   \dimen@ = \vsize
   \divide\dimen@ by 2
-  \advance\dimen@ by -\ht\partialpage
   %
   % box0 will be the left-hand column, box2 the right.
   \setbox0=\vsplit\PAGE to\dimen@ \setbox2=\vsplit\PAGE to\dimen@
+  \global\advance\vsize by 2\ht\partialpage
   \onepageout\pagesofar
   \unvbox\PAGE
   \penalty\outputpenalty
@@ -5976,9 +5976,9 @@
   %
   % \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
+  % typesetting, so reset \pagegoal to the normal \vsize.
+  \global\vsize = \txipageheight %
+  \pagegoal = \txipageheight %
 }
 \newbox\balancedcolumns
 \setbox\balancedcolumns=\vbox{shouldnt see this}%