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

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/10/01 18:05:24

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

Log message:
        (Customizing Output Target Names): rename+edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1151&r2=1.1152
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.323&r2=1.324
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -b -r1.1151 -r1.1152
--- ChangeLog   26 Sep 2010 18:37:42 -0000      1.1151
+++ ChangeLog   1 Oct 2010 18:05:22 -0000       1.1152
@@ -1,6 +1,11 @@
+2010-10-01  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Customizing Output Target Names): rename+edit.
+
 2010-09-26  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi: Avoid more duplicated index entries.
+       (PDF Output): correct link for GNU GV.
 
 2010-09-25  Patrice Dumas  <address@hidden>
 

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -b -r1.323 -r1.324
--- doc/texinfo.txi     1 Oct 2010 14:45:29 -0000       1.323
+++ doc/texinfo.txi     1 Oct 2010 18:05:23 -0000       1.324
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.323 2010/10/01 14:45:29 karl Exp $
address@hidden $Id: texinfo.txi,v 1.324 2010/10/01 18:05:23 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.
 
@@ -20556,7 +20556,8 @@
 identifiers in detail.
 
 @menu
-* Customizing Output File Names::
+* File: Customizing Output File Names.
+* Target: Customizing Output Target Names.
 @end menu
 
 @node Customizing Output File Names
@@ -20632,61 +20633,73 @@
 The function should return the file name for the element (@var{$file}).
 @end deftypefn
 
address@hidden %renamed_nodes
-It is also possible to specify renamed node names in
address@hidden  They are processed as explained in
address@hidden Xref Link Preservation}.
-
address@hidden target names
-
-Similarly target and id may be set.  The @dfn{id} is placed where the 
-item is located, the @dfn{target} is used to construct references to
-that item. In general they should be equal, but not always, for example
-in the default case, the target for a section is the node id.
-The following function reference, is
-for target items (nodes, anchors, floats):
-
address@hidden {Function Reference} {($target,$id)} node_target_name \%node 
$default_target $default_id $type
address@hidden is the same as in the @code{node_file_name} function reference
-above.
address@hidden is the target already set (it is also 
-in @code{$node->@{'target'@}}), and @var{$default_id} is similarly
-the id already set.
address@hidden is @code{top} if the node is the top node.
address@hidden xx vindex %renamed_nodes
address@hidden xx It is also possible to specify renamed node names in
address@hidden xx @code{%renamed_nodes}.  They are processed as explained in
address@hidden xx @ref{HTML Xref Link Preservation}.
+
address@hidden Customizing Output Target Names
address@hidden Customizing Output Target Names
+
address@hidden Customizing output target names
address@hidden Target names, customizing
address@hidden Id names, customizing
+
+Similar to file names, so-called target and id names may be set.  The
address@hidden is placed where the item is located, while the @dfn{target}
+is used to construct references to that item.  Usually, these should
+be the same.
+
address@hidden xx, but not always, for example in the default case, the
address@hidden xx target for a section is the node id.
+
+The following function reference is for target items (nodes, anchors,
+floats):
+
address@hidden {Function Reference} {($target,$id)} node_target_name @
+           \%node $default_target $default_id $type
address@hidden is the same as in the @code{node_file_name} function
+reference in the previous section.  @var{$default_target} is the
+target that has been already set (it is also in
address@hidden>@{'target'@}}), and @var{$default_id} is, similarly, the
+id already set.  @var{$type} is @code{top} if the node is the top
+node.  The function should return a two-element list of the target and
+id names.
 @end deftypefn
 
-For element (@pxref{Output Elements Defined}), the function 
+For elements (@pxref{Output Elements Defined}), the function 
 reference is:
 
