[6725] ragged right for long index entries

[Gavin D. Smith]

Revision: 6725
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6725
Author:   gavin
Date:     2015-10-26 13:18:48 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
ragged right for long index entries

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-10-26 09:10:31 UTC (rev 6724)
+++ trunk/ChangeLog     2015-10-26 13:18:48 UTC (rev 6725)
@@ -1,5 +1,9 @@
 2015-10-26  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\entry): Ragged right for long entries.
+
+2015-10-26  Gavin Smith  <address@hidden>
+
        * doc/texinfo-tex-test.texi (Long index entries): New section.
 
 2015-10-25  Gavin Smith  <address@hidden>

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2015-10-26 09:10:31 UTC (rev 6724)
+++ trunk/doc/texinfo-tex-test.texi     2015-10-26 13:18:48 UTC (rev 6725)
@@ -271,7 +271,8 @@
 124, 125, 127, 129, 135, 139, 143, 145, 148, 187}
 \entry {\code {-c}}{18, 20, 22, 27, 28, 38, 43, 51, 54, 65, 83, 91, 105, 
 124, 125, 127, 129, 135, 139, 143, 145, 148}
-\hrule
+\entry{Testing for Texinfo Commands: \code address@hidden, \code 
address@hidden
 \finishindex
 
 @section End-column glue

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-10-26 09:10:31 UTC (rev 6724)
+++ trunk/doc/texinfo.tex       2015-10-26 13:18:48 UTC (rev 6725)
@@ -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-25.20}
+\def\texinfoversion{2015-10-26.13}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5244,9 +5244,8 @@
     \global\setbox\boxA=\hbox\bgroup\unhbox\boxA
     % #1 is the page number.
     %
-    % The following is kludged to not output a line of dots in the index if
-    % there are no page numbers.  The next person who breaks this will be
-    % cursed by a Unix daemon.
+    % Get the width of the page numbers, and only use
+    % leaders if they are present.
     \global\setbox\boxB = \hbox{#1}%
     \ifdim\wd\boxB = 0pt
       \null\nobreak\hfill\ %
@@ -5293,11 +5292,8 @@
       \ifnum\dimen@>address@hidden
         % If the entry is too long, use the whole line
         \dimen@ = address@hidden
-      \else
-        % Cause stretch of 1fill at the end of the first line, to avoid
-        % extra spacing in a short first line.
-        \hskip 0pt plus 1fill
       \fi
+      \advance\leftskip by 0pt plus 1fill % ragged right
       \parshape = 2 0pt \dimen@ 1em address@hidden
       % 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.