[6786] struts for multiline \entry

[Gavin D. Smith]

Revision: 6786
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6786
Author:   gavin
Date:     2015-11-16 19:08:16 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
struts for multiline \entry

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-11-16 18:21:21 UTC (rev 6785)
+++ trunk/ChangeLog     2015-11-16 19:08:16 UTC (rev 6786)
@@ -1,5 +1,11 @@
 2015-11-16  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\entry): For multi-line entries, use a \strut 
+       on first and last lines.  Comments changed or removed.
+       (\insertindexentrybox): Set \lineskip to 0pt.
+
+2015-11-16  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\passargtomacro): Rewrite to operate purely 
        at TeX's expansion stage.
        (\defmacro): Use \passargtomacro for macros of more than one 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-11-16 18:21:21 UTC (rev 6785)
+++ trunk/doc/texinfo.tex       2015-11-16 19:08:16 UTC (rev 6786)
@@ -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-11-16.18}
+\def\texinfoversion{2015-11-16.19}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5201,16 +5201,12 @@
     % from @* into spaces.  The user might give these in long section
     % titles, for instance.
     \def\*{\unskip\space\ignorespaces}%
-    \def\entrybreak{\hfil\break}%
+    \def\entrybreak{\hfil\break}% An undocumented command
     %
     % A bit of stretch before each entry for the benefit of balancing
     % columns.
     \vskip 0pt plus0.5pt
     %
-    % Badness calculation for paragraph affected by -
-    %  How much \indexdotfill is stretched, or how much \parfillskip is shrunk
-    %  Number of lines (\linepenalty)
-    %  
     % Swallow the left brace of the text (first parameter):
     \afterassignment\doentry
     \let\temp =
@@ -5282,7 +5278,9 @@
       address@hidden by -1\leftskip
       address@hidden by -1\entryrightmargin
       address@hidden by address@hidden
+      \let\maybestrut=\relax
       \ifdim\wd\boxA > address@hidden % If the entry doesn't fit in one line
+        \let\maybestrut=\strut
       \ifdim\dimen@ > address@hidden   % due to long index text
         \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly
         address@hidden = \hsize
@@ -5297,7 +5295,9 @@
         % Ideally we'd add a finite glue at the end of the first line only, but
         % TeX doesn't seem to provide a way to do such a thing.
       \fi\fi
+      \maybestrut  % Add a strut on the first and last lines
       \unhbox\boxA
+      \maybestrut
       %
       % Do not prefer a separate line ending with a hyphen to fewer lines.
       \finalhyphendemerits = 0
@@ -5322,9 +5322,9 @@
 
 \newbox\entryindexbox
 \def\insertindexentrybox{%
-\lineskip=.7ex plus .5ex % This comes into effect when the \vbox has a large 
-                         % height due to the paragraph in it having several 
-                         % lines.
+\lineskip=0pt    % This comes into effect when the \vbox has a large 
+                 % height due to the paragraph in it having several 
+                 % lines.
 \box\entryindexbox}
 
 % Default is no penalty