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

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/10/12 00:24:00

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

Log message:
        (Customizing HTML Commands Without Arguments): rename+edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1155&r2=1.1156
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.327&r2=1.328
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1155
retrieving revision 1.1156
diff -u -b -r1.1155 -r1.1156
--- ChangeLog   10 Oct 2010 18:01:25 -0000      1.1155
+++ ChangeLog   12 Oct 2010 00:23:59 -0000      1.1156
@@ -1,3 +1,9 @@
+2010-10-11  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Customizing HTML Basic Commands),
+       (Customizing HTML Commands Without Arguments):
+       rename+edit.
+
 2010-10-10  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Customizing Output File Names): further

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -b -r1.327 -r1.328
--- doc/texinfo.txi     10 Oct 2010 18:01:25 -0000      1.327
+++ doc/texinfo.txi     12 Oct 2010 00:23:59 -0000      1.328
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.327 2010/10/10 18:01:25 karl Exp $
address@hidden $Id: texinfo.txi,v 1.328 2010/10/12 00:23:59 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.
 
@@ -18518,7 +18518,7 @@
 * Customizing Special Elements::      The top, toc, about, etc., elements.
 * Customizing Output-Related Names::  File names and target names.
 * Customizing HTML Headings::
-* Formatting insertions text and simple commands::
+* Customizing HTML Basic Commands::
 * References and footnotes formatting::
 * Block commands formatting::
 * Paragraph and preformatted region::
@@ -19369,6 +19369,8 @@
 @subsection Init File Expansion Contexts: Normal, Preformatted, String, Math
 
 @cindex Init file expansion contexts
address@hidden Expansion contexts, for init files
address@hidden Contexts for expansion in init files
 
 There are four expansion contexts of interest:
 
@@ -20819,7 +20821,6 @@
            \%element $command $command_texi_arg $formatted_arg @
            $in_preformatted $one_section $element_heading $first_in_page @
            $is_top $previous_is_top $unformatted_line $element_id $new_element
-
 @var{\%element}, @var{$command}, @var{$command_texi_arg},
 @var{$formatted_arg}, @var{$in_preformatted}, @var{$one_section}, and
 @var{$element_heading} are as above.  For the rest:
@@ -20846,11 +20847,14 @@
 @end deftypefn
 
 
address@hidden Formatting insertions text and simple commands
address@hidden Formatting insertions, text and simple commands
address@hidden Customizing HTML Basic Commands
address@hidden Customizing HTML Basic Commands
+
+This section describes customizing the HTML output for the basic
+Texinfo commands used within the running text.
 
 @menu
-* Formatting commands without arguments::
+* Customizing HTML Commands Without Arguments::
 * Formatting of @@<colon>::
 * Formatting of style and accents::
 * Formatting special simple commands::
@@ -20858,83 +20862,82 @@
 * Formatting of simple line commands::
 @end menu
 
address@hidden Formatting commands without arguments
address@hidden Customizing the formatting of commands without argument
address@hidden Customizing HTML Commands Without Arguments
address@hidden Customizing HTML Commands Without Arguments
 
-This includes the commands whose name is a nonletter character like 
@code{@@@@}, 
-the commands with lettered characters and braces
-but whose braces should be empty, like @code{@@address@hidden@}}, or some 
commands
-associated with accentted letters like @code{@@address@hidden@}}. 
-
-Each of these categories of commands have associated hashes,
-for normal
-context, for preformatted context for strings and math. 
-(@pxref{Init File Expansion Contexts}).  The 
-keys of the hashes are the 
-command names, the associated value is the text replacing the command.
-In math context if a command is not a key of these hashes, the 
-defaults for this command are used.
address@hidden Customizing HTML for commands without arguments
address@hidden Commands without arguments, customizing HTML for
address@hidden Insertion commands, customizing HTML
+
+These commands include those whose names are a single nonletter
+character, such as @code{@@@@}, and those with a normal alphabetic
+name but whose braces should be empty, such as @code{@@address@hidden@}} and
address@hidden@@address@hidden@}}.
+
+Each of these categories of commands have associated hashes for each
+expansion context: normal, preformatted, string, and math (@pxref{Init
+File Expansion Contexts}).  The keys of each hash are the command
+names, the associated value is the text replacing the command.  In
+math context, if a command is not a key of these hashes, the defaults
+for the command are used.
 
 @vindex %simple_map
address@hidden %simple_map_pre
address@hidden simple_map_texi
 @vindex %things_map
address@hidden %simple_map_pre
 @vindex %pre_map
address@hidden %simple_map_texi
 @vindex %texi_map
 @vindex %simple_map_math
 @vindex %math_map
 The hashes are:
