texi2html-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Texi2html-cvs] texi2html AUTHORS ChangeLog Makefile.am Makefil...


From: Patrice Dumas
Subject: [Texi2html-cvs] texi2html AUTHORS ChangeLog Makefile.am Makefil...
Date: Mon, 26 Oct 2009 23:21:59 +0000

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/10/26 23:21:58

Modified files:
        .              : AUTHORS ChangeLog Makefile.am Makefile.in 
                         texi2html.init texi2html.pl texi2html.spec.in 
        doc            : Makefile.am Makefile.in stamp-vti 
                         texi2html.1.in version.texi 
        maintained_extra: tex4ht.init 
        test/encodings : multi_lang.texi 
        test/encodings/res/multi_lang: multi_lang.html 
        test/encodings/res/texi_multi_lang: multi_lang.passfirst 
                                            multi_lang.passtexi 
                                            multi_lang.texi 
                                            multi_lang.texi.first 
        test/encodings/res_all/multi_lang: multi_lang.txt 
        test/encodings/res_all/texi_multi_lang: multi_lang.passfirst 
                                                multi_lang.passtexi 
                                                multi_lang.texi 
                                                multi_lang.texi.first 
        test/encodings/res_info/multi_lang: multi_lang.info 
        test/encodings/res_info/texi_multi_lang: multi_lang.passfirst 
                                                 multi_lang.passtexi 
                                                 multi_lang.texi 
                                                 multi_lang.texi.first 
        test/formatting: tests.txt 
Added files:
        test/formatting/res/simplest_test_prefix: simplest.1 simplest.2 
                                                  truc.html 
        test/formatting/res/simplest_test_prefix_info: truc.info 
        test/formatting/res_all/simplest_test_prefix: simplest.1 
                                                      simplest.2 
                                                      truc.txt 
        test/formatting/res_all/simplest_test_prefix_info: simplest.1 
                                                           simplest.2 
                                                           truc.info 
        test/formatting/res_info/simplest_test_prefix: simplest.1 
                                                       simplest.2 
                                                       simplest.info 
        test/formatting/res_info/simplest_test_prefix_info: simplest.1 
                                                            simplest.2 
                                                            simplest.info 

Log message:
                * texi2html.pl, T2h_l2h.pm, maintained_extra/tex4ht.init:
                call twice the extraction of html to have something ready for
                the special regions formatting and also allow to have 
modifications
                of the file like in mediawiki.init (report of tex_in_copying 
failing
                from Jean-Charles Malahieude).
                * Makefile.am, doc/Makefile.am: modify to be able to build
                texi2html as part of another package (in texinfo).
                * texi2html.init: handle right --prefix in info.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/AUTHORS?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.448&r2=1.449
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.am?cvsroot=texi2html&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.in?cvsroot=texi2html&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.244&r2=1.245
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.346&r2=1.347
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.spec.in?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/Makefile.am?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/Makefile.in?cvsroot=texi2html&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/stamp-vti?cvsroot=texi2html&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.1.in?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/version.texi?cvsroot=texi2html&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/texi2html/maintained_extra/tex4ht.init?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/multi_lang.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/multi_lang/multi_lang.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_multi_lang/multi_lang.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_multi_lang/multi_lang.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_multi_lang/multi_lang.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_multi_lang/multi_lang.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/multi_lang/multi_lang.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/texi_multi_lang/multi_lang.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/texi_multi_lang/multi_lang.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/texi_multi_lang/multi_lang.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/texi_multi_lang/multi_lang.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/multi_lang/multi_lang.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/texi_multi_lang/multi_lang.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/texi_multi_lang/multi_lang.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/texi_multi_lang/multi_lang.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/texi_multi_lang/multi_lang.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/tests.txt?cvsroot=texi2html&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/simplest_test_prefix/simplest.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/simplest_test_prefix/simplest.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/simplest_test_prefix/truc.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/simplest_test_prefix_info/truc.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/simplest_test_prefix/simplest.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/simplest_test_prefix/simplest.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/simplest_test_prefix/truc.txt?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/simplest_test_prefix_info/simplest.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/simplest_test_prefix_info/simplest.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/simplest_test_prefix_info/truc.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/simplest_test_prefix/simplest.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/simplest_test_prefix/simplest.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/simplest_test_prefix/simplest.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/simplest_test_prefix_info/simplest.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/simplest_test_prefix_info/simplest.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/simplest_test_prefix_info/simplest.info?cvsroot=texi2html&rev=1.1

Patches:
Index: AUTHORS
===================================================================
RCS file: /cvsroot/texi2html/texi2html/AUTHORS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AUTHORS     29 Aug 2008 15:05:38 -0000      1.3
+++ AUTHORS     26 Oct 2009 23:21:55 -0000      1.4
@@ -1,5 +1,5 @@
 Lionel Cons, Karl Berry, Olaf Bachmann, Karl-Heinz Marbaise (texi2html
-manual) and many others.
+manual), Adrian Aichner, Derek Price, Patrice Dumas and many others.
 
 Images in the images directory come from the Singular project:
 http://www.singular.uni-kl.de/

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -b -r1.448 -r1.449
--- ChangeLog   22 Oct 2009 20:23:18 -0000      1.448
+++ ChangeLog   26 Oct 2009 23:21:55 -0000      1.449
@@ -1,3 +1,14 @@
+2009-10-26   Patrice Dumas  <address@hidden>
+
+       * texi2html.pl, T2h_l2h.pm, maintained_extra/tex4ht.init:
+       call twice the extraction of html to have something ready for
+       the special regions formatting and also allow to have modifications
+       of the file like in mediawiki.init (report of tex_in_copying failing
+       from Jean-Charles Malahieude).
+       * Makefile.am, doc/Makefile.am: modify to be able to build
+       texi2html as part of another package (in texinfo).
+       * texi2html.init: handle right --prefix in info.
+
 2009-10-20   Patrice Dumas  <address@hidden>
 
        * texi2html.init, texi2html.pl, T2h_l2h.pm, 
maintained_extra/tex4ht.init: 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- Makefile.am 10 Sep 2009 20:32:28 -0000      1.54
+++ Makefile.am 26 Oct 2009 23:21:55 -0000      1.55
@@ -153,25 +153,25 @@
        $(SHELL) $(srcdir)/addformats.sh $@ $^
        chmod a+x $@
 
-texi2html.spec: texi2html.spec.in configure
+texi2html.spec: texi2html.spec.in $(top_builddir)/configure
        @echo Generating address@hidden
        @sed -e "s/address@hidden@]/$(PACKAGE_VERSION)/" \
-            -e "s/address@hidden@]/$(PACKAGE_TARNAME)/" $< >texi2html.tmp
+            $< >texi2html.tmp
        @cp texi2html.tmp texi2html.spec
        address@hidden texi2html.tmp
 
 i18n/en: texi2html.pl texi2html.init T2h_i18n.pm examples/roff.init \
                  examples/noheaders.init $(texi2html_formats)
-       $(PERL) $(top_builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir) 
template $^
+       $(PERL) $(builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir) template $^
 
 #i18n/de i18n/nl i18n/es i18n/no i18n/pt i18n/fr: i18n/en
 
 $(i18n_files): i18n/en
-       $(PERL) $(top_builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir) update
+       $(PERL) $(builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir) update
 
 #translations.pl: i18n/de i18n/nl i18n/es i18n/no i18n/pt i18n/fr i18n/en
 translations.pl: $(dist_i18n_DATA) 
-       $(PERL) $(top_builddir)/manage_i18n.pl -d i18n -o $@ -I . -I $(srcdir) 
merge
+       $(PERL) $(builddir)/manage_i18n.pl -d i18n -o $@ -I . -I $(srcdir) merge
 
 all-local: makeinfo.pl texi2any.pl
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.in,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- Makefile.in 10 Sep 2009 20:32:28 -0000      1.77
+++ Makefile.in 26 Oct 2009 23:21:55 -0000      1.78
@@ -947,7 +947,7 @@
        $(SHELL) $(srcdir)/addformats.sh $@ $^
        chmod a+x $@
 
-texi2html.spec: texi2html.spec.in configure
+texi2html.spec: texi2html.spec.in $(top_builddir)/configure
        @echo Generating address@hidden
        @sed -e "s/address@hidden@]/$(PACKAGE_VERSION)/" \
             -e "s/address@hidden@]/$(PACKAGE_TARNAME)/" $< >texi2html.tmp
@@ -956,16 +956,16 @@
 
 i18n/en: texi2html.pl texi2html.init T2h_i18n.pm examples/roff.init \
                  examples/noheaders.init $(texi2html_formats)
-       $(PERL) $(top_builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir) 
template $^
+       $(PERL) $(builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir) template $^
 
 #i18n/de i18n/nl i18n/es i18n/no i18n/pt i18n/fr: i18n/en
 
 $(i18n_files): i18n/en
