[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl doc/texi2...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl doc/texi2... |
|
Date: |
Fri, 22 Aug 2008 13:51:27 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 08/08/22 13:51:26
Modified files:
. : ChangeLog TODO texi2html.pl
doc : texi2html.html
test/formatting: Makefile.am
complex_command_in_simple_command.texi
tests.txt
test/formatting/res/center: center.2 center.html
test/formatting/res/complex_command_in_simple_command:
complex_command_in_simple_command.html
test/formatting/res/tables: tables.2 tables.html
test/formatting/res/texi_complex_command_in_simple_command:
complex_command_in_simple_command.passfirst
complex_command_in_simple_command.passtexi
complex_command_in_simple_command.texi
test/invalid : Makefile.am tests.txt
test/invalid/res/bad_nesting: bad_nesting.html
test/invalid/res/caption_not_closed: caption_not_closed.2
test/invalid/res/formats_not_closed: formats_not_closed.html
test/invalid/res/not_closed_in_menu: not_closed_in_menu.html
test/macros/res/defcondx_Dbar: defxcond.html
test/macros/res/defcondx_Ubar: defxcond.html
test/manuals/res/ccvs: cvs_10.html cvs_7.html cvs_8.html
test/manuals/res/ccvs_mediawiki:
`cvs: Adding, removing, and renaming
files and directories'
`cvs: History browsing'
`cvs: Multiple developers'
test/manuals/res/ccvs_mediawiki_nosplit: cvs
test/misc/res/verbatim_html: verbatim_html.html
test/tar_manual/res/tar: tar.html
Added files:
test/formatting: index_in_item_line_table.texi
index_in_item_line_table_in_code.texi
index_in_item_line_vtable.texi
table_in_table_item.texi
test/formatting/res/index_in_item_line_table:
index_in_item_line_table.2
index_in_item_line_table.html
test/formatting/res/index_in_item_line_table_in_code:
index_in_item_line_table_in_code.2
index_in_item_line_table_in_code.html
test/formatting/res/index_in_item_line_vtable:
index_in_item_line_vtable.2
index_in_item_line_vtable.html
test/formatting/res/table_in_table_item: table_in_table_item.2
table_in_table_item.html
test/formatting/res/texi_index_in_item_line_table:
index_in_item_line_table.2
index_in_item_line_table.passfirst
index_in_item_line_table.passtexi
index_in_item_line_table.texi
test/formatting/res/texi_index_in_item_line_table_in_code:
index_in_item_line_table_in_code.2
index_in_item_line_table_in_code.passfirst
index_in_item_line_table_in_code.passtexi
index_in_item_line_table_in_code.texi
test/formatting/res/texi_index_in_item_line_vtable:
index_in_item_line_vtable.2
index_in_item_line_vtable.passfirst
index_in_item_line_vtable.passtexi
index_in_item_line_vtable.texi
test/formatting/res/texi_table_in_table_item:
table_in_table_item.2
table_in_table_item.passfirst
table_in_table_item.passtexi
table_in_table_item.texi
test/invalid : multitable_too_much_col.texi
style_not_closed_in_cartouche.texi
style_not_closed_in_table_line.texi
test/invalid/res/multitable_too_much_col:
multitable_too_much_col.2
multitable_too_much_col.html
test/invalid/res/style_not_closed_in_cartouche:
style_not_closed_in_cartouche.2
style_not_closed_in_cartouche.html
test/invalid/res/style_not_closed_in_table_line:
style_not_closed_in_table_line.2
style_not_closed_in_table_line.html
test/invalid/res/texi_multitable_too_much_col:
multitable_too_much_col.2
multitable_too_much_col.passfirst
multitable_too_much_col.passtexi
multitable_too_much_col.texi
test/invalid/res/texi_style_not_closed_in_cartouche:
style_not_closed_in_cartouche.2
style_not_closed_in_cartouche.passfirst
style_not_closed_in_cartouche.passtexi
style_not_closed_in_cartouche.texi
test/invalid/res/texi_style_not_closed_in_table_line:
style_not_closed_in_table_line.2
style_not_closed_in_table_line.passfirst
style_not_closed_in_table_line.passtexi
style_not_closed_in_table_line.texi
Log message:
* texi2html.pl: simplify handling of table and list items, get
rid of table_list_stack, instead use the regular stack.
Close all formats closed by end of line (center and table term)
at end of line.
Don't call scan_line recursively in close_stack.
Keep the styles to be reopened in next paragraphs in
close_paragraph
and not in close_stack.
Now format_style{'table'} is only for (|v|f)table.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.314&r2=1.315
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.223&r2=1.224
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/Makefile.am?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/complex_command_in_simple_command.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/tests.txt?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/index_in_item_line_table.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/index_in_item_line_table_in_code.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/index_in_item_line_vtable.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/table_in_table_item.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/center/center.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/center/center.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/complex_command_in_simple_command/complex_command_in_simple_command.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/index_in_item_line_table/index_in_item_line_table.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/index_in_item_line_table/index_in_item_line_table.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/index_in_item_line_table_in_code/index_in_item_line_table_in_code.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/index_in_item_line_table_in_code/index_in_item_line_table_in_code.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/table_in_table_item/table_in_table_item.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/table_in_table_item/table_in_table_item.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/tables/tables.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/tables/tables.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_table_in_table_item/table_in_table_item.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_table_in_table_item/table_in_table_item.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_table_in_table_item/table_in_table_item.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_table_in_table_item/table_in_table_item.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/Makefile.am?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/tests.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/multitable_too_much_col.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/style_not_closed_in_cartouche.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/style_not_closed_in_table_line.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/bad_nesting/bad_nesting.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/caption_not_closed/caption_not_closed.2?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/formats_not_closed/formats_not_closed.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/multitable_too_much_col/multitable_too_much_col.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/multitable_too_much_col/multitable_too_much_col.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/not_closed_in_menu/not_closed_in_menu.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/defcondx_Dbar/defxcond.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/macros/res/defcondx_Ubar/defxcond.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs/cvs_10.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs/cvs_7.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs/cvs_8.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs_mediawiki/cvs:%32Adding%44%32removing%44%32and%32renaming%32files%32and%32directories?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs_mediawiki/cvs:%32History%32browsing?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs_mediawiki/cvs:%32Multiple%32developers?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/manuals/res/ccvs_mediawiki_nosplit/cvs?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/verbatim_html/verbatim_html.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/tar_manual/res/tar/tar.html?cvsroot=texi2html&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -b -r1.314 -r1.315
--- ChangeLog 20 Aug 2008 16:02:32 -0000 1.314
+++ ChangeLog 22 Aug 2008 13:51:15 -0000 1.315
@@ -1,3 +1,14 @@
+2008-08-21 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: simplify handling of table and list items, get
+ rid of table_list_stack, instead use the regular stack.
+ Close all formats closed by end of line (center and table term)
+ at end of line.
+ Don't call scan_line recursively in close_stack.
+ Keep the styles to be reopened in next paragraphs in close_paragraph
+ and not in close_stack.
+ Now format_style{'table'} is only for (|v|f)table.
+
2008-08-20 Patrice Dumas <address@hidden>
* texi2html.pl: parse correctly menu node with name.
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- TODO 19 Aug 2008 16:52:53 -0000 1.50
+++ TODO 22 Aug 2008 13:51:15 -0000 1.51
@@ -300,3 +300,6 @@
1.1 Section within unnumbered
* document the new $image arguments
+
+* if a 'term' triggers no_paragraph, the ouput may be more valid, but the
+center won't have effect in it.
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- texi2html.pl 20 Aug 2008 16:02:33 -0000 1.223
+++ texi2html.pl 22 Aug 2008 13:51:16 -0000 1.224
@@ -60,7 +60,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.223 2008/08/20 16:02:33 pertusus Exp $
+# $Id: texi2html.pl,v 1.224 2008/08/22 13:51:16 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -1208,10 +1208,11 @@
{
$format_type{$complex_format} = 'complex_format';
}
-foreach my $table (('table', 'ftable', 'vtable', 'multitable'))
+foreach my $table (('table', 'ftable', 'vtable'))
{
$format_type{$table} = 'table';
}
+$format_type{'multitable'} = 'multitable';
foreach my $def_format (keys(%Texi2HTML::Config::def_map))
{
$format_type{$def_format} = 'deff';
@@ -2675,10 +2676,10 @@
}
$style_type{$accent} = 'accent';
}
-#foreach my $simple ('ctrl', 'w', 'url','uref','indicateurl','email')
-#{
-# $style_type{$simple} = 'simple_style';
-#}
+
+
+
+
foreach my $special ('footnote', 'ref', 'xref', 'pxref', 'inforef', 'anchor',
'image', 'hyphenation')
{
if (exists $Texi2HTML::Config::command_type{$special})
@@ -6462,7 +6463,6 @@
$state->{'keep_nr'} = 0 unless exists($state->{'keep_nr'});
$state->{'detailmenu'} = 0 unless exists($state->{'detailmenu'}); #
number of opened detailed menus
$state->{'sec_num'} = 0 unless exists($state->{'sec_num'});
- $state->{'table_list_stack'} = [ {'format' => "noformat"} ] unless
exists($state->{'table_list_stack'});
$state->{'paragraph_style'} = [ '' ] unless
exists($state->{'paragraph_style'});
$state->{'preformatted_stack'} = [ '' ] unless
exists($state->{'preformatted_stack'});
$state->{'menu'} = 0 unless exists($state->{'menu'});
@@ -7693,7 +7693,6 @@
$command = $format->{'command'} if (defined($format->{'command'}));
$format_name = $format->{'format'} if (defined($format->{'format'}));
- $term = 1 if ($format->{'term'}); #This should never happen
return ($format_name,$command,\$format->{'paragraph_number'},$term,
$format->{'item_nr'}, $format->{'spec'}, $format->{'number'},
@@ -8192,25 +8191,16 @@
my $state = shift;
my $next_tag = next_tag($line);
- ################################ debug
my $top_stack = top_stack($stack,1);
- if ($state->{'deff_line'} and (!defined($top_stack) or
- !defined($top_stack->{'format'}) or
- !defined($Texi2HTML::Config::def_map{$top_stack->{'format'}}) or
- ($state->{'deff_line'}->{'command'} ne $top_stack->{'format'}))
- )
- {
- print STDERR "BUG: $state->{'deff_line'}->{'command'} not equal to
format def or top format not defined\n";
- }
- ################################ end debug
# the def item is started by anything else than a matching @DEFx
- if ($state->{'deff_line'} and
(!defined($Texi2HTML::Config::def_map{$next_tag}) or $next_tag ne
"$state->{'deff_line'}->{'command'}x"))
+
+ if ($top_stack and $top_stack->{'deff_line'} and ($next_tag ne
"$top_stack->{'format'}x"))
{
- #print STDERR "DEF push deff_item for $state->{'deff'}\n";
- push @$stack, { 'format' => 'deff_item', 'text' => '', 'deff_line' =>
$state->{'deff_line'}};
+ #print STDERR "DEF push deff_item for $top_stack->{'format'}\n";
+ push @$stack, { 'format' => 'deff_item', 'text' => ''};
begin_paragraph($stack, $state) if ($state->{'preformatted'});
- delete($state->{'deff_line'});
+ delete($top_stack->{'deff_line'});
#dump_stack(undef, $stack, $state);
}
}
@@ -8365,13 +8355,19 @@
###################################### end debug
}
- if (($format_type{$format} eq 'list') or ($format_type{$format} eq
'table'))
+ if ($format_type{$format} eq 'list')
{ # those functions return if they detect an inapropriate context
- add_item($text, $stack, $state, $line_nr, '', 1); # handle lists
- add_term($text, $stack, $state, $line_nr, 1); # handle table
- add_line($text, $stack, $state, $line_nr, 1); # handle table
+ add_item($text, $stack, $state, $line_nr); # handle lists
+ }
+ elsif ($format eq 'multitable')
+ {
add_row($text, $stack, $state, $line_nr); # handle multitable
}
+ elsif ($format_type{$format} eq 'table')
+ {
+ add_term($text, $stack, $state, $line_nr); # handle table
+ add_line($text, $stack, $state, $line_nr); # handle table
+ }
#print STDERR "END_FORMAT\n";
#dump_stack($text, $stack, $state);
@@ -8410,7 +8406,7 @@
}
if (defined($Texi2HTML::Config::def_map{$format}))
{
- close_stack($text, $stack, $state, $line_nr, undef, 'deff_item')
+ close_stack($text, $stack, $state, $line_nr, 'deff_item')
unless ($format_ref->{'format'} eq 'deff_item');
add_prev($text, $stack,
&$Texi2HTML::Config::def_item($format_ref->{'text'}));
$format_ref = pop @$stack; # pop deff
@@ -8468,10 +8464,9 @@
#print STDERR "after $format\n";
#dump_stack ($text, $stack, $state);
}
- elsif (($format_type{$format} eq 'table') or ($format_type{$format} eq
'list'))
+ elsif ($format_type{$format} eq 'table' or $format_type{$format} eq 'list'
or $format eq 'multitable')
{
#print STDERR "CLOSE $format
($format_ref->{'format'})\n$format_ref->{'text'}\n";
- pop @{$state->{'table_list_stack'}};
#dump_stack($text, $stack, $state);
if ($format_ref->{'format'} ne $format)
{ # for example vtable closing a table. Cannot be known
@@ -8551,7 +8546,14 @@
}
if ($removed_from_stack ne $format and !$format_mismatch)
{
- echo_error ("Bug: removed_from_stack $removed_from_stack ne format
$format", $line_nr);
+ #echo_error ("Bug: removed_from_stack $removed_from_stack ne format
$format", $line_nr);
+ # it may not be a bug. Consider, for example a @code{in code
+ # @end cartouche
+ # The @code is closed when the paragraph is closed by
+ # @end cartouche but not really closed since it might have been
+ # a multiple paragraph @code. So it is not removed from
+ # command_stack but still have disapeared from the stack!
+ echo_error("Closing format $format, got $removed_from_stack",
$line_nr);
}
if ($begin_menu_comment_after_end_format and $state->{'menu'})
{
@@ -8599,9 +8601,9 @@
# command_stack, although there is no real format opening
pop @{$state->{'command_stack'}};
$macro =~ s/x$//o;
- if (!$state->{'deff_line'})
+ if (!$top_format->{'deff_line'})
{# DEFx macro within a DEF paragraph
- close_stack($text, $stack, $state, $line_nr, undef,
'deff_item');
+ close_stack($text, $stack, $state, $line_nr, 'deff_item');
my $format_ref = pop @$stack;
add_prev($text, $stack,
&$Texi2HTML::Config::def_item($format_ref->{'text'}));
}
@@ -8616,38 +8618,16 @@
pop @{$state->{'command_stack'}};
push @{$state->{'command_stack'}}, $macro;
#print STDERR "DEF begin $macro\n";
- push @$stack, { 'format' => $macro, 'text' => '' };
+ $top_format = { 'format' => $macro, 'text' => '' };
+ push @$stack, $top_format;
}
#print STDERR "BEGIN_DEFF $macro\n";
#dump_stack ($text, $stack, $state);
- $state->{'deff_line'}->{'command'} = $macro;
+ $top_format->{'deff_line'} = 1;
+
my ($command, $style, $category, $name, $type, $class, $args_array,
$args_type_array);
($command, $style, $category, $name, $type, $class, $line,
$args_array, $args_type_array) = parse_def($macro, $line, $line_nr);
#print STDERR "AFTER parse_def $line";
- # duplicate_state?
-# old code when cmd_line was used.
-# $state->{'deff_line'}->{'style'} = $style;
-# $state->{'deff_line'}->{'category'} = substitute_line($category,
undef, $line_nr) if (defined($category));
-# $state->{'deff_line'}->{'category'} = '' if (!defined($category));
-# # FIXME -- --- ''... are transformed to entities by
-# # makeinfo. It may be wrong.
-# $state->{'deff_line'}->{'name'} = substitute_line($name, undef,
$line_nr) if (defined($name));
-# $state->{'deff_line'}->{'name'} = '' if (!defined($name));
-# $state->{'deff_line'}->{'type'} = substitute_line($type, undef,
$line_nr) if (defined($type));
-# $state->{'deff_line'}->{'class'} = substitute_line($class, undef,
$line_nr) if (defined($class));
-# # the remaining of the line (the argument)
-# #print STDERR "DEFF: open_cmd_line do_def_line $line";
-# # it is now parsed in $args_array
-# open_cmd_line($stack, $state, ['keep'], \&do_def_line);
-#
-# $category = substitute_line($category, undef, $line_nr) if
(defined($category));
-# $category = '' if (!defined($category));
-# # FIXME -- --- ''... are transformed to entities by
-# # makeinfo. It may be wrong.
-# $name = substitute_line($name, undef, $line_nr) if (defined($name));
-# $name = '' if (!defined($name));
-# $type = substitute_line($type, undef, $line_nr) if (defined($type));
-# $class = substitute_line($class, undef, $line_nr) if
(defined($class));
my @formatted_args = ();
my $arguments = '';
my %formatted_arguments = ();
@@ -8678,7 +8658,6 @@
$formatted_arguments{$type} = $formatted_args[-1];
}
}
- #$state->{'deff_line'}->{'arguments_array'} = address@hidden;
$name = $formatted_arguments{'name'};
$category = $formatted_arguments{'category'};
$type = $formatted_arguments{'type'};
@@ -8724,12 +8703,12 @@
}
}
- elsif (($format_type{$macro} eq 'list') or ($format_type{$macro} eq
'table'))
+ elsif ($format_type{$macro} eq 'list' or $format_type{$macro} eq 'table'
or $macro eq 'multitable')
{
my $format;
#print STDERR "LIST_TABLE $macro\n";
#dump_stack($text, $stack, $state);
- if (($macro eq 'itemize') or ($macro =~ /^(|v|f)table$/))
+ if ($macro eq 'itemize' or $format_type{$macro} eq 'table')
{
my $command;
my $prepended;
@@ -8737,7 +8716,7 @@
$command = 'asis' if (($command eq '') and ($macro ne 'itemize'));
my $prepended_formatted;
$prepended_formatted = substitute_line($prepended,
{'multiple_pass' => 1}) if (defined($prepended));
- $format = { 'format' => $macro, 'text' => '', 'command' =>
$command, 'prepended' => $prepended, 'prepended_formatted' =>
$prepended_formatted, 'term' => 0 };
+ $format = { 'format' => $macro, 'text' => '', 'command' =>
$command, 'prepended' => $prepended, 'prepended_formatted' =>
$prepended_formatted };
$line = '';
}
elsif ($macro eq 'enumerate')
@@ -8768,33 +8747,22 @@
$format->{'first'} = 1;
$format->{'paragraph_number'} = 0;
push @$stack, $format;
- push @{$state->{'table_list_stack'}}, $format;
- if ($macro =~ /^(|v|f)table$/)
+ if ($format_type{$macro} eq 'table')
{
push @$stack, { 'format' => 'line', 'text' => ''};
}
elsif ($macro eq 'multitable')
{
- if ($format->{'max_columns'})
- {
- push @$stack, { 'format' => 'row', 'text' => '', 'item_cmd' =>
$macro, 'columnfractions' => $format->{'columnfractions'}, 'prototype_row' =>
$format->{'prototype_row', 'prototype_lengths' =>
$format->{'prototype_lengths'}} };
+ push @$stack, { 'format' => 'row', 'text' => '', 'item_cmd' =>
$macro };
push @$stack, { 'format' => 'cell', 'text' => ''};
}
- else
- {
- # multitable without row... We use the special null
- # format which content is ignored
- push @$stack, { 'format' => 'null', 'text' => ''};
- push @$stack, { 'format' => 'null', 'text' => ''};
- }
- }
if ($format_type{$macro} eq 'list')
{
push @$stack, { 'format' => 'item', 'text' => ''};
}
begin_paragraph_after_command($state,$stack,$macro,$line)
if ($macro ne 'multitable');
- return '' if ($format_type{$macro} eq 'table' or $macro eq 'itemize');
+ return '' unless ($macro eq 'enumerate');
}
elsif ($macro eq 'float' or $macro eq 'quotation')
{
@@ -8863,7 +8831,7 @@
{
#print STDERR "close MENU_COMMENT\n";
#dump_stack($text, $stack, $state);
- close_stack($text, $stack, $state, $line_nr, undef, 'menu_comment');
+ close_stack($text, $stack, $state, $line_nr, 'menu_comment');
# close_paragraph isn't needed in most cases, but a preformatted may
# appear after close_stack if we closed a format, as formats reopen
# preformatted. However it is empty and close_paragraph will remove it
@@ -8880,7 +8848,7 @@
}
if ($state->{'menu_entry'})
{
- close_stack($text, $stack,$state, $line_nr, undef, 'menu_description');
+ close_stack($text, $stack,$state, $line_nr, 'menu_description');
my $descr = pop(@$stack);
print STDERR "# close_menu: close description\n" if ($T2H_DEBUG &
$DEBUG_MENU);
add_prev($text, $stack, do_menu_description($descr->{'text'}, $state));
@@ -9324,21 +9292,6 @@
return '';
}
-# not used anymore
-sub do_def_line($$$$$)
-{
- my $command = shift;
- my $args = shift;
- my @args = @$args;
- my $arguments = shift @args;
- my $style_stack = shift;
- my $state = shift;
- my $line_nr = shift;
-
- $state->{'deff_line'}->{'arguments'} = $arguments;
- return '';
-}
-
sub do_footnote($$$$)
{
my $command = shift;
@@ -9784,7 +9737,7 @@
my $index = $1;
my $macro = $state->{'item'};
delete $state->{'item'};
- close_stack($text, $stack, $state, $line_nr, undef, 'index_item');
+ close_stack($text, $stack, $state, $line_nr, 'index_item');
my $item = pop @$stack;
my $element = $state->{'element'};
$element = $state->{'node_ref'} unless ($element);
@@ -10754,12 +10707,18 @@
last;
}
elsif (index_command_prefix($macro) ne '')
+ { # if we are already in a (v|f)table the construct is quite
+ # wrong
+ # FIXME but could be made acceptable if needed
+ if ($state->{'item'})
{
+ echo_error("ignored address@hidden already in an
address@hidden>{'item'} entry", $line_nr);
+ next;
+ }
my $index_prefix = index_command_prefix($macro);
my $key = $cline;
$key =~ s/^\s*//;
$cline = substitute_texi_line($cline);
- #set_no_line_macro($macro, 1);
enter_index_entry($index_prefix, $line_nr, $key,
$state->{'place'}, $state->{'element'}, $state->{'after_element'}, $macro,
$state->{'region'});
add_prev ($text, $stack, "address@hidden" . $cline);
last;
@@ -10900,7 +10859,7 @@
add_prev($text, $stack, "address@hidden");
}
}
- elsif ($format_type{$macro} and ($format_type{$macro} eq 'table'
or $format_type{$macro} eq 'list'))
+ elsif ($format_type{$macro} and ($format_type{$macro} eq 'table'
or $format_type{$macro} eq 'list' or $macro eq 'multitable'))
{ # We must enter the index entries of (v|f)table thus we track
# in which table we are
push @{$state->{'table_stack'}}, $macro;
@@ -10978,6 +10937,74 @@
return 1;
} # end scan_structure
+sub close_style_command($$$$$)
+{
+ my $text = shift;
+ my $stack = shift;
+ my $state = shift;
+ my $line_nr = shift;
+ my $line = shift;
+
+ my $style = pop @$stack;
+ my $command = $style->{'style'};
+ my $result;
+ if (!defined($command))
+ {
+ print STDERR "Bug: empty style in pass_text\n";
+ return ($result, $command);
+ }
+ if (ref($::style_map_ref->{$command}) eq 'HASH')
+ {
+ push (@{$style->{'args'}}, $style->{'text'});
+ $style->{'fulltext'} .= $style->{'text'};
+ #my $number = 0;
+ #foreach my $arg(@{$style->{'args'}})
+ #{
+ #print STDERR " $number: $arg\n";
+ # $number++;
+ #}
+ $style->{'text'} = $style->{'fulltext'};
+ $state->{'keep_texi'} = 0 if (
+ ($::style_map_ref->{$command}->{'args'}->[$style->{'arg_nr'}] eq 'keep')
+ and ($state->{'keep_nr'} == 1));
+ }
+ $state->{'no_paragraph'}-- if ($no_paragraph_macro{$command});
+ $style->{'no_close'} = 1 if ($state->{'no_close'});
+ if ($::style_map_ref->{$command} and (defined($style_type{$command})) and
((!$style->{'no_close'} and ($style_type{$command} eq 'style')) or
($style_type{$command} eq 'accent')))
+ {
+ my $style_command = pop @{$state->{'command_stack'}};
+ ############################ debug
+ if ($style_command ne $command)
+ {
+ print STDERR "Bug: $style_command on 'command_stack', not $command\n";
+ push @$stack, $style;
+ push @{$state->{'command_stack'}}, $style_command;
+ print STDERR "Stacks before pop top:\n";
+ dump_stack($text, $stack, $state);
+ pop @$stack;
+ }
+ ############################ end debug
+ }
+ if ($state->{'keep_texi'})
+ { # don't expand @-commands in anchor, refs...
+ close_arg ($command, $style->{'arg_nr'}, $state);
+ $result = '@' . $command . '{' . $style->{'text'} . '}';
+ }
+ else
+ {
+ $result = do_simple($command, $style->{'text'}, $state, $style->{'args'},
$line_nr, $style->{'no_open'}, $style->{'no_close'});
+ if ($state->{'code_style'} < 0)
+ {
+ echo_error ("Bug: negative code_style: $state->{'code_style'},
line:$line", $line_nr);
+ }
+ if ($state->{'math_style'} < 0)
+ {
+ echo_error ("Bug: negative math_style: $state->{'math_style'},
line:$line", $line_nr);
+ }
+ }
+ return ($result, $command);
+}
+
sub scan_line($$$$;$)
{
my $line = shift;
@@ -10988,7 +11015,7 @@
die "stack not an array ref" unless (ref($stack) eq "ARRAY");
my $cline = $line;
- #print STDERR "SCAN_LINE (@{$state->{'command_stack'}}): $line";
+ #print STDERR "SCAN_LINE
(@{$state->{'command_stack'}})".format_line_number($line_nr).": $line";
#dump_stack($text, $stack, $state );
my $new_menu_entry; # true if there is a new menu entry
my $menu_description_in_format; # true if we are in a menu description
@@ -11005,7 +11032,7 @@
# end of lines are really protected only for @def*
# this cannot happen anymore, because the lines are concatenated
# in pass_structure
- unless ($state->{'end_of_line_protected'} and $state->{'deff_line'})
+ unless ($state->{'end_of_line_protected'}) # and in_some_format
{
if (!$state->{'raw'} and !$state->{'verb'} and $state->{'menu'})
{ # new menu entry
@@ -11212,7 +11239,7 @@
# closed below
# this cannot happen anymore, because the lines are concatenated
# in pass_structure
- if ($state->{'end_of_line_protected'} and $state->{'deff_line'})
+ if ($state->{'end_of_line_protected'})# and in some format
{
print STDERR "Bug: 'end_of_line_protected' with text following:
$cline\n"
unless $cline =~ /^$/;
@@ -11281,39 +11308,25 @@
(
($format_type{$end_tag} eq 'menu') and
(
- ($top_stack->{'format'} eq 'menu_preformatted') or
- ($top_stack->{'format'} eq 'menu_comment') or
- ($top_stack->{'format'} eq 'menu_description')
- )
- ) or
- (
- ($end_tag eq 'multitable') and
- (
- ($top_stack->{'format'} eq 'cell') or
- ($top_stack->{'format'} eq 'null')
+ $top_stack->{'format'} eq 'menu_preformatted' or
+ $top_stack->{'format'} eq 'menu_comment' or
+ $top_stack->{'format'} eq 'menu_description'
)
) or
(
- ($format_type{$end_tag} eq 'list' ) and
- ($top_stack->{'format'} eq 'item')
+ $end_tag eq 'multitable' and $top_stack->{'format'} eq 'cell'
) or
(
- (
- ($format_type{$end_tag} eq 'table') and
- ($end_tag ne 'multitable')
- ) and
- (
- ($top_stack->{'format'} eq 'term') or
- ($top_stack->{'format'} eq 'line')
- )
+ $format_type{$end_tag} eq 'list' and $top_stack->{'format'}
eq 'item'
) or
(
- (defined($Texi2HTML::Config::def_map{$end_tag})) and
- ($top_stack->{'format'} eq 'deff_item')
+ $format_type{$end_tag} eq 'table'
+ and
+ ($top_stack->{'format'} eq 'term' or $top_stack->{'format'}
eq 'line')
) or
(
- ($end_tag eq 'row') and
- ($top_stack->{'format'} eq 'cell')
+ defined($Texi2HTML::Config::def_map{$end_tag}) and
+ $top_stack->{'format'} eq 'deff_item'
)
)
{
@@ -11333,7 +11346,7 @@
my $waited_format = $top_stack->{'format'};
$waited_format = $fake_format{$top_stack->{'format'}} if
($format_type{$top_stack->{'format'}} eq 'fake');
echo_error ("waiting for end of $waited_format, found
address@hidden $end_tag", $line_nr);
- close_stack($text, $stack, $state, $line_nr, undef, $end_tag);
+ close_stack($text, $stack, $state, $line_nr, $end_tag);
# an empty preformatted may appear when closing things as
# when closed, formats reopen the preformatted environment
# in case there is some text following, but we know it isn't
@@ -11379,46 +11392,9 @@
#print STDERR "MACRO $macro\n";
#print STDERR "LINE $cline";
#dump_stack ($text, $stack, $state);
- # This is a macro added by close_stack to mark paragraph end
- if ($macro eq 'end_paragraph')
- {
- $cline =~ s/^\{\}//;
- my $top_stack = top_stack($stack);
- #################################### debug
- if (!$top_stack or !$top_stack->{'format'}
- or ($top_stack->{'format'} ne 'paragraph'))
- {
- print STDERR "Bug: end_paragraph but no paragraph to
end\n";
- dump_stack ($text, $stack, $state);
- next;
- }
- #################################### end debug
- $cline =~ s/^\s//;
- my $paragraph = pop @$stack;
- add_prev ($text, $stack, do_paragraph($paragraph->{'text'},
$state, $stack));
- next;
- }
- # Handle macro added by close_stack to mark preformatted region end
- elsif ($macro eq 'end_preformatted')
- {
- #print STDERR "END_PREFORMATTED\n";
- $cline =~ s/^\{\}//;
- my $top_stack = top_stack($stack);
- #################################### debug
- if (!$top_stack or !$top_stack->{'format'}
- or ($top_stack->{'format'} ne 'preformatted'))
- {
- print STDERR "Bug: end_preformatted but no preformatted to
end\n";
- dump_stack ($text, $stack, $state);
- next;
- }
- #################################### end debug
- my $paragraph = pop @$stack;
- $cline =~ s/^\s//;
- add_prev ($text, $stack, do_preformatted($paragraph->{'text'},
$state, $stack));
- next;
- }
+
close_paragraph($text, $stack, $state, $line_nr, 1) if
($Texi2HTML::Config::stop_paragraph_command{$macro} and !$state->{'keep_texi'});
+
if (defined($Texi2HTML::Config::misc_command{$macro}))
{
# Handle the misc command
@@ -11481,7 +11457,7 @@
# This is a @macroname{...} construct. We add it on top of stack
# It will be handled when we encounter the '}'
# There is a special case for def macros as @deffn{def} is licit
- if (!$Texi2HTML::Config::def_map{$macro} and $cline =~ s/^{//)
+ if (!$Texi2HTML::Config::def_map{$macro} and $cline =~ s/^{//) #}
{
if ($macro eq 'verb')
{
@@ -11533,11 +11509,13 @@
}
# @ at the end of line may protect the end of line even when
# keeping texi
- if ($macro eq "\n")
- {
- $state->{'end_of_line_protected'} = 1;
- #print STDERR "PROTECTING END OF LINE\n";
- }
+ # FIXME: with deff handled differently, now this is unused.
+ # in any case it should only be done in specific contexts
+ # if ($macro eq "\n")
+ # {
+ # $state->{'end_of_line_protected'} = 1;
+ # #print STDERR "PROTECTING END OF LINE\n";
+ # }
add_prev($text, $stack, "address@hidden");
if ($Texi2HTML::Config::texi_formats_map{$macro} and
$Texi2HTML::Config::texi_formats_map{$macro} eq 'raw')
@@ -11608,8 +11586,9 @@
if ($state->{'remove_texi'})
{
# handle specially some macros
- if ((($macro =~ /^(\w+?)index$/) and ($1 ne 'print')) or
- ($macro eq 'itemize') or ($macro =~ /^(|v|f)table$/)
+ if ((index_command_prefix($macro) ne '') or
+ ($macro eq 'itemize') or
+ ($format_type{$macro} and $format_type{$macro} eq
'table')
or ($macro eq 'multitable') or ($macro eq 'quotation'))
{
return;
@@ -11696,6 +11675,9 @@
echo_warn ("(bug?) Index out of sync
`$index_entry->{'texi'}' ne `$entry_texi'", $line_nr) if
($index_entry->{'texi'} ne $entry_texi);
}
add_prev($text, $stack,
&$Texi2HTML::Config::index_entry_command($macro, $index_name, $index_label,
$entry_texi, $entry_text));
+ # it eats the end of line and therefore don't start
+ # table entries nor close @center. These should be stopped
+ # on the next line, though.
return;
}
if ($macro eq 'insertcopying')
@@ -11715,14 +11697,20 @@
close_paragraph($text, $stack, $state, $line_nr);
# these functions return the format if in the right context
my $format;
- if ($format = add_item($text, $stack, $state, $line_nr,
$cline))
+ if ($format = add_item($text, $stack, $state, $line_nr))
{ # handle lists
+ push (@$stack, { 'format' => 'item', 'text' => '' });
+ begin_paragraph($stack, $state) unless
(!$state->{'preformatted'} and no_line($cline));
}
elsif ($format = add_term($text, $stack, $state, $line_nr))
{# handle table @item line
+ push (@$stack, { 'format' => 'term', 'text' => '' });
+ #$state->{'no_paragraph'}++;
}
elsif ($format = add_line($text, $stack, $state, $line_nr))
{# handle table text
+ push (@$stack, { 'format' => 'term', 'text' => '' });
+ #$state->{'no_paragraph'}++;
}
if ($format)
{
@@ -11737,58 +11725,47 @@
next;
}
$format = add_row ($text, $stack, $state, $line_nr); # handle
multitable
- unless ($format)
+ if (!$format)
{
echo_warn ("address@hidden outside of table or list",
$line_nr);
- next;
}
- my $row = {'format' => 'row', 'text' => '', 'item_cmd' =>
$macro };
- if ($format->{'max_columns'})
- {
- $row->{'columnfractions'} = $format->{'columnfractions'};
- $row->{'prototype_row'} = $format->{'prototype_row'};
- $row->{'prototype_lengths'} =
$format->{'prototype_lengths'};
- }
- push @$stack, $row;
- if ($format->{'max_columns'})
+ else
{
+ push @$stack, {'format' => 'row', 'text' => '', 'item_cmd'
=> $macro };
push @$stack, {'format' => 'cell', 'text' => ''};
$format->{'cell'} = 1;
-
+ if ($format->{'max_columns'})
+ {
begin_paragraph_after_command($state,$stack,$macro,$cline);
}
else
{
echo_warn ("address@hidden in empty multitable", $line_nr);
}
+ }
next;
}
if ($macro eq 'tab')
{
abort_empty_preformatted($stack, $state);
- # FIXME let the user be able not to close the paragraph
+ # FIXME let the user be able not to close the paragraph?
close_paragraph($text, $stack, $state, $line_nr);
my $format = add_cell ($text, $stack, $state);
- #print STDERR "tab, $format->{'cell'}, max
$format->{'max_columns'}\n";
if (!$format)
{
echo_warn ("address@hidden outside of multitable",
$line_nr);
}
- elsif (!$format->{'max_columns'})
+ else
+ {
+ push @$stack, {'format' => 'cell', 'text' => ''};
+ if (!$format->{'max_columns'})
{
echo_warn ("address@hidden in empty multitable", $line_nr);
- push @$stack, {'format' => 'null', 'text' => ''};
- next;
}
elsif ($format->{'cell'} > $format->{'max_columns'})
{
echo_warn ("too much address@hidden (multitable has only
$format->{'max_columns'} column(s))", $line_nr);
- push @$stack, {'format' => 'null', 'text' => ''};
- next;
}
- else
- {
- push @$stack, {'format' => 'cell', 'text' => ''};
}
begin_paragraph_after_command($state,$stack,$macro,$cline);
next;
@@ -11823,7 +11800,7 @@
my $leading_text = $1;
my $brace = $2;
add_prev($text, $stack, do_text($leading_text, $state));
- if (defined($brace) and ($brace eq '{')) #}
+ if (defined($brace) and ($brace eq '{')) #'}'
{
add_prev($text, $stack, do_text('{',$state)); #}
if ($state->{'math_style'})
@@ -11858,97 +11835,16 @@
else
{
echo_error("'}' without opening '{' before: $cline",
$line_nr);
+ #dump_stack($text, $stack, $state);
}
}
else
{ # A @-command{ ...} is closed
- my $style = pop @$stack;
- my $command = $style->{'style'};
- my $result;
- if (ref($::style_map_ref->{$command}) eq 'HASH')
- {
- push (@{$style->{'args'}}, $style->{'text'});
- $style->{'fulltext'} .= $style->{'text'};
- #my $number = 0;
- #foreach my $arg(@{$style->{'args'}})
- #{
- #print STDERR " $number: $arg\n";
- # $number++;
- #}
- $style->{'text'} = $style->{'fulltext'};
- $state->{'keep_texi'} = 0 if (
-
($::style_map_ref->{$command}->{'args'}->[$style->{'arg_nr'}] eq 'keep')
- and ($state->{'keep_nr'} == 1));
- }
- $state->{'no_paragraph'}-- if ($no_paragraph_macro{$command});
- if ($command)
- {
- $style->{'no_close'} = 1 if ($state->{'no_close'});
- if ($::style_map_ref->{$command} and
(defined($style_type{$command})) and ((!$style->{'no_close'} and
($style_type{$command} eq 'style')) or ($style_type{$command} eq 'accent')))
- {
- my $style_command = pop @{$state->{'command_stack'}};
- ############################ debug
- if ($style_command ne $command)
- {
- print STDERR "Bug: $style_command on
'command_stack', not $command\n";
- push @$stack, $style;
- push @{$state->{'command_stack'}}, $style_command;
- print STDERR "Stacks before pop top:\n";
- dump_stack($text, $stack, $state);
- pop @$stack;
- }
- ############################ end debug
- }
- if ($state->{'keep_texi'})
- { # don't expand @-commands in anchor, refs...
- close_arg ($command, $style->{'arg_nr'}, $state);
- $result = '@' . $command . '{' . $style->{'text'} .
'}';
- }
- else
- {
- $result = do_simple($command, $style->{'text'},
$state, $style->{'args'}, $line_nr, $style->{'no_open'}, $style->{'no_close'});
- if ($state->{'code_style'} < 0)
- {
- echo_error ("Bug: negative code_style:
$state->{'code_style'}, line:$cline", $line_nr);
- }
- if ($state->{'math_style'} < 0)
- {
- echo_error ("Bug: negative math_style:
$state->{'math_style'}, line:$cline", $line_nr);
- }
- }
- }
- else
- {
- print STDERR "Bug: empty style in pass_text\n";
- }
+ my ($result, $command) = close_style_command($text, $stack,
$state, $line_nr, $cline);
add_prev($text, $stack, $result);
if ($command eq 'cmd_line')
{
- if ($state->{'deff_line'})
- {
- # cannot happen now since 'cmd_line' isn't used for
- # deff anymore
- ############################ never here
-#print STDERR "DO DEFF $state->{'deff_line'}->{'command'}
$state->{'deff_line'}->{'arguments'}\n";
- my $command = $state->{'deff_line'}->{'command'};
- my $def_style = $state->{'deff_line'}->{'style'};
- my $category = $state->{'deff_line'}->{'category'};
- my $class = $state->{'deff_line'}->{'class'};
- my $type = $state->{'deff_line'}->{'type'};
- my $name = $state->{'deff_line'}->{'name'};
-
- #my $arguments = $state->{'deff'}->{'arguments'};
- my $arguments;
- $arguments =
substitute_line($state->{'deff_line'}->{'arguments'}, undef, $line_nr) if
(defined($state->{'deff_line'}->{'arguments'}));
- my $arguments_array =
$state->{'deff_line'}->{'arguments_array'};
-
- $category =
&$Texi2HTML::Config::definition_category($category, $class, $def_style);
- my ($index_entry, $index_label) =
do_index_entry_label($command, $state, $line_nr);
- add_prev($text, $stack,
&$Texi2HTML::Config::def_line($category, $name, $type, $arguments,
$index_label, $arguments_array));
- die "Should't get here";
- ######################################
- }
- elsif ($state->{'preformatted'})
+ if ($state->{'preformatted'})
{ # inconditionally begin a preformatted section for
# non @def* commands (currently @float and @quotation)
# for @def* it is done in begin_deff_item_if_needed
@@ -11988,17 +11884,41 @@
else
{ # no macro nor '}', but normal text
add_prev($text, $stack, do_text($cline, $state));
- #print STDERR "END LINE:$cline!!!\n";
- #dump_stack($text, $stack, $state);
-
- # @item line is closed by end of line
- add_term($text, $stack, $state, $line_nr);
-
- # @center is closed at the end of line. When a @-command which
+ # @center/line term is closed at the end of line. When a
+ # @-command which
# keeps the texi as is happens on the @center line, the @center
# is closed at the end of line appearing after the @-command
# closing (for example @ref, @footnote).
-
+ last if ($state->{'keep_texi'});
+ #print STDERR "END LINE:$cline!!!\n";
+ #dump_stack($text, $stack, $state);
+ my $maybe_format_to_close = 1;
+ my $multitable;
+ while ($maybe_format_to_close)
+ {
+ $maybe_format_to_close = 0;
+ my $top_format = top_stack($stack, 1);
+ # the stack cannot easily be used, because there may be
+ # opened commands in paragraphs if the center is in a
+ # style command, like
+ # @b{
+ # bold
+ #
+ # @center centered bold
+ #
+ # }
+ #
+ # Therefore $state->{'paragraph_style'}->[-1] is used.
+ #
+ # The close_stack until 'center' is needed because
+ # of constructs like
+ #
+ # @center something @table
+ #
+ # In that case what would be removed from the stack after
+ # paragraph closing wold not be the @center. Such construct
+ # is certainly incorrect, though.
+ #
# when 'closing_center' is true we don't retry to close
# the @center line.
if ($state->{'paragraph_style'}->[-1] eq 'center'
@@ -12006,19 +11926,48 @@
{
$state->{'closing_center'} = 1;
close_paragraph($text, $stack, $state, $line_nr);
- close_stack($text, $stack, $state, $line_nr, undef, 'center');
+ close_stack($text, $stack, $state, $line_nr, 'center');
delete $state->{'closing_center'};
my $center = pop @$stack;
add_prev($text, $stack,
&$Texi2HTML::Config::paragraph_style_command('center',$center->{'text'}));
my $top_paragraph_style = pop @{$state->{'paragraph_style'}};
+
# center is at the bottom of the comand_stack because it
# may be nested in many way
my $bottom_command_stack = shift @{$state->{'command_stack'}};
print STDERR "Bug: closing center, top_paragraph_style:
$top_paragraph_style, bottom_command_stack: $bottom_command_stack.\n"
if ($bottom_command_stack ne 'center' or
$top_paragraph_style ne 'center');
- $cline = '';
+ $maybe_format_to_close = 1;
next;
}
+
+ # @item line is closed by end of line. In general there should
+ # not be a paragraph in a term. However it may currently
+ # happen in construct like
+ #
+ # @table @asis
+ # @item @cindex index entry
+ # some text still in term, and in paragraph
+ # Not in term anymore
+ # ....
+ #
+ if (defined($top_format->{'format'}) and
$top_format->{'format'} eq 'term')
+ {
+ close_paragraph($text, $stack, $state, $line_nr)
+ if ($state->{'paragraph_context'});
+ $multitable = add_term($text, $stack, $state, $line_nr);
+ if ($multitable)
+ {
+ $maybe_format_to_close = 1;
+ next;
+ }
+ }
+ }
+ if ($multitable)
+ {
+ push (@$stack, { 'format' => 'line', 'text' => '' });
+ begin_paragraph($stack, $state) if ($state->{'preformatted'});
+ }
last;
}
}
@@ -12122,26 +12071,26 @@
}
# finish @item line in @*table
-sub add_term($$$$;$)
+sub add_term($$$$)
{
my $text = shift;
my $stack = shift;
my $state = shift;
my $line_nr = shift;
- my $end = shift;
- return unless (exists ($state->{'table_list_stack'}));
- my $format = $state->{'table_list_stack'}->[-1];
- return unless (($format_type{$format->{'format'}} eq 'table') and
($format->{'format'} ne 'multitable' ) and $format->{'term'});
+
+ my $top_format = top_stack($stack);
+ # FIXME: if there is a style on the stack, the closing of the term is
+ # postpopned until the next end of line without opened @-command.
+ # It is demonstrated in formatting/tables.texi.
+ # to avoid that we should search deeper in the stack and close until
+ # the term (what was done before)
+ return unless (defined($top_format->{'format'}) and
$top_format->{'format'} eq 'term');
+
#print STDERR "ADD_TERM\n";
- # we set 'term' = 0 early such that if we encounter an end of line
- # during close_stack we don't try to do the term once more
- $state->{'table_list_stack'}->[-1]->{'term'} = 0;
- # it is the first paragraph for the term.
- $format->{'paragraph_number'} = 0;
- #dump_stack($text, $stack, $state);
- close_stack($text, $stack, $state, $line_nr, undef, 'term');
my $term = pop @$stack;
+ my $format = $stack->[-1];
+ $format->{'paragraph_number'} = 0;
my $formatted_command;
my $leading_spaces;
my $trailing_spaces;
@@ -12178,11 +12127,7 @@
print STDERR "Bug: no index entry for $text" unless
defined($index_label);
}
add_prev($text, $stack, &$Texi2HTML::Config::table_item($term->{'text'},
$index_label,$format->{'format'},$format->{'command'},
$formatted_command,$state->{'command_stack'}, $term_formatted, $leading_spaces,
$trailing_spaces, $format->{'item_cmd'}));
- unless ($end)
- {
- push (@$stack, { 'format' => 'line', 'text' => '' });
- begin_paragraph($stack, $state) if ($state->{'preformatted'});
- }
+ #$state->{'no_paragraph'}--;
return $format;
}
@@ -12192,73 +12137,90 @@
my $stack = shift;
my $state = shift;
my $line_nr = shift;
- my $format = $state->{'table_list_stack'}->[-1];
- return unless ($format->{'format'} eq 'multitable');
- if ($format->{'cell'} > $format->{'max_columns'})
+
+ my $top_format = top_stack($stack);
+ # @center a @item
+ # will lead to row not being closed since a close paragraph doesn't
+ # end the center.
+ return unless (defined($top_format->{'format'}) and
$top_format->{'format'} eq 'cell');
+ my $format = $stack->[-3];
+ print STDERR "Bug under row cell row not a multitable\n" if
(!defined($format->{'format'}) or $format->{'format'} ne 'multitable');
+ # print STDERR "ADD_ROW\n";
+ # dump_stack($text, $stack, $state);
+
+ my $empty_first;
+ if ($format->{'first'} and $format->{'cell'} == 1 and
$stack->[-1]->{'text'} =~ /^\s*$/)
{
- close_stack($text, $stack, $state, $line_nr, undef, 'null');
- pop @$stack;
- }
- unless ($format->{'max_columns'})
- { # empty multitable
- pop @$stack; # pop 'row'
- return $format;
+ $empty_first = 1;
}
- if ($format->{'first'})
- { # first row
- $format->{'first'} = 0;
- #dump_stack($text, $stack, $state);
- #if ($stack->[-1]->{'format'} and ($stack->[-1]->{'format'} eq
'paragraph') and ($stack->[-1]->{'text'} =~ /^\s*$/) and ($format->{'cell'} ==
1))
- if ($stack->[-1]->{'format'} and ($stack->[-1]->{'format'} eq 'cell')
and ($stack->[-1]->{'text'} =~ /^\s*$/) and ($format->{'cell'} == 1))
+ if ($format->{'cell'} > $format->{'max_columns'} or $empty_first)
{
- pop @$stack;
- pop @$stack;
- #pop @$stack;
- return $format;
- }
+ my $cell = pop @$stack;
+ print STDERR "Bug: not a cell ($cell->{'format'}) in multitable\n" if
($cell->{'format'} ne 'cell');
}
+ else
+ {
add_cell($text, $stack, $state);
+ }
my $row = pop @$stack;
- add_prev($text, $stack, &$Texi2HTML::Config::row($row->{'text'},
$row->{'item_cmd'}, $row->{'columnfractions'}, $row->{'prototype_row'},
$row->{'prototype_lengths'}, $format->{'max_columns'}));
+ print STDERR "Bug: not a row ($row->{'format'}) in multitable\n" if
($row->{'format'} ne 'row');
+ if ($format->{'max_columns'} and !$empty_first)
+ {
+ # FIXME have the cell count in row and not in table. table could have
+ # the whole structure, but cell count doesn't make much sense
+ add_prev($text, $stack, &$Texi2HTML::Config::row($row->{'text'},
$row->{'item_cmd'}, $format->{'columnfractions'}, $format->{'prototype_row'},
$format->{'prototype_lengths'}, $format->{'max_columns'}));
+ }
+
+ $format->{'first'} = 0 if ($format->{'first'});
+
return $format;
}
+# FIXME remove and merge, too much double checks and code
sub add_cell($$$$)
{
my $text = shift;
my $stack = shift;
my $state = shift;
my $line_nr = shift;
- my $format = $state->{'table_list_stack'}->[-1];
- return unless ($format->{'format'} eq 'multitable');
- if ($format->{'cell'} <= $format->{'max_columns'})
- {
- close_stack($text, $stack, $state, $line_nr, undef, 'cell');
+ my $top_format = top_stack($stack);
+
+ return unless (defined($top_format) and $top_format->{'format'} eq 'cell');
+
my $cell = pop @$stack;
my $row = top_stack($stack);
- print STDERR "Bug: top_stack of cell not a row\n" if (!defined($row)
or !defined($row->{'format'}) or ($row->{'format'} ne 'row'));
- add_prev($text, $stack, &$Texi2HTML::Config::cell($cell->{'text'},
$row->{'item_cmd'}, $row->{'columnfractions'}, $row->{'prototype_row'},
$row->{'prototype_lengths'}, $format->{'max_columns'}));
- $format->{'cell'}++;
+ print STDERR "Bug: top_stack of cell not a row\n" if
(!defined($row->{'format'}) or ($row->{'format'} ne 'row'));
+ my $format = $stack->[-2];
+ print STDERR "Bug under cell row not a multitable\n" if
(!defined($format->{'format'}) or $format->{'format'} ne 'multitable');
+ if ($format->{'cell'} <= $format->{'max_columns'})
+ {
+ add_prev($text, $stack, &$Texi2HTML::Config::cell($cell->{'text'},
$row->{'item_cmd'}, $format->{'columnfractions'}, $format->{'prototype_row'},
$format->{'prototype_lengths'}, $format->{'max_columns'}));
}
+ $format->{'cell'}++;
return $format;
}
-sub add_line($$$$;$)
+sub add_line($$$$)
{
my $text = shift;
my $stack = shift;
my $state = shift;
my $line_nr = shift;
- my $end = shift;
- my $format = $state->{'table_list_stack'}->[-1];
- return unless ($format_type{$format->{'format'}} eq 'table' and
($format->{'format'} ne 'multitable') and ($format->{'term'} == 0));
+ my $top_stack = top_stack($stack);
+
+ # if there is something like
+ # @center centered @item new item
+ # the item isn't opened since it is in @center, and center isn't closed
+ # by an @item appearing here (unlike a paragraph).
+ # the error message is '@item outside of table or list'.
+ # texi2dvi also has issue, but makeinfo is happy, however it
+ # produces bad nesting.
+ return unless(defined($top_stack->{'format'}) and $top_stack->{'format'}
eq 'line');
#print STDERR "ADD_LINE\n";
#dump_stack($text, $stack, $state);
- # as in pre the end of line are kept, we must explicitely abort empty
- # preformatted, close_stack doesn't abort the empty preformatted regions.
- abort_empty_preformatted($stack, $state) if ($format->{'first'});
- close_stack($text, $stack, $state, $line_nr, undef, 'line');
+
my $line = pop @$stack;
+ my $format = $stack->[-1];
$format->{'paragraph_number'} = 0;
my $first = 0;
$first = 1 if ($format->{'first'});
@@ -12274,30 +12236,27 @@
{
add_prev($text, $stack,
&$Texi2HTML::Config::table_line($line->{'text'}));
}
- unless($end)
- {
- push (@$stack, { 'format' => 'term', 'text' => '' });
- }
- $format->{'term'} = 1;
return $format;
}
# finish @enumerate or @itemize @item
-sub add_item($$$$;$)
+sub add_item($$$$)
{
my $text = shift;
my $stack = shift;
my $state = shift;
my $line_nr = shift;
- my $line = shift;
- my $end = shift;
- my $format = $state->{'table_list_stack'}->[-1];
- return unless ($format_type{$format->{'format'}} eq 'list');
+
+ my $top_stack = top_stack($stack);
+
+ return unless (defined($top_stack->{'format'}) and $top_stack->{'format'}
eq 'item');
#print STDERR "ADD_ITEM: \n";
+ #dump_stack($text, $stack, $state);
# as in pre the end of line are kept, we must explicitely abort empty
# preformatted, close_stack doesn't do that.
- abort_empty_preformatted($stack, $state) if ($format->{'first'});
- close_stack($text, $stack, $state, $line_nr, undef, 'item');
+ my $item = pop @$stack;
+ my $format = $stack->[-1];
+
$format->{'paragraph_number'} = 0;
if ($format->{'format'} eq 'enumerate')
{
@@ -12315,7 +12274,7 @@
my @letter_ords = decompose(ord($spec) - $base_letter +
$format->{'item_nr'} - 1, 26);
foreach my $ord (@letter_ords)
- {# WARNING we go directly to 'ba' after 'z', and not 'aa'
+ {# FIXME we go directly to 'ba' after 'z', and not 'aa'
#because 'ba' is 1,0 and 'aa' is 0,0.
$format->{'number'} = chr($base_letter + $ord) .
$format->{'number'};
}
@@ -12323,10 +12282,8 @@
}
#dump_stack ($text, $stack, $state);
- my $item = pop @$stack;
# the element following ol or ul must be li. Thus even though there
# is no @item we put a normal item.
-
# don't do an item if it is the first and it is empty
if (!$format->{'first'} or ($item->{'text'} =~ /\S/o))
{
@@ -12344,12 +12301,6 @@
$format->{'first'} = 0;
}
- # Now prepare the new item
- unless($end)
- {
- push (@$stack, { 'format' => 'item', 'text' => '' });
- begin_paragraph($stack, $state) unless (!$state->{'preformatted'} and
no_line($line));
- }
return $format;
}
@@ -12371,13 +12322,13 @@
if (defined($::simple_map_ref->{$macro}))
{
# \n may in certain circumstances, protect end of lines
- # this cannot happen anymore, because the lines are concatenated
+ # FIXME this cannot happen anymore, because the lines are concatenated
# in pass_structure
- if ($macro eq "\n")
- {
- $state->{'end_of_line_protected'} = 1;
- #print STDERR "PROTECTING END OF LINE\n";
- }
+ # if ($macro eq "\n")
+ # {
+ # $state->{'end_of_line_protected'} = 1;
+ # #print STDERR "PROTECTING END OF LINE\n";
+ # }
if ($state->{'keep_texi'})
{
return "address@hidden";
@@ -12743,60 +12694,42 @@
delete $state->{'region_pass'};
}
-# close the stack, closing macros and formats left open.
-# the precise behavior of the function depends on $close_paragraph:
-# undef -> close everything
-# defined -> remove empty paragraphs, close until the first format or
-# paragraph. don't close styles, duplicate stack of styles not closed
-
-# if a $format is given the stack is closed according to $close_paragraph but
-# if $format is encountered the closing stops
-
-sub close_stack($$$$;$$)
+# close the stack, closing @-commands and formats left open.
+# if a $format is given if $format is encountered the closing stops
+sub close_stack($$$$;$)
{
my $text = shift;
my $stack = shift;
my $state = shift;
my $line_nr = shift;
- my $close_paragraph = shift;
my $format = shift;
- my $new_stack;
#print STDERR "sub_close_stack\n";
- return $new_stack unless (@$stack);
+ return unless (@$stack);
my $stack_level = $#$stack + 1;
- my $string = '';
- my $verb = '';
-
- if ($state->{'verb'})
- {
- $string .= $state->{'verb'};
- $verb = $state->{'verb'};
- }
#debugging
#my $print_format = 'NO FORMAT';
#$print_format = $format if ($format);
- #my $print_close_paragraph = 'close everything';
- #$print_close_paragraph = 'close paragraph without duplicating' if
(defined($close_paragraph));
- #$print_close_paragraph = $close_paragraph if ($close_paragraph);
- #print STDERR "Close_stack: format $print_format, close_paragraph:
$print_close_paragraph\n";
+ #print STDERR "Close_stack: format $print_format\n";
while ($stack_level--)
{
if ($stack->[$stack_level]->{'format'})
{
my $stack_format = $stack->[$stack_level]->{'format'};
- last if (defined($close_paragraph) or (defined($format) and
$stack_format eq $format));
+ last if (defined($format) and $stack_format eq $format);
# We silently close paragraphs, preformatted sections and fake
formats
if ($stack_format eq 'paragraph')
{
- $string .= "address@hidden";
+ my $paragraph = pop @$stack;
+ add_prev ($text, $stack, do_paragraph($paragraph->{'text'},
$state, $stack));
}
elsif ($stack_format eq 'preformatted')
{
- $string .= "address@hidden";
+ my $paragraph = pop @$stack;
+ add_prev ($text, $stack, do_preformatted($paragraph->{'text'},
$state, $stack));
}
else
{
@@ -12805,41 +12738,28 @@
warn "# Closing a fake format `$stack_format'\n" if
($T2H_VERBOSE);
}
elsif ($stack_format ne 'center')
- { # we don't warn, but add an @end center
+ { # we don't warn for center
echo_error ("closing `$stack_format'", $line_nr);
#dump_stack ($text, $stack, $state);
}
- $string .= "address@hidden $stack_format ";
- }
- }
- else
- {
- my $style = $stack->[$stack_level]->{'style'};
- # FIXME images, footnotes, xrefs, anchors with $close_paragraphs?
- # seems that it is not possible, as it is triggered by
- # close_paragraph which shouldn't be called with keep_texi
- # and when the arguments are expanded, there is a
- # substitute_line or similar with a new stack.
- if ($close_paragraph)
- { #duplicate the stack
- # the !exists($style_type{$style}) condition catches the unknown
- # @-commands: by default they are considered as style commands
- if ((exists($style_type{$style}) and ($style_type{$style} eq
'style')) or (!exists($style_type{$style})))
+ # if after a @def line, one has to opne a deff_item before
+ # closing it
+ begin_deff_item_if_needed('', $stack, $state);
+
+ if ($state->{'keep_texi'})
{
- push @$new_stack, { 'style' => $style, 'text' => '',
'no_open' => 1, 'arg_nr' => 0 };
- $string .= '}';
+ add_prev($text, $stack, "address@hidden $stack_format");
}
- elsif (($style_type{$style} eq 'simple_style') or
($style_type{$style} eq 'accent'))
+ elsif (!$state->{'remove_texi'})
{
- $string .= '}';
+ end_format($text, $stack, $state, $stack_format, $line_nr)
+ unless ($format_type{$stack_format} eq 'fake');
}
- else
- {
- print STDERR "$style while closing paragraph\n";
}
}
else
{
+ my $style = $stack->[$stack_level]->{'style'};
########################## debug
if (!defined($style))
{
@@ -12847,30 +12767,11 @@
dump_stack ($text, $stack, $state); # bug
}
########################## end debug
- $string .= '}';
echo_warn ("closing address@hidden $style", $line_nr) if
($style);
+ my ($result, $command) = close_style_command($text, $stack,
$state, $line_nr, '');
+ add_prev($text, $stack, $result) if (defined($result));
}
}
- }
- $state->{'no_close'} = 1 if ($close_paragraph);
- $state->{'close_stack'} = 1;
- if ($string ne '')
- {
- #print STDERR "scan_line in CLOSE_STACK ($string)\n";
- #dump_stack ($text, $stack, $state);
- scan_line($string, $text, $stack, $state, $line_nr);
- }
- delete $state->{'no_close'};
- delete $state->{'close_stack'};
- $state->{'verb'} = $verb if (($verb ne '') and $close_paragraph);
- # cancel paragraph states and command_stack
- # FIXME this seems to be unusefull, see formatting/center.texi
- unless (defined($close_paragraph) or defined($format))
- {
- $state->{'paragraph_style'} = [ '' ];
-# $state->{'command_stack'} = [ '' ];
- }
- return $new_stack;
}
# given a stack and a list of formats, return true if the stack contains
@@ -12923,10 +12824,49 @@
my $state = shift;
my $line_nr = shift;
my $no_preformatted_closing = shift;
- #my $macro = shift;
#print STDERR "CLOSE_PARAGRAPH\n";
#dump_stack($text, $stack, $state);
- my $new_stack = close_stack($text, $stack, $state, $line_nr, 1);
+
+ # close until the first format,
+ # duplicate stack of styles not closed
+ my $new_stack;
+ my $stack_level = $#$stack + 1;
+
+ while ($stack_level--)
+ {
+ last if ($stack->[$stack_level]->{'format'});
+ my $style = $stack->[$stack_level]->{'style'};
+ # FIXME images, footnotes, xrefs, anchors?
+ # seems that it is not possible, as
+ # close_paragraph shouldn't be called with keep_texi
+ # and when the arguments are expanded, there is a
+ # substitute_line or similar with a new stack.
+
+ # the !exists($style_type{$style}) condition catches the unknown
+ # @-commands: by default they are considered as style commands
+ if (!exists($style_type{$style}) or $style_type{$style} eq 'style')
+ {
+ push @$new_stack, { 'style' => $style, 'text' => '', 'no_open' =>
1, 'arg_nr' => 0 };
+ }
+ elsif (($style_type{$style} eq 'simple_style') or ($style_type{$style}
eq 'accent'))
+ {
+ }
+ else
+ {
+ print STDERR "BUG: special $style while closing paragraph\n";
+ }
+ $state->{'no_close'} = 1;
+ my ($result, $command) = close_style_command($text, $stack, $state,
$line_nr, '');
+ add_prev($text, $stack, $result) if (defined($result));
+ delete $state->{'no_close'};
+ }
+
+ if (!$state->{'paragraph_context'} and !$state->{'preformatted'} and
defined($new_stack) and scalar(@$new_stack))
+ { # in that case the $new_stack isn't recorded in
$state->{'paragraph_macros'}
+ # and therefore, it is lost
+ print STDERR "BUG: closing paragraph, but not in
paragraph/preformatted, and new_stack not empty
".format_line_number($line_nr)."\n";
+ dump_stack($text, $stack, $state);
+ }
my $top_stack = top_stack($stack);
if ($top_stack and !defined($top_stack->{'format'}))
{ #debug
@@ -13007,15 +12947,6 @@
}
print STDERR "\n";
}
- if (defined($state->{'table_list_stack'}))
- {
- print STDERR "table_list_stack: ";
- foreach my $format (@{$state->{'table_list_stack'}})
- {
- print STDERR "$format->{'format'} ";
- }
- print STDERR "\n";
- }
if (defined($state->{'command_stack'}))
{
print STDERR "command_stack: ";
@@ -13029,6 +12960,15 @@
{
print STDERR "region_lines($state->{'region_lines'}->{'number'}):
$state->{'region_lines'}->{'format'}\n";
}
+ if (defined($state->{'paragraph_macros'}))
+ {
+ print STDERR "paragraph_macros: ";
+ foreach my $style (@{$state->{'paragraph_macros'}})
+ {
+ print STDERR "($style->{'style'})";
+ }
+ print STDERR "\n";
+ }
if (defined($state->{'text_macro_stack'}) and
@{$state->{'text_macro_stack'}})
{
print STDERR "text_macro_stack: (@{$state->{'text_macro_stack'}})\n";
Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- doc/texi2html.html 20 Aug 2008 12:26:58 -0000 1.82
+++ doc/texi2html.html 22 Aug 2008 13:51:16 -0000 1.83
@@ -40,7 +40,7 @@
permission notice may be stated in a translation approved
by the Free Software Foundation.
-->
-<!-- Created on August 20, 2008 by texi2html @PACKAGE_VERSION@
+<!-- Created on August 21, 2008 by texi2html 1.79
texi2html was written by:
Lionel Cons <address@hidden> (original author)
Karl Berry <address@hidden>
@@ -56,7 +56,7 @@
<meta name="keywords" content="Texi2HTML – Texinfo to HTML v1.79">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<meta name="Generator" content="texi2html @PACKAGE_VERSION@">
+<meta name="Generator" content="texi2html 1.79">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
@@ -4718,6 +4718,7 @@
<dt><u>Function Reference:</u> $complex_format_text <b>complex_format</b><i>
$format_name $preformatted_text</i>
<a name="IDX266"></a>
</dt>
+
<dd><p><var>$format_name</var> is the complex format name,
<var>$preformatted_text</var> is the
text allready formatted as described in <a
href="#Paragraph-and-preformatted-region">Formatting (or not) a paragraph and a
preformatted region</a>.
This function returns the whole complex format.
@@ -7707,7 +7708,7 @@
</tr></table>
<h1>About This Document</h1>
<p>
- This document was generated by <em>Patrice Dumas</em> on <em>August 20,
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
@PACKAGE_VERSION@</em></a>.
+ This document was generated by <em>Patrice Dumas</em> on <em>August 21,
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
</p>
<p>
The buttons in the navigation panels have the following meaning:
@@ -7809,7 +7810,7 @@
<hr size="1">
<p>
<font size="-1">
- This document was generated by <em>Patrice Dumas</em> on <em>August 20,
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
@PACKAGE_VERSION@</em></a>.
+ This document was generated by <em>Patrice Dumas</em> on <em>August 21,
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
</font>
<br>
Index: test/formatting/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/Makefile.am 19 Aug 2008 16:52:54 -0000 1.4
+++ test/formatting/Makefile.am 22 Aug 2008 13:51:17 -0000 1.5
@@ -5,7 +5,8 @@
center.texi tables.texi formats_in_menu.texi heading.texi quotes.texi \
indicateurl_paragraph.texi complex_command_in_simple_command.texi \
symbol_after_block.texi html-extrali.texi html-para.texi html-title.texi \
- images.texi \
+ images.texi index_in_item_line_table.texi index_in_item_line_vtable.texi \
+ index_in_item_line_table_in_code.texi table_in_table_item.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/complex_command_in_simple_command.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/complex_command_in_simple_command.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/complex_command_in_simple_command.texi 18 Aug 2008
18:02:59 -0000 1.1
+++ test/formatting/complex_command_in_simple_command.texi 22 Aug 2008
13:51:17 -0000 1.2
@@ -281,6 +281,81 @@
After cartouche
}
+
address@hidden in b and samp
address@hidden
+In samp.
address@hidden
+In b
+
+Table
+
address@hidden @asis
address@hidden item
+line
address@hidden table
+After table.
+
+
+Multitable
address@hidden {truc} {machin}
address@hidden truc @tab machin
address@hidden multitable
+
+Enumerate.
+
address@hidden 1
address@hidden item
address@hidden enumerate
+
+After enumerate.
+
+Example
+
address@hidden
+Example
address@hidden example
+
+After example
+
+defun
+
address@hidden name args...
+text
address@hidden defun
+
+After defun.
+
+Flushright
+
address@hidden
+in flushright
address@hidden flushright
+
+Centered line
+
address@hidden in centered line
+
+Before quotation
+
address@hidden
+a q--uotation
address@hidden quotation
+
+After quotation
+
+Before cartouche
+
address@hidden
+Cartouche
address@hidden cartouche
+
+After cartouche
+
+close b}
+and close samp
+}
+
After the tests.
@bye
Index: test/formatting/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/tests.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/tests.txt 20 Aug 2008 12:27:00 -0000 1.3
+++ test/formatting/tests.txt 22 Aug 2008 13:51:17 -0000 1.4
@@ -24,6 +24,10 @@
texi html-para.texi
texi html-title.texi
texi images.texi -init docbook.init
+texi index_in_item_line_table.texi
+texi index_in_item_line_vtable.texi
+texi index_in_item_line_table_in_code.texi
+texi table_in_table_item.texi
def_cmds def_cmds.texi
menus menus.texi
menus_simple menus.texi -init simple_menu.init
@@ -61,3 +65,7 @@
float_docbook ../coverage/float.texi -init docbook.init -U texi2html
formatting_docbook ../coverage/formatting.texi -init docbook.init -U texi2html
formatting_xml ../coverage/formatting.texi -init xml.init -U texi2html
+index_in_item_line_table index_in_item_line_table.texi
+index_in_item_line_vtable index_in_item_line_vtable.texi
+index_in_item_line_table_in_code index_in_item_line_table_in_code.texi
+table_in_table_item table_in_table_item.texi
Index: test/formatting/res/center/center.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/center/center.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/center/center.2 18 Aug 2008 18:03:02 -0000 1.1
+++ test/formatting/res/center/center.2 22 Aug 2008 13:51:17 -0000 1.2
@@ -1,5 +1,7 @@
-*** '}' without opening '{' before: (l. 58)
-*** '}' without opening '{' before: (l. 62)
+** @item outside of table or list (l. 34)
+** @item outside of table or list (l. 68)
+** @tab outside of multitable (l. 68)
+** @item outside of table or list (l. 69)
*** closing `table' (l. 73)
** @item outside of table or list (l. 75)
*** @end table without corresponding opening (l. 76)
Index: test/formatting/res/center/center.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/center/center.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/center/center.html 18 Aug 2008 18:03:02 -0000
1.1
+++ test/formatting/res/center/center.html 22 Aug 2008 13:51:18 -0000
1.2
@@ -68,8 +68,8 @@
<dt> <p align="center"> centered text in item
</p></dt>
<dd><p>table line </p><p align="center"> centered text in table line
-</p><p align="center"> centered line with item </p></dd>
-<dt> second item on center line</dt>
+</p><p align="center"> centered line with item </p> second item on center line
+</dd>
</dl>
<p align="center"> unclosed command on center line <code>in code
@@ -93,12 +93,12 @@
<p align="center"> after first center </p><p align="center"> after second
center
</p>
-<p align="center"> ‘<samp>something </samp></p><p align="center"><samp>
end of samp
+<p align="center"> ‘<samp>something </samp></p><p align="center"><samp>
end of samp</samp>’
+</p>
+<p align="center"> after first center ‘<samp></samp></p><p
align="center"><samp> after second center
</samp></p>
-<p align="center"><samp> after first center ‘<samp></samp></samp></p><p
align="center"><samp><samp> after second center
-</samp></samp></p>
-<p><samp><samp>End of samp
-</samp></samp></p>
+<p><samp>End of samp</samp>’
+</p>
<hr size="1">
<a name="SEC1"></a>
<table cellpadding="1" cellspacing="1" border="0">
@@ -120,19 +120,17 @@
<h1 class="unnumbered">Heading</h1>
<table>
-<tr><td><p><samp><samp> truc </samp></samp></p></td><td><p><samp><samp> bidule
-</samp></samp></p> </td></tr>
-<tr><td><p><samp><samp> ctruc </samp></samp></p></td><td><p><samp><samp>
cbidule
-</samp></samp></p> </td></tr>
-<tr><td><p><samp><samp> cstruc
-</samp></samp></p></td></tr>
+<tr><td><p> truc </p></td><td><p> bidule
+</p> ctruc <p align="center"> cbidule
+</p> cstruc
+</td></tr>
</table>
-<p align="center"><samp><samp> before the table </samp></samp></p><dl
compact="compact">
+<p align="center"> before the table </p><dl compact="compact">
<dt> item in center</dt>
</dl>
-<p><samp><samp>Line in center
-</samp></samp></p> second item
+<p>Line in center
+</p> second item
@end table
<hr size="6">
Index:
test/formatting/res/complex_command_in_simple_command/complex_command_in_simple_command.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/complex_command_in_simple_command/complex_command_in_simple_command.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
test/formatting/res/complex_command_in_simple_command/complex_command_in_simple_command.html
18 Aug 2008 18:03:03 -0000 1.1
+++
test/formatting/res/complex_command_in_simple_command/complex_command_in_simple_command.html
22 Aug 2008 13:51:18 -0000 1.2
@@ -327,6 +327,83 @@
<p><code>After cartouche
</code>
</p>
+
+<a name="HEAD4"></a>
+<h3 class="subheading">in b and samp</h3>
+<p>‘<samp>
+In samp.
+<b>
+In b
+</b></samp></p>
+<p><samp><b>Table
+</b></samp></p>
+<dl compact="compact">
+<dt> item </dt>
+<dd><p><samp><b>line
+</b></samp></p></dd>
+</dl>
+<p><samp><b>After table.
+</b></samp></p>
+
+<p><samp><b>Multitable
+</b></samp></p><table>
+<tr><td><p><samp><b> truc </b></samp></p></td><td><p><samp><b> machin
+</b></samp></p></td></tr>
+</table>
+
+<p><samp><b>Enumerate.
+</b></samp></p>
+<ol>
+<li><samp><b> item
+</b></samp></li></ol>
+
+<p><samp><b>After enumerate.
+</b></samp></p>
+<p><samp><b>Example
+</b></samp></p>
+<table><tr><td> </td><td><pre class="example"><samp><b>Example
+</b></samp></pre></td></tr></table>
+
+<p><samp><b>After example
+</b></samp></p>
+<p><samp><b>defun
+</b></samp></p>
+<dl>
+<dt><u>Function:</u> <b>name</b><i> args...</i>
+<a name="IDX5"></a>
+</dt>
+<dd><p><samp><b>text
+</b></samp></p></dd></dl>
+
+<p><samp><b>After defun.
+</b></samp></p>
+<p><samp><b>Flushright
+</b></samp></p>
+<p align="right"><samp><b>in flushright
+</b></samp></p>
+<p><samp><b>Centered line
+</b></samp></p>
+<p align="center"><samp><b> in centered line
+</b></samp></p>
+<p><samp><b>Before quotation
+</b></samp></p>
+<blockquote><p><samp><b>a q--uotation
+</b></samp></p></blockquote>
+
+<p><samp><b>After quotation
+</b></samp></p>
+<p><samp><b>Before cartouche
+</b></samp></p>
+<table class="cartouche" border="1"><tr><td>
+<p><samp><b>Cartouche
+</b></samp></p></td></tr></table>
+
+<p><samp><b>After cartouche
+</b></samp></p>
+<p><samp><b>close b</b>
+and close samp
+</samp>’
+</p>
<p>After the tests.
</p>
<hr size="1">
Index: test/formatting/res/tables/tables.2
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/tables/tables.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/tables/tables.2 18 Aug 2008 18:03:10 -0000 1.1
+++ test/formatting/res/tables/tables.2 22 Aug 2008 13:51:19 -0000 1.2
@@ -1,6 +1,4 @@
** closing @-command ref (l. 16)
-*** closing `table' (l. 16)
** @item outside of table or list (l. 16)
*** @end table without corresponding opening (l. 16)
-** closing @-command ref (l. 19)
-*** '}' without opening '{' before: (l. 20)
+*** closing `table' (l. 16)
Index: test/formatting/res/tables/tables.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/tables/tables.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/tables/tables.html 18 Aug 2008 18:03:10 -0000
1.1
+++ test/formatting/res/tables/tables.html 22 Aug 2008 13:51:19 -0000
1.2
@@ -54,7 +54,7 @@
<dt> first item</dt>
<dd><p>First item text
</p>
-<p><a href="#Top">title in first item second item @end table</a></p> </dd>
+<p><a href="#Top">title in first item second item @end table</a></p></dd>
</dl>
<hr size="1">
<a name="SEC1"></a>
@@ -77,9 +77,8 @@
<h1 class="unnumbered">Unnumbered section</h1>
<dl compact="compact">
-<dt> <a href="#Top">title</a></dt>
-<dd><p>long title
-Item line
+<dt> <a href="#Top">title long title</a></dt>
+<dd><p>Item line
</p></dd>
</dl>
Index:
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passfirst
18 Aug 2008 18:03:14 -0000 1.1
+++
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passfirst
22 Aug 2008 13:51:19 -0000 1.2
@@ -280,6 +280,81 @@
complex_command_in_simple_command.texi(,281) After cartouche
complex_command_in_simple_command.texi(,282) }
complex_command_in_simple_command.texi(,283)
-complex_command_in_simple_command.texi(,284) After the tests.
-complex_command_in_simple_command.texi(,285)
-complex_command_in_simple_command.texi(,286) @bye
+complex_command_in_simple_command.texi(,284)
+complex_command_in_simple_command.texi(,285) @subheading in b and samp
+complex_command_in_simple_command.texi(,286) @samp{
+complex_command_in_simple_command.texi(,287) In samp.
+complex_command_in_simple_command.texi(,288) @b{
+complex_command_in_simple_command.texi(,289) In b
+complex_command_in_simple_command.texi(,290)
+complex_command_in_simple_command.texi(,291) Table
+complex_command_in_simple_command.texi(,292)
+complex_command_in_simple_command.texi(,293) @table @asis
+complex_command_in_simple_command.texi(,294) @item item
+complex_command_in_simple_command.texi(,295) line
+complex_command_in_simple_command.texi(,296) @end table
+complex_command_in_simple_command.texi(,297) After table.
+complex_command_in_simple_command.texi(,298)
+complex_command_in_simple_command.texi(,299)
+complex_command_in_simple_command.texi(,300) Multitable
+complex_command_in_simple_command.texi(,301) @multitable {truc} {machin}
+complex_command_in_simple_command.texi(,302) @item truc @tab machin
+complex_command_in_simple_command.texi(,303) @end multitable
+complex_command_in_simple_command.texi(,304)
+complex_command_in_simple_command.texi(,305) Enumerate.
+complex_command_in_simple_command.texi(,306)
+complex_command_in_simple_command.texi(,307) @enumerate 1
+complex_command_in_simple_command.texi(,308) @item item
+complex_command_in_simple_command.texi(,309) @end enumerate
+complex_command_in_simple_command.texi(,310)
+complex_command_in_simple_command.texi(,311) After enumerate.
+complex_command_in_simple_command.texi(,312)
+complex_command_in_simple_command.texi(,313) Example
+complex_command_in_simple_command.texi(,314)
+complex_command_in_simple_command.texi(,315) @example
+complex_command_in_simple_command.texi(,316) Example
+complex_command_in_simple_command.texi(,317) @end example
+complex_command_in_simple_command.texi(,318)
+complex_command_in_simple_command.texi(,319) After example
+complex_command_in_simple_command.texi(,320)
+complex_command_in_simple_command.texi(,321) defun
+complex_command_in_simple_command.texi(,322)
+complex_command_in_simple_command.texi(,323) @defun name args...
+complex_command_in_simple_command.texi(,324) text
+complex_command_in_simple_command.texi(,325) @end defun
+complex_command_in_simple_command.texi(,326)
+complex_command_in_simple_command.texi(,327) After defun.
+complex_command_in_simple_command.texi(,328)
+complex_command_in_simple_command.texi(,329) Flushright
+complex_command_in_simple_command.texi(,330)
+complex_command_in_simple_command.texi(,331) @flushright
+complex_command_in_simple_command.texi(,332) in flushright
+complex_command_in_simple_command.texi(,333) @end flushright
+complex_command_in_simple_command.texi(,334)
+complex_command_in_simple_command.texi(,335) Centered line
+complex_command_in_simple_command.texi(,336)
+complex_command_in_simple_command.texi(,337) @center in centered line
+complex_command_in_simple_command.texi(,338)
+complex_command_in_simple_command.texi(,339) Before quotation
+complex_command_in_simple_command.texi(,340)
+complex_command_in_simple_command.texi(,341) @quotation
+complex_command_in_simple_command.texi(,342) a q--uotation
+complex_command_in_simple_command.texi(,343) @end quotation
+complex_command_in_simple_command.texi(,344)
+complex_command_in_simple_command.texi(,345) After quotation
+complex_command_in_simple_command.texi(,346)
+complex_command_in_simple_command.texi(,347) Before cartouche
+complex_command_in_simple_command.texi(,348)
+complex_command_in_simple_command.texi(,349) @cartouche
+complex_command_in_simple_command.texi(,350) Cartouche
+complex_command_in_simple_command.texi(,351) @end cartouche
+complex_command_in_simple_command.texi(,352)
+complex_command_in_simple_command.texi(,353) After cartouche
+complex_command_in_simple_command.texi(,354)
+complex_command_in_simple_command.texi(,355) close b}
+complex_command_in_simple_command.texi(,356) and close samp
+complex_command_in_simple_command.texi(,357) }
+complex_command_in_simple_command.texi(,358)
+complex_command_in_simple_command.texi(,359) After the tests.
+complex_command_in_simple_command.texi(,360)
+complex_command_in_simple_command.texi(,361) @bye
Index:
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passtexi
18 Aug 2008 18:03:14 -0000 1.1
+++
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.passtexi
22 Aug 2008 13:51:19 -0000 1.2
@@ -280,6 +280,81 @@
complex_command_in_simple_command.texi(,281) After cartouche
complex_command_in_simple_command.texi(,282) }
complex_command_in_simple_command.texi(,283)
-complex_command_in_simple_command.texi(,284) After the tests.
-complex_command_in_simple_command.texi(,285)
-complex_command_in_simple_command.texi(,286) @bye
+complex_command_in_simple_command.texi(,284)
+complex_command_in_simple_command.texi(,285) @subheading in b and samp
+complex_command_in_simple_command.texi(,286) @samp{
+complex_command_in_simple_command.texi(,287) In samp.
+complex_command_in_simple_command.texi(,288) @b{
+complex_command_in_simple_command.texi(,289) In b
+complex_command_in_simple_command.texi(,290)
+complex_command_in_simple_command.texi(,291) Table
+complex_command_in_simple_command.texi(,292)
+complex_command_in_simple_command.texi(,293) @table @asis
+complex_command_in_simple_command.texi(,294) @item item
+complex_command_in_simple_command.texi(,295) line
+complex_command_in_simple_command.texi(,296) @end table
+complex_command_in_simple_command.texi(,297) After table.
+complex_command_in_simple_command.texi(,298)
+complex_command_in_simple_command.texi(,299)
+complex_command_in_simple_command.texi(,300) Multitable
+complex_command_in_simple_command.texi(,301) @multitable {truc} {machin}
+complex_command_in_simple_command.texi(,302) @item truc @tab machin
+complex_command_in_simple_command.texi(,303) @end multitable
+complex_command_in_simple_command.texi(,304)
+complex_command_in_simple_command.texi(,305) Enumerate.
+complex_command_in_simple_command.texi(,306)
+complex_command_in_simple_command.texi(,307) @enumerate 1
+complex_command_in_simple_command.texi(,308) @item item
+complex_command_in_simple_command.texi(,309) @end enumerate
+complex_command_in_simple_command.texi(,310)
+complex_command_in_simple_command.texi(,311) After enumerate.
+complex_command_in_simple_command.texi(,312)
+complex_command_in_simple_command.texi(,313) Example
+complex_command_in_simple_command.texi(,314)
+complex_command_in_simple_command.texi(,315) @example
+complex_command_in_simple_command.texi(,316) Example
+complex_command_in_simple_command.texi(,317) @end example
+complex_command_in_simple_command.texi(,318)
+complex_command_in_simple_command.texi(,319) After example
+complex_command_in_simple_command.texi(,320)
+complex_command_in_simple_command.texi(,321) defun
+complex_command_in_simple_command.texi(,322)
+complex_command_in_simple_command.texi(,323) @defun name args...
+complex_command_in_simple_command.texi(,324) text
+complex_command_in_simple_command.texi(,325) @end defun
+complex_command_in_simple_command.texi(,326)
+complex_command_in_simple_command.texi(,327) After defun.
+complex_command_in_simple_command.texi(,328)
+complex_command_in_simple_command.texi(,329) Flushright
+complex_command_in_simple_command.texi(,330)
+complex_command_in_simple_command.texi(,331) @flushright
+complex_command_in_simple_command.texi(,332) in flushright
+complex_command_in_simple_command.texi(,333) @end flushright
+complex_command_in_simple_command.texi(,334)
+complex_command_in_simple_command.texi(,335) Centered line
+complex_command_in_simple_command.texi(,336)
+complex_command_in_simple_command.texi(,337) @center in centered line
+complex_command_in_simple_command.texi(,338)
+complex_command_in_simple_command.texi(,339) Before quotation
+complex_command_in_simple_command.texi(,340)
+complex_command_in_simple_command.texi(,341) @quotation
+complex_command_in_simple_command.texi(,342) a q--uotation
+complex_command_in_simple_command.texi(,343) @end quotation
+complex_command_in_simple_command.texi(,344)
+complex_command_in_simple_command.texi(,345) After quotation
+complex_command_in_simple_command.texi(,346)
+complex_command_in_simple_command.texi(,347) Before cartouche
+complex_command_in_simple_command.texi(,348)
+complex_command_in_simple_command.texi(,349) @cartouche
+complex_command_in_simple_command.texi(,350) Cartouche
+complex_command_in_simple_command.texi(,351) @end cartouche
+complex_command_in_simple_command.texi(,352)
+complex_command_in_simple_command.texi(,353) After cartouche
+complex_command_in_simple_command.texi(,354)
+complex_command_in_simple_command.texi(,355) close b}
+complex_command_in_simple_command.texi(,356) and close samp
+complex_command_in_simple_command.texi(,357) }
+complex_command_in_simple_command.texi(,358)
+complex_command_in_simple_command.texi(,359) After the tests.
+complex_command_in_simple_command.texi(,360)
+complex_command_in_simple_command.texi(,361) @bye
Index:
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.texi
18 Aug 2008 18:03:14 -0000 1.1
+++
test/formatting/res/texi_complex_command_in_simple_command/complex_command_in_simple_command.texi
22 Aug 2008 13:51:19 -0000 1.2
@@ -281,6 +281,81 @@
After cartouche
}
+
address@hidden in b and samp
address@hidden
+In samp.
address@hidden
+In b
+
+Table
+
address@hidden @asis
address@hidden item
+line
address@hidden table
+After table.
+
+
+Multitable
address@hidden {truc} {machin}
address@hidden truc @tab machin
address@hidden multitable
+
+Enumerate.
+
address@hidden 1
address@hidden item
address@hidden enumerate
+
+After enumerate.
+
+Example
+
address@hidden
+Example
address@hidden example
+
+After example
+
+defun
+
address@hidden name args...
+text
address@hidden defun
+
+After defun.
+
+Flushright
+
address@hidden
+in flushright
address@hidden flushright
+
+Centered line
+
address@hidden in centered line
+
+Before quotation
+
address@hidden
+a q--uotation
address@hidden quotation
+
+After quotation
+
+Before cartouche
+
address@hidden
+Cartouche
address@hidden cartouche
+
+After cartouche
+
+close b}
+and close samp
+}
+
After the tests.
@bye
Index: test/invalid/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/invalid/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/invalid/Makefile.am 19 Aug 2008 15:05:51 -0000 1.2
+++ test/invalid/Makefile.am 22 Aug 2008 13:51:21 -0000 1.3
@@ -5,7 +5,8 @@
verb_not_closed.texi tex_not_closed.texi html_not_closed.texi \
verbatim_not_closed.texi copying_not_closed.texi node_in_copying.texi \
tex_in_copying.texi titlepage_not_closed.texi footnote_not_closed.texi \
- caption_not_closed.texi def_cmd_dble.texi \
+ caption_not_closed.texi def_cmd_dble.texi style_not_closed_in_table_line.texi
\
+ style_not_closed_in_cartouche.texi multitable_too_much_col.texi \
tests.txt res
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/invalid/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/invalid/tests.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/tests.txt 18 Aug 2008 18:03:48 -0000 1.1
+++ test/invalid/tests.txt 22 Aug 2008 13:51:21 -0000 1.2
@@ -20,6 +20,9 @@
texi footnote_not_closed.texi
texi caption_not_closed.texi
texi def_cmd_dble.texi
+texi style_not_closed_in_table_line.texi
+texi style_not_closed_in_cartouche.texi
+texi multitable_too_much_col.texi
brace_not_closed brace_not_closed.texi
recursive_copying recursive_copying.texi
bad_nesting bad_nesting.texi
@@ -42,3 +45,6 @@
footnote_not_closed footnote_not_closed.texi
caption_not_closed caption_not_closed.texi
def_cmd_dble def_cmd_dble.texi
+style_not_closed_in_table_line style_not_closed_in_table_line.texi
+style_not_closed_in_cartouche style_not_closed_in_cartouche.texi
+multitable_too_much_col multitable_too_much_col.texi
Index: test/invalid/res/bad_nesting/bad_nesting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/invalid/res/bad_nesting/bad_nesting.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/bad_nesting/bad_nesting.html 18 Aug 2008 18:03:49
-0000 1.1
+++ test/invalid/res/bad_nesting/bad_nesting.html 22 Aug 2008 13:51:22
-0000 1.2
@@ -67,7 +67,7 @@
<dt> <em>ref</em></dt>
<dd><table><tr><td> </td><td><pre class="example">example
</pre></td></tr></table>
- </dd>
+</dd>
</dl>
@end table
Index: test/invalid/res/caption_not_closed/caption_not_closed.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/invalid/res/caption_not_closed/caption_not_closed.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/caption_not_closed/caption_not_closed.2 18 Aug 2008
18:03:49 -0000 1.1
+++ test/invalid/res/caption_not_closed/caption_not_closed.2 22 Aug 2008
13:51:22 -0000 1.2
@@ -1,6 +1,6 @@
** closing @-command caption (l. 21)
-*** closing `float' (l. 21)
*** @end float without corresponding opening
** Unknown float style Text
+*** closing `float' (l. 21)
*** @end float without corresponding opening
** Unknown float style Text
Index: test/invalid/res/formats_not_closed/formats_not_closed.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/invalid/res/formats_not_closed/formats_not_closed.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/formats_not_closed/formats_not_closed.html 18 Aug 2008
18:03:51 -0000 1.1
+++ test/invalid/res/formats_not_closed/formats_not_closed.html 22 Aug 2008
13:51:22 -0000 1.2
@@ -68,8 +68,8 @@
<li><pre class="example"> first item
</pre></li><li><pre class="example"> an item
-</pre> </li></ol>
- </dd>
+</pre></li></ol>
+</dd>
</dl>
</td></tr></table>
@@ -87,7 +87,7 @@
<table>
<tr><td><p> rt </p></td><td><p> ds
</p>
- </td></tr>
+</td></tr>
</table>
<hr size="6">
<a name="SEC2"></a>
@@ -113,7 +113,7 @@
<table>
<tr><td><p> rt
</p>
- </td></tr>
+</td></tr>
</table>
<hr size="6">
<a name="SEC3"></a>
@@ -165,8 +165,9 @@
<dt><u>Variable:</u> <b>type1</b><i> var bidule</i>
<a name="IDX3"></a>
</dt>
+
</dl>
- </dd></dl>
+</dd></dl>
<hr size="6">
<a name="SEC5"></a>
<table cellpadding="1" cellspacing="1" border="0">
Index: test/invalid/res/not_closed_in_menu/not_closed_in_menu.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/invalid/res/not_closed_in_menu/not_closed_in_menu.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/invalid/res/not_closed_in_menu/not_closed_in_menu.html 18 Aug 2008
18:03:53 -0000 1.1
+++ test/invalid/res/not_closed_in_menu/not_closed_in_menu.html 22 Aug 2008
13:51:22 -0000 1.2
@@ -47,9 +47,9 @@
<tr><td align="left" valign="top"><a href="gcc.html#Top">•
(gcc)</a></td><td> </td><td align="left" valign="top"> text <dl
compact="compact">
<dt>- item</dt>
<dd><p>table line
-</p> </dd>
+</p></dd>
</dl>
- </td></tr>
+</td></tr>
</table>
<p>Some text.
@@ -62,18 +62,19 @@
<dt>• item</dt>
<dd><pre class="menu-comment">comment
<a href="manual2.html#Top">• (manual2)</a>::
-</pre> </dd>
+</pre></dd>
</dl>
- </th></tr></table>
+</th></tr></table>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="info.html#Top">•
(info)</a></td><td> </td><td align="left" valign="top"> before deff
<dl>
<dt><u>bidule:</u> <b>truc</b><i> chose</i>
<a name="IDX1"></a>
</dt>
+
<dd><p>deffn text
-</p> </dd></dl>
- </td></tr>
+</p></dd></dl>
+</td></tr>
</table>
<p>After menu
</p>
@@ -81,7 +82,7 @@
<tr><td align="left" valign="top"><a href="manual_in_menu.html#Top">•
(manual_in_menu)</a></td><td> </td><td align="left" valign="top">
desc2
</td></tr>
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">
-</pre> </th></tr></table>
+</pre></th></tr></table>
<hr size="1">
<p>
<font size="-1">
Index: test/macros/res/defcondx_Dbar/defxcond.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/macros/res/defcondx_Dbar/defxcond.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/macros/res/defcondx_Dbar/defxcond.html 18 Aug 2008 18:04:25 -0000
1.1
+++ test/macros/res/defcondx_Dbar/defxcond.html 22 Aug 2008 13:51:24 -0000
1.2
@@ -46,9 +46,11 @@
<dt><u>foo:</u>
<a name="IDX1"></a>
</dt>
+
<dt><u>bar:</u>
<a name="IDX2"></a>
</dt>
+
<dd><p>Documentation.
</p>
</dd></dl>
Index: test/macros/res/defcondx_Ubar/defxcond.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/macros/res/defcondx_Ubar/defxcond.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/macros/res/defcondx_Ubar/defxcond.html 18 Aug 2008 18:04:25 -0000
1.1
+++ test/macros/res/defcondx_Ubar/defxcond.html 22 Aug 2008 13:51:25 -0000
1.2
@@ -46,6 +46,8 @@
<dt><u>foo:</u>
<a name="IDX1"></a>
</dt>
+
+
<dd><p>Documentation.
</p>
</dd></dl>
Index: test/manuals/res/ccvs/cvs_10.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/ccvs/cvs_10.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/ccvs/cvs_10.html 18 Aug 2008 18:04:41 -0000 1.1
+++ test/manuals/res/ccvs/cvs_10.html 22 Aug 2008 13:51:25 -0000 1.2
@@ -659,6 +659,7 @@
<dt><u>Command:</u> <b>cvs watch on</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<a name="IDX163"></a>
</dt>
+
<dd><a name="IDX164"></a>
<p>Specify that developers should run <code>cvs edit</code>
before editing <var>files</var>. <small>CVS</small> will create working
@@ -685,6 +686,7 @@
<dt><u>Command:</u> <b>cvs watch off</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<a name="IDX166"></a>
</dt>
+
<dd><p>Do not create <var>files</var> read-only on checkout; thus,
developers will not be reminded to use <code>cvs edit</code>
and <code>cvs unedit</code>.
@@ -727,6 +729,7 @@
<dt><u>Command:</u> <b>cvs watch add</b><i> [<code>-lR</code>]
[<code>-a</code> <var>action</var>]… [<var>files</var>]…</i>
<a name="IDX168"></a>
</dt>
+
<dd><p>Add the current user to the list of people to receive notification of
work done on <var>files</var>.
</p>
@@ -786,6 +789,7 @@
<dt><u>Command:</u> <b>cvs watch remove</b><i> [<code>-lR</code>]
[<code>-a</code> <var>action</var>]… [<var>files</var>]…</i>
<a name="IDX170"></a>
</dt>
+
<dd><p>Remove a notification request established using <code>cvs watch
add</code>;
the arguments are the same. If the <code>-a</code> option is present, only
watches for the specified actions are removed.
@@ -869,6 +873,7 @@
<dt><u>Command:</u> <b>cvs edit</b><i> [<code>-lR</code>] [<code>-a</code>
<var>action</var>]… [<var>files</var>]…</i>
<a name="IDX174"></a>
</dt>
+
<dd><p>Prepare to edit the working files <var>files</var>. <small>CVS</small>
makes the
<var>files</var> read-write, and notifies users who have requested
<code>edit</code> notification for any of <var>files</var>.
@@ -899,6 +904,7 @@
<dt><u>Command:</u> <b>cvs unedit</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<a name="IDX178"></a>
</dt>
+
<dd><p>Abandon work on the working files <var>files</var>, and revert them to
the
repository versions on which they are based. <small>CVS</small> makes those
<var>files</var> read-only for which users have requested notification using
@@ -949,6 +955,7 @@
<dt><u>Command:</u> <b>cvs watchers</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<a name="IDX179"></a>
</dt>
+
<dd><p>List the users currently watching changes to <var>files</var>. The
report
includes the files being watched, and the mail address of each watcher.
</p>
@@ -963,6 +970,7 @@
<dt><u>Command:</u> <b>cvs editors</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<a name="IDX181"></a>
</dt>
+
<dd><p>List the users currently working on <var>files</var>. The report
includes the mail address of each user, the time when the user began
working with the file, and the host and path of the working directory
Index: test/manuals/res/ccvs/cvs_7.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/ccvs/cvs_7.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/ccvs/cvs_7.html 18 Aug 2008 18:04:44 -0000 1.1
+++ test/manuals/res/ccvs/cvs_7.html 22 Aug 2008 13:51:25 -0000 1.2
@@ -136,6 +136,7 @@
<dt><u>Command:</u> <b>cvs add</b><i> [<code>-k</code> kflag] [<code>-m</code>
message] files …</i>
<a name="IDX130"></a>
</dt>
+
<dd><p>Schedule <var>files</var> to be added to the repository.
The files or directories specified with <code>add</code> must
already exist in the current directory. To add a whole
@@ -242,6 +243,7 @@
<dt><u>Command:</u> <b>cvs remove</b><i> [options] files …</i>
<a name="IDX132"></a>
</dt>
+
<dd><p>Schedule file(s) to be removed from the repository
(files which have not already been removed from the
working directory are not processed). This command
Index: test/manuals/res/ccvs/cvs_8.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/ccvs/cvs_8.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/ccvs/cvs_8.html 18 Aug 2008 18:04:44 -0000 1.1
+++ test/manuals/res/ccvs/cvs_8.html 22 Aug 2008 13:51:25 -0000 1.2
@@ -223,6 +223,7 @@
<dt><u>Command:</u> <b>cvs annotate</b><i> [<code>-FflR</code>] [<code>-r
rev</code>|<code>-D date</code>] files …</i>
<a name="IDX135"></a>
</dt>
+
<dd><p>For each file in <var>files</var>, print the head revision
of the trunk, together with information on the last
modification for each line. For example:
Index: test/manuals/res/ccvs_mediawiki/cvs: Adding, removing, and renaming
files and directories
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/ccvs_mediawiki/cvs:
Adding, removing, and renaming files and directories,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/ccvs_mediawiki/cvs: Adding, removing, and renaming files
and directories 18 Aug 2008 18:04:45 -0000 1.1
+++ test/manuals/res/ccvs_mediawiki/cvs: Adding, removing, and renaming files
and directories 22 Aug 2008 13:51:25 -0000 1.2
@@ -91,6 +91,7 @@
<dt><u>Command:</u> <b>cvs add</b><i> [<code>-k</code> kflag] [<code>-m</code>
message] files …</i>
<div id="IDX130"></div>
</dt>
+
<dd><p>Schedule <var>files</var> to be added to the repository.
The files or directories specified with <code>add</code> must
already exist in the current directory. To add a whole
@@ -197,6 +198,7 @@
<dt><u>Command:</u> <b>cvs remove</b><i> [options] files …</i>
<div id="IDX132"></div>
</dt>
+
<dd><p>Schedule file(s) to be removed from the repository
(files which have not already been removed from the
working directory are not processed). This command
Index: test/manuals/res/ccvs_mediawiki/cvs: History browsing
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/ccvs_mediawiki/cvs:
History browsing,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/ccvs_mediawiki/cvs: History browsing 18 Aug 2008
18:04:46 -0000 1.1
+++ test/manuals/res/ccvs_mediawiki/cvs: History browsing 22 Aug 2008
13:51:25 -0000 1.2
@@ -178,6 +178,7 @@
<dt><u>Command:</u> <b>cvs annotate</b><i> [<code>-FflR</code>] [<code>-r
rev</code>|<code>-D date</code>] files …</i>
<div id="IDX135"></div>
</dt>
+
<dd><p>For each file in <var>files</var>, print the head revision
of the trunk, together with information on the last
modification for each line. For example:
Index: test/manuals/res/ccvs_mediawiki/cvs: Multiple developers
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/manuals/res/ccvs_mediawiki/cvs:
Multiple developers,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/ccvs_mediawiki/cvs: Multiple developers 18 Aug 2008
18:04:47 -0000 1.1
+++ test/manuals/res/ccvs_mediawiki/cvs: Multiple developers 22 Aug 2008
13:51:25 -0000 1.2
@@ -607,6 +607,7 @@
<dt><u>Command:</u> <b>cvs watch on</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX163"></div>
</dt>
+
<dd><div id="IDX164"></div>
<p>Specify that developers should run <code>cvs edit</code>
before editing <var>files</var>. <small>CVS</small> will create working
@@ -633,6 +634,7 @@
<dt><u>Command:</u> <b>cvs watch off</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX166"></div>
</dt>
+
<dd><p>Do not create <var>files</var> read-only on checkout; thus,
developers will not be reminded to use <code>cvs edit</code>
and <code>cvs unedit</code>.
@@ -675,6 +677,7 @@
<dt><u>Command:</u> <b>cvs watch add</b><i> [<code>-lR</code>]
[<code>-a</code> <var>action</var>]… [<var>files</var>]…</i>
<div id="IDX168"></div>
</dt>
+
<dd><p>Add the current user to the list of people to receive notification of
work done on <var>files</var>.
</p>
@@ -734,6 +737,7 @@
<dt><u>Command:</u> <b>cvs watch remove</b><i> [<code>-lR</code>]
[<code>-a</code> <var>action</var>]… [<var>files</var>]…</i>
<div id="IDX170"></div>
</dt>
+
<dd><p>Remove a notification request established using <code>cvs watch
add</code>;
the arguments are the same. If the <code>-a</code> option is present, only
watches for the specified actions are removed.
@@ -817,6 +821,7 @@
<dt><u>Command:</u> <b>cvs edit</b><i> [<code>-lR</code>] [<code>-a</code>
<var>action</var>]… [<var>files</var>]…</i>
<div id="IDX174"></div>
</dt>
+
<dd><p>Prepare to edit the working files <var>files</var>. <small>CVS</small>
makes the
<var>files</var> read-write, and notifies users who have requested
<code>edit</code> notification for any of <var>files</var>.
@@ -847,6 +852,7 @@
<dt><u>Command:</u> <b>cvs unedit</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX178"></div>
</dt>
+
<dd><p>Abandon work on the working files <var>files</var>, and revert them to
the
repository versions on which they are based. <small>CVS</small> makes those
<var>files</var> read-only for which users have requested notification using
@@ -897,6 +903,7 @@
<dt><u>Command:</u> <b>cvs watchers</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX179"></div>
</dt>
+
<dd><p>List the users currently watching changes to <var>files</var>. The
report
includes the files being watched, and the mail address of each watcher.
</p>
@@ -911,6 +918,7 @@
<dt><u>Command:</u> <b>cvs editors</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX181"></div>
</dt>
+
<dd><p>List the users currently working on <var>files</var>. The report
includes the mail address of each user, the time when the user began
working with the file, and the host and path of the working directory
Index: test/manuals/res/ccvs_mediawiki_nosplit/cvs
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/manuals/res/ccvs_mediawiki_nosplit/cvs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/manuals/res/ccvs_mediawiki_nosplit/cvs 18 Aug 2008 18:04:49 -0000
1.1
+++ test/manuals/res/ccvs_mediawiki_nosplit/cvs 22 Aug 2008 13:51:25 -0000
1.2
@@ -5079,6 +5079,7 @@
<dt><u>Command:</u> <b>cvs add</b><i> [<code>-k</code> kflag] [<code>-m</code>
message] files …</i>
<div id="IDX130"></div>
</dt>
+
<dd><p>Schedule <var>files</var> to be added to the repository.
The files or directories specified with <code>add</code> must
already exist in the current directory. To add a whole
@@ -5185,6 +5186,7 @@
<dt><u>Command:</u> <b>cvs remove</b><i> [options] files …</i>
<div id="IDX132"></div>
</dt>
+
<dd><p>Schedule file(s) to be removed from the repository
(files which have not already been removed from the
working directory are not processed). This command
@@ -5746,6 +5748,7 @@
<dt><u>Command:</u> <b>cvs annotate</b><i> [<code>-FflR</code>] [<code>-r
rev</code>|<code>-D date</code>] files …</i>
<div id="IDX135"></div>
</dt>
+
<dd><p>For each file in <var>files</var>, print the head revision
of the trunk, together with information on the last
modification for each line. For example:
@@ -6582,6 +6585,7 @@
<dt><u>Command:</u> <b>cvs watch on</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX163"></div>
</dt>
+
<dd><div id="IDX164"></div>
<p>Specify that developers should run <code>cvs edit</code>
before editing <var>files</var>. <small>CVS</small> will create working
@@ -6608,6 +6612,7 @@
<dt><u>Command:</u> <b>cvs watch off</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX166"></div>
</dt>
+
<dd><p>Do not create <var>files</var> read-only on checkout; thus,
developers will not be reminded to use <code>cvs edit</code>
and <code>cvs unedit</code>.
@@ -6650,6 +6655,7 @@
<dt><u>Command:</u> <b>cvs watch add</b><i> [<code>-lR</code>]
[<code>-a</code> <var>action</var>]… [<var>files</var>]…</i>
<div id="IDX168"></div>
</dt>
+
<dd><p>Add the current user to the list of people to receive notification of
work done on <var>files</var>.
</p>
@@ -6709,6 +6715,7 @@
<dt><u>Command:</u> <b>cvs watch remove</b><i> [<code>-lR</code>]
[<code>-a</code> <var>action</var>]… [<var>files</var>]…</i>
<div id="IDX170"></div>
</dt>
+
<dd><p>Remove a notification request established using <code>cvs watch
add</code>;
the arguments are the same. If the <code>-a</code> option is present, only
watches for the specified actions are removed.
@@ -6792,6 +6799,7 @@
<dt><u>Command:</u> <b>cvs edit</b><i> [<code>-lR</code>] [<code>-a</code>
<var>action</var>]… [<var>files</var>]…</i>
<div id="IDX174"></div>
</dt>
+
<dd><p>Prepare to edit the working files <var>files</var>. <small>CVS</small>
makes the
<var>files</var> read-write, and notifies users who have requested
<code>edit</code> notification for any of <var>files</var>.
@@ -6822,6 +6830,7 @@
<dt><u>Command:</u> <b>cvs unedit</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX178"></div>
</dt>
+
<dd><p>Abandon work on the working files <var>files</var>, and revert them to
the
repository versions on which they are based. <small>CVS</small> makes those
<var>files</var> read-only for which users have requested notification using
@@ -6872,6 +6881,7 @@
<dt><u>Command:</u> <b>cvs watchers</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX179"></div>
</dt>
+
<dd><p>List the users currently watching changes to <var>files</var>. The
report
includes the files being watched, and the mail address of each watcher.
</p>
@@ -6886,6 +6896,7 @@
<dt><u>Command:</u> <b>cvs editors</b><i> [<code>-lR</code>]
[<var>files</var>]…</i>
<div id="IDX181"></div>
</dt>
+
<dd><p>List the users currently working on <var>files</var>. The report
includes the mail address of each user, the time when the user began
working with the file, and the host and path of the working directory
Index: test/misc/res/verbatim_html/verbatim_html.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/misc/res/verbatim_html/verbatim_html.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/misc/res/verbatim_html/verbatim_html.html 18 Aug 2008 18:05:57
-0000 1.1
+++ test/misc/res/verbatim_html/verbatim_html.html 22 Aug 2008 13:51:26
-0000 1.2
@@ -89,7 +89,7 @@
<dt> <em>ref</em></dt>
<dd><table><tr><td> </td><td><pre class="example">example
</pre></td></tr></table>
- </dd>
+</dd>
</dl>
@end table
Index: test/tar_manual/res/tar/tar.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/tar_manual/res/tar/tar.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/tar_manual/res/tar/tar.html 18 Aug 2008 18:09:36 -0000 1.1
+++ test/tar_manual/res/tar/tar.html 22 Aug 2008 13:51:26 -0000 1.2
@@ -7517,6 +7517,7 @@
<dt><u>Backup variable:</u> <b>TAPE_FILE</b>
<a name="IDX265"></a>
</dt>
+
<dd><p>The device <code>tar</code> writes the archive to. If
<var>TAPE_FILE</var>
is a remote archive (see <a href="#remote_002ddev">remote-dev</a>), backup
script will suppose
that your <code>mt</code> is able to access remote devices. If <var>RSH</var>
@@ -7528,6 +7529,7 @@
<dt><u>Backup variable:</u> <b>BLOCKING</b>
<a name="IDX266"></a>
</dt>
+
<dd><p>The blocking factor <code>tar</code> will use when writing the dump
archive.
See section <a href="#Blocking-Factor">The Blocking Factor of an Archive</a>.
</p></dd></dl>
@@ -7536,6 +7538,7 @@
<dt><u>Backup variable:</u> <b>BACKUP_DIRS</b>
<a name="IDX267"></a>
</dt>
+
<dd><p>A list of file systems to be dumped (for <code>backup</code>), or
restored
(for <code>restore</code>). You can include any directory
name in the list — subdirectories on that file system will be
@@ -7562,6 +7565,7 @@
<dt><u>Backup variable:</u> <b>DIRLIST</b>
<a name="IDX268"></a>
</dt>
+
<dd><p>A path to the file containing the list of the file systems to backup
or restore. By default it is ‘<tt>/etc/backup/dirs</tt>’.
</p></dd></dl>
@@ -7570,6 +7574,7 @@
<dt><u>Backup variable:</u> <b>BACKUP_FILES</b>
<a name="IDX269"></a>
</dt>
+
<dd><p>A list of individual files to be dumped (for <code>backup</code>), or
restored
(for <code>restore</code>). These should be accessible from the machine on
which the backup script is run.
@@ -7584,6 +7589,7 @@
<dt><u>Backup variable:</u> <b>FILELIST</b>
<a name="IDX270"></a>
</dt>
+
<dd><p>A path to the file containing the list of the individual files to backup
or restore. By default it is ‘<tt>/etc/backup/files</tt>’.
</p></dd></dl>
@@ -7592,6 +7598,7 @@
<dt><u>Backup variable:</u> <b>MT</b>
<a name="IDX271"></a>
</dt>
+
<dd><p>Full file name of <code>mt</code> binary.
</p></dd></dl>
@@ -7609,6 +7616,7 @@
<dt><u>Backup variable:</u> <b>RSH_COMMAND</b>
<a name="IDX273"></a>
</dt>
+
<dd><p>Full file name of <code>rsh</code> binary on remote mashines. This will
be passed via ‘<samp>--rsh-command</samp>’ option to the remote
invocation
of <acronym>GNU</acronym> <code>tar</code>.
@@ -7618,6 +7626,7 @@
<dt><u>Backup variable:</u> <b>VOLNO_FILE</b>
<a name="IDX274"></a>
</dt>
+
<dd><p>Name of temporary file to hold volume numbers. This needs to be
accessible
by all the machines which have file systems to be dumped.
</p></dd></dl>
@@ -7626,6 +7635,7 @@
<dt><u>Backup variable:</u> <b>XLIST</b>
<a name="IDX275"></a>
</dt>
+
<dd><p>Name of <em>exclude file list</em>. An <em>exclude file list</em> is a
file
located on the remote machine and containing the list of files to
be excluded from the backup. Exclude file lists are searched in
@@ -7640,6 +7650,7 @@
<dt><u>Backup variable:</u> <b>SLEEP_TIME</b>
<a name="IDX276"></a>
</dt>
+
<dd><p>Time to sleep between dumps of any two successive file systems
</p>
<p>This variable affects only <code>backup</code>.
@@ -7649,6 +7660,7 @@
<dt><u>Backup variable:</u> <b>DUMP_REMIND_SCRIPT</b>
<a name="IDX277"></a>
</dt>
+
<dd><p>Script to be run when it’s time to insert a new tape in for the
next
volume. Administrators may want to tailor this script for their site.
If this variable isn’t set, <acronym>GNU</acronym> <code>tar</code> will
display its built-in
@@ -7661,6 +7673,7 @@
<dt><u>Backup variable:</u> <b>SLEEP_MESSAGE</b>
<a name="IDX278"></a>
</dt>
+
<dd><p>Message to display on the terminal while waiting for dump time. Usually
this will just be some literal text.
</p></dd></dl>
@@ -7669,6 +7682,7 @@
<dt><u>Backup variable:</u> <b>TAR</b>
<a name="IDX279"></a>
</dt>
+
<dd><p>Full file name of the <acronym>GNU</acronym> <code>tar</code>
executable. If this is not set, backup
scripts will search <code>tar</code> in the current shell path.
</p></dd></dl>
Index: test/formatting/index_in_item_line_table.texi
===================================================================
RCS file: test/formatting/index_in_item_line_table.texi
diff -N test/formatting/index_in_item_line_table.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/index_in_item_line_table.texi 22 Aug 2008 13:51:17
-0000 1.1
@@ -0,0 +1,19 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden index_in_item_line_table.info
+
address@hidden Top
address@hidden test index entries in @@item @@table
+
address@hidden @asis
address@hidden @cindex index
address@hidden
+More text
address@hidden @cindex 2 index
address@hidden
+Even more
address@hidden table
+
address@hidden another index
+
address@hidden
Index: test/formatting/index_in_item_line_table_in_code.texi
===================================================================
RCS file: test/formatting/index_in_item_line_table_in_code.texi
diff -N test/formatting/index_in_item_line_table_in_code.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/index_in_item_line_table_in_code.texi 22 Aug 2008
13:51:17 -0000 1.1
@@ -0,0 +1,23 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden index_in_item_line_table_in_code.info
+
address@hidden Top
address@hidden test index entries in @@item @@table in @@code
+
address@hidden
+
address@hidden @asis
address@hidden @cindex index
address@hidden
+More text
address@hidden @cindex 2 index
address@hidden
+Even more
address@hidden table
+
+}
+
address@hidden another index
+
address@hidden
Index: test/formatting/index_in_item_line_vtable.texi
===================================================================
RCS file: test/formatting/index_in_item_line_vtable.texi
diff -N test/formatting/index_in_item_line_vtable.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/index_in_item_line_vtable.texi 22 Aug 2008 13:51:17
-0000 1.1
@@ -0,0 +1,19 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden index_in_item_line_vtable.info
+
address@hidden Top
address@hidden test index entries in @@item @@table
+
address@hidden @asis
address@hidden @cindex index
address@hidden
+More text
address@hidden @cindex 2 index
address@hidden
+Even more
address@hidden vtable
+
address@hidden another index
+
address@hidden
Index: test/formatting/table_in_table_item.texi
===================================================================
RCS file: test/formatting/table_in_table_item.texi
diff -N test/formatting/table_in_table_item.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/table_in_table_item.texi 22 Aug 2008 13:51:17 -0000
1.1
@@ -0,0 +1,27 @@
+\input texinfo.tex @c -*-texinfo-*-
+
address@hidden table_in_table_item.texi
+
address@hidden Top
address@hidden Test table nested in table item
+
address@hidden @asis
address@hidden item @table @asis
+ @item in nested table item
+ in nested table line
+ @end table
+in table line
address@hidden table
+
+And in code
+
address@hidden
address@hidden @asis
address@hidden item @table @asis
+ @item in table in table item
+ in nested table line
+ @end table
address@hidden table
+}
+
address@hidden
Index: test/formatting/res/index_in_item_line_table/index_in_item_line_table.2
===================================================================
RCS file:
test/formatting/res/index_in_item_line_table/index_in_item_line_table.2
diff -N test/formatting/res/index_in_item_line_table/index_in_item_line_table.2
Index:
test/formatting/res/index_in_item_line_table/index_in_item_line_table.html
===================================================================
RCS file:
test/formatting/res/index_in_item_line_table/index_in_item_line_table.html
diff -N
test/formatting/res/index_in_item_line_table/index_in_item_line_table.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/index_in_item_line_table/index_in_item_line_table.html
22 Aug 2008 13:51:18 -0000 1.1
@@ -0,0 +1,71 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/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}
+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>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered">test index entries in @item @table</h1>
+
+<dl compact="compact">
+<dt> <a name="IDX1"></a>
+<p>‘<samp>opt</samp>’
+</p></dt>
+<dd><p>More text
+</p></dd>
+<dt> <a name="IDX2"></a>
+<p>‘<samp>nopt</samp>’
+</p></dt>
+<dd><p>Even more
+</p></dd>
+</dl>
+
+<a name="IDX3"></a>
+
+<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/index_in_item_line_table_in_code/index_in_item_line_table_in_code.2
===================================================================
RCS file:
test/formatting/res/index_in_item_line_table_in_code/index_in_item_line_table_in_code.2
diff -N
test/formatting/res/index_in_item_line_table_in_code/index_in_item_line_table_in_code.2
Index:
test/formatting/res/index_in_item_line_table_in_code/index_in_item_line_table_in_code.html
===================================================================
RCS file:
test/formatting/res/index_in_item_line_table_in_code/index_in_item_line_table_in_code.html
diff -N
test/formatting/res/index_in_item_line_table_in_code/index_in_item_line_table_in_code.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/index_in_item_line_table_in_code/index_in_item_line_table_in_code.html
22 Aug 2008 13:51:18 -0000 1.1
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/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}
+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>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered">test index entries in @item @table in @code</h1>
+
+<p><code>
+</code></p>
+<dl compact="compact">
+<dt> <a name="IDX1"></a>
+<p><code>‘<samp>opt</samp>’
+More text
+</code></p></dt>
+<dt> <a name="IDX2"></a>
+<p><code>‘<samp>nopt</samp>’
+Even more
+</code></p></dt>
+</dl>
+
+<p><code></code>
+</p>
+<a name="IDX3"></a>
+
+<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/index_in_item_line_vtable/index_in_item_line_vtable.2
===================================================================
RCS file:
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2
diff -N
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2
22 Aug 2008 13:51:18 -0000 1.1
@@ -0,0 +1,2 @@
+*** ignored @cindex already in an @item entry (l. 9)
+*** ignored @cindex already in an @item entry (l. 12)
Index:
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html
===================================================================
RCS file:
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html
diff -N
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html
22 Aug 2008 13:51:19 -0000 1.1
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/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}
+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>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered">test index entries in @item @table</h1>
+
+<dl compact="compact">
+<dt> index
+<a name="IDX1"></a>
+</dt>
+<dd><p>‘<samp>opt</samp>’
+More text
+</p></dd>
+<dt> 2 index
+<a name="IDX2"></a>
+</dt>
+<dd><p>‘<samp>nopt</samp>’
+Even more
+</p></dd>
+</dl>
+
+<a name="IDX3"></a>
+
+<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/table_in_table_item/table_in_table_item.2
===================================================================
RCS file: test/formatting/res/table_in_table_item/table_in_table_item.2
diff -N test/formatting/res/table_in_table_item/table_in_table_item.2
Index: test/formatting/res/table_in_table_item/table_in_table_item.html
===================================================================
RCS file: test/formatting/res/table_in_table_item/table_in_table_item.html
diff -N test/formatting/res/table_in_table_item/table_in_table_item.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/table_in_table_item/table_in_table_item.html 22 Aug
2008 13:51:19 -0000 1.1
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/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}
+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>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered">Test table nested in table item</h1>
+
+<dl compact="compact">
+<dt> item <dl compact="compact">
+<dt> in nested table item</dt>
+<dd><p> in nested table line
+ </p></dd>
+</dl></dt>
+<dd><p>in table line
+</p></dd>
+</dl>
+
+<p>And in code
+</p>
+<p><code>
+</code></p><dl compact="compact">
+<dt> item <dl compact="compact">
+<dt> in table in table item</dt>
+<dd><p><code> in nested table line
+ </code></p></dd>
+</dl></dt>
+</dl>
+<p><code></code>
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index:
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.2
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.2
diff -N
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.2
Index:
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passfirst
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passfirst
diff -N
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passfirst
22 Aug 2008 13:51:19 -0000 1.1
@@ -0,0 +1,18 @@
+index_in_item_line_table.texi(,2)
+index_in_item_line_table.texi(,3) @setfilename index_in_item_line_table.info
+index_in_item_line_table.texi(,4)
+index_in_item_line_table.texi(,5) @node Top
+index_in_item_line_table.texi(,6) @top test index entries in @@item @@table
+index_in_item_line_table.texi(,7)
+index_in_item_line_table.texi(,8) @table @asis
+index_in_item_line_table.texi(,9) @item @cindex index
+index_in_item_line_table.texi(,10) @option{opt}
+index_in_item_line_table.texi(,11) More text
+index_in_item_line_table.texi(,12) @item @cindex 2 index
+index_in_item_line_table.texi(,13) @option{nopt}
+index_in_item_line_table.texi(,14) Even more
+index_in_item_line_table.texi(,15) @end table
+index_in_item_line_table.texi(,16)
+index_in_item_line_table.texi(,17) @vindex another index
+index_in_item_line_table.texi(,18)
+index_in_item_line_table.texi(,19) @bye
Index:
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passtexi
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passtexi
diff -N
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.passtexi
22 Aug 2008 13:51:19 -0000 1.1
@@ -0,0 +1,18 @@
+index_in_item_line_table.texi(,2)
+index_in_item_line_table.texi(,3) @setfilename index_in_item_line_table.info
+index_in_item_line_table.texi(,4)
+index_in_item_line_table.texi(,5) @node Top
+index_in_item_line_table.texi(,6) @top test index entries in @@item @@table
+index_in_item_line_table.texi(,7)
+index_in_item_line_table.texi(,8) @table @asis
+index_in_item_line_table.texi(,9) @item @cindex index
+index_in_item_line_table.texi(,10) @option{opt}
+index_in_item_line_table.texi(,11) More text
+index_in_item_line_table.texi(,12) @item @cindex 2 index
+index_in_item_line_table.texi(,13) @option{nopt}
+index_in_item_line_table.texi(,14) Even more
+index_in_item_line_table.texi(,15) @end table
+index_in_item_line_table.texi(,16)
+index_in_item_line_table.texi(,17) @vindex another index
+index_in_item_line_table.texi(,18)
+index_in_item_line_table.texi(,19) @bye
Index:
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.texi
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.texi
diff -N
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_table/index_in_item_line_table.texi
22 Aug 2008 13:51:19 -0000 1.1
@@ -0,0 +1,19 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden index_in_item_line_table.info
+
address@hidden Top
address@hidden test index entries in @@item @@table
+
address@hidden @asis
address@hidden @cindex index
address@hidden
+More text
address@hidden @cindex 2 index
address@hidden
+Even more
address@hidden table
+
address@hidden another index
+
address@hidden
Index:
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.2
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.2
diff -N
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.2
Index:
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passfirst
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passfirst
diff -N
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passfirst
22 Aug 2008 13:51:20 -0000 1.1
@@ -0,0 +1,22 @@
+index_in_item_line_table_in_code.texi(,2)
+index_in_item_line_table_in_code.texi(,3) @setfilename
index_in_item_line_table_in_code.info
+index_in_item_line_table_in_code.texi(,4)
+index_in_item_line_table_in_code.texi(,5) @node Top
+index_in_item_line_table_in_code.texi(,6) @top test index entries in @@item
@@table in @@code
+index_in_item_line_table_in_code.texi(,7)
+index_in_item_line_table_in_code.texi(,8) @code{
+index_in_item_line_table_in_code.texi(,9)
+index_in_item_line_table_in_code.texi(,10) @table @asis
+index_in_item_line_table_in_code.texi(,11) @item @cindex index
+index_in_item_line_table_in_code.texi(,12) @option{opt}
+index_in_item_line_table_in_code.texi(,13) More text
+index_in_item_line_table_in_code.texi(,14) @item @cindex 2 index
+index_in_item_line_table_in_code.texi(,15) @option{nopt}
+index_in_item_line_table_in_code.texi(,16) Even more
+index_in_item_line_table_in_code.texi(,17) @end table
+index_in_item_line_table_in_code.texi(,18)
+index_in_item_line_table_in_code.texi(,19) }
+index_in_item_line_table_in_code.texi(,20)
+index_in_item_line_table_in_code.texi(,21) @vindex another index
+index_in_item_line_table_in_code.texi(,22)
+index_in_item_line_table_in_code.texi(,23) @bye
Index:
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passtexi
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passtexi
diff -N
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.passtexi
22 Aug 2008 13:51:20 -0000 1.1
@@ -0,0 +1,22 @@
+index_in_item_line_table_in_code.texi(,2)
+index_in_item_line_table_in_code.texi(,3) @setfilename
index_in_item_line_table_in_code.info
+index_in_item_line_table_in_code.texi(,4)
+index_in_item_line_table_in_code.texi(,5) @node Top
+index_in_item_line_table_in_code.texi(,6) @top test index entries in @@item
@@table in @@code
+index_in_item_line_table_in_code.texi(,7)
+index_in_item_line_table_in_code.texi(,8) @code{
+index_in_item_line_table_in_code.texi(,9)
+index_in_item_line_table_in_code.texi(,10) @table @asis
+index_in_item_line_table_in_code.texi(,11) @item @cindex index
+index_in_item_line_table_in_code.texi(,12) @option{opt}
+index_in_item_line_table_in_code.texi(,13) More text
+index_in_item_line_table_in_code.texi(,14) @item @cindex 2 index
+index_in_item_line_table_in_code.texi(,15) @option{nopt}
+index_in_item_line_table_in_code.texi(,16) Even more
+index_in_item_line_table_in_code.texi(,17) @end table
+index_in_item_line_table_in_code.texi(,18)
+index_in_item_line_table_in_code.texi(,19) }
+index_in_item_line_table_in_code.texi(,20)
+index_in_item_line_table_in_code.texi(,21) @vindex another index
+index_in_item_line_table_in_code.texi(,22)
+index_in_item_line_table_in_code.texi(,23) @bye
Index:
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.texi
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.texi
diff -N
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_table_in_code/index_in_item_line_table_in_code.texi
22 Aug 2008 13:51:20 -0000 1.1
@@ -0,0 +1,23 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden index_in_item_line_table_in_code.info
+
address@hidden Top
address@hidden test index entries in @@item @@table in @@code
+
address@hidden
+
address@hidden @asis
address@hidden @cindex index
address@hidden
+More text
address@hidden @cindex 2 index
address@hidden
+Even more
address@hidden table
+
+}
+
address@hidden another index
+
address@hidden
Index:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2
diff -N
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2
22 Aug 2008 13:51:20 -0000 1.1
@@ -0,0 +1,4 @@
+*** ignored @cindex already in an @item entry (l. 9)
+*** ignored @cindex already in an @item entry (l. 12)
+*** ignored @cindex already in an @item entry (l. 9)
+*** ignored @cindex already in an @item entry (l. 12)
Index:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst
diff -N
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst
22 Aug 2008 13:51:20 -0000 1.1
@@ -0,0 +1,18 @@
+index_in_item_line_vtable.texi(,2)
+index_in_item_line_vtable.texi(,3) @setfilename index_in_item_line_vtable.info
+index_in_item_line_vtable.texi(,4)
+index_in_item_line_vtable.texi(,5) @node Top
+index_in_item_line_vtable.texi(,6) @top test index entries in @@item @@table
+index_in_item_line_vtable.texi(,7)
+index_in_item_line_vtable.texi(,8) @vtable @asis
+index_in_item_line_vtable.texi(,9) @item index
+index_in_item_line_vtable.texi(,10) @option{opt}
+index_in_item_line_vtable.texi(,11) More text
+index_in_item_line_vtable.texi(,12) @item 2 index
+index_in_item_line_vtable.texi(,13) @option{nopt}
+index_in_item_line_vtable.texi(,14) Even more
+index_in_item_line_vtable.texi(,15) @end vtable
+index_in_item_line_vtable.texi(,16)
+index_in_item_line_vtable.texi(,17) @vindex another index
+index_in_item_line_vtable.texi(,18)
+index_in_item_line_vtable.texi(,19) @bye
Index:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passtexi
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passtexi
diff -N
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passtexi
22 Aug 2008 13:51:20 -0000 1.1
@@ -0,0 +1,18 @@
+index_in_item_line_vtable.texi(,2)
+index_in_item_line_vtable.texi(,3) @setfilename index_in_item_line_vtable.info
+index_in_item_line_vtable.texi(,4)
+index_in_item_line_vtable.texi(,5) @node Top
+index_in_item_line_vtable.texi(,6) @top test index entries in @@item @@table
+index_in_item_line_vtable.texi(,7)
+index_in_item_line_vtable.texi(,8) @vtable @asis
+index_in_item_line_vtable.texi(,9) @item @cindex index
+index_in_item_line_vtable.texi(,10) @option{opt}
+index_in_item_line_vtable.texi(,11) More text
+index_in_item_line_vtable.texi(,12) @item @cindex 2 index
+index_in_item_line_vtable.texi(,13) @option{nopt}
+index_in_item_line_vtable.texi(,14) Even more
+index_in_item_line_vtable.texi(,15) @end vtable
+index_in_item_line_vtable.texi(,16)
+index_in_item_line_vtable.texi(,17) @vindex another index
+index_in_item_line_vtable.texi(,18)
+index_in_item_line_vtable.texi(,19) @bye
Index:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.texi
===================================================================
RCS file:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.texi
diff -N
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.texi
22 Aug 2008 13:51:20 -0000 1.1
@@ -0,0 +1,19 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden index_in_item_line_vtable.info
+
address@hidden Top
address@hidden test index entries in @@item @@table
+
address@hidden @asis
address@hidden @cindex index
address@hidden
+More text
address@hidden @cindex 2 index
address@hidden
+Even more
address@hidden vtable
+
address@hidden another index
+
address@hidden
Index: test/formatting/res/texi_table_in_table_item/table_in_table_item.2
===================================================================
RCS file: test/formatting/res/texi_table_in_table_item/table_in_table_item.2
diff -N test/formatting/res/texi_table_in_table_item/table_in_table_item.2
Index:
test/formatting/res/texi_table_in_table_item/table_in_table_item.passfirst
===================================================================
RCS file:
test/formatting/res/texi_table_in_table_item/table_in_table_item.passfirst
diff -N
test/formatting/res/texi_table_in_table_item/table_in_table_item.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/texi_table_in_table_item/table_in_table_item.passfirst
22 Aug 2008 13:51:21 -0000 1.1
@@ -0,0 +1,26 @@
+table_in_table_item.texi(,2)
+table_in_table_item.texi(,3) @setfilename table_in_table_item.texi
+table_in_table_item.texi(,4)
+table_in_table_item.texi(,5) @node Top
+table_in_table_item.texi(,6) @top Test table nested in table item
+table_in_table_item.texi(,7)
+table_in_table_item.texi(,8) @table @asis
+table_in_table_item.texi(,9) @item item @table @asis
+table_in_table_item.texi(,10) @item in nested table item
+table_in_table_item.texi(,11) in nested table line
+table_in_table_item.texi(,12) @end table
+table_in_table_item.texi(,13) in table line
+table_in_table_item.texi(,14) @end table
+table_in_table_item.texi(,15)
+table_in_table_item.texi(,16) And in code
+table_in_table_item.texi(,17)
+table_in_table_item.texi(,18) @code{
+table_in_table_item.texi(,19) @table @asis
+table_in_table_item.texi(,20) @item item @table @asis
+table_in_table_item.texi(,21) @item in table in table item
+table_in_table_item.texi(,22) in nested table line
+table_in_table_item.texi(,23) @end table
+table_in_table_item.texi(,24) @end table
+table_in_table_item.texi(,25) }
+table_in_table_item.texi(,26)
+table_in_table_item.texi(,27) @bye
Index: test/formatting/res/texi_table_in_table_item/table_in_table_item.passtexi
===================================================================
RCS file:
test/formatting/res/texi_table_in_table_item/table_in_table_item.passtexi
diff -N
test/formatting/res/texi_table_in_table_item/table_in_table_item.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/texi_table_in_table_item/table_in_table_item.passtexi
22 Aug 2008 13:51:21 -0000 1.1
@@ -0,0 +1,26 @@
+table_in_table_item.texi(,2)
+table_in_table_item.texi(,3) @setfilename table_in_table_item.texi
+table_in_table_item.texi(,4)
+table_in_table_item.texi(,5) @node Top
+table_in_table_item.texi(,6) @top Test table nested in table item
+table_in_table_item.texi(,7)
+table_in_table_item.texi(,8) @table @asis
+table_in_table_item.texi(,9) @item item @table @asis
+table_in_table_item.texi(,10) @item in nested table item
+table_in_table_item.texi(,11) in nested table line
+table_in_table_item.texi(,12) @end table
+table_in_table_item.texi(,13) in table line
+table_in_table_item.texi(,14) @end table
+table_in_table_item.texi(,15)
+table_in_table_item.texi(,16) And in code
+table_in_table_item.texi(,17)
+table_in_table_item.texi(,18) @code{
+table_in_table_item.texi(,19) @table @asis
+table_in_table_item.texi(,20) @item item @table @asis
+table_in_table_item.texi(,21) @item in table in table item
+table_in_table_item.texi(,22) in nested table line
+table_in_table_item.texi(,23) @end table
+table_in_table_item.texi(,24) @end table
+table_in_table_item.texi(,25) }
+table_in_table_item.texi(,26)
+table_in_table_item.texi(,27) @bye
Index: test/formatting/res/texi_table_in_table_item/table_in_table_item.texi
===================================================================
RCS file: test/formatting/res/texi_table_in_table_item/table_in_table_item.texi
diff -N test/formatting/res/texi_table_in_table_item/table_in_table_item.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/texi_table_in_table_item/table_in_table_item.texi
22 Aug 2008 13:51:21 -0000 1.1
@@ -0,0 +1,27 @@
+\input texinfo.tex @c -*-texinfo-*-
+
address@hidden table_in_table_item.texi
+
address@hidden Top
address@hidden Test table nested in table item
+
address@hidden @asis
address@hidden item @table @asis
+ @item in nested table item
+ in nested table line
+ @end table
+in table line
address@hidden table
+
+And in code
+
address@hidden
address@hidden @asis
address@hidden item @table @asis
+ @item in table in table item
+ in nested table line
+ @end table
address@hidden table
+}
+
address@hidden
Index: test/invalid/multitable_too_much_col.texi
===================================================================
RCS file: test/invalid/multitable_too_much_col.texi
diff -N test/invalid/multitable_too_much_col.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/invalid/multitable_too_much_col.texi 22 Aug 2008 13:51:21 -0000
1.1
@@ -0,0 +1,25 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden Top
address@hidden test multitable with too much cells
+
+
address@hidden
address@hidden item in empty multitable @tab tab in empty m @tab second tab in
empty m
address@hidden item in empty m
address@hidden multitable
+
address@hidden {a}
address@hidden a @tab additional tab @tab other additional tab @tab 3rd
additiona tab
address@hidden a1
address@hidden a2 @tab additional tab2 @tab other additional tab2 @tab 3rd
additional tab2
address@hidden a3 @tab one additional tab
address@hidden multitable
+
address@hidden @columnfractions 0.4 0.6
address@hidden first @tab second @tab first out @tab second out @tab third out
address@hidden first1
address@hidden first2 @tab second2 @tab first2 out
address@hidden multitable
+
address@hidden
Index: test/invalid/style_not_closed_in_cartouche.texi
===================================================================
RCS file: test/invalid/style_not_closed_in_cartouche.texi
diff -N test/invalid/style_not_closed_in_cartouche.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/invalid/style_not_closed_in_cartouche.texi 22 Aug 2008 13:51:21
-0000 1.1
@@ -0,0 +1,12 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden style_not_closed_in_cartouche.info
+
address@hidden Top
address@hidden Test command not closed in cartouche
+
address@hidden
+cartouche @code{in code
address@hidden cartouche
+
address@hidden
Index: test/invalid/style_not_closed_in_table_line.texi
===================================================================
RCS file: test/invalid/style_not_closed_in_table_line.texi
diff -N test/invalid/style_not_closed_in_table_line.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/invalid/style_not_closed_in_table_line.texi 22 Aug 2008 13:51:21
-0000 1.1
@@ -0,0 +1,14 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden style_not_closed_in_table_line.info
+
address@hidden Top
address@hidden Test command not closed on table line
+
address@hidden @asis
address@hidden first item
+line
+line @code{in code @item in item
address@hidden table
+
address@hidden
Index: test/invalid/res/multitable_too_much_col/multitable_too_much_col.2
===================================================================
RCS file: test/invalid/res/multitable_too_much_col/multitable_too_much_col.2
diff -N test/invalid/res/multitable_too_much_col/multitable_too_much_col.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/invalid/res/multitable_too_much_col/multitable_too_much_col.2 22 Aug
2008 13:51:22 -0000 1.1
@@ -0,0 +1,16 @@
+** empty multitable (l. 7)
+** @item in empty multitable (l. 8)
+** @tab in empty multitable (l. 8)
+** @tab in empty multitable (l. 8)
+** @item in empty multitable (l. 9)
+** too much @tab (multitable has only 1 column(s)) (l. 13)
+** too much @tab (multitable has only 1 column(s)) (l. 13)
+** too much @tab (multitable has only 1 column(s)) (l. 13)
+** too much @tab (multitable has only 1 column(s)) (l. 15)
+** too much @tab (multitable has only 1 column(s)) (l. 15)
+** too much @tab (multitable has only 1 column(s)) (l. 15)
+** too much @tab (multitable has only 1 column(s)) (l. 16)
+** too much @tab (multitable has only 2 column(s)) (l. 20)
+** too much @tab (multitable has only 2 column(s)) (l. 20)
+** too much @tab (multitable has only 2 column(s)) (l. 20)
+** too much @tab (multitable has only 2 column(s)) (l. 22)
Index: test/invalid/res/multitable_too_much_col/multitable_too_much_col.html
===================================================================
RCS file: test/invalid/res/multitable_too_much_col/multitable_too_much_col.html
diff -N test/invalid/res/multitable_too_much_col/multitable_too_much_col.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/invalid/res/multitable_too_much_col/multitable_too_much_col.html
22 Aug 2008 13:51:22 -0000 1.1
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/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}
+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>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered">test multitable with too much cells</h1>
+
+
+
+<table>
+<tr><td><p> a </p></td></tr>
+<tr><td><p> a1
+</p></td></tr>
+<tr><td><p> a2 </p></td></tr>
+<tr><td><p> a3 </p></td></tr>
+</table>
+
+<table>
+<tr><td width="40%"><p> first </p></td><td width="60%"><p> second
</p></td></tr>
+<tr><td width="40%"><p> first1
+</p></td></tr>
+<tr><td width="40%"><p> first2 </p></td><td width="60%"><p> second2
</p></td></tr>
+</table>
+
+<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/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.2
===================================================================
RCS file:
test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.2
diff -N
test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.2
22 Aug 2008 13:51:22 -0000 1.1
@@ -0,0 +1 @@
+*** Closing format cartouche, got code (l. 10)
Index:
test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.html
===================================================================
RCS file:
test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.html
diff -N
test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/style_not_closed_in_cartouche/style_not_closed_in_cartouche.html
22 Aug 2008 13:51:23 -0000 1.1
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/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}
+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>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered">Test command not closed in cartouche</h1>
+
+<table class="cartouche" border="1"><tr><td>
+<p>cartouche <code>in code
+</code></p></td></tr></table>
+
+<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/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.2
===================================================================
RCS file:
test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.2
diff -N
test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.2
22 Aug 2008 13:51:23 -0000 1.1
@@ -0,0 +1 @@
+*** Closing format table, got code (l. 12)
Index:
test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.html
===================================================================
RCS file:
test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.html
diff -N
test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/style_not_closed_in_table_line/style_not_closed_in_table_line.html
22 Aug 2008 13:51:23 -0000 1.1
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/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}
+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>
+<a name="SEC_Top"></a>
+<h1 class="unnumbered">Test command not closed on table line</h1>
+
+<dl compact="compact">
+<dt> first item</dt>
+<dd><p>line
+line <code>in code </code></p></dd>
+<dt> in item</dt>
+</dl>
+
+<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/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.2
===================================================================
RCS file:
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.2
diff -N test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.2
Index:
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passfirst
===================================================================
RCS file:
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passfirst
diff -N
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passfirst
22 Aug 2008 13:51:23 -0000 1.1
@@ -0,0 +1,24 @@
+multitable_too_much_col.texi(,2)
+multitable_too_much_col.texi(,3) @node Top
+multitable_too_much_col.texi(,4) @top test multitable with too much cells
+multitable_too_much_col.texi(,5)
+multitable_too_much_col.texi(,6)
+multitable_too_much_col.texi(,7) @multitable
+multitable_too_much_col.texi(,8) @item item in empty multitable @tab tab in
empty m @tab second tab in empty m
+multitable_too_much_col.texi(,9) @item item in empty m
+multitable_too_much_col.texi(,10) @end multitable
+multitable_too_much_col.texi(,11)
+multitable_too_much_col.texi(,12) @multitable {a}
+multitable_too_much_col.texi(,13) @item a @tab additional tab @tab other
additional tab @tab 3rd additiona tab
+multitable_too_much_col.texi(,14) @item a1
+multitable_too_much_col.texi(,15) @item a2 @tab additional tab2 @tab other
additional tab2 @tab 3rd additional tab2
+multitable_too_much_col.texi(,16) @item a3 @tab one additional tab
+multitable_too_much_col.texi(,17) @end multitable
+multitable_too_much_col.texi(,18)
+multitable_too_much_col.texi(,19) @multitable @columnfractions 0.4 0.6
+multitable_too_much_col.texi(,20) @item first @tab second @tab first out @tab
second out @tab third out
+multitable_too_much_col.texi(,21) @item first1
+multitable_too_much_col.texi(,22) @item first2 @tab second2 @tab first2 out
+multitable_too_much_col.texi(,23) @end multitable
+multitable_too_much_col.texi(,24)
+multitable_too_much_col.texi(,25) @bye
Index:
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passtexi
===================================================================
RCS file:
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passtexi
diff -N
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.passtexi
22 Aug 2008 13:51:23 -0000 1.1
@@ -0,0 +1,24 @@
+multitable_too_much_col.texi(,2)
+multitable_too_much_col.texi(,3) @node Top
+multitable_too_much_col.texi(,4) @top test multitable with too much cells
+multitable_too_much_col.texi(,5)
+multitable_too_much_col.texi(,6)
+multitable_too_much_col.texi(,7) @multitable
+multitable_too_much_col.texi(,8) @item item in empty multitable @tab tab in
empty m @tab second tab in empty m
+multitable_too_much_col.texi(,9) @item item in empty m
+multitable_too_much_col.texi(,10) @end multitable
+multitable_too_much_col.texi(,11)
+multitable_too_much_col.texi(,12) @multitable {a}
+multitable_too_much_col.texi(,13) @item a @tab additional tab @tab other
additional tab @tab 3rd additiona tab
+multitable_too_much_col.texi(,14) @item a1
+multitable_too_much_col.texi(,15) @item a2 @tab additional tab2 @tab other
additional tab2 @tab 3rd additional tab2
+multitable_too_much_col.texi(,16) @item a3 @tab one additional tab
+multitable_too_much_col.texi(,17) @end multitable
+multitable_too_much_col.texi(,18)
+multitable_too_much_col.texi(,19) @multitable @columnfractions 0.4 0.6
+multitable_too_much_col.texi(,20) @item first @tab second @tab first out @tab
second out @tab third out
+multitable_too_much_col.texi(,21) @item first1
+multitable_too_much_col.texi(,22) @item first2 @tab second2 @tab first2 out
+multitable_too_much_col.texi(,23) @end multitable
+multitable_too_much_col.texi(,24)
+multitable_too_much_col.texi(,25) @bye
Index:
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.texi
===================================================================
RCS file:
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.texi
diff -N
test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/invalid/res/texi_multitable_too_much_col/multitable_too_much_col.texi
22 Aug 2008 13:51:23 -0000 1.1
@@ -0,0 +1,25 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden Top
address@hidden test multitable with too much cells
+
+
address@hidden
address@hidden item in empty multitable @tab tab in empty m @tab second tab in
empty m
address@hidden item in empty m
address@hidden multitable
+
address@hidden {a}
address@hidden a @tab additional tab @tab other additional tab @tab 3rd
additiona tab
address@hidden a1
address@hidden a2 @tab additional tab2 @tab other additional tab2 @tab 3rd
additional tab2
address@hidden a3 @tab one additional tab
address@hidden multitable
+
address@hidden @columnfractions 0.4 0.6
address@hidden first @tab second @tab first out @tab second out @tab third out
address@hidden first1
address@hidden first2 @tab second2 @tab first2 out
address@hidden multitable
+
address@hidden
Index:
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.2
===================================================================
RCS file:
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.2
diff -N
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.2
Index:
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passfirst
===================================================================
RCS file:
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passfirst
diff -N
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passfirst
22 Aug 2008 13:51:24 -0000 1.1
@@ -0,0 +1,11 @@
+style_not_closed_in_cartouche.texi(,2)
+style_not_closed_in_cartouche.texi(,3) @setfilename
style_not_closed_in_cartouche.info
+style_not_closed_in_cartouche.texi(,4)
+style_not_closed_in_cartouche.texi(,5) @node Top
+style_not_closed_in_cartouche.texi(,6) @top Test command not closed in
cartouche
+style_not_closed_in_cartouche.texi(,7)
+style_not_closed_in_cartouche.texi(,8) @cartouche
+style_not_closed_in_cartouche.texi(,9) cartouche @code{in code
+style_not_closed_in_cartouche.texi(,10) @end cartouche
+style_not_closed_in_cartouche.texi(,11)
+style_not_closed_in_cartouche.texi(,12) @bye
Index:
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passtexi
===================================================================
RCS file:
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passtexi
diff -N
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.passtexi
22 Aug 2008 13:51:24 -0000 1.1
@@ -0,0 +1,11 @@
+style_not_closed_in_cartouche.texi(,2)
+style_not_closed_in_cartouche.texi(,3) @setfilename
style_not_closed_in_cartouche.info
+style_not_closed_in_cartouche.texi(,4)
+style_not_closed_in_cartouche.texi(,5) @node Top
+style_not_closed_in_cartouche.texi(,6) @top Test command not closed in
cartouche
+style_not_closed_in_cartouche.texi(,7)
+style_not_closed_in_cartouche.texi(,8) @cartouche
+style_not_closed_in_cartouche.texi(,9) cartouche @code{in code
+style_not_closed_in_cartouche.texi(,10) @end cartouche
+style_not_closed_in_cartouche.texi(,11)
+style_not_closed_in_cartouche.texi(,12) @bye
Index:
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.texi
===================================================================
RCS file:
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.texi
diff -N
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/texi_style_not_closed_in_cartouche/style_not_closed_in_cartouche.texi
22 Aug 2008 13:51:24 -0000 1.1
@@ -0,0 +1,12 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden style_not_closed_in_cartouche.info
+
address@hidden Top
address@hidden Test command not closed in cartouche
+
address@hidden
+cartouche @code{in code
address@hidden cartouche
+
address@hidden
Index:
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.2
===================================================================
RCS file:
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.2
diff -N
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.2
Index:
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passfirst
===================================================================
RCS file:
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passfirst
diff -N
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passfirst
22 Aug 2008 13:51:24 -0000 1.1
@@ -0,0 +1,13 @@
+style_not_closed_in_table_line.texi(,2)
+style_not_closed_in_table_line.texi(,3) @setfilename
style_not_closed_in_table_line.info
+style_not_closed_in_table_line.texi(,4)
+style_not_closed_in_table_line.texi(,5) @node Top
+style_not_closed_in_table_line.texi(,6) @top Test command not closed on table
line
+style_not_closed_in_table_line.texi(,7)
+style_not_closed_in_table_line.texi(,8) @table @asis
+style_not_closed_in_table_line.texi(,9) @item first item
+style_not_closed_in_table_line.texi(,10) line
+style_not_closed_in_table_line.texi(,11) line @code{in code @item in item
+style_not_closed_in_table_line.texi(,12) @end table
+style_not_closed_in_table_line.texi(,13)
+style_not_closed_in_table_line.texi(,14) @bye
Index:
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passtexi
===================================================================
RCS file:
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passtexi
diff -N
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.passtexi
22 Aug 2008 13:51:24 -0000 1.1
@@ -0,0 +1,13 @@
+style_not_closed_in_table_line.texi(,2)
+style_not_closed_in_table_line.texi(,3) @setfilename
style_not_closed_in_table_line.info
+style_not_closed_in_table_line.texi(,4)
+style_not_closed_in_table_line.texi(,5) @node Top
+style_not_closed_in_table_line.texi(,6) @top Test command not closed on table
line
+style_not_closed_in_table_line.texi(,7)
+style_not_closed_in_table_line.texi(,8) @table @asis
+style_not_closed_in_table_line.texi(,9) @item first item
+style_not_closed_in_table_line.texi(,10) line
+style_not_closed_in_table_line.texi(,11) line @code{in code @item in item
+style_not_closed_in_table_line.texi(,12) @end table
+style_not_closed_in_table_line.texi(,13)
+style_not_closed_in_table_line.texi(,14) @bye
Index:
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.texi
===================================================================
RCS file:
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.texi
diff -N
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/invalid/res/texi_style_not_closed_in_table_line/style_not_closed_in_table_line.texi
22 Aug 2008 13:51:24 -0000 1.1
@@ -0,0 +1,14 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden style_not_closed_in_table_line.info
+
address@hidden Top
address@hidden Test command not closed on table line
+
address@hidden @asis
address@hidden first item
+line
+line @code{in code @item in item
address@hidden table
+
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl doc/texi2...,
Patrice Dumas <=