X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=texinfo-info.patch;h=c3822c51bc6ca23e554a22ecd85cd77db23ce63f;hb=e63b1e8bf191bf54594ab3a9d9af8dcbba6cbc01;hp=e57b764306f30171853b5aa281d07d88d09d4477;hpb=8dfb164e9d85ecb10be7cb0b79787ecd8283e03b;p=packages%2Ftexinfo.git diff --git a/texinfo-info.patch b/texinfo-info.patch index e57b764..c3822c5 100644 --- a/texinfo-info.patch +++ b/texinfo-info.patch @@ -1,36 +1,41 @@ ---- texinfo-3.12h/doc/info-stnd.texi Mon Mar 22 21:01:11 1999 -+++ texinfo-3.12h.new/doc/info-stnd.texi Wed May 12 20:24:26 1999 -@@ -10,9 +10,9 @@ +diff -ur texinfo-4.1-/doc/info-stnd.texi texinfo-4.1/doc/info-stnd.texi +--- texinfo-4.1-/doc/info-stnd.texi Sat Mar 2 16:03:54 2002 ++++ texinfo-4.1/doc/info-stnd.texi Sat Mar 9 15:58:09 2002 +@@ -10,10 +10,10 @@ - @include version.texi + @include version-stnd.texi -@dircategory Texinfo documentation system +@dircategory Texinfo documentation system: @direntry --* standalone info program: (info-stnd). Standalone Info-reading program. -+* standalone 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)Invoking infokey. Compile Info customizations. @end direntry @ifinfo ---- texinfo-3.12h/doc/info.texi Sat Mar 20 18:30:24 1999 -+++ texinfo-3.12h.new/doc/info.texi Wed May 12 20:25:30 1999 -@@ -5,9 +5,9 @@ +--- texinfo-4.2/doc/info.texi.orig Mon Mar 18 10:00:32 2002 ++++ texinfo-4.2/doc/info.texi Tue May 7 06:41:06 2002 +@@ -8,9 +8,10 @@ @comment %**end of header @comment $Id$ -@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). How to use the documentation ++ browsing system @end direntry @ifinfo ---- texinfo-3.12h/doc/texinfo.txi Wed Mar 31 22:15:52 1999 -+++ texinfo-3.12h.new/doc/texinfo.txi Wed May 12 20:44:59 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. +diff -ur texinfo-4.3-/doc/texinfo.txi texinfo-4.1/doc/texinfo.txi +--- texinfo-4.3-/doc/texinfo.txi Mon Mar 4 15:52:53 2002 ++++ texinfo-4.3/doc/texinfo.txi Sat Mar 9 15:55:55 2002 +@@ -22,13 +22,13 @@ + + @comment %**end of header -@dircategory Texinfo documentation system +@dircategory Texinfo documentation system: @@ -39,7 +44,7 @@ -* install-info: (texinfo)Invoking install-info. Update info/dir entries. -* texi2dvi: (texinfo)Format with texi2dvi. Print Texinfo documents. -* texindex: (texinfo)Format with tex/texindex. Sort Texinfo index files. --* makeinfo: (texinfo)makeinfo Preferred. 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 @@ -47,8 +52,8 @@ +* 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 +@@ -517,8 +517,8 @@ Formatting and Printing Hardcopy * Use TeX:: Use @TeX{} to format for hardcopy. @@ -59,16 +64,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. -@@ -573,7 +573,7 @@ - located in other directories. +@@ -561,7 +561,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 + Include Files -@@ -601,7 +601,7 @@ +@@ -583,7 +583,7 @@ Formatting Mistakes @@ -77,7 +82,7 @@ * 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}. -@@ -2204,7 +2204,7 @@ +@@ -2263,7 +2263,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 @@ -86,18 +91,28 @@ 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 -@@ -3787,8 +3787,8 @@ +@@ -3970,8 +3970,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{(texinfo)texi2dvi}) ++to specify this without altering the source file at all. For + example: @example - texi2dvi --texinfo=@@setshortcontentsaftertitlepage foo.texi -@@ -12420,8 +12420,8 @@ + texi2dvi --texinfo=@@setcontentsaftertitlepage foo.texi +@@ -12680,8 +12680,7 @@ + + If some macro feature causes 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; see @ref{Format +-with texi2dvi}. ++invoking @command{texi2dvi} with the @samp{-E} option; see @ref{texi2dvi}. + + @node alias + @section @samp{@@alias @var{new}=@var{existing}} +@@ -12825,8 +12825,8 @@ @menu * Use TeX:: Use @TeX{} to format for hardcopy. @@ -108,25 +123,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. -@@ -12436,7 +12436,7 @@ - of pages and how to print scaled up output. - @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 -@@ -12461,7 +12461,7 @@ +@@ -12857,7 +12857,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} -@@ -12482,7 +12482,7 @@ +@@ -12878,7 +12878,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} @@ -135,7 +141,7 @@ 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 -@@ -12556,7 +12556,7 @@ +@@ -12955,7 +12955,7 @@ @pindex texi2dvi Alternatively, it's a one-step process: run @code{texi2dvi} @@ -144,25 +150,16 @@ 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 -@@ -12588,7 +12588,7 @@ +@@ -12987,7 +12987,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)} -@@ -12621,7 +12621,7 @@ - For a list of other options, run @samp{texi2dvi --help}. - - --@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)} - -@@ -13093,7 +13093,7 @@ +@@ -13532,7 +13532,7 @@ @xref{small}, for information about commands that make it easier to produce examples for a smaller manual. @@ -171,16 +168,16 @@ @TeX{}}, for other ways to format with @code{@@smallbook} that do not require changing the source file. -@@ -13122,7 +13122,7 @@ +@@ -13562,7 +13562,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. -@@ -13163,7 +13163,7 @@ +@@ -13608,7 +13608,7 @@ margins, you must define a new command in @file{texinfo.tex} (or @file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}). @@ -189,64 +186,43 @@ @TeX{}}, for other ways to specify @code{@@pagesizes} that do not require changing the source file. -@@ -13909,7 +13909,7 @@ - located in other directories. +@@ -14453,7 +14453,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 -@@ -14140,7 +14140,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 -@@ -14158,10 +14158,10 @@ - commands are used in this manual: - - @smallexample --@@dircategory Texinfo documentation system -+@@dircategory Texinfo documentation system: +@@ -14700,7 +14700,7 @@ + @@dircategory Texinfo documentation system @@direntry --* Texinfo: (texinfo). The GNU documentation format. + * Texinfo: (texinfo). The GNU documentation format. -* install-info: (texinfo)Invoking install-info. @dots{} -+* Texinfo: (texinfo) The GNU documentation format -+* install-info: (texinfo)install-info @dots{} ++* install-info: (texinfo)install-info. @dots{} @dots{} @@end direntry @end smallexample -@@ -14169,10 +14169,10 @@ - Here's what this produces in the Info file: - - @smallexample --INFO-DIR-SECTION Texinfo documentation system -+INFO-DIR-SECTION Texinfo documentation system: +@@ -14711,7 +14711,7 @@ + INFO-DIR-SECTION Texinfo documentation system START-INFO-DIR-ENTRY --* Texinfo: (texinfo). The GNU documentation format. + * Texinfo: (texinfo). The GNU documentation format. -* install-info: (texinfo)Invoking install-info. @dots{} -+* Texinfo: (texinfo) The GNU documentation format -+* install-info: (texinfo)install-info @dots{} ++* install-info: (texinfo)install-info. @dots{} @dots{} END-INFO-DIR-ENTRY @end smallexample -@@ -14194,8 +14194,8 @@ - specified categories. - +@@ -14747,7 +14747,7 @@ + traditional @command{man} system. --@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 +-@node Invoking install-info ++@node install-info + @subsection Invoking @command{install-info} @pindex install-info -@@ -16729,7 +16729,7 @@ +@@ -17143,7 +17143,7 @@ command and you can use the @kbd{M-x Info-validate} command.@refill @menu @@ -255,7 +231,7 @@ * 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}. -@@ -16737,7 +16737,7 @@ +@@ -17151,7 +17151,7 @@ * Running Info-Validate:: How to find badly referenced nodes. @end menu @@ -264,7 +240,7 @@ @ifinfo @heading @code{makeinfo} Find Errors @end ifinfo -@@ -16756,7 +16756,7 @@ +@@ -17170,7 +17170,7 @@ cannot use @code{makeinfo}, or your problem is very puzzling, then you may want to use the tools described in this appendix.@refill