-       $(PERL) $(top_builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir) update
+       $(PERL) $(builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir) update
 
 #translations.pl: i18n/de i18n/nl i18n/es i18n/no i18n/pt i18n/fr i18n/en
 translations.pl: $(dist_i18n_DATA) 
-       $(PERL) $(top_builddir)/manage_i18n.pl -d i18n -o $@ -I . -I $(srcdir) 
merge
+       $(PERL) $(builddir)/manage_i18n.pl -d i18n -o $@ -I . -I $(srcdir) merge
 
 all-local: makeinfo.pl texi2any.pl
 

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -b -r1.244 -r1.245
--- texi2html.init      22 Oct 2009 20:23:18 -0000      1.244
+++ texi2html.init      26 Oct 2009 23:21:55 -0000      1.245
@@ -13,7 +13,7 @@
 # Afterwards, load the file with command-line 
 # option --init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.244 2009/10/22 20:23:18 pertusus Exp $
+# $Id: texi2html.init,v 1.245 2009/10/26 23:21:55 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -234,8 +234,6 @@
 # Otherwise the nodes are incorporated in sections.
 $USE_NODES = 1;
 
-#$USE_SECTIONS = 1;
-
 # --node-files
 # if this is set one file per node is generated, which can be a target for 
 # cross manual references.
@@ -6831,7 +6829,7 @@
     my $prefix = shift;
 
     my $outname;
-    return unless ($USE_SETFILENAME_EXTENSION);
+    return unless ($USE_SETFILENAME_EXTENSION and $PREFIX eq '');
 #print STDERR "NNNNNN $type " . get_conf('SPLIT') ."\n";
     $outname = $OUT if (defined($OUT) and $OUT ne '' and $OUT !~ /\/$/ and 
$Texi2HTML::THISDOC{'input_file_number'} == 0);
     if ($type eq 'doc' or !get_conf('SPLIT'))

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -b -r1.346 -r1.347
--- texi2html.pl        22 Oct 2009 20:23:18 -0000      1.346
+++ texi2html.pl        26 Oct 2009 23:21:55 -0000      1.347
@@ -86,7 +86,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.346 2009/10/22 20:23:18 pertusus Exp $
+# $Id: texi2html.pl,v 1.347 2009/10/26 23:21:55 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -3352,8 +3352,8 @@
 #                                                                              
#
 
#---############################################################################
 
-# options known by makeinfo (+version and if*)
-my @makeinfo_options = ('error-limit', 'error-limit', 'document-language',
+# options known by makeinfo (+version, help and if*)
+my @makeinfo_options = ('error-limit', 'document-language',
 'force', 'help', 'no-validate', 'no-warn', 'verbose', 'docbook', 'html', 
 'xml', 'plaintext', 'macro-expand', 'headers', 'no-split', 
 'number-sections', 'output', 'disable-encoding', 'enable-encoding', 
@@ -3361,6 +3361,11 @@
 'css-include', 'css-ref', 'internal-links', 'transliterate-file-names', 
 'output-indent', 'number-footnotes', 'D', 'I', 'P', 'U');
 
+# always used, even though they are not in makeinfo in C.
+# dump-texi', 'debug', 'test' are for debugging.
+# split is in makeinfo in C, as --no-split.
+# 'conf-dir', 'init-file' options have to be taken into account for proper
+# functionning.
 my @basic_options = ('dump-texi', 'debug', 'test', 'conf-dir', 'init-file',
 'split');
 
@@ -3544,11 +3549,9 @@
       $primary =~ s/\|.*//;
       next if ($primary eq 'version' or $primary eq 'help');
       next if ($my_command_name eq 'makeinfo' and ! grep {$primary eq $_} 
(@makeinfo_options, @basic_options) and $primary !~ /^if/);
-      #$opts{"$key$T2H_OPTIONS->{$key}->{'type'}"} = 
$T2H_OPTIONS->{$key}->{'linkage'};
       $opts->{$primary} = $T2H_OPTIONS->{$key}->{'linkage'} if 
defined($T2H_OPTIONS->{$key}->{'linkage'});
       push @types, "$key$T2H_OPTIONS->{$key}->{'type'}";
    }
-   #$opts{'version|V'} = sub {
    $opts->{'version'} = sub {
       print "makeinfo (GNU texinfo) 4.13
 
@@ -3558,7 +3561,6 @@
 There is NO WARRANTY, to the extent permitted by law.";
       exit 0;
    };
