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

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/08/17 18:45:59

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

Log message:
        (Init File Calling at Different Stages): edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1112&r2=1.1113
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.292&r2=1.293
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1112
retrieving revision 1.1113
diff -u -b -r1.1112 -r1.1113
--- ChangeLog   17 Aug 2010 00:15:54 -0000      1.1112
+++ ChangeLog   17 Aug 2010 18:45:57 -0000      1.1113
@@ -1,3 +1,7 @@
+2010-08-17  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Init File Calling at Different Stages): edit.
+
 2010-08-16  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (texi2any's Three Passes): edit, merge

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -b -r1.292 -r1.293
--- doc/texinfo.txi     17 Aug 2010 00:15:54 -0000      1.292
+++ doc/texinfo.txi     17 Aug 2010 18:45:58 -0000      1.293
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.292 2010/08/17 00:15:54 karl Exp $
address@hidden $Id: texinfo.txi,v 1.293 2010/08/17 18:45:58 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.
 
@@ -18635,7 +18635,7 @@
 * Init File Global Information::  Accessing the document title, file name, etc.
 * Init File Encodings::           Overriding input and output encodings.
 * texi2any's Three Passes::       @command{texi2any} works in three passes.
-* Calling functions at different stages::
+* Init File Calling at Different Stages::  Calling functions at various times.
 * External formatting of commands::
 * Program string customization::
 * Customizing generalized block command opening:: 
@@ -18704,7 +18704,7 @@
 Since the program can process more than one file on the command line,
 you must ensure that you properly initialize the variables used during
 formatting.  It is possible to call functions at different stages to
-help with that (@pxref{Calling functions at different stages}).
+help with that (@pxref{Init File Calling at Different Stages}).
 
 
 @node Init File Namespaces
@@ -19157,57 +19157,67 @@
 The default is to do nothing.
 
 These function references are mostly redundant with the handlers described 
-in the next section (@pxref{Calling functions at different stages}).
+in the next section (@pxref{Init File Calling at Different Stages}).
 
 
address@hidden Calling functions at different stages
address@hidden Calling functions at different stages
address@hidden Init File Calling at Different Stages
address@hidden Init File Calling at Different Stages
 
-Arbitrary user defined functions may be called between the 
-different Texinfo parsing and outputting passes.  This could be used, for
-example, to initialize variables before collecting the @@-commands and their
-text, expanding them between the collecting and expansion phase and doing
-some cleaning after the expansion pass. 
address@hidden Init file calling functions at different stages
address@hidden Calling functions at different stages
address@hidden Functions, calling at different stages
+
+Arbitrary user-defined functions may be called between the different
+Texinfo parsing and outputting passes (see previous section).  This
+could be used, for example, to initialize variables before collecting
+the @@-commands and their text, expanding them between the collecting
+and expansion phase and doing clean-up after the expansion pass.
+
+There are five places for user defined functions, each associated with
+an array.  The function references in each array are called one after
+another.  The arrays correspond with the different stages:
 
-There are five places for user defined functions, associated with arrays.
-The function references in these arrays are called one after another.
-The arrays correspond with the different stages:
 @vtable @code
 @item @@command_handler_setup
-The function references in that array are called before anything is done, 
-including collecting the output file names.  The input file names directory
-are available.
+Called before anything is done, including collecting the output file
+names.  The input file names' directories are available.
+
 @item @@command_handler_init
-The function references in that array are called as soon as the file names are 
-known. It may be at different moments, before processing anything, right after
-@@sefilename, or at the end of the first pass (after @@macro and @@include
-expansions).
-At that time the information available is essentially the file names.
+Called as soon as the input file names are known.  It may be at
+different moments: before processing anything, right after
address@hidden@@setfilename}, or at the end of address@hidden (after
address@hidden@@macro} and @code{@@include} expansions).  At that time the
+information available is essentially just the input file names.
+
 @item @@command_handler_names
-The function references in that array are called right after the collecting
-pass.  At that time all the special @@-commands  
-have been collected as explained above but no output has been produced,
-the element (node and section) names hasn't been processed and expanded.
+Called right after address@hidden, the main input collection.  At that
+time all the special @@-commands have been collected as explained
+above, but no output has been produced, and the element (node and
+section) names have not been processed.
+
 @item @@command_handler_process
-The function references in that array are called after the element names 
-have been processed, but before the main output initialization.
+Called after the element names have been processed, but
+before the main output initialization.
+
 @item @@command_handler_output
-The function references in that array are called rigth before the 
-main output processing, so that more informations are available,
-like the title.
+Called right before the main output processing, so that more
+information is available, such as the title (@pxref{Init File Global
+Information}).
+
 @item @@command_handler_finish
-he function references in that array are called after the end of the
-output generation.
+Called after output generation is finished.
 @end vtable 
 
-Here is an example of these arrays use:
+Because these are arrays, you should use @code{push} to add your
+functions to them, like this:
 
 @example
-push @@command_handler_init, \&Texi2HTML::LaTeX2HTML::init;
-push @@command_handler_process, \&Texi2HTML::LaTeX2HTML::latex2html;
-push @@command_handler_finish, \&Texi2HTML::LaTeX2HTML::finish;
+push (@@command_handler_init, \&my_init);
+push (@@command_handler_process, \&my_process);
+push (@@command_handler_finish, \&my_finish);
 @end example
 
+
 @node External formatting of commands
 @subsection External formatting of commands
 
@@ -24362,7 +24372,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.292 2010/08/17 00:15:54 karl Exp $
+$Id: texinfo.txi,v 1.293 2010/08/17 18:45:58 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}
@@ -24441,7 +24451,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.292 2010/08/17 00:15:54 karl Exp $
address@hidden $Id: texinfo.txi,v 1.293 2010/08/17 18:45:58 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- util/htmlxref.cnf   5 Aug 2010 00:09:06 -0000       1.8
+++ util/htmlxref.cnf   17 Aug 2010 18:45:58 -0000      1.9
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-08-03.16; # UTC
+htmlxrefversion=2010-08-17.18; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -96,6 +96,8 @@
 
 motti          node    ${GS}/motti/manual/
 
+ocrad          mono    ${GS}/ocrad/manual/ocrad_manual.html
+
 standards      mono    ${G}/prep/standards/standards.html
 standards      node    ${G}/prep/standards/html_node/