[6727] vbox instead of vtop for multi-line entry

[Gavin D. Smith]

Revision: 6727
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6727
Author:   gavin
Date:     2015-10-26 15:01:55 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
vbox instead of vtop for multi-line entry

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-10-26 13:30:35 UTC (rev 6726)
+++ trunk/ChangeLog     2015-10-26 15:01:55 UTC (rev 6727)
@@ -1,5 +1,11 @@
 2015-10-26  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\entry): Use a \vbox instead of a \vtop, for 
+       better column balancing and to stop an index entry overlapping 
+       text after the index.
+
+2015-10-26  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\entry): Permit hyphenation.
 
 2015-10-26  Gavin Smith  <address@hidden>

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-10-26 13:30:35 UTC (rev 6726)
+++ trunk/doc/texinfo.tex       2015-10-26 15:01:55 UTC (rev 6727)
@@ -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-10-26.14}
+\def\texinfoversion{2015-10-26.15}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5228,7 +5228,7 @@
 }
 \def\entrybreak{\unskip\space\ignorespaces}%
 \def\doentry{%
-    % Save the text of the entry in a \vtop.
+    % Save the text of the entry
     \global\setbox\boxA=\hbox\bgroup
     \bgroup % Instead of the swallowed brace.
       \noindent
@@ -5264,7 +5264,7 @@
     \ifdim\wd\boxB = 0pt
     \global\setbox\entryindexbox=\box\boxA
     \else
-    \global\setbox\entryindexbox=\vtop\bgroup\noindent
+    \global\setbox\entryindexbox=\vbox\bgroup\noindent
     % We want the text of the entries to be aligned to the left, and the
     % page numbers to be aligned to the right.
     %
@@ -5310,7 +5310,7 @@
     \hyphenpenalty=5000  % Discourage hyphenation.
     %
     \par % format the paragraph
-    \egroup % The \vtop
+    \egroup % The \vbox
     \fi
   \endgroup
   % delay text of entry until after penalty
@@ -5323,8 +5323,8 @@
 
 \newbox\entryindexbox
 \def\insertindexentrybox{%
-\lineskip=.8ex plus .6ex % This comes into effect when the \vtop has a large 
-                         % depth due to the paragraph in it having several 
+\lineskip=.8ex plus .6ex % This comes into effect when the \vbox has a large 
+                         % height due to the paragraph in it having several 
                          % lines.
 \box\entryindexbox}