[7306] remove \doublecolumntopgap dimen

[gavinsmith0123]

Revision: 7306
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7306
Author:   gavin
Date:     2016-08-06 20:16:05 +0000 (Sat, 06 Aug 2016)
Log Message:
-----------
remove \doublecolumntopgap dimen

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-08-06 12:49:21 UTC (rev 7305)
+++ trunk/ChangeLog     2016-08-06 20:16:05 UTC (rev 7306)
@@ -1,5 +1,17 @@
 2016-08-06  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\doublecolumntopgap, \pagesofar)
+       (\begindoublecolumns): Remove use of \doublecolumntopgap 
+       dimension.
+       (\begindoublecolumns): Don't touch \topskip or alter \vsize 
+       other than doubling it.
+       (\balancecolumns): Use a different height for boxes when 
+       splitting double column material roughly in two.
+       * doc/texinfo-tex-test.texi (Final page of index hard to balance):
+       Update so that test works properly.
+
+2016-08-06  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\entry): Remove stretch added before entry 
        here.
        (\begindoublecolumns): Put stretch into \baselineskip, so it can
@@ -113,7 +125,7 @@
        Compare heights of columns differently.  When not making the 
        bottoms of the two columns flush, use the obtained height of the 
        taller left column for the height of both columns.  (Otherwise, 
-       an overful column box could overlap material below.  An example 
+       an overful column box could overlap material below.)  An example
        of broken formatting due to this was reported in the AucTeX manual
        by Arash Esbati.
        Change some comments and edit for clarity.

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2016-08-06 12:49:21 UTC (rev 7305)
+++ trunk/doc/texinfo-tex-test.texi     2016-08-06 20:16:05 UTC (rev 7306)
@@ -429,6 +429,13 @@
 \entry {Programming, glyphs for}{119}
 \entry {Pronunciation of Texinfo}{3}
 \entry {Prototype row, column widths defined by}{93}
+\entry {Ragged left, without filling}{83}
+\entry {Ragged right, with filling}{84}
+\entry {Ragged right, without filling}{83}
+\entry {Raising and lowering sections}{51}
+\entry {Raw formatter commands}{146}
+\entry {Raw HTML}{213}
+\entry {raw text output}{188}
 \initial {Q}
 \entry {Quotation characters (`'), in source}{114}
 \entry {Quotation marks, French}{115}
@@ -439,13 +446,6 @@
 \entry {Quote characters, inserting}{110}
 \entry {Quoting, automatic for some macros}{156}
 \initial {R}
-\entry {Ragged left, without filling}{83}
-\entry {Ragged right, with filling}{84}
-\entry {Ragged right, without filling}{83}
-\entry {Raising and lowering sections}{51}
-\entry {Raw formatter commands}{146}
-\entry {Raw HTML}{213}
-\entry {raw text output}{188}
 \entry {RCS $Id}{253}
 \entry {Recommended names for keys}{69}
 \entry {Rectangle, black in hardcopy}{174}

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-08-06 12:49:21 UTC (rev 7305)
+++ trunk/doc/texinfo.tex       2016-08-06 20:16:05 UTC (rev 7306)
@@ -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{2016-08-06.12}
+\def\texinfoversion{2016-08-06.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5834,8 +5834,6 @@
 
 \newbox\partialpage
 \newdimen\doublecolumnhsize
-\newdimen\doublecolumntopgap
-\doublecolumntopgap = 0pt
 
 % Use inside an output routine to save \topmark and \firstmark
 \def\savemarks{%
@@ -5918,11 +5916,7 @@
   %
   % Double the \vsize as well.  (We don't need a separate register here,
   % since nobody clobbers \vsize.)
-  \global\doublecolumntopgap = \topskip
-  \global\advance\doublecolumntopgap by -1\baselineskip
-  \advance\vsize by -1\doublecolumntopgap
   \vsize = 2\vsize
-  \topskip=0pt
   %
   % For the benefit of balancing columns
   \advance\baselineskip by 0pt plus 0.5pt
@@ -5955,9 +5949,7 @@
   %
   \hsize = \doublecolumnhsize
   \wd0=\hsize \wd2=\hsize
-  \vbox{%
-    \vskip\doublecolumntopgap
-    \hbox to\txipagewidth{\box0\hfil\box2}}%
+  \hbox to\txipagewidth{\box0\hfil\box2}%
 }
 
 
@@ -6053,8 +6045,8 @@
       % Just split the last of the double column material roughly in half.
       \setbox2=\box0
       \setbox0 = \vsplit2 to address@hidden
-      \setbox0=\vbox to\ht2{\unvbox0\vfill}%
-      \setbox2=\vbox to\ht2{\unvbox2\vfill}%
+      \setbox0=\vbox to address@hidden {\unvbox0\vfill}%
+      \setbox2=\vbox to address@hidden {\unvbox2\vfill}%
     \else
       % Compare the heights of the two columns.
       \ifdim4\ht1>5\ht3