texinfo ChangeLog doc/texinfo.txi util/htmlxref...

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/10/13 20:25:19

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 
        util           : htmlxref.cnf 

Log message:
        (Customizing HTML for Simple Commands): rename+edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1158&r2=1.1159
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.329&r2=1.330
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1158
retrieving revision 1.1159
diff -u -b -r1.1158 -r1.1159
--- ChangeLog   12 Oct 2010 19:34:06 -0000      1.1158
+++ ChangeLog   13 Oct 2010 20:25:18 -0000      1.1159
@@ -1,3 +1,8 @@
+2010-10-13  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Customizing HTML for Simple Commands): rename+edit.
+       (Customizing HTML After @@-Colon): Try using @-command in node name.
+
 2010-10-12  Ralf Wildenhues  <address@hidden>
 
        * util/texi2dvi (run_index): Separate `local' statement from

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -b -r1.329 -r1.330
--- doc/texinfo.txi     12 Oct 2010 19:32:44 -0000      1.329
+++ doc/texinfo.txi     13 Oct 2010 20:25:18 -0000      1.330
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.329 2010/10/12 19:32:44 karl Exp $
address@hidden $Id: texinfo.txi,v 1.330 2010/10/13 20:25:18 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.
 
@@ -8758,7 +8758,7 @@
 
 Write the text of the indented paragraphs themselves after the
 @code{@@itemize}, up to another line that says @code{@@end
address@hidden
+itemize}.
 
 @findex item
 At the beginning of each paragraph for which a mark in the margin is
@@ -20854,21 +20854,21 @@
 Texinfo commands used within the running text.
 
 @menu
-* Argless: Customizing HTML Commands Without Arguments.
-* At-Colon: Customizing HTML After At-Colon.
-* Formatting of style and accents::
+* Argless: Customizing HTML for Commands Without Arguments.
+* @@-Colon: Customizing HTML After @@-Colon.
+* Simple: Customizing HTML for Simple Commands.
 * Formatting special simple commands::
 * Formatting characters and text::
 * Formatting of simple line commands::
 @end menu
 
 
address@hidden Customizing HTML Commands Without Arguments
address@hidden Customizing HTML Commands Without Arguments
address@hidden Customizing HTML for Commands Without Arguments
address@hidden Customizing HTML for Commands Without Arguments
 
 @cindex Customizing HTML for commands without arguments
 @cindex Commands without arguments, customizing HTML for
address@hidden Insertion commands, customizing HTML
address@hidden Insertion commands, customizing HTML for
 
 These commands include those whose names are a single nonletter
 character, such as @code{@@@@}, and those with a normal alphabetic
@@ -20939,8 +20939,12 @@
 @end deftypefn
 
 
address@hidden Customizing HTML After At-Colon
address@hidden Customizing HTML After @code{@@:}
address@hidden Customizing HTML After @@-Colon
address@hidden Customizing HTML After @@-Colon
+
address@hidden Customizing HTML after @code{@@:}
address@hidden Punctuation after @code{@@:}, customizing HTML for
address@hidden Sentence punctuation, customizing HTML for
 
 @vindex %colon_command_punctuation_characters
 The formatting of a punctuation character followed by @code{@@:} is
@@ -20961,61 +20965,75 @@
 @end deftypefn
 
 
address@hidden Formatting of style and accents
address@hidden Customizing accent, style and other simple commands with braces
address@hidden Customizing HTML for Simple Commands
address@hidden Customizing HTML for Simple Commands
+
address@hidden Customizing HTML for simple commands
address@hidden Simple commands, customizing HTML for
address@hidden Style commands, customizing HTML for
address@hidden Accent commands, customizing HTML for
 
 @vindex %style_map
 @vindex %style_map_pre
 @vindex %style_map_texi
 @vindex %style_map_math
-The formatting of the output produced by font and indicatric 
-commands (@code{@@tt}, @code{@@code}, @code{@@titlefont}), the accentuation 
related
-commands taking argument (@code{@@'}, @code{@@udotaccent}, @code{@@dotless})
-and miscalleneous commands (@code{@@email}, @code{@@verb}, @code{@@w}, 
address@hidden@@uref}, @code{@@math}, @code{@@asis}) is controlled by hashes in 
the
-default case, 
address@hidden for normal context, @code{%style_map_pre} for
-preformatted context and @code{%style_map_texi} in string context
-(@pxref{Init File Expansion Contexts}).
-In math context, @code{%style_map_math} is tried first and, if not found,
-other hashes are used.
+The formatting of the output produced by ``indicator'' and font
+commands (e.g., @code{@@code}, @code{@@t}, @code{@@titlefont}), the
+accent-related commands with arguments (e.g., @code{@@'},
address@hidden@@udotaccent}, @code{@@dotless}) and other simple commands with
+arguments (e.g., @code{@@w}, @code{@@uref}, @code{@@math},
address@hidden@@asis}) is controlled by the following hashes by default
+(@pxref{Init File Expansion Contexts}):
+
address@hidden @code
address@hidden %style_map
+in normal context.
+
address@hidden %style_map_pre
+in preformatted context.
+
address@hidden %style_map_texi
+in string context.  
+
address@hidden %style_map_math
+preferentially in math context, falling back to other hashes if not found.
address@hidden table
 
 If defined, a function reference is called for the @@-command opening:
 
address@hidden {Function Reference} begin_style_texi $command \%state \@@stack 
$real_style_or_accent $remove_texi
address@hidden is the @@-command name. 
address@hidden holds informations about the current context. 
address@hidden@@stack} is an opaque variable.
address@hidden is set if the command is an accent or is a
-marking of font command.
address@hidden is set if in a context where output is some simple
-text.
address@hidden deffn
address@hidden {Function Reference} begin_style_texi $command \%state \@@stack @
+       $real_style_or_accent $remove_texi
address@hidden @var
address@hidden $command
+The @@-command name. 
 
-The key of the hashes are the command names.
address@hidden There are two possibilities for
address@hidden the values corresponding with two interfaces. 
-The values may be strings or 
-hash references.
address@hidden and you can chose the interface depending on the one you prefer. 
-The interface with hash reference is the only one described in this
-manual, the other is mostly retained for backward compatibility.
-If you don't like these interfaces you
-can define your own.
address@hidden \%state
+Information about the current context. 
 
-Some remarks are in order:
address@hidden \@@stack
+An opaque variable.
+
address@hidden $real_style_or_accent
+Set if the command is an accent or a font command.
+
address@hidden $remove_texi
+Set if in a context where output is simple text.
address@hidden table
address@hidden deffn
+
+The key of the hashes are the command names.  The values may be
+strings or hash references.  The hash reference interface is the only
+one described in this manual, the other is retained primarily for
+backward compatibility.  
 
address@hidden
address@hidden 
 @vindex %accent_map
-The nonlettered accent commands which following character is considered
-to be the argument (like in @code{@@`a}) should be keys of the
-hash @code{%accent_map} hash, even if no value is associated.
address@hidden
-Command with braces may be handled differently, as described in
address@hidden File Formatting of Commands}, this is used 
-for @code{@@math} if address@hidden is used, for example.
address@hidden itemize
+The nonlettered accent commands where the following character is
+considered to be the argument (e.g., @code{@@`a}) should be keys of
+the hash @code{%accent_map} hash, even if no value is associated.
+
+Command with braces may be handled differently; @pxref{Init File
+Formatting of Commands}.  For example, this is used for @code{@@math}
+if @LaTeX{}2HTML is used.
 
 @menu
 * Hash reference interface::
@@ -24717,7 +24735,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.329 2010/10/12 19:32:44 karl Exp $
+$Id: texinfo.txi,v 1.330 2010/10/13 20:25:18 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}
@@ -24796,7 +24814,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.329 2010/10/12 19:32:44 karl Exp $
address@hidden $Id: texinfo.txi,v 1.330 2010/10/13 20:25:18 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi

Index: util/htmlxref.cnf
===================================================================
RCS file: /sources/texinfo/texinfo/util/htmlxref.cnf,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- util/htmlxref.cnf   12 Oct 2010 19:32:45 -0000      1.18
+++ util/htmlxref.cnf   13 Oct 2010 20:25:19 -0000      1.19
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-10-12.18; # UTC
+htmlxrefversion=2010-10-13.16; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -71,6 +71,8 @@
 
 ddd            mono    ${GS}/ddd/manual/html_mono/ddd.html
 
+diffutils      mono    ${GS}/diffutils/manual/diffutils.html
+
 emacs          mono    ${GS}/emacs/manual/html_mono/emacs.html
 emacs          node    ${GS}/emacs/manual/html_node/
  #