- updated for 4.8

Changed files:
    texinfo-info.patch -> 1.13

diff --git a/texinfo-info.patch b/texinfo-info.patch
index 360c341c3a36c4e82029264586d236d2e43c276e..99d4c1c4556cfe458d15c6260e1187b8cc5fb781 100644 (file)
--- a/texinfo-info.patch
+++ b/texinfo-info.patch
@@ -43,9 +43,9 @@
  @end direntry
  
  @titlepage
---- texinfo-4.7/doc/texinfo.txi.orig   2004-04-09 23:30:07.000000000 +0200
-+++ texinfo-4.7/doc/texinfo.txi        2004-04-12 13:23:06.957398368 +0200
-@@ -54,13 +54,13 @@
+--- texinfo-4.8/doc/texinfo.txi.orig   2004-12-29 16:06:41.000000000 +0100
++++ texinfo-4.8/doc/texinfo.txi        2005-01-08 00:19:43.541783216 +0100
+@@ -54,14 +54,14 @@
  @end quotation
  @end copying
  
@@ -55,17 +55,19 @@
 -* Texinfo: (texinfo).           The GNU documentation format.
 -* install-info: (texinfo)Invoking install-info. Update info/dir entries.
 -* texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
+-* texi2pdf: (texinfo)PDF Output.                PDF output for Texinfo.
 -* texindex: (texinfo)Format with tex/texindex.  Sort Texinfo index files.
 -* makeinfo: (texinfo)Invoking makeinfo.         Translate Texinfo source.
 +* Texinfo: (texinfo).                 The GNU documentation format
 +* install-info: (texinfo)install-info.        Update info/dir entries
 +* texi2dvi: (texinfo)texi2dvi.                Print Texinfo documents
++* texi2pdf: (texinfo)texi2pdf.                PDF output for Texinfo
 +* texindex: (texinfo)texindex.                Sort Texinfo index files
 +* makeinfo: (texinfo)makeinfo.                Translate Texinfo source
  @end direntry
  
  @c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
-@@ -553,8 +553,8 @@
+@@ -556,8 +556,8 @@
  Formatting and Printing Hardcopy
  
  * Use TeX::                     Use @TeX{} to format for hardcopy.
@@ -76,7 +78,16 @@
  * Print with lpr::              How to print.
  * Within Emacs::                How to format and print from an Emacs shell.
  * Texinfo Mode Printing::       How to format and print in Texinfo mode.
-@@ -578,7 +578,7 @@
+@@ -570,7 +570,7 @@
+ * pagesizes::                   How to print with customized page sizes.
+ * Cropmarks and Magnification:: How to print marks to indicate the size
+                                  of pages and how to print scaled up output.
+-* PDF Output::                  Portable Document Format output.
++* texi2pdf::                    Portable Document Format output.
+ * Obtaining TeX::               How to Obtain @TeX{}.
+ 
+ Creating and Installing Info Files
+@@ -581,7 +581,7 @@
  Creating an Info File
  
  * makeinfo advantages::         @code{makeinfo} provides better error checking.
@@ -85,7 +96,7 @@
  * makeinfo options::            Specify fill-column and other options.
  * Pointer Validation::          How to check that pointers point somewhere.
  * makeinfo in Emacs::           How to run @code{makeinfo} from Emacs.
-@@ -597,7 +597,7 @@
+@@ -600,7 +600,7 @@
                                   located in other directories.
  * Installing Dir Entries::      How to specify what menu entry to add
                                   to the Info directory.
@@ -94,7 +105,16 @@
  
  Generating HTML
  
