[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl examples/...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl examples/... |
|
Date: |
Wed, 03 Sep 2008 10:39:04 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 08/09/03 10:39:04
Modified files:
. : ChangeLog TODO texi2html.pl
examples : docbook.init
test/coverage : float.texi
test/coverage/res/float: float.html
test/coverage/res/texi_float: float.passfirst float.passtexi
float.texi
test/formatting/res/float_docbook: float.xml
test/formatting/res/float_xml: float.xml
test/formatting/res/formatting_docbook: formatting.xml
test/formatting/res/index_in_item_line_vtable:
index_in_item_line_vtable.2
index_in_item_line_vtable.html
test/formatting/res/texi_index_in_item_line_vtable:
index_in_item_line_vtable.2
index_in_item_line_vtable.passfirst
Added files:
test/formatting/res/inter_item_commands: inter_item_commands.2
inter_item_commands.html
test/formatting/res/inter_item_commands_docbook:
inter_item_commands.2
inter_item_commands.xml
test/formatting/res/inter_item_commands_xml:
inter_item_commands.2
inter_item_commands.xml
test/formatting/res/texi_inter_item_commands:
inter_item_commands.2
inter_item_commands.passfirst
inter_item_commands.passtexi
inter_item_commands.texi
Log message:
* texi2html.pl: add prepare_state_multiple_pass function to ease
formatting more than once specific texts (in index entries,
prepended
in @itemize, @caption formatting outside of document...) as if
they were in special regions (@copying, @titlepage...).
* examples/docbook: create valid docbook in @?(v|f)table taking
into account the strictness of docbook.
Remove title for text before first item, docbook handles right
anything before the real table beginning.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.320&r2=1.321
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.229&r2=1.230
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/docbook.init?cvsroot=texi2html&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/float.texi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/float/float.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_float/float.passfirst?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_float/float.passtexi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res/texi_float/float.texi?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/float_docbook/float.xml?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/float_xml/float.xml?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/formatting_docbook/formatting.xml?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/inter_item_commands/inter_item_commands.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/inter_item_commands/inter_item_commands.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/inter_item_commands_docbook/inter_item_commands.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/inter_item_commands_docbook/inter_item_commands.xml?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/inter_item_commands_xml/inter_item_commands.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/inter_item_commands_xml/inter_item_commands.xml?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2?cvsroot=texi2html&rev=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_inter_item_commands/inter_item_commands.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_inter_item_commands/inter_item_commands.passfirst?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_inter_item_commands/inter_item_commands.passtexi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_inter_item_commands/inter_item_commands.texi?cvsroot=texi2html&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -b -r1.320 -r1.321
--- ChangeLog 2 Sep 2008 12:06:51 -0000 1.320
+++ ChangeLog 3 Sep 2008 10:38:57 -0000 1.321
@@ -1,3 +1,14 @@
+2008-09-03 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: add prepare_state_multiple_pass function to ease
+ formatting more than once specific texts (in index entries, prepended
+ in @itemize, @caption formatting outside of document...) as if
+ they were in special regions (@copying, @titlepage...).
+ * examples/docbook: create valid docbook in @?(v|f)table taking
+ into account the strictness of docbook.
+ Remove title for text before first item, docbook handles right
+ anything before the real table beginning.
+
2008-09-02 Patrice Dumas <address@hidden>
* texi2html.pl, texi2html.init: section names and headings cross
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- TODO 2 Sep 2008 12:06:52 -0000 1.56
+++ TODO 3 Sep 2008 10:38:58 -0000 1.57
@@ -290,8 +290,6 @@
* decide @documentencoding @. And maybe change regexp.
-* only_inter_item_commands doesn't seems to work in docbook listitem
-
* html32 is not up to date:
Error at line 2159, character 8: unknown entity "euro"
Error at line 2161, character 7: unknown entity "le"
@@ -312,11 +310,13 @@
* verify that code_style is used for code_style style @-commands
in remove_texi.
-* docbook is very picky in variablelist.
-valistentry has (term+ , listitem). So one have to create empty listitem
-if needed.
-Also no paragraph in title.
-And in function only replaceable and type. And in replaceable, nothing.
+* docbook: in function no style.
+ replaceable is for @var or function argument. Only characters.
+
+ Instead of synopsis may use specialized synopsis, funcsynopsis/funcprototype
+ for deftype*, funcdef for defffn, ooclass for object oriented.
+
+ also informalfigure in @float
* to solve above issue, the definition arg formatted with simple_format
should alo be passed down
@@ -352,6 +352,3 @@
@subtitle subtitle
@author by Somebody and Someone
@author and Other people
-
-
-rerun all tests
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -b -r1.229 -r1.230
--- texi2html.pl 2 Sep 2008 12:06:53 -0000 1.229
+++ texi2html.pl 3 Sep 2008 10:38:58 -0000 1.230
@@ -60,7 +60,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.229 2008/09/02 12:06:53 pertusus Exp $
+# $Id: texi2html.pl,v 1.230 2008/09/03 10:38:58 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -6445,7 +6445,7 @@
{
my $prefix = shift;
my $line_nr = shift;
- my $key = shift;
+ my $entry = shift;
my $place = shift;
my $element = shift;
my $use_section_id = shift;
@@ -6454,19 +6454,20 @@
unless ($index_prefix_to_name{$prefix})
{
echo_error ("Undefined index command: ${prefix}index", $line_nr);
- $key = '';
+ $entry = '';
}
if (!exists($element->{'tag'}) and !$element->{'footnote'})
{
- echo_warn ("Index entry before document: address@hidden $key",
$line_nr);
+ echo_warn ("Index entry before document: address@hidden $entry",
$line_nr);
}
#print STDERR "($region) $key" if $region;
- $key =~ s/\s+$//;
- $key =~ s/^\s*//;
- my $entry = $key;
- # The $key is mostly usefull for alphabetical sorting
+ $entry =~ s/\s+$//;
+ $entry =~ s/^\s*//;
+ # The $key is mostly usefull for alphabetical sorting.
+ # beware that an entry beginning with a format will lead to an empty
+ # key, but with some texi.
# FIXME this should be done later, during formatting.
- $key = remove_texi($key);
+ my $key = remove_texi($entry);
my $id = '';
my $index_entry_hidden = (($place eq $no_element_associated_place) or
$region);
@@ -6488,9 +6489,9 @@
'prefix' => $prefix
};
- print STDERR "# enter address@hidden ${prefix}index '$key' with id $id
($index_entry)\n"
+ print STDERR "# enter address@hidden ${prefix}index($key) [$entry] with id
$id ($index_entry)\n"
if ($T2H_DEBUG & $DEBUG_INDEX);
- if ($key =~ /^\s*$/)
+ if ($entry =~ /^\s*$/)
{
# makeinfo doesn't warn, but texi2dvi breaks.
echo_warn("Empty index entry for address@hidden",$line_nr);
@@ -8863,6 +8864,23 @@
push @{$state->{'preformatted_stack'}}, $format_style;
}
+sub prepare_state_multiple_pass($$)
+{
+ my $command = shift;
+ my $state = shift;
+ my $return_state = {
+ 'multiple_pass' => 1,
+ 'region_pass' => 1,
+ 'element' => $state->{'element'},
+ };
+ if (defined($command))
+ {
+ $return_state->{'region'} = $command;
+ $return_state->{'command_stack'} = ["$command"];
+ }
+ return $return_state;
+}
+
sub begin_format($$$$$$);
sub begin_format($$$$$$)
@@ -9038,7 +9056,7 @@
($prepended, $command) = parse_format_command($line,$macro);
$command = 'asis' if (($command eq '') and ($macro ne 'itemize'));
my $prepended_formatted;
- $prepended_formatted = substitute_line($prepended,
{'multiple_pass' => 1}) if (defined($prepended));
+ $prepended_formatted = substitute_line($prepended,
prepare_state_multiple_pass('item', $state)) if (defined($prepended));
$format = { 'format' => $macro, 'text' => '', 'command' =>
$command, 'prepended' => $prepended, 'prepended_formatted' =>
$prepended_formatted };
$line = '';
}
@@ -9062,7 +9080,7 @@
{
foreach my $prototype (@$prototype_row)
{
- push @prototype_lengths,
2+length(substitute_line($prototype, {'multiple_pass' => 1}));
+ push @prototype_lengths,
2+length(substitute_line($prototype,
prepare_state_multiple_pass('columnfractions', $state)));
}
}
$format = { 'format' => $macro, 'text' => '', 'max_columns' =>
$max_columns, 'columnfractions' => $fractions, 'prototype_row' =>
$prototype_row, 'prototype_lengths' => address@hidden, 'cell' => 1 };
@@ -9593,7 +9611,7 @@
my @texi_lines = map {$_ = $_."\n"} split (/\n/, $text_texi);
$float->{"${command}_texi"} = address@hidden;
return &$Texi2HTML::Config::caption_shortcaption_command($command,
- substitute_text({ 'multiple_pass' => 1, 'region' => $command,
'region_pass' => 1, 'command_stack' => ["$command"]} , undef, @texi_lines),
address@hidden, $float);
+ substitute_text(prepare_state_multiple_pass($command, $state) , undef,
@texi_lines), address@hidden, $float);
}
# function called when a @float is encountered. Don't do any output
@@ -11252,12 +11270,12 @@
elsif (index_command_prefix($macro) ne '')
{ # if we are already in a (v|f)table the construct is quite
# wrong
- # FIXME but could be made acceptable if needed
- if ($state->{'item'})
- {
- echo_error("ignored address@hidden already in an
address@hidden>{'item'} entry", $line_nr);
- next;
- }
+ # FIXME should it be discarded?
+ # if ($state->{'item'})
+ # {
+ # echo_error("ignored address@hidden already in an
address@hidden>{'item'} entry", $line_nr);
+ # next;
+ # }
my $index_prefix = index_command_prefix($macro);
my $key = $cline;
$key =~ s/^\s*//;
@@ -12001,7 +12019,7 @@
# the caption has already been formatted,
# and these have been handled at the right place
# FIXME footnotes?
- my $caption = substitute_text({ 'multiple_pass'
=> 1, 'region' => 'listoffloats', 'region_pass' => 1 }, undef, @$caption_lines);
+ my $caption =
substitute_text(prepare_state_multiple_pass($macro, $state), undef,
@$caption_lines);
push @listoffloats_entries,
&$Texi2HTML::Config::listoffloats_entry($arg, $float, $float_style, $caption,
href($float, $state->{'element'}->{'file'}, $line_nr));
}
add_prev($text, $stack,
&$Texi2HTML::Config::listoffloats($arg, $style, address@hidden));
@@ -12230,7 +12248,7 @@
chomp($entry_texi);
$entry_texi =~ s/\s*$//;
# FIXME multiple_pass?
- my $entry_text = substitute_line($entry_texi);
+ my $entry_text = substitute_line($entry_texi,
prepare_state_multiple_pass($macro, $state));
my ($index_entry, $index_label) =
do_index_entry_label($macro,$state,$line_nr);
if (defined($index_entry))
@@ -12689,7 +12707,7 @@
{
my $index_entry;
($index_entry, $index_label) =
do_index_entry_label($format->{'format'}, $state,$line_nr);
- print STDERR "Bug: no index entry for $text" unless
defined($index_label);
+ print STDERR "Bug: no index entry for $term->{'text'}" unless
defined($index_label);
}
add_prev($text, $stack, &$Texi2HTML::Config::table_item($term->{'text'},
$index_label,$format->{'format'},$format->{'command'},
$formatted_command,$state->{'command_stack'}, $term_formatted, $leading_spaces,
$trailing_spaces, $format->{'item_cmd'}));
#$state->{'no_paragraph'}--;
@@ -13764,11 +13782,11 @@
echo_warn ("Waiting for index cmd address@hidden>{'command'}, got
address@hidden", $line_nr);
}
- print STDERR "[(index $command) $entry->{'entry'} $entry->{'label'}]\n"
+ print STDERR "(index $command) [$entry->{'entry'}] $entry->{'label'}\n"
if ($T2H_DEBUG & $DEBUG_INDEX);
- return ($entry, &$Texi2HTML::Config::index_entry_label ($entry->{'label'},
$state->{'preformatted'}, substitute_line($entry->{'entry'}),
+ return ($entry, &$Texi2HTML::Config::index_entry_label ($entry->{'label'},
$state->{'preformatted'}, substitute_line($entry->{'entry'},
prepare_state_multiple_pass("${command}_index", $state)),
$index_prefix_to_name{$entry->{'prefix'}},
- $command, $entry->{'texi'}, substitute_line($entry->{'texi'})));
+ $command, $entry->{'texi'}, substitute_line($entry->{'texi'},
prepare_state_multiple_pass("${command}_index", $state))));
}
# decompose a decimal number on a given base. The algorithm looks like
Index: examples/docbook.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/docbook.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- examples/docbook.init 1 Sep 2008 14:48:27 -0000 1.7
+++ examples/docbook.init 3 Sep 2008 10:38:59 -0000 1.8
@@ -195,7 +195,7 @@
%pre_map = %things_map;
-delete $inter_item_commands{'cindex'};
+#delete $inter_item_commands{'cindex'};
#$no_pagraph_commands{'cindex'} = 0;
$no_pagraph_commands{'float'} = 0;
@@ -1059,6 +1059,16 @@
return "<entry>" . $text . '</entry>';
}
+# if varlistentry_state is > 0 it means that a varlistentry is opened.
+# if varlistentry_state is == 2 it means that we are in a succession
+# of term
+# if varlistentry_state is == 1 it means that we are in the line
+# Having a listitem in a varlistentry is a must, so an empty
+# listitem is added if a varlistentry is closed and varlistentry_state == 2
+#
+# varlistentry acceps only term and listitem, so inter_item_commands
+# are put in the next term, or, if at the end of the table in a last
+# listitem
sub docbook_table_item($$$$$$$$$)
{
my $text = shift;
@@ -1084,10 +1094,22 @@
}
my $result = '';
+ if (defined($docbook_table_stack[-1]->{'inter_item'}))
+ {
+ $formatted_command = $docbook_table_stack[-1]->{'inter_item'} .
$formatted_command;
+ delete $docbook_table_stack[-1]->{'inter_item'};
+ }
if ($item_cmd eq 'item')
{
- $result .= '</varlistentry>' if ($docbook_table_stack[-1] == 1);
- $docbook_table_stack[-1] = 1;
+ if ($docbook_table_stack[-1]->{'varlistentry_state'} == 2)
+ {
+ $result .= "<listitem><para><!-- empty table line
--></para></listitem>";
+ }
+ if ($docbook_table_stack[-1]->{'varlistentry_state'} >= 1)
+ {
+ $result .= '</varlistentry>';
+ }
+ $docbook_table_stack[-1]->{'varlistentry_state'} = 2;
$result .= '<varlistentry>';
}
$result .= '<term>';
@@ -1107,8 +1129,22 @@
if ($text =~ /\S/)
{
- return "<listitem>$text</listitem>" unless $only_inter_item_commands;
- return $text;
+ if ($before_items)
+ {
+ return $text
+ }
+
+ if ($only_inter_item_commands)
+ {
+ $docbook_table_stack[-1]->{'inter_item'} = $text;
+ return '';
+ }
+ else
+ {
+ $docbook_table_stack[-1]->{'varlistentry_state'} = 1;
+ return "<listitem>$text</listitem>";
+ }
+ #return $text;
}
else
{
@@ -1135,8 +1171,8 @@
#my $prep_t = 'UNDEF'; $prep_t = $prepended if (defined($prepended));
#$item_nr = 0 if (!defined($item_nr));
#print STDERR " $item_nr --> $prep_t|${text}!!!!!\n";
- return $text if ($only_inter_item_commands and $before_items);
- return '<title>' . $text. '</title>' if ($before_items);
+ #return $text if ($only_inter_item_commands and $before_items);
+ return $text if ($before_items);
return '<listitem>' . $text . "</listitem>\n";
}
@@ -1230,7 +1266,16 @@
elsif ($format_command =~ /^(v|f)?table$/)
{
$result = docbook_add_id('variablelist').'>';
- $text .= '</varlistentry>' if ($docbook_table_stack[-1] == 1);
+ if (defined($docbook_table_stack[-1]->{'inter_item'}))
+ { # there is a para in case there is only a comment, to avoid
+ # an empty listitem
+ $text .=
"<listitem><para>$docbook_table_stack[-1]->{'inter_item'}</para></listitem>";
+ }
+ elsif ($docbook_table_stack[-1]->{'varlistentry_state'} == 2)
+ {
+ $text .= "<listitem><para><!-- empty table line
--></para></listitem>";
+ }
+ $text .= '</varlistentry>' if
($docbook_table_stack[-1]->{'varlistentry_state'} >= 1);
pop @docbook_table_stack;
return $result . "$text</variablelist>\n";
}
@@ -1242,8 +1287,9 @@
my $line = shift;
my $state = shift;
+ $pending_inter_item_text = undef; # if ($command =~ /^(v|f)?table/);
push (@docbook_multitable_stack, -1) if ($command eq 'multitable');
- push (@docbook_table_stack, 0) if ($command =~ /^(v|f)?table/);
+ push (@docbook_table_stack, {'varlistentry_state' => 0}) if ($command =~
/^(v|f)?table/);
return $line;
}
Index: test/coverage/float.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/float.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/float.texi 19 Aug 2008 14:52:13 -0000 1.2
+++ test/coverage/float.texi 3 Sep 2008 10:38:59 -0000 1.3
@@ -62,6 +62,8 @@
example
@end example
address@hidden in caption}
+
A table.
@table @emph
@item truc
@@ -152,6 +154,48 @@
@caption{Text in chapter}
@end float
address@hidden Text, float with a lot of features and no shortcaption
+
+Float text of a float with a lot of features.
+
address@hidden An example of float address@hidden 2
+An example 2.
address@hidden
+example 2
address@hidden example
+
+A table 2.
address@hidden @emph
address@hidden truc 2
+line 2
address@hidden table
+
+A multitable 2.
address@hidden {truc} {bidule}
address@hidden truc 2 @tab bidule
address@hidden truc 2 @tab bidule
address@hidden multitable
+An index entry 2
address@hidden float example in caption 2
+
+An itemize 2.
address@hidden @minus
address@hidden truc 2
+line
address@hidden itemize
+
address@hidden in caption 2}
+
+A ref 2.
address@hidden,xref Text with features caption}.
+A footnote 2.
address@hidden Text with features caption 2}.
+
address@hidden and @address@hidden@'address@hidden@address@hidden @sc{and}
@verb{!it is @verb!} @ a address@hidden @!@@ @AE{}.
+}
+
address@hidden float
+
@float th@'address@hidden, theoreme
A th@'address@hidden
Index: test/coverage/res/float/float.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/res/float/float.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/coverage/res/float/float.html 2 Sep 2008 12:07:08 -0000 1.5
+++ test/coverage/res/float/float.html 3 Sep 2008 10:38:59 -0000 1.6
@@ -56,10 +56,45 @@
</p></dd>
<dt><a href="#text-in-chapter">Text 1.1</a></dt><dd><p>Text in chapter
</p></dd>
-<dt><a href="#text-in-section">Text 1.2</a></dt><dd></dd>
-<dt><a href="#unnumbered-float">Text 4</a></dt><dd><p>unnumbered float
+<dt><a href="#float-with-a-lot-of-features-and-no-shortcaption">Text
1.2</a></dt><dd><p> An example of float caption<small
class="enddots">...</small> 2
+An example 2.
+</p><table><tr><td> </td><td><pre class="example">example 2
+</pre></td></tr></table>
+
+<p>A table 2.
+</p><dl compact="compact">
+<dt> <em>truc 2</em> </dt>
+<dd><p>line 2
</p></dd>
-<dt><a href="#Section-within-unnumbered-float">Text 5</a></dt><dd><p>Section
within unnumbered
+</dl>
+
+<p>A multitable 2.
+</p><table>
+<tr><td><p> truc 2 </p></td><td><p> bidule
+</p></td></tr>
+<tr><td><p> truc 2 </p></td><td><p> bidule
+</p></td></tr>
+</table>
+<p>An index entry 2
+</p>
+<p>An itemize 2.
+</p><ul class="toc">
+<li>- truc 2
+line
+</li></ul>
+
+
+<p>A ref 2.
+See section <a href="#Top">xref Text with features caption</a>.
+A footnote 2.
+<a href="#t_hlistoffloats_FOOT1">(1)</a>.
+</p>
+<p>TeX and <em><b>téî</b><a href="an_url">an_url</a></em>
<small>AND</small> <tt>it is @verb</tt> a word !@ Æ.
+</p></dd>
+<dt><a href="#text-in-section">Text 1.3</a></dt><dd></dd>
+<dt><a href="#unnumbered-float">Text 5</a></dt><dd><p>unnumbered float
+</p></dd>
+<dt><a href="#Section-within-unnumbered-float">Text 6</a></dt><dd><p>Section
within unnumbered
</p></dd>
<dt><a href="#Chapter-with-subsec-float">Text 2.1</a></dt><dd><p>Chapter with
subsec
</p></dd>
@@ -127,6 +162,8 @@
</strong></p><table><tr><td> </td><td><pre class="example"><strong>example
</strong></pre></td></tr></table>
+<p><strong><a name="Anchor-in-caption"></a>
+</strong></p>
<p><strong>A table.
</strong></p><dl compact="compact">
<dt> <em>truc</em> </dt>
@@ -239,6 +276,50 @@
</div><p><strong>Text 1.1: Text in chapter
</strong>
</p>
+<div class="float"><a
name="float-with-a-lot-of-features-and-no-shortcaption"></a>
+
+<p>Float text of a float with a lot of features.
+</p>
+
+
+</div><p><strong>Text 1.2: An example of float caption<small
class="enddots">...</small> 2
+An example 2.
+</strong></p><table><tr><td> </td><td><pre
class="example"><strong>example 2
+</strong></pre></td></tr></table>
+
+<p><strong>A table 2.
+</strong></p><dl compact="compact">
+<dt> <em>truc 2</em> </dt>
+<dd><p><strong>line 2
+</strong></p></dd>
+</dl>
+
+<p><strong>A multitable 2.
+</strong></p><table>
+<tr><td><p><strong> truc 2 </strong></p></td><td><p><strong> bidule
+</strong></p></td></tr>
+<tr><td><p><strong> truc 2 </strong></p></td><td><p><strong> bidule
+</strong></p></td></tr>
+</table>
+<p><strong>An index entry 2
+<a name="index-float-example-in-caption-2"></a>
+</strong></p>
+<p><strong>An itemize 2.
+</strong></p><ul class="toc">
+<li>-<strong> truc 2
+line
+</strong></li></ul>
+
+<p><strong><a name="Anchor-in-caption-2"></a>
+</strong></p>
+<p><strong>A ref 2.
+See section <a href="#Top">xref Text with features caption</a>.
+A footnote 2.
+<a name="DOCF3" href="#FOOT3">(3)</a>.
+</strong></p>
+<p><strong>TeX and <em><b>téî</b><a href="an_url">an_url</a></em>
<small>AND</small> <tt>it is @verb</tt> a word !@ Æ.
+</strong>
+</p>
<div class="float"><a name="theoreme"></a>
<p>A théorème
</p>
@@ -292,7 +373,7 @@
<p>A text in float no caption a label a type.
</p>
-</div><p><strong>Text 1.2</strong>
+</div><p><strong>Text 1.3</strong>
</p>
<hr size="6">
<a name="Unnumbered"></a>
@@ -323,7 +404,7 @@
<p>unnum
-</p></div><p><strong>Text 4: unnumbered float
+</p></div><p><strong>Text 5: unnumbered float
</strong>
</p>
<div class="float"><a name="label-but-no-type-in-unnumbered"></a>
@@ -361,7 +442,7 @@
<p>Section within unnumbered
-</p></div><p><strong>Text 5: Section within unnumbered
+</p></div><p><strong>Text 6: Section within unnumbered
</strong>
</p>
<hr size="6">
@@ -473,10 +554,45 @@
</p></dd>
<dt><a href="#text-in-chapter">Text 1.1</a></dt><dd><p>Text in chapter
</p></dd>
-<dt><a href="#text-in-section">Text 1.2</a></dt><dd></dd>
-<dt><a href="#unnumbered-float">Text 4</a></dt><dd><p>unnumbered float
+<dt><a href="#float-with-a-lot-of-features-and-no-shortcaption">Text
1.2</a></dt><dd><p> An example of float caption<small
class="enddots">...</small> 2
+An example 2.
+</p><table><tr><td> </td><td><pre class="example">example 2
+</pre></td></tr></table>
+
+<p>A table 2.
+</p><dl compact="compact">
+<dt> <em>truc 2</em> </dt>
+<dd><p>line 2
+</p></dd>
+</dl>
+
+<p>A multitable 2.
+</p><table>
+<tr><td><p> truc 2 </p></td><td><p> bidule
+</p></td></tr>
+<tr><td><p> truc 2 </p></td><td><p> bidule
+</p></td></tr>
+</table>
+<p>An index entry 2
+</p>
+<p>An itemize 2.
+</p><ul class="toc">
+<li>- truc 2
+line
+</li></ul>
+
+
+<p>A ref 2.
+See section <a href="#Top">xref Text with features caption</a>.
+A footnote 2.
+<a href="#t_hlistoffloats_FOOT1">(1)</a>.
+</p>
+<p>TeX and <em><b>téî</b><a href="an_url">an_url</a></em>
<small>AND</small> <tt>it is @verb</tt> a word !@ Æ.
+</p></dd>
+<dt><a href="#text-in-section">Text 1.3</a></dt><dd></dd>
+<dt><a href="#unnumbered-float">Text 5</a></dt><dd><p>unnumbered float
</p></dd>
-<dt><a href="#Section-within-unnumbered-float">Text 5</a></dt><dd><p>Section
within unnumbered
+<dt><a href="#Section-within-unnumbered-float">Text 6</a></dt><dd><p>Section
within unnumbered
</p></dd>
<dt><a href="#Chapter-with-subsec-float">Text 2.1</a></dt><dd><p>Chapter with
subsec
</p></dd>
@@ -497,6 +613,7 @@
<tr><th><a
name="list-of-floats-1_cp_letter-F">F</a></th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a href="#index-float-example">float
example</a></td><td valign="top"><a href="#Top">Test floats</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-float-example-in-caption">float
example in caption</a></td><td valign="top"><a href="#Top">Test
floats</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-float-example-in-caption-2">float example in caption 2</a></td><td
valign="top"><a href="#chapter">1. A chapter</a></td></tr>
<tr><td colspan="3"> <hr></td></tr>
</table>
<table><tr><th valign="top">Jump to: </th><td><a
href="#list-of-floats-1_cp_letter-F" class="summary-letter"><b>F</b></a>
@@ -516,6 +633,8 @@
<p>footnote Text with features
</p><h3><a name="FOOT2" href="#DOCF2">(2)</a></h3>
<p>footnote Text with features caption
+</p><h3><a name="FOOT3" href="#DOCF3">(3)</a></h3>
+<p>footnote Text with features caption 2
</p><hr size="1">
<a name="SEC_About"></a>
<table cellpadding="1" cellspacing="1" border="0">
Index: test/coverage/res/texi_float/float.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/texi_float/float.passfirst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res/texi_float/float.passfirst 19 Aug 2008 14:52:14
-0000 1.2
+++ test/coverage/res/texi_float/float.passfirst 3 Sep 2008 10:39:00
-0000 1.3
@@ -59,208 +59,252 @@
float.texi(,62) example
float.texi(,63) @end example
float.texi(,64)
-float.texi(,65) A table.
-float.texi(,66) @table @emph
-float.texi(,67) @item truc
-float.texi(,68) line
-float.texi(,69) @end table
-float.texi(,70)
-float.texi(,71) A multitable.
-float.texi(,72) @multitable {truc} {bidule}
-float.texi(,73) @item truc @tab bidule
-float.texi(,74) @item truc @tab bidule
-float.texi(,75) @end multitable
-float.texi(,76) An index entry
-float.texi(,77) @cindex float example in caption
-float.texi(,78)
-float.texi(,79) An itemize.
-float.texi(,80) @itemize @minus
-float.texi(,81) @item truc
-float.texi(,82) line
-float.texi(,83) @end itemize
-float.texi(,84)
-float.texi(,85) A ref.
-float.texi(,86) @xref{Top,xref Text with features caption}.
-float.texi(,87) A footnote.
-float.texi(,88) @footnote{footnote Text with features caption}.
-float.texi(,89)
-float.texi(,90) @TeX{} and @address@hidden@'address@hidden@address@hidden
@sc{and} @verb{!it is @verb!} @ a address@hidden @!@@ @AE{}.
-float.texi(,91) }
-float.texi(,92)
-float.texi(,93) @address@hidden and
@address@hidden@'address@hidden@address@hidden @sc{and} @verb{!it is @verb!} @
a address@hidden @!@@ @AE{}.}
+float.texi(,65) @anchor{Anchor in caption}
+float.texi(,66)
+float.texi(,67) A table.
+float.texi(,68) @table @emph
+float.texi(,69) @item truc
+float.texi(,70) line
+float.texi(,71) @end table
+float.texi(,72)
+float.texi(,73) A multitable.
+float.texi(,74) @multitable {truc} {bidule}
+float.texi(,75) @item truc @tab bidule
+float.texi(,76) @item truc @tab bidule
+float.texi(,77) @end multitable
+float.texi(,78) An index entry
+float.texi(,79) @cindex float example in caption
+float.texi(,80)
+float.texi(,81) An itemize.
+float.texi(,82) @itemize @minus
+float.texi(,83) @item truc
+float.texi(,84) line
+float.texi(,85) @end itemize
+float.texi(,86)
+float.texi(,87) A ref.
+float.texi(,88) @xref{Top,xref Text with features caption}.
+float.texi(,89) A footnote.
+float.texi(,90) @footnote{footnote Text with features caption}.
+float.texi(,91)
+float.texi(,92) @TeX{} and @address@hidden@'address@hidden@address@hidden
@sc{and} @verb{!it is @verb!} @ a address@hidden @!@@ @AE{}.
+float.texi(,93) }
float.texi(,94)
-float.texi(,95) @end float
+float.texi(,95) @address@hidden and
@address@hidden@'address@hidden@address@hidden @sc{and} @verb{!it is @verb!} @
a address@hidden @!@@ @AE{}.}
float.texi(,96)
-float.texi(,97)
-float.texi(,98) @float Text
-float.texi(,99) No label but caption and shortcaption.
-float.texi(,100)
-float.texi(,101) @caption{No label}
-float.texi(,102) @shortcaption{No label}
-float.texi(,103) @end float
-float.texi(,104)
-float.texi(,105) @float ,label but no type
-float.texi(,106) No type but caption and shortcaption.
-float.texi(,107)
-float.texi(,108) @caption{No type}
-float.texi(,109) @shortcaption{No type}
-float.texi(,110) @end float
-float.texi(,111)
-float.texi(,112)
-float.texi(,113) @float ,label but no type and no caption
-float.texi(,114) No type but label and no caption nor shortcaption.
-float.texi(,115)
-float.texi(,116) @end float
+float.texi(,97) @end float
+float.texi(,98)
+float.texi(,99)
+float.texi(,100) @float Text
+float.texi(,101) No label but caption and shortcaption.
+float.texi(,102)
+float.texi(,103) @caption{No label}
+float.texi(,104) @shortcaption{No label}
+float.texi(,105) @end float
+float.texi(,106)
+float.texi(,107) @float ,label but no type
+float.texi(,108) No type but caption and shortcaption.
+float.texi(,109)
+float.texi(,110) @caption{No type}
+float.texi(,111) @shortcaption{No type}
+float.texi(,112) @end float
+float.texi(,113)
+float.texi(,114)
+float.texi(,115) @float ,label but no type and no caption
+float.texi(,116) No type but label and no caption nor shortcaption.
float.texi(,117)
-float.texi(,118)
-float.texi(,119) @float
-float.texi(,120) No label, no type, no caption no shortcaption.
-float.texi(,121)
-float.texi(,122) @end float
+float.texi(,118) @end float
+float.texi(,119)
+float.texi(,120)
+float.texi(,121) @float
+float.texi(,122) No label, no type, no caption no shortcaption.
float.texi(,123)
-float.texi(,124) @float
-float.texi(,125) No label, no type, but caption and shortcaption.
-float.texi(,126) @caption{No label, no type, but caption and shortcaption.}
-float.texi(,127) @shortcaption{No label, no type, but caption and
shortcaption.}
-float.texi(,128) @end float
-float.texi(,129)
-float.texi(,130)
+float.texi(,124) @end float
+float.texi(,125)
+float.texi(,126) @float
+float.texi(,127) No label, no type, but caption and shortcaption.
+float.texi(,128) @caption{No label, no type, but caption and shortcaption.}
+float.texi(,129) @shortcaption{No label, no type, but caption and
shortcaption.}
+float.texi(,130) @end float
float.texi(,131)
-float.texi(,132) @float ,label but no type 2
-float.texi(,133) Second float with no type.
-float.texi(,134)
-float.texi(,135) @caption{No type 2}
-float.texi(,136) @shortcaption{No type 2}
-float.texi(,137) @end float
-float.texi(,138)
-float.texi(,139) @float Warning, warning in top
-float.texi(,140) A warning
-float.texi(,141)
-float.texi(,142) @caption{A warning}
-float.texi(,143) @shortcaption{A warning}
-float.texi(,144) @end float
-float.texi(,145)
-float.texi(,146) @node chapter
-float.texi(,147) @chapter A chapter
-float.texi(,148)
-float.texi(,149) @float Text, text in chapter
-float.texi(,150) Text in chapter
-float.texi(,151)
-float.texi(,152) @caption{Text in chapter}
-float.texi(,153) @end float
-float.texi(,154)
-float.texi(,155) @float th@'address@hidden, theoreme
-float.texi(,156) A th@'address@hidden
-float.texi(,157)
-float.texi(,158) @caption{A th@'address@hidden
-float.texi(,159) @end float
+float.texi(,132)
+float.texi(,133)
+float.texi(,134) @float ,label but no type 2
+float.texi(,135) Second float with no type.
+float.texi(,136)
+float.texi(,137) @caption{No type 2}
+float.texi(,138) @shortcaption{No type 2}
+float.texi(,139) @end float
+float.texi(,140)
+float.texi(,141) @float Warning, warning in top
+float.texi(,142) A warning
+float.texi(,143)
+float.texi(,144) @caption{A warning}
+float.texi(,145) @shortcaption{A warning}
+float.texi(,146) @end float
+float.texi(,147)
+float.texi(,148) @node chapter
+float.texi(,149) @chapter A chapter
+float.texi(,150)
+float.texi(,151) @float Text, text in chapter
+float.texi(,152) Text in chapter
+float.texi(,153)
+float.texi(,154) @caption{Text in chapter}
+float.texi(,155) @end float
+float.texi(,156)
+float.texi(,157) @float Text, float with a lot of features and no shortcaption
+float.texi(,158)
+float.texi(,159) Float text of a float with a lot of features.
float.texi(,160)
-float.texi(,161) @float ,label but no type in chapter
-float.texi(,162) float with no type.
-float.texi(,163)
-float.texi(,164) @caption{No type in chapter}
-float.texi(,165) @shortcaption{No type in chapter}
-float.texi(,166) @end float
-float.texi(,167)
-float.texi(,168) @float Warning, warning in chapter
-float.texi(,169) A warning
-float.texi(,170)
-float.texi(,171) @caption{A warning in chapter}
-float.texi(,172) @shortcaption{A warning in chapter}
-float.texi(,173) @end float
-float.texi(,174)
-float.texi(,175) @menu
-float.texi(,176) * section::
-float.texi(,177) @end menu
-float.texi(,178)
-float.texi(,179) @node section
-float.texi(,180) @section A section
-float.texi(,181)
-float.texi(,182) @float Text, text in section
-float.texi(,183)
-float.texi(,184) A text in float no caption a label a type.
-float.texi(,185)
-float.texi(,186) @end float
-float.texi(,187)
-float.texi(,188) @node Unnumbered
-float.texi(,189) @unnumbered Unnumbered
-float.texi(,190)
-float.texi(,191) @menu
-float.texi(,192) * Section within unnumbered::
-float.texi(,193) @end menu
-float.texi(,194) @float Text, unnumbered float
-float.texi(,195) unnum
-float.texi(,196) @shortcaption{unnumbered float}
-float.texi(,197) @caption{unnumbered float}
-float.texi(,198) @end float
-float.texi(,199)
-float.texi(,200) @float ,label but no type in unnumbered
-float.texi(,201) float with no type.
-float.texi(,202)
-float.texi(,203) @caption{No type in unnumbered}
-float.texi(,204) @shortcaption{No type in unnumbered}
-float.texi(,205) @end float
-float.texi(,206)
+float.texi(,161) @caption{ An example of float address@hidden 2
+float.texi(,162) An example 2.
+float.texi(,163) @example
+float.texi(,164) example 2
+float.texi(,165) @end example
+float.texi(,166)
+float.texi(,167) A table 2.
+float.texi(,168) @table @emph
+float.texi(,169) @item truc 2
+float.texi(,170) line 2
+float.texi(,171) @end table
+float.texi(,172)
+float.texi(,173) A multitable 2.
+float.texi(,174) @multitable {truc} {bidule}
+float.texi(,175) @item truc 2 @tab bidule
+float.texi(,176) @item truc 2 @tab bidule
+float.texi(,177) @end multitable
+float.texi(,178) An index entry 2
+float.texi(,179) @cindex float example in caption 2
+float.texi(,180)
+float.texi(,181) An itemize 2.
+float.texi(,182) @itemize @minus
+float.texi(,183) @item truc 2
+float.texi(,184) line
+float.texi(,185) @end itemize
+float.texi(,186)
+float.texi(,187) @anchor{Anchor in caption 2}
+float.texi(,188)
+float.texi(,189) A ref 2.
+float.texi(,190) @xref{Top,xref Text with features caption}.
+float.texi(,191) A footnote 2.
+float.texi(,192) @footnote{footnote Text with features caption 2}.
+float.texi(,193)
+float.texi(,194) @TeX{} and @address@hidden@'address@hidden@address@hidden
@sc{and} @verb{!it is @verb!} @ a address@hidden @!@@ @AE{}.
+float.texi(,195) }
+float.texi(,196)
+float.texi(,197) @end float
+float.texi(,198)
+float.texi(,199) @float th@'address@hidden, theoreme
+float.texi(,200) A th@'address@hidden
+float.texi(,201)
+float.texi(,202) @caption{A th@'address@hidden
+float.texi(,203) @end float
+float.texi(,204)
+float.texi(,205) @float ,label but no type in chapter
+float.texi(,206) float with no type.
float.texi(,207)
-float.texi(,208) @node Section within unnumbered
-float.texi(,209) @section Section within unnumbered
-float.texi(,210)
+float.texi(,208) @caption{No type in chapter}
+float.texi(,209) @shortcaption{No type in chapter}
+float.texi(,210) @end float
float.texi(,211)
-float.texi(,212) @float Text, Section within unnumbered float
-float.texi(,213) Section within unnumbered
-float.texi(,214) @shortcaption{Section within unnumbered}
-float.texi(,215) @caption{Section within unnumbered}
-float.texi(,216) @end float
-float.texi(,217)
-float.texi(,218) @node Chapter with unnumbsubsec
-float.texi(,219) @chapter Chapter with unnumbsubsec
-float.texi(,220)
-float.texi(,221) @menu
-float.texi(,222) * unnumbered sec::
-float.texi(,223) @end menu
-float.texi(,224) @float Text, Chapter with subsec float
-float.texi(,225) Chap
-float.texi(,226) @shortcaption{Chapter with subsec}
-float.texi(,227) @caption{Chapter with subsec}
-float.texi(,228) @end float
+float.texi(,212) @float Warning, warning in chapter
+float.texi(,213) A warning
+float.texi(,214)
+float.texi(,215) @caption{A warning in chapter}
+float.texi(,216) @shortcaption{A warning in chapter}
+float.texi(,217) @end float
+float.texi(,218)
+float.texi(,219) @menu
+float.texi(,220) * section::
+float.texi(,221) @end menu
+float.texi(,222)
+float.texi(,223) @node section
+float.texi(,224) @section A section
+float.texi(,225)
+float.texi(,226) @float Text, text in section
+float.texi(,227)
+float.texi(,228) A text in float no caption a label a type.
float.texi(,229)
-float.texi(,230) @node unnumbered sec
-float.texi(,231) @unnumberedsec unnumbered sec
-float.texi(,232)
-float.texi(,233) @float Text, unnumbered sec float
-float.texi(,234) Chap
-float.texi(,235) @shortcaption{unnumbered sec float}
-float.texi(,236) @caption{unnumbered sec float}
-float.texi(,237) @end float
-float.texi(,238)
-float.texi(,239) @float ,label but no type in unnumbered subsec in chapter
-float.texi(,240) float with no type.
-float.texi(,241)
-float.texi(,242) @caption{No type in unnumbered subsec in chapter}
-float.texi(,243) @shortcaption{No type in unnumbered subsec in chapter}
-float.texi(,244) @end float
-float.texi(,245)
-float.texi(,246) @node list of floats
-float.texi(,247) @unnumbered list of floats
-float.texi(,248)
-float.texi(,249) See @ref{text in section}.
-float.texi(,250) And (@pxref{text in chapter}).
-float.texi(,251) @xref{text with a lot of features}.
-float.texi(,252)
-float.texi(,253) And now a ref (without manual or printed manual)
-float.texi(,254) @ref{text with a lot of features, cross ref, title}.
+float.texi(,230) @end float
+float.texi(,231)
+float.texi(,232) @node Unnumbered
+float.texi(,233) @unnumbered Unnumbered
+float.texi(,234)
+float.texi(,235) @menu
+float.texi(,236) * Section within unnumbered::
+float.texi(,237) @end menu
+float.texi(,238) @float Text, unnumbered float
+float.texi(,239) unnum
+float.texi(,240) @shortcaption{unnumbered float}
+float.texi(,241) @caption{unnumbered float}
+float.texi(,242) @end float
+float.texi(,243)
+float.texi(,244) @float ,label but no type in unnumbered
+float.texi(,245) float with no type.
+float.texi(,246)
+float.texi(,247) @caption{No type in unnumbered}
+float.texi(,248) @shortcaption{No type in unnumbered}
+float.texi(,249) @end float
+float.texi(,250)
+float.texi(,251)
+float.texi(,252) @node Section within unnumbered
+float.texi(,253) @section Section within unnumbered
+float.texi(,254)
float.texi(,255)
-float.texi(,256) And now a ref (with manual without printed manual)
-float.texi(,257) @ref{text with a lot of features, cross ref, title, manual}.
-float.texi(,258)
-float.texi(,259) And now a ref (without manual with a printed manual)
-float.texi(,260) @ref{text with a lot of features, cross ref, title,, printed
manual title}.
+float.texi(,256) @float Text, Section within unnumbered float
+float.texi(,257) Section within unnumbered
+float.texi(,258) @shortcaption{Section within unnumbered}
+float.texi(,259) @caption{Section within unnumbered}
+float.texi(,260) @end float
float.texi(,261)
-float.texi(,262) A ref to float without type @ref{label but no type}.
-float.texi(,263)
-float.texi(,264) @listoffloats Text
-float.texi(,265) @listoffloats th@'address@hidden
-float.texi(,266)
-float.texi(,267) @printindex cp
-float.texi(,268)
-float.texi(,269) @bye
+float.texi(,262) @node Chapter with unnumbsubsec
+float.texi(,263) @chapter Chapter with unnumbsubsec
+float.texi(,264)
+float.texi(,265) @menu
+float.texi(,266) * unnumbered sec::
+float.texi(,267) @end menu
+float.texi(,268) @float Text, Chapter with subsec float
+float.texi(,269) Chap
+float.texi(,270) @shortcaption{Chapter with subsec}
+float.texi(,271) @caption{Chapter with subsec}
+float.texi(,272) @end float
+float.texi(,273)
+float.texi(,274) @node unnumbered sec
+float.texi(,275) @unnumberedsec unnumbered sec
+float.texi(,276)
+float.texi(,277) @float Text, unnumbered sec float
+float.texi(,278) Chap
+float.texi(,279) @shortcaption{unnumbered sec float}
+float.texi(,280) @caption{unnumbered sec float}
+float.texi(,281) @end float
+float.texi(,282)
+float.texi(,283) @float ,label but no type in unnumbered subsec in chapter
+float.texi(,284) float with no type.
+float.texi(,285)
+float.texi(,286) @caption{No type in unnumbered subsec in chapter}
+float.texi(,287) @shortcaption{No type in unnumbered subsec in chapter}
+float.texi(,288) @end float
+float.texi(,289)
+float.texi(,290) @node list of floats
+float.texi(,291) @unnumbered list of floats
+float.texi(,292)
+float.texi(,293) See @ref{text in section}.
+float.texi(,294) And (@pxref{text in chapter}).
+float.texi(,295) @xref{text with a lot of features}.
+float.texi(,296)
+float.texi(,297) And now a ref (without manual or printed manual)
+float.texi(,298) @ref{text with a lot of features, cross ref, title}.
+float.texi(,299)
+float.texi(,300) And now a ref (with manual without printed manual)
+float.texi(,301) @ref{text with a lot of features, cross ref, title, manual}.
+float.texi(,302)
+float.texi(,303) And now a ref (without manual with a printed manual)
+float.texi(,304) @ref{text with a lot of features, cross ref, title,, printed
manual title}.
+float.texi(,305)
+float.texi(,306) A ref to float without type @ref{label but no type}.
+float.texi(,307)
+float.texi(,308) @listoffloats Text
+float.texi(,309) @listoffloats th@'address@hidden
+float.texi(,310)
+float.texi(,311) @printindex cp
+float.texi(,312)
+float.texi(,313) @bye
Index: test/coverage/res/texi_float/float.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res/texi_float/float.passtexi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res/texi_float/float.passtexi 19 Aug 2008 14:52:14 -0000
1.2
+++ test/coverage/res/texi_float/float.passtexi 3 Sep 2008 10:39:00 -0000
1.3
@@ -59,208 +59,252 @@
float.texi(,62) example
float.texi(,63) @end example
float.texi(,64)
-float.texi(,65) A table.
-float.texi(,66) @table @emph
-float.texi(,67) @item truc
-float.texi(,68) line
-float.texi(,69) @end table
-float.texi(,70)
-float.texi(,71) A multitable.
-float.texi(,72) @multitable {truc} {bidule}
-float.texi(,73) @item truc @tab bidule
-float.texi(,74) @item truc @tab bidule
-float.texi(,75) @end multitable
-float.texi(,76) An index entry
-float.texi(,77) @cindex float example in caption
-float.texi(,78)
-float.texi(,79) An itemize.
-float.texi(,80) @itemize @minus
-float.texi(,81) @item truc
-float.texi(,82) line
-float.texi(,83) @end itemize
-float.texi(,84)
-float.texi(,85) A ref.
-float.texi(,86) @xref{Top,xref Text with features caption}.
-float.texi(,87) A footnote.
-float.texi(,88) @footnote{footnote Text with features caption}.
-float.texi(,89)
-float.texi(,90) @TeX{} and @address@hidden@'address@hidden@address@hidden
@sc{and} @verb{!it is @verb!} @ a address@hidden @!@@ @AE{}.
-float.texi(,91) }
-float.texi(,92)
-float.texi(,93) @address@hidden and
@address@hidden@'address@hidden@address@hidden @sc{and} @verb{!it is @verb!} @
a address@hidden @!@@ @AE{}.}
+float.texi(,65) @anchor{Anchor in caption}
+float.texi(,66)
+float.texi(,67) A table.
+float.texi(,68) @table @emph
+float.texi(,69) @item truc
+float.texi(,70) line
+float.texi(,71) @end table
+float.texi(,72)
+float.texi(,73) A multitable.
+float.texi(,74) @multitable {truc} {bidule}
+float.texi(,75) @item truc @tab bidule
+float.texi(,76) @item truc @tab bidule
+float.texi(,77) @end multitable
+float.texi(,78) An index entry
+float.texi(,79) @cindex float example in caption
+float.texi(,80)
+float.texi(,81) An itemize.
+float.texi(,82) @itemize @minus
+float.texi(,83) @item truc
+float.texi(,84) line
+float.texi(,85) @end itemize
+float.texi(,86)
+float.texi(,87) A ref.
+float.texi(,88) @xref{Top,xref Text with features caption}.
+float.texi(,89) A footnote.
+float.texi(,90) @footnote{footnote Text with features caption}.
+float.texi(,91)
+float.texi(,92) @TeX{} and @address@hidden@'address@hidden@address@hidden
@sc{and} @verb{!it is @verb!} @ a address@hidden @!@@ @AE{}.
+float.texi(,93) }
float.texi(,94)
-float.texi(,95) @end float
+float.texi(,95) @address@hidden and
@address@hidden@'address@hidden@address@hidden @sc{and} @verb{!it is @verb!} @
a address@hidden @!@@ @AE{}.}
float.texi(,96)
-float.texi(,97)
-float.texi(,98) @float Text
-float.texi(,99) No label but caption and shortcaption.
-float.texi(,100)
-float.texi(,101) @caption{No label}
-float.texi(,102) @shortcaption{No label}
-float.texi(,103) @end float
-float.texi(,104)
-float.texi(,105) @float ,label but no type
-float.texi(,106) No type but caption and shortcaption.
-float.texi(,107)
-float.texi(,108) @caption{No type}
-float.texi(,109) @shortcaption{No type}
-float.texi(,110) @end float
-float.texi(,111)
-float.texi(,112)
-float.texi(,113) @float ,label but no type and no caption
-float.texi(,114) No type but label and no caption nor shortcaption.
-float.texi(,115)
-float.texi(,116) @end float
+float.texi(,97) @end float
+float.texi(,98)
+float.texi(,99)
+float.texi(,100) @float Text
+float.texi(,101) No label but caption and shortcaption.
+float.texi(,102)
+float.texi(,103) @caption{No label}
+float.texi(,104) @shortcaption{No label}
+float.texi(,105) @end float
+float.texi(,106)
+float.texi(,107) @float ,label but no type
+float.texi(,108) No type but caption and shortcaption.
+float.texi(,109)
+float.texi(,110) @caption{No type}
+float.texi(,111) @shortcaption{No type}
+float.texi(,112) @end float
+float.texi(,113)
+float.texi(,114)
+float.texi(,115) @float ,label but no type and no caption
+float.texi(,116) No type but label and no caption nor shortcaption.
float.texi(,117)
-float.texi(,118)
-float.texi(,119) @float
-float.texi(,120) No label, no type, no caption no shortcaption.
-float.texi(,121)
-float.texi(,122) @end float
+float.texi(,118) @end float
+float.texi(,119)
+float.texi(,120)
+float.texi(,121) @float
+float.texi(,122) No label, no type, no caption no shortcaption.
float.texi(,123)
-float.texi(,124) @float
-float.texi(,125) No label, no type, but caption and shortcaption.
-float.texi(,126) @caption{No label, no type, but caption and shortcaption.}
-float.texi(,127) @shortcaption{No label, no type, but caption and
shortcaption.}
-float.texi(,128) @end float
-float.texi(,129)
-float.texi(,130)
+float.texi(,124) @end float
+float.texi(,125)
+float.texi(,126) @float
+float.texi(,127) No label, no type, but caption and shortcaption.
+float.texi(,128) @caption{No label, no type, but caption and shortcaption.}
+float.texi(,129) @shortcaption{No label, no type, but caption and
shortcaption.}
+float.texi(,130) @end float
float.texi(,131)
-float.texi(,132) @float ,label but no type 2
-float.texi(,133) Second float with no type.
-float.texi(,134)
-float.texi(,135) @caption{No type 2}
-float.texi(,136) @shortcaption{No type 2}
-float.texi(,137) @end float
-float.texi(,138)
-float.texi(,139) @float Warning, warning in top
-float.texi(,140) A warning
-float.texi(,141)
-float.texi(,142) @caption{A warning}
-float.texi(,143) @shortcaption{A warning}
-float.texi(,144) @end float
-float.texi(,145)
-float.texi(,146) @node chapter
-float.texi(,147) @chapter A chapter
-float.texi(,148)
-float.texi(,149) @float Text, text in chapter
-float.texi(,150) Text in chapter
-float.texi(,151)
-float.texi(,152) @caption{Text in chapter}
-float.texi(,153) @end float
-float.texi(,154)
-float.texi(,155) @float th@'address@hidden, theoreme
-float.texi(,156) A th@'address@hidden
-float.texi(,157)
-float.texi(,158) @caption{A th@'address@hidden
-float.texi(,159) @end float
+float.texi(,132)
+float.texi(,133)
+float.texi(,134) @float ,label but no type 2
+float.texi(,135) Second float with no type.
+float.texi(,136)
+float.texi(,137) @caption{No type 2}
+float.texi(,138) @shortcaption{No type 2}
+float.texi(,139) @end float
+float.texi(,140)
+float.texi(,141) @float Warning, warning in top
+float.texi(,142) A warning
+float.texi(,143)
+float.texi(,144) @caption{A warning}
+float.texi(,145) @shortcaption{A warning}
+float.texi(,146) @end float
+float.texi(,147)
+float.texi(,148) @node chapter
+float.texi(,149) @chapter A chapter
+float.texi(,150)
+float.texi(,151) @float Text, text in chapter
+float.texi(,152) Text in chapter
+float.texi(,153)
+float.texi(,154) @caption{Text in chapter}
+float.texi(,155) @end float
+float.texi(,156)
+float.texi(,157) @float Text, float with a lot of features and no shortcaption
+float.texi(,158)
+float.texi(,159) Float text of a float with a lot of features.
float.texi(,160)
-float.texi(,161) @float ,label but no type in chapter
-float.texi(,162) float with no type.
-float.texi(,163)
-float.texi(,164) @caption{No type in chapter}
-float.texi(,165) @shortcaption{No type in chapter}
-float.texi(,166) @end float
-float.texi(,167)
-float.texi(,168) @float Warning, warning in chapter
-float.texi(,169) A warning
-float.texi(,170)
-float.texi(,171) @caption{A warning in chapter}
-float.texi(,172) @shortcaption{A warning in chapter}
-float.texi(,173) @end float
-float.texi(,174)
-float.texi(,175) @menu
-float.texi(,176) * section::
-float.texi(,177) @end menu
-float.texi(,178)
-float.texi(,179) @node section
-float.texi(,180) @section A section
-float.texi(,181)
-float.texi(,182) @float Text, text in section
-float.texi(,183)
-float.texi(,184) A text in float no caption a label a type.
-float.texi(,185)
-float.texi(,186) @end float
-float.texi(,187)
-float.texi(,188) @node Unnumbered
-float.texi(,189) @unnumbered Unnumbered
-float.texi(,190)
-float.texi(,191) @menu
-float.texi(,192) * Section within unnumbered::
-float.texi(,193) @end menu
-float.texi(,194) @float Text, unnumbered float
-float.texi(,195) unnum
-float.texi(,196) @shortcaption{unnumbered float}
-float.texi(,197) @caption{unnumbered float}
-float.texi(,198) @end float
-float.texi(,199)
-float.texi(,200) @float ,label but no type in unnumbered
-float.texi(,201) float with no type.
-float.texi(,202)
-float.texi(,203) @caption{No type in unnumbered}
-float.texi(,204) @shortcaption{No type in unnumbered}
-float.texi(,205) @end float
-float.texi(,206)
+float.texi(,161) @caption{ An example of float address@hidden 2
+float.texi(,162) An example 2.
+float.texi(,163) @example
+float.texi(,164) example 2
+float.texi(,165) @end example
+float.texi(,166)
+float.texi(,167) A table 2.
+float.texi(,168) @table @emph
+float.texi(,169) @item truc 2
+float.texi(,170) line 2
+float.texi(,171) @end table
+float.texi(,172)
+float.texi(,173) A multitable 2.
+float.texi(,174) @multitable {truc} {bidule}
+float.texi(,175) @item truc 2 @tab bidule
+float.texi(,176) @item truc 2 @tab bidule
+float.texi(,177) @end multitable
+float.texi(,178) An index entry 2
+float.texi(,179) @cindex float example in caption 2
+float.texi(,180)
+float.texi(,181) An itemize 2.
+float.texi(,182) @itemize @minus
+float.texi(,183) @item truc 2
+float.texi(,184) line
+float.texi(,185) @end itemize
+float.texi(,186)
+float.texi(,187) @anchor{Anchor in caption 2}
+float.texi(,188)
+float.texi(,189) A ref 2.
+float.texi(,190) @xref{Top,xref Text with features caption}.
+float.texi(,191) A footnote 2.
+float.texi(,192) @footnote{footnote Text with features caption 2}.
+float.texi(,193)
+float.texi(,194) @TeX{} and @address@hidden@'address@hidden@address@hidden
@sc{and} @verb{!it is @verb!} @ a address@hidden @!@@ @AE{}.
+float.texi(,195) }
+float.texi(,196)
+float.texi(,197) @end float
+float.texi(,198)
+float.texi(,199) @float th@'address@hidden, theoreme
+float.texi(,200) A th@'address@hidden
+float.texi(,201)
+float.texi(,202) @caption{A th@'address@hidden
+float.texi(,203) @end float
+float.texi(,204)
+float.texi(,205) @float ,label but no type in chapter
+float.texi(,206) float with no type.
float.texi(,207)
-float.texi(,208) @node Section within unnumbered
-float.texi(,209) @section Section within unnumbered
-float.texi(,210)
+float.texi(,208) @caption{No type in chapter}
+float.texi(,209) @shortcaption{No type in chapter}
+float.texi(,210) @end float
float.texi(,211)
-float.texi(,212) @float Text, Section within unnumbered float
-float.texi(,213) Section within unnumbered
-float.texi(,214) @shortcaption{Section within unnumbered}
-float.texi(,215) @caption{Section within unnumbered}
-float.texi(,216) @end float
-float.texi(,217)
-float.texi(,218) @node Chapter with unnumbsubsec
-float.texi(,219) @chapter Chapter with unnumbsubsec
-float.texi(,220)
-float.texi(,221) @menu
-float.texi(,222) * unnumbered sec::
-float.texi(,223) @end menu
-float.texi(,224) @float Text, Chapter with subsec float
-float.texi(,225) Chap
-float.texi(,226) @shortcaption{Chapter with subsec}
-float.texi(,227) @caption{Chapter with subsec}
-float.texi(,228) @end float
+float.texi(,212) @float Warning, warning in chapter
+float.texi(,213) A warning
+float.texi(,214)
+float.texi(,215) @caption{A warning in chapter}
+float.texi(,216) @shortcaption{A warning in chapter}
+float.texi(,217) @end float
+float.texi(,218)
+float.texi(,219) @menu
+float.texi(,220) * section::
+float.texi(,221) @end menu
+float.texi(,222)
+float.texi(,223) @node section
+float.texi(,224) @section A section
+float.texi(,225)
+float.texi(,226) @float Text, text in section
+float.texi(,227)
+float.texi(,228) A text in float no caption a label a type.
float.texi(,229)
-float.texi(,230) @node unnumbered sec
-float.texi(,231) @unnumberedsec unnumbered sec
-float.texi(,232)
-float.texi(,233) @float Text, unnumbered sec float
-float.texi(,234) Chap
-float.texi(,235) @shortcaption{unnumbered sec float}
-float.texi(,236) @caption{unnumbered sec float}
-float.texi(,237) @end float
-float.texi(,238)
-float.texi(,239) @float ,label but no type in unnumbered subsec in chapter
-float.texi(,240) float with no type.
-float.texi(,241)
-float.texi(,242) @caption{No type in unnumbered subsec in chapter}
-float.texi(,243) @shortcaption{No type in unnumbered subsec in chapter}
-float.texi(,244) @end float
-float.texi(,245)
-float.texi(,246) @node list of floats
-float.texi(,247) @unnumbered list of floats
-float.texi(,248)
-float.texi(,249) See @ref{text in section}.
-float.texi(,250) And (@pxref{text in chapter}).
-float.texi(,251) @xref{text with a lot of features}.
-float.texi(,252)
-float.texi(,253) And now a ref (without manual or printed manual)
-float.texi(,254) @ref{text with a lot of features, cross ref, title}.
+float.texi(,230) @end float
+float.texi(,231)
+float.texi(,232) @node Unnumbered
+float.texi(,233) @unnumbered Unnumbered
+float.texi(,234)
+float.texi(,235) @menu
+float.texi(,236) * Section within unnumbered::
+float.texi(,237) @end menu
+float.texi(,238) @float Text, unnumbered float
+float.texi(,239) unnum
+float.texi(,240) @shortcaption{unnumbered float}
+float.texi(,241) @caption{unnumbered float}
+float.texi(,242) @end float
+float.texi(,243)
+float.texi(,244) @float ,label but no type in unnumbered
+float.texi(,245) float with no type.
+float.texi(,246)
+float.texi(,247) @caption{No type in unnumbered}
+float.texi(,248) @shortcaption{No type in unnumbered}
+float.texi(,249) @end float
+float.texi(,250)
+float.texi(,251)
+float.texi(,252) @node Section within unnumbered
+float.texi(,253) @section Section within unnumbered
+float.texi(,254)
float.texi(,255)
-float.texi(,256) And now a ref (with manual without printed manual)
-float.texi(,257) @ref{text with a lot of features, cross ref, title, manual}.
-float.texi(,258)
-float.texi(,259) And now a ref (without manual with a printed manual)
-float.texi(,260) @ref{text with a lot of features, cross ref, title,, printed
manual title}.
+float.texi(,256) @float Text, Section within unnumbered float
+float.texi(,257) Section within unnumbered
+float.texi(,258) @shortcaption{Section within unnumbered}
+float.texi(,259) @caption{Section within unnumbered}
+float.texi(,260) @end float
float.texi(,261)
-float.texi(,262) A ref to float without type @ref{label but no type}.
-float.texi(,263)
-float.texi(,264) @listoffloats Text
-float.texi(,265) @listoffloats th@'address@hidden
-float.texi(,266)
-float.texi(,267) @printindex cp
-float.texi(,268)
-float.texi(,269) @bye
+float.texi(,262) @node Chapter with unnumbsubsec
+float.texi(,263) @chapter Chapter with unnumbsubsec
+float.texi(,264)
+float.texi(,265) @menu
+float.texi(,266) * unnumbered sec::
+float.texi(,267) @end menu
+float.texi(,268) @float Text, Chapter with subsec float
+float.texi(,269) Chap
+float.texi(,270) @shortcaption{Chapter with subsec}
+float.texi(,271) @caption{Chapter with subsec}
+float.texi(,272) @end float
+float.texi(,273)
+float.texi(,274) @node unnumbered sec
+float.texi(,275) @unnumberedsec unnumbered sec
+float.texi(,276)
+float.texi(,277) @float Text, unnumbered sec float
+float.texi(,278) Chap
+float.texi(,279) @shortcaption{unnumbered sec float}
+float.texi(,280) @caption{unnumbered sec float}
+float.texi(,281) @end float
+float.texi(,282)
+float.texi(,283) @float ,label but no type in unnumbered subsec in chapter
+float.texi(,284) float with no type.
+float.texi(,285)
+float.texi(,286) @caption{No type in unnumbered subsec in chapter}
+float.texi(,287) @shortcaption{No type in unnumbered subsec in chapter}
+float.texi(,288) @end float
+float.texi(,289)
+float.texi(,290) @node list of floats
+float.texi(,291) @unnumbered list of floats
+float.texi(,292)
+float.texi(,293) See @ref{text in section}.
+float.texi(,294) And (@pxref{text in chapter}).
+float.texi(,295) @xref{text with a lot of features}.
+float.texi(,296)
+float.texi(,297) And now a ref (without manual or printed manual)
+float.texi(,298) @ref{text with a lot of features, cross ref, title}.
+float.texi(,299)
+float.texi(,300) And now a ref (with manual without printed manual)
+float.texi(,301) @ref{text with a lot of features, cross ref, title, manual}.
+float.texi(,302)
+float.texi(,303) And now a ref (without manual with a printed manual)
+float.texi(,304) @ref{text with a lot of features, cross ref, title,, printed
manual title}.
+float.texi(,305)
+float.texi(,306) A ref to float without type @ref{label but no type}.
+float.texi(,307)
+float.texi(,308) @listoffloats Text
+float.texi(,309) @listoffloats th@'address@hidden
+float.texi(,310)
+float.texi(,311) @printindex cp
+float.texi(,312)
+float.texi(,313) @bye
Index: test/coverage/res/texi_float/float.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/coverage/res/texi_float/float.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/coverage/res/texi_float/float.texi 19 Aug 2008 14:52:14 -0000
1.2
+++ test/coverage/res/texi_float/float.texi 3 Sep 2008 10:39:00 -0000
1.3
@@ -60,6 +60,8 @@
example
@end example
address@hidden in caption}
+
A table.
@table @emph
@item truc
@@ -150,6 +152,48 @@
@caption{Text in chapter}
@end float
address@hidden Text, float with a lot of features and no shortcaption
+
+Float text of a float with a lot of features.
+
address@hidden An example of float address@hidden 2
+An example 2.
address@hidden
+example 2
address@hidden example
+
+A table 2.
address@hidden @emph
address@hidden truc 2
+line 2
address@hidden table
+
+A multitable 2.
address@hidden {truc} {bidule}
address@hidden truc 2 @tab bidule
address@hidden truc 2 @tab bidule
address@hidden multitable
+An index entry 2
address@hidden float example in caption 2
+
+An itemize 2.
address@hidden @minus
address@hidden truc 2
+line
address@hidden itemize
+
address@hidden in caption 2}
+
+A ref 2.
address@hidden,xref Text with features caption}.
+A footnote 2.
address@hidden Text with features caption 2}.
+
address@hidden and @address@hidden@'address@hidden@address@hidden @sc{and}
@verb{!it is @verb!} @ a address@hidden @!@@ @AE{}.
+}
+
address@hidden float
+
@float th@'address@hidden, theoreme
A th@'address@hidden
Index: test/formatting/res/float_docbook/float.xml
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/float_docbook/float.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res/float_docbook/float.xml 26 Aug 2008 15:51:37 -0000
1.2
+++ test/formatting/res/float_docbook/float.xml 3 Sep 2008 10:39:00 -0000
1.3
@@ -84,6 +84,12 @@
</para>
+<anchor id="float with a lot of features and no shortcaption"></anchor>
+<para>Float text of a float with a lot of features.
+</para>
+
+
+
<anchor id="theoreme"></anchor><para>A théorème
</para>
Index: test/formatting/res/float_xml/float.xml
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/res/float_xml/float.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/float_xml/float.xml 25 Aug 2008 16:25:34 -0000
1.1
+++ test/formatting/res/float_xml/float.xml 3 Sep 2008 10:39:00 -0000
1.2
@@ -79,6 +79,8 @@
An example.
<example xml:space="preserve">example
</example>
+
+
A table.
<table><tableitem><tableterm> <emph>truc</emph> </tableterm>
<item><para>line
@@ -204,6 +206,48 @@
</caption>
</float>
+<float name="float with a lot of features and no shortcaption">
+<floattype>Text</floattype>
+<floatpos></floatpos>
+
+<para>Float text of a float with a lot of features.
+</para>
+<caption> An example of float caption&enddots; 2
+An example 2.
+<example xml:space="preserve">example 2
+</example>
+A table 2.
+<table><tableitem><tableterm> <emph>truc 2</emph> </tableterm>
+<item><para>line 2
+</para></item></tableitem></table>
+
+A multitable 2.
+<multitable><columnfraction>6</columnfraction>
+<columnfraction>8</columnfraction>
+<tbody><row><entry> truc 2 </entry><entry> bidule
+</entry></row><row><entry> truc 2 </entry><entry> bidule
+</entry></row></tbody></multitable>
+An index entry 2
+<indexterm index="cp">float example in caption 2</indexterm>
+An itemize 2.
+<itemize><itemfunction>−</itemfunction><item><para> truc 2
+line
+</para></item>
+</itemize>
+
+
+
+A ref 2.
+See <xref><xrefnodename>Top</xrefnodename><xrefinfoname>xref Text with
features caption</xrefinfoname></xref>.
+A footnote 2.
+<footnote><para>footnote Text with features caption 2
+</para></footnote>.
+
+&tex; and
<emph><b>téî</b><uref><urefurl>an_url</urefurl></uref></emph>
<sc>and</sc> it is @verb &space;a word &eosexcl;@ Æ.
+</caption>
+
+</float>
+
<float name="theoreme">
<floattype>théorème</floattype>
<floatpos></floatpos>
Index: test/formatting/res/formatting_docbook/formatting.xml
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/formatting_docbook/formatting.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res/formatting_docbook/formatting.xml 29 Aug 2008
15:05:56 -0000 1.4
+++ test/formatting/res/formatting_docbook/formatting.xml 3 Sep 2008
10:39:00 -0000 1.5
@@ -283,7 +283,7 @@
<listitem><para> e–mph item
</para></listitem>
</itemizedlist>
-<itemizedlist mark="bullet a--n itemize line"><title><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm></title><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>
@@ -324,7 +324,7 @@
<blockquote><para>def–fn
</para></blockquote></informalfigure>
<informalfigure><synopsis role="fset"><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><function><replaceable>i</replaceable></function><replaceable>
a</replaceable><replaceable> g</replaceable></synopsis>
-<blockquote><indexterm role="cp"><primary>index entry within
deffn</primary></indexterm></blockquote><synopsis role="cmde"><indexterm
role="fn"><primary>truc</primary></indexterm><function>truc</function><replaceable>
</replaceable></synopsis>
+<indexterm role="cp"><primary>index entry within
deffn</primary></indexterm><synopsis role="cmde"><indexterm
role="fn"><primary>truc</primary></indexterm><function>truc</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary>log
trap</primary></indexterm><function>log trap</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary> log
trap1</primary></indexterm><function> log trap1</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary>log trap2
</primary></indexterm><function>log trap2 </function><replaceable>
</replaceable></synopsis>
@@ -478,13 +478,13 @@
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term> a</term>
-<!-- comment between item and itemx -->
-<term> b</term>
+<term><!-- comment between item and itemx -->
+ b</term>
<listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term>− a</term>
-<listitem><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm></listitem><term>− b</term>
+<term><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm>− b</term>
<listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
@@ -804,7 +804,7 @@
<listitem><para> e–mph item
</para></listitem>
</itemizedlist>
-<itemizedlist mark="bullet a--n itemize line"><title><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm></title><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>
@@ -845,7 +845,7 @@
<blockquote><para>def–fn
</para></blockquote></informalfigure>
<informalfigure><synopsis role="fset"><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><function><replaceable>i</replaceable></function><replaceable>
a</replaceable><replaceable> g</replaceable></synopsis>
-<blockquote><indexterm role="cp"><primary>index entry within
deffn</primary></indexterm></blockquote><synopsis role="cmde"><indexterm
role="fn"><primary>truc</primary></indexterm><function>truc</function><replaceable>
</replaceable></synopsis>
+<indexterm role="cp"><primary>index entry within
deffn</primary></indexterm><synopsis role="cmde"><indexterm
role="fn"><primary>truc</primary></indexterm><function>truc</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary>log
trap</primary></indexterm><function>log trap</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary> log
trap1</primary></indexterm><function> log trap1</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary>log trap2
</primary></indexterm><function>log trap2 </function><replaceable>
</replaceable></synopsis>
@@ -999,13 +999,13 @@
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term> a</term>
-<!-- comment between item and itemx -->
-<term> b</term>
+<term><!-- comment between item and itemx -->
+ b</term>
<listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term>− a</term>
-<listitem><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm></listitem><term>− b</term>
+<term><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm>− b</term>
<listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
@@ -1321,7 +1321,7 @@
<listitem><para> e–mph item
</para></listitem>
</itemizedlist>
-<itemizedlist mark="bullet a--n itemize line"><title><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm></title><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>
@@ -1362,7 +1362,7 @@
<blockquote><para>def–fn
</para></blockquote></informalfigure>
<informalfigure><synopsis role="fset"><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><function><replaceable>i</replaceable></function><replaceable>
a</replaceable><replaceable> g</replaceable></synopsis>
-<blockquote><indexterm role="cp"><primary>index entry within
deffn</primary></indexterm></blockquote><synopsis role="cmde"><indexterm
role="fn"><primary>truc</primary></indexterm><function>truc</function><replaceable>
</replaceable></synopsis>
+<indexterm role="cp"><primary>index entry within
deffn</primary></indexterm><synopsis role="cmde"><indexterm
role="fn"><primary>truc</primary></indexterm><function>truc</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary>log
trap</primary></indexterm><function>log trap</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary> log
trap1</primary></indexterm><function> log trap1</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary>log trap2
</primary></indexterm><function>log trap2 </function><replaceable>
</replaceable></synopsis>
@@ -1516,13 +1516,13 @@
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term> a</term>
-<!-- comment between item and itemx -->
-<term> b</term>
+<term><!-- comment between item and itemx -->
+ b</term>
<listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
<variablelist><varlistentry><term>− a</term>
-<listitem><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm></listitem><term>− b</term>
+<term><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm>− b</term>
<listitem><para>l–ine
</para></listitem></varlistentry></variablelist>
@@ -1838,7 +1838,7 @@
<listitem> e--mph item
</listitem>
</itemizedlist>
-<itemizedlist mark="bullet a--n itemize line"><title><indexterm
role="cp"><primary>index entry within
itemize</primary></indexterm></title><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>
@@ -1879,7 +1879,7 @@
<blockquote>def--fn
</blockquote></informalfigure>
<informalfigure><synopsis role="fset"><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><function><replaceable>i</replaceable></function><replaceable>
a</replaceable><replaceable> g</replaceable></synopsis>
-<blockquote><indexterm role="cp"><primary>index entry within
deffn</primary></indexterm></blockquote><synopsis role="cmde"><indexterm
role="fn"><primary>truc</primary></indexterm><function>truc</function><replaceable>
</replaceable></synopsis>
+<indexterm role="cp"><primary>index entry within
deffn</primary></indexterm><synopsis role="cmde"><indexterm
role="fn"><primary>truc</primary></indexterm><function>truc</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary>log
trap</primary></indexterm><function>log trap</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary> log
trap1</primary></indexterm><function> log trap1</function><replaceable>
</replaceable></synopsis>
<synopsis role="Command"><indexterm role="fn"><primary>log trap2
</primary></indexterm><function>log trap2 </function><replaceable>
</replaceable></synopsis>
@@ -2033,13 +2033,13 @@
</listitem></varlistentry></variablelist>
<variablelist><varlistentry><term> a</term>
-<!-- comment between item and itemx -->
-<term> b</term>
+<term><!-- comment between item and itemx -->
+ b</term>
<listitem>l--ine
</listitem></varlistentry></variablelist>
<variablelist><varlistentry><term>− a</term>
-<listitem><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm></listitem><term>− b</term>
+<term><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm>− b</term>
<listitem>l--ine
</listitem></varlistentry></variablelist>
Index: test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2
22 Aug 2008 13:51:18 -0000 1.1
+++ test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.2
3 Sep 2008 10:39:00 -0000 1.2
@@ -1,2 +0,0 @@
-*** ignored @cindex already in an @item entry (l. 9)
-*** ignored @cindex already in an @item entry (l. 12)
Index:
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
---
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html
2 Sep 2008 12:07:44 -0000 1.3
+++
test/formatting/res/index_in_item_line_vtable/index_in_item_line_vtable.html
3 Sep 2008 10:39:01 -0000 1.4
@@ -45,17 +45,19 @@
<h1 class="unnumbered">test index entries in @item @table</h1>
<dl compact="compact">
-<dt> index
-<a name="index-index"></a>
+<dt> <a name="index-index"></a>
+<p>‘<samp>opt</samp>’
+</p>
+<a name="index-"></a>
</dt>
-<dd><p>‘<samp>opt</samp>’
-More text
+<dd><p>More text
</p></dd>
-<dt> 2 index
-<a name="index-2-index"></a>
+<dt> <a name="index-2-index"></a>
+<p>‘<samp>nopt</samp>’
+</p>
+<a name="index--1"></a>
</dt>
-<dd><p>‘<samp>nopt</samp>’
-Even more
+<dd><p>Even more
</p></dd>
</dl>
Index:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2
22 Aug 2008 13:51:20 -0000 1.1
+++
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.2
3 Sep 2008 10:39:03 -0000 1.2
@@ -1,4 +0,0 @@
-*** ignored @cindex already in an @item entry (l. 9)
-*** ignored @cindex already in an @item entry (l. 12)
-*** ignored @cindex already in an @item entry (l. 9)
-*** ignored @cindex already in an @item entry (l. 12)
Index:
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst
22 Aug 2008 13:51:20 -0000 1.1
+++
test/formatting/res/texi_index_in_item_line_vtable/index_in_item_line_vtable.passfirst
3 Sep 2008 10:39:03 -0000 1.2
@@ -5,10 +5,10 @@
index_in_item_line_vtable.texi(,6) @top test index entries in @@item @@table
index_in_item_line_vtable.texi(,7)
index_in_item_line_vtable.texi(,8) @vtable @asis
-index_in_item_line_vtable.texi(,9) @item index
+index_in_item_line_vtable.texi(,9) @item @cindex index
index_in_item_line_vtable.texi(,10) @option{opt}
index_in_item_line_vtable.texi(,11) More text
-index_in_item_line_vtable.texi(,12) @item 2 index
+index_in_item_line_vtable.texi(,12) @item @cindex 2 index
index_in_item_line_vtable.texi(,13) @option{nopt}
index_in_item_line_vtable.texi(,14) Even more
index_in_item_line_vtable.texi(,15) @end vtable
Index: test/formatting/res/inter_item_commands/inter_item_commands.2
===================================================================
RCS file: test/formatting/res/inter_item_commands/inter_item_commands.2
diff -N test/formatting/res/inter_item_commands/inter_item_commands.2
Index: test/formatting/res/inter_item_commands/inter_item_commands.html
===================================================================
RCS file: test/formatting/res/inter_item_commands/inter_item_commands.html
diff -N test/formatting/res/inter_item_commands/inter_item_commands.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/inter_item_commands/inter_item_commands.html 3 Sep
2008 10:39:01 -0000 1.1
@@ -0,0 +1,281 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<a name="Test-inter-item-ignored-commands"></a>
+<h1 class="unnumbered">Test inter item ignored commands</h1>
+
+
+<ul class="toc">
+<li><a name="index-also-a-cindex-in-itemize"></a>
+</li><li><code> e--mph item</code>
+</li></ul>
+
+<ul>
+<li><a name="index-index-entry-within-itemize"></a>
+</li><li> i–tem 1
+</li><li> <a name="index-index-entry-right-after-_0040item"></a>
+i–tem 2
+</li></ul>
+
+<ul>
+<li>T–ext before items.
+<a name="index-also-a-cindex-in-itemize-1"></a>
+</li><li> bullet item
+</li></ul>
+
+<ol>
+<li> e–numerate
+</li></ol>
+
+<table>
+<tr><td><p> truc
+</p>
+<a name="index-index-entry-between-empty-lines"></a>
+
+</td></tr>
+<tr><td><p> trouc
+</p></td></tr>
+</table>
+
+<table>
+<thead><tr><th width="600%"><p> mu–ltitable headitem </p></th><th
width="700%"><p> another tab
+</p></th></tr></thead>
+<tr><td width="600%"><p> mu–ltitable item </p></td><td width="700%"><p>
multitable tab
+</p></td></tr>
+<tr><td width="600%"><p> mu–ltitable item 2 </p></td><td
width="700%"><p> multitable tab 2
+<a name="index-index-entry-within-multitable"></a>
+</p></td></tr>
+<tr><td width="600%"><p> lone mu–ltitable item
+</p></td></tr>
+</table>
+
+<dl>
+<dt><a name="index-i"></a><u>fset:</u> <b><var>i</var></b><i> a g</i></dt>
+<dt><a name="index-log-trap1"></a><u>Command:</u> <b> log trap1</b></dt>
+<dd><a name="index-between-deffnx"></a>
+</dd><dt><a name="index-id-i-ule"></a><u>cmde2:</u> <b><b>id
‘<samp>i</samp>’ ule</b></b><i> truc</i></dt>
+<dd><a name="index-cindex-in-deff-item"></a>
+
+<p>In deff item.
+</p></dd></dl>
+
+<dl compact="compact">
+<dt> <code>a</code>
+<a name="index-a"></a>
+</dt>
+<dd><p>l–ine
+</p></dd>
+</dl>
+
+<dl compact="compact">
+<dt> a
+<a name="index-a-1"></a>
+</dt>
+<dt> b
+<a name="index-b"></a>
+</dt>
+<dd><p>l–ine
+</p></dd>
+</dl>
+
+<dl compact="compact">
+<dt> <var>a</var>
+<a name="index-a-2"></a>
+</dt>
+<dd><a name="index-index-entry-between-item-and-itemx"></a>
+</dd>
+<dt> <var>b</var>
+<a name="index-b-1"></a>
+</dt>
+<dd><p>l–ine
+</p></dd>
+<dt> <var>c</var>
+<a name="index-c"></a>
+</dt>
+<dt> <var>d</var>
+<a name="index-d"></a>
+</dt>
+</dl>
+
+<dl compact="compact">
+<dd><a name="index-cindex-in-table"></a>
+</dd>
+<dt> <code>abb</code></dt>
+<dd><p>l–ine
+</p></dd>
+</dl>
+
+<dl compact="compact">
+<dd><a name="index-cindex-in-table-1"></a>
+<p>Texte before first item.
+</p></dd>
+<dt> <code>abb</code></dt>
+</dl>
+
+<p>cp
+</p><table><tr><th valign="top">Jump to: </th><td><a
href="#Test-inter-item-ignored-commands_cp_letter-A"
class="summary-letter"><b>A</b></a>
+
+<a href="#Test-inter-item-ignored-commands_cp_letter-B"
class="summary-letter"><b>B</b></a>
+
+<a href="#Test-inter-item-ignored-commands_cp_letter-C"
class="summary-letter"><b>C</b></a>
+
+<a href="#Test-inter-item-ignored-commands_cp_letter-I"
class="summary-letter"><b>I</b></a>
+
+</td></tr></table>
+<table border="0" class="index-cp">
+<tr><td></td><th align="left">Index Entry</th><th align="left">
Section</th></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_cp_letter-A">A</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-also-a-cindex-in-itemize">also a
cindex in itemize</a></td><td valign="top"><a href="#Top">Test inter item
ignored commands</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-also-a-cindex-in-itemize-1">also
a cindex in itemize</a></td><td valign="top"><a href="#Top">Test inter item
ignored commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_cp_letter-B">B</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-between-deffnx">between
deffnx</a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_cp_letter-C">C</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-cindex-in-deff-item">cindex in
deff item</a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-cindex-in-table">cindex in
table</a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-cindex-in-table-1">cindex in
table</a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_cp_letter-I">I</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-index-entry-between-empty-lines">index entry between empty
lines</a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-index-entry-between-item-and-itemx">index entry between item and
itemx</a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-index-entry-right-after-_0040item">index entry right after
@item</a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-index-entry-within-itemize">index entry within itemize</a></td><td
valign="top"><a href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-index-entry-within-multitable">index entry within
multitable</a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a
href="#Test-inter-item-ignored-commands_cp_letter-A"
class="summary-letter"><b>A</b></a>
+
+<a href="#Test-inter-item-ignored-commands_cp_letter-B"
class="summary-letter"><b>B</b></a>
+
+<a href="#Test-inter-item-ignored-commands_cp_letter-C"
class="summary-letter"><b>C</b></a>
+
+<a href="#Test-inter-item-ignored-commands_cp_letter-I"
class="summary-letter"><b>I</b></a>
+
+</td></tr></table>
+
+<p>fn
+</p><table><tr><th valign="top">Jump to: </th><td><a
href="#Test-inter-item-ignored-commands_fn_letter-A"
class="summary-letter"><b>A</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-B"
class="summary-letter"><b>B</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-C"
class="summary-letter"><b>C</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-D"
class="summary-letter"><b>D</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-I"
class="summary-letter"><b>I</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-L"
class="summary-letter"><b>L</b></a>
+
+</td></tr></table>
+<table border="0" class="index-fn">
+<tr><td></td><th align="left">Index Entry</th><th align="left">
Section</th></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_fn_letter-A">A</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-2"><code>a</code></a></td><td
valign="top"><a href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_fn_letter-B">B</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-b-1"><code>b</code></a></td><td
valign="top"><a href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_fn_letter-C">C</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-c"><code>c</code></a></td><td
valign="top"><a href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_fn_letter-D">D</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-d"><code>d</code></a></td><td
valign="top"><a href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_fn_letter-I">I</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-i"><code><var>i</var></code></a></td><td valign="top"><a
href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-id-i-ule"><code><b>id
‘<samp>i</samp>’ ule</b></code></a></td><td valign="top"><a
href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_fn_letter-L">L</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-log-trap1"><code>log
trap1</code></a></td><td valign="top"><a href="#Top">Test inter item ignored
commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a
href="#Test-inter-item-ignored-commands_fn_letter-A"
class="summary-letter"><b>A</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-B"
class="summary-letter"><b>B</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-C"
class="summary-letter"><b>C</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-D"
class="summary-letter"><b>D</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-I"
class="summary-letter"><b>I</b></a>
+
+<a href="#Test-inter-item-ignored-commands_fn_letter-L"
class="summary-letter"><b>L</b></a>
+
+</td></tr></table>
+
+<p>vr
+</p><table><tr><th valign="top">Jump to: </th><td><a
href="#Test-inter-item-ignored-commands_vr_letter-A"
class="summary-letter"><b>A</b></a>
+
+<a href="#Test-inter-item-ignored-commands_vr_letter-B"
class="summary-letter"><b>B</b></a>
+
+</td></tr></table>
+<table border="0" class="index-vr">
+<tr><td></td><th align="left">Index Entry</th><th align="left">
Section</th></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_vr_letter-A">A</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a"><code>a</code></a></td><td
valign="top"><a href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-a-1"><code>a</code></a></td><td
valign="top"><a href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+<tr><th><a
name="Test-inter-item-ignored-commands_vr_letter-B">B</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="#index-b"><code>b</code></a></td><td
valign="top"><a href="#Top">Test inter item ignored commands</a></td></tr>
+<tr><td colspan="3"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a
href="#Test-inter-item-ignored-commands_vr_letter-A"
class="summary-letter"><b>A</b></a>
+
+<a href="#Test-inter-item-ignored-commands_vr_letter-B"
class="summary-letter"><b>B</b></a>
+
+</td></tr></table>
+
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/formatting/res/inter_item_commands_docbook/inter_item_commands.2
===================================================================
RCS file: test/formatting/res/inter_item_commands_docbook/inter_item_commands.2
diff -N test/formatting/res/inter_item_commands_docbook/inter_item_commands.2
Index: test/formatting/res/inter_item_commands_docbook/inter_item_commands.xml
===================================================================
RCS file:
test/formatting/res/inter_item_commands_docbook/inter_item_commands.xml
diff -N test/formatting/res/inter_item_commands_docbook/inter_item_commands.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/inter_item_commands_docbook/inter_item_commands.xml
3 Sep 2008 10:39:02 -0000 1.1
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; [
+ <!ENTITY tex "TeX">
+ <!ENTITY latex "LaTeX">
+]>
+<book id="inter_item_commands.xml" lang="en">
+<chapter label="" xreflabel="Test inter item ignored commands" id="Top">
+<title>Test inter item ignored commands</title>
+
+
+<itemizedlist mark="code"><!-- comment in itemize -->
+<indexterm role="cp"><primary>also a cindex in
itemize</primary></indexterm><listitem><para> e–mph item
+</para></listitem>
+</itemizedlist>
+<itemizedlist mark="bullet"><indexterm role="cp"><primary>index entry within
itemize</primary></indexterm><listitem><para> i–tem 1
+</para></listitem>
+<listitem> <indexterm role="cp"><primary>index entry right after
@item</primary></indexterm><para>i–tem 2
+</para></listitem>
+</itemizedlist>
+<itemizedlist><!-- comment in itemize -->
+<para>T–ext before items.
+<indexterm role="cp"><primary>also a cindex in
itemize</primary></indexterm></para><listitem><para> bullet item
+</para></listitem>
+</itemizedlist>
+<orderedlist numeration="arabic">
+<!-- comment before first item in enumerate -->
+<listitem><para> e–numerate
+</para></listitem>
+</orderedlist>
+<informaltable><tgroup cols="1"><colspec
colwidth="6*"></colspec><tbody><row><entry><!-- comment before first item -->
+
+</entry></row><row><entry> truc
+
+<indexterm role="cp"><primary>index entry between empty
lines</primary></indexterm>
+</entry></row><row><entry> trouc
+<!-- last comment -->
+</entry></row></tbody></tgroup></informaltable>
+<informaltable><tgroup cols="2"><colspec colwidth="600*"></colspec><colspec
colwidth="700*"></colspec><thead><row><entry> mu–ltitable headitem
</entry><entry> another tab
+</entry></row></thead><tbody><row><entry> mu–ltitable item
</entry><entry> multitable tab
+<!-- comment in multitable -->
+</entry></row><row><entry> mu–ltitable item 2 </entry><entry> multitable
tab 2
+<indexterm role="cp"><primary>index entry within
multitable</primary></indexterm></entry></row><row><entry> lone
mu–ltitable item
+</entry></row></tbody></tgroup></informaltable>
+<informalfigure><synopsis role="fset"><indexterm
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><function><replaceable>i</replaceable></function><replaceable>
a</replaceable><replaceable> g</replaceable></synopsis>
+<!-- comment before first deffnx -->
+
+<synopsis role="Command"><indexterm role="fn"><primary> log
trap1</primary></indexterm><function> log trap1</function><replaceable>
</replaceable></synopsis>
+<indexterm role="cp"><primary>between deffnx</primary></indexterm><synopsis
role="cmde2"><indexterm role="fn"><primary><emphasis role="bold">id
‘<literal>i</literal>’
ule</emphasis></primary></indexterm><function><emphasis role="bold">id
‘<literal>i</literal>’ ule</emphasis></function><replaceable>
truc</replaceable></synopsis>
+<blockquote><indexterm role="cp"><primary>cindex in deff
item</primary></indexterm>
+<para>In deff item.
+</para></blockquote></informalfigure>
+<variablelist><!-- comment in table -->
+<varlistentry><term> <literal>a</literal></term>
+<listitem><para>l–ine
+</para></listitem></varlistentry></variablelist>
+
+<variablelist><varlistentry><term> a</term>
+<term><!-- comment between item and itemx -->
+ b</term>
+<listitem><para>l–ine
+</para></listitem></varlistentry></variablelist>
+
+<variablelist><varlistentry><term> <replaceable>a</replaceable></term>
+<term><indexterm role="cp"><primary>index entry between item and
itemx</primary></indexterm><!-- and a comment -->
+<!-- and another comment -->
+ <replaceable>b</replaceable></term>
+<listitem><para>l–ine
+</para></listitem></varlistentry><varlistentry><term>
<replaceable>c</replaceable></term>
+<term>
+<!-- comment between lines -->
+
+ <replaceable>d</replaceable></term>
+<listitem><para>
+<!-- comment at end -->
+</para></listitem></varlistentry></variablelist>
+
+<variablelist><indexterm role="cp"><primary>cindex in
table</primary></indexterm><!-- comment in table -->
+<varlistentry><term> <literal>abb</literal></term>
+<listitem><para>l–ine
+</para></listitem></varlistentry></variablelist>
+
+<variablelist><indexterm role="cp"><primary>cindex in
table</primary></indexterm><para>Texte before first item.
+</para><varlistentry><term> <literal>abb</literal></term>
+<listitem><para><!-- empty table line
--></para></listitem></varlistentry></variablelist>
+
+<para>cp
+</para><index></index>
+
+<para>fn
+</para><index></index>
+
+<para>vr
+</para><index></index>
+
+</chapter>
+</book><!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-indent-step:1
+sgml-indent-data:nil
+End:
+-->
Index: test/formatting/res/inter_item_commands_xml/inter_item_commands.2
===================================================================
RCS file: test/formatting/res/inter_item_commands_xml/inter_item_commands.2
diff -N test/formatting/res/inter_item_commands_xml/inter_item_commands.2
Index: test/formatting/res/inter_item_commands_xml/inter_item_commands.xml
===================================================================
RCS file: test/formatting/res/inter_item_commands_xml/inter_item_commands.xml
diff -N test/formatting/res/inter_item_commands_xml/inter_item_commands.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/inter_item_commands_xml/inter_item_commands.xml 3 Sep
2008 10:39:03 -0000 1.1
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V4.12//EN"
"http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>
+<texinfo xml:lang="en">
+
+<setfilename>inter_item_commands.xml</setfilename>
+
+<node>
+<nodename>Top</nodename>
+<nodeup>(dir)</nodeup>
+<unnumbered>
+<title>Test inter item ignored commands</title>
+
+
+<itemize><itemfunction>•</itemfunction><item><!-- comment in itemize -->
+<para><indexterm index="cp">also a cindex in itemize</indexterm></para></item>
+<item><para> e–mph item
+</para></item>
+</itemize>
+
+<itemize><itemfunction>•</itemfunction><item><para><indexterm
index="cp">index entry within itemize</indexterm></para></item>
+<item><para> i–tem 1
+</para></item>
+<item><para> <indexterm index="cp">index entry right after
@item</indexterm>i–tem 2
+</para></item>
+</itemize>
+
+<itemize><itemfunction>•</itemfunction><item><!-- comment in itemize -->
+<para>T–ext before items.
+<indexterm index="cp">also a cindex in itemize</indexterm></para></item>
+<item><para> bullet item
+</para></item>
+</itemize>
+
+<enumerate first="1"><item>
+<!-- comment before first item in enumerate -->
+</item>
+<item><para> e–numerate
+</para></item>
+</enumerate>
+
+<multitable><columnfraction>6</columnfraction>
+<tbody><row><entry><!-- comment before first item -->
+
+</entry></row><row><entry> truc
+
+<indexterm index="cp">index entry between empty lines</indexterm>
+</entry></row><row><entry> trouc
+<!-- last comment -->
+</entry></row></tbody></multitable>
+
+<multitable><columnfraction>600</columnfraction>
+<columnfraction>700</columnfraction>
+<thead><row><entry> mu–ltitable headitem </entry><entry> another tab
+</entry></row></thead><tbody><row><entry> mu–ltitable item
</entry><entry> multitable tab
+<!-- comment in multitable -->
+</entry></row><row><entry> mu–ltitable item 2 </entry><entry> multitable
tab 2
+<indexterm index="cp">index entry within
multitable</indexterm></entry></row><row><entry> lone mu–ltitable item
+</entry></row></tbody></multitable>
+
+<definition><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory><deffunction><var>i</var></deffunction><defparam>
a</defparam><defparam> g</defparam></definitionterm>
+<!-- comment before first deffnx -->
+
+<definitionterm><indexterm index="fn"> log
trap1</indexterm><defcategory>Command</defcategory><deffunction> log
trap1</deffunction><defparam> </defparam></definitionterm>
+<para><indexterm index="cp">between
deffnx</indexterm></para><definitionterm><indexterm index="fn"><b>id
<samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory><deffunction><b>id
<samp>i</samp> ule</b></deffunction><defparam> truc</defparam></definitionterm>
+<definitionitem><para><indexterm index="cp">cindex in deff
item</indexterm></para>
+<para>In deff item.
+</para></definitionitem></definition>
+<table><!-- comment in table -->
+<tableitem><tableterm><indexterm index="vr">a</indexterm>
<code>a</code></tableterm>
+<item><para>l–ine
+</para></item></tableitem></table>
+
+<table><tableitem><tableterm><indexterm index="vr">a</indexterm> a</tableterm>
+<!-- comment between item and itemx -->
+<tableterm><indexterm index="vr">b</indexterm> b</tableterm>
+<item><para>l–ine
+</para></item></tableitem></table>
+
+<table><tableitem><tableterm><indexterm index="fn">a</indexterm>
<var>a</var></tableterm>
+<para><indexterm index="cp">index entry between item and itemx</indexterm><!--
and a comment -->
+<!-- and another comment -->
+</para><tableterm><indexterm index="fn">b</indexterm> <var>b</var></tableterm>
+<item><para>l–ine
+</para></item></tableitem><tableitem><tableterm><indexterm
index="fn">c</indexterm> <var>c</var></tableterm>
+
+<!-- comment between lines -->
+
+<tableterm><indexterm index="fn">d</indexterm> <var>d</var></tableterm>
+
+<!-- comment at end -->
+</tableitem></table>
+
+<table><para><indexterm index="cp">cindex in table</indexterm><!-- comment in
table -->
+</para><tableitem><tableterm> <code>abb</code></tableterm>
+<item><para>l–ine
+</para></item></tableitem></table>
+
+<table><item><para><indexterm index="cp">cindex in table</indexterm>Texte
before first item.
+</para></item><tableitem><tableterm> <code>abb</code></tableterm>
+</tableitem></table>
+
+<para>cp
+</para><printindex>cp</printindex>
+
+<para>fn
+</para><printindex>fn</printindex>
+
+<para>vr
+</para><printindex>vr</printindex>
+
+</unnumbered>
+</node>
+</texinfo>
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-indent-step:1
+sgml-indent-data:nil
+End:
+-->
Index: test/formatting/res/texi_inter_item_commands/inter_item_commands.2
===================================================================
RCS file: test/formatting/res/texi_inter_item_commands/inter_item_commands.2
diff -N test/formatting/res/texi_inter_item_commands/inter_item_commands.2
Index:
test/formatting/res/texi_inter_item_commands/inter_item_commands.passfirst
===================================================================
RCS file:
test/formatting/res/texi_inter_item_commands/inter_item_commands.passfirst
diff -N
test/formatting/res/texi_inter_item_commands/inter_item_commands.passfirst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/texi_inter_item_commands/inter_item_commands.passfirst
3 Sep 2008 10:39:03 -0000 1.1
@@ -0,0 +1,116 @@
+inter_item_commands.texi(,2)
+inter_item_commands.texi(,3) @setfilename inter_item_commands.info
+inter_item_commands.texi(,4)
+inter_item_commands.texi(,5) @node Top
+inter_item_commands.texi(,6) @top Test inter item ignored commands
+inter_item_commands.texi(,7)
+inter_item_commands.texi(,8)
+inter_item_commands.texi(,9) @itemize @code
+inter_item_commands.texi(,10) @c comment in itemize
+inter_item_commands.texi(,11) @cindex also a cindex in itemize
+inter_item_commands.texi(,12) @item e--mph item
+inter_item_commands.texi(,13) @end itemize
+inter_item_commands.texi(,14)
+inter_item_commands.texi(,15) @itemize @bullet
+inter_item_commands.texi(,16) @cindex index entry within itemize
+inter_item_commands.texi(,17) @item i--tem 1
+inter_item_commands.texi(,18) @item @cindex index entry right after @@item
+inter_item_commands.texi(,19) i--tem 2
+inter_item_commands.texi(,20) @end itemize
+inter_item_commands.texi(,21)
+inter_item_commands.texi(,22) @itemize
+inter_item_commands.texi(,23) @c comment in itemize
+inter_item_commands.texi(,24) T--ext before items.
+inter_item_commands.texi(,25) @cindex also a cindex in itemize
+inter_item_commands.texi(,26) @item bullet item
+inter_item_commands.texi(,27) @end itemize
+inter_item_commands.texi(,28)
+inter_item_commands.texi(,29) @enumerate
+inter_item_commands.texi(,30)
+inter_item_commands.texi(,31) @comment comment before first item in enumerate
+inter_item_commands.texi(,32) @item e--numerate
+inter_item_commands.texi(,33) @end enumerate
+inter_item_commands.texi(,34)
+inter_item_commands.texi(,35) @multitable {truc}
+inter_item_commands.texi(,36) @c comment before first item
+inter_item_commands.texi(,37)
+inter_item_commands.texi(,38) @item truc
+inter_item_commands.texi(,39)
+inter_item_commands.texi(,40) @cindex index entry between empty lines
+inter_item_commands.texi(,41)
+inter_item_commands.texi(,42) @item trouc
+inter_item_commands.texi(,43) @c last comment
+inter_item_commands.texi(,44) @end multitable
+inter_item_commands.texi(,45)
+inter_item_commands.texi(,46) @multitable @columnfractions 6 7
+inter_item_commands.texi(,47) @headitem mu--ltitable headitem @tab another tab
+inter_item_commands.texi(,48) @item mu--ltitable item @tab multitable tab
+inter_item_commands.texi(,49) @c comment in multitable
+inter_item_commands.texi(,50) @item mu--ltitable item 2 @tab multitable tab 2
+inter_item_commands.texi(,51) @cindex index entry within multitable
+inter_item_commands.texi(,52) @item lone mu--ltitable item
+inter_item_commands.texi(,53) @end multitable
+inter_item_commands.texi(,54)
+inter_item_commands.texi(,55) @deffn fset @var{i} a g
+inter_item_commands.texi(,56) @c comment before first deffnx
+inter_item_commands.texi(,57)
+inter_item_commands.texi(,58) @deffnx Command { log trap1} {}
+inter_item_commands.texi(,59) @cindex between deffnx
+inter_item_commands.texi(,60) @deffnx cmde2 @b{id @samp{i} ule} truc
+inter_item_commands.texi(,61) @cindex cindex in deff item
+inter_item_commands.texi(,62)
+inter_item_commands.texi(,63) In deff item.
+inter_item_commands.texi(,64) @end deffn
+inter_item_commands.texi(,65)
+inter_item_commands.texi(,66) @vtable @code
+inter_item_commands.texi(,67) @c comment in table
+inter_item_commands.texi(,68) @item a
+inter_item_commands.texi(,69) l--ine
+inter_item_commands.texi(,70) @end vtable
+inter_item_commands.texi(,71)
+inter_item_commands.texi(,72) @vtable @asis
+inter_item_commands.texi(,73) @item a
+inter_item_commands.texi(,74) @c comment between item and itemx
+inter_item_commands.texi(,75) @itemx b
+inter_item_commands.texi(,76) l--ine
+inter_item_commands.texi(,77) @end vtable
+inter_item_commands.texi(,78)
+inter_item_commands.texi(,79) @ftable @var
+inter_item_commands.texi(,80) @item a
+inter_item_commands.texi(,81) @cindex index entry between item and itemx
+inter_item_commands.texi(,82) @c and a comment
+inter_item_commands.texi(,83) @comment and another comment
+inter_item_commands.texi(,84) @itemx b
+inter_item_commands.texi(,85) l--ine
+inter_item_commands.texi(,86) @item c
+inter_item_commands.texi(,87)
+inter_item_commands.texi(,88) @c comment between lines
+inter_item_commands.texi(,89)
+inter_item_commands.texi(,90) @itemx d
+inter_item_commands.texi(,91)
+inter_item_commands.texi(,92) @c comment at end
+inter_item_commands.texi(,93) @end ftable
+inter_item_commands.texi(,94)
+inter_item_commands.texi(,95) @table @code
+inter_item_commands.texi(,96) @cindex cindex in table
+inter_item_commands.texi(,97) @c comment in table
+inter_item_commands.texi(,98) @item abb
+inter_item_commands.texi(,99) l--ine
+inter_item_commands.texi(,100) @end table
+inter_item_commands.texi(,101)
+inter_item_commands.texi(,102) @table @code
+inter_item_commands.texi(,103) @cindex cindex in table
+inter_item_commands.texi(,104) Texte before first item.
+inter_item_commands.texi(,105) @item abb
+inter_item_commands.texi(,106) @end table
+inter_item_commands.texi(,107)
+inter_item_commands.texi(,108) cp
+inter_item_commands.texi(,109) @printindex cp
+inter_item_commands.texi(,110)
+inter_item_commands.texi(,111) fn
+inter_item_commands.texi(,112) @printindex fn
+inter_item_commands.texi(,113)
+inter_item_commands.texi(,114) vr
+inter_item_commands.texi(,115) @printindex vr
+inter_item_commands.texi(,116)
+inter_item_commands.texi(,117) @bye
Index: test/formatting/res/texi_inter_item_commands/inter_item_commands.passtexi
===================================================================
RCS file:
test/formatting/res/texi_inter_item_commands/inter_item_commands.passtexi
diff -N
test/formatting/res/texi_inter_item_commands/inter_item_commands.passtexi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/texi_inter_item_commands/inter_item_commands.passtexi
3 Sep 2008 10:39:03 -0000 1.1
@@ -0,0 +1,116 @@
+inter_item_commands.texi(,2)
+inter_item_commands.texi(,3) @setfilename inter_item_commands.info
+inter_item_commands.texi(,4)
+inter_item_commands.texi(,5) @node Top
+inter_item_commands.texi(,6) @top Test inter item ignored commands
+inter_item_commands.texi(,7)
+inter_item_commands.texi(,8)
+inter_item_commands.texi(,9) @itemize @code
+inter_item_commands.texi(,10) @c comment in itemize
+inter_item_commands.texi(,11) @cindex also a cindex in itemize
+inter_item_commands.texi(,12) @item e--mph item
+inter_item_commands.texi(,13) @end itemize
+inter_item_commands.texi(,14)
+inter_item_commands.texi(,15) @itemize @bullet
+inter_item_commands.texi(,16) @cindex index entry within itemize
+inter_item_commands.texi(,17) @item i--tem 1
+inter_item_commands.texi(,18) @item @cindex index entry right after @@item
+inter_item_commands.texi(,19) i--tem 2
+inter_item_commands.texi(,20) @end itemize
+inter_item_commands.texi(,21)
+inter_item_commands.texi(,22) @itemize
+inter_item_commands.texi(,23) @c comment in itemize
+inter_item_commands.texi(,24) T--ext before items.
+inter_item_commands.texi(,25) @cindex also a cindex in itemize
+inter_item_commands.texi(,26) @item bullet item
+inter_item_commands.texi(,27) @end itemize
+inter_item_commands.texi(,28)
+inter_item_commands.texi(,29) @enumerate
+inter_item_commands.texi(,30)
+inter_item_commands.texi(,31) @comment comment before first item in enumerate
+inter_item_commands.texi(,32) @item e--numerate
+inter_item_commands.texi(,33) @end enumerate
+inter_item_commands.texi(,34)
+inter_item_commands.texi(,35) @multitable {truc}
+inter_item_commands.texi(,36) @c comment before first item
+inter_item_commands.texi(,37)
+inter_item_commands.texi(,38) @item truc
+inter_item_commands.texi(,39)
+inter_item_commands.texi(,40) @cindex index entry between empty lines
+inter_item_commands.texi(,41)
+inter_item_commands.texi(,42) @item trouc
+inter_item_commands.texi(,43) @c last comment
+inter_item_commands.texi(,44) @end multitable
+inter_item_commands.texi(,45)
+inter_item_commands.texi(,46) @multitable @columnfractions 6 7
+inter_item_commands.texi(,47) @headitem mu--ltitable headitem @tab another tab
+inter_item_commands.texi(,48) @item mu--ltitable item @tab multitable tab
+inter_item_commands.texi(,49) @c comment in multitable
+inter_item_commands.texi(,50) @item mu--ltitable item 2 @tab multitable tab 2
+inter_item_commands.texi(,51) @cindex index entry within multitable
+inter_item_commands.texi(,52) @item lone mu--ltitable item
+inter_item_commands.texi(,53) @end multitable
+inter_item_commands.texi(,54)
+inter_item_commands.texi(,55) @deffn fset @var{i} a g
+inter_item_commands.texi(,56) @c comment before first deffnx
+inter_item_commands.texi(,57)
+inter_item_commands.texi(,58) @deffnx Command { log trap1} {}
+inter_item_commands.texi(,59) @cindex between deffnx
+inter_item_commands.texi(,60) @deffnx cmde2 @b{id @samp{i} ule} truc
+inter_item_commands.texi(,61) @cindex cindex in deff item
+inter_item_commands.texi(,62)
+inter_item_commands.texi(,63) In deff item.
+inter_item_commands.texi(,64) @end deffn
+inter_item_commands.texi(,65)
+inter_item_commands.texi(,66) @vtable @code
+inter_item_commands.texi(,67) @c comment in table
+inter_item_commands.texi(,68) @item a
+inter_item_commands.texi(,69) l--ine
+inter_item_commands.texi(,70) @end vtable
+inter_item_commands.texi(,71)
+inter_item_commands.texi(,72) @vtable @asis
+inter_item_commands.texi(,73) @item a
+inter_item_commands.texi(,74) @c comment between item and itemx
+inter_item_commands.texi(,75) @itemx b
+inter_item_commands.texi(,76) l--ine
+inter_item_commands.texi(,77) @end vtable
+inter_item_commands.texi(,78)
+inter_item_commands.texi(,79) @ftable @var
+inter_item_commands.texi(,80) @item a
+inter_item_commands.texi(,81) @cindex index entry between item and itemx
+inter_item_commands.texi(,82) @c and a comment
+inter_item_commands.texi(,83) @comment and another comment
+inter_item_commands.texi(,84) @itemx b
+inter_item_commands.texi(,85) l--ine
+inter_item_commands.texi(,86) @item c
+inter_item_commands.texi(,87)
+inter_item_commands.texi(,88) @c comment between lines
+inter_item_commands.texi(,89)
+inter_item_commands.texi(,90) @itemx d
+inter_item_commands.texi(,91)
+inter_item_commands.texi(,92) @c comment at end
+inter_item_commands.texi(,93) @end ftable
+inter_item_commands.texi(,94)
+inter_item_commands.texi(,95) @table @code
+inter_item_commands.texi(,96) @cindex cindex in table
+inter_item_commands.texi(,97) @c comment in table
+inter_item_commands.texi(,98) @item abb
+inter_item_commands.texi(,99) l--ine
+inter_item_commands.texi(,100) @end table
+inter_item_commands.texi(,101)
+inter_item_commands.texi(,102) @table @code
+inter_item_commands.texi(,103) @cindex cindex in table
+inter_item_commands.texi(,104) Texte before first item.
+inter_item_commands.texi(,105) @item abb
+inter_item_commands.texi(,106) @end table
+inter_item_commands.texi(,107)
+inter_item_commands.texi(,108) cp
+inter_item_commands.texi(,109) @printindex cp
+inter_item_commands.texi(,110)
+inter_item_commands.texi(,111) fn
+inter_item_commands.texi(,112) @printindex fn
+inter_item_commands.texi(,113)
+inter_item_commands.texi(,114) vr
+inter_item_commands.texi(,115) @printindex vr
+inter_item_commands.texi(,116)
+inter_item_commands.texi(,117) @bye
Index: test/formatting/res/texi_inter_item_commands/inter_item_commands.texi
===================================================================
RCS file: test/formatting/res/texi_inter_item_commands/inter_item_commands.texi
diff -N test/formatting/res/texi_inter_item_commands/inter_item_commands.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/formatting/res/texi_inter_item_commands/inter_item_commands.texi
3 Sep 2008 10:39:03 -0000 1.1
@@ -0,0 +1,117 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden inter_item_commands.info
+
address@hidden Top
address@hidden Test inter item ignored commands
+
+
address@hidden @code
address@hidden comment in itemize
address@hidden also a cindex in itemize
address@hidden e--mph item
address@hidden itemize
+
address@hidden @bullet
address@hidden index entry within itemize
address@hidden i--tem 1
address@hidden @cindex index entry right after @@item
+i--tem 2
address@hidden itemize
+
address@hidden
address@hidden comment in itemize
+T--ext before items.
address@hidden also a cindex in itemize
address@hidden bullet item
address@hidden itemize
+
address@hidden
+
address@hidden comment before first item in enumerate
address@hidden e--numerate
address@hidden enumerate
+
address@hidden {truc}
address@hidden comment before first item
+
address@hidden truc
+
address@hidden index entry between empty lines
+
address@hidden trouc
address@hidden last comment
address@hidden multitable
+
address@hidden @columnfractions 6 7
address@hidden mu--ltitable headitem @tab another tab
address@hidden mu--ltitable item @tab multitable tab
address@hidden comment in multitable
address@hidden mu--ltitable item 2 @tab multitable tab 2
address@hidden index entry within multitable
address@hidden lone mu--ltitable item
address@hidden multitable
+
address@hidden fset @var{i} a g
address@hidden comment before first deffnx
+
address@hidden Command { log trap1} {}
address@hidden between deffnx
address@hidden cmde2 @b{id @samp{i} ule} truc
address@hidden cindex in deff item
+
+In deff item.
address@hidden deffn
+
address@hidden @code
address@hidden comment in table
address@hidden a
+l--ine
address@hidden vtable
+
address@hidden @asis
address@hidden a
address@hidden comment between item and itemx
address@hidden b
+l--ine
address@hidden vtable
+
address@hidden @var
address@hidden a
address@hidden index entry between item and itemx
address@hidden and a comment
address@hidden and another comment
address@hidden b
+l--ine
address@hidden c
+
address@hidden comment between lines
+
address@hidden d
+
address@hidden comment at end
address@hidden ftable
+
address@hidden @code
address@hidden cindex in table
address@hidden comment in table
address@hidden abb
+l--ine
address@hidden table
+
address@hidden @code
address@hidden cindex in table
+Texte before first item.
address@hidden abb
address@hidden table
+
+cp
address@hidden cp
+
+fn
address@hidden fn
+
+vr
address@hidden vr
+
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.pl examples/...,
Patrice Dumas <=