[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht... |
|
Date: |
Sat, 26 Sep 2009 23:10:15 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/09/26 23:10:12
Modified files:
. : ChangeLog TODO texi2html.init texi2html.pl
examples : makeinfo.init roff.init
formats : docbook.init html.init info.init xml.init
test/coverage/res_all/formatting: formatting.txt
test/encodings/res_all/formatting_converted_to_utf8:
formatting.txt
test/encodings/res_all/formatting_fr: formatting.txt
test/encodings/res_all/formatting_fr_icons: formatting.txt
test/formatting: float_copying.texi
test/formatting/res/float_copying: float_copying.2
float_copying_1.html
test/formatting/res/texi_float_copying: float_copying.2
float_copying.passfirst
float_copying.passtexi
float_copying.texi
float_copying.texi.first
test/formatting/res_all/float_copying: float_copying.2
float_copying_1.txt
test/formatting/res_all/formatting_weird_quotes: formatting.txt
test/formatting/res_all/heading: headings.txt
test/formatting/res_all/texi_float_copying: float_copying.2
float_copying.passfirst
float_copying.passtexi
float_copying.texi
float_copying.texi.first
test/formatting/res_info/float_copying: float_copying.2
float_copying.info
test/formatting/res_info/texi_float_copying: float_copying.2
float_copying.passfirst
float_copying.passtexi
float_copying.texi
float_copying.texi.first
test/indices/res/index_special_region: index_special_region.2
test/indices/res/index_special_region_html:
index_special_region.2
test/indices/res_all/index_special_region:
index_special_region.2
index_special_region_1.txt
index_special_region_2.txt
test/indices/res_all/index_special_region_html:
index_special_region.2
test/indices/res_info/index_special_region_html:
index_special_region.2
test/layout/res_all/formatting_exotic: formatting.txt
formatting_3.txt
test/layout/res_all/formatting_regions: formatting-regions.txt
Log message:
* texi2html.pl: use @code for index entries that should be
in @code that are not in usual places and so couldn't be
gathered in pass 2.
Distinguish 'expansion', like index entry, or caption in
various contexts and real regions like @copying and @titlepage,
that are 'region'.
Don't use 'hidden' in a index entry ref for hidden index
entries, instead flag entries that were not seen and are in
a region. Entries that are in an 'expansion' may be expanded
more than once and are also not collected.
Warn for anchors that are ignored because they are in a region
that is expanded more than once.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.441&r2=1.442
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.237&r2=1.238
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.340&r2=1.341
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/makeinfo.init?cvsroot=texi2html&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/roff.init?cvsroot=texi2html&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/docbook.init?cvsroot=texi2html&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/html.init?cvsroot=texi2html&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/info.init?cvsroot=texi2html&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texi2html/formats/xml.init?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/coverage/res_all/formatting/formatting.txt?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/formatting_converted_to_utf8/formatting.txt?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/formatting_fr/formatting.txt?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/encodings/res_all/formatting_fr_icons/formatting.txt?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/float_copying.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/float_copying/float_copying.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/float_copying/float_copying_1.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_float_copying/float_copying.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_float_copying/float_copying.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_float_copying/float_copying.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_float_copying/float_copying.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res/texi_float_copying/float_copying.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/float_copying/float_copying.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/float_copying/float_copying_1.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/formatting_weird_quotes/formatting.txt?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/heading/headings.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/texi_float_copying/float_copying.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/texi_float_copying/float_copying.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/texi_float_copying/float_copying.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/texi_float_copying/float_copying.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_all/texi_float_copying/float_copying.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/float_copying/float_copying.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/float_copying/float_copying.info?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/texi_float_copying/float_copying.2?cvsroot=texi2html&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/texi_float_copying/float_copying.passfirst?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/texi_float_copying/float_copying.passtexi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/texi_float_copying/float_copying.texi?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/res_info/texi_float_copying/float_copying.texi.first?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/index_special_region/index_special_region.2?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/index_special_region_html/index_special_region.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_all/index_special_region/index_special_region.2?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_all/index_special_region/index_special_region_1.txt?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_all/index_special_region/index_special_region_2.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_all/index_special_region_html/index_special_region.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res_info/index_special_region_html/index_special_region.2?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res_all/formatting_exotic/formatting.txt?cvsroot=texi2html&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res_all/formatting_exotic/formatting_3.txt?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res_all/formatting_regions/formatting-regions.txt?cvsroot=texi2html&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -b -r1.441 -r1.442
--- ChangeLog 23 Sep 2009 19:07:29 -0000 1.441
+++ ChangeLog 26 Sep 2009 23:10:02 -0000 1.442
@@ -1,3 +1,18 @@
+2009-09-23 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: use @code for index entries that should be
+ in @code that are not in usual places and so couldn't be
+ gathered in pass 2.
+ Distinguish 'expansion', like index entry, or caption in
+ various contexts and real regions like @copying and @titlepage,
+ that are 'region'.
+ Don't use 'hidden' in a index entry ref for hidden index
+ entries, instead flag entries that were not seen and are in
+ a region. Entries that are in an 'expansion' may be expanded
+ more than once and are also not collected.
+ Warn for anchors that are ignored because they are in a region
+ that is expanded more than once.
+
2009-09-22 Patrice Dumas <address@hidden>
* texi2html.pl: if a closed file is reopened, echo a warning
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- TODO 22 Sep 2009 20:22:24 -0000 1.147
+++ TODO 26 Sep 2009 23:10:03 -0000 1.148
@@ -3,7 +3,6 @@
Before next release
-------------------
-
Later
-----
@@ -59,6 +58,7 @@
new argument of printindex
new arguments of $unknown_style
new arguments of index_entry_label
+ new arguments of index_entry
new argument of style
NODE_FILENAMES
$Texi2HTML::THISDOC{'format_from_command_line'}
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- texi2html.init 21 Sep 2009 18:39:40 -0000 1.237
+++ texi2html.init 26 Sep 2009 23:10:03 -0000 1.238
@@ -13,7 +13,7 @@
# Afterwards, load the file with command-line
# option --init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.237 2009/09/21 18:39:40 pertusus Exp $
+# $Id: texi2html.init,v 1.238 2009/09/26 23:10:03 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -6125,7 +6125,7 @@
# arguments:
# target identifier
# boolean true if in preformatted format
-sub t2h_default_index_entry_label($$$$$$$$)
+sub t2h_default_index_entry_label($$$$$$$$$)
{
my $identifier = shift;
my $preformatted = shift;
@@ -6134,6 +6134,7 @@
my $index_command = shift;
my $texi_entry = shift;
my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
my $index_entry_ref = shift;
return '' if (!defined($identifier) or ($identifier !~ /\S/));
@@ -6379,7 +6380,7 @@
# href to the main text, linking to the section or node where the index
# entry appears
# section or node heading
-sub t2h_default_index_entry($$$$$$$$$)
+sub t2h_default_index_entry($$$$$$$$$$)
{
my $text_href = shift;
my $entry = shift;
@@ -6389,9 +6390,11 @@
my $current_element_file = shift;
my $entry_target = shift;
my $entry_element_target = shift;
+ my $in_region_not_in_output = shift;
my $index_entry_ref = shift;
- return '' if ($index_entry_ref->{'hidden'});
+ return '' if ($in_region_not_in_output);
+ #!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
$entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in
address@hidden");
return '' if ($entry =~ /^\s*$/);
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -b -r1.340 -r1.341
--- texi2html.pl 23 Sep 2009 19:07:29 -0000 1.340
+++ texi2html.pl 26 Sep 2009 23:10:04 -0000 1.341
@@ -86,7 +86,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.340 2009/09/23 19:07:29 pertusus Exp $
+# $Id: texi2html.pl,v 1.341 2009/09/26 23:10:04 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -1411,9 +1411,10 @@
foreach my $index_entry_ref (@{$letter_entry->{'entries'}})
{
my ($text_href, $entry_file, $element_file, $entry_target,
- $entry_element_target, $formatted_entry, $element_href,
$entry_element_text)
+ $entry_element_target, $formatted_entry, $element_href,
+ $entry_element_text, $in_region_not_in_output)
= main::get_index_entry_infos($index_entry_ref,
$split_group->{'element'});
- $entries_text .= &$index_entry ($text_href, $formatted_entry,
$element_href, $entry_element_text, $entry_file, $element_file, $entry_target,
$entry_element_target, $index_entry_ref);
+ $entries_text .= &$index_entry ($text_href, $formatted_entry,
$element_href, $entry_element_text, $entry_file, $element_file, $entry_target,
$entry_element_target, $in_region_not_in_output, $index_entry_ref);
}
$letters_text .= &$index_letter ($letter, $letter_id{$letter},
$entries_text)
}
@@ -7607,7 +7608,6 @@
$entry = '';
$index_name = $prefix;
}
- #if (!exists($current_element->{'tag'}) and
!$current_element->{'footnote'})
if ($current_element eq $element_before_anything)
{
#line_warn ("Index entry before document: address@hidden $entry",
$line_nr);
@@ -7615,30 +7615,22 @@
}
$entry = trim_comment_spaces ($entry, "index entry in address@hidden",
$line_nr);
# The $key is mostly usefull for alphabetical sorting.
- #Â beware that the texinfo could be non empty, but the key is. So the
- #Â key should be used to determine whether the entry is empty or not.
#Â This could be done later while sorting, but it doesn't really matter
#Â since there are no error messages anyway.
my $key = remove_texi($entry);
- my $id;
+ #Â beware that the texinfo could be non empty, but the key be empty. So the
+ #Â key should be used to determine whether the entry is empty or not.
- my $index_entry_hidden = 1;
- if (!$region and $place eq $no_element_associated_place)
- {
- $region = 'no_place';
- }
- elsif (!defined($region))
+ my $id;
+ # don't add a specific index target if the index entry is in a special
+ # region like @copying or the like
+ if (!defined($region))
{
$region = 'document';
- $index_entry_hidden = 0;
- }
- # don't add a specific index target if after a section or the index
- # entry is in @copying or the like
- unless ($index_entry_hidden)
- {
$id = 'IDX' . ++$document_idx_num;
}
my $target = $id;
+
# entry will later be in @code for code-like index entry. texi stays
# the same.
my $index_entry = {
@@ -7651,17 +7643,14 @@
'id' => $id,
'target' => $target,
'command' => $command,
- 'hidden' => $index_entry_hidden,
- 'region' => $region,
+ 'region' => $state->{'region'},
'line_nr' => $line_nr,
'index_name' => $index_name
};
- my $region_text = $region;
- $region_text = 'main' if (!defined($region));
my $id_text = $id;
$id_text = 'NO ID' if (!defined($id));
- print STDERR "# in $region_text enter address@hidden ${prefix}index($key)
[$entry] with id $id_text ($index_entry)\n"
+ print STDERR "# in $region enter address@hidden ${prefix}index($key)
[$entry] with id $id_text ($index_entry)\n"
if ($T2H_DEBUG & $DEBUG_INDEX);
$index_entry->{'entry'} = '@code{'.$index_entry->{'entry'}.'}'
@@ -7672,37 +7661,18 @@
push @$place, $index_entry;
- #print STDERR "enter_index_entry: region $region, index_entry
$index_entry, address@hidden, texi `$entry'\n";
+ #msg_debug("enter_index_entry: region $region, index_entry $index_entry,
address@hidden, texi `$entry'", $line_nr);
+
# don't add the index entry to the list of index entries used for index
# entry formatting, if the index entry appears in a region like copying
- push @index_labels, $index_entry unless ($index_entry_hidden);
- push @{$Texi2HTML::THISDOC{'index_entries_array'}->{$index_name}},
$index_entry;
- push
@{$Texi2HTML::THISDOC{'index_entries'}->{$region}->{$entry}->{'entries'}},
$index_entry;
-}
+ # currently this is only used for debugging purposes, since the
+ # index entries lists are broken by region now.
+ push @index_labels, $index_entry unless (defined($state->{'region'}));
-# sort according to cmp if both $a and $b are alphabetical or non
alphabetical,
-# otherwise the alphabetical is ranked first
-sub by_alpha
-{
- if ($a =~ /^[A-Za-z]/)
- {
- if ($b =~ /^[A-Za-z]/)
- {
- return lc($a) cmp lc($b);
- }
- else
- {
- return 1;
- }
- }
- elsif ($b =~ /^[A-Za-z]/)
- {
- return -1;
- }
- else
- {
- return lc($a) cmp lc($b);
- }
+ # these lists aare used to retrieve index entries in pass 3
+ push
@{$Texi2HTML::THISDOC{'index_entries'}->{$region}->{$entry}->{'entries'}},
$index_entry;
+ # this is used for @printindex
+ push @{$Texi2HTML::THISDOC{'index_entries_array'}->{$index_name}},
$index_entry;
}
# these variables are global, so great care should be taken with
@@ -9166,16 +9136,21 @@
my $state = shift;
my $line_nr = shift;
- #print STDERR "do_anchor_label $state->{'region'} m_p
$state->{'multiple_pass'} remove $state->{'remove_texi'} `$anchor'\n";
- # FIXME anchor may appear twice when outside document and first time
- # it appears in the document
- return '' if (($state->{'region'} and $state->{'multiple_pass'} > 0) or
$state->{'remove_texi'});
+ #msg_debug("do_anchor_label $state->{'region'} m_p
$state->{'multiple_pass'} remove $state->{'remove_texi'} `$anchor'", $line_nr);
+
$anchor = normalise_node($anchor);
+ if ((defined($state->{'multiple_pass'}) and $state->{'multiple_pass'} > 0)
or $state->{'outside_document'})
+ {
+ # no warning when outside of document.
+ line_warn("Anchor `$anchor' ignored in $state->{'region'} expanded more
than once", $line_nr) unless ($state->{'outside_document'} or
defined($state->{'expansion'}));
+ return '';
+ }
+
if (!exists($nodes{$anchor}) or !defined($nodes{$anchor}->{'id'}))
{
- print STDERR "Bug: unknown anchor `$anchor'\n";
+ msg_debug("Unknown anchor `$anchor'", $line_nr);
}
- return &$Texi2HTML::Config::anchor_label($nodes{$anchor}->{'id'}, $anchor,
$nodes{$anchor}, $state->{'region'});
+ return &$Texi2HTML::Config::anchor_label($nodes{$anchor}->{'id'}, $anchor,
$nodes{$anchor}, $state->{'expansion'});
}
sub get_format_command($)
@@ -9518,7 +9493,6 @@
{
line_error("Recursively expanding region $region in
$state->{'region'}", $line_nr);
return ('','', '');
-
}
print STDERR "# do_special_region_lines for region $region
['multiple_pass','region_pass']:
($region_initial_state{$region}->{'multiple_pass'},
$region_initial_state{$region}->{'region_pass'})" if ($T2H_DEBUG);
@@ -9539,57 +9513,55 @@
}
return ('','','') unless @{$region_lines{$region}};
+
+ my @result;
+
+ foreach my $context ('normal', 'remove_texi', 'simple_format')
+ {
+ print STDERR "#Â $context\n" if ($T2H_DEBUG);
my $new_state = duplicate_formatting_state($state);
reset_index_entries($region);
foreach my $key (keys(%{$region_initial_state{$region}}))
{
$new_state->{$key} = $region_initial_state{$region}->{$key};
}
+ $new_state->{'remove_texi'} = 1 if ($context eq 'remove_texi');
+
&$Texi2HTML::Config::begin_special_region($region,$new_state,$region_lines{$region})
if (defined($Texi2HTML::Config::begin_special_region));
- my $text = substitute_text($new_state, [ @{$region_line_nrs{$region}} ],
- "$region ($region_initial_state{$region}->{'multiple_pass'},
$region_initial_state{$region}->{'region_pass'})",
- @{$region_lines{$region}});
- $text = &$Texi2HTML::Config::end_special_region($region,$new_state,$text)
- if (defined($Texi2HTML::Config::end_special_region));
- $region_initial_state{$region}->{'region_pass'}++;
- my $remove_texi_state = duplicate_formatting_state($state);
- reset_index_entries($region);
- $remove_texi_state->{'remove_texi'} = 1;
- foreach my $key (keys(%{$region_initial_state{$region}}))
+ my $line_numbers;
+ my $context_string = "$region
($region_initial_state{$region}->{'multiple_pass'},
$region_initial_state{$region}->{'region_pass'})";
+ if ($context eq 'normal')
+ { # the line numbers are given only for the normal context, therefore
+ # there will be error messages only in that case
+ $line_numbers = [ @{$region_line_nrs{$region}} ];
+ }
+ else
{
- $remove_texi_state->{$key} = $region_initial_state{$region}->{$key};
+ $context_string = "$context $context_string";
}
-
&$Texi2HTML::Config::begin_special_region($region,$remove_texi_state,$region_lines{$region})
- if (defined($Texi2HTML::Config::begin_special_region));
- print STDERR "#Â remove texi\n" if ($T2H_DEBUG);
- my $removed_texi = substitute_text($remove_texi_state, undef,
- "remove_texi $region
($region_initial_state{$region}->{'multiple_pass'},
$region_initial_state{$region}->{'region_pass'})",
- @{$region_lines{$region}});
- $removed_texi =
&$Texi2HTML::Config::end_special_region($region,$remove_texi_state,
$removed_texi)
- if (defined($Texi2HTML::Config::end_special_region));
- $region_initial_state{$region}->{'region_pass'}++;
- my $simple_format_state = duplicate_formatting_state($state);
- reset_index_entries($region);
- foreach my $key (keys(%{$region_initial_state{$region}}))
+ my $result;
+ if ($context ne 'simple_format')
{
- $simple_format_state->{$key} = $region_initial_state{$region}->{$key};
+ $result = substitute_text($new_state, $line_numbers,
+ $context_string, @{$region_lines{$region}});
}
-
-
&$Texi2HTML::Config::begin_special_region($region,$simple_format_state,$region_lines{$region})
- if (defined($Texi2HTML::Config::begin_special_region));
- print STDERR "# simple format\n" if ($T2H_DEBUG);
- my $simple_format = simple_format($simple_format_state, undef,
- "simple_format $region
($region_initial_state{$region}->{'multiple_pass'},
$region_initial_state{$region}->{'region_pass'})",
- @{$region_lines{$region}});
- $simple_format =
&$Texi2HTML::Config::end_special_region($region,$simple_format_state,
$simple_format)
+ else
+ {
+ $result = simple_format($new_state, $line_numbers,
+ $context_string, @{$region_lines{$region}});
+ }
+ $result =
&$Texi2HTML::Config::end_special_region($region,$new_state,$result)
if (defined($Texi2HTML::Config::end_special_region));
+
+ push @result, $result;
$region_initial_state{$region}->{'region_pass'}++;
+ }
- return ($text, $removed_texi, $simple_format);
+ return @result;
}
sub do_insertcopying($$)
@@ -10138,14 +10110,19 @@
my $state = shift;
my $return_state = {
'multiple_pass' => 1,
- 'region_pass' => 1,
'element' => $state->{'element'},
+ 'outside_document' => $state->{'outside_document'},
+ 'new_state' => 1
};
if (defined($command))
{
- $return_state->{'region'} = $command;
+ $return_state->{'expansion'} = $command;
$return_state->{'command_stack'} = ["$command"];
}
+ else
+ {
+ msg_debug("prepare_state_multiple_pass command not defined");
+ }
return $return_state;
}
@@ -11022,14 +10999,6 @@
$text = &$Texi2HTML::Config::footnote_texi($text, $doc_state, $style_stack)
if (defined($Texi2HTML::Config::footnote_texi));
- #if (!defined($text))
- #{
- # msg_debug("footnote text not defined($global_foot_num,
".var_to_str($doc_state->{'outside_document'})." or
$doc_state->{'multiple_pass'}). Original argument $args->[0]", $line_nr);
- #}
- #else
- #{
- # msg_debug("FOOTNOTE($global_foot_num,
".var_to_str($doc_state->{'outside_document'})." or
$doc_state->{'multiple_pass'}) $text", $line_nr);
- #}
my $foot_state = duplicate_state($doc_state);
fill_state($foot_state);
push @{$foot_state->{'command_stack'}}, 'footnote';
@@ -11037,13 +11006,16 @@
push_state($foot_state);
my ($foot_num, $relative_foot_num);
- if (!$foot_state->{'region'})
+ my $special_place;
+ if (!defined($foot_state->{'expansion'}) and
!defined($foot_state->{'region'}))
{
$foot_num = \$global_foot_num;
$relative_foot_num = \$global_relative_foot_num;
}
else
{
+ $special_place = $foot_state->{'expansion'};
+ $special_place = $foot_state->{'region'} if (!defined($special_place));
$foot_num = \$doc_state->{'foot_num'};
$relative_foot_num = \$doc_state->{'relative_foot_num'};
}
@@ -11052,10 +11024,10 @@
my $docid = "DOCF$$foot_num";
my $footid = "FOOT$$foot_num";
- if ($doc_state->{'region'})
+ if (defined($special_place))
{
- $docid = $target_prefix . $doc_state->{'region'} . "_$docid";
- $footid = $target_prefix . $doc_state->{'region'} . "_$footid";
+ $docid = $target_prefix . $special_place . "_$docid";
+ $footid = $target_prefix . $special_place . "_$footid";
}
my $from_file = $docu_doc;
if ($doc_state->{'element'})
@@ -11085,11 +11057,11 @@
}
my ($foot_lines, $foot_label) =
&$Texi2HTML::Config::foot_line_and_ref($$foot_num,
$$relative_foot_num, $footid, $docid, $from_file,
$foot_state->{'element'}->{'file'}, address@hidden, $doc_state);
- if ($doc_state->{'outside_document'} or ($doc_state->{'region'} and
$doc_state->{'multiple_pass'} > 0))
+ if ($doc_state->{'outside_document'} or
(defined($doc_state->{'multiple_pass'}) and $doc_state->{'multiple_pass'} > 0))
{
#print STDERR "multiple_pass $doc_state->{'multiple_pass'}, 'outside_document'
$doc_state->{'outside_document'}\n";
#print STDERR "REGION FOOTNOTE($$foot_num): $doc_state->{'region'}
($doc_state->{'region_pass'})\n";
-
$region_initial_state{$doc_state->{'region'}}->{'footnotes'}->{$$foot_num}->{$doc_state->{'region_pass'}}
= $foot_lines;
+
$region_initial_state{$doc_state->{'region'}}->{'footnotes'}->{$$foot_num}->{$doc_state->{'region_pass'}}
= $foot_lines if (defined($doc_state->{'region'}));
}
else
{
@@ -11124,7 +11096,6 @@
$args[4] = '' if (!defined($args[4]));
$args[3] = '' if (!defined($args[3]));
my $image;
- #my $extension = substitute_line($args[4], {'code_style' => 1});
my $extension = substitute_line($args[4], "address@hidden extension",
{'code_style' => 1, 'remove_texi' => 1});
my $extension_simple = substitute_line($args[4], "address@hidden
extension", {'simple_format' => 1, 'code_style' => 1});
my ($file_name, $image_name, $simple_file_name);
@@ -11174,6 +11145,7 @@
'multiple_pass' => $state->{'multiple_pass'},
'region_pass' => $state->{'region_pass'},
'region' => $state->{'region'},
+ 'expansion' => $state->{'expansion'},
'sec_num' => $state->{'sec_num'},
'outside_document' => $state->{'outside_document'},
'inside_document' => $state->{'inside_document'},
@@ -11403,7 +11375,8 @@
$index_heading_element->{'target'},
substitute_line($entry->{'entry'}, "address@hidden>{'command'}
index infos"),
href($entry_heading_element, $element->{'file'}, $line_nr),
- $entry_heading_element->{'text'});
+ $entry_heading_element->{'text'},
+ (!$entry->{'seen_in_output'} and defined($entry->{'region'})));
}
# remove texi commands, replacing with what seems adequate. see simple_map_texi
@@ -12283,10 +12256,17 @@
my $line_nr = shift;
my $result;
+ #print STDERR "close_structure_command $cmd_ref->{'style'}\n";
+ #Â If the anchor is in @titlepage or @copying, it is nevertheless only
+ #Â expanded once in pass_structure, during the @copying or @titlepage
+ #Â expansion.
+ #Â It is not true, however if INLINE_INSERTCOPYING is true.
+ #Â See indices/index_special_region.texi tests.
if ($cmd_ref->{'style'} eq 'anchor')
{
my $anchor = $cmd_ref->{'text'};
$anchor = normalise_node($anchor);
+ #print STDERR "Anchor $anchor\n";
if ($nodes{$anchor})
{
line_error ("Anchor `$anchor' previously defined
".format_line_number($nodes{$anchor}->{'line_nr'}), $line_nr);
@@ -12662,7 +12642,6 @@
{
my $name = $1;
my $heading_ref = new_section_heading($macro, $name,
$state, $line_nr);
- #if ($state->{'place'} eq $no_element_associated_place)
if (exists($state->{'region_lines'}) and
$state->{'region_lines'}->{'format'})
{
my $region = $state->{'region_lines'}->{'format'};
@@ -13531,8 +13510,8 @@
{
my $float_style =
substitute_line(&$Texi2HTML::Config::listoffloats_float_style($arg, $float),
"address@hidden address@hidden type");
my ($caption_lines, $caption_or_shortcaption) =
&$Texi2HTML::Config::listoffloats_caption($float);
- # we set 'multiple_pass', 'region' and
- # 'region_pass'such that index entries
+ # we set 'multiple_pass', and 'expansion'
+ # such that index entries
# and anchors are not handled one more time;
# the caption has already been formatted,
# and these have been handled at the right place
@@ -14836,12 +14815,14 @@
#$stack = [ ];
}
+# This is used in pass 2 and 3.
sub open_region($$)
{
my $command = shift;
my $state = shift;
if (!exists($state->{'region_lines'}))
{
+ # FIXME 'format' is badly choosen 'region_name' would be much better
$state->{'region_lines'}->{'format'} = $command;
$state->{'region_lines'}->{'number'} = 1;
$state->{'region_lines'}->{'kept_place'} = $state->{'place'};
@@ -14858,6 +14839,7 @@
# close region like @insertcopying, titlepage...
# restore $state and delete the structure
+# This is used in pass 2 and 3.
sub close_region($)
{
my $state = shift;
@@ -14952,8 +14934,10 @@
# This tries to avoid cases where the command_stack is not empty
#Â for a good reason, for example when doing a @def formatting the
- #Â outside command_stack is preserved
- return if ($format or $state->{'multiple_pass'} or
$state->{'no_paragraph'});
+ #Â outside command_stack is preserved. Also when expanding for
+ # example @titleplage or @copying.
+ # FIXME sort out which cases it is.
+ return if ($format or (defined($state->{'multiple_pass'}) and
$state->{'multiple_pass'} > 0) or $state->{'no_paragraph'});
# go through the command_stack and warn for each opened style format
#Â and remove it. Those should be there because there is an opened style
@@ -15053,11 +15037,6 @@
{
last if ($stack->[$stack_level]->{'format'});
my $style = $stack->[$stack_level]->{'style'};
- # FIXME images, footnotes, xrefs, anchors?
- # seems that it is not possible, as
- # close_paragraph shouldn't be called with keep_texi
- # and when the arguments are expanded, there is a
- # substitute_line or similar with a new stack.
# the !exists($style_type{$style}) condition catches the unknown
# @-commands: by default they are considered as style commands
@@ -15072,7 +15051,12 @@
}
else
{
- print STDERR "BUG: special $style while closing paragraph\n";
+ # it shouldn't be possible to have 'special' styles, like
+ # images, footnotes, xrefs, anchors, as
+ # close_paragraph shouldn't be called with keep_texi
+ # and when the arguments are expanded, there is a
+ # substitute_line or similar with a new stack.
+ msg_debug("BUG: special $style while closing paragraph",
$line_nr);
}
}
#Â if not in a paragraph, the command is simply closed, and not
recorded
@@ -15273,7 +15257,11 @@
my $line_nr = shift;
$state = {} if (!defined($state));
$state->{'no_paragraph'} = 1;
- print STDERR "BUG: substitute line with main state\n" if
(($state->{'inside_document'} or $state->{'outside_document'}) and
!$state->{'duplicated'});
+
+ if (($state->{'inside_document'} or $state->{'outside_document'}) and
(!$state->{'duplicated'} and !$state->{'new_state'}))
+ {
+ msg_debug("substitute_line with main state in:
".var_to_str($context_string), $line_nr);
+ }
push @{$state->{'no_paragraph_stack'}}, $context_string;
# this is usefull when called from &$I, and also for image files
return simple_format($state, [ $line_nr ], $context_string, $line) if
($state->{'simple_format'});
@@ -15409,21 +15397,20 @@
msg_debug("do_index_entry_label($command): Undefined entry_texi", $line_nr)
if (!defined($entry_texi));
- # FIXME
- #$entry_texi = trim_around_spaces($entry_texi);
$entry_texi = trim_comment_spaces($entry_texi, "index label in
address@hidden", $line_nr);
# index entries are not entered in special regions
my $region = 'document';
- $region = $state->{'region'} if ($state->{'region'});
+ $region = $state->{'region'} if (defined($state->{'region'}));
my $entry;
- #Â Can be within a listoffloat.
- if ($region eq 'document' or defined($region_lines{$region}))
+ #Â Can be within a @caption expanded within a listoffloat. In that
+ # case the 2 following condition are not set.
+ if (defined($state->{'region'}) or !defined($state->{'expansion'}))
{
# index entry on a line that is not searched for index entries, like
#Â a @def* line
- if (!defined($Texi2HTML::THISDOC{'index_entries'}->{$region}) or
!defined( $Texi2HTML::THISDOC{'index_entries'}->{$region}->{$entry_texi}))
+ if (!defined($Texi2HTML::THISDOC{'index_entries'}->{$region}) or
!defined($Texi2HTML::THISDOC{'index_entries'}->{$region}->{$entry_texi}))
{
line_warn("Index entry not caught: `$entry_texi' in $region",
$line_nr);
}
@@ -15433,7 +15420,7 @@
# ============================ debug
if (!defined($entry_ref->{'entries'}))
{
- line_warn("BUG, not defined:
{'index_entries'}->{$region}->{$entry_texi}->{'entries'}", $line_nr);
+ msg_debug("BUG, not defined:
{'index_entries'}->{$region}->{$entry_texi}->{'entries'}", $line_nr);
}
# ============================ end debug
if (scalar(@{$entry_ref->{'entries'}}) > 1)
@@ -15449,6 +15436,7 @@
{
$entry = $entry_ref->{'entries'}->[0];
}
+ $entry->{'seen_in_output'} = 1 if (!$state->{'outside_document'});
############################################# debug
#Â verify that the old way of getting index entries (in an array) is
#Â synchronized with the document
@@ -15469,7 +15457,6 @@
}
if (!defined($entry))
{
- #print STDERR "Index entry in output not gathered in usual places
($region)\n";
#Â this can happen for listoffloats and caption without being a user
#Â error. Well, in fact, it could be argued that it is indeed a user
#Â error, putting an index entry in a snippet that can be expanded
@@ -15478,7 +15465,7 @@
my $prefix = index_entry_command_prefix($command, $line, $line_nr);
my $index_name = undef;
$index_name = $index_prefix_to_name{$prefix} if ($prefix ne '');
- #Â FIXME 'entry' could be @code{$entry_texi}
+ #print STDERR "Entry for index $index_name not gathered in usual
places ($region)\n";
$entry = {
'command' => $command,
'texi' => $entry_texi,
@@ -15487,8 +15474,12 @@
'index_name' => $index_name,
};
$entry->{'key'} = remove_texi($entry_texi);
+ $entry->{'entry'} = '@code{'.$entry->{'entry'}.'}'
+ if (defined($index_names{$index_name}) and
+ defined($index_names{$index_name}->{'prefixes'}) and
+ $index_names{$index_name}->{'prefixes'}->{$prefix}
+ and $entry->{'key'} =~ /\S/);
}
-# return '' if ($state->{'multiple_pass'} or $state->{'outside_document'});
if ($command ne $entry->{'command'})
{
# happened with bad texinfo with a line like
@@ -15498,14 +15489,14 @@
}
if ($entry->{'texi'} ne $entry_texi)
{
- line_warn ("Waiting for index `$entry->{'texi'}', got `$entry_texi'",
$line_nr);
+ msg_debug ("Waiting for index `$entry->{'texi'}', got `$entry_texi'",
$line_nr);
}
my $index_name = $index_prefix_to_name{$entry->{'prefix'}};
# =========== debug
my $id = 'no id';
$id = $entry->{'id'} if (defined($entry->{'id'}));
- print STDERR "(index($index_name) $command) [$entry->{'entry'}]
$entry->{'id'}\n"
+ print STDERR "(index($index_name) $command) [$entry->{'entry'}] $id\n"
if ($T2H_DEBUG & $DEBUG_INDEX);
# =========== end debug
#return (undef,'','') if ($state->{'region'});
@@ -15517,7 +15508,8 @@
my $formatted_entry_reference = substitute_line($entry->{'texi'},
"address@hidden", prepare_state_multiple_pass("${command}_index", $state));
return ($entry, $formatted_entry, &$Texi2HTML::Config::index_entry_label
($entry->{'id'}, $state->{'preformatted'}, $formatted_entry,
$index_name,
- $command, $entry->{'texi'}, $formatted_entry_reference, $entry));
+ $command, $entry->{'texi'}, $formatted_entry_reference,
+ (!$entry->{'seen_in_output'} and defined($entry->{'region'})),$entry));
}
# decompose a decimal number on a given base. The algorithm looks like
@@ -15901,7 +15893,12 @@
# of the main document, and in the main document)
# 'multiple_pass': the number of pass in the formatting of the region in the
# main document
+# It is set to 0 the first time the region is seen, before
+# it will be -1, for example when doing the
+#Â copying_comment, the titlepage... before starting with
+# the document itself.
# 'outside_document': set to 1 if outside of the main document formatting
+
foreach my $key (keys(%region_initial_state))
{
$region_initial_state{$key}->{'multiple_pass'} = -1;
@@ -15910,6 +15907,7 @@
$region_initial_state{$key}->{'foot_num'} = 0;
$region_initial_state{$key}->{'relative_foot_num'} = 0;
$region_initial_state{$key}->{'region'} = $key;
+# $region_initial_state{$key}->{'expansion'} = $key;
}
@opened_files = (); #Â all the files opened by the program to remove
Index: examples/makeinfo.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/makeinfo.init,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- examples/makeinfo.init 15 Sep 2009 18:21:27 -0000 1.34
+++ examples/makeinfo.init 26 Sep 2009 23:10:06 -0000 1.35
@@ -248,7 +248,7 @@
return '';
}
-sub makeinfo_like_index_entry($$$$)
+sub makeinfo_like_index_entry($$$$$$$$$$)
{
my $text_href = shift;
my $entry = shift;
@@ -258,6 +258,7 @@
my $current_element_file = shift;
my $entry_target = shift;
my $entry_element_target = shift;
+ my $in_region_not_in_output = shift;
my $index_entry_ref = shift;
return '' if ($entry !~ /\S/);
Index: examples/roff.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/roff.init,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- examples/roff.init 15 Sep 2009 18:21:27 -0000 1.32
+++ examples/roff.init 26 Sep 2009 23:10:06 -0000 1.33
@@ -1088,13 +1088,19 @@
# arguments:
# target identifier
# boolean true if in preformatted format
-sub t2h_roff_index_entry_label($$$$)
+sub t2h_roff_index_entry_label($$$$$$$$$)
{
my $identifier = shift;
my $preformatted = shift;
- my $label = shift;
+ my $entry = shift;
my $index_name = shift;
- return ".(x $index_name\n" . protect_spaces($label) . "\n.)x\n";
+ my $index_command = shift;
+ my $texi_entry = shift;
+ my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ return ".(x $index_name\n" . protect_spaces($entry) . "\n.)x\n";
}
# process definition commands line @deffn for example
Index: formats/docbook.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/docbook.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- formats/docbook.init 15 Sep 2009 18:21:27 -0000 1.17
+++ formats/docbook.init 26 Sep 2009 23:10:07 -0000 1.18
@@ -839,7 +839,7 @@
return
docbook_index_entry_label('','','',$main::index_prefix_to_name{$index_name},
'', '', $entry_formatted, {});
}
-sub docbook_index_entry_label($$$$$$$$)
+sub docbook_index_entry_label($$$$$$$$$)
{
my $identifier = shift;
my $preformatted = shift;
@@ -848,6 +848,7 @@
my $index_command = shift;
my $texi_entry = shift;
my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
my $index_entry = shift;
return "<indexterm
role=\"${index_name}\"><primary>${formatted_entry}</primary></indexterm>";
Index: formats/html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/html.init,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- formats/html.init 23 Sep 2009 19:07:30 -0000 1.27
+++ formats/html.init 26 Sep 2009 23:10:07 -0000 1.28
@@ -6,7 +6,7 @@
# A copy of this file is pasted into the beginning of texi2html by
# running './configure'.
#
-# $Id: html.init,v 1.27 2009/09/23 19:07:30 pertusus Exp $
+# $Id: html.init,v 1.28 2009/09/26 23:10:07 pertusus Exp $
use strict;
@@ -2702,7 +2702,8 @@
. "</h3>\n");
# this is a bit obscure, this allows to add an anchor only if formatted
# as part of the document.
- $place_id = '' if ($document_state->{'outside_document'} or
$document_state->{'multiple_pass'});
+ #$place_id = '' if ($document_state->{'outside_document'} or
$document_state->{'multiple_pass'} or $document_state->{'expansion'});
+ $place_id = '' if ($document_state->{'outside_document'} or
(defined($document_state->{'multiple_pass'}) and
$document_state->{'multiple_pass'} > 0));
return ($lines, &$anchor($place_id, $footnote_file . "#$footnote_id",
"($number_in_doc)"));
}
@@ -2804,7 +2805,7 @@
# target identifier
# boolean true if in preformatted format
# FIXME document the remaining
-sub html_default_index_entry_label($$$$$$$$)
+sub html_default_index_entry_label($$$$$$$$$)
{
my $identifier = shift;
my $preformatted = shift;
@@ -2813,6 +2814,7 @@
my $index_command = shift;
my $texi_entry = shift;
my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
my $index_entry_ref = shift;
return '' if (!defined($identifier) or ($identifier !~ /\S/));
@@ -2981,7 +2983,7 @@
# href to the main text, linking to the section or node where the index
# entry appears
# section or node heading
-sub html_default_index_entry($$$$$$$$$)
+sub html_default_index_entry($$$$$$$$$$)
{
my $text_href = shift;
my $entry = shift;
@@ -2991,6 +2993,7 @@
my $current_element_file = shift;
my $entry_target = shift;
my $entry_element_target = shift;
+ my $in_region_not_in_output = shift;
my $index_entry_ref = shift;
return '' if ($entry !~ /\S/);
Index: formats/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/info.init,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- formats/info.init 15 Sep 2009 18:21:27 -0000 1.31
+++ formats/info.init 26 Sep 2009 23:10:07 -0000 1.32
@@ -2450,7 +2450,7 @@
my $state = shift;
my $style_stack = shift;
- unless ($state->{'outside_document'} or $state->{'multiple_pass'})
+ unless ($state->{'outside_document'} or
(defined($state->{'multiple_pass'}) and $state->{'multiple_pass'} > 0))
{
$info_default_footnote_index++;
}
@@ -2920,7 +2920,7 @@
return $text;
}
-sub info_default_index_entry_label($$$$$$$$)
+sub info_default_index_entry_label($$$$$$$$$)
{
my $identifier = shift;
my $preformatted = shift;
@@ -2929,15 +2929,18 @@
my $index_command = shift;
my $texi_entry = shift;
my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
my $index_entry_ref = shift;
- return '' if ($index_entry_ref->{'hidden'});
+ #return '' if ($index_entry_ref->{'hidden'});
+ #return '' if (!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
+ return '' if ($in_region_not_in_output);
main::line_warn("Entry for index `$index_entry_ref->{'index_name'}'
outside of any node", $Texi2HTML::THISDOC{'line_nr'}) if
(!defined($info_default_current_node));
my $index_entry_stored = {'index_entry_reference' => $index_entry_ref,
'index_command' => $index_command, 'texi_entry' => $texi_entry};
return info_default_store_text(undef, undef, 'index_label',
$index_entry_stored);
}
-sub info_default_index_entry($$$$$$$$)
+sub info_default_index_entry($$$$$$$$$$)
{
my $text_href = shift;
my $entry = shift;
@@ -2947,9 +2950,12 @@
my $current_element_file = shift;
my $entry_target = shift;
my $entry_element_target = shift;
+ my $in_region_not_in_output = shift;
my $index_entry_ref = shift;
- return '' if ($index_entry_ref->{'hidden'});
+ #return '' if ($index_entry_ref->{'hidden'});
+ #return '' if (!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
+ return '' if ($in_region_not_in_output);
$entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in
address@hidden");
return '' if ($entry =~ /^\s*$/);
@@ -3060,7 +3066,7 @@
'footnote_index' => ${info_default_footnote_index},
'node_name' => $node_name,
'footnote_info_state' => $footnote_info_state}
- unless ($state->{'outside_document'} or $state->{'multiple_pass'});
+ unless ($state->{'outside_document'} or
(defined($state->{'multiple_pass'}) and $state->{'multiple_pass'} > 0));
return ([], $footnote_text);
}
Index: formats/xml.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/formats/xml.init,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- formats/xml.init 15 Sep 2009 18:21:27 -0000 1.16
+++ formats/xml.init 26 Sep 2009 23:10:07 -0000 1.17
@@ -645,7 +645,7 @@
return
xml_index_entry_label('','','',$main::index_prefix_to_name{$index_name}, '',
'', $entry_formatted, {});
}
-sub xml_index_entry_label($$$$$$$$)
+sub xml_index_entry_label($$$$$$$$$)
{
my $identifier = shift;
my $preformatted = shift;
@@ -654,7 +654,8 @@
my $index_command = shift;
my $texi_entry = shift;
my $formatted_entry_reference = shift;
- my $entry = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
return "<indexterm
index=\"${index_name}\">${formatted_entry_reference}</indexterm>";
Index: test/coverage/res_all/formatting/formatting.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/coverage/res_all/formatting/formatting.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/coverage/res_all/formatting/formatting.txt 30 Aug 2009 18:59:48
-0000 1.5
+++ test/coverage/res_all/formatting/formatting.txt 26 Sep 2009 23:10:08
-0000 1.6
@@ -1779,6 +1779,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1786,10 +1788,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1799,6 +1805,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1808,34 +1816,52 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
* after: Top section.
* after: Top section.
+* after: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
+* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
+* d-efmac_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
+* d-efmethod_name on c-lass: Top section.
+* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
+* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypemethod_name on c-lass: Top section.
* d-eftypemethod_name on c-lass: Top section.
+* d-eftypemethod_name on c-lass: Top section.
+* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
+* d-efun_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
+* de-ffn_name: Top section.
+* deffn: Top section.
+* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
@@ -1844,6 +1870,10 @@
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -1852,16 +1882,29 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id `i' ule: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -1880,27 +1923,39 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
vr
* Index:
* a: Top section.
* a: Top section.
+* a: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* d-efcv_name: Top section.
* d-efcv_name: Top section.
+* d-efcv_name: Top section.
* d-efivar_name: Top section.
* d-efivar_name: Top section.
+* d-efivar_name: Top section.
+* d-efopt_name: Top section.
* d-efopt_name: Top section.
* d-efopt_name: Top section.
* d-eftypeivar_name of c-lass: Top section.
* d-eftypeivar_name of c-lass: Top section.
+* d-eftypeivar_name of c-lass: Top section.
* d-eftypevar_name: Top section.
* d-eftypevar_name: Top section.
+* d-eftypevar_name: Top section.
+* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-efvar_name: Top section.
* d-efvar_name: Top section.
+* d-efvar_name: Top section.
+* d-efvr_name: Top section.
* d-efvr_name: Top section.
* d-efvr_name: Top section.
@@ -1912,6 +1967,7 @@
* Index:
* d-eftp_name: Top section.
* d-eftp_name: Top section.
+* d-eftp_name: Top section.
@@ -1951,6 +2007,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1958,10 +2016,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1969,6 +2031,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1978,42 +2042,64 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
+* after: Top section.
* after: Top section.
* after: Top section.
* b: Top section.
* b: Top section.
+* b: Top section.
+* bidule machin: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
+* d-efmac_name: Top section.
+* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
+* d-efop_name on c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
+* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypemethod_name on c-lass: Top section.
* d-eftypemethod_name on c-lass: Top section.
+* d-eftypemethod_name on c-lass: Top section.
+* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
+* d-efun_name: Top section.
+* de-ffn_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
+* deffn: Top section.
+* deffn: Top section.
+* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -2022,16 +2108,29 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id `i' ule: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -2050,6 +2149,8 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
Table of Contents
*****************
Index: test/encodings/res_all/formatting_converted_to_utf8/formatting.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res_all/formatting_converted_to_utf8/formatting.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/encodings/res_all/formatting_converted_to_utf8/formatting.txt 16 Sep
2009 08:43:16 -0000 1.5
+++ test/encodings/res_all/formatting_converted_to_utf8/formatting.txt 26 Sep
2009 23:10:08 -0000 1.6
@@ -1781,15 +1781,21 @@
* ?: Top section.
* âoption: Top section.
* âoption: Top section.
+* âoption: Top section.
+* â: Top section.
* â: Top section.
* â: Top section.
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* târuc: Top section.
@@ -1801,8 +1807,12 @@
* ?: Top section.
* âfoption: Top section.
* âfoption: Top section.
+* âfoption: Top section.
* â: Top section.
* â: Top section.
+* â: Top section.
+* a: Top section.
+* a: Top section.
* a: Top section.
* a: Top section.
* a: Top section.
@@ -1810,58 +1820,87 @@
* a: Top section.
* after: Top section.
* after: Top section.
+* after: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
+* bidule machin: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
+* deffn: Top section.
+* deffn: Top section.
+* deffnx: Top section.
+* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deâffn_name: Top section.
* deâffn_name: Top section.
+* deâffn_name: Top section.
+* dâeffn_name: Top section.
* dâeffn_name: Top section.
* dâeffn_name: Top section.
* dâefmac_name: Top section.
* dâefmac_name: Top section.
+* dâefmac_name: Top section.
* dâefmethod_name on câlass: Top section.
* dâefmethod_name on câlass: Top section.
+* dâefmethod_name on câlass: Top section.
+* dâefop_name on câlass: Top section.
* dâefop_name on câlass: Top section.
* dâefop_name on câlass: Top section.
* dâefspec_name: Top section.
* dâefspec_name: Top section.
+* dâefspec_name: Top section.
* dâeftypefn_name: Top section.
* dâeftypefn_name: Top section.
+* dâeftypefn_name: Top section.
+* dâeftypefun_name: Top section.
* dâeftypefun_name: Top section.
* dâeftypefun_name: Top section.
* dâeftypemethod_name on câlass: Top section.
* dâeftypemethod_name on câlass: Top section.
+* dâeftypemethod_name on câlass: Top section.
* dâeftypeop_name on câlass: Top section.
* dâeftypeop_name on câlass: Top section.
+* dâeftypeop_name on câlass: Top section.
+* dâefun_name: Top section.
* dâefun_name: Top section.
* dâefun_name: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
+* followed: Top section.
+* followed: Top section.
* i: Top section.
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id `i' ule: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -1874,6 +1913,12 @@
* machin: Top section.
* machin: Top section.
* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* truc: Top section.
+* truc: Top section.
* truc: Top section.
* truc: Top section.
* truc: Top section.
@@ -1885,22 +1930,32 @@
* Index:
* a: Top section.
* a: Top section.
+* a: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* dâefcv_name: Top section.
* dâefcv_name: Top section.
+* dâefcv_name: Top section.
* dâefivar_name: Top section.
* dâefivar_name: Top section.
+* dâefivar_name: Top section.
+* dâefopt_name: Top section.
* dâefopt_name: Top section.
* dâefopt_name: Top section.
* dâeftypeivar_name of câlass: Top section.
* dâeftypeivar_name of câlass: Top section.
+* dâeftypeivar_name of câlass: Top section.
* dâeftypevar_name: Top section.
* dâeftypevar_name: Top section.
+* dâeftypevar_name: Top section.
+* dâeftypevr_name: Top section.
* dâeftypevr_name: Top section.
* dâeftypevr_name: Top section.
* dâefvar_name: Top section.
* dâefvar_name: Top section.
+* dâefvar_name: Top section.
+* dâefvr_name: Top section.
* dâefvr_name: Top section.
* dâefvr_name: Top section.
@@ -1912,6 +1967,7 @@
* Index:
* dâeftp_name: Top section.
* dâeftp_name: Top section.
+* dâeftp_name: Top section.
@@ -1953,15 +2009,21 @@
* ?: Top section.
* âoption: Top section.
* âoption: Top section.
+* âoption: Top section.
+* â: Top section.
* â: Top section.
* â: Top section.
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* târuc: Top section.
@@ -1971,6 +2033,8 @@
* ?: Top section.
* âfoption: Top section.
* âfoption: Top section.
+* âfoption: Top section.
+* â: Top section.
* â: Top section.
* â: Top section.
* a: Top section.
@@ -1978,42 +2042,64 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
+* after: Top section.
* after: Top section.
* after: Top section.
* b: Top section.
* b: Top section.
+* b: Top section.
+* bidule machin: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
+* deffn: Top section.
+* deffn: Top section.
+* deffnx: Top section.
+* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deâffn_name: Top section.
* deâffn_name: Top section.
+* deâffn_name: Top section.
+* dâeffn_name: Top section.
* dâeffn_name: Top section.
* dâeffn_name: Top section.
* dâefmac_name: Top section.
* dâefmac_name: Top section.
+* dâefmac_name: Top section.
* dâefmethod_name on câlass: Top section.
* dâefmethod_name on câlass: Top section.
+* dâefmethod_name on câlass: Top section.
+* dâefop_name on câlass: Top section.
* dâefop_name on câlass: Top section.
* dâefop_name on câlass: Top section.
* dâefspec_name: Top section.
* dâefspec_name: Top section.
+* dâefspec_name: Top section.
+* dâeftypefn_name: Top section.
* dâeftypefn_name: Top section.
* dâeftypefn_name: Top section.
* dâeftypefun_name: Top section.
* dâeftypefun_name: Top section.
+* dâeftypefun_name: Top section.
+* dâeftypemethod_name on câlass: Top section.
* dâeftypemethod_name on câlass: Top section.
* dâeftypemethod_name on câlass: Top section.
* dâeftypeop_name on câlass: Top section.
* dâeftypeop_name on câlass: Top section.
+* dâeftypeop_name on câlass: Top section.
* dâefun_name: Top section.
* dâefun_name: Top section.
+* dâefun_name: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -2022,16 +2108,25 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id `i' ule: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -2044,6 +2139,12 @@
* machin: Top section.
* machin: Top section.
* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* truc: Top section.
+* truc: Top section.
* truc: Top section.
* truc: Top section.
* truc: Top section.
Index: test/encodings/res_all/formatting_fr/formatting.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res_all/formatting_fr/formatting.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res_all/formatting_fr/formatting.txt 30 Aug 2009 18:59:52
-0000 1.4
+++ test/encodings/res_all/formatting_fr/formatting.txt 26 Sep 2009 23:10:08
-0000 1.5
@@ -1779,6 +1779,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1786,10 +1788,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1799,6 +1805,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1808,34 +1816,52 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
* after: Top section.
* after: Top section.
+* after: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
+* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
+* d-efmac_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
* d-efmethod_name de c-lass: Top section.
* d-efmethod_name de c-lass: Top section.
+* d-efmethod_name de c-lass: Top section.
+* d-efop_name de c-lass: Top section.
* d-efop_name de c-lass: Top section.
* d-efop_name de c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
+* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypemethod_name de c-lass: Top section.
* d-eftypemethod_name de c-lass: Top section.
+* d-eftypemethod_name de c-lass: Top section.
+* d-eftypeop_name de c-lass: Top section.
* d-eftypeop_name de c-lass: Top section.
* d-eftypeop_name de c-lass: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
+* d-efun_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
+* de-ffn_name: Top section.
+* deffn: Top section.
+* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
@@ -1844,6 +1870,10 @@
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -1852,16 +1882,29 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id `i' ule: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -1880,27 +1923,39 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
vr
* Index:
* a: Top section.
* a: Top section.
+* a: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* d-efcv_name: Top section.
* d-efcv_name: Top section.
+* d-efcv_name: Top section.
* d-efivar_name: Top section.
* d-efivar_name: Top section.
+* d-efivar_name: Top section.
+* d-efopt_name: Top section.
* d-efopt_name: Top section.
* d-efopt_name: Top section.
* d-eftypeivar_name de c-lass: Top section.
* d-eftypeivar_name de c-lass: Top section.
+* d-eftypeivar_name de c-lass: Top section.
* d-eftypevar_name: Top section.
* d-eftypevar_name: Top section.
+* d-eftypevar_name: Top section.
+* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-efvar_name: Top section.
* d-efvar_name: Top section.
+* d-efvar_name: Top section.
+* d-efvr_name: Top section.
* d-efvr_name: Top section.
* d-efvr_name: Top section.
@@ -1912,6 +1967,7 @@
* Index:
* d-eftp_name: Top section.
* d-eftp_name: Top section.
+* d-eftp_name: Top section.
@@ -1951,6 +2007,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1958,10 +2016,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1969,6 +2031,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1978,42 +2042,64 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
+* after: Top section.
* after: Top section.
* after: Top section.
* b: Top section.
* b: Top section.
+* b: Top section.
+* bidule machin: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
+* d-efmac_name: Top section.
+* d-efmethod_name de c-lass: Top section.
* d-efmethod_name de c-lass: Top section.
* d-efmethod_name de c-lass: Top section.
* d-efop_name de c-lass: Top section.
* d-efop_name de c-lass: Top section.
+* d-efop_name de c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
+* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypemethod_name de c-lass: Top section.
* d-eftypemethod_name de c-lass: Top section.
+* d-eftypemethod_name de c-lass: Top section.
+* d-eftypeop_name de c-lass: Top section.
* d-eftypeop_name de c-lass: Top section.
* d-eftypeop_name de c-lass: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
+* d-efun_name: Top section.
+* de-ffn_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
+* deffn: Top section.
+* deffn: Top section.
+* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -2022,16 +2108,29 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id `i' ule: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -2050,6 +2149,8 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
Table des matie`res
*******************
Index: test/encodings/res_all/formatting_fr_icons/formatting.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/encodings/res_all/formatting_fr_icons/formatting.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/encodings/res_all/formatting_fr_icons/formatting.txt 30 Aug 2009
18:59:52 -0000 1.4
+++ test/encodings/res_all/formatting_fr_icons/formatting.txt 26 Sep 2009
23:10:08 -0000 1.5
@@ -1779,6 +1779,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1786,10 +1788,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1799,6 +1805,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1808,34 +1816,52 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
* after: Top section.
* after: Top section.
+* after: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
+* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
+* d-efmac_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
* d-efmethod_name de c-lass: Top section.
* d-efmethod_name de c-lass: Top section.
+* d-efmethod_name de c-lass: Top section.
+* d-efop_name de c-lass: Top section.
* d-efop_name de c-lass: Top section.
* d-efop_name de c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
+* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypemethod_name de c-lass: Top section.
* d-eftypemethod_name de c-lass: Top section.
+* d-eftypemethod_name de c-lass: Top section.
+* d-eftypeop_name de c-lass: Top section.
* d-eftypeop_name de c-lass: Top section.
* d-eftypeop_name de c-lass: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
+* d-efun_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
+* de-ffn_name: Top section.
+* deffn: Top section.
+* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
@@ -1844,6 +1870,10 @@
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -1852,16 +1882,29 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id `i' ule: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -1880,27 +1923,39 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
vr
* Index:
* a: Top section.
* a: Top section.
+* a: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* d-efcv_name: Top section.
* d-efcv_name: Top section.
+* d-efcv_name: Top section.
* d-efivar_name: Top section.
* d-efivar_name: Top section.
+* d-efivar_name: Top section.
+* d-efopt_name: Top section.
* d-efopt_name: Top section.
* d-efopt_name: Top section.
* d-eftypeivar_name de c-lass: Top section.
* d-eftypeivar_name de c-lass: Top section.
+* d-eftypeivar_name de c-lass: Top section.
* d-eftypevar_name: Top section.
* d-eftypevar_name: Top section.
+* d-eftypevar_name: Top section.
+* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-efvar_name: Top section.
* d-efvar_name: Top section.
+* d-efvar_name: Top section.
+* d-efvr_name: Top section.
* d-efvr_name: Top section.
* d-efvr_name: Top section.
@@ -1912,6 +1967,7 @@
* Index:
* d-eftp_name: Top section.
* d-eftp_name: Top section.
+* d-eftp_name: Top section.
@@ -1951,6 +2007,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1958,10 +2016,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1969,6 +2031,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1978,42 +2042,64 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
+* after: Top section.
* after: Top section.
* after: Top section.
* b: Top section.
* b: Top section.
+* b: Top section.
+* bidule machin: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
+* d-efmac_name: Top section.
+* d-efmethod_name de c-lass: Top section.
* d-efmethod_name de c-lass: Top section.
* d-efmethod_name de c-lass: Top section.
* d-efop_name de c-lass: Top section.
* d-efop_name de c-lass: Top section.
+* d-efop_name de c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
+* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypemethod_name de c-lass: Top section.
* d-eftypemethod_name de c-lass: Top section.
+* d-eftypemethod_name de c-lass: Top section.
+* d-eftypeop_name de c-lass: Top section.
* d-eftypeop_name de c-lass: Top section.
* d-eftypeop_name de c-lass: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
+* d-efun_name: Top section.
+* de-ffn_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
+* deffn: Top section.
+* deffn: Top section.
+* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -2022,16 +2108,29 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id `i' ule: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -2050,6 +2149,8 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
Table des matie`res
*******************
Index: test/formatting/float_copying.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/float_copying.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/float_copying.texi 18 Aug 2008 18:02:59 -0000 1.1
+++ test/formatting/float_copying.texi 26 Sep 2009 23:10:09 -0000 1.2
@@ -14,6 +14,7 @@
@anchor{caption copying footnote anchor}
@cindex indexed caption copying footnote
address@hidden public domain function
see @ref{Copying and floats}.
@@ -21,6 +22,7 @@
@anchor{public domain anchor}
@cindex indexed caption
address@hidden indexed caption function
}
@end float
@end copying
@@ -60,5 +62,6 @@
@subheading printindex
@printindex cp
address@hidden fn
@bye
Index: test/formatting/res/float_copying/float_copying.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/float_copying/float_copying.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res/float_copying/float_copying.2 3 Aug 2009 08:21:08
-0000 1.4
+++ test/formatting/res/float_copying/float_copying.2 26 Sep 2009 23:10:09
-0000 1.5
@@ -1,2 +1,4 @@
float_copying.texi:16: Entry for index `cp' outside of any node.
-float_copying.texi:23: Entry for index `cp' outside of any node.
+float_copying.texi:17: Entry for index `fn' outside of any node.
+float_copying.texi:24: Entry for index `cp' outside of any node.
+float_copying.texi:25: Entry for index `fn' outside of any node.
Index: test/formatting/res/float_copying/float_copying_1.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/float_copying/float_copying_1.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/formatting/res/float_copying/float_copying_1.html 10 Sep 2009
20:37:02 -0000 1.14
+++ test/formatting/res/float_copying/float_copying_1.html 26 Sep 2009
23:10:09 -0000 1.15
@@ -139,6 +139,26 @@
<a href="#Copying-and-floats-1_cp_letter-T" class="summary-letter"><b>T</b></a>
</td></tr></table>
+<table><tr><th valign="top">Jump to: </th><td><a
href="#Copying-and-floats-1_fn_letter-I" class="summary-letter"><b>I</b></a>
+
+<a href="#Copying-and-floats-1_fn_letter-P" class="summary-letter"><b>P</b></a>
+
+</td></tr></table>
+<table border="0" class="index-fn">
+<tr><td></td><th align="left">Index Entry</th><td> </td><th align="left">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a
name="Copying-and-floats-1_fn_letter-I">I</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a href="float_copying.html#Top"><code>indexed
caption function</code></a></td><td> </td><td valign="top"><a
href="float_copying.html#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a
name="Copying-and-floats-1_fn_letter-P">P</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="float_copying_fot.html#SEC_Foot"><code>public domain
function</code></a></td><td> </td><td valign="top"><a
href="float_copying_fot.html#SEC_Foot">Footnotes</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a
href="#Copying-and-floats-1_fn_letter-I" class="summary-letter"><b>I</b></a>
+
+<a href="#Copying-and-floats-1_fn_letter-P" class="summary-letter"><b>P</b></a>
+
+</td></tr></table>
<hr>
<table class="header" cellpadding="1" cellspacing="1" border="0">
Index: test/formatting/res/texi_float_copying/float_copying.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_float_copying/float_copying.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/formatting/res/texi_float_copying/float_copying.2 3 Aug 2009
08:21:11 -0000 1.5
+++ test/formatting/res/texi_float_copying/float_copying.2 26 Sep 2009
23:10:09 -0000 1.6
@@ -1,2 +1,4 @@
float_copying.texi:16: Entry for index `cp' outside of any node.
-float_copying.texi:23: Entry for index `cp' outside of any node.
+float_copying.texi:17: Entry for index `fn' outside of any node.
+float_copying.texi:24: Entry for index `cp' outside of any node.
+float_copying.texi:25: Entry for index `fn' outside of any node.
Index: test/formatting/res/texi_float_copying/float_copying.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_float_copying/float_copying.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/texi_float_copying/float_copying.passfirst 18 Aug
2008 18:03:16 -0000 1.1
+++ test/formatting/res/texi_float_copying/float_copying.passfirst 26 Sep
2009 23:10:09 -0000 1.2
@@ -1,41 +1,42 @@
float_copying.texi(,2)
float_copying.texi(,3) @setfilename float_copying.info
float_copying.texi(,4)
-float_copying.texi(,27)
-float_copying.texi(,28) @node Top
-float_copying.texi(,29) @top Top
-float_copying.texi(,30)
-float_copying.texi(,31) @cindex Top
+float_copying.texi(,29)
+float_copying.texi(,30) @node Top
+float_copying.texi(,31) @top Top
float_copying.texi(,32)
-float_copying.texi(,33) See the caption @ref{public domain anchor}.
+float_copying.texi(,33) @cindex Top
float_copying.texi(,34)
-float_copying.texi(,35) See the float @ref{public domain}.
+float_copying.texi(,35) See the caption @ref{public domain anchor}.
float_copying.texi(,36)
-float_copying.texi(,37) @insertcopying
+float_copying.texi(,37) See the float @ref{public domain}.
float_copying.texi(,38)
-float_copying.texi(,39) @menu
-float_copying.texi(,40) * Copying and floats::
-float_copying.texi(,41) @end menu
-float_copying.texi(,42)
-float_copying.texi(,43) @node Copying and floats
-float_copying.texi(,44) @appendix Copying and floats
-float_copying.texi(,45)
-float_copying.texi(,46) In the appendix, we print the references and the
copying once more
-float_copying.texi(,47) and the list of coyright notices (listoffloats).
-float_copying.texi(,48)
-float_copying.texi(,49) See the caption @ref{public domain anchor}.
+float_copying.texi(,39) @insertcopying
+float_copying.texi(,40)
+float_copying.texi(,41) @menu
+float_copying.texi(,42) * Copying and floats::
+float_copying.texi(,43) @end menu
+float_copying.texi(,44)
+float_copying.texi(,45) @node Copying and floats
+float_copying.texi(,46) @appendix Copying and floats
+float_copying.texi(,47)
+float_copying.texi(,48) In the appendix, we print the references and the
copying once more
+float_copying.texi(,49) and the list of coyright notices (listoffloats).
float_copying.texi(,50)
-float_copying.texi(,51) See the float @ref{public domain}.
+float_copying.texi(,51) See the caption @ref{public domain anchor}.
float_copying.texi(,52)
-float_copying.texi(,53) @cindex listofloats
+float_copying.texi(,53) See the float @ref{public domain}.
float_copying.texi(,54)
-float_copying.texi(,55) @insertcopying
-float_copying.texi(,56) @insertcopying
-float_copying.texi(,57)
-float_copying.texi(,58) @subheading listoffloats
-float_copying.texi(,59) @listoffloats Copyright notice
-float_copying.texi(,60)
-float_copying.texi(,61) @subheading printindex
-float_copying.texi(,62) @printindex cp
-float_copying.texi(,63)
-float_copying.texi(,64) @bye
+float_copying.texi(,55) @cindex listofloats
+float_copying.texi(,56)
+float_copying.texi(,57) @insertcopying
+float_copying.texi(,58) @insertcopying
+float_copying.texi(,59)
+float_copying.texi(,60) @subheading listoffloats
+float_copying.texi(,61) @listoffloats Copyright notice
+float_copying.texi(,62)
+float_copying.texi(,63) @subheading printindex
+float_copying.texi(,64) @printindex cp
+float_copying.texi(,65) @printindex fn
+float_copying.texi(,66)
+float_copying.texi(,67) @bye
Index: test/formatting/res/texi_float_copying/float_copying.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_float_copying/float_copying.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/texi_float_copying/float_copying.passtexi 18 Aug
2008 18:03:16 -0000 1.1
+++ test/formatting/res/texi_float_copying/float_copying.passtexi 26 Sep
2009 23:10:09 -0000 1.2
@@ -13,51 +13,54 @@
float_copying.texi(,14) @anchor{caption copying footnote anchor}
float_copying.texi(,15)
float_copying.texi(,16) @cindex indexed caption copying footnote
-float_copying.texi(,17)
-float_copying.texi(,18) see @ref{Copying and floats}.
-float_copying.texi(,19)
-float_copying.texi(,20) }
-float_copying.texi(,21)
-float_copying.texi(,22) @anchor{public domain anchor}
-float_copying.texi(,23) @cindex indexed caption
-float_copying.texi(,24) }
-float_copying.texi(,25) @end float
-float_copying.texi(,26) @end copying
-float_copying.texi(,27)
-float_copying.texi(,28) @node Top
-float_copying.texi(,29) @top Top
-float_copying.texi(,30)
-float_copying.texi(,31) @cindex Top
+float_copying.texi(,17) @findex public domain function
+float_copying.texi(,18)
+float_copying.texi(,19) see @ref{Copying and floats}.
+float_copying.texi(,20)
+float_copying.texi(,21) }
+float_copying.texi(,22)
+float_copying.texi(,23) @anchor{public domain anchor}
+float_copying.texi(,24) @cindex indexed caption
+float_copying.texi(,25) @findex indexed caption function
+float_copying.texi(,26) }
+float_copying.texi(,27) @end float
+float_copying.texi(,28) @end copying
+float_copying.texi(,29)
+float_copying.texi(,30) @node Top
+float_copying.texi(,31) @top Top
float_copying.texi(,32)
-float_copying.texi(,33) See the caption @ref{public domain anchor}.
+float_copying.texi(,33) @cindex Top
float_copying.texi(,34)
-float_copying.texi(,35) See the float @ref{public domain}.
+float_copying.texi(,35) See the caption @ref{public domain anchor}.
float_copying.texi(,36)
-float_copying.texi(,37) @insertcopying
+float_copying.texi(,37) See the float @ref{public domain}.
float_copying.texi(,38)
-float_copying.texi(,39) @menu
-float_copying.texi(,40) * Copying and floats::
-float_copying.texi(,41) @end menu
-float_copying.texi(,42)
-float_copying.texi(,43) @node Copying and floats
-float_copying.texi(,44) @appendix Copying and floats
-float_copying.texi(,45)
-float_copying.texi(,46) In the appendix, we print the references and the
copying once more
-float_copying.texi(,47) and the list of coyright notices (listoffloats).
-float_copying.texi(,48)
-float_copying.texi(,49) See the caption @ref{public domain anchor}.
+float_copying.texi(,39) @insertcopying
+float_copying.texi(,40)
+float_copying.texi(,41) @menu
+float_copying.texi(,42) * Copying and floats::
+float_copying.texi(,43) @end menu
+float_copying.texi(,44)
+float_copying.texi(,45) @node Copying and floats
+float_copying.texi(,46) @appendix Copying and floats
+float_copying.texi(,47)
+float_copying.texi(,48) In the appendix, we print the references and the
copying once more
+float_copying.texi(,49) and the list of coyright notices (listoffloats).
float_copying.texi(,50)
-float_copying.texi(,51) See the float @ref{public domain}.
+float_copying.texi(,51) See the caption @ref{public domain anchor}.
float_copying.texi(,52)
-float_copying.texi(,53) @cindex listofloats
+float_copying.texi(,53) See the float @ref{public domain}.
float_copying.texi(,54)
-float_copying.texi(,55) @insertcopying
-float_copying.texi(,56) @insertcopying
-float_copying.texi(,57)
-float_copying.texi(,58) @subheading listoffloats
-float_copying.texi(,59) @listoffloats Copyright notice
-float_copying.texi(,60)
-float_copying.texi(,61) @subheading printindex
-float_copying.texi(,62) @printindex cp
-float_copying.texi(,63)
-float_copying.texi(,64) @bye
+float_copying.texi(,55) @cindex listofloats
+float_copying.texi(,56)
+float_copying.texi(,57) @insertcopying
+float_copying.texi(,58) @insertcopying
+float_copying.texi(,59)
+float_copying.texi(,60) @subheading listoffloats
+float_copying.texi(,61) @listoffloats Copyright notice
+float_copying.texi(,62)
+float_copying.texi(,63) @subheading printindex
+float_copying.texi(,64) @printindex cp
+float_copying.texi(,65) @printindex fn
+float_copying.texi(,66)
+float_copying.texi(,67) @bye
Index: test/formatting/res/texi_float_copying/float_copying.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_float_copying/float_copying.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/texi_float_copying/float_copying.texi 18 Aug 2008
18:03:16 -0000 1.1
+++ test/formatting/res/texi_float_copying/float_copying.texi 26 Sep 2009
23:10:09 -0000 1.2
@@ -14,6 +14,7 @@
@anchor{caption copying footnote anchor}
@cindex indexed caption copying footnote
address@hidden public domain function
see @ref{Copying and floats}.
@@ -21,6 +22,7 @@
@anchor{public domain anchor}
@cindex indexed caption
address@hidden indexed caption function
}
@end float
@end copying
@@ -60,5 +62,6 @@
@subheading printindex
@printindex cp
address@hidden fn
@bye
Index: test/formatting/res/texi_float_copying/float_copying.texi.first
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res/texi_float_copying/float_copying.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res/texi_float_copying/float_copying.texi.first 2 Aug
2009 13:06:57 -0000 1.1
+++ test/formatting/res/texi_float_copying/float_copying.texi.first 26 Sep
2009 23:10:09 -0000 1.2
@@ -38,5 +38,6 @@
@subheading printindex
@printindex cp
address@hidden fn
@bye
Index: test/formatting/res_all/float_copying/float_copying.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/float_copying/float_copying.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res_all/float_copying/float_copying.2 3 Aug 2009
08:21:12 -0000 1.2
+++ test/formatting/res_all/float_copying/float_copying.2 26 Sep 2009
23:10:09 -0000 1.3
@@ -1,2 +1,4 @@
float_copying.texi:16: Entry for index `cp' outside of any node.
-float_copying.texi:23: Entry for index `cp' outside of any node.
+float_copying.texi:17: Entry for index `fn' outside of any node.
+float_copying.texi:24: Entry for index `cp' outside of any node.
+float_copying.texi:25: Entry for index `fn' outside of any node.
Index: test/formatting/res_all/float_copying/float_copying_1.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/float_copying/float_copying_1.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res_all/float_copying/float_copying_1.txt 6 Aug 2009
16:27:33 -0000 1.2
+++ test/formatting/res_all/float_copying/float_copying_1.txt 26 Sep 2009
23:10:09 -0000 1.3
@@ -37,6 +37,11 @@
printindex
----------
* Index:
+* indexed caption: (outside of any element).
+* indexed caption copying footnote: (outside of any element).
* listofloats: Appendix A Copying and floats.
* Top: Top.
+* Index:
+* indexed caption function: (outside of any element).
+* public domain function: (outside of any element).
Index: test/formatting/res_all/formatting_weird_quotes/formatting.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/formatting_weird_quotes/formatting.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res_all/formatting_weird_quotes/formatting.txt 30 Aug
2009 18:59:59 -0000 1.4
+++ test/formatting/res_all/formatting_weird_quotes/formatting.txt 26 Sep
2009 23:10:10 -0000 1.5
@@ -1779,6 +1779,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1786,10 +1788,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1799,6 +1805,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1808,34 +1816,52 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
* after: Top section.
* after: Top section.
+* after: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
+* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
+* d-efmac_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
+* d-efmethod_name on c-lass: Top section.
+* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
+* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypemethod_name on c-lass: Top section.
* d-eftypemethod_name on c-lass: Top section.
+* d-eftypemethod_name on c-lass: Top section.
+* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
+* d-efun_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
+* de-ffn_name: Top section.
+* deffn: Top section.
+* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
@@ -1844,6 +1870,10 @@
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -1852,16 +1882,29 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id @i'‘ ule: Top section.
* id @i'‘ ule: Top section.
* id @i'‘ ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -1880,27 +1923,39 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
vr
* Index:
* a: Top section.
* a: Top section.
+* a: Top section.
+* b: Top section.
* b: Top section.
* b: Top section.
* d-efcv_name: Top section.
* d-efcv_name: Top section.
+* d-efcv_name: Top section.
* d-efivar_name: Top section.
* d-efivar_name: Top section.
+* d-efivar_name: Top section.
+* d-efopt_name: Top section.
* d-efopt_name: Top section.
* d-efopt_name: Top section.
* d-eftypeivar_name of c-lass: Top section.
* d-eftypeivar_name of c-lass: Top section.
+* d-eftypeivar_name of c-lass: Top section.
* d-eftypevar_name: Top section.
* d-eftypevar_name: Top section.
+* d-eftypevar_name: Top section.
+* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-efvar_name: Top section.
* d-efvar_name: Top section.
+* d-efvar_name: Top section.
+* d-efvr_name: Top section.
* d-efvr_name: Top section.
* d-efvr_name: Top section.
@@ -1912,6 +1967,7 @@
* Index:
* d-eftp_name: Top section.
* d-eftp_name: Top section.
+* d-eftp_name: Top section.
@@ -1951,6 +2007,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1958,10 +2016,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1969,6 +2031,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1978,42 +2042,64 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
+* after: Top section.
* after: Top section.
* after: Top section.
* b: Top section.
* b: Top section.
+* b: Top section.
+* bidule machin: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
+* d-efmac_name: Top section.
+* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
+* d-efop_name on c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
+* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypemethod_name on c-lass: Top section.
* d-eftypemethod_name on c-lass: Top section.
+* d-eftypemethod_name on c-lass: Top section.
+* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
+* d-efun_name: Top section.
+* de-ffn_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
+* deffn: Top section.
+* deffn: Top section.
+* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
@@ -2022,16 +2108,29 @@
* i: Top section.
* i: Top section.
* i: Top section.
+* i: Top section.
+* i: Top section.
+* id @i'‘ ule: Top section.
* id @i'‘ ule: Top section.
* id @i'‘ ule: Top section.
* id ule: Top section.
* id ule: Top section.
+* id ule: Top section.
+* log trap: Top section.
* log trap: Top section.
* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -2050,6 +2149,8 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
Table of Contents
*****************
Index: test/formatting/res_all/heading/headings.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/heading/headings.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/formatting/res_all/heading/headings.txt 6 Aug 2009 16:27:35
-0000 1.2
+++ test/formatting/res_all/heading/headings.txt 26 Sep 2009 23:10:10
-0000 1.3
@@ -37,6 +37,7 @@
*******
* Index:
+* cindex copying: (outside of any element).
* heading in footnote: 1 A chapter.
* index entry after heading in top: Test headings.
Index: test/formatting/res_all/texi_float_copying/float_copying.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/texi_float_copying/float_copying.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res_all/texi_float_copying/float_copying.2 3 Aug 2009
08:21:14 -0000 1.3
+++ test/formatting/res_all/texi_float_copying/float_copying.2 26 Sep 2009
23:10:10 -0000 1.4
@@ -1,2 +1,4 @@
float_copying.texi:16: Entry for index `cp' outside of any node.
-float_copying.texi:23: Entry for index `cp' outside of any node.
+float_copying.texi:17: Entry for index `fn' outside of any node.
+float_copying.texi:24: Entry for index `cp' outside of any node.
+float_copying.texi:25: Entry for index `fn' outside of any node.
Index: test/formatting/res_all/texi_float_copying/float_copying.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/texi_float_copying/float_copying.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_all/texi_float_copying/float_copying.passfirst 28 Jun
2009 23:45:27 -0000 1.1
+++ test/formatting/res_all/texi_float_copying/float_copying.passfirst 26 Sep
2009 23:10:10 -0000 1.2
@@ -1,41 +1,42 @@
float_copying.texi(,2)
float_copying.texi(,3) @setfilename float_copying.info
float_copying.texi(,4)
-float_copying.texi(,27)
-float_copying.texi(,28) @node Top
-float_copying.texi(,29) @top Top
-float_copying.texi(,30)
-float_copying.texi(,31) @cindex Top
+float_copying.texi(,29)
+float_copying.texi(,30) @node Top
+float_copying.texi(,31) @top Top
float_copying.texi(,32)
-float_copying.texi(,33) See the caption @ref{public domain anchor}.
+float_copying.texi(,33) @cindex Top
float_copying.texi(,34)
-float_copying.texi(,35) See the float @ref{public domain}.
+float_copying.texi(,35) See the caption @ref{public domain anchor}.
float_copying.texi(,36)
-float_copying.texi(,37) @insertcopying
+float_copying.texi(,37) See the float @ref{public domain}.
float_copying.texi(,38)
-float_copying.texi(,39) @menu
-float_copying.texi(,40) * Copying and floats::
-float_copying.texi(,41) @end menu
-float_copying.texi(,42)
-float_copying.texi(,43) @node Copying and floats
-float_copying.texi(,44) @appendix Copying and floats
-float_copying.texi(,45)
-float_copying.texi(,46) In the appendix, we print the references and the
copying once more
-float_copying.texi(,47) and the list of coyright notices (listoffloats).
-float_copying.texi(,48)
-float_copying.texi(,49) See the caption @ref{public domain anchor}.
+float_copying.texi(,39) @insertcopying
+float_copying.texi(,40)
+float_copying.texi(,41) @menu
+float_copying.texi(,42) * Copying and floats::
+float_copying.texi(,43) @end menu
+float_copying.texi(,44)
+float_copying.texi(,45) @node Copying and floats
+float_copying.texi(,46) @appendix Copying and floats
+float_copying.texi(,47)
+float_copying.texi(,48) In the appendix, we print the references and the
copying once more
+float_copying.texi(,49) and the list of coyright notices (listoffloats).
float_copying.texi(,50)
-float_copying.texi(,51) See the float @ref{public domain}.
+float_copying.texi(,51) See the caption @ref{public domain anchor}.
float_copying.texi(,52)
-float_copying.texi(,53) @cindex listofloats
+float_copying.texi(,53) See the float @ref{public domain}.
float_copying.texi(,54)
-float_copying.texi(,55) @insertcopying
-float_copying.texi(,56) @insertcopying
-float_copying.texi(,57)
-float_copying.texi(,58) @subheading listoffloats
-float_copying.texi(,59) @listoffloats Copyright notice
-float_copying.texi(,60)
-float_copying.texi(,61) @subheading printindex
-float_copying.texi(,62) @printindex cp
-float_copying.texi(,63)
-float_copying.texi(,64) @bye
+float_copying.texi(,55) @cindex listofloats
+float_copying.texi(,56)
+float_copying.texi(,57) @insertcopying
+float_copying.texi(,58) @insertcopying
+float_copying.texi(,59)
+float_copying.texi(,60) @subheading listoffloats
+float_copying.texi(,61) @listoffloats Copyright notice
+float_copying.texi(,62)
+float_copying.texi(,63) @subheading printindex
+float_copying.texi(,64) @printindex cp
+float_copying.texi(,65) @printindex fn
+float_copying.texi(,66)
+float_copying.texi(,67) @bye
Index: test/formatting/res_all/texi_float_copying/float_copying.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/texi_float_copying/float_copying.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_all/texi_float_copying/float_copying.passtexi 28 Jun
2009 23:45:27 -0000 1.1
+++ test/formatting/res_all/texi_float_copying/float_copying.passtexi 26 Sep
2009 23:10:10 -0000 1.2
@@ -13,51 +13,54 @@
float_copying.texi(,14) @anchor{caption copying footnote anchor}
float_copying.texi(,15)
float_copying.texi(,16) @cindex indexed caption copying footnote
-float_copying.texi(,17)
-float_copying.texi(,18) see @ref{Copying and floats}.
-float_copying.texi(,19)
-float_copying.texi(,20) }
-float_copying.texi(,21)
-float_copying.texi(,22) @anchor{public domain anchor}
-float_copying.texi(,23) @cindex indexed caption
-float_copying.texi(,24) }
-float_copying.texi(,25) @end float
-float_copying.texi(,26) @end copying
-float_copying.texi(,27)
-float_copying.texi(,28) @node Top
-float_copying.texi(,29) @top Top
-float_copying.texi(,30)
-float_copying.texi(,31) @cindex Top
+float_copying.texi(,17) @findex public domain function
+float_copying.texi(,18)
+float_copying.texi(,19) see @ref{Copying and floats}.
+float_copying.texi(,20)
+float_copying.texi(,21) }
+float_copying.texi(,22)
+float_copying.texi(,23) @anchor{public domain anchor}
+float_copying.texi(,24) @cindex indexed caption
+float_copying.texi(,25) @findex indexed caption function
+float_copying.texi(,26) }
+float_copying.texi(,27) @end float
+float_copying.texi(,28) @end copying
+float_copying.texi(,29)
+float_copying.texi(,30) @node Top
+float_copying.texi(,31) @top Top
float_copying.texi(,32)
-float_copying.texi(,33) See the caption @ref{public domain anchor}.
+float_copying.texi(,33) @cindex Top
float_copying.texi(,34)
-float_copying.texi(,35) See the float @ref{public domain}.
+float_copying.texi(,35) See the caption @ref{public domain anchor}.
float_copying.texi(,36)
-float_copying.texi(,37) @insertcopying
+float_copying.texi(,37) See the float @ref{public domain}.
float_copying.texi(,38)
-float_copying.texi(,39) @menu
-float_copying.texi(,40) * Copying and floats::
-float_copying.texi(,41) @end menu
-float_copying.texi(,42)
-float_copying.texi(,43) @node Copying and floats
-float_copying.texi(,44) @appendix Copying and floats
-float_copying.texi(,45)
-float_copying.texi(,46) In the appendix, we print the references and the
copying once more
-float_copying.texi(,47) and the list of coyright notices (listoffloats).
-float_copying.texi(,48)
-float_copying.texi(,49) See the caption @ref{public domain anchor}.
+float_copying.texi(,39) @insertcopying
+float_copying.texi(,40)
+float_copying.texi(,41) @menu
+float_copying.texi(,42) * Copying and floats::
+float_copying.texi(,43) @end menu
+float_copying.texi(,44)
+float_copying.texi(,45) @node Copying and floats
+float_copying.texi(,46) @appendix Copying and floats
+float_copying.texi(,47)
+float_copying.texi(,48) In the appendix, we print the references and the
copying once more
+float_copying.texi(,49) and the list of coyright notices (listoffloats).
float_copying.texi(,50)
-float_copying.texi(,51) See the float @ref{public domain}.
+float_copying.texi(,51) See the caption @ref{public domain anchor}.
float_copying.texi(,52)
-float_copying.texi(,53) @cindex listofloats
+float_copying.texi(,53) See the float @ref{public domain}.
float_copying.texi(,54)
-float_copying.texi(,55) @insertcopying
-float_copying.texi(,56) @insertcopying
-float_copying.texi(,57)
-float_copying.texi(,58) @subheading listoffloats
-float_copying.texi(,59) @listoffloats Copyright notice
-float_copying.texi(,60)
-float_copying.texi(,61) @subheading printindex
-float_copying.texi(,62) @printindex cp
-float_copying.texi(,63)
-float_copying.texi(,64) @bye
+float_copying.texi(,55) @cindex listofloats
+float_copying.texi(,56)
+float_copying.texi(,57) @insertcopying
+float_copying.texi(,58) @insertcopying
+float_copying.texi(,59)
+float_copying.texi(,60) @subheading listoffloats
+float_copying.texi(,61) @listoffloats Copyright notice
+float_copying.texi(,62)
+float_copying.texi(,63) @subheading printindex
+float_copying.texi(,64) @printindex cp
+float_copying.texi(,65) @printindex fn
+float_copying.texi(,66)
+float_copying.texi(,67) @bye
Index: test/formatting/res_all/texi_float_copying/float_copying.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/texi_float_copying/float_copying.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_all/texi_float_copying/float_copying.texi 28 Jun
2009 23:45:27 -0000 1.1
+++ test/formatting/res_all/texi_float_copying/float_copying.texi 26 Sep
2009 23:10:10 -0000 1.2
@@ -14,6 +14,7 @@
@anchor{caption copying footnote anchor}
@cindex indexed caption copying footnote
address@hidden public domain function
see @ref{Copying and floats}.
@@ -21,6 +22,7 @@
@anchor{public domain anchor}
@cindex indexed caption
address@hidden indexed caption function
}
@end float
@end copying
@@ -60,5 +62,6 @@
@subheading printindex
@printindex cp
address@hidden fn
@bye
Index: test/formatting/res_all/texi_float_copying/float_copying.texi.first
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_all/texi_float_copying/float_copying.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_all/texi_float_copying/float_copying.texi.first 2 Aug
2009 13:07:06 -0000 1.1
+++ test/formatting/res_all/texi_float_copying/float_copying.texi.first 26 Sep
2009 23:10:10 -0000 1.2
@@ -38,5 +38,6 @@
@subheading printindex
@printindex cp
address@hidden fn
@bye
Index: test/formatting/res_info/float_copying/float_copying.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/float_copying/float_copying.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/formatting/res_info/float_copying/float_copying.2 2 Sep 2009
21:08:57 -0000 1.3
+++ test/formatting/res_info/float_copying/float_copying.2 26 Sep 2009
23:10:10 -0000 1.4
@@ -1,11 +1,13 @@
float_copying.texi:16: Entry for index `cp' outside of any node.
-float_copying.texi:23: Entry for index `cp' outside of any node.
+float_copying.texi:17: Entry for index `fn' outside of any node.
+float_copying.texi:24: Entry for index `cp' outside of any node.
+float_copying.texi:25: Entry for index `fn' outside of any node.
float_copying.texi:7: Float label `public domain' previously defined (l. 7)
float_copying.texi:14: Anchor `caption copying footnote anchor' previously
defined (l. 14)
-float_copying.texi:22: Anchor `public domain anchor' previously defined (l. 22)
+float_copying.texi:23: Anchor `public domain anchor' previously defined (l. 23)
float_copying.texi:7: Float label `public domain' previously defined (l. 7)
float_copying.texi:14: Anchor `caption copying footnote anchor' previously
defined (l. 14)
-float_copying.texi:22: Anchor `public domain anchor' previously defined (l. 22)
+float_copying.texi:23: Anchor `public domain anchor' previously defined (l. 23)
float_copying.texi:7: Float label `public domain' previously defined (l. 7)
float_copying.texi:14: Anchor `caption copying footnote anchor' previously
defined (l. 14)
-float_copying.texi:22: Anchor `public domain anchor' previously defined (l. 22)
+float_copying.texi:23: Anchor `public domain anchor' previously defined (l. 23)
Index: test/formatting/res_info/float_copying/float_copying.info
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/float_copying/float_copying.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
Binary files /tmp/cvsJWa5BD and /tmp/cvs4CwVDA differ
Index: test/formatting/res_info/texi_float_copying/float_copying.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/texi_float_copying/float_copying.2,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- test/formatting/res_info/texi_float_copying/float_copying.2 2 Sep 2009
21:08:57 -0000 1.4
+++ test/formatting/res_info/texi_float_copying/float_copying.2 26 Sep 2009
23:10:10 -0000 1.5
@@ -1,11 +1,13 @@
float_copying.texi:16: Entry for index `cp' outside of any node.
-float_copying.texi:23: Entry for index `cp' outside of any node.
+float_copying.texi:17: Entry for index `fn' outside of any node.
+float_copying.texi:24: Entry for index `cp' outside of any node.
+float_copying.texi:25: Entry for index `fn' outside of any node.
float_copying.texi:7: Float label `public domain' previously defined (l. 7)
float_copying.texi:14: Anchor `caption copying footnote anchor' previously
defined (l. 14)
-float_copying.texi:22: Anchor `public domain anchor' previously defined (l. 22)
+float_copying.texi:23: Anchor `public domain anchor' previously defined (l. 23)
float_copying.texi:7: Float label `public domain' previously defined (l. 7)
float_copying.texi:14: Anchor `caption copying footnote anchor' previously
defined (l. 14)
-float_copying.texi:22: Anchor `public domain anchor' previously defined (l. 22)
+float_copying.texi:23: Anchor `public domain anchor' previously defined (l. 23)
float_copying.texi:7: Float label `public domain' previously defined (l. 7)
float_copying.texi:14: Anchor `caption copying footnote anchor' previously
defined (l. 14)
-float_copying.texi:22: Anchor `public domain anchor' previously defined (l. 22)
+float_copying.texi:23: Anchor `public domain anchor' previously defined (l. 23)
Index: test/formatting/res_info/texi_float_copying/float_copying.passfirst
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/texi_float_copying/float_copying.passfirst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_info/texi_float_copying/float_copying.passfirst 28 Jun
2009 23:45:41 -0000 1.1
+++ test/formatting/res_info/texi_float_copying/float_copying.passfirst 26 Sep
2009 23:10:10 -0000 1.2
@@ -1,16 +1,16 @@
float_copying.texi(,2)
float_copying.texi(,3) @setfilename float_copying.info
float_copying.texi(,4)
-float_copying.texi(,27)
-float_copying.texi(,28) @node Top
-float_copying.texi(,29) @top Top
-float_copying.texi(,30)
-float_copying.texi(,31) @cindex Top
+float_copying.texi(,29)
+float_copying.texi(,30) @node Top
+float_copying.texi(,31) @top Top
float_copying.texi(,32)
-float_copying.texi(,33) See the caption @ref{public domain anchor}.
+float_copying.texi(,33) @cindex Top
float_copying.texi(,34)
-float_copying.texi(,35) See the float @ref{public domain}.
+float_copying.texi(,35) See the caption @ref{public domain anchor}.
float_copying.texi(,36)
+float_copying.texi(,37) See the float @ref{public domain}.
+float_copying.texi(,38)
float_copying.texi(,6)
float_copying.texi(,7) @float Copyright notice
float_copying.texi(,8)
@@ -22,32 +22,34 @@
float_copying.texi(,14)
float_copying.texi(,15)
float_copying.texi(,16) @cindex indexed caption copying footnote
-float_copying.texi(,17)
-float_copying.texi(,18) see @ref{Copying and floats}.
-float_copying.texi(,19)
-float_copying.texi(,20) }
-float_copying.texi(,21)
+float_copying.texi(,17) @findex public domain function
+float_copying.texi(,18)
+float_copying.texi(,19) see @ref{Copying and floats}.
+float_copying.texi(,20)
+float_copying.texi(,21) }
float_copying.texi(,22)
-float_copying.texi(,23) @cindex indexed caption
-float_copying.texi(,24) }
-float_copying.texi(,25) @end float
-float_copying.texi(,38)
-float_copying.texi(,39) @menu
-float_copying.texi(,40) * Copying and floats::
-float_copying.texi(,41) @end menu
-float_copying.texi(,42)
-float_copying.texi(,43) @node Copying and floats
-float_copying.texi(,44) @appendix Copying and floats
-float_copying.texi(,45)
-float_copying.texi(,46) In the appendix, we print the references and the
copying once more
-float_copying.texi(,47) and the list of coyright notices (listoffloats).
-float_copying.texi(,48)
-float_copying.texi(,49) See the caption @ref{public domain anchor}.
+float_copying.texi(,23)
+float_copying.texi(,24) @cindex indexed caption
+float_copying.texi(,25) @findex indexed caption function
+float_copying.texi(,26) }
+float_copying.texi(,27) @end float
+float_copying.texi(,40)
+float_copying.texi(,41) @menu
+float_copying.texi(,42) * Copying and floats::
+float_copying.texi(,43) @end menu
+float_copying.texi(,44)
+float_copying.texi(,45) @node Copying and floats
+float_copying.texi(,46) @appendix Copying and floats
+float_copying.texi(,47)
+float_copying.texi(,48) In the appendix, we print the references and the
copying once more
+float_copying.texi(,49) and the list of coyright notices (listoffloats).
float_copying.texi(,50)
-float_copying.texi(,51) See the float @ref{public domain}.
+float_copying.texi(,51) See the caption @ref{public domain anchor}.
float_copying.texi(,52)
-float_copying.texi(,53) @cindex listofloats
+float_copying.texi(,53) See the float @ref{public domain}.
float_copying.texi(,54)
+float_copying.texi(,55) @cindex listofloats
+float_copying.texi(,56)
float_copying.texi(,6)
float_copying.texi(,7) @float Copyright notice
float_copying.texi(,8)
@@ -59,15 +61,17 @@
float_copying.texi(,14)
float_copying.texi(,15)
float_copying.texi(,16) @cindex indexed caption copying footnote
-float_copying.texi(,17)
-float_copying.texi(,18) see @ref{Copying and floats}.
-float_copying.texi(,19)
-float_copying.texi(,20) }
-float_copying.texi(,21)
+float_copying.texi(,17) @findex public domain function
+float_copying.texi(,18)
+float_copying.texi(,19) see @ref{Copying and floats}.
+float_copying.texi(,20)
+float_copying.texi(,21) }
float_copying.texi(,22)
-float_copying.texi(,23) @cindex indexed caption
-float_copying.texi(,24) }
-float_copying.texi(,25) @end float
+float_copying.texi(,23)
+float_copying.texi(,24) @cindex indexed caption
+float_copying.texi(,25) @findex indexed caption function
+float_copying.texi(,26) }
+float_copying.texi(,27) @end float
float_copying.texi(,6)
float_copying.texi(,7) @float Copyright notice
float_copying.texi(,8)
@@ -79,20 +83,23 @@
float_copying.texi(,14)
float_copying.texi(,15)
float_copying.texi(,16) @cindex indexed caption copying footnote
-float_copying.texi(,17)
-float_copying.texi(,18) see @ref{Copying and floats}.
-float_copying.texi(,19)
-float_copying.texi(,20) }
-float_copying.texi(,21)
+float_copying.texi(,17) @findex public domain function
+float_copying.texi(,18)
+float_copying.texi(,19) see @ref{Copying and floats}.
+float_copying.texi(,20)
+float_copying.texi(,21) }
float_copying.texi(,22)
-float_copying.texi(,23) @cindex indexed caption
-float_copying.texi(,24) }
-float_copying.texi(,25) @end float
-float_copying.texi(,57)
-float_copying.texi(,58) @subheading listoffloats
-float_copying.texi(,59) @listoffloats Copyright notice
-float_copying.texi(,60)
-float_copying.texi(,61) @subheading printindex
-float_copying.texi(,62) @printindex cp
-float_copying.texi(,63)
-float_copying.texi(,64) @bye
+float_copying.texi(,23)
+float_copying.texi(,24) @cindex indexed caption
+float_copying.texi(,25) @findex indexed caption function
+float_copying.texi(,26) }
+float_copying.texi(,27) @end float
+float_copying.texi(,59)
+float_copying.texi(,60) @subheading listoffloats
+float_copying.texi(,61) @listoffloats Copyright notice
+float_copying.texi(,62)
+float_copying.texi(,63) @subheading printindex
+float_copying.texi(,64) @printindex cp
+float_copying.texi(,65) @printindex fn
+float_copying.texi(,66)
+float_copying.texi(,67) @bye
Index: test/formatting/res_info/texi_float_copying/float_copying.passtexi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/texi_float_copying/float_copying.passtexi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_info/texi_float_copying/float_copying.passtexi 28 Jun
2009 23:45:41 -0000 1.1
+++ test/formatting/res_info/texi_float_copying/float_copying.passtexi 26 Sep
2009 23:10:10 -0000 1.2
@@ -13,51 +13,54 @@
float_copying.texi(,14) @anchor{caption copying footnote anchor}
float_copying.texi(,15)
float_copying.texi(,16) @cindex indexed caption copying footnote
-float_copying.texi(,17)
-float_copying.texi(,18) see @ref{Copying and floats}.
-float_copying.texi(,19)
-float_copying.texi(,20) }
-float_copying.texi(,21)
-float_copying.texi(,22) @anchor{public domain anchor}
-float_copying.texi(,23) @cindex indexed caption
-float_copying.texi(,24) }
-float_copying.texi(,25) @end float
-float_copying.texi(,26) @end copying
-float_copying.texi(,27)
-float_copying.texi(,28) @node Top
-float_copying.texi(,29) @top Top
-float_copying.texi(,30)
-float_copying.texi(,31) @cindex Top
+float_copying.texi(,17) @findex public domain function
+float_copying.texi(,18)
+float_copying.texi(,19) see @ref{Copying and floats}.
+float_copying.texi(,20)
+float_copying.texi(,21) }
+float_copying.texi(,22)
+float_copying.texi(,23) @anchor{public domain anchor}
+float_copying.texi(,24) @cindex indexed caption
+float_copying.texi(,25) @findex indexed caption function
+float_copying.texi(,26) }
+float_copying.texi(,27) @end float
+float_copying.texi(,28) @end copying
+float_copying.texi(,29)
+float_copying.texi(,30) @node Top
+float_copying.texi(,31) @top Top
float_copying.texi(,32)
-float_copying.texi(,33) See the caption @ref{public domain anchor}.
+float_copying.texi(,33) @cindex Top
float_copying.texi(,34)
-float_copying.texi(,35) See the float @ref{public domain}.
+float_copying.texi(,35) See the caption @ref{public domain anchor}.
float_copying.texi(,36)
-float_copying.texi(,37) @insertcopying
+float_copying.texi(,37) See the float @ref{public domain}.
float_copying.texi(,38)
-float_copying.texi(,39) @menu
-float_copying.texi(,40) * Copying and floats::
-float_copying.texi(,41) @end menu
-float_copying.texi(,42)
-float_copying.texi(,43) @node Copying and floats
-float_copying.texi(,44) @appendix Copying and floats
-float_copying.texi(,45)
-float_copying.texi(,46) In the appendix, we print the references and the
copying once more
-float_copying.texi(,47) and the list of coyright notices (listoffloats).
-float_copying.texi(,48)
-float_copying.texi(,49) See the caption @ref{public domain anchor}.
+float_copying.texi(,39) @insertcopying
+float_copying.texi(,40)
+float_copying.texi(,41) @menu
+float_copying.texi(,42) * Copying and floats::
+float_copying.texi(,43) @end menu
+float_copying.texi(,44)
+float_copying.texi(,45) @node Copying and floats
+float_copying.texi(,46) @appendix Copying and floats
+float_copying.texi(,47)
+float_copying.texi(,48) In the appendix, we print the references and the
copying once more
+float_copying.texi(,49) and the list of coyright notices (listoffloats).
float_copying.texi(,50)
-float_copying.texi(,51) See the float @ref{public domain}.
+float_copying.texi(,51) See the caption @ref{public domain anchor}.
float_copying.texi(,52)
-float_copying.texi(,53) @cindex listofloats
+float_copying.texi(,53) See the float @ref{public domain}.
float_copying.texi(,54)
-float_copying.texi(,55) @insertcopying
-float_copying.texi(,56) @insertcopying
-float_copying.texi(,57)
-float_copying.texi(,58) @subheading listoffloats
-float_copying.texi(,59) @listoffloats Copyright notice
-float_copying.texi(,60)
-float_copying.texi(,61) @subheading printindex
-float_copying.texi(,62) @printindex cp
-float_copying.texi(,63)
-float_copying.texi(,64) @bye
+float_copying.texi(,55) @cindex listofloats
+float_copying.texi(,56)
+float_copying.texi(,57) @insertcopying
+float_copying.texi(,58) @insertcopying
+float_copying.texi(,59)
+float_copying.texi(,60) @subheading listoffloats
+float_copying.texi(,61) @listoffloats Copyright notice
+float_copying.texi(,62)
+float_copying.texi(,63) @subheading printindex
+float_copying.texi(,64) @printindex cp
+float_copying.texi(,65) @printindex fn
+float_copying.texi(,66)
+float_copying.texi(,67) @bye
Index: test/formatting/res_info/texi_float_copying/float_copying.texi
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/texi_float_copying/float_copying.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_info/texi_float_copying/float_copying.texi 28 Jun
2009 23:45:41 -0000 1.1
+++ test/formatting/res_info/texi_float_copying/float_copying.texi 26 Sep
2009 23:10:11 -0000 1.2
@@ -14,6 +14,7 @@
@anchor{caption copying footnote anchor}
@cindex indexed caption copying footnote
address@hidden public domain function
see @ref{Copying and floats}.
@@ -21,6 +22,7 @@
@anchor{public domain anchor}
@cindex indexed caption
address@hidden indexed caption function
}
@end float
@end copying
@@ -60,5 +62,6 @@
@subheading printindex
@printindex cp
address@hidden fn
@bye
Index: test/formatting/res_info/texi_float_copying/float_copying.texi.first
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/formatting/res_info/texi_float_copying/float_copying.texi.first,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/formatting/res_info/texi_float_copying/float_copying.texi.first
2 Aug 2009 13:07:12 -0000 1.1
+++ test/formatting/res_info/texi_float_copying/float_copying.texi.first
26 Sep 2009 23:10:11 -0000 1.2
@@ -23,6 +23,7 @@
@cindex indexed caption copying footnote
address@hidden public domain function
see @ref{Copying and floats}.
@@ -30,6 +31,7 @@
@cindex indexed caption
address@hidden indexed caption function
}
@end float
@@ -60,6 +62,7 @@
@cindex indexed caption copying footnote
address@hidden public domain function
see @ref{Copying and floats}.
@@ -67,6 +70,7 @@
@cindex indexed caption
address@hidden indexed caption function
}
@end float
@@ -80,6 +84,7 @@
@cindex indexed caption copying footnote
address@hidden public domain function
see @ref{Copying and floats}.
@@ -87,6 +92,7 @@
@cindex indexed caption
address@hidden indexed caption function
}
@end float
@@ -95,5 +101,6 @@
@subheading printindex
@printindex cp
address@hidden fn
@bye
Index: test/indices/res/index_special_region/index_special_region.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res/index_special_region/index_special_region.2,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/indices/res/index_special_region/index_special_region.2 15 Sep
2009 18:21:42 -0000 1.5
+++ test/indices/res/index_special_region/index_special_region.2 26 Sep
2009 23:10:11 -0000 1.6
@@ -9,3 +9,5 @@
index_special_region.texi:49: warning: Empty index entry for @deffn
index_special_region.texi:52: warning: table requires an argument: the
formatter for @item.
index_special_region.texi:53: warning: Empty index entry for @ftable
+index_special_region.texi:8: warning: Anchor `Copying information' ignored in
copying expanded more than once
+index_special_region.texi:11: warning: Anchor `Public domain reference'
ignored in copying expanded more than once
Index: test/indices/res/index_special_region_html/index_special_region.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res/index_special_region_html/index_special_region.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/indices/res/index_special_region_html/index_special_region.2 15 Sep
2009 18:21:42 -0000 1.2
+++ test/indices/res/index_special_region_html/index_special_region.2 26 Sep
2009 23:10:11 -0000 1.3
@@ -3,9 +3,13 @@
index_special_region.texi:17: warning: Printindex before document beginning:
@printindex cp
index_special_region.texi:23: Entry for index `cp' outside of any node.
index_special_region.texi:29: Entry for index `cp' outside of any node.
+index_special_region.texi:8: warning: Anchor `Copying information' ignored in
copying expanded more than once
+index_special_region.texi:11: warning: Anchor `Public domain reference'
ignored in copying expanded more than once
index_special_region.texi:46: warning: Empty index entry for @cindex
index_special_region.texi:47: warning: Empty index entry for @deffn
index_special_region.texi:48: warning: Empty index entry for @deffn
index_special_region.texi:49: warning: Empty index entry for @deffn
index_special_region.texi:52: warning: table requires an argument: the
formatter for @item.
index_special_region.texi:53: warning: Empty index entry for @ftable
+index_special_region.texi:8: warning: Anchor `Copying information' ignored in
copying expanded more than once
+index_special_region.texi:11: warning: Anchor `Public domain reference'
ignored in copying expanded more than once
Index: test/indices/res_all/index_special_region/index_special_region.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res_all/index_special_region/index_special_region.2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/indices/res_all/index_special_region/index_special_region.2 15 Sep
2009 18:21:43 -0000 1.3
+++ test/indices/res_all/index_special_region/index_special_region.2 26 Sep
2009 23:10:11 -0000 1.4
@@ -9,3 +9,5 @@
index_special_region.texi:49: warning: Empty index entry for @deffn
index_special_region.texi:52: warning: table requires an argument: the
formatter for @item.
index_special_region.texi:53: warning: Empty index entry for @ftable
+index_special_region.texi:8: warning: Anchor `Copying information' ignored in
copying expanded more than once
+index_special_region.texi:11: warning: Anchor `Public domain reference'
ignored in copying expanded more than once
Index: test/indices/res_all/index_special_region/index_special_region_1.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res_all/index_special_region/index_special_region_1.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/indices/res_all/index_special_region/index_special_region_1.txt
30 Aug 2009 19:00:07 -0000 1.3
+++ test/indices/res_all/index_special_region/index_special_region_1.txt
26 Sep 2009 23:10:11 -0000 1.4
@@ -8,6 +8,8 @@
* Index:
* Copying appendix: Appendix A Copying and indices.
+* Copying this document: (outside of any element).
+* Public domain: (outside of any element).
This test demonstrates @anchor and indices in @copying
Index: test/indices/res_all/index_special_region/index_special_region_2.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res_all/index_special_region/index_special_region_2.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/indices/res_all/index_special_region/index_special_region_2.txt
6 Aug 2009 16:27:44 -0000 1.2
+++ test/indices/res_all/index_special_region/index_special_region_2.txt
26 Sep 2009 23:10:11 -0000 1.3
@@ -18,10 +18,14 @@
* Index:
* Copying appendix: Appendix A Copying and indices.
+* Copying this document: (outside of any element).
+* Public domain: (outside of any element).
* Index:
* Copying appendix: Appendix A Copying and indices.
+* Copying this document: (outside of any element).
+* Public domain: (outside of any element).
* Index:
* another fun: Appendix A Copying and indices.
* findex entry: 1 Chapter.
Index: test/indices/res_all/index_special_region_html/index_special_region.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res_all/index_special_region_html/index_special_region.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/indices/res_all/index_special_region_html/index_special_region.2
15 Sep 2009 18:21:43 -0000 1.2
+++ test/indices/res_all/index_special_region_html/index_special_region.2
26 Sep 2009 23:10:11 -0000 1.3
@@ -9,3 +9,5 @@
index_special_region.texi:49: warning: Empty index entry for @deffn
index_special_region.texi:52: warning: table requires an argument: the
formatter for @item.
index_special_region.texi:53: warning: Empty index entry for @ftable
+index_special_region.texi:8: warning: Anchor `Copying information' ignored in
copying expanded more than once
+index_special_region.texi:11: warning: Anchor `Public domain reference'
ignored in copying expanded more than once
Index: test/indices/res_info/index_special_region_html/index_special_region.2
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res_info/index_special_region_html/index_special_region.2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/indices/res_info/index_special_region_html/index_special_region.2
15 Sep 2009 18:21:44 -0000 1.2
+++ test/indices/res_info/index_special_region_html/index_special_region.2
26 Sep 2009 23:10:11 -0000 1.3
@@ -9,3 +9,5 @@
index_special_region.texi:49: warning: Empty index entry for @deffn
index_special_region.texi:52: warning: table requires an argument: the
formatter for @item.
index_special_region.texi:53: warning: Empty index entry for @ftable
+index_special_region.texi:8: warning: Anchor `Copying information' ignored in
copying expanded more than once
+index_special_region.texi:11: warning: Anchor `Public domain reference'
ignored in copying expanded more than once
Index: test/layout/res_all/formatting_exotic/formatting.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res_all/formatting_exotic/formatting.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/layout/res_all/formatting_exotic/formatting.txt 30 Aug 2009
19:00:22 -0000 1.3
+++ test/layout/res_all/formatting_exotic/formatting.txt 26 Sep 2009
23:10:11 -0000 1.4
@@ -1779,6 +1779,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -1786,10 +1788,14 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
+* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
+* index entry within itemize: Top section.
+* index entry within multitable: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
* t-ruc: Top section.
@@ -1799,6 +1805,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -1808,38 +1816,58 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
+* after: Top section.
* after: Top section.
* after: Top section.
* b: Top section.
* b: Top section.
+* b: Top section.
+* bidule machin: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
+* d-effn_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
+* d-efmac_name: Top section.
+* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
+* d-efop_name on c-lass: Top section.
+* d-efspec_name: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
+* d-eftypefn_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypemethod_name on c-lass: Top section.
* d-eftypemethod_name on c-lass: Top section.
+* d-eftypemethod_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
+* d-eftypeop_name on c-lass: Top section.
+* d-efun_name: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
+* de-ffn_name: Top section.
+* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
+* deffn: Top section.
+* deffnx: Top section.
+* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
@@ -1848,18 +1876,27 @@
* followed: Top section.
* followed: Top section.
* followed: Top section.
+* followed: Top section.
+* followed: Top section.
+* i: Top section.
+* i: Top section.
* i: Top section.
* i: Top section.
* i: Top section.
* i: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
+* id `i' ule: Top section.
+* id ule: Top section.
* id ule: Top section.
* id ule: Top section.
* log trap: Top section.
* log trap: Top section.
+* log trap: Top section.
* log trap1: Top section.
* log trap1: Top section.
+* log trap1: Top section.
+* log trap2: Top section.
* log trap2: Top section.
* log trap2: Top section.
* machin: Top section.
@@ -1874,33 +1911,51 @@
* machin: Top section.
* machin: Top section.
* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* t-ruc: Top section.
* T-ruc: Top section.
* truc: Top section.
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
vr
* Index:
* a: Top section.
* a: Top section.
+* a: Top section.
* b: Top section.
* b: Top section.
+* b: Top section.
+* d-efcv_name: Top section.
* d-efcv_name: Top section.
* d-efcv_name: Top section.
* d-efivar_name: Top section.
* d-efivar_name: Top section.
+* d-efivar_name: Top section.
* d-efopt_name: Top section.
* d-efopt_name: Top section.
+* d-efopt_name: Top section.
+* d-eftypeivar_name of c-lass: Top section.
* d-eftypeivar_name of c-lass: Top section.
* d-eftypeivar_name of c-lass: Top section.
* d-eftypevar_name: Top section.
* d-eftypevar_name: Top section.
+* d-eftypevar_name: Top section.
+* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-eftypevr_name: Top section.
* d-efvar_name: Top section.
* d-efvar_name: Top section.
+* d-efvar_name: Top section.
+* d-efvr_name: Top section.
* d-efvr_name: Top section.
* d-efvr_name: Top section.
@@ -1912,6 +1967,7 @@
* Index:
* d-eftp_name: Top section.
* d-eftp_name: Top section.
+* d-eftp_name: Top section.
Index: test/layout/res_all/formatting_exotic/formatting_3.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res_all/formatting_exotic/formatting_3.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/layout/res_all/formatting_exotic/formatting_3.txt 13 Jul 2009
22:35:29 -0000 1.1
+++ test/layout/res_all/formatting_exotic/formatting_3.txt 26 Sep 2009
23:10:11 -0000 1.2
@@ -4,6 +4,8 @@
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -option: Top section.
* -option: Top section.
* -option: Top section.
* .: Top section.
@@ -11,17 +13,23 @@
* a: Top section.
* index entry between item and itemx: Top section.
* index entry between item and itemx: Top section.
+* index entry between item and itemx: Top section.
* index entry within deffn: Top section.
* index entry within deffn: Top section.
+* index entry within deffn: Top section.
+* index entry within itemize: Top section.
* index entry within itemize: Top section.
* index entry within itemize: Top section.
* index entry within multitable: Top section.
* index entry within multitable: Top section.
+* index entry within multitable: Top section.
* t-ruc: Top section.
* T-ruc: Top section.
* Index:
* ": Top section.
* ": Top section.
+* ": Top section.
+* -foption: Top section.
* -foption: Top section.
* -foption: Top section.
* .: Top section.
@@ -31,34 +39,52 @@
* a: Top section.
* a: Top section.
* a: Top section.
+* a: Top section.
+* a: Top section.
+* after: Top section.
* after: Top section.
* after: Top section.
* b: Top section.
* b: Top section.
+* b: Top section.
* bidule machin: Top section.
* bidule machin: Top section.
+* bidule machin: Top section.
+* d-effn_name: Top section.
* d-effn_name: Top section.
* d-effn_name: Top section.
* d-efmac_name: Top section.
* d-efmac_name: Top section.
+* d-efmac_name: Top section.
* d-efmethod_name on c-lass: Top section.
* d-efmethod_name on c-lass: Top section.
+* d-efmethod_name on c-lass: Top section.
+* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efop_name on c-lass: Top section.
* d-efspec_name: Top section.
* d-efspec_name: Top section.
+* d-efspec_name: Top section.
* d-eftypefn_name: Top section.
* d-eftypefn_name: Top section.
+* d-eftypefn_name: Top section.
+* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypefun_name: Top section.
* d-eftypemethod_name on c-lass: Top section.
* d-eftypemethod_name on c-lass: Top section.
+* d-eftypemethod_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
* d-eftypeop_name on c-lass: Top section.
+* d-eftypeop_name on c-lass: Top section.
+* d-efun_name: Top section.
* d-efun_name: Top section.
* d-efun_name: Top section.
* de-ffn_name: Top section.
* de-ffn_name: Top section.
+* de-ffn_name: Top section.
+* deffn: Top section.
+* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
* deffn: Top section.
@@ -67,24 +93,41 @@
* deffnx: Top section.
* deffnx: Top section.
* deffnx: Top section.
+* deffnx: Top section.
+* deffnx: Top section.
+* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
* followed: Top section.
+* followed: Top section.
+* i: Top section.
+* i: Top section.
* i: Top section.
* i: Top section.
* i: Top section.
* i: Top section.
* id `i' ule: Top section.
* id `i' ule: Top section.
+* id `i' ule: Top section.
+* id ule: Top section.
* id ule: Top section.
* id ule: Top section.
* log trap: Top section.
* log trap: Top section.
+* log trap: Top section.
+* log trap1: Top section.
* log trap1: Top section.
* log trap1: Top section.
* log trap2: Top section.
* log trap2: Top section.
+* log trap2: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
+* machin: Top section.
* machin: Top section.
* machin: Top section.
* machin: Top section.
@@ -103,6 +146,8 @@
* truc: Top section.
* truc: Top section.
* truc: Top section.
+* truc: Top section.
+* truc: Top section.
Table of Contents
*****************
Index: test/layout/res_all/formatting_regions/formatting-regions.txt
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/layout/res_all/formatting_regions/formatting-regions.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- test/layout/res_all/formatting_regions/formatting-regions.txt 30 Aug
2009 19:00:29 -0000 1.3
+++ test/layout/res_all/formatting_regions/formatting-regions.txt 26 Sep
2009 23:10:12 -0000 1.4
@@ -1753,6 +1753,8 @@
* Index:
* ": 1 constructs.
* ": 1 constructs.
+* ": 1 constructs.
+* -option: 1 constructs.
* -option: 1 constructs.
* -option: 1 constructs.
* .: 1 constructs.
@@ -1760,10 +1762,14 @@
* a: 1 constructs.
* index entry between item and itemx: 1 constructs.
* index entry between item and itemx: 1 constructs.
+* index entry between item and itemx: 1 constructs.
+* index entry within deffn: 1 constructs.
* index entry within deffn: 1 constructs.
* index entry within deffn: 1 constructs.
* index entry within itemize: 1 constructs.
* index entry within itemize: 1 constructs.
+* index entry within itemize: 1 constructs.
+* index entry within multitable: 1 constructs.
* index entry within multitable: 1 constructs.
* index entry within multitable: 1 constructs.
* t-ruc: 1 constructs.
@@ -1773,6 +1779,8 @@
* Index:
* ": 1 constructs.
* ": 1 constructs.
+* ": 1 constructs.
+* -foption: 1 constructs.
* -foption: 1 constructs.
* -foption: 1 constructs.
* .: 1 constructs.
@@ -1782,34 +1790,52 @@
* a: 1 constructs.
* a: 1 constructs.
* a: 1 constructs.
+* a: 1 constructs.
+* a: 1 constructs.
* after: 1 constructs.
* after: 1 constructs.
+* after: 1 constructs.
+* b: 1 constructs.
* b: 1 constructs.
* b: 1 constructs.
* bidule machin: 1 constructs.
* bidule machin: 1 constructs.
+* bidule machin: 1 constructs.
* d-effn_name: 1 constructs.
* d-effn_name: 1 constructs.
+* d-effn_name: 1 constructs.
+* d-efmac_name: 1 constructs.
* d-efmac_name: 1 constructs.
* d-efmac_name: 1 constructs.
* d-efmethod_name on c-lass: 1 constructs.
* d-efmethod_name on c-lass: 1 constructs.
+* d-efmethod_name on c-lass: 1 constructs.
+* d-efop_name on c-lass: 1 constructs.
* d-efop_name on c-lass: 1 constructs.
* d-efop_name on c-lass: 1 constructs.
* d-efspec_name: 1 constructs.
* d-efspec_name: 1 constructs.
+* d-efspec_name: 1 constructs.
+* d-eftypefn_name: 1 constructs.
* d-eftypefn_name: 1 constructs.
* d-eftypefn_name: 1 constructs.
* d-eftypefun_name: 1 constructs.
* d-eftypefun_name: 1 constructs.
+* d-eftypefun_name: 1 constructs.
* d-eftypemethod_name on c-lass: 1 constructs.
* d-eftypemethod_name on c-lass: 1 constructs.
+* d-eftypemethod_name on c-lass: 1 constructs.
+* d-eftypeop_name on c-lass: 1 constructs.
* d-eftypeop_name on c-lass: 1 constructs.
* d-eftypeop_name on c-lass: 1 constructs.
* d-efun_name: 1 constructs.
* d-efun_name: 1 constructs.
+* d-efun_name: 1 constructs.
* de-ffn_name: 1 constructs.
* de-ffn_name: 1 constructs.
+* de-ffn_name: 1 constructs.
+* deffn: 1 constructs.
+* deffn: 1 constructs.
* deffn: 1 constructs.
* deffn: 1 constructs.
* deffn: 1 constructs.
@@ -1818,6 +1844,10 @@
* deffnx: 1 constructs.
* deffnx: 1 constructs.
* deffnx: 1 constructs.
+* deffnx: 1 constructs.
+* deffnx: 1 constructs.
+* followed: 1 constructs.
+* followed: 1 constructs.
* followed: 1 constructs.
* followed: 1 constructs.
* followed: 1 constructs.
@@ -1826,16 +1856,29 @@
* i: 1 constructs.
* i: 1 constructs.
* i: 1 constructs.
+* i: 1 constructs.
+* i: 1 constructs.
+* id `i' ule: 1 constructs.
* id `i' ule: 1 constructs.
* id `i' ule: 1 constructs.
* id ule: 1 constructs.
* id ule: 1 constructs.
+* id ule: 1 constructs.
+* log trap: 1 constructs.
* log trap: 1 constructs.
* log trap: 1 constructs.
* log trap1: 1 constructs.
* log trap1: 1 constructs.
+* log trap1: 1 constructs.
* log trap2: 1 constructs.
* log trap2: 1 constructs.
+* log trap2: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
* machin: 1 constructs.
* machin: 1 constructs.
* machin: 1 constructs.
@@ -1854,27 +1897,39 @@
* truc: 1 constructs.
* truc: 1 constructs.
* truc: 1 constructs.
+* truc: 1 constructs.
+* truc: 1 constructs.
vr
* Index:
* a: 1 constructs.
* a: 1 constructs.
+* a: 1 constructs.
+* b: 1 constructs.
* b: 1 constructs.
* b: 1 constructs.
* d-efcv_name: 1 constructs.
* d-efcv_name: 1 constructs.
+* d-efcv_name: 1 constructs.
* d-efivar_name: 1 constructs.
* d-efivar_name: 1 constructs.
+* d-efivar_name: 1 constructs.
+* d-efopt_name: 1 constructs.
* d-efopt_name: 1 constructs.
* d-efopt_name: 1 constructs.
* d-eftypeivar_name of c-lass: 1 constructs.
* d-eftypeivar_name of c-lass: 1 constructs.
+* d-eftypeivar_name of c-lass: 1 constructs.
* d-eftypevar_name: 1 constructs.
* d-eftypevar_name: 1 constructs.
+* d-eftypevar_name: 1 constructs.
+* d-eftypevr_name: 1 constructs.
* d-eftypevr_name: 1 constructs.
* d-eftypevr_name: 1 constructs.
* d-efvar_name: 1 constructs.
* d-efvar_name: 1 constructs.
+* d-efvar_name: 1 constructs.
+* d-efvr_name: 1 constructs.
* d-efvr_name: 1 constructs.
* d-efvr_name: 1 constructs.
@@ -1886,6 +1941,7 @@
* Index:
* d-eftp_name: 1 constructs.
* d-eftp_name: 1 constructs.
+* d-eftp_name: 1 constructs.
@@ -1921,6 +1977,8 @@
* Index:
* ": 1 constructs.
* ": 1 constructs.
+* ": 1 constructs.
+* -option: 1 constructs.
* -option: 1 constructs.
* -option: 1 constructs.
* .: 1 constructs.
@@ -1928,10 +1986,14 @@
* a: 1 constructs.
* index entry between item and itemx: 1 constructs.
* index entry between item and itemx: 1 constructs.
+* index entry between item and itemx: 1 constructs.
+* index entry within deffn: 1 constructs.
* index entry within deffn: 1 constructs.
* index entry within deffn: 1 constructs.
* index entry within itemize: 1 constructs.
* index entry within itemize: 1 constructs.
+* index entry within itemize: 1 constructs.
+* index entry within multitable: 1 constructs.
* index entry within multitable: 1 constructs.
* index entry within multitable: 1 constructs.
* t-ruc: 1 constructs.
@@ -1939,6 +2001,8 @@
* Index:
* ": 1 constructs.
* ": 1 constructs.
+* ": 1 constructs.
+* -foption: 1 constructs.
* -foption: 1 constructs.
* -foption: 1 constructs.
* .: 1 constructs.
@@ -1948,42 +2012,64 @@
* a: 1 constructs.
* a: 1 constructs.
* a: 1 constructs.
+* a: 1 constructs.
+* a: 1 constructs.
+* after: 1 constructs.
* after: 1 constructs.
* after: 1 constructs.
* b: 1 constructs.
* b: 1 constructs.
+* b: 1 constructs.
+* bidule machin: 1 constructs.
* bidule machin: 1 constructs.
* bidule machin: 1 constructs.
* d-effn_name: 1 constructs.
* d-effn_name: 1 constructs.
+* d-effn_name: 1 constructs.
* d-efmac_name: 1 constructs.
* d-efmac_name: 1 constructs.
+* d-efmac_name: 1 constructs.
+* d-efmethod_name on c-lass: 1 constructs.
* d-efmethod_name on c-lass: 1 constructs.
* d-efmethod_name on c-lass: 1 constructs.
* d-efop_name on c-lass: 1 constructs.
* d-efop_name on c-lass: 1 constructs.
+* d-efop_name on c-lass: 1 constructs.
* d-efspec_name: 1 constructs.
* d-efspec_name: 1 constructs.
+* d-efspec_name: 1 constructs.
+* d-eftypefn_name: 1 constructs.
* d-eftypefn_name: 1 constructs.
* d-eftypefn_name: 1 constructs.
* d-eftypefun_name: 1 constructs.
* d-eftypefun_name: 1 constructs.
+* d-eftypefun_name: 1 constructs.
* d-eftypemethod_name on c-lass: 1 constructs.
* d-eftypemethod_name on c-lass: 1 constructs.
+* d-eftypemethod_name on c-lass: 1 constructs.
+* d-eftypeop_name on c-lass: 1 constructs.
* d-eftypeop_name on c-lass: 1 constructs.
* d-eftypeop_name on c-lass: 1 constructs.
* d-efun_name: 1 constructs.
* d-efun_name: 1 constructs.
+* d-efun_name: 1 constructs.
+* de-ffn_name: 1 constructs.
* de-ffn_name: 1 constructs.
* de-ffn_name: 1 constructs.
* deffn: 1 constructs.
* deffn: 1 constructs.
* deffn: 1 constructs.
* deffn: 1 constructs.
+* deffn: 1 constructs.
+* deffn: 1 constructs.
+* deffnx: 1 constructs.
* deffnx: 1 constructs.
* deffnx: 1 constructs.
* deffnx: 1 constructs.
* deffnx: 1 constructs.
+* deffnx: 1 constructs.
+* followed: 1 constructs.
+* followed: 1 constructs.
* followed: 1 constructs.
* followed: 1 constructs.
* followed: 1 constructs.
@@ -1992,16 +2078,29 @@
* i: 1 constructs.
* i: 1 constructs.
* i: 1 constructs.
+* i: 1 constructs.
+* i: 1 constructs.
+* id `i' ule: 1 constructs.
* id `i' ule: 1 constructs.
* id `i' ule: 1 constructs.
* id ule: 1 constructs.
* id ule: 1 constructs.
+* id ule: 1 constructs.
+* log trap: 1 constructs.
* log trap: 1 constructs.
* log trap: 1 constructs.
* log trap1: 1 constructs.
* log trap1: 1 constructs.
+* log trap1: 1 constructs.
* log trap2: 1 constructs.
* log trap2: 1 constructs.
+* log trap2: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
+* machin: 1 constructs.
* machin: 1 constructs.
* machin: 1 constructs.
* machin: 1 constructs.
@@ -2020,6 +2119,8 @@
* truc: 1 constructs.
* truc: 1 constructs.
* truc: 1 constructs.
+* truc: 1 constructs.
+* truc: 1 constructs.
Table of Contents
*****************
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/02
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/03
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/06
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/07
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/08
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht..., Patrice Dumas, 2009/09/08
- [Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...,
Patrice Dumas <=