[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.tres, tp/t/93layout.t, tp/tests/lay
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.tres, tp/t/93layout.t, tp/tests/layout/list-of-tests: move navigation_test_misc_file_collision test to tp/t/93layout.t. Remove no_monolithic_only_toc_out test from tp/tests/layout/list-of-tests, it is in tp/t/93layout.t. |
|
Date: |
Tue, 03 Jan 2023 06:24:27 -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 20fdeb4d7e * tp/Makefile.tres, tp/t/93layout.t,
tp/tests/layout/list-of-tests: move navigation_test_misc_file_collision test to
tp/t/93layout.t. Remove no_monolithic_only_toc_out test from
tp/tests/layout/list-of-tests, it is in tp/t/93layout.t.
20fdeb4d7e is described below
commit 20fdeb4d7eadd61b5bdbf54171b0b8269c319012
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 12:24:17 2023 +0100
* tp/Makefile.tres, tp/t/93layout.t, tp/tests/layout/list-of-tests:
move navigation_test_misc_file_collision test to tp/t/93layout.t.
Remove no_monolithic_only_toc_out test from
tp/tests/layout/list-of-tests, it is in tp/t/93layout.t.
---
ChangeLog | 7 +
tp/Makefile.tres | 7 +
tp/t/93layout.t | 7 +-
.../layout/navigation_test_misc_file_collision.pl | 1213 ++++++++++++++++++++
.../res_html}/chapter.html | 0
.../res_html}/index.html | 0
.../res_html}/navigation_abt.html | 1 -
.../res_html}/navigation_toc.html | 0
.../res_html}/section.html | 0
.../res_html}/subsection.html | 0
tp/tests/layout/list-of-tests | 2 -
.../navigation.1 | 0
.../navigation.2 | 0
.../no_monolithic_only_toc_out/no_monolithic.1 | 0
.../no_monolithic_only_toc_out/no_monolithic.2 | 0
.../no_monolithic_only_toc_out/no_monolithic.html | 238 ----
.../no_monolithic_toc.html | 54 -
.../layout_navigation_test_misc_file_collision.sh | 19 -
.../layout_no_monolithic_only_toc_out.sh | 19 -
19 files changed, 1233 insertions(+), 334 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2cb950ac3e..67776f48d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-03 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.tres, tp/t/93layout.t, tp/tests/layout/list-of-tests:
+ move navigation_test_misc_file_collision test to tp/t/93layout.t.
+ Remove no_monolithic_only_toc_out test from
+ tp/tests/layout/list-of-tests, it is in tp/t/93layout.t.
+
2023-01-03 Patrice Dumas <pertusus@free.fr>
* tp/t/init/only_toc_out.init: use the correct special element variety
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index e800e0e8a8..31b71cc9f7 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1415,6 +1415,13 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/layout/navigation_section_vertical/res_html/navigation_toc.html \
t/results/layout/navigation_section_vertical/res_html/section.html \
t/results/layout/navigation_section_vertical/res_html/subsection.html \
+ t/results/layout/navigation_test_misc_file_collision.pl \
+ t/results/layout/navigation_test_misc_file_collision/res_html/chapter.html \
+ t/results/layout/navigation_test_misc_file_collision/res_html/index.html \
+
t/results/layout/navigation_test_misc_file_collision/res_html/navigation_abt.html
\
+
t/results/layout/navigation_test_misc_file_collision/res_html/navigation_toc.html
\
+ t/results/layout/navigation_test_misc_file_collision/res_html/section.html \
+
t/results/layout/navigation_test_misc_file_collision/res_html/subsection.html \
t/results/layout/navigation_vertical.pl \
t/results/layout/navigation_vertical/res_html/navigation.html \
t/results/layout/no_monolithic.pl \
diff --git a/tp/t/93layout.t b/tp/t/93layout.t
index 13474a2957..c6577b67f9 100644
--- a/tp/t/93layout.t
+++ b/tp/t/93layout.t
@@ -87,7 +87,12 @@ my @test_cases = (
{'VERTICAL_HEAD_NAVIGATION' => 1, 'SPLIT' => 'node',
'HEADERS' => 0}
],
-
+# could also be considered as testing init files
+['navigation_test_misc_file_collision',
+ undef, {'test_file' => 'navigation.texi',
+ 'init_files' => ['misc_file_collision.init'] },
+ {'SPLIT' => 'node'},
+],
);
foreach my $test (@test_cases) {
diff --git a/tp/t/results/layout/navigation_test_misc_file_collision.pl
b/tp/t/results/layout/navigation_test_misc_file_collision.pl
new file mode 100644
index 0000000000..39ab99db7e
--- /dev/null
+++ b/tp/t/results/layout/navigation_test_misc_file_collision.pl
@@ -0,0 +1,1213 @@
+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{'navigation_test_misc_file_collision'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '\\input texinfo @c -*-texinfo-*-
+',
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
+ }
+ ],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
+ 'type' => 'preamble_before_content'
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'File used for navigation testing'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'menu',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ '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' => 'chapter'
+ }
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 7,
+ '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' => 'navigation.texi',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chapter'
+ }
+ ],
+ 'normalized' => 'chapter'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'First chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'chapter',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'menu',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'section'
+ }
+ ],
+ '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' => 'section'
+ }
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 14,
+ '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' => 'navigation.texi',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'section'
+ }
+ ],
+ 'normalized' => 'section'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Section in chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'section',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'AAAA
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'b b b b b b b b b b b b b b b b b b b b b b b b b b b
b b b b b b b b
+'
+ },
+ {
+ 'text' => 'b b b b b b b b b b b b b b b b b b b b b bb b b b b
b b bb b bb.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'menu',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'subsection'
+ }
+ ],
+ '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' => 'subsection'
+ }
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 48,
+ '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' => 'navigation.texi',
+ 'line_nr' => 49,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 47,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 18,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'subsection'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'subsection'
+ }
+ ],
+ 'normalized' => 'subsection'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 51,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Sub section in section'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'subsection',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'contents',
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 54,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'navigation.texi',
+ 'line_nr' => 52,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'bye'
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[5]{'extra'}{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[7]{'extra'}{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'navigation_test_misc_file_collision'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'navigation_test_misc_file_collision'}{'contents'}[7]{'args'}[0]{'contents'}[0];
+
+$result_texis{'navigation_test_misc_file_collision'} = '\\input texinfo @c
-*-texinfo-*-
+
+@node Top
+@top File used for navigation testing
+
+@menu
+* chapter::
+@end menu
+
+@node chapter
+@chapter First chapter
+
+@menu
+* section::
+@end menu
+
+@node section
+@section Section in chapter
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b
+b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
+
+@menu
+* subsection::
+@end menu
+
+@node subsection
+@subsection Sub section in section
+
+@contents
+
+@bye
+';
+
+
+$result_texts{'navigation_test_misc_file_collision'} = 'File used for
navigation testing
+********************************
+
+* chapter::
+
+1 First chapter
+***************
+
+* section::
+
+1.1 Section in chapter
+======================
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+AAAA
+
+b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b
+b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb.
+
+* subsection::
+
+1.1.1 Sub section in section
+----------------------------
+
+
+';
+
+$result_sectioning{'navigation_test_misc_file_collision'} = {
+ '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' => {
+ 'normalized' => 'chapter'
+ },
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'section',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'section'
+ },
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'subsection',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'subsection'
+ },
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 3,
+ 'section_number' => '1.1.1',
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => 2,
+ 'section_number' => '1.1',
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => 1,
+ 'section_number' => 1,
+ 'section_up' => {},
+ 'toplevel_prev' => {},
+ 'toplevel_up' => {}
+ }
+ }
+ ],
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
+$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
+$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
=
$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'navigation_test_misc_file_collision'};
+
+$result_nodes{'navigation_test_misc_file_collision'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
+ 'menus' => [
+ {
+ 'cmdname' => 'menu'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'chapter',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {
+ 'section_number' => 1
+ }
+ },
+ 'menus' => [
+ {
+ 'cmdname' => 'menu'
+ }
+ ],
+ 'normalized' => 'chapter'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'section',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {
+ 'section_number' => '1.1'
+ }
+ },
+ 'menus' => [
+ {
+ 'cmdname' => 'menu'
+ }
+ ],
+ 'normalized' => 'section'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'subsection',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {
+ 'section_number' => '1.1.1'
+ }
+ },
+ 'normalized' => 'subsection'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_up' => {}
+ }
+ },
+ 'node_up' => {}
+ }
+ },
+ 'node_prev' => {},
+ 'node_up' => {}
+ }
+ },
+ 'node_next' => {}
+ }
+};
+$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
=
$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
=
$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'};
+$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'navigation_test_misc_file_collision'};
+$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'navigation_test_misc_file_collision'};
+$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'node_next'}
=
$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'};
+
+$result_menus{'navigation_test_misc_file_collision'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chapter'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'section'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'subsection'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'section' => 1
+ }
+ }
+ },
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'chapter' => 1
+ }
+ }
+ },
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ }
+ }
+ }
+};
+$result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
=
$result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'};
+$result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
=
$result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'};
+$result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'navigation_test_misc_file_collision'};
+
+$result_errors{'navigation_test_misc_file_collision'} = [];
+
+
+$result_floats{'navigation_test_misc_file_collision'} = {};
+
+
+1;
diff --git
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/chapter.html
b/tp/t/results/layout/navigation_test_misc_file_collision/res_html/chapter.html
similarity index 100%
rename from
tp/tests/layout/res_parser/navigation_test_misc_file_collision/chapter.html
rename to
tp/t/results/layout/navigation_test_misc_file_collision/res_html/chapter.html
diff --git
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/index.html
b/tp/t/results/layout/navigation_test_misc_file_collision/res_html/index.html
similarity index 100%
rename from
tp/tests/layout/res_parser/navigation_test_misc_file_collision/index.html
rename to
tp/t/results/layout/navigation_test_misc_file_collision/res_html/index.html
diff --git
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
b/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_abt.html
similarity index 99%
rename from
tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
rename to
tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_abt.html
index d336a30b0c..2c73cb1eb5 100644
---
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_abt.html
+++
b/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_abt.html
@@ -26,7 +26,6 @@ td.name-direction-about {text-align:center}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
b/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_toc.html
similarity index 100%
rename from
tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation_toc.html
rename to
tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_toc.html
diff --git
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/section.html
b/tp/t/results/layout/navigation_test_misc_file_collision/res_html/section.html
similarity index 100%
rename from
tp/tests/layout/res_parser/navigation_test_misc_file_collision/section.html
rename to
tp/t/results/layout/navigation_test_misc_file_collision/res_html/section.html
diff --git
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
b/tp/t/results/layout/navigation_test_misc_file_collision/res_html/subsection.html
similarity index 100%
rename from
tp/tests/layout/res_parser/navigation_test_misc_file_collision/subsection.html
rename to
tp/t/results/layout/navigation_test_misc_file_collision/res_html/subsection.html
diff --git a/tp/tests/layout/list-of-tests b/tp/tests/layout/list-of-tests
index dbc2a8a000..a0f894023e 100644
--- a/tp/tests/layout/list-of-tests
+++ b/tp/tests/layout/list-of-tests
@@ -1,5 +1,3 @@
-no_monolithic_only_toc_out no_monolithic.texi -c 'MONOLITHIC 0' --init
only_toc_out.init
-navigation_test_misc_file_collision navigation.texi --split node --init
misc_file_collision.init
formatting_macro_expand formatting.texi
--macro-expand=@OUT_DIR@formatting.texi -c TEXINFO_OUTPUT_FORMAT=structure
# the output should be the same as just above, but is less interesting
diff --git
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation.1
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation.1
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation.2
b/tp/tests/layout/res_parser/navigation_test_misc_file_collision/navigation.2
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.1
b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.1
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.2
b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.2
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
deleted file mode 100644
index 314d9a2517..0000000000
--- a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<!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>Not monolithic</title>
-
-<meta name="description" content="Not monolithic">
-<meta name="keywords" content="Not monolithic">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-a.summary-letter-printindex {text-decoration: none}
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
-td.name-direction-about {text-align:center}
-td.printindex-index-entry {vertical-align: top}
-td.printindex-index-section {vertical-align: top; padding-left: 1em}
-th.entries-header-printindex {text-align:left}
-th.sections-header-printindex {text-align:left; padding-left: 1em}
-ul.toc-numbered-mark {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-
-<div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ < ]</td>
-<td>[<a href="#chapter" title="Next section in reading order"> > </a>]</td>
-<td> </td>
-<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of
contents">Contents</a>]</td>
-<td>[<a href="#chapter" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="top" id="Not-monolithic">Not monolithic</h1>
-
-<p>Not monolitic manual<a class="footnote" id="DOCF1"
href="#FOOT1"><sup>1</sup></a>.
-</p>
-<a class="index-entry-id" id="index-top"></a>
-
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#chapter" rel="index">1
Chapter</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
-
-<hr style="height: 6px;">
-<div class="chapter-level-extent" id="chapter">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Beginning of this chapter or previous chapter">
<< </a>]</td>
-<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
-<td>[ > ]</td>
-<td>[ >> ]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of
contents">Contents</a>]</td>
-<td>[<a href="#chapter" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="Chapter">1 Chapter</h1>
-
-<p>Chapter.
-</p>
-
-<div class="printindex cp-printindex">
-<table class="cp-entries-printindex" border="0">
-<tr><td></td><th class="entries-header-printindex">Index Entry</th><th
class="sections-header-printindex">Section</th></tr>
-<tr><td colspan="3"><hr></td></tr>
-<tr><th id="Chapter_cp_letter-T">T</th></tr>
-<tr><td></td><td class="printindex-index-entry"><a
href="#index-top">top</a></td><td class="printindex-index-section"><a
href="#Top">Not monolithic</a></td></tr>
-<tr><td colspan="3"><hr></td></tr>
-</table>
-</div>
-<hr style="height: 6px;">
-</div>
-</div>
-<div class="element-footnotes" id="SEC_Footnotes">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of
contents">Contents</a>]</td>
-<td>[<a href="#chapter" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="footnotes-heading">Footnotes</h1>
-
-<h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(1)</a></h5>
-<p>my footnote</p>
-</div><hr>
-<div class="element-shortcontents" id="SEC_Shortcontents">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of
contents">Contents</a>]</td>
-<td>[<a href="#chapter" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="shortcontents-heading">Short Table of Contents</h1>
-
-<div class="shortcontents">
-<ul class="toc-numbered-mark">
-<li><a id="stoc-Chapter" href="#chapter" rel="index">1 Chapter</a></li>
-</ul>
-</div>
-</div><hr>
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of
contents">Contents</a>]</td>
-<td>[<a href="#chapter" title="Index">Index</a>]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="about-heading">About This Document</h1>
-
-<p>
- This document was generated on <em class="emph">a sunny day</em> using <a
class="uref" href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.
-</p>
-<p>
- The buttons in the navigation panels have the following meaning:
-</p>
-<table border="1">
- <tr>
- <th> Button </th>
- <th> Name </th>
- <th> Go to </th>
- <th> From 1.2.3 go to</th>
- </tr>
- <tr>
- <td class="button-direction-about"> [ << ] </td>
- <td class="name-direction-about">FastBack</td>
- <td>Beginning of this chapter or previous chapter</td>
- <td>1</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ < ] </td>
- <td class="name-direction-about">Back</td>
- <td>Previous section in reading order</td>
- <td>1.2.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ Up ] </td>
- <td class="name-direction-about">Up</td>
- <td>Up section</td>
- <td>1.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ > ] </td>
- <td class="name-direction-about">Forward</td>
- <td>Next section in reading order</td>
- <td>1.2.4</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ >> ] </td>
- <td class="name-direction-about">FastForward</td>
- <td>Next chapter</td>
- <td>2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Top] </td>
- <td class="name-direction-about">Top</td>
- <td>Cover (top) of document</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Contents] </td>
- <td class="name-direction-about">Contents</td>
- <td>Table of contents</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Index] </td>
- <td class="name-direction-about">Index</td>
- <td>Index</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ ? ] </td>
- <td class="name-direction-about">About</td>
- <td>About (help)</td>
- <td> </td>
- </tr>
-</table>
-
-<p>
- where the <strong class="strong"> Example </strong> assumes that the current
position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of
a document of the following structure:
-</p>
-
-<ul>
- <li> 1. Section One
- <ul>
- <li>1.1 Subsection One-One
- <ul>
- <li>...</li>
- </ul>
- </li>
- <li>1.2 Subsection One-Two
- <ul>
- <li>1.2.1 Subsubsection One-Two-One</li>
- <li>1.2.2 Subsubsection One-Two-Two</li>
- <li>1.2.3 Subsubsection One-Two-Three
- <strong><== Current Position </strong></li>
- <li>1.2.4 Subsubsection One-Two-Four</li>
- </ul>
- </li>
- <li>1.3 Subsection One-Three
- <ul>
- <li>...</li>
- </ul>
- </li>
- <li>1.4 Subsection One-Four</li>
- </ul>
- </li>
-</ul>
-</div><hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of
contents">Contents</a>]</td>
-<td>[<a href="#chapter" title="Index">Index</a>]</td>
-<td>[<a href="#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> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
diff --git
a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html
b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html
deleted file mode 100644
index d309708918..0000000000
---
a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!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>Not monolithic</title>
-
-<meta name="description" content="Not monolithic">
-<meta name="keywords" content="Not monolithic">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-ul.toc-numbered-mark {list-style: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<div class="element-contents" id="SEC_Contents">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="no_monolithic.html#Top" title="Cover (top) of
document">Top</a>]</td>
-<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[<a href="no_monolithic.html#chapter" title="Index">Index</a>]</td>
-<td>[<a href="no_monolithic.html#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="contents-heading">Table of Contents</h1>
-
-<div class="contents">
-
-<ul class="toc-numbered-mark">
- <li><a id="toc-Chapter" href="no_monolithic.html#chapter" rel="index">1
Chapter</a></li>
-</ul>
-</div>
-</div><hr>
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="no_monolithic.html#Top" title="Cover (top) of
document">Top</a>]</td>
-<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[<a href="no_monolithic.html#chapter" title="Index">Index</a>]</td>
-<td>[<a href="no_monolithic.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> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
diff --git
a/tp/tests/test_scripts/layout_navigation_test_misc_file_collision.sh
b/tp/tests/test_scripts/layout_navigation_test_misc_file_collision.sh
deleted file mode 100755
index ff02452b96..0000000000
--- a/tp/tests/test_scripts/layout_navigation_test_misc_file_collision.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-# This file generated by maintain/regenerate_cmd_tests.sh
-
-if test z"$srcdir" = "z"; then
- srcdir=.
-fi
-
-one_test_logs_dir=test_log
-
-
-dir=layout
-name='navigation_test_misc_file_collision'
-mkdir -p $dir
-
-"$srcdir"/run_parser_all.sh -dir $dir $name
-exit_status=$?
-cat $dir/$one_test_logs_dir/$name.log
-exit $exit_status
-
diff --git a/tp/tests/test_scripts/layout_no_monolithic_only_toc_out.sh
b/tp/tests/test_scripts/layout_no_monolithic_only_toc_out.sh
deleted file mode 100755
index 417cfcc904..0000000000
--- a/tp/tests/test_scripts/layout_no_monolithic_only_toc_out.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-# This file generated by maintain/regenerate_cmd_tests.sh
-
-if test z"$srcdir" = "z"; then
- srcdir=.
-fi
-
-one_test_logs_dir=test_log
-
-
-dir=layout
-name='no_monolithic_only_toc_out'
-mkdir -p $dir
-
-"$srcdir"/run_parser_all.sh -dir $dir $name
-exit_status=$?
-cat $dir/$one_test_logs_dir/$name.log
-exit $exit_status
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.tres, tp/t/93layout.t, tp/tests/layout/list-of-tests: move navigation_test_misc_file_collision test to tp/t/93layout.t. Remove no_monolithic_only_toc_out test from tp/tests/layout/list-of-tests, it is in tp/t/93layout.t.,
Patrice Dumas <=