[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/init/only_toc_out.init: use the correct sp
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/t/init/only_toc_out.init: use the correct special element variety name. |
|
Date: |
Tue, 03 Jan 2023 06:03:43 -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 90ca216f13 * tp/t/init/only_toc_out.init: use the correct special
element variety name.
90ca216f13 is described below
commit 90ca216f13c37dd841a84fda66bbb6015bbeb68b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 12:03:33 2023 +0100
* tp/t/init/only_toc_out.init: use the correct special element variety
name.
* tp/Makefile.tres, tp/t/93layout.t: add no_monolithic_only_toc_out
test.
---
ChangeLog | 18 +-
tp/Makefile.tres | 3 +
tp/t/93layout.t | 11 +-
tp/t/init/only_toc_out.init | 2 +-
tp/t/results/layout/no_monolithic_only_toc_out.pl | 689 +++++++++++++++++++++
.../res_html}/no_monolithic.html | 28 +-
.../res_html/no_monolithic_toc.html | 54 ++
.../no_monolithic_only_toc_out/no_monolithic.html | 28 +-
.../no_monolithic_toc.html | 54 ++
9 files changed, 833 insertions(+), 54 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6d0256f0dd..2cb950ac3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,23 @@
-2023-01-02 Patrice Dumas <pertusus@free.fr>
+2023-01-03 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/init/only_toc_out.init: use the correct special element variety
+ name.
+
+ * tp/Makefile.tres, tp/t/93layout.t: add no_monolithic_only_toc_out
+ test.
+
+2023-01-03 Patrice Dumas <pertusus@free.fr>
* tp/t/30sectioning.t, tp/Makefile.tres, tp/t/92formatting.t:
move split_for_format_not_split to 30sectioning.t. Remove
now empty tp/t/92formatting.t.
-2023-01-02 Patrice Dumas <pertusus@free.fr>
+2023-01-03 Patrice Dumas <pertusus@free.fr>
* tp/t/92formatting.t, tp/Makefile.tres, tp/t/55conditionals.t:
move cnd.texi related tests to 55conditionals.t.
-2023-01-02 Patrice Dumas <pertusus@free.fr>
+2023-01-03 Patrice Dumas <pertusus@free.fr>
* tp/t/92formatting.t: explicit output format for all cond.texi
tests.
@@ -23,12 +31,12 @@
t/input_files/one_line_no_content.texi as
t/input_files/minimal_only_input_line.texi.
-2023-01-02 Patrice Dumas <pertusus@free.fr>
+2023-01-03 Patrice Dumas <pertusus@free.fr>
* tp/t/92formatting.t: remove texi2html style, and set corresponding
customization instead.
-2023-01-02 Patrice Dumas <pertusus@free.fr>
+2023-01-03 Patrice Dumas <pertusus@free.fr>
* tp/t/92formatting.t: remove texi2html style for cond.texi related
tests, and remove some custmization variables set.
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 12ef251c50..e800e0e8a8 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1423,6 +1423,9 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/layout/no_monolithic/res_html/no_monolithic_fot.html \
t/results/layout/no_monolithic/res_html/no_monolithic_ovr.html \
t/results/layout/no_monolithic/res_html/no_monolithic_toc.html \
+ t/results/layout/no_monolithic_only_toc_out.pl \
+ t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html \
+ t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic_toc.html \
t/results/macro/arg_body_expansion_order.pl \
t/results/macro/arg_not_closed.pl \
t/results/macro/backslash_in_arg.pl \
diff --git a/tp/t/93layout.t b/tp/t/93layout.t
index a0fdcfc4c7..13474a2957 100644
--- a/tp/t/93layout.t
+++ b/tp/t/93layout.t
@@ -5,14 +5,18 @@ use Texinfo::ModulePath (undef, undef, undef, 'updirs' => 2);
require 't/test_utils.pl';
-# These tests are supposed to test the same things as tests
-# under tp/tests did, but to be faster, as we are avoiding the
-# start-up time of perl for every one.
+# Use texi2html style to test variations in layout and navigation
+# as it is more relevant style for those variations
my @test_cases = (
['no_monolithic',
undef, {'test_file' => 'no_monolithic.texi' },
{'MONOLITHIC' => 0}
],
+['no_monolithic_only_toc_out',
+ undef, {'test_file' => 'no_monolithic.texi',
+ 'init_files' => ['only_toc_out.init'] },
+ {'MONOLITHIC' => 0}
+],
['navigation',
undef, {'test_file' => 'navigation.texi' },
],
@@ -91,7 +95,6 @@ foreach my $test (@test_cases) {
push @{$test->[2]->{'test_formats'}}, 'file_html';
}
$test->[3]->{'TEXI2HTML'} = 1;
- $test->[3]->{'TEST'} = 1;
$test->[3]->{'PROGRAM'} = 'texi2any';
$test->[3]->{'PACKAGE_URL'} = 'http://www.gnu.org/software/texinfo/';
}
diff --git a/tp/t/init/only_toc_out.init b/tp/t/init/only_toc_out.init
index 400f7efc08..b160caa7be 100644
--- a/tp/t/init/only_toc_out.init
+++ b/tp/t/init/only_toc_out.init
@@ -12,7 +12,7 @@ sub toc_out_element_file_name($$$$$)
my $prefix = $converter->{'document_name'};
my $type = $element->{'extra'}->{'special_element_variety'};
- if ($type and $type ne 'Contents')
+ if ($type and $type ne 'contents')
{
$filename = "$prefix.".$converter->get_conf('EXTENSION');
}
diff --git a/tp/t/results/layout/no_monolithic_only_toc_out.pl
b/tp/t/results/layout/no_monolithic_only_toc_out.pl
new file mode 100644
index 0000000000..9ee0a8aff3
--- /dev/null
+++ b/tp/t/results/layout/no_monolithic_only_toc_out.pl
@@ -0,0 +1,689 @@
+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{'no_monolithic_only_toc_out'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '\\input texinfo @c -*-texinfo-*-
+',
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
+ }
+ ],
+ 'type' => 'preamble_before_beginning'
+ }
+ ],
+ 'type' => 'preamble_before_setfilename'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'no_monolithic.info'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'text_arg' => 'no_monolithic.info'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'preamble_before_content'
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 5,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Not monolithic'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'Not monolitic manual'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'my footnote'
+ }
+ ],
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'footnote',
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 1,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {},
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ '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' => 'no_monolithic.texi',
+ 'line_nr' => 13,
+ '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' => 'no_monolithic.texi',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chapter'
+ }
+ ],
+ 'normalized' => 'chapter'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Chapter'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'chapter',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'Chapter.
+'
+ }
+ ],
+ 'type' => 'paragraph'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'contents',
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 21,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'shortcontents',
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cp'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'printindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'cp'
+ ]
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 24,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'no_monolithic.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'bye'
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'no_monolithic_only_toc_out'}{'contents'}[1];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'no_monolithic_only_toc_out'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+
+$result_texis{'no_monolithic_only_toc_out'} = '\\input texinfo @c -*-texinfo-*-
+
+@setfilename no_monolithic.info
+
+@node Top
+@top Not monolithic
+
+Not monolitic manual@footnote{my footnote}.
+
+@cindex top
+
+@menu
+* chapter::
+@end menu
+
+@node chapter
+@chapter Chapter
+
+Chapter.
+
+@contents
+@shortcontents
+
+@printindex cp
+@bye
+';
+
+
+$result_texts{'no_monolithic_only_toc_out'} = '
+Not monolithic
+**************
+
+Not monolitic manual.
+
+
+* chapter::
+
+1 Chapter
+*********
+
+Chapter.
+
+
+';
+
+$result_sectioning{'no_monolithic_only_toc_out'} = {
+ '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' => {
+ 'isindex' => 1,
+ 'normalized' => 'chapter'
+ },
+ 'info' => {},
+ 'structure' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 1,
+ 'section_number' => 1,
+ 'section_up' => {},
+ 'toplevel_prev' => {},
+ 'toplevel_up' => {}
+ }
+ }
+ ],
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'no_monolithic_only_toc_out'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'no_monolithic_only_toc_out'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_monolithic_only_toc_out'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'no_monolithic_only_toc_out'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_monolithic_only_toc_out'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
=
$result_sectioning{'no_monolithic_only_toc_out'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'no_monolithic_only_toc_out'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'no_monolithic_only_toc_out'};
+
+$result_nodes{'no_monolithic_only_toc_out'} = {
+ '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
+ }
+ },
+ 'isindex' => 1,
+ 'normalized' => 'chapter'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'node_prev' => {},
+ 'node_up' => {}
+ }
+ },
+ 'node_next' => {}
+ }
+};
+$result_nodes{'no_monolithic_only_toc_out'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'no_monolithic_only_toc_out'};
+$result_nodes{'no_monolithic_only_toc_out'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'no_monolithic_only_toc_out'};
+$result_nodes{'no_monolithic_only_toc_out'}{'structure'}{'node_next'} =
$result_nodes{'no_monolithic_only_toc_out'}{'structure'}{'menu_child'};
+
+$result_menus{'no_monolithic_only_toc_out'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_child' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'isindex' => 1,
+ 'normalized' => 'chapter'
+ },
+ 'info' => {},
+ 'structure' => {
+ 'menu_up' => {},
+ 'menu_up_hash' => {
+ 'Top' => 1
+ }
+ }
+ }
+ }
+};
+$result_menus{'no_monolithic_only_toc_out'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'no_monolithic_only_toc_out'};
+
+$result_errors{'no_monolithic_only_toc_out'} = [];
+
+
+$result_floats{'no_monolithic_only_toc_out'} = {};
+
+
+$result_indices_sort_strings{'no_monolithic_only_toc_out'} = {
+ 'cp' => [
+ 'top'
+ ]
+};
+
+
+1;
diff --git
a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
b/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html
similarity index 88%
copy from
tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
copy to
tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html
index 74df825c91..314d9a2517 100644
--- a/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic.html
+++ b/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html
@@ -38,7 +38,7 @@ ul.toc-numbered-mark {list-style: none}
<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>[<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>
@@ -66,7 +66,7 @@ ul.toc-numbered-mark {list-style: none}
<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>[<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>
@@ -90,7 +90,7 @@ ul.toc-numbered-mark {list-style: none}
<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="#SEC_Contents" title="Table of contents">Contents</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>
@@ -99,26 +99,10 @@ ul.toc-numbered-mark {list-style: none}
<h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(1)</a></h5>
<p>my footnote</p>
</div><hr>
-<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>[<a href="#chapter" title="Index">Index</a>]</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-Chapter" href="#chapter" rel="index">1 Chapter</a></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>[<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>
@@ -133,7 +117,7 @@ ul.toc-numbered-mark {list-style: none}
<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>[<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>
@@ -241,7 +225,7 @@ ul.toc-numbered-mark {list-style: none}
</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="#SEC_Contents" title="Table of contents">Contents</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>
diff --git
a/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic_toc.html
b/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic_toc.html
new file mode 100644
index 0000000000..d309708918
--- /dev/null
+++
b/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic_toc.html
@@ -0,0 +1,54 @@
+<!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/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
index 74df825c91..314d9a2517 100644
--- 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
@@ -38,7 +38,7 @@ ul.toc-numbered-mark {list-style: none}
<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>[<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>
@@ -66,7 +66,7 @@ ul.toc-numbered-mark {list-style: none}
<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>[<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>
@@ -90,7 +90,7 @@ ul.toc-numbered-mark {list-style: none}
<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="#SEC_Contents" title="Table of contents">Contents</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>
@@ -99,26 +99,10 @@ ul.toc-numbered-mark {list-style: none}
<h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(1)</a></h5>
<p>my footnote</p>
</div><hr>
-<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>[<a href="#chapter" title="Index">Index</a>]</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-Chapter" href="#chapter" rel="index">1 Chapter</a></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>[<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>
@@ -133,7 +117,7 @@ ul.toc-numbered-mark {list-style: none}
<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>[<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>
@@ -241,7 +225,7 @@ ul.toc-numbered-mark {list-style: none}
</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="#SEC_Contents" title="Table of contents">Contents</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>
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
new file mode 100644
index 0000000000..d309708918
--- /dev/null
+++
b/tp/tests/layout/res_parser/no_monolithic_only_toc_out/no_monolithic_toc.html
@@ -0,0 +1,54 @@
+<!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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/init/only_toc_out.init: use the correct special element variety name.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/t/30sectioning.t, tp/Makefile.tres, tp/t/92formatting.t: move split_for_format_not_split to 30sectioning.t. Remove now empty tp/t/92formatting.t.
- Next by Date:
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.
- Previous by thread:
branch master updated: * tp/t/30sectioning.t, tp/Makefile.tres, tp/t/92formatting.t: move split_for_format_not_split to 30sectioning.t. Remove now empty tp/t/92formatting.t.
- Next by 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.
- Index(es):