[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog doc/version.texi po_document/...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo ChangeLog doc/version.texi po_document/... |
|
Date: |
Sat, 11 Sep 2010 17:12:55 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/09/11 17:12:54
Modified files:
. : ChangeLog
doc : version.texi
po_document : de.us-ascii.po es.us-ascii.po fr.us-ascii.po
hu.po it.po ja.po nl.us-ascii.po no.us-ascii.po
pt.us-ascii.po pt_BR.us-ascii.po
texi2html : TODO texi2html.init texi2html.pl
texi2html/test/formatting/res/float_docbook: float.xml
texi2html/test/formatting/res_all/float_docbook: float.xml
texi2html/test/formatting/res_info/float_docbook: float.xml
Log message:
* texi2html/texi2html.init (%misc_command,
t2h_default_preserve_misc_command):
set args instead of skip when a line is in fact the misc
@-command argument.
* texi2html/texi2html.pl (add_to_texi2dvi_args),
texi2html/texi2html.init: call texi2dvi for pdf, dvi and ps
output,
add command line options for texi2dvi and pass some existing
options.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1132&r2=1.1133
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/version.texi?cvsroot=texinfo&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/de.us-ascii.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/es.us-ascii.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/fr.us-ascii.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/hu.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/it.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/ja.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/nl.us-ascii.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/no.us-ascii.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/pt.us-ascii.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/pt_BR.us-ascii.po?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/TODO?cvsroot=texinfo&r1=1.198&r2=1.199
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.init?cvsroot=texinfo&r1=1.288&r2=1.289
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.pl?cvsroot=texinfo&r1=1.423&r2=1.424
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/formatting/res/float_docbook/float.xml?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/formatting/res_all/float_docbook/float.xml?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/formatting/res_info/float_docbook/float.xml?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1132
retrieving revision 1.1133
diff -u -b -r1.1132 -r1.1133
--- ChangeLog 11 Sep 2010 00:40:19 -0000 1.1132
+++ ChangeLog 11 Sep 2010 17:12:52 -0000 1.1133
@@ -1,3 +1,12 @@
+2010-09-11 Patrice Dumas <address@hidden>
+
+ * texi2html/texi2html.init (%misc_command,
t2h_default_preserve_misc_command):
+ set args instead of skip when a line is in fact the misc
+ @-command argument.
+ * texi2html/texi2html.pl (add_to_texi2dvi_args),
+ texi2html/texi2html.init: call texi2dvi for pdf, dvi and ps output,
+ add command line options for texi2dvi and pass some existing options.
+
2010-09-10 Karl Berry <address@hidden>
* doc/texinfo.txi (Output Element Labels): add Section*,
@@ -116,7 +125,7 @@
* texi2html/texi2html.pl (do_text): disable the warning about
unlikely character in @var. It is too expensive (because do_text
is called often) for a warning which rather questionable anyway.
- * texi2ht/texi2html.init (t2h_default_external_href): an
+ * texi2html/texi2html.init (t2h_default_external_href): an
empty entry in htmlxref causes the corresponding possibility
being ignored.
* texi2html/texi2html.pl: reverse the order of directories where
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- doc/version.texi 12 Aug 2010 22:05:13 -0000 1.90
+++ doc/version.texi 11 Sep 2010 17:12:52 -0000 1.91
@@ -1,4 +1,4 @@
address@hidden UPDATED 11 August 2010
address@hidden UPDATED-MONTH August 2010
address@hidden UPDATED 10 September 2010
address@hidden UPDATED-MONTH September 2010
@set EDITION 4.13
@set VERSION 4.13
Index: po_document/de.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/de.us-ascii.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/de.us-ascii.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/de.us-ascii.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2008-03-19\n"
"Last-Translator: Reinhold Kainhofer <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "address@hidden"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
Index: po_document/es.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/es.us-ascii.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/es.us-ascii.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/es.us-ascii.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2008-08-28\n"
"Last-Translator: Francisco Vila <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "Notas al pie"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
Index: po_document/fr.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/fr.us-ascii.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/fr.us-ascii.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/fr.us-ascii.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2008-07-20\n"
"Last-Translator: Jean-Charles Malahieude <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "Notes de bas de page"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
Index: po_document/hu.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/hu.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/hu.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/hu.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2009-12-27 22:02+0100\n"
"Last-Translator: Harmath Dénes <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "Lábjegyzet"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Nincs értéke ennek: `{value}'@}"
Index: po_document/it.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/it.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/it.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/it.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2009-12-27 22:02+0100\n"
"Last-Translator: Federico Bruni <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "Note a piè di pagina"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Nessun valore per `{value}'@}"
Index: po_document/ja.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/ja.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/ja.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/ja.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2007-02-05\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "è注"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
Index: po_document/nl.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/nl.us-ascii.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/nl.us-ascii.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/nl.us-ascii.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2001-01-01\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "No translation available!"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
Index: po_document/no.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/no.us-ascii.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/no.us-ascii.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/no.us-ascii.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2001-01-01\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "No translation available!"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
Index: po_document/pt.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/pt.us-ascii.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/pt.us-ascii.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/pt.us-ascii.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2006-01-09\n"
"Last-Translator: Jorge Barros de Abreu <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "Notas de Rodap@'e"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
Index: po_document/pt_BR.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/pt_BR.us-ascii.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po_document/pt_BR.us-ascii.po 12 Aug 2010 22:05:18 -0000 1.18
+++ po_document/pt_BR.us-ascii.po 11 Sep 2010 17:12:53 -0000 1.19
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2010-08-12 10:30+0200\n"
+"POT-Creation-Date: 2010-08-14 01:27+0200\n"
"PO-Revision-Date: 2006-01-09\n"
"Last-Translator: Jorge Barros de Abreu <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -37,7 +37,7 @@
msgid "Footnotes"
msgstr "Notas de Rodap@'e"
-#: texi2html/texi2html.pl:12944
+#: texi2html/texi2html.pl:12946
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
Index: texi2html/TODO
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/TODO,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- texi2html/TODO 11 Aug 2010 12:46:06 -0000 1.198
+++ texi2html/TODO 11 Sep 2010 17:12:53 -0000 1.199
@@ -9,6 +9,11 @@
Before next release
-------------------
+with --quiet/--silent silence tex4ht and latex2html by redirecting to
+/dev/null.
+
+Rename Following NodeForward and add NodeBack.
+
Later
-----
@@ -36,9 +41,6 @@
info mode, such that it triggers also plaintext. Also test with
directories and files.
-* add --pdf --dvi that would trigger texi2dvi to be called. Karl should
- say how to match the options.
-
* check for (both split and not split)
--out foo/ --out bar/file.html
Index: texi2html/texi2html.init
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.init,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- texi2html/texi2html.init 12 Aug 2010 23:12:50 -0000 1.288
+++ texi2html/texi2html.init 11 Sep 2010 17:12:53 -0000 1.289
@@ -21,7 +21,7 @@
# Those values may be overrided by values set in $sysconfdir/texi2html/Config
# and then by values set in $HOME/texi2html/Config.
#
-# $Id: texi2html.init,v 1.288 2010/08/12 23:12:50 pertusus Exp $
+# $Id: texi2html.init,v 1.289 2010/09/11 17:12:53 pertusus Exp $
##################################################################
@@ -143,6 +143,15 @@
# --number-footnotes
set_default('NUMBER_FOOTNOTES', 1);
+# --batch
+set_default('BATCH', 0);
+
+# --silent/--quiet
+set_default('SILENT', 0);
+
+# --Xopt
address@hidden = ();
+
# not in makeinfo but in texi2dvi
# --command
@COMMANDS = ();
@@ -536,6 +545,8 @@
# use old framework for translations
set_default('I18N_PERL_HASH', 0);
+# command name to invoke when used as a texi2dvi wrapper
+set_default('TEXI2DVI', 'texi2dvi');
# this resets some defaults, those that are also set in formats and
# not set in every formats.
@@ -1070,6 +1081,12 @@
$null_device_file{'NUL'} = 1;
}
+%texi2dvi_formats = (
+ 'dvi' => 1,
+ 'pdf' => 1,
+ 'ps' => 1
+);
+
$finish_out = \&t2h_default_finish_out;
$translate_names = \&t2h_default_translate_names;
@@ -1295,10 +1312,10 @@
{
my $format = shift;
my $from_command_line = shift;
- if (defined($t2h_default_formats_load_table{$format}))
+ if (defined($t2h_default_formats_load_table{$format}) or
$texi2dvi_formats{$format})
{
$OUTPUT_FORMAT = $format;
- &{$t2h_default_formats_load_table{$format}}($from_command_line);
+ &{$t2h_default_formats_load_table{$format}}($from_command_line) unless
($texi2dvi_formats{$format});
$Texi2HTML::THISDOC{'format_from_command_line'} = $format if
($from_command_line);
return 1;
}
@@ -4837,8 +4854,10 @@
%misc_command = (
'bye' => {'skip' => 'line'}, # no arg
# set, clear
- 'set' => {'skip' => 'line'}, # special arg
- 'clear' => {'skip' => 'line'}, # special arg
+ #'set' => {'skip' => 'line'}, # special arg
+ 'set' => {'arg' => 'line'}, # special arg
+ #'clear' => {'skip' => 'line'}, # special arg
+ 'clear' => {'arg' => 1, 'skip' => 'line'}, # special arg
'alias' => {'args' => 3, 'skip' => 'line'}, # special arg
# comments
'comment' => {'arg' => 'line'},
@@ -4852,9 +4871,8 @@
'summarycontents'=> {}, # no arg
'setcontentsaftertitlepage' => {}, # no arg
'setshortcontentsaftertitlepage' => {}, # no arg
-# 'detailmenu' => {'skip' => 'whitespace'}, # no arg
-# 'end detailmenu' => {'skip' => 'whitespace'}, # no arg
- 'clickstyle' => {'skip' => 'line'}, # arg should be an @-command
+ #'clickstyle' => {'skip' => 'line'}, # arg should be an @-command
+ 'clickstyle' => {'arg' => 'line'}, # arg should be an @-command
# in preamble
'novalidate' => {}, # no arg
'dircategory'=> {'arg' => 'line'}, # line. Position with regard
@@ -4930,7 +4948,7 @@
'vskip' => {'arg' => 'line'}, # arg line in TeX
'cropmarks' => {}, # no arg
# miscalleneous
- 'verbatiminclude'=> {'skip' => 'line'},
+ 'verbatiminclude'=> {'arg' => 'line'},
'documentencoding' => {'arg' => 1, 'skip' => 'line'},
# obsolete @-commands. Remove spaces and end of lines after the
# commands? If no, they can lead to empty lines
@@ -5144,15 +5162,29 @@
my $arg_nr = $misc_command{$macro}->{'arg'};
while ($arg_nr)
{
- $line =~ s/(\s+\S*)//o;
- my $argument = $1;
- if (defined($argument))
+ if ($line =~ s/^(\s+)(\S*)//o)
{
- $text .= $argument;
- push @$args, $argument;
+ $text .= $1.$2;
+ my $argument = $2;
+ push @$args, $argument if ($argument ne '');
+ }
+ else
+ {
+ last;
}
$arg_nr--;
}
+# while ($arg_nr)
+# {
+# $line =~ s/(\s+\S*)//o;
+# my $argument = $1;
+# if (defined($argument))
+# {
+# $text .= $argument;
+# push @$args, $argument;
+# }
+# $arg_nr--;
+# }
}
if ($macro eq 'bye')
@@ -5164,7 +5196,7 @@
{
if ($line =~ /^\s*$/o)
{
- $line =~ s/([ \t]*)//o;
+ $line =~ s/^([ \t]*)//o;
$text .= $1;
}
}
@@ -5183,12 +5215,12 @@
}
elsif ($skip_spec eq 'whitespace')
{
- $line =~ s/(\s*)//o;
+ $line =~ s/^(\s*)//o;
$text .= $1;
}
elsif ($skip_spec eq 'space')
{
- $line =~ s/([ \t]*)//o;
+ $line =~ s/^([ \t]*)//o;
$text .= $1;
}
$line = '' if (!defined($line));
Index: texi2html/texi2html.pl
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.pl,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -b -r1.423 -r1.424
--- texi2html/texi2html.pl 12 Aug 2010 23:17:04 -0000 1.423
+++ texi2html/texi2html.pl 11 Sep 2010 17:12:53 -0000 1.424
@@ -90,7 +90,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.423 2010/08/12 23:17:04 pertusus Exp $
+# $Id: texi2html.pl,v 1.424 2010/09/11 17:12:53 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.gnu.org/software/texinfo/";;
@@ -199,6 +199,7 @@
'NO_WARN', 'VERBOSE',
'TRANSLITERATE_FILE_NAMES', 'ERROR_LIMIT', 'ENABLE_ENCODING',
'FORCE', 'INTERNAL_LINKS', 'OUTFILE', 'SUBDIR', 'OUT', 'MONOLITHIC',
+ 'BATCH', 'SILENT'
);
# FIXME TOP_HEADING_AT_BEGINNING seems to be a no-op
@@ -225,7 +226,8 @@
'COMPLETE_IMAGE_PATHS', 'USE_NODE_TARGET', 'NEW_CROSSREF_STYLE',
'PROGRAM_NAME_IN_FOOTER', 'NODE_FILENAMES', 'DEFAULT_ENCODING',
'OUT_ENCODING', 'ENCODING_NAME', 'EXTERNAL_CROSSREF_SPLIT', 'BODYTEXT',
- 'CSS_LINES', 'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE');
+ 'CSS_LINES', 'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE',
+ 'TEXI2DVI');
foreach my $var (@document_settable_at_commands, @command_line_settables,
@document_global_at_commands, @variable_settables)
@@ -375,6 +377,7 @@
@LINKS_BUTTONS
@IMAGE_EXTENSIONS
@INPUT_FILE_SUFFIXES
address@hidden
);
# I18n
@@ -641,6 +644,9 @@
'xml' => 'Texinfo XML',
'plaintext' => 'plain text',
'raw-text' => 'raw text',
+ 'dvi' => 'DVI',
+ 'pdf' => 'Pdf',
+ 'ps' => 'Postscript'
);
sub load($)
@@ -1905,6 +1911,7 @@
package main;
+# functions related with configuration variables.
sub get_conf($)
{
@@ -1949,12 +1956,12 @@
return Texi2HTML::Config::unset_variable($var, $level, 1);
}
-Texi2HTML::Config::set_default('USE_NLS', ('@USE_NLS@' eq 'yes' or $0 =~
/\.pl$/));
-
# prepare the gettext-like framework. To be noted that Locales::TextDomain
# canot be used, since it cannot be used dynamically through a reuires.
# Fortunately, Locales::TextDomain is a thin layer above Locales::Messages.
+Texi2HTML::Config::set_default('USE_NLS', ('@USE_NLS@' eq 'yes' or $0 =~
/\.pl$/));
+
my $strings_textdomain = '@PACKAGE@' . '_document';
$strings_textdomain = 'texi2html_document' if ($strings_textdomain eq
'@'.'PACKAGE@' . '_document');
my $messages_textdomain = '@PACKAGE@';
@@ -2362,6 +2369,19 @@
my $T2H_VERBOSE;
my $T2H_DEBUG;
+#
+# %value hold texinfo variables, see also -D, -U, @set and @clear.
+# we predefine html (the output format) and texi2html (the translator)
+# it is initialized with %value_initial at the beginning of the
+# document parsing and filled and emptied as @set and @clear are
+# encountered
+# FIXME remove html
+my %value_initial =
+ (
+ # 'html' => 1,
+ 'texi2html' => $THISVERSION,
+ );
+
sub line_warn($$);
sub document_warn($);
sub file_line_warn($$;$);
@@ -2371,6 +2391,15 @@
#print STDERR "" . gdt('test i18n: \' , \a \\ %% %{unknown}a %known % %{known}
\\', { 'known' => 'a known string', 'no' => 'nope'}); exit 0;
+sub add_to_texi2dvi_args($;$)
+{
+ my $option = shift;
+ my $value = shift;
+ #print STDERR "$option $value\n";
+ push @Texi2HTML::Config::TEXI2DVI_ARGUMENTS, $option;
+ push @Texi2HTML::Config::TEXI2DVI_ARGUMENTS, $value if (defined($value));
+}
+
# file: file name to locate. It can be a file path.
# directories: a reference on a array containing a list of directories to
# search the file in.
@@ -2544,6 +2573,60 @@
}
}
+sub set_output($;$)
+{
+ my $output = shift;
+ my $from_command_line = shift;
+ my $var = 'OUTFILE';
+ if ($output =~ m:/$: or -d $output)
+ {
+ $var = 'SUBDIR';
+ }
+ if ($from_command_line)
+ {
+ set_from_cmdline($var, $output);
+ set_from_cmdline('OUT', $output);
+ add_to_texi2dvi_args('-o', $output);
+ }
+ else
+ {
+ set_default($var, $output);
+ if (set_default('OUT', $output))
+ {
+ add_to_texi2dvi_args('-o', $output);
+ }
+ }
+}
+
+# used both for command line and @-command argument checking
+sub set_paragraphindent($$;$$)
+{
+ my $value = shift;
+ my $from_command_line = shift;
+ my $line_nr = shift;
+ my $pass = shift;
+ my $command = 'paragraphindent';
+
+ if ($value =~ /^([0-9]+)$/ or $value eq 'none' or $value eq 'asis')
+ {
+ if ($from_command_line)
+ {
+ set_from_cmdline($command, $value)
+ }
+ else
+ {
+ set_from_document($command, $value)
+ }
+ }
+ elsif ($from_command_line)
+ {
+ die sprintf(__("%s: --paragraph-indent arg must be
numeric/`none'/`asis', not `%s'.\n"), $real_command_name, $value);
+ }
+ elsif ($pass == 1)
+ {
+ line_error (sprintf(__("address@hidden arg must be
numeric/`none'/`asis', not `%s'"), $value), $line_nr);
+ }
+}
# find the encoding alias.
# with encoding support (USE_UNICODE), may return undef if no alias was found.
@@ -2720,31 +2803,6 @@
return $result;
}
-my %nodes; # nodes hash. The key is the texi node name
-my %cross_reference_nodes; # normalized node names arrays
-
-#
-# %value hold texinfo variables, see also -D, -U, @set and @clear.
-# we predefine html (the output format) and texi2html (the translator)
-# it is initialized with %value_initial at the beginning of the
-# document parsing and filled and emptied as @set and @clear are
-# encountered
-my %value_initial =
- (
- 'html' => 1,
- 'texi2html' => $THISVERSION,
- );
-
-#
-# _foo: internal variables to track @foo
-#
-foreach my $key ('_author', '_title', '_subtitle', '_shorttitlepage',
- '_settitle', '_titlefont')
-{
- $value_initial{$key} = ''; # prevent -w warnings
-}
-
-
sub unicode_to_protected($)
{
my $text = shift;
@@ -2849,57 +2907,6 @@
return $result;
}
-sub set_output($;$)
-{
- my $output = shift;
- my $from_command_line = shift;
- my $var = 'OUTFILE';
- if ($output =~ m:/$: or -d $output)
- {
- $var = 'SUBDIR';
- }
- if ($from_command_line)
- {
- set_from_cmdline($var, $output);
- set_from_cmdline('OUT', $output);
- }
- else
- {
- set_default($var, $output);
- set_default('OUT', $output);
- }
-}
-
-# used both for command line and @-command argument checking
-sub set_paragraphindent($$;$$)
-{
- my $value = shift;
- my $from_command_line = shift;
- my $line_nr = shift;
- my $pass = shift;
- my $command = 'paragraphindent';
-
- if ($value =~ /^([0-9]+)$/ or $value eq 'none' or $value eq 'asis')
- {
- if ($from_command_line)
- {
- set_from_cmdline($command, $value)
- }
- else
- {
- set_from_document($command, $value)
- }
- }
- elsif ($from_command_line)
- {
- die sprintf(__("%s: --paragraph-indent arg must be
numeric/`none'/`asis', not `%s'.\n"), $real_command_name, $value);
- }
- elsif ($pass == 1)
- {
- line_error (sprintf(__("address@hidden arg must be
numeric/`none'/`asis', not `%s'"), $value), $line_nr);
- }
-}
-
# T2H_OPTIONS is a hash whose keys are the (long) names of valid
# command-line options and whose values are a hash with the following keys:
# type ==> one of !|=i|:i|=s|:s (see Getopt::Long for more info)
@@ -2908,10 +2915,11 @@
# noHelp ==> if 1 -> for "not so important options": only print description
on -h 1
# 2 -> for obsolete options: only print description on -h 2
my $T2H_OPTIONS;
+
$T2H_OPTIONS -> {'macro-expand|E'} =
{
'type' => '=s',
- 'linkage' => sub {set_from_cmdline('MACRO_EXPAND', $_[1]);},
+ 'linkage' => sub {set_from_cmdline('MACRO_EXPAND', $_[1]);
add_to_texi2dvi_args('-E'); },
'verbose' => 'output macro expanded source in <file>',
};
@@ -2960,7 +2968,7 @@
$T2H_OPTIONS -> {'I'} =
{
'type' => '=s',
- 'linkage' => address@hidden::Config::INCLUDE_DIRS,
+ 'linkage' => sub { add_to_texi2dvi_args('-'.$_[0], $_[1]); push
@Texi2HTML::Config::INCLUDE_DIRS, $_[1] },
'verbose' => 'append $s to the @include search path',
};
@@ -3058,7 +3066,7 @@
$T2H_OPTIONS -> {'verbose|v'} =
{
'type' => '!',
- 'linkage' => sub {set_from_cmdline('VERBOSE', $_[1]);},
+ 'linkage' => sub {set_from_cmdline('VERBOSE', $_[1]);
add_to_texi2dvi_args('--verbose'); },
'verbose' => 'print progress info to stdout',
};
@@ -3227,14 +3235,46 @@
# 'verbose' => 'insert CMD in copy of input file'
#};
+$T2H_OPTIONS -> {'Xopt'} =
+{
+ 'type' => '=s',
+ 'linkage' => address@hidden::Config::TEXI2DVI_ARGUMENTS,
+ 'verbose' => 'pass argument to the dvi/pdf converter.',
+};
+
+$T2H_OPTIONS -> {'batch'} =
+{
+ 'type' => '',
+ 'linkage' => sub {set_from_cmdline('BATCH', $_[1]);
add_to_texi2dvi_args('--'.$_[0]);},
+ 'noHelp' => 2
+};
+
+$T2H_OPTIONS -> {'silent|quiet'} =
+{
+ 'type' => '',
+ 'linkage' => sub {set_from_cmdline('SILENT', $_[1]);
add_to_texi2dvi_args('--'.$_[0]);},
+ 'noHelp' => 2
+};
+
+my $call_texi2dvi = 0;
foreach my $output_format (keys(%Texi2HTML::Config::output_format_names))
{
next if (defined($Texi2HTML::Config::DEFAULT_OUTPUT_FORMAT) and
$output_format eq $Texi2HTML::Config::DEFAULT_OUTPUT_FORMAT);
+ my $linkage;
+ if ($Texi2HTML::Config::texi2dvi_formats{$output_format})
+ {
+ $linkage = sub {add_to_texi2dvi_args('--'.$_[0]); $call_texi2dvi = 1;
+ Texi2HTML::Config::t2h_default_load_format($_[0], 1);};
+ }
+ else
+ {
+ $linkage = sub {Texi2HTML::Config::t2h_default_load_format($_[0], 1);};
+ }
$T2H_OPTIONS -> {$output_format} =
{
'type' => '',
- 'linkage' => sub {Texi2HTML::Config::t2h_default_load_format($_[0], 1);},
+ 'linkage' => $linkage,
'verbose' => "output
$Texi2HTML::Config::output_format_names{$output_format} rather than
$Texi2HTML::Config::output_format_names{$Texi2HTML::Config::DEFAULT_OUTPUT_FORMAT}.",
}
};
@@ -3247,6 +3287,15 @@
'noHelp' => 2
};
+$T2H_OPTIONS -> {'debug'} =
+{
+ 'type' => '=i',
+ 'linkage' => sub {set_from_cmdline('DEBUG', $_[1]),
add_to_texi2dvi_args('--'.$_[0]); },
+ 'verbose' => 'output debuging information',
+ 'noHelp' => 1,
+};
+
+
##
## obsolete cmd line options
##
@@ -3439,14 +3488,6 @@
'noHelp' => 1,
};
-$T2H_OBSOLETE_OPTIONS -> {'debug'} =
-{
- 'type' => '=i',
- 'linkage' => sub {set_from_cmdline('DEBUG', $_[1])},
- 'verbose' => 'output HTML with debuging information',
- 'noHelp' => 1,
-};
-
$T2H_OBSOLETE_OPTIONS -> {'doctype'} =
{
'type' => '=s',
@@ -4003,6 +4044,12 @@
if (! $Texi2HTML::THISDOC{'format_from_command_line'} and
defined($ENV{'TEXINFO_OUTPUT_FORMAT'}) and $ENV{'TEXINFO_OUTPUT_FORMAT'} ne '')
{
+ if ($Texi2HTML::Config::texi2dvi_formats{$ENV{'TEXINFO_OUTPUT_FORMAT'}})
+ {
+ add_to_texi2dvi_args("--$ENV{'TEXINFO_OUTPUT_FORMAT'}");
+ $call_texi2dvi = 1;
+ }
+
if (!
Texi2HTML::Config::t2h_default_load_format($ENV{'TEXINFO_OUTPUT_FORMAT'}, 0))
{
warn sprintf(__("%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value
`%s'.\n"), $real_command_name, $ENV{'TEXINFO_OUTPUT_FORMAT'});
@@ -4035,6 +4082,16 @@
}
}
+if ($call_texi2dvi)
+{
+ if (defined(get_conf('OUT')) and @ARGV > 1)
+ {
+ die sprintf(__('when generating %s, only one input FILE may be specified
with -o'),
$Texi2HTML::Config::output_format_names{$Texi2HTML::Config::DEFAULT_OUTPUT_FORMAT});
+ }
+ print STDERR "".join('|', (get_conf('TEXI2DVI'),
@Texi2HTML::Config::TEXI2DVI_ARGUMENTS, @ARGV)) ."\n" if ($T2H_DEBUG or
$T2H_VERBOSE);
+ exec { get_conf('TEXI2DVI') } (@Texi2HTML::Config::TEXI2DVI_ARGUMENTS,
@ARGV);
+}
+
#+++############################################################################
#
#
@@ -5125,6 +5182,19 @@
# copying or documentdescription
my $no_element_associated_place;
+my %nodes; # nodes hash. The key is the texi node name
+my %cross_reference_nodes; # normalized node names arrays
+
+#
+# _foo: internal variables to track @foo
+# obsolete
+foreach my $key ('_author', '_title', '_subtitle', '_shorttitlepage',
+ '_settitle', '_titlefont')
+{
+ $value_initial{$key} = ''; # prevent -w warnings
+}
+
+
my @nodes_list; # nodes in document reading order
# each member is a reference on a hash
Index: texi2html/test/formatting/res/float_docbook/float.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/formatting/res/float_docbook/float.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- texi2html/test/formatting/res/float_docbook/float.xml 10 Sep 2009
22:57:21 -0000 1.6
+++ texi2html/test/formatting/res/float_docbook/float.xml 11 Sep 2010
17:12:54 -0000 1.7
@@ -7,7 +7,7 @@
<chapter label="" xreflabel="Test floats" id="Top">
<title>Test floats</title>
-<para>A list of floats at the begining.
+<para>A list of floats at the beginning.
</para>
<para>After the listoffloats.
</para>
Index: texi2html/test/formatting/res_all/float_docbook/float.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/formatting/res_all/float_docbook/float.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- texi2html/test/formatting/res_all/float_docbook/float.xml 10 Sep 2009
22:57:22 -0000 1.3
+++ texi2html/test/formatting/res_all/float_docbook/float.xml 11 Sep 2010
17:12:54 -0000 1.4
@@ -7,7 +7,7 @@
<chapter label="" xreflabel="Test floats" id="Top">
<title>Test floats</title>
-<para>A list of floats at the begining.
+<para>A list of floats at the beginning.
</para>
<para>After the listoffloats.
</para>
Index: texi2html/test/formatting/res_info/float_docbook/float.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/texi2html/test/formatting/res_info/float_docbook/float.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- texi2html/test/formatting/res_info/float_docbook/float.xml 10 Sep 2009
22:57:23 -0000 1.3
+++ texi2html/test/formatting/res_info/float_docbook/float.xml 11 Sep 2010
17:12:54 -0000 1.4
@@ -7,7 +7,7 @@
<chapter label="" xreflabel="Test floats" id="Top">
<title>Test floats</title>
-<para>A list of floats at the begining.
+<para>A list of floats at the beginning.
</para>
<para>After the listoffloats.
</para>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog doc/version.texi po_document/...,
Patrice Dumas <=