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

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/10/15 18:36:17

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

Log message:
        (Custom Interface for Simple HTML Customization): rename+edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1160&r2=1.1161
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.331&r2=1.332
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1160
retrieving revision 1.1161
diff -u -b -r1.1160 -r1.1161
--- ChangeLog   14 Oct 2010 18:54:32 -0000      1.1160
+++ ChangeLog   15 Oct 2010 18:36:16 -0000      1.1161
@@ -1,3 +1,8 @@
+2010-10-15  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Custom Interface for Simple HTML Customization):
+       rename+edit.
+
 2010-10-14  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Hash Interface for HTML Customization): rename+edit.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -b -r1.331 -r1.332
--- doc/texinfo.txi     14 Oct 2010 18:54:32 -0000      1.331
+++ doc/texinfo.txi     15 Oct 2010 18:36:16 -0000      1.332
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.331 2010/10/14 18:54:32 karl Exp $
address@hidden $Id: texinfo.txi,v 1.332 2010/10/15 18:36:16 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.
 
@@ -21036,15 +21036,17 @@
 backward compatibility.  You can also define your own interface.
 
 @menu
-* Hash Interface for HTML Customization::
-* Define your own interface::
+* Hash Interface for Simple HTML Customization::
+* Custom Interface for Simple HTML Customization::
 @end menu
 
 
address@hidden Hash Interface for HTML Customization
address@hidden Hash Interface for HTML Customization
address@hidden Hash Interface for Simple HTML Customization
address@hidden Hash Interface for Simple HTML Customization
+
address@hidden Hash interface for simple HTML customization
address@hidden Interface for simple HTML customization, hash
 
address@hidden Hash interface for HTML customization
 The keys of the hashes given above are Texinfo command names.  The
 values determine how the command argument is formatted.  Each value is
 a hash reference.  In this value hash, each key corresponds with a
@@ -21146,61 +21148,71 @@
 @item $command
 The @@-command name.
 
address@hidden $args
address@hidden \@@args
 An array reference containing the arguments of the @@-command.
 
address@hidden $command_stack
address@hidden \@@command_stack
 An array reference with the names of the @@-commands containing the
 @@-command being formatted, latest on top.
 
address@hidden $state
-A hash reference containing information about the context of the
-@@-command.
address@hidden \%state
+A hash reference containing context information.
 
 @item $line_nr
-An opaque structure containing the information about the line number
-of the @@-command.  It can be used to call @code{main::line_error} or
+An opaque structure containing line number information for the
+@@-command.  It can be used to call @code{main::line_error} or
 @code{main::line_warn} with the first argument being the message, and
 the second argument @code{$line_nr}.
 
address@hidden $line_numbers
address@hidden \@@line_numbers
 An array reference containing the line numbers (the same opaque
 structure as above) of the lines produced by the @@-command.
 @end table
 @end table
 
 
address@hidden Define your own interface
address@hidden Defining the style and indicatric commands interface
address@hidden Custom Interface for Simple HTML Customization
address@hidden Custom Interface for Simple HTML Customization
+
address@hidden Custom interface for simple HTML customization
address@hidden Interface for simple HTML customization, custom
 
-If you don't like this scheme, it is possible to change how those commands
+If you don't like the hash interface described in the previous
+section, it is possible to change how the ``simple'' Texinfo commands
 are processed by redefining the following function reference:
 
address@hidden {Function Reference} $resulting_text style $style $command $text 
$args $no_close $no_open $line_nr $state $command_stack \@@line_numbers
address@hidden is the @@-command, @var{$style} is the value associated with 
-the @var{$command} in the @code{%style_map}, @code{%style_map_pre} 
-or @code{%style_map_texi} hashes.
-The @var{$text} is the text appearing within the @@-command braces.
address@hidden is a reference on an array contening the command arguments 
-formatted according to the same conventions than with the reference hash style
-(provided the value associated with the @@-command is a hash reference with a
address@hidden key as described in @ref{Reference Hash Args}).
-If @var{$text} is split in paragraphs each paragraph is passed through
-the function, and @var{$no_close} is true if it is not the last paragraph,
-while @var{$no_open} is true if it is not the first paragraph.
address@hidden
-is an opaque structure containing the information about the line number of the 
-@@-command. It can be used to call @code{main::echo_error} or
address@hidden::echo_warning} with first argument a message, and second 
argument 
address@hidden
address@hidden
-is a reference on a hash containing a lot of informations about the context
-of the @@-command.
address@hidden
-is a reference on an array containing the name of the @@-commands containing 
-the @@-command being formatted.
address@hidden@@line_numbers} is a reference on an array containing the lines 
numbers
-of the lines spawn by the @@-command.
address@hidden {Function Reference} $resulting_text style $style $command $text 
@
+        $args $no_close $no_open $line_nr $state $command_stack \@@line_numbers
address@hidden @var
address@hidden $command
+The @@-command
+
address@hidden $style
+The value associated with the @var{$command} in the @code{%style_map},
address@hidden or @code{%style_map_texi} hashes.
+
address@hidden $text
+The argument text appearing within the @@-command braces.
+
address@hidden $args
+Array reference containing the command arguments, formatted according
+to the same conventions as the hash reference style (provided that the
+value associated with the @@-command is a hash reference with an
address@hidden key; @pxref{Reference Hash Args}).
+
address@hidden $no_close
address@hidden $no_open
+If @var{$text} is split into paragraphs, each paragraph is passed
+through the function, and @var{$no_close} is true if this is not the
+last paragraph, while @var{$no_open} is true if this is not the first
+paragraph.
+
address@hidden $line_nr
address@hidden $state
address@hidden $command_stack
address@hidden \@@line_numbers
+See the previous section.
address@hidden table
 @end deftypefn
 
 
@@ -24745,7 +24757,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.331 2010/10/14 18:54:32 karl Exp $
+$Id: texinfo.txi,v 1.332 2010/10/15 18:36:16 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}
@@ -24824,7 +24836,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.331 2010/10/14 18:54:32 karl Exp $
address@hidden $Id: texinfo.txi,v 1.332 2010/10/15 18:36:16 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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- util/htmlxref.cnf   14 Oct 2010 18:54:33 -0000      1.20
+++ util/htmlxref.cnf   15 Oct 2010 18:36:17 -0000      1.21
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-10-14.17; # UTC
+htmlxrefversion=2010-10-15.17; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -44,6 +44,8 @@
 automake       mono    ${GS}/automake/manual/automake.html
 automake       node    ${GS}/automake/manual/html_node/
 
+avl            node    http://www.stanford.edu/~blp/avl/libavl.html/
+
 bash           mono    ${GS}/bash/manual/bash.html
 bash           node    ${GS}/bash/manual/html_node/
 
@@ -298,6 +300,11 @@
 screen         mono    ${GS}/screen/manual/screen.html
 screen         node    ${GS}/screen/manual/html_node/
 
+# can't use mono files since they have generic names
+smalltalk      node    ${GS}/smalltalk/manual/html_node/
+smalltalk-base node    ${GS}/smalltalk/manual-base/html_node/
+smalltalk-libs node    ${GS}/smalltalk/manual-libs/html_node/
+
 standards      mono    ${G}/prep/standards/standards.html
 standards      node    ${G}/prep/standards/html_node/