[7935] fix indenting for toc entries

[gavinsmith0123]

Revision: 7935
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7935
Author:   gavin
Date:     2017-08-23 15:41:06 -0400 (Wed, 23 Aug 2017)
Log Message:
-----------
fix indenting for toc entries

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-08-20 20:06:30 UTC (rev 7934)
+++ trunk/ChangeLog     2017-08-23 19:41:06 UTC (rev 7935)
@@ -1,3 +1,13 @@
+2017-08-23  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\entry): When splitting the text across 
+       multiple lines, do not simply set \leftskip and \parindent to 
+       values, alter the existing values instead.  Otherwise, long 
+       entries in a table of contents would not be indented properly, 
+       because \leftskip had been set to a positive value.  Arnold 
+       Robbins reported that this happened for the gawk manual.  Add or 
+       change some comments.
+
 2017-08-20  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex (\partentry): Add stretch and a bonus for 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2017-08-20 20:06:30 UTC (rev 7934)
+++ trunk/doc/texinfo.tex       2017-08-23 19:41:06 UTC (rev 7935)
@@ -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{2017-08-20.20}
+\def\texinfoversion{2017-08-23.19}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5696,10 +5696,13 @@
       address@hidden by address@hidden
       \ifdim\wd\boxA > address@hidden % If the entry doesn't fit in one line
       \ifdim\dimen@ > address@hidden   % due to long index text
-        \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly
+        % Try to split the text roughly evenly.  \dimen@ will be the length of 
+        % the first line.
+        \dimen@ = 0.7\dimen@
         address@hidden = \hsize
         \ifnum\dimen@>address@hidden
-          % If the entry is too long, use the whole line
+          % If the entry is too long (for example, if it needs more than
+          % two lines), use all the space in the first line.
           \dimen@ = address@hidden
         \fi
         \advance\leftskip by 0pt plus 1fill % ragged right
@@ -5709,8 +5712,9 @@
         % instead of using \parshape with explicit line lengths, but TeX
         % doesn't seem to provide a way to do such a thing.
         %
-        \leftskip = 1em
-        \parindent = -1em
+        % Indent all lines but the first one.
+        \advance\leftskip by 1em
+        \advance\parindent by -1em
       \fi\fi
       \indent % start paragraph
       \unhbox\boxA