-   #$opts{'help|h'} = sub {
    $opts->{'help'} = sub {
       print "$makeinfo_help";
       exit 0;
@@ -3898,6 +3900,9 @@
 {
    push @Texi2HTML::Config::command_handler_init, 
\&Texi2HTML::LaTeX2HTML::init;
    push @Texi2HTML::Config::command_handler_process, 
\&Texi2HTML::LaTeX2HTML::latex2html;
+    # do it here once to have somethng ready for special regions
+   push @Texi2HTML::Config::command_handler_process, 
\&Texi2HTML::LaTeX2HTML::init_from_html;
+    # do it here once more in case the file was modified (see mediawiki.init)
    push @Texi2HTML::Config::command_handler_output, 
\&Texi2HTML::LaTeX2HTML::init_from_html;
    push @Texi2HTML::Config::command_handler_finish, 
\&Texi2HTML::LaTeX2HTML::finish;
    $Texi2HTML::Config::command_handler{'math'} = 

Index: texi2html.spec.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- texi2html.spec.in   9 Sep 2007 21:02:25 -0000       1.4
+++ texi2html.spec.in   26 Oct 2009 23:21:56 -0000      1.5
@@ -1,4 +1,4 @@
-Name: @PACKAGE_TARNAME@
+Name: texi2html
 Version: @PACKAGE_VERSION@
 Release: 1
 # GPLv2+ is for the code

Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- doc/Makefile.am     10 Sep 2009 20:32:29 -0000      1.16
+++ doc/Makefile.am     26 Oct 2009 23:21:56 -0000      1.17
@@ -10,7 +10,7 @@
 
 # use the script out of the distribution NOT
 # an old one which is installed on the client.
-TEXI2HTML = $(top_builddir)/texi2html
+TEXI2HTML = $(builddir)/../texi2html
 
 man_MANS = texi2html.1
 
@@ -24,16 +24,16 @@
 #texi2html.html: texi2html.texi $(srcdir)/version.texi \
 #  $(TEXI2HTML)
 texi2html.html: texi2html.texi $(srcdir)/version.texi \
-  $(top_srcdir)/texi2html.pl $(top_srcdir)/texi2html.init \
-  $(top_srcdir)/MySimple.pm $(top_srcdir)/T2h_i18n.pm
-       TEXINPUTS=$(srcdir)::$$TEXINPUTS T2H_HOME=$(top_srcdir) \
-         $(SHELL) $(top_srcdir)/missing-texi2html --run \
-           $(PERL) -x $(top_srcdir)/texi2html.pl -V $<
+  $(srcdir)/../texi2html.pl $(srcdir)/../texi2html.init \
+  $(srcdir)/../MySimple.pm $(srcdir)/../T2h_i18n.pm
+       TEXINPUTS=$(srcdir)::$$TEXINPUTS T2H_HOME=$(srcdir)/../ \
+         $(SHELL) $(srcdir)/../missing-texi2html --run \
+           $(PERL) -x $(srcdir)/../texi2html.pl -V $<
 
 $(TEXI2HTML):
-       @(cd $(top_builddir) && make texi2html)
+       @(cd $(builddir)/../ && make texi2html)
 
-texi2html.1: texi2html.1.in ../config.status
+texi2html.1: texi2html.1.in $(top_builddir)/config.status
        @echo Generating address@hidden
        @sed -e "s/address@hidden@]/$(PACKAGE_VERSION)/" \
             -e "s/address@hidden@]/$(PACKAGE_DATE)/" \

Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/Makefile.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- doc/Makefile.in     10 Sep 2009 20:32:29 -0000      1.53
+++ doc/Makefile.in     26 Oct 2009 23:21:56 -0000      1.54
@@ -188,7 +188,7 @@
 
 # use the script out of the distribution NOT
 # an old one which is installed on the client.
-TEXI2HTML = $(top_builddir)/texi2html
+TEXI2HTML = $(builddir)/../texi2html
 man_MANS = texi2html.1
 EXTRA_DIST = \
        texi2html.1.in \
@@ -712,16 +712,16 @@
 #texi2html.html: texi2html.texi $(srcdir)/version.texi \
 #  $(TEXI2HTML)
 texi2html.html: texi2html.texi $(srcdir)/version.texi \
-  $(top_srcdir)/texi2html.pl $(top_srcdir)/texi2html.init \
-  $(top_srcdir)/MySimple.pm $(top_srcdir)/T2h_i18n.pm
-       TEXINPUTS=$(srcdir)::$$TEXINPUTS T2H_HOME=$(top_srcdir) \
-         $(SHELL) $(top_srcdir)/missing-texi2html --run \
-           $(PERL) -x $(top_srcdir)/texi2html.pl -V $<
+  $(srcdir)/../texi2html.pl $(srcdir)/../texi2html.init \
+  $(srcdir)/../MySimple.pm $(srcdir)/../T2h_i18n.pm
+       TEXINPUTS=$(srcdir)::$$TEXINPUTS T2H_HOME=$(srcdir)/../ \
+         $(SHELL) $(srcdir)/../missing-texi2html --run \
+           $(PERL) -x $(srcdir)/../texi2html.pl -V $<
 
 $(TEXI2HTML):
-       @(cd $(top_builddir) && make texi2html)
+       @(cd $(builddir)/../ && make texi2html)
 
-texi2html.1: texi2html.1.in ../config.status
+texi2html.1: texi2html.1.in $(top_builddir)/config.status
        @echo Generating address@hidden
        @sed -e "s/address@hidden@]/$(PACKAGE_VERSION)/" \
             -e "s/address@hidden@]/$(PACKAGE_DATE)/" \

Index: doc/stamp-vti
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/stamp-vti,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- doc/stamp-vti       23 Sep 2009 19:07:30 -0000      1.64
+++ doc/stamp-vti       26 Oct 2009 23:21:56 -0000      1.65
@@ -1,4 +1,4 @@
address@hidden UPDATED 22 September 2009
address@hidden UPDATED-MONTH September 2009
address@hidden UPDATED 18 October 2009
address@hidden UPDATED-MONTH October 2009
 @set EDITION 1.83
 @set VERSION 1.83

Index: doc/texi2html.1.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.1.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/texi2html.1.in  8 Sep 2008 16:29:46 -0000       1.6
+++ doc/texi2html.1.in  26 Oct 2009 23:21:56 -0000      1.7
@@ -109,7 +109,7 @@
 Print version and exit.
 .PP
 .SH FILES
-Initialisation options are read first from @pkgdatadir@/texi2html/Config 
+Initialisation options are read first from @pkgdatadir@/Config 
 (the exact location being changeable with the
 .RI --datadir=dir
 option to the configure script), then from @sysconfdir@/texi2html/Config

Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/version.texi,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- doc/version.texi    23 Sep 2009 19:07:30 -0000      1.64
+++ doc/version.texi    26 Oct 2009 23:21:56 -0000      1.65
@@ -1,4 +1,4 @@
address@hidden UPDATED 22 September 2009
address@hidden UPDATED-MONTH September 2009
address@hidden UPDATED 18 October 2009
address@hidden UPDATED-MONTH October 2009
 @set EDITION 1.83
 @set VERSION 1.83

Index: maintained_extra/tex4ht.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/maintained_extra/tex4ht.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- maintained_extra/tex4ht.init        22 Oct 2009 20:23:19 -0000      1.3
+++ maintained_extra/tex4ht.init        26 Oct 2009 23:21:56 -0000      1.4
@@ -31,11 +31,15 @@
 # $Texi2HTML::TeX4HT::tex4ht_command_tex 
 #    and $Texi2HTML::TeX4HT::tex4ht_options_tex
 
+use strict;
 
 if (defined($OUTPUT_FORMAT) and $OUTPUT_FORMAT eq 'html')
 {
 push @command_handler_init, \&Texi2HTML::TeX4HT::tex4ht_init;
 push @command_handler_process, \&Texi2HTML::TeX4HT::tex4ht_process;
+# do it once here to have something ready for special regions formatting
+push @command_handler_process, \&Texi2HTML::TeX4HT::tex4ht_output;
+# do it once more if the file was modified (for example see mediawiki.init)
 push @command_handler_output, \&Texi2HTML::TeX4HT::tex4ht_output;
 push @command_handler_finish, \&Texi2HTML::TeX4HT::tex4ht_finish;
 
@@ -58,6 +62,10 @@
 use vars qw(
 $STYLE_MATH
 $STYLE_TEX
+$tex4ht_command_math
+$tex4ht_command_tex
+$tex4ht_options_math
+$tex4ht_options_tex
 );
 
 $STYLE_MATH = 'texi' if (!defined($STYLE_MATH));
@@ -81,12 +89,13 @@
 my $tex4ht_initial_dir;
 my $tex4ht_out_dir;
 my $tex4ht_latex_failed = 0;
+my %tex4ht_results;
 
 sub tex4ht_init
 {
   # set file names
   $tex4ht_initial_dir = Cwd::abs_path;
-  if ($null_device_file{$Texi2HTML::THISDOC{'filename'}->{'top'}})
+  if 
($Texi2HTML::Config::null_device_file{$Texi2HTML::THISDOC{'filename'}->{'top'}})
   {
     # when output is a null device we skip entirely the tex4ht stuff.
     $tex4ht_latex_failed = 1;
@@ -95,7 +104,6 @@
   $tex4ht_out_dir = "$Texi2HTML::THISDOC{'destination_directory'}";
   $tex4ht_out_dir = './' if (!defined($tex4ht_out_dir) or $tex4ht_out_dir =~ 
/^\s*$/);
   my $tex4ht_basename = "$Texi2HTML::THISDOC{'file_base_name'}_tex4ht";
-  $tex4ht_output_counter = 0;
   %tex4ht_results = ();
   $tex4ht_latex_failed = 0;
   # this initialization doesn't seems to be needed, but it is cleaner anyway
@@ -198,8 +206,6 @@
   return 1;
 }
 
-my %tex4ht_results;
-
 sub tex4ht_process
 {
   foreach my $command ('math', 'tex')
@@ -221,8 +227,11 @@
   tex4ht_return_to_dir();
 }
 
+my $tex4ht_output_counter;
+
 sub tex4ht_output
 {
+  $tex4ht_output_counter = 0;
   unless (chdir $tex4ht_out_dir)
   {
      main::document_warn ("t2h_tex4ht chdir to $tex4ht_out_dir failed");
@@ -346,8 +355,6 @@
   }
 }
 
-my $tex4ht_output_counter = 0;
-
 sub tex4ht_do_tex
 {
   my $command = shift;

Index: test/encodings/multi_lang.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/encodings/multi_lang.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/multi_lang.texi      18 Aug 2008 18:02:15 -0000      1.1
+++ test/encodings/multi_lang.texi      26 Oct 2009 23:21:56 -0000      1.2
@@ -13,6 +13,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 @end menu
 
@@ -42,6 +44,14 @@
 
 In english. @xref{Top}.
 
address@hidden fr_FR
address@hidden chapter fr_FR
address@hidden fr_FR
+
address@hidden de
address@hidden chapter de
address@hidden de
+
 @documentlanguage pt_BR
 @node chapter pt_BR
 @chapter pt_bR

Index: test/encodings/res/multi_lang/multi_lang.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/multi_lang/multi_lang.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/encodings/res/multi_lang/multi_lang.html       4 Oct 2009 21:51:12 
-0000       1.12
+++ test/encodings/res/multi_lang/multi_lang.html       26 Oct 2009 23:21:56 
-0000      1.13
@@ -62,7 +62,11 @@
 </td></tr>
 <tr><td align="left" valign="top"><a href="#chapter-en">3 
en</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
-<tr><td align="left" valign="top"><a href="#chapter-pt_005fBR">4 
pt_bR</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a href="#chapter-fr_005fFR">4 
fr_FR</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#chapter-de">5 
de</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#chapter-pt_005fBR">6 
pt_bR</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
 </td></tr>
 </table>
 
@@ -143,8 +147,8 @@
 <tr><td valign="middle" align="left">[<a href="#chapter-ja" title="Beginning 
of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#chapter-ja" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Up section"> Up 
</a>]</td>
-<td valign="middle" align="left">[<a href="#chapter-pt_005fBR" title="Next 
section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[<a href="#chapter-pt_005fBR" title="Next 
chapter"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-fr_005fFR" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-fr_005fFR" title="Next 
chapter"> &gt;&gt; </a>]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>
@@ -160,10 +164,50 @@
 <p>In english. See section <a href="#Top">Multi language file</a>.
 </p>
 <hr>
+<a name="chapter-fr_005fFR"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#chapter-en" 
title="D&eacute;but de ce chapitre ou chapitre pr&eacute;c&eacute;dent"> 
&lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-en" title="Section 
pr&eacute;c&eacute;dente dans l&rsquo;ordre de lecture"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Section 
sup&eacute;rieure">Plus haut</a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-de" title="Section 
suivante dans l&rsquo;ordre de lecture"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-de" title="Chapitre 
suivant"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left"> &nbsp; </td>
+<td valign="middle" align="left"> &nbsp; </td>
+<td valign="middle" align="left"> &nbsp; </td>
+<td valign="middle" align="left"> &nbsp; </td>
+<td valign="middle" align="left">[<a href="#Top" title="Couverture (top) du 
document">Racine</a>]</td>
+<td valign="middle" align="left">[Table des mati&egrave;res]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="A propos (page 
d&rsquo;aide)"> ? </a>]</td>
+</tr></table>
+<a name="fr_005fFR"></a>
+<h1 class="chapter">4 fr_FR</h1>
+
+<hr>
+<a name="chapter-de"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#chapter-fr_005fFR" 
title="Anfang dieses oder des letzten Kapitels"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-fr_005fFR" title="Voriger 
Abschnitt in Lesereihenfolge"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Abschnitt nach oben"> 
Nach oben </a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-pt_005fBR" 
title="N&auml;chster Abschnitt in Lesereihenfolge"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-pt_005fBR" 
title="N&auml;chstes Kapitel"> &gt;&gt; </a>]</td>
+<td valign="middle" align="left"> &nbsp; </td>
+<td valign="middle" align="left"> &nbsp; </td>
+<td valign="middle" align="left"> &nbsp; </td>
+<td valign="middle" align="left"> &nbsp; </td>
+<td valign="middle" align="left">[<a href="#Top" title="Titelseite des 
Dokuments">Anfang</a>]</td>
+<td valign="middle" align="left">[Inhalt]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="&Uuml;ber 
(Hilfe)"> ? </a>]</td>
+</tr></table>
+<a name="de"></a>
+<h1 class="chapter">5 de</h1>
+
+<hr>
 <a name="chapter-pt_005fBR"></a>
 <table class="header" cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="#chapter-en" 
title="Come&ccedil;o desse cap&iacute;tulo ou cap&iacute;tulo anterior"> 
&lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="#chapter-en" 
title="Se&ccedil;&atilde;o anterior na ordem de leitura"> &lt; </a>]</td>
+<tr><td valign="middle" align="left">[<a href="#chapter-de" 
title="Come&ccedil;o desse cap&iacute;tulo ou cap&iacute;tulo anterior"> 
&lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="#chapter-de" 
title="Se&ccedil;&atilde;o anterior na ordem de leitura"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="#Top" title="Se&ccedil;&atilde;o 
acima"> Acima </a>]</td>
 <td valign="middle" align="left">[ &gt; ]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
@@ -177,7 +221,7 @@
 <td valign="middle" align="left">[<a href="#SEC_About" title="Sobre (ajuda)"> 
? </a>]</td>
 </tr></table>
 <a name="pt_005fbR"></a>
-<h1 class="chapter">4 pt_bR</h1>
+<h1 class="chapter">6 pt_bR</h1>
 
 <p>In brazilian. Veja se&ccedil;&atilde;o <a href="#Top">Multi language 
file</a>.
 </p>

Index: test/encodings/res/texi_multi_lang/multi_lang.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/texi_multi_lang/multi_lang.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_multi_lang/multi_lang.passfirst     18 Aug 2008 
18:02:55 -0000      1.1
+++ test/encodings/res/texi_multi_lang/multi_lang.passfirst     26 Oct 2009 
23:21:56 -0000      1.2
@@ -12,40 +12,50 @@
 multi_lang.texi(,13) * chapter fr_NOWHERE::
 multi_lang.texi(,14) * chapter ja::
 multi_lang.texi(,15) * chapter en::
-multi_lang.texi(,16) * chapter pt_BR::
-multi_lang.texi(,17) @end menu
-multi_lang.texi(,18) 
-multi_lang.texi(,19) @node chapter fr_NOWHERE
-multi_lang.texi(,20) @chapter Fr_NOWHERE
-multi_lang.texi(,21) 
-multi_lang.texi(,22) In french. @xref{Top}.
+multi_lang.texi(,16) * chapter fr_FR::
+multi_lang.texi(,17) * chapter de::
+multi_lang.texi(,18) * chapter pt_BR::
+multi_lang.texi(,19) @end menu
+multi_lang.texi(,20) 
+multi_lang.texi(,21) @node chapter fr_NOWHERE
+multi_lang.texi(,22) @chapter Fr_NOWHERE
 multi_lang.texi(,23) 
-multi_lang.texi(,24) @menu
-multi_lang.texi(,25) * sub fr_NOWHERE::
-multi_lang.texi(,26) @end menu
-multi_lang.texi(,27) 
-multi_lang.texi(,28) @node sub fr_NOWHERE
-multi_lang.texi(,29) @section fr_NOWHERE section
-multi_lang.texi(,30) 
-multi_lang.texi(,31) In fr section.
+multi_lang.texi(,24) In french. @xref{Top}.
+multi_lang.texi(,25) 
+multi_lang.texi(,26) @menu
+multi_lang.texi(,27) * sub fr_NOWHERE::
+multi_lang.texi(,28) @end menu
+multi_lang.texi(,29) 
+multi_lang.texi(,30) @node sub fr_NOWHERE
+multi_lang.texi(,31) @section fr_NOWHERE section
 multi_lang.texi(,32) 
-multi_lang.texi(,33) @documentlanguage ja
-multi_lang.texi(,34) @node chapter ja
-multi_lang.texi(,35) @chapter ja
-multi_lang.texi(,36) 
-multi_lang.texi(,37) In japanese. @xref{Top}.
+multi_lang.texi(,33) In fr section.
+multi_lang.texi(,34) 
+multi_lang.texi(,35) @documentlanguage ja
+multi_lang.texi(,36) @node chapter ja
+multi_lang.texi(,37) @chapter ja
 multi_lang.texi(,38) 
-multi_lang.texi(,39) @documentlanguage en
-multi_lang.texi(,40) @node chapter en
-multi_lang.texi(,41) @chapter en
-multi_lang.texi(,42) 
-multi_lang.texi(,43) In english. @xref{Top}.
+multi_lang.texi(,39) In japanese. @xref{Top}.
+multi_lang.texi(,40) 
+multi_lang.texi(,41) @documentlanguage en
+multi_lang.texi(,42) @node chapter en
+multi_lang.texi(,43) @chapter en
 multi_lang.texi(,44) 
-multi_lang.texi(,45) @documentlanguage pt_BR
-multi_lang.texi(,46) @node chapter pt_BR
-multi_lang.texi(,47) @chapter pt_bR
-multi_lang.texi(,48) 
-multi_lang.texi(,49) In brazilian. @xref{Top}.
+multi_lang.texi(,45) In english. @xref{Top}.
+multi_lang.texi(,46) 
+multi_lang.texi(,47) @documentlanguage fr_FR
+multi_lang.texi(,48) @node chapter fr_FR
+multi_lang.texi(,49) @chapter fr_FR
 multi_lang.texi(,50) 
-multi_lang.texi(,51) 
-multi_lang.texi(,52) @bye
+multi_lang.texi(,51) @documentlanguage de
+multi_lang.texi(,52) @node chapter de
+multi_lang.texi(,53) @chapter de
+multi_lang.texi(,54) 
+multi_lang.texi(,55) @documentlanguage pt_BR
+multi_lang.texi(,56) @node chapter pt_BR
+multi_lang.texi(,57) @chapter pt_bR
+multi_lang.texi(,58) 
+multi_lang.texi(,59) In brazilian. @xref{Top}.
+multi_lang.texi(,60) 
+multi_lang.texi(,61) 
+multi_lang.texi(,62) @bye

Index: test/encodings/res/texi_multi_lang/multi_lang.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/texi_multi_lang/multi_lang.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_multi_lang/multi_lang.passtexi      18 Aug 2008 
18:02:55 -0000      1.1
+++ test/encodings/res/texi_multi_lang/multi_lang.passtexi      26 Oct 2009 
23:21:56 -0000      1.2
@@ -12,40 +12,50 @@
 multi_lang.texi(,13) * chapter fr_NOWHERE::
 multi_lang.texi(,14) * chapter ja::
 multi_lang.texi(,15) * chapter en::
-multi_lang.texi(,16) * chapter pt_BR::
-multi_lang.texi(,17) @end menu
-multi_lang.texi(,18) 
-multi_lang.texi(,19) @node chapter fr_NOWHERE
-multi_lang.texi(,20) @chapter Fr_NOWHERE
-multi_lang.texi(,21) 
-multi_lang.texi(,22) In french. @xref{Top}.
+multi_lang.texi(,16) * chapter fr_FR::
+multi_lang.texi(,17) * chapter de::
+multi_lang.texi(,18) * chapter pt_BR::
+multi_lang.texi(,19) @end menu
+multi_lang.texi(,20) 
+multi_lang.texi(,21) @node chapter fr_NOWHERE
+multi_lang.texi(,22) @chapter Fr_NOWHERE
 multi_lang.texi(,23) 
-multi_lang.texi(,24) @menu
-multi_lang.texi(,25) * sub fr_NOWHERE::
-multi_lang.texi(,26) @end menu
-multi_lang.texi(,27) 
-multi_lang.texi(,28) @node sub fr_NOWHERE
-multi_lang.texi(,29) @section fr_NOWHERE section
-multi_lang.texi(,30) 
-multi_lang.texi(,31) In fr section.
+multi_lang.texi(,24) In french. @xref{Top}.
+multi_lang.texi(,25) 
+multi_lang.texi(,26) @menu
+multi_lang.texi(,27) * sub fr_NOWHERE::
+multi_lang.texi(,28) @end menu
+multi_lang.texi(,29) 
+multi_lang.texi(,30) @node sub fr_NOWHERE
+multi_lang.texi(,31) @section fr_NOWHERE section
 multi_lang.texi(,32) 
-multi_lang.texi(,33) @documentlanguage ja
-multi_lang.texi(,34) @node chapter ja
-multi_lang.texi(,35) @chapter ja
-multi_lang.texi(,36) 
-multi_lang.texi(,37) In japanese. @xref{Top}.
+multi_lang.texi(,33) In fr section.
+multi_lang.texi(,34) 
+multi_lang.texi(,35) @documentlanguage ja
+multi_lang.texi(,36) @node chapter ja
+multi_lang.texi(,37) @chapter ja
 multi_lang.texi(,38) 
-multi_lang.texi(,39) @documentlanguage en
-multi_lang.texi(,40) @node chapter en
-multi_lang.texi(,41) @chapter en
-multi_lang.texi(,42) 
-multi_lang.texi(,43) In english. @xref{Top}.
+multi_lang.texi(,39) In japanese. @xref{Top}.
+multi_lang.texi(,40) 
+multi_lang.texi(,41) @documentlanguage en
+multi_lang.texi(,42) @node chapter en
+multi_lang.texi(,43) @chapter en
 multi_lang.texi(,44) 
-multi_lang.texi(,45) @documentlanguage pt_BR
-multi_lang.texi(,46) @node chapter pt_BR
-multi_lang.texi(,47) @chapter pt_bR
-multi_lang.texi(,48) 
-multi_lang.texi(,49) In brazilian. @xref{Top}.
+multi_lang.texi(,45) In english. @xref{Top}.
+multi_lang.texi(,46) 
+multi_lang.texi(,47) @documentlanguage fr_FR
+multi_lang.texi(,48) @node chapter fr_FR
+multi_lang.texi(,49) @chapter fr_FR
 multi_lang.texi(,50) 
-multi_lang.texi(,51) 
-multi_lang.texi(,52) @bye
+multi_lang.texi(,51) @documentlanguage de
+multi_lang.texi(,52) @node chapter de
+multi_lang.texi(,53) @chapter de
+multi_lang.texi(,54) 
+multi_lang.texi(,55) @documentlanguage pt_BR
+multi_lang.texi(,56) @node chapter pt_BR
+multi_lang.texi(,57) @chapter pt_bR
+multi_lang.texi(,58) 
+multi_lang.texi(,59) In brazilian. @xref{Top}.
+multi_lang.texi(,60) 
+multi_lang.texi(,61) 
+multi_lang.texi(,62) @bye

Index: test/encodings/res/texi_multi_lang/multi_lang.texi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/texi_multi_lang/multi_lang.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_multi_lang/multi_lang.texi  18 Aug 2008 18:02:55 
-0000      1.1
+++ test/encodings/res/texi_multi_lang/multi_lang.texi  26 Oct 2009 23:21:56 
-0000      1.2
@@ -13,6 +13,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 @end menu
 
@@ -42,6 +44,14 @@
 
 In english. @xref{Top}.
 
address@hidden fr_FR
address@hidden chapter fr_FR
address@hidden fr_FR
+
address@hidden de
address@hidden chapter de
address@hidden de
+
 @documentlanguage pt_BR
 @node chapter pt_BR
 @chapter pt_bR

Index: test/encodings/res/texi_multi_lang/multi_lang.texi.first
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/texi_multi_lang/multi_lang.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_multi_lang/multi_lang.texi.first    2 Aug 2009 
13:13:23 -0000       1.1
+++ test/encodings/res/texi_multi_lang/multi_lang.texi.first    26 Oct 2009 
23:21:56 -0000      1.2
@@ -13,6 +13,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 @end menu
 
@@ -42,6 +44,14 @@
 
 In english. @xref{Top}.
 
address@hidden fr_FR
address@hidden chapter fr_FR
address@hidden fr_FR
+
address@hidden de
address@hidden chapter de
address@hidden de
+
 @documentlanguage pt_BR
 @node chapter pt_BR
 @chapter pt_bR

Index: test/encodings/res_all/multi_lang/multi_lang.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/multi_lang/multi_lang.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/multi_lang/multi_lang.txt    6 Jul 2009 21:59:22 
-0000       1.1
+++ test/encodings/res_all/multi_lang/multi_lang.txt    26 Oct 2009 23:21:57 
-0000      1.2
@@ -6,6 +6,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 
 1 Fr_NOWHERE
@@ -30,7 +32,13 @@
 
 In english. See Top.
 
-4 pt_bR
+4 fr_FR
+*******
+
+5 de
+****
+
+6 pt_bR
 *******
 
 In brazilian. Veja Top.

Index: test/encodings/res_all/texi_multi_lang/multi_lang.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/texi_multi_lang/multi_lang.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/texi_multi_lang/multi_lang.passfirst 6 Jul 2009 
21:59:32 -0000       1.1
+++ test/encodings/res_all/texi_multi_lang/multi_lang.passfirst 26 Oct 2009 
23:21:57 -0000      1.2
@@ -12,40 +12,50 @@
 multi_lang.texi(,13) * chapter fr_NOWHERE::
 multi_lang.texi(,14) * chapter ja::
 multi_lang.texi(,15) * chapter en::
-multi_lang.texi(,16) * chapter pt_BR::
-multi_lang.texi(,17) @end menu
-multi_lang.texi(,18) 
-multi_lang.texi(,19) @node chapter fr_NOWHERE
-multi_lang.texi(,20) @chapter Fr_NOWHERE
-multi_lang.texi(,21) 
-multi_lang.texi(,22) In french. @xref{Top}.
+multi_lang.texi(,16) * chapter fr_FR::
+multi_lang.texi(,17) * chapter de::
+multi_lang.texi(,18) * chapter pt_BR::
+multi_lang.texi(,19) @end menu
+multi_lang.texi(,20) 
+multi_lang.texi(,21) @node chapter fr_NOWHERE
+multi_lang.texi(,22) @chapter Fr_NOWHERE
 multi_lang.texi(,23) 
-multi_lang.texi(,24) @menu
-multi_lang.texi(,25) * sub fr_NOWHERE::
-multi_lang.texi(,26) @end menu
-multi_lang.texi(,27) 
-multi_lang.texi(,28) @node sub fr_NOWHERE
-multi_lang.texi(,29) @section fr_NOWHERE section
-multi_lang.texi(,30) 
-multi_lang.texi(,31) In fr section.
+multi_lang.texi(,24) In french. @xref{Top}.
+multi_lang.texi(,25) 
+multi_lang.texi(,26) @menu
+multi_lang.texi(,27) * sub fr_NOWHERE::
+multi_lang.texi(,28) @end menu
+multi_lang.texi(,29) 
+multi_lang.texi(,30) @node sub fr_NOWHERE
+multi_lang.texi(,31) @section fr_NOWHERE section
 multi_lang.texi(,32) 
-multi_lang.texi(,33) @documentlanguage ja
-multi_lang.texi(,34) @node chapter ja
-multi_lang.texi(,35) @chapter ja
-multi_lang.texi(,36) 
-multi_lang.texi(,37) In japanese. @xref{Top}.
+multi_lang.texi(,33) In fr section.
+multi_lang.texi(,34) 
+multi_lang.texi(,35) @documentlanguage ja
+multi_lang.texi(,36) @node chapter ja
+multi_lang.texi(,37) @chapter ja
 multi_lang.texi(,38) 
-multi_lang.texi(,39) @documentlanguage en
-multi_lang.texi(,40) @node chapter en
-multi_lang.texi(,41) @chapter en
-multi_lang.texi(,42) 
-multi_lang.texi(,43) In english. @xref{Top}.
+multi_lang.texi(,39) In japanese. @xref{Top}.
+multi_lang.texi(,40) 
+multi_lang.texi(,41) @documentlanguage en
+multi_lang.texi(,42) @node chapter en
+multi_lang.texi(,43) @chapter en
 multi_lang.texi(,44) 
-multi_lang.texi(,45) @documentlanguage pt_BR
-multi_lang.texi(,46) @node chapter pt_BR
-multi_lang.texi(,47) @chapter pt_bR
-multi_lang.texi(,48) 
-multi_lang.texi(,49) In brazilian. @xref{Top}.
+multi_lang.texi(,45) In english. @xref{Top}.
+multi_lang.texi(,46) 
+multi_lang.texi(,47) @documentlanguage fr_FR
+multi_lang.texi(,48) @node chapter fr_FR
+multi_lang.texi(,49) @chapter fr_FR
 multi_lang.texi(,50) 
-multi_lang.texi(,51) 
-multi_lang.texi(,52) @bye
+multi_lang.texi(,51) @documentlanguage de
+multi_lang.texi(,52) @node chapter de
+multi_lang.texi(,53) @chapter de
+multi_lang.texi(,54) 
+multi_lang.texi(,55) @documentlanguage pt_BR
+multi_lang.texi(,56) @node chapter pt_BR
+multi_lang.texi(,57) @chapter pt_bR
+multi_lang.texi(,58) 
+multi_lang.texi(,59) In brazilian. @xref{Top}.
+multi_lang.texi(,60) 
+multi_lang.texi(,61) 
+multi_lang.texi(,62) @bye

Index: test/encodings/res_all/texi_multi_lang/multi_lang.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/texi_multi_lang/multi_lang.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/texi_multi_lang/multi_lang.passtexi  6 Jul 2009 
21:59:32 -0000       1.1
+++ test/encodings/res_all/texi_multi_lang/multi_lang.passtexi  26 Oct 2009 
23:21:57 -0000      1.2
@@ -12,40 +12,50 @@
 multi_lang.texi(,13) * chapter fr_NOWHERE::
 multi_lang.texi(,14) * chapter ja::
 multi_lang.texi(,15) * chapter en::
-multi_lang.texi(,16) * chapter pt_BR::
-multi_lang.texi(,17) @end menu
-multi_lang.texi(,18) 
-multi_lang.texi(,19) @node chapter fr_NOWHERE
-multi_lang.texi(,20) @chapter Fr_NOWHERE
-multi_lang.texi(,21) 
-multi_lang.texi(,22) In french. @xref{Top}.
+multi_lang.texi(,16) * chapter fr_FR::
+multi_lang.texi(,17) * chapter de::
+multi_lang.texi(,18) * chapter pt_BR::
+multi_lang.texi(,19) @end menu
+multi_lang.texi(,20) 
+multi_lang.texi(,21) @node chapter fr_NOWHERE
+multi_lang.texi(,22) @chapter Fr_NOWHERE
 multi_lang.texi(,23) 
-multi_lang.texi(,24) @menu
-multi_lang.texi(,25) * sub fr_NOWHERE::
-multi_lang.texi(,26) @end menu
-multi_lang.texi(,27) 
-multi_lang.texi(,28) @node sub fr_NOWHERE
-multi_lang.texi(,29) @section fr_NOWHERE section
-multi_lang.texi(,30) 
-multi_lang.texi(,31) In fr section.
+multi_lang.texi(,24) In french. @xref{Top}.
+multi_lang.texi(,25) 
+multi_lang.texi(,26) @menu
+multi_lang.texi(,27) * sub fr_NOWHERE::
+multi_lang.texi(,28) @end menu
+multi_lang.texi(,29) 
+multi_lang.texi(,30) @node sub fr_NOWHERE
+multi_lang.texi(,31) @section fr_NOWHERE section
 multi_lang.texi(,32) 
-multi_lang.texi(,33) @documentlanguage ja
-multi_lang.texi(,34) @node chapter ja
-multi_lang.texi(,35) @chapter ja
-multi_lang.texi(,36) 
-multi_lang.texi(,37) In japanese. @xref{Top}.
+multi_lang.texi(,33) In fr section.
+multi_lang.texi(,34) 
+multi_lang.texi(,35) @documentlanguage ja
+multi_lang.texi(,36) @node chapter ja
+multi_lang.texi(,37) @chapter ja
 multi_lang.texi(,38) 
-multi_lang.texi(,39) @documentlanguage en
-multi_lang.texi(,40) @node chapter en
-multi_lang.texi(,41) @chapter en
-multi_lang.texi(,42) 
-multi_lang.texi(,43) In english. @xref{Top}.
+multi_lang.texi(,39) In japanese. @xref{Top}.
+multi_lang.texi(,40) 
+multi_lang.texi(,41) @documentlanguage en
+multi_lang.texi(,42) @node chapter en
+multi_lang.texi(,43) @chapter en
 multi_lang.texi(,44) 
-multi_lang.texi(,45) @documentlanguage pt_BR
-multi_lang.texi(,46) @node chapter pt_BR
-multi_lang.texi(,47) @chapter pt_bR
-multi_lang.texi(,48) 
-multi_lang.texi(,49) In brazilian. @xref{Top}.
+multi_lang.texi(,45) In english. @xref{Top}.
+multi_lang.texi(,46) 
+multi_lang.texi(,47) @documentlanguage fr_FR
+multi_lang.texi(,48) @node chapter fr_FR
+multi_lang.texi(,49) @chapter fr_FR
 multi_lang.texi(,50) 
-multi_lang.texi(,51) 
-multi_lang.texi(,52) @bye
+multi_lang.texi(,51) @documentlanguage de
+multi_lang.texi(,52) @node chapter de
+multi_lang.texi(,53) @chapter de
+multi_lang.texi(,54) 
+multi_lang.texi(,55) @documentlanguage pt_BR
+multi_lang.texi(,56) @node chapter pt_BR
+multi_lang.texi(,57) @chapter pt_bR
+multi_lang.texi(,58) 
+multi_lang.texi(,59) In brazilian. @xref{Top}.
+multi_lang.texi(,60) 
+multi_lang.texi(,61) 
+multi_lang.texi(,62) @bye

Index: test/encodings/res_all/texi_multi_lang/multi_lang.texi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/texi_multi_lang/multi_lang.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/texi_multi_lang/multi_lang.texi      6 Jul 2009 
21:59:32 -0000       1.1
+++ test/encodings/res_all/texi_multi_lang/multi_lang.texi      26 Oct 2009 
23:21:57 -0000      1.2
@@ -13,6 +13,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 @end menu
 
@@ -42,6 +44,14 @@
 
 In english. @xref{Top}.
 
address@hidden fr_FR
address@hidden chapter fr_FR
address@hidden fr_FR
+
address@hidden de
address@hidden chapter de
address@hidden de
+
 @documentlanguage pt_BR
 @node chapter pt_BR
 @chapter pt_bR

Index: test/encodings/res_all/texi_multi_lang/multi_lang.texi.first
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/texi_multi_lang/multi_lang.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/texi_multi_lang/multi_lang.texi.first        2 Aug 
2009 13:13:26 -0000       1.1
+++ test/encodings/res_all/texi_multi_lang/multi_lang.texi.first        26 Oct 
2009 23:21:57 -0000      1.2
@@ -13,6 +13,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 @end menu
 
@@ -42,6 +44,14 @@
 
 In english. @xref{Top}.
 
address@hidden fr_FR
address@hidden chapter fr_FR
address@hidden fr_FR
+
address@hidden de
address@hidden chapter de
address@hidden de
+
 @documentlanguage pt_BR
 @node chapter pt_BR
 @chapter pt_bR

Index: test/encodings/res_info/multi_lang/multi_lang.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/multi_lang/multi_lang.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_info/multi_lang/multi_lang.info  6 Jul 2009 21:59:37 
-0000       1.1
+++ test/encodings/res_info/multi_lang/multi_lang.info  26 Oct 2009 23:21:57 
-0000      1.2
@@ -14,6 +14,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 
 
@@ -45,7 +47,7 @@
 In japanese. *Note Top::.
 
 
-File: multi_lang.info,  Node: chapter en,  Next: chapter pt_BR,  Prev: chapter 
ja,  Up: Top
+File: multi_lang.info,  Node: chapter en,  Next: chapter fr_FR,  Prev: chapter 
ja,  Up: Top
 
 3 en
 ****
@@ -53,9 +55,21 @@
 In english. *Note Top::.
 
 
-File: multi_lang.info,  Node: chapter pt_BR,  Prev: chapter en,  Up: Top
+File: multi_lang.info,  Node: chapter fr_FR,  Next: chapter de,  Prev: chapter 
en,  Up: Top
 
-4 pt_bR
+4 fr_FR
+*******
+
+
+File: multi_lang.info,  Node: chapter de,  Next: chapter pt_BR,  Prev: chapter 
fr_FR,  Up: Top
+
+5 de
+****
+
+
+File: multi_lang.info,  Node: chapter pt_BR,  Prev: chapter de,  Up: Top
+
+6 pt_bR
 *******
 
 In brazilian. *Note Top::.
@@ -64,10 +78,12 @@
 
 Tag Table:
 Node: Top82
-Node: chapter fr_NOWHERE299
-Node: sub fr_NOWHERE473
-Node: chapter ja609
-Node: chapter en747
-Node: chapter pt_BR879
+Node: chapter fr_NOWHERE332
+Node: sub fr_NOWHERE506
+Node: chapter ja642
+Node: chapter en780
+Node: chapter fr_FR912
+Node: chapter de1024
+Node: chapter pt_BR1133
 
 End Tag Table

Index: test/encodings/res_info/texi_multi_lang/multi_lang.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/texi_multi_lang/multi_lang.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_info/texi_multi_lang/multi_lang.passfirst        6 Jul 
2009 21:59:50 -0000       1.1
+++ test/encodings/res_info/texi_multi_lang/multi_lang.passfirst        26 Oct 
2009 23:21:57 -0000      1.2
@@ -12,40 +12,50 @@
 multi_lang.texi(,13) * chapter fr_NOWHERE::
 multi_lang.texi(,14) * chapter ja::
 multi_lang.texi(,15) * chapter en::
-multi_lang.texi(,16) * chapter pt_BR::
-multi_lang.texi(,17) @end menu
-multi_lang.texi(,18) 
-multi_lang.texi(,19) @node chapter fr_NOWHERE
-multi_lang.texi(,20) @chapter Fr_NOWHERE
-multi_lang.texi(,21) 
-multi_lang.texi(,22) In french. @xref{Top}.
+multi_lang.texi(,16) * chapter fr_FR::
+multi_lang.texi(,17) * chapter de::
+multi_lang.texi(,18) * chapter pt_BR::
+multi_lang.texi(,19) @end menu
+multi_lang.texi(,20) 
+multi_lang.texi(,21) @node chapter fr_NOWHERE
+multi_lang.texi(,22) @chapter Fr_NOWHERE
 multi_lang.texi(,23) 
-multi_lang.texi(,24) @menu
-multi_lang.texi(,25) * sub fr_NOWHERE::
-multi_lang.texi(,26) @end menu
-multi_lang.texi(,27) 
-multi_lang.texi(,28) @node sub fr_NOWHERE
-multi_lang.texi(,29) @section fr_NOWHERE section
-multi_lang.texi(,30) 
-multi_lang.texi(,31) In fr section.
+multi_lang.texi(,24) In french. @xref{Top}.
+multi_lang.texi(,25) 
+multi_lang.texi(,26) @menu
+multi_lang.texi(,27) * sub fr_NOWHERE::
+multi_lang.texi(,28) @end menu
+multi_lang.texi(,29) 
+multi_lang.texi(,30) @node sub fr_NOWHERE
+multi_lang.texi(,31) @section fr_NOWHERE section
 multi_lang.texi(,32) 
-multi_lang.texi(,33) @documentlanguage ja
-multi_lang.texi(,34) @node chapter ja
-multi_lang.texi(,35) @chapter ja
-multi_lang.texi(,36) 
-multi_lang.texi(,37) In japanese. @xref{Top}.
+multi_lang.texi(,33) In fr section.
+multi_lang.texi(,34) 
+multi_lang.texi(,35) @documentlanguage ja
+multi_lang.texi(,36) @node chapter ja
+multi_lang.texi(,37) @chapter ja
 multi_lang.texi(,38) 
-multi_lang.texi(,39) @documentlanguage en
-multi_lang.texi(,40) @node chapter en
-multi_lang.texi(,41) @chapter en
-multi_lang.texi(,42) 
-multi_lang.texi(,43) In english. @xref{Top}.
+multi_lang.texi(,39) In japanese. @xref{Top}.
+multi_lang.texi(,40) 
+multi_lang.texi(,41) @documentlanguage en
+multi_lang.texi(,42) @node chapter en
+multi_lang.texi(,43) @chapter en
 multi_lang.texi(,44) 
-multi_lang.texi(,45) @documentlanguage pt_BR
-multi_lang.texi(,46) @node chapter pt_BR
-multi_lang.texi(,47) @chapter pt_bR
-multi_lang.texi(,48) 
-multi_lang.texi(,49) In brazilian. @xref{Top}.
+multi_lang.texi(,45) In english. @xref{Top}.
+multi_lang.texi(,46) 
+multi_lang.texi(,47) @documentlanguage fr_FR
+multi_lang.texi(,48) @node chapter fr_FR
+multi_lang.texi(,49) @chapter fr_FR
 multi_lang.texi(,50) 
-multi_lang.texi(,51) 
-multi_lang.texi(,52) @bye
+multi_lang.texi(,51) @documentlanguage de
+multi_lang.texi(,52) @node chapter de
+multi_lang.texi(,53) @chapter de
+multi_lang.texi(,54) 
+multi_lang.texi(,55) @documentlanguage pt_BR
+multi_lang.texi(,56) @node chapter pt_BR
+multi_lang.texi(,57) @chapter pt_bR
+multi_lang.texi(,58) 
+multi_lang.texi(,59) In brazilian. @xref{Top}.
+multi_lang.texi(,60) 
+multi_lang.texi(,61) 
+multi_lang.texi(,62) @bye

Index: test/encodings/res_info/texi_multi_lang/multi_lang.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/texi_multi_lang/multi_lang.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_info/texi_multi_lang/multi_lang.passtexi 6 Jul 2009 
21:59:50 -0000       1.1
+++ test/encodings/res_info/texi_multi_lang/multi_lang.passtexi 26 Oct 2009 
23:21:57 -0000      1.2
@@ -12,40 +12,50 @@
 multi_lang.texi(,13) * chapter fr_NOWHERE::
 multi_lang.texi(,14) * chapter ja::
 multi_lang.texi(,15) * chapter en::
-multi_lang.texi(,16) * chapter pt_BR::
-multi_lang.texi(,17) @end menu
-multi_lang.texi(,18) 
-multi_lang.texi(,19) @node chapter fr_NOWHERE
-multi_lang.texi(,20) @chapter Fr_NOWHERE
-multi_lang.texi(,21) 
-multi_lang.texi(,22) In french. @xref{Top}.
+multi_lang.texi(,16) * chapter fr_FR::
+multi_lang.texi(,17) * chapter de::
+multi_lang.texi(,18) * chapter pt_BR::
+multi_lang.texi(,19) @end menu
+multi_lang.texi(,20) 
+multi_lang.texi(,21) @node chapter fr_NOWHERE
+multi_lang.texi(,22) @chapter Fr_NOWHERE
 multi_lang.texi(,23) 
-multi_lang.texi(,24) @menu
-multi_lang.texi(,25) * sub fr_NOWHERE::
-multi_lang.texi(,26) @end menu
-multi_lang.texi(,27) 
-multi_lang.texi(,28) @node sub fr_NOWHERE
-multi_lang.texi(,29) @section fr_NOWHERE section
-multi_lang.texi(,30) 
-multi_lang.texi(,31) In fr section.
+multi_lang.texi(,24) In french. @xref{Top}.
+multi_lang.texi(,25) 
+multi_lang.texi(,26) @menu
+multi_lang.texi(,27) * sub fr_NOWHERE::
+multi_lang.texi(,28) @end menu
+multi_lang.texi(,29) 
+multi_lang.texi(,30) @node sub fr_NOWHERE
+multi_lang.texi(,31) @section fr_NOWHERE section
 multi_lang.texi(,32) 
-multi_lang.texi(,33) @documentlanguage ja
-multi_lang.texi(,34) @node chapter ja
-multi_lang.texi(,35) @chapter ja
-multi_lang.texi(,36) 
-multi_lang.texi(,37) In japanese. @xref{Top}.
+multi_lang.texi(,33) In fr section.
+multi_lang.texi(,34) 
+multi_lang.texi(,35) @documentlanguage ja
+multi_lang.texi(,36) @node chapter ja
+multi_lang.texi(,37) @chapter ja
 multi_lang.texi(,38) 
-multi_lang.texi(,39) @documentlanguage en
-multi_lang.texi(,40) @node chapter en
-multi_lang.texi(,41) @chapter en
-multi_lang.texi(,42) 
-multi_lang.texi(,43) In english. @xref{Top}.
+multi_lang.texi(,39) In japanese. @xref{Top}.
+multi_lang.texi(,40) 
+multi_lang.texi(,41) @documentlanguage en
+multi_lang.texi(,42) @node chapter en
+multi_lang.texi(,43) @chapter en
 multi_lang.texi(,44) 
-multi_lang.texi(,45) @documentlanguage pt_BR
-multi_lang.texi(,46) @node chapter pt_BR
-multi_lang.texi(,47) @chapter pt_bR
-multi_lang.texi(,48) 
-multi_lang.texi(,49) In brazilian. @xref{Top}.
+multi_lang.texi(,45) In english. @xref{Top}.
+multi_lang.texi(,46) 
+multi_lang.texi(,47) @documentlanguage fr_FR
+multi_lang.texi(,48) @node chapter fr_FR
+multi_lang.texi(,49) @chapter fr_FR
 multi_lang.texi(,50) 
-multi_lang.texi(,51) 
-multi_lang.texi(,52) @bye
+multi_lang.texi(,51) @documentlanguage de
+multi_lang.texi(,52) @node chapter de
+multi_lang.texi(,53) @chapter de
+multi_lang.texi(,54) 
+multi_lang.texi(,55) @documentlanguage pt_BR
+multi_lang.texi(,56) @node chapter pt_BR
+multi_lang.texi(,57) @chapter pt_bR
+multi_lang.texi(,58) 
+multi_lang.texi(,59) In brazilian. @xref{Top}.
+multi_lang.texi(,60) 
+multi_lang.texi(,61) 
+multi_lang.texi(,62) @bye

Index: test/encodings/res_info/texi_multi_lang/multi_lang.texi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/texi_multi_lang/multi_lang.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_info/texi_multi_lang/multi_lang.texi     6 Jul 2009 
21:59:51 -0000       1.1
+++ test/encodings/res_info/texi_multi_lang/multi_lang.texi     26 Oct 2009 
23:21:57 -0000      1.2
@@ -13,6 +13,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 @end menu
 
@@ -42,6 +44,14 @@
 
 In english. @xref{Top}.
 
address@hidden fr_FR
address@hidden chapter fr_FR
address@hidden fr_FR
+
address@hidden de
address@hidden chapter de
address@hidden de
+
 @documentlanguage pt_BR
 @node chapter pt_BR
 @chapter pt_bR

Index: test/encodings/res_info/texi_multi_lang/multi_lang.texi.first
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/texi_multi_lang/multi_lang.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_info/texi_multi_lang/multi_lang.texi.first       2 Aug 
2009 13:13:29 -0000       1.1
+++ test/encodings/res_info/texi_multi_lang/multi_lang.texi.first       26 Oct 
2009 23:21:57 -0000      1.2
@@ -13,6 +13,8 @@
 * chapter fr_NOWHERE::
 * chapter ja::
 * chapter en::
+* chapter fr_FR::
+* chapter de::
 * chapter pt_BR::
 @end menu
 
@@ -42,6 +44,14 @@
 
 In english. @xref{Top}.
 
address@hidden fr_FR
address@hidden chapter fr_FR
address@hidden fr_FR
+
address@hidden de
address@hidden chapter de
address@hidden de
+
 @documentlanguage pt_BR
 @node chapter pt_BR
 @chapter pt_bR

Index: test/formatting/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/tests.txt,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- test/formatting/tests.txt   22 Oct 2009 20:23:19 -0000      1.35
+++ test/formatting/tests.txt   26 Oct 2009 23:21:57 -0000      1.36
@@ -71,6 +71,8 @@
 detailmenus detailmenus.texi
 detailmenus_simple detailmenus.texi --init simple_menu.init
 commands_in_ifset commands_in_ifset.texi
+simplest_test_prefix simplest.texi --prefix=truc
+simplest_test_prefix_info simplest.texi --info --prefix=truc
 simplest_test_css simplest.texi --css-include file.css
 punctuation punctuation.texi
 punctuation_frenchspacing punctuation_frenchspacing.texi

Index: test/formatting/res/simplest_test_prefix/simplest.1
===================================================================
RCS file: test/formatting/res/simplest_test_prefix/simplest.1
diff -N test/formatting/res/simplest_test_prefix/simplest.1

Index: test/formatting/res/simplest_test_prefix/simplest.2
===================================================================
RCS file: test/formatting/res/simplest_test_prefix/simplest.2
diff -N test/formatting/res/simplest_test_prefix/simplest.2
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/simplest_test_prefix/simplest.2 26 Oct 2009 23:21:57 
-0000      1.1
@@ -0,0 +1 @@
+warning: Must specify a title with a title command or @top

Index: test/formatting/res/simplest_test_prefix/truc.html
===================================================================
RCS file: test/formatting/res/simplest_test_prefix/truc.html
diff -N test/formatting/res/simplest_test_prefix/truc.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/simplest_test_prefix/truc.html  26 Oct 2009 23:21:57 
-0000      1.1
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by: 
+            Lionel Cons <address@hidden> (original author)
+            Karl Berry  <address@hidden>
+            Olaf Bachmann <address@hidden>
+            and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" 
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+
+<p>This is a very simple texi manual &nbsp; &lt;&gt;.
+</p>
+<hr>
+<p>
+ <font size="-1">
+  This document was generated on <i>a sunny day</i> using <a 
href="http://www.nongnu.org/texi2html/";><i>texi2html</i></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>

Index: test/formatting/res/simplest_test_prefix_info/truc.info
===================================================================
RCS file: test/formatting/res/simplest_test_prefix_info/truc.info
diff -N test/formatting/res/simplest_test_prefix_info/truc.info

Index: test/formatting/res_all/simplest_test_prefix/simplest.1
===================================================================
RCS file: test/formatting/res_all/simplest_test_prefix/simplest.1
diff -N test/formatting/res_all/simplest_test_prefix/simplest.1

Index: test/formatting/res_all/simplest_test_prefix/simplest.2
===================================================================
RCS file: test/formatting/res_all/simplest_test_prefix/simplest.2
diff -N test/formatting/res_all/simplest_test_prefix/simplest.2

Index: test/formatting/res_all/simplest_test_prefix/truc.txt
===================================================================
RCS file: test/formatting/res_all/simplest_test_prefix/truc.txt
diff -N test/formatting/res_all/simplest_test_prefix/truc.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/res_all/simplest_test_prefix/truc.txt       26 Oct 2009 
23:21:58 -0000      1.1
@@ -0,0 +1,5 @@
+Top
+***
+
+This is a very simple texi manual   <>.
+

Index: test/formatting/res_all/simplest_test_prefix_info/simplest.1
===================================================================
RCS file: test/formatting/res_all/simplest_test_prefix_info/simplest.1
diff -N test/formatting/res_all/simplest_test_prefix_info/simplest.1

Index: test/formatting/res_all/simplest_test_prefix_info/simplest.2
===================================================================
RCS file: test/formatting/res_all/simplest_test_prefix_info/simplest.2
diff -N test/formatting/res_all/simplest_test_prefix_info/simplest.2

Index: test/formatting/res_all/simplest_test_prefix_info/truc.info
===================================================================
RCS file: test/formatting/res_all/simplest_test_prefix_info/truc.info
diff -N test/formatting/res_all/simplest_test_prefix_info/truc.info
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/res_all/simplest_test_prefix_info/truc.info 26 Oct 2009 
23:21:58 -0000      1.1
@@ -0,0 +1,14 @@
+This is truc.info, produced by makeinfo version 4.13 from simplest.texi.
+
+
+
+File: truc.info,  Node: Top,  Up: (dir)
+
+This is a very simple texi manual   <>.
+
+
+
+Tag Table:
+Node: Top75
+
+End Tag Table

Index: test/formatting/res_info/simplest_test_prefix/simplest.1
===================================================================
RCS file: test/formatting/res_info/simplest_test_prefix/simplest.1
diff -N test/formatting/res_info/simplest_test_prefix/simplest.1

Index: test/formatting/res_info/simplest_test_prefix/simplest.2
===================================================================
RCS file: test/formatting/res_info/simplest_test_prefix/simplest.2
diff -N test/formatting/res_info/simplest_test_prefix/simplest.2
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/res_info/simplest_test_prefix/simplest.2    26 Oct 2009 
23:21:58 -0000      1.1
@@ -0,0 +1 @@
+Unknown option: prefix

Index: test/formatting/res_info/simplest_test_prefix/simplest.info
===================================================================
RCS file: test/formatting/res_info/simplest_test_prefix/simplest.info
diff -N test/formatting/res_info/simplest_test_prefix/simplest.info
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/res_info/simplest_test_prefix/simplest.info 26 Oct 2009 
23:21:58 -0000      1.1
@@ -0,0 +1,14 @@
+This is simplest.info, produced by makeinfo version 4.13 from
+simplest.texi.
+
+
+File: simplest.info,  Node: Top,  Up: (dir)
+
+This is a very simple texi manual   <>.
+
+
+
+Tag Table:
+Node: Top78
+
+End Tag Table

Index: test/formatting/res_info/simplest_test_prefix_info/simplest.1
===================================================================
RCS file: test/formatting/res_info/simplest_test_prefix_info/simplest.1
diff -N test/formatting/res_info/simplest_test_prefix_info/simplest.1

Index: test/formatting/res_info/simplest_test_prefix_info/simplest.2
===================================================================
RCS file: test/formatting/res_info/simplest_test_prefix_info/simplest.2
diff -N test/formatting/res_info/simplest_test_prefix_info/simplest.2
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/res_info/simplest_test_prefix_info/simplest.2       26 Oct 
2009 23:21:58 -0000      1.1
@@ -0,0 +1,2 @@
+Unknown option: info
+Unknown option: prefix

Index: test/formatting/res_info/simplest_test_prefix_info/simplest.info
===================================================================
RCS file: test/formatting/res_info/simplest_test_prefix_info/simplest.info
diff -N test/formatting/res_info/simplest_test_prefix_info/simplest.info
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/res_info/simplest_test_prefix_info/simplest.info    26 Oct 
2009 23:21:58 -0000      1.1
@@ -0,0 +1,14 @@
+This is simplest.info, produced by makeinfo version 4.13 from
+simplest.texi.
+
+
+File: simplest.info,  Node: Top,  Up: (dir)
+
+This is a very simple texi manual   <>.
+
+
+
+Tag Table:
+Node: Top78
+
+End Tag Table




reply via email to

[Prev in Thread] Current Thread [Next in Thread]