texinfo update (Fri Aug 27 09:44:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.381
retrieving revision 1.382
diff -c -r1.381 -r1.382
*** ChangeLog   26 Aug 2004 12:49:46 -0000      1.381
--- ChangeLog   27 Aug 2004 13:39:25 -0000      1.382
***************
*** 1,3 ****
--- 1,12 ----
+ 2004-08-27  Stepan Kasal  <address@hidden>
+ 
+       * doc/texinfo.tex (\initial): when breaking the column before the
+         initial, allow for some space at the bottom of the column, so
+         the baselineskip is preserved (more or less).
+         Don't give negative penalty, it encouradges creating of underfull
+         columns with stretched baselineskip.
+         At the end, the \nobreak should be before \vskip, not after it.
+ 
  2004-08-26  Stepan Kasal  <address@hidden>
  
        * util/texi2dvi: fix the sed script searching for @documentencoding;
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.172
retrieving revision 1.173
diff -c -r1.172 -r1.173
*** doc/texinfo.tex     20 Aug 2004 13:12:54 -0000      1.172
--- doc/texinfo.tex     27 Aug 2004 13:39:25 -0000      1.173
***************
*** 3533,3539 ****
    \removelastskip
    %
    % We like breaks before the index initials, so insert a bonus.
!   \penalty -300
    %
    % Typeset the initial.  Making this add up to a whole number of
    % baselineskips increases the chance of the dots lining up from column
--- 3533,3542 ----
    \removelastskip
    %
    % We like breaks before the index initials, so insert a bonus.
!   \nobreak
!   \vskip 0pt plus 3\baselineskip
!   \penalty 0
!   \vskip 0pt plus -3\baselineskip
    %
    % Typeset the initial.  Making this add up to a whole number of
    % baselineskips increases the chance of the dots lining up from column
***************
*** 3543,3552 ****
    % No shrink because it confuses \balancecolumns.
    \vskip 1.67\baselineskip plus .5\baselineskip
    \leftline{\secbf #1}%
-   \vskip .33\baselineskip plus .1\baselineskip
-   %
    % Do our best not to break after the initial.
    \nobreak
  }}
  
  % \entry typesets a paragraph consisting of the text (#1), dot leaders, and
--- 3546,3554 ----
    % No shrink because it confuses \balancecolumns.
    \vskip 1.67\baselineskip plus .5\baselineskip
    \leftline{\secbf #1}%
    % Do our best not to break after the initial.
    \nobreak
+   \vskip .33\baselineskip plus .1\baselineskip
  }}
  
  % \entry typesets a paragraph consisting of the text (#1), dot leaders, and
P ChangeLog
P doc/texinfo.tex