[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog Makefile.am Makefile.in tex...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog Makefile.am Makefile.in tex... |
|
Date: |
Sat, 23 May 2009 17:09:54 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/05/23 17:09:53
Modified files:
. : ChangeLog Makefile.am Makefile.in
texi2html.init texi2html.pl translations.pl
doc : stamp-vti texi2html.texi version.texi
formats : docbook.init html.init info.init xml.init
i18n : de en es fr ja nl no pt pt_BR
test : run_test.sh
test/coverage/res/formatting: formatting.html
test/encodings/res/formatting_fr: formatting.html
test/encodings/res/formatting_fr_icons: formatting.html
test/formatting/res/def_cmds_info: def_cmds.info
test/formatting/res/float_docbook: float.2
test/formatting/res/float_xml: float.2
test/formatting/res/formatting_docbook: formatting.2
test/formatting/res/formatting_info: formatting.info
test/formatting/res/formatting_weird_quotes: formatting.html
test/formatting/res/formatting_xml: formatting.2
test/layout/res/formatting_chm: formatting.html
formatting_1.html
formatting_2.html
formatting_3.html
formatting_4.html
formatting_5.html
formatting_abt.html
formatting_ovr.html
formatting_toc.html
test/layout/res/formatting_exotic: formatting.html
formatting_1.html
formatting_2.html
formatting_3.html
formatting_4.html
formatting_abt.html
formatting_ovr.html
formatting_toc.html
test/layout/res/formatting_makeinfo: chapter.html chapter2.html
formatting_abt.html
index.html
s_002d_002dect_002cion.html
subsection.html
subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
test/layout/res/formatting_regions: formatting_regions.html
test/macros/res/node-expand_xml: node-expand.2
test/manuals/res/ccvs_info: cvs.info-2
test/misc/res/formatting_html32: formatting.html
test/sectionning/res/nodes_id_docbook: nodes_id.2
Added files:
test/contents/res/contents_at_begin_info: contents_at_begin.2
test/contents/res/contents_at_end_info: contents_at_end.2
test/contents/res/contents_in_middle_chapter_info:
contents_in_middle_chapter.2
test/contents/res/contents_in_middle_section_info:
contents_in_middle_section.2
test/contents/res/double_contents_info: double_contents.2
test/contents/res/double_contents_setcontentsaftertitlepage_info:
double_contents_setcontentsaftertitlepage.2
test/coverage/res/comments_info: comments.2
test/encodings/res/accentenc_info: accentenc.2
test/encodings/res/nodetest_info: nodetest.2
test/formatting/res/at_command_glued_info: at_command_glued.2
test/formatting/res/def_cmds_info: def_cmds.2
test/formatting/res/direntry_dircategory_info:
direntry_dircategory.2
test/formatting/res/direntry_dircategory_info_split:
direntry_dircategory.2
test/formatting/res/formatting_info: formatting.2
test/formatting/res/heading_info: heading.2
test/formatting/res/kbdinputstyle_info: kbdinputstyle.2
test/formatting/res/nested_formats_info: nested_formats.2
test/formatting/res/nested_table_info: nested_table.2
test/formatting/res/simple_images_info: simple_images.2
test/formatting/res/simple_table_info: simple_table.2
test/formatting/res/test_sp_info: test_sp.2
test/indices/res/index_entry_in_footnote_info:
index_entry_in_footnote.2
test/indices/res/index_entry_in_footnote_separated_info:
index_entry_in_footnote.2
test/macros/res/cond_info: cond.2
test/macros/res/macro-at_info: macro-at.2
test/macros/res/no_arg_macro_info: no_arg_macro.2
test/macros/res/node-expand_info: node-expand.2
test/macros/res/test_include_with_setfilename_info:
test_include_with_setfilename.2
test/manuals/res/ccvs_info: cvs.2
test/sectionning: test_two_include.texi
test/sectionning/res/anchor_in_footnote_info:
anchor_in_footnote.2
test/sectionning/res/anchor_in_footnote_separated_info:
anchor_in_footnote.2
test/sectionning/res/at_commands_in_refs_info:
at_commands_in_refs.2
test/sectionning/res/node_footnote_info: node_footnote.2
test/sectionning/res/node_footnote_separated_info:
node_footnote.2
test/sectionning/res/test_two_include: test_two_include.2
test_two_include.html
test/sectionning/res/two_footnotes_in_nodes_info:
two_footnotes_in_nodes.2
test/sectionning/res/two_footnotes_in_nodes_separated_info:
two_footnotes_in_nodes.2
Log message:
* texi2html.pl, texi2html.init, formats/*: remove html
formatting
from texi2html.init, where only raw text formatting should be
done.
* formats/info.init: remove the debugging output and fix minor
bugs.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.386&r2=1.387
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.am?cvsroot=texi2html&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/texi2html/Makefile.in?cvsroot=texi2html&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.198&r2=1.199
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.288&r2=1.289
http://cvs.savannah.gnu.org/viewcvs/texi2html/translations.pl?cvsroot=texi2html&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/stamp-vti?cvsroot=texi2html&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.texi?cvsroot=texi2html&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/version.texi?cvsroot=texi2html&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/docbook.init?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/html.init?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/info.init?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/xml.init?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/de?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/en?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/es?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/fr?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/ja?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/nl?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/no?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/pt?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/i18n/pt_BR?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/run_test.sh?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/contents_at_begin_info/contents_at_begin.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/contents_at_end_info/contents_at_end.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/contents_in_middle_section_info/contents_in_middle_section.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/double_contents_info/double_contents.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/comments_info/comments.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/formatting/formatting.html?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/accentenc_info/accentenc.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr/formatting.html?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr_icons/formatting.html?cvsroot=texi2html&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/nodetest_info/nodetest.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/at_command_glued_info/at_command_glued.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/def_cmds_info/def_cmds.info?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/def_cmds_info/def_cmds.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/direntry_dircategory_info/direntry_dircategory.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/float_docbook/float.2?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/float_xml/float.2?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_docbook/formatting.2?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_info/formatting.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_info/formatting.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_weird_quotes/formatting.html?cvsroot=texi2html&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_xml/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/heading_info/heading.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/kbdinputstyle_info/kbdinputstyle.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/nested_formats_info/nested_formats.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/nested_table_info/nested_table.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/simple_images_info/simple_images.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/simple_table_info/simple_table.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/test_sp_info/test_sp.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/index_entry_in_footnote_info/index_entry_in_footnote.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/index_entry_in_footnote_separated_info/index_entry_in_footnote.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting.html?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_1.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_2.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_3.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_4.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_5.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_abt.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_ovr.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_toc.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting.html?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_1.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_2.html?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_3.html?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_4.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_abt.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_ovr.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_toc.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/chapter.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/chapter2.html?cvsroot=texi2html&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/formatting_abt.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/index.html?cvsroot=texi2html&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/s_002d_002dect_002cion.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/subsection.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_regions/formatting_regions.html?cvsroot=texi2html&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/cond_info/cond.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/macro-at_info/macro-at.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/no_arg_macro_info/no_arg_macro.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/node-expand_info/node-expand.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/node-expand_xml/node-expand.2?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs_info/cvs.info-2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs_info/cvs.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/formatting_html32/formatting.html?cvsroot=texi2html&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/test_two_include.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/anchor_in_footnote_info/anchor_in_footnote.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/anchor_in_footnote_separated_info/anchor_in_footnote.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/at_commands_in_refs_info/at_commands_in_refs.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/node_footnote_info/node_footnote.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/node_footnote_separated_info/node_footnote.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/nodes_id_docbook/nodes_id.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/test_two_include/test_two_include.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/test_two_include/test_two_include.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/two_footnotes_in_nodes_info/two_footnotes_in_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/two_footnotes_in_nodes_separated_info/two_footnotes_in_nodes.2?cvsroot=texi2html&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -b -r1.386 -r1.387
--- ChangeLog 22 May 2009 18:50:27 -0000 1.386
+++ ChangeLog 23 May 2009 17:09:38 -0000 1.387
@@ -1,3 +1,11 @@
+2009-05-23 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init, formats/*: remove html formatting
+ from texi2html.init, where only raw text formatting should be
+ done.
+ * formats/info.init: remove the debugging output and fix minor
+ bugs.
+
2009-05-22 Patrice Dumas <address@hidden>
* texi2html.pl, texi2html.init, formats/html.init,
Index: Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- Makefile.am 22 May 2009 18:50:27 -0000 1.47
+++ Makefile.am 23 May 2009 17:09:38 -0000 1.48
@@ -164,7 +164,7 @@
address@hidden texi2html.tmp
i18n/en: texi2html.pl texi2html.init T2h_i18n.pm examples/roff.init \
- examples/noheaders.init
+ examples/noheaders.init $(texi2html_formats)
$(PERL) $(top_builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir)
template $^
#i18n/de i18n/nl i18n/es i18n/no i18n/pt i18n/fr: i18n/en
Index: Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/Makefile.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- Makefile.in 22 May 2009 18:50:27 -0000 1.68
+++ Makefile.in 23 May 2009 17:09:38 -0000 1.69
@@ -845,7 +845,7 @@
address@hidden texi2html.tmp
i18n/en: texi2html.pl texi2html.init T2h_i18n.pm examples/roff.init \
- examples/noheaders.init
+ examples/noheaders.init $(texi2html_formats)
$(PERL) $(top_builddir)/manage_i18n.pl -d i18n -I . -I $(srcdir)
template $^
#i18n/de i18n/nl i18n/es i18n/no i18n/pt i18n/fr: i18n/en
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- texi2html.init 22 May 2009 18:50:27 -0000 1.198
+++ texi2html.init 23 May 2009 17:09:38 -0000 1.199
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.198 2009/05/22 18:50:27 pertusus Exp $
+# $Id: texi2html.init,v 1.199 2009/05/23 17:09:38 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -181,7 +181,7 @@
# -iso
# if this value is true, ISO8859 characters are used for special symbols
# (like copyright, etc).
-$USE_ISO = 1;
+$USE_ISO = 0;
# --conf-dir
# append to the files searched for init files.
@@ -381,7 +381,7 @@
# same as above, only for @small
$SMALL_EXAMPLE_INDENT_CELL = '';
-# font size for @small
+# unused
$SMALL_FONT_SIZE = '-1';
# horizontal rules
@@ -401,7 +401,7 @@
# if set and $SPLIT is set, then split index pages at the next letter
# after they have more than that many entries
-$SPLIT_INDEX = 100;
+$SPLIT_INDEX = 0;
# symbol put at the beginning of nodes entry in menu (and optionnaly of
# unnumbered in menus, see next variable)
@@ -444,15 +444,16 @@
# this controls the menu preformatted format
# FIXME this is not dynamic, so change in MENU_PRE_STYLE is not taken
# into account.
+#Â This is used if the menu appears within a preformatted format, which
+#Â is certainly an invalid construct.
$MENU_PRE_COMPLEX_FORMAT = {
- 'pre_style' => $MENU_PRE_STYLE,
'class' => 'menu-preformatted',
# 'style' => 'code'
};
# This controls the ul style for toc
-$NO_BULLET_LIST_STYLE = 'list-style: none';
-$NO_BULLET_LIST_ATTRIBUTE = ' class="toc"';
+$NO_BULLET_LIST_STYLE = '';
+$NO_BULLET_LIST_ATTRIBUTE = '';
# These lines are inserted before and after the shortcontents
$BEFORE_OVERVIEW = "";
@@ -621,7 +622,6 @@
$null_device_file{'NUL'} = 1;
}
-
$init_out = \&t2h_default_init_out;
$finish_out = \&t2h_default_finish_out;
$translate_names = \&t2h_default_translate_names;
@@ -636,10 +636,10 @@
'Contents', &$I('Contents'),
'Overview', &$I('Overview'),
'Index', &$I('Index'),
- ' ', ' ',
+ ' ', ' ',
'This', &$I('current'),
- 'Back', ' < ',
- 'FastBack', ' << ',
+ 'Back', ' < ',
+ 'FastBack', ' << ',
'Prev', &$I('Prev'),
'Up', &$I(' Up '),
'Next', &$I('Next'),
@@ -647,11 +647,11 @@
'NodeNext', &$I('Next node'),
'NodePrev', &$I('Previous node'),
'Following', &$I('Following node'),
- 'Forward', ' > ',
- 'FastForward', ' >> ',
+ 'Forward', ' > ',
+ 'FastForward', ' >> ',
'About', ' ? ',
- 'First', ' |< ',
- 'Last', ' >| ',
+ 'First', ' |< ',
+ 'Last', ' >| ',
'NextFile', &$I('Next file'),
'PrevFile', &$I('Previous file'),
);
@@ -707,57 +707,6 @@
'PrevFile', &$I('PrevFile'),
);
- %BUTTONS_ACCESSKEY =
- (
- 'Top', '',
- 'Contents', '',
- 'Overview', '',
- 'Index', '',
- 'This', '',
- 'Back', 'p',
- 'FastBack', '',
- 'Prev', 'p',
- 'Up', 'u',
- 'Next', 'n',
- 'NodeUp', 'u',
- 'NodeNext', 'n',
- 'NodePrev', 'p',
- 'Following', '',
- 'Forward', 'n',
- 'FastForward', '',
- 'About' , '',
- 'First', '',
- 'Last', '',
- 'NextFile', '',
- 'PrevFile', '',
- );
-
-# see http://www.w3.org/TR/REC-html40/types.html#type-links
- %BUTTONS_REL =
- (
- 'Top', 'start',
- 'Contents', 'contents',
- 'Overview', '',
- 'Index', 'index',
- 'This', '',
- 'Back', 'previous',
- 'FastBack', '',
- 'Prev', 'previous',
- 'Up', 'up',
- 'Next', 'next',
- 'NodeUp', 'up',
- 'NodeNext', 'next',
- 'NodePrev', 'previous',
- 'Following', '',
- 'Forward', 'next',
- 'FastForward', '',
- 'About' , 'help',
- 'First', '',
- 'Last', '',
- 'NextFile', 'next',
- 'PrevFile', 'previous',
- );
-
}
# is used in main program for dumping texi too.
@@ -848,14 +797,12 @@
print STDERR "# Encodings: doc $document_encoding, in $in_encoding out
$out_encoding, name $encoding_name\n" if ($VERBOSE);
}
-my @t2h_default_multitable_stack;
# We have to do this dynamically because of internationalization and because
# in body $DOCUMENTLANGUAGE could be used.
sub t2h_default_init_out()
{
- @t2h_default_multitable_stack = ();
&$translate_names;
- # Set the default body text, inserted between <body ... >
+ #Â set external cross ref splitting like splitting.
if (!defined($EXTERNAL_CROSSREF_SPLIT))
{
if (get_conf('SPLIT'))
@@ -1116,7 +1063,7 @@
$about_body = \&T2H_DEFAULT_about_body;
$print_frame = \&T2H_DEFAULT_print_frame;
$print_toc_frame = \&T2H_DEFAULT_print_toc_frame;
-#$toc_body = \&T2H_DEFAULT_toc_body;
+$toc_body = \&T2H_DEFAULT_toc_body;
$titlepage = \&T2H_DEFAULT_titlepage;
$css_lines = \&T2H_DEFAULT_css_lines;
$print_redirection_page = \&T2H_DEFAULT_print_redirection_page;
@@ -1151,7 +1098,6 @@
my $fh = shift;
my $element = shift;
main::print_lines($fh);
- print $fh "$SMALL_RULE\n";
&$print_page_foot($fh);
}
@@ -1175,14 +1121,8 @@
my $fh = shift;
my $end_page = shift;
my $element = shift;
- my $buttons = address@hidden;
- &$print_foot_navigation($fh, $buttons, $SMALL_RULE,
- ($end_page and ($SECTION_NAVIGATION or (get_conf('SPLIT') and
get_conf('SPLIT') ne 'node'))), $element);
-# &$print_foot_navigation($fh);
-# print $fh "$SMALL_RULE\n";
if ($end_page)
{
-# &$print_navigation($fh, $buttons);
&$print_page_foot($fh);
}
}
@@ -1193,36 +1133,7 @@
my $has_top_heading = shift;
my $element = shift;
- # a dirty hack. A section is considered to be empty if there are 2
- # lines or less in it. Indeed, this catches the sectionning command like
- # @top and the @node.
- if (scalar(@$Texi2HTML::THIS_SECTION) > 2)
- {
- # if top-level node has content
main::print_lines($fh, $Texi2HTML::THIS_SECTION);
- }
- else
- {
- # top-level node is fully enclosed in @ifnothtml
- # redo the titlepage with the actual state
- my ($titlepage_text, $titlepage_no_texi, $titlepage_simple_format) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
-
- &$titlepage([],$titlepage_text, $titlepage_no_texi,
$titlepage_simple_format);
- # only print the header and node label
- print $fh $Texi2HTML::THIS_SECTION->[0];
- print $fh $Texi2HTML::TITLEPAGE;
- if (@{$Texi2HTML::OVERVIEW} and
!$Texi2HTML::THISDOC{'setshortcontentsaftertitlepage'})
- {
- print $fh '<h2> ' . $Texi2HTML::NAME{'Overview'} . "</h2>\n" .
"<blockquote\n";
- main::print_lines($fh, $Texi2HTML::OVERVIEW);
- print $fh "</blockquote>\n";
- }
- elsif (@{$Texi2HTML::TOC_LINES} and
!$Texi2HTML::THISDOC{'setcontentsaftertitlepage'})
- {
- print $fh '<h1> ' . $Texi2HTML::NAME{'Contents'} . "</h1>\n";
- main::print_lines($fh, $Texi2HTML::TOC_LINES);
- }
- }
}
###################################################################
@@ -1256,8 +1167,6 @@
my $new_file = shift;
my $misc_page = shift;
&$print_page_head($fh) if ($new_file);
- print $fh "".&$misc_element_label($misc_pages_targets{$misc_page},
$misc_page);
- &$print_head_navigation($fh, $buttons) if ($new_file or
$SECTION_NAVIGATION);
}
sub T2H_DEFAULT_print_misc_footer
@@ -1265,8 +1174,6 @@
my $fh = shift;
my $buttons = shift;
my $new_file = shift;
- &$print_foot_navigation($fh, $buttons, $SMALL_RULE,
- ($new_file and ($SECTION_NAVIGATION or (get_conf('SPLIT') and
get_conf('SPLIT') ne 'node'))), undef);
# print $fh "$SMALL_RULE\n";
if ($new_file)
{
@@ -1274,6 +1181,18 @@
}
}
+use vars qw(
+%t2h_default_underline_symbol
+);
+
+%t2h_default_underline_symbol = (
+ 0 => '*',
+ 1 => '*',
+ 2 => '=',
+ 3 => '-',
+ 4 => '.'
+);
+
sub T2H_DEFAULT_print_misc
{
my $fh = shift;
@@ -1281,7 +1200,9 @@
my $misc_page = shift;
my $buttons = address@hidden;
&$print_misc_header($fh, $buttons, $new_file, $misc_page);
- print $fh "<h1>$Texi2HTML::NAME{This}</h1>\n";
+ my $heading = $Texi2HTML::NAME{This};
+ print $fh "$heading\n";
+ print $fh "".($t2h_default_underline_symbol{1} x length($heading))."\n\n";
main::print_lines($fh);
&$print_misc_footer($fh, $buttons, $new_file);
}
@@ -1294,10 +1215,6 @@
{
my $fh = shift;
my $element = shift;
- my $buttons = address@hidden;
- &$print_foot_navigation($fh, $buttons, $BIG_RULE, 1, $element);
-# &$end_section ($fh, 1, $element);
-# &$print_navigation($fh, $buttons);
}
###################################################################
@@ -1313,35 +1230,17 @@
{
my $fh = shift;
my $element = shift;
- # nothing to do there, by default, the navigation panel
- # is the section navigation panel
- if (! $SECTION_NAVIGATION)
- { # in this case print_navigation is called here.
- my $buttons = address@hidden;
- &$print_head_navigation($fh, $buttons);
- print $fh "\n$MIDDLE_RULE\n" unless ($VERTICAL_HEAD_NAVIGATION);
- }
}
sub T2H_DEFAULT_print_chapter_footer
{
my $fh = shift;
my $element = shift;
- my $buttons = address@hidden;
- &$print_foot_navigation($fh, $buttons, $BIG_RULE, 1, $element);
-# print $fh "$BIG_RULE\n";
-# &$print_navigation($fh, $buttons);
}
sub T2H_DEFAULT_print_section_header
{
- # nothing to do there, by default
- if (! $SECTION_NAVIGATION)
- { # in this case print_navigation is called here.
my $fh = shift;
- my $buttons = address@hidden;
- &$print_head_navigation($fh, $buttons);
- }
}
@@ -1385,33 +1284,11 @@
my $fh = shift;
my $misc_and_section_separation = shift;
my $element = shift;
- #&$print_foot_navigation($fh) if ($end_foot_navigation);
- #print $fh "$BIG_RULE\n";
- if ($misc_and_section_separation)
- {
- &$print_foot_navigation($fh, undef, $BIG_RULE, 0, $element);
- }
- else
- {
- print $fh "$BIG_RULE\n";
- }
}
sub T2H_DEFAULT_print_page_foot($)
{
my $fh = shift;
- my $program_string = &$program_string();
- print $fh <<EOT;
-<p>
- <font size="-1">
- $program_string
- </font>
- <br>
-$PRE_BODY_CLOSE
-</p>
-</body>
-</html>
-EOT
}
###################################################################
@@ -1422,30 +1299,7 @@
my $fh = shift;
my $buttons = shift;
- my $result = '';
- if ($VERTICAL_HEAD_NAVIGATION)
- {
- $result .= <<EOT;
-<table border="0" cellpadding="0" cellspacing="0">
-<tr valign="top">
-<td align="left">
-EOT
- }
- $result .= &$print_navigation($buttons, $VERTICAL_HEAD_NAVIGATION);
- if ($VERTICAL_HEAD_NAVIGATION)
- {
- $result .= <<EOT;
-</td>
-<td align="left">
-EOT
- }
- elsif (get_conf('SPLIT') eq 'node')
- {
- $result .= "$SMALL_RULE\n";
- }
-
- print $fh $result if (defined($fh));
- return $result;
+ return '';
}
sub T2H_DEFAULT_print_foot_navigation
@@ -1457,19 +1311,7 @@
my $element = shift;
$rule = '' if (!defined($rule));
- $print_navigation_panel = 1 if (!defined($print_navigation_panel)
- and defined($buttons));
-
- if ($VERTICAL_HEAD_NAVIGATION)
- {
- print $fh <<EOT;
-</td>
-</tr>
-</table>
-EOT
- }
print $fh "$rule\n" if ($rule ne '');
- print $fh "".&$print_navigation($buttons) if ($print_navigation_panel);
}
######################################################################
@@ -1500,7 +1342,7 @@
{
$alt = $button;
}
- return qq{<img src="$icon" border="0" alt="$alt" align="middle">};
+ return "$icon $alt";
}
sub T2H_DEFAULT_print_navigation
@@ -1508,114 +1350,7 @@
my $buttons = shift;
my $vertical = shift;
- my $result = '';
- $result .= '<table cellpadding="1" cellspacing="1" border="0">'."\n";
- $result .= "<tr>" unless $vertical;
- for my $button (@$buttons)
- {
- $result .= qq{<tr valign="top" align="left">\n} if $vertical;
- $result .= qq{<td valign="middle" align="left">};
-
- if (ref($button) eq 'CODE')
- {
- $result .= &$button($vertical);
- }
- elsif (ref($button) eq 'SCALAR')
- {
- $result .= "$$button" if defined($$button);
- }
- elsif (ref($button) eq 'ARRAY')
- {
- my $text = $button->[1];
- my $button_href = $button->[0];
- # verify that $button_href is simple text and text is a reference
- if (defined($button_href) and !ref($button_href)
- and defined($text) and (ref($text) eq 'SCALAR') and
defined($$text))
- { # use given text
- if ($Texi2HTML::HREF{$button_href})
- {
- my $anchor_attributes = '';
- if ($USE_ACCESSKEY and
(defined($BUTTONS_ACCESSKEY{$button_href})) and
($BUTTONS_ACCESSKEY{$button_href} ne ''))
- {
- $anchor_attributes =
"accesskey=\"$BUTTONS_ACCESSKEY{$button_href}\"";
- }
- if ($USE_REL_REV and (defined($BUTTONS_REL{$button_href}))
and ($BUTTONS_REL{$button_href} ne ''))
- {
- $anchor_attributes .= "
rel=\"$BUTTONS_REL{$button_href}\"";
- }
- $result .= "" .
- &$anchor('',
- $Texi2HTML::HREF{$button_href},
- $$text,
- $anchor_attributes
- )
- ;
- }
- else
- {
- $result .= $$text;
- }
- }
- }
- elsif ($button eq ' ')
- { # handle space button
- $result .=
- ($ICONS && $ACTIVE_ICONS{' '}) ?
- &$button_icon_img($BUTTONS_NAME{$button}, $ACTIVE_ICONS{'
'}) :
- $NAVIGATION_TEXT{' '};
- #next;
- }
- elsif ($Texi2HTML::HREF{$button})
- { # button is active
- my $btitle = $BUTTONS_GOTO{$button} ?
- 'title="' . $BUTTONS_GOTO{$button} . '"' : '';
- if ($USE_ACCESSKEY and (defined($BUTTONS_ACCESSKEY{$button})) and
($BUTTONS_ACCESSKEY{$button} ne ''))
- {
- $btitle .= " accesskey=\"$BUTTONS_ACCESSKEY{$button}\"";
- }
- if ($USE_REL_REV and (defined($BUTTONS_REL{$button})) and
($BUTTONS_REL{$button} ne ''))
- {
- $btitle .= " rel=\"$BUTTONS_REL{$button}\"";
- }
- if ($ICONS && $ACTIVE_ICONS{$button})
- { # use icon
- $result .= '' .
- &$anchor('',
- $Texi2HTML::HREF{$button},
- &$button_icon_img($BUTTONS_NAME{$button},
- $ACTIVE_ICONS{$button},
- $Texi2HTML::SIMPLE_TEXT{$button}),
- $btitle
- );
- }
- else
- { # use text
- $result .=
- '[' .
- &$anchor('',
- $Texi2HTML::HREF{$button},
- $NAVIGATION_TEXT{$button},
- $btitle
- ) .
- ']';
- }
- }
- else
- { # button is passive
- $result .=
- $ICONS && $PASSIVE_ICONS{$button} ?
- &$button_icon_img($BUTTONS_NAME{$button},
- $PASSIVE_ICONS{$button},
- $Texi2HTML::SIMPLE_TEXT{$button}) :
-
- "[" . $NAVIGATION_TEXT{$button}
. "]";
- }
- $result .= "</td>\n";
- $result .= "</tr>\n" if $vertical;
- }
- $result .= "</tr>" unless $vertical;
- $result .= "</table>\n";
- return $result;
+ return '';
}
######################################################################
@@ -1631,28 +1366,12 @@
my $main_file = shift;
$main_file = $Texi2HTML::THISDOC{'filename'}->{'top'};
$toc_file = $Texi2HTML::THISDOC{'filename'}->{'toc_frame'};
- print $fh <<EOT;
-$FRAMESET_DOCTYPE
-<html>
-<head><title>$Texi2HTML::THISDOC{'fulltitle'}</title></head>
-<frameset cols="140,*">
- <frame name="toc" src="$toc_file">
- <frame name="main" src="$main_file">
-</frameset>
-</html>
-EOT
}
sub T2H_DEFAULT_print_toc_frame
{
my $fh = shift;
my $stoc_lines = shift;
- &$print_page_head($fh);
- print $fh <<EOT;
-<h2>Content</h2>
-EOT
- print $fh map {s/\bhref=/target="main" href=/; $_;} @$stoc_lines;
- print $fh "</body></html>\n";
}
# This subroutine is intended to fill @Texi2HTML::TOC_LINES and
@@ -1683,13 +1402,35 @@
# $AFTER_OVERVIEW
# $BEFORE_TOC_LINES
# $AFTER_TOC_LINES
-# $CONTENTS
-# $SHORTCONTENTS
+# get_conf('contents')
+# get_conf('shortcontents')
sub T2H_DEFAULT_toc_body($)
{
+ my $elements = shift;
+ foreach my $element (@$elements)
+ {
+ my $level = $element->{'toc_level'};
+ $level = 1 if ($level < 1);
+ my $text = $element->{'name'};
+ $text = $element->{'text'} if ($NUMBER_SECTIONS);
+ my $result = (' ' x ($level - 1)) . $text;
+ push @{$Texi2HTML::TOC_LINES}, $result if (get_conf('contents'));
+ push @{$Texi2HTML::OVERVIEW}, $result if (get_conf('shortcontents') and
$level == 1);
+ }
+ if (@{$Texi2HTML::OVERVIEW})
+ {
+ unshift @{$Texi2HTML::OVERVIEW}, $BEFORE_OVERVIEW;
+ push @{$Texi2HTML::OVERVIEW}, $AFTER_OVERVIEW;
+ }
+ if (@{$Texi2HTML::TOC_LINES})
+ {
+ unshift @{$Texi2HTML::TOC_LINES}, $BEFORE_TOC_LINES;
+ push @{$Texi2HTML::TOC_LINES}, $AFTER_TOC_LINES;
+ }
}
+
sub T2H_DEFAULT_inline_contents($$$)
{
my $fh = shift;
@@ -1712,8 +1453,7 @@
}
if (@{$lines})
{
- $result = [ "".&$anchor($element->{'id'})."\n",
- "<h1>$name</h1>\n" ];
+ $result = [ $name . "\n", ($t2h_default_underline_symbol{0} x
length($name))."\n", "\n" ];
push @$result, @$lines;
}
@@ -1764,10 +1504,10 @@
%BUTTONS_EXAMPLE =
(
- 'Top', ' ',
- 'Contents', ' ',
- 'Overview', ' ',
- 'Index', ' ',
+ 'Top', ' ',
+ 'Contents', ' ',
+ 'Overview', ' ',
+ 'Index', ' ',
'This', '1.2.3',
'Back', '1.2.2',
'FastBack', '1',
@@ -1780,16 +1520,16 @@
'Following', '1.2.4',
'Forward', '1.2.4',
'FastForward', '2',
- 'About', ' ',
+ 'About', ' ',
'First', '1.',
'Last', '1.2.4',
- 'NextFile', ' ',
- 'PrevFile', ' ',
+ 'NextFile', ' ',
+ 'PrevFile', ' ',
);
sub T2H_DEFAULT_about_body
{
- my $about = "<p>\n";
+ my $about = "";
if (ref($PRE_ABOUT) eq 'CODE')
{
$about .= &$PRE_ABOUT();
@@ -1798,86 +1538,6 @@
{
$about .= $PRE_ABOUT;
}
- $about .= <<EOT;
-</p>
-<p>
-EOT
- $about .= &$I(' The buttons in the navigation panels have the following
meaning:') . "\n";
- $about .= <<EOT;
-</p>
-<table border="1">
- <tr>
-EOT
- $about .= ' <th> ' . &$I('Button') . " </th>\n" .
-' <th> ' . &$I('Name') . " </th>\n" .
-' <th> ' . &$I('Go to') . " </th>\n" .
-' <th> ' . &$I('From 1.2.3 go to') . "</th>\n" . " </tr>\n";
-
- for my $button (@SECTION_BUTTONS)
- {
- next if $button eq ' ' || ref($button) eq 'CODE' || ref($button) eq
'SCALAR' || ref($button) eq 'ARRAY';
- $about .= " <tr>\n <td align=\"center\">";
- $about .=
- ($ICONS && $ACTIVE_ICONS{$button} ?
- &$button_icon_img($BUTTONS_NAME{$button}, $ACTIVE_ICONS{$button})
:
- ' [' . $NAVIGATION_TEXT{$button} . '] ');
- $about .= "</td>\n";
- $about .= <<EOT;
- <td align="center">$BUTTONS_NAME{$button}</td>
- <td>$BUTTONS_GOTO{$button}</td>
- <td>$BUTTONS_EXAMPLE{$button}</td>
- </tr>
-EOT
- }
-
- $about .= <<EOT;
-</table>
-
-<p>
-EOT
- $about .= &$I(' where the @strong{ Example } assumes that the current
position is at @strong{ Subsubsection One-Two-Three } of a document of the
following structure:') . "\n";
-
-# where the <strong> Example </strong> assumes that the current position
-# is at <strong> Subsubsection One-Two-Three </strong> of a document of
-# the following structure:
- $about .= <<EOT;
-</p>
-
-<ul>
-EOT
- $about .= ' <li> 1. ' . &$I('Section One') . "\n" .
-" <ul>\n" .
-' <li>1.1 ' . &$I('Subsection One-One') . "\n";
- $about .= <<EOT;
- <ul>
- <li>...</li>
- </ul>
- </li>
-EOT
- $about .= ' <li>1.2 ' . &$I('Subsection One-Two') . "\n" .
-" <ul>\n" .
-' <li>1.2.1 ' . &$I('Subsubsection One-Two-One') . "</li>\n" .
-' <li>1.2.2 ' . &$I('Subsubsection One-Two-Two') . "</li>\n" .
-' <li>1.2.3 ' . &$I('Subsubsection One-Two-Three') . "
\n"
-.
-' <strong><== ' . &$I('Current Position') . " </strong></li>\n" .
-' <li>1.2.4 ' . &$I('Subsubsection One-Two-Four') . "</li>\n" .
-" </ul>\n" .
-" </li>\n" .
-' <li>1.3 ' . &$I('Subsection One-Three') . "\n";
- $about .= <<EOT;
- <ul>
- <li>...</li>
- </ul>
- </li>
-EOT
- $about .= ' <li>1.4 ' . &$I('Subsection One-Four') . "</li>\n";
- $about .= <<EOT;
- </ul>
- </li>
-</ul>
-$AFTER_ABOUT
-EOT
return $about;
}
@@ -1896,7 +1556,8 @@
$title = $Texi2HTML::THISDOC{'title'} if
(defined($Texi2HTML::THISDOC{'title'}) and $Texi2HTML::THISDOC{'title'} !~
/^\s*$/);
if ($title ne '')
{
- $Texi2HTML::TITLEPAGE = '<h1
align="center">'."$title</h1>\n$DEFAULT_RULE\n";
+ $Texi2HTML::TITLEPAGE = "$title\n";
+ $Texi2HTML::TITLEPAGE .= ($t2h_default_underline_symbol{0} x
length($title))."\n";
}
}
@@ -1923,40 +1584,6 @@
sub T2H_DEFAULT_print_redirection_page($)
{
my $fh = shift;
- my $longtitle = "$Texi2HTML::THISDOC{'fulltitle_simple_format'}";
- $longtitle .= ": $Texi2HTML::SIMPLE_TEXT{'This'}" if exists
$Texi2HTML::SIMPLE_TEXT{'This'};
- my $description = $longtitle;
- my $encoding = '';
- $encoding = "<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=$Texi2HTML::THISDOC{'ENCODING_NAME'}\">" if
(defined($Texi2HTML::THISDOC{'ENCODING_NAME'}) and
($Texi2HTML::THISDOC{'ENCODING_NAME'} ne ''));
- my $href = &$anchor('', $Texi2HTML::HREF{'This'},
$Texi2HTML::NAME{'This'});
- my $string = &$I('The node you are looking for is at %{href}.',
- { 'href' => $href });
- print $fh <<EOT;
-$DOCTYPE
-<html>
-<!-- Created on $Texi2HTML::THISDOC{'today'} by $Texi2HTML::THISDOC{'program'}
-->
-<!--
-$Texi2HTML::THISDOC{'program_authors'}
--->
-<head>
-<title>$longtitle</title>
-
-<meta name="description" content="$description">
-<meta name="keywords" content="$longtitle">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="$Texi2HTML::THISDOC{program}">
-$encoding
-$Texi2HTML::THISDOC{'CSS_LINES'}
-<meta http-equiv="Refresh" content="2; url=$Texi2HTML::HREF{'This'}">
-$EXTRA_HEAD
-</head>
-
-<body $Texi2HTML::THISDOC{'BODYTEXT'}>
-$AFTER_BODY_OPEN
-<p>$string</p>
-</body>
-EOT
}
sub T2H_DEFAULT_node_file_name($$)
@@ -2037,20 +1664,15 @@
);
#
-# texinfo "simple things" (@foo) to HTML ones
-#
-%simple_map = (
- '*', "<br>", # HTML+
- ' ', ' ',
- "\t", ' ',
- "\n", ' ',
- # "­" or "­" could also be possible for @-, but it seems
- # that some browser will consider this as an always visible hyphen mark
- # which is not what we want (see http://www.cs.tut.fi/~jkorpela/shy.html)
+# ascii representation of texinfo "simple things" @-commands
+%ascii_simple_map = (
+ '*', "\n",
+ ' ', ' ',
+ "\t", ' ',
+ "\n", ' ',
'-', '', # hyphenation hint
'|', '', # used in formatting commands @evenfooting and friends
'/', '',
- # spacing commands
':', '',
'!', '!',
'?', '?',
@@ -2058,11 +1680,17 @@
'@', '@',
'}', '}',
'{', '{',
- );
+);
+
+#Â texinfo "simple things" @-commands
+%simple_map = %ascii_simple_map;
# this map is used in preformatted text
%simple_map_pre = %simple_map;
-$simple_map_pre{'*'} = "\n";
+
+# This map is used when texi elements are removed and replaced
+# by simple text
+%simple_map_texi = %ascii_simple_map;
# maps for the math specific commands
%simple_map_math = (
@@ -2082,77 +1710,6 @@
$punctuation_characters = '.?!';
$after_punctuation_characters = '"\')]';
-#
-# texinfo "things" (@foo{}) to HTML ones
-#
-%things_map = (
- 'TeX' => 'TeX',
- 'LaTeX' => 'LaTeX',
-# pertusus: unknown by makeinfo, not in texinfo manual (@* is the right thing)
-# 'br', '<br>', # paragraph break
- 'bullet' => '*',
-# #'copyright' => '(C)',
- 'copyright' => '©',
- 'registeredsymbol' => '®',
- 'dots' => '<small class="dots">...</small>',
- 'enddots' => '<small class="enddots">...</small>',
- 'equiv' => '==',
-# FIXME i18n
- 'error' => 'error-->',
- 'expansion' => '==>',
- 'arrow' => '->',
- 'minus' => '-',
- 'point' => '-!-',
- 'print' => '-|',
- 'result' => '=>',
- # set in code using the language
- # 'today', &pretty_date,
- 'today' => '',
- 'aa' => 'å',
- 'AA' => 'Å',
- 'ae' => 'æ',
- 'oe' => 'œ', #pertusus: also œ. œ
not in html 3.2
- 'AE' => 'Æ',
- 'OE' => 'Œ', #pertusus: also Œ. Œ
not in html 3.2
- 'o' => 'ø',
- 'O' => 'Ø',
- 'ss' => 'ß',
- 'DH' => 'Ð',
- 'dh' => 'ð',
- 'TH' => 'Þ',
- 'th' => 'þ',
- 'l' => 'ł',
- 'L' => 'Ł',
- 'exclamdown' => '¡',
- 'questiondown' => '¿',
- 'pounds' => '£',
- 'ordf' => 'ª',
- 'ordm' => 'º',
- 'comma' => ',',
- 'euro' => '€',
- 'geq' => '≥',
- 'leq' => '≤',
- 'tie' => ' ',
- 'textdegree' => '°',
- 'quotedblleft' => '“',
- 'quotedblright' => '”',
- 'quoteleft' => '‘',
- 'quoteright' => '’',
- 'quotedblbase' => '„',
- 'quotesinglbase' => '‚',
- 'guillemetleft' => '«',
- 'guillemetright' => '»',
- 'guillemotleft' => '«',
- 'guillemotright' => '»',
- 'guilsinglleft' => '‹',
- 'guilsinglright' => '›',
- );
-
-# This map is used in preformatted environments
-%pre_map = %things_map;
-$pre_map{'dots'} = '...';
-$pre_map{'enddots'} = '...';
-#$pre_map{'br'} = "\n";
%ascii_things_map = (
'TeX' => 'TeX',
@@ -2213,92 +1770,23 @@
'guilsinglright' => '>',
);
-# ascii representation of @-commands
-%ascii_simple_map = (
- '*', "\n",
- ' ', ' ',
- "\t", ' ',
- "\n", ' ',
- '-', '', # hyphenation hint
- '|', '', # used in formatting commands @evenfooting and friends
- '/', '',
- ':', '',
- '!', '!',
- '?', '?',
- '.', '.',
- '@', '@',
- '}', '}',
- '{', '{',
-);
-
-#
-# This map is used when texi elements are removed and replaced
-# by simple text
-#
-%simple_map_texi = %ascii_simple_map;
+%things_map = %ascii_things_map;
+# This map is used in preformatted environments
+%pre_map = %things_map;
# text replacing macros when texi commands are removed and plain text is
-# produced
-%texi_map = (
- 'TeX', 'TeX',
- 'LaTeX', 'LaTeX',
- 'bullet', '*',
- 'copyright', 'C',
- 'registeredsymbol', 'R',
- 'dots', '...',
- 'enddots', '...',
- 'equiv', '==',
- 'error', 'error-->',
- 'expansion', '==>',
- 'arrow', '->',
- 'minus', '-',
- 'point', '-!-',
- 'print', '-|',
- 'result', '=>',
- 'today' => '',
- 'aa', 'aa',
- 'AA', 'AA',
- 'ae', 'ae',
- 'oe', 'oe',
- 'AE', 'AE',
- 'OE', 'OE',
- 'o', 'o',
- 'O', 'O',
- 'ss', 'ss',
- 'l', 'l',
- 'L', 'L',
- 'DH', 'D',
- 'dh', 'd',
- 'TH', 'TH',
- 'th', 'th',
- 'exclamdown', '!',
- #'exclamdown', '¡',
- 'questiondown', '?',
- #'questiondown', '¿',
- 'pounds', 'pounds',
- #'pounds', '£'
- 'ordf' => 'a',
- 'ordm' => 'o',
- 'comma' => ',',
- 'euro' => 'Euro',
- 'geq' => '>=',
- 'leq' => '<=',
- 'tie' => ' ',
- 'textdegree' => 'o',
- 'quotedblleft' => '``',
- 'quotedblright' => "''",
- 'quoteleft' => '`',
- 'quoteright' => "'",
- 'quotedblbase' => ',,',
- 'quotesinglbase' => ',',
- 'guillemetleft' => '<<',
- 'guillemetright' => '>>',
- 'guillemotleft' => '<<',
- 'guillemotright' => '>>',
- 'guilsinglleft' => '<',
- 'guilsinglright' => '>',
- );
+# produced.
+# Also used for index sorting.
+%texi_map = %ascii_things_map;
+
+foreach my $accent_letter ('o','O','l','L')
+{
+ $texi_map{$accent_letter} = $accent_letter;
+}
+$texi_map{'copyright'} = 'C';
+$texi_map{'registeredsymbol'} = 'R';
+
# taken from
#Latin extended additionnal
@@ -3076,15 +2564,6 @@
'page' => 1
);
-# on bug-texinfo verified that code_style shouldn't be used for anything
-# else than node.
-# anyway it doesn't make sense since the section name normally formatted
-# is used
-#%format_code_style = (
-# 'menu_name' => 1,
-# 'menu_description' => 1
-#);
-
# not used currently for html, but used in chm.init
%numeric_entity_map = ();
@@ -3138,36 +2617,36 @@
# default is {'args' => ['normal'], 'attribute' => ''},
%style_map = (
'asis', {},
- 'b', {'attribute' => 'b'},
- 'cite', {'attribute' => 'cite'},
+ 'b', {},
+ 'cite', {},
'clicksequence', {},
'click', {'function' => \&t2h_default_click_normal},
- 'code', {'args' => ['code'], 'attribute' => 'code'},
- 'command', {'args' => ['code'], 'attribute' => 'code'},
+ 'code', {'args' => ['code']},
+ 'command', {'args' => ['code']},
'ctrl', {'function' => \&t2h_default_ctrl,'type' =>
'simple_style'},
- 'dfn', {'attribute' => 'em'},
+ 'dfn', {},
'dmn', {},
'email', {'args' => ['code', 'normal'],
'function' => \&t2h_default_email,
'type' => 'simple_style'},
#'email', {'args' => ['normal', 'normal'],
# 'function' => \&t2h_default_email},
- 'emph', {'attribute' => 'em'},
- 'env', {'args' => ['code'], 'attribute' => 'code'},
- 'file', {'args' => ['code'], 'attribute' => 'tt', 'quote' => '"'},
- 'i', {'attribute' => 'i'},
- 'slanted', {'attribute' => 'i'},
- 'sansserif', {'attribute' => 'span class="sansserif"'},
- 'kbd', {'args' => ['code'], 'attribute' => 'kbd'},
- 'key', {'args' => ['code'], 'begin' => '<', 'end' => '>'},
+ 'emph', {},
+ 'env', {'args' => ['code']},
+ 'file', {'args' => ['code'], 'quote' => '"'},
+ 'i', {},
+ 'slanted', {},
+ 'sansserif', {},
+ 'kbd', {'args' => ['code'], },
+ 'key', {'args' => ['code'], 'begin' => '<', 'end' => '>'},
'math', {'function' => \&t2h_default_math, 'args' => ['math'] },
- 'option', {'args' => ['code'], 'attribute' => 'samp', 'quote' =>
'"'},
- 'r', {'attribute' => 'span class="roman"'},
- 'samp', {'args' => ['code'], 'attribute' => 'samp', 'quote' =>
'"'},
+ 'option', {'args' => ['code'], 'quote' => '"'},
+ 'r', {},
+ 'samp', {'args' => ['code'], 'quote' => '"'},
# 'sc', {'function' => \&t2h_default_sc},
- 'sc', {'attribute' => 'small'},
- 'strong', {'attribute' => 'strong'},
- 't', {'attribute' => 'tt'},
+ 'sc', {},
+ 'strong', {},
+ 't', {},
'uref', {'function' => \&t2h_default_uref,
'args' => ['code', 'normal', 'normal'],
'type' => 'simple_style' },
@@ -3176,9 +2655,9 @@
'url', {'function' => \&t2h_default_uref,
'args' => ['code', 'normal', 'normal'],
'type' => 'simple_style'},
- 'indicateurl', {'args' => ['code'], 'begin' => '<<code>', 'end' =>
'</code>>','type' => 'simple_style'},
- 'var', {'attribute' => 'var'},
- 'verb', {'args' => ['code'], 'attribute' => 'tt'},
+ 'indicateurl', {'args' => ['code'], 'begin' => '<', 'end' => '>','type'
=> 'simple_style'},
+ 'var', {},
+ 'verb', {'args' => ['code'], },
'titlefont', {'function' => \&t2h_default_titlefont,
'type' => 'simple_style'},
'w', {'type' => 'simple_style'},
@@ -3200,9 +2679,9 @@
}
%line_command_map = (
- 'title' => 'h1',
- 'subtitle' => 'h3 align="right"',
- 'author' => 'strong',
+ 'title' => '',
+ 'subtitle' => '',
+ 'author' => '',
);
%unicode_diacritical = (
@@ -3609,27 +3088,16 @@
my $text = $args->[0];
- return "&${text}$accent_map{$accent};" if (defined($accent_map{$accent})
and defined($special_accents{$accent}) and ($text =~
/^[$special_accents{$accent}]$/));
- return '&' . $text . 'ring;' if (($accent eq 'ringaccent') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
- return $text . '<' if ($accent eq 'v');
-# FIXME here there could be a conversion to the character in the right
-# encoding, like
-# if ($USE_UNICODE and defined($OUT_ENCODING) and $OUT_ENCODING ne ''
-# and exists($unicode_accents{$accent}) and
exists($unicode_accents{$accent}->{$text}))
-# {
-# my $encoded_char = Encode::encode($OUT_ENCODING,
chr(hex($unicode_map{$thing})), Encode::FB_QUIET);
-# return $encoded_char if ($encoded_char ne '');
-# }
- if ($USE_NUMERIC_ENTITY)
- {
- if (exists($unicode_accents{$accent}) and
exists($unicode_accents{$accent}->{$text}))
- {
- return ('&#' . hex($unicode_accents{$accent}->{$text}) . ';');
- }
- }
return ascii_accents($text, $accent);
}
+####################################################################
+#Â special accent/encoding commands
+#
+# Some functions used to override normal formatting functions in specific
+# cases. The user shouldn't want to change them, but can use them.
+#
+
sub ascii_accents($$)
{
my $text = shift;
@@ -3647,6 +3115,56 @@
return $text . $accent if (defined($accent_map{$accent}));
}
+# used to utf8 encode the result
+sub t2h_utf8_accent($$$)
+{
+ my $accent = shift;
+ my $args = shift;
+ my $style_stack = shift;
+
+ my $text = $args->[0];
+ #print STDERR "$accent\[".scalar(@$style_stack) ."\] (@$style_stack)\n";
+
+ # special handling of @dotless{i}
+ if ($accent eq 'dotless')
+ {
+ if (($text eq 'i') and (!defined($style_stack->[-1]) or
(!defined($unicode_accents{$style_stack->[-1]})) or ($style_stack->[-1] eq
'tieaccent')))
+ {
+ return "\x{0131}";
+ }
+ #return "\x{}" if ($text eq 'j'); # not found !
+ return $text;
+ }
+
+ # FIXME \x{0131}\x{0308} for @dotless{i} @" doesn't lead to NFC 00ef.
+ return Unicode::Normalize::NFC($text .
chr(hex($unicode_diacritical{$accent})))
+ if (defined($unicode_diacritical{$accent}));
+ return ascii_accents($text, $accent);
+}
+
+sub t2h_utf8_normal_text($$$$$$;$)
+{
+ my $text = shift;
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ $text = &$protect_text($text) unless($in_raw_text);
+ $text = uc($text) if (in_small_caps($style_stack));
+
+ if (!$in_code and !$in_preformatted)
+ {
+ $text =~ s/---/\x{2014}/g;
+ $text =~ s/--/\x{2013}/g;
+ $text =~ s/``/\x{201C}/g;
+ $text =~ s/''/\x{201D}/g;
+ }
+ return Unicode::Normalize::NFC($text);
+}
+
sub t2h_enable_encoding_normal_accent($$$)
{
return t2h_enable_encoding_accent ('normal', @_);
@@ -3793,10 +3311,12 @@
return &{$t2h_enable_encoding_default_accent{$in}->{$accent}}(@other_args);
}
+#Â end special accent/encoding commands
+####################################################################
sub default_sc($$)
{
- return '<small>' . uc($_[0]) . '</small>';
+ return uc($_[0]);
}
sub default_ctrl($$)
@@ -3829,8 +3349,10 @@
{
shift;
my $args = shift;
- return "<h1 class=\"titlefont\">$args->[0]</h1>" if ($args->[0] =~ /\S/);
- return '';
+ my $heading = $args->[0];
+ return '' unless ($heading =~ /\S/);
+ return $heading . "\n" .
+ ($t2h_default_underline_symbol{0} x length($heading)). "\n";
}
# At some point in time (before 4.7?) according to the texinfo
@@ -3852,7 +3374,7 @@
#$url =~ s/^\s*//;
$url = main::normalise_space($url);
return '' unless ($url =~ /\S/);
- return &$anchor('', $url, $url);
+ return t2h_default_url_and_text($url);
}
sub default_url ($$)
@@ -3861,8 +3383,7 @@
my $command = shift;
$url =~ s/\s*$//;
$url =~ s/^\s*//;
- return '' unless ($url =~ /\S/);
- return &$anchor('', $url, $url);
+ return t2h_default_url_and_text($url);
}
sub default_uref($$)
@@ -3874,9 +3395,7 @@
$url =~ s/\s*$//;
$url =~ s/^\s*//;
$text = $replacement if (defined($replacement));
- $text = $url unless ($text);
- return $text if ($url eq '');
- return &$anchor('', $url, $text);
+ return t2h_default_url_and_text($url, $text);
}
sub t2h_default_uref($$)
@@ -3894,9 +3413,7 @@
$text = '' if (!defined($text));
$text = main::normalise_space($text);
$text = $replacement if ($replacement ne '');
- $text = $url unless ($text ne '');
- return $text if ($url eq '');
- return &$anchor('', $url, $text);
+ return t2h_default_url_and_text($url, $text);
}
sub t2h_default_math($$)
@@ -3907,7 +3424,7 @@
#print STDERR "t2h_default_math $text\n";
$text =~ s/[{}]//g;
# $text =~ s/address@hidden/\\/g;
- return "<em>$text</em>";
+ return "$text";
}
sub default_email($$)
@@ -3918,9 +3435,7 @@
($mail, $text) = split /,\s*/, $arg;
$mail =~ s/\s*$//;
$mail =~ s/^\s*//;
- $text = $mail unless ($text);
- return $text if ($mail eq '');
- return &$anchor('', "mailto:$mail";, $text);
+ return t2h_default_url_and_text("mailto:$mail";, $text);
}
sub t2h_default_email($$)
@@ -3932,10 +3447,9 @@
$mail = main::normalise_space($mail);
#$mail =~ s/\s*$//;
#$mail =~ s/^\s*//;
- $text = $mail unless (defined($text) and ($text ne ''));
- $text = main::normalise_space($text);
- return $text if ($mail eq '');
- return &$anchor('', "mailto:$mail";, $text);
+ my $mailto = '';
+ $mailto = "mailto:$mail"; if ($mail ne '');
+ return t2h_default_url_and_text($mailto, $text);
}
sub t2h_default_click_normal($$$)
@@ -4177,11 +3691,11 @@
# 'quotation' => 'blockquote',
# lists
# 'itemize' => 'ul',
- 'enumerate' => 'ol',
+ 'enumerate' => '',
# 'multitable' => 'table',
- 'table' => 'dl compact="compact"',
- 'vtable' => 'dl compact="compact"',
- 'ftable' => 'dl compact="compact"',
+ 'table' => '',
+ 'vtable' => '',
+ 'ftable' => '',
'group' => '',
# 'detailmenu' => '',
);
@@ -4215,25 +3729,25 @@
{
'example' =>
{
- 'begin' => q{"<table><tr>$EXAMPLE_INDENT_CELL<td>"},
- 'end' => q{"</td></tr></table>\n"},
+ 'begin' => q{""},
+ 'end' => q{""},
'style' => 'code',
},
'smallexample' =>
{
- 'begin' => q{"<table><tr>$SMALL_EXAMPLE_INDENT_CELL<td>"},
- 'end' => q{"</td></tr></table>\n"},
+ 'begin' => q{""},
+ 'end' => q{""},
'style' => 'code',
},
'display' =>
{
- 'begin' => q{"<table><tr>$EXAMPLE_INDENT_CELL<td>"},
- 'end' => q{"</td></tr></table>\n"},
+ 'begin' => q{""},
+ 'end' => q{""},
},
'smalldisplay' =>
{
- 'begin' => q{"<table><tr>$SMALL_EXAMPLE_INDENT_CELL<td>"},
- 'end' => q{"</td></tr></table>\n"},
+ 'begin' => q{""},
+ 'end' => q{""},
}
};
@@ -4416,6 +3930,7 @@
'quote-arg' => {},
'allow-recursion' => {},
);
+
my %misc_command_old = (
# not needed for formatting
'raisesections', 'line', # no arg
@@ -4488,30 +4003,13 @@
);
%format_in_paragraph = (
- 'html' => 1,
);
# map mapping css specification to style
%css_map =
(
- 'ul.toc' => "$NO_BULLET_LIST_STYLE",
- 'pre.menu-comment' => "$MENU_PRE_STYLE",
- 'pre.menu-preformatted' => "$MENU_PRE_STYLE",
- 'a.summary-letter' => 'text-decoration: none',
- 'blockquote.smallquotation' => 'font-size: smaller',
-# 'pre.display' => 'font-family: inherit',
-# 'pre.smalldisplay' => 'font-family: inherit; font-size:
smaller',
- 'pre.display' => 'font-family: serif',
- 'pre.smalldisplay' => 'font-family: serif; font-size: smaller',
- 'pre.smallexample' => 'font-size: smaller',
- 'span.sansserif' => 'font-family:sans-serif;
font-weight:normal;',
- 'span.roman' => 'font-family:serif; font-weight:normal;'
);
-$css_map{'pre.format'} = $css_map{'pre.display'};
-$css_map{'pre.smallformat'} = $css_map{'pre.smalldisplay'};
-$css_map{'pre.smalllisp'} = $css_map{'pre.smallexample'};
-
# The command_handler arrays are for commands formatted externally.
# The function references in @command_handler_init are called
# before the second pass, before the @-commands text collection.
@@ -4740,10 +4238,6 @@
my $line = shift;
my $state = shift;
- # first array element is the number of cell in a row
- # second is the number of paragraphs in a cell
- push (@t2h_default_multitable_stack, [-1,-1]) if ($command eq
'multitable');
-
return $line;
}
@@ -4904,7 +4398,7 @@
$caption_text = $caption;
}
- return '<div class="float">' . "$label\n" . $text . '</div>' .
$caption_text;
+ return $text . "\n" . $caption_text;
}
sub t2h_default_listoffloats_style($)
@@ -4957,8 +4451,9 @@
my $caption = shift;
my $href = shift;
- return '<dt>' . &$anchor('', $href, $float_style) . '</dt><dd>' . $caption
-. '</dd>' . "\n";
+ $caption .= ': ' if ($caption ne '');
+
+ return "* $float_style: ${caption}$float->{'text'}.\n";
}
sub t2h_default_listoffloats($$$)
@@ -4967,12 +4462,12 @@
my $style = shift;
my $float_entries = shift;
- my $result = "<dl class=\"listoffloats\">\n" ;
+ my $result = "* List of $style:\n";
foreach my $float_entry (@$float_entries)
{
$result .= $float_entry;
}
- return $result . "</dl>\n";
+ return $result . "\n";
}
sub t2h_default_insertcopying($$$)
@@ -4983,12 +4478,18 @@
return $text;
}
-# This function is used to protect characters which are special in html
+sub t2h_default_protect_text($)
+{
+ my $text = shift;
+ return $text;
+}
+
+# This function is used to protect characters which are special in xml
# in inline text: &, ", <, and >.
#
# argument:
# text to be protected
-sub t2h_default_protect_text($)
+sub xml_default_protect_text($)
{
my $text = shift;
$text =~ s/&/&/g;
@@ -5046,6 +4547,7 @@
#
sub t2h_default_normal_text($$$$$$;$)
{
+ my @initial_args = @_;
my $text = shift;
my $in_raw_text = shift; # remove_texi
my $in_preformatted = shift;
@@ -5057,47 +4559,17 @@
# like utf8.init
if ($ENABLE_ENCODING and !$ENABLE_ENCODING_USE_ENTITY and
defined($Texi2HTML::THISDOC{'ENCODING_NAME'}) and
$Texi2HTML::THISDOC{'ENCODING_NAME'} eq 'utf-8')
{
- return t2h_utf8_normal_text($text, $in_raw_text, $in_preformatted,
$in_code, $in_simple, $style_stack, $state);
+ return &t2h_utf8_normal_text(@initial_args);
}
$text = uc($text) if (in_cmd($style_stack, 'sc'));
- $text = &$protect_text($text) unless($in_raw_text);
if (! $in_code and !$in_preformatted)
{
- if ($USE_ISO and !$in_raw_text)
- {
- $text =~ s/---/\&mdash\;/g;
- $text =~ s/--/\&ndash\;/g;
- $text =~ s/``/\&ldquo\;/g;
- $text =~ s/''/\&rdquo\;/g;
- if (! $in_simple)
- { # lquot and rquot don't seem to be accepted in title.
- $text =~ s/'/$iso_symbols{"'"}/g if (defined
($iso_symbols{"'"}));
- $text =~ s/`/$iso_symbols{'`'}/g if (defined
($iso_symbols{'`'}));
- }
- }
- else
- {
- if ($in_raw_text) #FIXME really do that ? It is done by makeinfo
- {
- $text =~ s/``/"/g;
- $text =~ s/''/"/g;
- }
- else
- {
- $text =~ s/``/"/g;
- $text =~ s/''/"/g;
- # to be like texinfo
- #$text =~ s/'/\&rsquo\;/g;
- #$text =~ s/`/\&lsquo\;/g;
- }
- # temporary reuse '' to store --- !....
- # FIXME won't '---' be handled wrongly?
- # FIXME really do that in raw text?
- $text =~ s/---/''/g;
+ $text =~ s/---/\x{1F}/g;
$text =~ s/--/-/g;
- $text =~ s/''/--/g;
- }
+ $text =~ s/\x{1F}/--/g;
+ $text =~ s/``/"/g;
+ $text =~ s/\'\'/"/g;
}
else
{
@@ -5111,7 +4583,23 @@
return $text;
}
-# This function produces an anchor
+sub t2h_default_url_and_text($;$)
+{
+ my $url = shift;
+ my $text = shift;
+ if (!defined($text) or $text eq '')
+ {
+ return "<$url>" if (defined($url) and $url ne '');
+ return '';
+ }
+ else
+ {
+ return $text if (!defined($url) or $url eq '');
+ return "$text <$url>";
+ }
+}
+
+# This function produces an anchor. This need is quite html specific.
#
# arguments:
# $name : anchor name
@@ -5124,24 +4612,8 @@
my $href = shift;
my $text = shift;
my $attributes = shift;
-#print STDERR "!$name!$href!$text!$attributes!\n";
- if (!defined($attributes) or ($attributes !~ /\S/))
- {
- $attributes = '';
- }
- else
- {
- $attributes = ' ' . $attributes;
- }
- $name = '' if (!defined($name) or ($name !~ /\S/));
- $href = '' if (!defined($href) or ($href !~ /\S/));
- $text = '' if (!defined($text));
- return $text if (($name eq '') and ($href eq ''));
- $name = "name=\"$name\"" if ($name ne '');
- $href = "href=\"$href\"" if ($href ne '');
- $href = ' ' . $href if (($name ne '') and ($href ne ''));
-#print STDERR "!!!$name!$href!$text!$attributes!\n";
- return "<a ${name}${href}${attributes}>$text</a>";
+ return $text if (defined($text));
+ return '';
}
# This function is used to format the text associated with a @deff/@end deff
@@ -5158,15 +4630,7 @@
my $command = shift;
if ($text =~ /\S/)
{
- if (! $DEF_TABLE)
- {
- return '<dd>' . $text . '</dd>';# unless $only_inter_item_commands;
- #return $text; # invalid without dd in ul
- }
- else
- {
- return '<tr><td colspan="2">' . $text . '</td></tr>';
- }
+ return $text;
}
return '';
}
@@ -5225,22 +4689,12 @@
my $command = shift;
if ($text =~ /\S/)
{
- if (! $DEF_TABLE)
- {
- return "<dl>\n" . $text . "</dl>\n";
- }
- else
- {
- return "<table width=\"100%\">\n" . $text . "</table>\n";
- }
+ return $text;
}
return '';
}
-# tracks menu entry index
-my $menu_entry_index;
-
# a whole menu
#
# argument:
@@ -5248,57 +4702,16 @@
#
# argument:
# whole menu text.
+#Â not used since menu is a normal preformatted command
sub t2h_default_menu_command($$$)
{
my $format = shift;
my $text = shift;
my $in_preformatted = shift;
+ return "* Menu:\n".$text."\n";
- $menu_entry_index=0;
-
- my $begin_row = '';
- my $end_row = '';
- if ($in_preformatted)
- {
- $begin_row = '<tr><td>';
- $end_row = '</td></tr>';
- }
- if ($text =~ /\S/)
- {
- return '' if ($format eq 'direntry');
- return $text if ($format eq 'detailmenu');
- return "<table class=\"menu\" border=\"0\"
cellspacing=\"0\">${begin_row}\n"
- . $text . "${end_row}</table>\n";
- }
}
-# obsolete
-# a simple menu entry ref in case we aren't in a standard menu context
-#sub t2h_default_simple_menu_link($$$$$$$)
-#{
-# my $entry = shift;
-# my $preformatted = shift;
-# my $href = shift;
-# my $node = shift;
-# my $title = shift;
-# my $ending = shift;
-# my $has_title = shift;
-# $title = '' unless($has_title);
-# $ending = '' if (!defined($ending));
-# if (($entry eq '') or $NODE_NAME_IN_MENU or $preformatted)
-# {
-# $title .= ':' if ($title ne '');
-# $entry = "$MENU_SYMBOL$title$node";
-# }
-# $menu_entry_index++;
-# my $accesskey;
-# $accesskey = "accesskey=\"$menu_entry_index\"" if ($USE_ACCESSKEY and
($menu_entry_index < 10));
-# $entry = &$anchor('', $href, $entry, $accesskey) if ($href);
-# $entry .= $ending if ($preformatted);
-# $entry .= ' ' unless $preformatted;
-# return $entry;
-#}
-
# formats a menu entry link pointing to a node or section
#
# arguments:
@@ -5323,24 +4736,9 @@
my $command_stack = shift;
my $preformatted = shift;
- my $in_commands = 0;
- $in_commands = 1 if ($command_stack->[-1] and $command_stack->[-1] ne
'menu' and $command_stack->[-1] ne 'detailmenu' and $command_stack->[-1] ne
'direntry');
-
$title = '' unless ($has_title);
-#print STDERR "MENU_LINK($in_commands)($state->{'preformatted'})\n";
- if (($entry eq '') or $NODE_NAME_IN_MENU or $preformatted)
- {
$title .= ':' if ($title ne '');
- $entry = "$MENU_SYMBOL$title$node";
- }
- $menu_entry_index++;
- my $accesskey;
- $accesskey = "accesskey=\"$menu_entry_index\"" if ($USE_ACCESSKEY and
($menu_entry_index < 10));
- $entry = &$anchor ('', $href, $entry, $accesskey) if (defined($href));
-
- return $entry.$ending if ($preformatted);
- return $entry .' ' if ($in_commands);
- return "<tr><td align=\"left\"
valign=\"top\">$entry</td><td> </td>";
+ return "$MENU_SYMBOL$title$node$ending";
}
# formats a menu entry description, ie the text appearing after the node
@@ -5352,6 +4750,7 @@
# the description text
# the state. See menu_entry.
# the heading of the element associated with the node.
+#Â not usd since in SIMPLE_MENU
sub t2h_default_menu_description($$$$)
{
my $text = shift;
@@ -5360,16 +4759,7 @@
my $command_stack = shift;
my $preformatted = shift;
- my $in_commands = 0;
- $in_commands = 1 if ($command_stack->[-1] and $command_stack->[-1] ne
'menu' and $command_stack->[-1] ne 'detailmenu' and $command_stack->[-1] ne
'direntry');
- return $text if ($preformatted or $in_commands);
- # FIXME: the following is better-looking.
- #return $text."<br>" if ($in_commands and !$state->{'preformatted'});
- if ($AVOID_MENU_REDUNDANCY)
- {
- $text = '' if (html_simplify_text($element_text) eq
html_simplify_text($text));
- }
- return "<td align=\"left\" valign=\"top\">$text</td></tr>\n";
+ return $text;
}
# Construct a href to an external source of information.
@@ -5379,6 +4769,8 @@
# node_xhtml_id is the node transformed such that it is unique and can
# be used to make an html cross ref as explained in the texinfo manual
# file is the file in '(file)node'
+# This is used to construct href, so is likely to be ignored oustside of
+#Â html.
sub t2h_default_external_href($$$)
{
my $node = shift;
@@ -5678,23 +5070,11 @@
my $index_label = shift;
my $format = shift;
my $command = shift;
-# my $formatted_command = shift;
my $style_stack = shift;
-# my $text_formatted = shift;
-# my $text_formatted_leading_spaces = shift;
-# my $text_formatted_trailing_spaces = shift;
my $item_cmd = shift;
my $formatted_index_entry = shift;
-# if (defined($text_formatted) and !exists
$special_list_commands{$format}->{$command})
-# {
-# $text = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
-# }
-# $formatted_command = '' if (!defined($formatted_command) or
-# exists($special_list_commands{$format}->{$command}));
- $text .= "\n" . $index_label if (defined($index_label));
-# return '<dt>' . $formatted_command . $text . '</dt>' . "\n";
- return '<dt>' . $text . '</dt>' . "\n";
+ return $text . "\n";
}
# format text on the line following the @item line (in table, vtable and
ftable)
@@ -5708,8 +5088,7 @@
if ($text =~ /\S/)
{
- return '<dd>' . $text . '</dd>' . "\n";# unless
($only_inter_item_commands);
- #return $text; # invalid without dd in ul
+ return $text;
}
return '';
}
@@ -5730,16 +5109,9 @@
$only_inter_item_commands = '' if (!defined($only_inter_item_commands));
- # this is used to keep the cell number
- $t2h_default_multitable_stack[-1]->[0] = -1;
-
if ($text =~ /\S/)
{
- if ($macro eq 'headitem')
- {
- return '<thead><tr>' . $text . '</tr></thead>' . "\n";
- }
- return '<tr>' . $text . '</tr>' . "\n";
+ return $text ."\n";
}
return '';
}
@@ -5758,30 +5130,10 @@
$only_inter_item_commands = '' if (!defined($only_inter_item_commands));
- $t2h_default_multitable_stack[-1]->[0]++;
- my $cell_nr = $t2h_default_multitable_stack[-1]->[0];
- my $fractions = '';
-
- if (defined($columnfractions) and (ref($columnfractions) eq 'ARRAY')
- and exists($columnfractions->[$cell_nr]))
- {
- my $fraction = sprintf('%d', 100*$columnfractions->[$cell_nr]);
- $fractions = " width=\"$fraction%\"";
- }
-
- # in constructs like
- # @strong{
- # @multitable ....
- # }
- # the space won't be removed since the <strong> is put before the space.
$text =~ s/^\s*//;
$text =~ s/\s*$//;
- if ($row_macro eq 'headitem')
- {
- return "<th${fractions}>" . $text . '</th>';
- }
- return "<td${fractions}>" . $text . '</td>';
+ return " $text";
}
sub t2h_default_format_list_item_texi($$$$$)
@@ -5794,7 +5146,12 @@
my $result_line;
my $open_command = 0;
- if (defined($command) and $command ne '' and !exists
$special_list_commands{$format}->{$command} and $format ne 'itemize')
+
+ $command = 'bullet' if ((!defined($command) or $command eq '') and
(!defined($prepended) or $prepended eq '') and $format eq 'itemize');
+ $prepended = "address@hidden" if (defined($command) and $command ne '');
+ $prepended = "$number." if (defined($number) and $number ne '');
+
+ if (defined($command) and $command ne '' and $format ne 'itemize')
{
address@hidden
$open_command = 1;
@@ -5850,18 +5207,14 @@
$formatted_command = '' if (!defined($formatted_command) or
exists($special_list_commands{$format}->{$command}));
my $prepend = '';
-# if (defined($prepended) and $prepended ne '')
-# {
-# $prepend = $prepended;
-# }
-# elsif ($formatted_command ne '')
+
if ($formatted_command ne '')
{
$prepend = $formatted_command;
}
if ($text =~ /\S/)
{
- return '<li>' . $prepend . $text . '</li>';
+ return $prepend . $text;
}
return '';
}
@@ -5884,26 +5237,14 @@
my $prototype_lengths = shift;
my $column_number = shift;
# my $number = shift;
- $formatted_command = '' if (!defined($formatted_command) or
- exists($special_list_commands{$format}->{$command}));
- if ($format_command eq 'itemize')
- {
- return "<ul>\n" . $text . "</ul>\n" if (($command eq 'bullet') or
(($command eq '') and ($prepended eq '')));
- return "<ul$NO_BULLET_LIST_ATTRIBUTE>\n" . $text . "</ul>\n";
- }
- elsif ($format_command eq 'multitable')
- {
- pop @t2h_default_multitable_stack;
- return &$format('multitable', 'table', $text);
- }
+ return $text;
}
-# an html comment
+# an comment
sub t2h_default_comment($)
{
my $text = shift;
- $text =~ s/--+/-/go;
- return '<!-- ' . $text . ' -->' . "\n";
+ return '';
}
sub t2h_collect_styles($)
@@ -6001,30 +5342,7 @@
$text = t2h_end_style($style, $text);
}
- if (defined($paragraph_number) and defined($$paragraph_number))
- {
- $$paragraph_number++;
- return $text if (($format eq 'itemize' or $format eq 'enumerate') and
- ($$paragraph_number == 1));
- }
-
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- if ($top_stack eq 'multitable')
- {
- $t2h_default_multitable_stack[-1]->[1]++;
- if ($t2h_default_multitable_stack[-1]->[1] == 0)
- {
return $text;
- }
- }
-
- my $open = '<p>';
- if ($align)
- {
- $open = "<p align=\"$paragraph_style{$align}\">";
- }
- return $open.$text.'</p>';
}
# a preformatted region
@@ -6054,12 +5372,7 @@
#print STDERR "preformatted @$command_stack_at_end;
@$command_stack_at_begin\n";
return '' if ($text eq '');
- $leading_command_formatted = '' if (!defined($leading_command_formatted)
or
- exists($special_list_commands{$format}->{$leading_command}));
- if (defined($preformatted_number) and defined($$preformatted_number))
- {
- $$preformatted_number++;
- }
+
my $top_stack = '';
$top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
if ($top_stack eq 'multitable')
@@ -6076,7 +5389,7 @@
{
$text = t2h_end_style($style, $text, \%style_map_pre);
}
- return "<pre class=\"$class\">".$text."</pre>";
+ return $text;
}
# This function formats a heading for an element
@@ -6109,19 +5422,11 @@
my $new_element = shift;
#print STDERR ":::::::: $element $command i_p $in_preformatted o_s
$one_section e_h $element_heading f_p $first_in_page i_t $is_top p_i_t
$previous_is_top id $element_id new $new_element\n";
- my $result = &$element_label($element_id, $element, $command,
$command_line);
+ my $result = '';
if ($new_element and !$one_section)
{
- if (!$element->{'element_ref'}->{'top'})
- {
- #return $result if (defined($command) and $command eq 'node' and
!$element_heading);
$result .= &$print_element_header($first_in_page, $previous_is_top);
}
- else
- {
- $result .= &$print_head_navigation(undef, address@hidden) if
(get_conf('SPLIT') or $SECTION_NAVIGATION);
- }
- }
return $result if (!$element_heading);
return $result. &$heading($element, $command, $texi_line, $line,
$in_preformatted, $one_section, $element_heading);
@@ -6137,51 +5442,21 @@
my $one_section = shift;
my $element_heading = shift;
- my $level = 3;
- if (!$element->{'node'})
+ if ($element->{'node'})
{
- $level = $element->{'level'};
- }
- my $text = $element->{'text'};
- my $class = $element->{'tag_level'};
- $class = 'unnumbered' if ($class eq 'top' or $class eq 'centerchap');
- my $align = '';
- $align = ' align="center"' if ($element->{'tag'} eq 'centerchap');
- if ($element->{'top'})
- {
- return '' if ($element->{'titlefont'});
- $level = 1;
- $text = $Texi2HTML::NAME{'Top'};
- $class = 'settitle' unless ($one_section);
- }
- # when it is a heading, the element is irrelevant, so the command and the
- # line are used...
- if (defined($command) and $command =~ /heading/)
- {
- $level = $main::sec2level{$command} if
(defined($main::sec2level{$command}));
- if (defined($line))
- {
- $text = $line;
- # this isn't done in main program in that case...
- chomp ($text);
- $text =~ s/^\s*//;
- }
- $class = $command;
- }
- elsif (defined($element->{'tocid'}) and $TOC_LINKS)
- {
- $text = &$anchor ('',
"$Texi2HTML::THISDOC{'toc_file'}#$element->{'tocid'}", $text);
- }
- $level = 1 if ($level == 0);
- return '' if ($text !~ /\S/);
- if (!$in_preformatted)
- {
- return "<h$level class=\"$class\"$align>$text</h$level>\n";
- }
- else
- {
- return "<strong>$text</strong>\n";
+ return '';
}
+ my $text = "$element->{'text'}";
+ #Â to do the same than makeinfo a trailing dot in section number is removed
+ $text =~ s/^(\w+)\. /$1 /;
+ #Â when @top is empty, use settitle
+ $text = $Texi2HTML::THISDOC{'settitle'} if (!length($text) and
$element->{'tag'} eq 'top' and defined ($Texi2HTML::THISDOC{'settitle'}) and
length($Texi2HTML::THISDOC{'settitle'}));
+ $text = "Annexe $text" if ($element->{'tag'} =~ /appendix/ and
$element->{'level'} <= 1);
+ my $result = $text . "\n" .
+ ($t2h_default_underline_symbol{$element->{'level'}} x length($text)) .
"\n";
+
+ $result .= "\n";
+ return $result;
}
sub t2h_default_heading_no_texi($$$)
@@ -6202,18 +5477,12 @@
my $expanded = 1 if (grep {$style eq $_} @EXPAND);
if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($style eq
'tex' and $expanded))
{
- $style = 'verbatim' if ($style eq 'verbatiminclude');
- return "<pre class=\"$style\">" . &$protect_text($text) . '</pre>';
- }
- elsif ($style eq 'html' and $expanded)
- {
- chomp ($text);
return $text;
}
elsif ($expanded)
{
main::echo_warn ("Raw $style not handled especially, but expanded",
$line_nr);
- return &$protect_text($text);
+ return $text;
}
else
{
@@ -6267,15 +5536,9 @@
{
$document_file = $footnote_file = '';
}
- unshift (@$lines, '<h3>' .
- &$anchor($footnote_id, $document_file . "#$place_id",
- "($number_in_doc)")
- . "</h3>\n");
- # this is a bit obscure, this allows to add an anchor only if formatted
- # as part of the document.
- $place_id = '' if ($document_state->{'outside_document'} or
$document_state->{'multiple_pass'});
- return ($lines, &$anchor($place_id, $footnote_file . "#$footnote_id",
- "($number_in_doc)"));
+ unshift (@$lines, "($number_in_doc)\n");
+ push @$lines, "\n";
+ return ($lines, "($number_in_doc)");
}
# formats a group of footnotes.
@@ -6287,8 +5550,6 @@
sub t2h_default_foot_section($)
{
my $lines = shift;
- unshift (@$lines, "<div class=\"footnote\">\n" ,"$DEFAULT_RULE\n", "<h3>"
. &$I('Footnotes') . "</h3>\n");
- push (@$lines, "</div>\n");
return $lines;
}
@@ -6353,20 +5614,18 @@
}
else
{
- $file = "$base.jpg";
+ $file = "$base.txt";
}
- main::echo_warn ("no image file for $base, (using $file)", $line_nr);
}
elsif (! $COMPLETE_IMAGE_PATHS)
{
$file = $file_name;
}
- $alt = &$protect_text($base) if (!defined($alt) or ($alt eq ''));
- return "[ $alt ]" if ($preformatted);
+ my $alt_txt = '';
+ $alt_txt = ": $alt" if (defined($alt) and $alt =~ /\S/);
+ return "[ $file$alt_txt ]";
# it is possible that $file_name is more correct as it allows the user
# to chose the relative path.
- $file = &$protect_text($file);
- return "<img src=\"$file\" alt=\"$alt\">";
}
# address put in footer describing when was generated and who did the manual
@@ -6445,33 +5704,18 @@
my $style = shift;
my $original_command = shift;
- $index_label = '' if (!defined($index_label));
- chomp($index_label);
- $category_prepared = '' if (!defined($category_prepared) or
($category_prepared =~ /^\s*$/));
$name = '' if (!defined($name) or ($name =~ /^\s*$/));
$type = '' if (!defined($type) or $type =~ /^\s*$/);
- if (!defined($arguments) or $arguments =~ /^\s*$/)
- {
- $arguments = '';
- }
- else
- {
- chomp ($arguments);
- $arguments = '<i>' . $arguments . '</i>';
- }
+ $arguments = '' if (!defined($arguments) or $arguments =~ /^\s*$/);
+
my $type_name = '';
- $type_name = " $type" if ($type ne '');
- $type_name .= ' <b>' . $name . '</b>' if ($name ne '');
- $type_name .= $arguments;
- if (! $DEF_TABLE)
- {
- return '<dt>'. $index_label. '<u>' . $category_prepared . ':</u>' .
$type_name . "</dt>\n";
- }
- else
- {
- return "<tr><td align=\"left\">" . $type_name .
- "</td><td align=\"right\">" . $category_prepared . $index_label .
"</td></tr>\n";
- }
+ $type_name .= "$type " if ($type ne '');
+ $type_name .= $name if ($name ne '');
+
+ my $result = " -- $category_prepared: ${type_name}$arguments";
+ $result =~ s/\s*$//;
+ $result .= "\n";
+
}
# process definition commands line @deffn for example while removing texi
@@ -6510,7 +5754,7 @@
if ($text =~ /\S/)
{
- return "<table class=\"cartouche\" border=\"1\"><tr><td>\n" . $text .
"</td></tr></table>\n";
+ return $text;
}
return '';
}
@@ -6562,7 +5806,6 @@
{
my $number = shift;
my $preformatted = shift;
- return "<br>\n" x $number if (!$preformatted);
return "\n" x $number;
}
@@ -6576,20 +5819,15 @@
my $explanation_text = shift;
my $explanation_simply_formatted = shift;
- my $attribute = $command;
- my $opening = "<$attribute>";
- if (defined($explanation_simply_formatted))
- {
- $opening = "<$attribute title=\"$explanation_simply_formatted\">";
- }
if ($with_explanation)
{
- return &$I('%{acronym_like} (%{explanation})', {'acronym_like' =>
$opening . $acronym_text . "</$attribute>", 'explanation' =>
$explanation_text},{'duplicate'=>1})
+ return "$acronym_text ($explanation_text)";
}
else
{
- return $opening . $acronym_text . "</$attribute>";
+ return "$acronym_text";
}
+
}
sub t2h_default_quotation_prepend_text($$)
@@ -6612,8 +5850,7 @@
my $argument_text = shift;
my $argument_text_texi = shift;
my $class_text = '';
- $class_text = " class=\"$command\"" if ($command ne 'quotation');
- return "<blockquote$class_text>" . $text . "</blockquote>\n";
+ return $text;
}
# format the text within a paragraph style format,
@@ -6638,10 +5875,7 @@
my $text = shift;
my $name = shift;
return '' if (!defined($text));
- return "<table border=\"0\" class=\"index-$name\">\n" .
- "<tr><td></td><th align=\"left\">" . &$I('Index Entry') . "</th><th
align=\"left\"> " . &$I('Section') . "</th></tr>\n"
- . "<tr><td colspan=\"3\"> $DEFAULT_RULE</td></tr>\n" . $text .
- "</table>\n";
+ return "* Index:\n" . $text;
}
# format a letter entry in an index page. The letter entry contains
@@ -6658,9 +5892,7 @@
my $letter = shift;
my $id = shift;
my $text = shift;
- return '<tr><th>' . &$anchor($id,'',&$protect_text($letter)) .
- "</th><td></td><td></td></tr>\n" . $text .
- "<tr><td colspan=\"3\"> $DEFAULT_RULE</td></tr>\n";
+ return '';
}
# format an index entry (in a letter entry).
@@ -6683,9 +5915,13 @@
my $entry_element_target = shift;
my $index_entry_ref = shift;
- return '<tr><td></td><td valign="top">' . &$anchor('', $text_href, $entry)
- . '</td><td valign="top">' . &$anchor('', $element_href, $element_text)
- . "</td></tr>\n";
+ return '' if ($index_entry_ref->{'hidden'});
+ $entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in
address@hidden");
+
+ my $element = $index_entry_ref->{'real_element'};
+ $element = $element->{'element_ref'} if ($element->{'element_ref'});
+
+ return "* $entry: ".$element->{'text'} . '.'."\n";
}
@@ -6747,17 +5983,7 @@
my $join = '';
my $nonalpha_text = '';
my $alpha_text = '';
- $join = " \n<br>\n" if (@$nonalpha and @$alpha);
- if (@$nonalpha)
- {
- $nonalpha_text = join("\n \n", @$nonalpha) . "\n";
- }
- if (@$alpha)
- {
- $alpha_text = join("\n \n", @$alpha) . "\n \n";
- }
- return "<table><tr><th valign=\"top\">" . &$I('Jump to') .":
</th><td>" .
- $nonalpha_text . $join . $alpha_text . "</td></tr></table>\n";
+ return '';
}
# return the heading with number texinfo text
@@ -6793,14 +6019,14 @@
my $command = shift;
my $line = shift;
- return &$anchor($id) . "\n";
+ return &$anchor($id);
}
sub t2h_default_misc_element_label($$)
{
my $id = shift;
my $misc_page_name = shift;
- return &$anchor($id) . "\n";
+ return &$anchor($id);
}
sub t2h_default_anchor_label($$$)
@@ -6827,10 +6053,6 @@
my $line = shift;
my $line_nr = shift;
- if (defined($commands_stack) and @$commands_stack and $commands_stack->[-1]
eq 'multitable' and @t2h_default_multitable_stack)
- {
- $t2h_default_multitable_stack[-1]->[1] = -1;
- }
return undef;
}
@@ -6853,9 +6075,7 @@
}
$arg_text = "<${style}$attribute_text>$arg_text</$style>";
}
- $arg_text .= "<br>" if ($command eq 'author');
$arg_text .= "\n";
- $arg_text .= "$DEFAULT_RULE\n" if ($command eq 'title');
return $arg_text;
}
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- texi2html.pl 22 May 2009 18:50:28 -0000 1.288
+++ texi2html.pl 23 May 2009 17:09:38 -0000 1.289
@@ -86,7 +86,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.288 2009/05/22 18:50:28 pertusus Exp $
+# $Id: texi2html.pl,v 1.289 2009/05/23 17:09:38 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -207,7 +207,6 @@
if ($command_format{$my_command_name})
{
- #$DEFAULT_OUTPUT_FORMAT = $command_format{$my_command_name};
$default_output_format = $command_format{$my_command_name};
}
@@ -692,13 +691,13 @@
# things coded by Olaf -- Pat).
#
-$toc_body = \&T2H_GPL_toc_body;
+#$toc_body = \&T2H_GPL_toc_body;
$style = \&T2H_GPL_style;
$format = \&T2H_GPL_format;
$printindex = \&t2h_GPL_default_printindex;
$summary_letter = \&t2h_default_summary_letter;
-sub T2H_GPL_toc_body($)
+sub HTML_DEFAULT_toc_body($)
{
my $elements_list = shift;
return unless (Texi2HTML::Config::get_conf('contents') or
@@ -1356,6 +1355,7 @@
require "$T2H_HOME/formats/xml.init"
if ($0 =~ /\.pl$/ &&
-e "$T2H_HOME/formats/xml.init" && -r "$T2H_HOME/formats/xml.init");
+
my $translation_file = 'translations.pl'; # file containing all the
translations
my $T2H_OBSOLETE_STRINGS;
@@ -1369,60 +1369,6 @@
if ($0 =~ /\.pl$/ &&
-e "$T2H_HOME/$translation_file" && -r "$T2H_HOME/$translation_file");
-#
-# Some functions used to override normal formatting functions in specific
-# cases. The user shouldn't want to change them, but can use them.
-#
-
-# used to utf8 encode the result
-sub t2h_utf8_accent($$$)
-{
- my $accent = shift;
- my $args = shift;
- my $style_stack = shift;
-
- my $text = $args->[0];
- #print STDERR "$accent\[".scalar(@$style_stack) ."\] (@$style_stack)\n";
-
- # special handling of @dotless{i}
- if ($accent eq 'dotless')
- {
- if (($text eq 'i') and (!defined($style_stack->[-1]) or
(!defined($unicode_accents{$style_stack->[-1]})) or ($style_stack->[-1] eq
'tieaccent')))
- {
- return "\x{0131}";
- }
- #return "\x{}" if ($text eq 'j'); # not found !
- return $text;
- }
-
- # FIXME \x{0131}\x{0308} for @dotless{i} @" doesn't lead to NFC 00ef.
- return Unicode::Normalize::NFC($text .
chr(hex($unicode_diacritical{$accent})))
- if (defined($unicode_diacritical{$accent}));
- return ascii_accents($text, $accent);
-}
-
-sub t2h_utf8_normal_text($$$$$$;$)
-{
- my $text = shift;
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- $text = &$protect_text($text) unless($in_raw_text);
- $text = uc($text) if (in_small_caps($style_stack));
-
- if (!$in_code and !$in_preformatted)
- {
- $text =~ s/---/\x{2014}/g;
- $text =~ s/--/\x{2013}/g;
- $text =~ s/``/\x{201C}/g;
- $text =~ s/''/\x{201D}/g;
- }
- return Unicode::Normalize::NFC($text);
-}
# these are unlikely to be used by users, as they are essentially
# used to follow the html external refs specification in texinfo
@@ -1615,11 +1561,12 @@
# This way, you can directly run texi2html.pl, if $T2H_HOME/T2h_i18n.pm
# exists.
+{
# @T2H_I18N@
require "$T2H_HOME/T2h_i18n.pm"
if ($0 =~ /\.pl$/ &&
-e "$T2H_HOME/T2h_i18n.pm" && -r "$T2H_HOME/T2h_i18n.pm");
-
+}
#########################################################################
#
@@ -1655,7 +1602,7 @@
my $CHILDLINE;
my $DEBUG;
my $DESTDIR;
-my $DVIPS;
+my $DVIPS = 'dvips';
my $ERROR;
my $EXTERNAL_FILE;
my $EXTERNAL_IMAGES;
@@ -2851,12 +2798,25 @@
foreach my $output_format (keys(%output_format_names))
{
- next if ($output_format eq $default_output_format);
+ next if (defined($default_output_format) and $output_format eq
$default_output_format);
+ my $text_default_output_format = 'raw text';
+ $text_default_output_format = $output_format_names{$default_output_format}
if (defined($default_output_format) and
defined($output_format_names{$default_output_format}));
$T2H_OPTIONS -> {$output_format} =
{
type => '',
linkage => sub {Texi2HTML::Config::t2h_default_load_format($_[0]);},
- verbose => "output $output_format_names{$output_format} rather than
$output_format_names{$default_output_format}.",
+ verbose => "output $output_format_names{$output_format} rather than
$text_default_output_format.",
+ }
+}
+
+if (defined($default_output_format))
+{
+ $T2H_OPTIONS -> {$default_output_format} =
+ {
+ type => '',
+ linkage => sub {Texi2HTML::Config::t2h_default_load_format($_[0]);},
+ verbose => "output default format.",
+ noHelp => 2
}
}
@@ -7128,7 +7088,8 @@
'command' => $command,
'hidden' => $index_entry_hidden,
'region' => $region,
- 'line_nr' => $line_nr
+ 'line_nr' => $line_nr,
+ 'index_name' => $index_prefix_to_name{$prefix}
};
print STDERR "# enter address@hidden ${prefix}index($key) [$entry] with id
$id ($index_entry)\n"
@@ -10545,6 +10506,11 @@
my $index_heading_element = $entry->{'element'};
my $entry_heading_element = $index_heading_element;
my $real_index_element = $entry->{'real_element'};
+
+ if (!defined($entry->{'real_element'}))
+ {
+ print STDERR "BUG: entry->{'real_element'} not defined\n";
+ }
# we always use the associated element_ref, instead of the original
# element
$entry_heading_element = $entry_heading_element->{'element_ref'}
@@ -10556,8 +10522,17 @@
else
{
$real_index_element = $entry->{'real_element'}->{'element_ref'};
+ ########################### debug
+ if (!defined($real_index_element))
+ {
+ print STDERR "BUG: element_ref not defined, real_element
$entry->{'real_element'}\n";
+ foreach my $key (keys(%{$entry->{'real_element'}}))
+ {
+ print STDERR " -> $key: $entry->{'real_element'}->{$key}\n";
+ }
+ }
+ ########################### end debug
}
- print STDERR "BUG: element_ref not defined, real_element
$entry->{'real_element'} $entry->{'real_element'}->{'texi'}\n" if
(!defined($real_index_element));
my $origin_href = '';
print STDERR "BUG: entry->{'file'} not defined for `$entry->{'entry'}'\n"
@@ -10618,10 +10593,11 @@
return $text;
}
-sub index_entry_command_prefix($;$)
+sub index_entry_command_prefix($$$)
{
my $command = shift;
my $line = shift;
+ my $line_nr = shift;
if ($command =~ /^(v|f)table$/)
{
return $1;
@@ -10631,10 +10607,9 @@
my ($prefix, $entry, $argument) = get_deff_index($command, $line,
undef, 0);
return $prefix;
}
- else
- {
- return index_command_prefix($command);
- }
+ my $prefix = index_command_prefix($command);
+ echo_error("No prefix found for address@hidden $line",$line_nr) if
($prefix eq '');
+ return $prefix;
}
sub enter_table_index_entry($$$$)
@@ -12611,9 +12586,9 @@
#print STDERR "# Stacked $macro
(@{$state->{'command_stack'}})\n" if ($T2H_DEBUG);
}
# FIXME give line, and modify line?
- &$Texi2HTML::Config::begin_style_texi($macro, $state, $stack,
$real_style_command)
+ &$Texi2HTML::Config::begin_style_texi($macro, $state, $stack,
$real_style_command, $state->{'remove_texi'})
if (defined($Texi2HTML::Config::begin_style_texi)
- and !($state->{'keep_texi'} or $state->{'remove_texi'}));
+ and !($state->{'keep_texi'}));
next;
}
@@ -14438,12 +14413,16 @@
#Â error, putting an index entry in a snippet that can be expanded
#Â more than once and is not strictly associated with a node/section.
+ my $prefix = index_entry_command_prefix($command, $line, $line_nr);
+ my $index_name = undef;
+ $index_name = $index_prefix_to_name{$prefix} if ($prefix ne '');
#Â FIXME 'entry' could be @code{$entry_texi}
$entry = {
'command' => $command,
'texi' => $entry_texi,
'entry' => $entry_texi,
- 'prefix' => index_entry_command_prefix($command, $line)
+ 'prefix' => $prefix,
+ 'index_name' => $index_name,
};
}
# return '' if ($state->{'multiple_pass'} or $state->{'outside_document'});
@@ -14459,17 +14438,18 @@
echo_warn ("Waiting for index `$entry->{'texi'}', got `$entry_texi'",
$line_nr);
}
+ my $index_name = $index_prefix_to_name{$entry->{'prefix'}};
# =========== debug
my $id = 'no id';
$id = $entry->{'id'} if (defined($entry->{'id'}));
- print STDERR "(index $command) [$entry->{'entry'}] $entry->{'id'}\n"
+ print STDERR "(index($index_name) $command) [$entry->{'entry'}]
$entry->{'id'}\n"
if ($T2H_DEBUG & $DEBUG_INDEX);
# =========== end debug
#return (undef,'','') if ($state->{'region'});
my $formatted_entry = substitute_line($entry->{'entry'}, "address@hidden",
prepare_state_multiple_pass("${command}_index", $state),$entry->{'line_nr'});
my $formatted_entry_reference = substitute_line($entry->{'texi'},
"address@hidden", prepare_state_multiple_pass("${command}_index", $state));
return ($entry, $formatted_entry, &$Texi2HTML::Config::index_entry_label
($entry->{'id'}, $state->{'preformatted'}, $formatted_entry,
- $index_prefix_to_name{$entry->{'prefix'}},
+ $index_name,
$command, $entry->{'texi'}, $formatted_entry_reference, $entry));
}
Index: translations.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/translations.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- translations.pl 25 Apr 2009 14:54:42 -0000 1.26
+++ translations.pl 23 May 2009 17:09:39 -0000 1.27
@@ -1,5 +1,8 @@
$LANGUAGES->{'fr'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Les boutons de navigation ont la signification
suivante :',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' Dans cet exemple on est @`a @strong{ Sous sous
section un-deux-trois } dans un document dont la structure est :',
' Up ' => 'Plus haut',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} section `%{section}\' dans
@cite{%{book}}',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => 'A propos',
@@ -76,13 +81,17 @@
'Previous section on same level' => 'Section
address@hidden'address@hidden'edente au address@hidden niveau',
'Section' => '',
'Section One' => 'Section un',
+ 'See ' => '',
'See %{node_file_href}' => 'Voir %{node_file_href}',
'See %{node_file_href} @cite{%{book}}' => 'Voir
%{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Voir %{node_file_href} section `%{section}\' dans
@cite{%{book}}',
'See %{reference_name}' => 'Voir %{reference_name}',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => 'Voir @cite{%{book}}',
'See section %{reference_name}' => 'Voir la section
%{reference_name}',
'See section `%{section}\' in @cite{%{book}}' => 'Voir
la section `%{section}\' dans @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'septembre',
'Short Table of Contents' =>
'address@hidden'address@hidden'e du contenu',
'Short table of contents' =>
'address@hidden'address@hidden'e du contenu',
@@ -113,13 +122,18 @@
'current' => 'courante',
'on @emph{%{date}}' => 'le @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' => 'section
`%{section}\' dans @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => 'voir %{node_file_href}',
'see %{node_file_href} @cite{%{book}}' => 'voir
%{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'voir %{node_file_href} section `%{section}\' dans
@cite{%{book}}',
'see %{reference_name}' => 'voir %{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'voir @cite{%{book}}',
'see section %{reference_name}' => 'voir la section
%{reference_name}',
'see section `%{section}\' in @cite{%{book}}' => 'voir
la section `%{section}\' dans @cite{{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'inconnu'
};
@@ -178,7 +192,10 @@
$LANGUAGES->{'pt_BR'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Os address@hidden nos address@hidden'eis de
navega@,address@hidden possuem os seguintes significados:',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' onde o @strong{ Exemplo } assume que a
posi@,address@hidden atual localiza-se em @strong{ Subsub@,address@hidden
address@hidden } de um documento com a seguinte estrutura:',
' Up ' => ' Acima ',
'%{acronym_like} (%{explanation})' => '',
@@ -189,9 +206,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => 'Sobre',
@@ -255,13 +274,17 @@
'Previous section on same level' =>
'Se@,address@hidden anterior no mesmo address@hidden'ivel',
'Section' => 'Se@,address@hidden',
'Section One' => 'Se@,address@hidden Um',
+ 'See ' => '',
'See %{node_file_href}' => 'Veja %{node_file_href}',
'See %{node_file_href} @cite{%{book}}' => 'Veja
%{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'See %{reference_name}' => 'Veja %{reference_name}',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => 'Veja @cite{%{book}}',
'See section %{reference_name}' => 'Veja
se@,address@hidden %{reference_name}',
'See section `%{section}\' in @cite{%{book}}' =>
'Veja se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'Setembro',
'Short Table of Contents' => 'Breve
address@hidden'ario',
'Short table of contents' => 'Breve
address@hidden'ario',
@@ -292,13 +315,18 @@
'current' => 'atual',
'on @emph{%{date}}' => 'em @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' =>
'se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}'
=> '',
+ 'see ' => '',
'see %{node_file_href}' => 'veja %{node_file_href}',
'see %{node_file_href} @cite{%{book}}' => 'veja
%{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'see %{reference_name}' => 'veja %{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'veja @cite{%{book}}',
'see section %{reference_name}' => 'veja
se@,address@hidden %{reference_name}',
'see section `%{section}\' in @cite{%{book}}' =>
'veja se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'desconhecido'
};
@@ -332,7 +360,10 @@
$LANGUAGES->{'nl'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => '',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
' Up ' => '',
'%{acronym_like} (%{explanation})' => '',
@@ -343,9 +374,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => '',
@@ -409,13 +442,17 @@
'Previous section on same level' => '',
'Section' => '',
'Section One' => '',
+ 'See ' => '',
'See %{node_file_href}' => '',
'See %{node_file_href} @cite{%{book}}' => '',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'September',
'Short Table of Contents' => 'Korte inhoudsopgave',
'Short table of contents' => '',
@@ -446,13 +483,18 @@
'current' => '',
'on @emph{%{date}}' => '',
'section `%{section}\' in @cite{%{book}}' => '',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => '',
'see %{node_file_href} @cite{%{book}}' => '',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'see %{reference_name}' => '',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => '',
'see section %{reference_name}' => '',
'see section `%{section}\' in @cite{%{book}}' => '',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => ''
};
@@ -464,7 +506,10 @@
$LANGUAGES->{'ja'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' =>
'ããã²ã¼ã·ã§ã³ããã«ä¸ã®ãã¿ã³ã«ã¯ä»¥ä¸ã®æå³ãããã¾ãã',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '@address@hidden',
' Up ' => 'ä¸',
'%{acronym_like} (%{explanation})' => '',
@@ -475,9 +520,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => '',
@@ -541,13 +588,17 @@
'Previous section on same level' => '',
'Section' => 'é
',
'Section One' => '第1é
',
+ 'See ' => '',
'See %{node_file_href}' => '',
'See %{node_file_href} @cite{%{book}}' => '',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => '9æ',
'Short Table of Contents' => 'ç°¡ç¥åããç®æ¬¡',
'Short table of contents' => '',
@@ -578,13 +629,18 @@
'current' => 'ç¾å¨ä½ç½®',
'on @emph{%{date}}' => '@emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' =>
'@cite{%{book}}ã® `%{section}\' ',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => '%{node_file_href}åç
§',
'see %{node_file_href} @cite{%{book}}' =>
'%{node_file_href} @cite{%{book}}åç
§',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'see %{reference_name}' => '',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => '',
'see section %{reference_name}' => '',
'see section `%{section}\' in @cite{%{book}}' => '',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'ä¸æ'
};
@@ -615,7 +671,10 @@
$LANGUAGES->{'pt'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Os address@hidden nos address@hidden'eis de
navega@,address@hidden possuem os seguintes significados:',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' onde o @strong{ Exemplo } assume que a
posi@,address@hidden atual localiza-se em @strong{ Subsub@,address@hidden
address@hidden } de um documento com a seguinte estrutura:',
' Up ' => ' Acima ',
'%{acronym_like} (%{explanation})' => '',
@@ -626,9 +685,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => 'Sobre',
@@ -692,13 +753,17 @@
'Previous section on same level' => 'Se@,address@hidden
anterior no mesmo address@hidden'ivel',
'Section' => 'Se@,address@hidden',
'Section One' => 'Se@,address@hidden Um',
+ 'See ' => '',
'See %{node_file_href}' => 'Veja %{node_file_href}',
'See %{node_file_href} @cite{%{book}}' => 'Veja
%{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'See %{reference_name}' => 'Veja %{reference_name}',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => 'Veja @cite{%{book}}',
'See section %{reference_name}' => 'Veja
se@,address@hidden %{reference_name}',
'See section `%{section}\' in @cite{%{book}}' => 'Veja
se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'Setembro',
'Short Table of Contents' => 'Breve
address@hidden'ario',
'Short table of contents' => 'Breve
address@hidden'ario',
@@ -729,13 +794,18 @@
'current' => 'atual',
'on @emph{%{date}}' => 'em @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' =>
'se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => 'veja %{node_file_href}',
'see %{node_file_href} @cite{%{book}}' => 'veja
%{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'see %{reference_name}' => 'veja %{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'veja @cite{%{book}}',
'see section %{reference_name}' => 'veja
se@,address@hidden %{reference_name}',
'see section `%{section}\' in @cite{%{book}}' => 'veja
se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'desconhecido'
};
@@ -769,7 +839,10 @@
$LANGUAGES->{'de'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Die Links in der Navigationsleiste haben die folgende
Bedeutung: ',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' wobei das @strong{ Beispiel } annimmt, dass die
aktuelle Position bei @strong{ Unterabschnitt 1-2-3 } in einem Dokument mit
folgender Struktur liegt:',
' Up ' => ' Nach oben ',
'%{acronym_like} (%{explanation})' => '%{acronym_like}
(%{explanation})',
@@ -780,9 +853,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} in Abschnitt `%{section}\' in
@cite{%{book}}',
'%{reference_name}' => '%{reference_name}',
+ '%{ref}' => '',
'%{style} %{number}' => '%{style} %{number}',
'%{style}: %{caption_first_line}' => '%{style}:
%{caption_first_line}',
'%{style}: %{shortcaption_first_line}' => '%{style}:
%{shortcaption_first_line}',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '@b{%{quotation_arg}:} ',
'@cite{%{book}}' => '@cite{%{book}}',
'About' => '@"Uber',
@@ -846,13 +921,17 @@
'Previous section on same level' => 'Voriger Abschnitt
derselben Ebene',
'Section' => 'Abschnitt',
'Section One' => 'Abschnitt 1',
+ 'See ' => '',
'See %{node_file_href}' => 'Siehe %{node_file_href}',
'See %{node_file_href} @cite{%{book}}' => 'Siehe
%{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Siehe %{node_file_href} in Abschnitt `%{section}\' in
@cite{%{book}}',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => 'Siehe
Abschnitt `%{section}\' in @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'September',
'Short Table of Contents' => 'Kurzes
Inhaltsverzeichnis',
'Short table of contents' => 'Kurzes
Inhaltsverzeichnis',
@@ -883,13 +962,18 @@
'current' => '',
'on @emph{%{date}}' => 'am @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' => 'Abschnitt
`%{section}\' in @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => 'siehe %{node_file_href}',
'see %{node_file_href} @cite{%{book}}' => 'siehe
%{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'siehe %{node_file_href} im Abschnitt `%{section}\' in
@cite{%{book}}',
'see %{reference_name}' => 'siehe %{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'siehe @cite{%{book}}',
'see section %{reference_name}' => 'siehe Abschnitt
%{reference_name}',
'see section `%{section}\' in @cite{%{book}}' => 'siehe
Abschnitt `%{section}\' in @cite{%{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'unbekannt'
};
@@ -902,7 +986,10 @@
$LANGUAGES->{'en'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => '',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
' Up ' => '',
'%{acronym_like} (%{explanation})' => '',
@@ -913,9 +1000,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => '',
@@ -979,13 +1068,17 @@
'Previous section on same level' => '',
'Section' => '',
'Section One' => '',
+ 'See ' => '',
'See %{node_file_href}' => '',
'See %{node_file_href} @cite{%{book}}' => '',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => '',
'Short Table of Contents' => '',
'Short table of contents' => '',
@@ -1016,13 +1109,18 @@
'current' => '',
'on @emph{%{date}}' => '',
'section `%{section}\' in @cite{%{book}}' => '',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => '',
'see %{node_file_href} @cite{%{book}}' => '',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'see %{reference_name}' => '',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => '',
'see section %{reference_name}' => '',
'see section `%{section}\' in @cite{%{book}}' => '',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => ''
};
@@ -1030,7 +1128,10 @@
$LANGUAGES->{'es'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Los botones de los paneles de address@hidden'on
tienen el significado siguiente:',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' donde el @strong{ Ejemplo } supone que la
posición actual está en la @strong{ address@hidden'on uno-dos-tres } de un
documento de la estructura siguiente:',
' Up ' => ' Subir ',
'%{acronym_like} (%{explanation})' => '',
@@ -1041,9 +1142,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} address@hidden'on `%{section}\' en
@cite{%{book}}',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => 'Acerca de',
@@ -1107,13 +1210,17 @@
'Previous section on same level' => 'address@hidden'on
anterior en el mismo nivel',
'Section' => 'address@hidden'on',
'Section One' => 'address@hidden'on Uno',
+ 'See ' => '',
'See %{node_file_href}' => 'address@hidden'ease
%{node_file_href}',
'See %{node_file_href} @cite{%{book}}' =>
'address@hidden'ease %{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'address@hidden'ease %{node_file_href} address@hidden'on
`%{section}\' en @cite{%{book}}',
'See %{reference_name}' => 'address@hidden'ease
%{reference_name}',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => 'address@hidden'ease
@cite{%{book}}',
'See section %{reference_name}' => 'address@hidden'ease
la address@hidden'on %{reference_name}',
'See section `%{section}\' in @cite{%{book}}' =>
'address@hidden'ease la address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'septiembre',
'Short Table of Contents' => 'Resumen del Contenido',
'Short table of contents' => 'Resumen del contenido',
@@ -1144,13 +1251,18 @@
'current' => 'actual',
'on @emph{%{date}}' => 'el @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' =>
'address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => 'address@hidden'ease
%{node_file_href}',
'see %{node_file_href} @cite{%{book}}' =>
'address@hidden'ease %{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'address@hidden'ease %{node_file_href} address@hidden'on
`%{section}\' en @cite{%{book}}',
'see %{reference_name}' => 'address@hidden'ease
%{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'address@hidden'ease
@cite{%{book}}',
'see section %{reference_name}' => 'address@hidden'ease
la address@hidden'on %{reference_name}',
'see section `%{section}\' in @cite{%{book}}' =>
'address@hidden'ease la address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'desconocido'
};
@@ -1163,7 +1275,10 @@
$LANGUAGES->{'no'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => '',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
' Up ' => '',
'%{acronym_like} (%{explanation})' => '',
@@ -1174,9 +1289,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => '',
@@ -1240,13 +1357,17 @@
'Previous section on same level' => '',
'Section' => '',
'Section One' => '',
+ 'See ' => '',
'See %{node_file_href}' => '',
'See %{node_file_href} @cite{%{book}}' => '',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'september',
'Short Table of Contents' => 'Kort innholdsfortegnelse',
'Short table of contents' => '',
@@ -1277,13 +1398,18 @@
'current' => '',
'on @emph{%{date}}' => '',
'section `%{section}\' in @cite{%{book}}' => '',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => '',
'see %{node_file_href} @cite{%{book}}' => '',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'see %{reference_name}' => '',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => '',
'see section %{reference_name}' => '',
'see section `%{section}\' in @cite{%{book}}' => '',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => ''
};
Index: doc/stamp-vti
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/stamp-vti,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- doc/stamp-vti 17 May 2009 15:35:16 -0000 1.58
+++ doc/stamp-vti 23 May 2009 17:09:39 -0000 1.59
@@ -1,4 +1,4 @@
address@hidden UPDATED 17 May 2009
address@hidden UPDATED 23 May 2009
@set UPDATED-MONTH May 2009
@set EDITION 1.83
@set VERSION 1.83
Index: doc/texi2html.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.texi,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- doc/texi2html.texi 21 May 2009 20:15:57 -0000 1.88
+++ doc/texi2html.texi 23 May 2009 17:09:39 -0000 1.89
@@ -1985,12 +1985,12 @@
and short table of contents:
@vtable @code
address@hidden $DO_CONTENTS
address@hidden $CONTENTS
If the variable is true a table of contents is done even if there is no
@code{@@contents} command.
If it is defined and false, no table of contents
is done even if there is a @code{@@contents} command.
address@hidden $DO_SCONTENTS
address@hidden $SHORTCONTENTS
If the variable is true a short table of contents is done even if there is no
@code{@@summarycontents} command.
If it is defined and false, no short table of contents
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/version.texi,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- doc/version.texi 17 May 2009 15:35:16 -0000 1.58
+++ doc/version.texi 23 May 2009 17:09:39 -0000 1.59
@@ -1,4 +1,4 @@
address@hidden UPDATED 17 May 2009
address@hidden UPDATED 23 May 2009
@set UPDATED-MONTH May 2009
@set EDITION 1.83
@set VERSION 1.83
Index: formats/docbook.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/docbook.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- formats/docbook.init 22 May 2009 18:50:29 -0000 1.1
+++ formats/docbook.init 23 May 2009 17:09:39 -0000 1.2
@@ -39,8 +39,6 @@
sub docbook_default_load()
{
-html_default_load();
-
$EXTENSION = "xml";
$DOCTYPE = '<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; [
<!ENTITY tex "TeX">
@@ -279,6 +277,7 @@
#$caption_shortcaption = \&docbook_caption_shortcaption;
#$caption_shortcaption_command = \&docbook_caption_shortcaption_command;
$normal_text = \&docbook_normal_text;
+$protect_text = \&xml_default_protect_text;
#$paragraph_style_command = \&docbook_paragraph_style_command;
$raw = \&docbook_raw;
$cartouche = \&docbook_cartouche;
Index: formats/html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/html.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- formats/html.init 22 May 2009 18:50:29 -0000 1.1
+++ formats/html.init 23 May 2009 17:09:39 -0000 1.2
@@ -6,11 +6,13 @@
# A copy of this file is pasted into the beginning of texi2html by
# running './configure'.
#
-# $Id: html.init,v 1.1 2009/05/22 18:50:29 pertusus Exp $
+# $Id: html.init,v 1.2 2009/05/23 17:09:39 pertusus Exp $
use strict;
-if ($DEFAULT_OUTPUT_FORMAT eq 'html')
+sub html_default_load();
+
+if (defined($DEFAULT_OUTPUT_FORMAT) and $DEFAULT_OUTPUT_FORMAT eq 'html')
{
html_default_load();
}
@@ -345,59 +347,58 @@
$ICONS = 0;
-# insert here name of icon images for buttons
-# Icons are used, if $ICONS and resp. value are set
-%ACTIVE_ICONS =
- (
+%BUTTONS_ACCESSKEY =
+(
'Top', '',
'Contents', '',
'Overview', '',
'Index', '',
'This', '',
- 'Back', '',
+ 'Back', 'p',
'FastBack', '',
- 'Prev', '',
- 'Up', '',
- 'Next', '',
- 'NodeUp', '',
- 'NodeNext', '',
- 'NodePrev', '',
+ 'Prev', 'p',
+ 'Up', 'u',
+ 'Next', 'n',
+ 'NodeUp', 'u',
+ 'NodeNext', 'n',
+ 'NodePrev', 'p',
'Following', '',
- 'Forward', '',
+ 'Forward', 'n',
'FastForward', '',
'About' , '',
'First', '',
'Last', '',
'NextFile', '',
'PrevFile', '',
- ' ', '',
- );
+);
-# insert here name of icon images for these, if button is inactive
-%PASSIVE_ICONS =
- (
- 'Top', '',
- 'Contents', '',
+# see http://www.w3.org/TR/REC-html40/types.html#type-links
+%BUTTONS_REL =
+(
+ 'Top', 'start',
+ 'Contents', 'contents',
'Overview', '',
- 'Index', '',
+ 'Index', 'index',
'This', '',
- 'Back', '',
+ 'Back', 'previous',
'FastBack', '',
- 'Prev', '',
- 'Up', '',
- 'Next', '',
- 'NodeUp', '',
- 'NodeNext', '',
- 'NodePrev', '',
+ 'Prev', 'previous',
+ 'Up', 'up',
+ 'Next', 'next',
+ 'NodeUp', 'up',
+ 'NodeNext', 'next',
+ 'NodePrev', 'previous',
'Following', '',
- 'Forward', '',
+ 'Forward', 'next',
'FastForward', '',
- 'About', '',
+ 'About' , 'help',
'First', '',
'Last', '',
- 'NextFile', '',
- 'PrevFile', '',
- );
+ 'NextFile', 'next',
+ 'PrevFile', 'previous',
+);
+
+
# PRE_ABOUT can be a function reference or a scalar.
# Note that if it is a scalar, T2H_InitGlobals has not been called,
@@ -448,6 +449,7 @@
$BODYTEXT = undef;
$init_out = \&html_default_init_out;
+$translate_names = \&html_default_translate_names;
########################################################################
@@ -547,11 +549,9 @@
$about_body = \&HTML_DEFAULT_about_body;
$print_frame = \&HTML_DEFAULT_print_frame;
$print_toc_frame = \&HTML_DEFAULT_print_toc_frame;
-#$toc_body = \&HTML_DEFAULT_toc_body;
+$toc_body = \&HTML_DEFAULT_toc_body;
$titlepage = \&HTML_DEFAULT_titlepage;
-$css_lines = \&HTML_DEFAULT_css_lines;
$print_redirection_page = \&HTML_DEFAULT_print_redirection_page;
-$node_file_name = \&HTML_DEFAULT_node_file_name;
$inline_contents = \&HTML_DEFAULT_inline_contents;
########################################################################
@@ -673,28 +673,6 @@
$pre_map{'enddots'} = '...';
#$pre_map{'br'} = "\n";
-# symbols used for the commands if $USE_ISO is true.
-%iso_symbols = (
- 'equiv' => '≡',
- 'dots' => '…',
- 'bullet' => '•',
- 'result' => '⇒',
- 'expansion' => '→',
- 'arrow' => '→',
- 'point' => '∗',
- "'" => '’',
- '`' => '‘',
- );
-
-# on bug-texinfo verified that code_style shouldn't be used for anything
-# else than node.
-# anyway it doesn't make sense since the section name normally formatted
-# is used
-#%format_code_style = (
-# 'menu_name' => 1,
-# 'menu_description' => 1
-#);
-
# default is {'args' => ['normal'], 'attribute' => ''},
my %style_map_html = (
'b', {'attribute' => 'b'},
@@ -758,6 +736,7 @@
{
$style_map{$accent_command} = { 'function' => \&html_default_accent };
$style_map_texi{$accent_command} = { 'function' =>
\&t2h_default_ascii_accent };
+ $style_map_pre{$accent_command} = { 'function' => \&html_default_accent };
}
$style_map_pre{'sc'} = {};
@@ -912,9 +891,6 @@
$menu_command = \&html_default_menu_command;
$menu_link = \&html_default_menu_link;
$menu_description = \&html_default_menu_description;
-$external_ref = \&html_default_external_ref;
-$external_href = \&html_default_external_href;
-$internal_ref = \&html_default_internal_ref;
$table_item = \&html_default_table_item;
$table_line = \&html_default_table_line;
$table_list = \&html_default_table_list;
@@ -940,13 +916,10 @@
$index_letter = \&html_default_index_letter;
#$printindex = \&html_default_printindex;
$print_index = \&html_default_print_index;
-$protect_text = \&html_default_protect_text;
$normal_text = \&html_default_normal_text;
$complex_format = \&html_default_complex_format;
$cartouche = \&html_default_cartouche;
$sp = \&html_default_sp;
-$copying_comment = \&html_default_copying_comment;
-$documentdescription = \&html_default_documentdescription;
$empty_line = \&html_default_empty_line;
$caption_shortcaption = \&html_default_caption_shortcaption;
$caption_shortcaption_command = \&html_default_caption_shortcaption_command;
@@ -967,6 +940,7 @@
$insertcopying = \&html_default_insertcopying;
$line_command = \&html_default_line_command;
+$protect_text = \&xml_default_protect_text;
}
my @html_default_multitable_stack;
@@ -994,6 +968,38 @@
}
}
+sub html_default_translate_names()
+{
+ t2h_default_translate_names();
+
+ %NAVIGATION_TEXT =
+ (
+ 'Top', &$I('Top'),
+ 'Contents', &$I('Contents'),
+ 'Overview', &$I('Overview'),
+ 'Index', &$I('Index'),
+ ' ', ' ',
+ 'This', &$I('current'),
+ 'Back', ' < ',
+ 'FastBack', ' << ',
+ 'Prev', &$I('Prev'),
+ 'Up', &$I(' Up '),
+ 'Next', &$I('Next'),
+ 'NodeUp', &$I('Node up'),
+ 'NodeNext', &$I('Next node'),
+ 'NodePrev', &$I('Previous node'),
+ 'Following', &$I('Following node'),
+ 'Forward', ' > ',
+ 'FastForward', ' >> ',
+ 'About', ' ? ',
+ 'First', ' |< ',
+ 'Last', ' >| ',
+ 'NextFile', &$I('Next file'),
+ 'PrevFile', &$I('Previous file'),
+ );
+
+}
+
########################################################################
# Page formatting functions
#
@@ -1568,41 +1574,6 @@
print $fh "</body></html>\n";
}
-# This subroutine is intended to fill @Texi2HTML::TOC_LINES and
-# @Texi2HTML::OVERVIEW with the table of contents and short table of
-# contents.
-#
-# arguments:
-# ref on an array containing all the elements
-
-# each element is a reference on a hash. The following keys might be of
-# use:
-# 'top': true if this is the top element
-# 'toc_level': level of the element in the table of content. Highest level
-# is 1 for the @top element and for chapters, appendix and so on,
-# 2 for section, unnumberedsec and so on...
-# 'tocid': label used for reference linking to the element in table of
-# contents
-# 'file': the file containing the element, usefull to do href to that file
-# in case the document is split.
-# 'text': text of the element, with section number
-# 'text_nonumber': text of the element, without section number
-
-# Relevant configuration variables are:
-# $NUMBER_SECTIONS
-# $NO_BULLET_LIST_ATTRIBUTE: usefull in case a list is used
-# $FRAMES: @Texi2HTML::OVERVIEW is used in one of the frames.
-# $BEFORE_OVERVIEW
-# $AFTER_OVERVIEW
-# $BEFORE_TOC_LINES
-# $AFTER_TOC_LINES
-# $CONTENTS
-# $SHORTCONTENTS
-
-sub HTML_DEFAULT_toc_body($)
-{
-}
-
sub HTML_DEFAULT_inline_contents($$$)
{
my $fh = shift;
@@ -1633,33 +1604,6 @@
return $result;
}
-sub HTML_DEFAULT_css_lines ($$)
-{
- my $import_lines = shift;
- my $rule_lines = shift;
-# return if (defined($CSS_LINES) or (address@hidden and address@hidden and
(! keys(%css_map))));
- if (defined($CSS_LINES))
- { # if predefined, use CSS_LINES.
- $Texi2HTML::THISDOC{'CSS_LINES'} = $CSS_LINES;
- return;
- }
- return if (address@hidden and address@hidden and (! keys(%css_map)));
- my $css_lines = "<style type=\"text/css\">\n<!--\n";
- $css_lines .= join('',@$import_lines) . "\n" if (@$import_lines);
- foreach my $css_rule (sort(keys(%css_map)))
- {
- next unless ($css_map{$css_rule});
- $css_lines .= "$css_rule {$css_map{$css_rule}}\n";
- }
- $css_lines .= join('',@$rule_lines) . "\n" if (@$rule_lines);
- $css_lines .= "-->\n</style>\n";
- foreach my $ref (@CSS_REFS)
- {
- $css_lines .= "<link rel=\"stylesheet\" type=\"text/css\"
href=\"$ref\">\n";
- }
- $Texi2HTML::THISDOC{'CSS_LINES'} = $css_lines;
-}
-
######################################################################
# About page
#
@@ -1836,40 +1780,6 @@
EOT
}
-sub HTML_DEFAULT_node_file_name($$)
-{
- my $node = shift;
- my $type = shift;
- return undef if ($node->{'external_node'}
- or ($type eq 'top' and !$NEW_CROSSREF_STYLE));
- my $node_file_base;
- if ($type eq 'top' and defined($TOP_NODE_FILE))
- {
- $node_file_base = $TOP_NODE_FILE;
- }
- elsif ($NEW_CROSSREF_STYLE)
- {
- if ($TRANSLITERATE_NODE)
- {
- $node_file_base = $node->{'cross_manual_file'};
- }
- else
- {
- $node_file_base = $node->{'cross_manual_target'};
- }
- }
- else
- {
- $node_file_base = main::remove_texi($node->{'texi'});
- $node_file_base =~ s/[^\w\.\-]/-/g;
- }
- if (defined($NODE_FILE_EXTENSION) and $NODE_FILE_EXTENSION ne '')
- {
- return ($node_file_base . ".$NODE_FILE_EXTENSION");
- }
- return $node_file_base;
-}
-
sub html_default_accent($$)
{
my $accent = shift;
@@ -2198,21 +2108,6 @@
return $text;
}
-# This function is used to protect characters which are special in html
-# in inline text: &, ", <, and >.
-#
-# argument:
-# text to be protected
-sub html_default_protect_text($)
-{
- my $text = shift;
- $text =~ s/&/&/g;
- $text =~ s/</</g;
- $text =~ s/>/>/g;
- $text =~ s/\"/"/g;
- return $text;
-}
-
sub html_default_normal_text($$$$$$;$)
{
my $text = shift;
@@ -2476,305 +2371,6 @@
return "<td align=\"left\" valign=\"top\">$text</td></tr>\n";
}
-# Construct a href to an external source of information.
-# node is the node with texinfo @-commands
-# node_id is the node transliterated and transformed as explained in the
-# texinfo manual
-# node_xhtml_id is the node transformed such that it is unique and can
-# be used to make an html cross ref as explained in the texinfo manual
-# file is the file in '(file)node'
-sub html_default_external_href($$$)
-{
- my $node = shift;
- my $node_id = shift;
- my $node_xhtml_id = shift;
- my $file = shift;
- $file = '' if (!defined($file));
- my $default_target_split = $Texi2HTML::THISDOC{'EXTERNAL_CROSSREF_SPLIT'};
- my $target_split;
- my $target_mono;
- my $href_split;
- my $href_mono;
- if ($file ne '')
- {
- if ($NEW_CROSSREF_STYLE)
- {
- $file =~ s/\.[^\.]*$//;
- $file =~ s/^.*\///;
- my $href;
- if (exists($Texi2HTML::THISDOC{'htmlxref'}->{$file}))
- {
- if
(exists($Texi2HTML::THISDOC{'htmlxref'}->{$file}->{'split'}))
- {
- $target_split = 1;
- $href_split =
$Texi2HTML::THISDOC{'htmlxref'}->{$file}->{'split'}->{'href'};
- }
- if
(exists($Texi2HTML::THISDOC{'htmlxref'}->{$file}->{'mono'}))
- {
- $target_mono = 1;
- $href_mono =
$Texi2HTML::THISDOC{'htmlxref'}->{$file}->{'mono'}->{'href'};
- }
- }
-
- if ((not $target_mono) and (not $target_split))
- { # nothing specified for that manual, use default
- $target_split = $default_target_split;
- }
- elsif ($target_split and $target_mono)
- { # depends on the splitting of the manual
- $target_split = get_conf('SPLIT');
- }
- elsif ($target_mono)
- { # only mono specified
- $target_split = 0;
- }
-
- if ($target_split)
- {
- if (defined($href_split))
- {
- $file = "$href_split";
- }
- elsif (defined($EXTERNAL_DIR))
- {
- $file = "$EXTERNAL_DIR/$file";
- }
- elsif (get_conf('SPLIT'))
- {
- $file = "../$file";
- }
- $file .= "/";
- }
- else
- {# target not split
- if (defined($href_mono))
- {
- $file = "$href_mono";
- }
- else
- {
- if (defined($EXTERNAL_DIR))
- {
- $file = "$EXTERNAL_DIR/$file";
- }
- elsif (get_conf('SPLIT'))
- {
- $file = "../$file";
- }
- $file .= "." . $NODE_FILE_EXTENSION;
- }
- }
- }
- else
- {
- $file .= "/";
- if (defined($EXTERNAL_DIR))
- {
- $file = $EXTERNAL_DIR . $file;
- }
- else
- {
- $file = '../' . $file;
- }
- }
- }
- else
- {
- $target_split = $default_target_split;
- }
- if ($node eq '')
- {
- if ($NEW_CROSSREF_STYLE)
- {
- if ($target_split)
- {
- return $file . $TOP_NODE_FILE . '.' . $NODE_FILE_EXTENSION .
'#Top';
- # or ?
- #return $file . '#Top';
- }
- else
- {
- return $file . '#Top';
- }
- }
- else
- {
- return $file;
- }
- }
- my $target;
- if ($NEW_CROSSREF_STYLE)
- {
- $node = $node_id;
- $target = $node_xhtml_id;
- }
- else
- {
- $node = main::remove_texi($node);
- $node =~ s/[^\w\.\-]/-/g;
- }
- my $file_basename = $node;
- $file_basename = $TOP_NODE_FILE if ($node =~ /^top$/i);
- if ($NEW_CROSSREF_STYLE)
- {
- if ($target_split)
- {
- return $file . $file_basename . ".$NODE_FILE_EXTENSION" . '#' .
$target;
- }
- else
- {
- return $file . '#' . $target;
- }
- }
- else
- {
- return $file . $file_basename . ".$NODE_FILE_EXTENSION";
- }
-}
-
-# format a reference external to the generated manual. This produces a full
-# reference with introductive words and the reference itself.
-#
-# arguments:
-# type of the reference: xref (reference at the beginning of a sentence),
-# pxref (reference in a parenthesis),
-# section in the book. This might be undef.
-# book name.
-# node and file name formatted according to the convention used in info
-# '(file)node' and no node means the Top node.
-# href linking to the html page containing the referenced node. A typical
-# use for this href is a href attribute in an <a> element
-# an optionnal cross reference name
-sub html_default_external_ref($$$$$$$$)
-{
- my $type = shift;
- my $section = shift;
- my $book = shift;
- my $file_node = shift;
- my $href = shift;
- my $cross_ref = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
-
- $file_node = "$cross_ref: $file_node" if (($file_node ne '') and
($cross_ref ne ''));
- $file_node = &$anchor('', $href, $file_node) if ($file_node ne '');
-
- # Yes, this is ugly, but this helps internationalization
- if ($type eq 'pxref')
- {
- if (($book ne '') and ($file_node ne ''))
- {
- return &$I('see %{node_file_href} section `%{section}\' in
@cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book, 'section'
=> $section },{'duplicate'=>1}) if ($section ne '');
- return &$I('see %{node_file_href} @cite{%{book}}', {
'node_file_href' => $file_node, 'book' => $book },{'duplicate'=>1});
- }
- elsif ($book ne '')
- {
- return &$I('see section `%{section}\' in @cite{%{book}}', {
'book' => $book, 'section' => $section },{'duplicate'=>1}) if ($section ne '');
- return &$I('see @cite{%{book}}', { 'book' => $book
},{'duplicate'=>1});
- }
- elsif ($file_node ne '')
- {
- return &$I('see %{node_file_href}', { 'node_file_href' =>
$file_node },{'duplicate'=>1});
- }
- }
- if ($type eq 'xref' or $type eq 'inforef')
- {
- if (($book ne '') and ($file_node ne ''))
- {
- return &$I('See %{node_file_href} section `%{section}\' in
@cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book, 'section'
=> $section },{'duplicate'=>1}) if ($section ne '');
- return &$I('See %{node_file_href} @cite{%{book}}', {
'node_file_href' => $file_node, 'book' => $book },{'duplicate'=>1});
- }
- elsif ($book ne '')
- {
- return &$I('See section `%{section}\' in @cite{%{book}}', {
'book' => $book, 'section' => $section },{'duplicate'=>1}) if ($section ne '');
- return &$I('See @cite{%{book}}', { 'book' => $book
},{'duplicate'=>1});
- }
- elsif ($file_node ne '')
- {
- return &$I('See %{node_file_href}', { 'node_file_href' =>
$file_node },{'duplicate'=>1});
- }
- }
- if ($type eq 'ref')
- {
- if (($book ne '') and ($file_node ne ''))
- {
- return &$I('%{node_file_href} section `%{section}\' in
@cite{%{book}}', { 'node_file_href' => $file_node, 'book' => $book, 'section'
=> $section },{'duplicate'=>1}) if ($section ne '');
- return &$I('%{node_file_href} @cite{%{book}}', {
'node_file_href' => $file_node, 'book' => $book },{'duplicate'=>1});
- }
- elsif ($book ne '')
- {
- return &$I('section `%{section}\' in @cite{%{book}}', { 'book'
=> $book, 'section' => $section },{'duplicate'=>1}) if ($section ne '');
- return &$I('@cite{%{book}}', { 'book' => $book
},{'duplicate'=>1});
- }
- elsif ($file_node ne '')
- {
- return &$I('%{node_file_href}', { 'node_file_href' => $file_node
},{'duplicate'=>1});
- }
- }
- return '';
-}
-
-# format a reference to a node or a section in the generated manual. This
-# produces a full reference with introductive words and the reference itself.
-#
-# arguments:
-# type of the reference: xref (reference at the beginning of a sentence),
-# pxref (reference in a parenthesis),
-# href linking to the html page containing the node or the section. A typical
-# use for this href is a href attribute in an <a> element
-# short name for this reference
-# name for this reference
-# boolean true if the reference is a reference to a section
-#
-# $SHORT_REF should be used.
-sub html_default_internal_ref($$$$$$$$)
-{
- my $type = shift;
- my $href = shift;
- my $short_name = shift;
- my $name = shift;
- my $is_section = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
- my $element = shift;
-
- if (! $SHORT_REF)
- {
- $name = &$anchor('', $href, $name);
- if ($type eq 'pxref')
- {
- return &$I('see section %{reference_name}', { 'reference_name' =>
$name },{'duplicate'=>1}) if ($is_section);
- return &$I('see %{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- elsif ($type eq 'xref' or $type eq 'inforef')
- {
- return &$I('See section %{reference_name}', { 'reference_name' =>
$name },{'duplicate'=>1}) if ($is_section);
- return &$I('See %{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- elsif ($type eq 'ref')
- {
- return &$I('%{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- }
- else
- {
- $name = &$anchor('', $href, $short_name);
- if ($type eq 'pxref')
- {
- return &$I('see %{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- elsif ($type eq 'xref' or $type eq 'inforef')
- {
- return &$I('See %{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- elsif ($type eq 'ref')
- {
- return &$I('%{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- }
- return '';
-}
-
sub html_teletyped_in_stack($)
{
my $stack = shift;
@@ -3652,50 +3248,6 @@
}
-sub html_default_copying_comment($$$$)
-{
- my $copying_lines = shift;
- my $copying_text = shift;
- my $copying_no_texi = shift;
- my $copying_simple_text = shift;
- return '' if ($copying_no_texi eq '');
- my $text = &$comment($copying_no_texi);
- return $text;
-}
-
-# return value is currently ignored
-sub html_default_documentdescription($$$$)
-{
- my $decription_lines = shift;
- my $description_text = shift;
- my $description_no_texi = shift;
- my $description_simple_text = shift;
-
- if (defined($DOCUMENT_DESCRIPTION))
- {
- $Texi2HTML::THISDOC{'DOCUMENT_DESCRIPTION'} = $DOCUMENT_DESCRIPTION;
- return $DOCUMENT_DESCRIPTION;
- }
-
- #return '' if ($description_no_texi eq '');
- #my @documentdescription = split (/\n/, $description_no_texi);
- if ($description_simple_text eq '')
- {
- $Texi2HTML::THISDOC{'DOCUMENT_DESCRIPTION'} = undef;
- return undef;
- }
- my @documentdescription = split (/\n/, $description_simple_text);
- my $document_description = shift @documentdescription;
- chomp $document_description;
- foreach my $line (@documentdescription)
- {
- chomp $line;
- $document_description .= ' ' . $line;
- }
- $Texi2HTML::THISDOC{'DOCUMENT_DESCRIPTION'} = $document_description;
- return $document_description;
-}
-
# format an index summary. This is a list of letters linking to the letter
# entries.
#
Index: formats/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/info.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- formats/info.init 22 May 2009 18:50:30 -0000 1.1
+++ formats/info.init 23 May 2009 17:09:39 -0000 1.2
@@ -29,7 +29,7 @@
sub info_default_load();
-if ($DEFAULT_OUTPUT_FORMAT eq 'info')
+if (defined($DEFAULT_OUTPUT_FORMAT) and $DEFAULT_OUTPUT_FORMAT eq 'info')
{
info_default_load();
}
@@ -47,7 +47,6 @@
my $info_default_after_punctuation_characters;
my $info_default_indent_length;
my %info_default_indent_format_length;
-my %default_info_level_to_symbol;
my $info_default_index_length_to_node;
my $info_default_listoffloat_caption_entry_length;
my $info_default_listoffloat_append;
@@ -215,14 +214,6 @@
'ftable' => 0,
);
-%default_info_level_to_symbol = (
- 0 => '*',
- 1 => '*',
- 2 => '=',
- 3 => '-',
- 4 => '.'
-);
-
$info_default_index_length_to_node = 41;
$info_default_listoffloat_caption_entry_length = 41;
@@ -405,8 +396,6 @@
return $result;
}
return info_default_store_text($state,$result,'accents_commands');
-# return '' if info_default_store_text($state,$result,'accents_commands');
-# return $result;
}
sub info_default_noop
@@ -452,10 +441,9 @@
my $last_line = $lines[-1];
my $indented_text = shift (@lines);
-print STDERR "COUNT info_default_count_lines(i_done $no_indentation, i_l
$indent_length) i_t `$indented_text'\n";
+ #print STDERR "COUNT info_default_count_lines(i_done $no_indentation,
i_l $indent_length) i_t `$indented_text'\n";
foreach my $line (@lines)
{
-print STDERR "ZZZZZZZZZZZZZzz `$line'\n";
if ($indent_length and $line =~ /\S/)
{
$indented_text .= ' ' x $indent_length . $line;
@@ -478,7 +466,7 @@
my $state = shift;
if (!exists $info_default_state_map{$state})
{
-print STDERR "NEW state $info_default_state_nr\n";
+ #print STDERR "NEW state $info_default_state_nr\n";
my ($current_command, $top_stack);
$info_default_state_map{$state} = {};
info_default_reset_state($info_default_state_map{$state});
@@ -491,13 +479,14 @@
#Â most cases, when a node is seen, but may still be useful in
address@hidden, for example
$info_default_state_map{$state}->{'line_count'} = 1;
+ $info_default_state_map{$state}->{'offset_in_file'} = 0;
$info_default_state_map{$state}->{'nr'} = $info_default_state_nr;
$info_default_state_map{$state}->{'state'} = $state;
$info_default_state_map{$state}->{'multitable_stack'} = [];
@{$info_default_state_map{$state}->{'align_stack'}} =
({'command'=>'normal'});
$info_default_state_nr++;
}
-print STDERR "RETURN state $state $info_default_state_map{$state}
$info_default_state_map{$state}->{'nr'}\n";
+ #print STDERR "RETURN state $state $info_default_state_map{$state}
$info_default_state_map{$state}->{'nr'}\n";
return $info_default_state_map{$state};
}
@@ -513,7 +502,7 @@
my $current_command = shift;
my $command_index = shift;
my $command_close = shift;
-print STDERR "NNNNNNNNNNNNNN iterator_next current $current_command idx
$command_index close $command_close\n";
+ #print STDERR "NNNNNNNNNNNNNN iterator_next current $current_command idx
$command_index close $command_close\n";
my $sub_command = $current_command->{'content'}->[$command_index];
@@ -590,15 +579,13 @@
my $max_column = shift;
# indentation for the lines except for the first one
my $indent_length_next = shift;
-
- $indent_length_next = $indent_length if (!defined($indent_length_next));
-
$indent_length = 0 if (!defined($indent_length));
+ $indent_length_next = $indent_length if (!defined($indent_length_next));
my $line_passed = 0;
my $result = '';
-print STDERR "process_text(indent($indent_length), in_para $in_para spaces
`$pending_spaces') line_char_counter $line_char_counter `$text'\n";
+ #print STDERR "process_text(indent($indent_length), in_para $in_para spaces
`$pending_spaces') line_char_counter $line_char_counter `$text'\n";
if (!$in_para)
{ #Â should never be in preformatted, but in string processing
my $chomped_text = $text;
@@ -618,10 +605,9 @@
while ($text ne '')
{
- my $pending_word_text = 'UNDEF';
-$pending_word_text = $pending_word if (defined($pending_word));
-
-#print STDERR "l_c_c $line_char_counter pending_word $pending_word_text,
pending_spaces `$pending_spaces', result `$result'\n";
+ #my $pending_word_text = 'UNDEF';
+ #$pending_word_text = $pending_word if (defined($pending_word));
+ #print STDERR "l_c_c $line_char_counter pending_word
$pending_word_text, pending_spaces `$pending_spaces', result `$result'\n";
if ($text =~ s/^(\s+)//)
{
my $new_spaces = $1;
@@ -633,7 +619,7 @@
{
$new_spaces = pop @lines;
$eol_spaces = join ("", @lines);
-print STDERR "EOL_SPACES[$line_char_counter](+$pending_spaces)
`$eol_spaces'\n";
+ #print STDERR "EOL_SPACES[$line_char_counter](+$pending_spaces)
`$eol_spaces'\n";
}
if (defined($pending_word))
{
@@ -696,7 +682,7 @@
my $index = shift;
my $close = shift;
- print STDERR "SKIP_SPACES\n";
+ #print STDERR "SKIP_SPACES\n";
while(1)
{
my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
@@ -705,7 +691,7 @@
if (defined($content->{'begin'}))
{
$content->{'begin'} =~ s/^\s*//;
-print STDERR "SKIP_SPACES begin\n";
+ #print STDERR "SKIP_SPACES begin\n";
return if ($content->{'begin'} ne '');
}
if (defined($content->{'content'}) or
defined($content->{'format_name'})
@@ -713,18 +699,18 @@
{ #Â non empty commands stop space skipping, even if they contain
# only spaces, like @asis{ }
#Â also for item(x) that have format_name defined
-print STDERR "SKIP_SPACES command?\n";
+ #print STDERR "SKIP_SPACES command?\n";
return;
}
if (defined($content->{'text'}))
{
-print STDERR "SKIP_SPACES text\n";
+ #print STDERR "SKIP_SPACES text\n";
$content->{'text'} =~ s/^\s*//;
return if ($content->{'text'} ne '');
}
if (defined($content->{'end'}))
{
-print STDERR "SKIP_SPACES end\n";
+ #print STDERR "SKIP_SPACES end\n";
$content->{'end'} =~ s/^\s*//;
return if ($content->{'end'} ne '');
}
@@ -745,7 +731,7 @@
my $pending_word_text = 'undef';
$pending_word_text = $pending_word if (defined($pending_word));
- print STDERR "store_pending(spaces `$pending_spaces',
indent($indent_length) `$indent_text' word `$pending_word_text'\n";
+ #print STDERR "store_pending(spaces `$pending_spaces',
indent($indent_length) `$indent_text' word `$pending_word_text'\n";
my $result = $pending_spaces;
$pending_spaces = '';
if (defined($pending_word))
@@ -769,8 +755,8 @@
{
my $info_state = shift;
my $result = '';
- print STDERR "Storing the stack\n";
- #print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]);
+ #print STDERR "Storing the stack\n";
+ print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]) if ($DEBUG);
my ($characters_count, $lines_count);
($characters_count, $result, $lines_count) =
info_default_process_content($info_state->{'top'}, $info_state);
$info_state->{'offset_in_file'} += $characters_count;
@@ -819,6 +805,8 @@
my $text_added = '';
my $item_line_added = 0;
my $indentation_done = 0;
+ if ($DEBUG)
+ {
my $text_item_pending = '';
$text_item_pending = $item_pending if (defined($item_pending));
my $text_length = '';
@@ -827,11 +815,10 @@
$text_command = $content->{'command'} if defined($content->{'command'});
my $in_node_count = 0;
$in_node_count = $info_state->{'line_count'} if
defined($info_state->{'line_count'});
- print STDERR
"($text_command|$text_length|$close|${all_line_passed}+$in_node_count|l_c_cnt
$line_char_counter) prfrmted $preformatted para $in_para indent_lvl
$indent_level in_exdent $in_exdent only_spaces $info_state->{'only_spaces'}
blank_line $info_state->{'blank_line'} table_item_line $table_item_line
in_table_item $in_table_item item_pending $text_item_pending\n";
my $pending_word_text = 'undef';
$pending_word_text = "`$pending_word'" if (defined($pending_word));
- print STDERR " spaces: `$pending_spaces' word: $pending_word_text\n";
-
+ print STDERR
"($text_command|$text_length|$close|${all_line_passed}+$in_node_count|l_c_cnt
$line_char_counter) prfrmted $preformatted para $in_para indent_lvl
$indent_level in_exdent $in_exdent only_spaces $info_state->{'only_spaces'}
blank_line $info_state->{'blank_line'} table_item_line $table_item_line
in_table_item $in_table_item item_pending $text_item_pending. spaces:
`$pending_spaces' word: $pending_word_text\n";
+ }
my $indent_length = $indent_level * $info_default_indent_length;
my $indent_length_next_line;
#Â indent_length is also set here for table @item so in that case
@@ -917,14 +904,14 @@
$length = $multitable->{'length_kept'};
$info_state->{'offset_in_file'} =
$multitable->{'offset_in_file_kept'};
$info_state->{'line_count'} = $multitable->{'line_count_kept'};
- print STDERR "MULTITABLE close, lines:
$multitable->{'line_count_kept'} + $all_line_passed\n";
+ #print STDERR "MULTITABLE close, lines:
$multitable->{'line_count_kept'} + $all_line_passed\n";
foreach my $anchor_and_index (@{$multitable->{'anchors'}},
@{$multitable->{'index_entries'}})
{
$anchor_and_index->{'line_nr'} +=
$multitable->{'line_count_kept'} + $all_line_passed;
}
if (! scalar(@{$info_state->{'multitable_stack'}}))
{
- print STDERR "MULTITABLE close, lengths:
$multitable->{'offset_in_file_kept'} + $length\n";
+ #print STDERR "MULTITABLE close, lengths:
$multitable->{'offset_in_file_kept'} + $length\n";
foreach my $anchor (@{$multitable->{'anchors'}})
{
$anchor->{'info_offset'} +=
$multitable->{'offset_in_file_kept'} + $length;
@@ -979,7 +966,7 @@
$cell_idx++;
}
my $previous_last_cell = scalar(@{$multitable->{'cells'}});
- print STDERR "ROW cell_beginning $cell_beginning, max_lines
$max_lines, previous_last_cell $previous_last_cell\n";
+ #print STDERR "ROW cell_beginning $cell_beginning, max_lines
$max_lines, previous_last_cell $previous_last_cell\n";
for (my $line_idx = 0; $line_idx < $max_lines; $line_idx++)
{
my $length = 0;
@@ -991,15 +978,15 @@
{
$last_cell = $cell_idx+1 if
(defined($multitable->{'cells'}->[$cell_idx]->{'lines'}->[$line_idx]));
}
- print STDERR " L(last_cell $last_cell): $line_idx\n";
+ #print STDERR " L(last_cell $last_cell): $line_idx\n";
for (my $cell_idx = 0; $cell_idx < $last_cell; $cell_idx++)
{
my $cell_text =
$multitable->{'cells'}->[$cell_idx]->{'lines'}->[$line_idx];
- print STDERR " C($cell_idx) ";
+ #print STDERR " C($cell_idx) ";
if (defined($cell_text))
{
chomp($cell_text);
- print STDERR "$cell_text";
+ #print STDERR "$cell_text";
$line .= $cell_text;
$length += length($cell_text);
}
@@ -1010,7 +997,7 @@
my $spaces = ' ' x
($multitable->{'cells'}->[$cell_idx+1]->{'beginning'} - $length);
$length += length($spaces);
$line .= $spaces;
- print STDERR " Csp($length) `$spaces'";
+ #print STDERR " Csp($length) `$spaces'";
}
}
}
@@ -1026,20 +1013,20 @@
$length += length($spaces);
}
$anchor->{'info_offset'} = $anchor_position +
$row_length + $multitable->{'length'};
- print STDERR "ROW anchor close:
anchor[$anchor->{'cell_idx'}]($multitable->{'cells'}->[$anchor->{'cell_idx'}]->{'beginning'}+$anchor->{'line_char_counter'})
$anchor_position $anchor->{'info_offset'}\n";
+ #print STDERR "ROW anchor close:
anchor[$anchor->{'cell_idx'}]($multitable->{'cells'}->[$anchor->{'cell_idx'}]->{'beginning'}+$anchor->{'line_char_counter'})
$anchor_position $anchor->{'info_offset'}\n";
$anchor->{'line_char_counter'} = $anchor_position;
}
}
$line .= "\n";
$row_length += length($line);
- print STDERR " ($length,".length($line).") $line";
+ #print STDERR " ($length,".length($line).") $line";
$row .= $line;
$previous_last_cell = $last_cell;
}
foreach my $anchor_and_index (@anchors, @indices)
{
$anchor_and_index->{'line_nr'} +=
$multitable->{'line_count'};
- print STDERR "ROW close: new line count:
$anchor_and_index->{'line_nr'} + \n";
+ #print STDERR "ROW close: new line count:
$anchor_and_index->{'line_nr'} + \n";
}
if ($content->{'item_command'} eq 'headitem')
{
@@ -1049,7 +1036,7 @@
$row .= $line;
$row_length += length($line);
}
- print STDERR "ROW_LENGTH $row_length\n";
+ #print STDERR "ROW_LENGTH $row_length\n";
$multitable->{'result'} .= $row;
$multitable->{'length'} += $row_length;
$multitable->{'line_count'} += $max_lines;
@@ -1080,7 +1067,7 @@
}
if ($content->{'command'} eq 'anchor' or ($content->{'command'}
eq 'float' and $content->{'anchor_reference'}))
{
-print STDERR "anchor: offset_in_file $info_state->{'offset_in_file'},
line_count $info_state->{'line_count'}, line_char_counter $line_char_counter
pending_added_length $pending_added_length\n";
+ #print STDERR "anchor: offset_in_file
$info_state->{'offset_in_file'}, line_count $info_state->{'line_count'},
line_char_counter $line_char_counter pending_added_length
$pending_added_length\n";
$content->{'anchor_reference'}->{'info_offset'} = $length +
$info_state->{'offset_in_file'} + $pending_added_length;
$content->{'anchor_reference'}->{'line_nr'} =
$all_line_passed + $info_state->{'line_count'};
$content->{'anchor_reference'}->{'line_char_counter'} =
$line_char_counter + $pending_added_length;
@@ -1094,12 +1081,12 @@
elsif ($content->{'command'} eq 'index_label')
{
my $index_line_nr = $all_line_passed +
$info_state->{'line_count'};
- my $index_name = $content->{'index_name'};
+ my $index_name =
$content->{'index_entry_reference'}->{'index_name'};
$info_default_index_line_string_length{$index_name} =
length($index_line_nr)
if
(!defined($info_default_index_line_string_length{$index_name}) or
$info_default_index_line_string_length{$index_name} < length($index_line_nr));
-print STDERR "RRRRRRRRRRRRR $content->{'index_entry_reference'}->{'texi'}
name: $index_name line: $index_line_nr max:
$info_default_index_line_string_length{$index_name}\n";
- my $index_ref = { 'index_entry_reference' =>
$content->{'index_entry_reference'}, 'line_nr' => $index_line_nr, 'index_name'
=> $index_name };
-print STDERR "INDEX($index_name) line $index_line_nr\n";
+ #print STDERR "RRRRRRRRRRRRR
$content->{'index_entry_reference'}->{'texi'} name: $index_name line:
$index_line_nr max: $info_default_index_line_string_length{$index_name}\n";
+ my $index_ref = { 'index_entry_reference' =>
$content->{'index_entry_reference'}, 'line_nr' => $index_line_nr };
+#print STDERR "INDEX($index_name) line $index_line_nr\n";
$info_default_index_entries{$content->{'index_entry_reference'}} = $index_ref;
if (@{$info_state->{'multitable_stack'}})
{
@@ -1175,13 +1162,13 @@
{
my $dummy_line_passed;
-print STDERR "BUG: defined pending_word before DEFINITION_LINE\n" if
defined($pending_word);
-print STDERR
"DEFINITION_LINE($line_char_counter,$pending_spaces,$indent_length,$in_para,$max_column):
$content->{'text'}";
+ print STDERR "BUG: defined pending_word before
DEFINITION_LINE\n" if defined($pending_word);
+ #print STDERR
"DEFINITION_LINE($line_char_counter,$pending_spaces,$indent_length,$in_para,$max_column):
$content->{'text'}";
($line_char_counter, $pending_spaces, $pending_word,
$dummy_line_passed, $text_added) =
info_default_process_text($content->{'text'}, $line_char_counter,
$pending_spaces, $pending_word, $indent_length, 1, $max_column,
$indent_length+2*$info_default_indent_length);
$text_added .= $pending_spaces;
$pending_spaces = '';
- print STDERR
"DEFINITION_LINE($line_char_counter,$pending_spaces) -> $text_added";
-print STDERR "BUG: defined pending_word after DEFINITION_LINE\n" if
defined($pending_word);
+ #print STDERR
"DEFINITION_LINE($line_char_counter,$pending_spaces) -> $text_added";
+ print STDERR "BUG: defined pending_word after
DEFINITION_LINE\n" if defined($pending_word);
$indentation_done = 1;
goto new_text;
@@ -1209,7 +1196,6 @@
{
$table_item_line = 1;
$in_table_item = 0;
-print STDERR "DDDDDDDDDDDDDDDD $content->{'command'} $first_item or
$indent_level $content->{'parent'}->{'command'}\n";
}
if (!$info_state->{'blank_line'} and ($content->{'command'}
ne 'itemx') and (!$first_item or $indent_level != 1))
{
@@ -1325,7 +1311,7 @@
{
if ($in_para and !$in_exdent)
{
-print STDERR "IN_PARA text\n";
+ #print STDERR "IN_PARA text\n";
my $new_text = $content->{'text'};
if ((!defined($content->{'command'}) or
$content->{'command'} ne ':') and $new_text =~
/([$info_default_end_sentence_character])([$info_default_after_punctuation_characters]*)(\s*)$/)
{
@@ -1341,7 +1327,10 @@
my ($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current, $index, $close);
while (1)
{
- last if (!defined($current_next) or
(defined($command_next) and $command_next eq '*'));
+ #Â !defined($text_next) catches many special
+ #Â commands, like anchor, index. Not sure if
+ # it is right or wrong.
+ last if (!defined($current_next) or
(!defined($text_next)) or (defined($command_next) and $command_next eq '*'));
if ($text_next =~ /\S/)
{
last;
@@ -1358,7 +1347,6 @@
($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current_next, $index_next,
$close_next);
}
}
- print STDERR "KKKKKKKKKKKK `$1' `$2' `$3'";
}
elsif (chomp($new_text))
{
@@ -1372,7 +1360,7 @@
} # ignore spaces outside of paragraphs and preformatted
elsif ($preformatted or
$info_state->{'align_stack'}->[-1]->{'command'} ne 'normal')
{
-print STDERR "IN_PREFORMATTED or ALIGN text\n";
+ #print STDERR "IN_PREFORMATTED or ALIGN text\n";
$text_added .= $content->{'text'};
}
else
@@ -1383,25 +1371,24 @@
if ($in_table_item and $info_state->{'only_spaces'})
{
#Â in a blank_line
-print STDERR "IN_ITEM ignored: `$content->{'text'}'\n";
+ #print STDERR "IN_ITEM ignored:
`$content->{'text'}'\n";
}
elsif (!$info_state->{'blank_line'} or
!$info_state->{'only_spaces'})
{
-print STDERR "IN_ADDING_BLANK_LINE because no line before or text before\n";
+ #print STDERR "IN_ADDING_BLANK_LINE because no line
before or text before\n";
$text_added .= "\n";
}
else
{
-print STDERR "IN_NOT_ADDING_BLANK_LINE\n";
+ #print STDERR "IN_NOT_ADDING_BLANK_LINE\n";
}
}
else
{ #Â exdent, item not in paragraph nor in preformatted
-print STDERR "NOWHERE and not end of line (or item_pending)
`$content->{'text'}'\n";
+ #print STDERR "NOWHERE and not end of line (or
item_pending) `$content->{'text'}'\n";
$text_added .= $content->{'text'};
}
}
-# unless (!defined($line_char_counter) and !$preformatted and
$content->{'text'} =~ /^\s*$/);
}
else
{
@@ -1418,7 +1405,6 @@
}
}
if (!$preformatted and !$in_exdent and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal' and $in_para)
- #if (!$preformatted and !$in_exdent)
{
#Â the line_passed returned here are not used, since they are
computed
#Â below.
@@ -1430,15 +1416,11 @@
{
my $chomped_text = $text_added;
- #if (chomp($chomped_text))
- #{
- # $in_exdent = 0;
- #}
chomp($chomped_text);
-print STDERR "NOT IN PARA text_added `$text_added' line_char_counter
$line_char_counter\n";
+ #print STDERR "NOT IN PARA text_added `$text_added'
line_char_counter $line_char_counter\n";
if ($chomped_text ne '' and $line_char_counter < $indent_length)
{
-print STDERR " indent_length $indent_length\n";
+ #print STDERR " indent_length
$indent_length\n";
$text_added = ' ' x ($indent_length -
$line_char_counter).$text_added;
}
$line_char_counter += length($text_added);
@@ -1448,7 +1430,7 @@
$line_char_counter += length($text_added);
}
new_text:
-print STDERR "ADDING `$text_added'\n" if ($text_added ne '');
+ print STDERR "ADDING `$text_added'\n" if ($text_added ne '' and $DEBUG);
if ($text_added ne '')
{
if ($item_pending and !$item_line_added)
@@ -1595,8 +1577,7 @@
push @{$info_state->{'current'}->{'content'}}, $new_command;
$info_state->{'current'} = $new_command;
- print STDERR "Opened $command ".
- "\n";
+ print STDERR "TREE: Opened $command\n" if ($DEBUG);
}
sub info_default_close_command($$;$$$)
@@ -1609,8 +1590,7 @@
$state = $Texi2HTML::THISDOC{'state'} if (!defined($state));
my $info_state = info_default_get_state($state);
- print STDERR "Closing $command ".
- "\n";
+ print STDERR "TREE: Closing $command\n" if ($DEBUG);
if (!defined($info_state->{'current'}))
{
print STDERR "info_state->{'current'} not defined\n";
@@ -1653,7 +1633,7 @@
my $command_text = '';
$command_text = "\[$command\]" if (defined($command));
$command_text .= $text if (defined($text));
- print STDERR "Storing text ${command_text}\n";
+ print STDERR "TREE Storing: ${command_text}\n" if ($DEBUG);
$text_entries->{'text'} = $text if (defined($text));
$text_entries->{'command'} = $command if (defined($command));
@@ -1682,12 +1662,14 @@
return $line;
}
-sub info_default_begin_style_texi($$$$)
+sub info_default_begin_style_texi($$$$$)
{
my $command = shift;
my $state = shift;
my $stack = shift;
my $real_style_command = shift;
+ my $remove_texi = shift;
+
info_default_open_command($state,$command)
unless ($info_default_accent_commands{$command} or exists
$things_map{$command});
# if ($real_style_command);
@@ -1701,13 +1683,11 @@
#print STDERR "begin_paragraph $command\n";
my $state = shift;
my $stack = shift;
- #my $info_state = info_default_get_state($state);
info_default_open_command($state,$command);
foreach my $style_command (@$paragraph_macros)
{
- print STDERR "para stack: $style_command->{'style'}\n";
+ #print STDERR "para stack: $style_command->{'style'}\n";
info_default_open_command($state,$style_command->{'style'});
- #$info_state->{'current'}->{'no_open'} = 1;
}
}
@@ -1723,8 +1703,6 @@
#Â character it is added to the tree in info_default_colon_command
return info_default_store_text($state,$result,$command) if ($result ne '');
return '';
- #return '' if info_default_store_text($state,$result,$command);
- #return $result;
}
sub info_default_colon_command($)
@@ -1737,7 +1715,7 @@
}
else
{
- return info_default_store_text(undef,$punctuation_character);;
+ return info_default_store_text(undef,$punctuation_character);
}
}
@@ -1781,7 +1759,9 @@
my @formatted_args = ();
foreach my $arg (@$args)
{
- my $arg_style = $style->{'orig_args'}->[$style_index];
+ #Â we don't use style, since we only set 'orig_args' in style_map
+ #Â nad not in style_map_pre...
+ my $arg_style = $style_map{$command}->{'orig_args'}->[$style_index];
if ($arg_style eq 'normal')
{
push @formatted_args, main::substitute_line($arg,
"address@hidden");
@@ -1792,7 +1772,7 @@
}
else
{
- print STDERR "Unknown arg style($style_index) $arg_style for
$command\n";
+ print STDERR "Unknown arg style($style_index) $arg_style for
$command, $state->{'remove_texi'}\n";
}
$style_index++;
}
@@ -1994,7 +1974,6 @@
}
return &$heading($element, $command, $texi_line, $line, $in_preformatted,
$one_section, $element_heading) unless ($new_element);
-print STDERR "HHHHHHHHHHHHHHH node($element->{'texi'}) $info_state->{'nr'}\n";
my $before = '';
$element->{'info_offset'} = $info_state->{'offset_in_file'};
push @{$info_state->{'pending_tags'}}, $element;
@@ -2020,7 +1999,6 @@
die "Heading called for a node\n" if ($element->{'node'});
my $state = $Texi2HTML::THISDOC{'state'};
my $info_state = info_default_get_state ($state);
-print STDERR "HHHHHHHHHHHHHHH section($element->{'texi'})
$info_state->{'nr'}\n";
$info_state->{'paragraph_in_element_nr'} = 0;
my $text = "$element->{'text'}";
#Â to do the same than makeinfo a trailing dot in section number is removed
@@ -2029,7 +2007,7 @@
$text = $Texi2HTML::THISDOC{'settitle'} if (!length($text) and
$element->{'tag'} eq 'top' and defined ($Texi2HTML::THISDOC{'settitle'}) and
length($Texi2HTML::THISDOC{'settitle'}));
$text = "Annexe $text" if ($element->{'tag'} =~ /appendix/ and
$element->{'level'} <= 1);
my $result = $text . "\n" .
- ($default_info_level_to_symbol{$element->{'level'}} x length($text)) .
"\n";
+ ($t2h_default_underline_symbol{$element->{'level'}} x length($text)) .
"\n";
$result .= "\n";
@@ -2056,10 +2034,9 @@
}
else
{
-#print STDERR "info_default_normal_text $text $in_preformatted $in_code \n";
+ #print STDERR "info_default_normal_text $text $in_preformatted $in_code
\n";
$text = uc($text) if (in_cmd($style_stack, 'sc'));
$text = uc($text) if (in_cmd($style_stack, 'var'));
-# $text = &$protect_text($text) unless($in_raw_text);
if (! $in_code and !$in_preformatted)
{
$text =~ s/---/\x{1F}/g;
@@ -2085,12 +2062,6 @@
return $text;
}
return info_default_store_text($state,$text);
- #Â We never store in the stack text in raw text (remove_texi).
-# unless ($in_raw_text)
-# {
-# return '' if (info_default_store_text($state,$text));
-# }
-# return $text;
}
#Â this is not called in preformatted
@@ -2110,7 +2081,7 @@
my $id = shift;
my $anchor_text = shift;
my $anchor_reference = shift;
- print STDERR "Storing anchor $anchor_reference->{'text'}\n";
+ #print STDERR "Storing anchor $anchor_reference->{'text'}\n";
return info_default_store_text(undef,undef,'anchor',{'anchor_reference' =>
$anchor_reference});
}
@@ -2238,8 +2209,9 @@
'text' => $node_ref->{'text'} . "-Footnotes",
'file' => $node_ref->{'file'},
'info_offset' => $info_state->{'offset_in_file'},
- 'node' => 1
+ 'node' => 1,
};
+ $footnote_element->{'element_ref'} = $footnote_element;
push @{$info_state->{'pending_tags'}}, $footnote_element;
$footnote_text = info_default_node_line($footnote_element,
$info_state);
}
@@ -2248,7 +2220,7 @@
$footnote_text = " ---------- Footnotes ----------\n\n";
$info_state->{'offset_in_file'} += length($footnote_text);
$info_state->{'line_count'} += 2;
-print STDERR "MMMMMMMMMMMMMMMMMM $info_state->{'line_count'}\n";
+ #print STDERR "MMMMMMMMMMMMMMMMMM $info_state->{'line_count'}\n";
}
while (@info_default_pending_footnotes)
{
@@ -2272,7 +2244,7 @@
}
foreach my
$footnote_pending_index_entry(@{$footnote_info_state->{'pending_index_entries'}})
{
-print STDERR
"TTTTTTTTTTT($footnote_pending_index_entry->{'index_entry_reference'}->{'entry'})
$footnote_pending_index_entry->{'line_nr'} $info_state->{'line_count'}\n";
+ #print STDERR
"TTTTTTTTTTT($footnote_pending_index_entry->{'index_entry_reference'}->{'entry'})
$footnote_pending_index_entry->{'line_nr'} $info_state->{'line_count'}\n";
$footnote_pending_index_entry->{'line_nr'} +=
$info_state->{'line_count'};
$footnote_pending_index_entry->{'index_entry_reference'}->{'real_element'} =
$footnote_element if (get_conf('footnotestyle') eq 'separate');
}
@@ -2323,7 +2295,7 @@
if (!$end_foot_navigation)
{
main::open_out_file("$Texi2HTML::THISDOC{'filename'}->{'top'}-$info_default_out_file_nr");
- print STDERR "X-$info_default_out_file_nr:
$info_state->{'offset_in_file'}\n";
+ #print STDERR "X-$info_default_out_file_nr:
$info_state->{'offset_in_file'}\n";
&$print_page_head($Texi2HTML::THISDOC{'FH'});
push @info_default_pending_indirect,
{'file'=>"$Texi2HTML::THISDOC{'filename'}->{'top'}-$info_default_out_file_nr",
'offset' => $info_state->{'offset_in_file'}};
}
@@ -2390,7 +2362,6 @@
# my $format = shift;
# my $text = shift;
# my $in_preformatted = shift;
-#print STDERR "MENU $format\n";
# return info_default_close_command(undef, $format, "* Menu:\n", undef,
"\n");
#}
@@ -2432,7 +2403,7 @@
return ($line, 0, undef, undef) unless ($pass == 2);
return ($line, 0, undef, undef) unless ($command eq 'exdent' or $command
eq 'noindent' or $command eq 'indent');
my ($result_line, $text, $args) = &$preserve_misc_command ($line,
$command);
- info_default_store_text($state,'',$command);
+ info_default_store_text($state,undef,$command);
return ($result_line, 1, '', undef);
}
@@ -2673,14 +2644,8 @@
my $formatted_entry = shift;
my $index_entry_ref = shift;
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state($state);
- print STDERR "Storing index entry $formatted_entry\n";
- my $index_entry_stored = {'command' => 'index_label',
'index_entry_reference' => $index_entry_ref, 'index_command' => $index_command,
'index_name' => $index_name};
- push @{$info_state->{'current'}->{'content'}}, $index_entry_stored;
- return info_default_output($info_state)
- if (!defined($info_state->{'current'}->{'command'}));
- return '';
+ my $index_entry_stored = {'index_entry_reference' => $index_entry_ref,
'index_command' => $index_command};
+ return info_default_store_text(undef,undef, 'index_label',
$index_entry_stored);
}
sub info_default_index_entry($$$$$$$$)
@@ -2709,12 +2674,12 @@
my $info_index_entry_ref = $info_default_index_entries{$index_entry_ref};
my $line_nr = $info_index_entry_ref->{'line_nr'};
#Â this happens for index entries appearing after @printindex. In that case
- #Â it is consideered that they are at the beginning of the node.
+ #Â it is considered that they are at the beginning of the node.
$line_nr = 4 if (!defined($line_nr) or $line_nr < 4);
- my $max_len =
$info_default_index_line_string_length{$info_index_entry_ref->{'index_name'}};
+ my $max_len =
$info_default_index_line_string_length{$index_entry_ref->{'index_name'}};
my $line_nr_spaces = sprintf("%${max_len}d", $line_nr);
my $line_part = "(line ${line_nr_spaces})";
-#print STDERR "GGGGGGGGGG name: $info_index_entry_ref->{'index_name'} max:
${max_len} line_nr: `$line_nr' line_nr_spaces `$line_nr_spaces' $line_part \n";
+ #print STDERR "GGGGGGGGGG name: $index_entry_ref->{'index_name'} max:
${max_len} line_nr: `$line_nr' line_nr_spaces `$line_nr_spaces' $line_part \n";
if (length($result)+length($line_part) +1 > get_conf('fillcolumn'))
{
$result .= "\n" . ' ' x (get_conf('fillcolumn') - length($line_part)) ;
@@ -2878,7 +2843,7 @@
my $format;
$format = $commands_stack->[-1] if (defined($commands_stack) and
@$commands_stack and $commands_stack->[-1]);
-print STDERR "tab_item_texi $command $commands_stack, $stack, $state, $line,
$line_nr\n";
+ #print STDERR "tab_item_texi $command $commands_stack, $stack, $state,
$line, $line_nr\n";
if ($format eq 'multitable')
{
if ($command ne 'tab')
@@ -2889,7 +2854,7 @@
}
else
{
- info_default_store_text ($state, '', $command, {'format_name' =>
$format});
+ info_default_store_text ($state, undef, $command, {'format_name' =>
$format});
}
$line =~ s/^\s*//;
return $line;
@@ -2986,7 +2951,6 @@
my $format = 'deff_item';
$format = 'deff_itemx' if ($command =~ /x$/);
- print STDERR "LLLLLLLLLLLLLL $format $command\n";
return info_default_close_command(undef, $format);
}
@@ -3019,17 +2983,9 @@
$result =~ s/\s*$//;
$result .= "\n";
my $state = $Texi2HTML::THISDOC{'state'};
-# if ($command =~ /x$/)
-# {
info_default_store_text(undef,$result,"${command}_line",{'definition_line'
=> 1});
-# }
-# else
-# {
-# return info_default_open_command($state, $command, {'begin'=>$result});
-# }
my $format = 'deff_item';
$format = 'deff_itemx' if ($original_command =~ /x$/);
- print STDERR "JJJJJJJJJJJJJ $command GGG $original_command $format\n";
return info_default_open_command($state, $format);
}
@@ -3081,6 +3037,7 @@
my @lines = split /^/, $caption;
$caption = $lines[0];
+ $caption = '' if (!defined($caption));
chomp ($caption);
my $result = '';
@@ -3089,7 +3046,6 @@
my $length = 0;
while ($caption_entry =~ s/^(\S+\s*)//)
{
-print STDERR "CAPTION_ENTRY($length) $caption_entry\n";
my $new_word = $1;
if (length($new_word) + $length >
($info_default_listoffloat_caption_entry_length - 3) or (length($new_word) +
$length + length($info_default_listoffloat_append) >
$info_default_listoffloat_caption_entry_length and $caption_entry ne ''))
{
@@ -3102,9 +3058,7 @@
$length += length($new_word);
}
}
-print STDERR "RESULT `$result'\n";
$result .= ' ' x ($info_default_listoffloat_caption_entry_length -
length($result));
-print STDERR "RESULT `$result'\n";
return "${result}$float->{'text'}.\n";
}
@@ -3124,7 +3078,7 @@
}
my ($parent_format, $in_format);
($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'});
-#print STDERR "JJJJJJJJJJj listoffloats not in top\n" if ($in_format);
+ #print STDERR "address@hidden not at top level\n" if ($in_format);
$info_state->{'paragraph_in_element_nr'}++ if (!$in_format);
return info_default_store_text($state,$result,'listoffloats');
}
@@ -3138,11 +3092,6 @@
{
return info_default_store_text(undef,$text, $style);
}
-# if ($style eq 'direntry')
-# {
-# $info_default_dir_specification .= "START-INFO-DIR-ENTRY\n"
-# .$text. "END-INFO-DIR-ENTRY\n";
-# }
return '';
}
Index: formats/xml.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/xml.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- formats/xml.init 22 May 2009 18:50:30 -0000 1.1
+++ formats/xml.init 23 May 2009 17:09:40 -0000 1.2
@@ -187,6 +187,7 @@
$caption_shortcaption = \&xml_caption_shortcaption;
$caption_shortcaption_command = \&xml_caption_shortcaption_command;
$normal_text = \&xml_normal_text;
+$protect_text = \&xml_default_protect_text;
$paragraph_style_command = \&xml_paragraph_style_command;
$raw = \&xml_raw;
$cartouche = \&xml_cartouche;
Index: i18n/de
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/de,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- i18n/de 25 Apr 2009 14:54:44 -0000 1.13
+++ i18n/de 23 May 2009 17:09:40 -0000 1.14
@@ -1,5 +1,8 @@
$LANGUAGES->{'de'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Die Links in der Navigationsleiste haben die folgende
Bedeutung: ',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' wobei das @strong{ Beispiel } annimmt, dass die
aktuelle Position bei @strong{ Unterabschnitt 1-2-3 } in einem Dokument mit
folgender Struktur liegt:',
' Up ' => ' Nach oben ',
'%{acronym_like} (%{explanation})' => '%{acronym_like}
(%{explanation})',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} in Abschnitt `%{section}\' in
@cite{%{book}}',
'%{reference_name}' => '%{reference_name}',
+ '%{ref}' => '',
'%{style} %{number}' => '%{style} %{number}',
'%{style}: %{caption_first_line}' => '%{style}:
%{caption_first_line}',
'%{style}: %{shortcaption_first_line}' => '%{style}:
%{shortcaption_first_line}',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '@b{%{quotation_arg}:} ',
'@cite{%{book}}' => '@cite{%{book}}',
'About' => '@"Uber',
@@ -76,13 +81,17 @@
'Previous section on same level' => 'Voriger Abschnitt
derselben Ebene',
'Section' => 'Abschnitt',
'Section One' => 'Abschnitt 1',
+ 'See ' => '',
'See %{node_file_href}' => 'Siehe %{node_file_href}',
'See %{node_file_href} @cite{%{book}}' => 'Siehe
%{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Siehe %{node_file_href} in Abschnitt `%{section}\' in
@cite{%{book}}',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => 'Siehe
Abschnitt `%{section}\' in @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'September',
'Short Table of Contents' => 'Kurzes
Inhaltsverzeichnis',
'Short table of contents' => 'Kurzes
Inhaltsverzeichnis',
@@ -113,13 +122,18 @@
'current' => '',
'on @emph{%{date}}' => 'am @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' => 'Abschnitt
`%{section}\' in @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => 'siehe %{node_file_href}',
'see %{node_file_href} @cite{%{book}}' => 'siehe
%{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'siehe %{node_file_href} im Abschnitt `%{section}\' in
@cite{%{book}}',
'see %{reference_name}' => 'siehe %{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'siehe @cite{%{book}}',
'see section %{reference_name}' => 'siehe Abschnitt
%{reference_name}',
'see section `%{section}\' in @cite{%{book}}' => 'siehe
Abschnitt `%{section}\' in @cite{%{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'unbekannt'
};
Index: i18n/en
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/en,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- i18n/en 25 Apr 2009 14:54:44 -0000 1.11
+++ i18n/en 23 May 2009 17:09:40 -0000 1.12
@@ -1,5 +1,8 @@
$LANGUAGES->{'en'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => '',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
' Up ' => '',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => '',
@@ -76,13 +81,17 @@
'Previous section on same level' => '',
'Section' => '',
'Section One' => '',
+ 'See ' => '',
'See %{node_file_href}' => '',
'See %{node_file_href} @cite{%{book}}' => '',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => '',
'Short Table of Contents' => '',
'Short table of contents' => '',
@@ -113,13 +122,18 @@
'current' => '',
'on @emph{%{date}}' => '',
'section `%{section}\' in @cite{%{book}}' => '',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => '',
'see %{node_file_href} @cite{%{book}}' => '',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'see %{reference_name}' => '',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => '',
'see section %{reference_name}' => '',
'see section `%{section}\' in @cite{%{book}}' => '',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => ''
};
Index: i18n/es
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/es,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- i18n/es 25 Apr 2009 14:54:44 -0000 1.14
+++ i18n/es 23 May 2009 17:09:40 -0000 1.15
@@ -1,5 +1,8 @@
$LANGUAGES->{'es'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Los botones de los paneles de address@hidden'on
tienen el significado siguiente:',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' donde el @strong{ Ejemplo } supone que la
posición actual está en la @strong{ address@hidden'on uno-dos-tres } de un
documento de la estructura siguiente:',
' Up ' => ' Subir ',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} address@hidden'on `%{section}\' en
@cite{%{book}}',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => 'Acerca de',
@@ -76,13 +81,17 @@
'Previous section on same level' => 'address@hidden'on
anterior en el mismo nivel',
'Section' => 'address@hidden'on',
'Section One' => 'address@hidden'on Uno',
+ 'See ' => '',
'See %{node_file_href}' => 'address@hidden'ease
%{node_file_href}',
'See %{node_file_href} @cite{%{book}}' =>
'address@hidden'ease %{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'address@hidden'ease %{node_file_href} address@hidden'on
`%{section}\' en @cite{%{book}}',
'See %{reference_name}' => 'address@hidden'ease
%{reference_name}',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => 'address@hidden'ease
@cite{%{book}}',
'See section %{reference_name}' => 'address@hidden'ease
la address@hidden'on %{reference_name}',
'See section `%{section}\' in @cite{%{book}}' =>
'address@hidden'ease la address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'septiembre',
'Short Table of Contents' => 'Resumen del Contenido',
'Short table of contents' => 'Resumen del contenido',
@@ -113,13 +122,18 @@
'current' => 'actual',
'on @emph{%{date}}' => 'el @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' =>
'address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => 'address@hidden'ease
%{node_file_href}',
'see %{node_file_href} @cite{%{book}}' =>
'address@hidden'ease %{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'address@hidden'ease %{node_file_href} address@hidden'on
`%{section}\' en @cite{%{book}}',
'see %{reference_name}' => 'address@hidden'ease
%{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'address@hidden'ease
@cite{%{book}}',
'see section %{reference_name}' => 'address@hidden'ease
la address@hidden'on %{reference_name}',
'see section `%{section}\' in @cite{%{book}}' =>
'address@hidden'ease la address@hidden'on `%{section}\' en @cite{%{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'desconocido'
};
Index: i18n/fr
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/fr,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- i18n/fr 25 Apr 2009 14:54:44 -0000 1.16
+++ i18n/fr 23 May 2009 17:09:40 -0000 1.17
@@ -1,5 +1,8 @@
$LANGUAGES->{'fr'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Les boutons de navigation ont la signification
suivante :',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' Dans cet exemple on est @`a @strong{ Sous sous
section un-deux-trois } dans un document dont la structure est :',
' Up ' => 'Plus haut',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} section `%{section}\' dans
@cite{%{book}}',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => 'A propos',
@@ -76,13 +81,17 @@
'Previous section on same level' => 'Section
address@hidden'address@hidden'edente au address@hidden niveau',
'Section' => '',
'Section One' => 'Section un',
+ 'See ' => '',
'See %{node_file_href}' => 'Voir %{node_file_href}',
'See %{node_file_href} @cite{%{book}}' => 'Voir
%{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Voir %{node_file_href} section `%{section}\' dans
@cite{%{book}}',
'See %{reference_name}' => 'Voir %{reference_name}',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => 'Voir @cite{%{book}}',
'See section %{reference_name}' => 'Voir la section
%{reference_name}',
'See section `%{section}\' in @cite{%{book}}' => 'Voir
la section `%{section}\' dans @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'septembre',
'Short Table of Contents' =>
'address@hidden'address@hidden'e du contenu',
'Short table of contents' =>
'address@hidden'address@hidden'e du contenu',
@@ -113,13 +122,18 @@
'current' => 'courante',
'on @emph{%{date}}' => 'le @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' => 'section
`%{section}\' dans @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => 'voir %{node_file_href}',
'see %{node_file_href} @cite{%{book}}' => 'voir
%{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'voir %{node_file_href} section `%{section}\' dans
@cite{%{book}}',
'see %{reference_name}' => 'voir %{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'voir @cite{%{book}}',
'see section %{reference_name}' => 'voir la section
%{reference_name}',
'see section `%{section}\' in @cite{%{book}}' => 'voir
la section `%{section}\' dans @cite{{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'inconnu'
};
Index: i18n/ja
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/ja,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- i18n/ja 25 Apr 2009 14:54:44 -0000 1.4
+++ i18n/ja 23 May 2009 17:09:40 -0000 1.5
@@ -1,5 +1,8 @@
$LANGUAGES->{'ja'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' =>
'ããã²ã¼ã·ã§ã³ããã«ä¸ã®ãã¿ã³ã«ã¯ä»¥ä¸ã®æå³ãããã¾ãã',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '@address@hidden',
' Up ' => 'ä¸',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => '',
@@ -76,13 +81,17 @@
'Previous section on same level' => '',
'Section' => 'é
',
'Section One' => '第1é
',
+ 'See ' => '',
'See %{node_file_href}' => '',
'See %{node_file_href} @cite{%{book}}' => '',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => '9æ',
'Short Table of Contents' => 'ç°¡ç¥åããç®æ¬¡',
'Short table of contents' => '',
@@ -113,13 +122,18 @@
'current' => 'ç¾å¨ä½ç½®',
'on @emph{%{date}}' => '@emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' =>
'@cite{%{book}}ã® `%{section}\' ',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => '%{node_file_href}åç
§',
'see %{node_file_href} @cite{%{book}}' =>
'%{node_file_href} @cite{%{book}}åç
§',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'see %{reference_name}' => '',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => '',
'see section %{reference_name}' => '',
'see section `%{section}\' in @cite{%{book}}' => '',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'ä¸æ'
};
Index: i18n/nl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/nl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- i18n/nl 25 Apr 2009 14:54:44 -0000 1.13
+++ i18n/nl 23 May 2009 17:09:40 -0000 1.14
@@ -1,5 +1,8 @@
$LANGUAGES->{'nl'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => '',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
' Up ' => '',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => '',
@@ -76,13 +81,17 @@
'Previous section on same level' => '',
'Section' => '',
'Section One' => '',
+ 'See ' => '',
'See %{node_file_href}' => '',
'See %{node_file_href} @cite{%{book}}' => '',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'September',
'Short Table of Contents' => 'Korte inhoudsopgave',
'Short table of contents' => '',
@@ -113,13 +122,18 @@
'current' => '',
'on @emph{%{date}}' => '',
'section `%{section}\' in @cite{%{book}}' => '',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => '',
'see %{node_file_href} @cite{%{book}}' => '',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'see %{reference_name}' => '',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => '',
'see section %{reference_name}' => '',
'see section `%{section}\' in @cite{%{book}}' => '',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => ''
};
Index: i18n/no
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/no,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- i18n/no 25 Apr 2009 14:54:44 -0000 1.13
+++ i18n/no 23 May 2009 17:09:40 -0000 1.14
@@ -1,5 +1,8 @@
$LANGUAGES->{'no'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => '',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => '',
' Up ' => '',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => '',
@@ -76,13 +81,17 @@
'Previous section on same level' => '',
'Section' => '',
'Section One' => '',
+ 'See ' => '',
'See %{node_file_href}' => '',
'See %{node_file_href} @cite{%{book}}' => '',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'See %{reference_name}' => '',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => '',
'See section %{reference_name}' => '',
'See section `%{section}\' in @cite{%{book}}' => '',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'september',
'Short Table of Contents' => 'Kort innholdsfortegnelse',
'Short table of contents' => '',
@@ -113,13 +122,18 @@
'current' => '',
'on @emph{%{date}}' => '',
'section `%{section}\' in @cite{%{book}}' => '',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => '',
'see %{node_file_href} @cite{%{book}}' => '',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => '',
'see %{reference_name}' => '',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => '',
'see section %{reference_name}' => '',
'see section `%{section}\' in @cite{%{book}}' => '',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => ''
};
Index: i18n/pt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/pt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- i18n/pt 25 Apr 2009 14:54:44 -0000 1.16
+++ i18n/pt 23 May 2009 17:09:41 -0000 1.17
@@ -1,5 +1,8 @@
$LANGUAGES->{'pt'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Os address@hidden nos address@hidden'eis de
navega@,address@hidden possuem os seguintes significados:',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' onde o @strong{ Exemplo } assume que a
posi@,address@hidden atual localiza-se em @strong{ Subsub@,address@hidden
address@hidden } de um documento com a seguinte estrutura:',
' Up ' => ' Acima ',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => 'Sobre',
@@ -76,13 +81,17 @@
'Previous section on same level' => 'Se@,address@hidden
anterior no mesmo address@hidden'ivel',
'Section' => 'Se@,address@hidden',
'Section One' => 'Se@,address@hidden Um',
+ 'See ' => '',
'See %{node_file_href}' => 'Veja %{node_file_href}',
'See %{node_file_href} @cite{%{book}}' => 'Veja
%{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'See %{reference_name}' => 'Veja %{reference_name}',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => 'Veja @cite{%{book}}',
'See section %{reference_name}' => 'Veja
se@,address@hidden %{reference_name}',
'See section `%{section}\' in @cite{%{book}}' => 'Veja
se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'Setembro',
'Short Table of Contents' => 'Breve
address@hidden'ario',
'Short table of contents' => 'Breve
address@hidden'ario',
@@ -113,13 +122,18 @@
'current' => 'atual',
'on @emph{%{date}}' => 'em @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' =>
'se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}' =>
'',
+ 'see ' => '',
'see %{node_file_href}' => 'veja %{node_file_href}',
'see %{node_file_href} @cite{%{book}}' => 'veja
%{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'see %{reference_name}' => 'veja %{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'veja @cite{%{book}}',
'see section %{reference_name}' => 'veja
se@,address@hidden %{reference_name}',
'see section `%{section}\' in @cite{%{book}}' => 'veja
se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'desconhecido'
};
Index: i18n/pt_BR
===================================================================
RCS file: /cvsroot/texi2html/texi2html/i18n/pt_BR,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- i18n/pt_BR 25 Apr 2009 14:54:44 -0000 1.7
+++ i18n/pt_BR 23 May 2009 17:09:42 -0000 1.8
@@ -1,5 +1,8 @@
$LANGUAGES->{'pt_BR'} = {
+ ' Next: %{node_next}' => '',
+ ' Prev: %{node_prev}' => '',
' The buttons in the navigation panels have the
following meaning:' => ' Os address@hidden nos address@hidden'eis de
navega@,address@hidden possuem os seguintes significados:',
+ ' Up: %{node_up}' => '',
' where the @strong{ Example } assumes that the
current position is at @strong{ Subsubsection One-Two-Three } of a document of
the following structure:' => ' onde o @strong{ Exemplo } assume que a
posi@,address@hidden atual localiza-se em @strong{ Subsub@,address@hidden
address@hidden } de um documento com a seguinte estrutura:',
' Up ' => ' Acima ',
'%{acronym_like} (%{explanation})' => '',
@@ -10,9 +13,11 @@
'%{node_file_href} @cite{%{book}}' => '',
'%{node_file_href} section `%{section}\' in
@cite{%{book}}' => '%{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'%{reference_name}' => '',
+ '%{ref}' => '',
'%{style} %{number}' => '',
'%{style}: %{caption_first_line}' => '',
'%{style}: %{shortcaption_first_line}' => '',
+ '%{title_ref}' => '',
'@b{%{quotation_arg}:} ' => '',
'@cite{%{book}}' => '',
'About' => 'Sobre',
@@ -76,13 +81,17 @@
'Previous section on same level' =>
'Se@,address@hidden anterior no mesmo address@hidden'ivel',
'Section' => 'Se@,address@hidden',
'Section One' => 'Se@,address@hidden Um',
+ 'See ' => '',
'See %{node_file_href}' => 'Veja %{node_file_href}',
'See %{node_file_href} @cite{%{book}}' => 'Veja
%{node_file_href} @cite{%{book}}',
'See %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'Veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'See %{reference_name}' => 'Veja %{reference_name}',
+ 'See %{ref}' => '',
+ 'See %{title_ref}' => '',
'See @cite{%{book}}' => 'Veja @cite{%{book}}',
'See section %{reference_name}' => 'Veja
se@,address@hidden %{reference_name}',
'See section `%{section}\' in @cite{%{book}}' =>
'Veja se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'See section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'September' => 'Setembro',
'Short Table of Contents' => 'Breve
address@hidden'ario',
'Short table of contents' => 'Breve
address@hidden'ario',
@@ -113,13 +122,18 @@
'current' => 'atual',
'on @emph{%{date}}' => 'em @emph{%{date}}',
'section `%{section}\' in @cite{%{book}}' =>
'se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'section address@hidden'@asis{}\' in @cite{%{book}}'
=> '',
+ 'see ' => '',
'see %{node_file_href}' => 'veja %{node_file_href}',
'see %{node_file_href} @cite{%{book}}' => 'veja
%{node_file_href} @cite{%{book}}',
'see %{node_file_href} section `%{section}\' in
@cite{%{book}}' => 'veja %{node_file_href} se@,address@hidden `%{section}\' em
@cite{%{book}}',
'see %{reference_name}' => 'veja %{reference_name}',
+ 'see %{ref}' => '',
+ 'see %{title_ref}' => '',
'see @cite{%{book}}' => 'veja @cite{%{book}}',
'see section %{reference_name}' => 'veja
se@,address@hidden %{reference_name}',
'see section `%{section}\' in @cite{%{book}}' =>
'veja se@,address@hidden `%{section}\' em @cite{%{book}}',
+ 'see section address@hidden'@asis{}\' in
@cite{%{book}}' => '',
'unknown' => 'desconhecido'
};
Index: test/run_test.sh
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/run_test.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/run_test.sh 22 May 2009 18:50:30 -0000 1.14
+++ test/run_test.sh 23 May 2009 17:09:42 -0000 1.15
@@ -101,7 +101,7 @@
fi
cp -r "$out_dir/$dir/"* "$res_dir/$dir/"
rm -f "$res_dir/$dir/"*.png "$res_dir/$dir/"*_l2h.css
- [ z"$do_info" = z'yes' ] && rm "$res_dir/$dir/$basename.2"
+ #[ z"$do_info" = z'yes' ] && rm "$res_dir/$dir/$basename.2"
else
echo "No dir $out_dir/$dir" 1>&2
fi
@@ -205,9 +205,9 @@
rm -f "$out_dir/$dir/"*".aux" "$out_dir/$dir/"*"_images.out"
fi
if [ -d "$results_dir/$dir" ]; then
- exclude_info=
- [ z"$do_info" = z'yes' ] && exclude_info="--exclude=$basename.2"
- diff -a -u --exclude=CVS --exclude='*.png' --exclude='*_l2h.css'
$exclude_info -r "$results_dir/$dir" "$out_dir/$dir" 2>>$logfile >
"$diffs_dir/$dir.diff"
+ #exclude_info=
+ #[ z"$do_info" = z'yes' ] && exclude_info="--exclude=$basename.2"
+ diff -a -u --exclude=CVS --exclude='*.png' --exclude='*_l2h.css' -r
"$results_dir/$dir" "$out_dir/$dir" 2>>$logfile > "$diffs_dir/$dir.diff"
dif_ret=$?
if [ $dif_ret != 0 ]; then
echo "D: $diffs_dir/$dir.diff"
Index: test/coverage/res/formatting/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/formatting/formatting.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- test/coverage/res/formatting/formatting.html 17 May 2009 15:35:20
-0000 1.23
+++ test/coverage/res/formatting/formatting.html 23 May 2009 17:09:44
-0000 1.24
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/encodings/res/formatting_fr/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr/formatting.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- test/encodings/res/formatting_fr/formatting.html 17 May 2009 15:35:23
-0000 1.23
+++ test/encodings/res/formatting_fr/formatting.html 23 May 2009 17:09:44
-0000 1.24
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/encodings/res/formatting_fr_icons/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr_icons/formatting.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- test/encodings/res/formatting_fr_icons/formatting.html 17 May 2009
15:35:24 -0000 1.23
+++ test/encodings/res/formatting_fr_icons/formatting.html 23 May 2009
17:09:44 -0000 1.24
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/def_cmds_info/def_cmds.info 27 Apr 2009 21:22:11
-0000 1.1
+++ test/formatting/res/def_cmds_info/def_cmds.info 23 May 2009 17:09:45
-0000 1.2
@@ -430,13 +430,13 @@
[index ]
* Menu:
-* A2: Top. (line 294)
* `A2': Top. (line 296)
-* A3: Top. (line 302)
* `A3': Top. (line 304)
+* `A4' of `A2': Top. (line 316)
+* A2: Top. (line 294)
+* A3: Top. (line 302)
* A3: Top. (line 310)
* A4 of A2: Top. (line 314)
-* `A4' of `A2': Top. (line 316)
* border-pattern: Top. (line 232)
* border-pattern of Window: Top. (line 235)
* d-efcv_name: Top. (line 58)
@@ -461,27 +461,20 @@
[index ]
* Menu:
-* I: Top. (line 13)
-* id ule: Top. (line 18)
-* id `i' ule: Top. (line 19)
-* I: Top. (line 113)
-* id ule: Top. (line 118)
-* id `i' ule: Top. (line 119)
-* FORWARD-CHAR: Top. (line 208)
-* A2: Top. (line 290)
+* )expose on )Window: Top. (line 256)
+* ,expose on ,Window: Top. (line 248)
+* ;expose on ;Window: Top. (line 264)
+* ;expose on ;Window: Top. (line 268)
* `A2': Top. (line 292)
-* A3: Top. (line 298)
* `A3': Top. (line 300)
-* A3 on A2: Top. (line 318)
* `A3' on `A2': Top. (line 320)
-* A4 on A2: Top. (line 322)
* `A4' on `A2': Top. (line 324)
* `int' on ): Top. (line 260)
* `int' on ,: Top. (line 252)
-* )expose on )Window: Top. (line 256)
-* ,expose on ,Window: Top. (line 248)
-* ;expose on ;Window: Top. (line 264)
-* ;expose on ;Window: Top. (line 268)
+* A2: Top. (line 290)
+* A3: Top. (line 298)
+* A3 on A2: Top. (line 318)
+* A4 on A2: Top. (line 322)
* after: Top. (line 37)
* after: Top. (line 137)
* bidule machin: Top. (line 26)
@@ -520,14 +513,21 @@
* e,xpose on W,indow: Top. (line 246)
* e;xpose on W;indow: Top. (line 262)
* e;xpose on W;indow: Top. (line 266)
-* expose on `com': Top. (line 270)
* 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)
* foobar: Top. (line 214)
* foobar: Top. (line 216)
* foobug: Top. (line 221)
+* FORWARD-CHAR: Top. (line 208)
+* I: Top. (line 13)
+* I: Top. (line 113)
+* id ule: Top. (line 18)
+* id ule: Top. (line 118)
+* id `i' ule: Top. (line 19)
+* id `i' ule: Top. (line 119)
* indow on W: Top. (line 241)
* indow on W: Top. (line 250)
* indow on W: Top. (line 258)
Index: test/formatting/res/float_docbook/float.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/float_docbook/float.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/float_docbook/float.2 19 Aug 2008 14:52:15 -0000
1.1
+++ test/formatting/res/float_docbook/float.2 23 May 2009 17:09:46 -0000
1.2
@@ -1,6 +0,0 @@
-i18n: missing string See %{title_ref}
-i18n: missing string %{ref}
-i18n: missing string see %{ref}
-i18n: missing string See %{ref}
-i18n: missing string %{title_ref}
-i18n: missing string section address@hidden'@asis{}' in @cite{%{book}}
Index: test/formatting/res/float_xml/float.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/float_xml/float.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/float_xml/float.2 25 Aug 2008 16:25:34 -0000
1.1
+++ test/formatting/res/float_xml/float.2 23 May 2009 17:09:46 -0000
1.2
@@ -1,2 +0,0 @@
-i18n: missing string See
-i18n: missing string see
Index: test/formatting/res/formatting_docbook/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_docbook/formatting.2,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/formatting/res/formatting_docbook/formatting.2 27 Apr 2009 18:45:47
-0000 1.9
+++ test/formatting/res/formatting_docbook/formatting.2 23 May 2009 17:09:46
-0000 1.10
@@ -48,13 +48,6 @@
** Empty index entry for @deffn (l. 42 in @mymacro)
** Cannot find @image file `f-ile.txt' (l. 18 in @mymacro)
** Cannot find @image file address@hidden' (l. 18 in @mymacro)
-i18n: missing string See section address@hidden'@asis{}' in @cite{%{book}}
-i18n: missing string section address@hidden'@asis{}' in @cite{%{book}}
-i18n: missing string see section address@hidden'@asis{}' in @cite{%{book}}
-i18n: missing string %{ref}
-i18n: missing string See %{ref}
-i18n: missing string see %{ref}
-i18n: missing string %{title_ref}
** Cannot find @image file `f-ile.txt' (l. 28 in @mymacro)
** Cannot find @image file address@hidden' (l. 28 in @mymacro)
** Cannot find @image file `f-ile.txt' (l. 18 in @mymacro)
Index: test/formatting/res/formatting_info/formatting.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_info/formatting.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvsDrOh4l and /tmp/cvsjEAw9Q differ
Index: test/formatting/res/formatting_weird_quotes/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_weird_quotes/formatting.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- test/formatting/res/formatting_weird_quotes/formatting.html 17 May 2009
15:35:26 -0000 1.24
+++ test/formatting/res/formatting_weird_quotes/formatting.html 23 May 2009
17:09:46 -0000 1.25
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/formatting/res/formatting_xml/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_xml/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/formatting_xml/formatting.2 2 Apr 2009 09:14:31
-0000 1.3
+++ test/formatting/res/formatting_xml/formatting.2 23 May 2009 17:09:46
-0000 1.4
@@ -30,6 +30,4 @@
** Empty index entry for @deffn (l. 42 in @mymacro)
** Empty index entry for @deffn (l. 42 in @mymacro)
** Empty index entry for @deffn (l. 42 in @mymacro)
-i18n: missing string See
-i18n: missing string see
*** @center should not appear in another format (l. 42 in @mymacro)
Index: test/layout/res/formatting_chm/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- test/layout/res/formatting_chm/formatting.html 17 May 2009 15:35:30
-0000 1.16
+++ test/layout/res/formatting_chm/formatting.html 23 May 2009 17:09:48
-0000 1.17
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting_1.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting_1.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_chm/formatting_1.html 17 May 2009 15:35:30
-0000 1.10
+++ test/layout/res/formatting_chm/formatting_1.html 23 May 2009 17:09:48
-0000 1.11
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting_2.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting_2.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_chm/formatting_2.html 17 May 2009 15:35:31
-0000 1.10
+++ test/layout/res/formatting_chm/formatting_2.html 23 May 2009 17:09:48
-0000 1.11
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting_3.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting_3.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_chm/formatting_3.html 17 May 2009 15:35:31
-0000 1.10
+++ test/layout/res/formatting_chm/formatting_3.html 23 May 2009 17:09:48
-0000 1.11
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting_4.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting_4.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_chm/formatting_4.html 17 May 2009 15:35:31
-0000 1.10
+++ test/layout/res/formatting_chm/formatting_4.html 23 May 2009 17:09:48
-0000 1.11
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting_5.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting_5.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/layout/res/formatting_chm/formatting_5.html 17 May 2009 15:35:31
-0000 1.12
+++ test/layout/res/formatting_chm/formatting_5.html 23 May 2009 17:09:48
-0000 1.13
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting_abt.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting_abt.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_chm/formatting_abt.html 17 May 2009 15:35:31
-0000 1.10
+++ test/layout/res/formatting_chm/formatting_abt.html 23 May 2009 17:09:48
-0000 1.11
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting_ovr.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting_ovr.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/layout/res/formatting_chm/formatting_ovr.html 17 May 2009 15:35:31
-0000 1.12
+++ test/layout/res/formatting_chm/formatting_ovr.html 23 May 2009 17:09:48
-0000 1.13
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting_toc.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting_toc.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/layout/res/formatting_chm/formatting_toc.html 17 May 2009 15:35:31
-0000 1.12
+++ test/layout/res/formatting_chm/formatting_toc.html 23 May 2009 17:09:48
-0000 1.13
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_exotic/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- test/layout/res/formatting_exotic/formatting.html 17 May 2009 15:35:31
-0000 1.21
+++ test/layout/res/formatting_exotic/formatting.html 23 May 2009 17:09:49
-0000 1.22
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_exotic/formatting_1.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting_1.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_exotic/formatting_1.html 17 May 2009 15:35:31
-0000 1.10
+++ test/layout/res/formatting_exotic/formatting_1.html 23 May 2009 17:09:49
-0000 1.11
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_exotic/formatting_2.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting_2.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- test/layout/res/formatting_exotic/formatting_2.html 17 May 2009 15:35:32
-0000 1.16
+++ test/layout/res/formatting_exotic/formatting_2.html 23 May 2009 17:09:49
-0000 1.17
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_exotic/formatting_3.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting_3.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- test/layout/res/formatting_exotic/formatting_3.html 17 May 2009 15:35:32
-0000 1.16
+++ test/layout/res/formatting_exotic/formatting_3.html 23 May 2009 17:09:49
-0000 1.17
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_exotic/formatting_4.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting_4.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/layout/res/formatting_exotic/formatting_4.html 17 May 2009 15:35:32
-0000 1.15
+++ test/layout/res/formatting_exotic/formatting_4.html 23 May 2009 17:09:49
-0000 1.16
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_exotic/formatting_abt.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting_abt.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/layout/res/formatting_exotic/formatting_abt.html 17 May 2009
15:35:32 -0000 1.12
+++ test/layout/res/formatting_exotic/formatting_abt.html 23 May 2009
17:09:49 -0000 1.13
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_exotic/formatting_ovr.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting_ovr.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_exotic/formatting_ovr.html 17 May 2009
15:35:32 -0000 1.14
+++ test/layout/res/formatting_exotic/formatting_ovr.html 23 May 2009
17:09:49 -0000 1.15
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_exotic/formatting_toc.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting_toc.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_exotic/formatting_toc.html 17 May 2009
15:35:32 -0000 1.14
+++ test/layout/res/formatting_exotic/formatting_toc.html 23 May 2009
17:09:49 -0000 1.15
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_makeinfo/chapter.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/chapter.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/layout/res/formatting_makeinfo/chapter.html 17 May 2009 15:35:32
-0000 1.15
+++ test/layout/res/formatting_makeinfo/chapter.html 23 May 2009 17:09:49
-0000 1.16
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_makeinfo/chapter2.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/chapter2.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- test/layout/res/formatting_makeinfo/chapter2.html 17 May 2009 15:35:32
-0000 1.17
+++ test/layout/res/formatting_makeinfo/chapter2.html 23 May 2009 17:09:49
-0000 1.18
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_makeinfo/formatting_abt.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/formatting_abt.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/layout/res/formatting_makeinfo/formatting_abt.html 17 May 2009
15:35:32 -0000 1.11
+++ test/layout/res/formatting_makeinfo/formatting_abt.html 23 May 2009
17:09:49 -0000 1.12
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_makeinfo/index.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/index.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- test/layout/res/formatting_makeinfo/index.html 17 May 2009 15:35:32
-0000 1.19
+++ test/layout/res/formatting_makeinfo/index.html 23 May 2009 17:09:49
-0000 1.20
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_makeinfo/s_002d_002dect_002cion.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/s_002d_002dect_002cion.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_makeinfo/s_002d_002dect_002cion.html 17 May
2009 15:35:32 -0000 1.14
+++ test/layout/res/formatting_makeinfo/s_002d_002dect_002cion.html 23 May
2009 17:09:49 -0000 1.15
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_makeinfo/subsection.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/subsection.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_makeinfo/subsection.html 17 May 2009 15:35:33
-0000 1.14
+++ test/layout/res/formatting_makeinfo/subsection.html 23 May 2009 17:09:49
-0000 1.15
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index:
test/layout/res/formatting_makeinfo/subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
---
test/layout/res/formatting_makeinfo/subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
17 May 2009 15:35:33 -0000 1.14
+++
test/layout/res/formatting_makeinfo/subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
23 May 2009 17:09:49 -0000 1.15
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_regions/formatting_regions.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_regions/formatting_regions.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- test/layout/res/formatting_regions/formatting_regions.html 17 May 2009
15:35:33 -0000 1.24
+++ test/layout/res/formatting_regions/formatting_regions.html 23 May 2009
17:09:50 -0000 1.25
@@ -97,7 +97,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/macros/res/node-expand_xml/node-expand.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/macros/res/node-expand_xml/node-expand.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/macros/res/node-expand_xml/node-expand.2 25 Aug 2008 16:25:41
-0000 1.1
+++ test/macros/res/node-expand_xml/node-expand.2 23 May 2009 17:09:50
-0000 1.2
@@ -1 +0,0 @@
-i18n: missing string See
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/manuals/res/ccvs_info/cvs.info-2 17 May 2009 15:35:34 -0000
1.3
+++ test/manuals/res/ccvs_info/cvs.info-2 23 May 2009 17:09:51 -0000
1.4
@@ -3090,8 +3090,6 @@
[index ]
* Menu:
-* `commitinfo': commitinfo. (line 6)
-* `verifymsg' (admin file): verifymsg. (line 6)
* !, in modules file: Excluding directories.
(line 6)
* #cvs.lock, removing: Concurrency. (line 11)
@@ -3103,10 +3101,6 @@
* #cvs.wfl, removing: Concurrency. (line 11)
* #cvs.wfl, technical details: Locks. (line 6)
* &, in modules file: Ampersand modules. (line 6)
-* `verifymsg', changing the log message: verifymsg. (line 31)
-* `verifymsg', changing the log message: config. (line 67)
-* `commitinfo', command environment: commitinfo. (line 30)
-* `commitinfo', working directory: commitinfo. (line 30)
* -a, in modules file: Alias modules. (line 6)
* -d, in modules file: Module options. (line 9)
* -e, in modules file: Module options. (line 12)
@@ -3153,6 +3147,12 @@
* =======: Conflicts example. (line 96)
* >>>>>>>: Conflicts example. (line 96)
* __ files (VMS): update output. (line 49)
+* `commitinfo': commitinfo. (line 6)
+* `commitinfo', command environment: commitinfo. (line 30)
+* `commitinfo', working directory: commitinfo. (line 30)
+* `verifymsg' (admin file): verifymsg. (line 6)
+* `verifymsg', changing the log message: verifymsg. (line 31)
+* `verifymsg', changing the log message: config. (line 67)
* Abandoning work: Editing files. (line 33)
* Access a branch: Accessing branches. (line 6)
* add (subcommand): Adding files. (line 29)
@@ -3365,9 +3365,9 @@
* Dates: Common options. (line 18)
* Dead state: Attic. (line 17)
* Decimal revision number: Revision numbers. (line 6)
-* DEFAULT in `verifymsg': verifymsg. (line 25)
* DEFAULT in commitinfo: commitinfo. (line 23)
* DEFAULT in editinfo: editinfo. (line 38)
+* DEFAULT in `verifymsg': verifymsg. (line 25)
* Defining a module: Defining the module. (line 6)
* Defining modules (intro): Intro administrative files.
(line 6)
@@ -3427,12 +3427,12 @@
* Example, branch merge: Merging a branch. (line 15)
* Excluding directories, in modules file: Excluding directories.
(line 6)
-* Exit status, of `verifymsg': verifymsg. (line 28)
* Exit status, of commitinfo: commitinfo. (line 19)
* Exit status, of CVS: Exit status. (line 6)
* Exit status, of editor: Error messages. (line 297)
* Exit status, of taginfo: user-defined logging.
(line 19)
+* Exit status, of `verifymsg': verifymsg. (line 28)
* export (subcommand): export. (line 6)
* Export program: Module options. (line 12)
* Fetching source: Getting the source. (line 6)
Index: test/misc/res/formatting_html32/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/misc/res/formatting_html32/formatting.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- test/misc/res/formatting_html32/formatting.html 17 May 2009 15:35:36
-0000 1.24
+++ test/misc/res/formatting_html32/formatting.html 23 May 2009 17:09:51
-0000 1.25
@@ -98,7 +98,7 @@
@th th
@exclamdown !
@questiondown ?
address@hidden pounds
address@hidden #
@registeredsymbol R
@ordf a
@ordm o
Index: test/sectionning/res/nodes_id_docbook/nodes_id.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/nodes_id_docbook/nodes_id.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/sectionning/res/nodes_id_docbook/nodes_id.2 27 Apr 2009 01:56:48
-0000 1.3
+++ test/sectionning/res/nodes_id_docbook/nodes_id.2 23 May 2009 17:09:52
-0000 1.4
@@ -1,3 +1 @@
-i18n: missing string See section address@hidden'@asis{}' in @cite{%{book}}
-i18n: missing string See %{ref}
** Cannot find @image file `image.txt' (l. 99)
Index: test/contents/res/contents_at_begin_info/contents_at_begin.2
===================================================================
RCS file: test/contents/res/contents_at_begin_info/contents_at_begin.2
diff -N test/contents/res/contents_at_begin_info/contents_at_begin.2
Index: test/contents/res/contents_at_end_info/contents_at_end.2
===================================================================
RCS file: test/contents/res/contents_at_end_info/contents_at_end.2
diff -N test/contents/res/contents_at_end_info/contents_at_end.2
Index:
test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.2
===================================================================
RCS file:
test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.2
diff -N
test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.2
Index:
test/contents/res/contents_in_middle_section_info/contents_in_middle_section.2
===================================================================
RCS file:
test/contents/res/contents_in_middle_section_info/contents_in_middle_section.2
diff -N
test/contents/res/contents_in_middle_section_info/contents_in_middle_section.2
Index: test/contents/res/double_contents_info/double_contents.2
===================================================================
RCS file: test/contents/res/double_contents_info/double_contents.2
diff -N test/contents/res/double_contents_info/double_contents.2
Index:
test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.2
===================================================================
RCS file:
test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.2
diff -N
test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.2
Index: test/coverage/res/comments_info/comments.2
===================================================================
RCS file: test/coverage/res/comments_info/comments.2
diff -N test/coverage/res/comments_info/comments.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/coverage/res/comments_info/comments.2 23 May 2009 17:09:44 -0000
1.1
@@ -0,0 +1 @@
+** Encoding name unknown: bad (l. 120)
Index: test/encodings/res/accentenc_info/accentenc.2
===================================================================
RCS file: test/encodings/res/accentenc_info/accentenc.2
diff -N test/encodings/res/accentenc_info/accentenc.2
Index: test/encodings/res/nodetest_info/nodetest.2
===================================================================
RCS file: test/encodings/res/nodetest_info/nodetest.2
diff -N test/encodings/res/nodetest_info/nodetest.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/encodings/res/nodetest_info/nodetest.2 23 May 2009 17:09:44 -0000
1.1
@@ -0,0 +1,2 @@
+*** Duplicate node for anchor found: @,{c} (l. 269)
+*** Node equivalent with address@hidden' already used address@hidden'
Index: test/formatting/res/at_command_glued_info/at_command_glued.2
===================================================================
RCS file: test/formatting/res/at_command_glued_info/at_command_glued.2
diff -N test/formatting/res/at_command_glued_info/at_command_glued.2
Index: test/formatting/res/def_cmds_info/def_cmds.2
===================================================================
RCS file: test/formatting/res/def_cmds_info/def_cmds.2
diff -N test/formatting/res/def_cmds_info/def_cmds.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/def_cmds_info/def_cmds.2 23 May 2009 17:09:45
-0000 1.1
@@ -0,0 +1,51 @@
+** Empty index entry for @deffn (l. 143 in @mymacro)
+** Empty index entry for @deffn (l. 143 in @mymacro)
+** Empty index entry for @deffn (l. 143 in @mymacro)
+** Empty index entry for @deffn (l. 143 in @mymacro)
+** Empty index entry for @deffn (l. 143 in @mymacro)
+** Empty index entry for @deffn (l. 143 in @mymacro)
+** Empty index entry for @deffn (l. 143 in @mymacro)
+** Empty index entry for @deffn (l. 143 in @mymacro)
+** Empty index entry for @deffn (l. 146 in @mymacro)
+** Empty index entry for @deffn (l. 146 in @mymacro)
+** Empty index entry for @deffn (l. 146 in @mymacro)
+** Empty index entry for @deffn (l. 146 in @mymacro)
+** Empty index entry for @deffn (l. 146 in @mymacro)
+** Empty index entry for @deffn (l. 146 in @mymacro)
+** Empty index entry for @deffn (l. 146 in @mymacro)
+** Empty index entry for @deffn (l. 146 in @mymacro)
+** Empty index entry for @deffn (l. 149 in @mymacro)
+** Empty index entry for @deffn (l. 149 in @mymacro)
+** Empty index entry for @deffn (l. 149 in @mymacro)
+** Empty index entry for @deffn (l. 149 in @mymacro)
+** Empty index entry for @deffn (l. 149 in @mymacro)
+** Empty index entry for @deffn (l. 149 in @mymacro)
+** Empty index entry for @deffn (l. 149 in @mymacro)
+** Empty index entry for @deffn (l. 149 in @mymacro)
+** Empty index entry for @deffn (l. 250)
+** Empty index entry for @defvr (l. 254)
+** Empty index entry for @deftypefn (l. 258)
+** Empty index entry for @deftypeop (l. 262)
+** Empty index entry for @deftypevr (l. 266)
+** Empty index entry for @defcv (l. 270)
+** Empty index entry for @deftypecv (l. 274)
+** Empty index entry for @defop (l. 278)
+** Empty index entry for @deftp (l. 282)
+*** '}' without opening '{' before: (l. 143 in @mymacro)
+*** '}' without opening '{' before: (l. 143 in @mymacro)
+*** '{' without macro. Before: (l. 143 in @mymacro)
+*** '{' without macro. Before: and after (l. 143 in @mymacro)
+*** '{' without macro. Before: more args (l. 143 in @mymacro)
+*** '}' without opening '{' before: (l. 143 in @mymacro)
+*** '}' without opening '{' before: (l. 146 in @mymacro)
+*** '}' without opening '{' before: (l. 146 in @mymacro)
+*** '{' without macro. Before: (l. 146 in @mymacro)
+*** '{' without macro. Before: and after (l. 146 in @mymacro)
+*** '{' without macro. Before: more args (l. 146 in @mymacro)
+*** '}' without opening '{' before: (l. 146 in @mymacro)
+*** '}' without opening '{' before: (l. 149 in @mymacro)
+*** '}' without opening '{' before: (l. 149 in @mymacro)
+*** '{' without macro. Before: (l. 149 in @mymacro)
+*** '{' without macro. Before: and after (l. 149 in @mymacro)
+*** '{' without macro. Before: more args (l. 149 in @mymacro)
+*** '}' without opening '{' before: (l. 149 in @mymacro)
Index: test/formatting/res/direntry_dircategory_info/direntry_dircategory.2
===================================================================
RCS file: test/formatting/res/direntry_dircategory_info/direntry_dircategory.2
diff -N test/formatting/res/direntry_dircategory_info/direntry_dircategory.2
Index:
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.2
===================================================================
RCS file:
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.2
diff -N
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.2
Index: test/formatting/res/formatting_info/formatting.2
===================================================================
RCS file: test/formatting/res/formatting_info/formatting.2
diff -N test/formatting/res/formatting_info/formatting.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/formatting_info/formatting.2 23 May 2009 17:09:46
-0000 1.1
@@ -0,0 +1,61 @@
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 28 in @mymacro)
+** Empty index entry for @deffn (l. 28 in @mymacro)
+** Empty index entry for @deffn (l. 28 in @mymacro)
+** Empty index entry for @deffn (l. 28 in @mymacro)
+** Empty index entry for @deffn (l. 28 in @mymacro)
+** Empty index entry for @deffn (l. 28 in @mymacro)
+** Empty index entry for @deffn (l. 28 in @mymacro)
+** Empty index entry for @deffn (l. 28 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 18 in @mymacro)
+** Empty index entry for @deffn (l. 38 in @mymacro)
+** Empty index entry for @deffn (l. 38 in @mymacro)
+** Empty index entry for @deffn (l. 38 in @mymacro)
+** Empty index entry for @deffn (l. 38 in @mymacro)
+** Empty index entry for @deffn (l. 38 in @mymacro)
+** Empty index entry for @deffn (l. 38 in @mymacro)
+** Empty index entry for @deffn (l. 38 in @mymacro)
+** Empty index entry for @deffn (l. 38 in @mymacro)
+** Empty index entry for @deffn (l. 42 in @mymacro)
+** Empty index entry for @deffn (l. 42 in @mymacro)
+** Empty index entry for @deffn (l. 42 in @mymacro)
+** Empty index entry for @deffn (l. 42 in @mymacro)
+** Empty index entry for @deffn (l. 42 in @mymacro)
+** Empty index entry for @deffn (l. 42 in @mymacro)
+** Empty index entry for @deffn (l. 42 in @mymacro)
+** Empty index entry for @deffn (l. 42 in @mymacro)
+** Cannot find @image file `f-ile.txt' (l. 18 in @mymacro)
+** Cannot find @image file ``f--ile'@..txt' (l. 18 in @mymacro)
+** Cannot find @image file `f-ile.txt' (l. 28 in @mymacro)
+** Cannot find @image file ``f--ile'@..txt' (l. 28 in @mymacro)
+** Cannot find @image file `f-ile.txt' (l. 18 in @mymacro)
+** Cannot find @image file ``f--ile'@..txt' (l. 18 in @mymacro)
+** Cannot find @image file `f-ile.txt' (l. 18 in @mymacro)
+** Cannot find @image file ``f--ile'@..txt' (l. 18 in @mymacro)
+** Cannot find @image file `f-ile.txt' (l. 38 in @mymacro)
+** Cannot find @image file ``f--ile'@..txt' (l. 38 in @mymacro)
+** Cannot find @image file `f-ile.txt' (l. 42 in @mymacro)
+** Cannot find @image file ``f--ile'@..txt' (l. 42 in @mymacro)
+*** @center should not appear in another format (l. 42 in @mymacro)
Index: test/formatting/res/heading_info/heading.2
===================================================================
RCS file: test/formatting/res/heading_info/heading.2
diff -N test/formatting/res/heading_info/heading.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/heading_info/heading.2 23 May 2009 17:09:47 -0000
1.1
@@ -0,0 +1 @@
+** Index entry before document: @cindex cindex copying (l. 8)
Index: test/formatting/res/kbdinputstyle_info/kbdinputstyle.2
===================================================================
RCS file: test/formatting/res/kbdinputstyle_info/kbdinputstyle.2
diff -N test/formatting/res/kbdinputstyle_info/kbdinputstyle.2
Index: test/formatting/res/nested_formats_info/nested_formats.2
===================================================================
RCS file: test/formatting/res/nested_formats_info/nested_formats.2
diff -N test/formatting/res/nested_formats_info/nested_formats.2
Index: test/formatting/res/nested_table_info/nested_table.2
===================================================================
RCS file: test/formatting/res/nested_table_info/nested_table.2
diff -N test/formatting/res/nested_table_info/nested_table.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/nested_table_info/nested_table.2 23 May 2009
17:09:47 -0000 1.1
@@ -0,0 +1,6 @@
+** Empty index entry for @vtable (l. 38 in @myvtable)
+** Empty index entry for @vtable (l. 38 in @myvtable)
+** Empty index entry for @vtable (l. 43 in @myvtable)
+** Empty index entry for @vtable (l. 43 in @myvtable)
+** Empty index entry for @vtable (l. 49 in @myvtable)
+** Empty index entry for @vtable (l. 49 in @myvtable)
Index: test/formatting/res/simple_images_info/simple_images.2
===================================================================
RCS file: test/formatting/res/simple_images_info/simple_images.2
diff -N test/formatting/res/simple_images_info/simple_images.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/simple_images_info/simple_images.2 23 May 2009
17:09:47 -0000 1.1
@@ -0,0 +1,4 @@
+** Cannot find @image file `f-ile.txt' (l. 12)
+** Cannot find @image file ``f--ile'@..txt' (l. 13)
+** Cannot find @image file `f-ile.txt' (l. 22)
+** Cannot find @image file ``f--ile'@..txt' (l. 23)
Index: test/formatting/res/simple_table_info/simple_table.2
===================================================================
RCS file: test/formatting/res/simple_table_info/simple_table.2
diff -N test/formatting/res/simple_table_info/simple_table.2
Index: test/formatting/res/test_sp_info/test_sp.2
===================================================================
RCS file: test/formatting/res/test_sp_info/test_sp.2
diff -N test/formatting/res/test_sp_info/test_sp.2
Index: test/indices/res/index_entry_in_footnote_info/index_entry_in_footnote.2
===================================================================
RCS file:
test/indices/res/index_entry_in_footnote_info/index_entry_in_footnote.2
diff -N test/indices/res/index_entry_in_footnote_info/index_entry_in_footnote.2
Index:
test/indices/res/index_entry_in_footnote_separated_info/index_entry_in_footnote.2
===================================================================
RCS file:
test/indices/res/index_entry_in_footnote_separated_info/index_entry_in_footnote.2
diff -N
test/indices/res/index_entry_in_footnote_separated_info/index_entry_in_footnote.2
Index: test/macros/res/cond_info/cond.2
===================================================================
RCS file: test/macros/res/cond_info/cond.2
diff -N test/macros/res/cond_info/cond.2
Index: test/macros/res/macro-at_info/macro-at.2
===================================================================
RCS file: test/macros/res/macro-at_info/macro-at.2
diff -N test/macros/res/macro-at_info/macro-at.2
Index: test/macros/res/no_arg_macro_info/no_arg_macro.2
===================================================================
RCS file: test/macros/res/no_arg_macro_info/no_arg_macro.2
diff -N test/macros/res/no_arg_macro_info/no_arg_macro.2
Index: test/macros/res/node-expand_info/node-expand.2
===================================================================
RCS file: test/macros/res/node-expand_info/node-expand.2
diff -N test/macros/res/node-expand_info/node-expand.2
Index:
test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.2
===================================================================
RCS file:
test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.2
diff -N
test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.2
Index: test/manuals/res/ccvs_info/cvs.2
===================================================================
RCS file: test/manuals/res/ccvs_info/cvs.2
diff -N test/manuals/res/ccvs_info/cvs.2
Index: test/sectionning/test_two_include.texi
===================================================================
RCS file: test/sectionning/test_two_include.texi
diff -N test/sectionning/test_two_include.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/test_two_include.texi 23 May 2009 17:09:51 -0000
1.1
@@ -0,0 +1,15 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden test_two_include.info
+
address@hidden Top
+
+Include version
address@hidden version.texi
+
+include inc_file
address@hidden inc_file.texi
+
+After inclusion.
+
address@hidden
Index: test/sectionning/res/anchor_in_footnote_info/anchor_in_footnote.2
===================================================================
RCS file: test/sectionning/res/anchor_in_footnote_info/anchor_in_footnote.2
diff -N test/sectionning/res/anchor_in_footnote_info/anchor_in_footnote.2
Index:
test/sectionning/res/anchor_in_footnote_separated_info/anchor_in_footnote.2
===================================================================
RCS file:
test/sectionning/res/anchor_in_footnote_separated_info/anchor_in_footnote.2
diff -N
test/sectionning/res/anchor_in_footnote_separated_info/anchor_in_footnote.2
Index: test/sectionning/res/at_commands_in_refs_info/at_commands_in_refs.2
===================================================================
RCS file: test/sectionning/res/at_commands_in_refs_info/at_commands_in_refs.2
diff -N test/sectionning/res/at_commands_in_refs_info/at_commands_in_refs.2
Index: test/sectionning/res/node_footnote_info/node_footnote.2
===================================================================
RCS file: test/sectionning/res/node_footnote_info/node_footnote.2
diff -N test/sectionning/res/node_footnote_info/node_footnote.2
Index: test/sectionning/res/node_footnote_separated_info/node_footnote.2
===================================================================
RCS file: test/sectionning/res/node_footnote_separated_info/node_footnote.2
diff -N test/sectionning/res/node_footnote_separated_info/node_footnote.2
Index: test/sectionning/res/test_two_include/test_two_include.2
===================================================================
RCS file: test/sectionning/res/test_two_include/test_two_include.2
diff -N test/sectionning/res/test_two_include/test_two_include.2
Index: test/sectionning/res/test_two_include/test_two_include.html
===================================================================
RCS file: test/sectionning/res/test_two_include/test_two_include.html
diff -N test/sectionning/res/test_two_include/test_two_include.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/test_two_include/test_two_include.html 23 May 2009
17:09:52 -0000 1.1
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<h1 class="node">Top</h1>
+
+<p>Include version
+</p>
+<p>include inc_file
+In included file.
+</p>
+<p>After inclusion.
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/sectionning/res/two_footnotes_in_nodes_info/two_footnotes_in_nodes.2
===================================================================
RCS file:
test/sectionning/res/two_footnotes_in_nodes_info/two_footnotes_in_nodes.2
diff -N
test/sectionning/res/two_footnotes_in_nodes_info/two_footnotes_in_nodes.2
Index:
test/sectionning/res/two_footnotes_in_nodes_separated_info/two_footnotes_in_nodes.2
===================================================================
RCS file:
test/sectionning/res/two_footnotes_in_nodes_separated_info/two_footnotes_in_nodes.2
diff -N
test/sectionning/res/two_footnotes_in_nodes_separated_info/two_footnotes_in_nodes.2
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog Makefile.am Makefile.in tex...,
Patrice Dumas <=