---- texinfo-6.0/doc/info-stnd.texi.orig 2015-07-17 21:06:08.870188902 +0200
-+++ texinfo-6.0/doc/info-stnd.texi 2015-07-17 21:09:52.940179499 +0200
-@@ -41,9 +41,9 @@
- license to the document, as described in section 6 of the license.
- @end copying
-
--@dircategory Texinfo documentation system
-+@dircategory Texinfo documentation system:
- @direntry
--* info stand-alone: (info-stnd). Read Info documents without Emacs.
-+* info stand-alone: (info-stnd). Read Info documents without Emacs
- @end direntry
-
- @titlepage
---- texinfo-7.0.1/doc/texinfo.texi.orig 2022-11-30 18:06:28.000000000 +0100
-+++ texinfo-7.0.1/doc/texinfo.texi 2022-12-15 21:06:45.579125662 +0100
-@@ -43,17 +43,17 @@ Texts. A copy of the license is include
+--- texinfo-7.1/doc/texinfo.texi.orig 2023-10-18 14:30:47.000000000 +0200
++++ texinfo-7.1/doc/texinfo.texi 2023-11-04 00:25:57.719850317 +0100
+@@ -45,17 +45,17 @@
@end quotation
@end copying
@end direntry
@set txiindexatsignignore
-@@ -513,8 +513,8 @@ Include Files
- Formatting and Printing with @TeX{}
-
- * Use @TeX{}:: Use @TeX{} to format for hardcopy.
--* Format with @command{texi2dvi} or @command{texi2pdf}:: The simplest way to format.
--* Format with @command{tex}/@command{texindex}:: Formatting with explicit shell commands.
-+* @command{texi2dvi} or @command{texi2pdf}:: The simplest way to format.
-+* @command{tex}/@command{texindex}:: Formatting with explicit shell commands.
- * Print with @command{lpr}:: How to print.
- * Printing with Emacs:: How to format with @TeX{} and print with Emacs.
- * Requirements Summary:: @TeX{} formatting requirements summary.
-@@ -534,7 +534,7 @@ Formatting and Printing with Emacs
-
- @command{texi2any}: The Generic Translator for Texinfo
-
--* Invoking @command{texi2any}:: Running the translator from a shell.
-+* @command{texi2any}:: Running the translator from a shell.
- * @command{texi2any} Environment Variables::
- * @command{texi2any} Printed Output:: Calling @command{texi2dvi}.
- * Customization Variables:: Configuring @command{texi2any}.
-@@ -570,7 +570,7 @@ Installing an Info File
- located in other directories.
- * Installing Dir Entries:: How to specify what menu entry to add
- to the Info directory.
--* Invoking @command{install-info}:: @code{install-info} options.
-+* @command{install-info}:: @code{install-info} options.
-
- Generating HTML
-
-@@ -1785,7 +1785,7 @@ processed from standard input, without a
+@@ -1171,7 +1171,7 @@
base file name from, @code{@@setfilename} could still be relevant.
This is not the only way, however: @option{--output} option specifies
the output file name on the @command{texi2any} command-line
@cindex Length of file names
@cindex File name collision
-@@ -12370,8 +12370,7 @@ included. This will generally not be th
+@@ -11845,8 +11845,7 @@
itself, but will usually be the case for up-to-date distributions of
the extended @TeX{} programs @command{etex} (DVI output) and
@command{pdftex} (PDF output). @command{texi2dvi} will use the
@cindex ISO 639-2 language codes
@cindex ISO 3166 country codes
-@@ -13685,8 +13684,8 @@ Also, quite a few macro-related construc
+@@ -13163,8 +13162,8 @@
some of the caveats are listed below. Thus, if you get macro-related
errors when producing the printed version of a manual, you might try
expanding the macros with @command{texi2any} by invoking
and use a language designed for macro processing, such as M4
(@pxref{External Macro Processors}).
-@@ -14096,8 +14095,8 @@ use @command{texi2any}'s macro expansion
+@@ -13704,8 +13703,8 @@
@itemize @bullet
@item
will run @command{texi2any} first to expand macros and eliminate
@samp{#line}.
-@@ -14403,8 +14402,8 @@ Details are in the following sections.
-
- @menu
- * Use @TeX{}:: Use @TeX{} to format for hardcopy.
--* Format with @command{texi2dvi} or @command{texi2pdf}:: The simplest way to format.
--* Format with @command{tex}/@command{texindex}:: Formatting with explicit shell commands.
-+* @command{texi2dvi} or @command{texi2pdf}:: The simplest way to format.
-+* @command{tex}/@command{texindex}:: Formatting with explicit shell commands.
- * Print with @command{lpr}:: How to print.
- * Printing with Emacs:: How to format with @TeX{} and print with Emacs.
- * Requirements Summary:: @TeX{} formatting requirements summary.
-@@ -14434,7 +14433,7 @@ and you can get it over the Internet or
+@@ -13991,7 +13990,7 @@
+ you may also create indices using the @command{texindex} command
+ after first running @TeX{}; and then you must run @TeX{} again.
+ @command{texi2dvi} takes care of all of this, running @TeX{} and
+-@command{texindex} as needed (@pxref{Format with @command{texi2dvi}}).
++@command{texindex} as needed (@pxref{@command{texi2dvi}}).
+
+ @anchor{Within Emacs} @c old node name
+ @anchor{Emacs Shell Printing} @c old node name
+@@ -14035,16 +14034,16 @@
@c please keep that text in sync with www.gnu.org/prep/FTP
-@node Format with @command{texi2dvi} or @command{texi2pdf}
+@node @command{texi2dvi} or @command{texi2pdf}
- @section Format with @command{texi2dvi} or @command{texi2pdf}
+ @nodedescription The simplest way to format.
+-@section Format with @command{texi2dvi} or @command{texi2pdf}
++@section @command{texi2dvi} or @command{texi2pdf}
@c previously in a separate node. To be used when referring
-@@ -14442,7 +14441,7 @@ and you can get it over the Internet or
+ @c only to PDF output, as is the case in @direntry
@anchor{PDF Output}
@c To be used when referring to DVI output or to texi2dvi only,
@c as is the case in @direntry
@pindex texi2dvi @r{(shell script)}
@pindex texi2pdf @r{(shell script)}
-@@ -14602,7 +14601,7 @@ The default is @samp{nomaybe}. This env
+@@ -14202,7 +14201,7 @@
for troubleshooting purposes, and may change or disappear in the future.
-@node Format with @command{tex}/@command{texindex}
+@node @command{tex}/@command{texindex}
+ @nodedescription Formatting with explicit shell commands.
@section Format with @command{tex}/@command{texindex}
- @cindex Shell formatting with @command{tex} and @command{texindex}
-@@ -14740,7 +14739,7 @@ Thus, the beginning of your file would l
+@@ -14336,7 +14335,7 @@
@noindent @code{@@novalidate} also turns off validation in
@command{texi2any}, just like its @code{--no-validate} option
Furthermore, you need not run @command{texindex} each time after you run
@command{tex}. The @command{tex} formatting command simply uses whatever
-@@ -14798,7 +14797,7 @@ file directly.
+@@ -14395,7 +14394,7 @@
For example, the following commands will (probably) suffice to sort
the indices, format, and print this manual using the @command{texi2dvi}
@example
@group
-@@ -15260,7 +15259,7 @@ anything which can be specified on the c
+@@ -14616,7 +14615,7 @@
specified within a initialization file.
- @menu
--* Invoking @command{texi2any}:: Running the translator from a shell.
-+* @command{texi2any}:: Running the translator from a shell.
- * @command{texi2any} Environment Variables::
- * @command{texi2any} Printed Output:: Calling @command{texi2dvi}.
- * Customization Variables:: Configuring @command{texi2any}.
-@@ -15270,10 +15269,10 @@ specified within a initialization file.
- @end menu
-
-@node Invoking @command{texi2any}
+@node @command{texi2any}
+ @nodedescription Running the translator from a shell.
@section Invoking @command{texi2any} from a Shell
--@anchor{Invoking makeinfo}
-+@anchor{makeinfo}
- @pindex makeinfo
- @pindex texi2any
-
-@@ -15932,8 +15931,8 @@ tricks together with @file{texinfo.tex},
+@@ -15275,8 +15274,8 @@
@command{texi2dvi} directly.
The output format options for this are @option{--dvi},
@command{texi2dvi} operation. In addition, the @option{--verbose},
@option{--silent}, and @option{--quiet} options are passed on if
specified; the @option{-I} and @option{-o} options are likewise passed
-@@ -16067,7 +16066,7 @@ variables may not be passed on to @TeX{}
+@@ -15413,7 +15412,7 @@
@cindex Options, customization variables for
The following table gives the customization variables associated with
meaning of the options.
@multitable @columnfractions 0.5 0.5
-@@ -16141,7 +16140,7 @@ forms:
+@@ -15487,7 +15486,7 @@
@itemx xml
These correspond to the command-line options (and
@code{TEXINFO_OUTPUT_FORMAT} environment variable values) of the same
-name. @xref{Invoking @command{texi2any}}.
+name. @xref{@command{texi2any}}.
- @item debugtree
@cindex tree representation, for debugging
-@@ -17368,7 +17367,7 @@ Info.)
- located in other directories.
- * Installing Dir Entries:: How to specify what menu entry to add
- to the Info directory.
--* Invoking @command{install-info}:: @code{install-info} options.
-+* @command{install-info}:: @code{install-info} options.
- @end menu
+ @cindex debugging document, with tree representation
+@@ -16130,13 +16129,13 @@
+ For Info output, column at which to start a menu entry description
+ provided by @code{@@nodedescription} or @code{@@nodedescriptionblock}.
+ Undefined by default, in which case 45% of the fill column value is used
+-(@pxref{Invoking @command{texi2any}}).
++(@pxref{@command{texi2any}}).
+ @item AUTO_MENU_MAX_WIDTH
+ Maximum number of columns in a menu entry line in Info when adding a
+ description from @code{@@nodedescription} or @code{@@nodedescriptionblock}.
+ Undefined by default, in which case 10% more than the fill column value
+-is used (@pxref{Invoking @command{texi2any}}).
++is used (@pxref{@command{texi2any}}).
-@@ -17605,7 +17604,7 @@ start at column 32, starting at zero (as
+ @item CHECK_MISSING_MENU_ENTRY
+ When a @code{@@menu} block occurs in a node, check if there is a menu
+@@ -17063,7 +17062,7 @@
most others. Description for individual utilities best start in
column 48, where possible. For more information about formatting see
the @samp{--calign}, @samp{--align}, and @samp{--max-width} options in
If you use @code{@@dircategory} more than once in the Texinfo source,
each usage specifies the `current' category; any subsequent
-@@ -17618,7 +17617,7 @@ documentation for the different programs
+@@ -17076,7 +17075,7 @@
traditional @command{man} system.
-@node Invoking @command{install-info}
+@node @command{install-info}
+ @nodedescription @code{install-info} options.
@subsection Invoking @command{install-info}
- @pindex install-info
-@@ -17864,7 +17863,7 @@ large Info file into shorter @dfn{indire
+@@ -17323,7 +17322,7 @@
300,000 characters each. With @command{texi2any}, splitting
may be prevented by @option{--no-split}, and the default size
of 300,000 characters may be modified with @option{--split-size}
When a file is split, Info itself makes use of a shortened version of
the original file that contains just the tag table and references to
-@@ -18044,7 +18043,7 @@ with which you can influence the HTML ou
- Variables}. You can also write so-called @dfn{initialization files}, or
- @dfn{init files} for short, to modify almost every aspect of HTML output
- formatting. Initialization files contain code and are loaded by
--@option{--init-file} (@pxref{Invoking @command{texi2any}}).
-+@option{--init-file} (@pxref{@command{texi2any}}).
+@@ -17505,7 +17504,7 @@
+ @code{@@example} (@pxref{Syntax Highlighting}). You can also write so-called
+ @dfn{initialization files}, or @dfn{init files} for short, to modify almost
+ every aspect of HTML output formatting. Initialization files contain code and
+-are loaded by @option{--init-file} (@pxref{Invoking @command{texi2any}}).
++are loaded by @option{--init-file} (@pxref{@command{texi2any}}).
Some initialization files are maintained with Texinfo and installed
in the default case. For example, @file{chm.pm} produces the intermediate
-@@ -18144,7 +18143,7 @@ insensitive filesystem by setting the cu
+@@ -17595,7 +17594,7 @@
@code{CASE_INSENSITIVE_FILENAMES}.
It is also possible to split at chapters or sections with
the file names are constructed after the name of the node associated
with the relevant sectioning command. Also, unless
@option{--no-node-files} is specified, a redirection file is output
-@@ -18361,7 +18360,7 @@ The EPUB output file is not generated if
+@@ -17816,7 +17815,7 @@
is left after the final EPUB file has been generated if
@code{EPUB_KEEP_CONTAINER_FOLDER} is set.
@node EPUB Cross-References
-@@ -22087,8 +22086,7 @@ then print the file. Optionally, you ma
- this, you must run the @command{texindex} command after first running the
- @command{tex} typesetting command; and then you must run the
- @command{tex} command again. Or else run the @command{texi2dvi}
--command which automatically creates indices as needed (@pxref{Format
--with @command{texi2dvi}}).
-+command which automatically creates indices as needed (@pxref{@command{texi2dvi}}).
-
- Often, when you are writing a document, you want to typeset and print
- only part of a file to see what it will look like. You can use the
-@@ -23506,7 +23504,7 @@ have been called the @code{@@regularbook
+@@ -23111,7 +23110,7 @@
called the @code{@@smallbook} command by comparison to the 8.5 by 11
inch format.)
and @ref{Preparing for @TeX{}}, for other ways to format with
@code{@@smallbook} with @TeX{} that do not require changing the source file.
-@@ -23531,7 +23529,7 @@ You may or may not prefer the formatting
+@@ -23137,7 +23136,7 @@
wide format, @code{@@afivepaper} for A5 paper, and @code{@@bsixpaper} for
B6 paper.
and @ref{Preparing for @TeX{}}, for other ways to format for different
paper sizes that do not require changing the source file.
-@@ -23574,7 +23572,7 @@ To make more elaborate changes, such as
+@@ -23181,7 +23180,7 @@
margins, you must define a new command in @file{texinfo.tex} or
@file{texinfo.cnf}.