texinfo/doc texinfo.tex,1.21,1.22

[karl]

Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv17356

Modified Files:
        texinfo.tex 
Log Message:
(\doitemize): rename from \itemizey.
(\itemizeitem): do not set \parskip=0 if the last
thing was a \nobreak (e.g., from \sectionheading).
Report from: Jesper Harder <address@hidden>, 
17 Jan 2004 22:03:51 +0100.


Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** texinfo.tex 15 Jan 2004 23:33:08 -0000      1.21
--- texinfo.tex 18 Jan 2004 00:34:41 -0000      1.22
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-01-15.09}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-01-17.16}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 2315,2323 ****
  \newcount \itemno
  
! \envdef\itemize{%
!   \parsearg\itemizey
! }
  
! \def\itemizey#1{%
    \aboveenvbreak
    \itemmax=\itemindent
--- 2315,2321 ----
  \newcount \itemno
  
! \envdef\itemize{\parsearg\doitemize}
  
! \def\doitemize#1{%
    \aboveenvbreak
    \itemmax=\itemindent
***************
*** 2334,2337 ****
--- 2332,2356 ----
  }
  
+ % Definition of @item while inside @itemize and @enumerate.
+ %
+ \def\itemizeitem{%
+   \advance\itemno by 1  % for enumerations
+   {\let\par=\endgraf \smallbreak}% reasonable place to break
+   {%
+    % If the document has an @itemize directly after a section title, a
+    % \nobreak will be the last contribution, and \sectionheading will have
+    % done a \vskip-\parskip.  In that case, we don't want to zero
+    % parskip, or the item text will crash with the heading.  On the
+    % other hand, when there is normal text preceding the item (as there
+    % usually is), we do want to zero parskip, or there would be too much
+    % space.  In that case, we won't have a \nobreak before.  At least
+    % that's the theory.
+    \ifnum\lastpenalty<10000 \parskip=0in \fi
+    \noindent
+    \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
+    \vadjust{\penalty 1200}}% not good to break after first line of item.
+   \flushcr
+ }
+ 
  % \splitoff TOKENS\endmark defines \first to be the first token in
  % TOKENS, and \rest to be the remainder.
***************
*** 2415,2419 ****
  }
  
! % Call itemizey, adding a period to the first argument and supplying the
  % common last two arguments.  Also subtract one from the initial value in
  % \itemno, since @item increments \itemno.
--- 2434,2438 ----
  }
  
! % Call \doitemize, adding a period to the first argument and supplying the
  % common last two arguments.  Also subtract one from the initial value in
  % \itemno, since @item increments \itemno.
***************
*** 2421,2425 ****
  \def\startenumeration#1{%
    \advance\itemno by -1
!   \itemizey{#1.}\flushcr
  }
  
--- 2440,2444 ----
  \def\startenumeration#1{%
    \advance\itemno by -1
!   \doitemize{#1.}\flushcr
  }
  
***************
*** 2432,2445 ****
  \def\Ecapsenumerate{\Eenumerate}
  
- % Definition of @item while inside @itemize.
- 
- \def\itemizeitem{%
- \advance\itemno by 1
- {\let\par=\endgraf \smallbreak}%
- \ifhmode \errmessage{In hmode at itemizeitem}\fi
- {\parskip=0in \hskip 0pt
- \hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
- \vadjust{\penalty 1200}}%
- \flushcr}
  
  % @multitable macros
--- 2451,2454 ----
***************
*** 4620,4624 ****
        % it's not a good place to break if the last penalty was \nobreak
        % or better ...
!       \ifnum\lastpenalty>10000 \else \penalty-50 \fi
        \vskip\envskipamount
      \fi
--- 4629,4633 ----
        % it's not a good place to break if the last penalty was \nobreak
        % or better ...
!       \ifnum\lastpenalty<10000 \penalty-50 \fi
        \vskip\envskipamount
      \fi