[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht... |
|
Date: |
Sat, 17 Jan 2009 14:30:50 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/01/17 14:30:49
Modified files:
. : ChangeLog TODO texi2html.init texi2html.pl
examples : info.init
test/coverage/res/formatting: formatting.2 formatting.html
test/encodings/res/formatting_converted_to_utf8: formatting.2
formatting.html
test/encodings/res/formatting_fr: formatting.2 formatting.html
test/encodings/res/formatting_fr_icons: formatting.2
formatting.html
test/formatting/res/formatting_docbook: formatting.xml
test/formatting/res/formatting_weird_quotes: formatting.2
formatting.html
test/formatting/res/formatting_xml: formatting.xml
test/formatting/res/inter_item_commands:
inter_item_commands.html
test/formatting/res/inter_item_commands_xml:
inter_item_commands.xml
test/formatting/res/symbol_after_block: symbol_after_block.html
test/indices/res/makeinfo_nodes_before_top: index.html
test/indices/res/makeinfo_nodes_before_top_and_sections:
index.html
test/layout/res/formatting_chm: formatting.2 formatting.html
test/layout/res/formatting_exotic: formatting.2 formatting.html
test/layout/res/formatting_makeinfo: formatting.2 index.html
test/layout/res/formatting_regions: formatting_regions.2
formatting_regions.html
test/misc/res/formatting_html32: formatting.2 formatting.html
test/misc/res/verbatim_html: verbatim_html.html
test/nested_formats: nested_formats.texi
test/nested_formats/res/nested_cartouche: nested_formats.html
test/nested_formats/res/nested_deffn: nested_formats.html
test/nested_formats/res/nested_enumerate: nested_formats.html
test/nested_formats/res/nested_example: nested_formats.html
test/nested_formats/res/nested_flushright: nested_formats.html
test/nested_formats/res/nested_group: nested_formats.html
test/nested_formats/res/nested_itemize: nested_formats.html
test/nested_formats/res/nested_menu: nested_formats.html
test/nested_formats/res/nested_multitable: nested_formats.html
test/nested_formats/res/nested_quotation: nested_formats.html
test/nested_formats/res/nested_table: nested_formats.html
test/nested_formats/res/texi_nested_formats:
nested_formats.passfirst
nested_formats.passtexi
nested_formats.texi
test/sectionning/res/makeinfo_novalidate_split: index.html
test/sectionning/res/makeinfo_novalidate_unsplit:
novalidate.html
Log message:
* texi2html.pl, texi2html.init: consider the @itemize argument
either as an @-command or a leading text, not both, and remove
spaces in @itemize arguments better.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.362&r2=1.363
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.259&r2=1.260
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/formatting/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/formatting/formatting.html?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_converted_to_utf8/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_converted_to_utf8/formatting.html?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr/formatting.html?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr_icons/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res/formatting_fr_icons/formatting.html?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_docbook/formatting.xml?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_weird_quotes/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_weird_quotes/formatting.html?cvsroot=texi2html&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_xml/formatting.xml?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/inter_item_commands/inter_item_commands.html?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/inter_item_commands_xml/inter_item_commands.xml?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/symbol_after_block/symbol_after_block.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/makeinfo_nodes_before_top/index.html?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/makeinfo_nodes_before_top_and_sections/index.html?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_chm/formatting.html?cvsroot=texi2html&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_exotic/formatting.html?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/index.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_regions/formatting_regions.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_regions/formatting_regions.html?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/formatting_html32/formatting.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/formatting_html32/formatting.html?cvsroot=texi2html&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/misc/res/verbatim_html/verbatim_html.html?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/nested_formats.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_cartouche/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_deffn/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_enumerate/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_example/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_flushright/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_group/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_itemize/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_menu/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_multitable/nested_formats.html?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_quotation/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/nested_table/nested_formats.html?cvsroot=texi2html&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/texi_nested_formats/nested_formats.passfirst?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/texi_nested_formats/nested_formats.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/nested_formats/res/texi_nested_formats/nested_formats.texi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/makeinfo_novalidate_split/index.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/makeinfo_novalidate_unsplit/novalidate.html?cvsroot=texi2html&r1=1.7&r2=1.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -b -r1.362 -r1.363
--- ChangeLog 9 Jan 2009 21:20:00 -0000 1.362
+++ ChangeLog 17 Jan 2009 14:30:41 -0000 1.363
@@ -1,3 +1,9 @@
+2009-01-17 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init: consider the @itemize argument
+ either as an @-command or a leading text, not both, and remove
+ spaces in @itemize arguments better.
+
2009-01-09 Patrice Dumas <address@hidden>
* texi2html.pl: (dir) is added as up node only if automatic
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- TODO 9 Jan 2009 21:20:01 -0000 1.80
+++ TODO 17 Jan 2009 14:30:42 -0000 1.81
@@ -47,7 +47,7 @@
$Texi2HTML::THISDOC{'split_level'}
$copying_comment, $titlepage better and $documentdescription
- $program_string
+ $program_string, $footnote_texi
$heading arguments $begin_paragraph_texi $tab_item_texi $begin_style_texi
$begin_special_region $end_special_region $simple_command $thing_command
Also element formatting documentation, especially print_foot_navigation
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- texi2html.init 9 Jan 2009 21:20:01 -0000 1.176
+++ texi2html.init 17 Jan 2009 14:30:42 -0000 1.177
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.176 2009/01/09 21:20:01 pertusus Exp $
+# $Id: texi2html.init,v 1.177 2009/01/17 14:30:42 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -5630,12 +5630,18 @@
my $result_line;
my $open_command = 0;
-
+ if (defined($command) and $command ne '' and $format ne 'itemize')
+ {
+ address@hidden
+ $open_command = 1;
+ }
if (defined($prepended) and $prepended ne '')
{
+ $prepended =~ s/^\s*//;
+ $prepended =~ s/\s*$//;
+ $line =~ s/^\s*//;
$result_line = $prepended . ' ' . $line;
}
- $open_command = 1 if (defined($command));
return ($result_line, $open_command);
}
@@ -6634,10 +6640,10 @@
sub t2h_default_tab_item_texi($$$$$$)
{
- my $comand = shift;
+ my $command = shift;
my $commands_stack = shift;
- my $state = shift;
my $stack = shift;
+ my $state = shift;
my $line = shift;
my $line_nr = shift;
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -b -r1.259 -r1.260
--- texi2html.pl 9 Jan 2009 21:20:04 -0000 1.259
+++ texi2html.pl 17 Jan 2009 14:30:42 -0000 1.260
@@ -74,7 +74,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.259 2009/01/09 21:20:04 pertusus Exp $
+# $Id: texi2html.pl,v 1.260 2009/01/17 14:30:42 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -485,6 +485,7 @@
$begin_style_texi
$begin_paragraph_texi
$tab_item_texi
+$footnote_texi
$colon_command
$simple_command
$thing_command
@@ -5746,7 +5747,7 @@
# Find next node if not already found
if ($node->{'nodenext'}) {}
- elsif ($node->{'texi'} eq 'Top')
+ elsif ($node->{'texi'} eq 'Top' and $node->{'automatic_directions'})
{ # special case as said in the texinfo manual
if ($node->{'menu_child'})
{
@@ -8218,19 +8219,9 @@
my $align = '';
$align = $state->{'paragraph_style'}->[-1] if
($state->{'paragraph_style'}->[-1]);
- if (exists($::style_map_ref->{$paragraph_command}) and
-
!exists($Texi2HTML::Config::special_list_commands{$format}->{$paragraph_command})
and $command_opened)
+ if ($paragraph_command and
!exists($Texi2HTML::Config::special_list_commands{$format}->{$paragraph_command}))
{
- if ($format eq 'itemize')
- {
- chomp ($text);
- $text = do_simple($paragraph_command, $text, $state, [$text]);
- $text = $text . "\n";
- }
- }
- elsif (exists($::things_map_ref->{$paragraph_command}))
- {
- $paragraph_command_formatted = do_simple($paragraph_command, '',
$state);
+ $paragraph_command_formatted = substitute_line("address@hidden",
duplicate_formatting_state($state));
}
return &$Texi2HTML::Config::paragraph($text, $align, $indent_style,
$paragraph_command, $paragraph_command_formatted, $paragraph_number, $format,
$item_nr, $enumerate_type,
$number,$state->{'command_stack'},$stack_at_beginning);
}
@@ -8257,14 +8248,9 @@
$pre_style = $state->{'preformatted_stack'}->[-1]->{'pre_style'} if
($state->{'preformatted_stack'}->[-1]->{'pre_style'});
$class = $state->{'preformatted_stack'}->[-1]->{'class'};
print STDERR "BUG: !state->{'preformatted_stack'}->[-1]->{'class'}\n"
unless ($class);
- if (exists($::style_map_ref->{$leading_command}) and
-
!exists($Texi2HTML::Config::special_list_commands{$format}->{$leading_command})
and ($style_type{$leading_command} eq 'style'))
- {
- $text = do_simple($leading_command, $text, $state,[$text]) if ($format
eq 'itemize');
- }
- elsif (exists($::things_map_ref->{$leading_command}))
+ if (defined($leading_command) and $leading_command ne '' and
!exists($Texi2HTML::Config::special_list_commands{$format}->{$leading_command}))
{
- $leading_command_formatted = do_simple($leading_command, '', $state);
+ $leading_command_formatted = substitute_line("address@hidden",
duplicate_formatting_state($state));
}
return &$Texi2HTML::Config::preformatted($text, $pre_style, $class,
$leading_command, $leading_command_formatted, $preformatted_number, $format,
$item_nr, $enumerate_type,
$number,$state->{'command_stack'},$stack_at_beginning);
}
@@ -8728,17 +8714,13 @@
my $line = shift;
my $tag = shift;
my $command = '';
+
+ my $orig_line = $line;
# macro_regexp
- if ($line =~ /^\s*\@([A-Za-z][\w-]*)(\{\})?$/ or $line =~
/^\s*\@([A-Za-z][\w-]*)(\{\})?\s/)
- {
- my $macro = $1;
- $macro = $alias{$macro} if (exists($alias{$macro}));
- if ($::things_map_ref->{$macro} or defined($::style_map_ref->{$macro}))
+ if ($line =~ s/^\s*\@([A-Za-z][\w-]*)(\{\})?\s*$//)
{
- # macro_regexp
- $line =~ s/^\s*\@([A-Za-z][\w-]*)(\{\})?\s*//;
$command = $1;
- }
+ $command = $alias{$command} if (exists($alias{$command}));
}
return ('', $command) if ($line =~ /^\s*$/);
chomp $line;
@@ -8953,7 +8935,7 @@
$format_mismatch = 1;
echo_warn ("Waiting for address@hidden $format_ref->{'format'},
found address@hidden $format ", $line_nr);
}
- if ($Texi2HTML::Config::format_map{$format})
+ if (exists ($Texi2HTML::Config::format_map{$format}))
{ # table or list has a simple format
add_prev($text, $stack, end_simple_format($format_ref->{'format'},
$format_ref->{'text'}, $state));
}
@@ -9919,6 +9901,8 @@
my $line_nr = shift;
$text .= "\n";
+ $text = &$Texi2HTML::Config::footnote_texi($text, $doc_state, $style_stack)
+ if (defined($Texi2HTML::Config::footnote_texi));
#print STDERR "FOOTNOTE($global_foot_num, $doc_state->{'outside_document'} or
$doc_state->{'multiple_pass'}) $text";
my $foot_state = duplicate_state($doc_state);
@@ -12956,9 +12940,9 @@
if (!$format->{'first'} or ($item->{'text'} =~ /\S/o))
{
my $formatted_command;
- if (defined($format->{'command'}) and
exists($::things_map_ref->{$format->{'command'}}))
+ if (defined($format->{'command'}) and $format->{'command'} ne '')# and
exists($::things_map_ref->{$format->{'command'}}))
{
- $formatted_command = do_simple($format->{'command'}, '', $state);
+ $formatted_command =
substitute_line("address@hidden>{'command'}\{\}",
duplicate_formatting_state($state));#do_simple($format->{'command'}, '',
$state);
$format->{'formatted_command'} = $formatted_command;
}
#chomp($item->{'text'});
Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- examples/info.init 9 Jan 2009 16:55:19 -0000 1.16
+++ examples/info.init 17 Jan 2009 14:30:43 -0000 1.17
@@ -63,7 +63,7 @@
'option', 'samp');
# slanted?
my @asis_commands = ('asis', 'b', 'ctrl', 'dmn', 'i', 'math', 'sc', 't', 'r',
- 'slanted', 'var', 'titlefont', 'verb');
+ 'slanted', 'var', 'titlefont', 'verb', 'clickstyle');
my @chevron_commands = ('key', 'indicateurl');
my %info_default_accent_commands = ();
@@ -118,6 +118,18 @@
}
}
+my %info_default_leaf_command = ();
+foreach my $command ('uref', 'url', 'email')
+{
+ $info_default_leaf_command{$command} = 1;
+ $style_map{$command}->{'orig_args'} = [ @{$style_map{$command}->{'args'}} ];
+ $style_map{$command}->{'args'} = [];
+ foreach my $arg (@{$style_map{$command}->{'orig_args'}})
+ {
+ push @{$style_map{$command}->{'args'}}, 'keep';
+ }
+}
+
$style_map{'uref'}->{'function'} = \&info_default_uref;
$style_map{'url'}->{'function'} = \&info_default_uref;
@@ -155,6 +167,21 @@
return "$text $mail";
}
+$special_list_commands{'itemize'} = {};
+my @info_default_normal_formats = ('table', 'vtable', 'ftable', 'enumerate',
+ 'itemize');
+foreach my $format (@info_default_normal_formats, 'group')
+{
+ $format_map{$format} = '';
+}
+
+my %info_default_indented_commands;
+foreach my $command (keys (%{$complex_format_map}),
@info_default_normal_formats, 'quotation')
+{
+ $info_default_indented_commands{$command} = 1;
+}
+
+
$style = \&info_default_style;
$print_page_head = \&info_default_print_page_head;
$toc_body = \&info_default_noop;
@@ -200,6 +227,11 @@
$index_entry_label = \&info_default_index_entry_label;
$foot_section = \&info_default_foot_lines;
$foot_line_and_ref = \&info_default_foot_line_and_ref;
+$footnote_texi = \&info_default_footnote_texi;
+$list_item = \&info_default_list_item;
+$format_list_item_texi = \&info_default_format_list_item_texi;
+$format = \&info_default_format;
+$tab_item_texi = \&info_default_tab_item_texi;
sub info_default_accent($$$)
@@ -254,8 +286,6 @@
#Â FIXME initialize
my %info_default_state_map = ();
my $info_default_state;
-my $info_default_offset_in_file;
-my $info_default_line_count;
sub info_default_reset_state($)
{
@@ -295,24 +325,35 @@
#Â Beware that there is a pending word if the text doesn't end with
# a space
-sub info_default_process_text($$$$;$)
+sub info_default_process_text($$$$$$)
{
my $text = shift;
my $line_char_counter = shift;
my $pending_spaces = shift;
my $pending_word = shift;
- my $indent_text = shift;
- $indent_text = '' if (!defined($indent_text));
+ my $indent_length = shift;
+ my $in_para = shift;
+
+ my $indent_text = '';
+ $indent_text = ' ' x $indent_length if (defined($indent_length));
+
my $line_passed = 0;
my $result = '';
-my $line_char_counter_text = 'undef';
-$line_char_counter_text = "$line_char_counter" if
(defined($line_char_counter));
-print STDERR "process_text(indent `$indent_text') line_char_counter
$line_char_counter_text `$text'\n";
- if (!defined($line_char_counter))
+print STDERR "process_text(indent `$indent_text', in_para $in_para)
line_char_counter $line_char_counter `$text'\n";
+ if (!$in_para)
{
my $chomped_text = $text;
- $line_passed = 1 if (chomp($chomped_text));
+ if ($line_char_counter == 0 and $chomped_text ne '')
+ {
+ $text = $indent_text.$text;
+ }
+ $line_char_counter += length($text);
+ if (chomp($chomped_text))
+ {
+ $line_passed = 1;
+ $line_char_counter = 0;
+ }
return ($line_char_counter, $pending_spaces, $pending_word,
$line_passed, $text);
}
@@ -396,10 +437,12 @@
my $line_char_counter = shift;
my $pending_spaces = shift;
my $pending_word = shift;
- my $indent_text = shift;
- $indent_text = '' if (!defined($indent_text));
+ my $indent_length = shift;
+
+ my $indent_text = '';
+ $indent_text = ' ' x $indent_length if (defined($indent_length));
- if (defined($line_char_counter) and $line_char_counter == 0)
+ if ($line_char_counter == 0)
{
$pending_spaces = $indent_text . $pending_spaces;
}
@@ -410,7 +453,7 @@
$result .= $pending_word;
$pending_word = undef;
}
- $line_char_counter += length($result) if (defined($line_char_counter));
+ $line_char_counter += length($result);
return ($line_char_counter, $pending_spaces, $pending_word, $result);
}
@@ -418,39 +461,18 @@
my $info_default_indent_length = 5;
my $info_default_para_indent_length = 3;
-my %info_default_indented_commands = ( 'quotation' => 1 );
-foreach my $complex_command (keys (%{$complex_format_map}))
-{
- $info_default_indented_commands{$complex_command} = 1;
-}
-
sub info_default_output($)
{
my $info_state = shift;
my $result = '';
-
- if (!defined($info_state->{'current'}->{'command'}))
- {
print STDERR "Storing the stack\n";
print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]);
my ($characters_count, $lines_count);
- my $in_main_document;
- $in_main_document = 1 if ($info_state->{'state'}->{'inside_document'}
and !$info_state->{'state'}->{'duplicated'});
- if ($in_main_document)
- {
- $info_state->{'offset_in_file'} = $info_default_offset_in_file;
- $info_state->{'line_count'} = $info_default_line_count;
- }
($characters_count, $result, $lines_count) =
info_default_process_content($info_state->{'top'}, $info_state);
$info_state->{'offset_in_file'} += $characters_count;
$info_state->{'line_count'} += $lines_count;
- if ($in_main_document)
- {
- $info_default_offset_in_file = $info_state->{'offset_in_file'};
- $info_default_line_count = $info_state->{'line_count'};
- }
- info_default_reset_state($info_state);
- }
+ info_default_reset_state($info_state)
+ if (!defined($info_state->{'current'}->{'command'}));
return $result;
}
@@ -465,7 +487,7 @@
my $length = 0;
my $result = '';
- my $line_char_counter;
+ my $line_char_counter = 0;
my $all_line_passed = 0;
my $pending_spaces = '';
@@ -473,9 +495,11 @@
my $preformatted = 0;
my $indent_level = 0;
my $exdent_line = 0;
- my $line_beginning = 0;
my $indent_para;
my $noindent_para;
+ my $item_pending;
+ my $in_exdent = 0;
+ my $in_para = 0;
my ($current, $index, $close) = ($current_command, 0, 0);
@@ -494,11 +518,18 @@
$text_command = $content->{'command'} if defined($content->{'command'});
my $in_node_count = 0;
$in_node_count = $info_state->{'line_count'} if
defined($info_state->{'line_count'});
- print STDERR
"($text_command|$text_length|$close|${all_line_passed}+$in_node_count)
preformatted $preformatted, line_beginning $line_beginning, indent_level
$indent_level exdent_line $exdent_line line_char_counter
$line_char_counter_text\n";
+ print STDERR
"($text_command|$text_length|$close|${all_line_passed}+$in_node_count)
preformatted $preformatted, indent_level $indent_level exdent_line $exdent_line
line_char_counter $line_char_counter_text\n";
my $pending_word_text = 'undef';
$pending_word_text = "`$pending_word'" if (defined($pending_word));
print STDERR " spaces: `$pending_spaces' word: $pending_word_text\n";
+ my $indent_length = $indent_level * $info_default_indent_length;
+ $indent_length = ($indent_level -1) * $info_default_indent_length
+ if ($indent_level and $in_exdent);
+ $indent_length = ($info_default_indent_length -2
+ +($indent_level -1)* $info_default_indent_length)
+ if ($item_pending);
+
if ($close)
{
if (defined($content->{'end'}))
@@ -520,24 +551,23 @@
{
$text_added .= "\n";
}
- #$line_beginning = 1;
$info_state->{'waiting_for_line'} = 1 if ($indent_level ==
0);
goto new_text;
}
if ($content->{'command'} eq 'paragraph')
{
$pending_spaces = '';
- $line_char_counter = undef;
+ $in_para = 0;
$indent_para = undef;
$noindent_para = undef;
$text_added = $content->{'end'};
$info_state->{'waiting_for_line'} = 1;
+ # FIXME needed?
goto new_text;
}
elsif ($content->{'command'} eq 'preformatted')
{
$preformatted--;
- $line_beginning = 0;
}
}
}
@@ -548,9 +578,9 @@
if ($content->{'command'} eq 'anchor' or $content->{'command'}
eq 'image' or $content->{'command'} eq 'index_command')
{
my $pending;
- ($line_char_counter, $pending_spaces, $pending_word,
$pending) = info_default_store_pending($line_char_counter, $pending_spaces,
$pending_word, ' ' x ($indent_level * $info_default_indent_length));
+ ($line_char_counter, $pending_spaces, $pending_word,
$pending) = info_default_store_pending($line_char_counter, $pending_spaces,
$pending_word, $indent_length);
#Â here spaces out of any environment are ignored.
- if (defined($line_char_counter) or ($preformatted) or
$pending !~ /^\s*$/)
+ if ($in_para or $preformatted or $pending !~ /^\s*$/)
{ #Â this has to be done before the anchor related code
#Â to have the right count.
$length += length($pending);
@@ -588,19 +618,18 @@
elsif ($content->{'command'} eq 'paragraph')
{
($current, $index, $close) =
info_default_skip_spaces($current, $index, $close);
- $line_char_counter = 0;
$content->{'begin'} = ' ' x $info_default_para_indent_length
if
- (!($content->{'top_stack'} eq 'quotation') and
($indent_para or (!$noindent_para and $content->{'paragraph_in_element_nr'})));
+ ($line_char_counter == 0 and !($indent_level) and
($indent_para or (!$noindent_para and $content->{'paragraph_in_element_nr'})));
+ $in_para = 1;
}
elsif ($content->{'command'} eq 'preformatted')
{
$preformatted++;
- $line_beginning = 1;
- $exdent_line = 0;
+ $in_exdent = 0;
}
- elsif ($content->{'command'} eq 'exdent' and $preformatted)
+ elsif ($content->{'command'} eq 'exdent')
{
- $exdent_line = 1;
+ $in_exdent = 1;
}
elsif ($content->{'command'} eq 'indent')
{
@@ -613,12 +642,15 @@
elsif ($content->{'command'} eq 'image')
{
$text_added .= $content->{'text'};
- #Â set $line_beginning
- #Â also indent if needed (though better check with Karl
goto new_text;
}
+ elsif ($content->{'command'} eq 'item' and exists
$format_map{$content->{'format'}})
+ {
+ $item_pending = 1;
+ }
if ($info_default_indented_commands{$content->{'command'}})
{
+ $info_state->{'waiting_for_line'} = 0 if ($indent_level ==
0);
$indent_level++;
}
}
@@ -630,7 +662,7 @@
if ($content->{'length'})
{
- if (defined($line_char_counter))
+ if ($in_para and !$in_exdent)
{
if (chomp($content->{'text'}))
{
@@ -645,7 +677,6 @@
elsif ($preformatted)
{
$text_added .= $content->{'text'};
- $info_state->{'waiting_for_line'} = 0;
}
else
{
@@ -659,49 +690,52 @@
}
}
else
- { #Â may this happen?
+ { #Â exdent, item not in paragraph nor in preformatted
$text_added .= $content->{'text'};
$info_state->{'waiting_for_line'} = 0;
}
}
-
-
# unless (!defined($line_char_counter) and !$preformatted and
$content->{'text'} =~ /^\s*$/);
}
}
- if (!$preformatted)
+ if (!$preformatted and !$in_exdent)
{
#Â the line_passed returned here are not used, since they are
computed
#Â below.
my $dummy_line_passed;
- ($line_char_counter, $pending_spaces, $pending_word,
$dummy_line_passed, $text_added) = info_default_process_text($text_added,
$line_char_counter, $pending_spaces, $pending_word, ' ' x ($indent_level *
$info_default_indent_length)) if ($text_added ne '');
+ ($line_char_counter, $pending_spaces, $pending_word,
$dummy_line_passed, $text_added) = info_default_process_text($text_added,
$line_char_counter, $pending_spaces, $pending_word, $indent_length, $in_para)
if ($text_added ne '');
}
else
{
-print STDERR "text_added `$text_added' line_beginning $line_beginning\n";
- if ($text_added ne '' and $line_beginning)
+print STDERR "text_added `$text_added' line_char_counter $line_char_counter\n";
+ if ($text_added ne '' and $line_char_counter == 0)
{
- my $used_indent_level = $indent_level;
- $used_indent_level-- if ($indent_level and $exdent_line);
- $exdent_line = 0;
-print STDERR " indent_level $indent_level\n";
- $text_added = ' ' x ($used_indent_level *
$info_default_indent_length)
- .$text_added;
- $line_beginning = 0;
+print STDERR " indent_length $indent_length\n";
+ $text_added = ' ' x $indent_length.$text_added;
}
+ $line_char_counter += length($text_added);
}
new_text:
print STDERR "ADDING `$text_added'\n" if ($text_added ne '');
+ if ($text_added ne '')
+ {
+ $item_pending = undef;
+ if ($exdent_line)
+ {
+ $exdent_line = 0;
+ $in_exdent = 1;
+ }
+ }
$result .= $text_added;
$length += length($text_added);
my ($line_passed, $end_of_line, $last_line) =
info_default_count_lines($text_added);
if ($end_of_line)
{
- $line_char_counter = 0 if (defined($line_char_counter));
- $line_beginning = 1 if ($preformatted);
+ $line_char_counter = 0;
+ $in_exdent = 0;
}
- elsif (defined($line_char_counter) and $line_passed)
+ elsif ($line_passed)
{# in that case we added more than one line, the $line_char_counter
#Â is reset to the last line length.
$line_char_counter = length($last_line);
@@ -806,9 +840,23 @@
}
}
+ if ($info_default_leaf_command{$command})
+ {
+ my $saved_offset_in_file = $info_state->{'offset_in_file'};
+ my $saved_line_count = $info_state->{'line_count'};
+ my $result = return info_default_output($info_state);
+ $info_state->{'offset_in_file'} = $saved_offset_in_file;
+ $info_state->{'line_count'} = $saved_line_count;
+ $info_state->{'current'}->{'text'} = $result;
+ $info_state->{'current'}->{'length'} = length($result);
+ return '';
+ }
$info_state->{'current'} = $info_state->{'current'}->{'parent'};
- return info_default_output($info_state);
+ return info_default_output($info_state)
+ if (!defined($info_state->{'current'}->{'command'}));
+ return '';
+
}
sub info_default_store_text($$;$$)
@@ -830,7 +878,9 @@
#Â the text. In that case the command is used.
# return 0 if (!(defined($command) and $command eq 'menu_entry') and
((!$state->{'inside_document'} and !$state->{'outside_document'}) or
($state->{'duplicated'} and $state->{'inside_document'})));
return '' if ($len == 0 and !defined($command));
- print STDERR "Storing text($len) $text\n";
+ my $command_text = '';
+ $command_text = "\[$command\]" if (defined($command));
+ print STDERR "Storing text${command_text}($len) $text\n";
my $text_stored = {'text' => $text, 'length' => $len};
$text_stored->{'command'} = $command if (defined($command));
if (defined($additional_entries))
@@ -841,8 +891,9 @@
}
}
push @{$info_state->{'current'}->{'content'}}, $text_stored;
- return info_default_output($info_state);
-# return 1;
+ return info_default_output($info_state)
+ if (!defined($info_state->{'current'}->{'command'}));
+ return '';
}
sub info_default_begin_format_texi($$$)
@@ -861,7 +912,7 @@
my $stack = shift;
my $real_style_command = shift;
info_default_open_command($state,$command, undef, undef, undef)
- unless ($info_default_accent_commands{$command});
+ unless ($info_default_accent_commands{$command} or exists
$things_map{$command});
# if ($real_style_command);
}
@@ -905,7 +956,8 @@
my $state = shift;
my $result = $things_map{$command};
- return info_default_close_command($state, undef, $command, undef, undef,
$line_nr, $result, $text, '');
+ #return info_default_close_command($state, undef, $command, undef, undef,
$line_nr, $result, $text, '');
+ return info_default_store_text($state, $result, $command);
# return $result . $text;
}
@@ -925,6 +977,29 @@
my $begin = '';
my $end = '';
+ if ($info_default_leaf_command{$command})
+ {
+ my $style_index = 0;
+ my @formatted_args = ();
+ foreach my $arg (@$args)
+ {
+ my $arg_style = $style->{'orig_args'}->[$style_index];
+ if ($arg_style eq 'normal')
+ {
+ push @formatted_args, main::substitute_line($arg);
+ }
+ elsif ($arg_style eq 'code')
+ {
+ push @formatted_args, main::substitute_line($arg, {'code_style' =>
1});
+ }
+ else
+ {
+ print STDERR "Unknown arg style($style_index) $arg_style for
$command\n";
+ }
+ $style_index++;
+ }
+ $args = address@hidden;
+ }
if (defined($style->{'function'}))
{
$text = &{$style->{'function'}}($command, $args, $command_stack, $state,
$line_nr);
@@ -937,12 +1012,12 @@
{
$end = $style->{'end'};
}
- unless($special_style{$command} or ($command eq 'cmd_line') or
$info_default_accent_commands{$command})
+ unless($special_style{$command} or ($command eq 'cmd_line') or
$info_default_accent_commands{$command} or ($command eq 'hyphenation') or
$info_default_leaf_command{$command})
{
return info_default_close_command($state, $command_stack, $command,
$no_close, $no_open, $line_nr, $begin, $text, $end);
}
#Â this is for *ref, images and footnotes
- if ($special_style{$command} and $command ne 'anchor')
+ if (($special_style{$command} or $info_default_leaf_command{$command}) and
$command ne 'anchor')
{
return info_default_store_text ($state, $begin.$text.$end, $command);
}
@@ -962,10 +1037,12 @@
$basename =~ s/^.*\///;
my $result = "This is $setfilename, produced by makeinfo version 4.13 from
$basename. ";
my $dummy;
- ($dummy, $dummy, $dummy, $dummy, $result) =
info_default_process_text($result, 0, '', undef);
+ ($dummy, $dummy, $dummy, $dummy, $result) =
info_default_process_text($result, 0, '', undef, undef, 1);
$result .= "\n\n";
$result .= "$Texi2HTML::THISDOC{'copying_comment'}";
- $info_default_offset_in_file = length($result);
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+ $info_state->{'offset_in_file'} = length($result);
print $fh $result;
}
@@ -990,6 +1067,10 @@
my $state = $Texi2HTML::THISDOC{'state'};
my $info_state = info_default_get_state ($state);
$info_state->{'paragraph_in_element_nr'}++;
+ if (defined($command_stack_at_begin->[0]) and $command_stack_at_begin->[0]
eq 'footnote' and $info_state->{'paragraph_in_element_nr'} <= 1)
+ {
+
+ }
return info_default_close_command(undef, undef, 'paragraph', undef, undef,
undef, '', undef, "\n", {'paragraph_in_element_nr' =>
($info_state->{'paragraph_in_element_nr'} -1), 'top_stack' => $top_stack});
}
@@ -1029,9 +1110,10 @@
4 => '.'
);
-sub info_default_node_line($)
+sub info_default_node_line($$)
{
my $element = shift;
+ my $info_state = shift;
my $result = "\x{1F}\nFile: $element->{'file'}, Node: $element->{'text'}";
if (defined($element->{'NodeNext'}))
{
@@ -1046,6 +1128,8 @@
$result .= ','.&$I(' Up: %{node_up}', {'node_up' =>
$element->{'NodeUp'}->{'text'}});
}
$result .= "\n\n";
+ $info_state->{'line_count'} = 3;
+ $info_state->{'offset_in_file'} += length($result);
return $result;
}
@@ -1080,20 +1164,11 @@
print STDERR "HHHHHHHHHHHHHHH node $info_state->{'nr'}\n";
my $before = '';
-# if ($info_state->{'waiting_for_line'})
-# {
-# $before = "\n";
-# $info_default_offset_in_file += length($before);
-# $info_default_line_count++;
-# $info_state->{'waiting_for_line'} = 0;
-# }
- $element->{'info_offset'} = $info_default_offset_in_file;
+ $element->{'info_offset'} = $info_state->{'offset_in_file'};
push @{$info_state->{'pending_tags'}}, $element;
- my $result = info_default_node_line($element);
+ my $result = info_default_node_line($element, $info_state);
- $info_default_line_count = 3;
- $info_default_offset_in_file += length($result);
$info_default_footnote_index = 0;
#$info_default_current_node = $Texi2HTML::THIS_ELEMENT;
$info_default_current_node = $element;
@@ -1125,18 +1200,18 @@
if (length($text))
{
$heading .= "\n";
- $info_default_line_count++;
+ $info_state->{'line_count'}++;
}
if ($info_state->{'waiting_for_line'})
{
$heading = "\n" .$heading;
$info_state->{'waiting_for_line'} = 0;
- $info_default_line_count++;
+ $info_state->{'line_count'}++;
}
#Â FIXME use state for headings appearing somewhere strange. + maybe
#Â waiting_for_line should also be used for headings
- $info_default_offset_in_file += length($heading);
- $info_default_line_count += 2;
+ $info_state->{'offset_in_file'} += length($heading);
+ $info_state->{'line_count'} += 2;
return $heading;
}
@@ -1211,7 +1286,9 @@
print STDERR "Storing anchor $anchor_reference->{'text'}\n";
my $anchor_stored = {'command' => 'anchor', 'anchor_reference' =>
$anchor_reference};
push @{$info_state->{'current'}->{'content'}}, $anchor_stored;
- return info_default_output($info_state);
+ return info_default_output($info_state)
+ if (!defined($info_state->{'current'}->{'command'}));
+ return '';
}
sub info_default_acronym_like($$$$$$)
@@ -1264,6 +1341,17 @@
}
}
+sub info_default_footnote_texi($$$)
+{
+ my $text = shift;
+ my $state = shift;
+ my $style_stack = shift;
+
+ $info_default_footnote_index++;
+ return "($info_default_footnote_index) $text";
+}
+
+
my @info_default_pending_footnotes;
sub info_default_print_section
{
@@ -1277,8 +1365,8 @@
if ($info_state->{'waiting_for_line'})
{
my $end = "\n";
- $info_default_offset_in_file += length($end);
- $info_default_line_count++;
+ $info_state->{'offset_in_file'} += length($end);
+ $info_state->{'line_count'}++;
$info_state->{'waiting_for_line'} = 0;
print $fh "$end";
}
@@ -1292,34 +1380,34 @@
my $footnote_element = { 'NodeUp' => $node_ref,
'text' => $node_ref->{'text'} . "-Footnotes",
'file' => $node_ref->{'file'},
- 'info_offset' => $info_default_offset_in_file,
+ 'info_offset' => $info_state->{'offset_in_file'},
'node' => 1
};
push @{$info_state->{'pending_tags'}}, $footnote_element;
- $footnote_text = info_default_node_line($footnote_element);
- $info_default_offset_in_file += length($footnote_text);
+ $footnote_text = info_default_node_line($footnote_element,
$info_state);
}
else
{
$footnote_text = " ---------- Footnotes ----------\n\n";
- $info_default_offset_in_file += length($footnote_text);
+ $info_state->{'offset_in_file'} += length($footnote_text);
}
while (@info_default_pending_footnotes)
{
#push @info_default_pending_footnotes, [$lines, $footnote_text,
${info_default_footnote_index}, $node_name, $footnote_info_state];
my $footnote = shift @info_default_pending_footnotes;
- my $foot_nr = $footnote->[2];
- my $node_name = $footnote->[3];
- my $lines = $footnote->[0];
- push @{$info_state->{'pending_tags'}}, {'anchor' => 1, 'text' =>
"${node_name}-Footnote-${foot_nr}", 'info_offset' =>
$info_default_offset_in_file };
- my $footnote_info_state = $footnote->[4];
+ my $foot_nr = $footnote->{'footnote_index'};
+ my $node_name = $footnote->{'node_name'};
+ my $lines = $footnote->{'lines'};
+ push @{$info_state->{'pending_tags'}}, {'anchor' => 1, 'text' =>
"${node_name}-Footnote-${foot_nr}", 'info_offset' =>
$info_state->{'offset_in_file'} };
+ my $footnote_info_state = $footnote->{'footnote_info_state'};
my $footnote_result = shift @{$lines};
my $initial_length = length($footnote_result);
$footnote_result =~ s/^\s*//;
- $footnote_result = " ($foot_nr) " . $footnote_result;
+ #$footnote_result = " ($foot_nr) " . $footnote_result;
+ $footnote_result = " " . $footnote_result;
foreach my
$footnote_pending_tags(@{$footnote_info_state->{'pending_tags'}})
{
- $footnote_pending_tags->{'info_offset'} +=
$info_default_offset_in_file + length($footnote_result) - $initial_length;
+ $footnote_pending_tags->{'info_offset'} +=
$info_state->{'offset_in_file'} + length($footnote_result) - $initial_length;
push @{$info_state->{'pending_tags'}}, $footnote_pending_tags;
}
my $line;
@@ -1333,9 +1421,11 @@
{#Â certainly out of paragraph commands
$footnote_result =~ s/\s*$//;
$footnote_result .= "\n";
+ $line_passed = 1;
}
$footnote_result .= "\n";
- $info_default_offset_in_file += length($footnote_result);
+ $info_state->{'offset_in_file'} += length($footnote_result);
+ $info_state->{'line_count'} += $line_passed +1;
$footnote_text .= $footnote_result;
}
print $fh "$footnote_text";
@@ -1451,10 +1541,7 @@
return ($line, 0, undef, undef) unless ($pass == 2);
return ($line, 0, undef, undef) unless ($command eq 'exdent' or $command
eq 'noindent' or $command eq 'indent');
my ($result_line, $text, $args) = &$preserve_misc_command ($line,
$command);
- #Â FIXME the information may need to be kept in the info_state
- #Â if processing outside of an environment
info_default_store_text($state,'',$command);
-#print STDERR "ZZZZZZZZZZZZZZz `$result_line' `$text'\n";
return ($result_line, 1, '', undef);
}
@@ -1638,16 +1725,16 @@
if ($info_state->{'waiting_for_line'})
{
$before = "\n";
- $info_default_offset_in_file += length($before);
- $info_default_line_count++;
+ $info_state->{'offset_in_file'} += length($before);
+ $info_state->{'line_count'}++;
$info_state->{'waiting_for_line'} = 0;
}
return $before if (!defined($text));
my $result = "\x{00}\x{08}[index\x{00}\x{08}]\n* Menu:\n\n" .$text."\n";
- $info_default_offset_in_file += length($result);
+ $info_state->{'offset_in_file'} += length($result);
#Â FIXME set waiting_for_line?
my ($line_passed, $end_of_line, $last_line) =
info_default_count_lines($result);
- $info_default_line_count += $line_passed;
+ $info_state->{'line_count'} += $line_passed;
return $before.$result;
}
@@ -1676,7 +1763,9 @@
print STDERR "Storing index entry $formatted_entry\n";
my $index_entry_stored = {'command' => 'index_label',
'index_entry_reference' => $index_entry_ref, 'index_command' => $index_command,
'index_name' => $index_name};
push @{$info_state->{'current'}->{'content'}}, $index_entry_stored;
- return info_default_output($info_state);
+ return info_default_output($info_state)
+ if (!defined($info_state->{'current'}->{'command'}));
+ return '';
}
my $info_default_index_length_to_node = 41;
@@ -1702,6 +1791,9 @@
$result .= $element_text . '.';
my $info_index_entry_ref = $info_default_index_entries{$index_entry_ref};
my $line_nr = $info_index_entry_ref->{'line_nr'};
+ #Â this happens for index entries appearing after @printindex. In that case
+ #Â it is consideered that they are at the beginning of the node.
+ $line_nr = 4 if (!defined($line_nr));
my $max_len =
$info_default_index_line_string_length{$info_index_entry_ref->{'index_name'}};
my $line_nr_spaces = sprintf("%${max_len}d", $line_nr);
my $line_part = "(line ${line_nr_spaces})";
@@ -1746,7 +1838,6 @@
my $footnote_state = $Texi2HTML::THISDOC{'state'};
my $footnote_info_state = info_default_get_state ($footnote_state);
- $info_default_footnote_index++;
my $footnote_text = "($info_default_footnote_index)";
my $node_name;
$node_name = '';
@@ -1755,7 +1846,11 @@
{
$footnote_text .= ' (' . info_default_normal_reference('pxref',
["${node_name}-Footnote-${info_default_footnote_index}"]) . ')';
}
- push @info_default_pending_footnotes, [$lines, $footnote_text,
${info_default_footnote_index}, $node_name, $footnote_info_state];
+ push @info_default_pending_footnotes, {'lines' => $lines,
+ 'footnote_text' => $footnote_text,
+ 'footnote_index' => ${info_default_footnote_index},
+ 'node_name' => $node_name,
+ 'footnote_info_state' => $footnote_info_state};
return ($lines, $footnote_text);
}
@@ -1767,5 +1862,80 @@
@$lines = ();
}
+sub info_default_format_list_item_texi($$$$)
+{
+ my $format = shift;
+ my $line = shift;
+ my $prepended = shift;
+ my $command = shift;
+
+ my $result_line;
+ $prepended = "address@hidden" if (defined($command) and $command ne '');
+
+ if (defined($prepended) and $prepended ne '')
+ {
+ $prepended =~ s/^\s*//;
+ $prepended =~ s/\s*$//;
+ $line =~ s/^\s*//;
+ $result_line = $prepended . ' ' . $line;
+ }
+ return ($result_line, 0);
+}
+
+sub info_default_list_item($$$$$$$$$$$)
+{
+ my $text = shift;
+ my $format = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+# my $prepend = '';
+# if (defined($formatted_command) and $formatted_command ne '')
+# {
+# $prepend = $formatted_command;
+# }
+# return $prepend . $text;
+ return $text;
+}
+
+sub info_default_format($$$)
+{
+ my $tag = shift;
+ my $element = shift;
+ my $text = shift;
+ #return '' if (!defined($element) or ($text !~ /\S/));
+ #return $text if ($element eq '');
+ $element = undef if ($element eq '');
+ my $element_end = $element;
+ if ($element =~ /^(\w+)(\s+)(.+)/)
+ {
+ $element = $1;
+ $element_end = $2;
+ }
+ return info_default_close_command(undef, undef, $tag, undef, undef, undef,
$element, undef, $element_end);
+}
+
+sub info_default_tab_item_texi($$$$$$)
+{
+ my $command = shift;
+ my $commands_stack = shift;
+ my $stack = shift;
+ my $state = shift;
+ my $line = shift;
+ my $line_nr = shift;
+
+ my $format;
+ $format = $commands_stack->[-1] if (defined($commands_stack) and
@$commands_stack and $commands_stack->[-1]);
+print STDERR "tab_item_texi $command $commands_stack, $stack, $state, $line,
$line_nr\n";
+ info_default_store_text ($state, '', $command, {'format' => $format});
+ return undef;
+}
1;
Index: test/coverage/res/formatting/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/formatting/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/coverage/res/formatting/formatting.2 28 Nov 2008 09:27:52 -0000
1.3
+++ test/coverage/res/formatting/formatting.2 17 Jan 2009 14:30:43 -0000
1.4
@@ -43,6 +43,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -75,6 +80,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -99,6 +109,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -139,6 +154,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -171,6 +191,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -195,6 +220,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/coverage/res/formatting/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/formatting/formatting.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- test/coverage/res/formatting/formatting.html 9 Jan 2009 21:20:10
-0000 1.18
+++ test/coverage/res/formatting/formatting.html 17 Jan 2009 14:30:43
-0000 1.19
@@ -959,7 +959,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -971,16 +971,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1330,12 +1330,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -1640,7 +1640,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -1652,17 +1652,17 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+</li><li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -2020,12 +2020,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -2335,7 +2335,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -2347,16 +2347,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2713,12 +2713,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
Index: test/encodings/res/formatting_converted_to_utf8/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_converted_to_utf8/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res/formatting_converted_to_utf8/formatting.2 28 Nov
2008 09:27:53 -0000 1.3
+++ test/encodings/res/formatting_converted_to_utf8/formatting.2 17 Jan
2009 14:30:43 -0000 1.4
@@ -43,6 +43,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -75,6 +80,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -99,6 +109,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -139,6 +154,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -171,6 +191,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -195,6 +220,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/encodings/res/formatting_converted_to_utf8/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_converted_to_utf8/formatting.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- test/encodings/res/formatting_converted_to_utf8/formatting.html 9 Jan
2009 21:20:19 -0000 1.18
+++ test/encodings/res/formatting_converted_to_utf8/formatting.html 17 Jan
2009 14:30:43 -0000 1.19
@@ -959,7 +959,7 @@
</li></ul>
<ul class="toc">
-<li> + iâtem +
+<li>+ iâtem +
</li></ul>
<ul>
@@ -971,16 +971,16 @@
</li></ul>
<ul class="toc">
-<li><em> eâmph item</em>
+<li><em></em> eâmph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> eâmph item
+<li><em>after emph</em> eâmph item
</li></ul>
-<ul>
-<li>aân itemize line iâtem 1
-</li><li>aân itemize line iâtem 2
+<ul class="toc">
+<li>⢠aân itemize line iâtem 1
+</li><li>⢠aân itemize line iâtem 2
</li></ul>
<ol>
@@ -1330,12 +1330,12 @@
<br>
<ul class="toc">
-<li><em>after emph eâmph item</em>
+<li>@emph after emph eâmph item
</li></ul>
-<ul>
-<li>aân itemize line iâtem 1
-</li><li>aân itemize line iâtem 2
+<ul class="toc">
+<li>⢠aân itemize line iâtem 1
+</li><li>⢠aân itemize line iâtem 2
</li></ul>
<dl>
@@ -1640,7 +1640,7 @@
</li></ul>
<ul class="toc">
-<li> + iâtem +
+<li>+ iâtem +
</li></ul>
<ul>
@@ -1652,17 +1652,17 @@
</li></ul>
<ul class="toc">
-<li><em> eâmph item</em>
+<li><em></em> eâmph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> eâmph item
+<li><em>after emph</em> eâmph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>aân itemize line iâtem 1
-</li><li>aân itemize line iâtem 2
+</li><li>⢠aân itemize line iâtem 1
+</li><li>⢠aân itemize line iâtem 2
</li></ul>
<ol>
@@ -2020,12 +2020,12 @@
<br>
<ul class="toc">
-<li><em>after emph eâmph item</em>
+<li>@emph after emph eâmph item
</li></ul>
-<ul>
-<li>aân itemize line iâtem 1
-</li><li>aân itemize line iâtem 2
+<ul class="toc">
+<li>⢠aân itemize line iâtem 1
+</li><li>⢠aân itemize line iâtem 2
</li></ul>
<dl>
@@ -2335,7 +2335,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -2347,16 +2347,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">⢠a--n itemize line i--tem 1
+</pre></li><li><pre class="example">⢠a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2713,12 +2713,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">⢠a--n itemize line i--tem 1
+</pre></li><li><pre class="example">⢠a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
Index: test/encodings/res/formatting_fr/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res/formatting_fr/formatting.2 28 Nov 2008 09:27:53
-0000 1.3
+++ test/encodings/res/formatting_fr/formatting.2 17 Jan 2009 14:30:44
-0000 1.4
@@ -43,6 +43,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -75,6 +80,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -99,6 +109,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -139,6 +154,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -171,6 +191,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -195,6 +220,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/encodings/res/formatting_fr/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr/formatting.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- test/encodings/res/formatting_fr/formatting.html 9 Jan 2009 21:20:21
-0000 1.18
+++ test/encodings/res/formatting_fr/formatting.html 17 Jan 2009 14:30:44
-0000 1.19
@@ -959,7 +959,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -971,16 +971,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1330,12 +1330,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -1640,7 +1640,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -1652,17 +1652,17 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+</li><li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -2020,12 +2020,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -2335,7 +2335,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -2347,16 +2347,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2713,12 +2713,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
Index: test/encodings/res/formatting_fr_icons/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr_icons/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/encodings/res/formatting_fr_icons/formatting.2 28 Nov 2008 09:27:53
-0000 1.3
+++ test/encodings/res/formatting_fr_icons/formatting.2 17 Jan 2009 14:30:44
-0000 1.4
@@ -43,6 +43,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -75,6 +80,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -99,6 +109,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -139,6 +154,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -171,6 +191,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -195,6 +220,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/encodings/res/formatting_fr_icons/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res/formatting_fr_icons/formatting.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- test/encodings/res/formatting_fr_icons/formatting.html 9 Jan 2009
21:20:22 -0000 1.18
+++ test/encodings/res/formatting_fr_icons/formatting.html 17 Jan 2009
14:30:44 -0000 1.19
@@ -959,7 +959,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -971,16 +971,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1330,12 +1330,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -1640,7 +1640,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -1652,17 +1652,17 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+</li><li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -2020,12 +2020,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -2335,7 +2335,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -2347,16 +2347,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2713,12 +2713,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
Index: test/formatting/res/formatting_docbook/formatting.xml
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_docbook/formatting.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/formatting/res/formatting_docbook/formatting.xml 8 Jan 2009
00:21:36 -0000 1.9
+++ test/formatting/res/formatting_docbook/formatting.xml 17 Jan 2009
14:30:44 -0000 1.10
@@ -284,7 +284,7 @@
<listitem><para> e–mph item
</para></listitem>
</itemizedlist>
-<itemizedlist mark="bullet a--n itemize line"><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm><listitem><para> i–tem 1
+<itemizedlist mark="@bullet{} a--n itemize line"><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm><listitem><para> i–tem 1
</para></listitem>
<listitem><para> i–tem 2
</para></listitem>
@@ -806,7 +806,7 @@
<listitem><para> e–mph item
</para></listitem>
</itemizedlist>
-<itemizedlist mark="bullet a--n itemize line"><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm><listitem><para> i–tem 1
+<itemizedlist mark="@bullet{} a--n itemize line"><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm><listitem><para> i–tem 1
</para></listitem>
<listitem><para> i–tem 2
</para></listitem>
@@ -1324,7 +1324,7 @@
<listitem><para> e–mph item
</para></listitem>
</itemizedlist>
-<itemizedlist mark="bullet a--n itemize line"><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm><listitem><para> i–tem 1
+<itemizedlist mark="@bullet{} a--n itemize line"><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm><listitem><para> i–tem 1
</para></listitem>
<listitem><para> i–tem 2
</para></listitem>
@@ -1835,14 +1835,14 @@
<itemizedlist mark="minus"><listitem> minu--s
</listitem>
</itemizedlist>
-<itemizedlist mark="emph"><listitem><emphasis> e--mph item
-</emphasis></listitem>
+<itemizedlist mark="emph"><listitem> e--mph item
+</listitem>
</itemizedlist>
<itemizedlist mark="@emph{after emph}"><!-- comment in itemize -->
<listitem> e--mph item
</listitem>
</itemizedlist>
-<itemizedlist mark="bullet a--n itemize line"><indexterm
role="cp"><primary>index entry within itemize</primary></indexterm><listitem>
i--tem 1
+<itemizedlist mark="@bullet{} a--n itemize line"><indexterm
role="cp"><primary>index entry within itemize</primary></indexterm><listitem>
i--tem 1
</listitem>
<listitem> i--tem 2
</listitem>
Index: test/formatting/res/formatting_weird_quotes/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_weird_quotes/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res/formatting_weird_quotes/formatting.2 28 Nov 2008
09:27:54 -0000 1.3
+++ test/formatting/res/formatting_weird_quotes/formatting.2 17 Jan 2009
14:30:44 -0000 1.4
@@ -43,6 +43,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -75,6 +80,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -99,6 +109,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -139,6 +154,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -171,6 +191,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -195,6 +220,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/formatting/res/formatting_weird_quotes/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_weird_quotes/formatting.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- test/formatting/res/formatting_weird_quotes/formatting.html 9 Jan 2009
21:20:22 -0000 1.19
+++ test/formatting/res/formatting_weird_quotes/formatting.html 17 Jan 2009
14:30:44 -0000 1.20
@@ -959,7 +959,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -971,16 +971,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1330,12 +1330,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -1640,7 +1640,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -1652,17 +1652,17 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+</li><li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -2020,12 +2020,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -2335,7 +2335,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -2347,16 +2347,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2713,12 +2713,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
Index: test/formatting/res/formatting_xml/formatting.xml
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_xml/formatting.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/formatting/res/formatting_xml/formatting.xml 1 Jan 2009 22:35:19
-0000 1.7
+++ test/formatting/res/formatting_xml/formatting.xml 17 Jan 2009 14:30:45
-0000 1.8
@@ -292,7 +292,7 @@
</para></item>
</itemize>
-<itemize><itemfunction>•</itemfunction><item><para> e–mph item
+<itemize><itemfunction><emph></emph></itemfunction><item><para> e–mph
item
</para></item>
</itemize>
@@ -826,7 +826,7 @@
</para></item>
</itemize>
-<itemize><itemfunction>•</itemfunction><item><para> e–mph item
+<itemize><itemfunction><emph></emph></itemfunction><item><para> e–mph
item
</para></item>
</itemize>
@@ -1355,7 +1355,7 @@
</para></item>
</itemize>
-<itemize><itemfunction>•</itemfunction><item><para> e–mph item
+<itemize><itemfunction><emph></emph></itemfunction><item><para> e–mph
item
</para></item>
</itemize>
@@ -1885,7 +1885,7 @@
</para></item>
</itemize>
-<itemize><itemfunction>•</itemfunction><item><para> e–mph item
+<itemize><itemfunction><emph></emph></itemfunction><item><para> e–mph
item
</para></item>
</itemize>
@@ -2413,7 +2413,7 @@
</para></item>
</itemize>
-<itemize><itemfunction>•</itemfunction><item><para> e–mph item
+<itemize><itemfunction><emph></emph></itemfunction><item><para> e–mph
item
</para></item>
</itemize>
@@ -2941,8 +2941,8 @@
</item>
</itemize>
-<itemize><itemfunction>•</itemfunction><item><emph> e--mph item
-</emph></item>
+<itemize><itemfunction><emph></emph></itemfunction><item> e--mph item
+</item>
</itemize>
<itemize><itemfunction><emph>after emph</emph></itemfunction><item><!--
comment in itemize -->
Index: test/formatting/res/inter_item_commands/inter_item_commands.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/inter_item_commands/inter_item_commands.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res/inter_item_commands/inter_item_commands.html 3 Nov
2008 12:33:18 -0000 1.4
+++ test/formatting/res/inter_item_commands/inter_item_commands.html 17 Jan
2009 14:30:45 -0000 1.5
@@ -47,8 +47,8 @@
<ul class="toc">
-<li><a name="index-also-a-cindex-in-itemize"></a>
-</li><li><code> e--mph item</code>
+<li><code></code><a name="index-also-a-cindex-in-itemize"></a>
+</li><li><code></code> e–mph item
</li></ul>
<ul>
Index: test/formatting/res/inter_item_commands_xml/inter_item_commands.xml
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/inter_item_commands_xml/inter_item_commands.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/inter_item_commands_xml/inter_item_commands.xml 3 Sep
2008 10:39:03 -0000 1.1
+++ test/formatting/res/inter_item_commands_xml/inter_item_commands.xml 17 Jan
2009 14:30:45 -0000 1.2
@@ -11,7 +11,7 @@
<title>Test inter item ignored commands</title>
-<itemize><itemfunction>•</itemfunction><item><!-- comment in itemize -->
+<itemize><itemfunction><code></code></itemfunction><item><!-- comment in
itemize -->
<para><indexterm index="cp">also a cindex in itemize</indexterm></para></item>
<item><para> e–mph item
</para></item>
Index: test/formatting/res/symbol_after_block/symbol_after_block.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/symbol_after_block/symbol_after_block.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/formatting/res/symbol_after_block/symbol_after_block.html 3 Nov
2008 12:33:18 -0000 1.5
+++ test/formatting/res/symbol_after_block/symbol_after_block.html 17 Jan
2009 14:30:45 -0000 1.6
@@ -79,11 +79,11 @@
<p>Itemize:
</p>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<p>”</p>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<p>@</p>
<p>Multitable:
Index: test/indices/res/makeinfo_nodes_before_top/index.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res/makeinfo_nodes_before_top/index.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/indices/res/makeinfo_nodes_before_top/index.html 9 Jan 2009
16:55:21 -0000 1.6
+++ test/indices/res/makeinfo_nodes_before_top/index.html 17 Jan 2009
14:30:45 -0000 1.7
@@ -49,7 +49,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">node: </td>
<td valign="middle" align="left">Top</td>
-<td valign="middle" align="left"><a href="index_nodes_5.html#first"
accesskey="n" rel="next">first</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
<td valign="middle" align="left"><a href="index_nodes_0.html#first-before-top"
accesskey="p" rel="previous">first before top</a></td>
<td valign="middle" align="left">,</td>
@@ -103,7 +103,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">node: </td>
<td valign="middle" align="left">Top</td>
-<td valign="middle" align="left"><a href="index_nodes_5.html#first"
accesskey="n" rel="next">first</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
<td valign="middle" align="left"><a href="index_nodes_0.html#first-before-top"
accesskey="p" rel="previous">first before top</a></td>
<td valign="middle" align="left">,</td>
Index: test/indices/res/makeinfo_nodes_before_top_and_sections/index.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res/makeinfo_nodes_before_top_and_sections/index.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/indices/res/makeinfo_nodes_before_top_and_sections/index.html 9 Jan
2009 16:55:21 -0000 1.7
+++ test/indices/res/makeinfo_nodes_before_top_and_sections/index.html 17 Jan
2009 14:30:45 -0000 1.8
@@ -50,7 +50,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">node: </td>
<td valign="middle" align="left">Top</td>
-<td valign="middle" align="left"><a
href="more_before_top_section_1.html#first" accesskey="n"
rel="next">first</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
<td valign="middle" align="left"><a
href="more_before_top_section_0.html#first-before-top" accesskey="p"
rel="previous">first before top</a></td>
<td valign="middle" align="left">,</td>
@@ -116,7 +116,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">node: </td>
<td valign="middle" align="left">Top</td>
-<td valign="middle" align="left"><a
href="more_before_top_section_1.html#first" accesskey="n"
rel="next">first</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
<td valign="middle" align="left"><a
href="more_before_top_section_0.html#first-before-top" accesskey="p"
rel="previous">first before top</a></td>
<td valign="middle" align="left">,</td>
Index: test/layout/res/formatting_chm/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/layout/res/formatting_chm/formatting.2 28 Nov 2008 09:27:55 -0000
1.2
+++ test/layout/res/formatting_chm/formatting.2 17 Jan 2009 14:30:46 -0000
1.3
@@ -43,6 +43,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -75,6 +80,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -99,6 +109,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -139,6 +154,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -171,6 +191,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -195,6 +220,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/layout/res/formatting_chm/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_chm/formatting.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/layout/res/formatting_chm/formatting.html 9 Jan 2009 21:20:29
-0000 1.11
+++ test/layout/res/formatting_chm/formatting.html 17 Jan 2009 14:30:46
-0000 1.12
@@ -945,7 +945,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -957,16 +957,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1316,12 +1316,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -1626,7 +1626,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -1638,17 +1638,17 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+</li><li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -2006,12 +2006,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -2321,7 +2321,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -2333,16 +2333,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2699,12 +2699,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
Index: test/layout/res/formatting_exotic/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/layout/res/formatting_exotic/formatting.2 28 Nov 2008 09:27:55
-0000 1.3
+++ test/layout/res/formatting_exotic/formatting.2 17 Jan 2009 14:30:46
-0000 1.4
@@ -43,6 +43,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -75,6 +80,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -99,6 +109,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -139,6 +154,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -171,6 +191,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -195,6 +220,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/layout/res/formatting_exotic/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_exotic/formatting.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- test/layout/res/formatting_exotic/formatting.html 9 Jan 2009 21:20:35
-0000 1.16
+++ test/layout/res/formatting_exotic/formatting.html 17 Jan 2009 14:30:46
-0000 1.17
@@ -960,7 +960,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -972,16 +972,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1331,12 +1331,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<table width="100%">
@@ -1641,7 +1641,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -1653,17 +1653,17 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+</li><li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -2021,12 +2021,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<table width="100%">
@@ -2336,7 +2336,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -2348,16 +2348,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2714,12 +2714,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><table width="100%">
Index: test/layout/res/formatting_makeinfo/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/layout/res/formatting_makeinfo/formatting.2 28 Nov 2008 09:27:55
-0000 1.3
+++ test/layout/res/formatting_makeinfo/formatting.2 17 Jan 2009 14:30:46
-0000 1.4
@@ -51,6 +51,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -93,6 +98,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -125,6 +135,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -177,6 +192,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -219,6 +239,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -251,6 +276,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/layout/res/formatting_makeinfo/index.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_makeinfo/index.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/layout/res/formatting_makeinfo/index.html 9 Jan 2009 21:20:41
-0000 1.14
+++ test/layout/res/formatting_makeinfo/index.html 17 Jan 2009 14:30:46
-0000 1.15
@@ -961,7 +961,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -973,16 +973,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1323,12 +1323,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -1633,7 +1633,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -1645,17 +1645,17 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+</li><li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -2004,12 +2004,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -2319,7 +2319,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -2331,16 +2331,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2688,12 +2688,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
Index: test/layout/res/formatting_regions/formatting_regions.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_regions/formatting_regions.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/layout/res/formatting_regions/formatting_regions.2 28 Nov 2008
09:27:55 -0000 1.4
+++ test/layout/res/formatting_regions/formatting_regions.2 17 Jan 2009
14:30:46 -0000 1.5
@@ -59,6 +59,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -101,6 +106,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -133,6 +143,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -185,6 +200,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -217,6 +237,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -269,6 +294,11 @@
*** no file argument for @image (l. 46 in @mymacro)
*** no file argument for @image (l. 46 in @mymacro)
*** no file argument for @image (l. 46 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 46 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 46 in @mymacro)
+** bullet requires {} (l. 46 in @mymacro)
*** '}' without opening '{' before: (l. 46 in @mymacro)
*** '}' without opening '{' before: (l. 46 in @mymacro)
*** '{' without macro. Before: (l. 46 in @mymacro)
@@ -301,6 +331,11 @@
*** no file argument for @image (l. 49 in @mymacro)
*** no file argument for @image (l. 49 in @mymacro)
*** no file argument for @image (l. 49 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 49 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 49 in @mymacro)
+** bullet requires {} (l. 49 in @mymacro)
*** '}' without opening '{' before: (l. 49 in @mymacro)
*** '}' without opening '{' before: (l. 49 in @mymacro)
*** '{' without macro. Before: (l. 49 in @mymacro)
@@ -333,6 +368,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
Index: test/layout/res/formatting_regions/formatting_regions.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res/formatting_regions/formatting_regions.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- test/layout/res/formatting_regions/formatting_regions.html 9 Jan 2009
21:20:43 -0000 1.18
+++ test/layout/res/formatting_regions/formatting_regions.html 17 Jan 2009
14:30:46 -0000 1.19
@@ -943,7 +943,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -955,16 +955,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1305,12 +1305,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -1611,7 +1611,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -1623,16 +1623,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -1973,12 +1973,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -2316,7 +2316,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -2328,17 +2328,17 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
+<ul class="toc">
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+</li><li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -2687,12 +2687,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
@@ -3001,7 +3001,7 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> + i--tem +
+<li><pre class="example">+ i--tem +
</pre></li></ul>
<pre class="example">
</pre><ul>
@@ -3013,16 +3013,16 @@
</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre class="example"> e--mph item
+</pre></li></ul>
<pre class="example">
</pre><ul class="toc">
-<li><pre class="example"> <em>after emph</em> e--mph item
+<li><pre class="example"><em>after emph</em> e--mph item
</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example"><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre
class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -3370,12 +3370,12 @@
</pre><ul class="toc">
-<li><pre class="example"><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre class="example">@emph after emph e--mph item
+</pre></li></ul>
<pre class="example">
-</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+</pre><ul class="toc">
+<li><pre class="example">• a--n itemize line i--tem 1
+</pre></li><li><pre class="example">• a--n itemize line i--tem 2
</pre></li></ul>
<pre class="example">
</pre><dl>
@@ -3677,7 +3677,7 @@
</li></ul>
<ul class="toc">
-<li> + i–tem +
+<li>+ i–tem +
</li></ul>
<ul>
@@ -3689,16 +3689,16 @@
</li></ul>
<ul class="toc">
-<li><em> e–mph item</em>
+<li><em></em> e–mph item
</li></ul>
<ul class="toc">
-<li> <em>after emph</em> e–mph item
+<li><em>after emph</em> e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<ol>
@@ -4039,12 +4039,12 @@
<br>
<ul class="toc">
-<li><em>after emph e–mph item</em>
+<li>@emph after emph e–mph item
</li></ul>
-<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<ul class="toc">
+<li>• a–n itemize line i–tem 1
+</li><li>• a–n itemize line i–tem 2
</li></ul>
<dl>
Index: test/misc/res/formatting_html32/formatting.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/misc/res/formatting_html32/formatting.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/misc/res/formatting_html32/formatting.2 28 Nov 2008 09:27:56
-0000 1.3
+++ test/misc/res/formatting_html32/formatting.2 17 Jan 2009 14:30:46
-0000 1.4
@@ -43,6 +43,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -75,6 +80,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -99,6 +109,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -139,6 +154,11 @@
*** no file argument for @image
*** no file argument for @image
*** no file argument for @image
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is)
+** bullet requires {}
+** bullet requires {}
+** bullet requires {}
*** '}' without opening '{' before:
*** '}' without opening '{' before:
*** '{' without macro. Before:
@@ -171,6 +191,11 @@
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
*** no file argument for @image (l. 38 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 38 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 38 in @mymacro)
+** bullet requires {} (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '}' without opening '{' before: (l. 38 in @mymacro)
*** '{' without macro. Before: (l. 38 in @mymacro)
@@ -195,6 +220,11 @@
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
*** no file argument for @image (l. 42 in @mymacro)
+** Unknown command address@hidden' (left as is)
+** Unknown command address@hidden' (left as is) (l. 42 in @mymacro)
+** bullet requires {}
+** bullet requires {} (l. 42 in @mymacro)
+** bullet requires {} (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '}' without opening '{' before: (l. 42 in @mymacro)
*** '{' without macro. Before: (l. 42 in @mymacro)
Index: test/misc/res/formatting_html32/formatting.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/misc/res/formatting_html32/formatting.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- test/misc/res/formatting_html32/formatting.html 9 Jan 2009 21:20:51
-0000 1.18
+++ test/misc/res/formatting_html32/formatting.html 17 Jan 2009 14:30:47
-0000 1.19
@@ -943,7 +943,7 @@
</li></ul>
<ul>
-<li> + i-tem +
+<li>+ i-tem +
</li></ul>
<ul>
@@ -955,16 +955,16 @@
</li></ul>
<ul>
-<li><em> e-mph item</em>
+<li><em></em> e-mph item
</li></ul>
<ul>
-<li> <em>after emph</em> e-mph item
+<li><em>after emph</em> e-mph item
</li></ul>
<ul>
-<li>a-n itemize line i-tem 1
-</li><li>a-n itemize line i-tem 2
+<li>* a-n itemize line i-tem 1
+</li><li>* a-n itemize line i-tem 2
</li></ul>
<ol>
@@ -1314,12 +1314,12 @@
<br>
<ul>
-<li><em>after emph e-mph item</em>
+<li>@emph after emph e-mph item
</li></ul>
<ul>
-<li>a-n itemize line i-tem 1
-</li><li>a-n itemize line i-tem 2
+<li>* a-n itemize line i-tem 1
+</li><li>* a-n itemize line i-tem 2
</li></ul>
<dl>
@@ -1624,7 +1624,7 @@
</li></ul>
<ul>
-<li> + i-tem +
+<li>+ i-tem +
</li></ul>
<ul>
@@ -1636,17 +1636,17 @@
</li></ul>
<ul>
-<li><em> e-mph item</em>
+<li><em></em> e-mph item
</li></ul>
<ul>
-<li> <em>after emph</em> e-mph item
+<li><em>after emph</em> e-mph item
</li></ul>
<ul>
<li><a name="index-index-entry-within-itemize"></a>
-</li><li>a-n itemize line i-tem 1
-</li><li>a-n itemize line i-tem 2
+</li><li>* a-n itemize line i-tem 1
+</li><li>* a-n itemize line i-tem 2
</li></ul>
<ol>
@@ -2004,12 +2004,12 @@
<br>
<ul>
-<li><em>after emph e-mph item</em>
+<li>@emph after emph e-mph item
</li></ul>
<ul>
-<li>a-n itemize line i-tem 1
-</li><li>a-n itemize line i-tem 2
+<li>* a-n itemize line i-tem 1
+</li><li>* a-n itemize line i-tem 2
</li></ul>
<dl>
@@ -2319,7 +2319,7 @@
</pre></li></ul>
<pre>
</pre><ul>
-<li><pre> + i--tem +
+<li><pre>+ i--tem +
</pre></li></ul>
<pre>
</pre><ul>
@@ -2331,16 +2331,16 @@
</pre></li></ul>
<pre>
</pre><ul>
-<li><pre><em> e--mph item
-</em></pre></li></ul>
+<li><em></em><pre> e--mph item
+</pre></li></ul>
<pre>
</pre><ul>
-<li><pre> <em>after emph</em> e--mph item
+<li><pre><em>after emph</em> e--mph item
</pre></li></ul>
<pre>
</pre><ul>
-<li><pre><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre>a--n itemize
line i--tem 1
-</pre></li><li><pre>a--n itemize line i--tem 2
+<li><pre><a
name="index-index-entry-within-itemize-1"></a></pre></li><li><pre>* a--n
itemize line i--tem 1
+</pre></li><li><pre>* a--n itemize line i--tem 2
</pre></li></ul>
<pre>
</pre><ol>
@@ -2701,12 +2701,12 @@
</pre><ul>
-<li><pre><em>after emph e--mph item
-</em></pre></li></ul>
+<li><pre>@emph after emph e--mph item
+</pre></li></ul>
<pre>
</pre><ul>
-<li><pre>a--n itemize line i--tem 1
-</pre></li><li><pre>a--n itemize line i--tem 2
+<li><pre>* a--n itemize line i--tem 1
+</pre></li><li><pre>* a--n itemize line i--tem 2
</pre></li></ul>
<pre>
</pre><dl>
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/misc/res/verbatim_html/verbatim_html.html 3 Nov 2008 23:24:29
-0000 1.10
+++ test/misc/res/verbatim_html/verbatim_html.html 17 Jan 2009 14:30:47
-0000 1.11
@@ -144,11 +144,10 @@
<p>A list with bullet
-Before itemize, in that case @bullet isn’right, one needs @bullet{} (in
info) </p><ul>
-<li> on the same line than item
+Before itemize, in that case @bullet isn’right, one needs @bullet{} (in
info) </p><ul class="toc">
+<li>• on the same line than item
some text
-</li><li>
-more text </li></ul>
+</li><li>• more text </li></ul>
<p>A list with text before first @item:
</p>
Index: test/nested_formats/nested_formats.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/nested_formats/nested_formats.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/nested_formats/nested_formats.texi 18 Aug 2008 18:06:01 -0000
1.1
+++ test/nested_formats/nested_formats.texi 17 Jan 2009 14:30:47 -0000
1.2
@@ -128,7 +128,7 @@
$$\\partial_t \\eta (t) = g(\\eta(t),\\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -178,7 +178,7 @@
@value{format_command_begin}
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -238,7 +238,7 @@
@end @value{format_command}
Call macro in itemize at the beginning of an item
address@hidden @bullet{} a--n itemize line
address@hidden a--n itemize line
@item @mymacro
@item item 1
Call macro in itemize
Index: test/nested_formats/res/nested_cartouche/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_cartouche/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_cartouche/nested_formats.html 26 Nov
2008 19:09:04 -0000 1.8
+++ test/nested_formats/res/nested_cartouche/nested_formats.html 17 Jan
2009 14:30:47 -0000 1.9
@@ -91,8 +91,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -137,8 +137,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -228,8 +228,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -274,8 +274,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -321,7 +321,7 @@
</td></tr></table>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
@@ -366,8 +366,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -412,8 +412,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -502,8 +502,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -548,8 +548,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -639,8 +639,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -685,8 +685,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -778,8 +778,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -824,8 +824,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -914,8 +914,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -960,8 +960,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1051,8 +1051,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1097,8 +1097,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1192,8 +1192,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1238,8 +1238,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1327,8 +1327,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1373,8 +1373,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1463,8 +1463,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1509,8 +1509,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1601,8 +1601,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1647,8 +1647,8 @@
<table class="cartouche" border="1"><tr><td>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1738,8 +1738,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1784,8 +1784,8 @@
<table class="cartouche" border="1"><tr><td>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1876,8 +1876,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1922,8 +1922,8 @@
<table class="cartouche" border="1"><tr><td>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2020,8 +2020,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2066,8 +2066,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2157,8 +2157,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2203,8 +2203,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2297,8 +2297,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2343,8 +2343,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2436,8 +2436,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2482,8 +2482,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2573,8 +2573,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2619,8 +2619,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2711,8 +2711,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2757,8 +2757,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2851,8 +2851,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2897,8 +2897,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2987,8 +2987,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3033,8 +3033,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3123,8 +3123,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3169,8 +3169,8 @@
<table class="cartouche" border="1"><tr><td>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3261,8 +3261,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3307,8 +3307,8 @@
<table class="cartouche" border="1"><tr><td>
<p align="left">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3398,8 +3398,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3444,8 +3444,8 @@
<table class="cartouche" border="1"><tr><td>
<p align="left">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3534,8 +3534,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3580,8 +3580,8 @@
<table class="cartouche" border="1"><tr><td>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3670,8 +3670,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3716,8 +3716,8 @@
<table class="cartouche" border="1"><tr><td>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/nested_deffn/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_deffn/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_deffn/nested_formats.html 26 Nov 2008
19:09:04 -0000 1.8
+++ test/nested_formats/res/nested_deffn/nested_formats.html 17 Jan 2009
14:30:47 -0000 1.9
@@ -105,8 +105,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -152,8 +152,8 @@
<dt><a name="index-arg-8"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -258,8 +258,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -305,8 +305,8 @@
<dt><a name="index-arg-18"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -352,7 +352,7 @@
</dd></dl>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
<dl>
@@ -411,8 +411,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -458,8 +458,8 @@
<dt><a name="index-arg-27"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -562,8 +562,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -609,8 +609,8 @@
<dt><a name="index-arg-36"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -715,8 +715,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -762,8 +762,8 @@
<dt><a name="index-arg-46"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -869,8 +869,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -916,8 +916,8 @@
<dt><a name="index-arg-55"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1020,8 +1020,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1067,8 +1067,8 @@
<dt><a name="index-arg-64"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1173,8 +1173,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1220,8 +1220,8 @@
<dt><a name="index-arg-74"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1329,8 +1329,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1376,8 +1376,8 @@
<dt><a name="index-arg-83"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1479,8 +1479,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1526,8 +1526,8 @@
<dt><a name="index-arg-92"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1631,8 +1631,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1678,8 +1678,8 @@
<dt><a name="index-arg-102"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1784,8 +1784,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1831,8 +1831,8 @@
<dt><a name="index-arg-111"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1936,8 +1936,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1983,8 +1983,8 @@
<dt><a name="index-arg-120"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2090,8 +2090,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2137,8 +2137,8 @@
<dt><a name="index-arg-130"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2249,8 +2249,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2296,8 +2296,8 @@
<dt><a name="index-arg-139"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2402,8 +2402,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2449,8 +2449,8 @@
<dt><a name="index-arg-149"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2557,8 +2557,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2604,8 +2604,8 @@
<dt><a name="index-arg-158"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2711,8 +2711,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2758,8 +2758,8 @@
<dt><a name="index-arg-167"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2863,8 +2863,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2910,8 +2910,8 @@
<dt><a name="index-arg-176"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3017,8 +3017,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3064,8 +3064,8 @@
<dt><a name="index-arg-186"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3172,8 +3172,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3219,8 +3219,8 @@
<dt><a name="index-arg-195"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3323,8 +3323,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3370,8 +3370,8 @@
<dt><a name="index-arg-204"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3475,8 +3475,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3522,8 +3522,8 @@
<dt><a name="index-arg-214"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3628,8 +3628,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3675,8 +3675,8 @@
<dt><a name="index-arg-223"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p align="left">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3781,8 +3781,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3828,8 +3828,8 @@
<dt><a name="index-arg-233"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p align="left">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3932,8 +3932,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3979,8 +3979,8 @@
<dt><a name="index-arg-242"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -4084,8 +4084,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -4131,8 +4131,8 @@
<dt><a name="index-arg-252"></a><u>fun:</u> <b>arg</b><i> arg1</i></dt>
<dd><p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/nested_enumerate/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_enumerate/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_enumerate/nested_formats.html 26 Nov
2008 19:09:04 -0000 1.8
+++ test/nested_formats/res/nested_enumerate/nested_formats.html 17 Jan
2009 14:30:47 -0000 1.9
@@ -91,8 +91,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -137,8 +137,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -228,8 +228,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -274,8 +274,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -321,7 +321,7 @@
</li></ol>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
@@ -366,8 +366,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -412,8 +412,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -502,8 +502,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -548,8 +548,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -639,8 +639,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -685,8 +685,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -778,8 +778,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -824,8 +824,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -914,8 +914,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -960,8 +960,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1051,8 +1051,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1097,8 +1097,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1192,8 +1192,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1238,8 +1238,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1327,8 +1327,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1373,8 +1373,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1463,8 +1463,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1509,8 +1509,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1601,8 +1601,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1647,8 +1647,8 @@
<ol>
<li><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1738,8 +1738,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1784,8 +1784,8 @@
<ol>
<li><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1876,8 +1876,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1922,8 +1922,8 @@
<ol>
<li><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2020,8 +2020,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2066,8 +2066,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2157,8 +2157,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2203,8 +2203,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2297,8 +2297,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2343,8 +2343,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2436,8 +2436,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2482,8 +2482,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2573,8 +2573,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2619,8 +2619,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2711,8 +2711,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2757,8 +2757,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2851,8 +2851,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2897,8 +2897,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2987,8 +2987,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3033,8 +3033,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3123,8 +3123,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3169,8 +3169,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3261,8 +3261,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3307,8 +3307,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3398,8 +3398,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3444,8 +3444,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3534,8 +3534,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3580,8 +3580,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3670,8 +3670,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3716,8 +3716,8 @@
<ol>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/nested_example/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_example/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_example/nested_formats.html 26 Nov 2008
19:09:04 -0000 1.8
+++ test/nested_formats/res/nested_example/nested_formats.html 17 Jan 2009
14:30:47 -0000 1.9
@@ -86,8 +86,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -131,8 +131,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -216,8 +216,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -261,8 +261,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -308,7 +308,7 @@
</pre></td></tr></table>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
@@ -348,8 +348,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -393,8 +393,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -478,8 +478,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -523,8 +523,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -608,8 +608,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -653,8 +653,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -741,8 +741,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -786,8 +786,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -871,8 +871,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -916,8 +916,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1001,8 +1001,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1046,8 +1046,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1136,8 +1136,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1181,8 +1181,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1265,8 +1265,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1310,8 +1310,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1394,8 +1394,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1439,8 +1439,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1526,8 +1526,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1571,8 +1571,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1657,8 +1657,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1702,8 +1702,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1788,8 +1788,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1833,8 +1833,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1926,8 +1926,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1971,8 +1971,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2056,8 +2056,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2101,8 +2101,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2190,8 +2190,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2235,8 +2235,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2323,8 +2323,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2368,8 +2368,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2454,8 +2454,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2499,8 +2499,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2585,8 +2585,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2630,8 +2630,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2719,8 +2719,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2764,8 +2764,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2849,8 +2849,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2894,8 +2894,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2978,8 +2978,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -3023,8 +3023,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -3110,8 +3110,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3155,8 +3155,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -3240,8 +3240,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -3285,8 +3285,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -3370,8 +3370,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3415,8 +3415,8 @@
</p>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -3499,8 +3499,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -3544,8 +3544,8 @@
</pre>
<table><tr><td> </td><td><pre class="example">in macro, a format_command
containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
Index: test/nested_formats/res/nested_flushright/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_flushright/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_flushright/nested_formats.html 26 Nov
2008 19:09:04 -0000 1.8
+++ test/nested_formats/res/nested_flushright/nested_formats.html 17 Jan
2009 14:30:47 -0000 1.9
@@ -81,8 +81,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -126,8 +126,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -205,8 +205,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -250,8 +250,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -295,7 +295,7 @@
</p>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
@@ -330,8 +330,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -375,8 +375,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -454,8 +454,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -499,8 +499,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -578,8 +578,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -623,8 +623,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -704,8 +704,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -749,8 +749,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -828,8 +828,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -873,8 +873,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -952,8 +952,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -997,8 +997,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1080,8 +1080,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1125,8 +1125,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1204,8 +1204,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1249,8 +1249,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1328,8 +1328,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1373,8 +1373,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1453,8 +1453,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1498,8 +1498,8 @@
</pre>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1578,8 +1578,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1623,8 +1623,8 @@
</pre>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1703,8 +1703,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1748,8 +1748,8 @@
</pre>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1834,8 +1834,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1879,8 +1879,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1958,8 +1958,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2003,8 +2003,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2085,8 +2085,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2130,8 +2130,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2212,8 +2212,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2257,8 +2257,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2337,8 +2337,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2382,8 +2382,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2462,8 +2462,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2507,8 +2507,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2589,8 +2589,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2634,8 +2634,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2713,8 +2713,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2758,8 +2758,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2836,8 +2836,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2881,8 +2881,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2961,8 +2961,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3006,8 +3006,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3085,8 +3085,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3130,8 +3130,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3208,8 +3208,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3253,8 +3253,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3331,8 +3331,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3376,8 +3376,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/nested_group/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_group/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_group/nested_formats.html 26 Nov 2008
19:09:05 -0000 1.8
+++ test/nested_formats/res/nested_group/nested_formats.html 17 Jan 2009
14:30:48 -0000 1.9
@@ -81,8 +81,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -126,8 +126,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -205,8 +205,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -250,8 +250,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -295,7 +295,7 @@
</p>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
@@ -330,8 +330,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -375,8 +375,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -454,8 +454,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -499,8 +499,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -578,8 +578,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -623,8 +623,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -704,8 +704,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -749,8 +749,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -828,8 +828,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -873,8 +873,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -952,8 +952,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -997,8 +997,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1080,8 +1080,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1125,8 +1125,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1204,8 +1204,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1249,8 +1249,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1328,8 +1328,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1373,8 +1373,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1453,8 +1453,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1498,8 +1498,8 @@
</pre>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1578,8 +1578,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1623,8 +1623,8 @@
</pre>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1703,8 +1703,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1748,8 +1748,8 @@
</pre>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1834,8 +1834,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1879,8 +1879,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1958,8 +1958,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2003,8 +2003,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2085,8 +2085,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2130,8 +2130,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2212,8 +2212,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2257,8 +2257,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2337,8 +2337,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2382,8 +2382,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2462,8 +2462,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2507,8 +2507,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2589,8 +2589,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2634,8 +2634,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2713,8 +2713,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2758,8 +2758,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2836,8 +2836,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2881,8 +2881,8 @@
</p>
<p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2961,8 +2961,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3006,8 +3006,8 @@
</p>
<p align="left">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3085,8 +3085,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3130,8 +3130,8 @@
</p>
<p align="left">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3208,8 +3208,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3253,8 +3253,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3331,8 +3331,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3376,8 +3376,8 @@
</p>
<p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/nested_itemize/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_itemize/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_itemize/nested_formats.html 26 Nov 2008
19:09:05 -0000 1.8
+++ test/nested_formats/res/nested_itemize/nested_formats.html 17 Jan 2009
14:30:48 -0000 1.9
@@ -97,8 +97,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -143,8 +143,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -240,8 +240,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -286,8 +286,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -333,7 +333,7 @@
</li></ul>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
<ul>
@@ -384,8 +384,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -430,8 +430,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -526,8 +526,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -572,8 +572,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -669,8 +669,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -715,8 +715,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -814,8 +814,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -860,8 +860,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -956,8 +956,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1002,8 +1002,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1099,8 +1099,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1145,8 +1145,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1246,8 +1246,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1292,8 +1292,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1387,8 +1387,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1433,8 +1433,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1529,8 +1529,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1575,8 +1575,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1673,8 +1673,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1719,8 +1719,8 @@
<ul>
<li><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1816,8 +1816,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1862,8 +1862,8 @@
<ul>
<li><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1960,8 +1960,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2006,8 +2006,8 @@
<ul>
<li><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2110,8 +2110,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2156,8 +2156,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2253,8 +2253,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2299,8 +2299,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2399,8 +2399,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2445,8 +2445,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2544,8 +2544,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2590,8 +2590,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2687,8 +2687,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2733,8 +2733,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2831,8 +2831,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2877,8 +2877,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2977,8 +2977,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3023,8 +3023,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3119,8 +3119,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3165,8 +3165,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3261,8 +3261,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3307,8 +3307,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3405,8 +3405,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3451,8 +3451,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3548,8 +3548,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3594,8 +3594,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3690,8 +3690,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3736,8 +3736,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3832,8 +3832,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3878,8 +3878,8 @@
<ul>
<li>in macro, a format_command containing some other commands.
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/nested_menu/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_menu/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_menu/nested_formats.html 26 Nov 2008
19:09:05 -0000 1.8
+++ test/nested_formats/res/nested_menu/nested_formats.html 17 Jan 2009
14:30:48 -0000 1.9
@@ -91,8 +91,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -137,8 +137,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -226,8 +226,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -272,8 +272,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -319,7 +319,7 @@
</pre></th></tr></table>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
@@ -364,8 +364,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -410,8 +410,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -500,8 +500,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -546,8 +546,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -635,8 +635,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -681,8 +681,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -774,8 +774,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -820,8 +820,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -910,8 +910,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -956,8 +956,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -1045,8 +1045,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -1091,8 +1091,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -1186,8 +1186,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1232,8 +1232,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -1321,8 +1321,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1367,8 +1367,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -1455,8 +1455,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -1501,8 +1501,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -1593,8 +1593,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1639,8 +1639,8 @@
<table class="menu" border="0" cellspacing="0"><tr><td>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1730,8 +1730,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1776,8 +1776,8 @@
<table class="menu" border="0" cellspacing="0"><tr><td>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1866,8 +1866,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1912,8 +1912,8 @@
</th></tr><table class="menu" border="0" cellspacing="0"><tr><td>
<pre class="example">in macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2010,8 +2010,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2056,8 +2056,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2145,8 +2145,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2191,8 +2191,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2285,8 +2285,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2331,8 +2331,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2424,8 +2424,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2470,8 +2470,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2561,8 +2561,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2607,8 +2607,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2697,8 +2697,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2743,8 +2743,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2837,8 +2837,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2883,8 +2883,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -2973,8 +2973,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3019,8 +3019,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -3107,8 +3107,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -3153,8 +3153,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -3245,8 +3245,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3291,8 +3291,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -3380,8 +3380,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -3426,8 +3426,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -3516,8 +3516,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3562,8 +3562,8 @@
<table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -3650,8 +3650,8 @@
html
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
@@ -3696,8 +3696,8 @@
</th></tr><table class="menu" border="0" cellspacing="0">
<tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">in
macro, a format_command containing some other commands.
</pre><ul>
-<li><pre class="menu-comment">a–n itemize line i–tem 1
-</pre></li><li><pre class="menu-comment">a–n itemize line i–tem 2
+<li><pre class="menu-comment"> i–tem 1
+</pre></li><li><pre class="menu-comment"> i–tem 2
</pre></li></ul>
<pre class="menu-comment">
</pre><ol>
Index: test/nested_formats/res/nested_multitable/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_multitable/nested_formats.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/nested_formats/res/nested_multitable/nested_formats.html 1 Jan
2009 22:35:27 -0000 1.9
+++ test/nested_formats/res/nested_multitable/nested_formats.html 17 Jan
2009 14:30:48 -0000 1.10
@@ -75,8 +75,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -123,7 +123,7 @@
<p>Call macro in format_command
</p>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
@@ -152,8 +152,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -226,8 +226,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -304,8 +304,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -378,8 +378,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -458,8 +458,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -531,8 +531,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -607,8 +607,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -682,8 +682,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -766,8 +766,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -845,8 +845,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -922,8 +922,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -997,8 +997,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1077,8 +1077,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1151,8 +1151,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1227,8 +1227,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1302,8 +1302,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/nested_quotation/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_quotation/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_quotation/nested_formats.html 26 Nov
2008 19:09:05 -0000 1.8
+++ test/nested_formats/res/nested_quotation/nested_formats.html 17 Jan
2009 14:30:48 -0000 1.9
@@ -89,8 +89,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -134,8 +134,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -222,8 +222,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -267,8 +267,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -314,7 +314,7 @@
</blockquote>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
<blockquote></blockquote>
@@ -357,8 +357,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -402,8 +402,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -490,8 +490,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -535,8 +535,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -623,8 +623,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -668,8 +668,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -759,8 +759,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -804,8 +804,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -892,8 +892,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -937,8 +937,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1025,8 +1025,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1070,8 +1070,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1163,8 +1163,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1208,8 +1208,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1295,8 +1295,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1340,8 +1340,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1427,8 +1427,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1472,8 +1472,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1562,8 +1562,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1607,8 +1607,8 @@
</pre>
<blockquote><pre class="example">in macro, a format_command containing some
other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1696,8 +1696,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1741,8 +1741,8 @@
</pre>
<blockquote><pre class="example">in macro, a format_command containing some
other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1830,8 +1830,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1875,8 +1875,8 @@
</pre>
<blockquote><pre class="example">in macro, a format_command containing some
other commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1971,8 +1971,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2016,8 +2016,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2104,8 +2104,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2149,8 +2149,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2241,8 +2241,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2286,8 +2286,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2377,8 +2377,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2422,8 +2422,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2511,8 +2511,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2556,8 +2556,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2645,8 +2645,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2690,8 +2690,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2782,8 +2782,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2827,8 +2827,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2915,8 +2915,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2960,8 +2960,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3047,8 +3047,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3092,8 +3092,8 @@
</p>
<blockquote><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3182,8 +3182,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3227,8 +3227,8 @@
</p>
<blockquote><p align="left">in macro, a format_command containing some other
commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3315,8 +3315,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3360,8 +3360,8 @@
</p>
<blockquote><p align="left">in macro, a format_command containing some other
commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3448,8 +3448,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3493,8 +3493,8 @@
</p>
<blockquote><p align="right">in macro, a format_command containing some other
commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3580,8 +3580,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3625,8 +3625,8 @@
</p>
<blockquote><p align="right">in macro, a format_command containing some other
commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/nested_table/nested_formats.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/nested_table/nested_formats.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- test/nested_formats/res/nested_table/nested_formats.html 26 Nov 2008
19:09:05 -0000 1.8
+++ test/nested_formats/res/nested_table/nested_formats.html 17 Jan 2009
14:30:48 -0000 1.9
@@ -96,8 +96,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -142,8 +142,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -239,8 +239,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -285,8 +285,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -334,7 +334,7 @@
</dl>
<p>Call macro in itemize at the beginning of an item
-</p><ul>
+</p><ul class="toc">
<li>a–n itemize line in macro
@@ -384,8 +384,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -430,8 +430,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -526,8 +526,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -572,8 +572,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -669,8 +669,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -715,8 +715,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -815,8 +815,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -861,8 +861,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -957,8 +957,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1003,8 +1003,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1100,8 +1100,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1146,8 +1146,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1248,8 +1248,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1294,8 +1294,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1389,8 +1389,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1435,8 +1435,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1531,8 +1531,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1577,8 +1577,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -1676,8 +1676,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1722,8 +1722,8 @@
<dl compact="compact">
<dd><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1819,8 +1819,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1865,8 +1865,8 @@
<dl compact="compact">
<dd><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -1963,8 +1963,8 @@
html
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2009,8 +2009,8 @@
<dl compact="compact">
<dd><pre class="example">in macro, a format_command containing some other
commands.
</pre><ul>
-<li><pre class="example">a--n itemize line i--tem 1
-</pre></li><li><pre class="example">a--n itemize line i--tem 2
+<li><pre class="example"> i--tem 1
+</pre></li><li><pre class="example"> i--tem 2
</pre></li></ul>
<pre class="example">
</pre><ol>
@@ -2114,8 +2114,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2160,8 +2160,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2257,8 +2257,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2303,8 +2303,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2404,8 +2404,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2450,8 +2450,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2549,8 +2549,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2595,8 +2595,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2692,8 +2692,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2738,8 +2738,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2836,8 +2836,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2882,8 +2882,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -2983,8 +2983,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3029,8 +3029,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3125,8 +3125,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3171,8 +3171,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3267,8 +3267,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3313,8 +3313,8 @@
<dl compact="compact">
<dd><p>in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3412,8 +3412,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3458,8 +3458,8 @@
<dl compact="compact">
<dd><p align="left">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3555,8 +3555,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3601,8 +3601,8 @@
<dl compact="compact">
<dd><p align="left">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3698,8 +3698,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3744,8 +3744,8 @@
<dl compact="compact">
<dd><p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3840,8 +3840,8 @@
html
<ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
@@ -3886,8 +3886,8 @@
<dl compact="compact">
<dd><p align="right">in macro, a format_command containing some other commands.
</p><ul>
-<li>a–n itemize line i–tem 1
-</li><li>a–n itemize line i–tem 2
+<li> i–tem 1
+</li><li> i–tem 2
</li></ul>
<ol>
Index: test/nested_formats/res/texi_nested_formats/nested_formats.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/texi_nested_formats/nested_formats.passfirst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/nested_formats/res/texi_nested_formats/nested_formats.passfirst
9 Jan 2009 21:20:52 -0000 1.2
+++ test/nested_formats/res/texi_nested_formats/nested_formats.passfirst
17 Jan 2009 14:30:49 -0000 1.3
@@ -82,7 +82,7 @@
nested_formats.texi(mymacro,233) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,233) @end tex
nested_formats.texi(mymacro,233)
-nested_formats.texi(mymacro,233) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,233) @itemize @bullet{}
nested_formats.texi(mymacro,233) @item i--tem 1
nested_formats.texi(mymacro,233) @item i--tem 2
nested_formats.texi(mymacro,233) @end itemize
@@ -132,7 +132,7 @@
nested_formats.texi(mymacro,233)
nested_formats.texi(mymacro,233) @group
nested_formats.texi(mymacro,233) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,233) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,233) @itemize @bullet{}
nested_formats.texi(mymacro,233) @item i--tem 1
nested_formats.texi(mymacro,233) @item i--tem 2
nested_formats.texi(mymacro,233) @end itemize
@@ -243,7 +243,7 @@
nested_formats.texi(mymacro,237) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,237) @end tex
nested_formats.texi(mymacro,237)
-nested_formats.texi(mymacro,237) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,237) @itemize @bullet{}
nested_formats.texi(mymacro,237) @item i--tem 1
nested_formats.texi(mymacro,237) @item i--tem 2
nested_formats.texi(mymacro,237) @end itemize
@@ -293,7 +293,7 @@
nested_formats.texi(mymacro,237)
nested_formats.texi(mymacro,237) @group
nested_formats.texi(mymacro,237) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,237) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,237) @itemize @bullet{}
nested_formats.texi(mymacro,237) @item i--tem 1
nested_formats.texi(mymacro,237) @item i--tem 2
nested_formats.texi(mymacro,237) @end itemize
@@ -345,7 +345,7 @@
nested_formats.texi(,238) @end group
nested_formats.texi(,239)
nested_formats.texi(,240) Call macro in itemize at the beginning of an item
-nested_formats.texi(,241) @itemize @bullet{} a--n itemize line
+nested_formats.texi(,241) @itemize a--n itemize line
nested_formats.texi(mymacro,242) @item in macro
nested_formats.texi(mymacro,242)
nested_formats.texi(mymacro,242) @group
@@ -405,7 +405,7 @@
nested_formats.texi(mymacro,242) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,242) @end tex
nested_formats.texi(mymacro,242)
-nested_formats.texi(mymacro,242) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,242) @itemize @bullet{}
nested_formats.texi(mymacro,242) @item i--tem 1
nested_formats.texi(mymacro,242) @item i--tem 2
nested_formats.texi(mymacro,242) @end itemize
@@ -455,7 +455,7 @@
nested_formats.texi(mymacro,242)
nested_formats.texi(mymacro,242) @group
nested_formats.texi(mymacro,242) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,242) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,242) @itemize @bullet{}
nested_formats.texi(mymacro,242) @item i--tem 1
nested_formats.texi(mymacro,242) @item i--tem 2
nested_formats.texi(mymacro,242) @end itemize
@@ -565,7 +565,7 @@
nested_formats.texi(mymacro,245) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,245) @end tex
nested_formats.texi(mymacro,245)
-nested_formats.texi(mymacro,245) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,245) @itemize @bullet{}
nested_formats.texi(mymacro,245) @item i--tem 1
nested_formats.texi(mymacro,245) @item i--tem 2
nested_formats.texi(mymacro,245) @end itemize
@@ -615,7 +615,7 @@
nested_formats.texi(mymacro,245)
nested_formats.texi(mymacro,245) @group
nested_formats.texi(mymacro,245) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,245) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,245) @itemize @bullet{}
nested_formats.texi(mymacro,245) @item i--tem 1
nested_formats.texi(mymacro,245) @item i--tem 2
nested_formats.texi(mymacro,245) @end itemize
@@ -726,7 +726,7 @@
nested_formats.texi(mymacro,249) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,249) @end tex
nested_formats.texi(mymacro,249)
-nested_formats.texi(mymacro,249) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,249) @itemize @bullet{}
nested_formats.texi(mymacro,249) @item i--tem 1
nested_formats.texi(mymacro,249) @item i--tem 2
nested_formats.texi(mymacro,249) @end itemize
@@ -776,7 +776,7 @@
nested_formats.texi(mymacro,249)
nested_formats.texi(mymacro,249) @group
nested_formats.texi(mymacro,249) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,249) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,249) @itemize @bullet{}
nested_formats.texi(mymacro,249) @item i--tem 1
nested_formats.texi(mymacro,249) @item i--tem 2
nested_formats.texi(mymacro,249) @end itemize
@@ -889,7 +889,7 @@
nested_formats.texi(mymacro,255) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,255) @end tex
nested_formats.texi(mymacro,255)
-nested_formats.texi(mymacro,255) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,255) @itemize @bullet{}
nested_formats.texi(mymacro,255) @item i--tem 1
nested_formats.texi(mymacro,255) @item i--tem 2
nested_formats.texi(mymacro,255) @end itemize
@@ -939,7 +939,7 @@
nested_formats.texi(mymacro,255)
nested_formats.texi(mymacro,255) @group
nested_formats.texi(mymacro,255) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,255) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,255) @itemize @bullet{}
nested_formats.texi(mymacro,255) @item i--tem 1
nested_formats.texi(mymacro,255) @item i--tem 2
nested_formats.texi(mymacro,255) @end itemize
@@ -1049,7 +1049,7 @@
nested_formats.texi(mymacro,258) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,258) @end tex
nested_formats.texi(mymacro,258)
-nested_formats.texi(mymacro,258) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,258) @itemize @bullet{}
nested_formats.texi(mymacro,258) @item i--tem 1
nested_formats.texi(mymacro,258) @item i--tem 2
nested_formats.texi(mymacro,258) @end itemize
@@ -1099,7 +1099,7 @@
nested_formats.texi(mymacro,258)
nested_formats.texi(mymacro,258) @group
nested_formats.texi(mymacro,258) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,258) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,258) @itemize @bullet{}
nested_formats.texi(mymacro,258) @item i--tem 1
nested_formats.texi(mymacro,258) @item i--tem 2
nested_formats.texi(mymacro,258) @end itemize
@@ -1210,7 +1210,7 @@
nested_formats.texi(mymacro,262) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,262) @end tex
nested_formats.texi(mymacro,262)
-nested_formats.texi(mymacro,262) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,262) @itemize @bullet{}
nested_formats.texi(mymacro,262) @item i--tem 1
nested_formats.texi(mymacro,262) @item i--tem 2
nested_formats.texi(mymacro,262) @end itemize
@@ -1260,7 +1260,7 @@
nested_formats.texi(mymacro,262)
nested_formats.texi(mymacro,262) @group
nested_formats.texi(mymacro,262) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,262) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,262) @itemize @bullet{}
nested_formats.texi(mymacro,262) @item i--tem 1
nested_formats.texi(mymacro,262) @item i--tem 2
nested_formats.texi(mymacro,262) @end itemize
@@ -1375,7 +1375,7 @@
nested_formats.texi(mymacro,270) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,270) @end tex
nested_formats.texi(mymacro,270)
-nested_formats.texi(mymacro,270) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,270) @itemize @bullet{}
nested_formats.texi(mymacro,270) @item i--tem 1
nested_formats.texi(mymacro,270) @item i--tem 2
nested_formats.texi(mymacro,270) @end itemize
@@ -1425,7 +1425,7 @@
nested_formats.texi(mymacro,270)
nested_formats.texi(mymacro,270) @group
nested_formats.texi(mymacro,270) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,270) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,270) @itemize @bullet{}
nested_formats.texi(mymacro,270) @item i--tem 1
nested_formats.texi(mymacro,270) @item i--tem 2
nested_formats.texi(mymacro,270) @end itemize
@@ -1535,7 +1535,7 @@
nested_formats.texi(mymacro,273) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,273) @end tex
nested_formats.texi(mymacro,273)
-nested_formats.texi(mymacro,273) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,273) @itemize @bullet{}
nested_formats.texi(mymacro,273) @item i--tem 1
nested_formats.texi(mymacro,273) @item i--tem 2
nested_formats.texi(mymacro,273) @end itemize
@@ -1585,7 +1585,7 @@
nested_formats.texi(mymacro,273)
nested_formats.texi(mymacro,273) @group
nested_formats.texi(mymacro,273) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,273) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,273) @itemize @bullet{}
nested_formats.texi(mymacro,273) @item i--tem 1
nested_formats.texi(mymacro,273) @item i--tem 2
nested_formats.texi(mymacro,273) @end itemize
@@ -1696,7 +1696,7 @@
nested_formats.texi(mymacro,277) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,277) @end tex
nested_formats.texi(mymacro,277)
-nested_formats.texi(mymacro,277) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,277) @itemize @bullet{}
nested_formats.texi(mymacro,277) @item i--tem 1
nested_formats.texi(mymacro,277) @item i--tem 2
nested_formats.texi(mymacro,277) @end itemize
@@ -1746,7 +1746,7 @@
nested_formats.texi(mymacro,277)
nested_formats.texi(mymacro,277) @group
nested_formats.texi(mymacro,277) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,277) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,277) @itemize @bullet{}
nested_formats.texi(mymacro,277) @item i--tem 1
nested_formats.texi(mymacro,277) @item i--tem 2
nested_formats.texi(mymacro,277) @end itemize
@@ -1859,7 +1859,7 @@
nested_formats.texi(mymacro,283) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,283) @end tex
nested_formats.texi(mymacro,283)
-nested_formats.texi(mymacro,283) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,283) @itemize @bullet{}
nested_formats.texi(mymacro,283) @item i--tem 1
nested_formats.texi(mymacro,283) @item i--tem 2
nested_formats.texi(mymacro,283) @end itemize
@@ -1909,7 +1909,7 @@
nested_formats.texi(mymacro,283)
nested_formats.texi(mymacro,283) @group
nested_formats.texi(mymacro,283) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,283) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,283) @itemize @bullet{}
nested_formats.texi(mymacro,283) @item i--tem 1
nested_formats.texi(mymacro,283) @item i--tem 2
nested_formats.texi(mymacro,283) @end itemize
@@ -2020,7 +2020,7 @@
nested_formats.texi(mymacro,287) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,287) @end tex
nested_formats.texi(mymacro,287)
-nested_formats.texi(mymacro,287) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,287) @itemize @bullet{}
nested_formats.texi(mymacro,287) @item i--tem 1
nested_formats.texi(mymacro,287) @item i--tem 2
nested_formats.texi(mymacro,287) @end itemize
@@ -2070,7 +2070,7 @@
nested_formats.texi(mymacro,287)
nested_formats.texi(mymacro,287) @group
nested_formats.texi(mymacro,287) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,287) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,287) @itemize @bullet{}
nested_formats.texi(mymacro,287) @item i--tem 1
nested_formats.texi(mymacro,287) @item i--tem 2
nested_formats.texi(mymacro,287) @end itemize
@@ -2182,7 +2182,7 @@
nested_formats.texi(mymacro,292) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,292) @end tex
nested_formats.texi(mymacro,292)
-nested_formats.texi(mymacro,292) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,292) @itemize @bullet{}
nested_formats.texi(mymacro,292) @item i--tem 1
nested_formats.texi(mymacro,292) @item i--tem 2
nested_formats.texi(mymacro,292) @end itemize
@@ -2232,7 +2232,7 @@
nested_formats.texi(mymacro,292)
nested_formats.texi(mymacro,292) @group
nested_formats.texi(mymacro,292) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,292) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,292) @itemize @bullet{}
nested_formats.texi(mymacro,292) @item i--tem 1
nested_formats.texi(mymacro,292) @item i--tem 2
nested_formats.texi(mymacro,292) @end itemize
@@ -2350,7 +2350,7 @@
nested_formats.texi(mymacro,303) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,303) @end tex
nested_formats.texi(mymacro,303)
-nested_formats.texi(mymacro,303) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,303) @itemize @bullet{}
nested_formats.texi(mymacro,303) @item i--tem 1
nested_formats.texi(mymacro,303) @item i--tem 2
nested_formats.texi(mymacro,303) @end itemize
@@ -2400,7 +2400,7 @@
nested_formats.texi(mymacro,303)
nested_formats.texi(mymacro,303) @group
nested_formats.texi(mymacro,303) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,303) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,303) @itemize @bullet{}
nested_formats.texi(mymacro,303) @item i--tem 1
nested_formats.texi(mymacro,303) @item i--tem 2
nested_formats.texi(mymacro,303) @end itemize
@@ -2511,7 +2511,7 @@
nested_formats.texi(mymacro,307) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,307) @end tex
nested_formats.texi(mymacro,307)
-nested_formats.texi(mymacro,307) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,307) @itemize @bullet{}
nested_formats.texi(mymacro,307) @item i--tem 1
nested_formats.texi(mymacro,307) @item i--tem 2
nested_formats.texi(mymacro,307) @end itemize
@@ -2561,7 +2561,7 @@
nested_formats.texi(mymacro,307)
nested_formats.texi(mymacro,307) @group
nested_formats.texi(mymacro,307) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,307) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,307) @itemize @bullet{}
nested_formats.texi(mymacro,307) @item i--tem 1
nested_formats.texi(mymacro,307) @item i--tem 2
nested_formats.texi(mymacro,307) @end itemize
@@ -2674,7 +2674,7 @@
nested_formats.texi(mymacro,313) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,313) @end tex
nested_formats.texi(mymacro,313)
-nested_formats.texi(mymacro,313) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,313) @itemize @bullet{}
nested_formats.texi(mymacro,313) @item i--tem 1
nested_formats.texi(mymacro,313) @item i--tem 2
nested_formats.texi(mymacro,313) @end itemize
@@ -2724,7 +2724,7 @@
nested_formats.texi(mymacro,313)
nested_formats.texi(mymacro,313) @group
nested_formats.texi(mymacro,313) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,313) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,313) @itemize @bullet{}
nested_formats.texi(mymacro,313) @item i--tem 1
nested_formats.texi(mymacro,313) @item i--tem 2
nested_formats.texi(mymacro,313) @end itemize
@@ -2837,7 +2837,7 @@
nested_formats.texi(mymacro,319) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,319) @end tex
nested_formats.texi(mymacro,319)
-nested_formats.texi(mymacro,319) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,319) @itemize @bullet{}
nested_formats.texi(mymacro,319) @item i--tem 1
nested_formats.texi(mymacro,319) @item i--tem 2
nested_formats.texi(mymacro,319) @end itemize
@@ -2887,7 +2887,7 @@
nested_formats.texi(mymacro,319)
nested_formats.texi(mymacro,319) @group
nested_formats.texi(mymacro,319) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,319) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,319) @itemize @bullet{}
nested_formats.texi(mymacro,319) @item i--tem 1
nested_formats.texi(mymacro,319) @item i--tem 2
nested_formats.texi(mymacro,319) @end itemize
@@ -2997,7 +2997,7 @@
nested_formats.texi(mymacro,322) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,322) @end tex
nested_formats.texi(mymacro,322)
-nested_formats.texi(mymacro,322) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,322) @itemize @bullet{}
nested_formats.texi(mymacro,322) @item i--tem 1
nested_formats.texi(mymacro,322) @item i--tem 2
nested_formats.texi(mymacro,322) @end itemize
@@ -3047,7 +3047,7 @@
nested_formats.texi(mymacro,322)
nested_formats.texi(mymacro,322) @group
nested_formats.texi(mymacro,322) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,322) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,322) @itemize @bullet{}
nested_formats.texi(mymacro,322) @item i--tem 1
nested_formats.texi(mymacro,322) @item i--tem 2
nested_formats.texi(mymacro,322) @end itemize
@@ -3158,7 +3158,7 @@
nested_formats.texi(mymacro,326) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,326) @end tex
nested_formats.texi(mymacro,326)
-nested_formats.texi(mymacro,326) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,326) @itemize @bullet{}
nested_formats.texi(mymacro,326) @item i--tem 1
nested_formats.texi(mymacro,326) @item i--tem 2
nested_formats.texi(mymacro,326) @end itemize
@@ -3208,7 +3208,7 @@
nested_formats.texi(mymacro,326)
nested_formats.texi(mymacro,326) @group
nested_formats.texi(mymacro,326) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,326) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,326) @itemize @bullet{}
nested_formats.texi(mymacro,326) @item i--tem 1
nested_formats.texi(mymacro,326) @item i--tem 2
nested_formats.texi(mymacro,326) @end itemize
@@ -3321,7 +3321,7 @@
nested_formats.texi(mymacro,332) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,332) @end tex
nested_formats.texi(mymacro,332)
-nested_formats.texi(mymacro,332) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,332) @itemize @bullet{}
nested_formats.texi(mymacro,332) @item i--tem 1
nested_formats.texi(mymacro,332) @item i--tem 2
nested_formats.texi(mymacro,332) @end itemize
@@ -3371,7 +3371,7 @@
nested_formats.texi(mymacro,332)
nested_formats.texi(mymacro,332) @group
nested_formats.texi(mymacro,332) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,332) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,332) @itemize @bullet{}
nested_formats.texi(mymacro,332) @item i--tem 1
nested_formats.texi(mymacro,332) @item i--tem 2
nested_formats.texi(mymacro,332) @end itemize
@@ -3481,7 +3481,7 @@
nested_formats.texi(mymacro,335) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,335) @end tex
nested_formats.texi(mymacro,335)
-nested_formats.texi(mymacro,335) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,335) @itemize @bullet{}
nested_formats.texi(mymacro,335) @item i--tem 1
nested_formats.texi(mymacro,335) @item i--tem 2
nested_formats.texi(mymacro,335) @end itemize
@@ -3531,7 +3531,7 @@
nested_formats.texi(mymacro,335)
nested_formats.texi(mymacro,335) @group
nested_formats.texi(mymacro,335) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,335) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,335) @itemize @bullet{}
nested_formats.texi(mymacro,335) @item i--tem 1
nested_formats.texi(mymacro,335) @item i--tem 2
nested_formats.texi(mymacro,335) @end itemize
@@ -3641,7 +3641,7 @@
nested_formats.texi(mymacro,338) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,338) @end tex
nested_formats.texi(mymacro,338)
-nested_formats.texi(mymacro,338) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,338) @itemize @bullet{}
nested_formats.texi(mymacro,338) @item i--tem 1
nested_formats.texi(mymacro,338) @item i--tem 2
nested_formats.texi(mymacro,338) @end itemize
@@ -3691,7 +3691,7 @@
nested_formats.texi(mymacro,338)
nested_formats.texi(mymacro,338) @group
nested_formats.texi(mymacro,338) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,338) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,338) @itemize @bullet{}
nested_formats.texi(mymacro,338) @item i--tem 1
nested_formats.texi(mymacro,338) @item i--tem 2
nested_formats.texi(mymacro,338) @end itemize
@@ -3804,7 +3804,7 @@
nested_formats.texi(mymacro,344) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,344) @end tex
nested_formats.texi(mymacro,344)
-nested_formats.texi(mymacro,344) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,344) @itemize @bullet{}
nested_formats.texi(mymacro,344) @item i--tem 1
nested_formats.texi(mymacro,344) @item i--tem 2
nested_formats.texi(mymacro,344) @end itemize
@@ -3854,7 +3854,7 @@
nested_formats.texi(mymacro,344)
nested_formats.texi(mymacro,344) @group
nested_formats.texi(mymacro,344) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,344) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,344) @itemize @bullet{}
nested_formats.texi(mymacro,344) @item i--tem 1
nested_formats.texi(mymacro,344) @item i--tem 2
nested_formats.texi(mymacro,344) @end itemize
@@ -3965,7 +3965,7 @@
nested_formats.texi(mymacro,348) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,348) @end tex
nested_formats.texi(mymacro,348)
-nested_formats.texi(mymacro,348) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,348) @itemize @bullet{}
nested_formats.texi(mymacro,348) @item i--tem 1
nested_formats.texi(mymacro,348) @item i--tem 2
nested_formats.texi(mymacro,348) @end itemize
@@ -4015,7 +4015,7 @@
nested_formats.texi(mymacro,348)
nested_formats.texi(mymacro,348) @group
nested_formats.texi(mymacro,348) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,348) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,348) @itemize @bullet{}
nested_formats.texi(mymacro,348) @item i--tem 1
nested_formats.texi(mymacro,348) @item i--tem 2
nested_formats.texi(mymacro,348) @end itemize
@@ -4127,7 +4127,7 @@
nested_formats.texi(mymacro,353) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,353) @end tex
nested_formats.texi(mymacro,353)
-nested_formats.texi(mymacro,353) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,353) @itemize @bullet{}
nested_formats.texi(mymacro,353) @item i--tem 1
nested_formats.texi(mymacro,353) @item i--tem 2
nested_formats.texi(mymacro,353) @end itemize
@@ -4177,7 +4177,7 @@
nested_formats.texi(mymacro,353)
nested_formats.texi(mymacro,353) @group
nested_formats.texi(mymacro,353) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,353) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,353) @itemize @bullet{}
nested_formats.texi(mymacro,353) @item i--tem 1
nested_formats.texi(mymacro,353) @item i--tem 2
nested_formats.texi(mymacro,353) @end itemize
@@ -4287,7 +4287,7 @@
nested_formats.texi(mymacro,356) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,356) @end tex
nested_formats.texi(mymacro,356)
-nested_formats.texi(mymacro,356) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,356) @itemize @bullet{}
nested_formats.texi(mymacro,356) @item i--tem 1
nested_formats.texi(mymacro,356) @item i--tem 2
nested_formats.texi(mymacro,356) @end itemize
@@ -4337,7 +4337,7 @@
nested_formats.texi(mymacro,356)
nested_formats.texi(mymacro,356) @group
nested_formats.texi(mymacro,356) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,356) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,356) @itemize @bullet{}
nested_formats.texi(mymacro,356) @item i--tem 1
nested_formats.texi(mymacro,356) @item i--tem 2
nested_formats.texi(mymacro,356) @end itemize
Index: test/nested_formats/res/texi_nested_formats/nested_formats.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/texi_nested_formats/nested_formats.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/nested_formats/res/texi_nested_formats/nested_formats.passtexi 9 Jan
2009 21:20:54 -0000 1.2
+++ test/nested_formats/res/texi_nested_formats/nested_formats.passtexi 17 Jan
2009 14:30:49 -0000 1.3
@@ -82,7 +82,7 @@
nested_formats.texi(mymacro,233) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,233) @end tex
nested_formats.texi(mymacro,233)
-nested_formats.texi(mymacro,233) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,233) @itemize @bullet{}
nested_formats.texi(mymacro,233) @item i--tem 1
nested_formats.texi(mymacro,233) @item i--tem 2
nested_formats.texi(mymacro,233) @end itemize
@@ -132,7 +132,7 @@
nested_formats.texi(mymacro,233)
nested_formats.texi(mymacro,233) @group
nested_formats.texi(mymacro,233) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,233) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,233) @itemize @bullet{}
nested_formats.texi(mymacro,233) @item i--tem 1
nested_formats.texi(mymacro,233) @item i--tem 2
nested_formats.texi(mymacro,233) @end itemize
@@ -243,7 +243,7 @@
nested_formats.texi(mymacro,237) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,237) @end tex
nested_formats.texi(mymacro,237)
-nested_formats.texi(mymacro,237) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,237) @itemize @bullet{}
nested_formats.texi(mymacro,237) @item i--tem 1
nested_formats.texi(mymacro,237) @item i--tem 2
nested_formats.texi(mymacro,237) @end itemize
@@ -293,7 +293,7 @@
nested_formats.texi(mymacro,237)
nested_formats.texi(mymacro,237) @group
nested_formats.texi(mymacro,237) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,237) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,237) @itemize @bullet{}
nested_formats.texi(mymacro,237) @item i--tem 1
nested_formats.texi(mymacro,237) @item i--tem 2
nested_formats.texi(mymacro,237) @end itemize
@@ -345,7 +345,7 @@
nested_formats.texi(,238) @end group
nested_formats.texi(,239)
nested_formats.texi(,240) Call macro in itemize at the beginning of an item
-nested_formats.texi(,241) @itemize @bullet{} a--n itemize line
+nested_formats.texi(,241) @itemize a--n itemize line
nested_formats.texi(mymacro,242) @item nested_formats.texi(mymacro,242) in
macro
nested_formats.texi(mymacro,242)
nested_formats.texi(mymacro,242) @group
@@ -405,7 +405,7 @@
nested_formats.texi(mymacro,242) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,242) @end tex
nested_formats.texi(mymacro,242)
-nested_formats.texi(mymacro,242) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,242) @itemize @bullet{}
nested_formats.texi(mymacro,242) @item i--tem 1
nested_formats.texi(mymacro,242) @item i--tem 2
nested_formats.texi(mymacro,242) @end itemize
@@ -455,7 +455,7 @@
nested_formats.texi(mymacro,242)
nested_formats.texi(mymacro,242) @group
nested_formats.texi(mymacro,242) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,242) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,242) @itemize @bullet{}
nested_formats.texi(mymacro,242) @item i--tem 1
nested_formats.texi(mymacro,242) @item i--tem 2
nested_formats.texi(mymacro,242) @end itemize
@@ -565,7 +565,7 @@
nested_formats.texi(mymacro,245) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,245) @end tex
nested_formats.texi(mymacro,245)
-nested_formats.texi(mymacro,245) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,245) @itemize @bullet{}
nested_formats.texi(mymacro,245) @item i--tem 1
nested_formats.texi(mymacro,245) @item i--tem 2
nested_formats.texi(mymacro,245) @end itemize
@@ -615,7 +615,7 @@
nested_formats.texi(mymacro,245)
nested_formats.texi(mymacro,245) @group
nested_formats.texi(mymacro,245) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,245) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,245) @itemize @bullet{}
nested_formats.texi(mymacro,245) @item i--tem 1
nested_formats.texi(mymacro,245) @item i--tem 2
nested_formats.texi(mymacro,245) @end itemize
@@ -726,7 +726,7 @@
nested_formats.texi(mymacro,249) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,249) @end tex
nested_formats.texi(mymacro,249)
-nested_formats.texi(mymacro,249) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,249) @itemize @bullet{}
nested_formats.texi(mymacro,249) @item i--tem 1
nested_formats.texi(mymacro,249) @item i--tem 2
nested_formats.texi(mymacro,249) @end itemize
@@ -776,7 +776,7 @@
nested_formats.texi(mymacro,249)
nested_formats.texi(mymacro,249) @group
nested_formats.texi(mymacro,249) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,249) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,249) @itemize @bullet{}
nested_formats.texi(mymacro,249) @item i--tem 1
nested_formats.texi(mymacro,249) @item i--tem 2
nested_formats.texi(mymacro,249) @end itemize
@@ -889,7 +889,7 @@
nested_formats.texi(mymacro,255) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,255) @end tex
nested_formats.texi(mymacro,255)
-nested_formats.texi(mymacro,255) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,255) @itemize @bullet{}
nested_formats.texi(mymacro,255) @item i--tem 1
nested_formats.texi(mymacro,255) @item i--tem 2
nested_formats.texi(mymacro,255) @end itemize
@@ -939,7 +939,7 @@
nested_formats.texi(mymacro,255)
nested_formats.texi(mymacro,255) @group
nested_formats.texi(mymacro,255) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,255) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,255) @itemize @bullet{}
nested_formats.texi(mymacro,255) @item i--tem 1
nested_formats.texi(mymacro,255) @item i--tem 2
nested_formats.texi(mymacro,255) @end itemize
@@ -1049,7 +1049,7 @@
nested_formats.texi(mymacro,258) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,258) @end tex
nested_formats.texi(mymacro,258)
-nested_formats.texi(mymacro,258) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,258) @itemize @bullet{}
nested_formats.texi(mymacro,258) @item i--tem 1
nested_formats.texi(mymacro,258) @item i--tem 2
nested_formats.texi(mymacro,258) @end itemize
@@ -1099,7 +1099,7 @@
nested_formats.texi(mymacro,258)
nested_formats.texi(mymacro,258) @group
nested_formats.texi(mymacro,258) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,258) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,258) @itemize @bullet{}
nested_formats.texi(mymacro,258) @item i--tem 1
nested_formats.texi(mymacro,258) @item i--tem 2
nested_formats.texi(mymacro,258) @end itemize
@@ -1210,7 +1210,7 @@
nested_formats.texi(mymacro,262) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,262) @end tex
nested_formats.texi(mymacro,262)
-nested_formats.texi(mymacro,262) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,262) @itemize @bullet{}
nested_formats.texi(mymacro,262) @item i--tem 1
nested_formats.texi(mymacro,262) @item i--tem 2
nested_formats.texi(mymacro,262) @end itemize
@@ -1260,7 +1260,7 @@
nested_formats.texi(mymacro,262)
nested_formats.texi(mymacro,262) @group
nested_formats.texi(mymacro,262) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,262) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,262) @itemize @bullet{}
nested_formats.texi(mymacro,262) @item i--tem 1
nested_formats.texi(mymacro,262) @item i--tem 2
nested_formats.texi(mymacro,262) @end itemize
@@ -1375,7 +1375,7 @@
nested_formats.texi(mymacro,270) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,270) @end tex
nested_formats.texi(mymacro,270)
-nested_formats.texi(mymacro,270) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,270) @itemize @bullet{}
nested_formats.texi(mymacro,270) @item i--tem 1
nested_formats.texi(mymacro,270) @item i--tem 2
nested_formats.texi(mymacro,270) @end itemize
@@ -1425,7 +1425,7 @@
nested_formats.texi(mymacro,270)
nested_formats.texi(mymacro,270) @group
nested_formats.texi(mymacro,270) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,270) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,270) @itemize @bullet{}
nested_formats.texi(mymacro,270) @item i--tem 1
nested_formats.texi(mymacro,270) @item i--tem 2
nested_formats.texi(mymacro,270) @end itemize
@@ -1535,7 +1535,7 @@
nested_formats.texi(mymacro,273) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,273) @end tex
nested_formats.texi(mymacro,273)
-nested_formats.texi(mymacro,273) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,273) @itemize @bullet{}
nested_formats.texi(mymacro,273) @item i--tem 1
nested_formats.texi(mymacro,273) @item i--tem 2
nested_formats.texi(mymacro,273) @end itemize
@@ -1585,7 +1585,7 @@
nested_formats.texi(mymacro,273)
nested_formats.texi(mymacro,273) @group
nested_formats.texi(mymacro,273) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,273) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,273) @itemize @bullet{}
nested_formats.texi(mymacro,273) @item i--tem 1
nested_formats.texi(mymacro,273) @item i--tem 2
nested_formats.texi(mymacro,273) @end itemize
@@ -1696,7 +1696,7 @@
nested_formats.texi(mymacro,277) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,277) @end tex
nested_formats.texi(mymacro,277)
-nested_formats.texi(mymacro,277) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,277) @itemize @bullet{}
nested_formats.texi(mymacro,277) @item i--tem 1
nested_formats.texi(mymacro,277) @item i--tem 2
nested_formats.texi(mymacro,277) @end itemize
@@ -1746,7 +1746,7 @@
nested_formats.texi(mymacro,277)
nested_formats.texi(mymacro,277) @group
nested_formats.texi(mymacro,277) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,277) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,277) @itemize @bullet{}
nested_formats.texi(mymacro,277) @item i--tem 1
nested_formats.texi(mymacro,277) @item i--tem 2
nested_formats.texi(mymacro,277) @end itemize
@@ -1859,7 +1859,7 @@
nested_formats.texi(mymacro,283) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,283) @end tex
nested_formats.texi(mymacro,283)
-nested_formats.texi(mymacro,283) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,283) @itemize @bullet{}
nested_formats.texi(mymacro,283) @item i--tem 1
nested_formats.texi(mymacro,283) @item i--tem 2
nested_formats.texi(mymacro,283) @end itemize
@@ -1909,7 +1909,7 @@
nested_formats.texi(mymacro,283)
nested_formats.texi(mymacro,283) @group
nested_formats.texi(mymacro,283) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,283) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,283) @itemize @bullet{}
nested_formats.texi(mymacro,283) @item i--tem 1
nested_formats.texi(mymacro,283) @item i--tem 2
nested_formats.texi(mymacro,283) @end itemize
@@ -2020,7 +2020,7 @@
nested_formats.texi(mymacro,287) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,287) @end tex
nested_formats.texi(mymacro,287)
-nested_formats.texi(mymacro,287) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,287) @itemize @bullet{}
nested_formats.texi(mymacro,287) @item i--tem 1
nested_formats.texi(mymacro,287) @item i--tem 2
nested_formats.texi(mymacro,287) @end itemize
@@ -2070,7 +2070,7 @@
nested_formats.texi(mymacro,287)
nested_formats.texi(mymacro,287) @group
nested_formats.texi(mymacro,287) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,287) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,287) @itemize @bullet{}
nested_formats.texi(mymacro,287) @item i--tem 1
nested_formats.texi(mymacro,287) @item i--tem 2
nested_formats.texi(mymacro,287) @end itemize
@@ -2182,7 +2182,7 @@
nested_formats.texi(mymacro,292) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,292) @end tex
nested_formats.texi(mymacro,292)
-nested_formats.texi(mymacro,292) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,292) @itemize @bullet{}
nested_formats.texi(mymacro,292) @item i--tem 1
nested_formats.texi(mymacro,292) @item i--tem 2
nested_formats.texi(mymacro,292) @end itemize
@@ -2232,7 +2232,7 @@
nested_formats.texi(mymacro,292)
nested_formats.texi(mymacro,292) @group
nested_formats.texi(mymacro,292) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,292) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,292) @itemize @bullet{}
nested_formats.texi(mymacro,292) @item i--tem 1
nested_formats.texi(mymacro,292) @item i--tem 2
nested_formats.texi(mymacro,292) @end itemize
@@ -2350,7 +2350,7 @@
nested_formats.texi(mymacro,303) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,303) @end tex
nested_formats.texi(mymacro,303)
-nested_formats.texi(mymacro,303) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,303) @itemize @bullet{}
nested_formats.texi(mymacro,303) @item i--tem 1
nested_formats.texi(mymacro,303) @item i--tem 2
nested_formats.texi(mymacro,303) @end itemize
@@ -2400,7 +2400,7 @@
nested_formats.texi(mymacro,303)
nested_formats.texi(mymacro,303) @group
nested_formats.texi(mymacro,303) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,303) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,303) @itemize @bullet{}
nested_formats.texi(mymacro,303) @item i--tem 1
nested_formats.texi(mymacro,303) @item i--tem 2
nested_formats.texi(mymacro,303) @end itemize
@@ -2511,7 +2511,7 @@
nested_formats.texi(mymacro,307) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,307) @end tex
nested_formats.texi(mymacro,307)
-nested_formats.texi(mymacro,307) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,307) @itemize @bullet{}
nested_formats.texi(mymacro,307) @item i--tem 1
nested_formats.texi(mymacro,307) @item i--tem 2
nested_formats.texi(mymacro,307) @end itemize
@@ -2561,7 +2561,7 @@
nested_formats.texi(mymacro,307)
nested_formats.texi(mymacro,307) @group
nested_formats.texi(mymacro,307) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,307) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,307) @itemize @bullet{}
nested_formats.texi(mymacro,307) @item i--tem 1
nested_formats.texi(mymacro,307) @item i--tem 2
nested_formats.texi(mymacro,307) @end itemize
@@ -2674,7 +2674,7 @@
nested_formats.texi(mymacro,313) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,313) @end tex
nested_formats.texi(mymacro,313)
-nested_formats.texi(mymacro,313) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,313) @itemize @bullet{}
nested_formats.texi(mymacro,313) @item i--tem 1
nested_formats.texi(mymacro,313) @item i--tem 2
nested_formats.texi(mymacro,313) @end itemize
@@ -2724,7 +2724,7 @@
nested_formats.texi(mymacro,313)
nested_formats.texi(mymacro,313) @group
nested_formats.texi(mymacro,313) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,313) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,313) @itemize @bullet{}
nested_formats.texi(mymacro,313) @item i--tem 1
nested_formats.texi(mymacro,313) @item i--tem 2
nested_formats.texi(mymacro,313) @end itemize
@@ -2837,7 +2837,7 @@
nested_formats.texi(mymacro,319) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,319) @end tex
nested_formats.texi(mymacro,319)
-nested_formats.texi(mymacro,319) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,319) @itemize @bullet{}
nested_formats.texi(mymacro,319) @item i--tem 1
nested_formats.texi(mymacro,319) @item i--tem 2
nested_formats.texi(mymacro,319) @end itemize
@@ -2887,7 +2887,7 @@
nested_formats.texi(mymacro,319)
nested_formats.texi(mymacro,319) @group
nested_formats.texi(mymacro,319) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,319) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,319) @itemize @bullet{}
nested_formats.texi(mymacro,319) @item i--tem 1
nested_formats.texi(mymacro,319) @item i--tem 2
nested_formats.texi(mymacro,319) @end itemize
@@ -2997,7 +2997,7 @@
nested_formats.texi(mymacro,322) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,322) @end tex
nested_formats.texi(mymacro,322)
-nested_formats.texi(mymacro,322) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,322) @itemize @bullet{}
nested_formats.texi(mymacro,322) @item i--tem 1
nested_formats.texi(mymacro,322) @item i--tem 2
nested_formats.texi(mymacro,322) @end itemize
@@ -3047,7 +3047,7 @@
nested_formats.texi(mymacro,322)
nested_formats.texi(mymacro,322) @group
nested_formats.texi(mymacro,322) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,322) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,322) @itemize @bullet{}
nested_formats.texi(mymacro,322) @item i--tem 1
nested_formats.texi(mymacro,322) @item i--tem 2
nested_formats.texi(mymacro,322) @end itemize
@@ -3158,7 +3158,7 @@
nested_formats.texi(mymacro,326) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,326) @end tex
nested_formats.texi(mymacro,326)
-nested_formats.texi(mymacro,326) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,326) @itemize @bullet{}
nested_formats.texi(mymacro,326) @item i--tem 1
nested_formats.texi(mymacro,326) @item i--tem 2
nested_formats.texi(mymacro,326) @end itemize
@@ -3208,7 +3208,7 @@
nested_formats.texi(mymacro,326)
nested_formats.texi(mymacro,326) @group
nested_formats.texi(mymacro,326) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,326) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,326) @itemize @bullet{}
nested_formats.texi(mymacro,326) @item i--tem 1
nested_formats.texi(mymacro,326) @item i--tem 2
nested_formats.texi(mymacro,326) @end itemize
@@ -3321,7 +3321,7 @@
nested_formats.texi(mymacro,332) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,332) @end tex
nested_formats.texi(mymacro,332)
-nested_formats.texi(mymacro,332) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,332) @itemize @bullet{}
nested_formats.texi(mymacro,332) @item i--tem 1
nested_formats.texi(mymacro,332) @item i--tem 2
nested_formats.texi(mymacro,332) @end itemize
@@ -3371,7 +3371,7 @@
nested_formats.texi(mymacro,332)
nested_formats.texi(mymacro,332) @group
nested_formats.texi(mymacro,332) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,332) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,332) @itemize @bullet{}
nested_formats.texi(mymacro,332) @item i--tem 1
nested_formats.texi(mymacro,332) @item i--tem 2
nested_formats.texi(mymacro,332) @end itemize
@@ -3481,7 +3481,7 @@
nested_formats.texi(mymacro,335) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,335) @end tex
nested_formats.texi(mymacro,335)
-nested_formats.texi(mymacro,335) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,335) @itemize @bullet{}
nested_formats.texi(mymacro,335) @item i--tem 1
nested_formats.texi(mymacro,335) @item i--tem 2
nested_formats.texi(mymacro,335) @end itemize
@@ -3531,7 +3531,7 @@
nested_formats.texi(mymacro,335)
nested_formats.texi(mymacro,335) @group
nested_formats.texi(mymacro,335) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,335) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,335) @itemize @bullet{}
nested_formats.texi(mymacro,335) @item i--tem 1
nested_formats.texi(mymacro,335) @item i--tem 2
nested_formats.texi(mymacro,335) @end itemize
@@ -3641,7 +3641,7 @@
nested_formats.texi(mymacro,338) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,338) @end tex
nested_formats.texi(mymacro,338)
-nested_formats.texi(mymacro,338) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,338) @itemize @bullet{}
nested_formats.texi(mymacro,338) @item i--tem 1
nested_formats.texi(mymacro,338) @item i--tem 2
nested_formats.texi(mymacro,338) @end itemize
@@ -3691,7 +3691,7 @@
nested_formats.texi(mymacro,338)
nested_formats.texi(mymacro,338) @group
nested_formats.texi(mymacro,338) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,338) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,338) @itemize @bullet{}
nested_formats.texi(mymacro,338) @item i--tem 1
nested_formats.texi(mymacro,338) @item i--tem 2
nested_formats.texi(mymacro,338) @end itemize
@@ -3804,7 +3804,7 @@
nested_formats.texi(mymacro,344) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,344) @end tex
nested_formats.texi(mymacro,344)
-nested_formats.texi(mymacro,344) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,344) @itemize @bullet{}
nested_formats.texi(mymacro,344) @item i--tem 1
nested_formats.texi(mymacro,344) @item i--tem 2
nested_formats.texi(mymacro,344) @end itemize
@@ -3854,7 +3854,7 @@
nested_formats.texi(mymacro,344)
nested_formats.texi(mymacro,344) @group
nested_formats.texi(mymacro,344) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,344) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,344) @itemize @bullet{}
nested_formats.texi(mymacro,344) @item i--tem 1
nested_formats.texi(mymacro,344) @item i--tem 2
nested_formats.texi(mymacro,344) @end itemize
@@ -3965,7 +3965,7 @@
nested_formats.texi(mymacro,348) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,348) @end tex
nested_formats.texi(mymacro,348)
-nested_formats.texi(mymacro,348) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,348) @itemize @bullet{}
nested_formats.texi(mymacro,348) @item i--tem 1
nested_formats.texi(mymacro,348) @item i--tem 2
nested_formats.texi(mymacro,348) @end itemize
@@ -4015,7 +4015,7 @@
nested_formats.texi(mymacro,348)
nested_formats.texi(mymacro,348) @group
nested_formats.texi(mymacro,348) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,348) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,348) @itemize @bullet{}
nested_formats.texi(mymacro,348) @item i--tem 1
nested_formats.texi(mymacro,348) @item i--tem 2
nested_formats.texi(mymacro,348) @end itemize
@@ -4127,7 +4127,7 @@
nested_formats.texi(mymacro,353) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,353) @end tex
nested_formats.texi(mymacro,353)
-nested_formats.texi(mymacro,353) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,353) @itemize @bullet{}
nested_formats.texi(mymacro,353) @item i--tem 1
nested_formats.texi(mymacro,353) @item i--tem 2
nested_formats.texi(mymacro,353) @end itemize
@@ -4177,7 +4177,7 @@
nested_formats.texi(mymacro,353)
nested_formats.texi(mymacro,353) @group
nested_formats.texi(mymacro,353) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,353) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,353) @itemize @bullet{}
nested_formats.texi(mymacro,353) @item i--tem 1
nested_formats.texi(mymacro,353) @item i--tem 2
nested_formats.texi(mymacro,353) @end itemize
@@ -4287,7 +4287,7 @@
nested_formats.texi(mymacro,356) $$\partial_t \eta (t) =
g(\eta(t),\varphi(t))$$
nested_formats.texi(mymacro,356) @end tex
nested_formats.texi(mymacro,356)
-nested_formats.texi(mymacro,356) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,356) @itemize @bullet{}
nested_formats.texi(mymacro,356) @item i--tem 1
nested_formats.texi(mymacro,356) @item i--tem 2
nested_formats.texi(mymacro,356) @end itemize
@@ -4337,7 +4337,7 @@
nested_formats.texi(mymacro,356)
nested_formats.texi(mymacro,356) @group
nested_formats.texi(mymacro,356) in macro, a format_command containing some
other commands.
-nested_formats.texi(mymacro,356) @itemize @bullet{} a--n itemize line
+nested_formats.texi(mymacro,356) @itemize @bullet{}
nested_formats.texi(mymacro,356) @item i--tem 1
nested_formats.texi(mymacro,356) @item i--tem 2
nested_formats.texi(mymacro,356) @end itemize
Index: test/nested_formats/res/texi_nested_formats/nested_formats.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/nested_formats/res/texi_nested_formats/nested_formats.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/nested_formats/res/texi_nested_formats/nested_formats.texi 9 Jan
2009 21:20:55 -0000 1.2
+++ test/nested_formats/res/texi_nested_formats/nested_formats.texi 17 Jan
2009 14:30:49 -0000 1.3
@@ -83,7 +83,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -133,7 +133,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -244,7 +244,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -294,7 +294,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -346,7 +346,7 @@
@end group
Call macro in itemize at the beginning of an item
address@hidden @bullet{} a--n itemize line
address@hidden a--n itemize line
@item in macro
@group
@@ -406,7 +406,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -456,7 +456,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -566,7 +566,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -616,7 +616,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -727,7 +727,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -777,7 +777,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -890,7 +890,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -940,7 +940,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1050,7 +1050,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1100,7 +1100,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1211,7 +1211,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1261,7 +1261,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1376,7 +1376,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1426,7 +1426,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1536,7 +1536,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1586,7 +1586,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1697,7 +1697,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1747,7 +1747,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1860,7 +1860,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -1910,7 +1910,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2021,7 +2021,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2071,7 +2071,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2183,7 +2183,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2233,7 +2233,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2351,7 +2351,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2401,7 +2401,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2512,7 +2512,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2562,7 +2562,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2675,7 +2675,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2725,7 +2725,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2838,7 +2838,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2888,7 +2888,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -2998,7 +2998,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3048,7 +3048,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3159,7 +3159,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3209,7 +3209,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3322,7 +3322,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3372,7 +3372,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3482,7 +3482,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3532,7 +3532,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3642,7 +3642,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3692,7 +3692,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3805,7 +3805,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3855,7 +3855,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -3966,7 +3966,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -4016,7 +4016,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -4128,7 +4128,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -4178,7 +4178,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -4288,7 +4288,7 @@
$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$
@end tex
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
@@ -4338,7 +4338,7 @@
@group
in macro, a format_command containing some other commands.
address@hidden @bullet{} a--n itemize line
address@hidden @bullet{}
@item i--tem 1
@item i--tem 2
@end itemize
Index: test/sectionning/res/makeinfo_novalidate_split/index.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/makeinfo_novalidate_split/index.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/sectionning/res/makeinfo_novalidate_split/index.html 9 Jan 2009
16:55:22 -0000 1.5
+++ test/sectionning/res/makeinfo_novalidate_split/index.html 17 Jan 2009
14:30:49 -0000 1.6
@@ -49,7 +49,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">node: </td>
<td valign="middle" align="left">Top</td>
-<td valign="middle" align="left"><a href="novalidate_4.html#second-node"
accesskey="n" rel="next">second node</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
<td valign="middle" align="left"><a href="novalidate_0.html#first"
accesskey="p" rel="previous">first</a></td>
<td valign="middle" align="left">,</td>
@@ -71,7 +71,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">node: </td>
<td valign="middle" align="left">Top</td>
-<td valign="middle" align="left"><a href="novalidate_4.html#second-node"
accesskey="n" rel="next">second node</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
<td valign="middle" align="left"><a href="novalidate_0.html#first"
accesskey="p" rel="previous">first</a></td>
<td valign="middle" align="left">,</td>
Index: test/sectionning/res/makeinfo_novalidate_unsplit/novalidate.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/makeinfo_novalidate_unsplit/novalidate.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/sectionning/res/makeinfo_novalidate_unsplit/novalidate.html 9 Jan
2009 16:55:22 -0000 1.7
+++ test/sectionning/res/makeinfo_novalidate_unsplit/novalidate.html 17 Jan
2009 14:30:49 -0000 1.8
@@ -101,7 +101,7 @@
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">node: </td>
<td valign="middle" align="left">Top</td>
-<td valign="middle" align="left"><a href="#second-node" accesskey="n"
rel="next">second node</a></td>
+<td valign="middle" align="left"></td>
<td valign="middle" align="left">,</td>
<td valign="middle" align="left"><a href="#first" accesskey="p"
rel="previous">first</a></td>
<td valign="middle" align="left">,</td>