X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=texinfo-info.patch;h=99d4c1c4556cfe458d15c6260e1187b8cc5fb781;hb=fde37d0129fc906c9e14dbabeec5bc1d4304e457;hp=96a2c804f70ce2c1a5a6d718797b3c4029a5adc1;hpb=88542f059f2ec230c641f6d290706d38c9706b53;p=packages%2Ftexinfo.git diff --git a/texinfo-info.patch b/texinfo-info.patch index 96a2c80..99d4c1c 100644 --- a/texinfo-info.patch +++ b/texinfo-info.patch @@ -1,39 +1,53 @@ -diff -Nru texinfo-3.12f/doc/info-stnd.texi texinfo-3.12f.new/doc/info-stnd.texi ---- texinfo-3.12f/doc/info-stnd.texi Fri Mar 5 20:55:59 1999 -+++ texinfo-3.12f.new/doc/info-stnd.texi Fri Apr 2 09:49:27 1999 -@@ -10,9 +10,9 @@ - - @include version.texi +--- texinfo-4.7/doc/info-stnd.texi.orig 2004-03-24 02:41:06.000000000 +0100 ++++ texinfo-4.7/doc/info-stnd.texi 2004-04-12 13:07:58.150558008 +0200 +@@ -35,10 +35,10 @@ + @end quotation + @end copying -@dircategory Texinfo documentation system +@dircategory Texinfo documentation system: @direntry --* info program: (info-stnd). Standalone Info-reading program. -+* info program: (info-stnd) Standalone Info-reading program +-* info standalone: (info-stnd). Read Info documents without Emacs. +-* infokey: (info-stnd)Invoking infokey. Compile Info customizations. ++* info standalone: (info-stnd). Read Info documents without Emacs ++* infokey: (info-stnd)infokey. Compile Info customizations @end direntry - @ifinfo -diff -Nru texinfo-3.12f/doc/info.texi texinfo-3.12f.new/doc/info.texi ---- texinfo-3.12f/doc/info.texi Wed Jan 20 22:33:25 1999 -+++ texinfo-3.12f.new/doc/info.texi Fri Apr 2 09:50:02 1999 -@@ -5,9 +5,9 @@ - @comment %**end of header - @comment $Id$ + @titlepage +@@ -1963,12 +1963,12 @@ + textual source file using the @code{infokey} command. + + @menu +-* Invoking infokey:: ++* infokey:: + * infokey source format:: + @end menu + + +-@node Invoking infokey ++@node infokey + @section Invoking @command{infokey} + + @cindex invoking infokey +--- texinfo-4.7/doc/info.texi.orig 2004-04-06 10:21:35.000000000 +0200 ++++ texinfo-4.7/doc/info.texi 2004-04-12 13:08:41.859913176 +0200 +@@ -37,9 +37,9 @@ + @end quotation + @end copying -@dircategory Texinfo documentation system +@dircategory Texinfo documentation system: @direntry --* Info: (info). Documentation browsing system. -+* Info: (info) Documentation browsing system +-* Info: (info). How to use the documentation browsing system. ++* Info: (info). The documentation browsing system @end direntry - @ifinfo -diff -Nru texinfo-3.12f/doc/texinfo.txi texinfo-3.12f.new/doc/texinfo.txi ---- texinfo-3.12f/doc/texinfo.txi Fri Mar 5 23:53:51 1999 -+++ texinfo-3.12f.new/doc/texinfo.txi Fri Apr 2 09:56:53 1999 -@@ -26,13 +26,13 @@ - @c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a - @c prefix arg). This updates the node pointers, which texinfmt.el needs. + @titlepage +--- 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 -@dircategory Texinfo documentation system +@dircategory Texinfo documentation system: @@ -41,46 +55,66 @@ diff -Nru texinfo-3.12f/doc/texinfo.txi texinfo-3.12f.new/doc/texinfo.txi -* 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)makeinfo Preferred. Translate Texinfo source. -+* Texinfo: (texinfo) The GNU documentation format -+* install-info: (texinfo)install-info Update info/dir entries -+* texi2dvi: (texinfo)texi2dvi Print Texinfo documents -+* texindex: (texinfo)texindex Sort Texinfo index files -+* makeinfo: (texinfo)makeinfo Translate Texinfo source +-* 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 Set smallbook if printing in smallbook format so the example of the -@@ -535,8 +535,8 @@ + @c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a +@@ -556,8 +556,8 @@ Formatting and Printing Hardcopy * Use TeX:: Use @TeX{} to format for hardcopy. -* Format with tex/texindex:: How to format with explicit shell commands. -* Format with texi2dvi:: A simpler way to format. -+* texindex:: How to format with explicit shell commands. -+* texi2dvi:: A simpler way to format. ++* texindex:: How to format with explicit shell commands. ++* texi2dvi:: A simpler way to format. * 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. -@@ -573,7 +573,7 @@ - located in other directories. +@@ -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. +-* Invoking makeinfo:: How to run @code{makeinfo} from a shell. ++* makeinfo:: How to run @code{makeinfo} from a shell. + * 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. +@@ -600,7 +600,7 @@ + located in other directories. * Installing Dir Entries:: How to specify what menu entry to add - to the Info directory. + to the Info directory. -* Invoking install-info:: @code{install-info} options. -+* install-info:: @code{install-info} options. ++* install-info:: @code{install-info} options. - Sample Permissions + Generating HTML -@@ -601,7 +601,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}. - Formatting Mistakes - --* makeinfo Preferred:: @code{makeinfo} finds errors. -+* makeinfo:: @code{makeinfo} finds errors. - * Debugging with Info:: How to catch errors with Info formatting. - * Debugging with TeX:: How to catch errors with @TeX{} formatting. - * Using texinfo-show-structure:: How to use @code{texinfo-show-structure}. -@@ -2206,7 +2206,7 @@ + @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 @@ -89,56 +123,56 @@ diff -Nru texinfo-3.12f/doc/texinfo.txi texinfo-3.12f.new/doc/texinfo.txi 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 -@@ -3748,8 +3748,8 @@ +@@ -3645,8 +3645,8 @@ You need to include the @code{@@set@dots{}contentsaftertitlepage} commands early in the document (just after @code{@@setfilename}, for --example). Or, if you're using @command{texi2dvi} (@pxref{Format with --texi2dvi}), you can use its @option{--texinfo} option to specify this -+example). Or, if you're using @command{texi2dvi} (@pxref{texi2dvi}), -+you can use its @option{--texinfo} option to specify this - without altering the source file at all. For example: +-example). We recommend using @command{texi2dvi} (@pxref{Format with +-texi2dvi}) to specify this without altering the source file at all. For ++example). We recommend using @command{texi2dvi} (@pxref{texi2dvi}) ++to specify this without altering the source file at all. For + example: @example - texi2dvi --texinfo=@@setshortcontentsaftertitlepage foo.texi -@@ -12356,8 +12356,8 @@ + texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi +@@ -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} +-option (@pxref{Format with texi2dvi}). ++option (@pxref{texi2dvi}). + + @itemize @bullet + @item +@@ -13906,8 +13906,8 @@ @menu * Use TeX:: Use @TeX{} to format for hardcopy. -* Format with tex/texindex:: How to format with explicit shell commands. -* Format with texi2dvi:: A simpler way to format. -+* texindex:: How to format with explicit shell commands. -+* texi2dvi:: A simpler way to format. ++* texindex:: How to format with explicit shell commands. ++* texi2dvi:: A simpler way to format. * 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. -@@ -12372,7 +12372,7 @@ - of pages and how to print scaled up output. +@@ -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 --@node Use TeX, Format with tex/texindex, Hardcopy, Hardcopy -+@node Use TeX, texindex, Hardcopy, Hardcopy - @section Use @TeX{} - - The typesetting program called @TeX{} is used for formatting a Texinfo -@@ -12397,7 +12397,7 @@ +@@ -13939,7 +13939,7 @@ + File}). - --@node Format with tex/texindex, Format with texi2dvi, Use TeX, Hardcopy -+@node texindex, texi2dvi, Use TeX, Hardcopy +-@node Format with tex/texindex ++@node texindex @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} -@@ -12418,7 +12418,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 -@@ -12492,7 +12492,7 @@ +@@ -14036,7 +14036,7 @@ @pindex texi2dvi Alternatively, it's a one-step process: run @code{texi2dvi} @@ -147,25 +181,25 @@ diff -Nru texinfo-3.12f/doc/texinfo.txi texinfo-3.12f.new/doc/texinfo.txi 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 -@@ -12524,7 +12524,7 @@ +@@ -14068,7 +14068,7 @@ (@pxref{Pointer Validation}). --@node Format with texi2dvi, Print with lpr, Format with tex/texindex, Hardcopy -+@node texi2dvi, Print with lpr, texindex, Hardcopy +-@node Format with texi2dvi ++@node texi2dvi @section Format with @code{texi2dvi} @pindex texi2dvi @r{(shell script)} -@@ -12557,7 +12557,7 @@ - For a list of other options, run @samp{texi2dvi --help}. - +@@ -14103,7 +14103,7 @@ + @pxref{Preparing for TeX,,Preparing for @TeX{}}). --@node Print with lpr, Within Emacs, Format with texi2dvi, Hardcopy -+@node Print with lpr, Within Emacs, texi2dvi, Hardcopy - @section Shell Print Using @code{lpr -d} - @pindex lpr @r{(DVI print command)} + 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}. -@@ -13029,7 +13029,7 @@ +@@ -14631,7 +14631,7 @@ @xref{small}, for information about commands that make it easier to produce examples for a smaller manual. @@ -174,16 +208,16 @@ diff -Nru texinfo-3.12f/doc/texinfo.txi texinfo-3.12f.new/doc/texinfo.txi @TeX{}}, for other ways to format with @code{@@smallbook} that do not require changing the source file. -@@ -13058,7 +13058,7 @@ +@@ -14661,7 +14661,7 @@ @end group @end example -@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for +@xref{texi2dvi}, and @ref{Preparing for TeX,,Preparing for - @TeX{}}, for other ways to format with @code{@@afourpaper} that do not + @TeX{}}, for other ways to format for different paper sizes that do not require changing the source file. -@@ -13099,7 +13099,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{}}). @@ -192,77 +226,66 @@ diff -Nru texinfo-3.12f/doc/texinfo.txi texinfo-3.12f.new/doc/texinfo.txi @TeX{}}, for other ways to specify @code{@@pagesizes} that do not require changing the source file. -@@ -13847,7 +13847,7 @@ - located in other directories. +@@ -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. +-* Invoking makeinfo:: How to run @code{makeinfo} from a shell. ++* makeinfo:: How to run @code{makeinfo} from a shell. + * 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. +@@ -14920,7 +14920,7 @@ + @code{makeinfo}. + + +-@node Invoking makeinfo ++@node makeinfo + @subsection Running @code{makeinfo} from a Shell + @pindex makeinfo + +@@ -15620,7 +15620,7 @@ + located in other directories. * Installing Dir Entries:: How to specify what menu entry to add - to the Info directory. + to the Info directory. -* Invoking install-info:: @code{install-info} options. -+* install-info:: @code{install-info} options. ++* install-info:: @code{install-info} options. @end menu - @node Directory file, New Info File, Install an Info File, Install an Info File -@@ -14078,7 +14078,7 @@ - special CTRL-_ character that Info needs will be present. - - --@node Installing Dir Entries, Invoking install-info, Other Info Directories, Install an Info File -+@node Installing Dir Entries, install-info, Other Info Directories, Install an Info File - @section Installing Info Directory Files - - When you install an Info file onto your system, you can use the program -@@ -14099,7 +14099,7 @@ - @@dircategory Texinfo documentation system - @@direntry - * Texinfo: (texinfo). The GNU documentation format. --* install-info: (texinfo)Invoking install-info. @dots{} -+* install-info: (texinfo)install-info @dots{} - @dots{} - @@end direntry - @end smallexample -@@ -14110,7 +14110,7 @@ - INFO-DIR-SECTION Texinfo documentation system - START-INFO-DIR-ENTRY - * Texinfo: (texinfo). The GNU documentation format. --* install-info: (texinfo)Invoking install-info. @dots{} -+* install-info: (texinfo)install-info @dots{} - @dots{} - END-INFO-DIR-ENTRY - @end smallexample -@@ -14132,8 +14132,8 @@ - specified categories. - - --@node Invoking install-info, , Installing Dir Entries, Install an Info File --@section Invoking install-info -+@node install-info, , Installing Dir Entries, Install an Info File -+@section install-info +@@ -15926,7 +15926,7 @@ + traditional @command{man} system. + + +-@node Invoking install-info ++@node install-info + @subsection Invoking @command{install-info} @pindex install-info -@@ -16660,7 +16660,7 @@ - command and you can use the @kbd{M-x Info-validate} command.@refill +@@ -16442,7 +16442,7 @@ - @menu --* makeinfo Preferred:: @code{makeinfo} finds errors. -+* makeinfo:: @code{makeinfo} finds errors. - * Debugging with Info:: How to catch errors with Info formatting. - * Debugging with TeX:: How to catch errors with @TeX{} formatting. - * Using texinfo-show-structure:: How to use @code{texinfo-show-structure}. -@@ -16668,7 +16668,7 @@ - * Running Info-Validate:: How to find badly referenced nodes. - @end menu + In standard Texinfo, node names may not contain @@-commands. + @command{makeinfo} has an option @option{--commands-in-node-names} +-which partially supports it (@pxref{Invoking makeinfo}), but it is not ++which partially supports it (@pxref{makeinfo}), but it is not + robust and not recommended. --@node makeinfo Preferred, Debugging with Info, Catching Mistakes, Catching Mistakes -+@node makeinfo, Debugging with Info, Catching Mistakes, Catching Mistakes - @ifinfo - @heading @code{makeinfo} Find Errors - @end ifinfo -@@ -16687,7 +16687,7 @@ - cannot use @code{makeinfo}, or your problem is very puzzling, then you - may want to use the tools described in this appendix.@refill - --@node Debugging with Info, Debugging with TeX, makeinfo Preferred, Catching Mistakes -+@node Debugging with Info, Debugging with TeX, makeinfo, Catching Mistakes - @comment node-name, next, previous, up - @section Catching Errors with Info Formatting - @cindex Catching errors with Info formatting + Thus, @command{makeinfo} also does not fully implement this part of