address@hidden {Function Reference} {($target,$id)} element_target_name 
\%element $default_target $default_id
-the @var{\%element} is the same than in @code{element_file_name}, and
address@hidden and @var{$default_id} are the target and id already set.
address@hidden deftypefn
-
-Placed items 
-(floats, footnotes, index entries, anchors, contents,
-shortcontents and headings)
-file and target may also be set.  In the default case, they should 
-be rightly set, so be careful when changing them.  The following 
-function reference can be used:
-
address@hidden {Function Reference} {($target, $id, $file)} 
placed_target_file_name \%placed_item \%element $default_target $default_id 
$default_file $context
address@hidden is a hash reference describing the placed item,
-in the same vein than above.
-the @var{\%element} is the same than in @code{element_file_name}, 
-corresponding with the element containing the placed item.
address@hidden, @var{default_id} and
address@hidden are the file, id and target already set.
address@hidden describes the context, it is empty in the normal cases, 
-and can also be set to @samp{footnotes} if in footnotes, or to
address@hidden if the placed item is out of any element
-(typically in @code{@@titlepage}, @code{@@copying}).
address@hidden {Function Reference} {($target,$id)} element_target_name @
+           \%element $default_target $default_id
address@hidden is the same as in @code{element_file_name} in the
+previous section, and @var{$default_target}, @var{$default_id}, and
+the return value, are as above.
address@hidden deftypefn
+
+The file, target, and id of ``placed'' items, namely floats,
+footnotes, index entries, anchors, contents, shortcontents and
+headings, may also be set, although the default should be suitable.
+Nevertheless, the following function reference can be used:
+
address@hidden {Function Reference} {($target, $id, $file)} @
+           placed_target_file_name \%placed_item \%element @
+           $default_target $default_id $default_file $context
+
address@hidden is a hash reference describing the placed item, as
+in the above, likewise @var{\%element}.  @var{$default_file},
address@hidden and @var{$default_target} are the file, id and target
+already set.  @var{$context} describes the context; this is set to
address@hidden if in footnotes, to @samp{no_associated_element} if
+the placed item is outside of any element (e.g., @code{@@titlepage},
address@hidden@@copying}), and is otherwise empty.
 @end deftypefn
 
 @vindex %misc_pages_targets
-For special elements, the @code{%misc_pages_targets} hash is 
-used to set the target and id.  The possibilities for the keys 
-are @samp{Overview}, @samp{Contents}, @samp{Footnotes} and @samp{About}.
+For special elements, the @code{%misc_pages_targets} hash is used to
+set the target and id.  The possibilities for the keys are
address@hidden, @samp{Contents}, @samp{Footnotes} and @samp{About}.
+
 
 @node Headings formatting
 @section Customizing headings formatting
@@ -24641,7 +24654,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.323 2010/10/01 14:45:29 karl Exp $
+$Id: texinfo.txi,v 1.324 2010/10/01 18:05:23 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}
@@ -24720,7 +24733,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.323 2010/10/01 14:45:29 karl Exp $
address@hidden $Id: texinfo.txi,v 1.324 2010/10/01 18:05:23 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- util/htmlxref.cnf   24 Sep 2010 17:24:18 -0000      1.14
+++ util/htmlxref.cnf   1 Oct 2010 18:05:24 -0000       1.15
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-09-24.16; # UTC
+htmlxrefversion=2010-10-01.17; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -69,14 +69,101 @@
 
 #cvs cannot be handled here; see http://ximbiot.com/cvs/manual.
 
-elisp          mono    ${GS}/emacs/manual/html_mono/elisp.html
-elisp          node    ${GS}/emacs/manual/html_node/
+ddd            mono    ${GS}/ddd/manual/html_mono/ddd.html
 
 emacs          mono    ${GS}/emacs/manual/html_mono/emacs.html
 emacs          node    ${GS}/emacs/manual/html_node/
