[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te... |
|
Date: |
Mon, 08 Sep 2008 16:29:51 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 08/09/08 16:29:51
Modified files:
. : ChangeLog NEWS TODO texi2html.init texi2html.pl
doc : texi2html.1.in texi2html.html texi2html.texi
test/indices : tests.txt
test/indices/res/makeinfo_nodes_before_top_and_sections:
index.html
test/sectionning: Makefile.am tests.txt
test/sectionning/res/node_footnote_end: node_footnote.html
test/sectionning/res/nodes_after_top_before_section:
nodes_after_top_before_section.html
nodes_after_top_before_section_1.html
Added files:
test/sectionning: no_element.texi
placed_things_before_element.texi
test/sectionning/res/equivalent_nodes_no_node:
equivalent_nodes.2
equivalent_nodes.html
test/sectionning/res/no_element: no_element.2 no_element.html
test/sectionning/res/no_section_directions_no_node: no_section.2
no_section.html
test/sectionning/res/no_section_no_node: no_section.2
no_section.html
test/sectionning/res/no_section_no_top_no_node:
no_section_no_top.2
no_section_no_top.html
test/sectionning/res/nodes_after_top_no_node: nodes_after_top.2
nodes_after_top.html
test/sectionning/res/one_node_no_node: one_node.2 one_node.html
test/sectionning/res/placed_things_before_element:
placed_things_before_element.2
placed_things_before_element.html
test/sectionning/res/rec_nodes_no_node: rec_nodes.2
rec_nodes.html
Removed files:
test/layout/res/formatting_makeinfo: formatting_ovr.html
formatting_toc.html
Log message:
* texi2html.pl: when node Top is considered as a @top, don't
associate the following nodes to it, but rather to the next
section.
When there is no section and USE_NODES is not set don't split
by node.
Split only by node when USE_SECTIONS is not set and USE_NODES
is. Default for USE_SECTIONS is 1, and default for USE_NODES
is now undef.
When there is no texinfo sectionning element at all or no
element for texi2html (for example no section but
USE_SECTIONS == 1 and USE_NODES undef).
always use THIS_SECTION and THIS_HEADER such that formatting
functions can modify them.
* texi2html.pl, texi2html.init: progress towards index
formatting
simplification and handling out of the main program.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.322&r2=1.323
http://cvs.savannah.gnu.org/viewcvs/texi2html/NEWS?cvsroot=texi2html&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.231&r2=1.232
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.1.in?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.texi?cvsroot=texi2html&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/tests.txt?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/indices/res/makeinfo_nodes_before_top_and_sections/index.html?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/formatting_ovr.html?cvsroot=texi2html&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/layout/res/formatting_makeinfo/formatting_toc.html?cvsroot=texi2html&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/Makefile.am?cvsroot=texi2html&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/tests.txt?cvsroot=texi2html&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/no_element.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/placed_things_before_element.texi?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_element/no_element.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_element/no_element.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_section_directions_no_node/no_section.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_section_directions_no_node/no_section.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_section_no_node/no_section.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_section_no_node/no_section.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_section_no_top_no_node/no_section_no_top.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/no_section_no_top_no_node/no_section_no_top.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/node_footnote_end/node_footnote.html?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section.html?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section_1.html?cvsroot=texi2html&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/nodes_after_top_no_node/nodes_after_top.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/nodes_after_top_no_node/nodes_after_top.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/one_node_no_node/one_node.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/one_node_no_node/one_node.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/placed_things_before_element/placed_things_before_element.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/placed_things_before_element/placed_things_before_element.html?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/rec_nodes_no_node/rec_nodes.2?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/res/rec_nodes_no_node/rec_nodes.html?cvsroot=texi2html&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -b -r1.322 -r1.323
--- ChangeLog 5 Sep 2008 13:42:52 -0000 1.322
+++ ChangeLog 8 Sep 2008 16:29:45 -0000 1.323
@@ -1,3 +1,21 @@
+2008-09-06 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: when node Top is considered as a @top, don't
+ associate the following nodes to it, but rather to the next
+ section.
+ When there is no section and USE_NODES is not set don't split
+ by node.
+ Split only by node when USE_SECTIONS is not set and USE_NODES
+ is. Default for USE_SECTIONS is 1, and default for USE_NODES
+ is now undef.
+ When there is no texinfo sectionning element at all or no
+ element for texi2html (for example no section but
+ USE_SECTIONS == 1 and USE_NODES undef).
+ always use THIS_SECTION and THIS_HEADER such that formatting
+ functions can modify them.
+ * texi2html.pl, texi2html.init: progress towards index formatting
+ simplification and handling out of the main program.
+
2008-09-04 Patrice Dumas <address@hidden>
* texi2html.pl: don't consider Top node is like @top when
Index: NEWS
===================================================================
RCS file: /cvsroot/texi2html/texi2html/NEWS,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- NEWS 1 Sep 2008 14:48:24 -0000 1.84
+++ NEWS 8 Sep 2008 16:29:45 -0000 1.85
@@ -115,6 +115,10 @@
$CSS_LINES is not defined, $Texi2HTML::THISDOC{'CSS_LINES'} is
autodetected.
+* When there is no section and $USE_NODES is not set don't split by node.
+ This behaviour and the previous aren't documented, so it could change
+ in the future.
+
* BUG FIXES
---------
Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- TODO 5 Sep 2008 13:42:53 -0000 1.58
+++ TODO 8 Sep 2008 16:29:45 -0000 1.59
@@ -359,3 +359,5 @@
menu name is used instead of node in menu links url text.
* change LINK_BUTTONS for makeinfo.init to have next, up... nodes
+
+* failure in indices test nodes_before_top_no_nodes
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- texi2html.init 5 Sep 2008 13:42:53 -0000 1.156
+++ texi2html.init 8 Sep 2008 16:29:46 -0000 1.157
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.156 2008/09/05 13:42:53 pertusus Exp $
+# $Id: texi2html.init,v 1.157 2008/09/08 16:29:46 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -124,7 +124,10 @@
# -use-nodes
# if this is set the nodes are used as sectionning elements.
# Otherwise the nodes are incorporated in sections.
-$USE_NODES = 0;
+#$USE_NODES = 0;
+$USE_NODES = undef;
+
+$USE_SECTIONS = 1;
# -node-files
# if this is set one file per node is generated, which can be a target for
@@ -4359,6 +4362,7 @@
$index_entry_command = \&t2h_default_index_entry_command;
$index_letter = \&t2h_default_index_letter;
$print_index = \&t2h_default_print_index;
+#$printindex = \&t2h_default_printindex;
$protect_text = \&t2h_default_protect_text;
$normal_text = \&t2h_default_normal_text;
$complex_format = \&t2h_default_complex_format;
@@ -6319,6 +6323,56 @@
return $text;
}
+#format a whole index
+sub t2h_default_printindex($$$)
+{
+ my $index_name = shift;
+ my $summary_index_items = shift;
+ my $letter_entries = shift;
+
+ my @alpha = ();
+ my @non_alpha = ();
+ my %letter_id;
+ foreach my $index_item (@$summary_index_items)
+ {
+ foreach my $summary_letter (@$index_item)
+ {
+ my ($letter, $file, $default_identifier, $index_element_id,
$number, $index_element) = @$summary_letter;
+ my ($result, $identifier, $is_symbol) =
+ t2h_default_summary_letter($letter, $file, $default_identifier,
$index_element_id, $number, $index_element, $index_name);
+
+ $identifier = $default_identifier if (!defined($identifier));
+ $letter_id{$letter} = $identifier;
+ $is_symbol = $letter !~ /^[A-Za-z]/ if (!defined($is_symbol));
+
+ if ($is_symbol)
+ {
+ push @non_alpha, $result;
+ }
+ else
+ {
+ push @alpha, $result;
+ }
+ }
+ }
+ my $summary = t2h_default_index_summary(address@hidden, address@hidden);
+ my $letters_text = '';
+ foreach my $letter_ref (@$letter_entries)
+ {
+ my $letter = $letter_ref->{'letter'};
+ my $entries = $letter_ref->{'entries'};
+ my $entries_text = '';
+ foreach my $entry (@$entries)
+ {
+ my ($text_href, $entry, $element_href, $element_text) = @$entry;
+ $entries_text .= t2h_default_index_entry ($text_href, $entry,
$element_href, $element_text);
+ }
+ $letters_text .= t2h_default_index_letter ($letter,
$letter_id{$letter}, $entries_text);
+ }
+ my $index_text = t2h_default_print_index($letters_text, $index_name);
+ return $summary . $index_text . $summary;
+}
+
# format a whole index
#
# argument:
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -b -r1.231 -r1.232
--- texi2html.pl 5 Sep 2008 13:42:53 -0000 1.231
+++ texi2html.pl 8 Sep 2008 16:29:46 -0000 1.232
@@ -60,7 +60,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.231 2008/09/05 13:42:53 pertusus Exp $
+# $Id: texi2html.pl,v 1.232 2008/09/08 16:29:46 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -213,7 +213,7 @@
$SHOW_MENU
$NUMBER_SECTIONS
$USE_NODES
-$ONLY_NODES
+$USE_SECTIONS
$USE_NODE_TARGET
$USE_UNICODE
$USE_UNIDECODE
@@ -430,6 +430,7 @@
$index_entry_command
$index_letter
$print_index
+$printindex
$index_summary
$summary_letter
$complex_format
@@ -3883,6 +3884,8 @@
}
echo_warn ("At end of document, $state->{'region_lines'}->{'number'}
$state->{'region_lines'}->{'format'} not closed") if
(exists($state->{'region_lines'}));
print STDERR "# end of pass structure\n" if $T2H_VERBOSE;
+ # To remove once they are handled
+ #print STDERR "No node nor section, texi2html won't be able to place
things rightly\n" if ($element_before_anything->{'place'} and
@{$element_before_anything->{'place'}});
return (address@hidden, address@hidden);
}
@@ -4807,6 +4810,7 @@
sub do_element_targets($)
{
my $element = shift;
+ print STDERR "file !defined for element $element->{'texi'}\n" if
(!defined($element->{'file'}));
if (defined($Texi2HTML::Config::element_target_name))
{
my ($target,$id) = &$Texi2HTML::Config::element_target_name($element,
$element->{'target'}, $element->{'id'});
@@ -4815,10 +4819,37 @@
}
foreach my $place(@{$element->{'place'}})
{
- do_place_target_file($place,$element, '');
+ do_place_target_file($place, $element, '');
}
}
+sub add_t2h_element($$$)
+{
+ my $element = shift;
+ my $elements_list = shift;
+ my $prev_element = shift;
+
+ push @$elements_list, $element;
+ $element->{'element'} = 1;
+ push @{$element->{'all_elements'}}, $element;
+
+ if (!$prev_element->{'holder'})
+ {
+ $element->{'back'} = $prev_element;
+ $prev_element->{'forward'} = $element;
+ }
+ return $prev_element;
+}
+
+sub add_t2h_dependent_element ($$)
+{
+ my $element = shift;
+ my $element_ref = shift;
+ push @{$element_ref->{'all_elements'}}, $element;
+ $element->{'element_ref'} = $element_ref;
+ $element_index = $element_ref if ($element_index and ($element_index eq
$element));
+}
+
my %files = (); # keys are files. This is used to avoid reusing an already
# used file name
my %empty_indices = (); # value is true for an index name key if the index
@@ -5110,38 +5141,6 @@
}
}
- # FIXME with ONLY_NODES we could find nodes, but it is lkely not to
- # be useful anyway
- # find section preceding and following top
- my $section_before_top; # section preceding the top node
- my $section_after_top; # section following the top node
- if ($node_top)
- {
- my $previous_is_top = 0;
- foreach my $element (@all_elements)
- {
- if ($element eq $node_top)
- {
- $previous_is_top = 1;
- next;
- }
- if ($previous_is_top)
- {
- if ($element->{'section'})
- {
- $section_after_top = $element;
- last;
- }
- next;
- }
- $section_before_top = $element if ($element->{'section'});
- }
- }
- print STDERR "# section before Top: $section_before_top->{'texi'}\n"
- if ($section_before_top and ($T2H_DEBUG & $DEBUG_ELEMENTS));
- print STDERR "# section after Top: $section_after_top->{'texi'}\n"
- if ($section_after_top and ($T2H_DEBUG & $DEBUG_ELEMENTS));
-
print STDERR "# Complete nodes next prev and up based on menus and
sections\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
# set the default id based on the node number
@@ -5335,10 +5334,10 @@
}
}
}
- # FIXME wwith_section or node_ref? with with_section, as it is now
+ # FIXME with_section or node_ref? with with_section, as it is now
# it is only done for the node associated with the section, with
# section_ref it will be done for all the nodes after the section but
- # not associated with another section
+ # not associated with another section (as it was before)
if (defined($node->{'with_section'}))
{
my $section = $node->{'with_section'};
@@ -5347,7 +5346,7 @@
$node->{$direction} = $section->{$direction}
if (defined($section->{$direction}));
}
- # FIXME this is wrong now, since it is only done for
+ # FIXME the following is wrong now, since it is only done for
# the node->with_section. If done for node->section_ref it
# could be true.
# this is a node appearing within a section but not associated
@@ -5449,151 +5448,62 @@
}
}
}
+ my $only_nodes = 0;
+ my $only_sections = 0;
- # FIXME next 2 phases should be done in one pass.
- # Also the special case node Top is texi2html specific, should
- # be configurable
+ # for legibility
+ my $use_nodes = $Texi2HTML::Config::USE_NODES;
+ my $use_sections = $Texi2HTML::Config::USE_SECTIONS;
+
+ $only_nodes = 1 if (
+ (!scalar(@sections_list) and
+ ($use_nodes or (!$use_sections and !defined($use_nodes))))
+ or ($use_nodes and !$use_sections)
+ );
+ $only_sections = 1 if (!$only_nodes and !$use_nodes and ($use_sections or
!defined($use_sections)));
+ #print STDERR "only_nodes: $only_nodes, only_sections $only_sections\n";
+
+ my $prev_element = { 'holder' => 1, 'texi' => 'HOLDER',
+ 'place' => [], 'indices' => [] };
print STDERR "# Build the elements list\n" if ($T2H_DEBUG &
$DEBUG_ELEMENTS);
- if (!$Texi2HTML::Config::USE_NODES)
+ foreach my $element (@all_elements)
{
- #the only sectionning elements are sections
- @elements_list = @sections_list;
- # if there is no section we use nodes... FIXME should be
- # configurable, like with USE_SECTIONS true everything is slumped
- # is one section.
- if (address@hidden)
+ if ($element->{'node'})
{
- print STDERR "# no section\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- @elements_list = @all_elements;
- }
- elsif (!$section_top and $node_top and !$node_top->{'with_section'})
+ if (!$only_nodes and $node_top and $element eq $node_top and
!$section_top and !$node_top->{'with_section'})
{ # special case for the top node if it isn't associated with
- # a section. The top node element is inserted between the
- # $section_before_top and the $section_after_top
+ # a section.
+ # FIXME Config variable
print STDERR "# Top not associated with a section\n" if
($T2H_DEBUG & $DEBUG_ELEMENTS);
$node_top->{'top_as_section'} = 1;
$node_top->{'section_ref'} = $node_top;
- $node_top->{'with_section'} = $node_top;
- my @old_element_lists = @elements_list;
- @elements_list = ();
- while (@old_element_lists)
- {
- my $section = shift @old_element_lists;
- if ($section_before_top and ($section eq $section_before_top))
- {
- push @elements_list, $section;
- push @elements_list, $node_top;
- last;
+ $prev_element = add_t2h_element($element, address@hidden,
$prev_element);
}
- elsif ($section_after_top and ($section eq $section_after_top))
- {
- push @elements_list, $node_top;
- push @elements_list, $section;
- last;
- }
- push @elements_list, $section;
- }
- push @elements_list, @old_element_lists;
- }
-
- foreach my $element (@elements_list)
- {
- print STDERR "# new section element $element->{'texi'}\n"
- if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- }
- }
- else
- {
- # elements are sections if possible, and node if no section associated
- foreach my $element(@all_elements)
- {
- if ($element->{'node'})
- {
- if (!defined($element->{'with_section'}) or
$Texi2HTML::Config::ONLY_NODES)
+ elsif ($element->{'section_ref'} and ($only_sections or
(!$only_nodes and $element->{'with_section'})))
{
- if (!defined($element->{'toc_level'}))
- { # FIXME use Texi2HTML::Config::NODE_TOC_LEVEL?
- # also just below.
- $element->{'toc_level'} = $MIN_LEVEL;
+ add_t2h_dependent_element ($element,
$element->{'section_ref'});
+ $element->{'toc_level'} =
$element->{'section_ref'}->{'toc_level'};
}
- else
+ elsif (!$only_sections)
{
- print STDERR "BUG? node with toc_level\n";
+ $prev_element = add_t2h_element($element, address@hidden,
$prev_element);
+ if ($element->{'section_ref'})
+ { # may happen if $only_nodes
+ $element->{'toc_level'} =
$element->{'section_ref'}->{'toc_level'};
}
- print STDERR "# new node element ($element)
$element->{'texi'}\n"
- if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- push @elements_list, $element;
}
- }
- elsif (! $Texi2HTML::Config::ONLY_NODES)
- {
- print STDERR "# new section element ($element)
$element->{'texi'}\n"
- if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- push @elements_list, $element;
+ # FIXME use Texi2HTML::Config::NODE_TOC_LEVEL?
+ $element->{'toc_level'} = $MIN_LEVEL if
(!defined($element->{'toc_level'}));
}
else
{
- if (defined($element->{'node_ref'}))
- {
- print STDERR "# section element ($element)
$element->{'texi'} with node $element->{'node_ref'}->{'texi'}\n"
- if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- }
- }
- }
- }
-
- # nodes are attached to the section preceding them if not already
- # associated with a section
- # here we don't set @{$element->{'nodes'}} since it may be changed
- # below if split by indices. Therefore we only set
- # @{$element->{'all_elements'}} with all the elements associated
- # with an element output, in the right order
- print STDERR "# Find the section associated with each node\n"
- if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- $current_section = $sections_list[0];
- $current_section = $node_top if ($node_top and
$node_top->{'top_as_section'} and !$section_before_top);
- foreach my $element (@all_elements)
- {
- if ($element->{'node'} and !$element->{'top_as_section'})
- {
- if ($element->{'with_section'})
- { # the node is associated with a section
- push @{$element->{'section_ref'}->{'all_elements'}}, $element,
$element->{'section_ref'};
- # first index is section if the first index is associated with
that node
- $element_index = $element->{'section_ref'} if ($element_index
and ($element_index eq $element));
- }
- elsif (defined($current_section))
- {# node appearing after a section, but not before another section,
- # or appearing before any section
- $element->{'toc_level'} = $current_section->{'toc_level'};
- if ($Texi2HTML::Config::USE_NODES)
- { # the node is an element itself
- push @{$element->{'all_elements'}}, $element;
- }
- else
+ if ($element->{'node_ref'} and $only_nodes)
{
- push @{$current_section->{'all_elements'}}, $element;
- # first index is section if the first index is associated
with that node
- $element_index = $current_section if ($element_index and
($element_index eq $element));
- }
+ add_t2h_dependent_element ($element, $element->{'node_ref'});
}
- else
- { # seems like there are only nodes in the documents
- $element->{'toc_level'} = $MIN_LEVEL;
- push @{$element->{'all_elements'}}, $element;
- }
- }
- else
+ elsif (!$only_nodes)
{
- $current_section = $element;
- if ($element->{'node'})
- { # Top node not associated with a section
- $element->{'toc_level'} = $MIN_LEVEL;
- push @{$element->{'section_ref'}->{'all_elements'}}, $element;
- }
- elsif (!$element->{'with_node'})
- { # a section not preceded by a node
- push @{$element->{'all_elements'}}, $element;
+ $prev_element = add_t2h_element($element, address@hidden,
$prev_element);
}
}
}
@@ -5613,7 +5523,7 @@
$element_top = $section_top;
# If the top node is associated with a section it is the top_element
# otherwise element top may be the top node
- $element_top = $node_top if ((!defined($element_top) or
$Texi2HTML::Config::ONLY_NODES) and defined($node_top));
+ $element_top = $node_top if (!defined($element_top) and
defined($node_top));
# If there is no @top section no top node the first node is the top element
$element_top = $element_first unless (defined($element_top));
$element_top->{'top'} = 1 if ($element_top->{'node'});
@@ -5624,31 +5534,6 @@
# elements
$element_last = $elements_list[-1];
- print STDERR "# find forward and back\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- my $prev;
- foreach my $element (@elements_list)
- {
- $element->{'element'} = 1;
- print STDERR "# fwd and back for $element->{'texi'}\n"
- if ($T2H_DEBUG & $DEBUG_ELEMENTS);
- # FIXME: certainly wrong. Indeed this causes the section associated
- # with the @node Top to be up for a @chapter, even if it is a
- # @chapter and not @top. It could even be up and, say, a @section!
- if ($element->{'toplevel'} and ($element ne $element_top))
- {
- $element->{'up'} = $element_top;
- }
- if ($prev)
- {
- $element->{'back'} = $prev;
- $prev->{'forward'} = $element;
- $prev = $element;
- }
- else
- {
- $prev = $element;
- }
- }
my @new_elements = ();
print STDERR "# preparing indices\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
@@ -5688,7 +5573,7 @@
print STDERR "BUG: multiple page index in only one
element\n" if (exists($index->[1]));
}
}
- else
+ elsif ($current_element->{'index_page'})
{
$current_element->{'sectionnext'} = $checked_element;
$current_element->{'toplevelnext'} = $checked_element if
($current_element->{'toplevel'});
@@ -5812,6 +5697,7 @@
'nodeprev' => $back,
'place' => [],
'seen' => 1,
+ 'element' => 1,
'page' => $page
};
# the index page is associated with the new element
@@ -5899,10 +5785,24 @@
}
}
+ foreach my $element (@elements_list)
+ {
+ print STDERR "BUG: element not 1 for $element->{'texi'}\n" unless
($element->{'element'} == 1);
+ # FIXME: certainly wrong. Indeed this causes the section associated
+ # with the @node Top to be up for a @chapter, even if it is a
+ # @chapter and not @top. It could even be up and, say, a @section!
+ if ($element->{'toplevel'} and ($element ne $element_top))
+ {
+ $element->{'up'} = $element_top;
+ }
+ }
+
# set 'reference_element' which is used each time there is a cross ref
# to that node.
- # It is the section associated with the node except if USE_NODES
- unless ($Texi2HTML::Config::USE_NODES)
+ # It is the section associated with the node if there are only sections
+ # FIXME with only_nodes there should certainly be a corresponding
+ # reference_element set.
+ if ($only_sections)
{
foreach my $node(@nodes_list)
{
@@ -5917,6 +5817,8 @@
# find id for indices and set element->{'this'}
foreach my $element (@elements_list)
{
+ print STDERR "BUG: $element->{'texi'}, 'element' not set\n" if
(!$element->{'element'});
+
$element->{'this'} = $element;
if ($element->{'index_page'})
{
@@ -5967,7 +5869,7 @@
}
}
- print STDERR "# find index entries id\n"
+ print STDERR "# do human-readable index entries id\n"
if ($T2H_DEBUG & $DEBUG_ELEMENTS);
if ($Texi2HTML::Config::NEW_CROSSREF_STYLE)
{
@@ -6006,7 +5908,6 @@
# use %sections and %headings to modify also the headings
foreach my $section (values(%sections), values(%headings))
- #foreach my $section (@sections_list)
{
if ($Texi2HTML::Config::NEW_CROSSREF_STYLE and ($section->{'cross'} =~
/\S/))
{
@@ -6055,7 +5956,7 @@
}
if ($node_as_top)
{
- do_node_target_file($node_as_top,'top');
+ do_node_target_file($node_as_top, 'top');
}
foreach my $key (keys(%nodes))
{
@@ -6141,6 +6042,7 @@
else
{ # not split
add_file($docu_doc);
+ # FIXME sections or elements?
foreach my $element(@elements_list)
{
$element->{'file'} = $docu_doc;
@@ -6151,12 +6053,36 @@
{
$node->{'file'} = $docu_doc;
$node->{'doc_nr'} = 0;
+ #FIXME do_element_targets?
+ #do_element_targets($node);
+ }
+ }
+ # 'pathological' cases. No texinfo sectionning element at all or no
+ # texi2html sectionning elements
+ #FIXME already done for nodes?
+ if (address@hidden)
+ {
+ if (@all_elements)
+ {
+ foreach my $element (@all_elements)
+ {
+ $element->{'file'} = $docu_doc;
+ $element->{'doc_nr'} = 0;
+ push @{$element->{'place'}}, @{$element->{'current_place'}};
+ do_element_targets($element);
+ }
+ }
+ else
+ {
+ $element_before_anything->{'file'} = $docu_doc;
+ $element_before_anything->{'doc_nr'} = 0;
+ do_element_targets($element_before_anything);
}
}
# correct the id and file for the things placed in footnotes
foreach my $place(@{$footnote_element->{'place'}})
{
- do_place_target_file ($place,$footnote_element, 'footnotes');
+ do_place_target_file ($place, $footnote_element, 'footnotes');
}
# if setcontentsaftertitlepage is set, the contents should be associated
# with the titlepage. That's wat is done there.
@@ -6202,6 +6128,7 @@
my $previous_file;
while ($current_element->{'back'})
{
+#print STDERR "Back $current_element->{'texi'}\n";
$current_element = $current_element->{'back'};
if ($current_element->{'file'} ne $file)
{
@@ -6225,6 +6152,7 @@
$current_element = $element;
while ($current_element->{'forward'})
{
+#print STDERR "Fwd $current_element->{'texi'}\n";
$current_element = $current_element->{'forward'};
if ($current_element->{'file'} ne $file)
{
@@ -6250,7 +6178,13 @@
last unless ($T2H_DEBUG & $DEBUG_ELEMENTS);
print STDERR "$file: counter $files{$file}->{'counter'}\n";
}
- foreach my $element ((@elements_list, $footnote_element))
+ my $output_elements = address@hidden;
+ if (!scalar(@elements_list) and ($T2H_DEBUG & $DEBUG_ELEMENTS))
+ {
+ print STDERR "No elements_list, no texi2html elements\n";
+ $output_elements = address@hidden;
+ }
+ foreach my $element ((@$output_elements, $footnote_element))
{
last unless ($T2H_DEBUG & $DEBUG_ELEMENTS);
my $is_toplevel = 'not toplevel';
@@ -6264,6 +6198,7 @@
{
print STDERR "node($element->{'id'}, toc_level
$element->{'toc_level'}, $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'}));
}
elsif ($element->{'footnote'})
{
@@ -6275,6 +6210,7 @@
$number = $element->{'number'} if ($element->{'number'});
print STDERR "$number ($element->{'id'}, $is_toplevel, level
$element->{'level'}-$element->{'toc_level'}, doc_nr
$element->{'doc_nr'}($element->{'file'})) $element->{'texi'}:\n";
print STDERR " with_node: $element->{'with_node'}->{'texi'}\n" if
(defined($element->{'with_node'}));
+ print STDERR " node_ref: $element->{'node_ref'}->{'texi'}\n" if
(defined($element->{'node_ref'}));
}
if (!$element->{'footnote'})
@@ -6358,11 +6294,11 @@
}
elsif ($place->{'entry'})
{
- print STDERR " index($place): $place->{'entry'}\n";
+ print STDERR " index($place): $place->{'entry'}
($place->{'label'}, $place->{'file'})\n";
}
elsif ($place->{'anchor'})
{
- print STDERR " anchor: $place->{'texi'}\n";
+ print STDERR " anchor: $place->{'texi'} ($place->{'id'},
$place->{'file'})\n";
}
elsif ($place->{'float'})
{
@@ -6795,6 +6731,7 @@
{
$state->{'element'} = $elements_list[0];
}
+ $state->{'element'} = {'file' => $docu_doc, 'texi' => 'VIRTUAL ELEMENT'}
if (!$state->{'element'});
#$state->{'element'} = $elements_list[0] unless ((address@hidden) or
(exists($state->{'element'}) and !$state->{'element'}->{'before_anything'}));
}
@@ -6808,10 +6745,9 @@
my $text;
my $doc_nr;
my $in_doc = 0;
+ #FIXME use $Texi2HTML::THIS_ELEMENT to allow output functio to redefin it
my $element;
my @text =();
- my @section_lines = ();
- my @head_lines = ();
my $one_section = 1 if (@elements_list <= 1);
push_state(\%state);
@@ -6941,14 +6877,14 @@
$Texi2HTML::THISDOC{'subtitles'} = [] if
(!defined($Texi2HTML::THISDOC{'subtitles'}));
# backward compatibility, titles should go away
$Texi2HTML::THISDOC{'titles'} = [] if
(!defined($Texi2HTML::THISDOC{'titles'}));
- foreach my $element (('authors', 'subtitles', 'titles'))
+ foreach my $command (('authors', 'subtitles', 'titles'))
{
my $i;
- for ($i = 0; $i < $#{$Texi2HTML::THISDOC{$element}} + 1; $i++)
+ for ($i = 0; $i < $#{$Texi2HTML::THISDOC{$command}} + 1; $i++)
{
- chomp ($Texi2HTML::THISDOC{$element}->[$i]);
- $Texi2HTML::THISDOC{$element}->[$i] =
substitute_line($Texi2HTML::THISDOC{$element}->[$i]);
- #print STDERR "$element:$i: $Texi2HTML::THISDOC{$element}->[$i]\n";
+ chomp ($Texi2HTML::THISDOC{$command}->[$i]);
+ $Texi2HTML::THISDOC{$command}->[$i] =
substitute_line($Texi2HTML::THISDOC{$command}->[$i]);
+ #print STDERR "$command:$i: $Texi2HTML::THISDOC{$command}->[$i]\n";
}
}
@@ -6985,11 +6921,11 @@
$Texi2HTML::THISDOC{'copying_comment'} = $copying_comment;
# must be after toc_body, but before titlepage
- foreach my $element_tag ('contents', 'shortcontents')
+ foreach my $command ('contents', 'shortcontents')
{
- next if (!defined($content_element{$element_tag}));
- my $toc_lines = &$Texi2HTML::Config::inline_contents(undef,
$element_tag, $content_element{$element_tag});
- @{$Texi2HTML::THISDOC{'inline_contents'}->{$element_tag}} =
@$toc_lines if (defined($toc_lines));
+ next if (!defined($content_element{$command}));
+ my $toc_lines = &$Texi2HTML::Config::inline_contents(undef, $command,
$content_element{$command});
+ @{$Texi2HTML::THISDOC{'inline_contents'}->{$command}} = @$toc_lines if
(defined($toc_lines));
}
($region_text, $region_no_texi, $region_simple_format) =
do_special_region_lines('titlepage');
@@ -7026,6 +6962,7 @@
my $index_pages_nr;
my $index_nr = 0;
my $line_nr;
+ my $current_file;
my $first_section = 0; # 1 if it is the first section of a page
my $previous_is_top = 0; # 1 if it is the element following the top element
@@ -7034,6 +6971,22 @@
{
unless ($index_pages)
{ # not in a index split over sections
+ #not sure it is the right way
+ # if ($Texi2HTML::THISDOC{'new_file'} and
+ # (!defined($current_file) or $Texi2HTML::THISDOC{'new_file'} ne
$current_file))
+ # {
+ # $current_file = $Texi2HTML::THISDOC{'new_file'};
+ # if ($files{$current_file}->{'filehandle'})
+ # {
+ # $FH = $files{$current_file}->{'filehandle'};
+ # }
+ # else
+ # {
+ # $FH = open_out("$docu_rdir$current_file");
+#print STDERR "OPEN $docu_rdir$current_file, $FH". scalar($FH)."\n";
+ # $files{$current_file}->{'filehandle'} = $FH;
+ # }
+ # }
$cline = shift @$doc_lines;
my $chomped_line = $cline;
if (!chomp($chomped_line) and @$doc_lines)
@@ -7052,11 +7005,10 @@
$tag = $1 if ($cline =~ /^\@(\w+)/ and !$index_pages);
if ($tag eq 'setfilename' and
$Texi2HTML::Config::IGNORE_BEFORE_SETFILENAME)
{
- @section_lines = ();
- @head_lines = ();
+ @{$Texi2HTML::THIS_SECTION} = ();
+ @{$Texi2HTML::THIS_HEADER} = ();
}
-
if (($tag eq 'node') or (defined($sec2level{$tag}) and ($tag !~
/heading/)) or $index_pages)
{
if (@stack or (defined($text) and $text ne ''))
@@ -7064,7 +7016,7 @@
#print STDERR "close_stack before address@hidden";
#print STDERR "text!$text%" if (! @stack);
close_stack(\$text, address@hidden, \%state, $line_nr);
- push @section_lines, $text;
+ push @{$Texi2HTML::THIS_SECTION}, $text;
$text = '';
}
$state{'sec_num'}++ if ($sec2level{$tag} and ($tag ne 'top'));
@@ -7122,30 +7074,28 @@
$old = $element->{'texi'} if (defined($element));
print STDERR "NEW: $new_element->{'texi'}, OLD: $old\n" if
($T2H_DEBUG & $DEBUG_ELEMENTS);
# print the element that just finished
- $Texi2HTML::THIS_SECTION = address@hidden;
- $Texi2HTML::THIS_HEADER = address@hidden;
if ($element)
{
finish_element($FH, $element, $new_element,
$first_section);
$first_section = 0;
$previous_is_top = 0 if (!$element->{'top'});
- @section_lines = ();
- @head_lines = ();
+ @{$Texi2HTML::THIS_SECTION} = ();
+ @{$Texi2HTML::THIS_HEADER} = ();
}
else
{
print STDERR "# Writing elements:" if ($T2H_VERBOSE);
if ($Texi2HTML::Config::IGNORE_PREAMBLE_TEXT)
{
- @section_lines = ();
- @head_lines = ();
+ @{$Texi2HTML::THIS_SECTION} = ();
+ @{$Texi2HTML::THIS_HEADER} = ();
}
- # remove empty line at the beginning of @section_lines
- shift @section_lines while (@section_lines and
($section_lines[0] =~ /^\s*$/));
+ # remove empty for the first document lines
+ shift @{$Texi2HTML::THIS_SECTION} while
(@{$Texi2HTML::THIS_SECTION} and ($Texi2HTML::THIS_SECTION->[0] =~ /^\s*$/));
}
# begin new element
- my $previous_file;
- $previous_file = $element->{'file'} if (defined($element));
+ #my $previous_file;
+ #$previous_file = $element->{'file'} if
(defined($element));
$element = $new_element;
$state{'element'} = $element;
$Texi2HTML::THIS_ELEMENT = $element;
@@ -7203,21 +7153,22 @@
}
#print STDERR "\nDone hrefs for $element->{'texi'}\n";
$files{$element->{'file'}}->{'counter'}--;
- if (!defined($previous_file) or ($element->{'file'} ne
$previous_file))
+ #if (!defined($previous_file) or ($element->{'file'} ne
$previous_file))
+ if (!defined($current_file) or ($element->{'file'} ne
$current_file))
{
- my $file = $element->{'file'};
+ $current_file = $element->{'file'};
print STDERR "\n" if ($T2H_VERBOSE and !$T2H_DEBUG);
- print STDERR "# Writing to $docu_rdir$file " if
$T2H_VERBOSE;
+ print STDERR "# Writing to $docu_rdir$current_file "
if $T2H_VERBOSE;
my $do_page_head = 0;
- if ($files{$file}->{'filehandle'})
+ if ($files{$current_file}->{'filehandle'})
{
- $FH = $files{$file}->{'filehandle'};
+ $FH = $files{$current_file}->{'filehandle'};
}
else
{
- $FH = open_out("$docu_rdir$file");
+ $FH = open_out("$docu_rdir$current_file");
#print STDERR "OPEN $docu_rdir$file, $FH". scalar($FH)."\n";
- $files{$file}->{'filehandle'} = $FH;
+ $files{$current_file}->{'filehandle'} = $FH;
$do_page_head = 1;
}
if ($element->{'top'})
@@ -7237,21 +7188,33 @@
print STDERR "\n" if ($T2H_DEBUG);
}
my $label =
&$Texi2HTML::Config::element_label($current_element->{'id'}, $current_element,
$tag, $cline);
- if (@section_lines)
+ #Uncomment that if you want empty line to appear without
+ #disturbing headings
+ #my $empty_section = 1;
+ #foreach my $section_line (@{$Texi2HTML::THIS_SECTION})
+ #{
+ # if ($section_line =~ /\S/)
+ # {
+ # $empty_section = 0;
+ # last;
+ # }
+ #}
+ #if (!$empty_section)
+ if (@{$Texi2HTML::THIS_SECTION})
{
- push (@section_lines, $label);
+ push (@{$Texi2HTML::THIS_SECTION}, $label);
}
else
{
- push @head_lines, $label;
+ push @{$Texi2HTML::THIS_HEADER}, $label;
}
if ($index_pages)
{
&$Texi2HTML::Config::print_element_header($FH,
$first_section, $previous_is_top) if (!$current_element->{'top'} and
!$one_section);
- push @section_lines,
&$Texi2HTML::Config::heading($element);
+ push @{$Texi2HTML::THIS_SECTION},
&$Texi2HTML::Config::heading($element);
#print STDERR "Do index page $index_pages_nr\n";
my $page = do_index_page($index_pages, $index_pages_nr,
$line_nr);
- push @section_lines, $page;
+ push @{$Texi2HTML::THIS_SECTION}, $page;
if (defined ($index_pages->[$index_pages_nr + 1]))
{
$index_pages_nr++;
@@ -7271,7 +7234,7 @@
my $cmd_line = $cline;
$cmd_line =~ s/address@hidden//;
my $heading_formatted =
&$Texi2HTML::Config::heading($current_element, $tag, $cmd_line,
substitute_line($cmd_line), undef, $one_section, $current_element->{'element'});
- push @section_lines, $heading_formatted if
(defined($heading_formatted) and ($heading_formatted ne ''));
+ push @{$Texi2HTML::THIS_SECTION}, $heading_formatted if
(defined($heading_formatted) and ($heading_formatted ne ''));
next;
}
elsif ($tag eq 'printindex')
@@ -7297,7 +7260,7 @@
}
begin_paragraph (address@hidden, \%state) if
($state{'preformatted'});
next if (@stack);
- push @section_lines, $text;
+ push @{$Texi2HTML::THIS_SECTION}, $text;
$text = '';
next;
}
@@ -7312,11 +7275,11 @@
if (@stack or (defined($text) and $text ne ''))
{# in pass text contents shouldn't appear in formats
close_stack(\$text, address@hidden, \%state, $line_nr);
- push @section_lines, $text;
+ push @{$Texi2HTML::THIS_SECTION}, $text;
$text = '';
}
my $toc_lines = &$Texi2HTML::Config::inline_contents($FH,
$tag, $content_element{$element_tag});
- push (@section_lines, @$toc_lines) if
(defined($toc_lines)) ;
+ push (@{$Texi2HTML::THIS_SECTION}, @$toc_lines) if
(defined($toc_lines)) ;
}
next unless (exists($Texi2HTML::Config::misc_command{$tag})
and $Texi2HTML::Config::misc_command{$tag}->{'keep'});
}
@@ -7327,7 +7290,7 @@
next if (@stack);
if ($text ne '' )
{
- push @section_lines, $text;
+ push @{$Texi2HTML::THIS_SECTION}, $text;
$text = '';
}
}
@@ -7337,11 +7300,10 @@
}
if (defined($text))
{
- push @section_lines, $text;
+ push @{$Texi2HTML::THIS_SECTION}, $text;
}
print STDERR "\n" if ($T2H_VERBOSE);
- $Texi2HTML::THIS_SECTION = address@hidden;
# if no sections, then simply print document as is
if ($one_section)
{
@@ -7354,9 +7316,8 @@
if (@foot_lines)
{
&$Texi2HTML::Config::foot_section (address@hidden);
- push @section_lines, @foot_lines;
+ push @{$Texi2HTML::THIS_SECTION}, @foot_lines;
}
- $Texi2HTML::THIS_HEADER = address@hidden;
print STDERR "# Write the section $element->{'texi'}\n" if
($T2H_VERBOSE);
&$Texi2HTML::Config::one_section($FH, $element);
close_out($FH);
@@ -7515,7 +7476,7 @@
if ($element->{'top'})
{
my $top_file = $docu_top_file;
- #print STDERR "TOP $element->{'texi'}, @section_lines\n";
+ #print STDERR "TOP $element->{'texi'}, @{$Texi2HTML::THIS_SECTION}\n";
print STDERR "[Top]" if ($T2H_VERBOSE);
$Texi2HTML::HREF{'Top'} = href($element_top, $element->{'file'});
&$Texi2HTML::Config::print_Top($FH, ($element->{'titlefont'} or
$element->{'index_page'}), $element);
@@ -7984,6 +7945,7 @@
my $href = '';
echo_error("Bug: $element->{'texi'}, target undef", $line_nr) if
(!defined($element->{'target'}));
echo_error("Bug: $element->{'texi'}, file undef", $line_nr) if
(!defined($element->{'file'}));
+ echo_error("Bug: file undef in href", $line_nr) if (!defined($file));
#foreach my $key (keys(%{$element}))
#{
# my $value = 'UNDEF'; $value = $element->{$key} if
defined($element->{$key});
@@ -10118,12 +10080,58 @@
my $page = shift;
my $index_element = $index_elements->[$nr];
+ if (defined($Texi2HTML::Config::printindex))
+ {
+ my @summary_letters = ();
+ foreach my $index_element_item (@$index_elements)
+ {
+ push @summary_letters, get_index_element_item_infos
+ ($index_element_item, $index_element->{'element'},
$index_element->{'name'});
+ # $letter, $file, $default_id, $index_element_id, $number,
$index_element;
+ }
+ my @index_letters = ();
+ my $page = $index_element->{'page'};
+ foreach my $letter (@{$page->{'letters'}})
+ {
+ my @entries = ();
+ foreach my $entry (@{$page->{'entries_by_letter'}->{$letter}})
+ {
+ my ($origin_href, $formatted_entry, $entry_href,
$entry_element_text) =
+ get_index_entry_infos($entry, $index_element->{'element'},
$line_nr);
+ push @entries, [$origin_href, $formatted_entry, $entry_href,
$entry_element_text];
+
+ }
+ push @index_letters, { 'letter' => $letter, 'entries' =>
address@hidden };
+ }
+ return (&$Texi2HTML::Config::printindex ($index_element->{'name'},
address@hidden, address@hidden));
+ }
my $index_infos = {};
my $summary = do_index_summary($index_element->{'element'},
$index_elements, $index_infos, $index_element->{'name'});
my $entries = do_index_entries($index_element->{'element'},
$index_element->{'page'}, $index_element->{'name'}, $line_nr, $index_infos);
return $summary . $entries . $summary;
}
+sub get_index_element_item_infos($$$)
+{
+ my $index_element_item = shift;
+ my $element = shift;
+ my $index_name = shift;
+
+ my @result = ();
+
+ my $index_element = $index_element_item->{'element'};
+ my $file = '';
+ $file .= $index_element->{'file'} if ($index_element->{'file'} ne
$element->{'file'});
+ my $number = 0;
+ for my $letter (@{$index_element_item->{'page'}->{'letters'}})
+ {
+ my $default_id = "$index_element->{'id'}" . "_$number";
+ push @result, [ $letter, $file, $default_id, $index_element->{'id'},
$number, $index_element ];
+ $number++;
+ }
+ return address@hidden;
+}
+
sub do_index_summary($$$)
{
my $element = shift;
@@ -10136,14 +10144,12 @@
for my $index_element_item (@$index_elements)
{
- my $index_element = $index_element_item->{'element'};
- my $file = '';
- $file .= $index_element->{'file'} if ($index_element->{'file'} ne
$element->{'file'});
- my $index = 0;
- for my $letter (@{$index_element_item->{'page'}->{'letters'}})
+ my $letter_infos = get_index_element_item_infos
+ ($index_element_item, $element, $index_name);
+ for my $letter_info (@$letter_infos)
{
- my $default_id = "$index_element->{'id'}" . "_$index";
- my ($formatted_letter, $letter_id, $is_symbol) =
&$Texi2HTML::Config::summary_letter($letter, $file, $default_id,
$index_element->{'id'}, $index, $index_element, $index_name);
+ my ($letter, $file, $default_id, $index_element_id, $number,
$index_element) = @$letter_info;
+ my ($formatted_letter, $letter_id, $is_symbol) =
&$Texi2HTML::Config::summary_letter($letter, $file, $default_id,
$index_element_id, $number, $index_element, $index_name);
$is_symbol = 1 if ($letter !~ /^[A-Za-z]/ and
(!defined($is_symbol)));
$letter_id = $default_id if (!defined($letter_id));
$index_infos->{'letter_id'}->{$letter} = $letter_id;
@@ -10156,27 +10162,16 @@
{
push @symbols, $formatted_letter;
}
- $index++;
}
}
return &$Texi2HTML::Config::index_summary(address@hidden, address@hidden);
}
-sub do_index_entries($$$$$)
+sub get_index_entry_infos($$$)
{
+ my $entry = shift;
my $element = shift;
- my $page = shift;
- my $name = shift;
my $line_nr = shift;
- my $index_infos = shift;
-
- my $letters = '';
- my $index = 0;
- foreach my $letter (@{$page->{'letters'}})
- {
- my $entries = '';
- foreach my $entry (@{$page->{'entries_by_letter'}->{$letter}})
- {
my $indexed_element = $entry->{'element'};
my $entry_element = $indexed_element;
# notice that we use the section associated with a node even when
@@ -10187,7 +10182,7 @@
$entry_element = $entry_element->{'section_ref'} if
($entry_element->{'section_ref'} and !$entry_element->{'top_as_section'});
my $origin_href = '';
$origin_href = $entry->{'file'} if ($Texi2HTML::Config::SPLIT and
$entry->{'file'} ne $element->{'file'});
- #print STDERR "$entry $entry->{'entry'}, real elem
$indexed_element->{'texi'}, section $entry_element->{'texi'}, real
$indexed_element->{'file'}, entry file $entry->{'file'}\n";
+#print STDERR "$entry $entry->{'entry'}, real elem $indexed_element->{'texi'},
section $entry_element->{'texi'}, real $indexed_element->{'file'}, entry file
$entry->{'file'}\n";
if ($entry->{'label'})
{
$origin_href .= '#' . $entry->{'label'};
@@ -10210,10 +10205,30 @@
}
}
#print STDERR "SUBHREF in index entry `$entry->{'entry'}' for
`$entry_element->{'texi'}'\n";
- $entries .= &$Texi2HTML::Config::index_entry ($origin_href,
+ return ($origin_href,
substitute_line($entry->{'entry'}),
href($entry_element, $element->{'file'}, $line_nr),
$entry_element->{'text'});
+}
+
+sub do_index_entries($$$$$)
+{
+ my $element = shift;
+ my $page = shift;
+ my $name = shift;
+ my $line_nr = shift;
+ my $index_infos = shift;
+
+ my $letters = '';
+ my $index = 0;
+ foreach my $letter (@{$page->{'letters'}})
+ {
+ my $entries = '';
+ foreach my $entry (@{$page->{'entries_by_letter'}->{$letter}})
+ {
+ my ($origin_href, $formatted_entry, $entry_href,
$entry_element_text) =
+ get_index_entry_infos($entry, $element, $line_nr);
+ $entries .= &$Texi2HTML::Config::index_entry ($origin_href,
$formatted_entry, $entry_href, $entry_element_text);
}
$letters .= &$Texi2HTML::Config::index_letter ($letter,
$index_infos->{'letter_id'}->{$letter}, $entries);
$index++;
@@ -14093,12 +14108,8 @@
{
my $input_file_name = shift(@ARGV);
-
- $Texi2HTML::THIS_SECTION = undef;
- $Texi2HTML::THIS_HEADER = undef;
- $Texi2HTML::THIS_ELEMENT = undef;
-
%Texi2HTML::THISDOC = ();
+ $Texi2HTML::THIS_ELEMENT = undef;
foreach my $global_key (keys(%Texi2HTML::GLOBAL))
{
@@ -14119,9 +14130,8 @@
# `"Texi2HTML::TITLEPAGE" used only once' and it is reset in
# &$Texi2HTML::Config::titlepage anyway
# $Texi2HTML::TITLEPAGE = undef;
- $Texi2HTML::THIS_ELEMENT = undef;
- $Texi2HTML::THIS_SECTION = undef;
- $Texi2HTML::THIS_HEADER = undef;
+ @{$Texi2HTML::THIS_SECTION} = ();
+ @{$Texi2HTML::THIS_HEADER} = ();
# the reference to these hashes may be used before this point (for example
# see makeinfo.init), so they should be kept as is and the values undef
Index: doc/texi2html.1.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.1.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- doc/texi2html.1.in 19 Jul 2008 21:00:54 -0000 1.5
+++ doc/texi2html.1.in 8 Sep 2008 16:29:46 -0000 1.6
@@ -22,7 +22,10 @@
.PP
The HTML files created by
.I texi2html
-are closer to TeX than to Info.
+are in general closer to TeX than to Info. Using init files (see
+the
+.B \-\-init\-file
+option), other styles or output formats may be selected.
.SH OPTIONS
Options may be abbreviated to th shortests unique prefix. The
following is only an incomplete list of the available options:
@@ -60,8 +63,8 @@
.B \-\-init\-file \fIfile\fP
Load init file \fIfile\fP (see also FILES).
.TP
-.B \-\-lang \fIlang\fP
-Use \fIlang\fP as document language (ISO 639 encoding).
+.B \-\-document\-language \fIlang\fP
+Use \fIlang\fP as document language.
.TP
.B \-\-macro\-expand \fIfile\fP
output macro expanded source in \fIfile\fP.
@@ -150,8 +153,8 @@
.SH AUTHOR
Texi2html was originally written by is Lionel Cons, CERN IT/DIS/OSE,
address@hidden Over time, many other people around the net
-contributed to this program. Its current maintainer is Olaf Bachmann,
address@hidden
+contributed to this program. It was maintained by Olaf Bachmann,
address@hidden, and is now maintained by Derek Price.
.SH AVAILABILITY
The latest version of this program, as well as support in the form of mailing
lists with archives, bug tracking, documentation, and other tools can be found
Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- doc/texi2html.html 5 Sep 2008 13:42:54 -0000 1.89
+++ doc/texi2html.html 8 Sep 2008 16:29:46 -0000 1.90
@@ -40,7 +40,7 @@
permission notice may be stated in a translation approved
by the Free Software Foundation.
-->
-<!-- Created on September 5, 2008 by texi2html 1.79
+<!-- Created on September 8, 2008 by texi2html 1.79
texi2html was written by:
Lionel Cons <address@hidden> (original author)
Karl Berry <address@hidden>
@@ -6713,7 +6713,10 @@
$Texi2HTML::THISDOC{’CSS_LINES’} which is used for formatting,
and if
$CSS_LINES is not defined, $Texi2HTML::THISDOC{’CSS_LINES’} is
autodetected.
-</p></li></ul>
+</p></li><li> When there is no section and $USE_NODES is not set don’t
split by node.
+This behaviour and the previous aren’t documented, so it could change
+in the future.
+</li></ul>
</li><li> API changes between 1.76 and 1.78:
<ul>
<li> paragraph has new arguments
@@ -7689,7 +7692,7 @@
</tr></table>
<h1>About This Document</h1>
<p>
- This document was generated by <em>Patrice Dumas</em> on <em>September 5,
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
+ This document was generated by <em>Patrice Dumas</em> on <em>September 8,
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
</p>
<p>
The buttons in the navigation panels have the following meaning:
@@ -7791,7 +7794,7 @@
<hr size="1">
<p>
<font size="-1">
- This document was generated by <em>Patrice Dumas</em> on <em>September 5,
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
+ This document was generated by <em>Patrice Dumas</em> on <em>September 8,
2008</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html
1.79</em></a>.
</font>
<br>
Index: doc/texi2html.texi
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.texi,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- doc/texi2html.texi 1 Sep 2008 14:48:27 -0000 1.76
+++ doc/texi2html.texi 8 Sep 2008 16:29:46 -0000 1.77
@@ -4529,6 +4529,9 @@
$Texi2HTML::address@hidden'CSS_LINES'@} which is used for formatting, and if
$CSS_LINES is not defined, $Texi2HTML::address@hidden'CSS_LINES'@} is
autodetected.
address@hidden When there is no section and $USE_NODES is not set don't split
by node.
+This behaviour and the previous aren't documented, so it could change
+in the future.
@end itemize
@item API changes between 1.76 and 1.78:
@itemize @bullet
Index: test/indices/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/indices/tests.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/indices/tests.txt 29 Aug 2008 15:06:00 -0000 1.2
+++ test/indices/tests.txt 8 Sep 2008 16:29:47 -0000 1.3
@@ -5,7 +5,9 @@
makeinfo_index_split index_split.texi -init makeinfo.init -init index_test.init
index_no_node index_no_node.texi -split chapter -init index_test.init
makeinfo_nodes_before_top nodes_before_top.texi -init makeinfo.init -init
index_test.init -split node -no-node-files
-nodes_before_top nodes_before_top.texi -init index_test.init -split chapter
+nodes_before_top nodes_before_top.texi --use-nodes -init index_test.init
-split chapter
+#doesn't work
+#nodes_before_top_no_nodes nodes_before_top.texi -init index_test.init -split
chapter
nodes_before_top_and_sections nodes_before_top_and_sections.texi -init
index_test.init -split chapter
nodes_before_top_and_sections_monolithic nodes_before_top_and_sections.texi
makeinfo_nodes_before_top_and_sections nodes_before_top_and_sections.texi
-init makeinfo.init -init index_test.init
Index: test/indices/res/makeinfo_nodes_before_top_and_sections/index.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/indices/res/makeinfo_nodes_before_top_and_sections/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/indices/res/makeinfo_nodes_before_top_and_sections/index.html 2 Sep
2008 12:08:03 -0000 1.2
+++ test/indices/res/makeinfo_nodes_before_top_and_sections/index.html 8 Sep
2008 16:29:47 -0000 1.3
@@ -21,6 +21,7 @@
<link href="#Top" rel="start" title="top section">
<link href="#Top" rel="index" title="top section">
<link href="more_before_top_section_abt.html#SEC_About" rel="help"
title="About This Document">
+<link href="#Top" rel="up" title="top section">
<link href="more_before_top_section_6.html#node-in-chapter" rel="next"
title="node in chapter">
<link href="more_before_top_section_0.html#first-before-top" rel="previous"
title="first before top">
<style type="text/css">
Index: test/sectionning/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/sectionning/Makefile.am 5 Sep 2008 13:16:31 -0000 1.6
+++ test/sectionning/Makefile.am 8 Sep 2008 16:29:47 -0000 1.7
@@ -10,6 +10,7 @@
section_file.texi html-top.texi menu-whitespace.texi nodes_id.texi \
node-whitespace.texi two_footnotes_in_nodes.texi section_in_unnumbered.texi \
top.texi more_nodes_than_sections.texi \
+ placed_things_before_element.texi no_element.texi \
test_directions.init tests.txt res
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/sectionning/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/tests.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- test/sectionning/tests.txt 5 Sep 2008 13:16:37 -0000 1.5
+++ test/sectionning/tests.txt 8 Sep 2008 16:29:48 -0000 1.6
@@ -6,22 +6,28 @@
makeinfo_novalidate_unsplit novalidate.texi -init makeinfo.init -split no
-no-node-file
first_section_no_node first_section_no_node.texi
nodes_before_top nodes_before_top.texi
-nodes_after_top nodes_after_top.texi
+nodes_after_top nodes_after_top.texi --use-nodes
+nodes_after_top_no_node nodes_after_top.texi
section_nodes_before_top section_nodes_before_top.texi
nodes_after_top_before_section nodes_after_top_before_section.texi -split
chapter
nodes_test nodes_test.texi
-no_section no_section.texi
-no_section_directions no_section.texi -init test_directions.init
+no_section_no_node no_section.texi
+no_section no_section.texi --use-nodes
+no_section_directions no_section.texi -init test_directions.init --use-nodes
+no_section_directions_no_node no_section.texi -init test_directions.init
no_node no_node.texi
no_node_directions no_node.texi -init test_directions.init
no_node_chapter_split no_node.texi -split chapter
-no_section_no_top no_section_no_top.texi
+no_section_no_top no_section_no_top.texi --use-nodes
+no_section_no_top_no_node no_section_no_top.texi
one_section one_section.texi
-one_node one_node.texi
+one_node_no_node one_node.texi
+one_node one_node.texi --use-nodes
one_node_and_section one_node_and_section.texi
first_section_and_nodes first_section_and_nodes.texi
double_top double_top.texi
-rec_nodes rec_nodes.texi
+rec_nodes rec_nodes.texi --use-nodes
+rec_nodes_no_node rec_nodes.texi
makeinfo_rec_nodes rec_nodes.texi -init makeinfo.init -no-node-files
lower_subsub lower_subsub.texi
raiselowersections raiselowersections.texi
@@ -34,7 +40,8 @@
test_refs_chapter test_refs.texi -split chapter
test_refs_nodes test_refs.texi -split node -node-files -use-nodes
at_commands_in_refs at_commands_in_refs.texi
-equivalent_nodes equivalent_nodes.texi
+equivalent_nodes equivalent_nodes.texi --use-nodes
+equivalent_nodes_no_node equivalent_nodes.texi
html-top_no_Top_node html-top.texi
menu-whitespace menu-whitespace.texi -init makeinfo.init
menu-whitespace_xml menu-whitespace.texi -init xml.init
@@ -44,3 +51,5 @@
two_footnotes_in_nodes two_footnotes_in_nodes.texi -init makeinfo.init
section_in_unnumbered section_in_unnumbered.texi
more_nodes_than_sections more_nodes_than_sections.texi -init makeinfo.init
+no_element no_element.texi
+placed_things_before_element placed_things_before_element.texi
Index: test/sectionning/res/node_footnote_end/node_footnote.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/node_footnote_end/node_footnote.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- test/sectionning/res/node_footnote_end/node_footnote.html 2 Sep 2008
12:09:26 -0000 1.2
+++ test/sectionning/res/node_footnote_end/node_footnote.html 8 Sep 2008
16:29:49 -0000 1.3
@@ -60,19 +60,8 @@
</td></tr>
</table>
-<a name="g_t_00e1"></a>
-
-<p>node á,
-Footnote 1<a name="DOCF1" href="#FOOT1">(1)</a>.
-</p>
-<a name="g_t_00e2"></a>
-
-<p>node â,
-Footnote 2<a name="DOCF2" href="#FOOT2">(2)</a>.
-</p>
<hr size="1">
-<a name="chapter"></a>
-<a name="chapter-1"></a>
+<a name="g_t_00e1"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Previous section
in reading order"> < </a>]</td>
<td valign="middle" align="left">[ > ]</td>
@@ -89,6 +78,17 @@
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
</tr></table>
+
+<p>node á,
+Footnote 1<a name="DOCF1" href="#FOOT1">(1)</a>.
+</p>
+<a name="g_t_00e2"></a>
+
+<p>node â,
+Footnote 2<a name="DOCF2" href="#FOOT2">(2)</a>.
+</p>
+<a name="chapter"></a>
+<a name="chapter-1"></a>
<h1 class="chapter">1. chapter</h1>
<table class="menu" border="0" cellspacing="0">
Index:
test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section.html
18 Aug 2008 18:06:19 -0000 1.1
+++
test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section.html
8 Sep 2008 16:29:49 -0000 1.2
@@ -50,16 +50,12 @@
<h1 class="settitle">Top</h1>
<p>Top node
</p><table class="menu" border="0" cellspacing="0">
-<tr><td align="left" valign="top"><a href="#second-node">• second
node</a></td><td> </td><td align="left" valign="top">
+<tr><td align="left" valign="top"><a
href="nodes_after_top_before_section_1.html#second-node">• second
node</a></td><td> </td><td align="left" valign="top">
</td></tr>
<tr><td align="left" valign="top"><a
href="nodes_after_top_before_section_1.html#third-node">1.
subsection</a></td><td> </td><td align="left" valign="top">
</td></tr>
</table>
-<a name="second-node"></a>
-
-<p>second node
-</p>
<hr size="1">
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
Index:
test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section_1.html
===================================================================
RCS file:
/cvsroot/texi2html/texi2html/test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section_1.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
---
test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section_1.html
2 Sep 2008 12:09:27 -0000 1.2
+++
test/sectionning/res/nodes_after_top_before_section/nodes_after_top_before_section_1.html
8 Sep 2008 16:29:49 -0000 1.3
@@ -40,8 +40,7 @@
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
-<a name="third-node"></a>
-<a name="subsection"></a>
+<a name="second-node"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a
href="nodes_after_top_before_section.html#Top" title="Previous section in
reading order"> < </a>]</td>
<td valign="middle" align="left">[ > ]</td>
@@ -58,6 +57,11 @@
<td valign="middle" align="left">[Index]</td>
<td valign="middle" align="left">[<a
href="nodes_after_top_before_section_abt.html#SEC_About" title="About (help)">
? </a>]</td>
</tr></table>
+
+<p>second node
+</p>
+<a name="third-node"></a>
+<a name="subsection"></a>
<h3 class="subsection">1. subsection</h3>
Index: test/sectionning/no_element.texi
===================================================================
RCS file: test/sectionning/no_element.texi
diff -N test/sectionning/no_element.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/no_element.texi 8 Sep 2008 16:29:47 -0000 1.1
@@ -0,0 +1,35 @@
+\input texinfo
address@hidden no_element.info
address@hidden no_element test
+
+
address@hidden anchor}
+
+Ref to the anchor:
address@hidden anchor}
+
+Ref to the anchor in footnote:
address@hidden in footnote}.
+
address@hidden footnote.
+
address@hidden in footnote}
+
+Ref to main text anchor
address@hidden anchor}
+}
+
address@hidden , float anchor
+In float
address@hidden float
+
+Ref to float
address@hidden anchor}.
+
address@hidden
+* An anchor:: menu entry pointing to the anchor.
address@hidden menu
+
address@hidden index entry
+
address@hidden
Index: test/sectionning/placed_things_before_element.texi
===================================================================
RCS file: test/sectionning/placed_things_before_element.texi
diff -N test/sectionning/placed_things_before_element.texi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/placed_things_before_element.texi 8 Sep 2008 16:29:48
-0000 1.1
@@ -0,0 +1,43 @@
+\input texinfo
address@hidden placed_things_before_element.info
address@hidden before element test
+
+
address@hidden anchor}
+
+Ref to the anchor:
address@hidden anchor}
+
+Ref to the anchor in footnote:
address@hidden in footnote}.
+
address@hidden footnote.
+
address@hidden in footnote}
+
+Ref to main text anchor
address@hidden anchor}
+}
+
address@hidden , float anchor
+In float
address@hidden float
+
+Ref to float
address@hidden anchor}.
+
address@hidden
+* An anchor:: menu entry pointing to the anchor.
address@hidden menu
+
address@hidden index entry
+
address@hidden section
+
+Ref to anchor
address@hidden anchor}
+
+Ref to footnote anchor
address@hidden in footnote}
+
address@hidden
Index: test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2
===================================================================
RCS file: test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2
diff -N test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.2 8 Sep
2008 16:29:48 -0000 1.1
@@ -0,0 +1,9 @@
+*** Node equivalent with address@hidden' already used address@hidden'
+*** Node equivalent with `node' already used address@hidden'
+** node_next address@hidden' for `before top' not found
+** ---> but equivalent node address@hidden' found
+*** Unknown node in menu entry address@hidden' (l. 12)
+** ---> but equivalent node address@hidden' found
+*** Bug: @samp{node}, file undef (l. 12)
+*** Bug: @samp{node}, file undef (l. 21)
+*** Bug: @samp{node}, file undef (l. 25)
Index: test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.html
===================================================================
RCS file: test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.html
diff -N test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/equivalent_nodes_no_node/equivalent_nodes.html 8 Sep
2008 16:29:48 -0000 1.1
@@ -0,0 +1,78 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="before-top"></a>
+<h1 class="node">Top</h1>
+
+<a name="Top"></a>
+
+<p>Equivalent nodes in node line and in menu.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a
href="#node">‘<samp>node</samp>’</a></td><td> </td><td
align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="node"></a>
+
+<div class="float"><a name="node"></a>
+<p>A figure
+</p></div><p><strong>Figure 1</strong>
+</p>
+<dl class="listoffloats">
+<dt><a href="#node">Figure 1</a></dt><dd></dd>
+</dl>
+
+<p>Ref to node <a href="#node">node</a>.
+</p>
+<p>Ref to @samp{node} <a href="#node">‘<samp>node</samp>’</a>.
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/sectionning/res/no_element/no_element.2
===================================================================
RCS file: test/sectionning/res/no_element/no_element.2
diff -N test/sectionning/res/no_element/no_element.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/no_element/no_element.2 8 Sep 2008 16:29:48
-0000 1.1
@@ -0,0 +1,2 @@
+** menu entry without previous node: An anchor (l. 30)
+** Index entry before document: @cindex index entry (l. 33)
Index: test/sectionning/res/no_element/no_element.html
===================================================================
RCS file: test/sectionning/res/no_element/no_element.html
diff -N test/sectionning/res/no_element/no_element.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/no_element/no_element.html 8 Sep 2008 16:29:48
-0000 1.1
@@ -0,0 +1,89 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>no_element test</title>
+
+<meta name="description" content="no_element test">
+<meta name="keywords" content="no_element test">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+
+
+<p><a name="An-anchor"></a>
+</p>
+<p>Ref to the anchor:
+<a href="#An-anchor">An anchor</a>
+</p>
+<p>Ref to the anchor in footnote:
+<a href="#Anchor-in-footnote">Anchor in footnote</a>.
+</p>
+<p><a name="DOCF1" href="#FOOT1">(1)</a>
+</p>
+<div class="float"><a name="float-anchor"></a>
+<p>In float
+</p></div><p><strong>1</strong>
+</p>
+<p>Ref to float
+<a href="#float-anchor">float anchor</a>.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#An-anchor">An
anchor</a></td><td> </td><td align="left" valign="top">
menu entry pointing to the anchor.
+</td></tr>
+</table>
+
+<a name="index-index-entry"></a>
+
+<div class="footnote">
+<hr>
+<h3>Footnotes</h3>
+<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<p>In footnote.
+</p>
+<p><a name="Anchor-in-footnote"></a>
+</p>
+<p>Ref to main text anchor
+<a href="#An-anchor">An anchor</a>
+</p></div>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/sectionning/res/no_section_directions_no_node/no_section.2
===================================================================
RCS file: test/sectionning/res/no_section_directions_no_node/no_section.2
diff -N test/sectionning/res/no_section_directions_no_node/no_section.2
Index: test/sectionning/res/no_section_directions_no_node/no_section.html
===================================================================
RCS file: test/sectionning/res/no_section_directions_no_node/no_section.html
diff -N test/sectionning/res/no_section_directions_no_node/no_section.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/no_section_directions_no_node/no_section.html 8 Sep
2008 16:29:48 -0000 1.1
@@ -0,0 +1,77 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Titlefont before top node</title>
+
+<meta name="description" content="Titlefont before top node">
+<meta name="keywords" content="Titlefont before top node">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<p>Garbage
+</p>
+<h1 class="titlefont">Titlefont before top node</h1>
+
+<a name="Top"></a>
+<p>Top node
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#second-node">• second
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#Top">•
TOP</a></td><td> </td><td align="left" valign="top"> myself
+</td></tr>
+</table>
+
+<a name="second-node"></a>
+<p>second node (@node second node,,top,TOP).
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#other-node">• other
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="other-node"></a>
+<p>ref to TOP <a href="#Top">Top</a>.
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/sectionning/res/no_section_no_node/no_section.2
===================================================================
RCS file: test/sectionning/res/no_section_no_node/no_section.2
diff -N test/sectionning/res/no_section_no_node/no_section.2
Index: test/sectionning/res/no_section_no_node/no_section.html
===================================================================
RCS file: test/sectionning/res/no_section_no_node/no_section.html
diff -N test/sectionning/res/no_section_no_node/no_section.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/no_section_no_node/no_section.html 8 Sep 2008
16:29:49 -0000 1.1
@@ -0,0 +1,77 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Titlefont before top node</title>
+
+<meta name="description" content="Titlefont before top node">
+<meta name="keywords" content="Titlefont before top node">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<p>Garbage
+</p>
+<h1 class="titlefont">Titlefont before top node</h1>
+
+<a name="Top"></a>
+<p>Top node
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#second-node">• second
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#Top">•
TOP</a></td><td> </td><td align="left" valign="top"> myself
+</td></tr>
+</table>
+
+<a name="second-node"></a>
+<p>second node (@node second node,,top,TOP).
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#other-node">• other
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="other-node"></a>
+<p>ref to TOP <a href="#Top">Top</a>.
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/sectionning/res/no_section_no_top_no_node/no_section_no_top.2
===================================================================
RCS file: test/sectionning/res/no_section_no_top_no_node/no_section_no_top.2
diff -N test/sectionning/res/no_section_no_top_no_node/no_section_no_top.2
Index: test/sectionning/res/no_section_no_top_no_node/no_section_no_top.html
===================================================================
RCS file: test/sectionning/res/no_section_no_top_no_node/no_section_no_top.html
diff -N test/sectionning/res/no_section_no_top_no_node/no_section_no_top.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/no_section_no_top_no_node/no_section_no_top.html
8 Sep 2008 16:29:49 -0000 1.1
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+
+<p>Garbage
+</p>
+<a name="first"></a>
+<p>first node
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#second-node">• second
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="second-node"></a>
+<p>second node
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/sectionning/res/nodes_after_top_no_node/nodes_after_top.2
===================================================================
RCS file: test/sectionning/res/nodes_after_top_no_node/nodes_after_top.2
diff -N test/sectionning/res/nodes_after_top_no_node/nodes_after_top.2
Index: test/sectionning/res/nodes_after_top_no_node/nodes_after_top.html
===================================================================
RCS file: test/sectionning/res/nodes_after_top_no_node/nodes_after_top.html
diff -N test/sectionning/res/nodes_after_top_no_node/nodes_after_top.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/nodes_after_top_no_node/nodes_after_top.html 8 Sep
2008 16:29:49 -0000 1.1
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<h1 class="node">Top</h1>
+<p>Top node
+</p><table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#second-node">• second
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#third-node">• third
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="second-node"></a>
+
+<p>second node
+</p>
+<a name="third-node"></a>
+
+
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/sectionning/res/one_node_no_node/one_node.2
===================================================================
RCS file: test/sectionning/res/one_node_no_node/one_node.2
diff -N test/sectionning/res/one_node_no_node/one_node.2
Index: test/sectionning/res/one_node_no_node/one_node.html
===================================================================
RCS file: test/sectionning/res/one_node_no_node/one_node.html
diff -N test/sectionning/res/one_node_no_node/one_node.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/one_node_no_node/one_node.html 8 Sep 2008 16:29:50
-0000 1.1
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+
+<p>Garbage
+</p>
+<a name="one-node"></a>
+<p>Top node
+</p>
+<p>anchor ref <a name="ref"></a>.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="gcc.html#Top">•
(gcc)</a></td><td> </td><td align="left" valign="top"> ref to gcc
+</td></tr>
+</table>
+
+
+<p>ref to ref <a href="#ref">ref</a>.
+</p>
+<p>Some text.
+</p>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index:
test/sectionning/res/placed_things_before_element/placed_things_before_element.2
===================================================================
RCS file:
test/sectionning/res/placed_things_before_element/placed_things_before_element.2
diff -N
test/sectionning/res/placed_things_before_element/placed_things_before_element.2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/sectionning/res/placed_things_before_element/placed_things_before_element.2
8 Sep 2008 16:29:50 -0000 1.1
@@ -0,0 +1,2 @@
+** menu entry without previous node: An anchor (l. 30)
+** Index entry before document: @cindex index entry (l. 33)
Index:
test/sectionning/res/placed_things_before_element/placed_things_before_element.html
===================================================================
RCS file:
test/sectionning/res/placed_things_before_element/placed_things_before_element.html
diff -N
test/sectionning/res/placed_things_before_element/placed_things_before_element.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
test/sectionning/res/placed_things_before_element/placed_things_before_element.html
8 Sep 2008 16:29:50 -0000 1.1
@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>before element test</title>
+
+<meta name="description" content="before element test">
+<meta name="keywords" content="before element test">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<p><a name="An-anchor"></a>
+</p>
+<p>Ref to the anchor:
+<a href="#An-anchor">An anchor</a>
+</p>
+<p>Ref to the anchor in footnote:
+<a href="#Anchor-in-footnote">Anchor in footnote</a>.
+</p>
+<p><a name="DOCF1" href="#FOOT1">(1)</a>
+</p>
+<div class="float"><a name="float-anchor"></a>
+<p>In float
+</p></div><p><strong>1.1</strong>
+</p>
+<p>Ref to float
+<a href="#float-anchor">float anchor</a>.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#An-anchor">An
anchor</a></td><td> </td><td align="left" valign="top">
menu entry pointing to the anchor.
+</td></tr>
+</table>
+
+<a name="index-index-entry"></a>
+
+<a name="section"></a>
+<h2 class="section">1. section</h2>
+
+<p>Ref to anchor
+<a href="#An-anchor">An anchor</a>
+</p>
+<p>Ref to footnote anchor
+<a href="#Anchor-in-footnote">Anchor in footnote</a>
+</p>
+<div class="footnote">
+<hr>
+<h3>Footnotes</h3>
+<h3><a name="FOOT1" href="#DOCF1">(1)</a></h3>
+<p>In footnote.
+</p>
+<p><a name="Anchor-in-footnote"></a>
+</p>
+<p>Ref to main text anchor
+<a href="#An-anchor">An anchor</a>
+</p></div>
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/sectionning/res/rec_nodes_no_node/rec_nodes.2
===================================================================
RCS file: test/sectionning/res/rec_nodes_no_node/rec_nodes.2
diff -N test/sectionning/res/rec_nodes_no_node/rec_nodes.2
Index: test/sectionning/res/rec_nodes_no_node/rec_nodes.html
===================================================================
RCS file: test/sectionning/res/rec_nodes_no_node/rec_nodes.html
diff -N test/sectionning/res/rec_nodes_no_node/rec_nodes.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/sectionning/res/rec_nodes_no_node/rec_nodes.html 8 Sep 2008
16:29:50 -0000 1.1
@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
+<html>
+<!-- Created on a sunny day by texi2html
+texi2html was written by:
+ Lionel Cons <address@hidden> (original author)
+ Karl Berry <address@hidden>
+ Olaf Bachmann <address@hidden>
+ and many others.
+Maintained by: Many creative people.
+Send bugs and suggestions to <address@hidden>
+-->
+<head>
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2html">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+pre.display {font-family: serif}
+pre.format {font-family: serif}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: serif; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: serif; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.roman {font-family:serif; font-weight:normal;}
+span.sansserif {font-family:sans-serif; font-weight:normal;}
+ul.toc {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
+
+<a name="Top"></a>
+<h1 class="node">Top</h1>
+<p>Top node
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#second-node">• second
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#node-following-second">• node
following second</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="second-node"></a>
+<p>second node (@node second node,,top,TOP).
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#other-node">• other
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top"><a href="#second-node">• second
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="other-node"></a>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#other-node">• other
node</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<a name="node-up-node-following-second"></a>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#node-following-second">• node
following second</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<p>in node up node following second
+</p>
+<a name="node-following-second"></a>
+
+<p>in node following second
+</p><table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a
href="#node-up-node-following-second">• node up node following
second</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr size="1">
+<p>
+ <font size="-1">
+ This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
+ </font>
+ <br>
+
+</p>
+</body>
+</html>
Index: test/layout/res/formatting_makeinfo/formatting_ovr.html
===================================================================
RCS file: test/layout/res/formatting_makeinfo/formatting_ovr.html
diff -N test/layout/res/formatting_makeinfo/formatting_ovr.html
--- test/layout/res/formatting_makeinfo/formatting_ovr.html 29 Aug 2008
15:06:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,716 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
-<html>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-''
-
-asis: "simple-double-three-four-"
-
-strong: "simple-double-three-four-"
-
-kbd: ``simple-double-three-four-''
-
-
-``simple-double-three-four-''
-
-
-
-@"u u"
-@"{U} U"
address@hidden n~
address@hidden a^
-@'e e'
address@hidden o=
address@hidden i`
-@'{e} e'
-@'address@hidden i'
address@hidden i
address@hidden j
address@hidden@=E} E=`
address@hidden l
-@,{@'C} C',
-@,c c,
-@,c@"u c,u"
-
-
address@hidden
-
-@ followed by a space
-
-@ followed by a tab
-
-@ followed by a new line
-
address@hidden
-@|
-@:
address@hidden !
address@hidden ?
address@hidden .
-@@ @
address@hidden }
address@hidden {
-@/
-
-foo vs. bar.
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
address@hidden TeX
address@hidden LaTeX
address@hidden *
address@hidden C
address@hidden ...
address@hidden ...
address@hidden ==
address@hidden error->
address@hidden ==>
address@hidden -
address@hidden -!-
address@hidden -|
address@hidden =>
address@hidden a sunny day
address@hidden aa
address@hidden AA
address@hidden ae
address@hidden oe
address@hidden AE
address@hidden OE
address@hidden o
address@hidden O
address@hidden ss
address@hidden l
address@hidden L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden R
address@hidden a
address@hidden o
address@hidden ,
address@hidden ``
address@hidden ''
address@hidden `
address@hidden '
address@hidden ,,
address@hidden ,
address@hidden <<
address@hidden >>
address@hidden <<
address@hidden >>
address@hidden <
address@hidden >
address@hidden o
address@hidden Euro
address@hidden ->
address@hidden <=
address@hidden >=
-
address@hidden,an accronym} -a
address@hidden -a
address@hidden@'E-. @comma{}A., @'Etude Autonome } E'-. ,A.
address@hidden@'E-. @comma{}A.} E'-. ,A.
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b,-c} -a,-b,-c
address@hidden,-b,-c} ,-b,-c
address@hidden,,-c} -a,,-c
address@hidden,,-c} ,,-c
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden:a < & @ % " - b:} a < & @ % " - b
address@hidden
address@hidden a''
address@hidden -a''
address@hidden a.
address@hidden -a.
address@hidden a*
address@hidden -a*
address@hidden a[
address@hidden -a[
address@hidden a(
address@hidden -a(
address@hidden a_
address@hidden -a_
address@hidden .a
address@hidden .-a
address@hidden a<
address@hidden -a<
-@,{c} c,
-@,{-c} -c,
address@hidden footnote}
address@hidden footnote2}
-
address@hidden f-ile
address@hidden,l-i} f-ile
address@hidden,,l-e} f-ile
address@hidden,,,alt} f-ile
address@hidden,,,,e-d-xt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
address@hidden
-
-
address@hidden @click{} A} click -> A
-After clickstyle =>
address@hidden @click{} A} click => A
-
-A quot-ation
-
-
-A Note
-
-
-A note
-
-
-Caution
-
-
-Important
-
-
-a Tip
-
-
-a Warning.
-
-
-The something e' TeX is here.
-
-
-A @ at the end of the @quotation line.
-
-
-something, other thing
-
-
-Note, the note
-
-
-
-
-
-
-
-
-
-
- i-temize
-
-
- i-tem +
-
-
- b-ullet
-
-
- minu-s
-
-
- e-mph item
-
-
- e-mph item
-
-
- i-tem 1
- i-tem 2
-
-
- e-numerate
-
-
- mu-ltitable headitem another tab
- mu-ltitable item multitable tab
- mu-ltitable item 2 multitable tab 2
- lone mu-ltitable item
-
-
- truc bidule
-
-
-
-e-xample some
- text
-
-
-
-s-mallexample
-
-
-
-d-isplay
-
-
-
-s-malldisplay
-
-
-
-l-isp
-
-
-
-s-malllisp
-
-
-
-f-ormat
-
-
-
-s-mallformat
-
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-
-cate-gory: de-ffn_name ar-guments more args
- even more so
-def-fn
-
-
-fset: i a g
-cmde: truc
-Command: log trap
-Command: log trap1
-Command: log trap2
-cmde: id ule truc
-cmde2: id i ule truc
-id i ule:
-:
-aaa:
-:
-:
-: machin
-: bidule machin
-truc: machin
-truc:
-truc: followed by a comment
-truc:
-:
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-
-empty: deffn with deffnx
-empty: deffnx
-
-
-fset: i a g
-cmde: truc
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-
-c-ategory: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-
-c-ategory: d-efcv_name
-d-efcv
-
-
-c-ategory: d-efop_name a-rguments...
-d-efop
-
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-
-Function: d-efun_name a-rguments...
-d-efun
-
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-
-Variable: d-efvar_name argvar argvar1
-d-efvar
-
-
-User Option: d-efopt_name
-d-efopt
-
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-
-Instance Variable: d-efivar_name
-d-efivar
-
-
-Instance Variable: t-ype d-eftypeivar_name
-d-eftypeivar
-
-
-Method: d-efmethod_name a-rguments...
-d-efmethod
-
-
-Method: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} .
address@hidden, cross ref name, title, file name, manual}
address@hidden, cross ref name, title, file name, manual}
address@hidden, cross ref name, file name}
-
address@hidden
address@hidden .
address@hidden
address@hidden@comma{}ion}
-
address@hidden@comma{}ion, a @comma{} in cross
-ref, a address@hidden in title, a address@hidden in file, a @comma{} in manual
name }
-
-
address@hidden,cross ref name}
address@hidden,,title}
address@hidden,,,file name}
address@hidden,,,,manual}
address@hidden,cross ref name,title,}
address@hidden,cross ref name,,file name}
address@hidden,cross ref name,,,manual}
address@hidden,cross ref name,title,file name}
address@hidden,cross ref name,title,,manual}
address@hidden,cross ref name,title, file name, manual}
address@hidden,,title,file name}
address@hidden,,title,,manual}
address@hidden,,title, file name, manual}
address@hidden,,,file name,manual}
-
-
address@hidden(pman)anode,cross ref name}
address@hidden(pman)anode,,title}
address@hidden(pman)anode,,,file name}
address@hidden(pman)anode,,,,manual}
address@hidden(pman)anode,cross ref name,title,}
address@hidden(pman)anode,cross ref name,,file name}
address@hidden(pman)anode,cross ref name,,,manual}
address@hidden(pman)anode,cross ref name,title,file name}
address@hidden(pman)anode,cross ref name,title,,manual}
address@hidden(pman)anode,cross ref name,title, file name, manual}
address@hidden(pman)anode,,title,file name}
address@hidden(pman)anode,,title,,manual}
address@hidden(pman)anode,,title, file name, manual}
address@hidden(pman)anode,,,file name,manual}
-
-
address@hidden, cross ref name, file name}
address@hidden
address@hidden, cross ref name}
address@hidden,,file name}
address@hidden, cross ref name, file name}
address@hidden
address@hidden, cross ref name}
address@hidden,,file name}
address@hidden, cross ref name, file name, spurious arg}
-
address@hidden@comma{}ion, a @comma{} in cross
-ref, a address@hidden in file}
-
-
-
- a
-l-ine
-
-
- a
- b
-l-ine
-
-
- a
- b
-l-ine
-
-
-
-c-artouche
-
-
-
-f-lushleft
-
-
-
-f-lushright
-
-
- ce-ntered line
-
-
-in verbatim ''
-
-
-
-html ''
-
-
-
-
- majorheading
-
- chapheading
-
- heading
-
- subheading
-
- subsubheading
-
-
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden@'E-. @comma{}A., @'address@hidden @b{Autonome} } E'-. ,A.
address@hidden@'E-. @comma{}A.} E'-. ,A.
-
address@hidden@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
-
address@hidden,,,address@hidden:jk _" %}} f-ile
address@hidden,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
address@hidden@verb{:jk _" %@:},,,address@hidden:jk _" %@:}} filejk _" %@
-
-
-
-
-Somehow invalid use of @,:
-
-@, ,
-
-
-@,@"u @,"u
-
-Invalid use of @':
-
-@' '
-
-
-@'@"u @'"u
-
address@hidden truc
address@hidden ij
address@hidden -a
address@hidden a
-
address@hidden, but without brace TeX
-
address@hidden @#
-
address@hidden -a
-
address@hidden,1-xt}
address@hidden,,2-xt}
address@hidden,,,3-xt}
-
-
- e-mph item
-
-
- i-tem 1
- i-tem 2
-
-
-fun:
-truc: machin bidule chose and
-truc: machin bidule chose and after
-truc: machin bidule chose and {
-truc: machin bidule chose and { and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-
address@hidden
-
address@hidden,cross ref name}
address@hidden,,title}
address@hidden,,,file name}
address@hidden,,,,manual}
address@hidden,cross ref name}
address@hidden,,title}
address@hidden,,,file name}
address@hidden,,,,manual}
address@hidden,cross ref name,title,}
address@hidden,cross ref name,,file name}
address@hidden,cross ref name,,,manual}
address@hidden,cross ref name,title,file name}
address@hidden,cross ref name,title,,manual}
address@hidden,cross ref name,title, file name, manual}
address@hidden,,title,file name}
address@hidden,,title,,manual}
address@hidden,,title, file name, manual}
address@hidden,,title, file name, manual}
address@hidden,,,file name,manual}
address@hidden,cross ref name,title,}
address@hidden,cross ref name,,file name}
address@hidden,cross ref name,,,manual}
address@hidden,cross ref name,title,file name}
address@hidden,cross ref name,title,,manual}
address@hidden,cross ref name,title, file name, manual}
address@hidden,,title,file name}
address@hidden,,title,,manual}
address@hidden,,title, file name, manual}
address@hidden,,,file name,manual}
-
address@hidden,cross ref name }
address@hidden,,file name}
address@hidden,cross ref name, file name}
address@hidden
-
-
- -->
-<!-- Created on a sunny day by texi2html
-texi2html was written by:
- Lionel Cons <address@hidden> (original author)
- Karl Berry <address@hidden>
- Olaf Bachmann <address@hidden>
- and many others.
-Maintained by: Many creative people.
-Send bugs and suggestions to <address@hidden>
--->
-<head>
-<title>title –a: Short Table of Contents</title>
-
-<meta name="description" content="title –a: Short Table of Contents">
-<meta name="keywords" content="title –a: Short Table of Contents">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2html">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link href="index.html#Top" rel="start" title="Top section">
-<link href="index.html#Top" rel="index" title="Top section">
-<link href="formatting_toc.html#SEC_Contents" rel="contents" title="Table of
Contents">
-<link href="formatting_abt.html#SEC_About" rel="help" title="About This
Document">
-<style type="text/css">
-<!--
-a.summary-letter {text-decoration: none}
-pre.display {font-family: serif}
-pre.format {font-family: serif}
-pre.menu-comment {font-family: serif}
-pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: serif; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: serif; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.roman {font-family:serif; font-weight:normal;}
-span.sansserif {font-family:sans-serif; font-weight:normal;}
-ul.toc {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
-
-<a name="SEC_Overview"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">node: </td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">[ > ]</td>
-</tr></table>
-<hr size="1">
-<h1>Short Table of Contents</h1>
-<div class="shortcontents">
-<ul class="toc">
-<li><a name="TOC1" href="chapter.html#chapter">1. chapter</a></li>
-<li><a name="TOC5" href="chapter2.html#chapter2">2. chapter 2</a></li>
-</ul>
-</div>
-<hr size="1">
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">node: </td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">[ > ]</td>
-</tr></table>
-<p>
- <font size="-1">
- This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
- </font>
- <br>
-
-</p>
-</body>
-</html>
Index: test/layout/res/formatting_makeinfo/formatting_toc.html
===================================================================
RCS file: test/layout/res/formatting_makeinfo/formatting_toc.html
diff -N test/layout/res/formatting_makeinfo/formatting_toc.html
--- test/layout/res/formatting_makeinfo/formatting_toc.html 29 Aug 2008
15:06:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,728 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html401/loose.dtd";>
-<html>
-<!-- In copying
-
-<
->
-"
-&
-'
-`
-
-"simple-double-three-four-"
-
-code: ``simple-double-three-four-''
-
-asis: "simple-double-three-four-"
-
-strong: "simple-double-three-four-"
-
-kbd: ``simple-double-three-four-''
-
-
-``simple-double-three-four-''
-
-
-
-@"u u"
-@"{U} U"
address@hidden n~
address@hidden a^
-@'e e'
address@hidden o=
address@hidden i`
-@'{e} e'
-@'address@hidden i'
address@hidden i
address@hidden j
address@hidden@=E} E=`
address@hidden l
-@,{@'C} C',
-@,c c,
-@,c@"u c,u"
-
-
address@hidden
-
-@ followed by a space
-
-@ followed by a tab
-
-@ followed by a new line
-
address@hidden
-@|
-@:
address@hidden !
address@hidden ?
address@hidden .
-@@ @
address@hidden }
address@hidden {
-@/
-
-foo vs. bar.
-colon :And something else.
-semi colon ;.
-And ? ?.
-Now ! !@
-but , ,
-
address@hidden TeX
address@hidden LaTeX
address@hidden *
address@hidden C
address@hidden ...
address@hidden ...
address@hidden ==
address@hidden error->
address@hidden ==>
address@hidden -
address@hidden -!-
address@hidden -|
address@hidden =>
address@hidden a sunny day
address@hidden aa
address@hidden AA
address@hidden ae
address@hidden oe
address@hidden AE
address@hidden OE
address@hidden o
address@hidden O
address@hidden ss
address@hidden l
address@hidden L
address@hidden ! upside-down
address@hidden ? upside-down
address@hidden pound sterling
address@hidden R
address@hidden a
address@hidden o
address@hidden ,
address@hidden ``
address@hidden ''
address@hidden `
address@hidden '
address@hidden ,,
address@hidden ,
address@hidden <<
address@hidden >>
address@hidden <<
address@hidden >>
address@hidden <
address@hidden >
address@hidden o
address@hidden Euro
address@hidden ->
address@hidden <=
address@hidden >=
-
address@hidden,an accronym} -a
address@hidden -a
address@hidden@'E-. @comma{}A., @'Etude Autonome } E'-. ,A.
address@hidden@'E-. @comma{}A.} E'-. ,A.
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -b
address@hidden,-b} -b
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden {\frac{1}{2}} @minus{}} -a {\frac{1}{2}} -
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -A
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden -a
address@hidden,-b} -a,-b
address@hidden -a
address@hidden,-b} ,-b
address@hidden,-b,-c} -a,-b,-c
address@hidden,-b,-c} ,-b,-c
address@hidden,,-c} -a,,-c
address@hidden,,-c} ,,-c
address@hidden,-b} -a,-b
address@hidden,} -a,
address@hidden,-b} ,-b
address@hidden -a
address@hidden:-a:} -a
address@hidden:a < & @ % " - b:} a < & @ % " - b
address@hidden
address@hidden a''
address@hidden -a''
address@hidden a.
address@hidden -a.
address@hidden a*
address@hidden -a*
address@hidden a[
address@hidden -a[
address@hidden a(
address@hidden -a(
address@hidden a_
address@hidden -a_
address@hidden .a
address@hidden .-a
address@hidden a<
address@hidden -a<
-@,{c} c,
-@,{-c} -c,
address@hidden footnote}
address@hidden footnote2}
-
address@hidden f-ile
address@hidden,l-i} f-ile
address@hidden,,l-e} f-ile
address@hidden,,,alt} f-ile
address@hidden,,,,e-d-xt} f-ile
address@hidden,aze,az,alt,e-xt} f-ile
address@hidden,aze,,a-lt} f-ile
address@hidden@file{f-ile}@@@.,aze,az,alt,@file{file ext} address@hidden
address@hidden
-
-
address@hidden @click{} A} click -> A
-After clickstyle =>
address@hidden @click{} A} click => A
-
-A quot-ation
-
-
-A Note
-
-
-A note
-
-
-Caution
-
-
-Important
-
-
-a Tip
-
-
-a Warning.
-
-
-The something e' TeX is here.
-
-
-A @ at the end of the @quotation line.
-
-
-something, other thing
-
-
-Note, the note
-
-
-
-
-
-
-
-
-
-
- i-temize
-
-
- i-tem +
-
-
- b-ullet
-
-
- minu-s
-
-
- e-mph item
-
-
- e-mph item
-
-
- i-tem 1
- i-tem 2
-
-
- e-numerate
-
-
- mu-ltitable headitem another tab
- mu-ltitable item multitable tab
- mu-ltitable item 2 multitable tab 2
- lone mu-ltitable item
-
-
- truc bidule
-
-
-
-e-xample some
- text
-
-
-
-s-mallexample
-
-
-
-d-isplay
-
-
-
-s-malldisplay
-
-
-
-l-isp
-
-
-
-s-malllisp
-
-
-
-f-ormat
-
-
-
-s-mallformat
-
-
-c-ategory: d-effn_name a-rguments...
-d-effn
-
-
-cate-gory: de-ffn_name ar-guments more args
- even more so
-def-fn
-
-
-fset: i a g
-cmde: truc
-Command: log trap
-Command: log trap1
-Command: log trap2
-cmde: id ule truc
-cmde2: id i ule truc
-id i ule:
-:
-aaa:
-:
-:
-: machin
-: bidule machin
-truc: machin
-truc:
-truc: followed by a comment
-truc:
-:
-truc: a b c d e f g h i
-truc: deffnx before end deffn
-
-
-empty: deffn
-
-
-empty: deffn with deffnx
-empty: deffnx
-
-
-fset: i a g
-cmde: truc
-text in def item for second def item
-
-
-c-ategory: d-efvr_name
-d-efvr
-
-
-c-ategory: t-ype d-eftypefn_name a-rguments...
-d-eftypefn
-
-
-c-ategory: t-ype d-eftypeop_name a-rguments...
-d-eftypeop
-
-
-c-ategory: t-ype d-eftypevr_name
-d-eftypevr
-
-
-c-ategory: d-efcv_name
-d-efcv
-
-
-c-ategory: d-efop_name a-rguments...
-d-efop
-
-
-c-ategory: d-eftp_name a-ttributes...
-d-eftp
-
-
-Function: d-efun_name a-rguments...
-d-efun
-
-
-Macro: d-efmac_name a-rguments...
-d-efmac
-
-
-Special Form: d-efspec_name a-rguments...
-d-efspec
-
-
-Variable: d-efvar_name argvar argvar1
-d-efvar
-
-
-User Option: d-efopt_name
-d-efopt
-
-
-Function: t-ype d-eftypefun_name a-rguments...
-d-eftypefun
-
-
-Variable: t-ype d-eftypevar_name
-d-eftypevar
-
-
-Instance Variable: d-efivar_name
-d-efivar
-
-
-Instance Variable: t-ype d-eftypeivar_name
-d-eftypeivar
-
-
-Method: d-efmethod_name a-rguments...
-d-efmethod
-
-
-Method: t-ype d-eftypemethod_name a-rguments...
-d-eftypemethod
-
-
address@hidden@@, cross r-ef name@@, t-itle@@, file n-ame@@, ma-nual@@} .
address@hidden, cross ref name, title, file name, manual}
address@hidden, cross ref name, title, file name, manual}
address@hidden, cross ref name, file name}
-
address@hidden
address@hidden .
address@hidden
address@hidden@comma{}ion}
-
address@hidden@comma{}ion, a @comma{} in cross
-ref, a address@hidden in title, a address@hidden in file, a @comma{} in manual
name }
-
-
address@hidden,cross ref name}
address@hidden,,title}
address@hidden,,,file name}
address@hidden,,,,manual}
address@hidden,cross ref name,title,}
address@hidden,cross ref name,,file name}
address@hidden,cross ref name,,,manual}
address@hidden,cross ref name,title,file name}
address@hidden,cross ref name,title,,manual}
address@hidden,cross ref name,title, file name, manual}
address@hidden,,title,file name}
address@hidden,,title,,manual}
address@hidden,,title, file name, manual}
address@hidden,,,file name,manual}
-
-
address@hidden(pman)anode,cross ref name}
address@hidden(pman)anode,,title}
address@hidden(pman)anode,,,file name}
address@hidden(pman)anode,,,,manual}
address@hidden(pman)anode,cross ref name,title,}
address@hidden(pman)anode,cross ref name,,file name}
address@hidden(pman)anode,cross ref name,,,manual}
address@hidden(pman)anode,cross ref name,title,file name}
address@hidden(pman)anode,cross ref name,title,,manual}
address@hidden(pman)anode,cross ref name,title, file name, manual}
address@hidden(pman)anode,,title,file name}
address@hidden(pman)anode,,title,,manual}
address@hidden(pman)anode,,title, file name, manual}
address@hidden(pman)anode,,,file name,manual}
-
-
address@hidden, cross ref name, file name}
address@hidden
address@hidden, cross ref name}
address@hidden,,file name}
address@hidden, cross ref name, file name}
address@hidden
address@hidden, cross ref name}
address@hidden,,file name}
address@hidden, cross ref name, file name, spurious arg}
-
address@hidden@comma{}ion, a @comma{} in cross
-ref, a address@hidden in file}
-
-
-
- a
-l-ine
-
-
- a
- b
-l-ine
-
-
- a
- b
-l-ine
-
-
-
-c-artouche
-
-
-
-f-lushleft
-
-
-
-f-lushright
-
-
- ce-ntered line
-
-
-in verbatim ''
-
-
-
-html ''
-
-
-
-
- majorheading
-
- chapheading
-
- heading
-
- subheading
-
- subsubheading
-
-
address@hidden,an accronym @comma{} @enddots{}} -a
address@hidden@'E-. @comma{}A., @'address@hidden @b{Autonome} } E'-. ,A.
address@hidden@'E-. @comma{}A.} E'-. ,A.
-
address@hidden@minus{} {\frac{1}{2}}} -a- {\frac{1}{2}}
-
address@hidden,,,address@hidden:jk _" %}} f-ile
address@hidden,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
address@hidden@verb{:jk _" %@:},,,address@hidden:jk _" %@:}} filejk _" %@
-
-
-
-
-Somehow invalid use of @,:
-
-@, ,
-
-
-@,@"u @,"u
-
-Invalid use of @':
-
-@' '
-
-
-@'@"u @'"u
-
address@hidden truc
address@hidden ij
address@hidden -a
address@hidden a
-
address@hidden, but without brace TeX
-
address@hidden @#
-
address@hidden -a
-
address@hidden,1-xt}
address@hidden,,2-xt}
address@hidden,,,3-xt}
-
-
- e-mph item
-
-
- i-tem 1
- i-tem 2
-
-
-fun:
-truc: machin bidule chose and
-truc: machin bidule chose and after
-truc: machin bidule chose and {
-truc: machin bidule chose and { and after
-truc: followed by a comment
-Various deff lines
-truc: after a deff item
-
-
address@hidden
-
address@hidden,cross ref name}
address@hidden,,title}
address@hidden,,,file name}
address@hidden,,,,manual}
address@hidden,cross ref name}
address@hidden,,title}
address@hidden,,,file name}
address@hidden,,,,manual}
address@hidden,cross ref name,title,}
address@hidden,cross ref name,,file name}
address@hidden,cross ref name,,,manual}
address@hidden,cross ref name,title,file name}
address@hidden,cross ref name,title,,manual}
address@hidden,cross ref name,title, file name, manual}
address@hidden,,title,file name}
address@hidden,,title,,manual}
address@hidden,,title, file name, manual}
address@hidden,,title, file name, manual}
address@hidden,,,file name,manual}
address@hidden,cross ref name,title,}
address@hidden,cross ref name,,file name}
address@hidden,cross ref name,,,manual}
address@hidden,cross ref name,title,file name}
address@hidden,cross ref name,title,,manual}
address@hidden,cross ref name,title, file name, manual}
address@hidden,,title,file name}
address@hidden,,title,,manual}
address@hidden,,title, file name, manual}
address@hidden,,,file name,manual}
-
address@hidden,cross ref name }
address@hidden,,file name}
address@hidden,cross ref name, file name}
address@hidden
-
-
- -->
-<!-- Created on a sunny day by texi2html
-texi2html was written by:
- Lionel Cons <address@hidden> (original author)
- Karl Berry <address@hidden>
- Olaf Bachmann <address@hidden>
- and many others.
-Maintained by: Many creative people.
-Send bugs and suggestions to <address@hidden>
--->
-<head>
-<title>title –a: Table of Contents</title>
-
-<meta name="description" content="title –a: Table of Contents">
-<meta name="keywords" content="title –a: Table of Contents">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2html">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link href="index.html#Top" rel="start" title="Top section">
-<link href="index.html#Top" rel="index" title="Top section">
-<link href="#SEC_Contents" rel="contents" title="Table of Contents">
-<link href="formatting_abt.html#SEC_About" rel="help" title="About This
Document">
-<style type="text/css">
-<!--
-a.summary-letter {text-decoration: none}
-pre.display {font-family: serif}
-pre.format {font-family: serif}
-pre.menu-comment {font-family: serif}
-pre.menu-preformatted {font-family: serif}
-pre.smalldisplay {font-family: serif; font-size: smaller}
-pre.smallexample {font-size: smaller}
-pre.smallformat {font-family: serif; font-size: smaller}
-pre.smalllisp {font-size: smaller}
-span.roman {font-family:serif; font-weight:normal;}
-span.sansserif {font-family:sans-serif; font-weight:normal;}
-ul.toc {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF"
vlink="#800080" alink="#FF0000">
-
-<a name="SEC_Contents"></a>
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">node: </td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">[ > ]</td>
-</tr></table>
-<hr size="1">
-<h1>Table of Contents</h1>
-<div class="contents">
-
-<ul class="toc">
- <li><a name="TOC1" href="chapter.html#chapter">1. chapter</a>
- <ul class="toc">
- <li><a name="TOC2"
href="s_002d_002dect_002cion.html#s_002d_002dect_002cion">1.1 A section</a>
- <ul class="toc">
- <li><a name="TOC3" href="subsection.html#subsection">1.1.1 subsection</a>
- <ul class="toc">
- <li><a name="TOC4"
href="subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html#subsubsection-_0060_0060simple_002ddouble_002d_002dthree_002d_002d_002dfour_002d_002d_002d_002d_0027_0027">1.1.1.1
subsubsection
“simple-double–three—four—-”</a></li>
- </ul>
-</li>
- </ul>
-</li>
- </ul></li>
- <li><a name="TOC5" href="chapter2.html#chapter2">2. chapter 2</a></li>
-</ul>
-</div>
-<hr size="1">
-<table cellpadding="1" cellspacing="1" border="0">
-<tr><td valign="middle" align="left">node: </td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">,</td>
-<td valign="middle" align="left"></td>
-<td valign="middle" align="left">[ > ]</td>
-</tr></table>
-<p>
- <font size="-1">
- This document was generated by <em>a tester</em> on <em>a sunny day</em>
using <a href="http://www.nongnu.org/texi2html/";><em>texi2html</em></a>.
- </font>
- <br>
-
-</p>
-</body>
-</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog NEWS TODO texi2html.init te...,
Patrice Dumas <=