-@@ -2433,7 +2433,7 @@
+@@ -906,7 +906,7 @@
+ viewable, among other design goals; for a discussion, see
+ @uref{http://tug.org/TUGboat/Articles/tb22-3/tb72beebeI.pdf}.  Texinfo
+ uses the @command{pdftex} program, a variant of @TeX{}, to output PDF;
+-see @uref{http://tug.org/applications/pdftex}.  @xref{PDF Output}.
++see @uref{http://tug.org/applications/pdftex}.  @xref{texi2pdf}.
+ 
+ @item XML
+ @cindex XML output
+@@ -2438,7 +2438,7 @@
  you must run the @code{texindex} command after first running the
  @code{tex} typesetting command; and then you must run the @code{tex}
  command again.  Or else run the @code{texi2dvi} command which
@@ -103,7 +123,7 @@
  
  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
-@@ -3638,8 +3638,8 @@
+@@ -3645,8 +3645,8 @@
  
  You need to include the @code{@@set@dots{}contentsaftertitlepage}
  commands early in the document (just after @code{@@setfilename}, for
@@ -114,7 +134,7 @@
  example:
  @example
  texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi
-@@ -13478,7 +13478,7 @@
+@@ -13637,7 +13637,7 @@
  problems with @TeX{}.  If you get macro-related errors when producing
  the printed version of a manual, try expanding the macros with
  @command{makeinfo} by invoking @command{texi2dvi} with the @samp{-E}
@@ -123,7 +143,7 @@
  
  @itemize @bullet
  @item
-@@ -13704,8 +13704,8 @@
+@@ -13906,8 +13906,8 @@
  
  @menu
  * Use TeX::                     Use @TeX{} to format for hardcopy.
@@ -134,7 +154,16 @@
  * Print with lpr::              How to print.
  * Within Emacs::                How to format and print from an Emacs shell.
  * Texinfo Mode Printing::       How to format and print in Texinfo mode.
-@@ -13737,7 +13737,7 @@
+@@ -13920,7 +13920,7 @@
+ * pagesizes::                   How to print with customized page sizes.
+ * Cropmarks and Magnification:: How to print marks to indicate the size
+                                  of pages and how to print scaled up output.
+-* PDF Output::                  Portable Document Format output.
++* texi2pdf::                    Portable Document Format output.
+ * Obtaining TeX::               How to Obtain @TeX{}.
+ @end menu
+ 
+@@ -13939,7 +13939,7 @@
  File}).
  
  
@@ -143,16 +172,7 @@
  @section Format with @code{tex} and @code{texindex}
  @cindex Shell formatting with @code{tex} and @code{texindex}
  @cindex Formatting with @code{tex} and @code{texindex}
-@@ -13758,7 +13758,7 @@
- @pindex texindex
- The @code{tex} formatting command itself does not sort the indices; it
- writes an output file of unsorted index data.  (The @code{texi2dvi}
--command automatically generates indices; @pxref{Format with texi2dvi,,
-+command automatically generates indices; @pxref{texi2dvi,,
- Format with @code{texi2dvi}}.)  To generate a printed index after
- running the @code{tex} command, you first need a sorted index to work
- from.  The @code{texindex} command sorts indices.  (The source file
-@@ -13835,7 +13835,7 @@
+@@ -14036,7 +14036,7 @@
  
  @pindex texi2dvi
  Alternatively, it's a one-step process: run @code{texi2dvi}
@@ -161,7 +181,7 @@
  
  You need not run @code{texindex} each time after you run @code{tex}.  If
  you do not, on the next run, the @code{tex} formatting command will use
-@@ -13867,7 +13867,7 @@
+@@ -14068,7 +14068,7 @@
  (@pxref{Pointer Validation}).
  
  
@@ -170,7 +190,16 @@
  @section Format with @code{texi2dvi}
  @pindex texi2dvi @r{(shell script)}
  
-@@ -14419,7 +14419,7 @@
+@@ -14103,7 +14103,7 @@
+ @pxref{Preparing for TeX,,Preparing for @TeX{}}).
+ 
+ With the @option{--pdf} option, @command{texi2dvi} produces PDF output
+-instead of DVI (@pxref{PDF Output}), by running @command{pdftex}
++instead of DVI (@pxref{texi2pdf}), by running @command{pdftex}
+ instead of @command{tex}.  Alternatively, the command
+ @command{texi2pdf} is an abbreviation for running @samp{texi2dvi --pdf}.
+ 
+@@ -14631,7 +14631,7 @@
  @xref{small}, for information about
  commands that make it easier to produce examples for a smaller manual.
  
@@ -179,7 +208,7 @@
  @TeX{}}, for other ways to format with @code{@@smallbook} that do not
  require changing the source file.
  
-@@ -14449,7 +14449,7 @@
+@@ -14661,7 +14661,7 @@
  @end group
  @end example
  
@@ -188,7 +217,7 @@
  @TeX{}}, for other ways to format for different paper sizes that do not
  require changing the source file.
  
-@@ -14495,7 +14495,7 @@
+@@ -14707,7 +14707,7 @@
  margins, you must define a new command in @file{texinfo.tex} (or
  @file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}).
  
@@ -197,7 +226,25 @@
  @TeX{}}, for other ways to specify @code{@@pagesizes} that do not
  require changing the source file.
  
-@@ -14658,7 +14658,7 @@
+@@ -14776,7 +14776,7 @@
+ magnifications.  Be prepared to experiment.
+ 
+ 
+-@node PDF Output
++@node texi2pdf
+ @section PDF Output
+ @cindex PDF output
+ 
+@@ -14784,7 +14784,7 @@
+ The simplest way to generate PDF output from Texinfo source is to run
+ the convenience script @command{texi2pdf}; this simply executes the
+ @command{texi2dvi} script with the @option{--pdf} option
+-(@pxref{Format with texi2dvi}).  If for some reason you want to
++(@pxref{texi2dvi}).  If for some reason you want to
+ process by hand, simply run the @command{pdftex} program instead of
+ plain @command{tex}.  That is, run @samp{pdftex foo.texi} instead of
+ @samp{tex foo.texi}.
+@@ -14888,7 +14888,7 @@
  
  @menu
  * makeinfo advantages::         @code{makeinfo} provides better error checking.
@@ -206,7 +253,7 @@
  * makeinfo options::            Specify fill-column and other options.
  * Pointer Validation::          How to check that pointers point somewhere.
  * makeinfo in Emacs::           How to run @code{makeinfo} from Emacs.
-@@ -14690,7 +14690,7 @@
+@@ -14920,7 +14920,7 @@
  @code{makeinfo}.
  
  
@@ -215,7 +262,7 @@
  @subsection Running @code{makeinfo} from a Shell
  @pindex makeinfo
  
-@@ -15383,7 +15383,7 @@
+@@ -15620,7 +15620,7 @@
                                   located in other directories.
  * Installing Dir Entries::      How to specify what menu entry to add
                                   to the Info directory.
@@ -224,7 +271,7 @@
  @end menu
  
  
-@@ -15689,7 +15689,7 @@
+@@ -15926,7 +15926,7 @@
  traditional @command{man} system.
  
  
@@ -233,7 +280,7 @@
  @subsection Invoking @command{install-info}
  @pindex install-info
  
-@@ -16187,7 +16187,7 @@
+@@ -16442,7 +16442,7 @@
  
  In standard Texinfo, node names may not contain @@-commands.
  @command{makeinfo} has an option @option{--commands-in-node-names}