texinfo update (Sun Jun 27 20:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.350
retrieving revision 1.351
diff -c -r1.350 -r1.351
*** ChangeLog   14 Jun 2004 21:39:22 -0000      1.350
--- ChangeLog   27 Jun 2004 23:50:37 -0000      1.351
***************
*** 1,3 ****
--- 1,15 ----
+ 2004-06-27  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.tex: Various doc fixes.
+       (\dosubindsanitize): propagate the same penalty
+       >10000, don't just use \nobreak.
+       (\sectionheading): insert a final penalty of
+       10001, not 10000.  This causes \aboveenvbreak to
+       insert \parskip glue, cancelling the
+       \vskip-\parskip done here.  Otherwise, when (e.g.)
+       @section is followed immediately by @example, the
+       example can be shrunk up above the section title.
+ 
  2004-06-14  Karl Berry  <address@hidden>
  
        * doc/texinfo.tex (\commondummies, \indexnofonts): dummy-up @comma.
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.161
retrieving revision 1.162
diff -c -r1.161 -r1.162
*** doc/texinfo.tex     20 Jun 2004 12:49:27 -0000      1.161
--- doc/texinfo.tex     27 Jun 2004 23:49:05 -0000      1.162
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-06-17.17}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
--- 3,9 ----
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-06-27.16}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
***************
*** 2265,2281 ****
      % \parskip glue -- logically it's part of the @item we just started.
      \nobreak \vskip-\parskip
      %
!     % Stop a page break at the \parskip glue coming up.  (Unfortunately
!     % we can't prevent a possible page break at the following
!     % \baselineskip glue.)  However, if what follows is an environment
!     % such as @example, there will be no \parskip glue; then
!     % the negative vskip we just would cause the example and the item to
!     % crash together.  So we use this bizarre value of 10001 as a signal
!     % to \aboveenvbreak to insert \parskip glue after all.
!     % (Possibly there are other commands that could be followed by
!     % @example which need the same treatment, but not section titles; or
!     % maybe section titles are the only special case and they should be
!     % penalty 10001...)
      \penalty 10001
      \endgroup
      \itemxneedsnegativevskipfalse
--- 2265,2277 ----
      % \parskip glue -- logically it's part of the @item we just started.
      \nobreak \vskip-\parskip
      %
!     % Stop a page break at the \parskip glue coming up.  However, if
!     % what follows is an environment such as @example, there will be no
!     % \parskip glue; then the negative vskip we just inserted would
!     % cause the example and the item to crash together.  So we use this
!     % bizarre value of 10001 as a signal to \aboveenvbreak to insert
!     % \parskip glue after all.  Section titles are handled this way also.
!     % 
      \penalty 10001
      \endgroup
      \itemxneedsnegativevskipfalse
***************
*** 3408,3424 ****
    \dosubindwrite
    %
    \ifx\lastskipmacro\zeroskipmacro
!     % if \lastskip was zero, perhaps the last item was a
!     % penalty, and perhaps it was >=10000, e.g., a \nobreak.
!     % In that case, we want to re-insert the penalty; since we
!     % just inserted a non-discardable item, any following glue
!     % (such as a \parskip) would be a breakpoint.  For example:
      %   @deffn deffn-whatever
      %   @vindex index-whatever
      %   Description.
      % would allow a break between the index-whatever whatsit
      % and the "Description." paragraph.
!     \ifnum\count255>9999 \nobreak \fi
    \else
      % On the other hand, if we had a nonzero \lastskip,
      % this make-up glue would be preceded by a non-discardable item
--- 3404,3421 ----
    \dosubindwrite
    %
    \ifx\lastskipmacro\zeroskipmacro
!     % If \lastskip was zero, perhaps the last item was a penalty, and
!     % perhaps it was >=10000, e.g., a \nobreak.  In that case, we want
!     % to re-insert the same penalty (values >10000 are used for various
!     % signals); since we just inserted a non-discardable item, any
!     % following glue (such as a \parskip) would be a breakpoint.  For example:
!     % 
      %   @deffn deffn-whatever
      %   @vindex index-whatever
      %   Description.
      % would allow a break between the index-whatever whatsit
      % and the "Description." paragraph.
!     \ifnum\count255>9999 \penalty\count255 \fi
    \else
      % On the other hand, if we had a nonzero \lastskip,
      % this make-up glue would be preceded by a non-discardable item
***************
*** 4350,4363 ****
    % glue accumulate.  (Not a breakpoint because it's preceded by a
    % discardable item.)
    \vskip-\parskip
!   %
!   % This \nobreak is purely so the last item on the list is a \penalty
!   % of 10000.  This is so other code, for instance \parsebodycommon, can
!   % check for and avoid allowing breakpoints.  Otherwise, it would
!   % insert a valid breakpoint between:
    %   @section sec-whatever
    %   @deffn def-whatever
!   \nobreak
  }
  
  
--- 4347,4360 ----
    % glue accumulate.  (Not a breakpoint because it's preceded by a
    % discardable item.)
    \vskip-\parskip
!   % 
!   % This is purely so the last item on the list is a known \penalty >
!   % 10000.  This is so \startdefun can avoid allowing breakpoints after
!   % section headings.  Otherwise, it would insert a valid breakpoint between:
!   % 
    %   @section sec-whatever
    %   @deffn def-whatever
!   \penalty 10001
  }
  
  
***************
*** 4702,4708 ****
  % start of the next paragraph will insert \parskip.
  %
  \def\aboveenvbreak{{%
!   % =10000 instead of <10000 because of a special case in \itemzzz, q.v.
    \ifnum \lastpenalty=10000 \else
      \advance\envskipamount by \parskip
      \endgraf
--- 4699,4706 ----
  % start of the next paragraph will insert \parskip.
  %
  \def\aboveenvbreak{{%
!   % =10000 instead of <10000 because of a special case in \itemzzz and
!   % \sectionheading, q.v.
    \ifnum \lastpenalty=10000 \else
      \advance\envskipamount by \parskip
      \endgraf
***************
*** 5146,5155 ****
      % If there are two @def commands in a row, we'll have a \nobreak,
      % which is there to keep the function description together with its
      % header.  But if there's nothing but headers, we need to allow a
!     % break somewhere.  Check for penalty 10002 (inserted by
!     % \defargscommonending) instead of 10000, since the sectioning
!     % commands insert a \penalty10000, and we don't want to allow a break
!     % between a section heading and a defun.
      \ifnum\lastpenalty=10002 \penalty2000 \fi
      %
      % Similarly, after a section heading, do not allow a break.
--- 5144,5154 ----
      % If there are two @def commands in a row, we'll have a \nobreak,
      % which is there to keep the function description together with its
      % header.  But if there's nothing but headers, we need to allow a
!     % break somewhere.  Check specifically for penalty 10002, inserted
!     % by \defargscommonending, instead of 10000, since the sectioning
!     % commands also insert a nobreak penalty, and we don't want to allow
!     % a break between a section heading and a defun.
!     % 
      \ifnum\lastpenalty=10002 \penalty2000 \fi
      %
      % Similarly, after a section heading, do not allow a break.
P ChangeLog
P doc/texinfo.tex