[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog T2h_l2h.pm texi2html.init t...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog T2h_l2h.pm texi2html.init t... |
|
Date: |
Fri, 18 Sep 2009 07:13:51 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/09/18 07:13:51
Modified files:
. : ChangeLog T2h_l2h.pm texi2html.init
texi2html.pl
test/indices/res/index_no_node: index_no_node_0.html
test/indices/res/index_no_node_no_top: index_no_node_no_top.html
test/sectionning: tests.txt
Log message:
* texi2html.pl: use global information for @printindex not
split.
Try to give correct file name to close_out.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.436&r2=1.437
http://cvs.savannah.gnu.org/viewcvs/texi2html/T2h_l2h.pm?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.235&r2=1.236
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.335&r2=1.336
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/index_no_node/index_no_node_0.html?cvsroot=texi2html&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/index_no_node_no_top/index_no_node_no_top.html?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/tests.txt?cvsroot=texi2html&r1=1.25&r2=1.26
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.436
retrieving revision 1.437
diff -u -b -r1.436 -r1.437
--- ChangeLog 17 Sep 2009 08:51:04 -0000 1.436
+++ ChangeLog 18 Sep 2009 07:13:50 -0000 1.437
@@ -1,3 +1,9 @@
+2009-09-18 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: use global information for @printindex not
+ split.
+ Try to give correct file name to close_out.
+
2009-09-17 Patrice Dumas <address@hidden>
* texi2html.pl: use global information for @printindex not
Index: T2h_l2h.pm
===================================================================
RCS file: /cvsroot/texi2html/texi2html/T2h_l2h.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- T2h_l2h.pm 15 Sep 2009 18:21:26 -0000 1.10
+++ T2h_l2h.pm 18 Sep 2009 07:13:50 -0000 1.11
@@ -55,7 +55,6 @@
my $docu_rdir;
my $docu_name;
my $docu_ext;
-my $ERROR = '***';
# init_from_html
my $extract_error_count;
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -b -r1.235 -r1.236
--- texi2html.init 16 Sep 2009 08:43:13 -0000 1.235
+++ texi2html.init 18 Sep 2009 07:13:50 -0000 1.236
@@ -13,7 +13,7 @@
# Afterwards, load the file with command-line
# option --init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.235 2009/09/16 08:43:13 pertusus Exp $
+# $Id: texi2html.init,v 1.236 2009/09/18 07:13:50 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -4650,14 +4650,14 @@
my $beginning = eval "$complex_format_map->{$name}->{'begin'}";
if ($@ ne '')
{
- print STDERR "$ERROR Evaluation of
$complex_format_map->{$name}->{'begin'}: $@";
+ main::msg_debug("Evaluation of
$complex_format_map->{$name}->{'begin'}: $@");
$beginning = '';
}
my $end = eval "$complex_format_map->{$name}->{'end'}";
if ($@ ne '')
{
- print STDERR "$ERROR Evaluation of
$complex_format_map->{$name}->{'end'}: $@";
+ main::msg_debug("Evaluation of $complex_format_map->{$name}->{'end'}:
$@");
$end = '';
}
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -b -r1.335 -r1.336
--- texi2html.pl 17 Sep 2009 08:51:04 -0000 1.335
+++ texi2html.pl 18 Sep 2009 07:13:50 -0000 1.336
@@ -86,7 +86,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.335 2009/09/17 08:51:04 pertusus Exp $
+# $Id: texi2html.pl,v 1.336 2009/09/18 07:13:50 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -176,22 +176,16 @@
my $DEBUG_USER = 64;
my $DEBUG_L2H = 128;
-my $ERROR = "***"; # prefix for errors
-my $WARN = "**"; # prefix for warnings
-
my $VARRE = '[\w\-]+'; # RE for a variable name
my $MAX_LEVEL = 4;
my $MIN_LEVEL = 1;
-#+++###########################################################################
+#+++########################################################################
# #
-# Initialization #
-# Some declarations, some functions that are GPL and therefore cannot be in #
-# texi2html.init, some functions that are not to be customized. #
-# Pasted content of File $(srcdir)/texi2html.init: Default initializations #
+# Command name and default format #
# #
-#---###########################################################################
+#---########################################################################
my $my_command_name = $0;
$my_command_name =~ s/.*\///;
@@ -209,6 +203,7 @@
$default_output_format = $command_format{$my_command_name};
}
+#Â This can be called from init files, mostly for formats.
sub default_output_format()
{
return $default_output_format;
@@ -219,6 +214,14 @@
return $my_command_name;
}
+#+++###########################################################################
+# #
+# Initialization #
+# Some declarations, some functions that are GPL and therefore cannot be in #
+# texi2html.init, some functions that are not to be customized. #
+# Pasted content of File $(srcdir)/texi2html.init: Default initializations #
+# #
+#---###########################################################################
{
package Texi2HTML::Config;
@@ -647,6 +650,7 @@
%t2h_encoding_aliases
);
+#Â FIXME i18n ?
%output_format_names = (
'info' => 'Info',
'html' => 'HTML',
@@ -661,9 +665,9 @@
# If required like other init files, the functions would be redefined
# and the format dependent stuff wouldn't be loaded. Having the
#Â formats loaded could be worked around, for example there could be
- #Â a vaariable that , if defined and a function reference, should be
- #Â called right after the require. There is no real workaround for
- #Â having the function redefined, though.
+ #Â a variable that, and if the variable is defined a function reference
+ #Â should be called right after the require. There is no real
+ # workaround for having the function redefined, though.
foreach my $output_format (keys(%output_format_names))
{
if ($file =~ /\/$output_format\.init$/)
@@ -1067,53 +1071,57 @@
foreach my $place (@places)
{
- unless ($place->{'command'} and $place->{'command'} eq 'printindex')
- {
-#print STDERR "HHHHHHHHH ($element->{'texi'}) place: $place->{'texi'},
place_element_ref $place_element_ref, current: $current_element->{'texi'},
$current_element->{'file'}\n";
- push @{$current_element->{'place'}}, $place;
- $place->{'file'} = $current_element->{'file'};
- $place->{'element_ref'} = $current_element if ($place->{'element_ref'}
and $current_element ne $element);
- next;
- }
- my $printindex = $place;
- my $index_name = $printindex->{'name'};
- #print STDERR "Associate letters in $element->{'texi'} for $index_name\n";
- my @letter_groups = ();
- # empty index
- next if (!exists($t2h_default_index_letters_array{$index_name}));
- my @letters_split = @{$t2h_default_index_letters_array{$index_name}};
+ my ($printindex, $printindex_to_split, $index_name);
- # index is not split
- if (scalar(@letters_split) eq 1)
+ #Â determines if the placed thing is a printindex to be split
+ if ($place->{'command'} and $place->{'command'} eq 'printindex')
{
- push @{$letter_groups[0]->{'letters'}}, @{$letters_split[0]};
- }
+ $printindex = $place;
+ $index_name = $printindex->{'name'};
+ # ! empty index
+ if (exists($t2h_default_index_letters_array{$index_name}) and
+ scalar(@{$t2h_default_index_letters_array{$index_name}})
# the element is at the level of splitting, then we split according to
# INDEX_SPLIT
#Â the condition defined($printindex->{'associated_element'} implies
#Â that we don't split printindex before first element, otherwise
#Â there will be a need to begin document without a first element
#Â which would be annoying.
- elsif (!$element->{'top'} and get_conf('SPLIT') and ((get_conf('SPLIT') eq
'node') or (defined($element->{'level'}) and $element->{'level'} <=
$Texi2HTML::THISDOC{'split_level'})) and
defined($printindex->{'associated_element'}))
- {
- $t2h_default_split_files{$default_element_file} = 1;
- foreach my $letters_split (@letters_split)
+ and !$element->{'top'} and get_conf('SPLIT') and
+ ((get_conf('SPLIT') eq 'node') or (defined($element->{'level'}) and
$element->{'level'} <= $Texi2HTML::THISDOC{'split_level'}))
+ and defined($printindex->{'associated_element'}))
{
- push @letter_groups, {'letters' => address@hidden;
+ $printindex_to_split = 1;
}
}
- else
- { # we 'unsplit' index split if not located where document is indeed split
- #print STDERR "UNSPLIT $element->{'texi'}, $index_name\n";
- foreach my $letters_split (@letters_split)
+
+ # this is a non split printindex or any other placed thing.
+ if (!$printindex_to_split)
{
- push @{$letter_groups[0]->{'letters'}}, @$letters_split;
+ push @{$current_element->{'place'}}, $place;
+ $place->{'file'} = $current_element->{'file'};
+ #Â the 'element_ref' has to be reset. Otherwise, $place->{'element_ref'}
+ #Â will appear as a new element and trigger closing the file and
+ #Â opening a new one.
+ $place->{'element_ref'} = $current_element if ($place->{'element_ref'}
and $current_element ne $element);
+ #Â this resets the element associated with a printindex.
+ $place->{'associated_element'} = $current_element if
($place->{'associated_element'} and $current_element ne $element);
+ next;
}
+
+ #Â now split the index
+ $t2h_default_split_files{$default_element_file} = 1;
+
+ my @letter_groups = ();
+ my @letters_split = @{$t2h_default_index_letters_array{$index_name}};
+ foreach my $letters_split (@letters_split)
+ {
+ push @letter_groups, {'letters' => address@hidden;
}
+
$letter_groups[0]->{'element'} = $current_element;
- # may only happen if SPLIT
- if (scalar(@letter_groups) > 1)
- { # this weird construct is there because the element use as a key is
+
+ # this weird construct is there because the element used as a key is
# converted to a string by perl, losing its meaning as a reference,
# the reference must be recorded explicitly
$t2h_default_element_split_printindices->{$element}->{'element'} =
$element;
@@ -1176,11 +1184,6 @@
}
}
$t2h_default_seen_files{$default_element_file} =
$current_element->{'file'};
- }
- else
- {
- push @{$current_element->{'place'}}, $place;
- }
$printindex->{'split_groups'} = address@hidden;# if
(scalar(@letter_groups)>1);
#print STDERR "$index_name processed for $element, $element->{'texi'}
(@{$printindex->{'split_groups'}})\n";
}
@@ -1300,7 +1303,14 @@
{
my $element = $printindex->{'associated_element'};
#Â this happens for printindex before the first element.
+ if (!defined($element))
+ {
$element = {'file' => '', 'id' => "$printindex->{'region'}_printindex"}
if (!defined($element));
+ }
+ elsif (defined($element->{'element_ref'}))
+ {
+ $element = $element->{'element_ref'};
+ }
@split_letters = ({ 'letters' =>
$Texi2HTML::THISDOC{'index_letters_array'}->{$index_name}, 'element' =>
$element});
}
else
@@ -6048,6 +6058,12 @@
$place->{'file'} = $filename if (defined($place->{'file'}) and
($place->{'file'} eq $previous_file_name));
}
$element->{'file'} = $filename;
+ if ($is_top)
+ { #Â reset these variables, although they aren't used much, they may
be
+ #Â used in file name comparisons
+ $docu_top = $filename;
+ $docu_top_file = "$docu_rdir$docu_top";
+ }
}
}
print STDERR "file !defined for element $element->{'texi'}\n" if
(!defined($element->{'file'}));
@@ -6720,7 +6736,7 @@
if ($element->{'section_ref'} and ($only_sections or (!$only_nodes
and $element->{'with_section'})))
{
add_t2h_dependent_element ($element,
$element->{'section_ref'});
- $element->{'toc_level'} =
$element->{'section_ref'}->{'toc_level'};
+ #$element->{'toc_level'} =
$element->{'section_ref'}->{'toc_level'};
}
elsif (!$only_sections)
{
@@ -7256,7 +7272,7 @@
print STDERR "$element ";
if ($element->{'node'})
{
- print STDERR "node($element->{'id'}, toc_level
$element->{'toc_level'}, $is_toplevel, doc_nr
$element->{'doc_nr'}($element->{'file'})) $element->{'texi'}:\n";
+ print STDERR "node($element->{'id'}, $is_toplevel, doc_nr
$element->{'doc_nr'}($element->{'file'})) $element->{'texi'}:\n";
print STDERR " section_ref:
$element->{'section_ref'}->{'texi'}\n" if (defined($element->{'section_ref'}));
print STDERR " with_section:
$element->{'with_section'}->{'texi'}\n" if
(defined($element->{'with_section'}));
}
@@ -7390,7 +7406,6 @@
else
{
$files{$file} = {
- #'type' => 'section',
'counter' => 1,
'relative_foot_num' => 0,
'foot_lines' => []
@@ -8116,7 +8131,7 @@
}
print STDERR "# Write the section
$Texi2HTML::THIS_ELEMENT->{'texi'}\n" if ($T2H_VERBOSE);
&$Texi2HTML::Config::one_section($Texi2HTML::THISDOC{'FH'},
$Texi2HTML::THIS_ELEMENT);
- close_out($Texi2HTML::THISDOC{'FH'});
+ close_out($Texi2HTML::THISDOC{'FH'}, $docu_doc_file);
# no misc element is done
return;
}
@@ -8231,7 +8246,7 @@
&$Texi2HTML::Config::print_page_foot($Texi2HTML::THISDOC{'FH'});
# this leaves the possibility for external code to close the file
#Â without erroring out
- close_out ($Texi2HTML::THISDOC{'FH'}) if
(fileno($Texi2HTML::THISDOC{'FH'}));
+ close_out ($Texi2HTML::THISDOC{'FH'}, $docu_doc_file) if
(fileno($Texi2HTML::THISDOC{'FH'}));
}
pop_state();
}
@@ -8298,40 +8313,40 @@
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
&$Texi2HTML::Config::print_section($FH, $first_section, 0, $element);
################# debug
- my $new_elem_file = 'NO ELEM';
+ my $new_elem_file = 'NO ELEM => no file';
$new_elem_file = $new_element->{'file'} if (defined($new_element));
- print STDERR "# FILES new: $new_elem_file old: $element->{'file'}\n"
+ print STDERR "# FILES new: $new_elem_file old(".fileno($FH)."):
$element->{'file'}\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
################# end debug
if (defined($new_element) and ($new_element->{'file'} ne
$element->{'file'}))
{
- print STDERR "# End of section with change in file\n"
+ print STDERR "# End of section with change in
file(".fileno($FH).") $element->{'file'} -> $new_element->{'file'}\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
if (!$files{$element->{'file'}}->{'counter'})
{
&$Texi2HTML::Config::print_chapter_footer($FH, $element) if
(Texi2HTML::Config::get_conf('SPLIT') eq 'chapter');
&$Texi2HTML::Config::print_section_footer($FH, $element) if
(Texi2HTML::Config::get_conf('SPLIT') eq 'section');
- print STDERR "# Close file after $element->{'texi'}\n"
+ print STDERR "# Close file(".fileno($FH).") after
$element->{'texi'}\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
&$Texi2HTML::Config::print_page_foot($FH);
- close_out($FH);
+ close_out($FH, "$docu_rdir$element->{'file'}");
}
else
{
- print STDERR "# Counter
$files{$element->{'file'}}->{'counter'} ne 0, file $element->{'file'}\n"
+ print STDERR "# Counter
$files{$element->{'file'}}->{'counter'} ne 0, file(".fileno($FH).")
$element->{'file'}\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
}
}
elsif (!defined($new_element))
{
- print STDERR "# End of last section
($files{$element->{'file'}}->{'counter'})\n"
+ print STDERR "# End of last section, file(".fileno($FH).")
$element->{'file'}, counter $files{$element->{'file'}}->{'counter'}\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
if (Texi2HTML::Config::get_conf('SPLIT'))
{ # end of last splitted section
&$Texi2HTML::Config::print_chapter_footer($FH, $element) if
(Texi2HTML::Config::get_conf('SPLIT') eq 'chapter');
&$Texi2HTML::Config::print_section_footer($FH, $element) if
(Texi2HTML::Config::get_conf('SPLIT') eq 'section');
&$Texi2HTML::Config::print_page_foot($FH);
- close_out($FH);
+ close_out($FH, "$docu_rdir$element->{'file'}");
}
else
{ # end of last unsplit section
@@ -8340,13 +8355,13 @@
}
elsif ($new_element->{'top'})
{
- print STDERR "# Section followed by Top
($files{$element->{'file'}}->{'counter'})\n"
+ print STDERR "# Section followed by Top, file(".fileno($FH).")
counter $files{$element->{'file'}}->{'counter'}\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
&$Texi2HTML::Config::end_section($FH, 1, $element);
}
else
{ # end of section followed by another one
- print STDERR "# Section followed by another one
($files{$element->{'file'}}->{'counter'})\n"
+ print STDERR "# Section followed by another one,
file(".fileno($FH).") counter $files{$element->{'file'}}->{'counter'}\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
&$Texi2HTML::Config::end_section($FH, 0, $element);
}
@@ -8457,6 +8472,8 @@
return ($line_number, $input_spool);
}
+my %filehandles = ();
+
sub open_out($)
{
my $file = shift;
@@ -8487,18 +8504,29 @@
# FIXME is it useful when in utf8?
binmode(FILE, ":encoding($Texi2HTML::THISDOC{'OUT_ENCODING'})");
}
+ $file =~ s/^(\.[\/]+)*//;
+ $filehandles{fileno(*FILE)} = $file;
return *FILE;
}
# FIXME not used for main out files only for special files
-sub close_out($;$)
+sub close_out($$)
{
my $FH = shift;
my $file = shift;
- $file = '' if (!defined($file));
- return if ($file eq '-');
-#print STDERR "close_out $file\n";
- close ($FH) || document_error ("Error occurred when closing $file: $!");
+ return if (defined($file) and $file eq '-');
+ $file =~ s/^(\.[\/]+)*//;
+ my $fileno = fileno($FH);
+#print STDERR "close_out $file $fileno\n";
+ if (!defined($fileno))
+ {
+ msg_debug("fileno not defined for $file")
+ }
+ elsif (defined($filehandles{$fileno}) and $filehandles{$fileno} ne $file)
+ {
+ #msg_debug("filehandles{$fileno} $filehandles{$fileno} and file $file
different")
+ }
+ close ($FH) || document_error ("Error when closing $file: $!");
}
sub next_line($$)
@@ -8596,7 +8624,6 @@
return if ($Texi2HTML::Config::NO_WARN);
my $text = shift;
chomp ($text);
- #warn "$WARN $text\n";
warn "warning: $text\n";
}
@@ -8636,8 +8663,6 @@
my $die = shift;
warn ("$text\n");
check_die ($die);
- #die "$ERROR $text\n" if ($die or !$Texi2HTML::Config::FORCE);
- #warn "$ERROR $text\n";
check_errors();
}
@@ -8685,7 +8710,6 @@
chomp ($text);
my $line_number = shift;
return if (!defined($line_number));
- #warn "$WARN $text " . format_line_number($line_number) . "\n";
my $file = $line_number->{'file_name'};
#Â otherwise out of source build fail since the file names are different
$file =~ s/^.*\/// if ($Texi2HTML::Config::TEST);
@@ -8701,7 +8725,6 @@
my $line_number = shift;
if (defined($line_number))
{
- #warn "$ERROR $text " . format_line_number($line_number) . "\n";
my $file = $line_number->{'file_name'};
$file =~ s/^.*\/// if ($Texi2HTML::Config::TEST);
my $macro_text = '';
@@ -12750,7 +12773,6 @@
if ($cline =~ /^$/)
{
# We already warned in pass texi
- #warn "$ERROR verb at end of line";
}
else
{
@@ -13485,7 +13507,6 @@
if ($cline =~ /^$/)
{
# Allready warned
- #warn "$ERROR verb at end of line";
}
else
{
Index: test/indices/res/index_no_node/index_no_node_0.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res/index_no_node/index_no_node_0.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- test/indices/res/index_no_node/index_no_node_0.html 10 Sep 2009 20:37:11
-0000 1.14
+++ test/indices/res/index_no_node/index_no_node_0.html 18 Sep 2009 07:13:50
-0000 1.15
@@ -43,27 +43,27 @@
<a name="index-truc"></a>
<p>Garbage
-</p><table><tr><th valign="top">Jump to: </th><td><a
href="#unnumbered_cp_letter-C" class="summary-letter"><b>C</b></a>
+</p><table><tr><th valign="top">Jump to: </th><td><a
href="#document_printindex_cp_letter-C" class="summary-letter"><b>C</b></a>
-<a href="#unnumbered_cp_letter-S" class="summary-letter"><b>S</b></a>
+<a href="#document_printindex_cp_letter-S" class="summary-letter"><b>S</b></a>
-<a href="#unnumbered_cp_letter-T" class="summary-letter"><b>T</b></a>
+<a href="#document_printindex_cp_letter-T" class="summary-letter"><b>T</b></a>
-<a href="#unnumbered_cp_letter-U" class="summary-letter"><b>U</b></a>
+<a href="#document_printindex_cp_letter-U" class="summary-letter"><b>U</b></a>
</td></tr></table>
<table border="0" class="index-cp">
<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="unnumbered_cp_letter-C">C</a></th><td></td><td></td></tr>
+<tr><th><a
name="document_printindex_cp_letter-C">C</a></th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node_4.html#index-chapter">chapter</a></td><td> </td><td
valign="top"><a href="index_no_node_4.html#Chapter">1 Chapter</a></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node_5.html#index-Chapter2">Chapter2</a></td><td> </td><td
valign="top"><a href="index_no_node_4.html#Chapter">1 Chapter</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="unnumbered_cp_letter-S">S</a></th><td></td><td></td></tr>
+<tr><th><a
name="document_printindex_cp_letter-S">S</a></th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node_3.html#index-second">second</a></td><td> </td><td
valign="top"><a href="index_no_node_3.html#second">0.1 second</a></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node_3.html#index-second-1">second</a></td><td> </td><td
valign="top"><a href="index_no_node_3.html#second">0.1 second</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="unnumbered_cp_letter-T">T</a></th><td></td><td></td></tr>
+<tr><th><a
name="document_printindex_cp_letter-T">T</a></th><td></td><td></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node.html#index-top-section">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node.html#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node.html#index-top-section-1">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node.html#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node.html#index-top-section-2">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node.html#top-section">top section</a></td></tr>
@@ -71,20 +71,20 @@
<tr><td></td><td valign="top"><a
href="index_no_node.html#index-top-section-4">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node.html#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node.html#index-top-section-5">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node.html#top-section">top section</a></td></tr>
<tr><td></td><td valign="top"><a
href="index_no_node.html#index-top-section1">top
section1</a></td><td> </td><td valign="top"><a
href="index_no_node.html#top-section">top section</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-truc">truc</a></td><td> </td><td valign="top"><a
href="#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_0.html#index-truc">truc</a></td><td> </td><td
valign="top"><a href="index_no_node_0.html#unnumbered">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="unnumbered_cp_letter-U">U</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-unnumbered">unnumbered</a></td><td> </td><td valign="top"><a
href="#unnumbered">unnumbered</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-unnumbered-after-text">unnumbered after
text</a></td><td> </td><td valign="top"><a
href="#unnumbered">unnumbered</a></td></tr>
+<tr><th><a
name="document_printindex_cp_letter-U">U</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_0.html#index-unnumbered">unnumbered</a></td><td> </td><td
valign="top"><a href="index_no_node_0.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_0.html#index-unnumbered-after-text">unnumbered after
text</a></td><td> </td><td valign="top"><a
href="index_no_node_0.html#unnumbered">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
-<table><tr><th valign="top">Jump to: </th><td><a
href="#unnumbered_cp_letter-C" class="summary-letter"><b>C</b></a>
+<table><tr><th valign="top">Jump to: </th><td><a
href="#document_printindex_cp_letter-C" class="summary-letter"><b>C</b></a>
-<a href="#unnumbered_cp_letter-S" class="summary-letter"><b>S</b></a>
+<a href="#document_printindex_cp_letter-S" class="summary-letter"><b>S</b></a>
-<a href="#unnumbered_cp_letter-T" class="summary-letter"><b>T</b></a>
+<a href="#document_printindex_cp_letter-T" class="summary-letter"><b>T</b></a>
-<a href="#unnumbered_cp_letter-U" class="summary-letter"><b>U</b></a>
+<a href="#document_printindex_cp_letter-U" class="summary-letter"><b>U</b></a>
</td></tr></table>
Index: test/indices/res/index_no_node_no_top/index_no_node_no_top.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res/index_no_node_no_top/index_no_node_no_top.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/indices/res/index_no_node_no_top/index_no_node_no_top.html 10 Sep
2009 20:37:11 -0000 1.5
+++ test/indices/res/index_no_node_no_top/index_no_node_no_top.html 18 Sep
2009 07:13:51 -0000 1.6
@@ -43,48 +43,48 @@
<a name="index-truc"></a>
<p>Garbage
-</p><table><tr><th valign="top">Jump to: </th><td><a
href="#unnumbered_cp_letter-C" class="summary-letter"><b>C</b></a>
+</p><table><tr><th valign="top">Jump to: </th><td><a
href="#document_printindex_cp_letter-C" class="summary-letter"><b>C</b></a>
-<a href="#unnumbered_cp_letter-S" class="summary-letter"><b>S</b></a>
+<a href="#document_printindex_cp_letter-S" class="summary-letter"><b>S</b></a>
-<a href="#unnumbered_cp_letter-T" class="summary-letter"><b>T</b></a>
+<a href="#document_printindex_cp_letter-T" class="summary-letter"><b>T</b></a>
-<a href="#unnumbered_cp_letter-U" class="summary-letter"><b>U</b></a>
+<a href="#document_printindex_cp_letter-U" class="summary-letter"><b>U</b></a>
</td></tr></table>
<table border="0" class="index-cp">
<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="unnumbered_cp_letter-C">C</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-chapter">chapter</a></td><td> </td><td valign="top"><a
href="#Chapter">1 Chapter</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-Chapter2">Chapter2</a></td><td> </td><td valign="top"><a
href="#Chapter">1 Chapter</a></td></tr>
-<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="unnumbered_cp_letter-S">S</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-second">second</a></td><td> </td><td valign="top"><a
href="#second">0.1 second</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-second-1">second</a></td><td> </td><td valign="top"><a
href="#second">0.1 second</a></td></tr>
-<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="unnumbered_cp_letter-T">T</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="#index-top-section">top
section</a></td><td> </td><td valign="top"><a
href="#top-_0028chapter_0029-section">top (chapter) section</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-top-section-1">top
section</a></td><td> </td><td valign="top"><a
href="#top-_0028chapter_0029-section">top (chapter) section</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-top-section-2">top
section</a></td><td> </td><td valign="top"><a
href="#top-_0028chapter_0029-section">top (chapter) section</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-top-section-3">top
section</a></td><td> </td><td valign="top"><a
href="#top-_0028chapter_0029-section">top (chapter) section</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-top-section-4">top
section</a></td><td> </td><td valign="top"><a
href="#top-_0028chapter_0029-section">top (chapter) section</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-top-section-5">top
section</a></td><td> </td><td valign="top"><a
href="#top-_0028chapter_0029-section">top (chapter) section</a></td></tr>
-<tr><td></td><td valign="top"><a href="#index-top-section1">top
section1</a></td><td> </td><td valign="top"><a
href="#top-_0028chapter_0029-section">top (chapter) section</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-truc">truc</a></td><td> </td><td valign="top"><a
href="#unnumbered">unnumbered</a></td></tr>
-<tr><td colspan="4"> <hr></td></tr>
-<tr><th><a name="unnumbered_cp_letter-U">U</a></th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-unnumbered">unnumbered</a></td><td> </td><td valign="top"><a
href="#unnumbered">unnumbered</a></td></tr>
-<tr><td></td><td valign="top"><a
href="#index-unnumbered-after-text">unnumbered after
text</a></td><td> </td><td valign="top"><a
href="#unnumbered">unnumbered</a></td></tr>
+<tr><th><a
name="document_printindex_cp_letter-C">C</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-chapter">chapter</a></td><td> </td><td
valign="top"><a href="index_no_node_no_top.html#Chapter">1
Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-Chapter2">Chapter2</a></td><td> </td><td
valign="top"><a href="index_no_node_no_top.html#Chapter">1
Chapter</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a
name="document_printindex_cp_letter-S">S</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-second">second</a></td><td> </td><td
valign="top"><a href="index_no_node_no_top.html#second">0.1 second</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-second-1">second</a></td><td> </td><td
valign="top"><a href="index_no_node_no_top.html#second">0.1
second</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a
name="document_printindex_cp_letter-T">T</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-top-section">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node_no_top.html#top-_0028chapter_0029-section">top (chapter)
section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-top-section-1">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node_no_top.html#top-_0028chapter_0029-section">top (chapter)
section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-top-section-2">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node_no_top.html#top-_0028chapter_0029-section">top (chapter)
section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-top-section-3">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node_no_top.html#top-_0028chapter_0029-section">top (chapter)
section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-top-section-4">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node_no_top.html#top-_0028chapter_0029-section">top (chapter)
section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-top-section-5">top
section</a></td><td> </td><td valign="top"><a
href="index_no_node_no_top.html#top-_0028chapter_0029-section">top (chapter)
section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-top-section1">top
section1</a></td><td> </td><td valign="top"><a
href="index_no_node_no_top.html#top-_0028chapter_0029-section">top (chapter)
section</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-truc">truc</a></td><td> </td><td
valign="top"><a
href="index_no_node_no_top.html#unnumbered">unnumbered</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a
name="document_printindex_cp_letter-U">U</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-unnumbered">unnumbered</a></td><td> </td><td
valign="top"><a
href="index_no_node_no_top.html#unnumbered">unnumbered</a></td></tr>
+<tr><td></td><td valign="top"><a
href="index_no_node_no_top.html#index-unnumbered-after-text">unnumbered after
text</a></td><td> </td><td valign="top"><a
href="index_no_node_no_top.html#unnumbered">unnumbered</a></td></tr>
<tr><td colspan="4"> <hr></td></tr>
</table>
-<table><tr><th valign="top">Jump to: </th><td><a
href="#unnumbered_cp_letter-C" class="summary-letter"><b>C</b></a>
+<table><tr><th valign="top">Jump to: </th><td><a
href="#document_printindex_cp_letter-C" class="summary-letter"><b>C</b></a>
-<a href="#unnumbered_cp_letter-S" class="summary-letter"><b>S</b></a>
+<a href="#document_printindex_cp_letter-S" class="summary-letter"><b>S</b></a>
-<a href="#unnumbered_cp_letter-T" class="summary-letter"><b>T</b></a>
+<a href="#document_printindex_cp_letter-T" class="summary-letter"><b>T</b></a>
-<a href="#unnumbered_cp_letter-U" class="summary-letter"><b>U</b></a>
+<a href="#document_printindex_cp_letter-U" class="summary-letter"><b>U</b></a>
</td></tr></table>
Index: test/sectionning/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/tests.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- test/sectionning/tests.txt 10 Sep 2009 20:38:12 -0000 1.25
+++ test/sectionning/tests.txt 18 Sep 2009 07:13:51 -0000 1.26
@@ -50,6 +50,7 @@
before_node_and_section before_node_and_section.texi
section_before_chapter section_before_chapter.texi
node_footnote_end node_footnote.texi --footnote-style=end
+# --debug 255
node_footnote_use_node node_footnote.texi --use-node --node-files
--footnote-style=end --split node
test_refs test_refs.texi
test_refs_chapter test_refs.texi --split chapter
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog T2h_l2h.pm texi2html.init t...,
Patrice Dumas <=