texinfo update (Sun Dec 5 20:22:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.421
retrieving revision 1.423
diff -c -r1.421 -r1.423
*** ChangeLog   5 Dec 2004 23:33:07 -0000       1.421
--- ChangeLog   6 Dec 2004 01:25:50 -0000       1.423
***************
*** 1,5 ****
--- 1,13 ----
  2004-12-05  Karl Berry  <address@hidden>
  
+       * makeinfo/html.c (add_escaped_anchor_name): prefix g_t if the
+       nodename begins with a nonletter.  Ugh.
+       * doc/texinfo.txi (HTML Xref Node Name Expansion): document this.
+       http://ff0.org/pipermail/texinfo-pretest/2004-December/000210.html
+       
+       * doc/texinfo.txi (HTML Xref 8-bit Character Expansion): define
+       behavior for Unicode code points above 0xfff.
+ 
        * makeinfo/makeinfo.c (reader_loop): <wbr> didn't make it into
        HTML 4, remove it.  Sigh.
        texinfo-pretest mail from wl, 05 Dec 2004 23:39:05 +0100.
Index: NEWS
===================================================================
RCS file: /cvsroot/texinfo/texinfo/NEWS,v
retrieving revision 1.99
retrieving revision 1.100
diff -c -r1.99 -r1.100
*** NEWS        1 Dec 2004 18:35:35 -0000       1.99
--- NEWS        6 Dec 2004 01:25:51 -0000       1.100
***************
*** 1,5 ****
! $Id: NEWS,v 1.99 2004/12/01 18:35:35 karl Exp $
! This file records noteworthy changes.
  
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,6 ----
! $Id: NEWS,v 1.100 2004/12/06 01:25:51 karl Exp $
! This file records noteworthy changes, very tersely.
! See the manual for detailed information.
  
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 28,36 ****
    . new command @slanted to typeset text in a slanted font,
      and @sansserif to typeset in a sans serif font.
  * makeinfo:
!   . HTML output: <a name="..."> constructs are added for the old-style
!     conversion of node names to HTML names, so that external references
!     to them can continue to work.
  * texi2dvi:
    . new option --recode, to call recode for input character translation.
  * Distribution:
--- 29,40 ----
    . new command @slanted to typeset text in a slanted font,
      and @sansserif to typeset in a sans serif font.
  * makeinfo:
!   . HTML output:
!     - <a name="..."> constructs are added for the old-style
!       conversion of node names to HTML names, so that external references
!       to them can continue to work.
!     - "g_t" prefixed to targets for node names beginning with a
!       nonletter, for XHTML compatibility.
  * texi2dvi:
    . new option --recode, to call recode for input character translation.
  * Distribution:
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.119
retrieving revision 1.120
diff -c -r1.119 -r1.120
*** doc/texinfo.txi     30 Nov 2004 13:29:20 -0000      1.119
--- doc/texinfo.txi     6 Dec 2004 01:13:06 -0000       1.120
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.119 2004/11/30 13:29:20 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.
  
--- 1,5 ----
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.120 2004/12/06 01:13:06 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.
  
***************
*** 16300,16305 ****
--- 16300,16310 ----
  
  @end itemize
  
+ One exception: the algorithm for node name expansion prefixes the
+ string @samp{g_t} when the node name begins with a non-letter.  This
+ kludge (due to XHTML rules) is not necessary for filenames, and is
+ therefore omitted.
+ 
  Any directory part in the filename argument of the source
  cross-reference command is ignored.  Thus, 
@code{@@address@hidden,,,../address@hidden
  and @code{@@address@hidden,,,address@hidden both use @samp{foo} as the manual 
name.
***************
*** 16346,16351 ****
--- 16351,16357 ----
  A special exception: the Top node (@pxref{The Top Node}) is always
  mapped to the file @file{index.html}, to match web server software.
  However, the HTML @emph{target} is @samp{Top}.  Thus (in the split case):
+ 
  @example
  @@address@hidden, Introduction,, emacs, The GNU Emacs address@hidden
  @result{} <a href="emacs/index.html#Top">
***************
*** 16353,16360 ****
  
  @enumerate
  @item
! The standard ASCII letters (a-z and A-z), and numbers (0-9) are not
! modified.  All other characters are changed as specified below.
  
  @item
  Multiple consecutive space, tab and newline characters are transformed
--- 16359,16370 ----
  
  @enumerate
  @item
! The standard ASCII letters (a-z and A-Z) are not modified.  All other
! characters are changed as specified below.
! 
! @item
! The standard ASCII numbers (0-9) are not modified except when a number
! is the first character of the node name.  In that case, see below.
  
  @item
  Multiple consecutive space, tab and newline characters are transformed
***************
*** 16374,16379 ****
--- 16384,16396 ----
  where @var{xx} is the ASCII character code in (lowercase) hexadecimal.
  This includes @samp{_}, which is mapped to @samp{_005f}.
  
+ @item
+ If the node name does not begin with a letter, the literal string
+ @samp{g_t} is prefixed to the result.  (Due to the rules above, that
+ string can never occur otherwise; it is an arbitrary choice, standing
+ for ``GNU Texinfo''.)  This is necessary because XHTML requires that
+ identifiers begin with a letter.
+ 
  @end enumerate
  
  For example:
***************
*** 16498,16507 ****
  @cindex 8-bit characters, in HTML cross-references
  @cindex Expansion of 8-bit characters in HTML cross-references
  
! Characters other than plain 7-bit ASCII are transformed into the
! corresponding Unicode code point(s), in Normalization Form C, which
  uses precomposed characters where available.  (This is the
! normalization form recommended by the W3C and other bodies.)
  
  These will then be further transformed by the rules above into the
  string @address@hidden, where @var{xxxx} is the code point in hex.
--- 16515,16525 ----
  @cindex 8-bit characters, in HTML cross-references
  @cindex Expansion of 8-bit characters in HTML cross-references
  
! Usually, characters other than plain 7-bit ASCII are transformed into
! the corresponding Unicode code point(s) in Normalization Form C, which
  uses precomposed characters where available.  (This is the
! normalization form recommended by the W3C and other bodies.)  This
! holds when that code point is 0xffff or less, as it almost always is.
  
  These will then be further transformed by the rules above into the
  string @address@hidden, where @var{xxxx} is the code point in hex.
***************
*** 16513,16522 ****
  @result{} A-TeX-B_0306-_2605_002e_002e_002e
  @end example
  
! Notice: 1)@address@hidden@@enddots} expands to three periods which in turn 
expands
! to three @samp{_002e}'s; 2)@address@hidden@@address@hidden@}} is a `B' with a 
breve
! accent, which does not exist as a pre-accented Unicode character,
! therefore expands to @samp{B_0306} (B with combining breve).
  
  For the definition of Unicode Normalization Form C, see Unicode report
  UAX#15, @uref{http://www.unicode.org/reports/tr15/}.  Many related
--- 16531,16548 ----
  @result{} A-TeX-B_0306-_2605_002e_002e_002e
  @end example
  
! Notice: 1)@address@hidden@@enddots} expands to three periods which in
! turn expands to three @samp{_002e}'s; 2)@address@hidden@@address@hidden@}} is 
a `B'
! with a breve accent, which does not exist as a pre-accented Unicode
! character, therefore expands to @samp{B_0306} (B with combining
! breve).
! 
! When the Unicode code point is above 0xffff, the transformation is
! @address@hidden, that is, two leading underscores followed by
! six hex digits.  Since Unicode has declared that their highest code
! point is 0x10ffff, this is sufficient.  (We felt it was better to
! define this extra escape than to always use six hex digits, since the
! first two would nearly always be zeros.)
  
  For the definition of Unicode Normalization Form C, see Unicode report
  UAX#15, @uref{http://www.unicode.org/reports/tr15/}.  Many related
***************
*** 18408,18414 ****
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.119 2004/11/30 13:29:20 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}
--- 18434,18440 ----
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.120 2004/12/06 01:13:06 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}
***************
*** 18474,18480 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.119 2004/11/30 13:29:20 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18500,18506 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.120 2004/12/06 01:13:06 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
***************
*** 18994,19000 ****
   | Start of text ...     |
   | ...                   |
   |                       |
- 
  @end group
  @end example
  
--- 19020,19025 ----
***************
*** 19026,19032 ****
   | Start of text ...     |   | More  text ...        |
   | ...                   |   | ...                   |
   |                       |   |                       |
- 
  @end group
  @end example
  
--- 19051,19056 ----
Index: makeinfo/html.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -c -r1.27 -r1.28
*** makeinfo/html.c     30 Nov 2004 02:03:23 -0000      1.27
--- makeinfo/html.c     6 Dec 2004 01:13:06 -0000       1.28
***************
*** 1,5 ****
  /* html.c -- html-related utilities.
!    $Id: html.c,v 1.27 2004/11/30 02:03:23 karl Exp $
  
     Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* html.c -- html-related utilities.
!    $Id: html.c,v 1.28 2004/12/06 01:13:06 karl Exp $
  
     Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software
     Foundation, Inc.
***************
*** 605,610 ****
--- 605,618 ----
  {
    canon_white (name);
  
+   if (!old && !strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+                        *name))
+     { /* XHTML does not allow anything but an ASCII letter to start an
+          identifier.  Therefore kludge in this constant string if we
+          have a nonletter.  */
+       add_word ("g_t");
+     }
+ 
    for (; *name; name++)
      {
        if (cr_or_whitespace (*name))
P ChangeLog
P NEWS
P doc/texinfo.txi
P makeinfo/html.c