+ #
+ ada-mode      mono    ${GS}/emacs/manual/html_mono/ada-mode.html
+ ada-mode      node    ${GS}/emacs/manual/html_node/ada-mode/
+ #
+ autotype      mono    ${GS}/emacs/manual/html_mono/autotype.html
+ autotype      node    ${GS}/emacs/manual/html_node/autotype/
+ #
+ ccmode                mono    ${GS}/emacs/manual/html_mono/ccmode.html
+ ccmode                node    ${GS}/emacs/manual/html_node/ccmode/
+ #
+ cl            mono    ${GS}/emacs/manual/html_mono/cl.html
+ cl            node    ${GS}/emacs/manual/html_node/cl/
+ #
+ ebrowse       mono    ${GS}/emacs/manual/html_mono/ebrowse.html
+ ebrowse       node    ${GS}/emacs/manual/html_node/ebrowse/
+ #
+ ediff         mono    ${GS}/emacs/manual/html_mono/ediff.html
+ ediff         node    ${GS}/emacs/manual/html_node/ediff/
+ #
+ eieio         mono    ${GS}/emacs/manual/html_mono/eieio.html
+ eieio         node    ${GS}/emacs/manual/html_node/eieio/
+ #
+ elisp         mono    ${GS}/emacs/manual/html_mono/elisp.html
+ elisp         node    ${GS}/emacs/manual/html_node/elisp/
+ #
+ epa           mono    ${GS}/emacs/manual/html_mono/epa.html
+ epa           node    ${GS}/emacs/manual/html_node/epa/
+ #
+ erc           mono    ${GS}/emacs/manual/html_mono/erc.html
+ erc           node    ${GS}/emacs/manual/html_node/erc/
+ #
+ dired-x       mono    ${GS}/emacs/manual/html_mono/dired-x.html
+ dired-x       node    ${GS}/emacs/manual/html_node/dired-x/
+ #
+ eshell                mono    ${GS}/emacs/manual/html_mono/eshell.html
+ eshell                node    ${GS}/emacs/manual/html_node/eshell/
+ #
+ flymake       mono    ${GS}/emacs/manual/html_mono/flymake.html
+ flymake       node    ${GS}/emacs/manual/html_node/flymake/
+ #
+ gnus          mono    ${GS}/emacs/manual/html_mono/gnus.html
+ gnus          node    ${GS}/emacs/manual/html_node/gnus/
+ #
+ idlwave       mono    ${GS}/emacs/manual/html_mono/idlwave.html
+ idlwave       node    ${GS}/emacs/manual/html_node/idlwave/
+ #
+ message       mono    ${GS}/emacs/manual/html_mono/message.html
+ message       node    ${GS}/emacs/manual/html_node/message/
+ #
+ mh-e          mono    ${GS}/emacs/manual/html_mono/mh-e.html
+ mh-e          node    ${GS}/emacs/manual/html_node/mh-e/
+ #
+ nxml-mode     mono    ${GS}/emacs/manual/html_mono/nxml-mode.html
+ nxml-mode     node    ${GS}/emacs/manual/html_node/nxml-mode/
+ #
+ org           mono    ${GS}/emacs/manual/html_mono/org.html
+ org           node    ${GS}/emacs/manual/html_node/org/
+ #
+ pcl-cvs       mono    ${GS}/emacs/manual/html_mono/pcl-cvs.html
+ pcl-cvs       node    ${GS}/emacs/manual/html_node/pcl-cvs/
+ #
+ rcirc         mono    ${GS}/emacs/manual/html_mono/rcirc.html
+ rcirc         node    ${GS}/emacs/manual/html_node/rcirc/
+ #
+ semantic      mono    ${GS}/emacs/manual/html_mono/semantic.html
+ semantic      node    ${GS}/emacs/manual/html_node/semantic/
+ #
+ smtp          mono    ${GS}/emacs/manual/html_mono/smtp.html
+ smtp          node    ${GS}/emacs/manual/html_node/smtp/
+ #
+ speedbar      mono    ${GS}/emacs/manual/html_mono/speedbar.html
+ speedbar      node    ${GS}/emacs/manual/html_node/speedbar/
+ #
+ tramp         mono    ${GS}/emacs/manual/html_mono/tramp.html
+ tramp         node    ${GS}/emacs/manual/html_node/tramp/
+ #
+ vip           mono    ${GS}/emacs/manual/html_mono/vip.html
+ vip           node    ${GS}/emacs/manual/html_node/vip/
+ #
+ viper         mono    ${GS}/emacs/manual/html_mono/viper.html
+ viper         node    ${GS}/emacs/manual/html_node/viper/
+ #
+ woman         mono    ${GS}/emacs/manual/html_mono/woman.html
+ woman         node    ${GS}/emacs/manual/html_node/woman/
+ # (end emacs manuals)
 
 emms           node    ${GS}/emms/manual/
 
