texinfo update (Thu Aug 19 09:44:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.376
retrieving revision 1.377
diff -c -r1.376 -r1.377
*** ChangeLog   19 Aug 2004 12:46:01 -0000      1.376
--- ChangeLog   19 Aug 2004 13:38:38 -0000      1.377
***************
*** 1,3 ****
--- 1,11 ----
+ 2004-08-19  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.tex (\multitable): \def\item to \crcr, instead of
+               \let, to avoid errors with a nested @itemize inside
+               @multitable.
+       Report from: Pierre-Luc Veilleux <address@hidden>,
+       18 Aug 2004 13:26:00 -0400.
+ 
  2004-08-19  Stepan Kasal  <address@hidden>
  
        * doc/texinfo.tex (\scanmacro): Make backslash active, not other,
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.170
retrieving revision 1.171
diff -c -r1.170 -r1.171
*** doc/texinfo.tex     19 Aug 2004 12:46:01 -0000      1.170
--- doc/texinfo.tex     19 Aug 2004 13:38:38 -0000      1.171
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-08-19.05}
  %
  % 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-08-19.06}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
***************
*** 2347,2354 ****
    \parindent = 0pt
    \parskip = \smallskipamount
    \ifdim \parskip=0pt \parskip=2pt \fi
-   \let\item = \internalBitem
-   \let\itemx = \internalBitemx
  }
  \def\Etable{\endgraf\afterenvbreak}
  \let\Eftable\Etable
--- 2347,2352 ----
***************
*** 2633,2639 ****
    \startsavinginserts
    %
    % @item within a multitable starts a normal row.
!   \let\item\crcr
    %
    \tolerance=9500
    \hbadness=9500
--- 2631,2640 ----
    \startsavinginserts
    %
    % @item within a multitable starts a normal row.
!   % We use \def instead of \let so that if one of the multitable entries
!   % contains an @itemize, we don't choke on the \item (seen as \crcr aka
!   % \endtemplate) expanding \doitemize.
!   \def\item{\crcr}%
    %
    \tolerance=9500
    \hbadness=9500
P ChangeLog
P doc/texinfo.tex