[7310] more on index formatting

[gavinsmith0123]

Revision: 7310
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7310
Author:   gavin
Date:     2016-08-09 19:17:00 +0000 (Tue, 09 Aug 2016)
Log Message:
-----------
more on index formatting

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-08-08 23:17:09 UTC (rev 7309)
+++ trunk/ChangeLog     2016-08-09 19:17:00 UTC (rev 7310)
@@ -1,3 +1,20 @@
+2016-08-09  Gavin Smith  <address@hidden>
+
+       * doc/texinfo.tex (\balancecolumns): When making bottoms of the 
+       two columns flush, use \unskip to remove glue from bottom of 
+       columns.  Remove code which ignored glue at the bottom of 
+       columns when balancing columns, because this glue was there to 
+       help to break before an index initial.
+
+       * doc/texinfo-tex-test.texi
+       (Final page initial at top of both columns): New example of 
+       index formatting.
+       (Short indices): Add text saying what to look at for short 
+       indices.
+       (\commenceindex, \finishindex): Move use of \smallfonts in order 
+       not to cancel the change to \baselineskip done in 
+       \begindoublecolumns.
+
 2016-08-08  Masamichi Hosoda  <address@hidden>
 
        * doc/texinfo.tex (\setpdfdestname): New macro for XeTeX.

Modified: trunk/doc/texinfo-tex-test.texi
===================================================================
--- trunk/doc/texinfo-tex-test.texi     2016-08-08 23:17:09 UTC (rev 7309)
+++ trunk/doc/texinfo-tex-test.texi     2016-08-09 19:17:00 UTC (rev 7310)
@@ -298,9 +298,10 @@
 
 @tex
 \gdef \commenceindex{%
+\begingroup
 \page
+\smallfonts \rm
 \begindoublecolumns
-\smallfonts \rm
 \tolerance = 9500
 \plainfrenchspacing
 \everypar = {}%
@@ -310,11 +311,17 @@
 \gdef \finishindex{%
 address@hidden \catcode`\\=13
 \enddoublecolumns
+\endgroup
+\hrule
 }
 @end tex
 
 @chapter Index display
 
+In these examples, a horizontal rule is at the end of each run of double 
+column material in order to show if any material extends below the
+box containing it.
+
 @section Long index entries
 
 @commenceindex
@@ -605,6 +612,9 @@
 \entry{bbbb}{2}
 \finishindex
 
+If the above is in two columns, check that the space below the initials
+`A' and `B' is even.
+
 @commenceindex
 \initial{A}
 \entry{aaaa}{1}
@@ -864,7 +874,88 @@
 \entry {zooming}{31}
 \finishindex
 
address@hidden Final page initial at top of both columns
 
address@hidden
+\initial {P}
+\entry {\code {phi}}{397}
+\entry {\code {pi}}{397}
+\entry {\code {pi-over-180}}{397}
+\entry {\code {pi-over-2}}{397}
+\entry {\code {pi-over-4}}{397}
+\entry {\code {polar-complexp}}{392}
+\entry {\code {poly-mix}}{408}
+\entry {\code {poly-mul}}{408}
+\entry {\code {poly-simplify}}{408}
+\entry {\code {polynomial-base}}{408}
+\entry {\code {polynomial-p}}{408}
+\entry {\code {posp}}{391}
+\entry {\code {pow}}{397}
+\entry {\code {pow-mod}}{398}
+\entry {\code {power-of-2}}{398}
+\entry {\code {prime-test}}{399}
+\entry {\code {primp}}{393}
+\initial {Q}
+\entry {\code {quarter-circle}}{397}
+\entry {\code {quarter-integer}}{399}
+\entry {\code {quotient}}{397}
+\initial {R}
+\entry {\code {random-digit}}{398}
+\entry {\code {random-digits}}{399}
+\entry {\code {random-float}}{399}
+\entry {\code {ratp}}{392}
+\entry {\code {read-expr}}{409}
+\entry {\code {read-exprs}}{410}
+\entry {\code {read-number}}{409}
+\entry {\code {realp}}{392}
+\entry {\code {rect-complexp}}{392}
+\entry {\code {reduce-cols}}{400}
+\entry {\code {reduce-vec}}{400}
+\entry {\code {reject-arg}}{394}
+\entry {\code {remove-units}}{409}
+\entry {\code {rewrite}}{405}
+\entry {\code {rewrite-heads}}{405}
+\entry {\code {row-matrix}}{400}
+\initial {S}
+\entry {\code {scalarp}}{392}
+\entry {\code {scale-int}}{396}
+\entry {\code {scale-rounding}}{396}
+\entry {\code {simplify}}{403}
+\entry {\code {simplify-extended}}{403}
+\entry {\code {simplify-units}}{403}
+\entry {\code {single-units-in-expr-p}}{409}
+\entry {\code {solve-eqn}}{407}
+\entry {\code {solve-for}}{406}
+\entry {\code {solve-system}}{407}
+\entry {\code {sort-intv}}{396}
+\entry {\code {sqr}}{397}
+\entry {\code {sqrt-e}}{397}
+\entry {\code {sqrt-two-pi}}{397}
+\entry {\code {square-matrixp}}{393}
+\entry {\code {swap-rows}}{401}
+\initial {T}
+\entry {\code {tderiv}}{406}
+\entry {\code {to-fraction}}{399}
+\entry {\code {to-hms}}{398}
+\entry {\code {to-radians}}{398}
+\entry {\code {to-radians-2}}{398}
+\entry {\code {to-simple-fraction}}{399}
+\entry {\code {to-standard-units}}{409}
+\entry {\code {transpose}}{401}
+\entry {\code {two-pi}}{397}
+\initial {U}
+\entry {\code {underflow}}{394}
+\entry {\code {units-in-expr-p}}{409}
+\initial {V}
+\entry {\code {vec-length}}{399}
+\entry {\code {vectorp}}{393}
+\initial {W}
+\entry {\code {with-extra-prec}}{395}
+\initial {Z}
+\entry {\code {zerop}}{391}
+\finishindex
+
+
 @section Test of index widow elimination
 
 First time shows without widow elimination.  Second time shows it with

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-08-08 23:17:09 UTC (rev 7309)
+++ trunk/doc/texinfo.tex       2016-08-09 19:17:00 UTC (rev 7310)
@@ -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{2016-08-08.23}
+\def\texinfoversion{2016-08-09.20}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -6047,10 +6047,6 @@
       \loop
         \global\setbox3 = \copy0
         \global\setbox1 = \vsplit3 to \dimen@
-        % Remove glue from bottom of columns to compare
-        % apparent heights.
-        \global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}%
-        \global\setbox3 = \vbox{\unvbox3\unpenalty\unskip}%
       \ifdim\ht1<\ht3
         \global\advance\dimen@ by 1pt
       \repeat
@@ -6074,8 +6070,8 @@
         \setbox0=\vbox to \ht1 {\unvbox1\vfill}%
       \else
         % Make column bottoms flush with each other.
-        \setbox0=\vbox address@hidden
-        \setbox2=\vbox address@hidden
+        \setbox2=\vbox to\ht1{\unvbox3\unskip}%
+        \setbox0=\vbox to\ht1{\unvbox1\unskip}%
       \fi
     \fi
   \fi