+findutils      mono    ${GS}/findutils/manual/html_mono/find.html
+findutils      node    ${GS}/findutils/manual/html_mono/find_html
+
 gama           mono    ${GS}/gama/manual/gama.html
 gama           node    ${GS}/gama/manual/html_node/
 
@@ -91,9 +178,20 @@
  gnat_ugn_unw  node    http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/
  libgomp       node    http://gcc.gnu.org/onlinedocs/libgomp/
 
+GDB = http://sourceware.org/gdb/current/onlinedocs
+gdb            node    ${GDB}/gdb/
+ gdbint                node    ${GDB}/gdbint/
+ stabs         node    ${GDB}/stabs/
+
 gettext                mono    ${GS}/gettext/manual/gettext.html
 gettext                node    ${GS}/gettext/manual/html_node/
 
+gforth         node    http://www.complang.tuwien.ac.at/forth/gforth/Docs-html/
+
+global         mono    ${GS}/global/manual/global.html
+
+gnu-arch       node    ${GS}/gnu-arch/tutorial/
+
 gnu-crypt      node    ${GS}/gnu-crypto/manual/
 
 gnubg          mono    ${GS}/gnubg/manual/gnubg.html
@@ -102,6 +200,9 @@
 gnubik         mono    ${GS}/gnubik/manual/gnubik.html
 gnubik         node    ${GS}/gnubik/manual/html_node/
 
+gnulib         mono    ${GS}/gnulib/manual/gnulib.html
+gnulib         node    ${GS}/gnulib/manual/html_node/
+
 GNUPG = http://www.gnupg.org/documentation/manuals
 gnupg          node    ${GNUPG}/gnupg/
  dirmngr       node    ${GNUPG}/dirmngr/
@@ -110,10 +211,11 @@
  assuan                node    ${GNUPG}/assuan/
  gpgme         node    ${GNUPG}/gpgme/
 
-gnus           node    ${GS}/emacs/manual/html_mono/mh-e.html
-
 gnuschool      mono    ${GS}/gnuschool/gnuschool.html
 
+gperf          mono    ${GS}/gperf/manual/gperf.html
+gperf          node    ${GS}/gperf/manual/html_node/
+
 gtypist                mono    ${GS}/gtypist/doc/
 
 gv             mono    ${GS}/gv/manual/gv.html
@@ -141,13 +243,12 @@
 mdk            mono    ${GS}/mdk/manual/mdk.html
 mdk            node    ${GS}/mdk/manual/html_node/
 
-mh-e           mono    ${GS}/emacs/manual/html_node/mh-e/
-mh-e           node    ${GS}/emacs/manual/html_mono/mh-e.html
-
 motti          node    ${GS}/motti/manual/
 
 ocrad          mono    ${GS}/ocrad/manual/ocrad_manual.html
 
+pascal         mono    http://www.gnu-pascal.de/gpc/
+
 pspp           mono    ${GS}/pspp/manual/pspp.html
 pspp           node    ${GS}/pspp/manual/html_node/
 
@@ -160,6 +261,12 @@
 
 texinfo                mono    ${GS}/texinfo/manual/texinfo/texinfo.html
 texinfo                node    ${GS}/texinfo/manual/texinfo/html_node/
+ #
+ info          mono    ${GS}/texinfo/manual/info/info.html
+ info          node    ${GS}/texinfo/manual/info/html_node/
+ #
+ info-stnd     mono    ${GS}/texinfo/manual/info-stnd/info-stnd.html
+ info-stnd     node    ${GS}/texinfo/manual/info-stnd/html_node/
 
 units          mono    ${GS}/units/manual/units.html
 units          node    ${GS}/units/manual/html_node/