texinfo update (Thu Jun 1 20:22:01 EDT 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- ChangeLog   1 Jun 2006 23:48:33 -0000       1.601
+++ ChangeLog   2 Jun 2006 00:11:26 -0000       1.602
@@ -1,3 +1,9 @@
+2006-06-01  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\thischapternum): new macro for
+       headings/footings, requested by Werner.
+       * NEWS, doc/texinfo.txi (Command List, Custom Headings): document it.
+
 2006-06-01  Sergey Poznyakoff  <address@hidden>
 
        * makeinfo/html.c (html_output_head): Insert external CSS
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- NEWS        1 Jun 2006 23:48:33 -0000       1.124
+++ NEWS        2 Jun 2006 00:11:25 -0000       1.125
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.124 2006/06/01 23:48:33 karl Exp $
+$Id: NEWS,v 1.125 2006/06/02 00:11:25 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -26,6 +26,7 @@
   . new command @allowcodebreaks to control breaks at _ and - within @code.
   . new command @frenchspacing to control spacing after sentences.
   . new command @fonttextsize to allow changing body text font size to 10pt.
+  . new command @thischapternum for use in TeX headers/footers.
 * makeinfo:
   . new option --css-ref=URL for creating a stylesheet <link> in HTML output.
   . new option --transliterate-file-names to use a sort of
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/TODO,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- TODO        28 Feb 2006 13:47:45 -0000      1.30
+++ TODO        1 Jun 2006 23:54:42 -0000       1.31
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.30 2006/02/28 13:47:45 karl Exp $
+$Id: TODO,v 1.31 2006/06/01 23:54:42 karl Exp $
 This is the todo list for GNU Texinfo.
 If you are interested in working on any of these, email address@hidden
 
@@ -98,8 +98,7 @@
 
 * TeX:
   - Use @ as the escape character, and Texinfo syntax generally, in the
-    table of contents and index files.  Eliminate all the crazy
-    multiple redefinitions of every Texinfo command in different contexts.
+    table of contents and index files.
   - Support input in any encoding and language, via ec or Latin Modern fonts.
   - Or even Unicode, e.g., UTF-8, maybe assume enctex for the TeX work.
   - Reasonable way to change fonts from the default (some work has been
@@ -108,8 +107,8 @@
   - @multitable: repeat table headings if multiple pages long.
   - @multitable: support a heading line concept (<thead> in HTML).
   - Introduce new command to change \bindingoffset.
-  - How about using latex2html to produce HTML?
-  - Table of contents gets misaligned if there are 10 or more [sub]sections.
+  - Use marks to define a real @thissection.
+  - Table of contents is misaligned if there are 10 or more [sub]sections.
   - Use url.sty (or something) to allow linebreak of url's.
   - Include hyperlink \special's in the DVI output for xdvi, etc.
   - PDF: make each letter of the index (A, B, ...) a section in the TOC.
Index: doc/texinfo.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- doc/texinfo.tex     29 May 2006 00:13:06 -0000      1.214
+++ doc/texinfo.tex     2 Jun 2006 00:11:26 -0000       1.215
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2006-05-28.17}
+\def\texinfoversion{2006-06-01.17}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
@@ -4581,14 +4581,17 @@
     \ifx\temptype\Ynothingkeyword
       \setbox0 = \hbox{}%
       \def\toctype{unnchap}%
+      \gdef\thischapternum{}%
       \gdef\thischapter{#1}%
     \else\ifx\temptype\Yomitfromtockeyword
       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
       \def\toctype{omit}%
+      \gdef\thischapternum{}%
       \gdef\thischapter{}%
     \else\ifx\temptype\Yappendixkeyword
       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
       \def\toctype{app}%
+      \xdef\thischapternum{\appendixletter}%
       % We don't substitute the actual chapter name into \thischapter
       % because we don't want its macros evaluated now.  And we don't
       % use \thissection because that changes with each section.
@@ -4598,6 +4601,7 @@
     \else
       \setbox0 = \hbox{#3\enspace}%
       \def\toctype{numchap}%
+      \xdef\thischapternum{\the\chapno}%
       \xdef\thischapter{\putwordChapter{} \the\chapno:
                         \noexpand\thischaptername}%
     \fi\fi\fi
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- doc/texinfo.txi     1 Jun 2006 23:48:33 -0000       1.164
+++ doc/texinfo.txi     2 Jun 2006 00:11:26 -0000       1.165
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.164 2006/06/01 23:48:33 karl Exp $
address@hidden $Id: texinfo.txi,v 1.165 2006/06/02 00:11:26 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -17962,14 +17962,16 @@
 
 @item @@thischapter
 @itemx @@thischaptername
address@hidden @@thischapternum
 @itemx @@thisfile
 @itemx @@thispage
 @itemx @@thistitle
-Only allowed in a heading or footing.  Stands for the number and name of
-the current chapter (in the format `Chapter 1: Title'), the chapter name
+Only allowed in a heading or footing.  Stands for, respectively, the
+number and name of the current chapter (in the format `Chapter 1:
+Title'), the current chapter name only, the current chapter number
 only, the filename, the current page number, and the title of the
 document, respectively.  @xref{Custom Headings, , How to Make Your Own
address@hidden
+Headings}.
 
 @item @@address@hidden@}
 Generate a normal interword space at which a line break is not allowed.
@@ -18720,7 +18722,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.164 2006/06/01 23:48:33 karl Exp $
+$Id: texinfo.txi,v 1.165 2006/06/02 00:11:26 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -18786,7 +18788,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.164 2006/06/01 23:48:33 karl Exp $
address@hidden $Id: texinfo.txi,v 1.165 2006/06/02 00:11:26 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
@@ -19485,6 +19487,11 @@
 @item @@thischaptername
 Expands to the name of the current address@hidden
 
address@hidden thischapternum
address@hidden @@thischapternum
+Expands to the number of the current chapter, or letter of the current
+appendix.
+
 @findex thischapter
 @item @@thischapter
 Expands to the number and name of the current
P ChangeLog
P NEWS
P TODO
P doc/texinfo.tex
P doc/texinfo.txi