[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (converter_defaults)
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (converter_defaults) (_set_variables_texi2html): copy %defaults and modify the copy in _set_variables_texi2html() instead of changing the file global variable. |
|
Date: |
Sun, 01 Jan 2023 19:15:24 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new cd3c3559a3 * tp/Texinfo/Convert/HTML.pm (converter_defaults)
(_set_variables_texi2html): copy %defaults and modify the copy in
_set_variables_texi2html() instead of changing the file global variable.
cd3c3559a3 is described below
commit cd3c3559a362b6ec339ce4b2279a391a0963bde7
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 2 01:15:10 2023 +0100
* tp/Texinfo/Convert/HTML.pm (converter_defaults)
(_set_variables_texi2html): copy %defaults and modify the copy in
_set_variables_texi2html() instead of changing the file global
variable.
* tp/Texinfo/Convert/HTML.pm (_convert_menu_entry_type): menu entry
node 'normalized' may be undefined if it consists in spaces only.
* tp/Makefile.tres, tp/t/30sectioning.t: new tests
in_menu_only_special_ascii_spaces_node_menu and
in_menu_only_special_spaces_node_menu with 'FORMAT_MENU' => 'menu'
based on tests with menu entry nodes consisting only in spaces.
* tp/Makefile.tres, tp/t/96moresectioning.t, tp/Makefile.am
(test_files), tp/t/30sectioning.t: move
nodes_after_top_before_chapter* and nodes_after_top_before_section*
tests from t/96moresectioning.t to t/30sectioning.t, use the inline
texts and remove the Texinfo files, and rename the tests with
_texi2html added.
* tp/Makefile.am (test_files), tp/t/96moresectioning.t: remove
t/input_files/sectioning.texi, use only
tests/sectioning/sectioning.texi.
---
ChangeLog | 26 +
tp/Makefile.am | 3 -
tp/Makefile.tres | 38 +-
tp/Texinfo/Convert/HTML.pm | 17 +-
tp/t/30sectioning.t | 35 ++
tp/t/96moresectioning.t | 45 +-
.../nodes_after_top_before_chapter.texi | 21 -
.../nodes_after_top_before_section.texi | 21 -
tp/t/input_files/sectioning.texi | 98 ---
...s_after_top_before_chapter_use_nodes_chapter.pl | 679 ---------------------
.../in_menu_only_special_ascii_spaces_node_menu.pl | 615 +++++++++++++++++++
.../nodes_after_top_before_chapter_texi2html.pl} | 200 ++----
.../nodes_after_top_before_chapter_texi2html.html} | 4 -
..._before_chapter_texi2html_use_nodes_chapter.pl} | 182 ++----
.../res_html/index.html | 8 +-
...e_chapter_texi2html_use_nodes_chapter_abt.html} | 0
.../res_html/second-node.html | 0
.../res_html/third-node.html | 6 +-
..._after_top_before_section_texi2html_chapter.pl} | 182 ++----
.../res_html/index.html | 4 -
.../res_html/second-node.html | 0
.../res_html/third-node.html | 0
...fter_top_before_section_texi2html_use_nodes.pl} | 182 ++----
...er_top_before_section_texi2html_use_nodes.html} | 4 -
..._before_section_texi2html_use_nodes_chapter.pl} | 182 ++----
.../res_html/index.html | 12 +-
...e_section_texi2html_use_nodes_chapter_abt.html} | 0
.../res_html/second-node.html | 0
.../res_html/third-node.html | 0
29 files changed, 986 insertions(+), 1578 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c87371f941..57d5c6fd52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2023-01-01 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (converter_defaults)
+ (_set_variables_texi2html): copy %defaults and modify the copy in
+ _set_variables_texi2html() instead of changing the file global
+ variable.
+
+ * tp/Texinfo/Convert/HTML.pm (_convert_menu_entry_type): menu entry
+ node 'normalized' may be undefined if it consists in spaces only.
+
+ * tp/Makefile.tres, tp/t/30sectioning.t: new tests
+ in_menu_only_special_ascii_spaces_node_menu and
+ in_menu_only_special_spaces_node_menu with 'FORMAT_MENU' => 'menu'
+ based on tests with menu entry nodes consisting only in spaces.
+
+ * tp/Makefile.tres, tp/t/96moresectioning.t, tp/Makefile.am
+ (test_files), tp/t/30sectioning.t: move
+ nodes_after_top_before_chapter* and nodes_after_top_before_section*
+ tests from t/96moresectioning.t to t/30sectioning.t, use the inline
+ texts and remove the Texinfo files, and rename the tests with
+ _texi2html added.
+
+ * tp/Makefile.am (test_files), tp/t/96moresectioning.t: remove
+ t/input_files/sectioning.texi, use only
+ tests/sectioning/sectioning.texi.
+
2023-01-01 Patrice Dumas <pertusus@free.fr>
* tp/Makefile.tres, tp/t/96moresectioning.t: do not use the texi2html
diff --git a/tp/Makefile.am b/tp/Makefile.am
index 7301c64e1d..7826af6755 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -230,8 +230,6 @@ test_files = \
t/input_files/no_monolithic.texi \
t/input_files/no_node.texi \
t/input_files/node_footnote.texi \
- t/input_files/nodes_after_top_before_chapter.texi \
- t/input_files/nodes_after_top_before_section.texi \
t/input_files/non_break_spaces.texi \
t/input_files/one_line.texi \
t/input_files/one_line_no_content.texi \
@@ -242,7 +240,6 @@ test_files = \
t/input_files/punctuation_small_case_accents_utf8.texi \
t/input_files/reference_to_only_special_spaces_node.texi \
t/input_files/sample_utf8.texi \
- t/input_files/sectioning.texi \
t/input_files/simplest.texi \
t/input_files/split_chapter_index.texi \
t/input_files/split_nocopying.texi \
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index f58dab1711..522ee49698 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1563,24 +1563,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/moresectioning/node_footnote_use_node_separate/res_html/chapter.html \
t/results/moresectioning/node_footnote_use_node_separate/res_html/index.html
\
t/results/moresectioning/node_footnote_use_node_separate/res_html/node_footnote_fot.html
\
- t/results/moresectioning/nodes_after_top_before_chapter.pl \
-
t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
\
- t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
\
-
t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
\
-
t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/nodes_after_top_before_chapter_abt.html
\
-
t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/second-node.html
\
-
t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/third-node.html
\
- t/results/moresectioning/nodes_after_top_before_section.pl \
- t/results/moresectioning/nodes_after_top_before_section/res_html/index.html \
-
t/results/moresectioning/nodes_after_top_before_section/res_html/second-node.html
\
-
t/results/moresectioning/nodes_after_top_before_section/res_html/third-node.html
\
- t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl \
-
t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
\
- t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
\
-
t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
\
-
t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/nodes_after_top_before_section_abt.html
\
-
t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/second-node.html
\
-
t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/third-node.html
\
t/results/moresectioning/placed_things_before_element.pl \
t/results/moresectioning/placed_things_before_element/res_html/placed_things_before_element.html
\
t/results/moresectioning/sectioning_frames.pl \
@@ -1881,7 +1863,9 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/external_node_in_menu.pl \
t/results/sectioning/hole_in_sectioning.pl \
t/results/sectioning/in_menu_only_special_ascii_spaces_node.pl \
+ t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl \
t/results/sectioning/in_menu_only_special_spaces_node.pl \
+ t/results/sectioning/in_menu_only_special_spaces_node_menu.pl \
t/results/sectioning/internal_top_node_up.pl \
t/results/sectioning/lone_Top_node.pl \
t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex \
@@ -1916,8 +1900,26 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/nodes_after_top_before_chapter_not_split.pl \
t/results/sectioning/nodes_after_top_before_chapter_not_split_no_use_node_directions.pl
\
t/results/sectioning/nodes_after_top_before_chapter_sections.pl \
+ t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl \
+
t/results/sectioning/nodes_after_top_before_chapter_texi2html/res_html/nodes_after_top_before_chapter_texi2html.html
\
+
t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
\
+
t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/index.html
\
+
t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/nodes_after_top_before_chapter_texi2html_use_nodes_chapter_abt.html
\
+
t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/second-node.html
\
+
t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/third-node.html
\
t/results/sectioning/nodes_after_top_before_section_nodes.pl \
t/results/sectioning/nodes_after_top_before_section_sections.pl \
+ t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl \
+
t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/index.html
\
+
t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/second-node.html
\
+
t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/third-node.html
\
+ t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl \
+
t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes/res_html/nodes_after_top_before_section_texi2html_use_nodes.html
\
+
t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
\
+
t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/index.html
\
+
t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/nodes_after_top_before_section_texi2html_use_nodes_chapter_abt.html
\
+
t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/second-node.html
\
+
t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/third-node.html
\
t/results/sectioning/nodes_before_after_top.pl \
t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
\
t/results/sectioning/nodes_before_after_top_xref.pl \
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 79e86cf185..ba3c609697 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1147,6 +1147,9 @@ sub label_command($$)
{
my $self = shift;
my $label = shift;
+ if (!defined($label)) {
+ cluck;
+ }
if ($self->{'labels'}) {
return $self->{'labels'}->{$label};
}
@@ -2343,7 +2346,10 @@ sub converter_defaults($$)
my $self = shift;
my $conf = shift;
if ($conf and defined($conf->{'TEXI2HTML'})) {
- _set_variables_texi2html();
+ my $default_ref = { %defaults };
+ my %texi2html_defaults = %$default_ref;
+ _set_variables_texi2html(\%texi2html_defaults);
+ return %texi2html_defaults;
}
return %defaults;
}
@@ -6345,7 +6351,8 @@ sub _convert_menu_entry_type($$$)
if ($node_entry->{'manual_content'}) {
$href = $self->command_href($node_entry, undef, $element);
$external_node = 1;
- } else {
+ # may not be defined in case of menu entry node consisting only of spaces
+ } elsif (defined($node_entry->{'normalized'})) {
my $node = $self->label_command($node_entry->{'normalized'});
if ($node) {
# if !NODE_NAME_IN_MENU, we pick the associated section, except if
@@ -11439,8 +11446,9 @@ sub _convert($$;$)
print STDERR "DEBUG: HERE!($element)\n";
}
-sub _set_variables_texi2html()
+sub _set_variables_texi2html($)
{
+ my $options = shift;
my @texi2html_options = (
# added hopefully temporarily to be able to validate with W3C validator
#['DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>'],
@@ -11493,7 +11501,8 @@ sub _set_variables_texi2html()
);
foreach my $option (@texi2html_options) {
#no warnings 'once';
- $defaults{$option->[0]} = $option->[1];
+ #$defaults{$option->[0]} = $option->[1];
+ $options->{$option->[0]} = $option->[1];
}
}
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index fe971e7192..9d81806a93 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -654,9 +654,16 @@ undef, {'test_file' => 'only_special_spaces_node.texi',
# a subset of the next test, with ascii spaces only
['in_menu_only_special_ascii_spaces_node',
undef, {'test_file' => 'in_menu_only_special_ascii_spaces_node.texi'}],
+['in_menu_only_special_ascii_spaces_node_menu',
+undef, {'test_file' => 'in_menu_only_special_ascii_spaces_node.texi'},
+{'FORMAT_MENU' => 'menu'}],
['in_menu_only_special_spaces_node',
undef, {'test_file' => 'in_menu_only_special_spaces_node.texi',
'skip' => ($] < 5.014) ? 'Perl too old: /a regex flag needed' : undef,
}],
+['in_menu_only_special_spaces_node_menu',
+undef, {'test_file' => 'in_menu_only_special_spaces_node.texi',
+ 'skip' => ($] < 5.014) ? 'Perl too old: /a regex flag needed' : undef,
},
+ {'FORMAT_MENU' => 'menu'}],
['reference_to_only_special_spaces_node',
undef, {'test_file' => 'reference_to_only_special_spaces_node.texi',
'skip' => ($] < 5.014) ? 'Perl too old: /a regex flag needed' : undef,
}],
@@ -2138,6 +2145,34 @@ my @test_out_files = (
['character_and_spaces_in_refs_out',
$character_and_spaces_in_refs_text,
{'test_split' => 'node'},],
+# test the texi2html style to test the style for tests
+# interesting to test diverse splitting options, and already
+# used for that above.
+['nodes_after_top_before_chapter_texi2html',
+ $nodes_after_top_before_chapter_text,
+ {},
+ {'TEXI2HTML' => 1, }
+],
+['nodes_after_top_before_chapter_texi2html_use_nodes_chapter',
+ $nodes_after_top_before_chapter_text,
+ {},
+ {'TEXI2HTML' => 1, 'USE_NODES' => 1, 'SPLIT' => 'chapter'}
+],
+['nodes_after_top_before_section_texi2html_chapter',
+ $nodes_after_top_before_section_text,
+ {},
+ {'TEXI2HTML' => 1, 'SPLIT' => 'chapter'}
+],
+['nodes_after_top_before_section_texi2html_use_nodes',
+ $nodes_after_top_before_section_text,
+ {},
+ {'TEXI2HTML' => 1, 'USE_NODES' => 1}
+],
+['nodes_after_top_before_section_texi2html_use_nodes_chapter',
+ $nodes_after_top_before_section_text,
+ {},
+ {'TEXI2HTML' => 1, 'USE_NODES' => 1, 'SPLIT' => 'chapter'}
+],
['topic_guide',
undef,
{'test_file' => 'topic_guide.texi',
diff --git a/tp/t/96moresectioning.t b/tp/t/96moresectioning.t
index 25fa1095ba..e3cc247a1b 100644
--- a/tp/t/96moresectioning.t
+++ b/tp/t/96moresectioning.t
@@ -5,21 +5,18 @@ use Texinfo::ModulePath (undef, undef, undef, 'updirs' => 2);
require 't/test_utils.pl';
-# These tests are supposed to test the same things as tests
-# under tp/tests did, but to be faster, as we are avoiding the
-# start-up time of perl for every one.
my @test_cases = (
# in this test, there are three nodes with the same transliterations
# that end up in the same file even when split at node
['node_footnote_use_node',
undef,
+ # also tests for node without section command nor directions after
+ # a section, and Top without @top and chapter in menu
{'test_file' => 'node_footnote.texi'},
{'FORMAT_MENU' => 'menu'}
],
['node_footnote_end',
undef,
- # also tests for node with section command nor directions after
- # a section, and Top without @top and chapter in menu
{'test_file' => 'node_footnote.texi', 'CHECK_NORMAL_MENU_STRUCTURE' => 1},
{'SPLIT' => '', 'USE_NODES' => 0}
],
@@ -35,37 +32,6 @@ my @test_cases = (
{'test_file' => 'node_footnote.texi'},
{'footnotestyle' => 'separate', 'FORMAT_MENU' => 'menu'}
],
-['nodes_after_top_before_chapter',
- undef,
- {'test_file' => 'nodes_after_top_before_chapter.texi'},
- {'TEXI2HTML' => 1, }
-],
-['nodes_after_top_before_chapter_use_nodes_chapter',
- undef,
- {'test_file' => 'nodes_after_top_before_chapter.texi'},
- {'TEXI2HTML' => 1, 'USE_NODES' => 1, 'SPLIT' => 'chapter'}
-],
-['nodes_after_top_before_section',
- undef,
- {'test_file' => 'nodes_after_top_before_section.texi'},
- {'TEXI2HTML' => 1, 'SPLIT' => 'chapter'}
-],
-['nodes_after_top_before_section_use_nodes',
- undef,
- {'test_file' => 'nodes_after_top_before_section.texi'},
- {'TEXI2HTML' => 1, 'USE_NODES' => 1}
-],
-['nodes_after_top_before_section_use_nodes_chapter',
- undef,
- {'test_file' => 'nodes_after_top_before_section.texi'},
- {'TEXI2HTML' => 1, 'USE_NODES' => 1, 'SPLIT' => 'chapter'}
-],
-['sectioning_frames',
- undef,
- # tests for node with directions after section
- {'test_file' => 'sectioning.texi', 'CHECK_NORMAL_MENU_STRUCTURE' => 1},
- {'TEXI2HTML' => 1, 'SPLIT' => 'chapter', 'FRAMES' => 1}
-],
['placed_things_before_element',
undef,
{'test_file' => 'placed_things_before_element.texi'},
@@ -96,6 +62,13 @@ my @test_cases = (
{'test_file' => 'top_node_up_explicit.texi'},
{'TEXI2HTML' => 1, 'TOP_NODE_UP_URL' => 'http://etop.example.org'}
],
+['sectioning_frames',
+ undef,
+ # tests for node with directions after section
+ {'test_file' => '../../tests/sectioning/sectioning.texi',
+ 'CHECK_NORMAL_MENU_STRUCTURE' => 1},
+ {'TEXI2HTML' => 1, 'SPLIT' => 'chapter', 'FRAMES' => 1}
+],
);
foreach my $test (@test_cases) {
diff --git a/tp/t/input_files/nodes_after_top_before_chapter.texi
b/tp/t/input_files/nodes_after_top_before_chapter.texi
deleted file mode 100644
index f645ac16e7..0000000000
--- a/tp/t/input_files/nodes_after_top_before_chapter.texi
+++ /dev/null
@@ -1,21 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@c test nodes after top before chapter
-
-
-@node Top
-Top node
-@menu
-* second node::
-* third node::
-@end menu
-
-@node second node, third node,Top,Top
-
-second node
-
-@node third node,,second node,Top
-@chapter chapter
-
-
-@bye
diff --git a/tp/t/input_files/nodes_after_top_before_section.texi
b/tp/t/input_files/nodes_after_top_before_section.texi
deleted file mode 100644
index 90869c39d7..0000000000
--- a/tp/t/input_files/nodes_after_top_before_section.texi
+++ /dev/null
@@ -1,21 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@c test nodes after Top before section
-
-
-@node Top
-Top node
-@menu
-* second node::
-* third node::
-@end menu
-
-@node second node, third node,Top,Top
-
-second node
-
-@node third node,,second node,Top
-@subsection subsection
-
-
-@bye
diff --git a/tp/t/input_files/sectioning.texi b/tp/t/input_files/sectioning.texi
deleted file mode 100644
index b88842efa6..0000000000
--- a/tp/t/input_files/sectioning.texi
+++ /dev/null
@@ -1,98 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
-@node Top,First node,(dir)
-@top
-@menu
-* First node:: node 1
- explaination no heading ?
-* and here ?
-With command @^{@dotless{i}} and
-a @cite{me}.
-
-heading
-* between node::
-node in between
-
-heading
-or not ?
-* Second node:: node 2
-
-heading with spaces around
-
-* Third node unnumbered:: unnumbered in Top menu
-* Last node no description::
-
-description here
-
-@end menu
-
-@node First node,,Top,Top
-@chapter first node chapter
-
-first node chapter text
-@menu
-* unnumbered:: un
-* unnumbered2:: un2
-* numbered:: nu
-
-@end menu
-
-@node unnumbered
-@unnumberedsec unnumbered section
-
-@menu
-* unnumbered sub:: un
-* numbered sub:: nu
-* unnumbered sub2:: un2
-* numbered sub2:: nu2
-@end menu
-
-@node unnumbered sub
-@unnumberedsubsec unnumbered subsection
-
-@node numbered sub
-@subsection numbered subsection
-
-@node unnumbered sub2
-@unnumberedsubsec unnumbered subsection2
-
-@node numbered sub2
-@subsection numbered subsection2
-
-@node unnumbered2
-@unnumberedsec unnumbered section2
-
-@menu
-* numbered sub3::
-@end menu
-
-@node numbered sub3
-@subsection numbered subsection3
-
-
-@node numbered
-@section numbered section
-
-@node between node,,,Top
-
-between node, node without sectioning node
-
-@node Second node,Third node unnumbered,,Top
-
-Second node text
-
-@chapter second node chapter
-
-second node chapter text.
-
-@node Third node unnumbered
-@unnumbered unnumbered chapter
-
-unnumbered chapter text.
-
-
-@node Last node no description,,Third node unnumbered,Top
-
-@contents
-@bye
-
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
deleted file mode 100644
index 9e787f4baf..0000000000
---
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
+++ /dev/null
@@ -1,679 +0,0 @@
-use vars qw(%result_texis %result_texts %result_trees %result_errors
- %result_indices %result_sectioning %result_nodes %result_menus
- %result_floats %result_converted %result_converted_errors
- %result_elements %result_directions_text %result_indices_sort_strings);
-
-use utf8;
-
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
- 'contents' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => ' test nodes after top before chapter
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' test nodes after top before chapter
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => 'Top node
-'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'menu',
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => '* ',
- 'type' => 'menu_entry_leading_text'
- },
- {
- 'contents' => [
- {
- 'text' => 'second node'
- }
- ],
- 'type' => 'menu_entry_node'
- },
- {
- 'text' => '::',
- 'type' => 'menu_entry_separator'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '
-'
- }
- ],
- 'type' => 'preformatted'
- }
- ],
- 'type' => 'menu_entry_description'
- }
- ],
- 'extra' => {
- 'menu_entry_description' => {},
- 'menu_entry_node' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'second-node'
- }
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 9,
- 'macro' => ''
- },
- 'type' => 'menu_entry'
- },
- {
- 'args' => [
- {
- 'text' => '* ',
- 'type' => 'menu_entry_leading_text'
- },
- {
- 'contents' => [
- {
- 'text' => 'third node'
- }
- ],
- 'type' => 'menu_entry_node'
- },
- {
- 'text' => '::',
- 'type' => 'menu_entry_separator'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '
-'
- }
- ],
- 'type' => 'preformatted'
- }
- ],
- 'type' => 'menu_entry_description'
- }
- ],
- 'extra' => {
- 'menu_entry_description' => {},
- 'menu_entry_node' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'third-node'
- }
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 10,
- 'macro' => ''
- },
- 'type' => 'menu_entry'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'menu'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'menu'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 11,
- 'macro' => ''
- }
- }
- ],
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 8,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 6,
- 'macro' => ''
- }
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'second node'
- }
- ],
- 'type' => 'line_arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'third node'
- }
- ],
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'type' => 'line_arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'type' => 'line_arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'contents' => [
- {
- 'text' => 'second node
-'
- }
- ],
- 'type' => 'paragraph'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'second-node'
- },
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'third-node'
- },
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- },
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'second-node'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 13,
- 'macro' => ''
- }
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'third node'
- }
- ],
- 'type' => 'line_arg'
- },
- {
- 'type' => 'line_arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'second node'
- }
- ],
- 'type' => 'line_arg'
- },
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'third-node'
- },
- undef,
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'second-node'
- },
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'third-node'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 17,
- 'macro' => ''
- }
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'chapter'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'chapter',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'extra' => {},
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 18,
- 'macro' => ''
- }
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
- }
- ],
- 'type' => 'document_root'
-};
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-$result_texis{'nodes_after_top_before_chapter_use_nodes_chapter'} = '\\input
texinfo @c -*-texinfo-*-
-
-@c test nodes after top before chapter
-
-
-@node Top
-Top node
-@menu
-* second node::
-* third node::
-@end menu
-
-@node second node, third node,Top,Top
-
-second node
-
-@node third node,,second node,Top
-@chapter chapter
-
-
-@bye
-';
-
-
-$result_texts{'nodes_after_top_before_chapter_use_nodes_chapter'} = '
-
-Top node
-* second node::
-* third node::
-
-
-second node
-
-1 chapter
-*********
-
-
-';
-
-$result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
- 'structure' => {
- 'section_childs' => [
- {
- 'cmdname' => 'chapter',
- 'extra' => {
- 'associated_node' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'third-node'
- },
- 'info' => {},
- 'structure' => {}
- }
- },
- 'info' => {},
- 'structure' => {
- 'section_level' => 1,
- 'section_number' => 1,
- 'section_up' => {}
- }
- }
- ],
- 'section_level' => 0
- }
-};
-$result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_chapter_use_nodes_chapter'};
-
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
- 'cmdname' => 'node',
- 'extra' => {
- 'menus' => [
- {
- 'cmdname' => 'menu'
- }
- ],
- 'normalized' => 'Top'
- },
- 'info' => {},
- 'structure' => {
- 'menu_child' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'second-node'
- },
- 'info' => {},
- 'structure' => {
- 'node_next' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'associated_section' => {
- 'cmdname' => 'chapter',
- 'extra' => {},
- 'info' => {},
- 'structure' => {
- 'section_number' => 1
- }
- },
- 'normalized' => 'third-node'
- },
- 'info' => {},
- 'structure' => {
- 'node_prev' => {},
- 'node_up' => {}
- }
- },
- 'node_prev' => {},
- 'node_up' => {}
- }
- },
- 'node_next' => {}
- }
-};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'node_next'}
=
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'};
-
-$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'Top'
- },
- 'info' => {},
- 'structure' => {
- 'menu_child' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'second-node'
- },
- 'info' => {},
- 'structure' => {
- 'menu_next' => {
- 'cmdname' => 'node',
- 'extra' => {
- 'normalized' => 'third-node'
- },
- 'info' => {},
- 'structure' => {
- 'menu_prev' => {},
- 'menu_up' => {},
- 'menu_up_hash' => {
- 'Top' => 1
- }
- }
- },
- 'menu_up' => {},
- 'menu_up_hash' => {
- 'Top' => 1
- }
- }
- }
- }
-};
-$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'};
-$result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_chapter_use_nodes_chapter'};
-
-$result_errors{'nodes_after_top_before_chapter_use_nodes_chapter'} = [];
-
-
-$result_floats{'nodes_after_top_before_chapter_use_nodes_chapter'} = {};
-
-
-$result_converted_errors{'file_html'}->{'nodes_after_top_before_chapter_use_nodes_chapter'}
= [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
-1;
diff --git
a/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
new file mode 100644
index 0000000000..238d1b5a17
--- /dev/null
+++ b/tp/t/results/sectioning/in_menu_only_special_ascii_spaces_node_menu.pl
@@ -0,0 +1,615 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'in_menu_only_special_ascii_spaces_node_menu'} = {
+ "contents" => [
+ {
+ "contents" => [
+ {
+ "contents" => [],
+ "type" => "preamble_before_content"
+ }
+ ],
+ "type" => "before_node_section"
+ },
+ {
+ "args" => [
+ {
+ "contents" => [
+ {
+ "text" => "Top"
+ }
+ ],
+ "info" => {
+ "spaces_after_argument" => "\n"
+ },
+ "type" => "line_arg"
+ }
+ ],
+ "cmdname" => "node",
+ "extra" => {
+ "node_content" => [
+ {}
+ ],
+ "nodes_manuals" => [
+ {
+ "node_content" => [
+ {}
+ ],
+ "normalized" => "Top"
+ }
+ ],
+ "normalized" => "Top"
+ },
+ "info" => {
+ "spaces_before_argument" => " "
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 1,
+ "macro" => ""
+ }
+ },
+ {
+ "args" => [
+ {
+ "contents" => [
+ {
+ "text" => "top"
+ }
+ ],
+ "info" => {
+ "spaces_after_argument" => "\n"
+ },
+ "type" => "line_arg"
+ }
+ ],
+ "cmdname" => "top",
+ "contents" => [
+ {
+ "text" => "\n",
+ "type" => "empty_line"
+ },
+ {
+ "args" => [
+ {
+ "info" => {
+ "spaces_after_argument" => "\n"
+ },
+ "type" => "block_line_arg"
+ }
+ ],
+ "cmdname" => "menu",
+ "contents" => [
+ {
+ "args" => [
+ {
+ "text" => "* \r",
+ "type" => "menu_entry_leading_text"
+ },
+ {
+ "type" => "menu_entry_node"
+ },
+ {
+ "text" => "::",
+ "type" => "menu_entry_separator"
+ },
+ {
+ "contents" => [
+ {
+ "contents" => [
+ {
+ "text" => "\n"
+ }
+ ],
+ "type" => "preformatted"
+ }
+ ],
+ "type" => "menu_entry_description"
+ }
+ ],
+ "extra" => {
+ "menu_entry_description" => {}
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 5,
+ "macro" => ""
+ },
+ "type" => "menu_entry"
+ },
+ {
+ "args" => [
+ {
+ "text" => "* \t\f",
+ "type" => "menu_entry_leading_text"
+ },
+ {
+ "type" => "menu_entry_node"
+ },
+ {
+ "text" => "::",
+ "type" => "menu_entry_separator"
+ },
+ {
+ "contents" => [
+ {
+ "contents" => [
+ {
+ "text" => "\n"
+ }
+ ],
+ "type" => "preformatted"
+ }
+ ],
+ "type" => "menu_entry_description"
+ }
+ ],
+ "extra" => {
+ "menu_entry_description" => {}
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 6,
+ "macro" => ""
+ },
+ "type" => "menu_entry"
+ },
+ {
+ "args" => [
+ {
+ "contents" => [
+ {
+ "text" => "menu"
+ }
+ ],
+ "info" => {
+ "spaces_after_argument" => "\n"
+ },
+ "type" => "line_arg"
+ }
+ ],
+ "cmdname" => "end",
+ "extra" => {
+ "text_arg" => "menu"
+ },
+ "info" => {
+ "spaces_before_argument" => " "
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 7,
+ "macro" => ""
+ }
+ }
+ ],
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 4,
+ "macro" => ""
+ }
+ },
+ {
+ "text" => "\n",
+ "type" => "empty_line"
+ }
+ ],
+ "extra" => {},
+ "info" => {
+ "spaces_before_argument" => " "
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 2,
+ "macro" => ""
+ }
+ },
+ {
+ "args" => [
+ {
+ "info" => {
+ "spaces_after_argument" => " \r\n"
+ },
+ "type" => "line_arg"
+ }
+ ],
+ "cmdname" => "node",
+ "extra" => {
+ "nodes_manuals" => [
+ undef
+ ]
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 9,
+ "macro" => ""
+ }
+ },
+ {
+ "args" => [
+ {
+ "contents" => [
+ {
+ "text" => "CARRIAGE RETURN|\r|"
+ }
+ ],
+ "info" => {
+ "spaces_after_argument" => "\n"
+ },
+ "type" => "line_arg"
+ }
+ ],
+ "cmdname" => "chapter",
+ "contents" => [
+ {
+ "text" => "\n",
+ "type" => "empty_line"
+ }
+ ],
+ "extra" => {},
+ "info" => {
+ "spaces_before_argument" => " "
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 10,
+ "macro" => ""
+ }
+ },
+ {
+ "args" => [
+ {
+ "info" => {
+ "spaces_after_argument" => " \t\f\n"
+ },
+ "type" => "line_arg"
+ }
+ ],
+ "cmdname" => "node",
+ "extra" => {
+ "nodes_manuals" => [
+ undef
+ ]
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 12,
+ "macro" => ""
+ }
+ },
+ {
+ "args" => [
+ {
+ "contents" => [
+ {
+ "text" => "CHARACTER TABULATION|\t| FORM FEED|\f|"
+ }
+ ],
+ "info" => {
+ "spaces_after_argument" => "\n"
+ },
+ "type" => "line_arg"
+ }
+ ],
+ "cmdname" => "chapter",
+ "contents" => [
+ {
+ "text" => "\n",
+ "type" => "empty_line"
+ }
+ ],
+ "extra" => {},
+ "info" => {
+ "spaces_before_argument" => " "
+ },
+ "source_info" => {
+ "file_name" => "in_menu_only_special_ascii_spaces_node.texi",
+ "line_nr" => 13,
+ "macro" => ""
+ }
+ }
+ ],
+ "type" => "document_root"
+};
+$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[1]{"extra"}{"node_content"}[0]
=
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[1]{"args"}[0]{"contents"}[0];
+$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[1]{"extra"}{"nodes_manuals"}[0]{"node_content"}[0]
=
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[1]{"args"}[0]{"contents"}[0];
+$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"extra"}{"menu_entry_description"}
=
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[0]{"args"}[3];
+$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[1]{"extra"}{"menu_entry_description"}
=
$result_trees{'in_menu_only_special_ascii_spaces_node_menu'}{"contents"}[2]{"contents"}[1]{"contents"}[1]{"args"}[3];
+
+$result_texis{'in_menu_only_special_ascii_spaces_node_menu'} = '@node Top
+@top top
+
+@menu
+* '."\r".'::
+* ::
+@end menu
+
+@node '."\r".'
+@chapter CARRIAGE RETURN|'."\r".'|
+
+@node
+@chapter CHARACTER TABULATION| | FORM FEED| |
+
+';
+
+
+$result_texts{'in_menu_only_special_ascii_spaces_node_menu'} = 'top
+***
+
+* '."\r".'::
+* ::
+
+1 CARRIAGE RETURN|'."\r".'|
+********************
+
+2 CHARACTER TABULATION| | FORM FEED| |
+**************************************
+
+';
+
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'chapter',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 1,
+ 'section_number' => 1,
+ 'section_up' => {},
+ 'toplevel_prev' => {},
+ 'toplevel_up' => {}
+ }
+ },
+ {
+ 'cmdname' => 'chapter',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 1,
+ 'section_number' => 2,
+ 'section_prev' => {},
+ 'section_up' => {},
+ 'toplevel_prev' => {},
+ 'toplevel_up' => {}
+ }
+ }
+ ],
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
=
$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'section_prev'}
=
$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'section_up'}
=
$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_up'}
=
$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'in_menu_only_special_ascii_spaces_node_menu'};
+
+$result_nodes{'in_menu_only_special_ascii_spaces_node_menu'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
+ 'menus' => [
+ {
+ 'cmdname' => 'menu'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'chapter',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {
+ 'section_number' => 1
+ }
+ }
+ },
+ 'structure' => {
+ 'node_prev' => {}
+ }
+ }
+ }
+};
+$result_nodes{'in_menu_only_special_ascii_spaces_node_menu'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'in_menu_only_special_ascii_spaces_node_menu'};
+
+$result_menus{'in_menu_only_special_ascii_spaces_node_menu'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {},
+ 'structure' => {}
+};
+
+$result_errors{'in_menu_only_special_ascii_spaces_node_menu'} = [
+ {
+ 'error_line' => 'empty node name in menu entry
+',
+ 'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
+ 'line_nr' => 5,
+ 'macro' => '',
+ 'text' => 'empty node name in menu entry',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'empty node name in menu entry
+',
+ 'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
+ 'line_nr' => 6,
+ 'macro' => '',
+ 'text' => 'empty node name in menu entry',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'empty argument in @node
+',
+ 'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
+ 'line_nr' => 9,
+ 'macro' => '',
+ 'text' => 'empty argument in @node',
+ 'type' => 'error'
+ },
+ {
+ 'error_line' => 'empty argument in @node
+',
+ 'file_name' => 'in_menu_only_special_ascii_spaces_node.texi',
+ 'line_nr' => 12,
+ 'macro' => '',
+ 'text' => 'empty argument in @node',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'in_menu_only_special_ascii_spaces_node_menu'} = {};
+
+
+
+$result_converted{'info'}->{'in_menu_only_special_ascii_spaces_node_menu'} =
'This is , produced from in_menu_only_special_ascii_spaces_node.texi.
+
+
+File: , Node: Top, Next: , Up: (dir)
+
+top
+***
+
+* Menu:
+
+* '."\r".'::
+* ::
+
+1 CARRIAGE RETURN|'."\r".'|
+********************
+
+2 CHARACTER TABULATION| | FORM FEED| |
+**************************************
+
+
+
+Tag Table:
+Node: Top70
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
+';
+
+
+$result_converted{'html'}->{'in_menu_only_special_ascii_spaces_node_menu'} =
'<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>top</title>
+
+<meta name="description" content="top">
+<meta name="keywords" content="top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="#Top" rel="start" title="Top">
+<style type="text/css">
+<!--
+td.menu-entry-description {vertical-align: top}
+td.menu-entry-destination {vertical-align: top}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: CARRIAGE RETURN|'."\r".'| </p>
+</div>
+<h1 class="top" id="top">top</h1>
+
+<table class="menu" border="0" cellspacing="0">
+<tr><td class="menu-entry-destination">• :</td><td> </td><td
class="menu-entry-description">
+</td></tr>
+<tr><td class="menu-entry-destination">• :</td><td> </td><td
class="menu-entry-description">
+</td></tr>
+</table>
+
+<hr>
+<div class="chapter-level-extent">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">top</a> </p>
+</div>
+<h2 class="chapter" id="CARRIAGE-RETURN_007c-_007c">1 CARRIAGE
RETURN|'."\r".'|</h2>
+
+<hr>
+</div>
+<div class="chapter-level-extent">
+<div class="nav-panel">
+<p>
+ </p>
+</div>
+<h2 class="chapter"
id="CHARACTER-TABULATION_007c-_007c-FORM-FEED_007c-_007c">2 CHARACTER
TABULATION| | FORM FEED||</h2>
+
+</div>
+</div>
+
+
+
+</body>
+</html>
+';
+
+1;
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
similarity index 66%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
rename to tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
index b6aa903b70..22ab5dff8a 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html.pl
@@ -5,57 +5,9 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'nodes_after_top_before_section_use_nodes'} = {
+$result_trees{'nodes_after_top_before_chapter_texi2html'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => ' test nodes after Top before section
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' test nodes after Top before section
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -139,8 +91,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 9,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
},
'type' => 'menu_entry'
@@ -188,8 +140,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} =
{
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 10,
+ 'file_name' => '',
+ 'line_nr' => 5,
'macro' => ''
},
'type' => 'menu_entry'
@@ -217,15 +169,15 @@ $result_trees{'nodes_after_top_before_section_use_nodes'}
= {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 11,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -253,8 +205,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} =
{
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -358,8 +310,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} =
{
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -429,8 +381,8 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} =
{
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 17,
+ 'file_name' => '',
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -439,7 +391,7 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} =
{
{
'contents' => [
{
- 'text' => 'subsection'
+ 'text' => 'chapter'
}
],
'info' => {
@@ -449,64 +401,37 @@ $result_trees{'nodes_after_top_before_section_use_nodes'}
= {
'type' => 'line_arg'
}
],
- 'cmdname' => 'subsection',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'cmdname' => 'chapter',
'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 18,
+ 'file_name' => '',
+ 'line_nr' => 13,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
};
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-$result_texis{'nodes_after_top_before_section_use_nodes'} = '\\input texinfo
@c -*-texinfo-*-
-
-@c test nodes after Top before section
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-@node Top
+$result_texis{'nodes_after_top_before_chapter_texi2html'} = '@node Top
Top node
@menu
* second node::
@@ -518,33 +443,26 @@ Top node
second node
@node third node,,second node,Top
-@subsection subsection
-
-
-@bye
+@chapter chapter
';
-$result_texts{'nodes_after_top_before_section_use_nodes'} = '
-
-Top node
+$result_texts{'nodes_after_top_before_chapter_texi2html'} = 'Top node
* second node::
* third node::
second node
-1 subsection
-------------
-
-
+1 chapter
+*********
';
-$result_sectioning{'nodes_after_top_before_section_use_nodes'} = {
+$result_sectioning{'nodes_after_top_before_chapter_texi2html'} = {
'structure' => {
'section_childs' => [
{
- 'cmdname' => 'subsection',
+ 'cmdname' => 'chapter',
'extra' => {
'associated_node' => {
'cmdname' => 'node',
@@ -557,18 +475,18 @@
$result_sectioning{'nodes_after_top_before_section_use_nodes'} = {
},
'info' => {},
'structure' => {
- 'section_level' => 3,
+ 'section_level' => 1,
'section_number' => 1,
'section_up' => {}
}
}
],
- 'section_level' => 2
+ 'section_level' => 0
}
};
-$result_sectioning{'nodes_after_top_before_section_use_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_section_use_nodes'};
+$result_sectioning{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_chapter_texi2html'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'} = {
+$result_nodes{'nodes_after_top_before_chapter_texi2html'} = {
'cmdname' => 'node',
'extra' => {
'menus' => [
@@ -591,7 +509,7 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} =
{
'cmdname' => 'node',
'extra' => {
'associated_section' => {
- 'cmdname' => 'subsection',
+ 'cmdname' => 'chapter',
'extra' => {},
'info' => {},
'structure' => {
@@ -613,13 +531,13 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'}
= {
'node_next' => {}
}
};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_use_nodes'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section_use_nodes'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_use_nodes'};
-$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'node_next'}
=
$result_nodes{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_chapter_texi2html'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_chapter_texi2html'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_chapter_texi2html'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'node_next'}
=
$result_nodes{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section_use_nodes'} = {
+$result_menus{'nodes_after_top_before_chapter_texi2html'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -655,21 +573,21 @@ $result_menus{'nodes_after_top_before_section_use_nodes'}
= {
}
}
};
-$result_menus{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_use_nodes'};
-$result_menus{'nodes_after_top_before_section_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_use_nodes'};
+$result_menus{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_chapter_texi2html'};
+$result_menus{'nodes_after_top_before_chapter_texi2html'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_chapter_texi2html'};
-$result_errors{'nodes_after_top_before_section_use_nodes'} = [];
+$result_errors{'nodes_after_top_before_chapter_texi2html'} = [];
-$result_floats{'nodes_after_top_before_section_use_nodes'} = {};
+$result_floats{'nodes_after_top_before_chapter_texi2html'} = {};
-$result_converted_errors{'file_html'}->{'nodes_after_top_before_section_use_nodes'}
= [
+$result_converted_errors{'file_html'}->{'nodes_after_top_before_chapter_texi2html'}
= [
{
'error_line' => 'warning: must specify a title with a title command or @top
',
- 'file_name' => 'nodes_after_top_before_section.texi',
+ 'file_name' => 'nodes_after_top_before_chapter_texi2html.texi',
'text' => 'must specify a title with a title command or @top',
'type' => 'warning'
}
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html/res_html/nodes_after_top_before_chapter_texi2html.html
similarity index 99%
rename from
tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
rename to
tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html/res_html/nodes_after_top_before_chapter_texi2html.html
index 2406ce45f0..64d352ad75 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_chapter/res_html/nodes_after_top_before_chapter.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html/res_html/nodes_after_top_before_chapter_texi2html.html
@@ -23,8 +23,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
-
<a class="node" id="Top"></a><p>Top node
</p><table class="menu" border="0" cellspacing="0">
<tr><td class="menu-entry-destination">• <a href="#second-node">second
node</a></td><td> </td><td class="menu-entry-description">
@@ -38,8 +36,6 @@ td.menu-entry-destination {vertical-align: top}
</p>
<div class="chapter-level-extent" id="third-node">
<h1 class="chapter" id="chapter">1 chapter</h1>
-
-
<hr>
</div>
<p>
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
similarity index 60%
rename from tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
rename to
tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
index aced48f8f6..5a05551ac7 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter.pl
@@ -5,57 +5,9 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'nodes_after_top_before_chapter'} = {
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => ' test nodes after top before chapter
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' test nodes after top before chapter
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -139,8 +91,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 9,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
},
'type' => 'menu_entry'
@@ -188,8 +140,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 10,
+ 'file_name' => '',
+ 'line_nr' => 5,
'macro' => ''
},
'type' => 'menu_entry'
@@ -217,15 +169,15 @@ $result_trees{'nodes_after_top_before_chapter'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 11,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -253,8 +205,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -358,8 +310,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -429,8 +381,8 @@ $result_trees{'nodes_after_top_before_chapter'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 17,
+ 'file_name' => '',
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -450,63 +402,36 @@ $result_trees{'nodes_after_top_before_chapter'} = {
}
],
'cmdname' => 'chapter',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 18,
+ 'file_name' => '',
+ 'line_nr' => 13,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
};
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-$result_texis{'nodes_after_top_before_chapter'} = '\\input texinfo @c
-*-texinfo-*-
-
-@c test nodes after top before chapter
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-@node Top
+$result_texis{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} =
'@node Top
Top node
@menu
* second node::
@@ -519,15 +444,10 @@ second node
@node third node,,second node,Top
@chapter chapter
-
-
-@bye
';
-$result_texts{'nodes_after_top_before_chapter'} = '
-
-Top node
+$result_texts{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} =
'Top node
* second node::
* third node::
@@ -536,11 +456,9 @@ second node
1 chapter
*********
-
-
';
-$result_sectioning{'nodes_after_top_before_chapter'} = {
+$result_sectioning{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}
= {
'structure' => {
'section_childs' => [
{
@@ -566,9 +484,9 @@ $result_sectioning{'nodes_after_top_before_chapter'} = {
'section_level' => 0
}
};
-$result_sectioning{'nodes_after_top_before_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_chapter'};
+$result_sectioning{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_chapter'} = {
+$result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
'cmdname' => 'node',
'extra' => {
'menus' => [
@@ -613,13 +531,13 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
'node_next' => {}
}
};
-$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_chapter'};
-$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_chapter'};
-$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_chapter'};
-$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'node_next'} =
$result_nodes{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'node_next'}
=
$result_nodes{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter'} = {
+$result_menus{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -655,21 +573,21 @@ $result_menus{'nodes_after_top_before_chapter'} = {
}
}
};
-$result_menus{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
= $result_menus{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_chapter'};
-$result_menus{'nodes_after_top_before_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_chapter'};
+$result_menus{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'};
+$result_menus{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'};
-$result_errors{'nodes_after_top_before_chapter'} = [];
+$result_errors{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} =
[];
-$result_floats{'nodes_after_top_before_chapter'} = {};
+$result_floats{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'} =
{};
-$result_converted_errors{'file_html'}->{'nodes_after_top_before_chapter'} = [
+$result_converted_errors{'file_html'}->{'nodes_after_top_before_chapter_texi2html_use_nodes_chapter'}
= [
{
'error_line' => 'warning: must specify a title with a title command or @top
',
- 'file_name' => 'nodes_after_top_before_chapter.texi',
+ 'file_name' =>
'nodes_after_top_before_chapter_texi2html_use_nodes_chapter.texi',
'text' => 'must specify a title with a title command or @top',
'type' => 'warning'
}
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/index.html
similarity index 86%
rename from
tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
rename to
tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/index.html
index b9d0fc534c..e3b0ea1715 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/index.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/index.html
@@ -23,15 +23,13 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
-
<a class="node-id" id="Top"></a><table class="nav-panel" cellpadding="1"
cellspacing="1" border="0">
<tr><td>[ < ]</td>
<td>[<a href="#second-node" title="Next section in reading order"> >
</a>]</td>
<td> </td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_chapter_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_chapter_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="node">Top</h1>
<p>Top node
@@ -56,7 +54,7 @@ td.menu-entry-destination {vertical-align: top}
<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_chapter_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_chapter_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<h3 class="node">second node</h3>
@@ -74,7 +72,7 @@ td.menu-entry-destination {vertical-align: top}
<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_chapter_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_chapter_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<p>
<span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em>.</span>
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/nodes_after_top_before_chapter_abt.html
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/nodes_after_top_before_chapter_texi2html_use_nodes_chapter_abt.html
similarity index 100%
rename from
tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/nodes_after_top_before_chapter_abt.html
rename to
tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/nodes_after_top_before_chapter_texi2html_use_nodes_chapter_abt.html
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/second-node.html
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/second-node.html
similarity index 100%
rename from
tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/second-node.html
rename to
tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/second-node.html
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/third-node.html
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/third-node.html
similarity index 86%
rename from
tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/third-node.html
rename to
tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/third-node.html
index c1f14e330b..b9d12472a7 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter/res_html/third-node.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_chapter_texi2html_use_nodes_chapter/res_html/third-node.html
@@ -35,11 +35,9 @@ span.program-in-footer {font-size: smaller}
<td>[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_chapter_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_chapter_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="chapter" id="chapter">1 chapter</h1>
-
-
</div>
<hr>
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
@@ -53,7 +51,7 @@ span.program-in-footer {font-size: smaller}
<td>[<a href="index.html#Top" title="Cover (top) of document">Top</a>]</td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_chapter_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_chapter_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<p>
<span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em>.</span>
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
similarity index 70%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
index 4af82fa84f..e6a74bcb0c 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
+++
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter.pl
@@ -5,57 +5,9 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => ' test nodes after Top before section
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' test nodes after Top before section
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -139,8 +91,8 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 9,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
},
'type' => 'menu_entry'
@@ -188,8 +140,8 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 10,
+ 'file_name' => '',
+ 'line_nr' => 5,
'macro' => ''
},
'type' => 'menu_entry'
@@ -217,15 +169,15 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 11,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -253,8 +205,8 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -358,8 +310,8 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -429,8 +381,8 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 17,
+ 'file_name' => '',
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -450,63 +402,36 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
}
],
'cmdname' => 'subsection',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 18,
+ 'file_name' => '',
+ 'line_nr' => 13,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
};
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-$result_texis{'nodes_after_top_before_section_use_nodes_chapter'} = '\\input
texinfo @c -*-texinfo-*-
-
-@c test nodes after Top before section
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-@node Top
+$result_texis{'nodes_after_top_before_section_texi2html_chapter'} = '@node Top
Top node
@menu
* second node::
@@ -519,15 +444,10 @@ second node
@node third node,,second node,Top
@subsection subsection
-
-
-@bye
';
-$result_texts{'nodes_after_top_before_section_use_nodes_chapter'} = '
-
-Top node
+$result_texts{'nodes_after_top_before_section_texi2html_chapter'} = 'Top node
* second node::
* third node::
@@ -536,11 +456,9 @@ second node
1 subsection
------------
-
-
';
-$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'} = {
+$result_sectioning{'nodes_after_top_before_section_texi2html_chapter'} = {
'structure' => {
'section_childs' => [
{
@@ -566,9 +484,9 @@
$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'} = {
'section_level' => 2
}
};
-$result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_section_use_nodes_chapter'};
+$result_sectioning{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_section_texi2html_chapter'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
+$result_nodes{'nodes_after_top_before_section_texi2html_chapter'} = {
'cmdname' => 'node',
'extra' => {
'menus' => [
@@ -613,13 +531,13 @@
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
'node_next' => {}
}
};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'node_next'}
=
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_texi2html_chapter'};
+$result_nodes{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section_texi2html_chapter'};
+$result_nodes{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_texi2html_chapter'};
+$result_nodes{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'node_next'}
=
$result_nodes{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section_use_nodes_chapter'} = {
+$result_menus{'nodes_after_top_before_section_texi2html_chapter'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -655,21 +573,21 @@
$result_menus{'nodes_after_top_before_section_use_nodes_chapter'} = {
}
}
};
-$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_use_nodes_chapter'};
-$result_menus{'nodes_after_top_before_section_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_use_nodes_chapter'};
+$result_menus{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_texi2html_chapter'};
+$result_menus{'nodes_after_top_before_section_texi2html_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_texi2html_chapter'};
-$result_errors{'nodes_after_top_before_section_use_nodes_chapter'} = [];
+$result_errors{'nodes_after_top_before_section_texi2html_chapter'} = [];
-$result_floats{'nodes_after_top_before_section_use_nodes_chapter'} = {};
+$result_floats{'nodes_after_top_before_section_texi2html_chapter'} = {};
-$result_converted_errors{'file_html'}->{'nodes_after_top_before_section_use_nodes_chapter'}
= [
+$result_converted_errors{'file_html'}->{'nodes_after_top_before_section_texi2html_chapter'}
= [
{
'error_line' => 'warning: must specify a title with a title command or @top
',
- 'file_name' => 'nodes_after_top_before_section.texi',
+ 'file_name' => 'nodes_after_top_before_section_texi2html_chapter.texi',
'text' => 'must specify a title with a title command or @top',
'type' => 'warning'
}
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/index.html
similarity index 99%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/index.html
index b7a5588b6d..0a573f2ece 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/index.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/index.html
@@ -23,8 +23,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
-
<a class="node" id="Top"></a><p>Top node
</p><table class="menu" border="0" cellspacing="0">
<tr><td class="menu-entry-destination">• <a href="#second-node">second
node</a></td><td> </td><td class="menu-entry-description">
@@ -38,8 +36,6 @@ td.menu-entry-destination {vertical-align: top}
</p>
<div class="subsection-level-extent" id="third-node">
<h3 class="subsection" id="subsection">1 subsection</h3>
-
-
<hr>
</div>
<p>
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/second-node.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/second-node.html
similarity index 100%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section/res_html/second-node.html
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/second-node.html
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section/res_html/third-node.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/third-node.html
similarity index 100%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section/res_html/third-node.html
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_chapter/res_html/third-node.html
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
similarity index 60%
copy from tp/t/results/moresectioning/nodes_after_top_before_section.pl
copy to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
index 3372e09ac3..0b40d912f3 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes.pl
@@ -5,57 +5,9 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'nodes_after_top_before_section'} = {
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => ' test nodes after Top before section
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' test nodes after Top before section
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -139,8 +91,8 @@ $result_trees{'nodes_after_top_before_section'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 9,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
},
'type' => 'menu_entry'
@@ -188,8 +140,8 @@ $result_trees{'nodes_after_top_before_section'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 10,
+ 'file_name' => '',
+ 'line_nr' => 5,
'macro' => ''
},
'type' => 'menu_entry'
@@ -217,15 +169,15 @@ $result_trees{'nodes_after_top_before_section'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 11,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -253,8 +205,8 @@ $result_trees{'nodes_after_top_before_section'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -358,8 +310,8 @@ $result_trees{'nodes_after_top_before_section'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -429,8 +381,8 @@ $result_trees{'nodes_after_top_before_section'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 17,
+ 'file_name' => '',
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -450,63 +402,36 @@ $result_trees{'nodes_after_top_before_section'} = {
}
],
'cmdname' => 'subsection',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 18,
+ 'file_name' => '',
+ 'line_nr' => 13,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
};
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-$result_texis{'nodes_after_top_before_section'} = '\\input texinfo @c
-*-texinfo-*-
-
-@c test nodes after Top before section
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-@node Top
+$result_texis{'nodes_after_top_before_section_texi2html_use_nodes'} = '@node
Top
Top node
@menu
* second node::
@@ -519,15 +444,10 @@ second node
@node third node,,second node,Top
@subsection subsection
-
-
-@bye
';
-$result_texts{'nodes_after_top_before_section'} = '
-
-Top node
+$result_texts{'nodes_after_top_before_section_texi2html_use_nodes'} = 'Top node
* second node::
* third node::
@@ -536,11 +456,9 @@ second node
1 subsection
------------
-
-
';
-$result_sectioning{'nodes_after_top_before_section'} = {
+$result_sectioning{'nodes_after_top_before_section_texi2html_use_nodes'} = {
'structure' => {
'section_childs' => [
{
@@ -566,9 +484,9 @@ $result_sectioning{'nodes_after_top_before_section'} = {
'section_level' => 2
}
};
-$result_sectioning{'nodes_after_top_before_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_section'};
+$result_sectioning{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_section_texi2html_use_nodes'};
-$result_nodes{'nodes_after_top_before_section'} = {
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'} = {
'cmdname' => 'node',
'extra' => {
'menus' => [
@@ -613,13 +531,13 @@ $result_nodes{'nodes_after_top_before_section'} = {
'node_next' => {}
}
};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'node_next'} =
$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'node_next'}
=
$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section'} = {
+$result_menus{'nodes_after_top_before_section_texi2html_use_nodes'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -655,21 +573,21 @@ $result_menus{'nodes_after_top_before_section'} = {
}
}
};
-$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
= $result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section'};
-$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section'};
+$result_menus{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_texi2html_use_nodes'};
+$result_menus{'nodes_after_top_before_section_texi2html_use_nodes'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_texi2html_use_nodes'};
-$result_errors{'nodes_after_top_before_section'} = [];
+$result_errors{'nodes_after_top_before_section_texi2html_use_nodes'} = [];
-$result_floats{'nodes_after_top_before_section'} = {};
+$result_floats{'nodes_after_top_before_section_texi2html_use_nodes'} = {};
-$result_converted_errors{'file_html'}->{'nodes_after_top_before_section'} = [
+$result_converted_errors{'file_html'}->{'nodes_after_top_before_section_texi2html_use_nodes'}
= [
{
'error_line' => 'warning: must specify a title with a title command or @top
',
- 'file_name' => 'nodes_after_top_before_section.texi',
+ 'file_name' => 'nodes_after_top_before_section_texi2html_use_nodes.texi',
'text' => 'must specify a title with a title command or @top',
'type' => 'warning'
}
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes/res_html/nodes_after_top_before_section_texi2html_use_nodes.html
similarity index 99%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes/res_html/nodes_after_top_before_section_texi2html_use_nodes.html
index e8d888192b..2f717a64a1 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes/res_html/nodes_after_top_before_section.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes/res_html/nodes_after_top_before_section_texi2html_use_nodes.html
@@ -25,8 +25,6 @@ td.name-direction-about {text-align:center}
</head>
<body lang="en">
-
-
<a class="node-id" id="Top"></a><table class="nav-panel" cellpadding="1"
cellspacing="1" border="0">
<tr><td>[ < ]</td>
<td>[<a href="#second-node" title="Next section in reading order"> >
</a>]</td>
@@ -82,8 +80,6 @@ td.name-direction-about {text-align:center}
<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<h3 class="subsection" id="subsection">1 subsection</h3>
-
-
<hr style="height: 6px;">
</div>
<div class="element-about" id="SEC_About">
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
similarity index 60%
rename from tp/t/results/moresectioning/nodes_after_top_before_section.pl
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
index 3372e09ac3..22b6124519 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter.pl
@@ -5,57 +5,9 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'nodes_after_top_before_section'} = {
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
'contents' => [
{
- 'contents' => [
- {
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'text' => ' test nodes after Top before section
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' test nodes after Top before section
-'
- ]
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
'type' => 'before_node_section'
},
{
@@ -139,8 +91,8 @@ $result_trees{'nodes_after_top_before_section'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 9,
+ 'file_name' => '',
+ 'line_nr' => 4,
'macro' => ''
},
'type' => 'menu_entry'
@@ -188,8 +140,8 @@ $result_trees{'nodes_after_top_before_section'} = {
}
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 10,
+ 'file_name' => '',
+ 'line_nr' => 5,
'macro' => ''
},
'type' => 'menu_entry'
@@ -217,15 +169,15 @@ $result_trees{'nodes_after_top_before_section'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 11,
+ 'file_name' => '',
+ 'line_nr' => 6,
'macro' => ''
}
}
],
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 8,
+ 'file_name' => '',
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -253,8 +205,8 @@ $result_trees{'nodes_after_top_before_section'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 6,
+ 'file_name' => '',
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -358,8 +310,8 @@ $result_trees{'nodes_after_top_before_section'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 13,
+ 'file_name' => '',
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -429,8 +381,8 @@ $result_trees{'nodes_after_top_before_section'} = {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 17,
+ 'file_name' => '',
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -450,63 +402,36 @@ $result_trees{'nodes_after_top_before_section'} = {
}
],
'cmdname' => 'subsection',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 18,
+ 'file_name' => '',
+ 'line_nr' => 13,
'macro' => ''
}
- },
- {
- 'args' => [
- {
- 'text' => '
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'bye'
}
],
'type' => 'document_root'
};
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'args'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-$result_texis{'nodes_after_top_before_section'} = '\\input texinfo @c
-*-texinfo-*-
-
-@c test nodes after Top before section
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[2]{'contents'}[0];
+$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
=
$result_trees{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'contents'}[3]{'args'}[3]{'contents'}[0];
-
-@node Top
+$result_texis{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} =
'@node Top
Top node
@menu
* second node::
@@ -519,15 +444,10 @@ second node
@node third node,,second node,Top
@subsection subsection
-
-
-@bye
';
-$result_texts{'nodes_after_top_before_section'} = '
-
-Top node
+$result_texts{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} =
'Top node
* second node::
* third node::
@@ -536,11 +456,9 @@ second node
1 subsection
------------
-
-
';
-$result_sectioning{'nodes_after_top_before_section'} = {
+$result_sectioning{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}
= {
'structure' => {
'section_childs' => [
{
@@ -566,9 +484,9 @@ $result_sectioning{'nodes_after_top_before_section'} = {
'section_level' => 2
}
};
-$result_sectioning{'nodes_after_top_before_section'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'nodes_after_top_before_section'};
+$result_sectioning{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'nodes_after_top_before_section_texi2html_use_nodes_chapter'};
-$result_nodes{'nodes_after_top_before_section'} = {
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
'cmdname' => 'node',
'extra' => {
'menus' => [
@@ -613,13 +531,13 @@ $result_nodes{'nodes_after_top_before_section'} = {
'node_next' => {}
}
};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section'};
-$result_nodes{'nodes_after_top_before_section'}{'structure'}{'node_next'} =
$result_nodes{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'};
+$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'node_next'}
=
$result_nodes{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section'} = {
+$result_menus{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -655,21 +573,21 @@ $result_menus{'nodes_after_top_before_section'} = {
}
}
};
-$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
= $result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'};
-$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section'};
-$result_menus{'nodes_after_top_before_section'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section'};
+$result_menus{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'};
+$result_menus{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_texi2html_use_nodes_chapter'};
+$result_menus{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'nodes_after_top_before_section_texi2html_use_nodes_chapter'};
-$result_errors{'nodes_after_top_before_section'} = [];
+$result_errors{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} =
[];
-$result_floats{'nodes_after_top_before_section'} = {};
+$result_floats{'nodes_after_top_before_section_texi2html_use_nodes_chapter'} =
{};
-$result_converted_errors{'file_html'}->{'nodes_after_top_before_section'} = [
+$result_converted_errors{'file_html'}->{'nodes_after_top_before_section_texi2html_use_nodes_chapter'}
= [
{
'error_line' => 'warning: must specify a title with a title command or @top
',
- 'file_name' => 'nodes_after_top_before_section.texi',
+ 'file_name' =>
'nodes_after_top_before_section_texi2html_use_nodes_chapter.texi',
'text' => 'must specify a title with a title command or @top',
'type' => 'warning'
}
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/index.html
similarity index 85%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/index.html
index f2a708840c..218c47ac28 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/index.html
+++
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/index.html
@@ -23,15 +23,13 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
-
<a class="node-id" id="Top"></a><table class="nav-panel" cellpadding="1"
cellspacing="1" border="0">
<tr><td>[ < ]</td>
<td>[<a href="#second-node" title="Next section in reading order"> >
</a>]</td>
<td> </td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_section_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_section_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<h1 class="node">Top</h1>
<p>Top node
@@ -56,7 +54,7 @@ td.menu-entry-destination {vertical-align: top}
<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_section_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_section_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<h3 class="node">second node</h3>
@@ -77,11 +75,9 @@ td.menu-entry-destination {vertical-align: top}
<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_section_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_section_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<h3 class="subsection" id="subsection">1 subsection</h3>
-
-
</div>
<hr>
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
@@ -95,7 +91,7 @@ td.menu-entry-destination {vertical-align: top}
<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
<td>[Contents]</td>
<td>[Index]</td>
-<td>[<a href="nodes_after_top_before_section_abt.html#SEC_About" title="About
(help)"> ? </a>]</td>
+<td>[<a
href="nodes_after_top_before_section_texi2html_use_nodes_chapter_abt.html#SEC_About"
title="About (help)"> ? </a>]</td>
</tr></table>
<p>
<span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em>.</span>
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/nodes_after_top_before_section_abt.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/nodes_after_top_before_section_texi2html_use_nodes_chapter_abt.html
similarity index 100%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/nodes_after_top_before_section_abt.html
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/nodes_after_top_before_section_texi2html_use_nodes_chapter_abt.html
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/second-node.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/second-node.html
similarity index 100%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/second-node.html
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/second-node.html
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/third-node.html
b/tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/third-node.html
similarity index 100%
rename from
tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter/res_html/third-node.html
rename to
tp/t/results/sectioning/nodes_after_top_before_section_texi2html_use_nodes_chapter/res_html/third-node.html
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (converter_defaults) (_set_variables_texi2html): copy %defaults and modify the copy in _set_variables_texi2html() instead of changing the file global variable.,
Patrice Dumas <=