address@hidden {preformatted text} {one nonlettered character} {nothing in 
braces}
address@hidden command type @tab one nonlettered character @tab nothing in 
braces
address@hidden normal text @tab @code{%simple_map} @tab @code{%things_map}
address@hidden preformatted text @tab @code{%simple_map_pre} @tab 
@code{%pre_map}
+
address@hidden {preformatted} {one nonlettered character} {empty braces}
address@hidden command type @tab one nonlettered character @tab empty braces
address@hidden normal       @tab @code{%simple_map}      @tab @code{%things_map}
address@hidden preformatted @tab @code{%simple_map_pre}  @tab @code{%pre_map}
 @item string @tab @code{%simple_map_texi} @tab @code{%texi_map}
 @item math @tab @code{%simple_map_math} @tab @code{%math_map}
 @end multitable
 
-To change the formatting of these commands, just change the
-value. For example, if you want @code{&shy;} to be outputted for @code{@@-}
-in normal and preformatted context, write in your init file:
+To change the formatting of a command, change the associated value in
+the desired hash.  For example, if you want @code{&shy;} to be output
+for @code{@@-} in normal and preformatted context, write this in your
+init file:
 
 @example
 address@hidden'-'@} = '&shy;';
 address@hidden'-'@} = '&shy;';
 @end example
 
-A special hash is used preferentially when sorting indices, 
-overriding @code{%texi_map} entries, @code{%sorting_things_map}.
-
-For a better control, function references are available,
-although they are not used in string context.
address@hidden is for one nonlettered character
-@@-command formatting:
address@hidden {Function Reference} $formatted_command simple_command $command 
$in_preformatted $in_math $line_nr \%state
address@hidden is the @@-command name.
address@hidden is true if in preformatted region.
address@hidden is true if in math.
address@hidden
-An opaque structure containing the information about the line number of the 
-@@-command.
address@hidden holds informations about the current context. 
address@hidden deftypefn
-
-For @@-commands without argument in brace, @code{thing_command}
-may be redefined:
-
address@hidden {Function Reference} $formatted_command thing_command $command 
$text $in_preformatted $in_math $line_nr \%state
address@hidden is the @@-command name.
address@hidden is the formatted text appearing in the @@-command. It is invalid 
Texinfo to have
-something else than an empty string.
address@hidden is true if in preformatted region.
address@hidden is true if in math.
address@hidden
-An opaque structure containing the information about the line number of the 
-@@-command.
address@hidden holds informations about the current context. 
address@hidden %sorting_things_map
+An additional hash is used preferentially when sorting indices,
+overriding @code{%texi_map} entries: @code{%sorting_things_map}.
+
+For better control, function references are available, although they
+are not used in string context.  @code{simple_command} is for
+formatting of the single-nonletter @@-commands:
+
address@hidden {Function Reference} $formatted_command simple_command
+           @ $command $in_preformatted $in_math $line_nr \%state
address@hidden is the @@-command name.  @var{$in_preformatted} is true
+if in a preformatted region.  @var{$in_math} is true if in math.
address@hidden is an opaque structure containing information about the
+line number of the @@-command.  @var{\%state} holds information about
+the current context.
address@hidden deftypefn
+
+For @@-commands with empty brace arguments, @code{thing_command} may
+be redefined:
+
address@hidden {Function Reference} $formatted_command thing_command
+           @ $command $text $in_preformatted $in_math $line_nr \%state
address@hidden is the formatted text appearing in the @@-command.  It is
+invalid Texinfo to have anything other than the empty string there.
address@hidden, @var{$in_preformatted}, @var{$in_math},
address@hidden, and @var{\%state} are as above.
 @end deftypefn
 
 
-
 @node Formatting of @@<colon>
 @subsection Formatting of a punctuation character associated with @code{@@:}
 
@@ -24711,7 +24714,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.327 2010/10/10 18:01:25 karl Exp $
+$Id: texinfo.txi,v 1.328 2010/10/12 00:23:59 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}
@@ -24790,7 +24793,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.327 2010/10/10 18:01:25 karl Exp $
address@hidden $Id: texinfo.txi,v 1.328 2010/10/12 00:23:59 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- util/htmlxref.cnf   10 Oct 2010 18:01:25 -0000      1.16
+++ util/htmlxref.cnf   12 Oct 2010 00:23:59 -0000      1.17
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-10-10.16; # UTC
+htmlxrefversion=2010-10-11.18; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -246,6 +246,12 @@
 gv             mono    ${GS}/gv/manual/gv.html
 gv             node    ${GS}/gv/manual/html_node/
 
+hello          mono    ${GS}/hello/manual/hello.html
+hello          node    ${GS}/hello/manual/html_node/
+
+idutils                mono    ${GS}/idutils/manual/idutils.html
+idutils                node    ${GS}/idutils/manual/html_node/
+
 inetutils      mono    ${GS}/inetutils/manual/inetutils.html
 inetutils      node    ${GS}/inetutils/manual/html_node/