texi2html-cvs
[Top][All Lists]
Advanced

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

[Texi2html-cvs] texi2html ChangeLog Makefile.in TODO aclocal.m4...


From: Patrice Dumas
Subject: [Texi2html-cvs] texi2html ChangeLog Makefile.in TODO aclocal.m4...
Date: Sun, 06 Sep 2009 21:46:38 +0000

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/09/06 21:46:33

Modified files:
        .              : ChangeLog Makefile.in TODO aclocal.m4 configure 
                         texi2html.init texi2html.pl 
        Tests          : Makefile.in 
        doc            : Makefile.in stamp-vti version.texi 
        formats        : info.init 
        test           : Makefile.in 
        test/contents  : Makefile.in 
        test/coverage  : Makefile.in comments.texi 
        test/coverage/res/comments: comments.2 
        test/coverage/res/comments_info: comments.2 
        test/coverage/res/texi_comments: comments.2 comments.passfirst 
                                         comments.passtexi comments.texi 
                                         comments.texi.first 
        test/coverage/res_all/comments: comments.2 
        test/coverage/res_all/comments_info: comments.2 
        test/coverage/res_all/texi_comments: comments.2 
                                             comments.passfirst 
                                             comments.passtexi 
                                             comments.texi 
                                             comments.texi.first 
        test/coverage/res_info/comments: comments.2 
        test/coverage/res_info/comments_info: comments.2 
        test/coverage/res_info/formatting: formatting.info 
        test/coverage/res_info/texi_comments: comments.2 
                                              comments.passfirst 
                                              comments.passtexi 
                                              comments.texi 
                                              comments.texi.first 
        test/encodings : Makefile.in 
        test/encodings/res/at_commands_in_refs_latin1_use_nodes: 
                                                                 
at_commands_in_refs_latin1.2 
        test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unicode: 
                                                                            
at_commands_in_refs_latin1.2 
        test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unidecode: 
                                                                              
at_commands_in_refs_latin1.2 
        test/encodings/res/at_commands_in_refs_utf8_use_nodes: 
                                                               
at_commands_in_refs_utf8.2 
        test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode: 
                                                                          
at_commands_in_refs_utf8.2 
        test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unidecode: 
                                                                            
at_commands_in_refs_utf8.2 
        test/encodings/res/encoding_index: encoding_index.2 
        test/encodings/res/encoding_index-latin1: 
                                                  encoding_index-latin1.2 
        test/encodings/res/encoding_index-latin1_toutf8: 
                                                         
encoding_index-latin1.2 
        test/encodings/res/encoding_index-utf8: encoding_index-utf8.2 
        test/encodings/res/encoding_index-utf8_toutf8: 
                                                       encoding_index-utf8.2 
        test/encodings/res/encoding_index_toutf8: encoding_index.2 
        test/encodings/res/nodetest: nodetest.html 
        test/encodings/res/nodetest_chapter: nodetest_1.html 
                                             nodetest_2.html 
                                             nodetest_3.html 
                                             nodetest_4.html 
                                             nodetest_5.html 
                                             nodetest_6.html 
                                             nodetest_8.html 
                                             nodetest_toc.html 
        test/encodings/res/nodetest_latin1: nodetest_latin1.2 
                                            nodetest_latin1.html 
        test/encodings/res/nodetest_latin1_no_unicode: nodetest_latin1.2 
                                                       nodetest_latin1.html 
        test/encodings/res/nodetest_latin1_use_nodes: L.html O.html 
                                                      OE.html a.html 
                                                      l.html 
                                                      nodetest_latin1.2 
                                                      nodetest_latin1_toc.html 
                                                      o.html oe.html 
                                                      rest.html 
        test/encodings/res/nodetest_latin1_use_nodes_no_unicode: L.html 
                                                                 O.html 
                                                                 OE.html 
                                                                 a.html 
                                                                 l.html 
                                                                 
nodetest_latin1.2 
                                                                 
nodetest_latin1_toc.html 
                                                                 o.html 
                                                                 oe.html 
                                                                 rest.html 
        test/encodings/res/nodetest_no_unicode: nodetest.html 
        test/encodings/res/nodetest_to_utf8_latin1: nodetest_latin1.2 
                                                    nodetest_latin1.html 
        test/encodings/res/nodetest_use_nodes: L.html O.html OE.html 
                                               a.html l.html 
                                               nodetest_toc.html o.html 
                                               oe.html rest.html 
        test/encodings/res/nodetest_use_nodes_no_unicode: L.html O.html 
                                                          OE.html a.html 
                                                          l.html 
                                                          nodetest_toc.html 
                                                          o.html oe.html 
                                                          rest.html 
        test/encodings/res/nodetest_use_nodes_no_unidecode: L.html 
                                                            O.html 
                                                            OE.html 
                                                            a.html 
                                                            l.html 
                                                            nodetest_toc.html 
                                                            o.html 
                                                            oe.html 
                                                            rest.html 
        test/encodings/res/nodetest_utf8: nodetest_utf8.2 
                                          nodetest_utf8.html 
        test/encodings/res/nodetest_utf8_no_unicode: nodetest_utf8.2 
                                                     nodetest_utf8.html 
        test/encodings/res/nodetest_utf8_use_nodes: L.html O.html 
                                                    OE.html a.html 
                                                    l.html 
                                                    nodetest_utf8.2 
                                                    nodetest_utf8_toc.html 
                                                    o.html oe.html 
                                                    rest.html 
        test/encodings/res/nodetest_utf8_use_nodes_no_unidecode: L.html 
                                                                 O.html 
                                                                 OE.html 
                                                                 a.html 
                                                                 l.html 
                                                                 
nodetest_utf8.2 
                                                                 
nodetest_utf8_toc.html 
                                                                 o.html 
                                                                 oe.html 
                                                                 rest.html 
        test/encodings/res/texi_nodetest_latin1: nodetest_latin1.2 
        test/encodings/res/texi_nodetest_utf8: nodetest_utf8.2 
        test/encodings/res_all/at_commands_in_refs_latin1_use_nodes: 
                                                                     
at_commands_in_refs_latin1.2 
        test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unicode: 
                                                                                
at_commands_in_refs_latin1.2 
        
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unidecode: 
                                                                                
  at_commands_in_refs_latin1.2 
        test/encodings/res_all/at_commands_in_refs_utf8_use_nodes: 
                                                                   
at_commands_in_refs_utf8.2 
        test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unicode: 
                                                                              
at_commands_in_refs_utf8.2 
        test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unidecode: 
                                                                                
at_commands_in_refs_utf8.2 
        test/encodings/res_all/encoding_index: encoding_index.2 
        test/encodings/res_all/encoding_index-latin1: 
                                                      encoding_index-latin1.2 
        test/encodings/res_all/encoding_index-latin1_toutf8: 
                                                             
encoding_index-latin1.2 
        test/encodings/res_all/encoding_index-utf8: 
                                                    encoding_index-utf8.2 
        test/encodings/res_all/encoding_index-utf8_toutf8: 
                                                           
encoding_index-utf8.2 
        test/encodings/res_all/encoding_index_toutf8: encoding_index.2 
        test/encodings/res_all/nodetest_latin1: nodetest_latin1.2 
        test/encodings/res_all/nodetest_latin1_no_unicode: 
                                                           nodetest_latin1.2 
        test/encodings/res_all/nodetest_latin1_use_nodes: O.txt OE.txt 
                                                          nodetest_latin1.2 
                                                          o.txt oe.txt 
        test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode: 
                                                                     O.txt 
                                                                     OE.txt 
                                                                     
nodetest_latin1.2 
                                                                     o.txt 
                                                                     oe.txt 
        test/encodings/res_all/nodetest_to_utf8_latin1: 
                                                        nodetest_latin1.2 
        test/encodings/res_all/nodetest_use_nodes: O.txt OE.txt o.txt 
                                                   oe.txt 
        test/encodings/res_all/nodetest_use_nodes_no_unicode: O.txt 
                                                              OE.txt 
                                                              o.txt 
                                                              oe.txt 
        test/encodings/res_all/nodetest_use_nodes_no_unidecode: O.txt 
                                                                OE.txt 
                                                                o.txt 
                                                                oe.txt 
        test/encodings/res_all/nodetest_utf8: nodetest_utf8.2 
        test/encodings/res_all/nodetest_utf8_no_unicode: nodetest_utf8.2 
        test/encodings/res_all/nodetest_utf8_use_nodes: O.txt OE.txt 
                                                        nodetest_utf8.2 
                                                        o.txt oe.txt 
        test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode: 
                                                                     O.txt 
                                                                     OE.txt 
                                                                     
nodetest_utf8.2 
                                                                     o.txt 
                                                                     oe.txt 
        test/encodings/res_all/texi_nodetest_latin1: nodetest_latin1.2 
        test/encodings/res_all/texi_nodetest_utf8: nodetest_utf8.2 
        test/encodings/res_info/at_commands_in_refs_latin1_use_nodes: 
                                                                      
at_commands_in_refs_latin1.2 
        
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unicode: 
                                                                                
 at_commands_in_refs_latin1.2 
        
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unidecode: 
                                                                                
   at_commands_in_refs_latin1.2 
        test/encodings/res_info/at_commands_in_refs_utf8_use_nodes: 
                                                                    
at_commands_in_refs_utf8.2 
        test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unicode: 
                                                                               
at_commands_in_refs_utf8.2 
        
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unidecode: 
                                                                                
 at_commands_in_refs_utf8.2 
        test/encodings/res_info/encoding_index: encoding_index.2 
                                                encoding_index.info 
        test/encodings/res_info/encoding_index-latin1: 
                                                       encoding_index-latin1.2 
        test/encodings/res_info/encoding_index-latin1_toutf8: 
                                                              
encoding_index-latin1.2 
        test/encodings/res_info/encoding_index-utf8: 
                                                     encoding_index-utf8.2 
        test/encodings/res_info/encoding_index-utf8_toutf8: 
                                                            
encoding_index-utf8.2 
        test/encodings/res_info/encoding_index_toutf8: encoding_index.2 
        test/encodings/res_info/formatting_converted_to_utf8: 
                                                              formatting.info 
        test/encodings/res_info/formatting_fr: formatting.info 
        test/encodings/res_info/formatting_fr_icons: formatting.info 
        test/encodings/res_info/nodetest_latin1: nodetest_latin1.2 
        test/encodings/res_info/nodetest_latin1_no_unicode: 
                                                            nodetest_latin1.2 
        test/encodings/res_info/nodetest_latin1_use_nodes: 
                                                           nodetest_latin1.2 
        test/encodings/res_info/nodetest_latin1_use_nodes_no_unicode: 
                                                                      
nodetest_latin1.2 
        test/encodings/res_info/nodetest_to_utf8_latin1: 
                                                         nodetest_latin1.2 
        test/encodings/res_info/nodetest_utf8: nodetest_utf8.2 
        test/encodings/res_info/nodetest_utf8_no_unicode: 
                                                          nodetest_utf8.2 
        test/encodings/res_info/nodetest_utf8_use_nodes: nodetest_utf8.2 
        test/encodings/res_info/nodetest_utf8_use_nodes_no_unidecode: 
                                                                      
nodetest_utf8.2 
        test/encodings/res_info/texi_nodetest_latin1: nodetest_latin1.2 
        test/encodings/res_info/texi_nodetest_utf8: nodetest_utf8.2 
        test/formatting: Makefile.in 
        test/formatting/res/comments_redefine_need: comments.2 
        test/formatting/res/def_cmds_info: def_cmds.info 
        test/formatting/res/formatting_info: formatting.info 
        test/formatting/res/heading_info: headings.info 
        test/formatting/res_all/comments_redefine_need: comments.2 
        test/formatting/res_all/def_cmds_info: def_cmds.info 
        test/formatting/res_all/formatting_info: formatting.info 
        test/formatting/res_all/heading_info: headings.info 
        test/formatting/res_info/comments_redefine_need: comments.2 
        test/formatting/res_info/def_cmds: def_cmds.info 
        test/formatting/res_info/def_cmds_info: def_cmds.info 
        test/formatting/res_info/float_copying: float_copying.info 
        test/formatting/res_info/formatting_info: formatting.info 
        test/formatting/res_info/formatting_weird_quotes: 
                                                          formatting.info 
        test/formatting/res_info/heading: headings.info 
        test/formatting/res_info/heading_info: headings.info 
        test/formatting/res_info/inter_item_commands: 
                                                      inter_item_commands.info 
        test/htmlxref  : Makefile.in 
        test/htmlxref-only_mono: Makefile.in 
        test/htmlxref-only_split: Makefile.in 
        test/indices   : Makefile.in 
        test/indices/res_info/double_index_entry: 
                                                  double_index_entry.info 
        test/indices/res_info/index_no_node: index_no_node 
        test/indices/res_info/index_no_node_no_top: 
                                                    index_no_node_no_top.info 
        test/indices/res_info/index_nodes: index_nodes 
        test/indices/res_info/index_special_region: 
                                                    index_special_region.info 
        test/indices/res_info/index_split: index_split 
        test/indices/res_info/index_table: index_table.info 
        test/indices/res_info/index_table_chapter: index_table.info 
        test/indices/res_info/printindex_between_node_section: 
                                                               
printindex_between_node_section.info 
        test/indices/res_info/split_chapter_index: split_chapter_index 
        test/info_coverage: Makefile.in 
        test/info_coverage/res_info/def_cmds: def_cmds.info 
        test/info_coverage/res_info/def_cmds_clean: def_cmds_clean.info 
        test/invalid   : Makefile.am Makefile.in tests.txt 
        test/layout    : Makefile.in 
        test/layout/res_info/formatting_regions: formatting-regions.info 
        test/macros    : Makefile.am Makefile.in tests.txt 
        test/manuals   : Makefile.in 
        test/manuals/res/ccvs_info: cvs.info-2 
        test/manuals/res/texinfo: internal_links_texinfo.txt 
                                  texinfo_14.html texinfo_33.html 
                                  texinfo_39.html texinfo_cp.idx 
                                  texinfo_fn.idx 
        test/manuals/res/texinfo_html: texinfo.html 
        test/manuals/res/texinfo_html_nosplit: texinfo.html 
        test/manuals/res/texinfo_nodes: Inserting-Accents.html 
                                        texinfo_285.html 
                                        texinfo_291.html 
        test/manuals/res_all/ccvs_info: cvs.info-2 
        test/manuals/res_all/texinfo: internal_links_texinfo.txt 
                                      texinfo_cp.idx texinfo_fn.idx 
        test/manuals/res_all/texinfo_html: 
                                           Command-and-Variable-Index.html 
                                           Concept-Index.html 
                                           Inserting-Accents.html 
        test/manuals/res_all/texinfo_html_nosplit: texinfo.html 
        test/manuals/res_info/ccvs: cvs.info-2 
        test/manuals/res_info/ccvs_info: cvs.info-2 
        test/manuals/res_info/hello: hello.info 
        test/manuals/res_info/hello_nodes: hello.info 
        test/manuals/res_info/info-stnd: info-stnd.info 
        test/manuals/res_info/texinfo: internal_links_texinfo.txt 
                                       texinfo-2 texinfo-3 
        test/manuals/res_info/texinfo_html: 
                                            Command-and-Variable-Index.html 
                                            Concept-Index.html 
                                            Inserting-Accents.html 
        test/manuals/res_info/texinfo_html_nosplit: texinfo.html 
        test/manuals/res_info/texinfo_nodes: texinfo-2 texinfo-3 
        test/many_input_files: Makefile.in 
        test/misc      : Makefile.in 
        test/misc/res/testkb: testkb.2 
        test/misc/res/texi_testkb: testkb.2 
        test/misc/res_all/testkb: testkb.2 
        test/misc/res_all/texi_testkb: testkb.2 
        test/misc/res_info/mini_ker_httex: mini_ker.info 
        test/misc/res_info/mini_ker_l2h: mini_ker.info 
        test/misc/res_info/testkb: testkb.2 testkb.info 
        test/misc/res_info/texi_testkb: testkb.2 
        test/misc/res_info/viper_chapter_split: viper 
        test/misc/res_info/viper_unsplit: viper 
        test/nested_formats: Makefile.in 
        test/sectionning: Makefile.am Makefile.in 
        test/singular_manual: Makefile.in 
        test/singular_manual/res_info/singular: singular.hlp-5 
        test/singular_manual/res_info/singular_httex: singular.hlp-5 
        test/singular_manual/res_info/singular_plain: singular.hlp-5 
        test/tar_manual: Makefile.in 
        test/tar_manual/res_info/tar: tar.info-2 
        test/texi2html_manual: Makefile.in 
        test/texi2html_manual/res_info/texi2html: texi2html.info 
        test/xemacs_manual: Makefile.in 
        test/xemacs_manual/res_info/xemacs: xemacs.info-4 
        test/xemacs_manual/res_info/xemacs_frame: xemacs.info-4 
Added files:
        test/invalid   : bad_documentencoding.texi 
        test/invalid/res/bad_documentencoding: bad_documentencoding.1 
                                               bad_documentencoding.2 
                                               bad_documentencoding.html 
        test/invalid/res/texi_bad_documentencoding: 
                                                    bad_documentencoding.2 
                                                    
bad_documentencoding.passfirst 
                                                    
bad_documentencoding.passtexi 
                                                    bad_documentencoding.texi 
                                                    
bad_documentencoding.texi.first 
        test/invalid/res_all/bad_documentencoding: 
                                                   bad_documentencoding.1 
                                                   bad_documentencoding.2 
                                                   bad_documentencoding.txt 
        test/invalid/res_all/texi_bad_documentencoding: 
                                                        bad_documentencoding.2 
                                                        
bad_documentencoding.passfirst 
                                                        
bad_documentencoding.passtexi 
                                                        
bad_documentencoding.texi 
                                                        
bad_documentencoding.texi.first 
        test/invalid/res_info/bad_documentencoding: 
                                                    bad_documentencoding.1 
                                                    bad_documentencoding.2 
                                                    bad_documentencoding.info 
        test/invalid/res_info/texi_bad_documentencoding: 
                                                         bad_documentencoding.2 
                                                         
bad_documentencoding.passfirst 
                                                         
bad_documentencoding.passtexi 
                                                         
bad_documentencoding.texi 
                                                         
bad_documentencoding.texi.first 
        test/macros    : test_paths.texi 
        test/macros/res/test_paths: test_paths.1 test_paths.2 
                                    test_paths.html 
        test/macros/res/texi_test_paths: test_paths.2 
                                         test_paths.passfirst 
                                         test_paths.passtexi 
                                         test_paths.texi 
                                         test_paths.texi.first 
        test/macros/res_all/test_paths: test_paths.1 test_paths.2 
                                        test_paths.txt 
        test/macros/res_all/texi_test_paths: test_paths.2 
                                             test_paths.passfirst 
                                             test_paths.passtexi 
                                             test_paths.texi 
                                             test_paths.texi.first 
        test/macros/res_info/test_paths: test_paths.1 test_paths.2 
                                         test_paths.info 
        test/macros/res_info/texi_test_paths: test_paths.2 
                                              test_paths.passfirst 
                                              test_paths.passtexi 
                                              test_paths.texi 
                                              test_paths.texi.first 

Log message:
                * texi2html.init: transliterate @O{}/@o{} (00D8/00F8) as O and 
o.
                * texi2html.pl, texi2html.init: warn if the @documentencoding is
                not a canonical encoding from the texinfo manual.
                Don't set output encoding to an encoding that cannot be handled.
                * formats/info.init: append <n> to index entries with same 
names.
                * texi2html.pl: if file begins with /, ./ or ../ don't search 
in -I.
                * */Makefile.in: use automake 1.11.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.424&r2=1.425
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.in?cvsroot=texi2html&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/texi2html/aclocal.m4?cvsroot=texi2html&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texi2html/configure?cvsroot=texi2html&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.227&r2=1.228
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.325&r2=1.326
http://cvs.savannah.gnu.org/viewcvs/texi2html/Tests/Makefile.in?cvsroot=texi2html&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/Makefile.in?cvsroot=texi2html&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/stamp-vti?cvsroot=texi2html&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/version.texi?cvsroot=texi2html&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/info.init?cvsroot=texi2html&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/Makefile.in?cvsroot=texi2html&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/Makefile.in?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/Makefile.in?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/comments.texi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/comments/comments.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/comments_info/comments.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_comments/comments.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_comments/comments.passfirst?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_comments/comments.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_comments/comments.texi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_comments/comments.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_all/comments/comments.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_all/comments_info/comments.2?cvsroot=texi2html&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_all/texi_comments/comments.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_all/texi_comments/comments.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_all/texi_comments/comments.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_all/texi_comments/comments.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_all/texi_comments/comments.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/comments/comments.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/comments_info/comments.2?cvsroot=texi2html&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/formatting/formatting.info?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/texi_comments/comments.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/texi_comments/comments.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/texi_comments/comments.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/texi_comments/comments.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_info/texi_comments/comments.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/Makefile.in?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/encoding_index/encoding_index.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/encoding_index-latin1/encoding_index-latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/encoding_index-latin1_toutf8/encoding_index-latin1.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/encoding_index-utf8/encoding_index-utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/encoding_index-utf8_toutf8/encoding_index-utf8.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/encoding_index_toutf8/encoding_index.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest/nodetest.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest_1.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest_2.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest_3.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest_4.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest_5.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest_6.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest_8.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_chapter/nodetest_toc.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1/nodetest_latin1.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/L.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/O.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/OE.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/a.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/l.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1_toc.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/o.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/oe.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes/rest.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/L.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/O.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/OE.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/a.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/l.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1_toc.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/o.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/oe.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/rest.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_no_unicode/nodetest.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/L.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/O.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/OE.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/a.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/l.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/nodetest_toc.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/o.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/oe.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes/rest.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/L.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/O.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/OE.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/a.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/l.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/nodetest_toc.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/o.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/oe.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/rest.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/L.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/O.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/OE.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/a.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/l.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/nodetest_toc.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/o.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/oe.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/rest.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8/nodetest_utf8.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8/nodetest_utf8.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/L.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/O.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/OE.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/a.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/l.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8_toc.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/o.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/oe.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes/rest.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/L.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/O.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/OE.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/a.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/l.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8_toc.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/o.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/oe.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/rest.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_nodetest_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/texi_nodetest_utf8/nodetest_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/encoding_index/encoding_index.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/encoding_index-latin1/encoding_index-latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/encoding_index-latin1_toutf8/encoding_index-latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/encoding_index-utf8/encoding_index-utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/encoding_index-utf8_toutf8/encoding_index-utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/encoding_index_toutf8/encoding_index.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_no_unicode/nodetest_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/O.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/OE.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/nodetest_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/o.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/oe.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/O.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/OE.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/o.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/oe.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_to_utf8_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes/O.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes/OE.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes/o.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes/oe.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unicode/O.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unicode/OE.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unicode/o.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unicode/oe.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unidecode/O.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unidecode/OE.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unidecode/o.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unidecode/oe.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8/nodetest_utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_no_unicode/nodetest_utf8.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/O.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/OE.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/nodetest_utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/o.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/oe.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/O.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/OE.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/o.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/oe.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/texi_nodetest_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/texi_nodetest_utf8/nodetest_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/encoding_index/encoding_index.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/encoding_index/encoding_index.info?cvsroot=texi2html&rev=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/encoding_index-latin1/encoding_index-latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/encoding_index-latin1_toutf8/encoding_index-latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/encoding_index-utf8/encoding_index-utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/encoding_index-utf8_toutf8/encoding_index-utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/encoding_index_toutf8/encoding_index.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/formatting_converted_to_utf8/formatting.info?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/formatting_fr/formatting.info?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/formatting_fr_icons/formatting.info?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_latin1_no_unicode/nodetest_latin1.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_latin1_use_nodes/nodetest_latin1.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_to_utf8_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_utf8/nodetest_utf8.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_utf8_no_unicode/nodetest_utf8.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_utf8_use_nodes/nodetest_utf8.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/texi_nodetest_latin1/nodetest_latin1.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_info/texi_nodetest_utf8/nodetest_utf8.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.in?cvsroot=texi2html&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/comments_redefine_need/comments.2?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/def_cmds_info/def_cmds.info?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_info/formatting.info?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/heading_info/headings.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/comments_redefine_need/comments.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/def_cmds_info/def_cmds.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/formatting_info/formatting.info?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/heading_info/headings.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/comments_redefine_need/comments.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/def_cmds/def_cmds.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/def_cmds_info/def_cmds.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/float_copying/float_copying.info?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/formatting_info/formatting.info?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/formatting_weird_quotes/formatting.info?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/heading/headings.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/heading_info/headings.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/inter_item_commands/inter_item_commands.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/htmlxref/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/htmlxref-only_mono/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/htmlxref-only_split/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/Makefile.in?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/double_index_entry/double_index_entry.info?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/index_no_node/index_no_node?cvsroot=texi2html&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/index_no_node_no_top/index_no_node_no_top.info?cvsroot=texi2html&rev=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/index_nodes/index_nodes?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/index_special_region/index_special_region.info?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/index_split/index_split?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/index_table/index_table.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/index_table_chapter/index_table.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/printindex_between_node_section/printindex_between_node_section.info?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/split_chapter_index/split_chapter_index?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/info_coverage/Makefile.in?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/info_coverage/res_info/def_cmds/def_cmds.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/info_coverage/res_info/def_cmds_clean/def_cmds_clean.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/Makefile.am?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/Makefile.in?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/tests.txt?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/bad_documentencoding.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/bad_documentencoding/bad_documentencoding.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/bad_documentencoding/bad_documentencoding.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/bad_documentencoding/bad_documentencoding.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_bad_documentencoding/bad_documentencoding.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_bad_documentencoding/bad_documentencoding.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_bad_documentencoding/bad_documentencoding.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_bad_documentencoding/bad_documentencoding.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_bad_documentencoding/bad_documentencoding.texi.first?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_all/bad_documentencoding/bad_documentencoding.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_all/bad_documentencoding/bad_documentencoding.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_all/bad_documentencoding/bad_documentencoding.txt?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_all/texi_bad_documentencoding/bad_documentencoding.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_all/texi_bad_documentencoding/bad_documentencoding.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_all/texi_bad_documentencoding/bad_documentencoding.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_all/texi_bad_documentencoding/bad_documentencoding.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_all/texi_bad_documentencoding/bad_documentencoding.texi.first?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_info/bad_documentencoding/bad_documentencoding.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_info/bad_documentencoding/bad_documentencoding.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_info/bad_documentencoding/bad_documentencoding.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_info/texi_bad_documentencoding/bad_documentencoding.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_info/texi_bad_documentencoding/bad_documentencoding.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_info/texi_bad_documentencoding/bad_documentencoding.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_info/texi_bad_documentencoding/bad_documentencoding.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res_info/texi_bad_documentencoding/bad_documentencoding.texi.first?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res_info/formatting_regions/formatting-regions.info?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/Makefile.am?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/Makefile.in?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/tests.txt?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/test_paths.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/test_paths/test_paths.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/test_paths/test_paths.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/test_paths/test_paths.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_paths/test_paths.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_paths/test_paths.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_paths/test_paths.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_paths/test_paths.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_paths/test_paths.texi.first?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_all/test_paths/test_paths.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_all/test_paths/test_paths.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_all/test_paths/test_paths.txt?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_all/texi_test_paths/test_paths.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_all/texi_test_paths/test_paths.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_all/texi_test_paths/test_paths.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_all/texi_test_paths/test_paths.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_all/texi_test_paths/test_paths.texi.first?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/test_paths/test_paths.1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/test_paths/test_paths.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/test_paths/test_paths.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/texi_test_paths/test_paths.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/texi_test_paths/test_paths.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/texi_test_paths/test_paths.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/texi_test_paths/test_paths.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res_info/texi_test_paths/test_paths.texi.first?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/Makefile.in?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs_info/cvs.info-2?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/internal_links_texinfo.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_14.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_33.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_39.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_cp.idx?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_fn.idx?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo_html/texinfo.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo_html_nosplit/texinfo.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo_nodes/Inserting-Accents.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo_nodes/texinfo_285.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo_nodes/texinfo_291.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_all/ccvs_info/cvs.info-2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_all/texinfo/internal_links_texinfo.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_all/texinfo/texinfo_cp.idx?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_all/texinfo/texinfo_fn.idx?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_all/texinfo_html/Command-and-Variable-Index.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_all/texinfo_html/Concept-Index.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_all/texinfo_html/Inserting-Accents.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_all/texinfo_html_nosplit/texinfo.html?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/ccvs/cvs.info-2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/ccvs_info/cvs.info-2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/hello/hello.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/hello_nodes/hello.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/info-stnd/info-stnd.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo/internal_links_texinfo.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo/texinfo-2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo/texinfo-3?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo_html/Command-and-Variable-Index.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo_html/Concept-Index.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo_html/Inserting-Accents.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo_html_nosplit/texinfo.html?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo_nodes/texinfo-2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res_info/texinfo_nodes/texinfo-3?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/many_input_files/Makefile.in?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/Makefile.in?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/testkb/testkb.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/texi_testkb/testkb.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_all/testkb/testkb.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_all/texi_testkb/testkb.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_info/mini_ker_httex/mini_ker.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_info/mini_ker_l2h/mini_ker.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_info/testkb/testkb.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_info/testkb/testkb.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_info/texi_testkb/testkb.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_info/viper_chapter_split/viper?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res_info/viper_unsplit/viper?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/Makefile.am?cvsroot=texi2html&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/Makefile.in?cvsroot=texi2html&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/singular_manual/Makefile.in?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/singular_manual/res_info/singular/singular.hlp-5?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/singular_manual/res_info/singular_httex/singular.hlp-5?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/singular_manual/res_info/singular_plain/singular.hlp-5?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res_info/tar/tar.info-2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/texi2html_manual/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/texi2html_manual/res_info/texi2html/texi2html.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/Makefile.in?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res_info/xemacs/xemacs.info-4?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/xemacs_manual/res_info/xemacs_frame/xemacs.info-4?cvsroot=texi2html&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -b -r1.424 -r1.425
--- ChangeLog   6 Sep 2009 12:52:38 -0000       1.424
+++ ChangeLog   6 Sep 2009 21:45:55 -0000       1.425
@@ -7,6 +7,13 @@
        output, after initializations.
        * texi2html.pl, texi2html.init, formats/*: put the functions in 
        the handlers only once.
+       * texi2html.init: transliterate @O{}/@o{} (00D8/00F8) as O and o.
+       * texi2html.pl, texi2html.init: warn if the @documentencoding is
+       not a canonical encoding from the texinfo manual.
+       Don't set output encoding to an encoding that cannot be handled.
+       * formats/info.init: append <n> to index entries with same names.
+       * texi2html.pl: if file begins with /, ./ or ../ don't search in -I.
+       * */Makefile.in: use automake 1.11.
 
 2009-09-05   Patrice Dumas  <address@hidden>
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- Makefile.in 10 Aug 2009 10:00:21 -0000      1.75
+++ Makefile.in 6 Sep 2009 21:45:55 -0000       1.76
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,9 +52,30 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = texi2html_configured.pl check_texinfo.pl \
        manage_i18n.pl
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(i18ndir)" \
        "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(pkgdatadir)"
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
@@ -63,18 +86,12 @@
        install-pdf-recursive install-ps-recursive install-recursive \
        installcheck-recursive installdirs-recursive pdf-recursive \
        ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dist_i18nDATA_INSTALL = $(INSTALL_DATA)
-dist_imagesDATA_INSTALL = $(INSTALL_DATA)
-dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_i18n_DATA) $(dist_images_DATA) $(dist_pkgdata_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+       distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -82,9 +99,34 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
@@ -328,14 +370,14 @@
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
-             echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-             cd $(srcdir) && $(AUTOMAKE) --gnu  \
+             echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+             $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
                && exit 0; \
              exit 1;; \
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -352,9 +394,10 @@
        $(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-       cd $(srcdir) && $(AUTOCONF)
+       $(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-       cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+       $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 texi2html_configured.pl: $(top_builddir)/config.status $(srcdir)/texi2html.pl
        cd $(top_builddir) && $(SHELL) ./config.status $@
 check_texinfo.pl: $(top_builddir)/config.status $(srcdir)/check_texinfo.pl.in
@@ -364,73 +407,97 @@
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
        test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-       @list='$(bin_SCRIPTS)'; for p in $$list; do \
+       @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         if test -f $$d$$p; then \
-           f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-           echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-           $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-         else :; fi; \
-       done
+         if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+       done | \
+       sed -e 'p;s,.*/,,;n' \
+           -e 'h;s|.*|.|' \
+           -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+           if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+             if (++n[d] == $(am__install_max)) { \
+               print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+           else { print "f", d "/" $$4, $$1 } } \
+         END { for (d in files) print "f", d, files[d] }' | \
+       while read type dir files; do \
+            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+            test -z "$$files" || { \
+              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit 
$$?; \
+            } \
+       ; done
 
 uninstall-binSCRIPTS:
        @$(NORMAL_UNINSTALL)
-       @list='$(bin_SCRIPTS)'; for p in $$list; do \
-         f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-         rm -f "$(DESTDIR)$(bindir)/$$f"; \
-       done
+       @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+       files=`for p in $$list; do echo "$$p"; done | \
+              sed -e 's,.*/,,;$(transform)'`; \
+       test -n "$$list" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(bindir)" && rm -f $$files
 install-dist_i18nDATA: $(dist_i18n_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(i18ndir)" || $(MKDIR_P) "$(DESTDIR)$(i18ndir)"
-       @list='$(dist_i18n_DATA)'; for p in $$list; do \
+       @list='$(dist_i18n_DATA)'; test -n "$(i18ndir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(dist_i18nDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(i18ndir)/$$f'"; 
\
-         $(dist_i18nDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(i18ndir)/$$f"; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(i18ndir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(i18ndir)" || exit $$?; \
        done
 
 uninstall-dist_i18nDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(dist_i18n_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(i18ndir)/$$f'"; \
-         rm -f "$(DESTDIR)$(i18ndir)/$$f"; \
-       done
+       @list='$(dist_i18n_DATA)'; test -n "$(i18ndir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(i18ndir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(i18ndir)" && rm -f $$files
 install-dist_imagesDATA: $(dist_images_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
-       @list='$(dist_images_DATA)'; for p in $$list; do \
+       @list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(dist_imagesDATA_INSTALL) '$$d$$p' 
'$(DESTDIR)$(imagesdir)/$$f'"; \
-         $(dist_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$f"; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(imagesdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(imagesdir)" || exit $$?; \
        done
 
 uninstall-dist_imagesDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(dist_images_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(imagesdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(imagesdir)/$$f"; \
-       done
+       @list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-       @list='$(dist_pkgdata_DATA)'; for p in $$list; do \
+       @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' 
'$(DESTDIR)$(pkgdatadir)/$$f'"; \
-         $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
        done
 
 uninstall-dist_pkgdataDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(dist_pkgdata_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-         rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
-       done
+       @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -456,7 +523,7 @@
          else \
            local_target="$$target"; \
          fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
          || eval $$failcom; \
        done; \
        if test "$$dot_seen" = "no"; then \
@@ -490,16 +557,16 @@
          else \
            local_target="$$target"; \
          fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
          || eval $$failcom; \
        done && test -z "$$fail"
 tags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); 
\
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) 
tags); \
        done
 ctags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) 
ctags); \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) 
ctags); \
        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -514,7 +581,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
-       tags=; \
+       set x; \
        here=`pwd`; \
        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
          include_option=--etags-include; \
@@ -526,7 +593,7 @@
        list='$(SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test ! -f $$subdir/TAGS || \
-             tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -535,36 +602,41 @@
          done | \
          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
              END { if (nonempty) { for (i in files) print i; }; }'`; \
-       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+       shift; \
+       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
+         if test $$# -gt 0; then \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             "$$@" $$unique; \
+         else \
          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-           $$tags $$unique; \
+             $$unique; \
+         fi; \
        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
-       tags=; \
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
              END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+       test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$tags $$unique
+            $$unique
 
 GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
-         && cd $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) $$here
+         && $(am__cd) $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
        $(am__remove_distdir)
-       test -d $(distdir) || mkdir $(distdir)
+       test -d "$(distdir)" || mkdir "$(distdir)"
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        list='$(DISTFILES)'; \
@@ -580,38 +652,54 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
-       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d "$(distdir)/$$subdir" \
            || $(MKDIR_P) "$(distdir)/$$subdir" \
            || exit 1; \
-           distdir=`$(am__cd) $(distdir) && pwd`; \
-           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-           (cd $$subdir && \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+           $(am__relativize); \
+           new_distdir=$$reldir; \
+           dir1=$$subdir; dir2="$(top_distdir)"; \
+           $(am__relativize); \
+           new_top_distdir=$$reldir; \
+           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) 
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+           echo "     am__remove_distdir=: am__skip_length_check=: 
am__skip_mode_fix=: distdir)"; \
+           ($(am__cd) $$subdir && \
              $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$$top_distdir" \
-               distdir="$$distdir/$$subdir" \
+               top_distdir="$$new_top_distdir" \
+               distdir="$$new_distdir" \
                am__remove_distdir=: \
                am__skip_length_check=: \
+               am__skip_mode_fix=: \
                distdir) \
              || exit 1; \
          fi; \
        done
-       -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+       -test -n "$(am__skip_mode_fix)" \
+       || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
          ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
          ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-       || chmod -R a+r $(distdir)
+       || chmod -R a+r "$(distdir)"
 dist-gzip: distdir
        tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c 
>$(distdir).tar.gz
        $(am__remove_distdir)
@@ -623,6 +711,10 @@
        tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
        $(am__remove_distdir)
 
+dist-xz: distdir
+       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+       $(am__remove_distdir)
+
 dist-tarZ: distdir
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__remove_distdir)
@@ -653,6 +745,8 @@
          bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lzma*) \
          unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+       *.tar.xz*) \
+         xz -dc $(distdir).tar.xz | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
@@ -664,9 +758,11 @@
        mkdir $(distdir)/_build
        mkdir $(distdir)/_inst
        chmod a-w $(distdir)
+       test -d $(distdir)/_build || exit 0; \
        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 
's,^[^:\\/]:[\\/],/,'` \
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-         && cd $(distdir)/_build \
+         && am__cwd=`pwd` \
+         && $(am__cd) $(distdir)/_build \
          && ../configure --srcdir=.. --prefix="$$dc_install_base" \
            $(DISTCHECK_CONFIGURE_FLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) \
@@ -688,13 +784,15 @@
          && rm -rf "$$dc_destdir" \
          && $(MAKE) $(AM_MAKEFLAGS) dist \
          && rm -rf $(DIST_ARCHIVES) \
-         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+         && cd "$$am__cwd" \
+         || exit 1
        $(am__remove_distdir)
        @(echo "$(distdir) archives ready for distribution: "; \
          list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
          sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-       @cd $(distuninstallcheck_dir) \
+       @$(am__cd) '$(distuninstallcheck_dir)' \
        && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
           || { echo "ERROR: files left after uninstall:" ; \
                if test -n "$(DESTDIR)"; then \
@@ -739,6 +837,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -769,18 +868,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-binSCRIPTS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -804,14 +913,14 @@
 uninstall-am: uninstall-binSCRIPTS uninstall-dist_i18nDATA \
        uninstall-dist_imagesDATA uninstall-dist_pkgdataDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-       install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+       install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
        all all-am all-local am--refresh check check-am clean \
        clean-generic clean-local ctags ctags-recursive dist dist-all \
-       dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \
-       distcheck distclean distclean-generic distclean-tags \
+       dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \
+       dist-zip distcheck distclean distclean-generic distclean-tags \
        distcleancheck distdir distuninstallcheck dvi dvi-am html \
        html-am html-local info info-am install install-am \
        install-binSCRIPTS install-data install-data-am \
@@ -864,6 +973,7 @@
 
 clean-local:
        -rm -f texi2html texi2html.temp
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- TODO        6 Sep 2009 12:52:38 -0000       1.136
+++ TODO        6 Sep 2009 21:45:55 -0000       1.137
@@ -25,20 +25,6 @@
 
 * add --command command line that gives inserted lines.
 
-* the following are not the same, -I is not taken into account with a 
-  leading ./:
address@hidden ./d2t_singular/surf_lib_noEx.tex
address@hidden d2t_singular/surf_lib_noEx.tex
-in locate_include_file.
-Do it for --css-include, @image and @verbatiminclude too?
-
-* '00D8' which is Oslash is transliterated on OE? Should be O.
-
-* info: append <n> to index entries with same names.
-
-* warn when @documentencoding is not one proposed in the texinfo manual,
-  with something like not a canonical encoding. %canonical_texinfo_encodings.
-
 Later
 -----
 

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/texi2html/texi2html/aclocal.m4,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- aclocal.m4  10 Aug 2009 10:00:22 -0000      1.41
+++ aclocal.m4  6 Sep 2009 21:45:55 -0000       1.42
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -31,10 +31,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
+[am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.2], [],
+m4_if([$1], [1.11], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,7 +50,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.11])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -110,14 +110,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -130,6 +130,7 @@
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -146,13 +147,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 13
+# serial 16
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -169,7 +170,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -220,8 +221,8 @@
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -245,8 +246,21 @@
                   [define([AC_PROG_OBJC],
                           defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
@@ -269,7 +283,7 @@
 done
 echo "timestamp for $_am_arg" 
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -280,7 +294,14 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\    *)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -307,27 +328,38 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&address@hidden: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions 
of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules 
and dependencies not useful
                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
+  AC_SUBST([MAINT])dnl
 ]
 )
 
@@ -335,14 +367,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -359,7 +391,14 @@
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\    *)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -447,14 +486,14 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -463,16 +502,29 @@
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \   ]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$[*]" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -525,18 +577,25 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 2
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.

Index: configure
===================================================================
RCS file: /cvsroot/texi2html/texi2html/configure,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- configure   10 Aug 2009 10:00:22 -0000      1.64
+++ configure   6 Sep 2009 21:45:56 -0000       1.65
@@ -1710,7 +1710,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.10'
+am__api_version='1.11'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1833,16 +1833,29 @@
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \    ]*)
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$*" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
@@ -1880,7 +1893,14 @@
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\    *)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -1890,6 +1910,115 @@
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\    *)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program 
name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
>&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" 
>&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
@@ -2070,108 +2199,6 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program 
name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not 
prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" 
>&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.
@@ -2266,6 +2293,7 @@
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable 
maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of 
Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -2654,6 +2682,7 @@
 LTLIBOBJS=$ac_ltlibobjs
 
 
+
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; 
then
   as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- texi2html.init      6 Sep 2009 12:52:38 -0000       1.227
+++ texi2html.init      6 Sep 2009 21:45:56 -0000       1.228
@@ -13,7 +13,7 @@
 # Afterwards, load the file with command-line 
 # option --init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.227 2009/09/06 12:52:38 pertusus Exp $
+# $Id: texi2html.init,v 1.228 2009/09/06 21:45:56 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -995,8 +995,8 @@
 
     if (!defined($out_encoding) and (defined($encoding_name)))
     {
-        $out_encoding = main::encoding_alias ($encoding_name);
-        $out_encoding = $encoding_name if (!defined($out_encoding));
+        my $possible_out_encoding = main::encoding_alias ($encoding_name, 
undef, 'determining encoding from default encoding');
+        $out_encoding = $possible_out_encoding if 
(defined($possible_out_encoding));
     }
     if (!defined($out_encoding) and (defined(get_conf('IN_ENCODING'))))
     {
@@ -1004,8 +1004,8 @@
     }
     if (!defined($out_encoding) and (defined($document_encoding)))
     {
-        $out_encoding = main::encoding_alias ($document_encoding);
-        $out_encoding = $document_encoding if (!defined($out_encoding));
+        my $possible_out_encoding = main::encoding_alias ($document_encoding, 
undef, 'determining encoding from documentencoding');
+        $out_encoding = $possible_out_encoding if 
(defined($possible_out_encoding));
     }
 
     if (!defined($encoding_name))
@@ -2617,6 +2617,7 @@
    }
 }
 
+# currently unused
 my %makeinfo_transliterate_map = (
   '0416' => 'ZH',
   '0447' => 'ch',
@@ -2811,8 +2812,8 @@
 %transliterate_map = (
                '00C5'  => 'AA',
                '00E5'  => 'aa',
-               '00D8'  => 'OE',
-               '00F8'  => 'oe',
+               '00D8'  => 'O',
+               '00F8'  => 'o',
                '00E6' => 'ae',
                '0153' => 'oe',
                '00C6' => 'AE',
@@ -2900,6 +2901,13 @@
    $t2h_encoding_aliases{$perl_charset_to_html{$perl_charset}} = 
$perl_charset_to_html{$perl_charset};
 }
 
+# These are the encodings from the texinfo manual
+foreach my $canonical_encoding('us-ascii', 'utf-8', 'iso-8859-1', 
+  'iso-8859-15','iso-8859-2','koi8-r', 'koi8-u')
+{
+  $canonical_texinfo_encodings{$canonical_encoding} = 1;
+}
+
 # not used currently for html, but used in chm.init
 %numeric_entity_map = ();
 

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -b -r1.325 -r1.326
--- texi2html.pl        6 Sep 2009 12:52:38 -0000       1.325
+++ texi2html.pl        6 Sep 2009 21:45:56 -0000       1.326
@@ -86,7 +86,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.325 2009/09/06 12:52:38 pertusus Exp $
+# $Id: texi2html.pl,v 1.326 2009/09/06 21:45:56 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -630,6 +630,7 @@
 %region_codes
 %deprecated_commands
 %output_format_names
+%canonical_texinfo_encodings
 );
 
 # subject to change
@@ -2242,17 +2243,18 @@
 
 # find the encoding alias.
 # with encoding support (USE_UNICODE), may return undef if no alias was found
-sub encoding_alias($;$)
+sub encoding_alias($;$$)
 {
     my $encoding = shift;
     my $line_nr = shift;
-    return $encoding if (!defined($encoding) or $encoding eq '');
+    my $context_string = shift;
+    return undef if (!defined($encoding) or $encoding eq '');
     if ($Texi2HTML::Config::USE_UNICODE)
     {
          my $result_encoding = Encode::resolve_alias($encoding);
          if (! $result_encoding)
          {
-              msg_warn("Encoding name unknown: $encoding", $line_nr);
+              msg_warn("Encoding name unknown: $encoding", $line_nr, 
$context_string);
               return undef;
          }
          if 
(defined($Texi2HTML::Config::t2h_encoding_aliases{$result_encoding}))
@@ -5209,15 +5211,18 @@
    my $line_nr = shift;
    my $text;
    my $args;
+   my $cline = $line;
     
    if (!$state->{'ignored'} and !$state->{'arg_expansion'})
    {
       if ($macro eq 'documentencoding')
-      {
-         if ($line =~ /(\s+)([0-9\w\-]+)/)
+      {  # FIXME accept more characters, like @?
+         if ($cline =~ s/^(\s+)([\w\-]+)//)
          {
             my $encoding = $2;
             $Texi2HTML::THISDOC{'documentencoding'} = $encoding;
+            line_warn("Encoding $encoding is not a canonical texinfo 
encoding", $line_nr)
+                if 
(!$Texi2HTML::Config::canonical_texinfo_encodings{lc($encoding)});
             if (Texi2HTML::Config::set_conf('DOCUMENT_ENCODING', 
$Texi2HTML::THISDOC{'documentencoding'}, 1))
             {
                my $from_encoding;
@@ -5235,6 +5240,11 @@
                   }
                }
             }
+            #FIXME error if garbage remains on the line?
+         }
+         else
+         {
+            line_error("Incorrect or missing address@hidden argument $line", 
$line_nr);
          }
       }
       elsif ($macro eq 'alias')
@@ -8313,7 +8323,13 @@
     my $file = shift;
 
     # APA: Don't implicitely search ., to conform with the docs!
-    # return $file if (-e $file && -r $file);
+    
+    # if file begins with /, ./ or ../ don't search in -I (Karl)
+    if ($file =~ m,^(/|\./|\.\./),)
+    {
+        return "$file" if (-e "$file" && -r "$file");
+        return undef;
+    }
     foreach my $dir (@Texi2HTML::Config::INCLUDE_DIRS)
     {
         return "$dir/$file" if (-e "$dir/$file" && -r "$dir/$file");
@@ -8555,14 +8571,20 @@
 }
 
 # echo a warning
-sub msg_warn($;$)
+sub msg_warn($;$$)
 {
     my $text = shift;
     my $line_number = shift;
+    my $context_string = shift;
+
     if (defined($line_number))
     {
          line_warn ($text, $line_number);
     }
+    elsif (defined($context_string))
+    {
+        document_warn ("$text (in $context_string)");
+    }
     else
     {
         document_warn ($text);

Index: Tests/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Tests/Makefile.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- Tests/Makefile.in   10 Aug 2009 10:00:23 -0000      1.56
+++ Tests/Makefile.in   6 Sep 2009 21:45:57 -0000       1.57
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -161,7 +164,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Tests/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  Tests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -180,6 +183,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -203,13 +207,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -237,6 +245,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -255,6 +264,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -263,18 +274,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -334,6 +355,7 @@
         *_l2h.tex *_l2h.css *_l2h_images.pl *_l2h_images.tex \
        *_l2h_labels.pl *-l2h_cache.pm l2h_cache.pm *.out; fi) ; \
        done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: doc/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/Makefile.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- doc/Makefile.in     10 Aug 2009 10:00:24 -0000      1.51
+++ doc/Makefile.in     6 Sep 2009 21:45:57 -0000       1.52
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -42,6 +44,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 INFO_DEPS = $(srcdir)/texi2html.info
@@ -63,11 +66,25 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
-texinfohtmlDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(texinfohtml_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -193,7 +210,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -212,10 +229,11 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 .texi.info:
        restore=: && backupdir="$(am__leading_dot)am$$$$" && \
-       am__cwd=`pwd` && cd $(srcdir) && \
+       am__cwd=`pwd` && $(am__cd) $(srcdir) && \
        rm -rf $$backupdir && mkdir $$backupdir && \
        if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
          for f in $@ address@hidden address@hidden $(@:.info=).i[0-9] 
$(@:.info=).i[0-9][0-9]; do \
@@ -227,10 +245,10 @@
         -o $@ $<; \
        then \
          rc=0; \
-         cd $(srcdir); \
+         $(am__cd) $(srcdir); \
        else \
          rc=$$?; \
-         cd $(srcdir) && \
+         $(am__cd) $(srcdir) && \
          $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
        fi; \
        rm -rf $$backupdir; exit $$rc
@@ -286,16 +304,18 @@
 
 uninstall-dvi-am:
        @$(NORMAL_UNINSTALL)
-       @list='$(DVIS)'; for p in $$list; do \
-         f=$(am__strip_dir) \
+       @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
          echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
          rm -f "$(DESTDIR)$(dvidir)/$$f"; \
        done
 
 uninstall-html-am:
        @$(NORMAL_UNINSTALL)
-       @list='$(HTMLS)'; for p in $$list; do \
-         f=$(am__strip_dir) \
+       @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
          echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
          rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
        done
@@ -309,7 +329,8 @@
          for file in $$list; do \
            relfile=`echo "$$file" | sed 's|^.*/||'`; \
            echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove 
'$(DESTDIR)$(infodir)/$$relfile'"; \
-           install-info --info-dir="$(DESTDIR)$(infodir)" --remove 
"$(DESTDIR)$(infodir)/$$relfile"; \
+           if install-info --info-dir="$(DESTDIR)$(infodir)" --remove 
"$(DESTDIR)$(infodir)/$$relfile"; \
+           then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; 
fi; \
          done; \
        else :; fi
        @$(NORMAL_UNINSTALL)
@@ -325,16 +346,18 @@
 
 uninstall-pdf-am:
        @$(NORMAL_UNINSTALL)
-       @list='$(PDFS)'; for p in $$list; do \
-         f=$(am__strip_dir) \
+       @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
          echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
          rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
        done
 
 uninstall-ps-am:
        @$(NORMAL_UNINSTALL)
-       @list='$(PSS)'; for p in $$list; do \
-         f=$(am__strip_dir) \
+       @list='$(PSS)'; test -n "$(psdir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
          echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
          rm -f "$(DESTDIR)$(psdir)/$$f"; \
        done
@@ -351,8 +374,8 @@
          for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] 
$$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
            if test -f $$file; then \
              relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-             test -f $(distdir)/$$relfile || \
-               cp -p $$file $(distdir)/$$relfile; \
+             test -f "$(distdir)/$$relfile" || \
+               cp -p $$file "$(distdir)/$$relfile"; \
            else :; fi; \
          done; \
        done
@@ -362,8 +385,11 @@
          texi2html.ky texi2html.kys texi2html.log texi2html.op \
          texi2html.ops texi2html.pg texi2html.pgs texi2html.tmp \
          texi2html.toc texi2html.tp texi2html.tps texi2html.vr \
-         texi2html.vrs texi2html.dvi texi2html.pdf texi2html.ps \
-         texi2html.html
+         texi2html.vrs
+
+clean-aminfo:
+       -test -z "texi2html.dvi texi2html.pdf texi2html.ps texi2html.html" \
+       || rm -rf texi2html.dvi texi2html.pdf texi2html.ps texi2html.html
 
 maintainer-clean-aminfo:
        @list='$(INFO_DEPS)'; for i in $$list; do \
@@ -371,68 +397,64 @@
          echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] 
$$i_i[0-9][0-9]"; \
          rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
        done
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
        @$(NORMAL_INSTALL)
        test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-       for i in $$l2; do \
-         case "$$i" in \
-           *.1*) list="$$list $$i" ;; \
-         esac; \
-       done; \
-       for i in $$list; do \
-         if test -f $$i; then file=$$i; \
-         else file=$(srcdir)/$$i; fi; \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         case "$$ext" in \
-           1*) ;; \
-           *) ext='1' ;; \
-         esac; \
-         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-         inst=`echo $$inst | sed -e 's/^.*\///'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+       @list=''; test -n "$(man1dir)" || exit 0; \
+       { for i in $$list; do echo "$$i"; done; \
+       l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+         sed -n '/\.1[a-z]*$$/p'; \
+       } | while read p; do \
+         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; echo "$$p"; \
+       done | \
+       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+       sed 'N;N;s,\n, ,g' | { \
+       list=; while read file base inst; do \
+         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
          echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-         $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-       done
+           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; 
\
+         fi; \
+       done; \
+       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+       while read files; do \
+         test -z "$$files" || { \
+           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+           $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+       done; }
+
 uninstall-man1:
        @$(NORMAL_UNINSTALL)
-       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-       for i in $$l2; do \
-         case "$$i" in \
-           *.1*) list="$$list $$i" ;; \
-         esac; \
-       done; \
-       for i in $$list; do \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         case "$$ext" in \
-           1*) ;; \
-           *) ext='1' ;; \
-         esac; \
-         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-         inst=`echo $$inst | sed -e 's/^.*\///'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-         rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-       done
+       @list=''; test -n "$(man1dir)" || exit 0; \
+       files=`{ for i in $$list; do echo "$$i"; done; \
+       l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+         sed -n '/\.1[a-z]*$$/p'; \
+       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+       test -z "$$files" || { \
+         echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+         cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 install-texinfohtmlDATA: $(texinfohtml_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(texinfohtmldir)" || $(MKDIR_P) "$(DESTDIR)$(texinfohtmldir)"
-       @list='$(texinfohtml_DATA)'; for p in $$list; do \
+       @list='$(texinfohtml_DATA)'; test -n "$(texinfohtmldir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(texinfohtmlDATA_INSTALL) '$$d$$p' 
'$(DESTDIR)$(texinfohtmldir)/$$f'"; \
-         $(texinfohtmlDATA_INSTALL) "$$d$$p" 
"$(DESTDIR)$(texinfohtmldir)/$$f"; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(texinfohtmldir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(texinfohtmldir)" || exit $$?; \
        done
 
 uninstall-texinfohtmlDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(texinfohtml_DATA)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(texinfohtmldir)/$$f'"; \
-         rm -f "$(DESTDIR)$(texinfohtmldir)/$$f"; \
-       done
+       @list='$(texinfohtml_DATA)'; test -n "$(texinfohtmldir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(texinfohtmldir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(texinfohtmldir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -441,6 +463,19 @@
 
 
 distdir: $(DISTFILES)
+       @list='$(MANS)'; if test -n "$$list"; then \
+         list=`for p in $$list; do \
+           if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+           if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+         if test -n "$$list" && \
+           grep 'ab help2man is required to generate this page' $$list 
>/dev/null; then \
+           echo "error: found man pages containing the \`missing help2man' 
replacement text:" >&2; \
+           grep -l 'ab help2man is required to generate this page' $$list | 
sed 's/^/         /' >&2; \
+           echo "       to fix them, install help2man, remove and regenerate 
the man pages;" >&2; \
+           echo "       typically \`make maintainer-clean' will remove them" 
>&2; \
+           exit 1; \
+         else :; fi; \
+       else :; fi
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
        list='$(DISTFILES)'; \
@@ -456,13 +491,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -498,13 +537,14 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-aminfo clean-generic mostlyclean-am
 
 distclean: distclean-am
        -rm -f Makefile
@@ -529,11 +569,14 @@
 install-dvi-am: $(DVIS)
        @$(NORMAL_INSTALL)
        test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
-       @list='$(DVIS)'; for p in $$list; do \
+       @list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
-         $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
        done
 install-exec-am:
 
@@ -542,26 +585,31 @@
 install-html-am: $(HTMLS)
        @$(NORMAL_INSTALL)
        test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
-       @list='$(HTMLS)'; for p in $$list; do \
+       @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
+         $(am__strip_dir) \
          if test -d "$$d$$p"; then \
            echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
            $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
            echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
+           $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
          else \
-           echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-           $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
+           list2="$$list2 $$d$$p"; \
          fi; \
-       done
+       done; \
+       test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
+       done; }
 install-info: install-info-am
 
 install-info-am: $(INFO_DEPS)
        @$(NORMAL_INSTALL)
        test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       list='$(INFO_DEPS)'; \
+       list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
        for file in $$list; do \
          case $$file in \
            $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -571,16 +619,17 @@
          for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
                        $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
            if test -f $$ifile; then \
-             relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
-             echo " $(INSTALL_DATA) '$$ifile' 
'$(DESTDIR)$(infodir)/$$relfile'"; \
-             $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
+             echo "$$ifile"; \
            else : ; fi; \
          done; \
-       done
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
        @$(POST_INSTALL)
        @if (install-info --version && \
             install-info --version 2>&1 | sed 1q | grep -i -v debian) 
>/dev/null 2>&1; then \
-         list='$(INFO_DEPS)'; \
+         list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
          for file in $$list; do \
            relfile=`echo "$$file" | sed 's|^.*/||'`; \
            echo " install-info --info-dir='$(DESTDIR)$(infodir)' 
'$(DESTDIR)$(infodir)/$$relfile'";\
@@ -594,23 +643,27 @@
 install-pdf-am: $(PDFS)
        @$(NORMAL_INSTALL)
        test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
-       @list='$(PDFS)'; for p in $$list; do \
+       @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
-         $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
-       done
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
 install-ps: install-ps-am
 
 install-ps-am: $(PSS)
        @$(NORMAL_INSTALL)
        test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
-       @list='$(PSS)'; for p in $$list; do \
+       @list='$(PSS)'; test -n "$(psdir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
-         $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
-       done
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -636,23 +689,23 @@
 
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
-.PHONY: all all-am check check-am check-local clean clean-generic \
-       dist-info distclean distclean-generic distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-man1 install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       install-texinfohtmlDATA installcheck installcheck-am \
-       installdirs maintainer-clean maintainer-clean-aminfo \
-       maintainer-clean-generic maintainer-clean-vti mostlyclean \
-       mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
-       pdf-am ps ps-am uninstall uninstall-am uninstall-dvi-am \
-       uninstall-html-am uninstall-info-am uninstall-man \
-       uninstall-man1 uninstall-pdf-am uninstall-ps-am \
-       uninstall-texinfohtmlDATA
+.PHONY: all all-am check check-am check-local clean clean-aminfo \
+       clean-generic dist-info distclean distclean-generic distdir \
+       dvi dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-man1 \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip install-texinfohtmlDATA installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-aminfo maintainer-clean-generic \
+       maintainer-clean-vti mostlyclean mostlyclean-aminfo \
+       mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am \
+       uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
+       uninstall-info-am uninstall-man uninstall-man1 \
+       uninstall-pdf-am uninstall-ps-am uninstall-texinfohtmlDATA
 
 
 #texi2html.html: texi2html.texi $(srcdir)/version.texi \
@@ -691,6 +744,7 @@
 .texi.txt:
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
         --no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: doc/stamp-vti
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/stamp-vti,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- doc/stamp-vti       3 Aug 2009 09:35:07 -0000       1.61
+++ doc/stamp-vti       6 Sep 2009 21:45:57 -0000       1.62
@@ -1,4 +1,4 @@
address@hidden UPDATED 30 July 2009
address@hidden UPDATED-MONTH July 2009
address@hidden UPDATED 24 August 2009
address@hidden UPDATED-MONTH August 2009
 @set EDITION 1.83
 @set VERSION 1.83

Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/version.texi,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- doc/version.texi    3 Aug 2009 09:35:07 -0000       1.61
+++ doc/version.texi    6 Sep 2009 21:45:57 -0000       1.62
@@ -1,4 +1,4 @@
address@hidden UPDATED 30 July 2009
address@hidden UPDATED-MONTH July 2009
address@hidden UPDATED 24 August 2009
address@hidden UPDATED-MONTH August 2009
 @set EDITION 1.83
 @set VERSION 1.83

Index: formats/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/info.init,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- formats/info.init   6 Sep 2009 12:52:39 -0000       1.27
+++ formats/info.init   6 Sep 2009 21:45:57 -0000       1.28
@@ -46,6 +46,7 @@
 my $info_default_index_length_to_node;
 my $info_default_listoffloat_caption_entry_length;
 my $info_default_listoffloat_append;
+my %info_default_index_entries_counts;
 
 if (defined($DEFAULT_OUTPUT_FORMAT) and $DEFAULT_OUTPUT_FORMAT eq 'info')
 {
@@ -2874,6 +2875,7 @@
 {
    my $index_name = shift;
    my $printindex = shift;
+   %info_default_index_entries_counts = ();
    return 
info_default_store_text(undef,t2h_GPL_default_printindex($index_name,$printindex),'printindex');
 }
 
@@ -2932,16 +2934,19 @@
 
     return '' if ($index_entry_ref->{'hidden'});
     $entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in 
address@hidden");
-    #if 
(!defined($info_default_index_entries_counts{$index_entry_ref->{'index_name'}}->{$index_entry_ref->{'texi'}}))
-    #{
-    #   
$info_default_index_entries_counts{$index_entry_ref->{'index_name'}}->{$index_entry_ref->{'texi'}}
 = 0;
-    #}
-    #else
-    #{
-    #   
$info_default_index_entries_counts{$index_entry_ref->{'index_name'}}->{$index_entry_ref->{'texi'}}++;
-    #}
 
-    my $result = "* $entry: ";
+    my $entry_nr = '';
+    if (!defined($info_default_index_entries_counts{$entry}))
+    {
+       $info_default_index_entries_counts{$entry} = 0;
+    }
+    else
+    {
+       $info_default_index_entries_counts{$entry} ++;
+       $entry_nr = ' <'.$info_default_index_entries_counts{$entry}.'>';
+    }
+
+    my $result = "* $entry${entry_nr}: ";
     if (length($result) < $info_default_index_length_to_node)
     {
        $result .= ' ' x($info_default_index_length_to_node - length($result));

Index: test/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- test/Makefile.in    25 Aug 2009 13:15:44 -0000      1.17
+++ test/Makefile.in    6 Sep 2009 21:45:57 -0000       1.18
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -40,6 +42,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = path_separator
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -51,9 +54,39 @@
        ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+       distdir
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -170,7 +203,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -189,6 +222,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 path_separator: $(top_builddir)/config.status $(srcdir)/path_separator.in
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -216,7 +250,7 @@
          else \
            local_target="$$target"; \
          fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
          || eval $$failcom; \
        done; \
        if test "$$dot_seen" = "no"; then \
@@ -250,16 +284,16 @@
          else \
            local_target="$$target"; \
          fi; \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
          || eval $$failcom; \
        done && test -z "$$fail"
 tags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); 
\
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) 
tags); \
        done
 ctags-recursive:
        list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) 
ctags); \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) 
ctags); \
        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -274,7 +308,7 @@
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
-       tags=; \
+       set x; \
        here=`pwd`; \
        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
          include_option=--etags-include; \
@@ -286,7 +320,7 @@
        list='$(SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test ! -f $$subdir/TAGS || \
-             tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
          fi; \
        done; \
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -295,29 +329,34 @@
          done | \
          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
              END { if (nonempty) { for (i in files) print i; }; }'`; \
-       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+       shift; \
+       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
+         if test $$# -gt 0; then \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             "$$@" $$unique; \
+         else \
          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-           $$tags $$unique; \
+             $$unique; \
+         fi; \
        fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
-       tags=; \
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
          $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
              END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+       test -z "$(CTAGS_ARGS)$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$tags $$unique
+            $$unique
 
 GTAGS:
        here=`$(am__cd) $(top_builddir) && pwd` \
-         && cd $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) $$here
+         && $(am__cd) $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -326,6 +365,7 @@
        @failed=0; all=0; xfail=0; xpass=0; skip=0; \
        srcdir=$(srcdir); export srcdir; \
        list=' $(TESTS) '; \
+       $(am__tty_colors); \
        if test -n "$$list"; then \
          for tst in $$list; do \
            if test -f ./$$tst; then dir=./; \
@@ -337,10 +377,10 @@
              *[\ \     ]$$tst[\ \      ]*) \
                xpass=`expr $$xpass + 1`; \
                failed=`expr $$failed + 1`; \
-               echo "XPASS: $$tst"; \
+               col=$$red; res=XPASS; \
              ;; \
              *) \
-               echo "PASS: $$tst"; \
+               col=$$grn; res=PASS; \
              ;; \
              esac; \
            elif test $$? -ne 77; then \
@@ -348,17 +388,18 @@
              case " $(XFAIL_TESTS) " in \
              *[\ \     ]$$tst[\ \      ]*) \
                xfail=`expr $$xfail + 1`; \
-               echo "XFAIL: $$tst"; \
+               col=$$lgn; res=XFAIL; \
              ;; \
              *) \
                failed=`expr $$failed + 1`; \
-               echo "FAIL: $$tst"; \
+               col=$$red; res=FAIL; \
              ;; \
              esac; \
            else \
              skip=`expr $$skip + 1`; \
-             echo "SKIP: $$tst"; \
+             col=$$blu; res=SKIP; \
            fi; \
+           echo "$${col}$$res$${std}: $$tst"; \
          done; \
          if test "$$all" -eq 1; then \
            tests="test"; \
@@ -400,11 +441,15 @@
              dashes="$$report"; \
          fi; \
          dashes=`echo "$$dashes" | sed s/./=/g`; \
-         echo "$$dashes"; \
+         if test "$$failed" -eq 0; then \
+           echo "$$grn$$dashes"; \
+         else \
+           echo "$$red$$dashes"; \
+         fi; \
          echo "$$banner"; \
          test -z "$$skipped" || echo "$$skipped"; \
          test -z "$$report" || echo "$$report"; \
-         echo "$$dashes"; \
+         echo "$$dashes$$std"; \
          test "$$failed" -eq 0; \
        else :; fi
 
@@ -424,29 +469,44 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
-       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d "$(distdir)/$$subdir" \
            || $(MKDIR_P) "$(distdir)/$$subdir" \
            || exit 1; \
-           distdir=`$(am__cd) $(distdir) && pwd`; \
-           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-           (cd $$subdir && \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+           $(am__relativize); \
+           new_distdir=$$reldir; \
+           dir1=$$subdir; dir2="$(top_distdir)"; \
+           $(am__relativize); \
+           new_top_distdir=$$reldir; \
+           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) 
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+           echo "     am__remove_distdir=: am__skip_length_check=: 
am__skip_mode_fix=: distdir)"; \
+           ($(am__cd) $$subdir && \
              $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$$top_distdir" \
-               distdir="$$distdir/$$subdir" \
+               top_distdir="$$new_top_distdir" \
+               distdir="$$new_distdir" \
                am__remove_distdir=: \
                am__skip_length_check=: \
+               am__skip_mode_fix=: \
                distdir) \
              || exit 1; \
          fi; \
@@ -477,6 +537,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
@@ -495,6 +556,8 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -503,18 +566,28 @@
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -535,8 +608,8 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-       install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
+       ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
        all all-am all-local check check-TESTS check-am clean \
@@ -605,6 +678,7 @@
        for dir in $(htmlxref_cnf_tests); do \
                rm -rf $$dir/.texinfo/ ; \
        done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/contents/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/contents/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/contents/Makefile.in   10 Aug 2009 10:00:30 -0000      1.10
+++ test/contents/Makefile.in   6 Sep 2009 21:45:57 -0000       1.11
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -150,7 +153,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/contents/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/contents/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -169,6 +172,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -192,13 +196,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -229,6 +237,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -248,6 +257,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -256,18 +267,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -307,6 +328,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/coverage/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/coverage/Makefile.in   10 Aug 2009 10:00:30 -0000      1.12
+++ test/coverage/Makefile.in   6 Sep 2009 21:45:57 -0000       1.13
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -148,7 +151,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/coverage/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/coverage/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -167,6 +170,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -190,13 +194,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -227,6 +235,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -246,6 +255,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -254,18 +265,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -305,6 +326,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/coverage/comments.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/comments.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/comments.texi 20 Aug 2008 16:02:33 -0000      1.2
+++ test/coverage/comments.texi 6 Sep 2009 21:45:57 -0000       1.3
@@ -116,8 +116,8 @@
 
 Special arg for documentencoding. makeinfo complains, not tex
 
address@hidden
-@@documentencoding @documentencoding bad encoding name
address@hidden @documentencoding
+@@documentencoding @documentencoding US-ascii encoding name
 @documentencoding ISO-8859-1
 @c accepts on or off
 @@frenchspacing @frenchspacing on

Index: test/coverage/res/comments/comments.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/res/comments/comments.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/coverage/res/comments/comments.2       6 Sep 2009 12:52:44 -0000       
1.5
+++ test/coverage/res/comments/comments.2       6 Sep 2009 21:45:58 -0000       
1.6
@@ -1,3 +1,2 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument
 warning: Must specify a title with a title command or @top

Index: test/coverage/res/comments_info/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/comments_info/comments.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/coverage/res/comments_info/comments.2  6 Sep 2009 12:52:44 -0000       
1.3
+++ test/coverage/res/comments_info/comments.2  6 Sep 2009 21:45:58 -0000       
1.4
@@ -1,2 +1 @@
-comments.texi:120: warning: Encoding name unknown: bad
 warning: Must specify a title with a title command or @top

Index: test/coverage/res/texi_comments/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/texi_comments/comments.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/coverage/res/texi_comments/comments.2  3 Aug 2009 08:19:34 -0000       
1.5
+++ test/coverage/res/texi_comments/comments.2  6 Sep 2009 21:45:58 -0000       
1.6
@@ -1,2 +1 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument

Index: test/coverage/res/texi_comments/comments.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/texi_comments/comments.passfirst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res/texi_comments/comments.passfirst  20 Aug 2008 16:02:33 
-0000      1.2
+++ test/coverage/res/texi_comments/comments.passfirst  6 Sep 2009 21:45:58 
-0000       1.3
@@ -101,8 +101,8 @@
 comments.texi(,116) 
 comments.texi(,117) Special arg for documentencoding. makeinfo complains, not 
tex
 comments.texi(,118) 
-comments.texi(,119) @documentencoding
-comments.texi(,120) @@documentencoding @documentencoding bad encoding name
+comments.texi(,119) @c @documentencoding
+comments.texi(,120) @@documentencoding @documentencoding US-ascii encoding name
 comments.texi(,121) @documentencoding ISO-8859-1
 comments.texi(,122) @c accepts on or off
 comments.texi(,123) @@frenchspacing @frenchspacing on

Index: test/coverage/res/texi_comments/comments.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/texi_comments/comments.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res/texi_comments/comments.passtexi   20 Aug 2008 16:02:33 
-0000      1.2
+++ test/coverage/res/texi_comments/comments.passtexi   6 Sep 2009 21:45:58 
-0000       1.3
@@ -101,8 +101,8 @@
 comments.texi(,116) 
 comments.texi(,117) Special arg for documentencoding. makeinfo complains, not 
tex
 comments.texi(,118) 
-comments.texi(,119) @documentencoding
-comments.texi(,120) @@documentencoding @documentencoding bad encoding name
+comments.texi(,119) @c @documentencoding
+comments.texi(,120) @@documentencoding @documentencoding US-ascii encoding name
 comments.texi(,121) @documentencoding ISO-8859-1
 comments.texi(,122) @c accepts on or off
 comments.texi(,123) @@frenchspacing @frenchspacing on

Index: test/coverage/res/texi_comments/comments.texi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/texi_comments/comments.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res/texi_comments/comments.texi       20 Aug 2008 16:02:33 
-0000      1.2
+++ test/coverage/res/texi_comments/comments.texi       6 Sep 2009 21:45:58 
-0000       1.3
@@ -102,8 +102,8 @@
 
 Special arg for documentencoding. makeinfo complains, not tex
 
address@hidden
-@@documentencoding @documentencoding bad encoding name
address@hidden @documentencoding
+@@documentencoding @documentencoding US-ascii encoding name
 @documentencoding ISO-8859-1
 @c accepts on or off
 @@frenchspacing @frenchspacing on

Index: test/coverage/res/texi_comments/comments.texi.first
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res/texi_comments/comments.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res/texi_comments/comments.texi.first 2 Aug 2009 13:12:02 
-0000       1.1
+++ test/coverage/res/texi_comments/comments.texi.first 6 Sep 2009 21:45:58 
-0000       1.2
@@ -102,8 +102,8 @@
 
 Special arg for documentencoding. makeinfo complains, not tex
 
address@hidden
-@@documentencoding @documentencoding bad encoding name
address@hidden @documentencoding
+@@documentencoding @documentencoding US-ascii encoding name
 @documentencoding ISO-8859-1
 @c accepts on or off
 @@frenchspacing @frenchspacing on

Index: test/coverage/res_all/comments/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_all/comments/comments.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res_all/comments/comments.2   3 Aug 2009 08:19:34 -0000       
1.2
+++ test/coverage/res_all/comments/comments.2   6 Sep 2009 21:45:58 -0000       
1.3
@@ -1,2 +1 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument

Index: test/coverage/res_all/comments_info/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_all/comments_info/comments.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res_all/comments_info/comments.2      3 Aug 2009 08:19:34 
-0000       1.2
+++ test/coverage/res_all/comments_info/comments.2      6 Sep 2009 21:45:59 
-0000       1.3
@@ -1 +0,0 @@
-comments.texi:120: warning: Encoding name unknown: bad

Index: test/coverage/res_all/texi_comments/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_all/texi_comments/comments.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/coverage/res_all/texi_comments/comments.2      3 Aug 2009 08:19:34 
-0000       1.3
+++ test/coverage/res_all/texi_comments/comments.2      6 Sep 2009 21:45:59 
-0000       1.4
@@ -1,2 +1 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument

Index: test/coverage/res_all/texi_comments/comments.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_all/texi_comments/comments.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_all/texi_comments/comments.passfirst      21 Jun 2009 
09:25:40 -0000      1.1
+++ test/coverage/res_all/texi_comments/comments.passfirst      6 Sep 2009 
21:45:59 -0000       1.2
@@ -101,8 +101,8 @@
 comments.texi(,116) 
 comments.texi(,117) Special arg for documentencoding. makeinfo complains, not 
tex
 comments.texi(,118) 
-comments.texi(,119) @documentencoding
-comments.texi(,120) @@documentencoding @documentencoding bad encoding name
+comments.texi(,119) @c @documentencoding
+comments.texi(,120) @@documentencoding @documentencoding US-ascii encoding name
 comments.texi(,121) @documentencoding ISO-8859-1
 comments.texi(,122) @c accepts on or off
 comments.texi(,123) @@frenchspacing @frenchspacing on

Index: test/coverage/res_all/texi_comments/comments.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_all/texi_comments/comments.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_all/texi_comments/comments.passtexi       21 Jun 2009 
09:25:40 -0000      1.1
+++ test/coverage/res_all/texi_comments/comments.passtexi       6 Sep 2009 
21:45:59 -0000       1.2
@@ -101,8 +101,8 @@
 comments.texi(,116) 
 comments.texi(,117) Special arg for documentencoding. makeinfo complains, not 
tex
 comments.texi(,118) 
-comments.texi(,119) @documentencoding
-comments.texi(,120) @@documentencoding @documentencoding bad encoding name
+comments.texi(,119) @c @documentencoding
+comments.texi(,120) @@documentencoding @documentencoding US-ascii encoding name
 comments.texi(,121) @documentencoding ISO-8859-1
 comments.texi(,122) @c accepts on or off
 comments.texi(,123) @@frenchspacing @frenchspacing on

Index: test/coverage/res_all/texi_comments/comments.texi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_all/texi_comments/comments.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_all/texi_comments/comments.texi   21 Jun 2009 09:25:40 
-0000      1.1
+++ test/coverage/res_all/texi_comments/comments.texi   6 Sep 2009 21:45:59 
-0000       1.2
@@ -102,8 +102,8 @@
 
 Special arg for documentencoding. makeinfo complains, not tex
 
address@hidden
-@@documentencoding @documentencoding bad encoding name
address@hidden @documentencoding
+@@documentencoding @documentencoding US-ascii encoding name
 @documentencoding ISO-8859-1
 @c accepts on or off
 @@frenchspacing @frenchspacing on

Index: test/coverage/res_all/texi_comments/comments.texi.first
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_all/texi_comments/comments.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_all/texi_comments/comments.texi.first     2 Aug 2009 
13:12:03 -0000       1.1
+++ test/coverage/res_all/texi_comments/comments.texi.first     6 Sep 2009 
21:45:59 -0000       1.2
@@ -102,8 +102,8 @@
 
 Special arg for documentencoding. makeinfo complains, not tex
 
address@hidden
-@@documentencoding @documentencoding bad encoding name
address@hidden @documentencoding
+@@documentencoding @documentencoding US-ascii encoding name
 @documentencoding ISO-8859-1
 @c accepts on or off
 @@frenchspacing @frenchspacing on

Index: test/coverage/res_info/comments/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_info/comments/comments.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res_info/comments/comments.2  3 Aug 2009 08:19:35 -0000       
1.2
+++ test/coverage/res_info/comments/comments.2  6 Sep 2009 21:45:59 -0000       
1.3
@@ -1,2 +1 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument

Index: test/coverage/res_info/comments_info/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_info/comments_info/comments.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res_info/comments_info/comments.2     3 Aug 2009 08:19:35 
-0000       1.2
+++ test/coverage/res_info/comments_info/comments.2     6 Sep 2009 21:45:59 
-0000       1.3
@@ -1 +0,0 @@
-comments.texi:120: warning: Encoding name unknown: bad

Index: test/coverage/res_info/formatting/formatting.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_info/formatting/formatting.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvs998h6X and /tmp/cvsnwUeEJ differ

Index: test/coverage/res_info/texi_comments/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_info/texi_comments/comments.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/coverage/res_info/texi_comments/comments.2     3 Aug 2009 08:19:35 
-0000       1.3
+++ test/coverage/res_info/texi_comments/comments.2     6 Sep 2009 21:45:59 
-0000       1.4
@@ -1,2 +1 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument

Index: test/coverage/res_info/texi_comments/comments.passfirst
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_info/texi_comments/comments.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_info/texi_comments/comments.passfirst     21 Jun 2009 
09:25:42 -0000      1.1
+++ test/coverage/res_info/texi_comments/comments.passfirst     6 Sep 2009 
21:45:59 -0000       1.2
@@ -101,8 +101,8 @@
 comments.texi(,116) 
 comments.texi(,117) Special arg for documentencoding. makeinfo complains, not 
tex
 comments.texi(,118) 
-comments.texi(,119) @documentencoding
-comments.texi(,120) @@documentencoding @documentencoding bad encoding name
+comments.texi(,119) @c @documentencoding
+comments.texi(,120) @@documentencoding @documentencoding US-ascii encoding name
 comments.texi(,121) @documentencoding ISO-8859-1
 comments.texi(,122) @c accepts on or off
 comments.texi(,123) @@frenchspacing @frenchspacing on

Index: test/coverage/res_info/texi_comments/comments.passtexi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_info/texi_comments/comments.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_info/texi_comments/comments.passtexi      21 Jun 2009 
09:25:42 -0000      1.1
+++ test/coverage/res_info/texi_comments/comments.passtexi      6 Sep 2009 
21:46:00 -0000       1.2
@@ -101,8 +101,8 @@
 comments.texi(,116) 
 comments.texi(,117) Special arg for documentencoding. makeinfo complains, not 
tex
 comments.texi(,118) 
-comments.texi(,119) @documentencoding
-comments.texi(,120) @@documentencoding @documentencoding bad encoding name
+comments.texi(,119) @c @documentencoding
+comments.texi(,120) @@documentencoding @documentencoding US-ascii encoding name
 comments.texi(,121) @documentencoding ISO-8859-1
 comments.texi(,122) @c accepts on or off
 comments.texi(,123) @@frenchspacing @frenchspacing on

Index: test/coverage/res_info/texi_comments/comments.texi
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_info/texi_comments/comments.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_info/texi_comments/comments.texi  21 Jun 2009 09:25:42 
-0000      1.1
+++ test/coverage/res_info/texi_comments/comments.texi  6 Sep 2009 21:46:00 
-0000       1.2
@@ -102,8 +102,8 @@
 
 Special arg for documentencoding. makeinfo complains, not tex
 
address@hidden
-@@documentencoding @documentencoding bad encoding name
address@hidden @documentencoding
+@@documentencoding @documentencoding US-ascii encoding name
 @documentencoding ISO-8859-1
 @c accepts on or off
 @@frenchspacing @frenchspacing on

Index: test/coverage/res_info/texi_comments/comments.texi.first
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/coverage/res_info/texi_comments/comments.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/coverage/res_info/texi_comments/comments.texi.first    2 Aug 2009 
13:12:05 -0000       1.1
+++ test/coverage/res_info/texi_comments/comments.texi.first    6 Sep 2009 
21:46:00 -0000       1.2
@@ -102,8 +102,8 @@
 
 Special arg for documentencoding. makeinfo complains, not tex
 
address@hidden
-@@documentencoding @documentencoding bad encoding name
address@hidden @documentencoding
+@@documentencoding @documentencoding US-ascii encoding name
 @documentencoding ISO-8859-1
 @c accepts on or off
 @@frenchspacing @frenchspacing on

Index: test/encodings/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/encodings/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/encodings/Makefile.in  25 Aug 2009 21:32:13 -0000      1.15
+++ test/encodings/Makefile.in  6 Sep 2009 21:46:00 -0000       1.16
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -154,7 +157,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/encodings/Makefile'; 
\
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/encodings/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -173,6 +176,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -196,13 +200,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -233,6 +241,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -252,6 +261,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -260,18 +271,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -311,6 +332,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: 
test/encodings/res/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
        23 Dec 2008 14:02:25 -0000      1.1
+++ 
test/encodings/res/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
        6 Sep 2009 21:46:00 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
     23 Dec 2008 14:02:25 -0000      1.1
+++ 
test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
     6 Sep 2009 21:46:00 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
   23 Dec 2008 14:02:26 -0000      1.1
+++ 
test/encodings/res/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
   6 Sep 2009 21:46:00 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
    23 Dec 2008 14:02:27 -0000      1.1
+++ 
test/encodings/res/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
    6 Sep 2009 21:46:00 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding

Index: 
test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- 
test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
 6 Sep 2009 12:52:46 -0000       1.4
+++ 
test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
 6 Sep 2009 21:46:00 -0000       1.5
@@ -1 +1,2 @@
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding
 warning: Document encoding is utf8, but there is no unicode support

Index: 
test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
       23 Dec 2008 14:02:28 -0000      1.1
+++ 
test/encodings/res/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
       6 Sep 2009 21:46:01 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding

Index: test/encodings/res/encoding_index/encoding_index.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/encoding_index/encoding_index.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res/encoding_index/encoding_index.2  3 Aug 2009 08:20:00 
-0000       1.2
+++ test/encodings/res/encoding_index/encoding_index.2  6 Sep 2009 21:46:01 
-0000       1.3
@@ -1 +1,2 @@
+encoding_index.texi:5: warning: Encoding ascii is not a canonical texinfo 
encoding
 encoding_index.texi:56: warning: Empty index entry for @cindex

Index: test/encodings/res/encoding_index-latin1/encoding_index-latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/encoding_index-latin1/encoding_index-latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res/encoding_index-latin1/encoding_index-latin1.2    3 Aug 
2009 08:20:00 -0000       1.2
+++ test/encodings/res/encoding_index-latin1/encoding_index-latin1.2    6 Sep 
2009 21:46:01 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-latin1.texi:5: warning: Encoding latin1 is not a canonical 
texinfo encoding
 encoding_index-latin1.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res/encoding_index-latin1_toutf8/encoding_index-latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/encoding_index-latin1_toutf8/encoding_index-latin1.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res/encoding_index-latin1_toutf8/encoding_index-latin1.2     
3 Aug 2009 08:20:00 -0000       1.3
+++ test/encodings/res/encoding_index-latin1_toutf8/encoding_index-latin1.2     
6 Sep 2009 21:46:01 -0000       1.4
@@ -1 +1,2 @@
+encoding_index-latin1.texi:5: warning: Encoding latin1 is not a canonical 
texinfo encoding
 encoding_index-latin1.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res/encoding_index-utf8/encoding_index-utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/encoding_index-utf8/encoding_index-utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res/encoding_index-utf8/encoding_index-utf8.2        3 Aug 
2009 08:20:00 -0000       1.2
+++ test/encodings/res/encoding_index-utf8/encoding_index-utf8.2        6 Sep 
2009 21:46:01 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-utf8.texi:5: warning: Encoding utf8 is not a canonical texinfo 
encoding
 encoding_index-utf8.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res/encoding_index-utf8_toutf8/encoding_index-utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/encoding_index-utf8_toutf8/encoding_index-utf8.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res/encoding_index-utf8_toutf8/encoding_index-utf8.2 3 Aug 
2009 08:20:00 -0000       1.3
+++ test/encodings/res/encoding_index-utf8_toutf8/encoding_index-utf8.2 6 Sep 
2009 21:46:01 -0000       1.4
@@ -1 +1,2 @@
+encoding_index-utf8.texi:5: warning: Encoding utf8 is not a canonical texinfo 
encoding
 encoding_index-utf8.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res/encoding_index_toutf8/encoding_index.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/encoding_index_toutf8/encoding_index.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res/encoding_index_toutf8/encoding_index.2   3 Aug 2009 
08:20:00 -0000       1.3
+++ test/encodings/res/encoding_index_toutf8/encoding_index.2   6 Sep 2009 
21:46:01 -0000       1.4
@@ -1 +1,2 @@
+encoding_index.texi:5: warning: Encoding ascii is not a canonical texinfo 
encoding
 encoding_index.texi:56: warning: Empty index entry for @cindex

Index: test/encodings/res/nodetest/nodetest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest/nodetest.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/encodings/res/nodetest/nodetest.html   30 Aug 2009 18:59:49 -0000      
1.11
+++ test/encodings/res/nodetest/nodetest.html   6 Sep 2009 21:46:01 -0000       
1.12
@@ -351,7 +351,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-5"></a>
+<a name="O-6"></a>
 <h2 class="section">1.12 &Ouml;</h2>
 <hr>
 <a name="g_t_00dc"></a>
@@ -501,7 +501,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-1"></a>
+<a name="o-2"></a>
 <h2 class="section">2.4 &oacute;</h2>
 <hr>
 <a name="g_t_00fa"></a>
@@ -804,7 +804,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-2"></a>
+<a name="o-3"></a>
 <h2 class="section">3.6 &ograve;</h2>
 <hr>
 <a name="g_t_00f9"></a>
@@ -899,7 +899,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d9"></a>
@@ -1067,7 +1067,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-3"></a>
+<a name="o-4"></a>
 <h2 class="section">4.6 &ocirc;</h2>
 <hr>
 <a name="g_t_00fb"></a>
@@ -1162,7 +1162,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">4.11 &Ocirc;</h2>
 <hr>
 <a name="g_t_00db"></a>
@@ -1264,7 +1264,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-5"></a>
+<a name="o-6"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
 <a name="g_t_00c3"></a>
@@ -1411,7 +1411,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">6.4 &#491;</h2>
 <hr>
 <a name="g_t_0173"></a>
@@ -1506,7 +1506,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">6.9 &#490;</h2>
 <hr>
 <a name="g_t_0172"></a>
@@ -1714,7 +1714,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe-1"></a>
+<a name="oe"></a>
 <h2 class="section">8.3 &oelig;</h2>
 <hr>
 <a name="g_t_00c5"></a>
@@ -1771,7 +1771,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE-1"></a>
+<a name="OE"></a>
 <h2 class="section">8.6 &OElig;</h2>
 <hr>
 <a name="g_t_0142"></a>
@@ -1809,7 +1809,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe"></a>
+<a name="o-1"></a>
 <h2 class="section">8.8 &oslash;</h2>
 <hr>
 <a name="g_t_0141"></a>
@@ -1847,7 +1847,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE"></a>
+<a name="O-2"></a>
 <h2 class="section">8.10 &Oslash;</h2>
 <hr>
 <a name="a_030b"></a>
@@ -2112,7 +2112,7 @@
     <li><a name="toc-A" href="#g_t_00c4">1.9 &Auml;</a></li>
     <li><a name="toc-E" href="#g_t_00cb">1.10 &Euml;</a></li>
     <li><a name="toc-I-1" href="#g_t_00cf">1.11 &Iuml;</a></li>
-    <li><a name="toc-O-5" href="#g_t_00d6">1.12 &Ouml;</a></li>
+    <li><a name="toc-O-6" href="#g_t_00d6">1.12 &Ouml;</a></li>
     <li><a name="toc-U-4" href="#g_t_00dc">1.13 &Uuml;</a></li>
     <li><a name="toc-ss" href="#g_t_00df">1.14 &szlig;</a></li>
   </ul></li>
@@ -2121,7 +2121,7 @@
     <li><a name="toc-a-8" href="#g_t_00e1">2.1 &aacute;</a></li>
     <li><a name="toc-e-1" href="#g_t_00e9">2.2 &eacute;</a></li>
     <li><a name="toc-i-5" href="#g_t_00ed">2.3 &iacute;</a></li>
-    <li><a name="toc-o-1" href="#g_t_00f3">2.4 &oacute;</a></li>
+    <li><a name="toc-o-2" href="#g_t_00f3">2.4 &oacute;</a></li>
     <li><a name="toc-u" href="#g_t_00fa">2.5 &uacute;</a></li>
     <li><a name="toc-y" href="#g_t_00fd">2.6 &yacute;</a></li>
     <li><a name="toc-A-4" href="#g_t_00c1">2.7 &Aacute;</a></li>
@@ -2138,12 +2138,12 @@
     <li><a name="toc-i-1" href="#g_t_00ec">3.3 &igrave;</a></li>
     <li><a name="toc-i" href="#with-brace-_00ec">3.4 &igrave;</a></li>
     <li><a name="toc-i-9" href="#with-dotless-_00ec">3.5 &igrave;</a></li>
-    <li><a name="toc-o-2" href="#g_t_00f2">3.6 &ograve;</a></li>
+    <li><a name="toc-o-3" href="#g_t_00f2">3.6 &ograve;</a></li>
     <li><a name="toc-u-3" href="#g_t_00f9">3.7 &ugrave;</a></li>
     <li><a name="toc-A-5" href="#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-4" href="#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I" href="#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-3" href="#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-4" href="#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-2" href="#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" href="#circumflex-accent">4 circumflex 
accent</a>
@@ -2153,19 +2153,19 @@
     <li><a name="toc-i-4" href="#g_t_00ee">4.3 &icirc;</a></li>
     <li><a name="toc-i-6" href="#with-brace-_00ee">4.4 &icirc;</a></li>
     <li><a name="toc-i-7" href="#with-dotless-_00ee">4.5 &icirc;</a></li>
-    <li><a name="toc-o-3" href="#g_t_00f4">4.6 &ocirc;</a></li>
+    <li><a name="toc-o-4" href="#g_t_00f4">4.6 &ocirc;</a></li>
     <li><a name="toc-u-2" href="#g_t_00fb">4.7 &ucirc;</a></li>
     <li><a name="toc-A-1" href="#g_t_00c2">4.8 &Acirc;</a></li>
     <li><a name="toc-E-3" href="#g_t_00ca">4.9 &Ecirc;</a></li>
     <li><a name="toc-I-2" href="#g_t_00ce">4.10 &Icirc;</a></li>
-    <li><a name="toc-O-4" href="#g_t_00d4">4.11 &Ocirc;</a></li>
+    <li><a name="toc-O-5" href="#g_t_00d4">4.11 &Ocirc;</a></li>
     <li><a name="toc-U-3" href="#g_t_00db">4.12 &Ucirc;</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="#tilde-accent">5 tilde accent</a>
   <ul class="toc">
     <li><a name="toc-a-5" href="#g_t_00e3">5.1 &atilde;</a></li>
     <li><a name="toc-n" href="#g_t_00f1">5.2 &ntilde;</a></li>
-    <li><a name="toc-o-5" href="#g_t_00f5">5.3 &otilde;</a></li>
+    <li><a name="toc-o-6" href="#g_t_00f5">5.3 &otilde;</a></li>
     <li><a name="toc-A-3" href="#g_t_00c3">5.4 &Atilde;</a></li>
     <li><a name="toc-O-1" href="#g_t_00d5">5.5 &Otilde;</a></li>
   </ul></li>
@@ -2174,12 +2174,12 @@
     <li><a name="toc-a-6" href="#g_t_0105">6.1 &#261;</a></li>
     <li><a name="toc-e" href="#g_t_0119">6.2 &#281;</a></li>
     <li><a name="toc-i-3" href="#g_t_012f">6.3 &#303;</a></li>
-    <li><a name="toc-o-4" href="#g_t_01eb">6.4 &#491;</a></li>
+    <li><a name="toc-o-5" href="#g_t_01eb">6.4 &#491;</a></li>
     <li><a name="toc-u-1" href="#g_t_0173">6.5 &#371;</a></li>
     <li><a name="toc-A-2" href="#g_t_0104">6.6 &#260;</a></li>
     <li><a name="toc-E-1" href="#g_t_0118">6.7 &#280;</a></li>
     <li><a name="toc-I-4" href="#g_t_012e">6.8 &#302;</a></li>
-    <li><a name="toc-O-2" href="#g_t_01ea">6.9 &#490;</a></li>
+    <li><a name="toc-O-3" href="#g_t_01ea">6.9 &#490;</a></li>
     <li><a name="toc-U" href="#g_t_0172">6.10 &#370;</a></li>
   </ul></li>
   <li><a name="toc-cedilla-accent-1" href="#cedilla-accent">7 cedilla 
accent</a>
@@ -2192,14 +2192,14 @@
   <ul class="toc">
     <li><a name="toc-aa-1" href="#g_t_00e5">8.1 &aring;</a></li>
     <li><a name="toc-ae" href="#g_t_00e6">8.2 &aelig;</a></li>
-    <li><a name="toc-oe-1" href="#g_t_0153">8.3 &oelig;</a></li>
+    <li><a name="toc-oe" href="#g_t_0153">8.3 &oelig;</a></li>
     <li><a name="toc-AA" href="#g_t_00c5">8.4 &Aring;</a></li>
     <li><a name="toc-AE" href="#g_t_00c6">8.5 &AElig;</a></li>
-    <li><a name="toc-OE-1" href="#g_t_0152">8.6 &OElig;</a></li>
+    <li><a name="toc-OE" href="#g_t_0152">8.6 &OElig;</a></li>
     <li><a name="toc-l" href="#g_t_0142">8.7 &#322;</a></li>
-    <li><a name="toc-oe" href="#g_t_00f8">8.8 &oslash;</a></li>
+    <li><a name="toc-o-1" href="#g_t_00f8">8.8 &oslash;</a></li>
     <li><a name="toc-L" href="#g_t_0141">8.9 &#321;</a></li>
-    <li><a name="toc-OE" href="#g_t_00d8">8.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="#g_t_00d8">8.10 &Oslash;</a></li>
     <li><a name="toc-a-3" href="#a_030b">8.11 a''</a></li>
     <li><a name="toc-a-9" href="#g_t_0103">8.12 &#259;</a></li>
     <li><a name="toc-a-1" href="#g_t_01ce">8.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_chapter/nodetest_1.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest_1.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/encodings/res/nodetest_chapter/nodetest_1.html 30 Aug 2009 18:59:50 
-0000      1.9
+++ test/encodings/res/nodetest_chapter/nodetest_1.html 6 Sep 2009 21:46:02 
-0000       1.10
@@ -323,7 +323,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="O-5"></a>
+<a name="O-6"></a>
 <h2 class="section">1.12 &Ouml;</h2>
 <hr>
 <a name="g_t_00dc"></a>

Index: test/encodings/res/nodetest_chapter/nodetest_2.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest_2.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/encodings/res/nodetest_chapter/nodetest_2.html 30 Aug 2009 18:59:50 
-0000      1.9
+++ test/encodings/res/nodetest_chapter/nodetest_2.html 6 Sep 2009 21:46:02 
-0000       1.10
@@ -148,7 +148,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="o-1"></a>
+<a name="o-2"></a>
 <h2 class="section">2.4 &oacute;</h2>
 <hr>
 <a name="g_t_00fa"></a>

Index: test/encodings/res/nodetest_chapter/nodetest_3.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest_3.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/encodings/res/nodetest_chapter/nodetest_3.html 30 Aug 2009 18:59:50 
-0000      1.9
+++ test/encodings/res/nodetest_chapter/nodetest_3.html 6 Sep 2009 21:46:02 
-0000       1.10
@@ -185,7 +185,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="o-2"></a>
+<a name="o-3"></a>
 <h2 class="section">3.6 &ograve;</h2>
 <hr>
 <a name="g_t_00f9"></a>
@@ -280,7 +280,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d9"></a>

Index: test/encodings/res/nodetest_chapter/nodetest_4.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest_4.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/encodings/res/nodetest_chapter/nodetest_4.html 30 Aug 2009 18:59:50 
-0000      1.9
+++ test/encodings/res/nodetest_chapter/nodetest_4.html 6 Sep 2009 21:46:02 
-0000       1.10
@@ -187,7 +187,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="o-3"></a>
+<a name="o-4"></a>
 <h2 class="section">4.6 &ocirc;</h2>
 <hr>
 <a name="g_t_00fb"></a>
@@ -282,7 +282,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">4.11 &Ocirc;</h2>
 <hr>
 <a name="g_t_00db"></a>

Index: test/encodings/res/nodetest_chapter/nodetest_5.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest_5.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/encodings/res/nodetest_chapter/nodetest_5.html 30 Aug 2009 18:59:50 
-0000      1.9
+++ test/encodings/res/nodetest_chapter/nodetest_5.html 6 Sep 2009 21:46:02 
-0000       1.10
@@ -121,7 +121,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="o-5"></a>
+<a name="o-6"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
 <a name="g_t_00c3"></a>

Index: test/encodings/res/nodetest_chapter/nodetest_6.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest_6.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_chapter/nodetest_6.html 30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_chapter/nodetest_6.html 6 Sep 2009 21:46:02 
-0000       1.11
@@ -145,7 +145,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">6.4 &#491;</h2>
 <hr>
 <a name="g_t_0173"></a>
@@ -240,7 +240,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">6.9 &#490;</h2>
 <hr>
 <a name="g_t_0172"></a>

Index: test/encodings/res/nodetest_chapter/nodetest_8.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest_8.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/nodetest_chapter/nodetest_8.html 30 Aug 2009 18:59:50 
-0000      1.1
+++ test/encodings/res/nodetest_chapter/nodetest_8.html 6 Sep 2009 21:46:02 
-0000       1.2
@@ -145,7 +145,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="oe-1"></a>
+<a name="oe"></a>
 <h2 class="section">8.3 &oelig;</h2>
 <hr>
 <a name="g_t_00c5"></a>
@@ -202,7 +202,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="OE-1"></a>
+<a name="OE"></a>
 <h2 class="section">8.6 &OElig;</h2>
 <hr>
 <a name="g_t_0142"></a>
@@ -240,7 +240,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="oe"></a>
+<a name="o-1"></a>
 <h2 class="section">8.8 &oslash;</h2>
 <hr>
 <a name="g_t_0141"></a>
@@ -278,7 +278,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
-<a name="OE"></a>
+<a name="O-2"></a>
 <h2 class="section">8.10 &Oslash;</h2>
 <hr>
 <a name="a_030b"></a>

Index: test/encodings/res/nodetest_chapter/nodetest_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_chapter/nodetest_toc.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/encodings/res/nodetest_chapter/nodetest_toc.html       30 Aug 2009 
18:59:50 -0000      1.8
+++ test/encodings/res/nodetest_chapter/nodetest_toc.html       6 Sep 2009 
21:46:02 -0000       1.9
@@ -65,7 +65,7 @@
     <li><a name="toc-A" href="nodetest_1.html#g_t_00c4">1.9 &Auml;</a></li>
     <li><a name="toc-E" href="nodetest_1.html#g_t_00cb">1.10 &Euml;</a></li>
     <li><a name="toc-I-1" href="nodetest_1.html#g_t_00cf">1.11 &Iuml;</a></li>
-    <li><a name="toc-O-5" href="nodetest_1.html#g_t_00d6">1.12 &Ouml;</a></li>
+    <li><a name="toc-O-6" href="nodetest_1.html#g_t_00d6">1.12 &Ouml;</a></li>
     <li><a name="toc-U-4" href="nodetest_1.html#g_t_00dc">1.13 &Uuml;</a></li>
     <li><a name="toc-ss" href="nodetest_1.html#g_t_00df">1.14 &szlig;</a></li>
   </ul></li>
@@ -74,7 +74,7 @@
     <li><a name="toc-a-8" href="nodetest_2.html#g_t_00e1">2.1 &aacute;</a></li>
     <li><a name="toc-e-1" href="nodetest_2.html#g_t_00e9">2.2 &eacute;</a></li>
     <li><a name="toc-i-5" href="nodetest_2.html#g_t_00ed">2.3 &iacute;</a></li>
-    <li><a name="toc-o-1" href="nodetest_2.html#g_t_00f3">2.4 &oacute;</a></li>
+    <li><a name="toc-o-2" href="nodetest_2.html#g_t_00f3">2.4 &oacute;</a></li>
     <li><a name="toc-u" href="nodetest_2.html#g_t_00fa">2.5 &uacute;</a></li>
     <li><a name="toc-y" href="nodetest_2.html#g_t_00fd">2.6 &yacute;</a></li>
     <li><a name="toc-A-4" href="nodetest_2.html#g_t_00c1">2.7 &Aacute;</a></li>
@@ -91,12 +91,12 @@
     <li><a name="toc-i-1" href="nodetest_3.html#g_t_00ec">3.3 &igrave;</a></li>
     <li><a name="toc-i" href="nodetest_3.html#with-brace-_00ec">3.4 
&igrave;</a></li>
     <li><a name="toc-i-9" href="nodetest_3.html#with-dotless-_00ec">3.5 
&igrave;</a></li>
-    <li><a name="toc-o-2" href="nodetest_3.html#g_t_00f2">3.6 &ograve;</a></li>
+    <li><a name="toc-o-3" href="nodetest_3.html#g_t_00f2">3.6 &ograve;</a></li>
     <li><a name="toc-u-3" href="nodetest_3.html#g_t_00f9">3.7 &ugrave;</a></li>
     <li><a name="toc-A-5" href="nodetest_3.html#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-4" href="nodetest_3.html#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I" href="nodetest_3.html#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-3" href="nodetest_3.html#g_t_00d2">3.11 
&Ograve;</a></li>
+    <li><a name="toc-O-4" href="nodetest_3.html#g_t_00d2">3.11 
&Ograve;</a></li>
     <li><a name="toc-U-2" href="nodetest_3.html#g_t_00d9">3.12 
&Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" 
href="nodetest_4.html#circumflex-accent">4 circumflex accent</a>
@@ -106,19 +106,19 @@
     <li><a name="toc-i-4" href="nodetest_4.html#g_t_00ee">4.3 &icirc;</a></li>
     <li><a name="toc-i-6" href="nodetest_4.html#with-brace-_00ee">4.4 
&icirc;</a></li>
     <li><a name="toc-i-7" href="nodetest_4.html#with-dotless-_00ee">4.5 
&icirc;</a></li>
-    <li><a name="toc-o-3" href="nodetest_4.html#g_t_00f4">4.6 &ocirc;</a></li>
+    <li><a name="toc-o-4" href="nodetest_4.html#g_t_00f4">4.6 &ocirc;</a></li>
     <li><a name="toc-u-2" href="nodetest_4.html#g_t_00fb">4.7 &ucirc;</a></li>
     <li><a name="toc-A-1" href="nodetest_4.html#g_t_00c2">4.8 &Acirc;</a></li>
     <li><a name="toc-E-3" href="nodetest_4.html#g_t_00ca">4.9 &Ecirc;</a></li>
     <li><a name="toc-I-2" href="nodetest_4.html#g_t_00ce">4.10 &Icirc;</a></li>
-    <li><a name="toc-O-4" href="nodetest_4.html#g_t_00d4">4.11 &Ocirc;</a></li>
+    <li><a name="toc-O-5" href="nodetest_4.html#g_t_00d4">4.11 &Ocirc;</a></li>
     <li><a name="toc-U-3" href="nodetest_4.html#g_t_00db">4.12 &Ucirc;</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="nodetest_5.html#tilde-accent">5 tilde 
accent</a>
   <ul class="toc">
     <li><a name="toc-a-5" href="nodetest_5.html#g_t_00e3">5.1 &atilde;</a></li>
     <li><a name="toc-n" href="nodetest_5.html#g_t_00f1">5.2 &ntilde;</a></li>
-    <li><a name="toc-o-5" href="nodetest_5.html#g_t_00f5">5.3 &otilde;</a></li>
+    <li><a name="toc-o-6" href="nodetest_5.html#g_t_00f5">5.3 &otilde;</a></li>
     <li><a name="toc-A-3" href="nodetest_5.html#g_t_00c3">5.4 &Atilde;</a></li>
     <li><a name="toc-O-1" href="nodetest_5.html#g_t_00d5">5.5 &Otilde;</a></li>
   </ul></li>
@@ -127,12 +127,12 @@
     <li><a name="toc-a-6" href="nodetest_6.html#g_t_0105">6.1 &#261;</a></li>
     <li><a name="toc-e" href="nodetest_6.html#g_t_0119">6.2 &#281;</a></li>
     <li><a name="toc-i-3" href="nodetest_6.html#g_t_012f">6.3 &#303;</a></li>
-    <li><a name="toc-o-4" href="nodetest_6.html#g_t_01eb">6.4 &#491;</a></li>
+    <li><a name="toc-o-5" href="nodetest_6.html#g_t_01eb">6.4 &#491;</a></li>
     <li><a name="toc-u-1" href="nodetest_6.html#g_t_0173">6.5 &#371;</a></li>
     <li><a name="toc-A-2" href="nodetest_6.html#g_t_0104">6.6 &#260;</a></li>
     <li><a name="toc-E-1" href="nodetest_6.html#g_t_0118">6.7 &#280;</a></li>
     <li><a name="toc-I-4" href="nodetest_6.html#g_t_012e">6.8 &#302;</a></li>
-    <li><a name="toc-O-2" href="nodetest_6.html#g_t_01ea">6.9 &#490;</a></li>
+    <li><a name="toc-O-3" href="nodetest_6.html#g_t_01ea">6.9 &#490;</a></li>
     <li><a name="toc-U" href="nodetest_6.html#g_t_0172">6.10 &#370;</a></li>
   </ul></li>
   <li><a name="toc-cedilla-accent-1" href="nodetest_7.html#cedilla-accent">7 
cedilla accent</a>
@@ -145,14 +145,14 @@
   <ul class="toc">
     <li><a name="toc-aa-1" href="nodetest_8.html#g_t_00e5">8.1 &aring;</a></li>
     <li><a name="toc-ae" href="nodetest_8.html#g_t_00e6">8.2 &aelig;</a></li>
-    <li><a name="toc-oe-1" href="nodetest_8.html#g_t_0153">8.3 &oelig;</a></li>
+    <li><a name="toc-oe" href="nodetest_8.html#g_t_0153">8.3 &oelig;</a></li>
     <li><a name="toc-AA" href="nodetest_8.html#g_t_00c5">8.4 &Aring;</a></li>
     <li><a name="toc-AE" href="nodetest_8.html#g_t_00c6">8.5 &AElig;</a></li>
-    <li><a name="toc-OE-1" href="nodetest_8.html#g_t_0152">8.6 &OElig;</a></li>
+    <li><a name="toc-OE" href="nodetest_8.html#g_t_0152">8.6 &OElig;</a></li>
     <li><a name="toc-l" href="nodetest_8.html#g_t_0142">8.7 &#322;</a></li>
-    <li><a name="toc-oe" href="nodetest_8.html#g_t_00f8">8.8 &oslash;</a></li>
+    <li><a name="toc-o-1" href="nodetest_8.html#g_t_00f8">8.8 &oslash;</a></li>
     <li><a name="toc-L" href="nodetest_8.html#g_t_0141">8.9 &#321;</a></li>
-    <li><a name="toc-OE" href="nodetest_8.html#g_t_00d8">8.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="nodetest_8.html#g_t_00d8">8.10 
&Oslash;</a></li>
     <li><a name="toc-a-3" href="nodetest_8.html#a_030b">8.11 a''</a></li>
     <li><a name="toc-a-9" href="nodetest_8.html#g_t_0103">8.12 &#259;</a></li>
     <li><a name="toc-a-1" href="nodetest_8.html#g_t_01ce">8.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1/nodetest_latin1.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/nodetest_latin1/nodetest_latin1.2        6 Sep 2009 
12:52:47 -0000       1.4
+++ test/encodings/res/nodetest_latin1/nodetest_latin1.2        6 Sep 2009 
21:46:02 -0000       1.5
@@ -1,2 +1,3 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: test/encodings/res/nodetest_latin1/nodetest_latin1.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1/nodetest_latin1.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_latin1/nodetest_latin1.html     24 Aug 2009 
10:26:38 -0000      1.10
+++ test/encodings/res/nodetest_latin1/nodetest_latin1.html     6 Sep 2009 
21:46:02 -0000       1.11
@@ -184,7 +184,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">1.4 ö</h2>
 <p>Ref to an anchor at the end of the doc 
 (see <a href="#g_t_00e9_002do">there is an o-é could there be an &icirc;</a>).
@@ -572,7 +572,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">2.10 &Oacute;</h2>
 <hr>
 <a name="g_t_00da"></a>
@@ -856,7 +856,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d9"></a>
@@ -1077,7 +1077,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">4.9 Ô</h2>
 <hr>
 <a name="g_t_00db"></a>
@@ -1482,7 +1482,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe-1"></a>
+<a name="o-4"></a>
 <h2 class="section">7.8 &oslash;</h2>
 <hr>
 <a name="g_t_0141"></a>
@@ -1520,7 +1520,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE-1"></a>
+<a name="O-2"></a>
 <h2 class="section">7.10 &Oslash;</h2>
 <hr>
 <a name="a_030b"></a>
@@ -1797,7 +1797,7 @@
     <li><a name="toc-a-9" href="#g_t_00e4">1.1 ä</a></li>
     <li><a name="toc-e-3" href="#g_t_00eb">1.2 ë</a></li>
     <li><a name="toc-i-5" href="#g_t_00ef">1.3 ï</a></li>
-    <li><a name="toc-o-4" href="#g_t_00f6">1.4 ö</a></li>
+    <li><a name="toc-o-5" href="#g_t_00f6">1.4 ö</a></li>
     <li><a name="toc-u-2" href="#g_t_00fc">1.5 ü</a></li>
     <li><a name="toc-y" href="#g_t_00ff">1.6 ÿ</a></li>
     <li><a name="toc-A-4" href="#g_t_00c4">1.7 Ä</a></li>
@@ -1818,7 +1818,7 @@
     <li><a name="toc-A" href="#g_t_00c1">2.7 &Aacute;</a></li>
     <li><a name="toc-E" href="#g_t_00c9">2.8 &Eacute;</a></li>
     <li><a name="toc-I-2" href="#g_t_00cd">2.9 &Iacute;</a></li>
-    <li><a name="toc-O-3" href="#g_t_00d3">2.10 &Oacute;</a></li>
+    <li><a name="toc-O-4" href="#g_t_00d3">2.10 &Oacute;</a></li>
     <li><a name="toc-U-3" href="#g_t_00da">2.11 &Uacute;</a></li>
     <li><a name="toc-Y" href="#g_t_00dd">2.12 &Yacute;</a></li>
   </ul></li>
@@ -1834,7 +1834,7 @@
     <li><a name="toc-A-2" href="#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-1" href="#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I-3" href="#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-4" href="#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-5" href="#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-1" href="#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" href="#circumflex-accent">4 circumflex 
accent</a>
@@ -1847,7 +1847,7 @@
     <li><a name="toc-A-3" href="#g_t_00c2">4.6 Â</a></li>
     <li><a name="toc-E-3" href="#g_t_00ca">4.7 Ê</a></li>
     <li><a name="toc-I-1" href="#g_t_00ce">4.8 Î</a></li>
-    <li><a name="toc-O-2" href="#g_t_00d4">4.9 Ô</a></li>
+    <li><a name="toc-O-3" href="#g_t_00d4">4.9 Ô</a></li>
     <li><a name="toc-U" href="#g_t_00db">4.10 Û</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="#tilde-accent">5 tilde accent</a>
@@ -1872,9 +1872,9 @@
     <li><a name="toc-AE" href="#g_t_00c6">7.5 &AElig;</a></li>
     <li><a name="toc-OE" href="#g_t_0152">7.6 &OElig;</a></li>
     <li><a name="toc-l" href="#g_t_0142">7.7 &#322;</a></li>
-    <li><a name="toc-oe-1" href="#g_t_00f8">7.8 &oslash;</a></li>
+    <li><a name="toc-o-4" href="#g_t_00f8">7.8 &oslash;</a></li>
     <li><a name="toc-L" href="#g_t_0141">7.9 &#321;</a></li>
-    <li><a name="toc-OE-1" href="#g_t_00d8">7.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="#g_t_00d8">7.10 &Oslash;</a></li>
     <li><a name="toc-a" href="#a_030b">7.11 a''</a></li>
     <li><a name="toc-a-1" href="#g_t_0103">7.12 &#259;</a></li>
     <li><a name="toc-a-8" href="#g_t_01ce">7.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.2     6 Sep 
2009 12:52:48 -0000       1.5
+++ test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.2     6 Sep 
2009 21:46:03 -0000       1.6
@@ -1,2 +1,3 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.html  24 Aug 
2009 10:26:38 -0000      1.11
+++ test/encodings/res/nodetest_latin1_no_unicode/nodetest_latin1.html  6 Sep 
2009 21:46:03 -0000       1.12
@@ -184,7 +184,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">1.4 ö</h2>
 <p>Ref to an anchor at the end of the doc 
 (see <a href="#g_t_00e9_002do">there is an o-é could there be an &icirc;</a>).
@@ -572,7 +572,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">2.10 &Oacute;</h2>
 <hr>
 <a name="g_t_00da"></a>
@@ -856,7 +856,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d9"></a>
@@ -1077,7 +1077,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">4.9 Ô</h2>
 <hr>
 <a name="g_t_00db"></a>
@@ -1482,7 +1482,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe-1"></a>
+<a name="o-4"></a>
 <h2 class="section">7.8 &oslash;</h2>
 <hr>
 <a name="g_t_0141"></a>
@@ -1520,7 +1520,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE-1"></a>
+<a name="O-2"></a>
 <h2 class="section">7.10 &Oslash;</h2>
 <hr>
 <a name="a_030b"></a>
@@ -1797,7 +1797,7 @@
     <li><a name="toc-a-9" href="#g_t_00e4">1.1 ä</a></li>
     <li><a name="toc-e-3" href="#g_t_00eb">1.2 ë</a></li>
     <li><a name="toc-i-5" href="#g_t_00ef">1.3 ï</a></li>
-    <li><a name="toc-o-4" href="#g_t_00f6">1.4 ö</a></li>
+    <li><a name="toc-o-5" href="#g_t_00f6">1.4 ö</a></li>
     <li><a name="toc-u-2" href="#g_t_00fc">1.5 ü</a></li>
     <li><a name="toc-y" href="#g_t_00ff">1.6 ÿ</a></li>
     <li><a name="toc-A-4" href="#g_t_00c4">1.7 Ä</a></li>
@@ -1818,7 +1818,7 @@
     <li><a name="toc-A" href="#g_t_00c1">2.7 &Aacute;</a></li>
     <li><a name="toc-E" href="#g_t_00c9">2.8 &Eacute;</a></li>
     <li><a name="toc-I-2" href="#g_t_00cd">2.9 &Iacute;</a></li>
-    <li><a name="toc-O-3" href="#g_t_00d3">2.10 &Oacute;</a></li>
+    <li><a name="toc-O-4" href="#g_t_00d3">2.10 &Oacute;</a></li>
     <li><a name="toc-U-3" href="#g_t_00da">2.11 &Uacute;</a></li>
     <li><a name="toc-Y" href="#g_t_00dd">2.12 &Yacute;</a></li>
   </ul></li>
@@ -1834,7 +1834,7 @@
     <li><a name="toc-A-2" href="#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-1" href="#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I-3" href="#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-4" href="#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-5" href="#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-1" href="#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" href="#circumflex-accent">4 circumflex 
accent</a>
@@ -1847,7 +1847,7 @@
     <li><a name="toc-A-3" href="#g_t_00c2">4.6 Â</a></li>
     <li><a name="toc-E-3" href="#g_t_00ca">4.7 Ê</a></li>
     <li><a name="toc-I-1" href="#g_t_00ce">4.8 Î</a></li>
-    <li><a name="toc-O-2" href="#g_t_00d4">4.9 Ô</a></li>
+    <li><a name="toc-O-3" href="#g_t_00d4">4.9 Ô</a></li>
     <li><a name="toc-U" href="#g_t_00db">4.10 Û</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="#tilde-accent">5 tilde accent</a>
@@ -1872,9 +1872,9 @@
     <li><a name="toc-AE" href="#g_t_00c6">7.5 &AElig;</a></li>
     <li><a name="toc-OE" href="#g_t_0152">7.6 &OElig;</a></li>
     <li><a name="toc-l" href="#g_t_0142">7.7 &#322;</a></li>
-    <li><a name="toc-oe-1" href="#g_t_00f8">7.8 &oslash;</a></li>
+    <li><a name="toc-o-4" href="#g_t_00f8">7.8 &oslash;</a></li>
     <li><a name="toc-L" href="#g_t_0141">7.9 &#321;</a></li>
-    <li><a name="toc-OE-1" href="#g_t_00d8">7.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="#g_t_00d8">7.10 &Oslash;</a></li>
     <li><a name="toc-a" href="#a_030b">7.11 a''</a></li>
     <li><a name="toc-a-1" href="#g_t_0103">7.12 &#259;</a></li>
     <li><a name="toc-a-8" href="#g_t_01ce">7.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_latin1_use_nodes/L.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/L.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/L.html 24 Aug 2009 10:26:38 
-0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/L.html 6 Sep 2009 21:46:03 
-0000       1.7
@@ -44,9 +44,9 @@
 <a name="g_t_0141"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_latin1_use_nodes/O.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/O.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/O.html 24 Aug 2009 10:26:38 
-0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/O.html 6 Sep 2009 21:46:03 
-0000       1.7
@@ -78,7 +78,7 @@
 <td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">2.10 &Oacute;</h2>
 <hr>
 <a name="g_t_00d2"></a>
@@ -98,7 +98,7 @@
 <td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d4"></a>
@@ -118,7 +118,7 @@
 <td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">4.9 Ô</h2>
 <hr>
 <a name="g_t_00d5"></a>
@@ -143,6 +143,26 @@
 <p>This marks the <a name="x_002dspot"></a>spot.
 A second one with accented char <a name="g_t_00e9_002do"></a>.
 </p><hr>
+<a name="g_t_00d8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a 
href="nodetest_latin1_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="O-2"></a>
+<h2 class="section">7.10 &Oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_latin1_use_nodes/OE.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/OE.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/OE.html        24 Aug 2009 
10:26:38 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/OE.html        6 Sep 2009 
21:46:03 -0000       1.7
@@ -61,26 +61,6 @@
 <a name="OE"></a>
 <h2 class="section">7.6 &OElig;</h2>
 <hr>
-<a name="g_t_00d8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a 
href="nodetest_latin1_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<a name="OE-1"></a>
-<h2 class="section">7.10 &Oslash;</h2>
-<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>.

Index: test/encodings/res/nodetest_latin1_use_nodes/a.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/a.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/a.html 24 Aug 2009 10:26:38 
-0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/a.html 6 Sep 2009 21:46:03 
-0000       1.7
@@ -146,7 +146,7 @@
 <a name="a_030b"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
 <td valign="middle" align="left">[<a href="#g_t_0103" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>

Index: test/encodings/res/nodetest_latin1_use_nodes/l.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/l.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/l.html 24 Aug 2009 10:26:39 
-0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/l.html 6 Sep 2009 21:46:03 
-0000       1.7
@@ -46,7 +46,7 @@
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="OE.html#g_t_0152" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1.2      6 Sep 
2009 12:52:48 -0000       1.4
+++ test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1.2      6 Sep 
2009 21:46:03 -0000       1.5
@@ -1,2 +1,3 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1_toc.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1_toc.html       
24 Aug 2009 10:26:39 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/nodetest_latin1_toc.html       
6 Sep 2009 21:46:03 -0000       1.7
@@ -58,7 +58,7 @@
     <li><a name="toc-a-9" href="a.html#g_t_00e4">1.1 ä</a></li>
     <li><a name="toc-e-3" href="e.html#g_t_00eb">1.2 ë</a></li>
     <li><a name="toc-i-5" href="i.html#g_t_00ef">1.3 ï</a></li>
-    <li><a name="toc-o-4" href="o.html#g_t_00f6">1.4 ö</a></li>
+    <li><a name="toc-o-5" href="o.html#g_t_00f6">1.4 ö</a></li>
     <li><a name="toc-u-2" href="u.html#g_t_00fc">1.5 ü</a></li>
     <li><a name="toc-y" href="y.html#g_t_00ff">1.6 ÿ</a></li>
     <li><a name="toc-A-4" href="A.html#g_t_00c4">1.7 Ä</a></li>
@@ -79,7 +79,7 @@
     <li><a name="toc-A" href="A.html#g_t_00c1">2.7 &Aacute;</a></li>
     <li><a name="toc-E" href="E.html#g_t_00c9">2.8 &Eacute;</a></li>
     <li><a name="toc-I-2" href="I.html#g_t_00cd">2.9 &Iacute;</a></li>
-    <li><a name="toc-O-3" href="O.html#g_t_00d3">2.10 &Oacute;</a></li>
+    <li><a name="toc-O-4" href="O.html#g_t_00d3">2.10 &Oacute;</a></li>
     <li><a name="toc-U-3" href="U.html#g_t_00da">2.11 &Uacute;</a></li>
     <li><a name="toc-Y" href="Y.html#g_t_00dd">2.12 &Yacute;</a></li>
   </ul></li>
@@ -95,7 +95,7 @@
     <li><a name="toc-A-2" href="A.html#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-1" href="E.html#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I-3" href="I.html#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-4" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-5" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-1" href="U.html#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" 
href="circumflex-accent.html#circumflex-accent">4 circumflex accent</a>
@@ -108,7 +108,7 @@
     <li><a name="toc-A-3" href="A.html#g_t_00c2">4.6 Â</a></li>
     <li><a name="toc-E-3" href="E.html#g_t_00ca">4.7 Ê</a></li>
     <li><a name="toc-I-1" href="I.html#g_t_00ce">4.8 Î</a></li>
-    <li><a name="toc-O-2" href="O.html#g_t_00d4">4.9 Ô</a></li>
+    <li><a name="toc-O-3" href="O.html#g_t_00d4">4.9 Ô</a></li>
     <li><a name="toc-U" href="U.html#g_t_00db">4.10 Û</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="tilde-accent.html#tilde-accent">5 
tilde accent</a>
@@ -133,9 +133,9 @@
     <li><a name="toc-AE" href="AE.html#g_t_00c6">7.5 &AElig;</a></li>
     <li><a name="toc-OE" href="OE.html#g_t_0152">7.6 &OElig;</a></li>
     <li><a name="toc-l" href="l.html#g_t_0142">7.7 &#322;</a></li>
-    <li><a name="toc-oe-1" href="oe.html#g_t_00f8">7.8 &oslash;</a></li>
+    <li><a name="toc-o-4" href="o.html#g_t_00f8">7.8 &oslash;</a></li>
     <li><a name="toc-L" href="L.html#g_t_0141">7.9 &#321;</a></li>
-    <li><a name="toc-OE-1" href="OE.html#g_t_00d8">7.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="O.html#g_t_00d8">7.10 &Oslash;</a></li>
     <li><a name="toc-a" href="a.html#a_030b">7.11 a''</a></li>
     <li><a name="toc-a-1" href="a.html#g_t_0103">7.12 &#259;</a></li>
     <li><a name="toc-a-8" href="a.html#g_t_01ce">7.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_latin1_use_nodes/o.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/o.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/o.html 24 Aug 2009 10:26:39 
-0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/o.html 6 Sep 2009 21:46:03 
-0000       1.7
@@ -58,7 +58,7 @@
 <td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">1.4 ö</h2>
 <p>Ref to an anchor at the end of the doc 
 (see <a href="O.html#g_t_00e9_002do">there is an o-é could there be an 
&icirc;</a>).
@@ -143,6 +143,26 @@
 <a name="o-3"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
+<a name="g_t_00f8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a 
href="nodetest_latin1_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="o-4"></a>
+<h2 class="section">7.8 &oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_latin1_use_nodes/oe.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/oe.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/oe.html        24 Aug 2009 
10:26:39 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/oe.html        6 Sep 2009 
21:46:03 -0000       1.7
@@ -61,26 +61,6 @@
 <a name="oe"></a>
 <h2 class="section">7.3 &oelig;</h2>
 <hr>
-<a name="g_t_00f8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a 
href="nodetest_latin1_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<a name="oe-1"></a>
-<h2 class="section">7.8 &oslash;</h2>
-<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>.

Index: test/encodings/res/nodetest_latin1_use_nodes/rest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes/rest.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes/rest.html      24 Aug 2009 
10:26:39 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes/rest.html      6 Sep 2009 
21:46:03 -0000       1.7
@@ -68,9 +68,9 @@
 <tr><td align="left" valign="top"><a href="AE.html#g_t_00c6">7.5 
&AElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="OE.html#g_t_0152">7.6 
&OElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="l.html#g_t_0142">7.7 
&#322;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="oe.html#g_t_00f8">7.8 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="o.html#g_t_00f8">7.8 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="L.html#g_t_0141">7.9 
&#321;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="OE.html#g_t_00d8">7.10 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="O.html#g_t_00d8">7.10 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#a_030b">7.11 
a''</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_0103">7.12 
&#259;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_01ce">7.13 
a&lt;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/L.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/L.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/L.html      24 Aug 
2009 10:26:39 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/L.html      6 Sep 
2009 21:46:03 -0000       1.7
@@ -44,9 +44,9 @@
 <a name="g_t_0141"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/O.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/O.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/O.html      24 Aug 
2009 10:26:39 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/O.html      6 Sep 
2009 21:46:03 -0000       1.7
@@ -78,7 +78,7 @@
 <td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">2.10 &Oacute;</h2>
 <hr>
 <a name="g_t_00d2"></a>
@@ -98,7 +98,7 @@
 <td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d4"></a>
@@ -118,7 +118,7 @@
 <td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">4.9 Ô</h2>
 <hr>
 <a name="g_t_00d5"></a>
@@ -143,6 +143,26 @@
 <p>This marks the <a name="x_002dspot"></a>spot.
 A second one with accented char <a name="g_t_00e9_002do"></a>.
 </p><hr>
+<a name="g_t_00d8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a 
href="nodetest_latin1_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="O-2"></a>
+<h2 class="section">7.10 &Oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/OE.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/OE.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/OE.html     24 Aug 
2009 10:26:39 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/OE.html     6 Sep 
2009 21:46:03 -0000       1.7
@@ -61,26 +61,6 @@
 <a name="OE"></a>
 <h2 class="section">7.6 &OElig;</h2>
 <hr>
-<a name="g_t_00d8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a 
href="nodetest_latin1_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<a name="OE-1"></a>
-<h2 class="section">7.10 &Oslash;</h2>
-<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>.

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/a.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/a.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/a.html      24 Aug 
2009 10:26:39 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/a.html      6 Sep 
2009 21:46:03 -0000       1.7
@@ -146,7 +146,7 @@
 <a name="a_030b"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
 <td valign="middle" align="left">[<a href="#g_t_0103" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/l.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/l.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/l.html      24 Aug 
2009 10:26:40 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/l.html      6 Sep 
2009 21:46:04 -0000       1.7
@@ -46,7 +46,7 @@
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="OE.html#g_t_0152" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2   
6 Sep 2009 12:52:48 -0000       1.4
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2   
6 Sep 2009 21:46:04 -0000       1.5
@@ -1,2 +1,3 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: 
test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1_toc.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- 
test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1_toc.html
    24 Aug 2009 10:26:40 -0000      1.6
+++ 
test/encodings/res/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1_toc.html
    6 Sep 2009 21:46:04 -0000       1.7
@@ -58,7 +58,7 @@
     <li><a name="toc-a-9" href="a.html#g_t_00e4">1.1 ä</a></li>
     <li><a name="toc-e-3" href="e.html#g_t_00eb">1.2 ë</a></li>
     <li><a name="toc-i-5" href="i.html#g_t_00ef">1.3 ï</a></li>
-    <li><a name="toc-o-4" href="o.html#g_t_00f6">1.4 ö</a></li>
+    <li><a name="toc-o-5" href="o.html#g_t_00f6">1.4 ö</a></li>
     <li><a name="toc-u-2" href="u.html#g_t_00fc">1.5 ü</a></li>
     <li><a name="toc-y" href="y.html#g_t_00ff">1.6 ÿ</a></li>
     <li><a name="toc-A-4" href="A.html#g_t_00c4">1.7 Ä</a></li>
@@ -79,7 +79,7 @@
     <li><a name="toc-A" href="A.html#g_t_00c1">2.7 &Aacute;</a></li>
     <li><a name="toc-E" href="E.html#g_t_00c9">2.8 &Eacute;</a></li>
     <li><a name="toc-I-2" href="I.html#g_t_00cd">2.9 &Iacute;</a></li>
-    <li><a name="toc-O-3" href="O.html#g_t_00d3">2.10 &Oacute;</a></li>
+    <li><a name="toc-O-4" href="O.html#g_t_00d3">2.10 &Oacute;</a></li>
     <li><a name="toc-U-3" href="U.html#g_t_00da">2.11 &Uacute;</a></li>
     <li><a name="toc-Y" href="Y.html#g_t_00dd">2.12 &Yacute;</a></li>
   </ul></li>
@@ -95,7 +95,7 @@
     <li><a name="toc-A-2" href="A.html#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-1" href="E.html#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I-3" href="I.html#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-4" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-5" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-1" href="U.html#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" 
href="circumflex-accent.html#circumflex-accent">4 circumflex accent</a>
@@ -108,7 +108,7 @@
     <li><a name="toc-A-3" href="A.html#g_t_00c2">4.6 Â</a></li>
     <li><a name="toc-E-3" href="E.html#g_t_00ca">4.7 Ê</a></li>
     <li><a name="toc-I-1" href="I.html#g_t_00ce">4.8 Î</a></li>
-    <li><a name="toc-O-2" href="O.html#g_t_00d4">4.9 Ô</a></li>
+    <li><a name="toc-O-3" href="O.html#g_t_00d4">4.9 Ô</a></li>
     <li><a name="toc-U" href="U.html#g_t_00db">4.10 Û</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="tilde-accent.html#tilde-accent">5 
tilde accent</a>
@@ -133,9 +133,9 @@
     <li><a name="toc-AE" href="AE.html#g_t_00c6">7.5 &AElig;</a></li>
     <li><a name="toc-OE" href="OE.html#g_t_0152">7.6 &OElig;</a></li>
     <li><a name="toc-l" href="l.html#g_t_0142">7.7 &#322;</a></li>
-    <li><a name="toc-oe-1" href="oe.html#g_t_00f8">7.8 &oslash;</a></li>
+    <li><a name="toc-o-4" href="o.html#g_t_00f8">7.8 &oslash;</a></li>
     <li><a name="toc-L" href="L.html#g_t_0141">7.9 &#321;</a></li>
-    <li><a name="toc-OE-1" href="OE.html#g_t_00d8">7.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="O.html#g_t_00d8">7.10 &Oslash;</a></li>
     <li><a name="toc-a" href="a.html#a_030b">7.11 a''</a></li>
     <li><a name="toc-a-1" href="a.html#g_t_0103">7.12 &#259;</a></li>
     <li><a name="toc-a-8" href="a.html#g_t_01ce">7.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/o.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/o.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/o.html      24 Aug 
2009 10:26:40 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/o.html      6 Sep 
2009 21:46:04 -0000       1.7
@@ -58,7 +58,7 @@
 <td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">1.4 ö</h2>
 <p>Ref to an anchor at the end of the doc 
 (see <a href="O.html#g_t_00e9_002do">there is an o-é could there be an 
&icirc;</a>).
@@ -143,6 +143,26 @@
 <a name="o-3"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
+<a name="g_t_00f8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a 
href="nodetest_latin1_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="o-4"></a>
+<h2 class="section">7.8 &oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/oe.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/oe.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/oe.html     24 Aug 
2009 10:26:40 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/oe.html     6 Sep 
2009 21:46:04 -0000       1.7
@@ -61,26 +61,6 @@
 <a name="oe"></a>
 <h2 class="section">7.3 &oelig;</h2>
 <hr>
-<a name="g_t_00f8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a 
href="nodetest_latin1_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_latin1_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<a name="oe-1"></a>
-<h2 class="section">7.8 &oslash;</h2>
-<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>.

Index: test/encodings/res/nodetest_latin1_use_nodes_no_unicode/rest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_latin1_use_nodes_no_unicode/rest.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/encodings/res/nodetest_latin1_use_nodes_no_unicode/rest.html   24 Aug 
2009 10:26:40 -0000      1.6
+++ test/encodings/res/nodetest_latin1_use_nodes_no_unicode/rest.html   6 Sep 
2009 21:46:04 -0000       1.7
@@ -68,9 +68,9 @@
 <tr><td align="left" valign="top"><a href="AE.html#g_t_00c6">7.5 
&AElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="OE.html#g_t_0152">7.6 
&OElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="l.html#g_t_0142">7.7 
&#322;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="oe.html#g_t_00f8">7.8 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="o.html#g_t_00f8">7.8 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="L.html#g_t_0141">7.9 
&#321;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="OE.html#g_t_00d8">7.10 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="O.html#g_t_00d8">7.10 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#a_030b">7.11 
a''</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_0103">7.12 
&#259;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_01ce">7.13 
a&lt;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>

Index: test/encodings/res/nodetest_no_unicode/nodetest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_no_unicode/nodetest.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/encodings/res/nodetest_no_unicode/nodetest.html        30 Aug 2009 
18:59:50 -0000      1.11
+++ test/encodings/res/nodetest_no_unicode/nodetest.html        6 Sep 2009 
21:46:04 -0000       1.12
@@ -351,7 +351,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-5"></a>
+<a name="O-6"></a>
 <h2 class="section">1.12 &Ouml;</h2>
 <hr>
 <a name="g_t_00dc"></a>
@@ -501,7 +501,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-1"></a>
+<a name="o-2"></a>
 <h2 class="section">2.4 &oacute;</h2>
 <hr>
 <a name="g_t_00fa"></a>
@@ -804,7 +804,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-2"></a>
+<a name="o-3"></a>
 <h2 class="section">3.6 &ograve;</h2>
 <hr>
 <a name="g_t_00f9"></a>
@@ -899,7 +899,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d9"></a>
@@ -1067,7 +1067,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-3"></a>
+<a name="o-4"></a>
 <h2 class="section">4.6 &ocirc;</h2>
 <hr>
 <a name="g_t_00fb"></a>
@@ -1162,7 +1162,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">4.11 &Ocirc;</h2>
 <hr>
 <a name="g_t_00db"></a>
@@ -1264,7 +1264,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-5"></a>
+<a name="o-6"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
 <a name="g_t_00c3"></a>
@@ -1411,7 +1411,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">6.4 &#491;</h2>
 <hr>
 <a name="g_t_0173"></a>
@@ -1506,7 +1506,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">6.9 &#490;</h2>
 <hr>
 <a name="g_t_0172"></a>
@@ -1714,7 +1714,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe-1"></a>
+<a name="oe"></a>
 <h2 class="section">8.3 &oelig;</h2>
 <hr>
 <a name="g_t_00c5"></a>
@@ -1771,7 +1771,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE-1"></a>
+<a name="OE"></a>
 <h2 class="section">8.6 &OElig;</h2>
 <hr>
 <a name="g_t_0142"></a>
@@ -1809,7 +1809,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe"></a>
+<a name="o-1"></a>
 <h2 class="section">8.8 &oslash;</h2>
 <hr>
 <a name="g_t_0141"></a>
@@ -1847,7 +1847,7 @@
 <td valign="middle" align="left">[Index]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE"></a>
+<a name="O-2"></a>
 <h2 class="section">8.10 &Oslash;</h2>
 <hr>
 <a name="a_030b"></a>
@@ -2112,7 +2112,7 @@
     <li><a name="toc-A" href="#g_t_00c4">1.9 &Auml;</a></li>
     <li><a name="toc-E" href="#g_t_00cb">1.10 &Euml;</a></li>
     <li><a name="toc-I-1" href="#g_t_00cf">1.11 &Iuml;</a></li>
-    <li><a name="toc-O-5" href="#g_t_00d6">1.12 &Ouml;</a></li>
+    <li><a name="toc-O-6" href="#g_t_00d6">1.12 &Ouml;</a></li>
     <li><a name="toc-U-4" href="#g_t_00dc">1.13 &Uuml;</a></li>
     <li><a name="toc-ss" href="#g_t_00df">1.14 &szlig;</a></li>
   </ul></li>
@@ -2121,7 +2121,7 @@
     <li><a name="toc-a-8" href="#g_t_00e1">2.1 &aacute;</a></li>
     <li><a name="toc-e-1" href="#g_t_00e9">2.2 &eacute;</a></li>
     <li><a name="toc-i-5" href="#g_t_00ed">2.3 &iacute;</a></li>
-    <li><a name="toc-o-1" href="#g_t_00f3">2.4 &oacute;</a></li>
+    <li><a name="toc-o-2" href="#g_t_00f3">2.4 &oacute;</a></li>
     <li><a name="toc-u" href="#g_t_00fa">2.5 &uacute;</a></li>
     <li><a name="toc-y" href="#g_t_00fd">2.6 &yacute;</a></li>
     <li><a name="toc-A-4" href="#g_t_00c1">2.7 &Aacute;</a></li>
@@ -2138,12 +2138,12 @@
     <li><a name="toc-i-1" href="#g_t_00ec">3.3 &igrave;</a></li>
     <li><a name="toc-i" href="#with-brace-_00ec">3.4 &igrave;</a></li>
     <li><a name="toc-i-9" href="#with-dotless-_00ec">3.5 &igrave;</a></li>
-    <li><a name="toc-o-2" href="#g_t_00f2">3.6 &ograve;</a></li>
+    <li><a name="toc-o-3" href="#g_t_00f2">3.6 &ograve;</a></li>
     <li><a name="toc-u-3" href="#g_t_00f9">3.7 &ugrave;</a></li>
     <li><a name="toc-A-5" href="#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-4" href="#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I" href="#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-3" href="#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-4" href="#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-2" href="#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" href="#circumflex-accent">4 circumflex 
accent</a>
@@ -2153,19 +2153,19 @@
     <li><a name="toc-i-4" href="#g_t_00ee">4.3 &icirc;</a></li>
     <li><a name="toc-i-6" href="#with-brace-_00ee">4.4 &icirc;</a></li>
     <li><a name="toc-i-7" href="#with-dotless-_00ee">4.5 &icirc;</a></li>
-    <li><a name="toc-o-3" href="#g_t_00f4">4.6 &ocirc;</a></li>
+    <li><a name="toc-o-4" href="#g_t_00f4">4.6 &ocirc;</a></li>
     <li><a name="toc-u-2" href="#g_t_00fb">4.7 &ucirc;</a></li>
     <li><a name="toc-A-1" href="#g_t_00c2">4.8 &Acirc;</a></li>
     <li><a name="toc-E-3" href="#g_t_00ca">4.9 &Ecirc;</a></li>
     <li><a name="toc-I-2" href="#g_t_00ce">4.10 &Icirc;</a></li>
-    <li><a name="toc-O-4" href="#g_t_00d4">4.11 &Ocirc;</a></li>
+    <li><a name="toc-O-5" href="#g_t_00d4">4.11 &Ocirc;</a></li>
     <li><a name="toc-U-3" href="#g_t_00db">4.12 &Ucirc;</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="#tilde-accent">5 tilde accent</a>
   <ul class="toc">
     <li><a name="toc-a-5" href="#g_t_00e3">5.1 &atilde;</a></li>
     <li><a name="toc-n" href="#g_t_00f1">5.2 &ntilde;</a></li>
-    <li><a name="toc-o-5" href="#g_t_00f5">5.3 &otilde;</a></li>
+    <li><a name="toc-o-6" href="#g_t_00f5">5.3 &otilde;</a></li>
     <li><a name="toc-A-3" href="#g_t_00c3">5.4 &Atilde;</a></li>
     <li><a name="toc-O-1" href="#g_t_00d5">5.5 &Otilde;</a></li>
   </ul></li>
@@ -2174,12 +2174,12 @@
     <li><a name="toc-a-6" href="#g_t_0105">6.1 &#261;</a></li>
     <li><a name="toc-e" href="#g_t_0119">6.2 &#281;</a></li>
     <li><a name="toc-i-3" href="#g_t_012f">6.3 &#303;</a></li>
-    <li><a name="toc-o-4" href="#g_t_01eb">6.4 &#491;</a></li>
+    <li><a name="toc-o-5" href="#g_t_01eb">6.4 &#491;</a></li>
     <li><a name="toc-u-1" href="#g_t_0173">6.5 &#371;</a></li>
     <li><a name="toc-A-2" href="#g_t_0104">6.6 &#260;</a></li>
     <li><a name="toc-E-1" href="#g_t_0118">6.7 &#280;</a></li>
     <li><a name="toc-I-4" href="#g_t_012e">6.8 &#302;</a></li>
-    <li><a name="toc-O-2" href="#g_t_01ea">6.9 &#490;</a></li>
+    <li><a name="toc-O-3" href="#g_t_01ea">6.9 &#490;</a></li>
     <li><a name="toc-U" href="#g_t_0172">6.10 &#370;</a></li>
   </ul></li>
   <li><a name="toc-cedilla-accent-1" href="#cedilla-accent">7 cedilla 
accent</a>
@@ -2192,14 +2192,14 @@
   <ul class="toc">
     <li><a name="toc-aa-1" href="#g_t_00e5">8.1 &aring;</a></li>
     <li><a name="toc-ae" href="#g_t_00e6">8.2 &aelig;</a></li>
-    <li><a name="toc-oe-1" href="#g_t_0153">8.3 &oelig;</a></li>
+    <li><a name="toc-oe" href="#g_t_0153">8.3 &oelig;</a></li>
     <li><a name="toc-AA" href="#g_t_00c5">8.4 &Aring;</a></li>
     <li><a name="toc-AE" href="#g_t_00c6">8.5 &AElig;</a></li>
-    <li><a name="toc-OE-1" href="#g_t_0152">8.6 &OElig;</a></li>
+    <li><a name="toc-OE" href="#g_t_0152">8.6 &OElig;</a></li>
     <li><a name="toc-l" href="#g_t_0142">8.7 &#322;</a></li>
-    <li><a name="toc-oe" href="#g_t_00f8">8.8 &oslash;</a></li>
+    <li><a name="toc-o-1" href="#g_t_00f8">8.8 &oslash;</a></li>
     <li><a name="toc-L" href="#g_t_0141">8.9 &#321;</a></li>
-    <li><a name="toc-OE" href="#g_t_00d8">8.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="#g_t_00d8">8.10 &Oslash;</a></li>
     <li><a name="toc-a-3" href="#a_030b">8.11 a''</a></li>
     <li><a name="toc-a-9" href="#g_t_0103">8.12 &#259;</a></li>
     <li><a name="toc-a-1" href="#g_t_01ce">8.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.2        6 Sep 
2009 12:52:48 -0000       1.4
+++ test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.2        6 Sep 
2009 21:46:04 -0000       1.5
@@ -1,2 +1,3 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.html     24 Aug 
2009 10:26:40 -0000      1.10
+++ test/encodings/res/nodetest_to_utf8_latin1/nodetest_latin1.html     6 Sep 
2009 21:46:04 -0000       1.11
@@ -184,7 +184,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">1.4 ö</h2>
 <p>Ref to an anchor at the end of the doc 
 (see <a href="#g_t_00e9_002do">there is an o-é could there be an î</a>).
@@ -572,7 +572,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">2.10 Ó</h2>
 <hr>
 <a name="g_t_00da"></a>
@@ -856,7 +856,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">3.11 Ò</h2>
 <hr>
 <a name="g_t_00d9"></a>
@@ -1077,7 +1077,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">4.9 Ô</h2>
 <hr>
 <a name="g_t_00db"></a>
@@ -1482,7 +1482,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe-1"></a>
+<a name="o-4"></a>
 <h2 class="section">7.8 ø</h2>
 <hr>
 <a name="g_t_0141"></a>
@@ -1520,7 +1520,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE-1"></a>
+<a name="O-2"></a>
 <h2 class="section">7.10 Ø</h2>
 <hr>
 <a name="a_030b"></a>
@@ -1797,7 +1797,7 @@
     <li><a name="toc-a-9" href="#g_t_00e4">1.1 ä</a></li>
     <li><a name="toc-e-3" href="#g_t_00eb">1.2 ë</a></li>
     <li><a name="toc-i-5" href="#g_t_00ef">1.3 ï</a></li>
-    <li><a name="toc-o-4" href="#g_t_00f6">1.4 ö</a></li>
+    <li><a name="toc-o-5" href="#g_t_00f6">1.4 ö</a></li>
     <li><a name="toc-u-2" href="#g_t_00fc">1.5 ü</a></li>
     <li><a name="toc-y" href="#g_t_00ff">1.6 ÿ</a></li>
     <li><a name="toc-A-4" href="#g_t_00c4">1.7 Ä</a></li>
@@ -1818,7 +1818,7 @@
     <li><a name="toc-A" href="#g_t_00c1">2.7 Á</a></li>
     <li><a name="toc-E" href="#g_t_00c9">2.8 É</a></li>
     <li><a name="toc-I-2" href="#g_t_00cd">2.9 Í</a></li>
-    <li><a name="toc-O-3" href="#g_t_00d3">2.10 Ó</a></li>
+    <li><a name="toc-O-4" href="#g_t_00d3">2.10 Ó</a></li>
     <li><a name="toc-U-3" href="#g_t_00da">2.11 Ú</a></li>
     <li><a name="toc-Y" href="#g_t_00dd">2.12 Ý</a></li>
   </ul></li>
@@ -1834,7 +1834,7 @@
     <li><a name="toc-A-2" href="#g_t_00c0">3.8 À</a></li>
     <li><a name="toc-E-1" href="#g_t_00c8">3.9 È</a></li>
     <li><a name="toc-I-3" href="#g_t_00cc">3.10 Ì</a></li>
-    <li><a name="toc-O-4" href="#g_t_00d2">3.11 Ò</a></li>
+    <li><a name="toc-O-5" href="#g_t_00d2">3.11 Ò</a></li>
     <li><a name="toc-U-1" href="#g_t_00d9">3.12 Ù</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" href="#circumflex-accent">4 circumflex 
accent</a>
@@ -1847,7 +1847,7 @@
     <li><a name="toc-A-3" href="#g_t_00c2">4.6 Â</a></li>
     <li><a name="toc-E-3" href="#g_t_00ca">4.7 Ê</a></li>
     <li><a name="toc-I-1" href="#g_t_00ce">4.8 Î</a></li>
-    <li><a name="toc-O-2" href="#g_t_00d4">4.9 Ô</a></li>
+    <li><a name="toc-O-3" href="#g_t_00d4">4.9 Ô</a></li>
     <li><a name="toc-U" href="#g_t_00db">4.10 Û</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="#tilde-accent">5 tilde accent</a>
@@ -1872,9 +1872,9 @@
     <li><a name="toc-AE" href="#g_t_00c6">7.5 Æ</a></li>
     <li><a name="toc-OE" href="#g_t_0152">7.6 Œ</a></li>
     <li><a name="toc-l" href="#g_t_0142">7.7 ł</a></li>
-    <li><a name="toc-oe-1" href="#g_t_00f8">7.8 ø</a></li>
+    <li><a name="toc-o-4" href="#g_t_00f8">7.8 ø</a></li>
     <li><a name="toc-L" href="#g_t_0141">7.9 Ł</a></li>
-    <li><a name="toc-OE-1" href="#g_t_00d8">7.10 Ø</a></li>
+    <li><a name="toc-O-2" href="#g_t_00d8">7.10 Ø</a></li>
     <li><a name="toc-a" href="#a_030b">7.11 a̋</a></li>
     <li><a name="toc-a-1" href="#g_t_0103">7.12 ă</a></li>
     <li><a name="toc-a-8" href="#g_t_01ce">7.13 ǎ</a></li>

Index: test/encodings/res/nodetest_use_nodes/L.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/L.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/L.html        30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_use_nodes/L.html        6 Sep 2009 21:46:04 
-0000       1.11
@@ -44,9 +44,9 @@
 <a name="g_t_0141"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_use_nodes/O.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/O.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/O.html        30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_use_nodes/O.html        6 Sep 2009 21:46:04 
-0000       1.11
@@ -58,7 +58,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-5"></a>
+<a name="O-6"></a>
 <h2 class="section">1.12 &Ouml;</h2>
 <hr>
 <a name="g_t_00d3"></a>
@@ -98,7 +98,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d4"></a>
@@ -118,7 +118,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">4.11 &Ocirc;</h2>
 <hr>
 <a name="g_t_00d5"></a>
@@ -160,9 +160,29 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">6.9 &#490;</h2>
 <hr>
+<a name="g_t_00d8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="O-2"></a>
+<h2 class="section">8.10 &Oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_use_nodes/OE.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/OE.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/OE.html       30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_use_nodes/OE.html       6 Sep 2009 21:46:04 
-0000       1.11
@@ -58,28 +58,8 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="OE-1"></a>
-<h2 class="section">8.6 &OElig;</h2>
-<hr>
-<a name="g_t_00d8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[Index]</td>
-<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
 <a name="OE"></a>
-<h2 class="section">8.10 &Oslash;</h2>
+<h2 class="section">8.6 &OElig;</h2>
 <hr>
 <p>
  <font size="-1">

Index: test/encodings/res/nodetest_use_nodes/a.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/a.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/a.html        30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_use_nodes/a.html        6 Sep 2009 21:46:04 
-0000       1.11
@@ -166,7 +166,7 @@
 <a name="a_030b"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
 <td valign="middle" align="left">[<a href="#g_t_0103" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>

Index: test/encodings/res/nodetest_use_nodes/l.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/l.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/l.html        30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_use_nodes/l.html        6 Sep 2009 21:46:05 
-0000       1.11
@@ -46,7 +46,7 @@
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="OE.html#g_t_0152" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_use_nodes/nodetest_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/nodetest_toc.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/nodetest_toc.html     30 Aug 2009 
18:59:50 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes/nodetest_toc.html     6 Sep 2009 
21:46:05 -0000       1.11
@@ -66,7 +66,7 @@
     <li><a name="toc-A" href="A.html#g_t_00c4">1.9 &Auml;</a></li>
     <li><a name="toc-E" href="E.html#g_t_00cb">1.10 &Euml;</a></li>
     <li><a name="toc-I-1" href="I.html#g_t_00cf">1.11 &Iuml;</a></li>
-    <li><a name="toc-O-5" href="O.html#g_t_00d6">1.12 &Ouml;</a></li>
+    <li><a name="toc-O-6" href="O.html#g_t_00d6">1.12 &Ouml;</a></li>
     <li><a name="toc-U-4" href="U.html#g_t_00dc">1.13 &Uuml;</a></li>
     <li><a name="toc-ss" href="ss.html#g_t_00df">1.14 &szlig;</a></li>
   </ul></li>
@@ -75,7 +75,7 @@
     <li><a name="toc-a-8" href="a.html#g_t_00e1">2.1 &aacute;</a></li>
     <li><a name="toc-e-1" href="e.html#g_t_00e9">2.2 &eacute;</a></li>
     <li><a name="toc-i-5" href="i.html#g_t_00ed">2.3 &iacute;</a></li>
-    <li><a name="toc-o-1" href="o.html#g_t_00f3">2.4 &oacute;</a></li>
+    <li><a name="toc-o-2" href="o.html#g_t_00f3">2.4 &oacute;</a></li>
     <li><a name="toc-u" href="u.html#g_t_00fa">2.5 &uacute;</a></li>
     <li><a name="toc-y" href="y.html#g_t_00fd">2.6 &yacute;</a></li>
     <li><a name="toc-A-4" href="A.html#g_t_00c1">2.7 &Aacute;</a></li>
@@ -92,12 +92,12 @@
     <li><a name="toc-i-1" href="i.html#g_t_00ec">3.3 &igrave;</a></li>
     <li><a name="toc-i" href="with-brace-i.html#with-brace-_00ec">3.4 
&igrave;</a></li>
     <li><a name="toc-i-9" href="with-dotless-i.html#with-dotless-_00ec">3.5 
&igrave;</a></li>
-    <li><a name="toc-o-2" href="o.html#g_t_00f2">3.6 &ograve;</a></li>
+    <li><a name="toc-o-3" href="o.html#g_t_00f2">3.6 &ograve;</a></li>
     <li><a name="toc-u-3" href="u.html#g_t_00f9">3.7 &ugrave;</a></li>
     <li><a name="toc-A-5" href="A.html#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-4" href="E.html#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I" href="I.html#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-3" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-4" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-2" href="U.html#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" 
href="circumflex-accent.html#circumflex-accent">4 circumflex accent</a>
@@ -107,19 +107,19 @@
     <li><a name="toc-i-4" href="i.html#g_t_00ee">4.3 &icirc;</a></li>
     <li><a name="toc-i-6" href="with-brace-i.html#with-brace-_00ee">4.4 
&icirc;</a></li>
     <li><a name="toc-i-7" href="with-dotless-i.html#with-dotless-_00ee">4.5 
&icirc;</a></li>
-    <li><a name="toc-o-3" href="o.html#g_t_00f4">4.6 &ocirc;</a></li>
+    <li><a name="toc-o-4" href="o.html#g_t_00f4">4.6 &ocirc;</a></li>
     <li><a name="toc-u-2" href="u.html#g_t_00fb">4.7 &ucirc;</a></li>
     <li><a name="toc-A-1" href="A.html#g_t_00c2">4.8 &Acirc;</a></li>
     <li><a name="toc-E-3" href="E.html#g_t_00ca">4.9 &Ecirc;</a></li>
     <li><a name="toc-I-2" href="I.html#g_t_00ce">4.10 &Icirc;</a></li>
-    <li><a name="toc-O-4" href="O.html#g_t_00d4">4.11 &Ocirc;</a></li>
+    <li><a name="toc-O-5" href="O.html#g_t_00d4">4.11 &Ocirc;</a></li>
     <li><a name="toc-U-3" href="U.html#g_t_00db">4.12 &Ucirc;</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="tilde-accent.html#tilde-accent">5 
tilde accent</a>
   <ul class="toc">
     <li><a name="toc-a-5" href="a.html#g_t_00e3">5.1 &atilde;</a></li>
     <li><a name="toc-n" href="n.html#g_t_00f1">5.2 &ntilde;</a></li>
-    <li><a name="toc-o-5" href="o.html#g_t_00f5">5.3 &otilde;</a></li>
+    <li><a name="toc-o-6" href="o.html#g_t_00f5">5.3 &otilde;</a></li>
     <li><a name="toc-A-3" href="A.html#g_t_00c3">5.4 &Atilde;</a></li>
     <li><a name="toc-O-1" href="O.html#g_t_00d5">5.5 &Otilde;</a></li>
   </ul></li>
@@ -128,12 +128,12 @@
     <li><a name="toc-a-6" href="a.html#g_t_0105">6.1 &#261;</a></li>
     <li><a name="toc-e" href="e.html#g_t_0119">6.2 &#281;</a></li>
     <li><a name="toc-i-3" href="i.html#g_t_012f">6.3 &#303;</a></li>
-    <li><a name="toc-o-4" href="o.html#g_t_01eb">6.4 &#491;</a></li>
+    <li><a name="toc-o-5" href="o.html#g_t_01eb">6.4 &#491;</a></li>
     <li><a name="toc-u-1" href="u.html#g_t_0173">6.5 &#371;</a></li>
     <li><a name="toc-A-2" href="A.html#g_t_0104">6.6 &#260;</a></li>
     <li><a name="toc-E-1" href="E.html#g_t_0118">6.7 &#280;</a></li>
     <li><a name="toc-I-4" href="I.html#g_t_012e">6.8 &#302;</a></li>
-    <li><a name="toc-O-2" href="O.html#g_t_01ea">6.9 &#490;</a></li>
+    <li><a name="toc-O-3" href="O.html#g_t_01ea">6.9 &#490;</a></li>
     <li><a name="toc-U" href="U.html#g_t_0172">6.10 &#370;</a></li>
   </ul></li>
   <li><a name="toc-cedilla-accent-1" 
href="cedilla-accent.html#cedilla-accent">7 cedilla accent</a>
@@ -146,14 +146,14 @@
   <ul class="toc">
     <li><a name="toc-aa-1" href="aa.html#g_t_00e5">8.1 &aring;</a></li>
     <li><a name="toc-ae" href="ae.html#g_t_00e6">8.2 &aelig;</a></li>
-    <li><a name="toc-oe-1" href="oe.html#g_t_0153">8.3 &oelig;</a></li>
+    <li><a name="toc-oe" href="oe.html#g_t_0153">8.3 &oelig;</a></li>
     <li><a name="toc-AA" href="AA.html#g_t_00c5">8.4 &Aring;</a></li>
     <li><a name="toc-AE" href="AE.html#g_t_00c6">8.5 &AElig;</a></li>
-    <li><a name="toc-OE-1" href="OE.html#g_t_0152">8.6 &OElig;</a></li>
+    <li><a name="toc-OE" href="OE.html#g_t_0152">8.6 &OElig;</a></li>
     <li><a name="toc-l" href="l.html#g_t_0142">8.7 &#322;</a></li>
-    <li><a name="toc-oe" href="oe.html#g_t_00f8">8.8 &oslash;</a></li>
+    <li><a name="toc-o-1" href="o.html#g_t_00f8">8.8 &oslash;</a></li>
     <li><a name="toc-L" href="L.html#g_t_0141">8.9 &#321;</a></li>
-    <li><a name="toc-OE" href="OE.html#g_t_00d8">8.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="O.html#g_t_00d8">8.10 &Oslash;</a></li>
     <li><a name="toc-a-3" href="a.html#a_030b">8.11 a''</a></li>
     <li><a name="toc-a-9" href="a.html#g_t_0103">8.12 &#259;</a></li>
     <li><a name="toc-a-1" href="a.html#g_t_01ce">8.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_use_nodes/o.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/o.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/o.html        30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_use_nodes/o.html        6 Sep 2009 21:46:05 
-0000       1.11
@@ -80,7 +80,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-1"></a>
+<a name="o-2"></a>
 <h2 class="section">2.4 &oacute;</h2>
 <hr>
 <a name="g_t_00f2"></a>
@@ -100,7 +100,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-2"></a>
+<a name="o-3"></a>
 <h2 class="section">3.6 &ograve;</h2>
 <hr>
 <a name="g_t_00f4"></a>
@@ -120,7 +120,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-3"></a>
+<a name="o-4"></a>
 <h2 class="section">4.6 &ocirc;</h2>
 <hr>
 <a name="g_t_00f5"></a>
@@ -140,7 +140,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-5"></a>
+<a name="o-6"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
 <a name="g_t_01eb"></a>
@@ -160,9 +160,29 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">6.4 &#491;</h2>
 <hr>
+<a name="g_t_00f8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="o-1"></a>
+<h2 class="section">8.8 &oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_use_nodes/oe.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/oe.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/oe.html       30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_use_nodes/oe.html       6 Sep 2009 21:46:05 
-0000       1.11
@@ -58,28 +58,8 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="oe-1"></a>
-<h2 class="section">8.3 &oelig;</h2>
-<hr>
-<a name="g_t_00f8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[Index]</td>
-<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
 <a name="oe"></a>
-<h2 class="section">8.8 &oslash;</h2>
+<h2 class="section">8.3 &oelig;</h2>
 <hr>
 <p>
  <font size="-1">

Index: test/encodings/res/nodetest_use_nodes/rest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes/rest.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes/rest.html     30 Aug 2009 18:59:50 
-0000      1.10
+++ test/encodings/res/nodetest_use_nodes/rest.html     6 Sep 2009 21:46:05 
-0000       1.11
@@ -68,9 +68,9 @@
 <tr><td align="left" valign="top"><a href="AE.html#g_t_00c6">&bull; 
&AElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="OE.html#g_t_0152">&bull; 
&OElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="l.html#g_t_0142">&bull; 
&#322;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="oe.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="o.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="L.html#g_t_0141">&bull; 
&#321;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="OE.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="O.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#a_030b">&bull; 
a''</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_0103">&bull; 
&#259;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_01ce">&bull; 
a&lt;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>

Index: test/encodings/res/nodetest_use_nodes_no_unicode/L.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/L.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/L.html     30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/L.html     6 Sep 2009 
21:46:05 -0000       1.11
@@ -44,9 +44,9 @@
 <a name="g_t_0141"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_use_nodes_no_unicode/O.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/O.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/O.html     30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/O.html     6 Sep 2009 
21:46:05 -0000       1.11
@@ -58,7 +58,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-5"></a>
+<a name="O-6"></a>
 <h2 class="section">1.12 &Ouml;</h2>
 <hr>
 <a name="g_t_00d3"></a>
@@ -98,7 +98,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d4"></a>
@@ -118,7 +118,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">4.11 &Ocirc;</h2>
 <hr>
 <a name="g_t_00d5"></a>
@@ -160,9 +160,29 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">6.9 &#490;</h2>
 <hr>
+<a name="g_t_00d8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="O-2"></a>
+<h2 class="section">8.10 &Oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_use_nodes_no_unicode/OE.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/OE.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/OE.html    30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/OE.html    6 Sep 2009 
21:46:05 -0000       1.11
@@ -58,28 +58,8 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="OE-1"></a>
-<h2 class="section">8.6 &OElig;</h2>
-<hr>
-<a name="g_t_00d8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[Index]</td>
-<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
 <a name="OE"></a>
-<h2 class="section">8.10 &Oslash;</h2>
+<h2 class="section">8.6 &OElig;</h2>
 <hr>
 <p>
  <font size="-1">

Index: test/encodings/res/nodetest_use_nodes_no_unicode/a.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/a.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/a.html     30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/a.html     6 Sep 2009 
21:46:05 -0000       1.11
@@ -166,7 +166,7 @@
 <a name="a_030b"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
 <td valign="middle" align="left">[<a href="#g_t_0103" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>

Index: test/encodings/res/nodetest_use_nodes_no_unicode/l.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/l.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/l.html     30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/l.html     6 Sep 2009 
21:46:05 -0000       1.11
@@ -46,7 +46,7 @@
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="OE.html#g_t_0152" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_use_nodes_no_unicode/nodetest_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/nodetest_toc.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/nodetest_toc.html  30 Aug 
2009 18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/nodetest_toc.html  6 Sep 
2009 21:46:05 -0000       1.11
@@ -66,7 +66,7 @@
     <li><a name="toc-A" href="A.html#g_t_00c4">1.9 &Auml;</a></li>
     <li><a name="toc-E" href="E.html#g_t_00cb">1.10 &Euml;</a></li>
     <li><a name="toc-I-1" href="I.html#g_t_00cf">1.11 &Iuml;</a></li>
-    <li><a name="toc-O-5" href="O.html#g_t_00d6">1.12 &Ouml;</a></li>
+    <li><a name="toc-O-6" href="O.html#g_t_00d6">1.12 &Ouml;</a></li>
     <li><a name="toc-U-4" href="U.html#g_t_00dc">1.13 &Uuml;</a></li>
     <li><a name="toc-ss" href="ss.html#g_t_00df">1.14 &szlig;</a></li>
   </ul></li>
@@ -75,7 +75,7 @@
     <li><a name="toc-a-8" href="a.html#g_t_00e1">2.1 &aacute;</a></li>
     <li><a name="toc-e-1" href="e.html#g_t_00e9">2.2 &eacute;</a></li>
     <li><a name="toc-i-5" href="i.html#g_t_00ed">2.3 &iacute;</a></li>
-    <li><a name="toc-o-1" href="o.html#g_t_00f3">2.4 &oacute;</a></li>
+    <li><a name="toc-o-2" href="o.html#g_t_00f3">2.4 &oacute;</a></li>
     <li><a name="toc-u" href="u.html#g_t_00fa">2.5 &uacute;</a></li>
     <li><a name="toc-y" href="y.html#g_t_00fd">2.6 &yacute;</a></li>
     <li><a name="toc-A-4" href="A.html#g_t_00c1">2.7 &Aacute;</a></li>
@@ -92,12 +92,12 @@
     <li><a name="toc-i-1" href="i.html#g_t_00ec">3.3 &igrave;</a></li>
     <li><a name="toc-i" href="with-brace-i.html#with-brace-_00ec">3.4 
&igrave;</a></li>
     <li><a name="toc-i-9" href="with-dotless-i.html#with-dotless-_00ec">3.5 
&igrave;</a></li>
-    <li><a name="toc-o-2" href="o.html#g_t_00f2">3.6 &ograve;</a></li>
+    <li><a name="toc-o-3" href="o.html#g_t_00f2">3.6 &ograve;</a></li>
     <li><a name="toc-u-3" href="u.html#g_t_00f9">3.7 &ugrave;</a></li>
     <li><a name="toc-A-5" href="A.html#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-4" href="E.html#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I" href="I.html#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-3" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-4" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-2" href="U.html#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" 
href="circumflex-accent.html#circumflex-accent">4 circumflex accent</a>
@@ -107,19 +107,19 @@
     <li><a name="toc-i-4" href="i.html#g_t_00ee">4.3 &icirc;</a></li>
     <li><a name="toc-i-6" href="with-brace-i.html#with-brace-_00ee">4.4 
&icirc;</a></li>
     <li><a name="toc-i-7" href="with-dotless-i.html#with-dotless-_00ee">4.5 
&icirc;</a></li>
-    <li><a name="toc-o-3" href="o.html#g_t_00f4">4.6 &ocirc;</a></li>
+    <li><a name="toc-o-4" href="o.html#g_t_00f4">4.6 &ocirc;</a></li>
     <li><a name="toc-u-2" href="u.html#g_t_00fb">4.7 &ucirc;</a></li>
     <li><a name="toc-A-1" href="A.html#g_t_00c2">4.8 &Acirc;</a></li>
     <li><a name="toc-E-3" href="E.html#g_t_00ca">4.9 &Ecirc;</a></li>
     <li><a name="toc-I-2" href="I.html#g_t_00ce">4.10 &Icirc;</a></li>
-    <li><a name="toc-O-4" href="O.html#g_t_00d4">4.11 &Ocirc;</a></li>
+    <li><a name="toc-O-5" href="O.html#g_t_00d4">4.11 &Ocirc;</a></li>
     <li><a name="toc-U-3" href="U.html#g_t_00db">4.12 &Ucirc;</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="tilde-accent.html#tilde-accent">5 
tilde accent</a>
   <ul class="toc">
     <li><a name="toc-a-5" href="a.html#g_t_00e3">5.1 &atilde;</a></li>
     <li><a name="toc-n" href="n.html#g_t_00f1">5.2 &ntilde;</a></li>
-    <li><a name="toc-o-5" href="o.html#g_t_00f5">5.3 &otilde;</a></li>
+    <li><a name="toc-o-6" href="o.html#g_t_00f5">5.3 &otilde;</a></li>
     <li><a name="toc-A-3" href="A.html#g_t_00c3">5.4 &Atilde;</a></li>
     <li><a name="toc-O-1" href="O.html#g_t_00d5">5.5 &Otilde;</a></li>
   </ul></li>
@@ -128,12 +128,12 @@
     <li><a name="toc-a-6" href="a.html#g_t_0105">6.1 &#261;</a></li>
     <li><a name="toc-e" href="e.html#g_t_0119">6.2 &#281;</a></li>
     <li><a name="toc-i-3" href="i.html#g_t_012f">6.3 &#303;</a></li>
-    <li><a name="toc-o-4" href="o.html#g_t_01eb">6.4 &#491;</a></li>
+    <li><a name="toc-o-5" href="o.html#g_t_01eb">6.4 &#491;</a></li>
     <li><a name="toc-u-1" href="u.html#g_t_0173">6.5 &#371;</a></li>
     <li><a name="toc-A-2" href="A.html#g_t_0104">6.6 &#260;</a></li>
     <li><a name="toc-E-1" href="E.html#g_t_0118">6.7 &#280;</a></li>
     <li><a name="toc-I-4" href="I.html#g_t_012e">6.8 &#302;</a></li>
-    <li><a name="toc-O-2" href="O.html#g_t_01ea">6.9 &#490;</a></li>
+    <li><a name="toc-O-3" href="O.html#g_t_01ea">6.9 &#490;</a></li>
     <li><a name="toc-U" href="U.html#g_t_0172">6.10 &#370;</a></li>
   </ul></li>
   <li><a name="toc-cedilla-accent-1" 
href="cedilla-accent.html#cedilla-accent">7 cedilla accent</a>
@@ -146,14 +146,14 @@
   <ul class="toc">
     <li><a name="toc-aa-1" href="aa.html#g_t_00e5">8.1 &aring;</a></li>
     <li><a name="toc-ae" href="ae.html#g_t_00e6">8.2 &aelig;</a></li>
-    <li><a name="toc-oe-1" href="oe.html#g_t_0153">8.3 &oelig;</a></li>
+    <li><a name="toc-oe" href="oe.html#g_t_0153">8.3 &oelig;</a></li>
     <li><a name="toc-AA" href="AA.html#g_t_00c5">8.4 &Aring;</a></li>
     <li><a name="toc-AE" href="AE.html#g_t_00c6">8.5 &AElig;</a></li>
-    <li><a name="toc-OE-1" href="OE.html#g_t_0152">8.6 &OElig;</a></li>
+    <li><a name="toc-OE" href="OE.html#g_t_0152">8.6 &OElig;</a></li>
     <li><a name="toc-l" href="l.html#g_t_0142">8.7 &#322;</a></li>
-    <li><a name="toc-oe" href="oe.html#g_t_00f8">8.8 &oslash;</a></li>
+    <li><a name="toc-o-1" href="o.html#g_t_00f8">8.8 &oslash;</a></li>
     <li><a name="toc-L" href="L.html#g_t_0141">8.9 &#321;</a></li>
-    <li><a name="toc-OE" href="OE.html#g_t_00d8">8.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="O.html#g_t_00d8">8.10 &Oslash;</a></li>
     <li><a name="toc-a-3" href="a.html#a_030b">8.11 a''</a></li>
     <li><a name="toc-a-9" href="a.html#g_t_0103">8.12 &#259;</a></li>
     <li><a name="toc-a-1" href="a.html#g_t_01ce">8.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_use_nodes_no_unicode/o.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/o.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/o.html     30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/o.html     6 Sep 2009 
21:46:05 -0000       1.11
@@ -80,7 +80,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-1"></a>
+<a name="o-2"></a>
 <h2 class="section">2.4 &oacute;</h2>
 <hr>
 <a name="g_t_00f2"></a>
@@ -100,7 +100,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-2"></a>
+<a name="o-3"></a>
 <h2 class="section">3.6 &ograve;</h2>
 <hr>
 <a name="g_t_00f4"></a>
@@ -120,7 +120,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-3"></a>
+<a name="o-4"></a>
 <h2 class="section">4.6 &ocirc;</h2>
 <hr>
 <a name="g_t_00f5"></a>
@@ -140,7 +140,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-5"></a>
+<a name="o-6"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
 <a name="g_t_01eb"></a>
@@ -160,9 +160,29 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">6.4 &#491;</h2>
 <hr>
+<a name="g_t_00f8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="o-1"></a>
+<h2 class="section">8.8 &oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_use_nodes_no_unicode/oe.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/oe.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/oe.html    30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/oe.html    6 Sep 2009 
21:46:05 -0000       1.11
@@ -58,28 +58,8 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="oe-1"></a>
-<h2 class="section">8.3 &oelig;</h2>
-<hr>
-<a name="g_t_00f8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[Index]</td>
-<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
 <a name="oe"></a>
-<h2 class="section">8.8 &oslash;</h2>
+<h2 class="section">8.3 &oelig;</h2>
 <hr>
 <p>
  <font size="-1">

Index: test/encodings/res/nodetest_use_nodes_no_unicode/rest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unicode/rest.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unicode/rest.html  30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unicode/rest.html  6 Sep 2009 
21:46:05 -0000       1.11
@@ -68,9 +68,9 @@
 <tr><td align="left" valign="top"><a href="AE.html#g_t_00c6">&bull; 
&AElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="OE.html#g_t_0152">&bull; 
&OElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="l.html#g_t_0142">&bull; 
&#322;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="oe.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="o.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="L.html#g_t_0141">&bull; 
&#321;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="OE.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="O.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#a_030b">&bull; 
a''</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_0103">&bull; 
&#259;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_01ce">&bull; 
a&lt;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/L.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/L.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/L.html   30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/L.html   6 Sep 2009 
21:46:05 -0000       1.11
@@ -44,9 +44,9 @@
 <a name="g_t_0141"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/O.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/O.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/O.html   30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/O.html   6 Sep 2009 
21:46:06 -0000       1.11
@@ -58,7 +58,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-5"></a>
+<a name="O-6"></a>
 <h2 class="section">1.12 &Ouml;</h2>
 <hr>
 <a name="g_t_00d3"></a>
@@ -98,7 +98,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d4"></a>
@@ -118,7 +118,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">4.11 &Ocirc;</h2>
 <hr>
 <a name="g_t_00d5"></a>
@@ -160,9 +160,29 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">6.9 &#490;</h2>
 <hr>
+<a name="g_t_00d8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="O-2"></a>
+<h2 class="section">8.10 &Oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/OE.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/OE.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/OE.html  30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/OE.html  6 Sep 2009 
21:46:06 -0000       1.11
@@ -58,28 +58,8 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="OE-1"></a>
-<h2 class="section">8.6 &OElig;</h2>
-<hr>
-<a name="g_t_00d8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[Index]</td>
-<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
 <a name="OE"></a>
-<h2 class="section">8.10 &Oslash;</h2>
+<h2 class="section">8.6 &OElig;</h2>
 <hr>
 <p>
  <font size="-1">

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/a.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/a.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/a.html   30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/a.html   6 Sep 2009 
21:46:06 -0000       1.11
@@ -166,7 +166,7 @@
 <a name="a_030b"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
 <td valign="middle" align="left">[<a href="#g_t_0103" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/l.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/l.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/l.html   30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/l.html   6 Sep 2009 
21:46:06 -0000       1.11
@@ -46,7 +46,7 @@
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="OE.html#g_t_0152" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/nodetest_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/nodetest_toc.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/nodetest_toc.html        
30 Aug 2009 18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/nodetest_toc.html        
6 Sep 2009 21:46:06 -0000       1.11
@@ -66,7 +66,7 @@
     <li><a name="toc-A" href="A.html#g_t_00c4">1.9 &Auml;</a></li>
     <li><a name="toc-E" href="E.html#g_t_00cb">1.10 &Euml;</a></li>
     <li><a name="toc-I-1" href="I.html#g_t_00cf">1.11 &Iuml;</a></li>
-    <li><a name="toc-O-5" href="O.html#g_t_00d6">1.12 &Ouml;</a></li>
+    <li><a name="toc-O-6" href="O.html#g_t_00d6">1.12 &Ouml;</a></li>
     <li><a name="toc-U-4" href="U.html#g_t_00dc">1.13 &Uuml;</a></li>
     <li><a name="toc-ss" href="ss.html#g_t_00df">1.14 &szlig;</a></li>
   </ul></li>
@@ -75,7 +75,7 @@
     <li><a name="toc-a-8" href="a.html#g_t_00e1">2.1 &aacute;</a></li>
     <li><a name="toc-e-1" href="e.html#g_t_00e9">2.2 &eacute;</a></li>
     <li><a name="toc-i-5" href="i.html#g_t_00ed">2.3 &iacute;</a></li>
-    <li><a name="toc-o-1" href="o.html#g_t_00f3">2.4 &oacute;</a></li>
+    <li><a name="toc-o-2" href="o.html#g_t_00f3">2.4 &oacute;</a></li>
     <li><a name="toc-u" href="u.html#g_t_00fa">2.5 &uacute;</a></li>
     <li><a name="toc-y" href="y.html#g_t_00fd">2.6 &yacute;</a></li>
     <li><a name="toc-A-4" href="A.html#g_t_00c1">2.7 &Aacute;</a></li>
@@ -92,12 +92,12 @@
     <li><a name="toc-i-1" href="i.html#g_t_00ec">3.3 &igrave;</a></li>
     <li><a name="toc-i" href="with-brace-i.html#with-brace-_00ec">3.4 
&igrave;</a></li>
     <li><a name="toc-i-9" href="with-dotless-i.html#with-dotless-_00ec">3.5 
&igrave;</a></li>
-    <li><a name="toc-o-2" href="o.html#g_t_00f2">3.6 &ograve;</a></li>
+    <li><a name="toc-o-3" href="o.html#g_t_00f2">3.6 &ograve;</a></li>
     <li><a name="toc-u-3" href="u.html#g_t_00f9">3.7 &ugrave;</a></li>
     <li><a name="toc-A-5" href="A.html#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-4" href="E.html#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I" href="I.html#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-3" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-4" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-2" href="U.html#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" 
href="circumflex-accent.html#circumflex-accent">4 circumflex accent</a>
@@ -107,19 +107,19 @@
     <li><a name="toc-i-4" href="i.html#g_t_00ee">4.3 &icirc;</a></li>
     <li><a name="toc-i-6" href="with-brace-i.html#with-brace-_00ee">4.4 
&icirc;</a></li>
     <li><a name="toc-i-7" href="with-dotless-i.html#with-dotless-_00ee">4.5 
&icirc;</a></li>
-    <li><a name="toc-o-3" href="o.html#g_t_00f4">4.6 &ocirc;</a></li>
+    <li><a name="toc-o-4" href="o.html#g_t_00f4">4.6 &ocirc;</a></li>
     <li><a name="toc-u-2" href="u.html#g_t_00fb">4.7 &ucirc;</a></li>
     <li><a name="toc-A-1" href="A.html#g_t_00c2">4.8 &Acirc;</a></li>
     <li><a name="toc-E-3" href="E.html#g_t_00ca">4.9 &Ecirc;</a></li>
     <li><a name="toc-I-2" href="I.html#g_t_00ce">4.10 &Icirc;</a></li>
-    <li><a name="toc-O-4" href="O.html#g_t_00d4">4.11 &Ocirc;</a></li>
+    <li><a name="toc-O-5" href="O.html#g_t_00d4">4.11 &Ocirc;</a></li>
     <li><a name="toc-U-3" href="U.html#g_t_00db">4.12 &Ucirc;</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="tilde-accent.html#tilde-accent">5 
tilde accent</a>
   <ul class="toc">
     <li><a name="toc-a-5" href="a.html#g_t_00e3">5.1 &atilde;</a></li>
     <li><a name="toc-n" href="n.html#g_t_00f1">5.2 &ntilde;</a></li>
-    <li><a name="toc-o-5" href="o.html#g_t_00f5">5.3 &otilde;</a></li>
+    <li><a name="toc-o-6" href="o.html#g_t_00f5">5.3 &otilde;</a></li>
     <li><a name="toc-A-3" href="A.html#g_t_00c3">5.4 &Atilde;</a></li>
     <li><a name="toc-O-1" href="O.html#g_t_00d5">5.5 &Otilde;</a></li>
   </ul></li>
@@ -128,12 +128,12 @@
     <li><a name="toc-a-6" href="a.html#g_t_0105">6.1 &#261;</a></li>
     <li><a name="toc-e" href="e.html#g_t_0119">6.2 &#281;</a></li>
     <li><a name="toc-i-3" href="i.html#g_t_012f">6.3 &#303;</a></li>
-    <li><a name="toc-o-4" href="o.html#g_t_01eb">6.4 &#491;</a></li>
+    <li><a name="toc-o-5" href="o.html#g_t_01eb">6.4 &#491;</a></li>
     <li><a name="toc-u-1" href="u.html#g_t_0173">6.5 &#371;</a></li>
     <li><a name="toc-A-2" href="A.html#g_t_0104">6.6 &#260;</a></li>
     <li><a name="toc-E-1" href="E.html#g_t_0118">6.7 &#280;</a></li>
     <li><a name="toc-I-4" href="I.html#g_t_012e">6.8 &#302;</a></li>
-    <li><a name="toc-O-2" href="O.html#g_t_01ea">6.9 &#490;</a></li>
+    <li><a name="toc-O-3" href="O.html#g_t_01ea">6.9 &#490;</a></li>
     <li><a name="toc-U" href="U.html#g_t_0172">6.10 &#370;</a></li>
   </ul></li>
   <li><a name="toc-cedilla-accent-1" 
href="cedilla-accent.html#cedilla-accent">7 cedilla accent</a>
@@ -146,14 +146,14 @@
   <ul class="toc">
     <li><a name="toc-aa-1" href="aa.html#g_t_00e5">8.1 &aring;</a></li>
     <li><a name="toc-ae" href="ae.html#g_t_00e6">8.2 &aelig;</a></li>
-    <li><a name="toc-oe-1" href="oe.html#g_t_0153">8.3 &oelig;</a></li>
+    <li><a name="toc-oe" href="oe.html#g_t_0153">8.3 &oelig;</a></li>
     <li><a name="toc-AA" href="AA.html#g_t_00c5">8.4 &Aring;</a></li>
     <li><a name="toc-AE" href="AE.html#g_t_00c6">8.5 &AElig;</a></li>
-    <li><a name="toc-OE-1" href="OE.html#g_t_0152">8.6 &OElig;</a></li>
+    <li><a name="toc-OE" href="OE.html#g_t_0152">8.6 &OElig;</a></li>
     <li><a name="toc-l" href="l.html#g_t_0142">8.7 &#322;</a></li>
-    <li><a name="toc-oe" href="oe.html#g_t_00f8">8.8 &oslash;</a></li>
+    <li><a name="toc-o-1" href="o.html#g_t_00f8">8.8 &oslash;</a></li>
     <li><a name="toc-L" href="L.html#g_t_0141">8.9 &#321;</a></li>
-    <li><a name="toc-OE" href="OE.html#g_t_00d8">8.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="O.html#g_t_00d8">8.10 &Oslash;</a></li>
     <li><a name="toc-a-3" href="a.html#a_030b">8.11 a''</a></li>
     <li><a name="toc-a-9" href="a.html#g_t_0103">8.12 &#259;</a></li>
     <li><a name="toc-a-1" href="a.html#g_t_01ce">8.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/o.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/o.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/o.html   30 Aug 2009 
18:59:51 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/o.html   6 Sep 2009 
21:46:06 -0000       1.11
@@ -80,7 +80,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-1"></a>
+<a name="o-2"></a>
 <h2 class="section">2.4 &oacute;</h2>
 <hr>
 <a name="g_t_00f2"></a>
@@ -100,7 +100,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-2"></a>
+<a name="o-3"></a>
 <h2 class="section">3.6 &ograve;</h2>
 <hr>
 <a name="g_t_00f4"></a>
@@ -120,7 +120,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-3"></a>
+<a name="o-4"></a>
 <h2 class="section">4.6 &ocirc;</h2>
 <hr>
 <a name="g_t_00f5"></a>
@@ -140,7 +140,7 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-5"></a>
+<a name="o-6"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
 <a name="g_t_01eb"></a>
@@ -160,9 +160,29 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">6.4 &#491;</h2>
 <hr>
+<a name="g_t_00f8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="o-1"></a>
+<h2 class="section">8.8 &oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/oe.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/oe.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/oe.html  30 Aug 2009 
18:59:52 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/oe.html  6 Sep 2009 
21:46:06 -0000       1.11
@@ -58,28 +58,8 @@
 <td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="oe-1"></a>
-<h2 class="section">8.3 &oelig;</h2>
-<hr>
-<a name="g_t_00f8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_toc.html#SEC_Contents" 
title="Table of contents">Contents</a>]</td>
-<td valign="middle" align="left">[Index]</td>
-<td valign="middle" align="left">[<a href="nodetest_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
 <a name="oe"></a>
-<h2 class="section">8.8 &oslash;</h2>
+<h2 class="section">8.3 &oelig;</h2>
 <hr>
 <p>
  <font size="-1">

Index: test/encodings/res/nodetest_use_nodes_no_unidecode/rest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_use_nodes_no_unidecode/rest.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_use_nodes_no_unidecode/rest.html        30 Aug 
2009 18:59:52 -0000      1.10
+++ test/encodings/res/nodetest_use_nodes_no_unidecode/rest.html        6 Sep 
2009 21:46:06 -0000       1.11
@@ -68,9 +68,9 @@
 <tr><td align="left" valign="top"><a href="AE.html#g_t_00c6">&bull; 
&AElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="OE.html#g_t_0152">&bull; 
&OElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="l.html#g_t_0142">&bull; 
&#322;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="oe.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="o.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="L.html#g_t_0141">&bull; 
&#321;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="OE.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="O.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#a_030b">&bull; 
a''</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_0103">&bull; 
&#259;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_01ce">&bull; 
a&lt;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>

Index: test/encodings/res/nodetest_utf8/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8/nodetest_utf8.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/nodetest_utf8/nodetest_utf8.2    6 Sep 2009 12:52:49 
-0000       1.4
+++ test/encodings/res/nodetest_utf8/nodetest_utf8.2    6 Sep 2009 21:46:06 
-0000       1.5
@@ -1,2 +1,3 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: test/encodings/res/nodetest_utf8/nodetest_utf8.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8/nodetest_utf8.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8/nodetest_utf8.html 24 Aug 2009 10:26:44 
-0000      1.10
+++ test/encodings/res/nodetest_utf8/nodetest_utf8.html 6 Sep 2009 21:46:06 
-0000       1.11
@@ -184,7 +184,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">1.4 ö</h2>
 <p>Ref to an anchor at the end of the doc 
 (see <a href="#g_t_00e9_002do">there is an o-é could there be an &icirc;</a>).
@@ -572,7 +572,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">2.10 &Oacute;</h2>
 <hr>
 <a name="g_t_00da"></a>
@@ -856,7 +856,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d9"></a>
@@ -1077,7 +1077,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">4.9 Ô</h2>
 <hr>
 <a name="g_t_00db"></a>
@@ -1482,7 +1482,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe-1"></a>
+<a name="o-4"></a>
 <h2 class="section">7.8 &oslash;</h2>
 <hr>
 <a name="g_t_0141"></a>
@@ -1520,7 +1520,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE-1"></a>
+<a name="O-2"></a>
 <h2 class="section">7.10 &Oslash;</h2>
 <hr>
 <a name="a_030b"></a>
@@ -1797,7 +1797,7 @@
     <li><a name="toc-a-9" href="#g_t_00e4">1.1 ä</a></li>
     <li><a name="toc-e-3" href="#g_t_00eb">1.2 ë</a></li>
     <li><a name="toc-i-5" href="#g_t_00ef">1.3 ï</a></li>
-    <li><a name="toc-o-4" href="#g_t_00f6">1.4 ö</a></li>
+    <li><a name="toc-o-5" href="#g_t_00f6">1.4 ö</a></li>
     <li><a name="toc-u-2" href="#g_t_00fc">1.5 ü</a></li>
     <li><a name="toc-y" href="#g_t_00ff">1.6 ÿ</a></li>
     <li><a name="toc-A-4" href="#g_t_00c4">1.7 Ä</a></li>
@@ -1818,7 +1818,7 @@
     <li><a name="toc-A" href="#g_t_00c1">2.7 &Aacute;</a></li>
     <li><a name="toc-E" href="#g_t_00c9">2.8 &Eacute;</a></li>
     <li><a name="toc-I-2" href="#g_t_00cd">2.9 &Iacute;</a></li>
-    <li><a name="toc-O-3" href="#g_t_00d3">2.10 &Oacute;</a></li>
+    <li><a name="toc-O-4" href="#g_t_00d3">2.10 &Oacute;</a></li>
     <li><a name="toc-U-3" href="#g_t_00da">2.11 &Uacute;</a></li>
     <li><a name="toc-Y" href="#g_t_00dd">2.12 &Yacute;</a></li>
   </ul></li>
@@ -1834,7 +1834,7 @@
     <li><a name="toc-A-2" href="#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-1" href="#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I-3" href="#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-4" href="#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-5" href="#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-1" href="#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" href="#circumflex-accent">4 circumflex 
accent</a>
@@ -1847,7 +1847,7 @@
     <li><a name="toc-A-3" href="#g_t_00c2">4.6 Â</a></li>
     <li><a name="toc-E-3" href="#g_t_00ca">4.7 Ê</a></li>
     <li><a name="toc-I-1" href="#g_t_00ce">4.8 Î</a></li>
-    <li><a name="toc-O-2" href="#g_t_00d4">4.9 Ô</a></li>
+    <li><a name="toc-O-3" href="#g_t_00d4">4.9 Ô</a></li>
     <li><a name="toc-U" href="#g_t_00db">4.10 Û</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="#tilde-accent">5 tilde accent</a>
@@ -1872,9 +1872,9 @@
     <li><a name="toc-AE" href="#g_t_00c6">7.5 &AElig;</a></li>
     <li><a name="toc-OE" href="#g_t_0152">7.6 &OElig;</a></li>
     <li><a name="toc-l" href="#g_t_0142">7.7 &#322;</a></li>
-    <li><a name="toc-oe-1" href="#g_t_00f8">7.8 &oslash;</a></li>
+    <li><a name="toc-o-4" href="#g_t_00f8">7.8 &oslash;</a></li>
     <li><a name="toc-L" href="#g_t_0141">7.9 &#321;</a></li>
-    <li><a name="toc-OE-1" href="#g_t_00d8">7.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="#g_t_00d8">7.10 &Oslash;</a></li>
     <li><a name="toc-a" href="#a_030b">7.11 a''</a></li>
     <li><a name="toc-a-1" href="#g_t_0103">7.12 &#259;</a></li>
     <li><a name="toc-a-8" href="#g_t_01ce">7.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.2 6 Sep 2009 
12:52:49 -0000       1.5
+++ test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.2 6 Sep 2009 
21:46:06 -0000       1.6
@@ -1,3 +1,4 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 warning: Document encoding is utf8, but there is no unicode support
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.html      24 Aug 
2009 10:26:44 -0000      1.10
+++ test/encodings/res/nodetest_utf8_no_unicode/nodetest_utf8.html      6 Sep 
2009 21:46:06 -0000       1.11
@@ -572,7 +572,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-1"></a>
+<a name="O-2"></a>
 <h2 class="section">2.10 &Oacute;</h2>
 <hr>
 <a name="g_t_00da"></a>
@@ -856,7 +856,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d9"></a>
@@ -1482,7 +1482,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="oe-1"></a>
+<a name="o-3"></a>
 <h2 class="section">7.8 &oslash;</h2>
 <hr>
 <a name="g_t_0141"></a>
@@ -1520,7 +1520,7 @@
 <td valign="middle" align="left">[<a href="#rest" title="Index">Index</a>]</td>
 <td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ? 
</a>]</td>
 </tr></table>
-<a name="OE-1"></a>
+<a name="O-1"></a>
 <h2 class="section">7.10 &Oslash;</h2>
 <hr>
 <a name="a_030b"></a>
@@ -1818,7 +1818,7 @@
     <li><a name="toc-A" href="#g_t_00c1">2.7 &Aacute;</a></li>
     <li><a name="toc-E" href="#g_t_00c9">2.8 &Eacute;</a></li>
     <li><a name="toc-I" href="#g_t_00cd">2.9 &Iacute;</a></li>
-    <li><a name="toc-O-1" href="#g_t_00d3">2.10 &Oacute;</a></li>
+    <li><a name="toc-O-2" href="#g_t_00d3">2.10 &Oacute;</a></li>
     <li><a name="toc-U-1" href="#g_t_00da">2.11 &Uacute;</a></li>
     <li><a name="toc-Y" href="#g_t_00dd">2.12 &Yacute;</a></li>
   </ul></li>
@@ -1834,7 +1834,7 @@
     <li><a name="toc-A-2" href="#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-1" href="#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I-1" href="#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-2" href="#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-3" href="#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U" href="#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" href="#circumflex-accent">4 circumflex 
accent</a>
@@ -1872,9 +1872,9 @@
     <li><a name="toc-AE" href="#g_t_00c6">7.5 &AElig;</a></li>
     <li><a name="toc-OE" href="#g_t_0152">7.6 &OElig;</a></li>
     <li><a name="toc-l" href="#g_t_0142">7.7 &#322;</a></li>
-    <li><a name="toc-oe-1" href="#g_t_00f8">7.8 &oslash;</a></li>
+    <li><a name="toc-o-3" href="#g_t_00f8">7.8 &oslash;</a></li>
     <li><a name="toc-L" href="#g_t_0141">7.9 &#321;</a></li>
-    <li><a name="toc-OE-1" href="#g_t_00d8">7.10 &Oslash;</a></li>
+    <li><a name="toc-O-1" href="#g_t_00d8">7.10 &Oslash;</a></li>
     <li><a name="toc-a" href="#a_030b">7.11 a''</a></li>
     <li><a name="toc-a-1" href="#g_t_0103">7.12 &#259;</a></li>
     <li><a name="toc-a-7" href="#g_t_01ce">7.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_utf8_use_nodes/L.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/L.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/L.html   24 Aug 2009 10:26:44 
-0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/L.html   6 Sep 2009 21:46:07 
-0000       1.11
@@ -44,9 +44,9 @@
 <a name="g_t_0141"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_utf8_use_nodes/O.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/O.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/O.html   24 Aug 2009 10:26:44 
-0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/O.html   6 Sep 2009 21:46:07 
-0000       1.11
@@ -78,7 +78,7 @@
 <td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">2.10 &Oacute;</h2>
 <hr>
 <a name="g_t_00d2"></a>
@@ -98,7 +98,7 @@
 <td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d4"></a>
@@ -118,7 +118,7 @@
 <td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">4.9 Ô</h2>
 <hr>
 <a name="g_t_00d5"></a>
@@ -143,6 +143,26 @@
 <p>This marks the <a name="x_002dspot"></a>spot.
 A second one with accented char <a name="g_t_00e9_002do"></a>.
 </p><hr>
+<a name="g_t_00d8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a 
href="nodetest_utf8_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="O-2"></a>
+<h2 class="section">7.10 &Oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_utf8_use_nodes/OE.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/OE.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/OE.html  24 Aug 2009 10:26:45 
-0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/OE.html  6 Sep 2009 21:46:07 
-0000       1.11
@@ -61,26 +61,6 @@
 <a name="OE"></a>
 <h2 class="section">7.6 &OElig;</h2>
 <hr>
-<a name="g_t_00d8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a 
href="nodetest_utf8_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<a name="OE-1"></a>
-<h2 class="section">7.10 &Oslash;</h2>
-<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>.

Index: test/encodings/res/nodetest_utf8_use_nodes/a.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/a.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/a.html   24 Aug 2009 10:26:45 
-0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/a.html   6 Sep 2009 21:46:07 
-0000       1.11
@@ -146,7 +146,7 @@
 <a name="a_030b"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
 <td valign="middle" align="left">[<a href="#g_t_0103" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>

Index: test/encodings/res/nodetest_utf8_use_nodes/l.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/l.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/l.html   24 Aug 2009 10:26:45 
-0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/l.html   6 Sep 2009 21:46:07 
-0000       1.11
@@ -46,7 +46,7 @@
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="OE.html#g_t_0152" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8.2  6 Sep 2009 
12:52:49 -0000       1.4
+++ test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8.2  6 Sep 2009 
21:46:07 -0000       1.5
@@ -1,2 +1,3 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8_toc.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8_toc.html   24 Aug 
2009 10:26:45 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/nodetest_utf8_toc.html   6 Sep 
2009 21:46:07 -0000       1.11
@@ -58,7 +58,7 @@
     <li><a name="toc-a-9" href="a.html#g_t_00e4">1.1 ä</a></li>
     <li><a name="toc-e-3" href="e.html#g_t_00eb">1.2 ë</a></li>
     <li><a name="toc-i-5" href="i.html#g_t_00ef">1.3 ï</a></li>
-    <li><a name="toc-o-4" href="o.html#g_t_00f6">1.4 ö</a></li>
+    <li><a name="toc-o-5" href="o.html#g_t_00f6">1.4 ö</a></li>
     <li><a name="toc-u-2" href="u.html#g_t_00fc">1.5 ü</a></li>
     <li><a name="toc-y" href="y.html#g_t_00ff">1.6 ÿ</a></li>
     <li><a name="toc-A-4" href="A.html#g_t_00c4">1.7 Ä</a></li>
@@ -79,7 +79,7 @@
     <li><a name="toc-A" href="A.html#g_t_00c1">2.7 &Aacute;</a></li>
     <li><a name="toc-E" href="E.html#g_t_00c9">2.8 &Eacute;</a></li>
     <li><a name="toc-I-2" href="I.html#g_t_00cd">2.9 &Iacute;</a></li>
-    <li><a name="toc-O-3" href="O.html#g_t_00d3">2.10 &Oacute;</a></li>
+    <li><a name="toc-O-4" href="O.html#g_t_00d3">2.10 &Oacute;</a></li>
     <li><a name="toc-U-3" href="U.html#g_t_00da">2.11 &Uacute;</a></li>
     <li><a name="toc-Y" href="Y.html#g_t_00dd">2.12 &Yacute;</a></li>
   </ul></li>
@@ -95,7 +95,7 @@
     <li><a name="toc-A-2" href="A.html#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-1" href="E.html#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I-3" href="I.html#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-4" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-5" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-1" href="U.html#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" 
href="circumflex-accent.html#circumflex-accent">4 circumflex accent</a>
@@ -108,7 +108,7 @@
     <li><a name="toc-A-3" href="A.html#g_t_00c2">4.6 Â</a></li>
     <li><a name="toc-E-3" href="E.html#g_t_00ca">4.7 Ê</a></li>
     <li><a name="toc-I-1" href="I.html#g_t_00ce">4.8 Î</a></li>
-    <li><a name="toc-O-2" href="O.html#g_t_00d4">4.9 Ô</a></li>
+    <li><a name="toc-O-3" href="O.html#g_t_00d4">4.9 Ô</a></li>
     <li><a name="toc-U" href="U.html#g_t_00db">4.10 Û</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="tilde-accent.html#tilde-accent">5 
tilde accent</a>
@@ -133,9 +133,9 @@
     <li><a name="toc-AE" href="AE.html#g_t_00c6">7.5 &AElig;</a></li>
     <li><a name="toc-OE" href="OE.html#g_t_0152">7.6 &OElig;</a></li>
     <li><a name="toc-l" href="l.html#g_t_0142">7.7 &#322;</a></li>
-    <li><a name="toc-oe-1" href="oe.html#g_t_00f8">7.8 &oslash;</a></li>
+    <li><a name="toc-o-4" href="o.html#g_t_00f8">7.8 &oslash;</a></li>
     <li><a name="toc-L" href="L.html#g_t_0141">7.9 &#321;</a></li>
-    <li><a name="toc-OE-1" href="OE.html#g_t_00d8">7.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="O.html#g_t_00d8">7.10 &Oslash;</a></li>
     <li><a name="toc-a" href="a.html#a_030b">7.11 a''</a></li>
     <li><a name="toc-a-1" href="a.html#g_t_0103">7.12 &#259;</a></li>
     <li><a name="toc-a-8" href="a.html#g_t_01ce">7.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_utf8_use_nodes/o.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/o.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/o.html   24 Aug 2009 10:26:45 
-0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/o.html   6 Sep 2009 21:46:07 
-0000       1.11
@@ -58,7 +58,7 @@
 <td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">1.4 ö</h2>
 <p>Ref to an anchor at the end of the doc 
 (see <a href="O.html#g_t_00e9_002do">there is an o-é could there be an 
&icirc;</a>).
@@ -143,6 +143,26 @@
 <a name="o-3"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
+<a name="g_t_00f8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a 
href="nodetest_utf8_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="o-4"></a>
+<h2 class="section">7.8 &oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_utf8_use_nodes/oe.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/oe.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/oe.html  24 Aug 2009 10:26:45 
-0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/oe.html  6 Sep 2009 21:46:07 
-0000       1.11
@@ -61,26 +61,6 @@
 <a name="oe"></a>
 <h2 class="section">7.3 &oelig;</h2>
 <hr>
-<a name="g_t_00f8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a 
href="nodetest_utf8_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<a name="oe-1"></a>
-<h2 class="section">7.8 &oslash;</h2>
-<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>.

Index: test/encodings/res/nodetest_utf8_use_nodes/rest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes/rest.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes/rest.html        24 Aug 2009 
10:26:45 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes/rest.html        6 Sep 2009 
21:46:07 -0000       1.11
@@ -68,9 +68,9 @@
 <tr><td align="left" valign="top"><a href="AE.html#g_t_00c6">&bull; 
&AElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="OE.html#g_t_0152">&bull; 
&OElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="l.html#g_t_0142">&bull; 
&#322;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="oe.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="o.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="L.html#g_t_0141">&bull; 
&#321;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="OE.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="O.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#a_030b">&bull; 
a''</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_0103">&bull; 
&#259;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_01ce">&bull; 
a&lt;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/L.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/L.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/L.html      24 Aug 
2009 10:26:46 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/L.html      6 Sep 
2009 21:46:08 -0000       1.11
@@ -44,9 +44,9 @@
 <a name="g_t_0141"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/O.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/O.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/O.html      24 Aug 
2009 10:26:46 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/O.html      6 Sep 
2009 21:46:08 -0000       1.11
@@ -78,7 +78,7 @@
 <td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-3"></a>
+<a name="O-4"></a>
 <h2 class="section">2.10 &Oacute;</h2>
 <hr>
 <a name="g_t_00d2"></a>
@@ -98,7 +98,7 @@
 <td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-4"></a>
+<a name="O-5"></a>
 <h2 class="section">3.11 &Ograve;</h2>
 <hr>
 <a name="g_t_00d4"></a>
@@ -118,7 +118,7 @@
 <td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="O-2"></a>
+<a name="O-3"></a>
 <h2 class="section">4.9 Ô</h2>
 <hr>
 <a name="g_t_00d5"></a>
@@ -143,6 +143,26 @@
 <p>This marks the <a name="x_002dspot"></a>spot.
 A second one with accented char <a name="g_t_00e9_002do"></a>.
 </p><hr>
+<a name="g_t_00d8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a 
href="nodetest_utf8_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="O-2"></a>
+<h2 class="section">7.10 &Oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/OE.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/OE.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/OE.html     24 Aug 
2009 10:26:46 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/OE.html     6 Sep 
2009 21:46:08 -0000       1.11
@@ -61,26 +61,6 @@
 <a name="OE"></a>
 <h2 class="section">7.6 &OElig;</h2>
 <hr>
-<a name="g_t_00d8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="a.html#a_030b" title="Next section 
in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a 
href="nodetest_utf8_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<a name="OE-1"></a>
-<h2 class="section">7.10 &Oslash;</h2>
-<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>.

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/a.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/a.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/a.html      24 Aug 
2009 10:26:46 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/a.html      6 Sep 
2009 21:46:08 -0000       1.11
@@ -146,7 +146,7 @@
 <a name="a_030b"></a>
 <table cellpadding="1" cellspacing="1" border="0">
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="OE.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="O.html#g_t_00d8" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
 <td valign="middle" align="left">[<a href="#g_t_0103" title="Next section in 
reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/l.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/l.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/l.html      24 Aug 
2009 10:26:46 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/l.html      6 Sep 
2009 21:46:08 -0000       1.11
@@ -46,7 +46,7 @@
 <tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
 <td valign="middle" align="left">[<a href="OE.html#g_t_0152" title="Previous 
section in reading order"> &lt; </a>]</td>
 <td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="oe.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[<a href="o.html#g_t_00f8" title="Next 
section in reading order"> &gt; </a>]</td>
 <td valign="middle" align="left">[ &gt;&gt; ]</td>
 <td valign="middle" align="left"> &nbsp; </td>
 <td valign="middle" align="left"> &nbsp; </td>

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2     
6 Sep 2009 12:52:49 -0000       1.4
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2     
6 Sep 2009 21:46:08 -0000       1.5
@@ -1,2 +1,3 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 warning: Must specify a title with a title command or @top

Index: 
test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8_toc.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8_toc.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- 
test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8_toc.html  
    24 Aug 2009 10:26:46 -0000      1.10
+++ 
test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8_toc.html  
    6 Sep 2009 21:46:08 -0000       1.11
@@ -58,7 +58,7 @@
     <li><a name="toc-a-9" href="a.html#g_t_00e4">1.1 ä</a></li>
     <li><a name="toc-e-3" href="e.html#g_t_00eb">1.2 ë</a></li>
     <li><a name="toc-i-5" href="i.html#g_t_00ef">1.3 ï</a></li>
-    <li><a name="toc-o-4" href="o.html#g_t_00f6">1.4 ö</a></li>
+    <li><a name="toc-o-5" href="o.html#g_t_00f6">1.4 ö</a></li>
     <li><a name="toc-u-2" href="u.html#g_t_00fc">1.5 ü</a></li>
     <li><a name="toc-y" href="y.html#g_t_00ff">1.6 ÿ</a></li>
     <li><a name="toc-A-4" href="A.html#g_t_00c4">1.7 Ä</a></li>
@@ -79,7 +79,7 @@
     <li><a name="toc-A" href="A.html#g_t_00c1">2.7 &Aacute;</a></li>
     <li><a name="toc-E" href="E.html#g_t_00c9">2.8 &Eacute;</a></li>
     <li><a name="toc-I-2" href="I.html#g_t_00cd">2.9 &Iacute;</a></li>
-    <li><a name="toc-O-3" href="O.html#g_t_00d3">2.10 &Oacute;</a></li>
+    <li><a name="toc-O-4" href="O.html#g_t_00d3">2.10 &Oacute;</a></li>
     <li><a name="toc-U-3" href="U.html#g_t_00da">2.11 &Uacute;</a></li>
     <li><a name="toc-Y" href="Y.html#g_t_00dd">2.12 &Yacute;</a></li>
   </ul></li>
@@ -95,7 +95,7 @@
     <li><a name="toc-A-2" href="A.html#g_t_00c0">3.8 &Agrave;</a></li>
     <li><a name="toc-E-1" href="E.html#g_t_00c8">3.9 &Egrave;</a></li>
     <li><a name="toc-I-3" href="I.html#g_t_00cc">3.10 &Igrave;</a></li>
-    <li><a name="toc-O-4" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
+    <li><a name="toc-O-5" href="O.html#g_t_00d2">3.11 &Ograve;</a></li>
     <li><a name="toc-U-1" href="U.html#g_t_00d9">3.12 &Ugrave;</a></li>
   </ul></li>
   <li><a name="toc-circumflex-accent-1" 
href="circumflex-accent.html#circumflex-accent">4 circumflex accent</a>
@@ -108,7 +108,7 @@
     <li><a name="toc-A-3" href="A.html#g_t_00c2">4.6 Â</a></li>
     <li><a name="toc-E-3" href="E.html#g_t_00ca">4.7 Ê</a></li>
     <li><a name="toc-I-1" href="I.html#g_t_00ce">4.8 Î</a></li>
-    <li><a name="toc-O-2" href="O.html#g_t_00d4">4.9 Ô</a></li>
+    <li><a name="toc-O-3" href="O.html#g_t_00d4">4.9 Ô</a></li>
     <li><a name="toc-U" href="U.html#g_t_00db">4.10 Û</a></li>
   </ul></li>
   <li><a name="toc-tilde-accent-1" href="tilde-accent.html#tilde-accent">5 
tilde accent</a>
@@ -133,9 +133,9 @@
     <li><a name="toc-AE" href="AE.html#g_t_00c6">7.5 &AElig;</a></li>
     <li><a name="toc-OE" href="OE.html#g_t_0152">7.6 &OElig;</a></li>
     <li><a name="toc-l" href="l.html#g_t_0142">7.7 &#322;</a></li>
-    <li><a name="toc-oe-1" href="oe.html#g_t_00f8">7.8 &oslash;</a></li>
+    <li><a name="toc-o-4" href="o.html#g_t_00f8">7.8 &oslash;</a></li>
     <li><a name="toc-L" href="L.html#g_t_0141">7.9 &#321;</a></li>
-    <li><a name="toc-OE-1" href="OE.html#g_t_00d8">7.10 &Oslash;</a></li>
+    <li><a name="toc-O-2" href="O.html#g_t_00d8">7.10 &Oslash;</a></li>
     <li><a name="toc-a" href="a.html#a_030b">7.11 a''</a></li>
     <li><a name="toc-a-1" href="a.html#g_t_0103">7.12 &#259;</a></li>
     <li><a name="toc-a-8" href="a.html#g_t_01ce">7.13 a&lt;</a></li>

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/o.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/o.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/o.html      24 Aug 
2009 10:26:46 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/o.html      6 Sep 
2009 21:46:09 -0000       1.11
@@ -58,7 +58,7 @@
 <td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
 </tr></table>
 <hr>
-<a name="o-4"></a>
+<a name="o-5"></a>
 <h2 class="section">1.4 ö</h2>
 <p>Ref to an anchor at the end of the doc 
 (see <a href="O.html#g_t_00e9_002do">there is an o-é could there be an 
&icirc;</a>).
@@ -143,6 +143,26 @@
 <a name="o-3"></a>
 <h2 class="section">5.3 &otilde;</h2>
 <hr>
+<a name="g_t_00f8"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
+<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
+<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
+<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
+<td valign="middle" align="left">[<a 
href="nodetest_utf8_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
+<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
+<td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
+</tr></table>
+<hr>
+<a name="o-4"></a>
+<h2 class="section">7.8 &oslash;</h2>
+<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>.

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/oe.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/oe.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/oe.html     24 Aug 
2009 10:26:46 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/oe.html     6 Sep 
2009 21:46:09 -0000       1.11
@@ -61,26 +61,6 @@
 <a name="oe"></a>
 <h2 class="section">7.3 &oelig;</h2>
 <hr>
-<a name="g_t_00f8"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">[<a href="rest.html#rest" 
title="Beginning of this chapter or previous chapter"> &lt;&lt; </a>]</td>
-<td valign="middle" align="left">[<a href="l.html#g_t_0142" title="Previous 
section in reading order"> &lt; </a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" title="Up section"> 
Up </a>]</td>
-<td valign="middle" align="left">[<a href="L.html#g_t_0141" title="Next 
section in reading order"> &gt; </a>]</td>
-<td valign="middle" align="left">[ &gt;&gt; ]</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="index.html#Top" title="Cover (top) 
of document">Top</a>]</td>
-<td valign="middle" align="left">[<a 
href="nodetest_utf8_toc.html#SEC_Contents" title="Table of 
contents">Contents</a>]</td>
-<td valign="middle" align="left">[<a href="rest.html#rest" 
title="Index">Index</a>]</td>
-<td valign="middle" align="left">[<a href="nodetest_utf8_abt.html#SEC_About" 
title="About (help)"> ? </a>]</td>
-</tr></table>
-<hr>
-<a name="oe-1"></a>
-<h2 class="section">7.8 &oslash;</h2>
-<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>.

Index: test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/rest.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/rest.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/rest.html   24 Aug 
2009 10:26:47 -0000      1.10
+++ test/encodings/res/nodetest_utf8_use_nodes_no_unidecode/rest.html   6 Sep 
2009 21:46:09 -0000       1.11
@@ -68,9 +68,9 @@
 <tr><td align="left" valign="top"><a href="AE.html#g_t_00c6">&bull; 
&AElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="OE.html#g_t_0152">&bull; 
&OElig;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="l.html#g_t_0142">&bull; 
&#322;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="oe.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="o.html#g_t_00f8">&bull; 
&oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="L.html#g_t_0141">&bull; 
&#321;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
-<tr><td align="left" valign="top"><a href="OE.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
+<tr><td align="left" valign="top"><a href="O.html#g_t_00d8">&bull; 
&Oslash;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#a_030b">&bull; 
a''</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_0103">&bull; 
&#259;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>
 <tr><td align="left" valign="top"><a href="a.html#g_t_01ce">&bull; 
a&lt;</a></td><td>&nbsp;&nbsp;</td><td align="left" valign="top"></td></tr>

Index: test/encodings/res/texi_nodetest_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/texi_nodetest_latin1/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_nodetest_latin1/nodetest_latin1.2   18 Aug 2008 
18:02:56 -0000      1.1
+++ test/encodings/res/texi_nodetest_latin1/nodetest_latin1.2   6 Sep 2009 
21:46:09 -0000       1.2
@@ -0,0 +1 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding

Index: test/encodings/res/texi_nodetest_utf8/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res/texi_nodetest_utf8/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res/texi_nodetest_utf8/nodetest_utf8.2       18 Aug 2008 
18:02:56 -0000      1.1
+++ test/encodings/res/texi_nodetest_utf8/nodetest_utf8.2       6 Sep 2009 
21:46:09 -0000       1.2
@@ -0,0 +1 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding

Index: 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
    6 Jul 2009 21:59:20 -0000       1.1
+++ 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
    6 Sep 2009 21:46:09 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
 6 Jul 2009 21:59:20 -0000       1.1
+++ 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
 6 Sep 2009 21:46:10 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
       6 Jul 2009 21:59:20 -0000       1.1
+++ 
test/encodings/res_all/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
       6 Sep 2009 21:46:10 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
        6 Jul 2009 21:59:20 -0000       1.1
+++ 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
        6 Sep 2009 21:46:10 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding

Index: 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
     6 Sep 2009 12:52:49 -0000       1.3
+++ 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
     6 Sep 2009 21:46:10 -0000       1.4
@@ -1 +1,2 @@
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding
 warning: Document encoding is utf8, but there is no unicode support

Index: 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
   6 Jul 2009 21:59:21 -0000       1.1
+++ 
test/encodings/res_all/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
   6 Sep 2009 21:46:10 -0000       1.2
@@ -0,0 +1 @@
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding

Index: test/encodings/res_all/encoding_index/encoding_index.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/encoding_index/encoding_index.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/encoding_index/encoding_index.2      3 Aug 2009 
08:20:16 -0000       1.2
+++ test/encodings/res_all/encoding_index/encoding_index.2      6 Sep 2009 
21:46:10 -0000       1.3
@@ -1 +1,2 @@
+encoding_index.texi:5: warning: Encoding ascii is not a canonical texinfo 
encoding
 encoding_index.texi:56: warning: Empty index entry for @cindex

Index: test/encodings/res_all/encoding_index-latin1/encoding_index-latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/encoding_index-latin1/encoding_index-latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/encoding_index-latin1/encoding_index-latin1.2        
3 Aug 2009 08:20:16 -0000       1.2
+++ test/encodings/res_all/encoding_index-latin1/encoding_index-latin1.2        
6 Sep 2009 21:46:11 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-latin1.texi:5: warning: Encoding latin1 is not a canonical 
texinfo encoding
 encoding_index-latin1.texi:57: warning: Empty index entry for @cindex

Index: 
test/encodings/res_all/encoding_index-latin1_toutf8/encoding_index-latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/encoding_index-latin1_toutf8/encoding_index-latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/encoding_index-latin1_toutf8/encoding_index-latin1.2 
3 Aug 2009 08:20:16 -0000       1.2
+++ test/encodings/res_all/encoding_index-latin1_toutf8/encoding_index-latin1.2 
6 Sep 2009 21:46:11 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-latin1.texi:5: warning: Encoding latin1 is not a canonical 
texinfo encoding
 encoding_index-latin1.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res_all/encoding_index-utf8/encoding_index-utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/encoding_index-utf8/encoding_index-utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/encoding_index-utf8/encoding_index-utf8.2    3 Aug 
2009 08:20:17 -0000       1.2
+++ test/encodings/res_all/encoding_index-utf8/encoding_index-utf8.2    6 Sep 
2009 21:46:11 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-utf8.texi:5: warning: Encoding utf8 is not a canonical texinfo 
encoding
 encoding_index-utf8.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res_all/encoding_index-utf8_toutf8/encoding_index-utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/encoding_index-utf8_toutf8/encoding_index-utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/encoding_index-utf8_toutf8/encoding_index-utf8.2     
3 Aug 2009 08:20:17 -0000       1.2
+++ test/encodings/res_all/encoding_index-utf8_toutf8/encoding_index-utf8.2     
6 Sep 2009 21:46:11 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-utf8.texi:5: warning: Encoding utf8 is not a canonical texinfo 
encoding
 encoding_index-utf8.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res_all/encoding_index_toutf8/encoding_index.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/encoding_index_toutf8/encoding_index.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/encoding_index_toutf8/encoding_index.2       3 Aug 
2009 08:20:17 -0000       1.2
+++ test/encodings/res_all/encoding_index_toutf8/encoding_index.2       6 Sep 
2009 21:46:11 -0000       1.3
@@ -1 +1,2 @@
+encoding_index.texi:5: warning: Encoding ascii is not a canonical texinfo 
encoding
 encoding_index.texi:56: warning: Empty index entry for @cindex

Index: test/encodings/res_all/nodetest_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1/nodetest_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_latin1/nodetest_latin1.2    3 Aug 2009 
08:20:20 -0000       1.2
+++ test/encodings/res_all/nodetest_latin1/nodetest_latin1.2    6 Sep 2009 
21:46:12 -0000       1.3
@@ -1 +1,2 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_latin1_no_unicode/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_no_unicode/nodetest_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_latin1_no_unicode/nodetest_latin1.2 3 Aug 
2009 08:20:20 -0000       1.2
+++ test/encodings/res_all/nodetest_latin1_no_unicode/nodetest_latin1.2 6 Sep 
2009 21:46:12 -0000       1.3
@@ -1 +1,2 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_latin1_use_nodes/O.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/O.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_latin1_use_nodes/O.txt      6 Jul 2009 
21:59:23 -0000       1.1
+++ test/encodings/res_all/nodetest_latin1_use_nodes/O.txt      6 Sep 2009 
21:46:12 -0000       1.2
@@ -10,3 +10,5 @@
 ======
 This marks the spot.
 A second one with accented char .
+7.10 /O
+=======

Index: test/encodings/res_all/nodetest_latin1_use_nodes/OE.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/OE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_latin1_use_nodes/OE.txt     6 Jul 2009 
21:59:23 -0000       1.1
+++ test/encodings/res_all/nodetest_latin1_use_nodes/OE.txt     6 Sep 2009 
21:46:12 -0000       1.2
@@ -1,4 +1,2 @@
 7.6 OE
 ======
-7.10 /O
-=======

Index: test/encodings/res_all/nodetest_latin1_use_nodes/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/nodetest_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_latin1_use_nodes/nodetest_latin1.2  3 Aug 
2009 08:20:20 -0000       1.2
+++ test/encodings/res_all/nodetest_latin1_use_nodes/nodetest_latin1.2  6 Sep 
2009 21:46:12 -0000       1.3
@@ -1 +1,2 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_latin1_use_nodes/o.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/o.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_latin1_use_nodes/o.txt      6 Jul 2009 
21:59:24 -0000       1.1
+++ test/encodings/res_all/nodetest_latin1_use_nodes/o.txt      6 Sep 2009 
21:46:12 -0000       1.2
@@ -10,3 +10,5 @@
 =====
 5.3 o~
 ======
+7.8 /o
+======

Index: test/encodings/res_all/nodetest_latin1_use_nodes/oe.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes/oe.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_latin1_use_nodes/oe.txt     6 Jul 2009 
21:59:24 -0000       1.1
+++ test/encodings/res_all/nodetest_latin1_use_nodes/oe.txt     6 Sep 2009 
21:46:12 -0000       1.2
@@ -1,4 +1,2 @@
 7.3 oe
 ======
-7.8 /o
-======

Index: test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/O.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/O.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/O.txt   6 Jul 
2009 21:59:25 -0000       1.1
+++ test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/O.txt   6 Sep 
2009 21:46:12 -0000       1.2
@@ -10,3 +10,5 @@
 ======
 This marks the spot.
 A second one with accented char .
+7.10 /O
+=======

Index: test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/OE.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/OE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/OE.txt  6 Jul 
2009 21:59:25 -0000       1.1
+++ test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/OE.txt  6 Sep 
2009 21:46:12 -0000       1.2
@@ -1,4 +1,2 @@
 7.6 OE
 ======
-7.10 /O
-=======

Index: 
test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2   
    3 Aug 2009 08:20:20 -0000       1.2
+++ 
test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2   
    6 Sep 2009 21:46:12 -0000       1.3
@@ -1 +1,2 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/o.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/o.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/o.txt   6 Jul 
2009 21:59:25 -0000       1.1
+++ test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/o.txt   6 Sep 
2009 21:46:12 -0000       1.2
@@ -10,3 +10,5 @@
 =====
 5.3 o~
 ======
+7.8 /o
+======

Index: test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/oe.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/oe.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/oe.txt  6 Jul 
2009 21:59:25 -0000       1.1
+++ test/encodings/res_all/nodetest_latin1_use_nodes_no_unicode/oe.txt  6 Sep 
2009 21:46:12 -0000       1.2
@@ -1,4 +1,2 @@
 7.3 oe
 ======
-7.8 /o
-======

Index: test/encodings/res_all/nodetest_to_utf8_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_to_utf8_latin1/nodetest_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_to_utf8_latin1/nodetest_latin1.2    3 Aug 
2009 08:20:21 -0000       1.2
+++ test/encodings/res_all/nodetest_to_utf8_latin1/nodetest_latin1.2    6 Sep 
2009 21:46:13 -0000       1.3
@@ -1 +1,2 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_use_nodes/O.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes/O.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes/O.txt     30 Aug 2009 18:59:53 
-0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes/O.txt     6 Sep 2009 21:46:13 
-0000       1.3
@@ -12,3 +12,5 @@
 A second one with accented char .
 6.9 O;
 ======
+8.10 /O
+=======

Index: test/encodings/res_all/nodetest_use_nodes/OE.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes/OE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes/OE.txt    30 Aug 2009 18:59:53 
-0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes/OE.txt    6 Sep 2009 21:46:13 
-0000       1.3
@@ -1,4 +1,2 @@
 8.6 OE
 ======
-8.10 /O
-=======

Index: test/encodings/res_all/nodetest_use_nodes/o.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes/o.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes/o.txt     30 Aug 2009 18:59:53 
-0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes/o.txt     6 Sep 2009 21:46:13 
-0000       1.3
@@ -12,3 +12,5 @@
 ======
 6.4 o;
 ======
+8.8 /o
+======

Index: test/encodings/res_all/nodetest_use_nodes/oe.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes/oe.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes/oe.txt    30 Aug 2009 18:59:53 
-0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes/oe.txt    6 Sep 2009 21:46:13 
-0000       1.3
@@ -1,4 +1,2 @@
 8.3 oe
 ======
-8.8 /o
-======

Index: test/encodings/res_all/nodetest_use_nodes_no_unicode/O.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unicode/O.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes_no_unicode/O.txt  30 Aug 2009 
18:59:53 -0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes_no_unicode/O.txt  6 Sep 2009 
21:46:13 -0000       1.3
@@ -12,3 +12,5 @@
 A second one with accented char .
 6.9 O;
 ======
+8.10 /O
+=======

Index: test/encodings/res_all/nodetest_use_nodes_no_unicode/OE.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unicode/OE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes_no_unicode/OE.txt 30 Aug 2009 
18:59:53 -0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes_no_unicode/OE.txt 6 Sep 2009 
21:46:13 -0000       1.3
@@ -1,4 +1,2 @@
 8.6 OE
 ======
-8.10 /O
-=======

Index: test/encodings/res_all/nodetest_use_nodes_no_unicode/o.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unicode/o.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes_no_unicode/o.txt  30 Aug 2009 
18:59:53 -0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes_no_unicode/o.txt  6 Sep 2009 
21:46:13 -0000       1.3
@@ -12,3 +12,5 @@
 ======
 6.4 o;
 ======
+8.8 /o
+======

Index: test/encodings/res_all/nodetest_use_nodes_no_unicode/oe.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unicode/oe.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes_no_unicode/oe.txt 30 Aug 2009 
18:59:53 -0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes_no_unicode/oe.txt 6 Sep 2009 
21:46:13 -0000       1.3
@@ -1,4 +1,2 @@
 8.3 oe
 ======
-8.8 /o
-======

Index: test/encodings/res_all/nodetest_use_nodes_no_unidecode/O.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unidecode/O.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes_no_unidecode/O.txt        30 Aug 
2009 18:59:53 -0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes_no_unidecode/O.txt        6 Sep 
2009 21:46:13 -0000       1.3
@@ -12,3 +12,5 @@
 A second one with accented char .
 6.9 O;
 ======
+8.10 /O
+=======

Index: test/encodings/res_all/nodetest_use_nodes_no_unidecode/OE.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unidecode/OE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes_no_unidecode/OE.txt       30 Aug 
2009 18:59:53 -0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes_no_unidecode/OE.txt       6 Sep 
2009 21:46:13 -0000       1.3
@@ -1,4 +1,2 @@
 8.6 OE
 ======
-8.10 /O
-=======

Index: test/encodings/res_all/nodetest_use_nodes_no_unidecode/o.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unidecode/o.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes_no_unidecode/o.txt        30 Aug 
2009 18:59:53 -0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes_no_unidecode/o.txt        6 Sep 
2009 21:46:13 -0000       1.3
@@ -12,3 +12,5 @@
 ======
 6.4 o;
 ======
+8.8 /o
+======

Index: test/encodings/res_all/nodetest_use_nodes_no_unidecode/oe.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_use_nodes_no_unidecode/oe.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_use_nodes_no_unidecode/oe.txt       30 Aug 
2009 18:59:53 -0000      1.2
+++ test/encodings/res_all/nodetest_use_nodes_no_unidecode/oe.txt       6 Sep 
2009 21:46:13 -0000       1.3
@@ -1,4 +1,2 @@
 8.3 oe
 ======
-8.8 /o
-======

Index: test/encodings/res_all/nodetest_utf8/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8/nodetest_utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_utf8/nodetest_utf8.2        3 Aug 2009 
08:20:21 -0000       1.2
+++ test/encodings/res_all/nodetest_utf8/nodetest_utf8.2        6 Sep 2009 
21:46:14 -0000       1.3
@@ -1 +1,2 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_utf8_no_unicode/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_no_unicode/nodetest_utf8.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res_all/nodetest_utf8_no_unicode/nodetest_utf8.2     6 Sep 
2009 12:52:49 -0000       1.3
+++ test/encodings/res_all/nodetest_utf8_no_unicode/nodetest_utf8.2     6 Sep 
2009 21:46:14 -0000       1.4
@@ -1,2 +1,3 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 warning: Document encoding is utf8, but there is no unicode support
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_utf8_use_nodes/O.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/O.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_utf8_use_nodes/O.txt        6 Jul 2009 
21:59:30 -0000       1.1
+++ test/encodings/res_all/nodetest_utf8_use_nodes/O.txt        6 Sep 2009 
21:46:14 -0000       1.2
@@ -10,3 +10,5 @@
 ======
 This marks the spot.
 A second one with accented char .
+7.10 /O
+=======

Index: test/encodings/res_all/nodetest_utf8_use_nodes/OE.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/OE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_utf8_use_nodes/OE.txt       6 Jul 2009 
21:59:30 -0000       1.1
+++ test/encodings/res_all/nodetest_utf8_use_nodes/OE.txt       6 Sep 2009 
21:46:14 -0000       1.2
@@ -1,4 +1,2 @@
 7.6 OE
 ======
-7.10 /O
-=======

Index: test/encodings/res_all/nodetest_utf8_use_nodes/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/nodetest_utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_utf8_use_nodes/nodetest_utf8.2      3 Aug 
2009 08:20:21 -0000       1.2
+++ test/encodings/res_all/nodetest_utf8_use_nodes/nodetest_utf8.2      6 Sep 
2009 21:46:14 -0000       1.3
@@ -1 +1,2 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_utf8_use_nodes/o.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/o.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_utf8_use_nodes/o.txt        6 Jul 2009 
21:59:30 -0000       1.1
+++ test/encodings/res_all/nodetest_utf8_use_nodes/o.txt        6 Sep 2009 
21:46:14 -0000       1.2
@@ -10,3 +10,5 @@
 =====
 5.3 o~
 ======
+7.8 /o
+======

Index: test/encodings/res_all/nodetest_utf8_use_nodes/oe.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes/oe.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_utf8_use_nodes/oe.txt       6 Jul 2009 
21:59:30 -0000       1.1
+++ test/encodings/res_all/nodetest_utf8_use_nodes/oe.txt       6 Sep 2009 
21:46:14 -0000       1.2
@@ -1,4 +1,2 @@
 7.3 oe
 ======
-7.8 /o
-======

Index: test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/O.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/O.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/O.txt   6 Jul 
2009 21:59:30 -0000       1.1
+++ test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/O.txt   6 Sep 
2009 21:46:14 -0000       1.2
@@ -10,3 +10,5 @@
 ======
 This marks the spot.
 A second one with accented char .
+7.10 /O
+=======

Index: test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/OE.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/OE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/OE.txt  6 Jul 
2009 21:59:30 -0000       1.1
+++ test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/OE.txt  6 Sep 
2009 21:46:14 -0000       1.2
@@ -1,4 +1,2 @@
 7.6 OE
 ======
-7.10 /O
-=======

Index: 
test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2 
3 Aug 2009 08:20:21 -0000       1.2
+++ test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2 
6 Sep 2009 21:46:14 -0000       1.3
@@ -1 +1,2 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/o.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/o.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/o.txt   6 Jul 
2009 21:59:31 -0000       1.1
+++ test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/o.txt   6 Sep 
2009 21:46:14 -0000       1.2
@@ -10,3 +10,5 @@
 =====
 5.3 o~
 ======
+7.8 /o
+======

Index: test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/oe.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/oe.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/oe.txt  6 Jul 
2009 21:59:31 -0000       1.1
+++ test/encodings/res_all/nodetest_utf8_use_nodes_no_unidecode/oe.txt  6 Sep 
2009 21:46:14 -0000       1.2
@@ -1,4 +1,2 @@
 7.3 oe
 ======
-7.8 /o
-======

Index: test/encodings/res_all/texi_nodetest_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/texi_nodetest_latin1/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/texi_nodetest_latin1/nodetest_latin1.2       6 Jul 
2009 21:59:32 -0000       1.1
+++ test/encodings/res_all/texi_nodetest_latin1/nodetest_latin1.2       6 Sep 
2009 21:46:14 -0000       1.2
@@ -0,0 +1 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding

Index: test/encodings/res_all/texi_nodetest_utf8/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_all/texi_nodetest_utf8/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_all/texi_nodetest_utf8/nodetest_utf8.2   6 Jul 2009 
21:59:32 -0000       1.1
+++ test/encodings/res_all/texi_nodetest_utf8/nodetest_utf8.2   6 Sep 2009 
21:46:15 -0000       1.2
@@ -0,0 +1 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding

Index: 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
   4 Aug 2009 07:58:28 -0000       1.2
+++ 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes/at_commands_in_refs_latin1.2
   6 Sep 2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
 Unknown option: node-files
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
        4 Aug 2009 07:58:28 -0000       1.2
+++ 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unicode/at_commands_in_refs_latin1.2
        6 Sep 2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
 Unknown option: node-files
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
      4 Aug 2009 07:58:28 -0000       1.2
+++ 
test/encodings/res_info/at_commands_in_refs_latin1_use_nodes_no_unidecode/at_commands_in_refs_latin1.2
      6 Sep 2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
 Unknown option: node-files
+at_commands_in_refs_latin1.texi:4: warning: Encoding latin1 is not a canonical 
texinfo encoding

Index: 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
       4 Aug 2009 07:58:28 -0000       1.2
+++ 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes/at_commands_in_refs_utf8.2
       6 Sep 2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
 Unknown option: node-files
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding

Index: 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
    6 Sep 2009 12:52:49 -0000       1.4
+++ 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unicode/at_commands_in_refs_utf8.2
    6 Sep 2009 21:46:15 -0000       1.5
@@ -1,2 +1,3 @@
 Unknown option: node-files
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding
 warning: Document encoding is utf8, but there is no unicode support

Index: 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
  4 Aug 2009 07:58:29 -0000       1.2
+++ 
test/encodings/res_info/at_commands_in_refs_utf8_use_nodes_no_unidecode/at_commands_in_refs_utf8.2
  6 Sep 2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
 Unknown option: node-files
+at_commands_in_refs_utf8.texi:4: warning: Encoding utf8 is not a canonical 
texinfo encoding

Index: test/encodings/res_info/encoding_index/encoding_index.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/encoding_index/encoding_index.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_info/encoding_index/encoding_index.2     3 Aug 2009 
08:20:22 -0000       1.2
+++ test/encodings/res_info/encoding_index/encoding_index.2     6 Sep 2009 
21:46:15 -0000       1.3
@@ -1 +1,2 @@
+encoding_index.texi:5: warning: Encoding ascii is not a canonical texinfo 
encoding
 encoding_index.texi:56: warning: Empty index entry for @cindex

Index: test/encodings/res_info/encoding_index/encoding_index.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/encoding_index/encoding_index.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
Binary files /tmp/cvs3yjKy9 and /tmp/cvshKK9RY differ

Index: test/encodings/res_info/encoding_index-latin1/encoding_index-latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/encoding_index-latin1/encoding_index-latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_info/encoding_index-latin1/encoding_index-latin1.2       
3 Aug 2009 08:20:22 -0000       1.2
+++ test/encodings/res_info/encoding_index-latin1/encoding_index-latin1.2       
6 Sep 2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-latin1.texi:5: warning: Encoding latin1 is not a canonical 
texinfo encoding
 encoding_index-latin1.texi:57: warning: Empty index entry for @cindex

Index: 
test/encodings/res_info/encoding_index-latin1_toutf8/encoding_index-latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/encoding_index-latin1_toutf8/encoding_index-latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- 
test/encodings/res_info/encoding_index-latin1_toutf8/encoding_index-latin1.2    
    3 Aug 2009 08:20:22 -0000       1.2
+++ 
test/encodings/res_info/encoding_index-latin1_toutf8/encoding_index-latin1.2    
    6 Sep 2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-latin1.texi:5: warning: Encoding latin1 is not a canonical 
texinfo encoding
 encoding_index-latin1.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res_info/encoding_index-utf8/encoding_index-utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/encoding_index-utf8/encoding_index-utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_info/encoding_index-utf8/encoding_index-utf8.2   3 Aug 
2009 08:20:22 -0000       1.2
+++ test/encodings/res_info/encoding_index-utf8/encoding_index-utf8.2   6 Sep 
2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-utf8.texi:5: warning: Encoding utf8 is not a canonical texinfo 
encoding
 encoding_index-utf8.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res_info/encoding_index-utf8_toutf8/encoding_index-utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/encoding_index-utf8_toutf8/encoding_index-utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_info/encoding_index-utf8_toutf8/encoding_index-utf8.2    
3 Aug 2009 08:20:22 -0000       1.2
+++ test/encodings/res_info/encoding_index-utf8_toutf8/encoding_index-utf8.2    
6 Sep 2009 21:46:15 -0000       1.3
@@ -1 +1,2 @@
+encoding_index-utf8.texi:5: warning: Encoding utf8 is not a canonical texinfo 
encoding
 encoding_index-utf8.texi:57: warning: Empty index entry for @cindex

Index: test/encodings/res_info/encoding_index_toutf8/encoding_index.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/encoding_index_toutf8/encoding_index.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_info/encoding_index_toutf8/encoding_index.2      3 Aug 
2009 08:20:22 -0000       1.2
+++ test/encodings/res_info/encoding_index_toutf8/encoding_index.2      6 Sep 
2009 21:46:16 -0000       1.3
@@ -1 +1,2 @@
+encoding_index.texi:5: warning: Encoding ascii is not a canonical texinfo 
encoding
 encoding_index.texi:56: warning: Empty index entry for @cindex

Index: test/encodings/res_info/formatting_converted_to_utf8/formatting.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/formatting_converted_to_utf8/formatting.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvslf9pSe and /tmp/cvs19ZRj4 differ

Index: test/encodings/res_info/formatting_fr/formatting.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/formatting_fr/formatting.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsiE6YWf and /tmp/cvsfUILq5 differ

Index: test/encodings/res_info/formatting_fr_icons/formatting.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/formatting_fr_icons/formatting.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
Binary files /tmp/cvsVmbSAe and /tmp/cvs9bW863 differ

Index: test/encodings/res_info/nodetest_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_latin1/nodetest_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_info/nodetest_latin1/nodetest_latin1.2   3 Aug 2009 
08:20:23 -0000       1.2
+++ test/encodings/res_info/nodetest_latin1/nodetest_latin1.2   6 Sep 2009 
21:46:16 -0000       1.3
@@ -1 +1,2 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_info/nodetest_latin1_no_unicode/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_latin1_no_unicode/nodetest_latin1.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_info/nodetest_latin1_no_unicode/nodetest_latin1.2        
3 Aug 2009 08:20:23 -0000       1.2
+++ test/encodings/res_info/nodetest_latin1_no_unicode/nodetest_latin1.2        
6 Sep 2009 21:46:16 -0000       1.3
@@ -1 +1,2 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_info/nodetest_latin1_use_nodes/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_latin1_use_nodes/nodetest_latin1.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res_info/nodetest_latin1_use_nodes/nodetest_latin1.2 4 Aug 
2009 07:58:30 -0000       1.3
+++ test/encodings/res_info/nodetest_latin1_use_nodes/nodetest_latin1.2 6 Sep 
2009 21:46:16 -0000       1.4
@@ -1,2 +1,3 @@
 Unknown option: node-files
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: 
test/encodings/res_info/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 
test/encodings/res_info/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2  
    4 Aug 2009 07:58:31 -0000       1.3
+++ 
test/encodings/res_info/nodetest_latin1_use_nodes_no_unicode/nodetest_latin1.2  
    6 Sep 2009 21:46:16 -0000       1.4
@@ -1,2 +1,3 @@
 Unknown option: node-files
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_info/nodetest_to_utf8_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_to_utf8_latin1/nodetest_latin1.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res_info/nodetest_to_utf8_latin1/nodetest_latin1.2   3 Aug 
2009 08:20:24 -0000       1.3
+++ test/encodings/res_info/nodetest_to_utf8_latin1/nodetest_latin1.2   6 Sep 
2009 21:46:16 -0000       1.4
@@ -1,3 +1,4 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding
 nodetest_latin1.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)
 nodetest_latin1.texi:48: warning: `.' or `,' must follow @xref.
 nodetest_latin1.texi:52: warning: `.' or `,' must follow @xref.

Index: test/encodings/res_info/nodetest_utf8/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_utf8/nodetest_utf8.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/encodings/res_info/nodetest_utf8/nodetest_utf8.2       3 Aug 2009 
08:20:24 -0000       1.2
+++ test/encodings/res_info/nodetest_utf8/nodetest_utf8.2       6 Sep 2009 
21:46:16 -0000       1.3
@@ -1 +1,2 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_info/nodetest_utf8_no_unicode/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_utf8_no_unicode/nodetest_utf8.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res_info/nodetest_utf8_no_unicode/nodetest_utf8.2    6 Sep 
2009 12:52:50 -0000       1.3
+++ test/encodings/res_info/nodetest_utf8_no_unicode/nodetest_utf8.2    6 Sep 
2009 21:46:16 -0000       1.4
@@ -1,2 +1,3 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 warning: Document encoding is utf8, but there is no unicode support
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_info/nodetest_utf8_use_nodes/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_utf8_use_nodes/nodetest_utf8.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res_info/nodetest_utf8_use_nodes/nodetest_utf8.2     4 Aug 
2009 07:58:35 -0000       1.3
+++ test/encodings/res_info/nodetest_utf8_use_nodes/nodetest_utf8.2     6 Sep 
2009 21:46:17 -0000       1.4
@@ -1,3 +1,4 @@
 Unknown option: node-files
 Unknown option: use-nodes
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: 
test/encodings/res_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- 
test/encodings/res_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2    
    4 Aug 2009 07:58:36 -0000       1.3
+++ 
test/encodings/res_info/nodetest_utf8_use_nodes_no_unidecode/nodetest_utf8.2    
    6 Sep 2009 21:46:17 -0000       1.4
@@ -1,3 +1,4 @@
 Unknown option: node-files
 Unknown option: use-nodes
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding
 nodetest_utf8.texi:273: Node equivalent with address@hidden' already used 
address@hidden' (l. 305)

Index: test/encodings/res_info/texi_nodetest_latin1/nodetest_latin1.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/texi_nodetest_latin1/nodetest_latin1.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_info/texi_nodetest_latin1/nodetest_latin1.2      6 Jul 
2009 21:59:52 -0000       1.1
+++ test/encodings/res_info/texi_nodetest_latin1/nodetest_latin1.2      6 Sep 
2009 21:46:17 -0000       1.2
@@ -0,0 +1 @@
+nodetest_latin1.texi:3: warning: Encoding latin1 is not a canonical texinfo 
encoding

Index: test/encodings/res_info/texi_nodetest_utf8/nodetest_utf8.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/encodings/res_info/texi_nodetest_utf8/nodetest_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/encodings/res_info/texi_nodetest_utf8/nodetest_utf8.2  6 Jul 2009 
21:59:52 -0000       1.1
+++ test/encodings/res_info/texi_nodetest_utf8/nodetest_utf8.2  6 Sep 2009 
21:46:17 -0000       1.2
@@ -0,0 +1 @@
+nodetest_utf8.texi:3: warning: Encoding utf8 is not a canonical texinfo 
encoding

Index: test/formatting/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- test/formatting/Makefile.in 2 Sep 2009 15:32:10 -0000       1.22
+++ test/formatting/Makefile.in 6 Sep 2009 21:46:17 -0000       1.23
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -165,7 +168,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  
test/formatting/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/formatting/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -184,6 +187,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -207,13 +211,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -244,6 +252,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -263,6 +272,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -271,18 +282,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -322,6 +343,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/formatting/res/comments_redefine_need/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/comments_redefine_need/comments.2,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/formatting/res/comments_redefine_need/comments.2       6 Sep 2009 
12:52:51 -0000       1.6
+++ test/formatting/res/comments_redefine_need/comments.2       6 Sep 2009 
21:46:17 -0000       1.7
@@ -1,4 +1,3 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument
 warning: Must specify a title with a title command or @top
 comments.texi:49: warning: Unknown command address@hidden'

Index: test/formatting/res/def_cmds_info/def_cmds.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/def_cmds_info/def_cmds.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/def_cmds_info/def_cmds.info     6 Sep 2009 12:52:51 
-0000       1.3
+++ test/formatting/res/def_cmds_info/def_cmds.info     6 Sep 2009 21:46:17 
-0000       1.4
@@ -437,26 +437,26 @@
 * `A4' of `A2':                          Top.                 (line 318)
 * A2:                                    Top.                 (line 296)
 * A3:                                    Top.                 (line 304)
-* A3:                                    Top.                 (line 312)
+* A3 <1>:                                Top.                 (line 312)
 * A4 of A2:                              Top.                 (line 316)
 * border-pattern:                        Top.                 (line 232)
 * border-pattern of Window:              Top.                 (line 235)
 * d-efcv_name:                           Top.                 (line  58)
-* d-efcv_name:                           Top.                 (line 158)
+* d-efcv_name <1>:                       Top.                 (line 158)
 * d-efivar_name:                         Top.                 (line  88)
-* d-efivar_name:                         Top.                 (line 188)
+* d-efivar_name <1>:                     Top.                 (line 188)
 * d-efopt_name:                          Top.                 (line  79)
-* d-efopt_name:                          Top.                 (line 179)
+* d-efopt_name <1>:                      Top.                 (line 179)
 * d-eftypeivar_name of c-lass:           Top.                 (line  91)
-* d-eftypeivar_name of c-lass:           Top.                 (line 191)
+* d-eftypeivar_name of c-lass <1>:       Top.                 (line 191)
 * d-eftypevar_name:                      Top.                 (line  85)
-* d-eftypevar_name:                      Top.                 (line 185)
+* d-eftypevar_name <1>:                  Top.                 (line 185)
 * d-eftypevr_name:                       Top.                 (line  55)
-* d-eftypevr_name:                       Top.                 (line 155)
+* d-eftypevr_name <1>:                   Top.                 (line 155)
 * d-efvar_name:                          Top.                 (line  76)
-* d-efvar_name:                          Top.                 (line 176)
+* d-efvar_name <1>:                      Top.                 (line 176)
 * d-efvr_name:                           Top.                 (line  46)
-* d-efvr_name:                           Top.                 (line 146)
+* d-efvr_name <1>:                       Top.                 (line 146)
 * enable:                                Top.                 (line 226)
 * fill-column:                           Top.                 (line 211)
 
@@ -466,7 +466,7 @@
 * )expose on )Window:                    Top.                 (line 256)
 * ,expose on ,Window:                    Top.                 (line 248)
 * ;expose on ;Window:                    Top.                 (line 264)
-* ;expose on ;Window:                    Top.                 (line 268)
+* ;expose on ;Window <1>:                Top.                 (line 268)
 * `A2':                                  Top.                 (line 294)
 * `A3':                                  Top.                 (line 302)
 * `A3' on `A2':                          Top.                 (line 322)
@@ -478,87 +478,87 @@
 * A3 on A2:                              Top.                 (line 320)
 * A4 on A2:                              Top.                 (line 324)
 * after:                                 Top.                 (line  37)
-* after:                                 Top.                 (line 137)
+* after <1>:                             Top.                 (line 137)
 * apply:                                 Top.                 (line 272)
 * bidule machin:                         Top.                 (line  26)
-* bidule machin:                         Top.                 (line 126)
+* bidule machin <1>:                     Top.                 (line 126)
 * d-effn_name:                           Top.                 (line   6)
-* d-effn_name:                           Top.                 (line 106)
+* d-effn_name <1>:                       Top.                 (line 106)
 * d-efmac_name:                          Top.                 (line  70)
-* d-efmac_name:                          Top.                 (line 170)
+* d-efmac_name <1>:                      Top.                 (line 170)
 * d-efmethod_name on c-lass:             Top.                 (line  94)
-* d-efmethod_name on c-lass:             Top.                 (line 194)
+* d-efmethod_name on c-lass <1>:         Top.                 (line 194)
 * d-efop_name on c-lass:                 Top.                 (line  61)
-* d-efop_name on c-lass:                 Top.                 (line 161)
+* d-efop_name on c-lass <1>:             Top.                 (line 161)
 * d-efspec_name:                         Top.                 (line  73)
-* d-efspec_name:                         Top.                 (line 173)
+* d-efspec_name <1>:                     Top.                 (line 173)
 * d-eftypefn_name:                       Top.                 (line  49)
-* d-eftypefn_name:                       Top.                 (line 149)
+* d-eftypefn_name <1>:                   Top.                 (line 149)
 * d-eftypefun_name:                      Top.                 (line  82)
-* d-eftypefun_name:                      Top.                 (line 182)
+* d-eftypefun_name <1>:                  Top.                 (line 182)
 * d-eftypemethod_name on c-lass:         Top.                 (line  97)
-* d-eftypemethod_name on c-lass:         Top.                 (line 197)
+* d-eftypemethod_name on c-lass <1>:     Top.                 (line 197)
 * d-eftypeop_name on c-lass:             Top.                 (line  52)
-* d-eftypeop_name on c-lass:             Top.                 (line 152)
+* d-eftypeop_name on c-lass <1>:         Top.                 (line 152)
 * d-efun_name:                           Top.                 (line  67)
-* d-efun_name:                           Top.                 (line 167)
+* d-efun_name <1>:                       Top.                 (line 167)
 * de-ffn_name:                           Top.                 (line   9)
-* de-ffn_name:                           Top.                 (line 109)
+* de-ffn_name <1>:                       Top.                 (line 109)
 * deffn:                                 Top.                 (line  41)
-* deffn:                                 Top.                 (line  43)
-* deffn:                                 Top.                 (line 141)
-* deffn:                                 Top.                 (line 143)
+* deffn <1>:                             Top.                 (line  43)
+* deffn <2>:                             Top.                 (line 141)
+* deffn <3>:                             Top.                 (line 143)
 * deffnx:                                Top.                 (line  39)
-* deffnx:                                Top.                 (line  44)
-* deffnx:                                Top.                 (line 139)
-* deffnx:                                Top.                 (line 144)
+* deffnx <1>:                            Top.                 (line  44)
+* deffnx <2>:                            Top.                 (line 139)
+* deffnx <3>:                            Top.                 (line 144)
 * e)xpose on W)indow:                    Top.                 (line 254)
 * e,xpose on W,indow:                    Top.                 (line 246)
 * e;xpose on W;indow:                    Top.                 (line 262)
-* e;xpose on W;indow:                    Top.                 (line 266)
+* e;xpose on W;indow <1>:                Top.                 (line 266)
 * expose on Window:                      Top.                 (line 244)
 * expose on windows:                     Top.                 (line 238)
 * expose on `com':                       Top.                 (line 270)
 * followed:                              Top.                 (line  31)
-* followed:                              Top.                 (line 131)
+* followed <1>:                          Top.                 (line 131)
 * foobar:                                Top.                 (line 214)
-* foobar:                                Top.                 (line 216)
+* foobar <1>:                            Top.                 (line 216)
 * foobug:                                Top.                 (line 221)
 * FORWARD-CHAR:                          Top.                 (line 208)
 * I:                                     Top.                 (line  13)
-* I:                                     Top.                 (line 113)
+* I <1>:                                 Top.                 (line 113)
 * id ule:                                Top.                 (line  18)
-* id ule:                                Top.                 (line 118)
+* id ule <1>:                            Top.                 (line 118)
 * id `i' ule:                            Top.                 (line  19)
-* id `i' ule:                            Top.                 (line 119)
+* id `i' ule <1>:                        Top.                 (line 119)
 * indow on W:                            Top.                 (line 241)
-* indow on W:                            Top.                 (line 250)
-* indow on W:                            Top.                 (line 258)
+* indow on W <1>:                        Top.                 (line 250)
+* indow on W <2>:                        Top.                 (line 258)
 * log trap:                              Top.                 (line  15)
-* log trap:                              Top.                 (line 115)
+* log trap <1>:                          Top.                 (line 115)
 * log trap1:                             Top.                 (line  16)
-* log trap1:                             Top.                 (line 116)
+* log trap1 <1>:                         Top.                 (line 116)
 * log trap2:                             Top.                 (line  17)
-* log trap2:                             Top.                 (line 117)
+* log trap2 <1>:                         Top.                 (line 117)
 * machin:                                Top.                 (line  25)
-* machin:                                Top.                 (line  27)
-* machin:                                Top.                 (line  32)
-* machin:                                Top.                 (line  33)
-* machin:                                Top.                 (line  34)
-* machin:                                Top.                 (line  35)
-* machin:                                Top.                 (line 125)
-* machin:                                Top.                 (line 127)
-* machin:                                Top.                 (line 132)
-* machin:                                Top.                 (line 133)
-* machin:                                Top.                 (line 134)
-* machin:                                Top.                 (line 135)
+* machin <1>:                            Top.                 (line  27)
+* machin <2>:                            Top.                 (line  32)
+* machin <3>:                            Top.                 (line  33)
+* machin <4>:                            Top.                 (line  34)
+* machin <5>:                            Top.                 (line  35)
+* machin <6>:                            Top.                 (line 125)
+* machin <7>:                            Top.                 (line 127)
+* machin <8>:                            Top.                 (line 132)
+* machin <9>:                            Top.                 (line 133)
+* machin <10>:                           Top.                 (line 134)
+* machin <11>:                           Top.                 (line 135)
 * name:                                  Top.                 (line 100)
-* name:                                  Top.                 (line 103)
-* name:                                  Top.                 (line 200)
-* name:                                  Top.                 (line 204)
+* name <1>:                              Top.                 (line 103)
+* name <2>:                              Top.                 (line 200)
+* name <3>:                              Top.                 (line 204)
 * push:                                  Top.                 (line 223)
 * truc:                                  Top.                 (line  14)
-* truc:                                  Top.                 (line 114)
+* truc <1>:                              Top.                 (line 114)
 
 
 

Index: test/formatting/res/formatting_info/formatting.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_info/formatting.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
Binary files /tmp/cvswaRl3o and /tmp/cvsBvLaUe differ

Index: test/formatting/res/heading_info/headings.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res/heading_info/headings.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvs70YFGn and /tmp/cvsR6q4yd differ

Index: test/formatting/res_all/comments_redefine_need/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_all/comments_redefine_need/comments.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res_all/comments_redefine_need/comments.2   3 Aug 2009 
08:21:12 -0000       1.3
+++ test/formatting/res_all/comments_redefine_need/comments.2   6 Sep 2009 
21:46:18 -0000       1.4
@@ -1,4 +1,3 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument
 comments.texi:49: warning: Unknown command address@hidden'
 comments.texi:53: warning: need has the right arg: 0.1

Index: test/formatting/res_all/def_cmds_info/def_cmds.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_all/def_cmds_info/def_cmds.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res_all/def_cmds_info/def_cmds.info 6 Sep 2009 12:52:59 
-0000       1.2
+++ test/formatting/res_all/def_cmds_info/def_cmds.info 6 Sep 2009 21:46:18 
-0000       1.3
@@ -437,26 +437,26 @@
 * `A4' of `A2':                          Top.                 (line 318)
 * A2:                                    Top.                 (line 296)
 * A3:                                    Top.                 (line 304)
-* A3:                                    Top.                 (line 312)
+* A3 <1>:                                Top.                 (line 312)
 * A4 of A2:                              Top.                 (line 316)
 * border-pattern:                        Top.                 (line 232)
 * border-pattern of Window:              Top.                 (line 235)
 * d-efcv_name:                           Top.                 (line  58)
-* d-efcv_name:                           Top.                 (line 158)
+* d-efcv_name <1>:                       Top.                 (line 158)
 * d-efivar_name:                         Top.                 (line  88)
-* d-efivar_name:                         Top.                 (line 188)
+* d-efivar_name <1>:                     Top.                 (line 188)
 * d-efopt_name:                          Top.                 (line  79)
-* d-efopt_name:                          Top.                 (line 179)
+* d-efopt_name <1>:                      Top.                 (line 179)
 * d-eftypeivar_name of c-lass:           Top.                 (line  91)
-* d-eftypeivar_name of c-lass:           Top.                 (line 191)
+* d-eftypeivar_name of c-lass <1>:       Top.                 (line 191)
 * d-eftypevar_name:                      Top.                 (line  85)
-* d-eftypevar_name:                      Top.                 (line 185)
+* d-eftypevar_name <1>:                  Top.                 (line 185)
 * d-eftypevr_name:                       Top.                 (line  55)
-* d-eftypevr_name:                       Top.                 (line 155)
+* d-eftypevr_name <1>:                   Top.                 (line 155)
 * d-efvar_name:                          Top.                 (line  76)
-* d-efvar_name:                          Top.                 (line 176)
+* d-efvar_name <1>:                      Top.                 (line 176)
 * d-efvr_name:                           Top.                 (line  46)
-* d-efvr_name:                           Top.                 (line 146)
+* d-efvr_name <1>:                       Top.                 (line 146)
 * enable:                                Top.                 (line 226)
 * fill-column:                           Top.                 (line 211)
 
@@ -466,7 +466,7 @@
 * )expose on )Window:                    Top.                 (line 256)
 * ,expose on ,Window:                    Top.                 (line 248)
 * ;expose on ;Window:                    Top.                 (line 264)
-* ;expose on ;Window:                    Top.                 (line 268)
+* ;expose on ;Window <1>:                Top.                 (line 268)
 * `A2':                                  Top.                 (line 294)
 * `A3':                                  Top.                 (line 302)
 * `A3' on `A2':                          Top.                 (line 322)
@@ -478,87 +478,87 @@
 * A3 on A2:                              Top.                 (line 320)
 * A4 on A2:                              Top.                 (line 324)
 * after:                                 Top.                 (line  37)
-* after:                                 Top.                 (line 137)
+* after <1>:                             Top.                 (line 137)
 * apply:                                 Top.                 (line 272)
 * bidule machin:                         Top.                 (line  26)
-* bidule machin:                         Top.                 (line 126)
+* bidule machin <1>:                     Top.                 (line 126)
 * d-effn_name:                           Top.                 (line   6)
-* d-effn_name:                           Top.                 (line 106)
+* d-effn_name <1>:                       Top.                 (line 106)
 * d-efmac_name:                          Top.                 (line  70)
-* d-efmac_name:                          Top.                 (line 170)
+* d-efmac_name <1>:                      Top.                 (line 170)
 * d-efmethod_name on c-lass:             Top.                 (line  94)
-* d-efmethod_name on c-lass:             Top.                 (line 194)
+* d-efmethod_name on c-lass <1>:         Top.                 (line 194)
 * d-efop_name on c-lass:                 Top.                 (line  61)
-* d-efop_name on c-lass:                 Top.                 (line 161)
+* d-efop_name on c-lass <1>:             Top.                 (line 161)
 * d-efspec_name:                         Top.                 (line  73)
-* d-efspec_name:                         Top.                 (line 173)
+* d-efspec_name <1>:                     Top.                 (line 173)
 * d-eftypefn_name:                       Top.                 (line  49)
-* d-eftypefn_name:                       Top.                 (line 149)
+* d-eftypefn_name <1>:                   Top.                 (line 149)
 * d-eftypefun_name:                      Top.                 (line  82)
-* d-eftypefun_name:                      Top.                 (line 182)
+* d-eftypefun_name <1>:                  Top.                 (line 182)
 * d-eftypemethod_name on c-lass:         Top.                 (line  97)
-* d-eftypemethod_name on c-lass:         Top.                 (line 197)
+* d-eftypemethod_name on c-lass <1>:     Top.                 (line 197)
 * d-eftypeop_name on c-lass:             Top.                 (line  52)
-* d-eftypeop_name on c-lass:             Top.                 (line 152)
+* d-eftypeop_name on c-lass <1>:         Top.                 (line 152)
 * d-efun_name:                           Top.                 (line  67)
-* d-efun_name:                           Top.                 (line 167)
+* d-efun_name <1>:                       Top.                 (line 167)
 * de-ffn_name:                           Top.                 (line   9)
-* de-ffn_name:                           Top.                 (line 109)
+* de-ffn_name <1>:                       Top.                 (line 109)
 * deffn:                                 Top.                 (line  41)
-* deffn:                                 Top.                 (line  43)
-* deffn:                                 Top.                 (line 141)
-* deffn:                                 Top.                 (line 143)
+* deffn <1>:                             Top.                 (line  43)
+* deffn <2>:                             Top.                 (line 141)
+* deffn <3>:                             Top.                 (line 143)
 * deffnx:                                Top.                 (line  39)
-* deffnx:                                Top.                 (line  44)
-* deffnx:                                Top.                 (line 139)
-* deffnx:                                Top.                 (line 144)
+* deffnx <1>:                            Top.                 (line  44)
+* deffnx <2>:                            Top.                 (line 139)
+* deffnx <3>:                            Top.                 (line 144)
 * e)xpose on W)indow:                    Top.                 (line 254)
 * e,xpose on W,indow:                    Top.                 (line 246)
 * e;xpose on W;indow:                    Top.                 (line 262)
-* e;xpose on W;indow:                    Top.                 (line 266)
+* e;xpose on W;indow <1>:                Top.                 (line 266)
 * expose on Window:                      Top.                 (line 244)
 * expose on windows:                     Top.                 (line 238)
 * expose on `com':                       Top.                 (line 270)
 * followed:                              Top.                 (line  31)
-* followed:                              Top.                 (line 131)
+* followed <1>:                          Top.                 (line 131)
 * foobar:                                Top.                 (line 214)
-* foobar:                                Top.                 (line 216)
+* foobar <1>:                            Top.                 (line 216)
 * foobug:                                Top.                 (line 221)
 * FORWARD-CHAR:                          Top.                 (line 208)
 * I:                                     Top.                 (line  13)
-* I:                                     Top.                 (line 113)
+* I <1>:                                 Top.                 (line 113)
 * id ule:                                Top.                 (line  18)
-* id ule:                                Top.                 (line 118)
+* id ule <1>:                            Top.                 (line 118)
 * id `i' ule:                            Top.                 (line  19)
-* id `i' ule:                            Top.                 (line 119)
+* id `i' ule <1>:                        Top.                 (line 119)
 * indow on W:                            Top.                 (line 241)
-* indow on W:                            Top.                 (line 250)
-* indow on W:                            Top.                 (line 258)
+* indow on W <1>:                        Top.                 (line 250)
+* indow on W <2>:                        Top.                 (line 258)
 * log trap:                              Top.                 (line  15)
-* log trap:                              Top.                 (line 115)
+* log trap <1>:                          Top.                 (line 115)
 * log trap1:                             Top.                 (line  16)
-* log trap1:                             Top.                 (line 116)
+* log trap1 <1>:                         Top.                 (line 116)
 * log trap2:                             Top.                 (line  17)
-* log trap2:                             Top.                 (line 117)
+* log trap2 <1>:                         Top.                 (line 117)
 * machin:                                Top.                 (line  25)
-* machin:                                Top.                 (line  27)
-* machin:                                Top.                 (line  32)
-* machin:                                Top.                 (line  33)
-* machin:                                Top.                 (line  34)
-* machin:                                Top.                 (line  35)
-* machin:                                Top.                 (line 125)
-* machin:                                Top.                 (line 127)
-* machin:                                Top.                 (line 132)
-* machin:                                Top.                 (line 133)
-* machin:                                Top.                 (line 134)
-* machin:                                Top.                 (line 135)
+* machin <1>:                            Top.                 (line  27)
+* machin <2>:                            Top.                 (line  32)
+* machin <3>:                            Top.                 (line  33)
+* machin <4>:                            Top.                 (line  34)
+* machin <5>:                            Top.                 (line  35)
+* machin <6>:                            Top.                 (line 125)
+* machin <7>:                            Top.                 (line 127)
+* machin <8>:                            Top.                 (line 132)
+* machin <9>:                            Top.                 (line 133)
+* machin <10>:                           Top.                 (line 134)
+* machin <11>:                           Top.                 (line 135)
 * name:                                  Top.                 (line 100)
-* name:                                  Top.                 (line 103)
-* name:                                  Top.                 (line 200)
-* name:                                  Top.                 (line 204)
+* name <1>:                              Top.                 (line 103)
+* name <2>:                              Top.                 (line 200)
+* name <3>:                              Top.                 (line 204)
 * push:                                  Top.                 (line 223)
 * truc:                                  Top.                 (line  14)
-* truc:                                  Top.                 (line 114)
+* truc <1>:                              Top.                 (line 114)
 
 
 

Index: test/formatting/res_all/formatting_info/formatting.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_all/formatting_info/formatting.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
Binary files /tmp/cvsU0w5or and /tmp/cvs18mmmh differ

Index: test/formatting/res_all/heading_info/headings.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_all/heading_info/headings.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvsnxLJaq and /tmp/cvsvHOz9f differ

Index: test/formatting/res_info/comments_redefine_need/comments.2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/comments_redefine_need/comments.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res_info/comments_redefine_need/comments.2  3 Aug 2009 
08:21:16 -0000       1.3
+++ test/formatting/res_info/comments_redefine_need/comments.2  6 Sep 2009 
21:46:18 -0000       1.4
@@ -1,4 +1,3 @@
-comments.texi:120: warning: Encoding name unknown: bad
 comments.texi:212: @clickstyle should only accept a macro as argument
 comments.texi:49: warning: Unknown command address@hidden'
 comments.texi:53: warning: need has the right arg: 0.1

Index: test/formatting/res_info/def_cmds/def_cmds.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/def_cmds/def_cmds.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res_info/def_cmds/def_cmds.info     6 Sep 2009 12:52:59 
-0000       1.2
+++ test/formatting/res_info/def_cmds/def_cmds.info     6 Sep 2009 21:46:18 
-0000       1.3
@@ -437,26 +437,26 @@
 * `A4' of `A2':                          Top.                 (line 318)
 * A2:                                    Top.                 (line 296)
 * A3:                                    Top.                 (line 304)
-* A3:                                    Top.                 (line 312)
+* A3 <1>:                                Top.                 (line 312)
 * A4 of A2:                              Top.                 (line 316)
 * border-pattern:                        Top.                 (line 232)
 * border-pattern of Window:              Top.                 (line 235)
 * d-efcv_name:                           Top.                 (line  58)
-* d-efcv_name:                           Top.                 (line 158)
+* d-efcv_name <1>:                       Top.                 (line 158)
 * d-efivar_name:                         Top.                 (line  88)
-* d-efivar_name:                         Top.                 (line 188)
+* d-efivar_name <1>:                     Top.                 (line 188)
 * d-efopt_name:                          Top.                 (line  79)
-* d-efopt_name:                          Top.                 (line 179)
+* d-efopt_name <1>:                      Top.                 (line 179)
 * d-eftypeivar_name of c-lass:           Top.                 (line  91)
-* d-eftypeivar_name of c-lass:           Top.                 (line 191)
+* d-eftypeivar_name of c-lass <1>:       Top.                 (line 191)
 * d-eftypevar_name:                      Top.                 (line  85)
-* d-eftypevar_name:                      Top.                 (line 185)
+* d-eftypevar_name <1>:                  Top.                 (line 185)
 * d-eftypevr_name:                       Top.                 (line  55)
-* d-eftypevr_name:                       Top.                 (line 155)
+* d-eftypevr_name <1>:                   Top.                 (line 155)
 * d-efvar_name:                          Top.                 (line  76)
-* d-efvar_name:                          Top.                 (line 176)
+* d-efvar_name <1>:                      Top.                 (line 176)
 * d-efvr_name:                           Top.                 (line  46)
-* d-efvr_name:                           Top.                 (line 146)
+* d-efvr_name <1>:                       Top.                 (line 146)
 * enable:                                Top.                 (line 226)
 * fill-column:                           Top.                 (line 211)
 
@@ -466,7 +466,7 @@
 * )expose on )Window:                    Top.                 (line 256)
 * ,expose on ,Window:                    Top.                 (line 248)
 * ;expose on ;Window:                    Top.                 (line 264)
-* ;expose on ;Window:                    Top.                 (line 268)
+* ;expose on ;Window <1>:                Top.                 (line 268)
 * `A2':                                  Top.                 (line 294)
 * `A3':                                  Top.                 (line 302)
 * `A3' on `A2':                          Top.                 (line 322)
@@ -478,87 +478,87 @@
 * A3 on A2:                              Top.                 (line 320)
 * A4 on A2:                              Top.                 (line 324)
 * after:                                 Top.                 (line  37)
-* after:                                 Top.                 (line 137)
+* after <1>:                             Top.                 (line 137)
 * apply:                                 Top.                 (line 272)
 * bidule machin:                         Top.                 (line  26)
-* bidule machin:                         Top.                 (line 126)
+* bidule machin <1>:                     Top.                 (line 126)
 * d-effn_name:                           Top.                 (line   6)
-* d-effn_name:                           Top.                 (line 106)
+* d-effn_name <1>:                       Top.                 (line 106)
 * d-efmac_name:                          Top.                 (line  70)
-* d-efmac_name:                          Top.                 (line 170)
+* d-efmac_name <1>:                      Top.                 (line 170)
 * d-efmethod_name on c-lass:             Top.                 (line  94)
-* d-efmethod_name on c-lass:             Top.                 (line 194)
+* d-efmethod_name on c-lass <1>:         Top.                 (line 194)
 * d-efop_name on c-lass:                 Top.                 (line  61)
-* d-efop_name on c-lass:                 Top.                 (line 161)
+* d-efop_name on c-lass <1>:             Top.                 (line 161)
 * d-efspec_name:                         Top.                 (line  73)
-* d-efspec_name:                         Top.                 (line 173)
+* d-efspec_name <1>:                     Top.                 (line 173)
 * d-eftypefn_name:                       Top.                 (line  49)
-* d-eftypefn_name:                       Top.                 (line 149)
+* d-eftypefn_name <1>:                   Top.                 (line 149)
 * d-eftypefun_name:                      Top.                 (line  82)
-* d-eftypefun_name:                      Top.                 (line 182)
+* d-eftypefun_name <1>:                  Top.                 (line 182)
 * d-eftypemethod_name on c-lass:         Top.                 (line  97)
-* d-eftypemethod_name on c-lass:         Top.                 (line 197)
+* d-eftypemethod_name on c-lass <1>:     Top.                 (line 197)
 * d-eftypeop_name on c-lass:             Top.                 (line  52)
-* d-eftypeop_name on c-lass:             Top.                 (line 152)
+* d-eftypeop_name on c-lass <1>:         Top.                 (line 152)
 * d-efun_name:                           Top.                 (line  67)
-* d-efun_name:                           Top.                 (line 167)
+* d-efun_name <1>:                       Top.                 (line 167)
 * de-ffn_name:                           Top.                 (line   9)
-* de-ffn_name:                           Top.                 (line 109)
+* de-ffn_name <1>:                       Top.                 (line 109)
 * deffn:                                 Top.                 (line  41)
-* deffn:                                 Top.                 (line  43)
-* deffn:                                 Top.                 (line 141)
-* deffn:                                 Top.                 (line 143)
+* deffn <1>:                             Top.                 (line  43)
+* deffn <2>:                             Top.                 (line 141)
+* deffn <3>:                             Top.                 (line 143)
 * deffnx:                                Top.                 (line  39)
-* deffnx:                                Top.                 (line  44)
-* deffnx:                                Top.                 (line 139)
-* deffnx:                                Top.                 (line 144)
+* deffnx <1>:                            Top.                 (line  44)
+* deffnx <2>:                            Top.                 (line 139)
+* deffnx <3>:                            Top.                 (line 144)
 * e)xpose on W)indow:                    Top.                 (line 254)
 * e,xpose on W,indow:                    Top.                 (line 246)
 * e;xpose on W;indow:                    Top.                 (line 262)
-* e;xpose on W;indow:                    Top.                 (line 266)
+* e;xpose on W;indow <1>:                Top.                 (line 266)
 * expose on Window:                      Top.                 (line 244)
 * expose on windows:                     Top.                 (line 238)
 * expose on `com':                       Top.                 (line 270)
 * followed:                              Top.                 (line  31)
-* followed:                              Top.                 (line 131)
+* followed <1>:                          Top.                 (line 131)
 * foobar:                                Top.                 (line 214)
-* foobar:                                Top.                 (line 216)
+* foobar <1>:                            Top.                 (line 216)
 * foobug:                                Top.                 (line 221)
 * FORWARD-CHAR:                          Top.                 (line 208)
 * I:                                     Top.                 (line  13)
-* I:                                     Top.                 (line 113)
+* I <1>:                                 Top.                 (line 113)
 * id ule:                                Top.                 (line  18)
-* id ule:                                Top.                 (line 118)
+* id ule <1>:                            Top.                 (line 118)
 * id `i' ule:                            Top.                 (line  19)
-* id `i' ule:                            Top.                 (line 119)
+* id `i' ule <1>:                        Top.                 (line 119)
 * indow on W:                            Top.                 (line 241)
-* indow on W:                            Top.                 (line 250)
-* indow on W:                            Top.                 (line 258)
+* indow on W <1>:                        Top.                 (line 250)
+* indow on W <2>:                        Top.                 (line 258)
 * log trap:                              Top.                 (line  15)
-* log trap:                              Top.                 (line 115)
+* log trap <1>:                          Top.                 (line 115)
 * log trap1:                             Top.                 (line  16)
-* log trap1:                             Top.                 (line 116)
+* log trap1 <1>:                         Top.                 (line 116)
 * log trap2:                             Top.                 (line  17)
-* log trap2:                             Top.                 (line 117)
+* log trap2 <1>:                         Top.                 (line 117)
 * machin:                                Top.                 (line  25)
-* machin:                                Top.                 (line  27)
-* machin:                                Top.                 (line  32)
-* machin:                                Top.                 (line  33)
-* machin:                                Top.                 (line  34)
-* machin:                                Top.                 (line  35)
-* machin:                                Top.                 (line 125)
-* machin:                                Top.                 (line 127)
-* machin:                                Top.                 (line 132)
-* machin:                                Top.                 (line 133)
-* machin:                                Top.                 (line 134)
-* machin:                                Top.                 (line 135)
+* machin <1>:                            Top.                 (line  27)
+* machin <2>:                            Top.                 (line  32)
+* machin <3>:                            Top.                 (line  33)
+* machin <4>:                            Top.                 (line  34)
+* machin <5>:                            Top.                 (line  35)
+* machin <6>:                            Top.                 (line 125)
+* machin <7>:                            Top.                 (line 127)
+* machin <8>:                            Top.                 (line 132)
+* machin <9>:                            Top.                 (line 133)
+* machin <10>:                           Top.                 (line 134)
+* machin <11>:                           Top.                 (line 135)
 * name:                                  Top.                 (line 100)
-* name:                                  Top.                 (line 103)
-* name:                                  Top.                 (line 200)
-* name:                                  Top.                 (line 204)
+* name <1>:                              Top.                 (line 103)
+* name <2>:                              Top.                 (line 200)
+* name <3>:                              Top.                 (line 204)
 * push:                                  Top.                 (line 223)
 * truc:                                  Top.                 (line  14)
-* truc:                                  Top.                 (line 114)
+* truc <1>:                              Top.                 (line 114)
 
 
 

Index: test/formatting/res_info/def_cmds_info/def_cmds.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/def_cmds_info/def_cmds.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res_info/def_cmds_info/def_cmds.info        6 Sep 2009 
12:53:00 -0000       1.2
+++ test/formatting/res_info/def_cmds_info/def_cmds.info        6 Sep 2009 
21:46:19 -0000       1.3
@@ -437,26 +437,26 @@
 * `A4' of `A2':                          Top.                 (line 318)
 * A2:                                    Top.                 (line 296)
 * A3:                                    Top.                 (line 304)
-* A3:                                    Top.                 (line 312)
+* A3 <1>:                                Top.                 (line 312)
 * A4 of A2:                              Top.                 (line 316)
 * border-pattern:                        Top.                 (line 232)
 * border-pattern of Window:              Top.                 (line 235)
 * d-efcv_name:                           Top.                 (line  58)
-* d-efcv_name:                           Top.                 (line 158)
+* d-efcv_name <1>:                       Top.                 (line 158)
 * d-efivar_name:                         Top.                 (line  88)
-* d-efivar_name:                         Top.                 (line 188)
+* d-efivar_name <1>:                     Top.                 (line 188)
 * d-efopt_name:                          Top.                 (line  79)
-* d-efopt_name:                          Top.                 (line 179)
+* d-efopt_name <1>:                      Top.                 (line 179)
 * d-eftypeivar_name of c-lass:           Top.                 (line  91)
-* d-eftypeivar_name of c-lass:           Top.                 (line 191)
+* d-eftypeivar_name of c-lass <1>:       Top.                 (line 191)
 * d-eftypevar_name:                      Top.                 (line  85)
-* d-eftypevar_name:                      Top.                 (line 185)
+* d-eftypevar_name <1>:                  Top.                 (line 185)
 * d-eftypevr_name:                       Top.                 (line  55)
-* d-eftypevr_name:                       Top.                 (line 155)
+* d-eftypevr_name <1>:                   Top.                 (line 155)
 * d-efvar_name:                          Top.                 (line  76)
-* d-efvar_name:                          Top.                 (line 176)
+* d-efvar_name <1>:                      Top.                 (line 176)
 * d-efvr_name:                           Top.                 (line  46)
-* d-efvr_name:                           Top.                 (line 146)
+* d-efvr_name <1>:                       Top.                 (line 146)
 * enable:                                Top.                 (line 226)
 * fill-column:                           Top.                 (line 211)
 
@@ -466,7 +466,7 @@
 * )expose on )Window:                    Top.                 (line 256)
 * ,expose on ,Window:                    Top.                 (line 248)
 * ;expose on ;Window:                    Top.                 (line 264)
-* ;expose on ;Window:                    Top.                 (line 268)
+* ;expose on ;Window <1>:                Top.                 (line 268)
 * `A2':                                  Top.                 (line 294)
 * `A3':                                  Top.                 (line 302)
 * `A3' on `A2':                          Top.                 (line 322)
@@ -478,87 +478,87 @@
 * A3 on A2:                              Top.                 (line 320)
 * A4 on A2:                              Top.                 (line 324)
 * after:                                 Top.                 (line  37)
-* after:                                 Top.                 (line 137)
+* after <1>:                             Top.                 (line 137)
 * apply:                                 Top.                 (line 272)
 * bidule machin:                         Top.                 (line  26)
-* bidule machin:                         Top.                 (line 126)
+* bidule machin <1>:                     Top.                 (line 126)
 * d-effn_name:                           Top.                 (line   6)
-* d-effn_name:                           Top.                 (line 106)
+* d-effn_name <1>:                       Top.                 (line 106)
 * d-efmac_name:                          Top.                 (line  70)
-* d-efmac_name:                          Top.                 (line 170)
+* d-efmac_name <1>:                      Top.                 (line 170)
 * d-efmethod_name on c-lass:             Top.                 (line  94)
-* d-efmethod_name on c-lass:             Top.                 (line 194)
+* d-efmethod_name on c-lass <1>:         Top.                 (line 194)
 * d-efop_name on c-lass:                 Top.                 (line  61)
-* d-efop_name on c-lass:                 Top.                 (line 161)
+* d-efop_name on c-lass <1>:             Top.                 (line 161)
 * d-efspec_name:                         Top.                 (line  73)
-* d-efspec_name:                         Top.                 (line 173)
+* d-efspec_name <1>:                     Top.                 (line 173)
 * d-eftypefn_name:                       Top.                 (line  49)
-* d-eftypefn_name:                       Top.                 (line 149)
+* d-eftypefn_name <1>:                   Top.                 (line 149)
 * d-eftypefun_name:                      Top.                 (line  82)
-* d-eftypefun_name:                      Top.                 (line 182)
+* d-eftypefun_name <1>:                  Top.                 (line 182)
 * d-eftypemethod_name on c-lass:         Top.                 (line  97)
-* d-eftypemethod_name on c-lass:         Top.                 (line 197)
+* d-eftypemethod_name on c-lass <1>:     Top.                 (line 197)
 * d-eftypeop_name on c-lass:             Top.                 (line  52)
-* d-eftypeop_name on c-lass:             Top.                 (line 152)
+* d-eftypeop_name on c-lass <1>:         Top.                 (line 152)
 * d-efun_name:                           Top.                 (line  67)
-* d-efun_name:                           Top.                 (line 167)
+* d-efun_name <1>:                       Top.                 (line 167)
 * de-ffn_name:                           Top.                 (line   9)
-* de-ffn_name:                           Top.                 (line 109)
+* de-ffn_name <1>:                       Top.                 (line 109)
 * deffn:                                 Top.                 (line  41)
-* deffn:                                 Top.                 (line  43)
-* deffn:                                 Top.                 (line 141)
-* deffn:                                 Top.                 (line 143)
+* deffn <1>:                             Top.                 (line  43)
+* deffn <2>:                             Top.                 (line 141)
+* deffn <3>:                             Top.                 (line 143)
 * deffnx:                                Top.                 (line  39)
-* deffnx:                                Top.                 (line  44)
-* deffnx:                                Top.                 (line 139)
-* deffnx:                                Top.                 (line 144)
+* deffnx <1>:                            Top.                 (line  44)
+* deffnx <2>:                            Top.                 (line 139)
+* deffnx <3>:                            Top.                 (line 144)
 * e)xpose on W)indow:                    Top.                 (line 254)
 * e,xpose on W,indow:                    Top.                 (line 246)
 * e;xpose on W;indow:                    Top.                 (line 262)
-* e;xpose on W;indow:                    Top.                 (line 266)
+* e;xpose on W;indow <1>:                Top.                 (line 266)
 * expose on Window:                      Top.                 (line 244)
 * expose on windows:                     Top.                 (line 238)
 * expose on `com':                       Top.                 (line 270)
 * followed:                              Top.                 (line  31)
-* followed:                              Top.                 (line 131)
+* followed <1>:                          Top.                 (line 131)
 * foobar:                                Top.                 (line 214)
-* foobar:                                Top.                 (line 216)
+* foobar <1>:                            Top.                 (line 216)
 * foobug:                                Top.                 (line 221)
 * FORWARD-CHAR:                          Top.                 (line 208)
 * I:                                     Top.                 (line  13)
-* I:                                     Top.                 (line 113)
+* I <1>:                                 Top.                 (line 113)
 * id ule:                                Top.                 (line  18)
-* id ule:                                Top.                 (line 118)
+* id ule <1>:                            Top.                 (line 118)
 * id `i' ule:                            Top.                 (line  19)
-* id `i' ule:                            Top.                 (line 119)
+* id `i' ule <1>:                        Top.                 (line 119)
 * indow on W:                            Top.                 (line 241)
-* indow on W:                            Top.                 (line 250)
-* indow on W:                            Top.                 (line 258)
+* indow on W <1>:                        Top.                 (line 250)
+* indow on W <2>:                        Top.                 (line 258)
 * log trap:                              Top.                 (line  15)
-* log trap:                              Top.                 (line 115)
+* log trap <1>:                          Top.                 (line 115)
 * log trap1:                             Top.                 (line  16)
-* log trap1:                             Top.                 (line 116)
+* log trap1 <1>:                         Top.                 (line 116)
 * log trap2:                             Top.                 (line  17)
-* log trap2:                             Top.                 (line 117)
+* log trap2 <1>:                         Top.                 (line 117)
 * machin:                                Top.                 (line  25)
-* machin:                                Top.                 (line  27)
-* machin:                                Top.                 (line  32)
-* machin:                                Top.                 (line  33)
-* machin:                                Top.                 (line  34)
-* machin:                                Top.                 (line  35)
-* machin:                                Top.                 (line 125)
-* machin:                                Top.                 (line 127)
-* machin:                                Top.                 (line 132)
-* machin:                                Top.                 (line 133)
-* machin:                                Top.                 (line 134)
-* machin:                                Top.                 (line 135)
+* machin <1>:                            Top.                 (line  27)
+* machin <2>:                            Top.                 (line  32)
+* machin <3>:                            Top.                 (line  33)
+* machin <4>:                            Top.                 (line  34)
+* machin <5>:                            Top.                 (line  35)
+* machin <6>:                            Top.                 (line 125)
+* machin <7>:                            Top.                 (line 127)
+* machin <8>:                            Top.                 (line 132)
+* machin <9>:                            Top.                 (line 133)
+* machin <10>:                           Top.                 (line 134)
+* machin <11>:                           Top.                 (line 135)
 * name:                                  Top.                 (line 100)
-* name:                                  Top.                 (line 103)
-* name:                                  Top.                 (line 200)
-* name:                                  Top.                 (line 204)
+* name <1>:                              Top.                 (line 103)
+* name <2>:                              Top.                 (line 200)
+* name <3>:                              Top.                 (line 204)
 * push:                                  Top.                 (line 223)
 * truc:                                  Top.                 (line  14)
-* truc:                                  Top.                 (line 114)
+* truc <1>:                              Top.                 (line 114)
 
 
 

Index: test/formatting/res_info/float_copying/float_copying.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/float_copying/float_copying.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
Binary files /tmp/cvs1ltUys and /tmp/cvsxiizDi differ

Index: test/formatting/res_info/formatting_info/formatting.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/formatting_info/formatting.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
Binary files /tmp/cvs2dL6Fs and /tmp/cvstZWJMi differ

Index: test/formatting/res_info/formatting_weird_quotes/formatting.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/formatting_weird_quotes/formatting.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
Binary files /tmp/cvsVlTIZv and /tmp/cvshAOM8l differ

Index: test/formatting/res_info/heading/headings.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/heading/headings.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvsKBDeZw and /tmp/cvsh3VV9m differ

Index: test/formatting/res_info/heading_info/headings.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/heading_info/headings.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvs9H86mv and /tmp/cvsnx14yl differ

Index: test/formatting/res_info/inter_item_commands/inter_item_commands.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/formatting/res_info/inter_item_commands/inter_item_commands.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvs4yFzZv and /tmp/cvsv0GXcm differ

Index: test/htmlxref/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/htmlxref/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/htmlxref/Makefile.in   10 Aug 2009 10:00:47 -0000      1.9
+++ test/htmlxref/Makefile.in   6 Sep 2009 21:46:19 -0000       1.10
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,7 +150,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/htmlxref/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/htmlxref/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -166,6 +169,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -189,13 +193,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -226,6 +234,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -245,6 +254,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -253,18 +264,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -304,6 +325,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/htmlxref-only_mono/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/htmlxref-only_mono/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/htmlxref-only_mono/Makefile.in 10 Aug 2009 10:00:47 -0000      1.9
+++ test/htmlxref-only_mono/Makefile.in 6 Sep 2009 21:46:19 -0000       1.10
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,7 +150,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  
test/htmlxref-only_mono/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/htmlxref-only_mono/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -166,6 +169,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -189,13 +193,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -226,6 +234,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -245,6 +254,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -253,18 +264,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -304,6 +325,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/htmlxref-only_split/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/htmlxref-only_split/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/htmlxref-only_split/Makefile.in        10 Aug 2009 10:00:48 -0000      
1.9
+++ test/htmlxref-only_split/Makefile.in        6 Sep 2009 21:46:19 -0000       
1.10
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,7 +150,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  
test/htmlxref-only_split/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/htmlxref-only_split/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -166,6 +169,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -189,13 +193,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -226,6 +234,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -245,6 +254,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -253,18 +264,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -304,6 +325,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/indices/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/indices/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/indices/Makefile.in    3 Sep 2009 15:06:09 -0000       1.12
+++ test/indices/Makefile.in    6 Sep 2009 21:46:20 -0000       1.13
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -154,7 +157,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/indices/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/indices/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -173,6 +176,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -196,13 +200,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -233,6 +241,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -252,6 +261,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -260,18 +271,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -311,6 +332,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/indices/res_info/double_index_entry/double_index_entry.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/double_index_entry/double_index_entry.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvszknufB and /tmp/cvsFMWWAr differ

Index: test/indices/res_info/index_no_node/index_no_node
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/index_no_node/index_no_node,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvsWFUdMB and /tmp/cvsBXkb9r differ

Index: test/indices/res_info/index_no_node_no_top/index_no_node_no_top.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/index_no_node_no_top/index_no_node_no_top.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvsz1YEeA and /tmp/cvsHHXVCq differ

Index: test/indices/res_info/index_nodes/index_nodes
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/index_nodes/index_nodes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsUKiPLA and /tmp/cvsdzIqbr differ

Index: test/indices/res_info/index_special_region/index_special_region.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/index_special_region/index_special_region.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsnF2spD and /tmp/cvs1F4lQt differ

Index: test/indices/res_info/index_split/index_split
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/index_split/index_split,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvskHbf7D and /tmp/cvsn2iszu differ

Index: test/indices/res_info/index_table/index_table.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/index_table/index_table.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvs9CgxjC and /tmp/cvshONaNs differ

Index: test/indices/res_info/index_table_chapter/index_table.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/index_table_chapter/index_table.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvsgowjXC and /tmp/cvshj4ost differ

Index: 
test/indices/res_info/printindex_between_node_section/printindex_between_node_section.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/printindex_between_node_section/printindex_between_node_section.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsXds79C and /tmp/cvspcCwGt differ

Index: test/indices/res_info/split_chapter_index/split_chapter_index
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/indices/res_info/split_chapter_index/split_chapter_index,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvs8QBQ4F and /tmp/cvshVovCw differ

Index: test/info_coverage/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/info_coverage/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/info_coverage/Makefile.in      10 Aug 2009 10:00:57 -0000      1.5
+++ test/info_coverage/Makefile.in      6 Sep 2009 21:46:21 -0000       1.6
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -166,7 +169,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  
test/info_coverage/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/info_coverage/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -185,6 +188,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -208,13 +212,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -245,6 +253,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -264,6 +273,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -272,18 +283,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -323,6 +344,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/info_coverage/res_info/def_cmds/def_cmds.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/info_coverage/res_info/def_cmds/def_cmds.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/info_coverage/res_info/def_cmds/def_cmds.info  6 Sep 2009 12:53:15 
-0000       1.2
+++ test/info_coverage/res_info/def_cmds/def_cmds.info  6 Sep 2009 21:46:21 
-0000       1.3
@@ -406,26 +406,26 @@
 * `A4' of `A2':                          Top.                 (line 297)
 * A2:                                    Top.                 (line 275)
 * A3:                                    Top.                 (line 283)
-* A3:                                    Top.                 (line 291)
+* A3 <1>:                                Top.                 (line 291)
 * A4 of A2:                              Top.                 (line 295)
 * border-pattern:                        Top.                 (line 211)
 * border-pattern of Window:              Top.                 (line 214)
 * d-efcv_name:                           Top.                 (line  54)
-* d-efcv_name:                           Top.                 (line 144)
+* d-efcv_name <1>:                       Top.                 (line 144)
 * d-efivar_name:                         Top.                 (line  84)
-* d-efivar_name:                         Top.                 (line 174)
+* d-efivar_name <1>:                     Top.                 (line 174)
 * d-efopt_name:                          Top.                 (line  75)
-* d-efopt_name:                          Top.                 (line 165)
+* d-efopt_name <1>:                      Top.                 (line 165)
 * d-eftypeivar_name of c-lass:           Top.                 (line  87)
-* d-eftypeivar_name of c-lass:           Top.                 (line 177)
+* d-eftypeivar_name of c-lass <1>:       Top.                 (line 177)
 * d-eftypevar_name:                      Top.                 (line  81)
-* d-eftypevar_name:                      Top.                 (line 171)
+* d-eftypevar_name <1>:                  Top.                 (line 171)
 * d-eftypevr_name:                       Top.                 (line  51)
-* d-eftypevr_name:                       Top.                 (line 141)
+* d-eftypevr_name <1>:                   Top.                 (line 141)
 * d-efvar_name:                          Top.                 (line  72)
-* d-efvar_name:                          Top.                 (line 162)
+* d-efvar_name <1>:                      Top.                 (line 162)
 * d-efvr_name:                           Top.                 (line  42)
-* d-efvr_name:                           Top.                 (line 132)
+* d-efvr_name <1>:                       Top.                 (line 132)
 * enable:                                Top.                 (line 205)
 * fill-column:                           Top.                 (line 190)
 
@@ -435,7 +435,7 @@
 * )expose on )Window:                    Top.                 (line 235)
 * ,expose on ,Window:                    Top.                 (line 227)
 * ;expose on ;Window:                    Top.                 (line 243)
-* ;expose on ;Window:                    Top.                 (line 247)
+* ;expose on ;Window <1>:                Top.                 (line 247)
 * `A2':                                  Top.                 (line 273)
 * `A3':                                  Top.                 (line 281)
 * `A3' on `A2':                          Top.                 (line 301)
@@ -447,75 +447,75 @@
 * A3 on A2:                              Top.                 (line 299)
 * A4 on A2:                              Top.                 (line 303)
 * after:                                 Top.                 (line  33)
-* after:                                 Top.                 (line 123)
+* after <1>:                             Top.                 (line 123)
 * apply:                                 Top.                 (line 251)
 * bidule machin:                         Top.                 (line  26)
-* bidule machin:                         Top.                 (line 116)
+* bidule machin <1>:                     Top.                 (line 116)
 * d-effn_name:                           Top.                 (line   6)
-* d-effn_name:                           Top.                 (line  96)
+* d-effn_name <1>:                       Top.                 (line  96)
 * d-efmac_name:                          Top.                 (line  66)
-* d-efmac_name:                          Top.                 (line 156)
+* d-efmac_name <1>:                      Top.                 (line 156)
 * d-efmethod_name on c-lass:             Top.                 (line  90)
-* d-efmethod_name on c-lass:             Top.                 (line 180)
+* d-efmethod_name on c-lass <1>:         Top.                 (line 180)
 * d-efop_name on c-lass:                 Top.                 (line  57)
-* d-efop_name on c-lass:                 Top.                 (line 147)
+* d-efop_name on c-lass <1>:             Top.                 (line 147)
 * d-efspec_name:                         Top.                 (line  69)
-* d-efspec_name:                         Top.                 (line 159)
+* d-efspec_name <1>:                     Top.                 (line 159)
 * d-eftypefn_name:                       Top.                 (line  45)
-* d-eftypefn_name:                       Top.                 (line 135)
+* d-eftypefn_name <1>:                   Top.                 (line 135)
 * d-eftypefun_name:                      Top.                 (line  78)
-* d-eftypefun_name:                      Top.                 (line 168)
+* d-eftypefun_name <1>:                  Top.                 (line 168)
 * d-eftypemethod_name on c-lass:         Top.                 (line  93)
-* d-eftypemethod_name on c-lass:         Top.                 (line 183)
+* d-eftypemethod_name on c-lass <1>:     Top.                 (line 183)
 * d-eftypeop_name on c-lass:             Top.                 (line  48)
-* d-eftypeop_name on c-lass:             Top.                 (line 138)
+* d-eftypeop_name on c-lass <1>:         Top.                 (line 138)
 * d-efun_name:                           Top.                 (line  63)
-* d-efun_name:                           Top.                 (line 153)
+* d-efun_name <1>:                       Top.                 (line 153)
 * de-ffn_name:                           Top.                 (line   9)
-* de-ffn_name:                           Top.                 (line  99)
+* de-ffn_name <1>:                       Top.                 (line  99)
 * deffn:                                 Top.                 (line  37)
-* deffn:                                 Top.                 (line  39)
-* deffn:                                 Top.                 (line 127)
-* deffn:                                 Top.                 (line 129)
+* deffn <1>:                             Top.                 (line  39)
+* deffn <2>:                             Top.                 (line 127)
+* deffn <3>:                             Top.                 (line 129)
 * deffnx:                                Top.                 (line  35)
-* deffnx:                                Top.                 (line  40)
-* deffnx:                                Top.                 (line 125)
-* deffnx:                                Top.                 (line 130)
+* deffnx <1>:                            Top.                 (line  40)
+* deffnx <2>:                            Top.                 (line 125)
+* deffnx <3>:                            Top.                 (line 130)
 * e)xpose on W)indow:                    Top.                 (line 233)
 * e,xpose on W,indow:                    Top.                 (line 225)
 * e;xpose on W;indow:                    Top.                 (line 241)
-* e;xpose on W;indow:                    Top.                 (line 245)
+* e;xpose on W;indow <1>:                Top.                 (line 245)
 * expose on Window:                      Top.                 (line 223)
 * expose on windows:                     Top.                 (line 217)
 * expose on `com':                       Top.                 (line 249)
 * followed:                              Top.                 (line  31)
-* followed:                              Top.                 (line 121)
+* followed <1>:                          Top.                 (line 121)
 * foobar:                                Top.                 (line 193)
-* foobar:                                Top.                 (line 195)
+* foobar <1>:                            Top.                 (line 195)
 * foobug:                                Top.                 (line 200)
 * FORWARD-CHAR:                          Top.                 (line 187)
 * I:                                     Top.                 (line  13)
-* I:                                     Top.                 (line 103)
+* I <1>:                                 Top.                 (line 103)
 * id ule:                                Top.                 (line  18)
-* id ule:                                Top.                 (line 108)
+* id ule <1>:                            Top.                 (line 108)
 * id `i' ule:                            Top.                 (line  19)
-* id `i' ule:                            Top.                 (line 109)
+* id `i' ule <1>:                        Top.                 (line 109)
 * indow on W:                            Top.                 (line 220)
-* indow on W:                            Top.                 (line 229)
-* indow on W:                            Top.                 (line 237)
+* indow on W <1>:                        Top.                 (line 229)
+* indow on W <2>:                        Top.                 (line 237)
 * log trap:                              Top.                 (line  15)
-* log trap:                              Top.                 (line 105)
+* log trap <1>:                          Top.                 (line 105)
 * log trap1:                             Top.                 (line  16)
-* log trap1:                             Top.                 (line 106)
+* log trap1 <1>:                         Top.                 (line 106)
 * log trap2:                             Top.                 (line  17)
-* log trap2:                             Top.                 (line 107)
+* log trap2 <1>:                         Top.                 (line 107)
 * machin:                                Top.                 (line  25)
-* machin:                                Top.                 (line  27)
-* machin:                                Top.                 (line 115)
-* machin:                                Top.                 (line 117)
+* machin <1>:                            Top.                 (line  27)
+* machin <2>:                            Top.                 (line 115)
+* machin <3>:                            Top.                 (line 117)
 * push:                                  Top.                 (line 202)
 * truc:                                  Top.                 (line  14)
-* truc:                                  Top.                 (line 104)
+* truc <1>:                              Top.                 (line 104)
 
 
 

Index: test/info_coverage/res_info/def_cmds_clean/def_cmds_clean.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/info_coverage/res_info/def_cmds_clean/def_cmds_clean.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/info_coverage/res_info/def_cmds_clean/def_cmds_clean.info      28 Jul 
2009 18:42:19 -0000      1.1
+++ test/info_coverage/res_info/def_cmds_clean/def_cmds_clean.info      6 Sep 
2009 21:46:21 -0000       1.2
@@ -495,42 +495,42 @@
 * `A4' of `A2':                          Top.                 (line 476)
 * A2:                                    Top.                 (line 454)
 * A3:                                    Top.                 (line 462)
-* A3:                                    Top.                 (line 470)
+* A3 <1>:                                Top.                 (line 470)
 * A4 of A2:                              Top.                 (line 474)
 * border-pattern:                        Top.                 (line 392)
 * border-pattern of Window:              Top.                 (line 395)
 * defcv_name:                            Top.                 (line  54)
-* defcv_name:                            Top.                 (line 144)
-* defcv_name:                            Top.                 (line 235)
-* defcv_name:                            Top.                 (line 325)
+* defcv_name <1>:                        Top.                 (line 144)
+* defcv_name <2>:                        Top.                 (line 235)
+* defcv_name <3>:                        Top.                 (line 325)
 * defivar_name:                          Top.                 (line  84)
-* defivar_name:                          Top.                 (line 174)
-* defivar_name:                          Top.                 (line 265)
-* defivar_name:                          Top.                 (line 355)
+* defivar_name <1>:                      Top.                 (line 174)
+* defivar_name <2>:                      Top.                 (line 265)
+* defivar_name <3>:                      Top.                 (line 355)
 * defopt_name:                           Top.                 (line  75)
-* defopt_name:                           Top.                 (line 165)
-* defopt_name:                           Top.                 (line 256)
-* defopt_name:                           Top.                 (line 346)
+* defopt_name <1>:                       Top.                 (line 165)
+* defopt_name <2>:                       Top.                 (line 256)
+* defopt_name <3>:                       Top.                 (line 346)
 * deftypeivar_name of class:             Top.                 (line  87)
-* deftypeivar_name of class:             Top.                 (line 177)
-* deftypeivar_name of class:             Top.                 (line 268)
-* deftypeivar_name of class:             Top.                 (line 358)
+* deftypeivar_name of class <1>:         Top.                 (line 177)
+* deftypeivar_name of class <2>:         Top.                 (line 268)
+* deftypeivar_name of class <3>:         Top.                 (line 358)
 * deftypevar_name:                       Top.                 (line  81)
-* deftypevar_name:                       Top.                 (line 171)
-* deftypevar_name:                       Top.                 (line 262)
-* deftypevar_name:                       Top.                 (line 352)
+* deftypevar_name <1>:                   Top.                 (line 171)
+* deftypevar_name <2>:                   Top.                 (line 262)
+* deftypevar_name <3>:                   Top.                 (line 352)
 * deftypevr_name:                        Top.                 (line  51)
-* deftypevr_name:                        Top.                 (line 141)
-* deftypevr_name:                        Top.                 (line 232)
-* deftypevr_name:                        Top.                 (line 322)
+* deftypevr_name <1>:                    Top.                 (line 141)
+* deftypevr_name <2>:                    Top.                 (line 232)
+* deftypevr_name <3>:                    Top.                 (line 322)
 * defvar_name:                           Top.                 (line  72)
-* defvar_name:                           Top.                 (line 162)
-* defvar_name:                           Top.                 (line 253)
-* defvar_name:                           Top.                 (line 343)
+* defvar_name <1>:                       Top.                 (line 162)
+* defvar_name <2>:                       Top.                 (line 253)
+* defvar_name <3>:                       Top.                 (line 343)
 * defvr_name:                            Top.                 (line  42)
-* defvr_name:                            Top.                 (line 132)
-* defvr_name:                            Top.                 (line 223)
-* defvr_name:                            Top.                 (line 313)
+* defvr_name <1>:                        Top.                 (line 132)
+* defvr_name <2>:                        Top.                 (line 223)
+* defvr_name <3>:                        Top.                 (line 313)
 * enable:                                Top.                 (line 386)
 * fill-column:                           Top.                 (line 371)
 
@@ -540,7 +540,7 @@
 * )expose on )Window:                    Top.                 (line 416)
 * ,expose on ,Window:                    Top.                 (line 408)
 * ;expose on ;Window:                    Top.                 (line 424)
-* ;expose on ;Window:                    Top.                 (line 428)
+* ;expose on ;Window <1>:                Top.                 (line 428)
 * `A2':                                  Top.                 (line 452)
 * `A3':                                  Top.                 (line 460)
 * `A3' on `A2':                          Top.                 (line 480)
@@ -552,128 +552,128 @@
 * A3 on A2:                              Top.                 (line 478)
 * A4 on A2:                              Top.                 (line 482)
 * after:                                 Top.                 (line  33)
-* after:                                 Top.                 (line 123)
-* after:                                 Top.                 (line 214)
-* after:                                 Top.                 (line 304)
+* after <1>:                             Top.                 (line 123)
+* after <2>:                             Top.                 (line 214)
+* after <3>:                             Top.                 (line 304)
 * bidule machin:                         Top.                 (line  26)
-* bidule machin:                         Top.                 (line 116)
-* bidule machin:                         Top.                 (line 207)
-* bidule machin:                         Top.                 (line 297)
+* bidule machin <1>:                     Top.                 (line 116)
+* bidule machin <2>:                     Top.                 (line 207)
+* bidule machin <3>:                     Top.                 (line 297)
 * deffn:                                 Top.                 (line  37)
-* deffn:                                 Top.                 (line  39)
-* deffn:                                 Top.                 (line 127)
-* deffn:                                 Top.                 (line 129)
-* deffn:                                 Top.                 (line 218)
-* deffn:                                 Top.                 (line 220)
-* deffn:                                 Top.                 (line 308)
-* deffn:                                 Top.                 (line 310)
+* deffn <1>:                             Top.                 (line  39)
+* deffn <2>:                             Top.                 (line 127)
+* deffn <3>:                             Top.                 (line 129)
+* deffn <4>:                             Top.                 (line 218)
+* deffn <5>:                             Top.                 (line 220)
+* deffn <6>:                             Top.                 (line 308)
+* deffn <7>:                             Top.                 (line 310)
 * deffnx:                                Top.                 (line  35)
-* deffnx:                                Top.                 (line  40)
-* deffnx:                                Top.                 (line 125)
-* deffnx:                                Top.                 (line 130)
-* deffnx:                                Top.                 (line 216)
-* deffnx:                                Top.                 (line 221)
-* deffnx:                                Top.                 (line 306)
-* deffnx:                                Top.                 (line 311)
+* deffnx <1>:                            Top.                 (line  40)
+* deffnx <2>:                            Top.                 (line 125)
+* deffnx <3>:                            Top.                 (line 130)
+* deffnx <4>:                            Top.                 (line 216)
+* deffnx <5>:                            Top.                 (line 221)
+* deffnx <6>:                            Top.                 (line 306)
+* deffnx <7>:                            Top.                 (line 311)
 * deffn_name:                            Top.                 (line   6)
-* deffn_name:                            Top.                 (line   9)
-* deffn_name:                            Top.                 (line  96)
-* deffn_name:                            Top.                 (line  99)
-* deffn_name:                            Top.                 (line 187)
-* deffn_name:                            Top.                 (line 190)
-* deffn_name:                            Top.                 (line 277)
-* deffn_name:                            Top.                 (line 280)
+* deffn_name <1>:                        Top.                 (line   9)
+* deffn_name <2>:                        Top.                 (line  96)
+* deffn_name <3>:                        Top.                 (line  99)
+* deffn_name <4>:                        Top.                 (line 187)
+* deffn_name <5>:                        Top.                 (line 190)
+* deffn_name <6>:                        Top.                 (line 277)
+* deffn_name <7>:                        Top.                 (line 280)
 * defmac_name:                           Top.                 (line  66)
-* defmac_name:                           Top.                 (line 156)
-* defmac_name:                           Top.                 (line 247)
-* defmac_name:                           Top.                 (line 337)
+* defmac_name <1>:                       Top.                 (line 156)
+* defmac_name <2>:                       Top.                 (line 247)
+* defmac_name <3>:                       Top.                 (line 337)
 * defmethod_name on class:               Top.                 (line  90)
-* defmethod_name on class:               Top.                 (line 180)
-* defmethod_name on class:               Top.                 (line 271)
-* defmethod_name on class:               Top.                 (line 361)
+* defmethod_name on class <1>:           Top.                 (line 180)
+* defmethod_name on class <2>:           Top.                 (line 271)
+* defmethod_name on class <3>:           Top.                 (line 361)
 * defop_name on class:                   Top.                 (line  57)
-* defop_name on class:                   Top.                 (line 147)
-* defop_name on class:                   Top.                 (line 238)
-* defop_name on class:                   Top.                 (line 328)
+* defop_name on class <1>:               Top.                 (line 147)
+* defop_name on class <2>:               Top.                 (line 238)
+* defop_name on class <3>:               Top.                 (line 328)
 * defspec_name:                          Top.                 (line  69)
-* defspec_name:                          Top.                 (line 159)
-* defspec_name:                          Top.                 (line 250)
-* defspec_name:                          Top.                 (line 340)
+* defspec_name <1>:                      Top.                 (line 159)
+* defspec_name <2>:                      Top.                 (line 250)
+* defspec_name <3>:                      Top.                 (line 340)
 * deftypefn_name:                        Top.                 (line  45)
-* deftypefn_name:                        Top.                 (line 135)
-* deftypefn_name:                        Top.                 (line 226)
-* deftypefn_name:                        Top.                 (line 316)
+* deftypefn_name <1>:                    Top.                 (line 135)
+* deftypefn_name <2>:                    Top.                 (line 226)
+* deftypefn_name <3>:                    Top.                 (line 316)
 * deftypefun_name:                       Top.                 (line  78)
-* deftypefun_name:                       Top.                 (line 168)
-* deftypefun_name:                       Top.                 (line 259)
-* deftypefun_name:                       Top.                 (line 349)
+* deftypefun_name <1>:                   Top.                 (line 168)
+* deftypefun_name <2>:                   Top.                 (line 259)
+* deftypefun_name <3>:                   Top.                 (line 349)
 * deftypemethod_name on class:           Top.                 (line  93)
-* deftypemethod_name on class:           Top.                 (line 183)
-* deftypemethod_name on class:           Top.                 (line 274)
-* deftypemethod_name on class:           Top.                 (line 364)
+* deftypemethod_name on class <1>:       Top.                 (line 183)
+* deftypemethod_name on class <2>:       Top.                 (line 274)
+* deftypemethod_name on class <3>:       Top.                 (line 364)
 * deftypeop_name on class:               Top.                 (line  48)
-* deftypeop_name on class:               Top.                 (line 138)
-* deftypeop_name on class:               Top.                 (line 229)
-* deftypeop_name on class:               Top.                 (line 319)
+* deftypeop_name on class <1>:           Top.                 (line 138)
+* deftypeop_name on class <2>:           Top.                 (line 229)
+* deftypeop_name on class <3>:           Top.                 (line 319)
 * defun_name:                            Top.                 (line  63)
-* defun_name:                            Top.                 (line 153)
-* defun_name:                            Top.                 (line 244)
-* defun_name:                            Top.                 (line 334)
+* defun_name <1>:                        Top.                 (line 153)
+* defun_name <2>:                        Top.                 (line 244)
+* defun_name <3>:                        Top.                 (line 334)
 * e)xpose on W)indow:                    Top.                 (line 414)
 * e,xpose on W,indow:                    Top.                 (line 406)
 * e;xpose on W;indow:                    Top.                 (line 422)
-* e;xpose on W;indow:                    Top.                 (line 426)
+* e;xpose on W;indow <1>:                Top.                 (line 426)
 * expose on Window:                      Top.                 (line 404)
 * expose on windows:                     Top.                 (line 398)
 * expose on `com':                       Top.                 (line 430)
 * followed:                              Top.                 (line  31)
-* followed:                              Top.                 (line 121)
-* followed:                              Top.                 (line 212)
-* followed:                              Top.                 (line 302)
+* followed <1>:                          Top.                 (line 121)
+* followed <2>:                          Top.                 (line 212)
+* followed <3>:                          Top.                 (line 302)
 * foobar:                                Top.                 (line 374)
-* foobar:                                Top.                 (line 376)
+* foobar <1>:                            Top.                 (line 376)
 * foobug:                                Top.                 (line 381)
 * FORWARDCHAR:                           Top.                 (line 368)
 * I:                                     Top.                 (line  13)
-* I:                                     Top.                 (line 103)
-* I:                                     Top.                 (line 194)
-* I:                                     Top.                 (line 284)
+* I <1>:                                 Top.                 (line 103)
+* I <2>:                                 Top.                 (line 194)
+* I <3>:                                 Top.                 (line 284)
 * id ule:                                Top.                 (line  18)
-* id ule:                                Top.                 (line 108)
-* id ule:                                Top.                 (line 199)
-* id ule:                                Top.                 (line 289)
+* id ule <1>:                            Top.                 (line 108)
+* id ule <2>:                            Top.                 (line 199)
+* id ule <3>:                            Top.                 (line 289)
 * id `i' ule:                            Top.                 (line  19)
-* id `i' ule:                            Top.                 (line 109)
-* id `i' ule:                            Top.                 (line 200)
-* id `i' ule:                            Top.                 (line 290)
+* id `i' ule <1>:                        Top.                 (line 109)
+* id `i' ule <2>:                        Top.                 (line 200)
+* id `i' ule <3>:                        Top.                 (line 290)
 * indow on W:                            Top.                 (line 401)
-* indow on W:                            Top.                 (line 410)
-* indow on W:                            Top.                 (line 418)
+* indow on W <1>:                        Top.                 (line 410)
+* indow on W <2>:                        Top.                 (line 418)
 * log trap:                              Top.                 (line  15)
-* log trap:                              Top.                 (line 105)
-* log trap:                              Top.                 (line 196)
-* log trap:                              Top.                 (line 286)
+* log trap <1>:                          Top.                 (line 105)
+* log trap <2>:                          Top.                 (line 196)
+* log trap <3>:                          Top.                 (line 286)
 * log trap1:                             Top.                 (line  16)
-* log trap1:                             Top.                 (line 106)
-* log trap1:                             Top.                 (line 197)
-* log trap1:                             Top.                 (line 287)
+* log trap1 <1>:                         Top.                 (line 106)
+* log trap1 <2>:                         Top.                 (line 197)
+* log trap1 <3>:                         Top.                 (line 287)
 * log trap2:                             Top.                 (line  17)
-* log trap2:                             Top.                 (line 107)
-* log trap2:                             Top.                 (line 198)
-* log trap2:                             Top.                 (line 288)
+* log trap2 <1>:                         Top.                 (line 107)
+* log trap2 <2>:                         Top.                 (line 198)
+* log trap2 <3>:                         Top.                 (line 288)
 * machin:                                Top.                 (line  25)
-* machin:                                Top.                 (line  27)
-* machin:                                Top.                 (line 115)
-* machin:                                Top.                 (line 117)
-* machin:                                Top.                 (line 206)
-* machin:                                Top.                 (line 208)
-* machin:                                Top.                 (line 296)
-* machin:                                Top.                 (line 298)
+* machin <1>:                            Top.                 (line  27)
+* machin <2>:                            Top.                 (line 115)
+* machin <3>:                            Top.                 (line 117)
+* machin <4>:                            Top.                 (line 206)
+* machin <5>:                            Top.                 (line 208)
+* machin <6>:                            Top.                 (line 296)
+* machin <7>:                            Top.                 (line 298)
 * push:                                  Top.                 (line 383)
 * truc:                                  Top.                 (line  14)
-* truc:                                  Top.                 (line 104)
-* truc:                                  Top.                 (line 195)
-* truc:                                  Top.                 (line 285)
+* truc <1>:                              Top.                 (line 104)
+* truc <2>:                              Top.                 (line 195)
+* truc <3>:                              Top.                 (line 285)
 
 
 

Index: test/invalid/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/invalid/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/invalid/Makefile.am    2 Aug 2009 13:13:05 -0000       1.8
+++ test/invalid/Makefile.am    6 Sep 2009 21:46:21 -0000       1.9
@@ -12,6 +12,7 @@
  unknown_command_with_braces.texi multitable_begin_with_tab.texi \
  ref_to_unknown_node.texi def_bad_defx_command.texi \
  direntry_dircategory_after_first_node.texi node_too_much_arguments.texi \
+ bad_documentencoding.texi \
  tests.txt res res_all res_info
 
 DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out

Index: test/invalid/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/invalid/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/invalid/Makefile.in    10 Aug 2009 10:00:57 -0000      1.14
+++ test/invalid/Makefile.in    6 Sep 2009 21:46:21 -0000       1.15
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -144,6 +147,7 @@
  unknown_command_with_braces.texi multitable_begin_with_tab.texi \
  ref_to_unknown_node.texi def_bad_defx_command.texi \
  direntry_dircategory_after_first_node.texi node_too_much_arguments.texi \
+ bad_documentencoding.texi \
  tests.txt res res_all res_info
 
 DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
@@ -160,7 +164,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/invalid/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/invalid/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -179,6 +183,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -202,13 +207,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -239,6 +248,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -258,6 +268,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -266,18 +278,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -317,6 +339,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/invalid/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/invalid/tests.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/invalid/tests.txt      4 Aug 2009 07:58:39 -0000       1.8
+++ test/invalid/tests.txt      6 Sep 2009 21:46:21 -0000       1.9
@@ -34,6 +34,7 @@
 texi def_bad_defx_command.texi
 texi direntry_dircategory_after_first_node.texi
 texi node_too_much_arguments.texi
+texi bad_documentencoding.texi
 brace_not_closed brace_not_closed.texi
 recursive_copying recursive_copying.texi
 bad_nesting bad_nesting.texi
@@ -71,3 +72,4 @@
 def_bad_defx_command def_bad_defx_command.texi
 direntry_dircategory_after_first_node 
direntry_dircategory_after_first_node.texi
 node_too_much_arguments node_too_much_arguments.texi
+bad_documentencoding bad_documentencoding.texi

Index: test/layout/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/layout/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/layout/Makefile.in     10 Aug 2009 10:00:58 -0000      1.9
+++ test/layout/Makefile.in     6 Sep 2009 21:46:22 -0000       1.10
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,7 +150,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/layout/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/layout/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -166,6 +169,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -189,13 +193,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -226,6 +234,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -245,6 +254,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -253,18 +264,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -304,6 +325,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/layout/res_info/formatting_regions/formatting-regions.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/layout/res_info/formatting_regions/formatting-regions.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/layout/res_info/formatting_regions/formatting-regions.info     30 Aug 
2009 19:00:37 -0000      1.3
+++ test/layout/res_info/formatting_regions/formatting-regions.info     6 Sep 
2009 21:46:22 -0000       1.4
@@ -1851,26 +1851,26 @@
 * Menu:
 
 * ":                                     constructs.         (line   15)
-* ":                                     constructs.         (line  441)
-* ":                                     constructs.         (line 1012)
+* " <1>:                                 constructs.         (line  441)
+* " <2>:                                 constructs.         (line 1012)
 * -option:                               constructs.         (line   15)
-* -option:                               constructs.         (line  441)
-* -option:                               constructs.         (line 1012)
+* -option <1>:                           constructs.         (line  441)
+* -option <2>:                           constructs.         (line 1012)
 * .:                                     constructs.         (line 1415)
 * ?:                                     constructs.         (line 1415)
 * a:                                     constructs.         (line 1415)
 * index entry between item and itemx:    constructs.         (line  311)
-* index entry between item and itemx:    constructs.         (line  863)
-* index entry between item and itemx:    constructs.         (line 1308)
+* index entry between item and itemx <1>: constructs.        (line  863)
+* index entry between item and itemx <2>: constructs.        (line 1308)
 * index entry within deffn:              constructs.         (line  156)
-* index entry within deffn:              constructs.         (line  710)
-* index entry within deffn:              constructs.         (line 1153)
+* index entry within deffn <1>:          constructs.         (line  710)
+* index entry within deffn <2>:          constructs.         (line 1153)
 * index entry within itemize:            constructs.         (line  117)
-* index entry within itemize:            constructs.         (line  671)
-* index entry within itemize:            constructs.         (line 1114)
+* index entry within itemize <1>:        constructs.         (line  671)
+* index entry within itemize <2>:        constructs.         (line 1114)
 * index entry within multitable:         constructs.         (line  125)
-* index entry within multitable:         constructs.         (line  680)
-* index entry within multitable:         constructs.         (line 1122)
+* index entry within multitable <1>:     constructs.         (line  680)
+* index entry within multitable <2>:     constructs.         (line 1122)
 * T-ruc:                                 constructs.         (line 1415)
 * t-ruc:                                 constructs.         (line 1415)
 
@@ -1880,127 +1880,127 @@
 * Menu:
 
 * ":                                     constructs.         (line   15)
-* ":                                     constructs.         (line  441)
-* ":                                     constructs.         (line 1012)
+* " <1>:                                 constructs.         (line  441)
+* " <2>:                                 constructs.         (line 1012)
 * -foption:                              constructs.         (line   15)
-* -foption:                              constructs.         (line  441)
-* -foption:                              constructs.         (line 1012)
+* -foption <1>:                          constructs.         (line  441)
+* -foption <2>:                          constructs.         (line 1012)
 * .:                                     constructs.         (line 1415)
 * ?:                                     constructs.         (line 1415)
 * a:                                     constructs.         (line  174)
-* a:                                     constructs.         (line  310)
-* a:                                     constructs.         (line  728)
-* a:                                     constructs.         (line  862)
-* a:                                     constructs.         (line 1171)
-* a:                                     constructs.         (line 1307)
-* a:                                     constructs.         (line 1415)
+* a <1>:                                 constructs.         (line  310)
+* a <2>:                                 constructs.         (line  728)
+* a <3>:                                 constructs.         (line  862)
+* a <4>:                                 constructs.         (line 1171)
+* a <5>:                                 constructs.         (line 1307)
+* a <6>:                                 constructs.         (line 1415)
 * after:                                 constructs.         (line  384)
-* after:                                 constructs.         (line  961)
-* after:                                 constructs.         (line 1381)
+* after <1>:                             constructs.         (line  961)
+* after <2>:                             constructs.         (line 1381)
 * b:                                     constructs.         (line  311)
-* b:                                     constructs.         (line  863)
-* b:                                     constructs.         (line 1308)
+* b <1>:                                 constructs.         (line  863)
+* b <2>:                                 constructs.         (line 1308)
 * bidule machin:                         constructs.         (line  168)
-* bidule machin:                         constructs.         (line  722)
-* bidule machin:                         constructs.         (line 1165)
+* bidule machin <1>:                     constructs.         (line  722)
+* bidule machin <2>:                     constructs.         (line 1165)
 * d-effn_name:                           constructs.         (line  148)
-* d-effn_name:                           constructs.         (line  702)
-* d-effn_name:                           constructs.         (line 1145)
+* d-effn_name <1>:                       constructs.         (line  702)
+* d-effn_name <2>:                       constructs.         (line 1145)
 * d-efmac_name:                          constructs.         (line  210)
-* d-efmac_name:                          constructs.         (line  764)
-* d-efmac_name:                          constructs.         (line 1207)
+* d-efmac_name <1>:                      constructs.         (line  764)
+* d-efmac_name <2>:                      constructs.         (line 1207)
 * d-efmethod_name on c-lass:             constructs.         (line  234)
-* d-efmethod_name on c-lass:             constructs.         (line  788)
-* d-efmethod_name on c-lass:             constructs.         (line 1231)
+* d-efmethod_name on c-lass <1>:         constructs.         (line  788)
+* d-efmethod_name on c-lass <2>:         constructs.         (line 1231)
 * d-efop_name on c-lass:                 constructs.         (line  201)
-* d-efop_name on c-lass:                 constructs.         (line  755)
-* d-efop_name on c-lass:                 constructs.         (line 1198)
+* d-efop_name on c-lass <1>:             constructs.         (line  755)
+* d-efop_name on c-lass <2>:             constructs.         (line 1198)
 * d-efspec_name:                         constructs.         (line  213)
-* d-efspec_name:                         constructs.         (line  767)
-* d-efspec_name:                         constructs.         (line 1210)
+* d-efspec_name <1>:                     constructs.         (line  767)
+* d-efspec_name <2>:                     constructs.         (line 1210)
 * d-eftypefn_name:                       constructs.         (line  189)
-* d-eftypefn_name:                       constructs.         (line  743)
-* d-eftypefn_name:                       constructs.         (line 1186)
+* d-eftypefn_name <1>:                   constructs.         (line  743)
+* d-eftypefn_name <2>:                   constructs.         (line 1186)
 * d-eftypefun_name:                      constructs.         (line  222)
-* d-eftypefun_name:                      constructs.         (line  776)
-* d-eftypefun_name:                      constructs.         (line 1219)
+* d-eftypefun_name <1>:                  constructs.         (line  776)
+* d-eftypefun_name <2>:                  constructs.         (line 1219)
 * d-eftypemethod_name on c-lass:         constructs.         (line  237)
-* d-eftypemethod_name on c-lass:         constructs.         (line  791)
-* d-eftypemethod_name on c-lass:         constructs.         (line 1234)
+* d-eftypemethod_name on c-lass <1>:     constructs.         (line  791)
+* d-eftypemethod_name on c-lass <2>:     constructs.         (line 1234)
 * d-eftypeop_name on c-lass:             constructs.         (line  192)
-* d-eftypeop_name on c-lass:             constructs.         (line  746)
-* d-eftypeop_name on c-lass:             constructs.         (line 1189)
+* d-eftypeop_name on c-lass <1>:         constructs.         (line  746)
+* d-eftypeop_name on c-lass <2>:         constructs.         (line 1189)
 * d-efun_name:                           constructs.         (line  207)
-* d-efun_name:                           constructs.         (line  761)
-* d-efun_name:                           constructs.         (line 1204)
+* d-efun_name <1>:                       constructs.         (line  761)
+* d-efun_name <2>:                       constructs.         (line 1204)
 * de-ffn_name:                           constructs.         (line  151)
-* de-ffn_name:                           constructs.         (line  705)
-* de-ffn_name:                           constructs.         (line 1148)
+* de-ffn_name <1>:                       constructs.         (line  705)
+* de-ffn_name <2>:                       constructs.         (line 1148)
 * deffn:                                 constructs.         (line  177)
-* deffn:                                 constructs.         (line  179)
-* deffn:                                 constructs.         (line  731)
-* deffn:                                 constructs.         (line  733)
-* deffn:                                 constructs.         (line 1174)
-* deffn:                                 constructs.         (line 1176)
+* deffn <1>:                             constructs.         (line  179)
+* deffn <2>:                             constructs.         (line  731)
+* deffn <3>:                             constructs.         (line  733)
+* deffn <4>:                             constructs.         (line 1174)
+* deffn <5>:                             constructs.         (line 1176)
 * deffnx:                                constructs.         (line  175)
-* deffnx:                                constructs.         (line  180)
-* deffnx:                                constructs.         (line  729)
-* deffnx:                                constructs.         (line  734)
-* deffnx:                                constructs.         (line 1172)
-* deffnx:                                constructs.         (line 1177)
+* deffnx <1>:                            constructs.         (line  180)
+* deffnx <2>:                            constructs.         (line  729)
+* deffnx <3>:                            constructs.         (line  734)
+* deffnx <4>:                            constructs.         (line 1172)
+* deffnx <5>:                            constructs.         (line 1177)
 * followed:                              constructs.         (line  171)
-* followed:                              constructs.         (line  382)
-* followed:                              constructs.         (line  725)
-* followed:                              constructs.         (line  959)
-* followed:                              constructs.         (line 1168)
-* followed:                              constructs.         (line 1379)
+* followed <1>:                          constructs.         (line  382)
+* followed <2>:                          constructs.         (line  725)
+* followed <3>:                          constructs.         (line  959)
+* followed <4>:                          constructs.         (line 1168)
+* followed <5>:                          constructs.         (line 1379)
 * I:                                     constructs.         (line  155)
-* I:                                     constructs.         (line  182)
-* I:                                     constructs.         (line  709)
-* I:                                     constructs.         (line  736)
-* I:                                     constructs.         (line 1152)
-* I:                                     constructs.         (line 1179)
+* I <1>:                                 constructs.         (line  182)
+* I <2>:                                 constructs.         (line  709)
+* I <3>:                                 constructs.         (line  736)
+* I <4>:                                 constructs.         (line 1152)
+* I <5>:                                 constructs.         (line 1179)
 * id ule:                                constructs.         (line  160)
-* id ule:                                constructs.         (line  714)
-* id ule:                                constructs.         (line 1157)
+* id ule <1>:                            constructs.         (line  714)
+* id ule <2>:                            constructs.         (line 1157)
 * id `i' ule:                            constructs.         (line  161)
-* id `i' ule:                            constructs.         (line  715)
-* id `i' ule:                            constructs.         (line 1158)
+* id `i' ule <1>:                        constructs.         (line  715)
+* id `i' ule <2>:                        constructs.         (line 1158)
 * log trap:                              constructs.         (line  157)
-* log trap:                              constructs.         (line  711)
-* log trap:                              constructs.         (line 1154)
+* log trap <1>:                          constructs.         (line  711)
+* log trap <2>:                          constructs.         (line 1154)
 * log trap1:                             constructs.         (line  158)
-* log trap1:                             constructs.         (line  712)
-* log trap1:                             constructs.         (line 1155)
+* log trap1 <1>:                         constructs.         (line  712)
+* log trap1 <2>:                         constructs.         (line 1155)
 * log trap2:                             constructs.         (line  159)
-* log trap2:                             constructs.         (line  713)
-* log trap2:                             constructs.         (line 1156)
+* log trap2 <1>:                         constructs.         (line  713)
+* log trap2 <2>:                         constructs.         (line 1156)
 * machin:                                constructs.         (line  167)
-* machin:                                constructs.         (line  169)
-* machin:                                constructs.         (line  378)
-* machin:                                constructs.         (line  379)
-* machin:                                constructs.         (line  380)
-* machin:                                constructs.         (line  381)
-* machin:                                constructs.         (line  721)
-* machin:                                constructs.         (line  723)
-* machin:                                constructs.         (line  955)
-* machin:                                constructs.         (line  956)
-* machin:                                constructs.         (line  957)
-* machin:                                constructs.         (line  958)
-* machin:                                constructs.         (line 1164)
-* machin:                                constructs.         (line 1166)
-* machin:                                constructs.         (line 1375)
-* machin:                                constructs.         (line 1376)
-* machin:                                constructs.         (line 1377)
-* machin:                                constructs.         (line 1378)
+* machin <1>:                            constructs.         (line  169)
+* machin <2>:                            constructs.         (line  378)
+* machin <3>:                            constructs.         (line  379)
+* machin <4>:                            constructs.         (line  380)
+* machin <5>:                            constructs.         (line  381)
+* machin <6>:                            constructs.         (line  721)
+* machin <7>:                            constructs.         (line  723)
+* machin <8>:                            constructs.         (line  955)
+* machin <9>:                            constructs.         (line  956)
+* machin <10>:                           constructs.         (line  957)
+* machin <11>:                           constructs.         (line  958)
+* machin <12>:                           constructs.         (line 1164)
+* machin <13>:                           constructs.         (line 1166)
+* machin <14>:                           constructs.         (line 1375)
+* machin <15>:                           constructs.         (line 1376)
+* machin <16>:                           constructs.         (line 1377)
+* machin <17>:                           constructs.         (line 1378)
 * t-ruc:                                 constructs.         (line 1415)
 * T-ruc:                                 constructs.         (line 1415)
 * truc:                                  constructs.         (line  156)
-* truc:                                  constructs.         (line  183)
-* truc:                                  constructs.         (line  710)
-* truc:                                  constructs.         (line  737)
-* truc:                                  constructs.         (line 1153)
-* truc:                                  constructs.         (line 1180)
+* truc <1>:                              constructs.         (line  183)
+* truc <2>:                              constructs.         (line  710)
+* truc <3>:                              constructs.         (line  737)
+* truc <4>:                              constructs.         (line 1153)
+* truc <5>:                              constructs.         (line 1180)
 
    vr
 
@@ -2008,35 +2008,35 @@
 * Menu:
 
 * a:                                     constructs.         (line  306)
-* a:                                     constructs.         (line  858)
-* a:                                     constructs.         (line 1303)
+* a <1>:                                 constructs.         (line  858)
+* a <2>:                                 constructs.         (line 1303)
 * b:                                     constructs.         (line  307)
-* b:                                     constructs.         (line  859)
-* b:                                     constructs.         (line 1304)
+* b <1>:                                 constructs.         (line  859)
+* b <2>:                                 constructs.         (line 1304)
 * d-efcv_name:                           constructs.         (line  198)
-* d-efcv_name:                           constructs.         (line  752)
-* d-efcv_name:                           constructs.         (line 1195)
+* d-efcv_name <1>:                       constructs.         (line  752)
+* d-efcv_name <2>:                       constructs.         (line 1195)
 * d-efivar_name:                         constructs.         (line  228)
-* d-efivar_name:                         constructs.         (line  782)
-* d-efivar_name:                         constructs.         (line 1225)
+* d-efivar_name <1>:                     constructs.         (line  782)
+* d-efivar_name <2>:                     constructs.         (line 1225)
 * d-efopt_name:                          constructs.         (line  219)
-* d-efopt_name:                          constructs.         (line  773)
-* d-efopt_name:                          constructs.         (line 1216)
+* d-efopt_name <1>:                      constructs.         (line  773)
+* d-efopt_name <2>:                      constructs.         (line 1216)
 * d-eftypeivar_name of c-lass:           constructs.         (line  231)
-* d-eftypeivar_name of c-lass:           constructs.         (line  785)
-* d-eftypeivar_name of c-lass:           constructs.         (line 1228)
+* d-eftypeivar_name of c-lass <1>:       constructs.         (line  785)
+* d-eftypeivar_name of c-lass <2>:       constructs.         (line 1228)
 * d-eftypevar_name:                      constructs.         (line  225)
-* d-eftypevar_name:                      constructs.         (line  779)
-* d-eftypevar_name:                      constructs.         (line 1222)
+* d-eftypevar_name <1>:                  constructs.         (line  779)
+* d-eftypevar_name <2>:                  constructs.         (line 1222)
 * d-eftypevr_name:                       constructs.         (line  195)
-* d-eftypevr_name:                       constructs.         (line  749)
-* d-eftypevr_name:                       constructs.         (line 1192)
+* d-eftypevr_name <1>:                   constructs.         (line  749)
+* d-eftypevr_name <2>:                   constructs.         (line 1192)
 * d-efvar_name:                          constructs.         (line  216)
-* d-efvar_name:                          constructs.         (line  770)
-* d-efvar_name:                          constructs.         (line 1213)
+* d-efvar_name <1>:                      constructs.         (line  770)
+* d-efvar_name <2>:                      constructs.         (line 1213)
 * d-efvr_name:                           constructs.         (line  186)
-* d-efvr_name:                           constructs.         (line  740)
-* d-efvr_name:                           constructs.         (line 1183)
+* d-efvr_name <1>:                       constructs.         (line  740)
+* d-efvr_name <2>:                       constructs.         (line 1183)
 
    ky
 
@@ -2048,8 +2048,8 @@
 * Menu:
 
 * d-eftp_name:                           constructs.         (line  204)
-* d-eftp_name:                           constructs.         (line  758)
-* d-eftp_name:                           constructs.         (line 1201)
+* d-eftp_name <1>:                       constructs.         (line  758)
+* d-eftp_name <2>:                       constructs.         (line 1201)
 
    ---------- Footnotes ----------
 
@@ -2121,26 +2121,26 @@
 * Menu:
 
 * ":                                     constructs.         (line   15)
-* ":                                     constructs.         (line  441)
-* ":                                     constructs.         (line 1012)
+* " <1>:                                 constructs.         (line  441)
+* " <2>:                                 constructs.         (line 1012)
 * -option:                               constructs.         (line   15)
-* -option:                               constructs.         (line  441)
-* -option:                               constructs.         (line 1012)
+* -option <1>:                           constructs.         (line  441)
+* -option <2>:                           constructs.         (line 1012)
 * .:                                     constructs.         (line 1415)
 * ?:                                     constructs.         (line 1415)
 * a:                                     constructs.         (line 1415)
 * index entry between item and itemx:    constructs.         (line  311)
-* index entry between item and itemx:    constructs.         (line  863)
-* index entry between item and itemx:    constructs.         (line 1308)
+* index entry between item and itemx <1>: constructs.        (line  863)
+* index entry between item and itemx <2>: constructs.        (line 1308)
 * index entry within deffn:              constructs.         (line  156)
-* index entry within deffn:              constructs.         (line  710)
-* index entry within deffn:              constructs.         (line 1153)
+* index entry within deffn <1>:          constructs.         (line  710)
+* index entry within deffn <2>:          constructs.         (line 1153)
 * index entry within itemize:            constructs.         (line  117)
-* index entry within itemize:            constructs.         (line  671)
-* index entry within itemize:            constructs.         (line 1114)
+* index entry within itemize <1>:        constructs.         (line  671)
+* index entry within itemize <2>:        constructs.         (line 1114)
 * index entry within multitable:         constructs.         (line  125)
-* index entry within multitable:         constructs.         (line  680)
-* index entry within multitable:         constructs.         (line 1122)
+* index entry within multitable <1>:     constructs.         (line  680)
+* index entry within multitable <2>:     constructs.         (line 1122)
 * T-ruc:                                 constructs.         (line 1415)
 * t-ruc:                                 constructs.         (line 1415)
 
@@ -2148,127 +2148,127 @@
 * Menu:
 
 * ":                                     constructs.         (line   15)
-* ":                                     constructs.         (line  441)
-* ":                                     constructs.         (line 1012)
+* " <1>:                                 constructs.         (line  441)
+* " <2>:                                 constructs.         (line 1012)
 * -foption:                              constructs.         (line   15)
-* -foption:                              constructs.         (line  441)
-* -foption:                              constructs.         (line 1012)
+* -foption <1>:                          constructs.         (line  441)
+* -foption <2>:                          constructs.         (line 1012)
 * .:                                     constructs.         (line 1415)
 * ?:                                     constructs.         (line 1415)
 * a:                                     constructs.         (line  174)
-* a:                                     constructs.         (line  310)
-* a:                                     constructs.         (line  728)
-* a:                                     constructs.         (line  862)
-* a:                                     constructs.         (line 1171)
-* a:                                     constructs.         (line 1307)
-* a:                                     constructs.         (line 1415)
+* a <1>:                                 constructs.         (line  310)
+* a <2>:                                 constructs.         (line  728)
+* a <3>:                                 constructs.         (line  862)
+* a <4>:                                 constructs.         (line 1171)
+* a <5>:                                 constructs.         (line 1307)
+* a <6>:                                 constructs.         (line 1415)
 * after:                                 constructs.         (line  384)
-* after:                                 constructs.         (line  961)
-* after:                                 constructs.         (line 1381)
+* after <1>:                             constructs.         (line  961)
+* after <2>:                             constructs.         (line 1381)
 * b:                                     constructs.         (line  311)
-* b:                                     constructs.         (line  863)
-* b:                                     constructs.         (line 1308)
+* b <1>:                                 constructs.         (line  863)
+* b <2>:                                 constructs.         (line 1308)
 * bidule machin:                         constructs.         (line  168)
-* bidule machin:                         constructs.         (line  722)
-* bidule machin:                         constructs.         (line 1165)
+* bidule machin <1>:                     constructs.         (line  722)
+* bidule machin <2>:                     constructs.         (line 1165)
 * d-effn_name:                           constructs.         (line  148)
-* d-effn_name:                           constructs.         (line  702)
-* d-effn_name:                           constructs.         (line 1145)
+* d-effn_name <1>:                       constructs.         (line  702)
+* d-effn_name <2>:                       constructs.         (line 1145)
 * d-efmac_name:                          constructs.         (line  210)
-* d-efmac_name:                          constructs.         (line  764)
-* d-efmac_name:                          constructs.         (line 1207)
+* d-efmac_name <1>:                      constructs.         (line  764)
+* d-efmac_name <2>:                      constructs.         (line 1207)
 * d-efmethod_name on c-lass:             constructs.         (line  234)
-* d-efmethod_name on c-lass:             constructs.         (line  788)
-* d-efmethod_name on c-lass:             constructs.         (line 1231)
+* d-efmethod_name on c-lass <1>:         constructs.         (line  788)
+* d-efmethod_name on c-lass <2>:         constructs.         (line 1231)
 * d-efop_name on c-lass:                 constructs.         (line  201)
-* d-efop_name on c-lass:                 constructs.         (line  755)
-* d-efop_name on c-lass:                 constructs.         (line 1198)
+* d-efop_name on c-lass <1>:             constructs.         (line  755)
+* d-efop_name on c-lass <2>:             constructs.         (line 1198)
 * d-efspec_name:                         constructs.         (line  213)
-* d-efspec_name:                         constructs.         (line  767)
-* d-efspec_name:                         constructs.         (line 1210)
+* d-efspec_name <1>:                     constructs.         (line  767)
+* d-efspec_name <2>:                     constructs.         (line 1210)
 * d-eftypefn_name:                       constructs.         (line  189)
-* d-eftypefn_name:                       constructs.         (line  743)
-* d-eftypefn_name:                       constructs.         (line 1186)
+* d-eftypefn_name <1>:                   constructs.         (line  743)
+* d-eftypefn_name <2>:                   constructs.         (line 1186)
 * d-eftypefun_name:                      constructs.         (line  222)
-* d-eftypefun_name:                      constructs.         (line  776)
-* d-eftypefun_name:                      constructs.         (line 1219)
+* d-eftypefun_name <1>:                  constructs.         (line  776)
+* d-eftypefun_name <2>:                  constructs.         (line 1219)
 * d-eftypemethod_name on c-lass:         constructs.         (line  237)
-* d-eftypemethod_name on c-lass:         constructs.         (line  791)
-* d-eftypemethod_name on c-lass:         constructs.         (line 1234)
+* d-eftypemethod_name on c-lass <1>:     constructs.         (line  791)
+* d-eftypemethod_name on c-lass <2>:     constructs.         (line 1234)
 * d-eftypeop_name on c-lass:             constructs.         (line  192)
-* d-eftypeop_name on c-lass:             constructs.         (line  746)
-* d-eftypeop_name on c-lass:             constructs.         (line 1189)
+* d-eftypeop_name on c-lass <1>:         constructs.         (line  746)
+* d-eftypeop_name on c-lass <2>:         constructs.         (line 1189)
 * d-efun_name:                           constructs.         (line  207)
-* d-efun_name:                           constructs.         (line  761)
-* d-efun_name:                           constructs.         (line 1204)
+* d-efun_name <1>:                       constructs.         (line  761)
+* d-efun_name <2>:                       constructs.         (line 1204)
 * de-ffn_name:                           constructs.         (line  151)
-* de-ffn_name:                           constructs.         (line  705)
-* de-ffn_name:                           constructs.         (line 1148)
+* de-ffn_name <1>:                       constructs.         (line  705)
+* de-ffn_name <2>:                       constructs.         (line 1148)
 * deffn:                                 constructs.         (line  177)
-* deffn:                                 constructs.         (line  179)
-* deffn:                                 constructs.         (line  731)
-* deffn:                                 constructs.         (line  733)
-* deffn:                                 constructs.         (line 1174)
-* deffn:                                 constructs.         (line 1176)
+* deffn <1>:                             constructs.         (line  179)
+* deffn <2>:                             constructs.         (line  731)
+* deffn <3>:                             constructs.         (line  733)
+* deffn <4>:                             constructs.         (line 1174)
+* deffn <5>:                             constructs.         (line 1176)
 * deffnx:                                constructs.         (line  175)
-* deffnx:                                constructs.         (line  180)
-* deffnx:                                constructs.         (line  729)
-* deffnx:                                constructs.         (line  734)
-* deffnx:                                constructs.         (line 1172)
-* deffnx:                                constructs.         (line 1177)
+* deffnx <1>:                            constructs.         (line  180)
+* deffnx <2>:                            constructs.         (line  729)
+* deffnx <3>:                            constructs.         (line  734)
+* deffnx <4>:                            constructs.         (line 1172)
+* deffnx <5>:                            constructs.         (line 1177)
 * followed:                              constructs.         (line  171)
-* followed:                              constructs.         (line  382)
-* followed:                              constructs.         (line  725)
-* followed:                              constructs.         (line  959)
-* followed:                              constructs.         (line 1168)
-* followed:                              constructs.         (line 1379)
+* followed <1>:                          constructs.         (line  382)
+* followed <2>:                          constructs.         (line  725)
+* followed <3>:                          constructs.         (line  959)
+* followed <4>:                          constructs.         (line 1168)
+* followed <5>:                          constructs.         (line 1379)
 * I:                                     constructs.         (line  155)
-* I:                                     constructs.         (line  182)
-* I:                                     constructs.         (line  709)
-* I:                                     constructs.         (line  736)
-* I:                                     constructs.         (line 1152)
-* I:                                     constructs.         (line 1179)
+* I <1>:                                 constructs.         (line  182)
+* I <2>:                                 constructs.         (line  709)
+* I <3>:                                 constructs.         (line  736)
+* I <4>:                                 constructs.         (line 1152)
+* I <5>:                                 constructs.         (line 1179)
 * id ule:                                constructs.         (line  160)
-* id ule:                                constructs.         (line  714)
-* id ule:                                constructs.         (line 1157)
+* id ule <1>:                            constructs.         (line  714)
+* id ule <2>:                            constructs.         (line 1157)
 * id `i' ule:                            constructs.         (line  161)
-* id `i' ule:                            constructs.         (line  715)
-* id `i' ule:                            constructs.         (line 1158)
+* id `i' ule <1>:                        constructs.         (line  715)
+* id `i' ule <2>:                        constructs.         (line 1158)
 * log trap:                              constructs.         (line  157)
-* log trap:                              constructs.         (line  711)
-* log trap:                              constructs.         (line 1154)
+* log trap <1>:                          constructs.         (line  711)
+* log trap <2>:                          constructs.         (line 1154)
 * log trap1:                             constructs.         (line  158)
-* log trap1:                             constructs.         (line  712)
-* log trap1:                             constructs.         (line 1155)
+* log trap1 <1>:                         constructs.         (line  712)
+* log trap1 <2>:                         constructs.         (line 1155)
 * log trap2:                             constructs.         (line  159)
-* log trap2:                             constructs.         (line  713)
-* log trap2:                             constructs.         (line 1156)
+* log trap2 <1>:                         constructs.         (line  713)
+* log trap2 <2>:                         constructs.         (line 1156)
 * machin:                                constructs.         (line  167)
-* machin:                                constructs.         (line  169)
-* machin:                                constructs.         (line  378)
-* machin:                                constructs.         (line  379)
-* machin:                                constructs.         (line  380)
-* machin:                                constructs.         (line  381)
-* machin:                                constructs.         (line  721)
-* machin:                                constructs.         (line  723)
-* machin:                                constructs.         (line  955)
-* machin:                                constructs.         (line  956)
-* machin:                                constructs.         (line  957)
-* machin:                                constructs.         (line  958)
-* machin:                                constructs.         (line 1164)
-* machin:                                constructs.         (line 1166)
-* machin:                                constructs.         (line 1375)
-* machin:                                constructs.         (line 1376)
-* machin:                                constructs.         (line 1377)
-* machin:                                constructs.         (line 1378)
+* machin <1>:                            constructs.         (line  169)
+* machin <2>:                            constructs.         (line  378)
+* machin <3>:                            constructs.         (line  379)
+* machin <4>:                            constructs.         (line  380)
+* machin <5>:                            constructs.         (line  381)
+* machin <6>:                            constructs.         (line  721)
+* machin <7>:                            constructs.         (line  723)
+* machin <8>:                            constructs.         (line  955)
+* machin <9>:                            constructs.         (line  956)
+* machin <10>:                           constructs.         (line  957)
+* machin <11>:                           constructs.         (line  958)
+* machin <12>:                           constructs.         (line 1164)
+* machin <13>:                           constructs.         (line 1166)
+* machin <14>:                           constructs.         (line 1375)
+* machin <15>:                           constructs.         (line 1376)
+* machin <16>:                           constructs.         (line 1377)
+* machin <17>:                           constructs.         (line 1378)
 * t-ruc:                                 constructs.         (line 1415)
 * T-ruc:                                 constructs.         (line 1415)
 * truc:                                  constructs.         (line  156)
-* truc:                                  constructs.         (line  183)
-* truc:                                  constructs.         (line  710)
-* truc:                                  constructs.         (line  737)
-* truc:                                  constructs.         (line 1153)
-* truc:                                  constructs.         (line 1180)
+* truc <1>:                              constructs.         (line  183)
+* truc <2>:                              constructs.         (line  710)
+* truc <3>:                              constructs.         (line  737)
+* truc <4>:                              constructs.         (line 1153)
+* truc <5>:                              constructs.         (line 1180)
 
 
 

Index: test/macros/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/macros/Makefile.am     2 Aug 2009 13:47:02 -0000       1.10
+++ test/macros/Makefile.am     6 Sep 2009 21:46:22 -0000       1.11
@@ -9,7 +9,7 @@
  macro_in_pass_texi_commands.texi two_macros_on_a_line.texi \
  macro_commands_in_pass_texi_commands.texi node-value.texi empty_macro.texi \
  test_include_with_setfilename.texi no_arg_macro.texi \
- simple_imbricated_macro.texi \
+ simple_imbricated_macro.texi test_paths.texi \
  address@hidden \
  file.texi inc_file.texi macro_included.texi my-bib-macros.texi \
  incl-incl.txi included_file_with_setfilename.texi \

Index: test/macros/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/macros/Makefile.in     10 Aug 2009 10:01:00 -0000      1.15
+++ test/macros/Makefile.in     6 Sep 2009 21:46:22 -0000       1.16
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -141,7 +144,7 @@
  macro_in_pass_texi_commands.texi two_macros_on_a_line.texi \
  macro_commands_in_pass_texi_commands.texi node-value.texi empty_macro.texi \
  test_include_with_setfilename.texi no_arg_macro.texi \
- simple_imbricated_macro.texi \
+ simple_imbricated_macro.texi test_paths.texi \
  address@hidden \
  file.texi inc_file.texi macro_included.texi my-bib-macros.texi \
  incl-incl.txi included_file_with_setfilename.texi \
@@ -161,7 +164,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/macros/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/macros/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -180,6 +183,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -203,13 +207,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -240,6 +248,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -259,6 +268,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -267,18 +278,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -318,6 +339,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/macros/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/tests.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/macros/tests.txt       4 Aug 2009 07:58:41 -0000       1.11
+++ test/macros/tests.txt       6 Sep 2009 21:46:22 -0000       1.12
@@ -31,6 +31,7 @@
 texi macro_commands_in_pass_texi_commands.texi
 texi no_arg_macro.texi
 texi empty_macro.texi
+texi test_paths.texi
 texi cond.texi --ifhtml --ifinfo --no-iftex
 test_include test_include.texi
 texi simple_imbricated_macro.texi
@@ -61,3 +62,4 @@
 test_include_with_setfilename_info test_include_with_setfilename.texi --init 
info.init
 no_arg_macro_info no_arg_macro.texi --init info.init
 simple_imbricated_macro simple_imbricated_macro.texi
+test_paths test_paths.texi

Index: test/manuals/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/manuals/Makefile.in    10 Aug 2009 10:01:01 -0000      1.12
+++ test/manuals/Makefile.in    6 Sep 2009 21:46:23 -0000       1.13
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -148,7 +151,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/manuals/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/manuals/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -167,6 +170,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -190,13 +194,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -227,6 +235,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -246,6 +255,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -254,18 +265,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -305,6 +326,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/manuals/res/ccvs_info/cvs.info-2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/ccvs_info/cvs.info-2,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/manuals/res/ccvs_info/cvs.info-2       25 Jul 2009 12:35:28 -0000      
1.6
+++ test/manuals/res/ccvs_info/cvs.info-2       6 Sep 2009 21:46:24 -0000       
1.7
@@ -3104,7 +3104,7 @@
 * -a, in modules file:                   Alias modules.       (line   5)
 * -d, in modules file:                   Module options.      (line   9)
 * -e, in modules file:                   Module options.      (line  12)
-* -e, in modules file:                   Module program options.
+* -e, in modules file <1>:               Module program options.
                                                               (line   5)
 * -j (merging branches):                 Merging a branch.    (line   5)
 * -j (merging branches), and keyword substitution: Merging and keywords.
@@ -3113,11 +3113,11 @@
 * -kk, to avoid conflicts during a merge: Merging and keywords.
                                                               (line   5)
 * -o, in modules file:                   Module options.      (line  16)
-* -o, in modules file:                   Module program options.
+* -o, in modules file <1>:               Module program options.
                                                               (line   5)
 * -s, in modules file:                   Module options.      (line  22)
 * -t, in modules file:                   Module options.      (line  30)
-* -t, in modules file:                   Module program options.
+* -t, in modules file <1>:               Module program options.
                                                               (line   5)
 * .# files:                              update output.       (line  49)
 * .bashrc, setting CVSROOT in:           Specifying a repository.
@@ -3152,7 +3152,7 @@
 * `commitinfo', working directory:       commitinfo.          (line  29)
 * `verifymsg' (admin file):              verifymsg.           (line   5)
 * `verifymsg', changing the log message: verifymsg.           (line  30)
-* `verifymsg', changing the log message: config.              (line  67)
+* `verifymsg', changing the log message <1>: config.          (line  67)
 * Abandoning work:                       Editing files.       (line  32)
 * Access a branch:                       Accessing branches.  (line   5)
 * add (subcommand):                      Adding files.        (line  28)
@@ -3192,7 +3192,7 @@
 * Binary files:                          Binary files.        (line   5)
 * Branch merge example:                  Merging a branch.    (line  14)
 * Branch number:                         Revision numbers.    (line   5)
-* Branch number:                         Branches and revisions.
+* Branch number <1>:                     Branches and revisions.
                                                               (line   5)
 * Branch tags, deleting:                 Modifying tags.      (line  18)
 * Branch tags, moving:                   Modifying tags.      (line  36)
@@ -3230,7 +3230,7 @@
 * Client/Server Operation:               Remote repositories. (line   5)
 * Client/Server Operation, port specification: Remote repositories.
                                                               (line   5)
-* Client/Server Operation, port specification: Password authentication server.
+* Client/Server Operation, port specification <1>: Password authentication 
server.
                                                               (line   9)
 * co (subcommand):                       checkout.            (line   5)
 * Command reference:                     Invoking CVS.        (line   5)
@@ -3246,7 +3246,7 @@
 * Common syntax of info files:           syntax.              (line   5)
 * Compatibility, between CVS versions:   Compatibility.       (line   5)
 * Compression:                           Global options.      (line 126)
-* Compression:                           Invoking CVS.        (line  79)
+* Compression <1>:                       Invoking CVS.        (line  79)
 * COMSPEC, environment variable:         Environment variables.
                                                               (line 122)
 * config, in CVSROOT:                    config.              (line   5)
@@ -3308,7 +3308,7 @@
 * cvsadmin:                              admin.               (line  17)
 * CVSEDITOR, environment variable:       Committing your changes.
                                                               (line  16)
-* CVSEDITOR, environment variable:       Environment variables.
+* CVSEDITOR, environment variable <1>:   Environment variables.
                                                               (line  46)
 * CVSEDITOR, internal variable:          Variables.           (line  37)
 * CVSHeader keyword:                     Keyword list.        (line  11)
@@ -3338,7 +3338,7 @@
 * CVSUMASK, environment variable:        File permissions.    (line  33)
 * cvswrappers (admin file):              Wrappers.            (line   5)
 * CVSWRAPPERS, environment variable:     Wrappers.            (line   5)
-* CVSWRAPPERS, environment variable:     Environment variables.
+* CVSWRAPPERS, environment variable <1>: Environment variables.
                                                               (line  12)
 * CVS_CLIENT_LOG, environment variable:  Environment variables.
                                                               (line  97)
@@ -3399,7 +3399,7 @@
 * Editor, avoiding invocation of:        Common options.      (line 115)
 * EDITOR, environment variable:          Committing your changes.
                                                               (line  16)
-* EDITOR, environment variable:          Environment variables.
+* EDITOR, environment variable <1>:      Environment variables.
                                                               (line  47)
 * EDITOR, internal variable:             Variables.           (line  38)
 * EDITOR, overriding:                    Global options.      (line  40)
@@ -3456,12 +3456,12 @@
 * Group:                                 File permissions.    (line   5)
 * gserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* gserver (client/server connection method), port specification: Password 
authentication server.
+* gserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * GSSAPI:                                GSSAPI authenticated.
                                                               (line   5)
 * Gzip:                                  Global options.      (line 126)
-* Gzip:                                  Invoking CVS.        (line  79)
+* Gzip <1>:                              Invoking CVS.        (line  79)
 * Hard links:                            Special Files.       (line   5)
 * HEAD, as reserved tag name:            Tags.                (line  24)
 * HEAD, special tag:                     Common options.      (line 148)
@@ -3523,7 +3523,7 @@
 * Known bugs in this manual or CVS:      BUGS.                (line  68)
 * kserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* kserver (client/server connection method), port specification: Password 
authentication server.
+* kserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * Layout of repository:                  Repository.          (line   5)
 * Left-hand options:                     Global options.      (line   5)
@@ -3611,7 +3611,7 @@
 * Notify.tmp file, in CVS directory:     Working directory storage.
                                                               (line 171)
 * Number, branch:                        Revision numbers.    (line   5)
-* Number, branch:                        Branches and revisions.
+* Number, branch <1>:                    Branches and revisions.
                                                               (line   5)
 * Number, revision-:                     Revision numbers.    (line   5)
 * Option defaults:                       ~/.cvsrc.            (line   5)
@@ -3645,12 +3645,12 @@
 * Policy:                                When to commit.      (line   5)
 * port, specifying for remote repositories: Remote repositories.
                                                               (line   5)
-* port, specifying for remote repositories: Password authentication server.
+* port, specifying for remote repositories <1>: Password authentication server.
                                                               (line   9)
 * Precommit checking:                    commitinfo.          (line   5)
 * pserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* pserver (client/server connection method), port specification: Password 
authentication server.
+* pserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * pserver (subcommand):                  Password authentication server.
                                                               (line   9)
@@ -3691,7 +3691,7 @@
 * Remote repositories:                   Remote repositories. (line   5)
 * Remote repositories, port specification: Remote repositories.
                                                               (line   5)
-* Remote repositories, port specification: Password authentication server.
+* Remote repositories, port specification <1>: Password authentication server.
                                                               (line   9)
 * Remove (subcommand):                   Removing files.      (line  33)
 * Removing a change:                     Merging two revisions.
@@ -3712,7 +3712,7 @@
 * Repositories, remote:                  Remote repositories. (line   5)
 * Repositories, remote, port specification: Remote repositories.
                                                               (line   5)
-* Repositories, remote, port specification: Password authentication server.
+* Repositories, remote, port specification <1>: Password authentication server.
                                                               (line   9)
 * Repository (intro):                    Repository.          (line   5)
 * Repository file, in CVS directory:     Working directory storage.
@@ -3862,7 +3862,7 @@
 * USER, environment variable:            Variables.           (line  81)
 * USER, internal variable:               Variables.           (line  43)
 * UserAdminOptions, in CVSROOT/config:   admin.               (line  17)
-* UserAdminOptions, in CVSROOT/config:   config.              (line  84)
+* UserAdminOptions, in CVSROOT/config <1>: config.            (line  84)
 * users (admin file):                    Getting Notified.    (line  70)
 * Variables:                             Variables.           (line   5)
 * Vendor:                                Tracking sources.    (line   9)
@@ -3874,7 +3874,7 @@
 * Viewing differences:                   Viewing differences. (line   5)
 * VISUAL, environment variable:          Committing your changes.
                                                               (line  22)
-* VISUAL, environment variable:          Environment variables.
+* VISUAL, environment variable <1>:      Environment variables.
                                                               (line  48)
 * VISUAL, internal variable:             Variables.           (line  39)
 * watch add (subcommand):                Getting Notified.    (line  10)

Index: test/manuals/res/texinfo/internal_links_texinfo.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo/internal_links_texinfo.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res/texinfo/internal_links_texinfo.txt 6 Aug 2009 16:28:21 
-0000       1.2
+++ test/manuals/res/texinfo/internal_links_texinfo.txt 6 Sep 2009 21:46:24 
-0000       1.3
@@ -775,9 +775,9 @@
 texinfo_27.html#index-Nodes_002c-checking-for-badly-referenced cp      Nodes, 
checking for badly referenced
 texinfo_15.html#index-Non_002dbreakable-space  cp      Non-breakable space
 texinfo_14.html#index-Not-ending-a-sentence    cp      Not ending a sentence
-texinfo_14.html#index-OE       cp      O
+texinfo_14.html#index-O-1      cp      O
 texinfo_2.html#index-O_0027Dea_002c-Brendan    cp      O'Dea, Brendan
-texinfo_14.html#index-OE-2     cp      OE
+texinfo_14.html#index-OE-1     cp      OE
 texinfo_30.html#index-Obtaining-TeX    cp      Obtaining TeX
 texinfo_27.html#index-Occurrences_002c-listing-with-_0040occur cp      
Occurrences, listing with @occur
 texinfo_16.html#index-Optional-and-repeated-arguments  cp      Optional and 
repeated arguments
@@ -1071,8 +1071,8 @@
 texinfo_21.html#index-makeinfo-inside-Emacs    cp      makeinfo inside Emacs
 texinfo_21.html#index-makeinfo-options cp      makeinfo options
 texinfo_18.html#index-meta-HTML-tag_002c-and-charset   cp      meta HTML tag, 
and charset
-texinfo_14.html#index-oe       cp      o
-texinfo_14.html#index-oe-2     cp      oe
+texinfo_14.html#index-o-1      cp      o
+texinfo_14.html#index-oe-1     cp      oe
 texinfo_3.html#index-page_002ddelimiter        cp      page-delimiter
 texinfo_20.html#index-pdfcolor_002etex_002c-installing cp      pdfcolor.tex, 
installing
 texinfo_20.html#index-pdftex   cp      pdftex
@@ -1115,7 +1115,7 @@
 texinfo_27.html#index-Info_002dvalidate        fn      Info-validate
 texinfo_14.html#index-L        fn      L
 texinfo_14.html#index-O        fn      O
-texinfo_14.html#index-OE-1     fn      OE
+texinfo_14.html#index-OE       fn      OE
 texinfo_14.html#index-_005c-_0028literal-_005c-in-_0040math_0029       fn      
\ (literal \ in @math)
 texinfo_20.html#index-_005cemergencystretch    fn      \emergencystretch
 texinfo_2.html#index-_005cinput-_0028raw-TeX-startup_0029      fn      \input 
(raw TeX startup)
@@ -1283,7 +1283,7 @@
 texinfo_3.html#index-occur_002dmode_002dgoto_002doccurrence    fn      
occur-mode-goto-occurrence
 texinfo_26.html#index-oddfooting       fn      oddfooting
 texinfo_26.html#index-oddheading       fn      oddheading
-texinfo_14.html#index-oe-1     fn      oe
+texinfo_14.html#index-oe       fn      oe
 texinfo_10.html#index-option   fn      option
 texinfo_15.html#index-page     fn      page
 texinfo_4.html#index-page_002c-within-_0040titlepage   fn      page, within 
@titlepage

Index: test/manuals/res/texinfo/texinfo_14.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_14.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/manuals/res/texinfo/texinfo_14.html    24 Aug 2009 10:27:26 -0000      
1.14
+++ test/manuals/res/texinfo/texinfo_14.html    6 Sep 2009 21:46:24 -0000       
1.15
@@ -577,13 +577,13 @@
 <a name="index-L"></a>
 <a name="index-L-1"></a>
 <a name="index-o"></a>
-<a name="index-oe"></a>
+<a name="index-o-1"></a>
 <a name="index-O"></a>
-<a name="index-OE"></a>
+<a name="index-O-1"></a>
+<a name="index-oe"></a>
 <a name="index-oe-1"></a>
-<a name="index-oe-2"></a>
+<a name="index-OE"></a>
 <a name="index-OE-1"></a>
-<a name="index-OE-2"></a>
 <a name="index-ss"></a>
 <a name="index-ss-1"></a>
 <a name="index-Es_002dzet"></a>

Index: test/manuals/res/texinfo/texinfo_33.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_33.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/manuals/res/texinfo/texinfo_33.html    24 Aug 2009 10:27:27 -0000      
1.10
+++ test/manuals/res/texinfo/texinfo_33.html    6 Sep 2009 21:46:24 -0000       
1.11
@@ -255,8 +255,8 @@
 <tr><td></td><td valign="top"><a 
href="texinfo_3.html#index-occur_002dmode_002dgoto_002doccurrence"><code>occur-mode-goto-occurrence</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="texinfo_3.html#Showing-the-Structure">2.3 Showing the 
Section Structure of a File</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_26.html#index-oddfooting"><code>oddfooting</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="texinfo_26.html#Custom-Headings">E.3 How to Make Your 
Own Headings</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_26.html#index-oddheading"><code>oddheading</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="texinfo_26.html#Custom-Headings">E.3 How to Make Your 
Own Headings</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-OE-1"><code>OE</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-oe-1"><code>oe</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-OE"><code>OE</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-oe"><code>oe</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_10.html#index-option"><code>option</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="texinfo_10.html#option">9.1.10 
<code>@option</code>{<var>option-name</var>}</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="index_split-0_fn_letter-P">P</a></th><td></td><td></td></tr>

Index: test/manuals/res/texinfo/texinfo_39.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_39.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/manuals/res/texinfo/texinfo_39.html    25 Aug 2009 13:15:46 -0000      
1.11
+++ test/manuals/res/texinfo/texinfo_39.html    6 Sep 2009 21:46:24 -0000       
1.12
@@ -180,13 +180,13 @@
 <tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-Not-ending-a-sentence">Not ending a 
sentence</a></td><td>&nbsp;</td><td valign="top"><a 
href="texinfo_14.html#Not-Ending-a-Sentence">13.2.1 Not Ending a 
Sentence</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="index_split-5_cp_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-OE">&Oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-oe">&oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-O-1">&Oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-o-1">&oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_2.html#index-O_0027Dea_002c-Brendan">O&rsquo;Dea, 
Brendan</a></td><td>&nbsp;</td><td valign="top"><a 
href="texinfo_2.html#Using-Texinfo">1.2 Using Texinfo</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_30.html#index-Obtaining-TeX">Obtaining 
TeX</a></td><td>&nbsp;</td><td valign="top"><a 
href="texinfo_30.html#Obtaining-TeX">Appendix I How to Obtain TeX</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_27.html#index-Occurrences_002c-listing-with-_0040occur">Occurrences,
 listing with <code>@occur</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="texinfo_27.html#Using-occur">F.4 Using <code>occur</code></a></td></tr>
-<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-OE-2">&OElig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-oe-2">&oelig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-OE-1">&OElig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="texinfo_14.html#index-oe-1">&oelig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="texinfo_14.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_16.html#index-Optional-and-repeated-arguments">Optional and 
repeated arguments</a></td><td>&nbsp;</td><td valign="top"><a 
href="texinfo_16.html#Optional-Arguments">15.2 Optional and Repeated 
Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_21.html#index-Options-for-makeinfo">Options for 
<code>makeinfo</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="texinfo_21.html#makeinfo-options">20.1.3 Options for 
<code>makeinfo</code></a></td></tr>
 <tr><td></td><td valign="top"><a 
href="texinfo_17.html#index-Ordinary-HTML-commands_002c-using">Ordinary HTML 
commands, using</a></td><td>&nbsp;</td><td valign="top"><a 
href="texinfo_17.html#Raw-Formatter-Commands">16.3 Raw Formatter 
Commands</a></td></tr>

Index: test/manuals/res/texinfo/texinfo_cp.idx
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_cp.idx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/manuals/res/texinfo/texinfo_cp.idx     6 Aug 2009 16:28:22 -0000       
1.4
+++ test/manuals/res/texinfo/texinfo_cp.idx     6 Sep 2009 21:46:24 -0000       
1.5
@@ -2945,7 +2945,7 @@
   element_href: texinfo_14.html#Not-Ending-a-Sentence
   element_text: 13.2.1 Not Ending a Sentence
 key: O
-  origin_href: texinfo_14.html#index-OE
+  origin_href: texinfo_14.html#index-O-1
   entry: &Oslash;
   texi_entry: @O{}
   element_href: texinfo_14.html#Inserting-Accents
@@ -2957,7 +2957,7 @@
   element_href: texinfo_2.html#Using-Texinfo
   element_text: 1.2 Using Texinfo
 key: OE
-  origin_href: texinfo_14.html#index-OE-2
+  origin_href: texinfo_14.html#index-OE-1
   entry: &OElig;
   texi_entry: @OE{}
   element_href: texinfo_14.html#Inserting-Accents
@@ -4721,13 +4721,13 @@
   element_href: texinfo_18.html#documentencoding
   element_text: 17.2 <code>@documentencoding <var>enc</var></code>: Set Input 
Encoding
 key: o
-  origin_href: texinfo_14.html#index-oe
+  origin_href: texinfo_14.html#index-o-1
   entry: &oslash;
   texi_entry: @o{}
   element_href: texinfo_14.html#Inserting-Accents
   element_text: 13.3 Inserting Accents
 key: oe
-  origin_href: texinfo_14.html#index-oe-2
+  origin_href: texinfo_14.html#index-oe-1
   entry: &oelig;
   texi_entry: @oe{}
   element_href: texinfo_14.html#Inserting-Accents

Index: test/manuals/res/texinfo/texinfo_fn.idx
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_fn.idx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res/texinfo/texinfo_fn.idx     6 Aug 2009 16:28:22 -0000       
1.2
+++ test/manuals/res/texinfo/texinfo_fn.idx     6 Sep 2009 21:46:24 -0000       
1.3
@@ -119,7 +119,7 @@
   element_href: texinfo_14.html#Inserting-Accents
   element_text: 13.3 Inserting Accents
 key: OE
-  origin_href: texinfo_14.html#index-OE-1
+  origin_href: texinfo_14.html#index-OE
   entry: <code>OE</code>
   texi_entry: @code{OE}
   element_href: texinfo_14.html#Inserting-Accents
@@ -1127,7 +1127,7 @@
   element_href: texinfo_26.html#Custom-Headings
   element_text: E.3 How to Make Your Own Headings
 key: oe
-  origin_href: texinfo_14.html#index-oe-1
+  origin_href: texinfo_14.html#index-oe
   entry: <code>oe</code>
   texi_entry: @code{oe}
   element_href: texinfo_14.html#Inserting-Accents

Index: test/manuals/res/texinfo_html/texinfo.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo_html/texinfo.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res/texinfo_html/texinfo.html  5 Sep 2009 07:24:06 -0000       
1.3
+++ test/manuals/res/texinfo_html/texinfo.html  6 Sep 2009 21:46:24 -0000       
1.4
@@ -11671,13 +11671,13 @@
 <a name="index-L"></a>
 <a name="index-L-1"></a>
 <a name="index-o"></a>
-<a name="index-oe"></a>
+<a name="index-o-1"></a>
 <a name="index-O"></a>
-<a name="index-OE"></a>
+<a name="index-O-1"></a>
+<a name="index-oe"></a>
 <a name="index-oe-1"></a>
-<a name="index-oe-2"></a>
+<a name="index-OE"></a>
 <a name="index-OE-1"></a>
-<a name="index-OE-2"></a>
 <a name="index-ss"></a>
 <a name="index-ss-1"></a>
 <a name="index-Es_002dzet"></a>
@@ -22549,8 +22549,8 @@
 <tr><td></td><td valign="top"><a 
href="#index-occur_002dmode_002dgoto_002doccurrence"><code>occur-mode-goto-occurrence</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="#Showing-the-Structure">2.3 Showing the Section 
Structure of a File</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-oddfooting"><code>oddfooting</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#Custom-Headings">E.3 How to Make Your Own 
Headings</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-oddheading"><code>oddheading</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#Custom-Headings">E.3 How to Make Your Own 
Headings</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE-1"><code>OE</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe-1"><code>oe</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-OE"><code>OE</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-oe"><code>oe</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-option"><code>option</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#option">9.1.10 
<code>@option</code>{<var>option-name</var>}</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a 
name="Command-and-Variable-Index-1_fn_letter-P">P</a></th><td></td><td></td></tr>
@@ -23450,13 +23450,13 @@
 <tr><td></td><td valign="top"><a href="#index-Not-ending-a-sentence">Not 
ending a sentence</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Not-Ending-a-Sentence">13.2.1 Not Ending a Sentence</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Concept-Index-1_cp_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE">&Oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe">&oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-O-1">&Oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-o-1">&oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-O_0027Dea_002c-Brendan">O&rsquo;Dea, 
Brendan</a></td><td>&nbsp;</td><td valign="top"><a href="#Using-Texinfo">1.2 
Using Texinfo</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Obtaining-TeX">Obtaining 
TeX</a></td><td>&nbsp;</td><td valign="top"><a href="#Obtaining-TeX">Appendix I 
How to Obtain TeX</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Occurrences_002c-listing-with-_0040occur">Occurrences, listing 
with <code>@occur</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Using-occur">F.4 Using <code>occur</code></a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE-2">&OElig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe-2">&oelig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-OE-1">&OElig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-oe-1">&oelig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Optional-and-repeated-arguments">Optional and repeated 
arguments</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Optional-Arguments">15.2 Optional and Repeated Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Options-for-makeinfo">Options 
for <code>makeinfo</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#makeinfo-options">20.1.3 Options for <code>makeinfo</code></a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Ordinary-HTML-commands_002c-using">Ordinary HTML commands, 
using</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Raw-Formatter-Commands">16.3 Raw Formatter Commands</a></td></tr>

Index: test/manuals/res/texinfo_html_nosplit/texinfo.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo_html_nosplit/texinfo.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res/texinfo_html_nosplit/texinfo.html  5 Sep 2009 07:24:07 
-0000       1.3
+++ test/manuals/res/texinfo_html_nosplit/texinfo.html  6 Sep 2009 21:46:25 
-0000       1.4
@@ -11671,13 +11671,13 @@
 <a name="index-L"></a>
 <a name="index-L-1"></a>
 <a name="index-o"></a>
-<a name="index-oe"></a>
+<a name="index-o-1"></a>
 <a name="index-O"></a>
-<a name="index-OE"></a>
+<a name="index-O-1"></a>
+<a name="index-oe"></a>
 <a name="index-oe-1"></a>
-<a name="index-oe-2"></a>
+<a name="index-OE"></a>
 <a name="index-OE-1"></a>
-<a name="index-OE-2"></a>
 <a name="index-ss"></a>
 <a name="index-ss-1"></a>
 <a name="index-Es_002dzet"></a>
@@ -22549,8 +22549,8 @@
 <tr><td></td><td valign="top"><a 
href="#index-occur_002dmode_002dgoto_002doccurrence"><code>occur-mode-goto-occurrence</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="#Showing-the-Structure">2.3 Showing the Section 
Structure of a File</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-oddfooting"><code>oddfooting</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#Custom-Headings">E.3 How to Make Your Own 
Headings</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-oddheading"><code>oddheading</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#Custom-Headings">E.3 How to Make Your Own 
Headings</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE-1"><code>OE</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe-1"><code>oe</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-OE"><code>OE</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-oe"><code>oe</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-option"><code>option</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#option">9.1.10 
<code>@option</code>{<var>option-name</var>}</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a 
name="Command-and-Variable-Index-1_fn_letter-P">P</a></th><td></td><td></td></tr>
@@ -23450,13 +23450,13 @@
 <tr><td></td><td valign="top"><a href="#index-Not-ending-a-sentence">Not 
ending a sentence</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Not-Ending-a-Sentence">13.2.1 Not Ending a Sentence</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Concept-Index-1_cp_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE">&Oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe">&oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-O-1">&Oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-o-1">&oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-O_0027Dea_002c-Brendan">O&rsquo;Dea, 
Brendan</a></td><td>&nbsp;</td><td valign="top"><a href="#Using-Texinfo">1.2 
Using Texinfo</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Obtaining-TeX">Obtaining 
TeX</a></td><td>&nbsp;</td><td valign="top"><a href="#Obtaining-TeX">Appendix I 
How to Obtain TeX</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Occurrences_002c-listing-with-_0040occur">Occurrences, listing 
with <code>@occur</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Using-occur">F.4 Using <code>occur</code></a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE-2">&OElig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe-2">&oelig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-OE-1">&OElig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-oe-1">&oelig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">13.3 Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Optional-and-repeated-arguments">Optional and repeated 
arguments</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Optional-Arguments">15.2 Optional and Repeated Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Options-for-makeinfo">Options 
for <code>makeinfo</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#makeinfo-options">20.1.3 Options for <code>makeinfo</code></a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Ordinary-HTML-commands_002c-using">Ordinary HTML commands, 
using</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Raw-Formatter-Commands">16.3 Raw Formatter Commands</a></td></tr>

Index: test/manuals/res/texinfo_nodes/Inserting-Accents.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo_nodes/Inserting-Accents.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/manuals/res/texinfo_nodes/Inserting-Accents.html       24 Aug 2009 
10:27:29 -0000      1.14
+++ test/manuals/res/texinfo_nodes/Inserting-Accents.html       6 Sep 2009 
21:46:25 -0000       1.15
@@ -164,13 +164,13 @@
 <a name="index-L"></a>
 <a name="index-L-1"></a>
 <a name="index-o"></a>
-<a name="index-oe"></a>
+<a name="index-o-1"></a>
 <a name="index-O"></a>
-<a name="index-OE"></a>
+<a name="index-O-1"></a>
+<a name="index-oe"></a>
 <a name="index-oe-1"></a>
-<a name="index-oe-2"></a>
+<a name="index-OE"></a>
 <a name="index-OE-1"></a>
-<a name="index-OE-2"></a>
 <a name="index-ss"></a>
 <a name="index-ss-1"></a>
 <a name="index-Es_002dzet"></a>

Index: test/manuals/res/texinfo_nodes/texinfo_285.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo_nodes/texinfo_285.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/manuals/res/texinfo_nodes/texinfo_285.html     24 Aug 2009 10:27:32 
-0000      1.11
+++ test/manuals/res/texinfo_nodes/texinfo_285.html     6 Sep 2009 21:46:25 
-0000       1.12
@@ -256,8 +256,8 @@
 <tr><td></td><td valign="top"><a 
href="Showing-the-Structure.html#index-occur_002dmode_002dgoto_002doccurrence"><code>occur-mode-goto-occurrence</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Showing-the-Structure.html#Showing-the-Structure">2.3 
Showing the Section Structure of a File</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Custom-Headings.html#index-oddfooting"><code>oddfooting</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Custom-Headings.html#Custom-Headings">E.3 How to Make 
Your Own Headings</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Custom-Headings.html#index-oddheading"><code>oddheading</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Custom-Headings.html#Custom-Headings">E.3 How to Make 
Your Own Headings</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-1"><code>OE</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-1"><code>oe</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE"><code>OE</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe"><code>oe</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="option.html#index-option"><code>option</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="option.html#option">9.1.10 
<code>@option</code>{<var>option-name</var>}</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="index_split-0_fn_letter-P">P</a></th><td></td><td></td></tr>

Index: test/manuals/res/texinfo_nodes/texinfo_291.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res/texinfo_nodes/texinfo_291.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/manuals/res/texinfo_nodes/texinfo_291.html     25 Aug 2009 13:15:47 
-0000      1.12
+++ test/manuals/res/texinfo_nodes/texinfo_291.html     6 Sep 2009 21:46:25 
-0000       1.13
@@ -181,13 +181,13 @@
 <tr><td></td><td valign="top"><a 
href="Not-Ending-a-Sentence.html#index-Not-ending-a-sentence">Not ending a 
sentence</a></td><td>&nbsp;</td><td valign="top"><a 
href="Not-Ending-a-Sentence.html#Not-Ending-a-Sentence">13.2.1 Not Ending a 
Sentence</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="index_split-5_cp_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE">&Oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe">&oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-O-1">&Oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-o-1">&oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Using-Texinfo.html#index-O_0027Dea_002c-Brendan">O&rsquo;Dea, 
Brendan</a></td><td>&nbsp;</td><td valign="top"><a 
href="Using-Texinfo.html#Using-Texinfo">1.2 Using Texinfo</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Obtaining-TeX.html#index-Obtaining-TeX">Obtaining 
TeX</a></td><td>&nbsp;</td><td valign="top"><a 
href="Obtaining-TeX.html#Obtaining-TeX">Appendix I How to Obtain 
TeX</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Using-occur.html#index-Occurrences_002c-listing-with-_0040occur">Occurrences,
 listing with <code>@occur</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="Using-occur.html#Using-occur">F.4 Using <code>occur</code></a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-2">&OElig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-2">&oelig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-1">&OElig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-1">&oelig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">13.3 Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Optional-Arguments.html#index-Optional-and-repeated-arguments">Optional 
and repeated arguments</a></td><td>&nbsp;</td><td valign="top"><a 
href="Optional-Arguments.html#Optional-Arguments">15.2 Optional and Repeated 
Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="makeinfo-options.html#index-Options-for-makeinfo">Options for 
<code>makeinfo</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="makeinfo-options.html#makeinfo-options">20.1.3 Options for 
<code>makeinfo</code></a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Raw-Formatter-Commands.html#index-Ordinary-HTML-commands_002c-using">Ordinary
 HTML commands, using</a></td><td>&nbsp;</td><td valign="top"><a 
href="Raw-Formatter-Commands.html#Raw-Formatter-Commands">16.3 Raw Formatter 
Commands</a></td></tr>

Index: test/manuals/res_all/ccvs_info/cvs.info-2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_all/ccvs_info/cvs.info-2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_all/ccvs_info/cvs.info-2   31 Jul 2009 10:16:48 -0000      
1.1
+++ test/manuals/res_all/ccvs_info/cvs.info-2   6 Sep 2009 21:46:25 -0000       
1.2
@@ -3104,7 +3104,7 @@
 * -a, in modules file:                   Alias modules.       (line   5)
 * -d, in modules file:                   Module options.      (line   9)
 * -e, in modules file:                   Module options.      (line  12)
-* -e, in modules file:                   Module program options.
+* -e, in modules file <1>:               Module program options.
                                                               (line   5)
 * -j (merging branches):                 Merging a branch.    (line   5)
 * -j (merging branches), and keyword substitution: Merging and keywords.
@@ -3113,11 +3113,11 @@
 * -kk, to avoid conflicts during a merge: Merging and keywords.
                                                               (line   5)
 * -o, in modules file:                   Module options.      (line  16)
-* -o, in modules file:                   Module program options.
+* -o, in modules file <1>:               Module program options.
                                                               (line   5)
 * -s, in modules file:                   Module options.      (line  22)
 * -t, in modules file:                   Module options.      (line  30)
-* -t, in modules file:                   Module program options.
+* -t, in modules file <1>:               Module program options.
                                                               (line   5)
 * .# files:                              update output.       (line  49)
 * .bashrc, setting CVSROOT in:           Specifying a repository.
@@ -3152,7 +3152,7 @@
 * `commitinfo', working directory:       commitinfo.          (line  29)
 * `verifymsg' (admin file):              verifymsg.           (line   5)
 * `verifymsg', changing the log message: verifymsg.           (line  30)
-* `verifymsg', changing the log message: config.              (line  67)
+* `verifymsg', changing the log message <1>: config.          (line  67)
 * Abandoning work:                       Editing files.       (line  32)
 * Access a branch:                       Accessing branches.  (line   5)
 * add (subcommand):                      Adding files.        (line  28)
@@ -3192,7 +3192,7 @@
 * Binary files:                          Binary files.        (line   5)
 * Branch merge example:                  Merging a branch.    (line  14)
 * Branch number:                         Revision numbers.    (line   5)
-* Branch number:                         Branches and revisions.
+* Branch number <1>:                     Branches and revisions.
                                                               (line   5)
 * Branch tags, deleting:                 Modifying tags.      (line  18)
 * Branch tags, moving:                   Modifying tags.      (line  36)
@@ -3230,7 +3230,7 @@
 * Client/Server Operation:               Remote repositories. (line   5)
 * Client/Server Operation, port specification: Remote repositories.
                                                               (line   5)
-* Client/Server Operation, port specification: Password authentication server.
+* Client/Server Operation, port specification <1>: Password authentication 
server.
                                                               (line   9)
 * co (subcommand):                       checkout.            (line   5)
 * Command reference:                     Invoking CVS.        (line   5)
@@ -3246,7 +3246,7 @@
 * Common syntax of info files:           syntax.              (line   5)
 * Compatibility, between CVS versions:   Compatibility.       (line   5)
 * Compression:                           Global options.      (line 126)
-* Compression:                           Invoking CVS.        (line  79)
+* Compression <1>:                       Invoking CVS.        (line  79)
 * COMSPEC, environment variable:         Environment variables.
                                                               (line 122)
 * config, in CVSROOT:                    config.              (line   5)
@@ -3308,7 +3308,7 @@
 * cvsadmin:                              admin.               (line  17)
 * CVSEDITOR, environment variable:       Committing your changes.
                                                               (line  16)
-* CVSEDITOR, environment variable:       Environment variables.
+* CVSEDITOR, environment variable <1>:   Environment variables.
                                                               (line  46)
 * CVSEDITOR, internal variable:          Variables.           (line  37)
 * CVSHeader keyword:                     Keyword list.        (line  11)
@@ -3338,7 +3338,7 @@
 * CVSUMASK, environment variable:        File permissions.    (line  33)
 * cvswrappers (admin file):              Wrappers.            (line   5)
 * CVSWRAPPERS, environment variable:     Wrappers.            (line   5)
-* CVSWRAPPERS, environment variable:     Environment variables.
+* CVSWRAPPERS, environment variable <1>: Environment variables.
                                                               (line  12)
 * CVS_CLIENT_LOG, environment variable:  Environment variables.
                                                               (line  97)
@@ -3399,7 +3399,7 @@
 * Editor, avoiding invocation of:        Common options.      (line 115)
 * EDITOR, environment variable:          Committing your changes.
                                                               (line  16)
-* EDITOR, environment variable:          Environment variables.
+* EDITOR, environment variable <1>:      Environment variables.
                                                               (line  47)
 * EDITOR, internal variable:             Variables.           (line  38)
 * EDITOR, overriding:                    Global options.      (line  40)
@@ -3456,12 +3456,12 @@
 * Group:                                 File permissions.    (line   5)
 * gserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* gserver (client/server connection method), port specification: Password 
authentication server.
+* gserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * GSSAPI:                                GSSAPI authenticated.
                                                               (line   5)
 * Gzip:                                  Global options.      (line 126)
-* Gzip:                                  Invoking CVS.        (line  79)
+* Gzip <1>:                              Invoking CVS.        (line  79)
 * Hard links:                            Special Files.       (line   5)
 * HEAD, as reserved tag name:            Tags.                (line  24)
 * HEAD, special tag:                     Common options.      (line 148)
@@ -3523,7 +3523,7 @@
 * Known bugs in this manual or CVS:      BUGS.                (line  68)
 * kserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* kserver (client/server connection method), port specification: Password 
authentication server.
+* kserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * Layout of repository:                  Repository.          (line   5)
 * Left-hand options:                     Global options.      (line   5)
@@ -3611,7 +3611,7 @@
 * Notify.tmp file, in CVS directory:     Working directory storage.
                                                               (line 171)
 * Number, branch:                        Revision numbers.    (line   5)
-* Number, branch:                        Branches and revisions.
+* Number, branch <1>:                    Branches and revisions.
                                                               (line   5)
 * Number, revision-:                     Revision numbers.    (line   5)
 * Option defaults:                       ~/.cvsrc.            (line   5)
@@ -3645,12 +3645,12 @@
 * Policy:                                When to commit.      (line   5)
 * port, specifying for remote repositories: Remote repositories.
                                                               (line   5)
-* port, specifying for remote repositories: Password authentication server.
+* port, specifying for remote repositories <1>: Password authentication server.
                                                               (line   9)
 * Precommit checking:                    commitinfo.          (line   5)
 * pserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* pserver (client/server connection method), port specification: Password 
authentication server.
+* pserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * pserver (subcommand):                  Password authentication server.
                                                               (line   9)
@@ -3691,7 +3691,7 @@
 * Remote repositories:                   Remote repositories. (line   5)
 * Remote repositories, port specification: Remote repositories.
                                                               (line   5)
-* Remote repositories, port specification: Password authentication server.
+* Remote repositories, port specification <1>: Password authentication server.
                                                               (line   9)
 * Remove (subcommand):                   Removing files.      (line  33)
 * Removing a change:                     Merging two revisions.
@@ -3712,7 +3712,7 @@
 * Repositories, remote:                  Remote repositories. (line   5)
 * Repositories, remote, port specification: Remote repositories.
                                                               (line   5)
-* Repositories, remote, port specification: Password authentication server.
+* Repositories, remote, port specification <1>: Password authentication server.
                                                               (line   9)
 * Repository (intro):                    Repository.          (line   5)
 * Repository file, in CVS directory:     Working directory storage.
@@ -3862,7 +3862,7 @@
 * USER, environment variable:            Variables.           (line  81)
 * USER, internal variable:               Variables.           (line  43)
 * UserAdminOptions, in CVSROOT/config:   admin.               (line  17)
-* UserAdminOptions, in CVSROOT/config:   config.              (line  84)
+* UserAdminOptions, in CVSROOT/config <1>: config.            (line  84)
 * users (admin file):                    Getting Notified.    (line  70)
 * Variables:                             Variables.           (line   5)
 * Vendor:                                Tracking sources.    (line   9)
@@ -3874,7 +3874,7 @@
 * Viewing differences:                   Viewing differences. (line   5)
 * VISUAL, environment variable:          Committing your changes.
                                                               (line  22)
-* VISUAL, environment variable:          Environment variables.
+* VISUAL, environment variable <1>:      Environment variables.
                                                               (line  48)
 * VISUAL, internal variable:             Variables.           (line  39)
 * watch add (subcommand):                Getting Notified.    (line  10)

Index: test/manuals/res_all/texinfo/internal_links_texinfo.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_all/texinfo/internal_links_texinfo.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res_all/texinfo/internal_links_texinfo.txt     6 Aug 2009 
16:28:38 -0000       1.2
+++ test/manuals/res_all/texinfo/internal_links_texinfo.txt     6 Sep 2009 
21:46:26 -0000       1.3
@@ -786,9 +786,9 @@
 texinfo_27.txt#index-Nodes_002c-checking-for-badly-referenced  cp      Nodes, 
checking for badly referenced
 texinfo_15.txt#index-Non_002dbreakable-space   cp      Non-breakable space
 texinfo_14.txt#index-Not-ending-a-sentence     cp      Not ending a sentence
-texinfo_14.txt#index-OE        cp      O
+texinfo_14.txt#index-O-1       cp      O
 texinfo_2.txt#index-O_0027Dea_002c-Brendan     cp      O'Dea, Brendan
-texinfo_14.txt#index-OE-2      cp      OE
+texinfo_14.txt#index-OE-1      cp      OE
 texinfo_30.txt#index-Obtaining-TeX     cp      Obtaining TeX
 texinfo_27.txt#index-Occurrences_002c-listing-with-_0040occur  cp      
Occurrences, listing with @occur
 texinfo_16.txt#index-Optional-and-repeated-arguments   cp      Optional and 
repeated arguments
@@ -1082,8 +1082,8 @@
 texinfo_21.txt#index-makeinfo-inside-Emacs     cp      makeinfo inside Emacs
 texinfo_21.txt#index-makeinfo-options  cp      makeinfo options
 texinfo_18.txt#index-meta-HTML-tag_002c-and-charset    cp      meta HTML tag, 
and charset
-texinfo_14.txt#index-oe        cp      o
-texinfo_14.txt#index-oe-2      cp      oe
+texinfo_14.txt#index-o-1       cp      o
+texinfo_14.txt#index-oe-1      cp      oe
 texinfo_3.txt#index-page_002ddelimiter cp      page-delimiter
 texinfo_20.txt#index-pdfcolor_002etex_002c-installing  cp      pdfcolor.tex, 
installing
 texinfo_20.txt#index-pdftex    cp      pdftex
@@ -1126,7 +1126,7 @@
 texinfo_27.txt#index-Info_002dvalidate fn      Info-validate
 texinfo_14.txt#index-L fn      L
 texinfo_14.txt#index-O fn      O
-texinfo_14.txt#index-OE-1      fn      OE
+texinfo_14.txt#index-OE        fn      OE
 texinfo_14.txt#index-_005c-_0028literal-_005c-in-_0040math_0029        fn      
\ (literal \ in @math)
 texinfo_20.txt#index-_005cemergencystretch     fn      \emergencystretch
 texinfo_2.txt#index-_005cinput-_0028raw-TeX-startup_0029       fn      \input 
(raw TeX startup)
@@ -1294,7 +1294,7 @@
 texinfo_3.txt#index-occur_002dmode_002dgoto_002doccurrence     fn      
occur-mode-goto-occurrence
 texinfo_26.txt#index-oddfooting        fn      oddfooting
 texinfo_26.txt#index-oddheading        fn      oddheading
-texinfo_14.txt#index-oe-1      fn      oe
+texinfo_14.txt#index-oe        fn      oe
 texinfo_10.txt#index-option    fn      option
 texinfo_15.txt#index-page      fn      page
 texinfo_4.txt#index-page_002c-within-_0040titlepage    fn      page, within 
@titlepage

Index: test/manuals/res_all/texinfo/texinfo_cp.idx
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_all/texinfo/texinfo_cp.idx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res_all/texinfo/texinfo_cp.idx 6 Aug 2009 16:28:38 -0000       
1.2
+++ test/manuals/res_all/texinfo/texinfo_cp.idx 6 Sep 2009 21:46:26 -0000       
1.3
@@ -2945,7 +2945,7 @@
   element_href: texinfo_14.txt#Not-Ending-a-Sentence
   element_text: 13.2.1 Not Ending a Sentence
 key: O
-  origin_href: texinfo_14.txt#index-OE
+  origin_href: texinfo_14.txt#index-O-1
   entry: /O
   texi_entry: @O{}
   element_href: texinfo_14.txt#Inserting-Accents
@@ -2957,7 +2957,7 @@
   element_href: texinfo_2.txt#Using-Texinfo
   element_text: 1.2 Using Texinfo
 key: OE
-  origin_href: texinfo_14.txt#index-OE-2
+  origin_href: texinfo_14.txt#index-OE-1
   entry: OE
   texi_entry: @OE{}
   element_href: texinfo_14.txt#Inserting-Accents
@@ -4721,13 +4721,13 @@
   element_href: texinfo_18.txt#documentencoding
   element_text: 17.2 @documentencoding enc: Set Input Encoding
 key: o
-  origin_href: texinfo_14.txt#index-oe
+  origin_href: texinfo_14.txt#index-o-1
   entry: /o
   texi_entry: @o{}
   element_href: texinfo_14.txt#Inserting-Accents
   element_text: 13.3 Inserting Accents
 key: oe
-  origin_href: texinfo_14.txt#index-oe-2
+  origin_href: texinfo_14.txt#index-oe-1
   entry: oe
   texi_entry: @oe{}
   element_href: texinfo_14.txt#Inserting-Accents

Index: test/manuals/res_all/texinfo/texinfo_fn.idx
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_all/texinfo/texinfo_fn.idx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res_all/texinfo/texinfo_fn.idx 6 Aug 2009 16:28:38 -0000       
1.2
+++ test/manuals/res_all/texinfo/texinfo_fn.idx 6 Sep 2009 21:46:26 -0000       
1.3
@@ -119,7 +119,7 @@
   element_href: texinfo_14.txt#Inserting-Accents
   element_text: 13.3 Inserting Accents
 key: OE
-  origin_href: texinfo_14.txt#index-OE-1
+  origin_href: texinfo_14.txt#index-OE
   entry: OE
   texi_entry: @code{OE}
   element_href: texinfo_14.txt#Inserting-Accents
@@ -1127,7 +1127,7 @@
   element_href: texinfo_26.txt#Custom-Headings
   element_text: E.3 How to Make Your Own Headings
 key: oe
-  origin_href: texinfo_14.txt#index-oe-1
+  origin_href: texinfo_14.txt#index-oe
   entry: oe
   texi_entry: @code{oe}
   element_href: texinfo_14.txt#Inserting-Accents

Index: test/manuals/res_all/texinfo_html/Command-and-Variable-Index.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_all/texinfo_html/Command-and-Variable-Index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res_all/texinfo_html/Command-and-Variable-Index.html   5 Sep 
2009 07:24:08 -0000       1.3
+++ test/manuals/res_all/texinfo_html/Command-and-Variable-Index.html   6 Sep 
2009 21:46:26 -0000       1.4
@@ -420,8 +420,8 @@
 <tr><td></td><td valign="top"><a 
href="Showing-the-Structure.html#index-occur_002dmode_002dgoto_002doccurrence"><code>occur-mode-goto-occurrence</code></a></td><td>&nbsp;</td><td
 valign="top"><a 
href="Showing-the-Structure.html#Showing-the-Structure">Showing the 
Structure</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Custom-Headings.html#index-oddfooting"><code>oddfooting</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Custom-Headings.html#Custom-Headings">Custom 
Headings</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Custom-Headings.html#index-oddheading"><code>oddheading</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Custom-Headings.html#Custom-Headings">Custom 
Headings</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-1"><code>OE</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-1"><code>oe</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE"><code>OE</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe"><code>oe</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="option.html#index-option"><code>option</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="option.html#option">option</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a 
name="Command-and-Variable-Index_fn_letter-P">P</a></th><td></td><td></td></tr>

Index: test/manuals/res_all/texinfo_html/Concept-Index.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_all/texinfo_html/Concept-Index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res_all/texinfo_html/Concept-Index.html        5 Sep 2009 
07:24:08 -0000       1.3
+++ test/manuals/res_all/texinfo_html/Concept-Index.html        6 Sep 2009 
21:46:26 -0000       1.4
@@ -723,13 +723,13 @@
 <tr><td></td><td valign="top"><a 
href="Not-Ending-a-Sentence.html#index-Not-ending-a-sentence">Not ending a 
sentence</a></td><td>&nbsp;</td><td valign="top"><a 
href="Not-Ending-a-Sentence.html#Not-Ending-a-Sentence">Not Ending a 
Sentence</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Concept-Index_cp_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE">&Oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe">&oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-O-1">&Oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-o-1">&oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Using-Texinfo.html#index-O_0027Dea_002c-Brendan">O&rsquo;Dea, 
Brendan</a></td><td>&nbsp;</td><td valign="top"><a 
href="Using-Texinfo.html#Using-Texinfo">Using Texinfo</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Obtaining-TeX.html#index-Obtaining-TeX">Obtaining 
TeX</a></td><td>&nbsp;</td><td valign="top"><a 
href="Obtaining-TeX.html#Obtaining-TeX">Obtaining TeX</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Using-occur.html#index-Occurrences_002c-listing-with-_0040occur">Occurrences,
 listing with <code>@occur</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="Using-occur.html#Using-occur">Using occur</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-2">&OElig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-2">&oelig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-1">&OElig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-1">&oelig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Optional-Arguments.html#index-Optional-and-repeated-arguments">Optional 
and repeated arguments</a></td><td>&nbsp;</td><td valign="top"><a 
href="Optional-Arguments.html#Optional-Arguments">Optional 
Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="makeinfo-options.html#index-Options-for-makeinfo">Options for 
<code>makeinfo</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="makeinfo-options.html#makeinfo-options">makeinfo options</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Raw-Formatter-Commands.html#index-Ordinary-HTML-commands_002c-using">Ordinary
 HTML commands, using</a></td><td>&nbsp;</td><td valign="top"><a 
href="Raw-Formatter-Commands.html#Raw-Formatter-Commands">Raw Formatter 
Commands</a></td></tr>

Index: test/manuals/res_all/texinfo_html/Inserting-Accents.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_all/texinfo_html/Inserting-Accents.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res_all/texinfo_html/Inserting-Accents.html    5 Sep 2009 
07:24:09 -0000       1.3
+++ test/manuals/res_all/texinfo_html/Inserting-Accents.html    6 Sep 2009 
21:46:26 -0000       1.4
@@ -160,13 +160,13 @@
 <a name="index-L"></a>
 <a name="index-L-1"></a>
 <a name="index-o"></a>
-<a name="index-oe"></a>
+<a name="index-o-1"></a>
 <a name="index-O"></a>
-<a name="index-OE"></a>
+<a name="index-O-1"></a>
+<a name="index-oe"></a>
 <a name="index-oe-1"></a>
-<a name="index-oe-2"></a>
+<a name="index-OE"></a>
 <a name="index-OE-1"></a>
-<a name="index-OE-2"></a>
 <a name="index-ss"></a>
 <a name="index-ss-1"></a>
 <a name="index-Es_002dzet"></a>

Index: test/manuals/res_all/texinfo_html_nosplit/texinfo.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_all/texinfo_html_nosplit/texinfo.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res_all/texinfo_html_nosplit/texinfo.html      5 Sep 2009 
07:24:12 -0000       1.2
+++ test/manuals/res_all/texinfo_html_nosplit/texinfo.html      6 Sep 2009 
21:46:27 -0000       1.3
@@ -10398,13 +10398,13 @@
 <a name="index-L"></a>
 <a name="index-L-1"></a>
 <a name="index-o"></a>
-<a name="index-oe"></a>
+<a name="index-o-1"></a>
 <a name="index-O"></a>
-<a name="index-OE"></a>
+<a name="index-O-1"></a>
+<a name="index-oe"></a>
 <a name="index-oe-1"></a>
-<a name="index-oe-2"></a>
+<a name="index-OE"></a>
 <a name="index-OE-1"></a>
-<a name="index-OE-2"></a>
 <a name="index-ss"></a>
 <a name="index-ss-1"></a>
 <a name="index-Es_002dzet"></a>
@@ -19925,8 +19925,8 @@
 <tr><td></td><td valign="top"><a 
href="#index-occur_002dmode_002dgoto_002doccurrence"><code>occur-mode-goto-occurrence</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="#Showing-the-Structure">Showing the 
Structure</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-oddfooting"><code>oddfooting</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#Custom-Headings">Custom Headings</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-oddheading"><code>oddheading</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#Custom-Headings">Custom Headings</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE-1"><code>OE</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe-1"><code>oe</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-OE"><code>OE</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-oe"><code>oe</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-option"><code>option</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#option">option</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a 
name="Command-and-Variable-Index_fn_letter-P">P</a></th><td></td><td></td></tr>
@@ -20815,13 +20815,13 @@
 <tr><td></td><td valign="top"><a href="#index-Not-ending-a-sentence">Not 
ending a sentence</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Not-Ending-a-Sentence">Not Ending a Sentence</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Concept-Index_cp_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE">&Oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe">&oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-O-1">&Oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-o-1">&oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-O_0027Dea_002c-Brendan">O&rsquo;Dea, 
Brendan</a></td><td>&nbsp;</td><td valign="top"><a href="#Using-Texinfo">Using 
Texinfo</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Obtaining-TeX">Obtaining 
TeX</a></td><td>&nbsp;</td><td valign="top"><a href="#Obtaining-TeX">Obtaining 
TeX</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Occurrences_002c-listing-with-_0040occur">Occurrences, listing 
with <code>@occur</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Using-occur">Using occur</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE-2">&OElig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe-2">&oelig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-OE-1">&OElig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-oe-1">&oelig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Optional-and-repeated-arguments">Optional and repeated 
arguments</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Optional-Arguments">Optional Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Options-for-makeinfo">Options 
for <code>makeinfo</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#makeinfo-options">makeinfo options</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Ordinary-HTML-commands_002c-using">Ordinary HTML commands, 
using</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Raw-Formatter-Commands">Raw Formatter Commands</a></td></tr>

Index: test/manuals/res_info/ccvs/cvs.info-2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res_info/ccvs/cvs.info-2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_info/ccvs/cvs.info-2       31 Jul 2009 10:17:09 -0000      
1.1
+++ test/manuals/res_info/ccvs/cvs.info-2       6 Sep 2009 21:46:28 -0000       
1.2
@@ -3104,7 +3104,7 @@
 * -a, in modules file:                   Alias modules.       (line   5)
 * -d, in modules file:                   Module options.      (line   9)
 * -e, in modules file:                   Module options.      (line  12)
-* -e, in modules file:                   Module program options.
+* -e, in modules file <1>:               Module program options.
                                                               (line   5)
 * -j (merging branches):                 Merging a branch.    (line   5)
 * -j (merging branches), and keyword substitution: Merging and keywords.
@@ -3113,11 +3113,11 @@
 * -kk, to avoid conflicts during a merge: Merging and keywords.
                                                               (line   5)
 * -o, in modules file:                   Module options.      (line  16)
-* -o, in modules file:                   Module program options.
+* -o, in modules file <1>:               Module program options.
                                                               (line   5)
 * -s, in modules file:                   Module options.      (line  22)
 * -t, in modules file:                   Module options.      (line  30)
-* -t, in modules file:                   Module program options.
+* -t, in modules file <1>:               Module program options.
                                                               (line   5)
 * .# files:                              update output.       (line  49)
 * .bashrc, setting CVSROOT in:           Specifying a repository.
@@ -3152,7 +3152,7 @@
 * `commitinfo', working directory:       commitinfo.          (line  29)
 * `verifymsg' (admin file):              verifymsg.           (line   5)
 * `verifymsg', changing the log message: verifymsg.           (line  30)
-* `verifymsg', changing the log message: config.              (line  67)
+* `verifymsg', changing the log message <1>: config.          (line  67)
 * Abandoning work:                       Editing files.       (line  32)
 * Access a branch:                       Accessing branches.  (line   5)
 * add (subcommand):                      Adding files.        (line  28)
@@ -3192,7 +3192,7 @@
 * Binary files:                          Binary files.        (line   5)
 * Branch merge example:                  Merging a branch.    (line  14)
 * Branch number:                         Revision numbers.    (line   5)
-* Branch number:                         Branches and revisions.
+* Branch number <1>:                     Branches and revisions.
                                                               (line   5)
 * Branch tags, deleting:                 Modifying tags.      (line  18)
 * Branch tags, moving:                   Modifying tags.      (line  36)
@@ -3230,7 +3230,7 @@
 * Client/Server Operation:               Remote repositories. (line   5)
 * Client/Server Operation, port specification: Remote repositories.
                                                               (line   5)
-* Client/Server Operation, port specification: Password authentication server.
+* Client/Server Operation, port specification <1>: Password authentication 
server.
                                                               (line   9)
 * co (subcommand):                       checkout.            (line   5)
 * Command reference:                     Invoking CVS.        (line   5)
@@ -3246,7 +3246,7 @@
 * Common syntax of info files:           syntax.              (line   5)
 * Compatibility, between CVS versions:   Compatibility.       (line   5)
 * Compression:                           Global options.      (line 126)
-* Compression:                           Invoking CVS.        (line  79)
+* Compression <1>:                       Invoking CVS.        (line  79)
 * COMSPEC, environment variable:         Environment variables.
                                                               (line 122)
 * config, in CVSROOT:                    config.              (line   5)
@@ -3308,7 +3308,7 @@
 * cvsadmin:                              admin.               (line  17)
 * CVSEDITOR, environment variable:       Committing your changes.
                                                               (line  16)
-* CVSEDITOR, environment variable:       Environment variables.
+* CVSEDITOR, environment variable <1>:   Environment variables.
                                                               (line  46)
 * CVSEDITOR, internal variable:          Variables.           (line  37)
 * CVSHeader keyword:                     Keyword list.        (line  11)
@@ -3338,7 +3338,7 @@
 * CVSUMASK, environment variable:        File permissions.    (line  33)
 * cvswrappers (admin file):              Wrappers.            (line   5)
 * CVSWRAPPERS, environment variable:     Wrappers.            (line   5)
-* CVSWRAPPERS, environment variable:     Environment variables.
+* CVSWRAPPERS, environment variable <1>: Environment variables.
                                                               (line  12)
 * CVS_CLIENT_LOG, environment variable:  Environment variables.
                                                               (line  97)
@@ -3399,7 +3399,7 @@
 * Editor, avoiding invocation of:        Common options.      (line 115)
 * EDITOR, environment variable:          Committing your changes.
                                                               (line  16)
-* EDITOR, environment variable:          Environment variables.
+* EDITOR, environment variable <1>:      Environment variables.
                                                               (line  47)
 * EDITOR, internal variable:             Variables.           (line  38)
 * EDITOR, overriding:                    Global options.      (line  40)
@@ -3456,12 +3456,12 @@
 * Group:                                 File permissions.    (line   5)
 * gserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* gserver (client/server connection method), port specification: Password 
authentication server.
+* gserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * GSSAPI:                                GSSAPI authenticated.
                                                               (line   5)
 * Gzip:                                  Global options.      (line 126)
-* Gzip:                                  Invoking CVS.        (line  79)
+* Gzip <1>:                              Invoking CVS.        (line  79)
 * Hard links:                            Special Files.       (line   5)
 * HEAD, as reserved tag name:            Tags.                (line  24)
 * HEAD, special tag:                     Common options.      (line 148)
@@ -3523,7 +3523,7 @@
 * Known bugs in this manual or CVS:      BUGS.                (line  68)
 * kserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* kserver (client/server connection method), port specification: Password 
authentication server.
+* kserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * Layout of repository:                  Repository.          (line   5)
 * Left-hand options:                     Global options.      (line   5)
@@ -3611,7 +3611,7 @@
 * Notify.tmp file, in CVS directory:     Working directory storage.
                                                               (line 171)
 * Number, branch:                        Revision numbers.    (line   5)
-* Number, branch:                        Branches and revisions.
+* Number, branch <1>:                    Branches and revisions.
                                                               (line   5)
 * Number, revision-:                     Revision numbers.    (line   5)
 * Option defaults:                       ~/.cvsrc.            (line   5)
@@ -3645,12 +3645,12 @@
 * Policy:                                When to commit.      (line   5)
 * port, specifying for remote repositories: Remote repositories.
                                                               (line   5)
-* port, specifying for remote repositories: Password authentication server.
+* port, specifying for remote repositories <1>: Password authentication server.
                                                               (line   9)
 * Precommit checking:                    commitinfo.          (line   5)
 * pserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* pserver (client/server connection method), port specification: Password 
authentication server.
+* pserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * pserver (subcommand):                  Password authentication server.
                                                               (line   9)
@@ -3691,7 +3691,7 @@
 * Remote repositories:                   Remote repositories. (line   5)
 * Remote repositories, port specification: Remote repositories.
                                                               (line   5)
-* Remote repositories, port specification: Password authentication server.
+* Remote repositories, port specification <1>: Password authentication server.
                                                               (line   9)
 * Remove (subcommand):                   Removing files.      (line  33)
 * Removing a change:                     Merging two revisions.
@@ -3712,7 +3712,7 @@
 * Repositories, remote:                  Remote repositories. (line   5)
 * Repositories, remote, port specification: Remote repositories.
                                                               (line   5)
-* Repositories, remote, port specification: Password authentication server.
+* Repositories, remote, port specification <1>: Password authentication server.
                                                               (line   9)
 * Repository (intro):                    Repository.          (line   5)
 * Repository file, in CVS directory:     Working directory storage.
@@ -3862,7 +3862,7 @@
 * USER, environment variable:            Variables.           (line  81)
 * USER, internal variable:               Variables.           (line  43)
 * UserAdminOptions, in CVSROOT/config:   admin.               (line  17)
-* UserAdminOptions, in CVSROOT/config:   config.              (line  84)
+* UserAdminOptions, in CVSROOT/config <1>: config.            (line  84)
 * users (admin file):                    Getting Notified.    (line  70)
 * Variables:                             Variables.           (line   5)
 * Vendor:                                Tracking sources.    (line   9)
@@ -3874,7 +3874,7 @@
 * Viewing differences:                   Viewing differences. (line   5)
 * VISUAL, environment variable:          Committing your changes.
                                                               (line  22)
-* VISUAL, environment variable:          Environment variables.
+* VISUAL, environment variable <1>:      Environment variables.
                                                               (line  48)
 * VISUAL, internal variable:             Variables.           (line  39)
 * watch add (subcommand):                Getting Notified.    (line  10)

Index: test/manuals/res_info/ccvs_info/cvs.info-2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/ccvs_info/cvs.info-2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_info/ccvs_info/cvs.info-2  31 Jul 2009 10:17:09 -0000      
1.1
+++ test/manuals/res_info/ccvs_info/cvs.info-2  6 Sep 2009 21:46:28 -0000       
1.2
@@ -3104,7 +3104,7 @@
 * -a, in modules file:                   Alias modules.       (line   5)
 * -d, in modules file:                   Module options.      (line   9)
 * -e, in modules file:                   Module options.      (line  12)
-* -e, in modules file:                   Module program options.
+* -e, in modules file <1>:               Module program options.
                                                               (line   5)
 * -j (merging branches):                 Merging a branch.    (line   5)
 * -j (merging branches), and keyword substitution: Merging and keywords.
@@ -3113,11 +3113,11 @@
 * -kk, to avoid conflicts during a merge: Merging and keywords.
                                                               (line   5)
 * -o, in modules file:                   Module options.      (line  16)
-* -o, in modules file:                   Module program options.
+* -o, in modules file <1>:               Module program options.
                                                               (line   5)
 * -s, in modules file:                   Module options.      (line  22)
 * -t, in modules file:                   Module options.      (line  30)
-* -t, in modules file:                   Module program options.
+* -t, in modules file <1>:               Module program options.
                                                               (line   5)
 * .# files:                              update output.       (line  49)
 * .bashrc, setting CVSROOT in:           Specifying a repository.
@@ -3152,7 +3152,7 @@
 * `commitinfo', working directory:       commitinfo.          (line  29)
 * `verifymsg' (admin file):              verifymsg.           (line   5)
 * `verifymsg', changing the log message: verifymsg.           (line  30)
-* `verifymsg', changing the log message: config.              (line  67)
+* `verifymsg', changing the log message <1>: config.          (line  67)
 * Abandoning work:                       Editing files.       (line  32)
 * Access a branch:                       Accessing branches.  (line   5)
 * add (subcommand):                      Adding files.        (line  28)
@@ -3192,7 +3192,7 @@
 * Binary files:                          Binary files.        (line   5)
 * Branch merge example:                  Merging a branch.    (line  14)
 * Branch number:                         Revision numbers.    (line   5)
-* Branch number:                         Branches and revisions.
+* Branch number <1>:                     Branches and revisions.
                                                               (line   5)
 * Branch tags, deleting:                 Modifying tags.      (line  18)
 * Branch tags, moving:                   Modifying tags.      (line  36)
@@ -3230,7 +3230,7 @@
 * Client/Server Operation:               Remote repositories. (line   5)
 * Client/Server Operation, port specification: Remote repositories.
                                                               (line   5)
-* Client/Server Operation, port specification: Password authentication server.
+* Client/Server Operation, port specification <1>: Password authentication 
server.
                                                               (line   9)
 * co (subcommand):                       checkout.            (line   5)
 * Command reference:                     Invoking CVS.        (line   5)
@@ -3246,7 +3246,7 @@
 * Common syntax of info files:           syntax.              (line   5)
 * Compatibility, between CVS versions:   Compatibility.       (line   5)
 * Compression:                           Global options.      (line 126)
-* Compression:                           Invoking CVS.        (line  79)
+* Compression <1>:                       Invoking CVS.        (line  79)
 * COMSPEC, environment variable:         Environment variables.
                                                               (line 122)
 * config, in CVSROOT:                    config.              (line   5)
@@ -3308,7 +3308,7 @@
 * cvsadmin:                              admin.               (line  17)
 * CVSEDITOR, environment variable:       Committing your changes.
                                                               (line  16)
-* CVSEDITOR, environment variable:       Environment variables.
+* CVSEDITOR, environment variable <1>:   Environment variables.
                                                               (line  46)
 * CVSEDITOR, internal variable:          Variables.           (line  37)
 * CVSHeader keyword:                     Keyword list.        (line  11)
@@ -3338,7 +3338,7 @@
 * CVSUMASK, environment variable:        File permissions.    (line  33)
 * cvswrappers (admin file):              Wrappers.            (line   5)
 * CVSWRAPPERS, environment variable:     Wrappers.            (line   5)
-* CVSWRAPPERS, environment variable:     Environment variables.
+* CVSWRAPPERS, environment variable <1>: Environment variables.
                                                               (line  12)
 * CVS_CLIENT_LOG, environment variable:  Environment variables.
                                                               (line  97)
@@ -3399,7 +3399,7 @@
 * Editor, avoiding invocation of:        Common options.      (line 115)
 * EDITOR, environment variable:          Committing your changes.
                                                               (line  16)
-* EDITOR, environment variable:          Environment variables.
+* EDITOR, environment variable <1>:      Environment variables.
                                                               (line  47)
 * EDITOR, internal variable:             Variables.           (line  38)
 * EDITOR, overriding:                    Global options.      (line  40)
@@ -3456,12 +3456,12 @@
 * Group:                                 File permissions.    (line   5)
 * gserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* gserver (client/server connection method), port specification: Password 
authentication server.
+* gserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * GSSAPI:                                GSSAPI authenticated.
                                                               (line   5)
 * Gzip:                                  Global options.      (line 126)
-* Gzip:                                  Invoking CVS.        (line  79)
+* Gzip <1>:                              Invoking CVS.        (line  79)
 * Hard links:                            Special Files.       (line   5)
 * HEAD, as reserved tag name:            Tags.                (line  24)
 * HEAD, special tag:                     Common options.      (line 148)
@@ -3523,7 +3523,7 @@
 * Known bugs in this manual or CVS:      BUGS.                (line  68)
 * kserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* kserver (client/server connection method), port specification: Password 
authentication server.
+* kserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * Layout of repository:                  Repository.          (line   5)
 * Left-hand options:                     Global options.      (line   5)
@@ -3611,7 +3611,7 @@
 * Notify.tmp file, in CVS directory:     Working directory storage.
                                                               (line 171)
 * Number, branch:                        Revision numbers.    (line   5)
-* Number, branch:                        Branches and revisions.
+* Number, branch <1>:                    Branches and revisions.
                                                               (line   5)
 * Number, revision-:                     Revision numbers.    (line   5)
 * Option defaults:                       ~/.cvsrc.            (line   5)
@@ -3645,12 +3645,12 @@
 * Policy:                                When to commit.      (line   5)
 * port, specifying for remote repositories: Remote repositories.
                                                               (line   5)
-* port, specifying for remote repositories: Password authentication server.
+* port, specifying for remote repositories <1>: Password authentication server.
                                                               (line   9)
 * Precommit checking:                    commitinfo.          (line   5)
 * pserver (client/server connection method), port specification: Remote 
repositories.
                                                               (line   5)
-* pserver (client/server connection method), port specification: Password 
authentication server.
+* pserver (client/server connection method), port specification <1>: Password 
authentication server.
                                                               (line   9)
 * pserver (subcommand):                  Password authentication server.
                                                               (line   9)
@@ -3691,7 +3691,7 @@
 * Remote repositories:                   Remote repositories. (line   5)
 * Remote repositories, port specification: Remote repositories.
                                                               (line   5)
-* Remote repositories, port specification: Password authentication server.
+* Remote repositories, port specification <1>: Password authentication server.
                                                               (line   9)
 * Remove (subcommand):                   Removing files.      (line  33)
 * Removing a change:                     Merging two revisions.
@@ -3712,7 +3712,7 @@
 * Repositories, remote:                  Remote repositories. (line   5)
 * Repositories, remote, port specification: Remote repositories.
                                                               (line   5)
-* Repositories, remote, port specification: Password authentication server.
+* Repositories, remote, port specification <1>: Password authentication server.
                                                               (line   9)
 * Repository (intro):                    Repository.          (line   5)
 * Repository file, in CVS directory:     Working directory storage.
@@ -3862,7 +3862,7 @@
 * USER, environment variable:            Variables.           (line  81)
 * USER, internal variable:               Variables.           (line  43)
 * UserAdminOptions, in CVSROOT/config:   admin.               (line  17)
-* UserAdminOptions, in CVSROOT/config:   config.              (line  84)
+* UserAdminOptions, in CVSROOT/config <1>: config.            (line  84)
 * users (admin file):                    Getting Notified.    (line  70)
 * Variables:                             Variables.           (line   5)
 * Vendor:                                Tracking sources.    (line   9)
@@ -3874,7 +3874,7 @@
 * Viewing differences:                   Viewing differences. (line   5)
 * VISUAL, environment variable:          Committing your changes.
                                                               (line  22)
-* VISUAL, environment variable:          Environment variables.
+* VISUAL, environment variable <1>:      Environment variables.
                                                               (line  48)
 * VISUAL, internal variable:             Variables.           (line  39)
 * watch add (subcommand):                Getting Notified.    (line  10)

Index: test/manuals/res_info/hello/hello.info
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res_info/hello/hello.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_info/hello/hello.info      31 Jul 2009 10:17:15 -0000      
1.1
+++ test/manuals/res_info/hello/hello.info      6 Sep 2009 21:46:28 -0000       
1.2
@@ -693,7 +693,7 @@
 * -greeting:                             Invoking hello.       (line 16)
 * -h:                                    Invoking hello.       (line 20)
 * -help:                                 Overview.             (line 36)
-* -help:                                 Invoking hello.       (line 20)
+* -help <1>:                             Invoking hello.       (line 20)
 * -n:                                    Invoking hello.       (line 31)
 * -next-generation:                      Invoking hello.       (line 31)
 * -t:                                    Invoking hello.       (line 38)

Index: test/manuals/res_info/hello_nodes/hello.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/hello_nodes/hello.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_info/hello_nodes/hello.info        31 Jul 2009 10:17:15 
-0000      1.1
+++ test/manuals/res_info/hello_nodes/hello.info        6 Sep 2009 21:46:28 
-0000       1.2
@@ -693,7 +693,7 @@
 * -greeting:                             Invoking hello.       (line 16)
 * -h:                                    Invoking hello.       (line 20)
 * -help:                                 Overview.             (line 36)
-* -help:                                 Invoking hello.       (line 20)
+* -help <1>:                             Invoking hello.       (line 20)
 * -n:                                    Invoking hello.       (line 31)
 * -next-generation:                      Invoking hello.       (line 31)
 * -t:                                    Invoking hello.       (line 38)

Index: test/manuals/res_info/info-stnd/info-stnd.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/info-stnd/info-stnd.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_info/info-stnd/info-stnd.info      31 Jul 2009 10:17:16 
-0000      1.1
+++ test/manuals/res_info/info-stnd/info-stnd.info      6 Sep 2009 21:46:28 
-0000       1.2
@@ -2101,7 +2101,7 @@
                                                               (line  55)
 * 0, in Info windows:                    Selecting Xrefs.     (line  22)
 * 1 ... 9, in Info windows:              Selecting Xrefs.     (line  12)
-* 1 ... 9, in Info windows:              Selecting Xrefs.     (line  12)
+* 1 ... 9, in Info windows <1>:          Selecting Xrefs.     (line  12)
 * <:                                     Node Commands.       (line  70)
 * >:                                     Node Commands.       (line  77)
 * ?, in Info windows:                    Miscellaneous Commands.
@@ -2358,7 +2358,7 @@
 * M-0, in the echo area, vi-like operation: The Echo Area.    (line  27)
 * M-0, vi-like operation:                Selecting Xrefs.     (line  22)
 * M-1 ... M-9, vi-like operation:        Selecting Xrefs.     (line  12)
-* M-1 ... M-9, vi-like operation:        Selecting Xrefs.     (line  12)
+* M-1 ... M-9, vi-like operation <1>:    Selecting Xrefs.     (line  12)
 * M-<:                                   Cursor Commands.     (line  63)
 * M->:                                   Cursor Commands.     (line  68)
 * M-b, in Info windows:                  Cursor Commands.     (line  57)
@@ -2397,7 +2397,7 @@
 * moving the cursor:                     Cursor Commands.     (line   5)
 * n:                                     Node Commands.       (line  22)
 * n, vi-like operation:                  Searching Commands.  (line  34)
-* n, vi-like operation:                  Searching Commands.  (line  40)
+* n, vi-like operation <1>:              Searching Commands.  (line  40)
 * negative arguments:                    Miscellaneous Commands.
                                                               (line  68)
 * NEXT:                                  Scrolling Commands.  (line  37)
@@ -2478,7 +2478,7 @@
 * set-variable:                          Variables.           (line  16)
 * Shift-TAB, in Info windows:            Selecting Xrefs.     (line  57)
 * Shift-TAB, in the echo area:           The Echo Area.       (line  80)
-* Shift-TAB, in the echo area:           The Echo Area.       (line  82)
+* Shift-TAB, in the echo area <1>:       The Echo Area.       (line  82)
 * show-footnotes:                        Miscellaneous Commands.
                                                               (line 109)
 * show-index-match:                      Variables.           (line 113)

Index: test/manuals/res_info/texinfo/internal_links_texinfo.txt
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo/internal_links_texinfo.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_info/texinfo/internal_links_texinfo.txt    31 Jul 2009 
10:17:22 -0000      1.1
+++ test/manuals/res_info/texinfo/internal_links_texinfo.txt    6 Sep 2009 
21:46:28 -0000       1.2
@@ -779,9 +779,9 @@
 texinfo#index-Nodes_002c-checking-for-badly-referenced cp      Nodes, checking 
for badly referenced
 texinfo#index-Non_002dbreakable-space  cp      Non-breakable space
 texinfo#index-Not-ending-a-sentence    cp      Not ending a sentence
-texinfo#index-OE       cp      O
+texinfo#index-O-1      cp      O
 texinfo#index-O_0027Dea_002c-Brendan   cp      O'Dea, Brendan
-texinfo#index-OE-2     cp      OE
+texinfo#index-OE-1     cp      OE
 texinfo#index-Obtaining-TeX    cp      Obtaining TeX
 texinfo#index-Occurrences_002c-listing-with-_0040occur cp      Occurrences, 
listing with `occur'
 texinfo#index-Optional-and-repeated-arguments  cp      Optional and repeated 
arguments
@@ -1082,8 +1082,8 @@
 texinfo#index-mailto-link      cp      mailto link
 texinfo#index-makeinfo cp      makeinfo
 texinfo#index-meta-HTML-tag_002c-and-charset   cp      meta HTML tag, and 
charset
-texinfo#index-oe       cp      o
-texinfo#index-oe-2     cp      oe
+texinfo#index-o-1      cp      o
+texinfo#index-oe-1     cp      oe
 texinfo#index-page_002ddelimiter       cp      page-delimiter
 texinfo#index-pdfcolor_002etex_002c-installing cp      pdfcolor.tex, installing
 texinfo#index-pdftex   cp      pdftex
@@ -1125,7 +1125,7 @@
 texinfo#index-Info_002dvalidate        fn      Info-validate
 texinfo#index-L        fn      L
 texinfo#index-O        fn      O
-texinfo#index-OE-1     fn      OE
+texinfo#index-OE       fn      OE
 texinfo#index-_005c-_0028literal-_005c-in-_0040math_0029       fn      \ 
(literal \ in `math')
 texinfo#index-_005cemergencystretch    fn      \emergencystretch
 texinfo#index-_005cinput-_0028raw-TeX-startup_0029     fn      \input (raw  
startup)
@@ -1293,7 +1293,7 @@
 texinfo#index-occur_002dmode_002dgoto_002doccurrence   fn      
occur-mode-goto-occurrence
 texinfo#index-oddfooting       fn      oddfooting
 texinfo#index-oddheading       fn      oddheading
-texinfo#index-oe-1     fn      oe
+texinfo#index-oe       fn      oe
 texinfo#index-option   fn      option
 texinfo#index-page     fn      page
 texinfo#index-page_002c-within-_0040titlepage  fn      page, within `titlepage'

Index: test/manuals/res_info/texinfo/texinfo-2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo/texinfo-2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_info/texinfo/texinfo-2     28 Jul 2009 18:42:47 -0000      
1.1
+++ test/manuals/res_info/texinfo/texinfo-2     6 Sep 2009 21:46:28 -0000       
1.2
@@ -7120,7 +7120,7 @@
 * buffer-end:                            Def Cmd Template.    (line  73)
 * bullet:                                bullet.              (line   5)
 * bye:                                   Ending a File.       (line   5)
-* bye:                                   File End.            (line   5)
+* bye <1>:                               File End.            (line   5)
 * c (comment):                           Comments.            (line   5)
 * cartouche:                             cartouche.           (line   5)
 * center:                                titlefont center sp. (line   5)
@@ -7138,7 +7138,7 @@
 * contents:                              Contents.            (line   5)
 * copying:                               copying.             (line   5)
 * copyright:                             copying.             (line  34)
-* copyright:                             copyright symbol.    (line   5)
+* copyright <1>:                         copyright symbol.    (line   5)
 * cropmarks:                             Cropmarks and Magnification.
                                                               (line   5)
 * defcodeindex:                          New Indices.         (line   5)
@@ -7150,7 +7150,7 @@
 * defivar:                               Abstract Objects.    (line  39)
 * defmac:                                Functions Commands.  (line  67)
 * defmethod:                             Abstract Objects.    (line 110)
-* defmethod:                             Abstract Objects.    (line 139)
+* defmethod <1>:                         Abstract Objects.    (line 139)
 * defop:                                 Abstract Objects.    (line  59)
 * defopt:                                Variables Commands.  (line  55)
 * defspec:                               Functions Commands.  (line  72)
@@ -7181,7 +7181,7 @@
 * emph:                                  emph & strong.       (line   5)
 * end:                                   Quotations and Examples.
                                                               (line  15)
-* end:                                   Introducing Lists.   (line  20)
+* end <1>:                               Introducing Lists.   (line  20)
 * end titlepage:                         end titlepage.       (line   5)
 * enddots:                               dots.                (line   5)
 * enumerate:                             enumerate.           (line   5)
@@ -7225,7 +7225,7 @@
 * ifclear:                               ifset ifclear.       (line  46)
 * ifhtml:                                Conditional Commands.
                                                               (line  14)
-* ifhtml:                                Raw Formatter Commands.
+* ifhtml <1>:                            Raw Formatter Commands.
                                                               (line  36)
 * ifinfo:                                Conditional Commands.
                                                               (line   8)
@@ -7252,8 +7252,8 @@
 * isearch-backward:                      deffnx.              (line  21)
 * isearch-forward:                       deffnx.              (line  20)
 * item:                                  itemize.             (line  21)
-* item:                                  table.               (line  27)
-* item:                                  Multitable Rows.     (line   5)
+* item <1>:                              table.               (line  27)
+* item <2>:                              Multitable Rows.     (line   5)
 * itemize:                               itemize.             (line   5)
 * itemx:                                 itemx.               (line   5)
 * kbd:                                   kbd.                 (line   5)
@@ -7327,10 +7327,10 @@
 * shorttitlepage:                        titlepage.           (line  45)
 * smallbook:                             smallbook.           (line   5)
 * smalldisplay:                          small.               (line   5)
-* smalldisplay:                          display.             (line  15)
+* smalldisplay <1>:                      display.             (line  15)
 * smallexample:                          small.               (line   5)
 * smallformat:                           small.               (line   5)
-* smallformat:                           format.              (line  14)
+* smallformat <1>:                       format.              (line  14)
 * smalllisp:                             small.               (line   5)
 * sp (line spacing):                     sp.                  (line   5)
 * sp (titlepage line spacing):           titlefont center sp. (line   5)
@@ -7345,7 +7345,7 @@
                                                               (line   5)
 * summarycontents:                       Contents.            (line   5)
 * syncodeindex:                          syncodeindex.        (line   5)
-* syncodeindex:                          syncodeindex.        (line   9)
+* syncodeindex <1>:                      syncodeindex.        (line   9)
 * synindex:                              synindex.            (line   5)
 * t (typewriter font):                   Fonts.               (line   5)
 * tab:                                   Multitable Rows.     (line   5)
@@ -7356,14 +7356,14 @@
 * texinfo-all-menus-update:              Updating Commands.   (line 112)
 * texinfo-every-node-update:             Updating Commands.   (line 107)
 * texinfo-format-buffer:                 Info Formatting.     (line  22)
-* texinfo-format-buffer:                 texinfo-format commands.
+* texinfo-format-buffer <1>:             texinfo-format commands.
                                                               (line   5)
-* texinfo-format-buffer:                 texinfo-format commands.
+* texinfo-format-buffer <2>:             texinfo-format commands.
                                                               (line  23)
 * texinfo-format-region:                 Info Formatting.     (line  13)
-* texinfo-format-region:                 texinfo-format commands.
+* texinfo-format-region <1>:             texinfo-format commands.
                                                               (line   5)
-* texinfo-format-region:                 texinfo-format commands.
+* texinfo-format-region <2>:             texinfo-format commands.
                                                               (line  19)
 * texinfo-indent-menu-description:       Other Updating Commands.
                                                               (line  45)
@@ -7391,7 +7391,7 @@
                                                               (line  54)
 * texinfo-show-structure:                Showing the Structure.
                                                               (line  18)
-* texinfo-show-structure:                Using texinfo-show-structure.
+* texinfo-show-structure <1>:            Using texinfo-show-structure.
                                                               (line   5)
 * texinfo-start-menu-description:        Inserting.           (line  93)
 * texinfo-tex-buffer:                    Printing.            (line  21)

Index: test/manuals/res_info/texinfo/texinfo-3
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo/texinfo-3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsImCe0K and /tmp/cvsw5wKLE differ

Index: test/manuals/res_info/texinfo_html/Command-and-Variable-Index.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo_html/Command-and-Variable-Index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res_info/texinfo_html/Command-and-Variable-Index.html  5 Sep 
2009 07:24:13 -0000       1.3
+++ test/manuals/res_info/texinfo_html/Command-and-Variable-Index.html  6 Sep 
2009 21:46:29 -0000       1.4
@@ -420,8 +420,8 @@
 <tr><td></td><td valign="top"><a 
href="Showing-the-Structure.html#index-occur_002dmode_002dgoto_002doccurrence"><code>occur-mode-goto-occurrence</code></a></td><td>&nbsp;</td><td
 valign="top"><a 
href="Showing-the-Structure.html#Showing-the-Structure">Showing the 
Structure</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Custom-Headings.html#index-oddfooting"><code>oddfooting</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Custom-Headings.html#Custom-Headings">Custom 
Headings</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Custom-Headings.html#index-oddheading"><code>oddheading</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Custom-Headings.html#Custom-Headings">Custom 
Headings</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-1"><code>OE</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-1"><code>oe</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE"><code>OE</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe"><code>oe</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="option.html#index-option"><code>option</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="option.html#option">option</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a 
name="Command-and-Variable-Index_fn_letter-P">P</a></th><td></td><td></td></tr>

Index: test/manuals/res_info/texinfo_html/Concept-Index.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo_html/Concept-Index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res_info/texinfo_html/Concept-Index.html       5 Sep 2009 
07:24:13 -0000       1.3
+++ test/manuals/res_info/texinfo_html/Concept-Index.html       6 Sep 2009 
21:46:29 -0000       1.4
@@ -723,13 +723,13 @@
 <tr><td></td><td valign="top"><a 
href="Not-Ending-a-Sentence.html#index-Not-ending-a-sentence">Not ending a 
sentence</a></td><td>&nbsp;</td><td valign="top"><a 
href="Not-Ending-a-Sentence.html#Not-Ending-a-Sentence">Not Ending a 
Sentence</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Concept-Index_cp_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE">&Oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe">&oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-O-1">&Oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-o-1">&oslash;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Using-Texinfo.html#index-O_0027Dea_002c-Brendan">O&rsquo;Dea, 
Brendan</a></td><td>&nbsp;</td><td valign="top"><a 
href="Using-Texinfo.html#Using-Texinfo">Using Texinfo</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Obtaining-TeX.html#index-Obtaining-TeX">Obtaining 
TeX</a></td><td>&nbsp;</td><td valign="top"><a 
href="Obtaining-TeX.html#Obtaining-TeX">Obtaining TeX</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Using-occur.html#index-Occurrences_002c-listing-with-_0040occur">Occurrences,
 listing with <code>@occur</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="Using-occur.html#Using-occur">Using occur</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-2">&OElig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-2">&oelig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-OE-1">&OElig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="Inserting-Accents.html#index-oe-1">&oelig;</a></td><td>&nbsp;</td><td 
valign="top"><a href="Inserting-Accents.html#Inserting-Accents">Inserting 
Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Optional-Arguments.html#index-Optional-and-repeated-arguments">Optional 
and repeated arguments</a></td><td>&nbsp;</td><td valign="top"><a 
href="Optional-Arguments.html#Optional-Arguments">Optional 
Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="makeinfo-options.html#index-Options-for-makeinfo">Options for 
<code>makeinfo</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="makeinfo-options.html#makeinfo-options">makeinfo options</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="Raw-Formatter-Commands.html#index-Ordinary-HTML-commands_002c-using">Ordinary
 HTML commands, using</a></td><td>&nbsp;</td><td valign="top"><a 
href="Raw-Formatter-Commands.html#Raw-Formatter-Commands">Raw Formatter 
Commands</a></td></tr>

Index: test/manuals/res_info/texinfo_html/Inserting-Accents.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo_html/Inserting-Accents.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res_info/texinfo_html/Inserting-Accents.html   5 Sep 2009 
07:24:14 -0000       1.3
+++ test/manuals/res_info/texinfo_html/Inserting-Accents.html   6 Sep 2009 
21:46:29 -0000       1.4
@@ -160,13 +160,13 @@
 <a name="index-L"></a>
 <a name="index-L-1"></a>
 <a name="index-o"></a>
-<a name="index-oe"></a>
+<a name="index-o-1"></a>
 <a name="index-O"></a>
-<a name="index-OE"></a>
+<a name="index-O-1"></a>
+<a name="index-oe"></a>
 <a name="index-oe-1"></a>
-<a name="index-oe-2"></a>
+<a name="index-OE"></a>
 <a name="index-OE-1"></a>
-<a name="index-OE-2"></a>
 <a name="index-ss"></a>
 <a name="index-ss-1"></a>
 <a name="index-Es_002dzet"></a>

Index: test/manuals/res_info/texinfo_html_nosplit/texinfo.html
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo_html_nosplit/texinfo.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res_info/texinfo_html_nosplit/texinfo.html     5 Sep 2009 
07:24:17 -0000       1.2
+++ test/manuals/res_info/texinfo_html_nosplit/texinfo.html     6 Sep 2009 
21:46:29 -0000       1.3
@@ -10398,13 +10398,13 @@
 <a name="index-L"></a>
 <a name="index-L-1"></a>
 <a name="index-o"></a>
-<a name="index-oe"></a>
+<a name="index-o-1"></a>
 <a name="index-O"></a>
-<a name="index-OE"></a>
+<a name="index-O-1"></a>
+<a name="index-oe"></a>
 <a name="index-oe-1"></a>
-<a name="index-oe-2"></a>
+<a name="index-OE"></a>
 <a name="index-OE-1"></a>
-<a name="index-OE-2"></a>
 <a name="index-ss"></a>
 <a name="index-ss-1"></a>
 <a name="index-Es_002dzet"></a>
@@ -19925,8 +19925,8 @@
 <tr><td></td><td valign="top"><a 
href="#index-occur_002dmode_002dgoto_002doccurrence"><code>occur-mode-goto-occurrence</code></a></td><td>&nbsp;</td><td
 valign="top"><a href="#Showing-the-Structure">Showing the 
Structure</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-oddfooting"><code>oddfooting</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#Custom-Headings">Custom Headings</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-oddheading"><code>oddheading</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#Custom-Headings">Custom Headings</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE-1"><code>OE</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe-1"><code>oe</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-OE"><code>OE</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-oe"><code>oe</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-option"><code>option</code></a></td><td>&nbsp;</td><td 
valign="top"><a href="#option">option</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a 
name="Command-and-Variable-Index_fn_letter-P">P</a></th><td></td><td></td></tr>
@@ -20815,13 +20815,13 @@
 <tr><td></td><td valign="top"><a href="#index-Not-ending-a-sentence">Not 
ending a sentence</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Not-Ending-a-Sentence">Not Ending a Sentence</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th><a name="Concept-Index_cp_letter-O">O</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE">&Oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe">&oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-O-1">&Oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-o-1">&oslash;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-O_0027Dea_002c-Brendan">O&rsquo;Dea, 
Brendan</a></td><td>&nbsp;</td><td valign="top"><a href="#Using-Texinfo">Using 
Texinfo</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Obtaining-TeX">Obtaining 
TeX</a></td><td>&nbsp;</td><td valign="top"><a href="#Obtaining-TeX">Obtaining 
TeX</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Occurrences_002c-listing-with-_0040occur">Occurrences, listing 
with <code>@occur</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#Using-occur">Using occur</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-OE-2">&OElig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
-<tr><td></td><td valign="top"><a 
href="#index-oe-2">&oelig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-OE-1">&OElig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
+<tr><td></td><td valign="top"><a 
href="#index-oe-1">&oelig;</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Inserting-Accents">Inserting Accents</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Optional-and-repeated-arguments">Optional and repeated 
arguments</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Optional-Arguments">Optional Arguments</a></td></tr>
 <tr><td></td><td valign="top"><a href="#index-Options-for-makeinfo">Options 
for <code>makeinfo</code></a></td><td>&nbsp;</td><td valign="top"><a 
href="#makeinfo-options">makeinfo options</a></td></tr>
 <tr><td></td><td valign="top"><a 
href="#index-Ordinary-HTML-commands_002c-using">Ordinary HTML commands, 
using</a></td><td>&nbsp;</td><td valign="top"><a 
href="#Raw-Formatter-Commands">Raw Formatter Commands</a></td></tr>

Index: test/manuals/res_info/texinfo_nodes/texinfo-2
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo_nodes/texinfo-2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res_info/texinfo_nodes/texinfo-2       31 Jul 2009 10:17:29 
-0000      1.1
+++ test/manuals/res_info/texinfo_nodes/texinfo-2       6 Sep 2009 21:46:29 
-0000       1.2
@@ -7120,7 +7120,7 @@
 * buffer-end:                            Def Cmd Template.    (line  73)
 * bullet:                                bullet.              (line   5)
 * bye:                                   Ending a File.       (line   5)
-* bye:                                   File End.            (line   5)
+* bye <1>:                               File End.            (line   5)
 * c (comment):                           Comments.            (line   5)
 * cartouche:                             cartouche.           (line   5)
 * center:                                titlefont center sp. (line   5)
@@ -7138,7 +7138,7 @@
 * contents:                              Contents.            (line   5)
 * copying:                               copying.             (line   5)
 * copyright:                             copying.             (line  34)
-* copyright:                             copyright symbol.    (line   5)
+* copyright <1>:                         copyright symbol.    (line   5)
 * cropmarks:                             Cropmarks and Magnification.
                                                               (line   5)
 * defcodeindex:                          New Indices.         (line   5)
@@ -7150,7 +7150,7 @@
 * defivar:                               Abstract Objects.    (line  39)
 * defmac:                                Functions Commands.  (line  67)
 * defmethod:                             Abstract Objects.    (line 110)
-* defmethod:                             Abstract Objects.    (line 139)
+* defmethod <1>:                         Abstract Objects.    (line 139)
 * defop:                                 Abstract Objects.    (line  59)
 * defopt:                                Variables Commands.  (line  55)
 * defspec:                               Functions Commands.  (line  72)
@@ -7181,7 +7181,7 @@
 * emph:                                  emph & strong.       (line   5)
 * end:                                   Quotations and Examples.
                                                               (line  15)
-* end:                                   Introducing Lists.   (line  20)
+* end <1>:                               Introducing Lists.   (line  20)
 * end titlepage:                         end titlepage.       (line   5)
 * enddots:                               dots.                (line   5)
 * enumerate:                             enumerate.           (line   5)
@@ -7225,7 +7225,7 @@
 * ifclear:                               ifset ifclear.       (line  46)
 * ifhtml:                                Conditional Commands.
                                                               (line  14)
-* ifhtml:                                Raw Formatter Commands.
+* ifhtml <1>:                            Raw Formatter Commands.
                                                               (line  36)
 * ifinfo:                                Conditional Commands.
                                                               (line   8)
@@ -7252,8 +7252,8 @@
 * isearch-backward:                      deffnx.              (line  21)
 * isearch-forward:                       deffnx.              (line  20)
 * item:                                  itemize.             (line  21)
-* item:                                  table.               (line  27)
-* item:                                  Multitable Rows.     (line   5)
+* item <1>:                              table.               (line  27)
+* item <2>:                              Multitable Rows.     (line   5)
 * itemize:                               itemize.             (line   5)
 * itemx:                                 itemx.               (line   5)
 * kbd:                                   kbd.                 (line   5)
@@ -7327,10 +7327,10 @@
 * shorttitlepage:                        titlepage.           (line  45)
 * smallbook:                             smallbook.           (line   5)
 * smalldisplay:                          small.               (line   5)
-* smalldisplay:                          display.             (line  15)
+* smalldisplay <1>:                      display.             (line  15)
 * smallexample:                          small.               (line   5)
 * smallformat:                           small.               (line   5)
-* smallformat:                           format.              (line  14)
+* smallformat <1>:                       format.              (line  14)
 * smalllisp:                             small.               (line   5)
 * sp (line spacing):                     sp.                  (line   5)
 * sp (titlepage line spacing):           titlefont center sp. (line   5)
@@ -7345,7 +7345,7 @@
                                                               (line   5)
 * summarycontents:                       Contents.            (line   5)
 * syncodeindex:                          syncodeindex.        (line   5)
-* syncodeindex:                          syncodeindex.        (line   9)
+* syncodeindex <1>:                      syncodeindex.        (line   9)
 * synindex:                              synindex.            (line   5)
 * t (typewriter font):                   Fonts.               (line   5)
 * tab:                                   Multitable Rows.     (line   5)
@@ -7356,14 +7356,14 @@
 * texinfo-all-menus-update:              Updating Commands.   (line 112)
 * texinfo-every-node-update:             Updating Commands.   (line 107)
 * texinfo-format-buffer:                 Info Formatting.     (line  22)
-* texinfo-format-buffer:                 texinfo-format commands.
+* texinfo-format-buffer <1>:             texinfo-format commands.
                                                               (line   5)
-* texinfo-format-buffer:                 texinfo-format commands.
+* texinfo-format-buffer <2>:             texinfo-format commands.
                                                               (line  23)
 * texinfo-format-region:                 Info Formatting.     (line  13)
-* texinfo-format-region:                 texinfo-format commands.
+* texinfo-format-region <1>:             texinfo-format commands.
                                                               (line   5)
-* texinfo-format-region:                 texinfo-format commands.
+* texinfo-format-region <2>:             texinfo-format commands.
                                                               (line  19)
 * texinfo-indent-menu-description:       Other Updating Commands.
                                                               (line  45)
@@ -7391,7 +7391,7 @@
                                                               (line  54)
 * texinfo-show-structure:                Showing the Structure.
                                                               (line  18)
-* texinfo-show-structure:                Using texinfo-show-structure.
+* texinfo-show-structure <1>:            Using texinfo-show-structure.
                                                               (line   5)
 * texinfo-start-menu-description:        Inserting.           (line  93)
 * texinfo-tex-buffer:                    Printing.            (line  21)

Index: test/manuals/res_info/texinfo_nodes/texinfo-3
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/manuals/res_info/texinfo_nodes/texinfo-3,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvslNXVOa and /tmp/cvstFFI05 differ

Index: test/many_input_files/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/many_input_files/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/many_input_files/Makefile.in   10 Aug 2009 10:01:14 -0000      1.12
+++ test/many_input_files/Makefile.in   6 Sep 2009 21:46:29 -0000       1.13
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,8 +41,11 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -148,7 +153,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  
test/many_input_files/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/many_input_files/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -167,6 +172,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -178,6 +184,7 @@
        @failed=0; all=0; xfail=0; xpass=0; skip=0; \
        srcdir=$(srcdir); export srcdir; \
        list=' $(TESTS) '; \
+       $(am__tty_colors); \
        if test -n "$$list"; then \
          for tst in $$list; do \
            if test -f ./$$tst; then dir=./; \
@@ -189,10 +196,10 @@
              *[\ \     ]$$tst[\ \      ]*) \
                xpass=`expr $$xpass + 1`; \
                failed=`expr $$failed + 1`; \
-               echo "XPASS: $$tst"; \
+               col=$$red; res=XPASS; \
              ;; \
              *) \
-               echo "PASS: $$tst"; \
+               col=$$grn; res=PASS; \
              ;; \
              esac; \
            elif test $$? -ne 77; then \
@@ -200,17 +207,18 @@
              case " $(XFAIL_TESTS) " in \
              *[\ \     ]$$tst[\ \      ]*) \
                xfail=`expr $$xfail + 1`; \
-               echo "XFAIL: $$tst"; \
+               col=$$lgn; res=XFAIL; \
              ;; \
              *) \
                failed=`expr $$failed + 1`; \
-               echo "FAIL: $$tst"; \
+               col=$$red; res=FAIL; \
              ;; \
              esac; \
            else \
              skip=`expr $$skip + 1`; \
-             echo "SKIP: $$tst"; \
+             col=$$blu; res=SKIP; \
            fi; \
+           echo "$${col}$$res$${std}: $$tst"; \
          done; \
          if test "$$all" -eq 1; then \
            tests="test"; \
@@ -252,11 +260,15 @@
              dashes="$$report"; \
          fi; \
          dashes=`echo "$$dashes" | sed s/./=/g`; \
-         echo "$$dashes"; \
+         if test "$$failed" -eq 0; then \
+           echo "$$grn$$dashes"; \
+         else \
+           echo "$$red$$dashes"; \
+         fi; \
          echo "$$banner"; \
          test -z "$$skipped" || echo "$$skipped"; \
          test -z "$$report" || echo "$$report"; \
-         echo "$$dashes"; \
+         echo "$$dashes$$std"; \
          test "$$failed" -eq 0; \
        else :; fi
 
@@ -276,13 +288,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -314,6 +330,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -333,6 +350,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -341,18 +360,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -373,7 +402,7 @@
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
        dist-hook distclean distclean-generic distclean-local distdir \
@@ -410,6 +439,7 @@
        for dir in $(test_dirs); do \
                rm -rf `find "$(distdir)/$${dir}_res" -name CVS` ;\
        done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/misc/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/misc/Makefile.in       10 Aug 2009 10:01:14 -0000      1.11
+++ test/misc/Makefile.in       6 Sep 2009 21:46:30 -0000       1.12
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -147,7 +150,7 @@
          esac; \
        done; \
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/misc/Makefile'; \
-       cd $(top_srcdir) && \
+       $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu  test/misc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -166,6 +169,7 @@
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -189,13 +193,17 @@
          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
+           fi; \
            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx 
{} \;; \
            fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
            || exit 1; \
          fi; \
        done
@@ -226,6 +234,7 @@
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f 
$(CONFIG_CLEAN_VPATH_FILES)
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -245,6 +254,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -253,18 +264,28 @@
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -304,6 +325,7 @@
 
 dist-hook:
        rm -rf `find $(distdir)/res $(distdir)/res_info $(distdir)/res_all 
-name CVS`
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Index: test/misc/res/testkb/testkb.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res/testkb/testkb.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res/testkb/testkb.2       18 Aug 2008 18:05:56 -0000      1.1
+++ test/misc/res/testkb/testkb.2       6 Sep 2009 21:46:30 -0000       1.2
@@ -0,0 +1 @@
+testkb.texi:4: warning: Encoding ASCII is not a canonical texinfo encoding

Index: test/misc/res/texi_testkb/testkb.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res/texi_testkb/testkb.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res/texi_testkb/testkb.2  18 Aug 2008 18:05:56 -0000      1.1
+++ test/misc/res/texi_testkb/testkb.2  6 Sep 2009 21:46:30 -0000       1.2
@@ -0,0 +1 @@
+testkb.texi:4: warning: Encoding ASCII is not a canonical texinfo encoding

Index: test/misc/res_all/testkb/testkb.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res_all/testkb/testkb.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res_all/testkb/testkb.2   30 Jul 2009 09:54:32 -0000      1.1
+++ test/misc/res_all/testkb/testkb.2   6 Sep 2009 21:46:30 -0000       1.2
@@ -0,0 +1 @@
+testkb.texi:4: warning: Encoding ASCII is not a canonical texinfo encoding

Index: test/misc/res_all/texi_testkb/testkb.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res_all/texi_testkb/testkb.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res_all/texi_testkb/testkb.2      30 Jul 2009 09:54:32 -0000      
1.1
+++ test/misc/res_all/texi_testkb/testkb.2      6 Sep 2009 21:46:30 -0000       
1.2
@@ -0,0 +1 @@
+testkb.texi:4: warning: Encoding ASCII is not a canonical texinfo encoding

Index: test/misc/res_info/mini_ker_httex/mini_ker.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/misc/res_info/mini_ker_httex/mini_ker.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/misc/res_info/mini_ker_httex/mini_ker.info     4 Aug 2009 14:31:02 
-0000       1.2
+++ test/misc/res_info/mini_ker_httex/mini_ker.info     6 Sep 2009 21:46:30 
-0000       1.3
@@ -2847,14 +2847,14 @@
 * `aspha.data', GTLS:                    GTLS run and output. (line   5)
 * `aspha.data', SVD:                     SVD run and output.  (line   5)
 * `data.data':                           Data.                (line   5)
-* `data.data':                           Kalman filter results.
+* `data.data' <1>:                       Kalman filter results.
                                                               (line   5)
 * `dimetaphi':                           Size sequence.       (line   5)
 * `dimetaphi', Kalman filter:            Kalman filter vectors dimensions.
                                                               (line   5)
 * `dres.data':                           Simulation and output.
                                                               (line  12)
-* `dres.data':                           Simulation and output.
+* `dres.data' <1>:                       Simulation and output.
                                                               (line  85)
 * `dres.data', GTLS:                     GTLS run and output. (line   5)
 * `ffl' (linearity test):                End of time step.    (line  32)
@@ -2874,16 +2874,16 @@
 * `res.data':                            Simulation and output.
                                                               (line  12)
 * `selseq.kumac':                        Selecting features.  (line   5)
-* `selseq.kumac':                        Miniker with cmz.    (line   4)
+* `selseq.kumac' <1>:                    Miniker with cmz.    (line   4)
 * `sens.data':                           Sensitivities.       (line  69)
 * `sigma.data':                          Sensitivities.       (line  69)
 * `sltc.exe':                            Stability of fastest modes.
                                                               (line   5)
-* `sltc.exe':                            SVD run and output.  (line   5)
+* `sltc.exe' <1>:                        SVD run and output.  (line   5)
 * `sltcirc.exe':                         Generalized TLS.     (line   5)
-* `sltcirc.exe':                         GTLS run and output. (line   5)
+* `sltcirc.exe' <1>:                     GTLS run and output. (line   5)
 * `smod':                                SVD with cmz.        (line   5)
-* `smod':                                GTLS with cmz.       (line   5)
+* `smod' <1>:                            GTLS with cmz.       (line   5)
 * `title.tex':                           Model equation and parameters.
                                                               (line 208)
 * `title.tex', GTLS:                     GTLS run and output. (line   5)
@@ -2959,7 +2959,7 @@
                                                               (line   5)
 * model size:                            Size sequence.       (line   5)
 * mortran:                               Introduction.        (line   5)
-* mortran:                               A note about mortran and cmz 
directives.
+* mortran <1>:                           A note about mortran and cmz 
directives.
                                                               (line   5)
 * observation function:                  Observations.        (line   8)
 * observations:                          Error and observation matrices.
@@ -3006,7 +3006,7 @@
 * SVD output:                            SVD run and output.  (line   5)
 * SVD run:                               SVD run and output.  (line   5)
 * TEF:                                   Introduction.        (line   5)
-* TEF:                                   A model description. (line   5)
+* TEF <1>:                               A model description. (line   5)
 * title file:                            Model equation and parameters.
                                                               (line 208)
 * transfers:                             Introduction.        (line   5)
@@ -3056,7 +3056,7 @@
 * dphi:                                  End of time step.    (line  65)
 * dt:                                    Model equation and parameters.
                                                               (line   5)
-* dt:                                    Simulation and output.
+* dt <1>:                                Simulation and output.
                                                               (line  85)
 * d_pi_aspha(.,.):                       Advance matrix sensitivity.
                                                               (line  11)
@@ -3078,11 +3078,11 @@
                                                               (line 108)
 * f_set:                                 Model with explicit size.
                                                               (line  16)
-* f_set:                                 Model with explicit size.
+* f_set <1>:                             Model with explicit size.
                                                               (line  25)
-* f_set:                                 Cost function coding and adjoint 
modeling.
+* f_set <2>:                             Cost function coding and adjoint 
modeling.
                                                               (line  15)
-* f_set:                                 Cost function coding and adjoint 
modeling.
+* f_set <3>:                             Cost function coding and adjoint 
modeling.
                                                               (line  22)
 * H:                                     End of time step.    (line  45)
 * index_ff_gain:                         Specifying the Borel sweep.
@@ -3108,11 +3108,11 @@
                                                               (line   5)
 * modzprint:                             Model equation and parameters.
                                                               (line   5)
-* modzprint:                             Controlling the printout and data 
output.
+* modzprint <1>:                         Controlling the printout and data 
output.
                                                               (line   5)
 * mp:                                    Model equation and parameters.
                                                               (line 192)
-* mp:                                    Size sequence.       (line   5)
+* mp <1>:                                Size sequence.       (line   5)
 * m_dwn:                                 1D gridded Model size.
                                                               (line  23)
 * m_mult:                                1D gridded Model size.
@@ -3123,7 +3123,7 @@
                                                               (line  23)
 * np:                                    Model equation and parameters.
                                                               (line 192)
-* np:                                    Size sequence.       (line   5)
+* np <1>:                                Size sequence.       (line   5)
 * nstep:                                 Model equation and parameters.
                                                               (line   5)
 * n_dwn:                                 1D gridded Model size.
@@ -3165,7 +3165,7 @@
 * var::                                  Model equation and parameters.
                                                               (line 108)
 * vobs(.):                               Data.                (line   5)
-* vobs(.):                               Feeding the observations.
+* vobs(.) <1>:                           Feeding the observations.
                                                               (line   5)
 * zback:                                 Cost function coding and adjoint 
modeling.
                                                               (line   5)
@@ -3175,7 +3175,7 @@
                                                               (line  79)
 * zcommand:                              Control laws.        (line   5)
 * zgetobs:                               Data.                (line   5)
-* zgetobs:                               Feeding the observations.
+* zgetobs <1>:                           Feeding the observations.
                                                               (line   5)
 * zkalman:                               Coding the Kalman filter.
                                                               (line   5)

Index: test/misc/res_info/mini_ker_l2h/mini_ker.info
===================================================================
RCS file: 
/cvsroot/texi2html/texi2html/test/misc/res_info/mini_ker_l2h/mini_ker.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/misc/res_info/mini_ker_l2h/mini_ker.info       4 Aug 2009 14:31:02 
-0000       1.2
+++ test/misc/res_info/mini_ker_l2h/mini_ker.info       6 Sep 2009 21:46:30 
-0000       1.3
@@ -2847,14 +2847,14 @@
 * `aspha.data', GTLS:                    GTLS run and output. (line   5)
 * `aspha.data', SVD:                     SVD run and output.  (line   5)
 * `data.data':                           Data.                (line   5)
-* `data.data':                           Kalman filter results.
+* `data.data' <1>:                       Kalman filter results.
                                                               (line   5)
 * `dimetaphi':                           Size sequence.       (line   5)
 * `dimetaphi', Kalman filter:            Kalman filter vectors dimensions.
                                                               (line   5)
 * `dres.data':                           Simulation and output.
                                                               (line  12)
-* `dres.data':                           Simulation and output.
+* `dres.data' <1>:                       Simulation and output.
                                                               (line  85)
 * `dres.data', GTLS:                     GTLS run and output. (line   5)
 * `ffl' (linearity test):                End of time step.    (line  32)
@@ -2874,16 +2874,16 @@
 * `res.data':                            Simulation and output.
                                                               (line  12)
 * `selseq.kumac':                        Selecting features.  (line   5)
-* `selseq.kumac':                        Miniker with cmz.    (line   4)
+* `selseq.kumac' <1>:                    Miniker with cmz.    (line   4)
 * `sens.data':                           Sensitivities.       (line  69)
 * `sigma.data':                          Sensitivities.       (line  69)
 * `sltc.exe':                            Stability of fastest modes.
                                                               (line   5)
-* `sltc.exe':                            SVD run and output.  (line   5)
+* `sltc.exe' <1>:                        SVD run and output.  (line   5)
 * `sltcirc.exe':                         Generalized TLS.     (line   5)
-* `sltcirc.exe':                         GTLS run and output. (line   5)
+* `sltcirc.exe' <1>:                     GTLS run and output. (line   5)
 * `smod':                                SVD with cmz.        (line   5)
-* `smod':                                GTLS with cmz.       (line   5)
+* `smod' <1>:                            GTLS with cmz.       (line   5)
 * `title.tex':                           Model equation and parameters.
                                                               (line 208)
 * `title.tex', GTLS:                     GTLS run and output. (line   5)
@@ -2959,7 +2959,7 @@
                                                               (line   5)
 * model size:                            Size sequence.       (line   5)
 * mortran:                               Introduction.        (line   5)
-* mortran:                               A note about mortran and cmz 
directives.
+* mortran <1>:                           A note about mortran and cmz 
directives.
                                                               (line   5)
 * observation function:                  Observations.        (line   8)
 * observations:                          Error and observation matrices.
@@ -3006,7 +3006,7 @@
 * SVD output:                            SVD run and output.  (line   5)
 * SVD run:                               SVD run and output.  (line   5)
 * TEF:                                   Introduction.        (line   5)
-* TEF:                                   A model description. (line   5)
+* TEF <1>:                               A model description. (line   5)
 * title file:                            Model equation and parameters.
                                                               (line 208)
 * transfers:                             Introduction.        (line   5)
@@ -3056,7 +3056,7 @@
 * dphi:                                  End of time step.    (line  65)
 * dt:                                    Model equation and parameters.
                                                               (line   5)
-* dt:                                    Simulation and output.
+* dt <1>:                                Simulation and output.
                                                               (line  85)
 * d_pi_aspha(.,.):                       Advance matrix sensitivity.
                                                               (line  11)
@@ -3078,11 +3078,11 @@
                                                               (line 108)
 * f_set:                                 Model with explicit size.
                                                               (line  16)
-* f_set:                                 Model with explicit size.
+* f_set <1>:                             Model with explicit size.
                                                               (line  25)
-* f_set:                                 Cost function coding and adjoint 
modeling.
+* f_set <2>:                             Cost function coding and adjoint 
modeling.
                                                               (line  15)
-* f_set:                                 Cost function coding and adjoint 
modeling.
+* f_set <3>:                             Cost function coding and adjoint 
modeling.
                                                               (line  22)
 * H:                                     End of time step.    (line  45)
 * index_ff_gain:                         Specifying the Borel sweep.
@@ -3108,11 +3108,11 @@
                                                               (line   5)
 * modzprint:                             Model equation and parameters.
                                                               (line   5)
-* modzprint:                             Controlling the printout and data 
output.
+* modzprint <1>:                         Controlling the printout and data 
output.
                                                               (line   5)
 * mp:                                    Model equation and parameters.
                                                               (line 192)
-* mp:                                    Size sequence.       (line   5)
+* mp <1>:                                Size sequence.       (line   5)
 * m_dwn:                                 1D gridded Model size.
                                                               (line  23)
 * m_mult:                                1D gridded Model size.
@@ -3123,7 +3123,7 @@
                                                               (line  23)
 * np:                                    Model equation and parameters.
                                                               (line 192)
-* np:                                    Size sequence.       (line   5)
+* np <1>:                                Size sequence.       (line   5)
 * nstep:                                 Model equation and parameters.
                                                               (line   5)
 * n_dwn:                                 1D gridded Model size.
@@ -3165,7 +3165,7 @@
 * var::                                  Model equation and parameters.
                                                               (line 108)
 * vobs(.):                               Data.                (line   5)
-* vobs(.):                               Feeding the observations.
+* vobs(.) <1>:                           Feeding the observations.
                                                               (line   5)
 * zback:                                 Cost function coding and adjoint 
modeling.
                                                               (line   5)
@@ -3175,7 +3175,7 @@
                                                               (line  79)
 * zcommand:                              Control laws.        (line   5)
 * zgetobs:                               Data.                (line   5)
-* zgetobs:                               Feeding the observations.
+* zgetobs <1>:                           Feeding the observations.
                                                               (line   5)
 * zkalman:                               Coding the Kalman filter.
                                                               (line   5)

Index: test/misc/res_info/testkb/testkb.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/misc/res_info/testkb/testkb.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res_info/testkb/testkb.2  30 Jul 2009 09:54:34 -0000      1.1
+++ test/misc/res_info/testkb/testkb.2  6 Sep 2009 21:46:30 -0000       1.2
@@ -