texinfo update (Sun Oct 31 10:22:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.403
retrieving revision 1.404
diff -c -r1.403 -r1.404
*** ChangeLog   29 Oct 2004 11:09:20 -0000      1.403
--- ChangeLog   31 Oct 2004 14:56:10 -0000      1.404
***************
*** 1,3 ****
--- 1,9 ----
+ 2004-10-31  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.tex (\setmultitablespacing): just let \multistrut be
+       the same as \strut.  Its previous computation was wrong.
+       See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
+ 
  2004-10-22  Stepan Kasal  <address@hidden>
  
        * info/Makefile.am (generated_sources): Add dependencies defining
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.176
retrieving revision 1.177
diff -c -r1.176 -r1.177
*** doc/texinfo.tex     7 Oct 2004 12:13:02 -0000       1.176
--- doc/texinfo.tex     31 Oct 2004 14:56:11 -0000      1.177
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-09-06.16}
  %
  % 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-10-31.06}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
***************
*** 2732,2750 ****
    \global\setpercentfalse
  }
  
! \def\setmultitablespacing{% test to see if user has set \multitablelinespace.
! % If so, do nothing. If not, give it an appropriate dimension based on
! % current baselineskip.
  \ifdim\multitablelinespace=0pt
  \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
  \global\advance\multitablelinespace by-\ht0
! %% strut to put in table in case some entry doesn't have descenders,
! %% to keep lines equally spaced
! \let\multistrut = \strut
! \else
! %% FIXME: what is \box0 supposed to be?
! \gdef\multistrut{\vrule height\multitablelinespace depth\dp0
! width0pt\relax} \fi
  %% Test to see if parskip is larger than space between lines of
  %% table. If not, do nothing.
  %%        If so, set to same dimension as multitablelinespace.
--- 2732,2748 ----
    \global\setpercentfalse
  }
  
! \def\setmultitablespacing{%
!   \def\multistrut{\strut}% just use the standard line spacing
!   %
!   % Compute \multitablelinespace (if not defined by user) for use in
!   % \multitableparskip calculation.  We used define \multistrut based on
!   % this, but (ironically) that caused the spacing to be off.
!   % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
  \ifdim\multitablelinespace=0pt
  \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
  \global\advance\multitablelinespace by-\ht0
! \fi
  %% Test to see if parskip is larger than space between lines of
  %% table. If not, do nothing.
  %%        If so, set to same dimension as multitablelinespace.
P ChangeLog
P doc/texinfo.tex