--- /dev/null
+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
+
+-@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
+ @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$
+
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* Info: (info). Documentation browsing system.
++* Info: (info) 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.
+
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* Texinfo: (texinfo). The GNU documentation format.
+-* 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.
++* 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
+ @end direntry
+
+ @c Set smallbook if printing in smallbook format so the example of the
+@@ -535,8 +535,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.
+ * 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.
+ * Installing Dir Entries:: How to specify what menu entry to add
+ to the Info directory.
+-* Invoking install-info:: @code{install-info} options.
++* install-info:: @code{install-info} options.
+
+ Sample Permissions
+
+@@ -601,7 +601,7 @@
+
+ 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 @@
+ 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
+-automatically creates indices as needed (@pxref{Format with texi2dvi}).
++automatically creates indices as needed (@pxref{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
+@@ -3748,8 +3748,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
+ texi2dvi --texinfo=@@setshortcontentsaftertitlepage foo.texi
+@@ -12356,8 +12356,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.
+ * 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.
+ @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 @@
+
+
+
+-@node Format with tex/texindex, Format with texi2dvi, Use TeX, Hardcopy
++@node texindex, texi2dvi, Use TeX, Hardcopy
+ @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 @@
+
+ @pindex texi2dvi
+ Alternatively, it's a one-step process: run @code{texi2dvi}
+-(@pxref{Format with texi2dvi}).
++(@pxref{texi2dvi}).
+
+ 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 @@
+ (@pxref{Pointer Validation}).
+
+
+-@node Format with texi2dvi, Print with lpr, Format with tex/texindex, Hardcopy
++@node texi2dvi, Print with lpr, texindex, Hardcopy
+ @section Format with @code{texi2dvi}
+ @pindex texi2dvi @r{(shell script)}
+
+@@ -12557,7 +12557,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)}
+
+@@ -13029,7 +13029,7 @@
+ @xref{small}, for information about
+ commands that make it easier to produce examples for a smaller manual.
+
+-@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{@@smallbook} that do not
+ require changing the source file.
+
+@@ -13058,7 +13058,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
+ require changing the source file.
+
+@@ -13099,7 +13099,7 @@
+ margins, you must define a new command in @file{texinfo.tex} (or
+ @file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}).
+
+-@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 specify @code{@@pagesizes} that do not
+ require changing the source file.
+
+@@ -13847,7 +13847,7 @@
+ located in other directories.
+ * Installing Dir Entries:: How to specify what menu entry to add
+ to the Info directory.
+-* Invoking 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
+
+ @pindex install-info
+
+@@ -16660,7 +16660,7 @@
+ command and you can use the @kbd{M-x Info-validate} command.@refill
+
+ @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
+
+-@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
--- /dev/null
+--- texinfo-3.12f/util/install-info.c.zlib Wed Mar 17 18:35:46 1999
++++ texinfo-3.12f/util/install-info.c Wed Mar 17 18:35:47 1999
+@@ -19,6 +19,7 @@
+
+ #include "system.h"
+ #include <getopt.h>
++#include <zlib.h>
+
+ static char *progname = "install-info";
+
+@@ -474,7 +475,7 @@
+ COMPRESSION_PROGRAM. The compression program is determined by the
+ magic number, not the filename. */
+
+-FILE *
++gzFile
+ open_possibly_compressed_file (filename, create_callback,
+ opened_filename, compression_program, is_pipe)
+ char *filename;
+@@ -486,7 +487,7 @@
+ char *local_opened_filename, *local_compression_program;
+ int nread;
+ char data[4];
+- FILE *f;
++ gzFile *f;
+
+ /* We let them pass NULL if they don't want this info, but it's easier
+ to always determine it. */
+@@ -494,23 +495,23 @@
+ opened_filename = &local_opened_filename;
+
+ *opened_filename = filename;
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = gzopen (*opened_filename, FOPEN_RBIN);
+ if (!f)
+ {
+ *opened_filename = concat (filename, ".gz", "");
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = gzopen (*opened_filename, FOPEN_RBIN);
+ #ifdef __MSDOS__
+ if (!f)
+ {
+ free (*opened_filename);
+ *opened_filename = concat (filename, ".igz", "");
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = gzopen (*opened_filename, FOPEN_RBIN);
+ }
+ if (!f)
+ {
+ free (*opened_filename);
+ *opened_filename = concat (filename, ".inz", "");
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = gzopen (*opened_filename, FOPEN_RBIN);
+ }
+ #endif
+ if (!f)
+@@ -522,7 +523,7 @@
+ /* And try opening it again. */
+ free (*opened_filename);
+ *opened_filename = filename;
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = gzopen (*opened_filename, FOPEN_RBIN);
+ if (!f)
+ pfatal_with_name (filename);
+ }
+@@ -531,54 +532,7 @@
+ }
+ }
+
+- /* Read first few bytes of file rather than relying on the filename.
+- If the file is shorter than this it can't be usable anyway. */
+- nread = fread (data, sizeof (data), 1, f);
+- if (nread != 1)
+- {
+- /* Empty files don't set errno, so we get something like
+- "install-info: No error for foo", which is confusing. */
+- if (nread == 0)
+- fatal (_("%s: empty file"), *opened_filename);
+- pfatal_with_name (*opened_filename);
+- }
+-
+- if (!compression_program)
+- compression_program = &local_compression_program;
+-
+- if (data[0] == '\x1f' && data[1] == '\x8b')
+-#if STRIP_DOT_EXE
+- /* An explicit .exe yields a better diagnostics from popen below
+- if they don't have gzip installed. */
+- *compression_program = "gzip.exe";
+-#else
+- *compression_program = "gzip";
+-#endif
+- else
+- *compression_program = NULL;
+-
+- if (*compression_program)
+- { /* It's compressed, so fclose the file and then open a pipe. */
+- char *command = concat (*compression_program," -cd <", *opened_filename);
+- if (fclose (f) < 0)
+- pfatal_with_name (*opened_filename);
+- f = popen (command, "r");
+- if (f)
+- *is_pipe = 1;
+- else
+- pfatal_with_name (command);
+- }
+- else
+- { /* It's a plain file, seek back over the magic bytes. */
+- if (fseek (f, 0, 0) < 0)
+- pfatal_with_name (*opened_filename);
+-#if O_BINARY
+- /* Since this is a text file, and we opened it in binary mode,
+- switch back to text mode. */
+- f = freopen (*opened_filename, "r", f);
+-#endif
+- *is_pipe = 0;
+- }
++ *is_pipe = 0;
+
+ return f;
+ }
+@@ -601,7 +555,7 @@
+ char **compression_program;
+ {
+ char *real_name;
+- FILE *f;
++ gzFile *f;
+ int pipe_p;
+ int filled = 0;
+ int data_size = 8192;
+@@ -615,7 +569,7 @@
+
+ for (;;)
+ {
+- int nread = fread (data + filled, 1, data_size - filled, f);
++ int nread = gzread (f, data + filled, data_size - filled);
+ if (nread < 0)
+ pfatal_with_name (real_name);
+ if (nread == 0)
+@@ -634,10 +588,7 @@
+ /* We need to close the stream, since on some systems the pipe created
+ by popen is simulated by a temporary file which only gets removed
+ inside pclose. */
+- if (pipe_p)
+- pclose (f);
+- else
+- fclose (f);
++ gzclose(f);
+
+ *sizep = filled;
+ return data;
+@@ -1245,7 +1196,7 @@
+ warning (_("no entries found for `%s'; nothing deleted"), infile);
+
+ output_dirfile (opened_dirfilename, dir_nlines, dir_lines, n_entries_to_add,
+- entries_to_add, input_sections, compression_program);
++ entries_to_add, input_sections, NULL);
+
+ xexit (0);
+ }
+--- texinfo-3.12f/util/Makefile.in.zlib Wed Mar 17 18:36:17 1999
++++ texinfo-3.12f/util/Makefile.in Wed Mar 17 18:36:25 1999
+@@ -102,7 +102,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lz
+ install_info_SOURCES = install-info.c
+ install_info_OBJECTS = install-info.o
+ install_info_LDADD = $(LDADD)
projects / packages / texinfo.git / commitdiff