texinfo update (Mon Nov 8 19:22:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.407
retrieving revision 1.408
diff -c -r1.407 -r1.408
*** ChangeLog   7 Nov 2004 13:57:22 -0000       1.407
--- ChangeLog   9 Nov 2004 00:08:20 -0000       1.408
***************
*** 1,3 ****
--- 1,11 ----
+ 2004-11-08  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.tex (\pdfmakeoutlines): in the first run through the
+       toc, define \thischapnum...\thissubsecnum as 0, rather than \empty.
+       This is so \expnumber doesn't end up trying to expand
+       \csname sec\empty\endcsname, i.e., \sec, which is the secant function.
+       Report from: Oliver Beck, help-texinfo, 8 Nov 2004 08:05:55 +0100.
+ 
  2004-11-07  Karl Berry  <address@hidden>
  
        * makeinfo/makeinfo.c (main) [LC_MESSAGES]: #ifdef the setlocale
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.177
retrieving revision 1.178
diff -c -r1.177 -r1.178
*** doc/texinfo.tex     31 Oct 2004 14:56:11 -0000      1.177
--- doc/texinfo.tex     9 Nov 2004 00:08:20 -0000       1.178
***************
*** 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
--- 3,9 ----
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-11-08.15}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
***************
*** 1242,1254 ****
        % Read toc silently, to get counts of subentries for \pdfoutline.
        \def\numchapentry##1##2##3##4{%
        \def\thischapnum{##2}%
!       \let\thissecnum\empty
!       \let\thissubsecnum\empty
        }%
        \def\numsecentry##1##2##3##4{%
        \advancenumber{chap\thischapnum}%
        \def\thissecnum{##2}%
!       \let\thissubsecnum\empty
        }%
        \def\numsubsecentry##1##2##3##4{%
        \advancenumber{sec\thissecnum}%
--- 1242,1254 ----
        % Read toc silently, to get counts of subentries for \pdfoutline.
        \def\numchapentry##1##2##3##4{%
        \def\thischapnum{##2}%
!       \def\thissecnum{0}%
!       \def\thissubsecnum{0}%
        }%
        \def\numsecentry##1##2##3##4{%
        \advancenumber{chap\thischapnum}%
        \def\thissecnum{##2}%
!       \def\thissubsecnum{0}%
        }%
        \def\numsubsecentry##1##2##3##4{%
        \advancenumber{sec\thissecnum}%
***************
*** 1257,1265 ****
        \def\numsubsubsecentry##1##2##3##4{%
        \advancenumber{subsec\thissubsecnum}%
        }%
!       \let\thischapnum\empty
!       \let\thissecnum\empty
!       \let\thissubsecnum\empty
        %
        % use \def rather than \let here because we redefine \chapentry et
        % al. a second time, below.
--- 1257,1265 ----
        \def\numsubsubsecentry##1##2##3##4{%
        \advancenumber{subsec\thissubsecnum}%
        }%
!       \def\thischapnum{0}%
!       \def\thissecnum{0}%
!       \def\thissubsecnum{0}%
        %
        % use \def rather than \let here because we redefine \chapentry et
        % al. a second time, below.
P ChangeLog
P doc/texinfo.tex