[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog doc/texinfo.txi util/texi2dvi...
|
From: |
Karl Berry |
|
Subject: |
texinfo ChangeLog doc/texinfo.txi util/texi2dvi... |
|
Date: |
Fri, 20 Apr 2012 18:52:49 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Karl Berry <karl> 12/04/20 18:52:48
Modified files:
. : ChangeLog
doc : texinfo.txi
util : texi2dvi
tp : texi2any.pl
Log message:
option doc, add --dvipdf option to texi2any
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1353&r2=1.1354
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.434&r2=1.435
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2dvi?cvsroot=texinfo&r1=1.172&r2=1.173
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.124&r2=1.125
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1353
retrieving revision 1.1354
diff -u -b -r1.1353 -r1.1354
--- ChangeLog 20 Apr 2012 18:41:24 -0000 1.1353
+++ ChangeLog 20 Apr 2012 18:52:47 -0000 1.1354
@@ -1,9 +1,12 @@
2012-04-20 Karl Berry <address@hidden>
* util/texi2dvi: more doc on --dvipdf, spelling.
+ * tp/texi2any.pl: new option --dvipdf.
* doc/texinfo.txi (Invoking texi2any) <--macro-expand>:
mention that it implies passing -E to texi2dvi, when requested.
+ (Invoking texi2any): sync with current --help, except for texi2dvi
+ options.
2012-04-19 Patrice Dumas <address@hidden>
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -b -r1.434 -r1.435
--- doc/texinfo.txi 17 Apr 2012 18:23:25 -0000 1.434
+++ doc/texinfo.txi 20 Apr 2012 18:52:47 -0000 1.435
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.434 2012/04/17 18:23:25 karl Exp $
address@hidden $Id: texinfo.txi,v 1.435 2012/04/20 18:52:47 karl Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -15134,8 +15134,8 @@
directives described in the previous section. However,
@file{texinfo.tex} does not and cannot. Therefore, such a line will
be incorrectly typeset verbatim if @TeX{} sees it. The solution is to
-use the (@command{makeinfo}) macro expansion options before running
address@hidden There are three approaches.
+use @command{makeinfo}'s macro expansion options before running
address@hidden There are three approaches:
@itemize @bullet
@item
@@ -15146,8 +15146,8 @@
@item
If you run @command{makeinfo} or its variants (@pxref{Generic
-Translator texi2any,, @command{texi2any}: The Generic Translator}), you
-can specify @option{--no-ifinfo --iftex -E somefile.out}, you can then
+Translator texi2any,, @command{texi2any}: The Generic Translator}),
+you can specify @option{--no-ifinfo --iftex -E somefile.out}, and then
give @file{somefile.out} to @code{texi2dvi} in a separate command.
@item
@@ -15162,7 +15162,7 @@
@code{@@address@hidden@}} command (@pxref{Conditional Commands}), or by
@TeX{} itself, are the (incorrect) line numbers from the derived file
which @TeX{} is reading, rather than the preprocessor-specified line
-numbers. This is another instance of why we recommend running
+numbers. This is another example of why we recommend running
@command{makeinfo} for the best diagnostics (@pxref{makeinfo
advantages,, @code{makeinfo} Advantages}).
@@ -16534,7 +16534,7 @@
that, initialization files provide even more control over the final
output---nearly anything not specified in the Texinfo input file.
Initialization files are written in Perl, like the main program, and
-anything which may be specified on the command line may also be
+anything which can be specified on the command line can also be
specified within a initialization file.
The rest of this chapter goes into the details.
@@ -16556,10 +16556,10 @@
@cindex Implementation, @command{texi2any} as reference
Above, we called @command{texi2any} ``the'' translator for Texinfo
-instead of just ``a'' translator, even though of course it's
+instead of just ``a'' translator, even though (of course) it's
technically and legally possible for other implementations to be
written. The reason is that alternative implementations are highly
-likely to have subtle (or not-so-subtle) differences in behavior, and
+likely to have subtle, or not-so-subtle, differences in behavior, and
thus Texinfo documents would become dependent on the processor.
Therefore, it is important to have a reference implementation that
defines parts of the language not fully specified by the manual (often
@@ -16575,9 +16575,10 @@
implementations (@pxref{History}). The current reference
implementation, @command{texi2any}, inherited the design of
customization and other features from @command{texi2html} (for more on
address@hidden compatibility, @pxref{texi2html}). However,
address@hidden is a full reimplementation: it constructs a tree-based
-representation of the input document for all back-ends to work from.
address@hidden compatibility, @pxref{texi2html,,
address@hidden). However, @code{texi2any} is a full
+reimplementation: it constructs a tree-based representation of the
+input document for all back-ends to work from.
@cindex Texinfo language tests
@cindex Tests, of Texinfo language
@@ -16604,24 +16605,24 @@
@node Invoking texi2any
address@hidden Running @command{texi2any}/@code{makeinfo} from a Shell
address@hidden Invoking @command{texi2any}/@code{makeinfo} from a Shell
@anchor{Invoking makeinfo}
@pindex makeinfo
@pindex texi2any
To process a Texinfo file, invoke @command{texi2any} or
address@hidden followed by the name of the Texinfo file. Also
-select the format you want to output with the appropriate command line
-option (default is Info). Thus, to create the Info file for Bison,
-type the following to the shell:
address@hidden (the two names are synonyms for the same program;
+we'll use the names interchangeably) followed by the name of the
+Texinfo file. Also select the format you want to output with the
+appropriate command line option (default is Info). Thus, to create
+the Info file for Bison, type the following to the shell:
@example
texi2any --info bison.texinfo
@end example
You can specify more than one input file name; each is processed in
-turn. If an input file name is @samp{-}, or no input file names at
-all are given, standard input is read.
+turn. If an input file name is @samp{-}, standard input is read.
@anchor{makeinfo Options}
@cindex @code{makeinfo} options
@@ -16638,9 +16639,9 @@
or a single letter preceded by @samp{-}. You can use abbreviations
for the long option names as long as they are unique.
-For example, you could use the following shell command to create an Info
-file for @file{bison.texinfo} in which each line is filled to only 68
-columns:
+For example, you could use the following shell command to create an
+Info file for @file{bison.texinfo} in which lines are filled to only
+68 columns:
@example
texi2any --fill-column=68 bison.texinfo
@@ -16653,13 +16654,12 @@
@end example
@noindent
-This would keep the Info file together as one possibly very long
-file and would also set the fill column to 70.
+(This would keep the Info file together as one possibly very long
+file and would also set the fill column to 70.)
-The options are:
+The options are (approximately in alphabetical order):
@table @code
-
@item --commands-in-node-names
@opindex --commands-in-node-names
This option now does nothing, but remains for compatibility. (It used
@@ -16670,10 +16670,10 @@
@opindex address@hidden
Prepend @var{path} to the directory search list for finding
customization files that may be loaded with @option{--init-file} (see
-below). @var{path} can be a single directory, or a list of several
-directories separated by the usual path separator character (@samp{:}
-on GNU and Unix systems, @samp{;} on MS-DOS/MS-Windows).
address@hidden Init Files}.
+below). The @var{path} value can be a single directory, or a list of
+several directories separated by the usual path separator character
+(@samp{:} on Unix-like systems, @samp{;} on Windows). @xref{Loading
+Init Files}.
@item address@hidden
@opindex --css-include
@@ -16707,7 +16707,7 @@
@item --docbook
@opindex --docbook
-Generate Docbook output.
+Generate Docbook output (rather than Info).
@item address@hidden
@opindex --document-language
@@ -16720,8 +16720,8 @@
@itemx -e @var{limit}
@opindex address@hidden
@opindex -e @var{limit}
-Specify the maximum number of errors to report before aborting (on the
-assumption that continuing would be useless); default 100.
+Report @var{LIMIT} errors before aborting (on the assumption that
+continuing would be useless); default 100.
@item address@hidden
@itemx -f @var{width}
@@ -16765,24 +16765,25 @@
@itemx -h
@opindex address@hidden, for @command{texi2any}}
@opindex -h
-Print a usage message listing available options, then exit successfully.
+Print a message with available options and basic usage, then exit
+successfully.
@item --html
@opindex --html
-Generate HTML output. By default, the HTML output is split into one
-output file per Texinfo source node, and the split output is written
-into a subdirectory based on the name of the top-level Info file.
address@hidden HTML}.
-
address@hidden -I @var{dir}
address@hidden -I @var{dir}
-Append @var{dir} to the directory search list for finding files that
+Generate HTML output (rather than Info). By default, the HTML output
+is split into one output file per Texinfo source node, and the split
+output is written into a subdirectory based on the name of the
+top-level Info file. @xref{Generating HTML}.
+
address@hidden -I @var{path}
address@hidden -I @var{path}
+Append @var{path} to the directory search list for finding files that
are included using the @code{@@include} command. By default,
address@hidden searches only the current directory. If @var{dir} is
-not given, the current directory @file{.} is appended. Note that
address@hidden can actually be a list of several directories separated by the
-usual path separator character (@samp{:} on Unix, @samp{;} on
-MS-DOS/MS-Windows).
address@hidden searches only the current directory. If @var{path} is
+not given, the current directory is appended. The @var{path} value
+can be a single directory or a list of several directories separated
+by the usual path separator character (@samp{:} on Unix-like systems,
address@hidden;} on Windows).
@item --ifdocbook
@opindex --ifdocbook
@@ -16798,47 +16799,52 @@
@opindex --ifxml
For the given format, process @samp{@@address@hidden and
@samp{@@@var{format}} commands, and do not process
address@hidden@@address@hidden, even if not generating the given output
-format. For instance, if @option{--iftex} is specified, then
address@hidden@@iftex} and @samp{@@tex} blocks will be read, and
address@hidden@@ifnottex} blocks will be ignored, even if @TeX{} is not being
-run.
address@hidden@@address@hidden, regardless of the format being output.
+For instance, if @option{--iftex} is given, then @samp{@@iftex} and
address@hidden@@tex} blocks will be read, and @samp{@@ifnottex} blocks will be
+ignored.
@item --info
@opindex --info
Generate Info output. By default, if the output file contains more
-than about 300,000 bytes, it is split into shorter @dfn{indirect}
-subfiles of about that size. The name of the output file and of the
-indirect subfiles is determined by @code{@@setfilename}
-(@pxref{setfilename}). @xref{Tag and Split Files}.
+than about 300,000 bytes, it is split into shorter subfiles of about
+that size. The name of the output file and any subfiles is determined
+by @code{@@setfilename} (@pxref{setfilename}). @xref{Tag and Split
+Files}.
@item address@hidden
@opindex address@hidden
Load @var{file} as code to modify the behavior and output of the
-generated manual. It is customary to use the @code{.pm} or
-the @code{.init} extensions
-for these customization files, but that is not enforced by anything;
-the @var{file} name is taken literally. @option{--conf-dir} (see
-above) may be used to add to the list of directories in which these
-customization files are searched for. @xref{Loading Init Files}.
+generated manual. It is customary to use the @code{.pm} or the
address@hidden extensions for these customization files, but that is not
+enforced; the @var{file} name can be anything. The
address@hidden option (see above) can be used to add to the list
+of directories in which these customization files are searched for.
address@hidden Init Files}.
@item address@hidden
@opindex address@hidden
address@hidden Internal links, of HTML
In HTML mode, output a tab-separated file containing three columns:
the internal link to an indexed item or item in the table of contents,
the name of the index (or table of contents) in which it occurs, and
the term which was indexed or entered. The items are in the natural
-sorting order for the given element. This can be useful for
+sorting order for the given element. This dump can be useful for
post-processors.
@item address@hidden
@itemx -E @var{file}
@opindex address@hidden
@opindex -E @var{file}
-Output the Texinfo source with all the macros expanded to the named
-file. Normally, the results of macro expansion are used internally by
address@hidden and then discarded. This option can be used by
address@hidden
+Output the Texinfo source, with all Texinfo macros expanded, to
address@hidden Normally, the result of macro expansion is used
+internally by @code{makeinfo} and then discarded.
+
+When the output format being produced requires calling
address@hidden, this option implies passing @code{-E}, with no
+argument (@pxref{Format with texi2dvi,, Format with @code{texi2dvi}}).
+If you don't need the macro-expanded output file, you can use
address@hidden -E} (see @code{--Xopt} below).
@item --no-headers
@opindex --no-headers
@@ -16873,11 +16879,28 @@
@opindex --no-ifxml
For the given format, do not process @samp{@@address@hidden and
@samp{@@@var{format}} commands, and do process
address@hidden@@address@hidden, even if generating the given format. For
-instance, if @option{--no-ifhtml} is specified, then @samp{@@ifhtml}
address@hidden@@address@hidden, regardless of the format being output.
+For instance, if @option{--no-ifhtml} is given, then @samp{@@ifhtml}
and @samp{@@html} blocks will not be read, and @samp{@@ifnothtml}
blocks will be.
address@hidden --no-node-files
address@hidden --node-files
address@hidden --no-node-files
address@hidden --node-files
+When generating HTML, create redirection files for anchors and any
+nodes not already output with the file name corresponding to the node
+name (@pxref{HTML Xref Node Name Expansion}). This makes it possible
+for section- and chapter-level cross-manual references to succeed
+(@pxref{HTML Xref Configuration}).
+
+If the output is split, this is enabled by default. If the output is
+not split, @option{--node-files} enables the creation of the
+redirection files, in addition to the monolithic main output file.
address@hidden suppresses the creation of redirection files
+in any case. This option has no effect with any output format other
+than address@hidden @xref{Generating HTML}.
+
@item --no-number-footnotes
@opindex --no-number-footnotes
Suppress automatic footnote numbering. By default, footnotes are
@@ -16900,31 +16923,14 @@
@cindex Pointer validation, suppressing from command line
Suppress the pointer-validation phase of @code{makeinfo}---a dangerous
thing to do. This can also be done with the @code{@@novalidate}
-command (@pxref{Use TeX,,Use @TeX{}}). Normally, after a Texinfo file
-is processed, some consistency checks are made to ensure that cross
-references can be resolved, etc. @xref{Pointer Validation}.
+command (@pxref{Use TeX,,Use @TeX{}}). Normally, consistency checks
+are made to ensure that cross references can be resolved, etc.
address@hidden Validation}.
@item --no-warn
@opindex --no-warn
Suppress warning messages (but not error messages).
address@hidden --node-files
address@hidden --no-node-files
address@hidden --node-files
address@hidden --no-node-files
-When generating HTML, create redirection files for anchors and for any
-nodes that are not already output with the name corresponding to the
-node name (@pxref{HTML Xref Node Name Expansion}). This option makes
-it possible for section- and chapter-level cross-manual references to
-succeed (@pxref{HTML Xref Configuration}).
-
-This is set by default if the output is split. If the output is not
-split, @option{--node-files} enables the creation of the redirection
-files, in addition to the monolithic main output file.
address@hidden suppresses the creation of redirection files
-in any case. This option has no effect with any output format other
-than address@hidden @xref{Generating HTML}.
-
@item address@hidden
@itemx -o @var{file}
@opindex address@hidden
@@ -16939,22 +16945,27 @@
@samp{--no-split} is implied.
If @var{file} is a directory or ends with a @samp{/} the usual rules
-are used to determine the actual output file name (use
address@hidden@@setfilename} or the input file name) but these files are
-written to the @var{file} directory. For example, @samp{makeinfo -o
-bar/ foo.texi}, with or without @option{--no-split}, will write
address@hidden/foo.info}, and possibly other files under @file{bar/}.
+are used to determine the output file name (namely, use
address@hidden@@setfilename} or the input file name) but the files are written
+to the @var{file} directory. For example, @samp{makeinfo -o bar/
+foo.texi}, with or without @option{--no-split}, will write
address@hidden/foo.info}, and possibly other files, under @file{bar/}.
-When generating HTML, if output is split, @var{file} is used as the
+When generating HTML and output is split, @var{file} is used as the
name for the directory into which all files are written. For example,
@samp{makeinfo -o bar --html foo.texi} will write
@file{bar/index.html}, among other files.
address@hidden -P @var{dir}
address@hidden -P @var{dir}
-Prepend @var{dir} to the directory search list for @code{@@include}.
-If @var{dir} is not given, the current directory @file{.} is prepended.
-See @samp{-I} for more details.
address@hidden address@hidden
address@hidden --outputindent
+This option now does nothing, but remains for compatibility. (It used
+to alter indentation in XML/Docbook output.)
+
address@hidden -P @var{path}
address@hidden -P @var{path}
+Prepend @var{path} to the directory search list for @code{@@include}.
+If @var{path} is not given, the current directory is prepended. See
address@hidden above.
@item address@hidden
@itemx -p @var{indent}
@@ -16962,12 +16973,14 @@
@opindex -p @var{indent}
Set the paragraph indentation style to @var{indent}. The value set by
this option overrides the value set in a Texinfo file by an
address@hidden@@paragraphindent} command (@pxref{paragraphindent}). The value
-of @var{indent} is interpreted as follows:
address@hidden@@paragraphindent} command (@pxref{paragraphindent,,
address@hidden@@paragraphindent}}). The value of @var{indent} is interpreted
+as follows:
@table @asis
@item @samp{asis}
-Preserve any existing indentation at the starts of paragraphs.
+Preserve any existing indentation (or lack thereof) at the beginnings
+of paragraphs.
@item @samp{0} or @samp{none}
Delete any existing indentation.
@@ -16976,6 +16989,9 @@
Indent each paragraph by @var{num} spaces.
@end table
+The default is to indent by two spaces, except for paragraphs
+following a section heading, which are not indented.
+
@item --plaintext
@opindex --plaintext
@cindex Plain text output with @option{--plaintext}
@@ -16984,20 +17000,24 @@
@cindex Node separators, omitting with @option{--plaintext}
@cindex Menus, omitting with @option{--plaintext}
@cindex @file{INSTALL} file, generating
-Output a plain text file: do not include menus or node separator lines
-in the output. This results in a straightforward plain text file that
-you can (for example) send in email without complications, or include
-in a distribution (for example, an @file{INSTALL} file).
+Output a plain text file (rather than Info): do not include menus or
+node separator lines in the output. This results in a straightforward
+plain text file that you can (for example) send in email without
+complications, or include in a distribution (for example, an
address@hidden file).
With this option, @code{@@setfilename} is ignored and the output goes
to standard output by default; this can be overridden with @option{-o}.
@item --set-init-variable @address@hidden
@opindex --set-init-variable @address@hidden
-Set the configuration variable @var{var} to @var{value}. Many aspects
-of the behavior and output may be modified by modifying configuration
-variables, beyond what can be set in the document by @@-commands and
-with other command line switches. @xref{Configuration Variables}.
+Set the configuration variable @var{var} to @var{value}. The @code{=}
+is optional, but both @var{var} and @var{value} must be quoted to the
+shell as necessary so the result is a single word. Many aspects of
address@hidden behavior and output may be controlled by
+configuration variables, beyond what can be set in the document by
+@@-commands and with other command line switches. @xref{Configuration
+Variables}.
@item address@hidden
@itemx --no-split
@@ -17012,8 +17032,8 @@
by default each output file contains one node (@pxref{Generating
HTML}). @option{--no-split} suppresses this splitting of the output.
-On the other hand, @address@hidden may be used to specify
-at which level the resulting document should be split. The possible
+Alternatively, @address@hidden may be used to specify at
+which level the resulting document should be split. The possible
values for @var{how} are:
@table @samp
@@ -17022,8 +17042,7 @@
@@-commands at this level (@code{@@appendix}, etc.).
@item section
-The output is split at @code{@@section} and other sectioning
-@@-commands at this level.
+The output is split at @code{@@section} and similar.
@item node
The output is split at every node. This is the default.
@@ -17031,7 +17050,9 @@
@item address@hidden
@opindex address@hidden
-Keep Info files to at most @var{num} characters; default is 300,000.
+Keep Info files to at most @var{num} characters if possible; default
+is 300,000. (However, a single node will never be split across Info
+files.)
@item --transliterate-file-names
@opindex --transliterate-file-names
@@ -17056,7 +17077,7 @@
@item --xml
@opindex --xml
-Generate XML output rather than Info.
+Generate Texinfo XML output (rather than Info).
@end table
@@ -17064,13 +17085,13 @@
@cindex Environment variable @code{TEXINFO_OUTPUT_FORMAT}
@command{makeinfo} also reads the environment variable
@env{TEXINFO_OUTPUT_FORMAT} to determine the output format, if not
-overridden by a command line option. The possible values are:
+overridden by a command line option. The value should be one of:
@example
-docbook html info plaintext xml
+docbook dvi dvipdf html info plaintext ps pdf xml
@end example
-If not set, Info output is the default.
+If not set or otherwise specified, Info output is the default.
@node Pointer Validation
@@ -17183,7 +17204,7 @@
@item PLAINTEXINFO
Output the Texinfo source with all the macros, @code{@@include} and
address@hidden@@address@hidden@}} expanded. This is similar with setting
address@hidden@@address@hidden@}} expanded. This is similar to setting
@option{--macro-expand}, but instead of being output in addition to
the normal conversion, output of Texinfo is the main output.
@@ -17396,8 +17417,8 @@
@item DUMP_TEXI
For debugging. If set, there is no conversion done, only parsing and
-macros expansion. If @option{--macro-expand} is set the Texinfo source
-is also expanded to the corresponding file.
+macros expansion. If @option{--macro-expand} is set, the Texinfo
+source is also expanded to the corresponding file.
@item DUMP_TREE
For debugging. If set, the tree constructed upon parsing a Texinfo
@@ -21917,7 +21938,7 @@
Revision Control System}) or other version control systems, which
expand it into a string such as:
@example
-$Id: texinfo.txi,v 1.434 2012/04/17 18:23:25 karl Exp $
+$Id: texinfo.txi,v 1.435 2012/04/20 18:52:47 karl Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -b -r1.172 -r1.173
--- util/texi2dvi 20 Apr 2012 18:41:24 -0000 1.172
+++ util/texi2dvi 20 Apr 2012 18:52:48 -0000 1.173
@@ -1,6 +1,6 @@
#! /bin/sh
# texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.172 2012/04/20 18:41:24 karl Exp $
+# $Id: texi2dvi,v 1.173 2012/04/20 18:52:48 karl Exp $
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
@@ -34,7 +34,7 @@
set -e
# This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.172 $'
+rcs_revision='$Revision: 1.173 $'
rcs_version=`set - $rcs_revision; echo $2`
program=`echo $0 | sed -e 's!.*/!!'`
@@ -329,8 +329,8 @@
Output format:
--dvi output a DVI file [default]
--dvipdf output a PDF file via DVI (using a dvi-to-pdf program)
- --html output an HTML file; run HeVeA for LaTeX files
- --info output an Info file; run HeVeA for LaTeX files
+ --html output an HTML file from LaTeX, using HeVeA
+ --info output an Info file from LaTeX, using HeVeA
-p, --pdf use pdftex or pdflatex for processing
--ps output a PostScript file via DVI (using dvips)
--text output a plain text file from LaTeX, using HeVeA
Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- tp/texi2any.pl 18 Apr 2012 21:10:23 -0000 1.124
+++ tp/texi2any.pl 20 Apr 2012 18:52:48 -0000 1.125
@@ -553,7 +553,7 @@
--html output HTML rather than Info.
--plaintext output plain text rather than Info.
--xml output Texinfo XML rather than Info.
- --dvi, --ps, --pdf call texi2dvi to generate specified output.\n")
+ --dvi, --dvipdf, --ps, --pdf call texi2dvi to generate given output.\n")
."\n";
$makeinfo_help .= __("General output options:
@@ -635,6 +635,7 @@
Also, for the --no-ifFORMAT options, do process address@hidden text.\n")
."\n";
$makeinfo_help .= __(" The defaults for the address@hidden conditionals
depend on the output format:
+ if generating Docbook, --ifdocbook is on and the others are off;
if generating HTML, --ifhtml is on and the others are off;
if generating Info, --ifinfo is on and the others are off;
if generating plain text, --ifplaintext is on and the others are off;
@@ -646,6 +647,7 @@
makeinfo --xml foo.texi write Texinfo XML to address@hidden
makeinfo --docbook foo.texi write Docbook XML to address@hidden
makeinfo --no-headers foo.texi write plain text to standard output
+ makeinfo --dvi foo.texi write PDF using texi2dvi
makeinfo --html --no-headers foo.texi write html without node lines, menus
makeinfo --number-sections foo.texi write Info with numbered sections
@@ -804,6 +806,7 @@
set_from_cmdline('SHOW_MENU', 0)},
'xml' => sub {$format = set_format($_[0]);},
'dvi' => sub {$format = set_texi2dvi_format($_[0]);},
+ 'dvipdf' => sub {$format = set_texi2dvi_format($_[0]);},
'ps' => sub {$format = set_texi2dvi_format($_[0]);},
'pdf' => sub {$format = set_texi2dvi_format($_[0]);},
'debug=i' => sub {set_from_cmdline('DEBUG', $_[1]);
@@ -866,6 +869,9 @@
'dvi' => {
'texi2dvi_format' => 1,
},
+ 'dvipdf' => {
+ 'texi2dvi_format' => 1,
+ },
'debugcount' => {
'nodes_tree' => 1,
'floats' => 1,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog doc/texinfo.txi util/texi2dvi...,
Karl Berry <=