[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te... |
|
Date: |
Sat, 02 May 2009 11:31:21 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/05/02 11:31:19
Modified files:
. : ChangeLog NEWS TODO texi2html.init texi2html.pl
doc : texi2html.texi
examples : info.init mediawiki.init xml.init
test/contents : tests.txt
test/coverage/res/formatting: formatting.html
test/encodings/res/formatting_fr: formatting.html
test/encodings/res/formatting_fr_icons: formatting.html
test/formatting: Makefile.am Makefile.in tests.txt
test/formatting/res/formatting_weird_quotes: formatting.html
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 : Makefile.am Makefile.in tests.txt
test/manuals : tests.txt
test/manuals/res/ccvs_info: cvs.info
test/manuals/res/texinfo: texinfo_cp.idx
test/misc/res/formatting_html32: formatting.html
test/tar_manual/res/texi_tar: tar.passfirst tar.passtexi
tar.texi
Added files:
test/contents/res/contents_at_begin_info: contents_at_begin.info
test/contents/res/contents_at_end_info: contents_at_end.info
test/contents/res/contents_in_middle_chapter_info:
contents_in_middle_chapter.info
test/contents/res/contents_in_middle_section_info:
contents_in_middle_section.info
test/contents/res/double_contents_info: double_contents.info
test/contents/res/double_contents_setcontentsaftertitlepage_info:
double_contents_setcontentsaftertitlepage.info
test/formatting: direntry_dircategory.texi simple_table.texi
test/formatting/res/direntry_dircategory: direntry_dircategory.2
direntry_dircategory.html
test/formatting/res/direntry_dircategory_info:
direntry_dircategory.info
test/formatting/res/direntry_dircategory_info_split:
direntry_dircategory.info
direntry_dircategory.info-1
direntry_dircategory.info-2
test/formatting/res/formatting_info: formatting.info
test/formatting/res/texi_direntry_dircategory:
direntry_dircategory.2
direntry_dircategory.passfirst
direntry_dircategory.passtexi
direntry_dircategory.texi
test/macros : included_file_with_setfilename.texi
no_arg_macro.texi
test_include_with_setfilename.texi
test/macros/res/no_arg_macro_info: no_arg_macro.info
test/macros/res/test_include_with_setfilename_info:
test_include_with_setfilename.info
test/macros/res/texi_no_arg_macro: no_arg_macro.2
no_arg_macro.passfirst
no_arg_macro.passtexi
no_arg_macro.texi
test/macros/res/texi_test_include_with_setfilename:
test_include_with_setfilename.2
test_include_with_setfilename.passfirst
test_include_with_setfilename.passtexi
test_include_with_setfilename.texi
Log message:
* texi2html.pl: ignore @setfilename in included file,
consistently
with the texinfo manual.
Allow @cartouche to be handled like a simple_format.
* texi2html.pl, texi2html.init: @direntry is handled like a
menu, not a raw environment.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.380&r2=1.381
http://cvs.savannah.gnu.org/viewcvs/texi2html/NEWS?cvsroot=texi2html&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.192&r2=1.193
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.281&r2=1.282
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.texi?cvsroot=texi2html&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/mediawiki.init?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/xml.init?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/tests.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/contents_at_begin_info/contents_at_begin.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/contents_at_end_info/contents_at_end.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/contents_in_middle_section_info/contents_in_middle_section.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/double_contents_info/double_contents.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/formatting/formatting.html?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr/formatting.html?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr_icons/formatting.html?cvsroot=texi2html&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.am?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.in?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/tests.txt?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/direntry_dircategory.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/simple_table.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/direntry_dircategory/direntry_dircategory.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/direntry_dircategory/direntry_dircategory.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/direntry_dircategory_info/direntry_dircategory.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-1?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_info/formatting.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_weird_quotes/formatting.html?cvsroot=texi2html&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_direntry_dircategory/direntry_dircategory.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_direntry_dircategory/direntry_dircategory.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_1.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_2.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_3.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_4.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_5.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_abt.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_ovr.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting_toc.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting.html?cvsroot=texi2html&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_1.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_2.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_3.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_4.html?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_abt.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_ovr.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting_toc.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/chapter.html?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/chapter2.html?cvsroot=texi2html&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/formatting_abt.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/index.html?cvsroot=texi2html&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/s_002d_002dect_002cion.html?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/subsection.html?cvsroot=texi2html&r1=1.12&r2=1.13
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.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_regions/formatting_regions.html?cvsroot=texi2html&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/Makefile.am?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/Makefile.in?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/tests.txt?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/included_file_with_setfilename.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/no_arg_macro.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/test_include_with_setfilename.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/no_arg_macro_info/no_arg_macro.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.info?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_no_arg_macro/no_arg_macro.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_no_arg_macro/no_arg_macro.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_no_arg_macro/no_arg_macro.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_no_arg_macro/no_arg_macro.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/tests.txt?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs_info/cvs.info?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/texinfo/texinfo_cp.idx?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/formatting_html32/formatting.html?cvsroot=texi2html&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/texi_tar/tar.passfirst?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/texi_tar/tar.passtexi?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/texi_tar/tar.texi?cvsroot=texi2html&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -b -r1.380 -r1.381
--- ChangeLog 27 Apr 2009 21:22:10 -0000 1.380
+++ ChangeLog 2 May 2009 11:31:00 -0000 1.381
@@ -1,8 +1,16 @@
+2009-05-01 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: ignore @setfilename in included file, consistently
+ with the texinfo manual.
+ Allow @cartouche to be handled like a simple_format.
+ * texi2html.pl, texi2html.init: @direntry is handled like a
+ menu, not a raw environment.
+
2009-04-27 Patrice Dumas <address@hidden>
* texi2html.pl: simplify index handling and fix syn*index to do
the same than in the documentation and in makeinfo/texi2dvi.
- fix index_summary_file.
+ Fix index_summary_file.
Fix line count with a def* protected end of line at the end of
the file.
* texi2html.init: @page stops paragraphs.
@@ -64,7 +72,7 @@
contexts when paragraphs should not appear, and also give context
of close_paragraph to be able to deliver an error message stating
that something triggering paragraph closing happened while it
- shouldn't have..
+ shouldn't have.
Change the System Identifier to be conformant with what w3c now
wants (report from Andreas Lochmann).
* texi2html.pl: Split close_stack_texi_structure in
Index: NEWS
===================================================================
RCS file: /cvsroot/texi2html/texi2html/NEWS,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- NEWS 25 Apr 2009 14:54:41 -0000 1.95
+++ NEWS 2 May 2009 11:31:00 -0000 1.96
@@ -2,11 +2,18 @@
1.84 ()
+* NEW FEATURES
+ ------------
+
+* new info backend, ready for world domination!
+
* BUG FIXES
---------
* Handling of @itemize and @table arguments are more in line with makeinfo.
+* ignore @setfilename in @include'd files, as told in the texinfo manual.
+
* COMPATIBILITY
-------------
@@ -14,10 +21,12 @@
and apply the @-command given as @table argument. Correspondingly,
some arguments of $table_item have been removed.
-* Formatting of titlepage chaned, and @title, @subtitle and @author
+* Formatting of titlepage changed, and @title, @subtitle and @author
are now handled by $line_command.
-* verbatiminclude is now a $raw command argument distinct from verbatim.
+* @verbatiminclude is now a $raw command argument distinct from @verbatim.
+
+* @direntry is formatted like a menu and passed down to $menu_command.
1.82 (2009-01-05)
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- TODO 27 Apr 2009 18:45:45 -0000 1.95
+++ TODO 2 May 2009 11:31:00 -0000 1.96
@@ -372,3 +372,11 @@
* add tests for -o - and input coming from stdin, including check of
out file names.
+
+
+* /dev/null ad NUL on dos is acceptable as -o
+ it is possible to use
+ $devnull = File::Spec->devnull();
+ but maybe not on djgpp osname osvers
+
+* warning if @direcategory/@direntry after first node or element.
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- texi2html.init 27 Apr 2009 18:45:45 -0000 1.192
+++ texi2html.init 2 May 2009 11:31:01 -0000 1.193
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.192 2009/04/27 18:45:45 pertusus Exp $
+# $Id: texi2html.init,v 1.193 2009/05/02 11:31:01 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -854,7 +854,7 @@
# not in code_style, according to post on bug-texinfo
if ($SIMPLE_MENU)
{
- foreach my $format ('menu', 'detailmenu')
+ foreach my $format ('menu', 'detailmenu', 'direntry')
{
if (!defined($complex_format_map->{$format}))
{
@@ -2232,11 +2232,11 @@
'ss', 'ss',
'l', 'l',
'L', 'L',
- 'exclamdown', '! upside-down',
+ 'exclamdown', '!',
#'exclamdown', '¡',
- 'questiondown', '? upside-down',
+ 'questiondown', '?',
#'questiondown', '¿',
- 'pounds', 'pound sterling',
+ 'pounds', 'pounds',
#'pounds', '£'
'ordf' => 'a',
'ordm' => 'o',
@@ -3973,7 +3973,7 @@
'ifnotinfo' => 1,
'ifnotxml' => 1,
'ifnotdocbook' => 1,
- 'direntry' => 'raw',
+ 'direntry' => 'normal',
'verbatim' => 'raw',
'ifclear' => 'value',
'ifset' => 'value' ,
@@ -5049,6 +5049,7 @@
}
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";
@@ -5107,7 +5108,7 @@
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');
+ $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";
@@ -5151,7 +5152,7 @@
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');
+ $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'});
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -b -r1.281 -r1.282
--- texi2html.pl 27 Apr 2009 21:22:10 -0000 1.281
+++ texi2html.pl 2 May 2009 11:31:01 -0000 1.282
@@ -79,7 +79,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.281 2009/04/27 21:22:10 pertusus Exp $
+# $Id: texi2html.pl,v 1.282 2009/05/02 11:31:01 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -1779,6 +1779,7 @@
$format_type{'menu'} = 'menu';
$format_type{'detailmenu'} = 'menu';
+$format_type{'direntry'} = 'menu';
$format_type{'cartouche'} = 'cartouche';
@@ -3134,7 +3135,7 @@
# correct %Texi2HTML::Config::texi_formats_map based on command line and init
# variables
-$Texi2HTML::Config::texi_formats_map{'menu'} = 1 if
($Texi2HTML::Config::SHOW_MENU);
+$Texi2HTML::Config::texi_formats_map{'menu'} = 'normal' if
($Texi2HTML::Config::SHOW_MENU);
foreach my $expanded (@Texi2HTML::Config::EXPAND)
{
@@ -3146,7 +3147,7 @@
}
else
{
- $Texi2HTML::Config::texi_formats_map{$expanded} = 1;
+ $Texi2HTML::Config::texi_formats_map{$expanded} = 'normal';
}
}
@@ -3160,7 +3161,7 @@
}
}
-#Â the remaining (not EXPAND) raw formats are set as 'raw' such that
+#Â the remaining (not in @EXPAND) raw formats are set as 'raw' such that
# they are propagated to formatting functions, but
#Â they don't start paragraphs or preformatted.
foreach my $raw (@raw_regions)
@@ -3981,6 +3982,7 @@
# to be used
$state->{'menu'} = 0; # number of opened menus
$state->{'detailmenu'} = 0; # number of opened detailed menus
+ $state->{'direntry'} = 0; # number of opened direntry
$state->{'sectionning_base'} = 0; # current base sectionning level
$state->{'table_stack'} = [ "no table" ]; # a stack of opened tables/lists
# seems to be only debug
@@ -5121,6 +5123,7 @@
my $node = shift;
my $state = shift;
my $line_nr = shift;
+ return if ($state->{'direntry'});
my $node_menu_ref = {};
if (exists($nodes{$node}))
{
@@ -6976,6 +6979,7 @@
$state->{'keep_texi'} = 0 unless exists($state->{'keep_texi'});
$state->{'keep_nr'} = 0 unless exists($state->{'keep_nr'});
$state->{'detailmenu'} = 0 unless exists($state->{'detailmenu'}); #
number of opened detailed menus
+ $state->{'direntry'} = 0 unless exists($state->{'direntry'}); # number
of opened detailed menus
$state->{'sec_num'} = 0 unless exists($state->{'sec_num'});
$state->{'paragraph_style'} = [ '' ] unless
exists($state->{'paragraph_style'});
$state->{'preformatted_stack'} = [ '' ] unless
exists($state->{'preformatted_stack'});
@@ -7618,7 +7622,7 @@
&$Texi2HTML::Config::print_page_foot($Texi2HTML::THISDOC{'FH'});
# this leaves the possibility for external code to close the file
#Â without erroring out
- #close_out ($Texi2HTML::THISDOC{'FH'});
+ close_out ($Texi2HTML::THISDOC{'FH'}) if
(fileno($Texi2HTML::THISDOC{'FH'}));
}
pop_state();
}
@@ -8405,6 +8409,7 @@
}
# handle raw formatting, ignored regions...
+#Â called from scan_texi, so only in first pass.
sub do_text_macro($$$$$)
{
my $type = shift;
@@ -8868,7 +8873,7 @@
$state->{$format}--;
if ($state->{$format} < 0)
{ # FIXME currently happens, see invalid/not_closed_in_menu.texi
- echo_error("Too many menu closed", $line_nr);
+ echo_error("Too many $format closed", $line_nr);
#print STDERR "Bug, $format counter negative:
$state->{$format}\n";
#dump_stack($text, $stack, $state);
#exit 1;
@@ -8948,10 +8953,6 @@
}
add_prev($text, $stack,
&$Texi2HTML::Config::def($format_ref->{'text'}, $format_ref->{'orig_format'}));
}
- elsif ($format_type{$format} eq 'cartouche')
- {
- add_prev($text, $stack,
&$Texi2HTML::Config::cartouche($format_ref->{'text'},$state->{'command_stack'}));
- }
elsif ($format eq 'float')
{
unless (defined($state->{'float'}))
@@ -9045,6 +9046,10 @@
add_prev($text, $stack, end_simple_format($format_ref->{'format'},
$format_ref->{'text'}, $state));
}
}
+ elsif ($format_type{$format} eq 'cartouche')
+ {
+ add_prev($text, $stack,
&$Texi2HTML::Config::cartouche($format_ref->{'text'},$state->{'command_stack'}));
+ }
elsif ($format_type{$format} eq 'menu')
{
# it should be short-circuited if $Texi2HTML::Config::SIMPLE_MENU
@@ -9062,10 +9067,13 @@
{
add_prev($text, $stack,
&$Texi2HTML::Config::menu($format_ref->{'text'}));
}
- else # detailmenu
+ elsif ($format eq 'detailmenu') # detailmenu
{
add_prev($text, $stack, $format_ref->{'text'});
}
+ else # direntry
+ {
+ }
}
else
{
@@ -9412,15 +9420,8 @@
if ($state->{'preformatted'})
{
# add a fake complex style in order to have a given pre style
- # FIXME check 'style' on bug-texinfo
push_complex_format_style('menu',
- $Texi2HTML::Config::MENU_PRE_COMPLEX_FORMAT
-# {
-# 'pre_style' => $Texi2HTML::Config::MENU_PRE_STYLE,
-# 'class' => 'menu-preformatted',
-## 'style' => 'code'
-# }
- , $state);
+ $Texi2HTML::Config::MENU_PRE_COMPLEX_FORMAT, $state);
begin_paragraph_after_command($state,$stack,$macro,$line);
}
else
@@ -9515,7 +9516,7 @@
my $state = shift;
my $line_nr = shift;
my $menu_entry = shift;
-# my $menu_entry = $state->{'menu_entry'};
+
my $file = $state->{'element'}->{'file'};
my $node_name = normalise_node($menu_entry->{'node'});
# normalise_node is used in fact to determine if name is empty.
@@ -9543,10 +9544,19 @@
my $entry = '';
my $href;
- my $element = $nodes{$node_name};
+
+ my $element;
+ if ($state->{'direntry'})
+ {
+ $href = do_external_href($node_name);
+ }
+ else
+ {
+ $element = $nodes{$node_name};
+ }
# menu points to an unknown node
- if (!$element->{'seen'})
+ if (defined($element) and !$element->{'seen'})
{
if ($menu_entry->{'node'} =~ /^\s*\(.*\)/o or $novalidate)
{
@@ -9578,7 +9588,7 @@
}
# the original node or an equivalent node was seen
- if ($element->{'seen'})
+ if (defined($element) and $element->{'seen'})
{
if ($element->{'reference_element'})
{
@@ -9608,7 +9618,14 @@
my $element = $menu_entry->{'menu_reference_element'};
- return &$Texi2HTML::Config::menu_description($text,
duplicate_formatting_state($state),$element->{'text_nonumber'},
$state->{'command_stack'}, $state->{'preformatted'});
+ ############# debug
+ #Â this is not a bug if element is not defined in direntry
+ print STDERR "Bug: !defined(element) in do_menu_description\n" if
(!defined($element) and ($state->{'menu'} or $state->{'detailmenu'}));
+ ############# end debug
+ my $element_text = '';
+ $element_text = $element->{'text_nonumber'} if (defined($element));
+
+ return &$Texi2HTML::Config::menu_description($text,
duplicate_formatting_state($state),$element_text, $state->{'command_stack'},
$state->{'preformatted'});
}
sub do_xref($$$$)
@@ -10768,7 +10785,7 @@
{
pop @{$state->{'text_macro_stack'}};
# we keep menu and titlepage for the following pass
- if ((($end_tag eq 'menu') and
$Texi2HTML::Config::texi_formats_map{'menu'}) or ($region_lines{$end_tag}) or
$state->{'arg_expansion'})
+ if (($Texi2HTML::Config::texi_formats_map{$end_tag} eq
'normal') or ($region_lines{$end_tag}) or $state->{'arg_expansion'})
{
add_prev($text, $stack, "address@hidden");
}
@@ -10783,7 +10800,7 @@
{
echo_error ("address@hidden $end_tag without corresponding
element", $line_nr);
}
- else
+ else # a format that is not handled during the first pass
{# ARG_EXPANSION
add_prev($text, $stack, "address@hidden");
}
@@ -10816,7 +10833,7 @@
or $macro eq 'definfoenclose' or $macro eq 'include')
{ # special commands whose arguments will have @macro and
# @value expanded, and that are processed in this pass
- if ($state->{'ignored'})
+ if ($state->{'ignored'} or ($line_nr->{'file_name'} ne
$Texi2HTML::THISDOC{'input_file_name'} and $macro eq 'setfilename'))
{
$cline = '';
}
@@ -10907,7 +10924,7 @@
# we must keep it for later, unless we are in an 'ignored'.
# if in 'arg_expansion' we keep everything.
my $macro_kept;
- if ((($state->{'raw'} or (($macro eq 'menu') and
$Texi2HTML::Config::texi_formats_map{'menu'}) or
(exists($region_lines{$macro}))) and !$state->{'ignored'}) or
$state->{'arg_expansion'})
+ if ((($state->{'raw'} or
($Texi2HTML::Config::texi_formats_map{$macro} eq 'normal') or
(exists($region_lines{$macro}))) and !$state->{'ignored'}) or
$state->{'arg_expansion'})
{
add_prev($text, $stack, $tag);
$macro_kept = 1;
@@ -11085,7 +11102,7 @@
{
my $top = pop @$stack;
# defer this to later?
- echo_error ("unclosed command in
address@hidden>{'line_command'}: $top->{'style'}");
+ #echo_error ("unclosed command in
address@hidden>{'line_command'}: $top->{'style'}");
add_prev($text, $stack,
"address@hidden>{'style'}".'{'.$top->{'text'}.'}');
}
my $command = pop @$stack;
@@ -11238,7 +11255,6 @@
my $line_nr = shift;
my $remaining_on_line = shift;
- $state->{'detailmenu'}-- if ($end_tag eq 'detailmenu' and
$state->{'detailmenu'});
if (defined($state->{'text_macro_stack'})
and @{$state->{'text_macro_stack'}}
and ($end_tag eq $state->{'text_macro_stack'}->[-1]))
@@ -11257,8 +11273,9 @@
}
#dump_stack($text, $stack, $state);
}
- if ($end_tag eq 'menu' or
$Texi2HTML::Config::region_formats_kept{$end_tag})
+ if (($Texi2HTML::Config::texi_formats_map{$end_tag} eq 'normal') or
$Texi2HTML::Config::region_formats_kept{$end_tag})
{
+ $state->{$end_tag}-- if
($Texi2HTML::Config::texi_formats_map{$end_tag} eq 'normal');
add_prev($text, $stack, "address@hidden $end_tag");
}
else
@@ -11267,13 +11284,17 @@
#dump_stack($text, $stack, $state);
return 1 if ($remaining_on_line =~ /^\s*$/);
}
- $state->{'menu'}-- if ($end_tag eq 'menu');
}
elsif ($Texi2HTML::Config::texi_formats_map{$end_tag})
{
echo_error ("address@hidden $end_tag without corresponding element",
$line_nr);
#dump_stack($text, $stack, $state);
}
+ elsif ($end_tag eq 'detailmenu' or $end_tag eq 'direntry')
+ {
+ $state->{$end_tag}-- if $state->{$end_tag};
+ add_prev($text, $stack, "address@hidden $end_tag");
+ }
else
{
if ($end_tag eq 'float' and $state->{'float'})
@@ -11441,12 +11462,6 @@
add_prev ($text, $stack, "address@hidden".$line);
next;
}
- elsif ($macro eq 'detailmenu')
- {
- add_prev ($text, $stack, "address@hidden" . $cline);
- $state->{'detailmenu'}++;
- last;
- }
elsif ($sec2level{$macro})
{
if ($cline =~ /^\s*(.*)$/)
@@ -11509,10 +11524,13 @@
$state->{'raw'} = $macro;
#print STDERR "RAW\n";
}
- elsif ($macro eq 'menu')
+ elsif ($Texi2HTML::Config::texi_formats_map{$macro} eq
'normal')
+ {
+ if ($macro eq 'menu')
{
- $state->{'menu'}++;
delete ($state->{'prev_menu_node'});
+ }
+ $state->{$macro}++;
push @{$state->{'text_macro_stack'}}, $macro;
#print STDERR "MENU (text_macro_stack:
@{$state->{'text_macro_stack'}})\n";
}
@@ -11534,7 +11552,7 @@
}
# if it is a raw formatting command or a menu command
# we must keep it for later
- if (($state->{'raw'} and
(!defined($Texi2HTML::Config::command_handler{$macro}))) or ($macro eq 'menu'))
+ if (($state->{'raw'} and
(!defined($Texi2HTML::Config::command_handler{$macro}))) or
($Texi2HTML::Config::texi_formats_map{$macro} eq 'normal'))
{
add_prev($text, $stack, "address@hidden");
$macro_kept = 1;
@@ -11547,6 +11565,12 @@
#dump_stack ($text, $stack, $state);
return if ($cline =~ /^\s*$/);
}
+ elsif ($macro eq 'detailmenu' or $macro eq 'direntry')
+ {
+ add_prev ($text, $stack, "address@hidden" . $cline);
+ $state->{$macro}++;
+ last;
+ }
elsif ($macro eq 'float')
{
my ($style_texi, $label_texi) = split(/,/, $cline);
@@ -11838,7 +11862,7 @@
# in pass_structure
unless ($state->{'end_of_line_protected'}) # and $in_some_format)
{
- if (!$state->{'raw'} and !$state->{'verb'} and $state->{'menu'})
+ if (!$state->{'raw'} and !$state->{'verb'} and ($state->{'menu'} or
$state->{'direntry'}))
{ # new menu entry
my ($node, $name, $ending);
if ($cline =~ s/^\*(\s+$NODERE)(::)//o)
Index: doc/texi2html.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.texi,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- doc/texi2html.texi 27 Apr 2009 17:14:06 -0000 1.85
+++ doc/texi2html.texi 2 May 2009 11:31:02 -0000 1.86
@@ -3848,7 +3848,8 @@
or a detailmenu in that case:
@deftypefn {Function Reference} $menu menu_command $command
$menu_components_text
address@hidden is the menu command, currently @samp{menu} or @samp{detailmenu}.
address@hidden is the menu command, currently @samp{menu}, @samp{detailmenu}
+or @samp{direntry}.
@var{$menu_components_text} is the formatted menu components text, obtained
as explained above.
@end deftypefn
@@ -4537,9 +4538,10 @@
@item $format_list_item_texi should now modify directly the @@item argument
and apply the @@-command given as @@table argument. Correspondingly,
some arguments of $table_item have been removed.
address@hidden Formatting of titlepage chaned, and @@title, @@subtitle and
@@author
address@hidden Formatting of titlepage changed, and @@title, @@subtitle and
@@author
are now handled by $line_command
address@hidden verbatiminclude is now a $raw command argument distinct from
verbatim.
address@hidden @@verbatiminclude is now a $raw command argument distinct from
@@verbatim.
address@hidden @@direntry is formatted like a menu and passed down to
$menu_command.
@end itemize
@item API changes between 1.78 and 1.80:
@itemize @bullet
Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- examples/info.init 27 Apr 2009 01:56:40 -0000 1.39
+++ examples/info.init 2 May 2009 11:31:02 -0000 1.40
@@ -1,11 +1,8 @@
-
-########## WORK IN PROGRESS ##################
-
#+##############################################################################
#
# info.init: convert to info
#
-# Copyright (C) 2008 Patrice Dumas <address@hidden>
+# Copyright (C) 2008, 2009 Patrice Dumas <address@hidden>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,7 +29,7 @@
$USE_NODES = 1;
$USE_SECTIONS = 0;
address@hidden = ('info');
address@hidden = ('info', 'direntry');
$EXTENSION = 'info';
$SHOW_MENU = 1;
$USE_SETFILENAME = 1;
@@ -41,6 +38,7 @@
$SPLIT_INDEX = 0;
$SEPARATED_FOOTNOTES = 0;
$INLINE_CONTENTS = 1;
+$INLINE_INSERTCOPYING = 1;
$SIMPLE_MENU = 1;
$MENU_SYMBOL = '*';
$USE_MENU_DIRECTIONS = 0;
@@ -186,7 +184,7 @@
$special_list_commands{'itemize'} = {};
my @info_default_normal_formats = ('table', 'vtable', 'ftable', 'enumerate',
'itemize');
-foreach my $format (@info_default_normal_formats, 'group')
+foreach my $format (@info_default_normal_formats, 'group', 'cartouche')
{
$format_map{$format} = '';
}
@@ -309,12 +307,13 @@
return $copying_text;
}
-sub info_default_count_lines($$;$$)
+sub info_default_count_lines($;$$)
{
my $text = shift;
- my $info_state = shift;
my $indent_length = shift;
my $indentation_done = shift;
+
+ my $blank_line;
my $no_indentation = 0;
if (!defined($indentation_done) or $indentation_done)
@@ -331,7 +330,7 @@
my $end_of_line = 0;
if (($#lines > 1) and !$end_of_line and ($lines[-1] !~ /\S/) and
($lines[-2] !~ /\S/))
{
- $info_state->{'blank_line'} = 1;
+ $blank_line = 1;
}
my $last_line = $lines[-1];
@@ -354,7 +353,7 @@
$line_passed++;
$end_of_line = 1;
}
- return ($line_passed, $end_of_line, $last_line, $indented_text);
+ return ($line_passed, $end_of_line, $last_line, $indented_text,
$blank_line);
}
#Â FIXME initialize
@@ -649,7 +648,7 @@
my $info_state = shift;
my $result = '';
print STDERR "Storing the stack\n";
-# print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]);
+ #print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]);
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;
@@ -690,6 +689,8 @@
my $table_item_line = 0;
my $in_table_item = 0;
my $max_column = $info_default_max_column;
+ my $direntry = 0;
+ my $preformatted_format = 0;
#Â for formats that needs to process a full line (center and flushright)
# to know the line length before outputing
@@ -737,9 +738,6 @@
{
$text_added .= $content->{'end'};
}
- #Â if ending a paragraph, go straight to the text addition
- #Â without processing of the end of lines. Same if ending a
- #Â quotation or an @example
if ($info_default_indented_commands{$content->{'command'}})
{
$indent_level--;
@@ -750,13 +748,17 @@
#Â this nullify a potential noindent in a random format
$info_state->{'indent_para'} = undef;
}
- elsif ($complex_format_map->{$content->{'command'}})
+ elsif ($complex_format_map->{$content->{'command'}} or
$content->{'command'} eq 'cartouche')
{
if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level > 0) and !$preformatted)
{
$text_added .= "\n";
}
}
+ if ($complex_format_map->{$content->{'command'}} and
$content->{'content'})
+ {
+ $preformatted_format--;
+ }
if ($content->{'command'} eq 'paragraph' and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal')
{
#Â if there is no space at the end of a paragraph, there may be
@@ -831,6 +833,14 @@
$cell->{'length'} = $length;
$cell->{'line_passed'} = $all_line_passed;
}
+ elsif ($content->{'command'} eq 'direntry')
+ {
+ $direntry--;
+ #Â this has to be done here, otherwise, at the end, $direntry
+ #Â would be 0
+ $info_default_dir_specification .= $text_added;
+ $text_added = '';
+ }
elsif ($content->{'command'} eq 'multitable_row')
{
my $multitable = $info_state->{'multitable_stack'}->[-1];
@@ -1003,7 +1013,6 @@
{
#Â empty paragraph
goto new_text if (!$content->{'content'});
-
my $paragraphindent = $Texi2HTML::THISDOC{'paragraphindent'};
$paragraphindent = $Texi2HTML::Config::PARAGRAPHINDENT if
(!defined($paragraphindent));
$paragraphindent = 0 if ($paragraphindent eq 'none');
@@ -1105,10 +1114,32 @@
{
$text_added .= "\n" unless ($info_state->{'blank_line'});
}
+ elsif ($content->{'command'} eq 'direntry')
+ {
+ if ($content->{'content'})
+ {
+ $direntry++;
+ }
+ }
elsif ($paragraph_style{$content->{'command'}})
{
push @{$info_state->{'align_stack'}}, {'command' =>
$content->{'command'}};
}
+ elsif ($content->{'command'} eq 'verbatim' or
$content->{'command'} eq 'verbatiminclude')
+ {
+ #Â $preformatteed cannot be used here since preformatted
+ #Â is closed before a verbatim
+ if (!$preformatted_format and $indent_level != 0)
+ {
+ if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'})
+ {
+ $text_added .= "\n";
+ }
+ my $verb_text = $content->{'text'};
+ my ($line_passed, $end_of_line, $last_line,
$text_indented, $blank_line) = info_default_count_lines($verb_text);
+ $content->{'text'} .= "\n" unless ($blank_line or
($last_line =~ /^\s*$/));
+ }
+ }
elsif ($content->{'command'} eq 'multitable')
{
my $multitable = {
@@ -1138,11 +1169,19 @@
my $cell_width =
$content->{'parent'}->{'parent'}->{'columns_size'}->[$multitable->{'cell_index'}];
#$max_column = $cell_width-1;
$max_column = $cell_width -2;
- push @{$multitable->{'cells'}}, {'cell_width' =>
$cell_width, 'index_entries' => [], 'anchors' => []};
+ my $cell = {'cell_width' => $cell_width, 'index_entries' =>
[], 'anchors' => []};
+ push @{$multitable->{'cells'}}, $cell;
$result = '';
$length = 0;
$all_line_passed = 0;
$line_char_counter = 0;
+ if (!$content->{'content'})
+ {# empty cell
+ $cell->{'result'} = $result;
+ $cell->{'length'} = $length;
+ $cell->{'line_passed'} = $all_line_passed;
+ }
+ #info_default_skip_spaces($current, $index, $close);
}
if ($info_default_indented_commands{$content->{'command'}})
{
@@ -1157,13 +1196,17 @@
#Â there is no close if !$content->{'content'}
$indent_level++ if ($content->{'content'});
}
- elsif ($complex_format_map->{$content->{'command'}})
+ elsif ($complex_format_map->{$content->{'command'}} or
$content->{'command'} eq 'cartouche')
{
if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0) and !$preformatted)
{
$text_added .= "\n";
}
}
+ if ($complex_format_map->{$content->{'command'}} and
$content->{'content'})
+ {
+ $preformatted_format++;
+ }
}
if (defined($content->{'text'}))
@@ -1311,9 +1354,10 @@
$in_table_item = 0 if ($in_table_item);
$info_state->{'blank_line'} = 0;
}
- my ($line_passed, $end_of_line, $last_line, $text_indented) =
info_default_count_lines($text_added, $info_state, $indent_length,
($indentation_done
+ my ($line_passed, $end_of_line, $last_line, $text_indented, $blank_line)
= info_default_count_lines($text_added, $indent_length, ($indentation_done
or $info_state->{'align_stack'}->[-1]->{'command'} eq 'center'
or $info_state->{'align_stack'}->[-1]->{'command'} eq 'flushright'));
+ $info_state->{'blank_line'} = 1 if ($blank_line);
#Â only_space is set in all the conditionals
if ($end_of_line)
{
@@ -1403,10 +1447,17 @@
}
}
+ if ($direntry)
+ {
+ $info_default_dir_specification .= $text_indented;
+ }
+ else
+ {
$result .= $text_indented;
$length += length($text_indented);
$all_line_passed += $line_passed;
}
+ }
return ($length, $result, $all_line_passed);
}
@@ -1460,7 +1511,6 @@
$info_state->{'current'} = $new_command;
print STDERR "Opened $command ".
"\n";
-# Data::Dumper->Dump([$info_state->{'top'}]);
}
sub info_default_close_command($$;$$$)
@@ -1473,7 +1523,6 @@
$state = $Texi2HTML::THISDOC{'state'} if (!defined($state));
my $info_state = info_default_get_state($state);
- #print STDERR "" . Data::Dumper->Dump([$current_command]);
print STDERR "Closing $command ".
"\n";
if (!defined($info_state->{'current'}))
@@ -1488,7 +1537,6 @@
{
print STDERR "Was waiting for $info_state->{'current'}->{'command'}\n";
}
-# Data::Dumper->Dump([$info_state->{'top'}]);
#return if $no_close;
$command_entries->{'begin'} = $begin;
$command_entries->{'end'} = $end;
@@ -1936,8 +1984,6 @@
my $style_stack = shift;
my $state = shift;
-#Data::Dumper->Dump([$state]);
-
#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'));
@@ -2069,6 +2115,7 @@
{
&$print_page_foot($fh);
}
+ info_default_end_section($fh, $end_page, $element);
}
sub info_default_footnote_texi($$$)
@@ -2143,7 +2190,8 @@
$line = shift @$lines;
$footnote_result .= $line;
}
- my ($line_passed, $end_of_line, $last_line, $text_indented) =
info_default_count_lines($footnote_result, $info_state);
+ my ($line_passed, $end_of_line, $last_line, $text_indented,
$blank_line) = info_default_count_lines($footnote_result);
+ $info_state->{'blank_line'} = 1 if ($blank_line);
if ($line_passed == 0)
{#Â certainly out of paragraph commands
$footnote_result =~ s/\s*$//;
@@ -2176,11 +2224,14 @@
}
$info_default_out_file_nr++;
close($Texi2HTML::THISDOC{'FH'});
+ 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_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'}};
}
+ }
}
sub info_default_one_section($$)
@@ -2257,6 +2308,11 @@
$begin = "* Menu:\n\n";
$end = "\n";
}
+ elsif ($name eq 'direntry')
+ {
+ $begin = "START-INFO-DIR-ENTRY\n";
+ $end = "END-INFO-DIR-ENTRY\n";
+ }
return info_default_close_command(undef, $name, $begin, $end);
}
@@ -2497,8 +2553,8 @@
my $result = "\x{00}\x{08}[index\x{00}\x{08}]\n* Menu:\n\n" .$text."\n";
$info_state->{'offset_in_file'} += length($result);
- my ($line_passed, $end_of_line, $last_line, $text_indented) =
info_default_count_lines($result, $info_state);
- $info_state->{'blank_line'} = 1 if ($last_line !~ /\S/ and $end_of_line);
+ my ($line_passed, $end_of_line, $last_line, $text_indented, $blank_line) =
info_default_count_lines($result);
+ $info_state->{'blank_line'} = 1 if (($last_line !~ /\S/ and $end_of_line)
or ($blank_line));
$info_state->{'line_count'} += $line_passed;
return $before.$result;
}
@@ -2739,7 +2795,8 @@
{
info_default_store_text ($state, '', $command, {'format_name' =>
$format});
}
- return undef;
+ $line =~ s/^\s*//;
+ return $line;
}
sub info_default_sp($$)
@@ -2987,11 +3044,11 @@
{
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";
- }
+# if ($style eq 'direntry')
+# {
+# $info_default_dir_specification .= "START-INFO-DIR-ENTRY\n"
+# .$text. "END-INFO-DIR-ENTRY\n";
+# }
return '';
}
Index: examples/mediawiki.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/mediawiki.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- examples/mediawiki.init 25 Apr 2009 14:54:43 -0000 1.13
+++ examples/mediawiki.init 2 May 2009 11:31:02 -0000 1.14
@@ -8,7 +8,7 @@
# Load the file with command-line
# option -init-file mediawiki.init
#
-# $Id: mediawiki.init,v 1.13 2009/04/25 14:54:43 pertusus Exp $
+# $Id: mediawiki.init,v 1.14 2009/05/02 11:31:02 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -51,6 +51,8 @@
# Use preformatted menus.
$SIMPLE_MENU = 1;
+$texi_formats_map{'direntry'} = 0;
+
push @command_handler_init, \&mediawiki_initialize_variables;
my %doc_nr_to_file; # File name cache based on file index.
Index: examples/xml.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/xml.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- examples/xml.init 25 Apr 2009 14:54:43 -0000 1.15
+++ examples/xml.init 2 May 2009 11:31:02 -0000 1.16
@@ -8,7 +8,7 @@
$USE_SETFILENAME = 1;
$SEPARATE_DESCRIPTION = 1;
$USE_NODES = 1;
address@hidden = ('xml');
address@hidden = ('xml', 'direntry');
$USE_ISO = 0;
$SECTION_NAVIGATION = 0;
@@ -183,6 +183,7 @@
#$format_code_style{'menu_name'} = 1;
#$format_code_style{'menu_description'} = 1;
$format_map{'detailmenu'} = 'detailmenu';
+$format_map{'direntry'} = 'direntry';
$format_map{'menu_comment'} = '';
delete $format_map{'enumerate'};
foreach my $table ('table', 'ftable', 'vtable')
Index: test/contents/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/contents/tests.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/contents/tests.txt 18 Aug 2008 18:01:52 -0000 1.1
+++ test/contents/tests.txt 2 May 2009 11:31:03 -0000 1.2
@@ -35,3 +35,11 @@
double_contents_book double_contents.texi -init book.init
double_contents_setcontentsaftertitlepage_book
double_contents_setcontentsaftertitlepage.texi -init book.init
double_contents_setcontentsaftertitlepage_book_chapter
double_contents_setcontentsaftertitlepage.texi -init book.init -split chapter
+
+contents_at_begin_info contents_at_begin.texi -init info.init
+contents_at_end_info contents_at_end.texi -init info.init
+contents_in_middle_chapter_info contents_in_middle_chapter.texi -init info.init
+contents_in_middle_section_info contents_in_middle_section.texi -init info.init
+double_contents_info double_contents.texi -init info.init
+double_contents_setcontentsaftertitlepage_info
double_contents_setcontentsaftertitlepage.texi -init info.init
+
Index: test/coverage/res/formatting/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/formatting/formatting.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- test/coverage/res/formatting/formatting.html 16 Apr 2009 08:37:15
-0000 1.21
+++ test/coverage/res/formatting/formatting.html 2 May 2009 11:31:05
-0000 1.22
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- test/encodings/res/formatting_fr/formatting.html 16 Apr 2009 08:37:16
-0000 1.21
+++ test/encodings/res/formatting_fr/formatting.html 2 May 2009 11:31:06
-0000 1.22
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- test/encodings/res/formatting_fr_icons/formatting.html 16 Apr 2009
08:37:16 -0000 1.21
+++ test/encodings/res/formatting_fr_icons/formatting.html 2 May 2009
11:31:06 -0000 1.22
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@registeredsymbol R
@ordf a
@ordm o
Index: test/formatting/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- test/formatting/Makefile.am 12 Apr 2009 23:05:37 -0000 1.16
+++ test/formatting/Makefile.am 2 May 2009 11:31:06 -0000 1.17
@@ -10,6 +10,7 @@
nested_formats.texi inter_item_commands.texi multitables.texi \
double_style_paragraph.texi at_command_glued.texi test_sp.texi \
kbdinputstyle.texi simple_images.texi simple_table.texi empty_item.texi \
+ direntry_dircategory.texi \
f--ile.gif f--ile.jpeg f--ile.png f---ile.gr--a f--ile.jpg f--ile.txt \
simple_menu.init weird_quotes.init redefine_need.init file.css tests.txt res
Index: test/formatting/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/formatting/Makefile.in 27 Apr 2009 17:14:07 -0000 1.14
+++ test/formatting/Makefile.in 2 May 2009 11:31:07 -0000 1.15
@@ -140,6 +140,7 @@
nested_formats.texi inter_item_commands.texi multitables.texi \
double_style_paragraph.texi at_command_glued.texi test_sp.texi \
kbdinputstyle.texi simple_images.texi simple_table.texi empty_item.texi \
+ direntry_dircategory.texi \
f--ile.gif f--ile.jpeg f--ile.png f---ile.gr--a f--ile.jpg f--ile.txt \
simple_menu.init weird_quotes.init redefine_need.init file.css tests.txt res
Index: test/formatting/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/tests.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- test/formatting/tests.txt 26 Apr 2009 18:27:26 -0000 1.18
+++ test/formatting/tests.txt 2 May 2009 11:31:07 -0000 1.19
@@ -37,6 +37,7 @@
texi kbdinputstyle.texi
texi simple_table.texi
texi empty_item.texi
+texi direntry_dircategory.texi
# for makeinfo
texi ../coverage/formatting.texi -U texi2html
def_cmds def_cmds.texi
@@ -95,9 +96,14 @@
kbdinputstyle kbdinputstyle.texi
simple_table simple_table.texi
empty_item empty_item.texi
+direntry_dircategory direntry_dircategory.texi
at_command_glued_info at_command_glued.texi -init info.init
test_sp_info test_sp.texi -init info.init
kbdinputstyle_info kbdinputstyle.texi -init info.init
simple_images_info simple_images.texi -init info.init
nested_formats_info nested_formats.texi -init info.init
formatting_info ../coverage/formatting.texi -init info.init -U texi2html
+direntry_dircategory_info direntry_dircategory.texi -init info.init
+direntry_dircategory_info_split direntry_dircategory.texi -init info.init
-split-size 1
+direntry_dircategory_xml direntry_dircategory.texi -init xml.init
+heading_info heading.texi -init info.init
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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- test/formatting/res/formatting_weird_quotes/formatting.html 16 Apr 2009
08:37:17 -0000 1.22
+++ test/formatting/res/formatting_weird_quotes/formatting.html 2 May 2009
11:31:09 -0000 1.23
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@registeredsymbol R
@ordf a
@ordm o
Index: test/layout/res/formatting_chm/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_chm/formatting.html 16 Apr 2009 08:37:20
-0000 1.14
+++ test/layout/res/formatting_chm/formatting.html 2 May 2009 11:31:10
-0000 1.15
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/layout/res/formatting_chm/formatting_1.html 16 Apr 2009 08:37:20
-0000 1.8
+++ test/layout/res/formatting_chm/formatting_1.html 2 May 2009 11:31:10
-0000 1.9
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/layout/res/formatting_chm/formatting_2.html 16 Apr 2009 08:37:20
-0000 1.8
+++ test/layout/res/formatting_chm/formatting_2.html 2 May 2009 11:31:11
-0000 1.9
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/layout/res/formatting_chm/formatting_3.html 16 Apr 2009 08:37:20
-0000 1.8
+++ test/layout/res/formatting_chm/formatting_3.html 2 May 2009 11:31:11
-0000 1.9
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/layout/res/formatting_chm/formatting_4.html 16 Apr 2009 08:37:20
-0000 1.8
+++ test/layout/res/formatting_chm/formatting_4.html 2 May 2009 11:31:11
-0000 1.9
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_chm/formatting_5.html 16 Apr 2009 08:37:20
-0000 1.10
+++ test/layout/res/formatting_chm/formatting_5.html 2 May 2009 11:31:11
-0000 1.11
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/layout/res/formatting_chm/formatting_abt.html 16 Apr 2009 08:37:20
-0000 1.8
+++ test/layout/res/formatting_chm/formatting_abt.html 2 May 2009 11:31:11
-0000 1.9
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_chm/formatting_ovr.html 16 Apr 2009 08:37:21
-0000 1.10
+++ test/layout/res/formatting_chm/formatting_ovr.html 2 May 2009 11:31:11
-0000 1.11
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_chm/formatting_toc.html 16 Apr 2009 08:37:22
-0000 1.10
+++ test/layout/res/formatting_chm/formatting_toc.html 2 May 2009 11:31:11
-0000 1.11
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- test/layout/res/formatting_exotic/formatting.html 16 Apr 2009 08:37:22
-0000 1.19
+++ test/layout/res/formatting_exotic/formatting.html 2 May 2009 11:31:11
-0000 1.20
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/layout/res/formatting_exotic/formatting_1.html 16 Apr 2009 08:37:22
-0000 1.8
+++ test/layout/res/formatting_exotic/formatting_1.html 2 May 2009 11:31:11
-0000 1.9
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_exotic/formatting_2.html 16 Apr 2009 08:37:22
-0000 1.14
+++ test/layout/res/formatting_exotic/formatting_2.html 2 May 2009 11:31:12
-0000 1.15
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_exotic/formatting_3.html 16 Apr 2009 08:37:22
-0000 1.14
+++ test/layout/res/formatting_exotic/formatting_3.html 2 May 2009 11:31:12
-0000 1.15
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- test/layout/res/formatting_exotic/formatting_4.html 16 Apr 2009 08:37:22
-0000 1.13
+++ test/layout/res/formatting_exotic/formatting_4.html 2 May 2009 11:31:12
-0000 1.14
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/layout/res/formatting_exotic/formatting_abt.html 16 Apr 2009
08:37:22 -0000 1.10
+++ test/layout/res/formatting_exotic/formatting_abt.html 2 May 2009
11:31:12 -0000 1.11
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/layout/res/formatting_exotic/formatting_ovr.html 16 Apr 2009
08:37:22 -0000 1.12
+++ test/layout/res/formatting_exotic/formatting_ovr.html 2 May 2009
11:31:12 -0000 1.13
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/layout/res/formatting_exotic/formatting_toc.html 16 Apr 2009
08:37:22 -0000 1.12
+++ test/layout/res/formatting_exotic/formatting_toc.html 2 May 2009
11:31:12 -0000 1.13
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- test/layout/res/formatting_makeinfo/chapter.html 16 Apr 2009 08:37:23
-0000 1.13
+++ test/layout/res/formatting_makeinfo/chapter.html 2 May 2009 11:31:12
-0000 1.14
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/layout/res/formatting_makeinfo/chapter2.html 16 Apr 2009 08:37:23
-0000 1.15
+++ test/layout/res/formatting_makeinfo/chapter2.html 2 May 2009 11:31:12
-0000 1.16
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/layout/res/formatting_makeinfo/formatting_abt.html 16 Apr 2009
08:37:23 -0000 1.9
+++ test/layout/res/formatting_makeinfo/formatting_abt.html 2 May 2009
11:31:12 -0000 1.10
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- test/layout/res/formatting_makeinfo/index.html 16 Apr 2009 08:37:23
-0000 1.17
+++ test/layout/res/formatting_makeinfo/index.html 2 May 2009 11:31:12
-0000 1.18
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/layout/res/formatting_makeinfo/s_002d_002dect_002cion.html 16 Apr
2009 08:37:23 -0000 1.12
+++ test/layout/res/formatting_makeinfo/s_002d_002dect_002cion.html 2 May
2009 11:31:13 -0000 1.13
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/layout/res/formatting_makeinfo/subsection.html 16 Apr 2009 08:37:23
-0000 1.12
+++ test/layout/res/formatting_makeinfo/subsection.html 2 May 2009 11:31:13
-0000 1.13
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
---
test/layout/res/formatting_makeinfo/subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
16 Apr 2009 08:37:23 -0000 1.12
+++
test/layout/res/formatting_makeinfo/subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
2 May 2009 11:31:13 -0000 1.13
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- test/layout/res/formatting_regions/formatting_regions.html 25 Apr 2009
14:54:45 -0000 1.22
+++ test/layout/res/formatting_regions/formatting_regions.html 2 May 2009
11:31:13 -0000 1.23
@@ -91,9 +91,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@registeredsymbol R
@ordf a
@ordm o
Index: test/macros/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/macros/Makefile.am 20 Nov 2008 12:02:37 -0000 1.5
+++ test/macros/Makefile.am 2 May 2009 11:31:13 -0000 1.6
@@ -8,9 +8,10 @@
value_in_pass0_macros.texi macros_in_pass0_macros.texi macro_zero.texi \
macro_in_pass_texi_commands.texi two_macros_on_a_line.texi \
macro_commands_in_pass_texi_commands.texi node-value.texi empty_macro.texi \
+ test_include_with_setfilename no_arg_macro.texi \
address@hidden \
file.texi inc_file.texi macro_included.texi my-bib-macros.texi \
- incl-incl.txi \
+ incl-incl.txi included_file_with_setfilename.texi \
tests.txt res
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/macros/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/macros/Makefile.in 27 Apr 2009 17:14:10 -0000 1.9
+++ test/macros/Makefile.in 2 May 2009 11:31:13 -0000 1.10
@@ -138,9 +138,10 @@
value_in_pass0_macros.texi macros_in_pass0_macros.texi macro_zero.texi \
macro_in_pass_texi_commands.texi two_macros_on_a_line.texi \
macro_commands_in_pass_texi_commands.texi node-value.texi empty_macro.texi \
+ test_include_with_setfilename no_arg_macro.texi \
address@hidden \
file.texi inc_file.texi macro_included.texi my-bib-macros.texi \
- incl-incl.txi \
+ incl-incl.txi included_file_with_setfilename.texi \
tests.txt res
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/macros/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/macros/tests.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/macros/tests.txt 18 Jan 2009 00:59:31 -0000 1.8
+++ test/macros/tests.txt 2 May 2009 11:31:14 -0000 1.9
@@ -1,4 +1,5 @@
texi test_include.texi
+texi test_include_with_setfilename.texi
texi macros.texi
texi macro_zero.texi
texi simple_macro.texi
@@ -28,6 +29,7 @@
texi macro_in_misc.texi
texi macro_in_pass_texi_commands.texi
texi macro_commands_in_pass_texi_commands.texi
+texi no_arg_macro.texi
texi empty_macro.texi
texi cond.texi --ifhtml --ifinfo --no-iftex
test_include test_include.texi
@@ -52,3 +54,5 @@
value_in_misc value_in_misc_valid.texi --iftex
macro_in_misc macro_in_misc.texi
macro_commands_in_pass_texi_commands macro_commands_in_pass_texi_commands.texi
+test_include_with_setfilename_info test_include_with_setfilename.texi -init
info.init
+no_arg_macro_info no_arg_macro.texi -init info.init
Index: test/manuals/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/tests.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/manuals/tests.txt 27 Apr 2009 17:14:11 -0000 1.4
+++ test/manuals/tests.txt 2 May 2009 11:31:17 -0000 1.5
@@ -11,3 +11,4 @@
ccvs_info cvs.texi -init info.init
mini_ker mini_ker.texi --split section --node-files --use-nodes --iftex --init
book.init --init mini_ker_t2h.init --init tex4ht.init
texinfo_info texinfo.texi -init info.init
+texinfo_xml texinfo.texi -init xml.init
Index: test/manuals/res/ccvs_info/cvs.info
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/ccvs_info/cvs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/manuals/res/ccvs_info/cvs.info 26 Apr 2009 19:02:18 -0000 1.2
+++ test/manuals/res/ccvs_info/cvs.info 2 May 2009 11:31:17 -0000 1.3
@@ -11,197 +11,197 @@
Indirect:
-cvs.info-1: 335
-cvs.info-2: 301755
+cvs.info-1: 336
+cvs.info-2: 301756
Tag Table:
(Indirect)
-Node: Top335
-Node: Overview3237
-Node: What is CVS?3802
-Node: What is CVS not?6404
-Node: A sample session11960
-Node: Getting the source12787
-Node: Committing your changes13673
-Node: Cleaning up15841
-Node: Viewing differences17554
-Node: Repository18459
-Node: Specifying a repository21172
-Node: Repository storage22512
-Node: Repository files23733
-Node: File permissions26581
-Node: Windows permissions30446
-Node: Attic31399
-Node: CVS in repository32453
-Node: Locks35549
-Node: CVSROOT storage38696
-Node: Working directory storage40503
-Node: Intro administrative files50130
-Node: Multiple repositories51852
-Node: Creating a repository53346
-Node: Backing up55289
-Node: Moving a repository57217
-Node: Remote repositories58297
-Node: Server requirements59938
-Node: Connecting via rsh62369
-Node: Password authenticated65115
-Node: Password authentication server65877
-Node: Password authentication client77131
-Node: Password authentication security80336
-Node: GSSAPI authenticated82196
-Node: Kerberos authenticated84046
-Node: Connecting via fork85874
-Node: Read-only access86986
-Node: Server temporary directory89993
-Node: Starting a new project91287
-Node: Setting up the files92032
-Node: From files92661
-Node: From other version control systems94648
-Node: From scratch97221
-Node: Defining the module97966
-Node: Revisions98952
-Node: Revision numbers100159
-Node: Versions revisions releases101200
-Node: Assigning revisions101787
-Node: Tags103338
-Node: Tagging the working directory108680
-Node: Tagging by date/tag110072
-Node: Modifying tags111450
-Node: Tagging add/remove114648
-Node: Sticky tags116287
-Node: Branching and merging119378
-Node: Branches motivation120676
-Node: Creating a branch121692
-Node: Accessing branches123257
-Node: Branches and revisions126488
-Node: Magic branch numbers129207
-Node: Merging a branch130704
-Node: Merging more than once133008
-Node: Merging two revisions135490
-Node: Merging adds and removals136820
-Node: Merging and keywords138100
-Node: Recursive behavior141426
-Node: Adding and removing143254
-Node: Adding files144149
-Node: Removing files146824
-Node: Removing directories150250
-Node: Moving files151418
-Node: Outside152071
-Node: Inside152995
-Node: Rename by copying153852
-Node: Moving directories154863
-Node: History browsing156270
-Node: log messages156823
-Node: history database157149
-Node: user-defined logging157633
-Node: annotate159439
-Node: Binary files160598
-Node: Binary why161236
-Node: Binary howto163475
-Node: Multiple developers166525
-Node: File status168685
-Node: Updating a file171776
-Node: Conflicts example173082
-Node: Informing others177123
-Node: Concurrency177669
-Node: Watches179421
-Node: Setting a watch180818
-Node: Getting Notified182116
-Node: Editing files185826
-Node: Watch information188348
-Node: Watches Compatibility189202
-Node: Choosing a model190083
-Node: Revision management192765
-Node: When to commit193371
-Node: Keyword substitution194486
-Node: Keyword list195553
-Node: Using keywords200401
-Node: Avoiding substitution202055
-Node: Substitution modes203268
-Node: Configuring keyword expansion206059
-Node: Log keyword209220
-Node: Tracking sources210384
-Node: First import211906
-Node: Update imports213250
-Node: Reverting local changes215035
-Node: Binary files in imports215734
-Node: Keywords in imports216050
-Node: Multiple vendor branches217196
-Node: Builds218897
-Node: Special Files221576
-Node: CVS commands222225
-Node: Structure223683
-Node: Exit status224959
-Node: ~/.cvsrc225956
-Node: Global options227999
-Node: Common options233153
-Node: admin240841
-Node: admin options242025
-Node: checkout253208
-Node: checkout options255973
-Node: checkout examples260317
-Node: commit260603
-Node: commit options262475
-Node: commit examples263840
-Node: diff266232
-Node: diff options267135
-Node: Line group formats274979
-Node: Line formats280704
-Node: diff examples283920
-Node: export284889
-Node: export options286197
-Node: history287280
-Node: history options288067
-Node: import291587
-Node: import options294202
-Node: import output295467
-Node: import examples296541
-Node: log296720
-Node: log options297875
-Node: log examples301755
-Node: rdiff301912
-Node: rdiff options303230
-Node: rdiff examples304899
-Node: release305876
-Node: release options307182
-Node: release output307871
-Node: release examples309155
-Node: update309637
-Node: update options310698
-Node: update output314813
-Node: Invoking CVS317677
-Node: Administrative files339853
-Node: modules341119
-Node: Alias modules342473
-Node: Regular modules343531
-Node: Ampersand modules344933
-Node: Excluding directories346178
-Node: Module options346730
-Node: Module program options348310
-Node: Wrappers349095
-Node: commit files350798
-Node: syntax352803
-Node: commitinfo353711
-Node: verifymsg355877
-Node: editinfo360504
-Node: editinfo example362804
-Node: loginfo364112
-Node: loginfo example366698
-Node: Keeping a checked out copy367546
-Node: rcsinfo368576
-Node: cvsignore370135
-Node: checkoutlist373407
-Node: history file374740
-Node: Variables375398
-Node: config378950
-Node: Environment variables384089
-Node: Compatibility390085
-Node: Troubleshooting391104
-Node: Error messages391742
-Node: Connection407800
-Node: Other problems412739
-Node: Credits413677
-Node: BUGS415081
-Node: Index418688
+Node: Top336
+Node: Overview3238
+Node: What is CVS?3803
+Node: What is CVS not?6405
+Node: A sample session11961
+Node: Getting the source12788
+Node: Committing your changes13674
+Node: Cleaning up15842
+Node: Viewing differences17555
+Node: Repository18460
+Node: Specifying a repository21173
+Node: Repository storage22513
+Node: Repository files23734
+Node: File permissions26582
+Node: Windows permissions30447
+Node: Attic31400
+Node: CVS in repository32454
+Node: Locks35550
+Node: CVSROOT storage38697
+Node: Working directory storage40504
+Node: Intro administrative files50131
+Node: Multiple repositories51853
+Node: Creating a repository53347
+Node: Backing up55290
+Node: Moving a repository57218
+Node: Remote repositories58298
+Node: Server requirements59939
+Node: Connecting via rsh62370
+Node: Password authenticated65116
+Node: Password authentication server65878
+Node: Password authentication client77132
+Node: Password authentication security80337
+Node: GSSAPI authenticated82197
+Node: Kerberos authenticated84047
+Node: Connecting via fork85875
+Node: Read-only access86987
+Node: Server temporary directory89994
+Node: Starting a new project91288
+Node: Setting up the files92033
+Node: From files92662
+Node: From other version control systems94649
+Node: From scratch97222
+Node: Defining the module97967
+Node: Revisions98953
+Node: Revision numbers100160
+Node: Versions revisions releases101201
+Node: Assigning revisions101788
+Node: Tags103339
+Node: Tagging the working directory108681
+Node: Tagging by date/tag110073
+Node: Modifying tags111451
+Node: Tagging add/remove114649
+Node: Sticky tags116288
+Node: Branching and merging119379
+Node: Branches motivation120677
+Node: Creating a branch121693
+Node: Accessing branches123258
+Node: Branches and revisions126489
+Node: Magic branch numbers129208
+Node: Merging a branch130705
+Node: Merging more than once133009
+Node: Merging two revisions135491
+Node: Merging adds and removals136821
+Node: Merging and keywords138101
+Node: Recursive behavior141427
+Node: Adding and removing143255
+Node: Adding files144150
+Node: Removing files146825
+Node: Removing directories150251
+Node: Moving files151419
+Node: Outside152072
+Node: Inside152996
+Node: Rename by copying153853
+Node: Moving directories154864
+Node: History browsing156271
+Node: log messages156824
+Node: history database157150
+Node: user-defined logging157634
+Node: annotate159440
+Node: Binary files160599
+Node: Binary why161237
+Node: Binary howto163476
+Node: Multiple developers166526
+Node: File status168686
+Node: Updating a file171777
+Node: Conflicts example173083
+Node: Informing others177124
+Node: Concurrency177670
+Node: Watches179422
+Node: Setting a watch180819
+Node: Getting Notified182117
+Node: Editing files185827
+Node: Watch information188349
+Node: Watches Compatibility189203
+Node: Choosing a model190084
+Node: Revision management192766
+Node: When to commit193372
+Node: Keyword substitution194487
+Node: Keyword list195554
+Node: Using keywords200402
+Node: Avoiding substitution202056
+Node: Substitution modes203269
+Node: Configuring keyword expansion206060
+Node: Log keyword209221
+Node: Tracking sources210385
+Node: First import211907
+Node: Update imports213251
+Node: Reverting local changes215036
+Node: Binary files in imports215735
+Node: Keywords in imports216051
+Node: Multiple vendor branches217197
+Node: Builds218898
+Node: Special Files221577
+Node: CVS commands222226
+Node: Structure223684
+Node: Exit status224960
+Node: ~/.cvsrc225957
+Node: Global options228000
+Node: Common options233154
+Node: admin240842
+Node: admin options242026
+Node: checkout253209
+Node: checkout options255974
+Node: checkout examples260318
+Node: commit260604
+Node: commit options262476
+Node: commit examples263841
+Node: diff266233
+Node: diff options267136
+Node: Line group formats274980
+Node: Line formats280705
+Node: diff examples283921
+Node: export284890
+Node: export options286198
+Node: history287281
+Node: history options288068
+Node: import291588
+Node: import options294203
+Node: import output295468
+Node: import examples296542
+Node: log296721
+Node: log options297876
+Node: log examples301756
+Node: rdiff301913
+Node: rdiff options303231
+Node: rdiff examples304900
+Node: release305877
+Node: release options307183
+Node: release output307872
+Node: release examples309156
+Node: update309638
+Node: update options310699
+Node: update output314814
+Node: Invoking CVS317678
+Node: Administrative files339854
+Node: modules341120
+Node: Alias modules342474
+Node: Regular modules343532
+Node: Ampersand modules344934
+Node: Excluding directories346179
+Node: Module options346731
+Node: Module program options348311
+Node: Wrappers349096
+Node: commit files350799
+Node: syntax352804
+Node: commitinfo353712
+Node: verifymsg355878
+Node: editinfo360505
+Node: editinfo example362805
+Node: loginfo364113
+Node: loginfo example366699
+Node: Keeping a checked out copy367547
+Node: rcsinfo368577
+Node: cvsignore370136
+Node: checkoutlist373408
+Node: history file374741
+Node: Variables375399
+Node: config378951
+Node: Environment variables384090
+Node: Compatibility390086
+Node: Troubleshooting391105
+Node: Error messages391743
+Node: Connection407801
+Node: Other problems412740
+Node: Credits413678
+Node: BUGS415082
+Node: Index418689
End Tag Table
Index: test/manuals/res/texinfo/texinfo_cp.idx
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/texinfo/texinfo_cp.idx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/texinfo/texinfo_cp.idx 27 Apr 2009 17:14:11 -0000
1.1
+++ test/manuals/res/texinfo/texinfo_cp.idx 2 May 2009 11:31:18 -0000
1.2
@@ -1,4 +1,4 @@
-key: ! upside-down
+key: !
origin_href: texinfo_14.html#index-_00a1
entry: ¡
texi_entry: @exclamdown{}
@@ -358,7 +358,7 @@
texi_entry: <title> HTML tag
element_href: texinfo_4.html#settitle
element_text: 3.2.4 <code>@settitle</code>: Set the document title
-key: ? upside-down
+key: ?
origin_href: texinfo_14.html#index-_00bf
entry: ¿
texi_entry: @questiondown{}
Index: test/misc/res/formatting_html32/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/misc/res/formatting_html32/formatting.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- test/misc/res/formatting_html32/formatting.html 26 Apr 2009 16:12:48
-0000 1.22
+++ test/misc/res/formatting_html32/formatting.html 2 May 2009 11:31:18
-0000 1.23
@@ -92,9 +92,9 @@
@ss ss
@l l
@L L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden !
address@hidden ?
address@hidden pounds
@registeredsymbol R
@ordf a
@ordm o
Index: test/tar_manual/res/texi_tar/tar.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/tar_manual/res/texi_tar/tar.passfirst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/tar_manual/res/texi_tar/tar.passfirst 25 Apr 2009 14:54:48 -0000
1.3
+++ test/tar_manual/res/texi_tar/tar.passfirst 2 May 2009 11:31:19 -0000
1.4
@@ -85,7 +85,7 @@
tar.texi(,58)
tar.texi(,59) @dircategory Individual utilities
tar.texi(,60) @direntry
-tar.texi(,61) * tar: (tar)tar invocation. Invoking
@GNUTAR{}.
+tar.texi(GNUTAR,61) * tar: (tar)tar invocation. Invoking
@acronym{GNU} @command{tar}.
tar.texi(,62) @end direntry
tar.texi(,63)
tar.texi(,64) @shorttitlepage @acronym{GNU} @command{tar}
Index: test/tar_manual/res/texi_tar/tar.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/tar_manual/res/texi_tar/tar.passtexi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/tar_manual/res/texi_tar/tar.passtexi 25 Apr 2009 14:54:48 -0000
1.3
+++ test/tar_manual/res/texi_tar/tar.passtexi 2 May 2009 11:31:19 -0000
1.4
@@ -107,7 +107,7 @@
tar.texi(,58)
tar.texi(,59) @dircategory Individual utilities
tar.texi(,60) @direntry
-tar.texi(,61) * tar: (tar)tar invocation. Invoking
@GNUTAR{}.
+tar.texi(GNUTAR,61) * tar: (tar)tar invocation. Invoking
tar.texi(GNUTAR,61) @acronym{GNU} @command{tar}.
tar.texi(,62) @end direntry
tar.texi(,63)
tar.texi(,64) @shorttitlepage @acronym{GNU} @command{tar}
Index: test/tar_manual/res/texi_tar/tar.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/tar_manual/res/texi_tar/tar.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/tar_manual/res/texi_tar/tar.texi 25 Apr 2009 14:54:48 -0000
1.3
+++ test/tar_manual/res/texi_tar/tar.texi 2 May 2009 11:31:19 -0000
1.4
@@ -108,7 +108,7 @@
@dircategory Individual utilities
@direntry
-* tar: (tar)tar invocation. Invoking @GNUTAR{}.
+* tar: (tar)tar invocation. Invoking @acronym{GNU}
@command{tar}.
@end direntry
@shorttitlepage @acronym{GNU} @command{tar}
Index: test/contents/res/contents_at_begin_info/contents_at_begin.info
===================================================================
RCS file: test/contents/res/contents_at_begin_info/contents_at_begin.info
diff -N test/contents/res/contents_at_begin_info/contents_at_begin.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/contents/res/contents_at_begin_info/contents_at_begin.info 2 May
2009 11:31:03 -0000 1.1
@@ -0,0 +1,30 @@
+This is contents_at_begin.info, produced by makeinfo version 4.13 from
+contents_at_begin.texi.
+
+
+File: contents_at_begin.info, Node: Top, Next: chapter, Up: (dir)
+
+Contents at beginning
+*********************
+
+Content at the beginning.
+
+* Menu:
+
+* chapter::
+
+
+File: contents_at_begin.info, Node: chapter, Prev: Top, Up: Top
+
+1 Chapter 1
+***********
+
+The chapter
+
+
+
+Tag Table:
+Node: Top96
+Node: chapter262
+
+End Tag Table
Index: test/contents/res/contents_at_end_info/contents_at_end.info
===================================================================
RCS file: test/contents/res/contents_at_end_info/contents_at_end.info
diff -N test/contents/res/contents_at_end_info/contents_at_end.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/contents/res/contents_at_end_info/contents_at_end.info 2 May 2009
11:31:03 -0000 1.1
@@ -0,0 +1,30 @@
+This is contents_at_end.info, produced by makeinfo version 4.13 from
+contents_at_end.texi.
+
+
+File: contents_at_end.info, Node: Top, Next: chapter, Up: (dir)
+
+Contents at end
+***************
+
+Content at end.
+
+* Menu:
+
+* chapter::
+
+
+File: contents_at_end.info, Node: chapter, Prev: Top, Up: Top
+
+1 Chapter 1
+***********
+
+The chapter
+
+
+
+Tag Table:
+Node: Top92
+Node: chapter234
+
+End Tag Table
Index:
test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.info
===================================================================
RCS file:
test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.info
diff -N
test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/contents/res/contents_in_middle_chapter_info/contents_in_middle_chapter.info
2 May 2009 11:31:04 -0000 1.1
@@ -0,0 +1,43 @@
+This is contents_in_middle_chapter.info, produced by makeinfo version
+4.13 from contents_in_middle_chapter.texi.
+
+
+File: contents_in_middle_chapter.info, Node: Top, Next: chapter, Up: (dir)
+
+Contents in chapter
+*******************
+
+Content in chapter.
+
+* Menu:
+
+* chapter::
+
+
+File: contents_in_middle_chapter.info, Node: chapter, Prev: Top, Up: Top
+
+1 Chapter 1
+***********
+
+The chapter with contents
+
+* Menu:
+
+* section::
+
+
+File: contents_in_middle_chapter.info, Node: section, Up: chapter
+
+1.1 section
+===========
+
+Section.
+
+
+
+Tag Table:
+Node: Top114
+Node: chapter279
+Node: section432
+
+End Tag Table
Index:
test/contents/res/contents_in_middle_section_info/contents_in_middle_section.info
===================================================================
RCS file:
test/contents/res/contents_in_middle_section_info/contents_in_middle_section.info
diff -N
test/contents/res/contents_in_middle_section_info/contents_in_middle_section.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/contents/res/contents_in_middle_section_info/contents_in_middle_section.info
2 May 2009 11:31:04 -0000 1.1
@@ -0,0 +1,51 @@
+This is contents_in_middle_section.info, produced by makeinfo version
+4.13 from contents_in_middle_section.texi.
+
+
+File: contents_in_middle_section.info, Node: Top, Next: chapter, Up: (dir)
+
+Contents in section
+*******************
+
+Content in section.
+
+* Menu:
+
+* chapter::
+
+
+File: contents_in_middle_section.info, Node: chapter, Prev: Top, Up: Top
+
+1 Chapter 1
+***********
+
+* Menu:
+
+* section::
+* section1::
+
+
+File: contents_in_middle_section.info, Node: section, Next: section1, Up:
chapter
+
+1.1 section
+===========
+
+The section with contents
+
+
+File: contents_in_middle_section.info, Node: section1, Prev: section, Up:
chapter
+
+1.2 section 1
+=============
+
+Section 1.
+
+
+
+Tag Table:
+Node: Top114
+Node: chapter279
+Node: section418
+Node: section1558
+
+End Tag Table
Index: test/contents/res/double_contents_info/double_contents.info
===================================================================
RCS file: test/contents/res/double_contents_info/double_contents.info
diff -N test/contents/res/double_contents_info/double_contents.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/contents/res/double_contents_info/double_contents.info 2 May 2009
11:31:04 -0000 1.1
@@ -0,0 +1,41 @@
+This is double_contents.info, produced by makeinfo version 4.13 from
+double_contents.texi.
+
+
+File: double_contents.info, Node: Top, Next: chapter, Up: (dir)
+
+Double contents
+***************
+
+Double contents.
+
+* Menu:
+
+* chapter::
+
+
+File: double_contents.info, Node: chapter, Prev: Top, Up: Top
+
+1 Chapter 1
+***********
+
+The chapter
+
+* Menu:
+
+* section::
+
+
+File: double_contents.info, Node: section, Up: chapter
+
+1.1 section with contents
+=========================
+
+
+
+Tag Table:
+Node: Top92
+Node: chapter235
+Node: section363
+
+End Tag Table
Index:
test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.info
===================================================================
RCS file:
test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.info
diff -N
test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/contents/res/double_contents_setcontentsaftertitlepage_info/double_contents_setcontentsaftertitlepage.info
2 May 2009 11:31:04 -0000 1.1
@@ -0,0 +1,42 @@
+This is double_contents_setcontentsaftertitlepage.info, produced by
+makeinfo version 4.13 from
+double_contents_setcontentsaftertitlepage.texi.
+
+
+File: double_contents_setcontentsaftertitlepage.info, Node: Top, Next:
chapter, Up: (dir)
+
+Double contents
+***************
+
+Double contents.
+
+* Menu:
+
+* chapter::
+
+
+File: double_contents_setcontentsaftertitlepage.info, Node: chapter, Prev:
Top, Up: Top
+
+1 Chapter 1
+***********
+
+The chapter
+
+* Menu:
+
+* section::
+
+
+File: double_contents_setcontentsaftertitlepage.info, Node: section, Up:
chapter
+
+1.1 section with contents
+=========================
+
+
+
+Tag Table:
+Node: Top144
+Node: chapter313
+Node: section467
+
+End Tag Table
Index: test/formatting/direntry_dircategory.texi
===================================================================
RCS file: test/formatting/direntry_dircategory.texi
diff -N test/formatting/direntry_dircategory.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/direntry_dircategory.texi 2 May 2009 11:31:07 -0000
1.1
@@ -0,0 +1,37 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden direntry_dircategory.info
+
address@hidden address@hidden ere}?''
address@hidden
+* foo: (foo). address@hidden''
address@hidden direntry
+
address@hidden cat2
address@hidden
+* aaa :: aaaa
+ bbbbb
+
+menutitle
address@hidden direntry
+
+
address@hidden Top
address@hidden Test dircategory and direntry
+
+Text
address@hidden in text
address@hidden
+* in text: (in_text). in text
address@hidden direntry
+
address@hidden
+* chapter::
address@hidden menu
+
address@hidden chapter
address@hidden chapter
+
+In chapter
+
address@hidden
Index: test/formatting/simple_table.texi
===================================================================
RCS file: test/formatting/simple_table.texi
diff -N test/formatting/simple_table.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/simple_table.texi 2 May 2009 11:31:07 -0000 1.1
@@ -0,0 +1,62 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden simple_table.info
+
address@hidden Top
address@hidden Element
+
address@hidden @emph
address@hidden first item
address@hidden second itemx
+
+Text.
+
address@hidden example
address@hidden
+In example
+
+end example.
address@hidden example
address@hidden empty line
+
+empty line.
address@hidden quotation
address@hidden
+Quotation
address@hidden quotation
+
address@hidden quotation after a blank line
+
address@hidden
+quotation after a blank line
address@hidden quotation
address@hidden table
+
address@hidden @strong
address@hidden item before ignored lines
address@hidden comment
address@hidden vindex
address@hidden itemx now
+
+Description
address@hidden vtable
+
address@hidden @r
address@hidden item
+
address@hidden itemx after an empty line
+
+Description.
+
address@hidden vtable
+
+Something.
address@hidden @emph
address@hidden in item
+Text without blank line
address@hidden second item
+Text without blank line 2
address@hidden table
+After table.
+
address@hidden
Index: test/formatting/res/direntry_dircategory/direntry_dircategory.2
===================================================================
RCS file: test/formatting/res/direntry_dircategory/direntry_dircategory.2
diff -N test/formatting/res/direntry_dircategory/direntry_dircategory.2
Index: test/formatting/res/direntry_dircategory/direntry_dircategory.html
===================================================================
RCS file: test/formatting/res/direntry_dircategory/direntry_dircategory.html
diff -N test/formatting/res/direntry_dircategory/direntry_dircategory.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/direntry_dircategory/direntry_dircategory.html 2 May
2009 11:31:07 -0000 1.1
@@ -0,0 +1,202 @@
+<!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>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<a name="Test-dircategory-and-direntry"></a>
+<h1 class="settitle">Test dircategory and direntry</h1>
+
+<p>Text
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#chapter">1.
chapter</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr size="1">
+<a name="chapter"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Previous section
in reading order"> < </a>]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left">[<a href="#Top" title="Beginning of this
chapter or previous chapter"> << </a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up
</a>]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<a name="chapter-1"></a>
+<h1 class="chapter">1. chapter</h1>
+
+<p>In chapter
+</p>
+<hr size="6">
+<a name="SEC_About"></a>
+<table cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<h1>About This Document</h1>
+<p>
+ 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>.
+</p>
+<p>
+ The buttons in the navigation panels have the following meaning:
+</p>
+<table border="1">
+ <tr>
+ <th> Button </th>
+ <th> Name </th>
+ <th> Go to </th>
+ <th> From 1.2.3 go to</th>
+ </tr>
+ <tr>
+ <td align="center"> [ < ] </td>
+ <td align="center">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ > ] </td>
+ <td align="center">Forward</td>
+ <td>Next section in reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"> [ << ] </td>
+ <td align="center">FastBack</td>
+ <td>Beginning of this chapter or previous chapter</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"> [ Up ] </td>
+ <td align="center">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ >> ] </td>
+ <td align="center">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Top] </td>
+ <td align="center">Top</td>
+ <td>Cover (top) of document</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Contents] </td>
+ <td align="center">Contents</td>
+ <td>Table of contents</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Index] </td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [ ? ] </td>
+ <td align="center">About</td>
+ <td>About (help)</td>
+ <td> </td>
+ </tr>
+</table>
+
+<p>
+ 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:
+</p>
+
+<ul>
+ <li> 1. Section One
+ <ul>
+ <li>1.1 Subsection One-One
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Subsection One-Two
+ <ul>
+ <li>1.2.1 Subsubsection One-Two-One</li>
+ <li>1.2.2 Subsubsection One-Two-Two</li>
+ <li>1.2.3 Subsubsection One-Two-Three
+ <strong><== Current Position </strong></li>
+ <li>1.2.4 Subsubsection One-Two-Four</li>
+ </ul>
+ </li>
+ <li>1.3 Subsection One-Three
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Subsection One-Four</li>
+ </ul>
+ </li>
+</ul>
+
+<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/formatting/res/direntry_dircategory_info/direntry_dircategory.info
===================================================================
RCS file:
test/formatting/res/direntry_dircategory_info/direntry_dircategory.info
diff -N test/formatting/res/direntry_dircategory_info/direntry_dircategory.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/direntry_dircategory_info/direntry_dircategory.info
2 May 2009 11:31:08 -0000 1.1
@@ -0,0 +1,42 @@
+This is direntry_dircategory.info, produced by makeinfo version 4.13
+from direntry_dircategory.texi.
+
+INFO-DIR-SECTION "category--TH ERE?"
+START-INFO-DIR-ENTRY
+* foo: (foo). "hello--THERE?"
+END-INFO-DIR-ENTRY
+INFO-DIR-SECTION cat2
+START-INFO-DIR-ENTRY
+* aaa :: aaaa
+ bbbbb
+
+menutitle
+END-INFO-DIR-ENTRY
+
+
+File: direntry_dircategory.info, Node: Top, Next: chapter, Up: (dir)
+
+Test dircategory and direntry
+*****************************
+
+Text
+
+* Menu:
+
+* chapter::
+
+
+File: direntry_dircategory.info, Node: chapter, Prev: Top, Up: Top
+
+1 chapter
+*********
+
+In chapter
+
+
+
+Tag Table:
+Node: Top341
+Node: chapter505
+
+End Tag Table
Index:
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info
===================================================================
RCS file:
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info
diff -N
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info
2 May 2009 11:31:08 -0000 1.1
@@ -0,0 +1,26 @@
+This is direntry_dircategory.info, produced by makeinfo version 4.13
+from direntry_dircategory.texi.
+
+INFO-DIR-SECTION "category--TH ERE?"
+START-INFO-DIR-ENTRY
+* foo: (foo). "hello--THERE?"
+END-INFO-DIR-ENTRY
+INFO-DIR-SECTION cat2
+START-INFO-DIR-ENTRY
+* aaa :: aaaa
+ bbbbb
+
+menutitle
+END-INFO-DIR-ENTRY
+
+
+Indirect:
+direntry_dircategory.info-1: 341
+direntry_dircategory.info-2: 844
+
+Tag Table:
+(Indirect)
+Node: Top341
+Node: chapter844
+
+End Tag Table
Index:
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-1
===================================================================
RCS file:
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-1
diff -N
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-1
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-1
2 May 2009 11:31:08 -0000 1.1
@@ -0,0 +1,27 @@
+This is direntry_dircategory.info, produced by makeinfo version 4.13
+from direntry_dircategory.texi.
+
+INFO-DIR-SECTION "category--TH ERE?"
+START-INFO-DIR-ENTRY
+* foo: (foo). "hello--THERE?"
+END-INFO-DIR-ENTRY
+INFO-DIR-SECTION cat2
+START-INFO-DIR-ENTRY
+* aaa :: aaaa
+ bbbbb
+
+menutitle
+END-INFO-DIR-ENTRY
+
+
+File: direntry_dircategory.info, Node: Top, Next: chapter, Up: (dir)
+
+Test dircategory and direntry
+*****************************
+
+Text
+
+* Menu:
+
+* chapter::
+
Index:
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-2
===================================================================
RCS file:
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-2
diff -N
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/direntry_dircategory_info_split/direntry_dircategory.info-2
2 May 2009 11:31:08 -0000 1.1
@@ -0,0 +1,23 @@
+This is direntry_dircategory.info, produced by makeinfo version 4.13
+from direntry_dircategory.texi.
+
+INFO-DIR-SECTION "category--TH ERE?"
+START-INFO-DIR-ENTRY
+* foo: (foo). "hello--THERE?"
+END-INFO-DIR-ENTRY
+INFO-DIR-SECTION cat2
+START-INFO-DIR-ENTRY
+* aaa :: aaaa
+ bbbbb
+
+menutitle
+END-INFO-DIR-ENTRY
+
+
+File: direntry_dircategory.info, Node: chapter, Prev: Top, Up: Top
+
+1 chapter
+*********
+
+In chapter
+
Index: test/formatting/res/formatting_info/formatting.info
===================================================================
RCS file: test/formatting/res/formatting_info/formatting.info
diff -N test/formatting/res/formatting_info/formatting.info
Binary files /dev/null and /tmp/cvs4TJWZ5 differ
Index: test/formatting/res/texi_direntry_dircategory/direntry_dircategory.2
===================================================================
RCS file: test/formatting/res/texi_direntry_dircategory/direntry_dircategory.2
diff -N test/formatting/res/texi_direntry_dircategory/direntry_dircategory.2
Index:
test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passfirst
===================================================================
RCS file:
test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passfirst
diff -N
test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passfirst
2 May 2009 11:31:10 -0000 1.1
@@ -0,0 +1,36 @@
+direntry_dircategory.texi(,2)
+direntry_dircategory.texi(,3) @setfilename direntry_dircategory.info
+direntry_dircategory.texi(,4)
+direntry_dircategory.texi(,5) @dircategory address@hidden ere}?''
+direntry_dircategory.texi(,6) @direntry
+direntry_dircategory.texi(,7) * foo: (foo). address@hidden''
+direntry_dircategory.texi(,8) @end direntry
+direntry_dircategory.texi(,9)
+direntry_dircategory.texi(,10) @dircategory cat2
+direntry_dircategory.texi(,11) @direntry
+direntry_dircategory.texi(,12) * aaa :: aaaa
+direntry_dircategory.texi(,13) bbbbb
+direntry_dircategory.texi(,14)
+direntry_dircategory.texi(,15) menutitle
+direntry_dircategory.texi(,16) @end direntry
+direntry_dircategory.texi(,17)
+direntry_dircategory.texi(,18)
+direntry_dircategory.texi(,19) @node Top
+direntry_dircategory.texi(,20) @top Test dircategory and direntry
+direntry_dircategory.texi(,21)
+direntry_dircategory.texi(,22) Text
+direntry_dircategory.texi(,23) @dircategory in text
+direntry_dircategory.texi(,24) @direntry
+direntry_dircategory.texi(,25) * in text: (in_text). in text
+direntry_dircategory.texi(,26) @end direntry
+direntry_dircategory.texi(,27)
+direntry_dircategory.texi(,28) @menu
+direntry_dircategory.texi(,29) * chapter::
+direntry_dircategory.texi(,30) @end menu
+direntry_dircategory.texi(,31)
+direntry_dircategory.texi(,32) @node chapter
+direntry_dircategory.texi(,33) @chapter chapter
+direntry_dircategory.texi(,34)
+direntry_dircategory.texi(,35) In chapter
+direntry_dircategory.texi(,36)
+direntry_dircategory.texi(,37) @bye
Index:
test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passtexi
===================================================================
RCS file:
test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passtexi
diff -N
test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/texi_direntry_dircategory/direntry_dircategory.passtexi
2 May 2009 11:31:10 -0000 1.1
@@ -0,0 +1,36 @@
+direntry_dircategory.texi(,2)
+direntry_dircategory.texi(,3) @setfilename direntry_dircategory.info
+direntry_dircategory.texi(,4)
+direntry_dircategory.texi(,5) @dircategory address@hidden ere}?''
+direntry_dircategory.texi(,6) @direntry
+direntry_dircategory.texi(,7) * foo: (foo). address@hidden''
+direntry_dircategory.texi(,8) @end direntry
+direntry_dircategory.texi(,9)
+direntry_dircategory.texi(,10) @dircategory cat2
+direntry_dircategory.texi(,11) @direntry
+direntry_dircategory.texi(,12) * aaa :: aaaa
+direntry_dircategory.texi(,13) bbbbb
+direntry_dircategory.texi(,14)
+direntry_dircategory.texi(,15) menutitle
+direntry_dircategory.texi(,16) @end direntry
+direntry_dircategory.texi(,17)
+direntry_dircategory.texi(,18)
+direntry_dircategory.texi(,19) @node Top
+direntry_dircategory.texi(,20) @top Test dircategory and direntry
+direntry_dircategory.texi(,21)
+direntry_dircategory.texi(,22) Text
+direntry_dircategory.texi(,23) @dircategory in text
+direntry_dircategory.texi(,24) @direntry
+direntry_dircategory.texi(,25) * in text: (in_text). in text
+direntry_dircategory.texi(,26) @end direntry
+direntry_dircategory.texi(,27)
+direntry_dircategory.texi(,28) @menu
+direntry_dircategory.texi(,29) * chapter::
+direntry_dircategory.texi(,30) @end menu
+direntry_dircategory.texi(,31)
+direntry_dircategory.texi(,32) @node chapter
+direntry_dircategory.texi(,33) @chapter chapter
+direntry_dircategory.texi(,34)
+direntry_dircategory.texi(,35) In chapter
+direntry_dircategory.texi(,36)
+direntry_dircategory.texi(,37) @bye
Index: test/formatting/res/texi_direntry_dircategory/direntry_dircategory.texi
===================================================================
RCS file:
test/formatting/res/texi_direntry_dircategory/direntry_dircategory.texi
diff -N test/formatting/res/texi_direntry_dircategory/direntry_dircategory.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/texi_direntry_dircategory/direntry_dircategory.texi
2 May 2009 11:31:10 -0000 1.1
@@ -0,0 +1,37 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden direntry_dircategory.info
+
address@hidden address@hidden ere}?''
address@hidden
+* foo: (foo). address@hidden''
address@hidden direntry
+
address@hidden cat2
address@hidden
+* aaa :: aaaa
+ bbbbb
+
+menutitle
address@hidden direntry
+
+
address@hidden Top
address@hidden Test dircategory and direntry
+
+Text
address@hidden in text
address@hidden
+* in text: (in_text). in text
address@hidden direntry
+
address@hidden
+* chapter::
address@hidden menu
+
address@hidden chapter
address@hidden chapter
+
+In chapter
+
address@hidden
Index: test/macros/included_file_with_setfilename.texi
===================================================================
RCS file: test/macros/included_file_with_setfilename.texi
diff -N test/macros/included_file_with_setfilename.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/included_file_with_setfilename.texi 2 May 2009 11:31:14
-0000 1.1
@@ -0,0 +1,3 @@
address@hidden included_file.info
+
+In included file.
Index: test/macros/no_arg_macro.texi
===================================================================
RCS file: test/macros/no_arg_macro.texi
diff -N test/macros/no_arg_macro.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/no_arg_macro.texi 2 May 2009 11:31:14 -0000 1.1
@@ -0,0 +1,24 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden no_arg_macro.info
+
address@hidden Top
+
address@hidden texnl{}
address@hidden macro
+
+ This is a more low-level API. The word break property is a property defined
+ in Unicode Standard Annex #29, section ``Word Boundaries'', see
+ @url{http://www.unicode.org/reports/tr29/address@hidden It is used
+ for determining the word breaks in a string.
+
+
address@hidden texnl2
address@hidden macro
+
+ This is a more low-level API. The word break property is a property defined
+ in Unicode Standard Annex #29, section ``Word Boundaries'', see
+ @url{http://www.unicode.org/reports/tr29/address@hidden It is used
+ for determining the word breaks in a string.
+
address@hidden
Index: test/macros/test_include_with_setfilename.texi
===================================================================
RCS file: test/macros/test_include_with_setfilename.texi
diff -N test/macros/test_include_with_setfilename.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/test_include_with_setfilename.texi 2 May 2009 11:31:14
-0000 1.1
@@ -0,0 +1,12 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden test_include_with_setfilename.info
+
address@hidden Top
+
+Include a file that has a @@setfilename.
address@hidden included_file_with_setfilename.texi
+
+After inclusion.
+
address@hidden
Index: test/macros/res/no_arg_macro_info/no_arg_macro.info
===================================================================
RCS file: test/macros/res/no_arg_macro_info/no_arg_macro.info
diff -N test/macros/res/no_arg_macro_info/no_arg_macro.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/res/no_arg_macro_info/no_arg_macro.info 2 May 2009 11:31:14
-0000 1.1
@@ -0,0 +1,22 @@
+This is no_arg_macro.info, produced by makeinfo version 4.13 from
+no_arg_macro.texi.
+
+
+File: no_arg_macro.info, Node: Top, Up: (dir)
+
+This is a more low-level API. The word break property is a property
+defined in Unicode Standard Annex #29, section "Word Boundaries", see
+ `http://www.unicode.org/reports/tr29/#Word_Boundaries'. It is used
+for determining the word breaks in a string.
+
+ This is a more low-level API. The word break property is a property
+defined in Unicode Standard Annex #29, section "Word Boundaries", see
+ `http://www.unicode.org/reports/tr29/#Word_Boundaries'. It is used
+for determining the word breaks in a string.
+
+
+
+Tag Table:
+Node: Top86
+
+End Tag Table
Index:
test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.info
===================================================================
RCS file:
test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.info
diff -N
test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/macros/res/test_include_with_setfilename_info/test_include_with_setfilename.info
2 May 2009 11:31:14 -0000 1.1
@@ -0,0 +1,18 @@
+This is test_include_with_setfilename.info, produced by makeinfo version
+4.13 from test_include_with_setfilename.texi.
+
+
+File: test_include_with_setfilename.info, Node: Top, Up: (dir)
+
+Include a file that has a @setfilename.
+
+ In included file.
+
+ After inclusion.
+
+
+
+Tag Table:
+Node: Top120
+
+End Tag Table
Index: test/macros/res/texi_no_arg_macro/no_arg_macro.2
===================================================================
RCS file: test/macros/res/texi_no_arg_macro/no_arg_macro.2
diff -N test/macros/res/texi_no_arg_macro/no_arg_macro.2
Index: test/macros/res/texi_no_arg_macro/no_arg_macro.passfirst
===================================================================
RCS file: test/macros/res/texi_no_arg_macro/no_arg_macro.passfirst
diff -N test/macros/res/texi_no_arg_macro/no_arg_macro.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/res/texi_no_arg_macro/no_arg_macro.passfirst 2 May 2009
11:31:15 -0000 1.1
@@ -0,0 +1,19 @@
+no_arg_macro.texi(,2)
+no_arg_macro.texi(,3) @setfilename no_arg_macro.info
+no_arg_macro.texi(,4)
+no_arg_macro.texi(,5) @node Top
+no_arg_macro.texi(,6)
+no_arg_macro.texi(,9)
+no_arg_macro.texi(,10) This is a more low-level API. The word break
property is a property defined
+no_arg_macro.texi(,11) in Unicode Standard Annex #29, section ``Word
Boundaries'', see
+no_arg_macro.texi(texnl,12)
@url{http://www.unicode.org/reports/tr29/#Word_Boundaries}. It is used
+no_arg_macro.texi(,13) for determining the word breaks in a string.
+no_arg_macro.texi(,14)
+no_arg_macro.texi(,15)
+no_arg_macro.texi(,18)
+no_arg_macro.texi(,19) This is a more low-level API. The word break
property is a property defined
+no_arg_macro.texi(,20) in Unicode Standard Annex #29, section ``Word
Boundaries'', see
+no_arg_macro.texi(texnl2,21)
@url{http://www.unicode.org/reports/tr29/#Word_Boundaries}. It is used
+no_arg_macro.texi(,22) for determining the word breaks in a string.
+no_arg_macro.texi(,23)
+no_arg_macro.texi(,24) @bye
Index: test/macros/res/texi_no_arg_macro/no_arg_macro.passtexi
===================================================================
RCS file: test/macros/res/texi_no_arg_macro/no_arg_macro.passtexi
diff -N test/macros/res/texi_no_arg_macro/no_arg_macro.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/res/texi_no_arg_macro/no_arg_macro.passtexi 2 May 2009
11:31:15 -0000 1.1
@@ -0,0 +1,19 @@
+no_arg_macro.texi(,2)
+no_arg_macro.texi(,3) @setfilename no_arg_macro.info
+no_arg_macro.texi(,4)
+no_arg_macro.texi(,5) @node Top
+no_arg_macro.texi(,6)
+no_arg_macro.texi(,9)
+no_arg_macro.texi(,10) This is a more low-level API. The word break
property is a property defined
+no_arg_macro.texi(,11) in Unicode Standard Annex #29, section ``Word
Boundaries'', see
+no_arg_macro.texi(texnl,12)
@url{http://www.unicode.org/reports/tr29/#Word_Boundaries}.no_arg_macro.texi(texnl,12)
It is used
+no_arg_macro.texi(,13) for determining the word breaks in a string.
+no_arg_macro.texi(,14)
+no_arg_macro.texi(,15)
+no_arg_macro.texi(,18)
+no_arg_macro.texi(,19) This is a more low-level API. The word break
property is a property defined
+no_arg_macro.texi(,20) in Unicode Standard Annex #29, section ``Word
Boundaries'', see
+no_arg_macro.texi(texnl2,21)
@url{http://www.unicode.org/reports/tr29/#Word_Boundaries}.no_arg_macro.texi(texnl2,21)
It is used
+no_arg_macro.texi(,22) for determining the word breaks in a string.
+no_arg_macro.texi(,23)
+no_arg_macro.texi(,24) @bye
Index: test/macros/res/texi_no_arg_macro/no_arg_macro.texi
===================================================================
RCS file: test/macros/res/texi_no_arg_macro/no_arg_macro.texi
diff -N test/macros/res/texi_no_arg_macro/no_arg_macro.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/macros/res/texi_no_arg_macro/no_arg_macro.texi 2 May 2009 11:31:15
-0000 1.1
@@ -0,0 +1,20 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden no_arg_macro.info
+
address@hidden Top
+
+
+ This is a more low-level API. The word break property is a property defined
+ in Unicode Standard Annex #29, section ``Word Boundaries'', see
+ @url{http://www.unicode.org/reports/tr29/#Word_Boundaries}. It is used
+ for determining the word breaks in a string.
+
+
+
+ This is a more low-level API. The word break property is a property defined
+ in Unicode Standard Annex #29, section ``Word Boundaries'', see
+ @url{http://www.unicode.org/reports/tr29/#Word_Boundaries}. It is used
+ for determining the word breaks in a string.
+
address@hidden
Index:
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.2
===================================================================
RCS file:
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.2
diff -N
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.2
Index:
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passfirst
===================================================================
RCS file:
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passfirst
diff -N
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passfirst
2 May 2009 11:31:16 -0000 1.1
@@ -0,0 +1,12 @@
+test_include_with_setfilename.texi(,2)
+test_include_with_setfilename.texi(,3) @setfilename
test_include_with_setfilename.info
+test_include_with_setfilename.texi(,4)
+test_include_with_setfilename.texi(,5) @node Top
+test_include_with_setfilename.texi(,6)
+test_include_with_setfilename.texi(,7) Include a file that has a @@setfilename.
+included_file_with_setfilename.texi(,1)
+included_file_with_setfilename.texi(,2) In included file.
+included_file_with_setfilename.texi(,3)
+test_include_with_setfilename.texi(,9) After inclusion.
+test_include_with_setfilename.texi(,10)
+test_include_with_setfilename.texi(,11) @bye
Index:
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passtexi
===================================================================
RCS file:
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passtexi
diff -N
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.passtexi
2 May 2009 11:31:16 -0000 1.1
@@ -0,0 +1,12 @@
+test_include_with_setfilename.texi(,2)
+test_include_with_setfilename.texi(,3) @setfilename
test_include_with_setfilename.info
+test_include_with_setfilename.texi(,4)
+test_include_with_setfilename.texi(,5) @node Top
+test_include_with_setfilename.texi(,6)
+test_include_with_setfilename.texi(,7) Include a file that has a @@setfilename.
+included_file_with_setfilename.texi(,1)
+included_file_with_setfilename.texi(,2) In included file.
+included_file_with_setfilename.texi(,3)
+test_include_with_setfilename.texi(,9) After inclusion.
+test_include_with_setfilename.texi(,10)
+test_include_with_setfilename.texi(,11) @bye
Index:
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.texi
===================================================================
RCS file:
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.texi
diff -N
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/macros/res/texi_test_include_with_setfilename/test_include_with_setfilename.texi
2 May 2009 11:31:16 -0000 1.1
@@ -0,0 +1,13 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden test_include_with_setfilename.info
+
address@hidden Top
+
+Include a file that has a @@setfilename.
+
+In included file.
+
+After inclusion.
+
address@hidden
- [Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te...,
Patrice Dumas <=