[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/htm
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/html_tests.t, tp/tests/contents/Makefile.am (EXTRA_DIST), tp/tests/contents/list-of-tests: move contents_and_parts out of tp/tests/contents/list-of-tests to tp/t/30sectioning.t and inline, remove the Texinfo file. Add no_content tests in tp/tests/contents/list-of-tests to test also the default case for contents location and unset the texi2html style. Duplicate the no_content tests in tp/t/html_tests.t. |
|
Date: |
Wed, 04 Jan 2023 03:29: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 dabcb0d443 * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/html_tests.t,
tp/tests/contents/Makefile.am (EXTRA_DIST), tp/tests/contents/list-of-tests:
move contents_and_parts out of tp/tests/contents/list-of-tests to
tp/t/30sectioning.t and inline, remove the Texinfo file. Add no_content tests
in tp/tests/contents/list-of-tests to test also the default case for contents
location and unset the texi2html style. Duplicate the no_content tests in
tp/t/html_tests.t.
dabcb0d443 is described below
commit dabcb0d4439025174a2eebacc20fbfc0924ba148
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 4 09:29:16 2023 +0100
* tp/Makefile.tres, tp/t/30sectioning.t, tp/t/html_tests.t,
tp/tests/contents/Makefile.am (EXTRA_DIST),
tp/tests/contents/list-of-tests: move contents_and_parts out of
tp/tests/contents/list-of-tests to tp/t/30sectioning.t and inline,
remove the Texinfo file.
Add no_content tests in tp/tests/contents/list-of-tests to test also
the default case for contents location and unset the texi2html style.
Duplicate the no_content tests in tp/t/html_tests.t.
---
ChangeLog | 11 +
tp/Makefile.tres | 13 +
tp/t/30sectioning.t | 26 +
tp/t/html_tests.t | 33 +-
tp/t/results/sectioning/contents_and_parts.pl | 1133 ++++++++++++++++++++
tp/tests/contents/Makefile.am | 1 -
tp/tests/contents/contents_and_parts.texi | 28 -
tp/tests/contents/list-of-tests | 17 +-
.../contents_and_parts/contents_and_parts.html | 284 -----
.../contents/res_parser/no_content/no_content.html | 163 +--
.../no_content_do_contents/no_content.html | 175 +--
.../no_content_do_contents_inline/no_content.html | 163 +--
.../no_content.1} | 0
.../no_content.2} | 0
.../no_content.html | 71 ++
.../res_parser/no_content_inline/no_content.html | 163 +--
.../no_content.1} | 0
.../no_content.2} | 0
.../res_parser/no_content_separate/no_content.html | 51 +
...=> contents_no_content_do_contents_separate.sh} | 2 +-
...nd_parts.sh => contents_no_content_separate.sh} | 2 +-
21 files changed, 1408 insertions(+), 928 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 66ca1f4196..d552e6ed6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-01-04 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/html_tests.t,
+ tp/tests/contents/Makefile.am (EXTRA_DIST),
+ tp/tests/contents/list-of-tests: move contents_and_parts out of
+ tp/tests/contents/list-of-tests to tp/t/30sectioning.t and inline,
+ remove the Texinfo file.
+ Add no_content tests in tp/tests/contents/list-of-tests to test also
+ the default case for contents location and unset the texi2html style.
+ Duplicate the no_content tests in tp/t/html_tests.t.
+
2023-01-04 Patrice Dumas <pertusus@free.fr>
* tp/t/test_utils.pl (convert_to_plaintext): set OUTFILE to undef
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index ee887da24d..1c93821fac 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -574,6 +574,18 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/html_tests/mathjax_with_texinfo_enable_encoding/res_latex \
t/results/html_tests/mathjax_with_texinfo_html_text.pl \
t/results/html_tests/mathjax_with_texinfo_no_convert_to_latex.pl \
+ t/results/html_tests/no_content.pl \
+ t/results/html_tests/no_content/res_html \
+ t/results/html_tests/no_content_do_contents.pl \
+ t/results/html_tests/no_content_do_contents/res_html \
+ t/results/html_tests/no_content_do_contents_inline.pl \
+ t/results/html_tests/no_content_do_contents_inline/res_html \
+ t/results/html_tests/no_content_do_contents_separate_element.pl \
+ t/results/html_tests/no_content_do_contents_separate_element/res_html \
+ t/results/html_tests/no_content_inline.pl \
+ t/results/html_tests/no_content_inline/res_html \
+ t/results/html_tests/no_content_separate_element.pl \
+ t/results/html_tests/no_content_separate_element/res_html \
t/results/html_tests/no_use_iso.pl \
t/results/html_tests/node_footnote_end.pl \
t/results/html_tests/node_footnote_end/res_html \
@@ -1568,6 +1580,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/sectioning/chapter_between_nodes_with_appendix_nomenu.pl \
t/results/sectioning/chapter_node_before_and_after_part.pl \
t/results/sectioning/character_and_spaces_in_node.pl \
+ t/results/sectioning/contents_and_parts.pl \
t/results/sectioning/contents_in_html_text.pl \
t/results/sectioning/contents_with_only_top_node.pl \
t/results/sectioning/double_node_anchor_float.pl \
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index 39699a0316..753f5c7f4d 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -231,6 +231,32 @@ in node after chapter 1
@contents
', {'test_split' => 'section'}, {'CONTENTS_OUTPUT_LOCATION' => 'inline'}
],
+['contents_and_parts',
+'@node Top
+@top top
+
+@menu
+* chapter 1 node::
+* chapter 2 node::
+* chapter 3 node::
+@end menu
+
+@part part 1: part 1
+
+@node chapter 1 node
+@chapter chapter 1
+
+@node chapter 2 node
+@chapter chapter 2
+
+@part part2: part2
+
+@node chapter 3 node
+@chapter chapter 3
+
+@contents
+@shortcontents
+'],
['lone_contents',
'@contents
'],
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index e2bc0bf2b4..b1c2b528c5 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -958,9 +958,36 @@ $check_htmlxref_text
{'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">',
'FORMAT_MENU' => 'nomenu'}
],
-
-
-
+# there are the same tests in tests/contents to test the command line
+['no_content',
+ undef, {'test_file' => '../../tests/contents/no_content.texi'},
+ {'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
+],
+['no_content_inline',
+ undef, {'test_file' => '../../tests/contents/no_content.texi'},
+ {'CONTENTS_OUTPUT_LOCATION' => 'inline',
+ 'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
+],
+['no_content_separate_element',
+ undef, {'test_file' => '../../tests/contents/no_content.texi'},
+ {'CONTENTS_OUTPUT_LOCATION' => 'separate_element',
+ 'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
+],
+['no_content_do_contents',
+ undef, {'test_file' => '../../tests/contents/no_content.texi'},
+ {'contents' => 1,
+ 'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
+],
+['no_content_do_contents_inline',
+ undef, {'test_file' => '../../tests/contents/no_content.texi'},
+ {'contents' => 1, 'CONTENTS_OUTPUT_LOCATION' => 'inline',
+ 'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
+],
+['no_content_do_contents_separate_element',
+ undef, {'test_file' => '../../tests/contents/no_content.texi'},
+ {'contents' => 1, 'CONTENTS_OUTPUT_LOCATION' => 'separate_element',
+ 'SPLIT' => '', 'BIG_RULE' => '<hr style="height: 6px;">'}
+],
);
diff --git a/tp/t/results/sectioning/contents_and_parts.pl
b/tp/t/results/sectioning/contents_and_parts.pl
new file mode 100644
index 0000000000..7936fc74d6
--- /dev/null
+++ b/tp/t/results/sectioning/contents_and_parts.pl
@@ -0,0 +1,1133 @@
+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{'contents_and_parts'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ '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' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ '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 1 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' => 'chapter-1-node'
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'type' => 'menu_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter 2 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' => 'chapter-2-node'
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'type' => 'menu_entry'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '* ',
+ 'type' => 'menu_entry_leading_text'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter 3 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' => 'chapter-3-node'
+ }
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ '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' => '',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'part 1: part 1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'part',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter 1 node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chapter-1-node'
+ }
+ ],
+ 'normalized' => 'chapter-1-node'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter 1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'chapter',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {
+ 'associated_part' => {}
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter 2 node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chapter-2-node'
+ }
+ ],
+ 'normalized' => 'chapter-2-node'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter 2'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'chapter',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'part2: part2'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'part',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter 3 node'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chapter-3-node'
+ }
+ ],
+ 'normalized' => 'chapter-3-node'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter 3'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'chapter',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'contents',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'shortcontents',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 24,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'associated_part' => {}
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'contents_and_parts'}{'contents'}[1]{'extra'}{'node_content'}[0]
= $result_trees{'contents_and_parts'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'contents_and_parts'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_description'}
=
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3];
+$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'contents_and_parts'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[4]{'extra'}{'node_content'}[0]
= $result_trees{'contents_and_parts'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'contents_and_parts'}{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[5]{'extra'}{'associated_part'}
= $result_trees{'contents_and_parts'}{'contents'}[3];
+$result_trees{'contents_and_parts'}{'contents'}[6]{'extra'}{'node_content'}[0]
= $result_trees{'contents_and_parts'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'contents_and_parts'}{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[9]{'extra'}{'node_content'}[0]
= $result_trees{'contents_and_parts'}{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'contents_and_parts'}{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'contents_and_parts'}{'contents'}[10]{'extra'}{'associated_part'}
= $result_trees{'contents_and_parts'}{'contents'}[8];
+
+$result_texis{'contents_and_parts'} = '@node Top
+@top top
+
+@menu
+* chapter 1 node::
+* chapter 2 node::
+* chapter 3 node::
+@end menu
+
+@part part 1: part 1
+
+@node chapter 1 node
+@chapter chapter 1
+
+@node chapter 2 node
+@chapter chapter 2
+
+@part part2: part2
+
+@node chapter 3 node
+@chapter chapter 3
+
+@contents
+@shortcontents
+';
+
+
+$result_texts{'contents_and_parts'} = 'top
+***
+
+* chapter 1 node::
+* chapter 2 node::
+* chapter 3 node::
+
+part 1: part 1
+**************
+
+1 chapter 1
+***********
+
+2 chapter 2
+***********
+
+part2: part2
+************
+
+3 chapter 3
+***********
+
+';
+
+$result_sectioning{'contents_and_parts'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ },
+ {
+ 'cmdname' => 'part',
+ 'extra' => {
+ 'part_associated_section' => {
+ 'cmdname' => 'chapter',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chapter-1-node'
+ },
+ 'info' => {},
+ 'structure' => {}
+ },
+ 'associated_part' => {}
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 1,
+ 'section_number' => 1,
+ 'section_up' => {},
+ 'toplevel_prev' => {},
+ 'toplevel_up' => {}
+ }
+ },
+ 'part_following_node' => {}
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_childs' => [
+ {},
+ {
+ 'cmdname' => 'chapter',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chapter-2-node'
+ },
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 1,
+ 'section_number' => 2,
+ 'section_prev' => {},
+ 'section_up' => {},
+ 'toplevel_prev' => {},
+ 'toplevel_up' => {}
+ }
+ }
+ ],
+ 'section_level' => 0,
+ 'section_prev' => {},
+ 'section_up' => {}
+ }
+ },
+ {
+ 'cmdname' => 'part',
+ 'extra' => {
+ 'part_associated_section' => {
+ 'cmdname' => 'chapter',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chapter-3-node'
+ },
+ 'info' => {},
+ 'structure' => {}
+ },
+ 'associated_part' => {}
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 1,
+ 'section_number' => 3,
+ 'section_up' => {},
+ 'toplevel_prev' => {},
+ 'toplevel_up' => {}
+ }
+ },
+ 'part_following_node' => {}
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_childs' => [
+ {}
+ ],
+ 'section_level' => 0,
+ 'section_prev' => {},
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'contents_and_parts'};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'extra'}{'associated_part'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'structure'}{'section_up'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'structure'}{'toplevel_prev'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'structure'}{'toplevel_up'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_following_node'}
=
$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_associated_section'}{'extra'}{'associated_node'};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'structure'}{'section_childs'}[0]
=
$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'structure'}{'section_childs'}[1]{'structure'}{'section_prev'}
=
$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'structure'}{'section_childs'}[1]{'structure'}{'section_up'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'extra'}{'part_associated_section'};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_up'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'structure'}{'section_prev'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'structure'}{'section_up'}
= $result_sectioning{'contents_and_parts'};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'extra'}{'part_associated_section'}{'extra'}{'associated_part'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'extra'}{'part_associated_section'}{'structure'}{'section_up'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'extra'}{'part_associated_section'}{'structure'}{'toplevel_prev'}
=
$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1]{'structure'}{'section_childs'}[1];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'extra'}{'part_associated_section'}{'structure'}{'toplevel_up'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'extra'}{'part_following_node'}
=
$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'extra'}{'part_associated_section'}{'extra'}{'associated_node'};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'structure'}{'section_childs'}[0]
=
$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'extra'}{'part_associated_section'};
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'structure'}{'section_prev'}
= $result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[1];
+$result_sectioning{'contents_and_parts'}{'structure'}{'section_childs'}[2]{'structure'}{'section_up'}
= $result_sectioning{'contents_and_parts'};
+
+$result_nodes{'contents_and_parts'} = {
+ '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' => {
+ 'associated_part' => {
+ 'cmdname' => 'part',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_number' => 1
+ }
+ },
+ 'node_preceding_part' => {},
+ 'normalized' => 'chapter-1-node'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'chapter',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {
+ 'section_number' => 2
+ }
+ },
+ 'normalized' => 'chapter-2-node'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'chapter',
+ 'extra' => {
+ 'associated_part' => {
+ 'cmdname' => 'part',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_number' => 3
+ }
+ },
+ 'node_preceding_part' => {},
+ 'normalized' => 'chapter-3-node'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {},
+ 'node_up' => {}
+ }
+ },
+ 'node_prev' => {},
+ 'node_up' => {}
+ }
+ },
+ 'node_prev' => {},
+ 'node_up' => {}
+ }
+ },
+ 'node_next' => {}
+ }
+};
+$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'extra'}{'node_preceding_part'}
=
$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'extra'}{'associated_section'}{'extra'}{'associated_part'};
+$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'extra'}{'node_preceding_part'}
=
$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'extra'}{'associated_section'}{'extra'}{'associated_part'};
+$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
=
$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_next'};
+$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'contents_and_parts'};
+$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'contents_and_parts'}{'structure'}{'menu_child'};
+$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'contents_and_parts'};
+$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'contents_and_parts'};
+$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'contents_and_parts'};
+$result_nodes{'contents_and_parts'}{'structure'}{'node_next'} =
$result_nodes{'contents_and_parts'}{'structure'}{'menu_child'};
+
+$result_menus{'contents_and_parts'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chapter-1-node'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chapter-2-node'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chapter-3-node'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_prev' => {},
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ }
+ },
+ 'menu_prev' => {},
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ }
+ },
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ }
+ }
+ }
+};
+$result_menus{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
=
$result_menus{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'menu_next'};
+$result_menus{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'contents_and_parts'};
+$result_menus{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
= $result_menus{'contents_and_parts'}{'structure'}{'menu_child'};
+$result_menus{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'contents_and_parts'};
+$result_menus{'contents_and_parts'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'contents_and_parts'};
+
+$result_errors{'contents_and_parts'} = [];
+
+
+$result_floats{'contents_and_parts'} = {};
+
+
+
+$result_converted{'plaintext'}->{'contents_and_parts'} = 'top
+***
+
+1 chapter 1
+***********
+
+2 chapter 2
+***********
+
+3 chapter 3
+***********
+
+top
+part 1: part 1
+1 chapter 1
+2 chapter 2
+part2: part2
+3 chapter 3
+top
+part 1: part 1
+1 chapter 1
+2 chapter 2
+part2: part2
+3 chapter 3
+';
+
+
+$result_converted{'html'}->{'contents_and_parts'} = '<!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">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<style type="text/css">
+<!--
+ul.toc-numbered-mark {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter-1-node" accesskey="n" rel="next">chapter 1</a>
[<a href="#SEC_Contents" title="Table of contents"
rel="contents">Contents</a>]</p>
+</div>
+<h1 class="top" id="top">top</h1>
+
+
+<div class="element-contents" id="SEC_Contents">
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+<ul class="toc-numbered-mark">
+<li><a id="toc-part-1_003a-part-1" href="#part-1_003a-part-1">part 1: part
1</a>
+<ul class="toc-numbered-mark">
+ <li><a id="toc-chapter-1" href="#chapter-1-node">1 chapter 1</a></li>
+ <li><a id="toc-chapter-2" href="#chapter-2-node">2 chapter 2</a></li>
+</ul></li>
+<li><a id="toc-part2_003a-part2" href="#part2_003a-part2">part2: part2</a>
+<ul class="toc-numbered-mark">
+ <li><a id="toc-chapter-3" href="#chapter-3-node">3 chapter 3</a></li>
+</ul></li>
+
+</ul>
+</div>
+</div>
+<div class="element-shortcontents" id="SEC_Shortcontents">
+<h2 class="shortcontents-heading">Short Table of Contents</h2>
+
+<div class="shortcontents">
+<ul class="toc-numbered-mark">
+<li><a id="stoc-part-1_003a-part-1" href="#toc-part-1_003a-part-1">part 1:
part 1</a><ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-1" href="#toc-chapter-1">1 chapter 1</a></li>
+<li><a id="stoc-chapter-2" href="#toc-chapter-2">2 chapter 2</a></li>
+</ul></li>
+<li><a id="stoc-part2_003a-part2" href="#toc-part2_003a-part2">part2:
part2</a><ul class="toc-numbered-mark">
+<li><a id="stoc-chapter-3" href="#toc-chapter-3">3 chapter 3</a></li>
+</ul></li>
+
+</ul>
+</div>
+</div>
+<hr>
+</div>
+<div class="part-level-extent" id="part-1_003a-part-1">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter-2-node" accesskey="n" rel="next">chapter 2</a>,
Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top"
accesskey="u" rel="up">top</a> [<a href="#SEC_Contents" title="Table of
contents" rel="contents">Contents</a>]</p>
+</div>
+<h1 class="part">part 1: part 1</h1>
+<hr>
+
+<ul class="mini-toc">
+<li><a href="#chapter-1-node" accesskey="1">chapter 1</a></li>
+<li><a href="#chapter-2-node" accesskey="2">chapter 2</a></li>
+</ul>
+<div class="chapter-level-extent" id="chapter-1-node">
+<h2 class="chapter" id="chapter-1">1 chapter 1</h2>
+
+<hr>
+</div>
+<div class="chapter-level-extent" id="chapter-2-node">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter-3-node" accesskey="n" rel="next">chapter 3</a>,
Previous: <a href="#chapter-1-node" accesskey="p" rel="prev">chapter 1</a>, Up:
<a href="#Top" accesskey="u" rel="up">top</a> [<a href="#SEC_Contents"
title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h2 class="chapter" id="chapter-2">2 chapter 2</h2>
+
+<hr>
+</div>
+</div>
+<div class="part-level-extent" id="part2_003a-part2">
+<div class="nav-panel">
+<p>
+Previous: <a href="#chapter-2-node" accesskey="p" rel="prev">chapter 2</a>,
Up: <a href="#Top" accesskey="u" rel="up">top</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h1 class="part">part2: part2</h1>
+<hr>
+
+<ul class="mini-toc">
+<li><a href="#chapter-3-node" accesskey="1">chapter 3</a></li>
+</ul>
+<div class="chapter-level-extent" id="chapter-3-node">
+<h2 class="chapter" id="chapter-3">3 chapter 3</h2>
+
+</div>
+</div>
+
+
+
+</body>
+</html>
+';
+
+1;
diff --git a/tp/tests/contents/Makefile.am b/tp/tests/contents/Makefile.am
index cc21fbf69f..429d509e60 100644
--- a/tp/tests/contents/Makefile.am
+++ b/tp/tests/contents/Makefile.am
@@ -1,6 +1,5 @@
EXTRA_DIST = \
no_content.texi \
- contents_and_parts.texi \
res_parser list-of-tests
DISTCLEANFILES = tests.log tests.out
diff --git a/tp/tests/contents/contents_and_parts.texi
b/tp/tests/contents/contents_and_parts.texi
deleted file mode 100644
index d8c43a7774..0000000000
--- a/tp/tests/contents/contents_and_parts.texi
+++ /dev/null
@@ -1,28 +0,0 @@
-\input texinfo.tex @c -*-texinfo-*-
-
-@node Top
-@top top
-
-@menu
-* chapter 1 node::
-* chapter 2 node::
-* chapter 3 node::
-@end menu
-
-@part part 1: part 1
-
-@node chapter 1 node
-@chapter chapter 1
-
-@node chapter 2 node
-@chapter chapter 2
-
-@part part2: part2
-
-@node chapter 3 node
-@chapter chapter 3
-
-@contents
-@shortcontents
-
-@bye
diff --git a/tp/tests/contents/list-of-tests b/tp/tests/contents/list-of-tests
index f739c0a0aa..e4b3e45a21 100644
--- a/tp/tests/contents/list-of-tests
+++ b/tp/tests/contents/list-of-tests
@@ -1,10 +1,15 @@
-no_content no_content.texi
-no_content_do_contents no_content.texi -c 'contents 1'
-no_content_inline no_content.texi -c 'CONTENTS_OUTPUT_LOCATION inline'
-no_content_do_contents_inline no_content.texi -c 'CONTENTS_OUTPUT_LOCATION
inline' -c 'contents 1'
+# the same tests are in t/*.t to test through code
+no_content no_content.texi -c TEXI2HTML=undef --html --no-split -c 'BIG_RULE
<hr style="height: 6px;">'
+no_content_separate no_content.texi -c TEXI2HTML=undef --html --no-split -c
'BIG_RULE <hr style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION
separate_element'
+no_content_do_contents_separate no_content.texi -c TEXI2HTML=undef --html
--no-split -c 'BIG_RULE <hr style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION
separate_element' -c 'contents 1'
+no_content_do_contents no_content.texi -c TEXI2HTML=undef --html --no-split -c
'BIG_RULE <hr style="height: 6px;">' -c 'contents 1'
+no_content_inline no_content.texi -c TEXI2HTML=undef --html --no-split -c
'BIG_RULE <hr style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION inline'
+no_content_do_contents_inline no_content.texi -c TEXI2HTML=undef --html
--no-split -c 'BIG_RULE <hr style="height: 6px;">' -c 'CONTENTS_OUTPUT_LOCATION
inline' -c 'contents 1'
+
+# many other tests using double_contents.texi are in t/*.t, but customization
+# variables set in init files are not used in the t/*.t test suite, so there
cannot
+# be proper testing with book.pm
double_contents_book ../../t/input_files/double_contents.texi -c
TEXI2HTML=undef --html --no-split -c FORMAT_MENU=nomenu --init book.pm
double_contents_after_title_book ../../t/input_files/double_contents.texi -c
TEXI2HTML=undef --html --no-split --init book.pm -c 'CONTENTS_OUTPUT_LOCATION
after_title'
double_contents_after_title_book_chapter
../../t/input_files/double_contents.texi -c TEXI2HTML=undef --html --init
book.pm --split chapter -c 'CONTENTS_OUTPUT_LOCATION after_title'
-contents_and_parts contents_and_parts.texi
-
diff --git
a/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.html
b/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.html
deleted file mode 100644
index 215290249c..0000000000
--- a/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.html
+++ /dev/null
@@ -1,284 +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>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="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-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}
-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-1-node" title="Next section in reading order"> >
</a>]</td>
-<td> </td>
-<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="top" id="top">top</h1>
-
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#chapter-1-node">1 chapter
1</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="#chapter-2-node">2 chapter
2</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="#chapter-3-node">3 chapter
3</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
-
-<hr style="height: 6px;">
-</div>
-<div class="part-level-extent" id="part-1_003a-part-1">
-<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>[<a href="#chapter-2-node" title="Next section in reading order"> >
</a>]</td>
-<td>[<a href="#chapter-2-node" title="Next chapter"> >> </a>]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="part">part 1: part 1</h1>
-<hr>
-
-<div class="chapter-level-extent" id="chapter-1-node">
-<h1 class="chapter" id="chapter-1">1 chapter 1</h1>
-
-<hr>
-</div>
-<div class="chapter-level-extent" id="chapter-2-node">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#chapter-1-node" title="Beginning of this chapter or
previous chapter"> << </a>]</td>
-<td>[<a href="#chapter-1-node" title="Previous section in reading order"> <
</a>]</td>
-<td>[<a href="#chapter-1-node" title="Up section"> Up </a>]</td>
-<td>[<a href="#chapter-3-node" title="Next section in reading order"> >
</a>]</td>
-<td>[<a href="#chapter-3-node" title="Next chapter"> >> </a>]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[<a href="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="chapter-2">2 chapter 2</h1>
-
-<hr>
-</div>
-</div>
-<div class="part-level-extent" id="part2_003a-part2">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#chapter-2-node" title="Beginning of this chapter or
previous chapter"> << </a>]</td>
-<td>[<a href="#chapter-2-node" 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="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="part">part2: part2</h1>
-<hr>
-
-<div class="chapter-level-extent" id="chapter-3-node">
-<h1 class="chapter" id="chapter-3">3 chapter 3</h1>
-
-
-<hr style="height: 6px;">
-</div>
-</div>
-<div class="element-contents" id="SEC_Contents">
-<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="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</td>
-<td>[<a href="#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-part-1_003a-part-1" href="#part-1_003a-part-1">part 1: part
1</a>
-<ul class="toc-numbered-mark">
- <li><a id="toc-chapter-1" href="#chapter-1-node">1 chapter 1</a></li>
- <li><a id="toc-chapter-2" href="#chapter-2-node">2 chapter 2</a></li>
-</ul></li>
-<li><a id="toc-part2_003a-part2" href="#part2_003a-part2">part2: part2</a>
-<ul class="toc-numbered-mark">
- <li><a id="toc-chapter-3" href="#chapter-3-node">3 chapter 3</a></li>
-</ul></li>
-
-</ul>
-</div>
-</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="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</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-part-1_003a-part-1" href="#part-1_003a-part-1">part 1: part
1</a><ul class="toc-numbered-mark">
-<li><a id="stoc-chapter-1" href="#chapter-1-node">1 chapter 1</a></li>
-<li><a id="stoc-chapter-2" href="#chapter-2-node">2 chapter 2</a></li>
-</ul></li>
-<li><a id="stoc-part2_003a-part2" href="#part2_003a-part2">part2: part2</a><ul
class="toc-numbered-mark">
-<li><a id="stoc-chapter-3" href="#chapter-3-node">3 chapter 3</a></li>
-</ul></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="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</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>
-<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/contents/res_parser/no_content/no_content.html
b/tp/tests/contents/res_parser/no_content/no_content.html
index 358381fc08..05fcf15932 100644
--- a/tp/tests/contents/res_parser/no_content/no_content.html
+++ b/tp/tests/contents/res_parser/no_content/no_content.html
@@ -12,174 +12,39 @@
<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}
-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}
--->
-</style>
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
</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>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> </p>
+</div>
<h1 class="top" id="No-ccontent">No ccontent</h1>
<p>No content.
</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#chapter">1 Chapter
1</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
<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>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a
href="#Top" accesskey="u" rel="up">No ccontent</a> </p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
<p>The chapter
</p>
-<hr style="height: 6px;">
</div>
</div>
-<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>[Contents]</td>
-<td>[Index]</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>
-<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>
diff --git
a/tp/tests/contents/res_parser/no_content_do_contents/no_content.html
b/tp/tests/contents/res_parser/no_content_do_contents/no_content.html
index 130fab5a9d..27a4e5a898 100644
--- a/tp/tests/contents/res_parser/no_content_do_contents/no_content.html
+++ b/tp/tests/contents/res_parser/no_content_do_contents/no_content.html
@@ -12,13 +12,11 @@
<meta name="Generator" content="texi2any">
<meta name="viewport" content="width=device-width,initial-scale=1">
+<link href="#Top" rel="start" title="Top">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="#chapter" rel="next" title="chapter">
<style type="text/css">
<!--
-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}
ul.toc-numbered-mark {list-style: none}
-->
</style>
@@ -28,55 +26,17 @@ ul.toc-numbered-mark {list-style: none}
<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="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
<h1 class="top" id="No-ccontent">No ccontent</h1>
<p>No content.
</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#chapter">1 Chapter
1</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="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
-
-<p>The chapter
-</p>
-<hr style="height: 6px;">
-</div>
-</div>
<div class="element-contents" id="SEC_Contents">
-<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="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="contents-heading">Table of Contents</h1>
+<h2 class="contents-heading">Table of Contents</h2>
<div class="contents">
@@ -84,119 +44,20 @@ ul.toc-numbered-mark {list-style: none}
<li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</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="#SEC_Contents" title="Table of contents">Contents</a>]</td>
-<td>[Index]</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>
+</div>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
<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>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a
href="#Top" accesskey="u" rel="up">No ccontent</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
-<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>The chapter
</p>
+</div>
+</div>
-<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>
-<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>
diff --git
a/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html
b/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html
index 358381fc08..05fcf15932 100644
--- a/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html
+++ b/tp/tests/contents/res_parser/no_content_do_contents_inline/no_content.html
@@ -12,174 +12,39 @@
<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}
-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}
--->
-</style>
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
</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>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> </p>
+</div>
<h1 class="top" id="No-ccontent">No ccontent</h1>
<p>No content.
</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#chapter">1 Chapter
1</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
<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>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a
href="#Top" accesskey="u" rel="up">No ccontent</a> </p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
<p>The chapter
</p>
-<hr style="height: 6px;">
</div>
</div>
-<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>[Contents]</td>
-<td>[Index]</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>
-<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>
diff --git
a/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.1
b/tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.1
similarity index 100%
copy from tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.1
copy to
tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.1
diff --git
a/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.2
b/tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.2
similarity index 100%
rename from tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.2
rename to
tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.2
diff --git
a/tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.html
b/tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.html
new file mode 100644
index 0000000000..f3a84400b4
--- /dev/null
+++
b/tp/tests/contents/res_parser/no_content_do_contents_separate/no_content.html
@@ -0,0 +1,71 @@
+<!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>No ccontent</title>
+
+<meta name="description" content="No ccontent">
+<meta name="keywords" content="No ccontent">
+<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">
+
+<link href="#Top" rel="start" title="Top">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="#chapter" rel="next" title="chapter">
+<style type="text/css">
+<!--
+ul.toc-numbered-mark {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h1 class="top" id="No-ccontent">No ccontent</h1>
+
+<p>No content.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a
href="#Top" accesskey="u" rel="up">No ccontent</a> [<a
href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
+
+<p>The chapter
+</p>
+<hr style="height: 6px;">
+</div>
+</div>
+<div class="element-contents" id="SEC_Contents">
+<div class="nav-panel">
+<p>
+ [<a href="#SEC_Contents" title="Table of contents"
rel="contents">Contents</a>]</p>
+</div>
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+
+<ul class="toc-numbered-mark">
+ <li><a id="toc-Chapter-1" href="#chapter">1 Chapter 1</a></li>
+</ul>
+</div>
+</div>
+
+
+</body>
+</html>
diff --git a/tp/tests/contents/res_parser/no_content_inline/no_content.html
b/tp/tests/contents/res_parser/no_content_inline/no_content.html
index 358381fc08..05fcf15932 100644
--- a/tp/tests/contents/res_parser/no_content_inline/no_content.html
+++ b/tp/tests/contents/res_parser/no_content_inline/no_content.html
@@ -12,174 +12,39 @@
<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}
-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}
--->
-</style>
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
</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>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> </p>
+</div>
<h1 class="top" id="No-ccontent">No ccontent</h1>
<p>No content.
</p>
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#chapter">1 Chapter
1</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
<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>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="Chapter-1">1 Chapter 1</h1>
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a
href="#Top" accesskey="u" rel="up">No ccontent</a> </p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
<p>The chapter
</p>
-<hr style="height: 6px;">
</div>
</div>
-<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>[Contents]</td>
-<td>[Index]</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>
-<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>
diff --git
a/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.1
b/tp/tests/contents/res_parser/no_content_separate/no_content.1
similarity index 100%
copy from tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.1
copy to tp/tests/contents/res_parser/no_content_separate/no_content.1
diff --git
a/tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.1
b/tp/tests/contents/res_parser/no_content_separate/no_content.2
similarity index 100%
rename from tp/tests/contents/res_parser/contents_and_parts/contents_and_parts.1
rename to tp/tests/contents/res_parser/no_content_separate/no_content.2
diff --git a/tp/tests/contents/res_parser/no_content_separate/no_content.html
b/tp/tests/contents/res_parser/no_content_separate/no_content.html
new file mode 100644
index 0000000000..05fcf15932
--- /dev/null
+++ b/tp/tests/contents/res_parser/no_content_separate/no_content.html
@@ -0,0 +1,51 @@
+<!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>No ccontent</title>
+
+<meta name="description" content="No ccontent">
+<meta name="keywords" content="No ccontent">
+<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">
+
+<link href="#Top" rel="start" title="Top">
+<link href="#chapter" rel="next" title="chapter">
+
+
+</head>
+
+<body lang="en">
+<div class="top-level-extent" id="Top">
+<div class="nav-panel">
+<p>
+Next: <a href="#chapter" accesskey="n" rel="next">Chapter 1</a> </p>
+</div>
+<h1 class="top" id="No-ccontent">No ccontent</h1>
+
+<p>No content.
+</p>
+
+<ul class="mini-toc">
+<li><a href="#chapter" accesskey="1">Chapter 1</a></li>
+</ul>
+<hr style="height: 6px;">
+<div class="chapter-level-extent" id="chapter">
+<div class="nav-panel">
+<p>
+Previous: <a href="#Top" accesskey="p" rel="prev">No ccontent</a>, Up: <a
href="#Top" accesskey="u" rel="up">No ccontent</a> </p>
+</div>
+<h2 class="chapter" id="Chapter-1">1 Chapter 1</h2>
+
+<p>The chapter
+</p>
+</div>
+</div>
+
+
+
+</body>
+</html>
diff --git a/tp/tests/test_scripts/contents_contents_and_parts.sh
b/tp/tests/test_scripts/contents_no_content_do_contents_separate.sh
similarity index 88%
copy from tp/tests/test_scripts/contents_contents_and_parts.sh
copy to tp/tests/test_scripts/contents_no_content_do_contents_separate.sh
index 9b2b532c7c..61772f1567 100755
--- a/tp/tests/test_scripts/contents_contents_and_parts.sh
+++ b/tp/tests/test_scripts/contents_no_content_do_contents_separate.sh
@@ -9,7 +9,7 @@ one_test_logs_dir=test_log
dir=contents
-name='contents_and_parts'
+name='no_content_do_contents_separate'
mkdir -p $dir
"$srcdir"/run_parser_all.sh -dir $dir $name
diff --git a/tp/tests/test_scripts/contents_contents_and_parts.sh
b/tp/tests/test_scripts/contents_no_content_separate.sh
similarity index 91%
rename from tp/tests/test_scripts/contents_contents_and_parts.sh
rename to tp/tests/test_scripts/contents_no_content_separate.sh
index 9b2b532c7c..a70e33752b 100755
--- a/tp/tests/test_scripts/contents_contents_and_parts.sh
+++ b/tp/tests/test_scripts/contents_no_content_separate.sh
@@ -9,7 +9,7 @@ one_test_logs_dir=test_log
dir=contents
-name='contents_and_parts'
+name='no_content_separate'
mkdir -p $dir
"$srcdir"/run_parser_all.sh -dir $dir $name
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.tres, tp/t/30sectioning.t, tp/t/html_tests.t, tp/tests/contents/Makefile.am (EXTRA_DIST), tp/tests/contents/list-of-tests: move contents_and_parts out of tp/tests/contents/list-of-tests to tp/t/30sectioning.t and inline, remove the Texinfo file. Add no_content tests in tp/tests/contents/list-of-tests to test also the default case for contents location and unset the texi2html style. Duplicate the no_content tests in tp/t/html_tests.t.,
Patrice Dumas <=