[6590] fix display of short index column, broken recently

[Gavin D. Smith]

Revision: 6590
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6590
Author:   gavin
Date:     2015-08-31 14:51:50 +0000 (Mon, 31 Aug 2015)
Log Message:
-----------
fix display of short index column, broken recently

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-30 22:11:12 UTC (rev 6589)
+++ trunk/ChangeLog     2015-08-31 14:51:50 UTC (rev 6590)
@@ -1,3 +1,9 @@
+2015-08-31  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\balancecolumns): Fix case of short final 
+       column which we don't try to break.
+       * NEWS: Mention a change to index formatting.
+
 2015-08-30  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex (\initialfonts, \initialglyphs): Rename, and 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2015-08-30 22:11:12 UTC (rev 6589)
+++ trunk/NEWS  2015-08-31 14:51:50 UTC (rev 6590)
@@ -38,6 +38,8 @@
   . For initials in indices that are non-alphanumeric characters (for
     example, backslash, or braces), avoid use of a typewriter font.  
     This gives a more consistent appearance.
+  . Have a stronger preference for breaking a column in an index before
+    a letter heading.
 
 * makeinfo
   . Some Perl modules have been rewritten in C to increase speed.

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-08-30 22:11:12 UTC (rev 6589)
+++ trunk/doc/texinfo.tex       2015-08-31 14:51:50 UTC (rev 6590)
@@ -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-08-31.00}
+\def\texinfoversion{2015-08-31.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5352,9 +5352,6 @@
   \advance\dimen@ by-\baselineskip
   \ifdim\dimen@<14\baselineskip
     % Don't split a short final column in two.
-    \global\setbox1 = \copy0
-    \setbox0=\vbox{}%
-    \setbox0=\vbox address@hidden
     \setbox2=\vbox{}%
   \else
     \divide\dimen@ by 2 % target to split to
@@ -5370,18 +5367,18 @@
         \global\advance\dimen@ by 1pt
       \repeat
     }%
+    address@hidden by 4
+    address@hidden by 5
+    \ifdim\ht3<address@hidden
+      % Column heights are too different, so don't make their bottoms
+      % flush with each other
+      \setbox0=\vbox address@hidden
+      \setbox2=\vbox address@hidden
+    \else
+      \setbox0=\vbox address@hidden
+      \setbox2=\vbox address@hidden
+    \fi
   \fi
-  address@hidden by 4
-  address@hidden by 5
-  \ifdim\ht3<address@hidden
-    % Column heights are too different, so don't make their bottoms
-    % flush with each other
-    \setbox0=\vbox address@hidden
-    \setbox2=\vbox address@hidden
-  \else
-    \setbox0=\vbox address@hidden
-    \setbox2=\vbox address@hidden
-  \fi
   %
   \pagesofar
 }