diff options
author | Norbert Preining <norbert@preining.info> | 2024-01-10 03:03:23 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-01-10 03:03:23 +0000 |
commit | cdb8117b8f1ac752d1927b82759c5be9f0ec0ab5 (patch) | |
tree | ebd07d36ab12076de3523b744cc87f975747f3e0 /macros/texinfo/texinfo/tp/t/results/layout | |
parent | 140e2f7f1509acd423172e2895d0d7839e5b88c6 (diff) |
CTAN sync 202401100303
Diffstat (limited to 'macros/texinfo/texinfo/tp/t/results/layout')
68 files changed, 5480 insertions, 3483 deletions
diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation.pl index 4502a05be2..cd3a84cb49 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation.pl @@ -12,57 +12,20 @@ $result_trees{'navigation'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation'} = ' -File used for navigation testing +$result_texts{'navigation'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation/res_html/navigation.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation/res_html/navigation.html index 53f2608e10..3f2b087546 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation/res_html/navigation.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation/res_html/navigation.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.button-direction-about {text-align:center} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} @@ -27,7 +29,6 @@ ul.toc-numbered-mark {list-style: none} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> <tr><td>[ < ]</td> @@ -37,7 +38,7 @@ ul.toc-numbered-mark {list-style: none} <td>[Index]</td> <td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#chapter">1 First chapter</a></td><td> </td><td class="menu-entry-description"> @@ -61,7 +62,7 @@ ul.toc-numbered-mark {list-style: none} <td>[Index]</td> <td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> @@ -85,7 +86,7 @@ ul.toc-numbered-mark {list-style: none} <td>[Index]</td> <td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -136,7 +137,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <td>[Index]</td> <td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> <hr style="height: 6px;"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl index 2975b70ae4..42b7a37ab1 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_chapter'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_chapter'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_chapter'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_chapter'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_chapter'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_chapter'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_chapter'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_chapter'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_chapter'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_chapter'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_chapter'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_chapter'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_chapter'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_chapter'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_chapter'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_chapter'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_chapter'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_chapter'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_chapter'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_chapter'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_chapter'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_chapter'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_chapter'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_chapter'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_chapter'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_chapter'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_chapter'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_chapter'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_chapter'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_chapter'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_chapter'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_chapter'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_chapter'} = ' -File used for navigation testing +$result_texts{'navigation_chapter'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html index ca3297c510..6efe40462b 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> @@ -64,7 +66,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -115,7 +117,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/index.html index 2df7b70fe6..70ed8ccec4 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> <tr><td>[ < ]</td> @@ -34,7 +35,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html#chapter">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl index 3e510c9961..8cbea43261 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_chapter_no_header'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_chapter_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_chapter_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_chapter_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_chapter_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_chapter_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_chapter_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_chapter_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_chapter_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_chapter_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_chapter_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_chapter_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_chapter_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_chapter_no_header'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_chapter_no_header'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_chapter_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_chapter_no_header'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_chapter_no_header'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_chapter_no_header'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_chapter_no_header'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_chapter_no_header'} = ' -File used for navigation testing +$result_texts{'navigation_chapter_no_header'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html index 6d7fd96dd2..d0e3d98925 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -39,7 +41,7 @@ td.menu-entry-destination {vertical-align: top} <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> <hr> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> @@ -48,7 +50,7 @@ td.menu-entry-destination {vertical-align: top} <hr> <div class="section-level-extent" id="section"> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -84,7 +86,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <hr> <div class="subsection-level-extent" id="subsection"> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html index 2df7b70fe6..70ed8ccec4 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> <tr><td>[ < ]</td> @@ -34,7 +35,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html#chapter">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl index f94749fb66..1ea8a768c6 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_chapter_no_header_vertical'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_chapter_no_header_vertical'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_chapter_no_header_vertical'} = ' -File used for navigation testing +$result_texts{'navigation_chapter_no_header_vertical'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html index 6eb83283ad..8de4b455ac 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -65,7 +67,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> @@ -74,7 +76,7 @@ td.menu-entry-destination {vertical-align: top} <hr> <div class="section-level-extent" id="section"> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -110,7 +112,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <hr> <div class="subsection-level-extent" id="subsection"> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </td> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html index 8fc70bb639..ceab1d1f85 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table border="0" cellpadding="0" cellspacing="0"> <tr> @@ -51,7 +52,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html#chapter">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl index 58dc6c27f7..639ec4cf86 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_chapter_vertical'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_chapter_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_chapter_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_chapter_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_chapter_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_chapter_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_chapter_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_chapter_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_chapter_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_chapter_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_chapter_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_chapter_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_chapter_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_chapter_vertical'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_chapter_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_chapter_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_chapter_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_chapter_vertical'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_chapter_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_chapter_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_chapter_vertical'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_chapter_vertical'} = ' -File used for navigation testing +$result_texts{'navigation_chapter_vertical'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html index f3b427c37f..5725f878a1 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -71,7 +73,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> @@ -95,7 +97,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -146,7 +148,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </td> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html index 8fc70bb639..ceab1d1f85 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table border="0" cellpadding="0" cellspacing="0"> <tr> @@ -51,7 +52,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html#chapter">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl index f2e1ff161b..79dbe43419 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_no_header'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_no_header'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_no_header'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_no_header'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_no_header'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_no_header'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_no_header'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_no_header'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_no_header'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_no_header'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_no_header'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_no_header'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_no_header'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_no_header'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_no_header'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_no_header'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_no_header'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_no_header'} = ' -File used for navigation testing +$result_texts{'navigation_no_header'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header/res_html/navigation.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header/res_html/navigation.html index 04e05bd639..77cabf73fd 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header/res_html/navigation.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header/res_html/navigation.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} ul.toc-numbered-mark {list-style: none} @@ -25,9 +27,8 @@ ul.toc-numbered-mark {list-style: none} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#chapter">1 First chapter</a></td><td> </td><td class="menu-entry-description"> @@ -36,7 +37,7 @@ ul.toc-numbered-mark {list-style: none} <hr style="height: 6px;"> <div class="chapter-level-extent" id="chapter"> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> @@ -45,7 +46,7 @@ ul.toc-numbered-mark {list-style: none} <hr> <div class="section-level-extent" id="section"> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -81,7 +82,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <hr> <div class="subsection-level-extent" id="subsection"> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> <hr style="height: 6px;"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl index 17578fda8f..387bcfa70a 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_no_header_vertical'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_no_header_vertical'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_no_header_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_no_header_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_no_header_vertical'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_no_header_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_no_header_vertical'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_no_header_vertical'} = ' -File used for navigation testing +$result_texts{'navigation_no_header_vertical'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html index d552cd79fe..d371dd433b 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} ul.toc-numbered-mark {list-style: none} @@ -25,9 +27,8 @@ ul.toc-numbered-mark {list-style: none} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#chapter">1 First chapter</a></td><td> </td><td class="menu-entry-description"> @@ -39,7 +40,7 @@ ul.toc-numbered-mark {list-style: none} </table> <hr style="height: 6px;"> <div class="chapter-level-extent" id="chapter"> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> @@ -48,7 +49,7 @@ ul.toc-numbered-mark {list-style: none} <hr> <div class="section-level-extent" id="section"> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -84,7 +85,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <hr> <div class="subsection-level-extent" id="subsection"> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </td> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl index 576c96486c..ecdb9345c8 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_node'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_node'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_node'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_node'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_node'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_node'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_node'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_node'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_node'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_node'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_node'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_node'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_node'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_node'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_node'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_node'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_node'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_node'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_node'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_node'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_node'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_node'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_node'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_node'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_node'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_node'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_node'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_node'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_node'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_node'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_node'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_node'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_node'} = ' -File used for navigation testing +$result_texts{'navigation_node'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html index 30b55e8dc0..9db51292f9 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -41,7 +43,7 @@ td.menu-entry-destination {vertical-align: top} <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> <hr> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="section.html">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html index c9b5470ea8..a8f6522098 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> <tr><td>[ < ]</td> @@ -35,7 +36,7 @@ td.menu-entry-destination {vertical-align: top} <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> <hr> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html index 6e96d1974f..5b96dad49d 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/section.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -41,7 +43,7 @@ td.menu-entry-destination {vertical-align: top} <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> <hr> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html index c1f20489a2..6ddd4f27c0 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node/res_html/subsection.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} --> </style> @@ -39,7 +41,7 @@ span.program-in-footer {font-size: smaller} <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> <hr> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl index 0469a63f49..89d8cc21f7 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_node_no_header'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_node_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_node_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_node_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_node_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_node_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_node_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_node_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_node_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_node_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_node_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_node_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_node_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_node_no_header'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_node_no_header'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_node_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_node_no_header'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_node_no_header'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_node_no_header'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_node_no_header'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_node_no_header'} = ' -File used for navigation testing +$result_texts{'navigation_node_no_header'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html index 7dfc2005ee..793858a9c2 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="section.html">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html index cc36105bc2..ee6044b86f 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> <tr><td>[ < ]</td> @@ -35,7 +36,7 @@ td.menu-entry-destination {vertical-align: top} <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> <hr> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html index 70f209068a..e15bbe4bbb 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/section.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html index c1ac6dd476..67b17205ff 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header/res_html/subsection.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} --> </style> @@ -38,7 +40,7 @@ span.program-in-footer {font-size: smaller} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl index d1a5391294..05554e60ec 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_node_no_header_vertical'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_node_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_node_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_node_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_node_no_header_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_node_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_node_no_header_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_node_no_header_vertical'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_node_no_header_vertical'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_node_no_header_vertical'} = ' -File used for navigation testing +$result_texts{'navigation_node_no_header_vertical'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html index 7dfc2005ee..793858a9c2 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="section.html">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html index 0a79509225..d820d44cd0 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table border="0" cellpadding="0" cellspacing="0"> <tr> @@ -51,7 +52,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html index 70f209068a..e15bbe4bbb 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/section.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html index c1ac6dd476..67b17205ff 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_no_header_vertical/res_html/subsection.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} --> </style> @@ -38,7 +40,7 @@ span.program-in-footer {font-size: smaller} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl index ec5964970d..9c20ac1930 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_node_vertical'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_node_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_node_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_node_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_node_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_node_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_node_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_node_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_node_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_node_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_node_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_node_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_node_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_node_vertical'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_node_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_node_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_node_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_node_vertical'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_node_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_node_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_node_vertical'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_node_vertical'} = ' -File used for navigation testing +$result_texts{'navigation_node_vertical'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html index af95aeff51..9d0e8b5803 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -71,7 +73,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="section.html">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html index 696d162dfe..2b2dc9af63 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table border="0" cellpadding="0" cellspacing="0"> <tr> @@ -51,7 +52,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html index 96b39c5f70..e71a0921a0 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/section.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -71,7 +73,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html index 930e6092e1..9bb454d79e 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_node_vertical/res_html/subsection.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} --> </style> @@ -69,7 +71,7 @@ span.program-in-footer {font-size: smaller} </table> </td> <td> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </td> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl index 204082f0e9..c4233a1de7 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_section'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_section'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_section'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_section'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_section'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_section'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_section'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_section'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_section'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_section'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_section'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_section'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_section'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_section'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_section'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_section'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_section'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_section'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_section'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_section'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_section'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_section'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_section'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_section'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_section'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_section'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_section'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_section'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_section'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_section'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_section'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_section'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_section'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_section'} = ' -File used for navigation testing +$result_texts{'navigation_section'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html index d54dfd2919..dd9c37ae4b 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="section.html#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html index 193959cff3..2dd5cc2110 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> <tr><td>[ < ]</td> @@ -34,7 +35,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html index 05d9f81299..5e47fdbdfe 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section/res_html/section.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -91,7 +93,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl index 51373cca47..7d70eb9d9d 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_section_no_header'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_section_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_section_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_section_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_section_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_section_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_section_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_section_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_section_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_section_no_header'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_section_no_header'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_section_no_header'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_section_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_section_no_header'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_section_no_header'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_section_no_header'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_section_no_header'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_section_no_header'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_section_no_header'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_section_no_header'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_section_no_header'} = ' -File used for navigation testing +$result_texts{'navigation_section_no_header'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html index d54dfd2919..dd9c37ae4b 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="section.html#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html index 193959cff3..2dd5cc2110 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> <tr><td>[ < ]</td> @@ -34,7 +35,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html index 6e5c99070a..e8fe17800d 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header/res_html/section.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -40,7 +42,7 @@ td.menu-entry-destination {vertical-align: top} <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -76,7 +78,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <hr> <div class="subsection-level-extent" id="subsection"> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl index 13c6c054bc..19b491e08f 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_section_no_header_vertical'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_section_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_section_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_section_no_header_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_section_no_header_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_section_no_header_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_section_no_header_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_section_no_header_vertical'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_section_no_header_vertical'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_section_no_header_vertical'} = ' -File used for navigation testing +$result_texts{'navigation_section_no_header_vertical'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html index 0eeefcf78f..45095f02dc 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -71,7 +73,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="section.html#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html index 696d162dfe..2b2dc9af63 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table border="0" cellpadding="0" cellspacing="0"> <tr> @@ -51,7 +52,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html index 54cd3464a6..064ad6de39 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_no_header_vertical/res_html/section.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -71,7 +73,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -107,7 +109,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <hr> <div class="subsection-level-extent" id="subsection"> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </td> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl index 584328ba46..867672ca56 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_section_vertical'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_section_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_section_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_section_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_section_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_section_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_section_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_section_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_section_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_section_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_section_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_section_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_section_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_section_vertical'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_section_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_section_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_section_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_section_vertical'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_section_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_section_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_section_vertical'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_section_vertical'} = ' -File used for navigation testing +$result_texts{'navigation_section_vertical'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html index 0eeefcf78f..45095f02dc 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/chapter.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -71,7 +73,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="section.html#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html index 696d162dfe..2b2dc9af63 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/index.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -24,7 +26,6 @@ td.menu-entry-destination {vertical-align: top} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table border="0" cellpadding="0" cellspacing="0"> <tr> @@ -51,7 +52,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html index fb70d42abd..87bb2c3edf 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_section_vertical/res_html/section.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} --> @@ -71,7 +73,7 @@ td.menu-entry-destination {vertical-align: top} </table> </td> <td> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -122,7 +124,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <td>[Index]</td> <td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </td> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision.pl new file mode 100644 index 0000000000..f074f677b4 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision.pl @@ -0,0 +1,1179 @@ +use vars qw(%result_texis %result_texts %result_trees %result_errors + %result_indices %result_sectioning %result_nodes %result_menus + %result_floats %result_converted %result_converted_errors + %result_elements %result_directions_text %result_indices_sort_strings); + +use utf8; + +$result_trees{'navigation_test_misc_file_collision'} = { + 'contents' => [ + { + 'contents' => [ + { + 'contents' => [ + { + 'text' => '\\input texinfo @c -*-texinfo-*- +', + 'type' => 'text_before_beginning' + }, + { + 'text' => ' +', + 'type' => 'text_before_beginning' + } + ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], + 'type' => 'preamble_before_content' + } + ], + 'type' => 'before_node_section' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Top' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 3, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'File used for navigation testing' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'top', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'menu', + 'contents' => [ + { + 'contents' => [ + { + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'text' => 'chapter' + } + ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, + 'type' => 'menu_entry_node' + }, + { + 'text' => '::', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ + { + 'contents' => [ + { + 'text' => ' +' + } + ], + 'type' => 'preformatted' + } + ], + 'type' => 'menu_entry_description' + } + ], + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 7, + 'macro' => '' + }, + 'type' => 'menu_entry' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'menu' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'text_arg' => 'menu' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 8, + 'macro' => '' + } + } + ], + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 6, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 4, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'chapter' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 10, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'First chapter' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'chapter', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'menu', + 'contents' => [ + { + 'contents' => [ + { + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'text' => 'section' + } + ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, + 'type' => 'menu_entry_node' + }, + { + 'text' => '::', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ + { + 'contents' => [ + { + 'text' => ' +' + } + ], + 'type' => 'preformatted' + } + ], + 'type' => 'menu_entry_description' + } + ], + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 14, + 'macro' => '' + }, + 'type' => 'menu_entry' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'menu' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'text_arg' => 'menu' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 15, + 'macro' => '' + } + } + ], + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 13, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 11, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'section' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 17, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Section in chapter' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'section', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'AAAA +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b +' + }, + { + 'text' => 'b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'menu', + 'contents' => [ + { + 'contents' => [ + { + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'text' => 'subsection' + } + ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, + 'type' => 'menu_entry_node' + }, + { + 'text' => '::', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ + { + 'contents' => [ + { + 'text' => ' +' + } + ], + 'type' => 'preformatted' + } + ], + 'type' => 'menu_entry_description' + } + ], + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 48, + 'macro' => '' + }, + 'type' => 'menu_entry' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'menu' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'text_arg' => 'menu' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 49, + 'macro' => '' + } + } + ], + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 47, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 18, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'subsection' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 51, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Sub section in section' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'subsection', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'text' => ' +', + 'type' => 'rawline_arg' + } + ], + 'cmdname' => 'contents', + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 54, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'navigation.texi', + 'line_nr' => 52, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'text' => ' +', + 'type' => 'rawline_arg' + } + ], + 'cmdname' => 'bye' + } + ], + 'type' => 'document_root' +}; +$result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_test_misc_file_collision'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_test_misc_file_collision'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_test_misc_file_collision'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; + +$result_texis{'navigation_test_misc_file_collision'} = '\\input texinfo @c -*-texinfo-*- + +@node Top +@top File used for navigation testing + +@menu +* chapter:: +@end menu + +@node chapter +@chapter First chapter + +@menu +* section:: +@end menu + +@node section +@section Section in chapter + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b +b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. + +@menu +* subsection:: +@end menu + +@node subsection +@subsection Sub section in section + +@contents + +@bye +'; + + +$result_texts{'navigation_test_misc_file_collision'} = 'File used for navigation testing +******************************** + +* chapter:: + +1 First chapter +*************** + +* section:: + +1.1 Section in chapter +====================== + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +AAAA + +b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b +b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. + +* subsection:: + +1.1.1 Sub section in section +---------------------------- + + +'; + +$result_sectioning{'navigation_test_misc_file_collision'} = { + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'top', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'chapter', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'chapter' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'section', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'section' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'subsection', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'subsection' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_level' => 3, + 'section_number' => '1.1.1', + 'section_up' => {} + } + } + ], + 'section_level' => 2, + 'section_number' => '1.1', + 'section_up' => {} + } + } + ], + 'section_level' => 1, + 'section_number' => 1, + 'section_up' => {}, + 'toplevel_prev' => {}, + 'toplevel_up' => {} + } + } + ], + 'section_level' => 0, + 'section_up' => {} + } + } + ], + 'section_level' => -1 + } +}; +$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]; +$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]; +$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]; +$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'} = $result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]; +$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'} = $result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]; +$result_sectioning{'navigation_test_misc_file_collision'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'} = $result_sectioning{'navigation_test_misc_file_collision'}; + +$result_nodes{'navigation_test_misc_file_collision'} = { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'top', + 'extra' => {}, + 'structure' => {} + }, + 'menus' => [ + { + 'cmdname' => 'menu' + } + ], + 'normalized' => 'Top' + }, + 'structure' => { + 'menu_child' => { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'chapter', + 'extra' => {}, + 'structure' => { + 'section_number' => 1 + } + }, + 'menus' => [ + { + 'cmdname' => 'menu' + } + ], + 'normalized' => 'chapter' + }, + 'structure' => { + 'menu_child' => { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'section', + 'extra' => {}, + 'structure' => { + 'section_number' => '1.1' + } + }, + 'menus' => [ + { + 'cmdname' => 'menu' + } + ], + 'normalized' => 'section' + }, + 'structure' => { + 'menu_child' => { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'subsection', + 'extra' => {}, + 'structure' => { + 'section_number' => '1.1.1' + } + }, + 'normalized' => 'subsection' + }, + 'structure' => { + 'node_up' => {} + } + }, + 'node_up' => {} + } + }, + 'node_prev' => {}, + 'node_up' => {} + } + }, + 'node_next' => {} + } +}; +$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'} = $result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}; +$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'node_up'} = $result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}; +$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'node_prev'} = $result_nodes{'navigation_test_misc_file_collision'}; +$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'node_up'} = $result_nodes{'navigation_test_misc_file_collision'}; +$result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'node_next'} = $result_nodes{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}; + +$result_menus{'navigation_test_misc_file_collision'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + }, + 'structure' => { + 'menu_child' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'chapter' + }, + 'structure' => { + 'menu_child' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'section' + }, + 'structure' => { + 'menu_child' => { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'subsection' + }, + 'structure' => { + 'menu_up' => {}, + 'menu_up_hash' => { + 'section' => 1 + } + } + }, + 'menu_up' => {}, + 'menu_up_hash' => { + 'chapter' => 1 + } + } + }, + 'menu_up' => {}, + 'menu_up_hash' => { + 'Top' => 1 + } + } + } + } +}; +$result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} = $result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}; +$result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} = $result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}; +$result_menus{'navigation_test_misc_file_collision'}{'structure'}{'menu_child'}{'structure'}{'menu_up'} = $result_menus{'navigation_test_misc_file_collision'}; + +$result_errors{'navigation_test_misc_file_collision'} = []; + + +$result_floats{'navigation_test_misc_file_collision'} = {}; + + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/chapter.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/chapter.html new file mode 100644 index 0000000000..883e0c59e0 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/chapter.html @@ -0,0 +1,62 @@ +<!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>1 First chapter (File used for navigation testing)</title> + +<meta name="description" content="1 First chapter (File used for navigation testing)"> +<meta name="keywords" content="1 First chapter (File used for navigation testing)"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="Generator" content="texi2any"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +<style type="text/css"> +<!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} +span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} +td.menu-entry-description {vertical-align: top} +td.menu-entry-destination {vertical-align: top} +--> +</style> + + +</head> + +<body lang="en"> +<div class="chapter-level-extent" id="chapter"> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="navigation_abt.html#Top" title="Beginning of this chapter or previous chapter"> << </a>]</td> +<td>[<a href="navigation_abt.html#Top" title="Previous section in reading order"> < </a>]</td> +<td>[<a href="navigation_abt.html#Top" title="Up section"> Up </a>]</td> +<td>[<a href="navigation_abt.html#section" title="Next section in reading order"> > </a>]</td> +<td>[ >> ]</td> +<td> </td> +<td> </td> +<td> </td> +<td> </td> +<td>[<a href="navigation_abt.html#Top" title="Cover (top) of document">Top</a>]</td> +<td>[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[Index]</td> +<td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<hr> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> + +<table class="menu" border="0" cellspacing="0"> +<tr><td class="menu-entry-destination"><a href="navigation_abt.html#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> +</td></tr> +</table> + +</div> +</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/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/index.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/index.html new file mode 100644 index 0000000000..34e50c28a2 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/index.html @@ -0,0 +1,23 @@ +<!DOCTYPE html> +<html> +<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> +<!-- This file redirects to the location of a node or anchor --> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<title>Top (File used for navigation testing)</title> + +<meta name="description" content="Top (File used for navigation testing)"> +<meta name="keywords" content="Top (File used for navigation testing)"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="Generator" content="texi2any"> + +<meta http-equiv="Refresh" content="0; url=navigation_abt.html#Top"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +</head> + +<body lang="en"> + +<p>The node you are looking for is at <a href="navigation_abt.html#Top">Top</a>.</p> +</body> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_abt.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_abt.html new file mode 100644 index 0000000000..51ddceeeec --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_abt.html @@ -0,0 +1,222 @@ +<!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>File used for navigation testing</title> + +<meta name="description" content="File used for navigation testing"> +<meta name="keywords" content="File used for navigation testing"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="Generator" content="texi2any"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +<style type="text/css"> +<!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} +span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} +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> + + +</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.html" title="Next section in reading order"> > </a>]</td> +<td> </td> +<td>[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[Index]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<hr> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> + +<table class="menu" border="0" cellspacing="0"> +<tr><td class="menu-entry-destination"><a href="chapter.html">1 First chapter</a></td><td> </td><td class="menu-entry-description"> +</td></tr> +</table> + +<hr style="height: 6px;"> +<div class="section-level-extent" id="section"> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> << </a>]</td> +<td>[<a href="chapter.html" title="Previous section in reading order"> < </a>]</td> +<td>[<a href="chapter.html" title="Up section"> Up </a>]</td> +<td>[<a href="subsection.html" title="Next section in reading order"> > </a>]</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="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[Index]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> + +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>AAAA +</p> +<p>b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b +b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. +</p> +<table class="menu" border="0" cellspacing="0"> +<tr><td class="menu-entry-destination"><a href="subsection.html">1.1.1 Sub section in section</a></td><td> </td><td class="menu-entry-description"> +</td></tr> +</table> + +<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="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[Index]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<hr> +<h1 class="about-heading">About This Document</h1> + +<p> + This document was generated on <em class="emph">a sunny day</em> using <a class="uref" href="http://www.gnu.org/software/texinfo/"><em class="emph">texi2any</em></a>. +</p> +<p> + The buttons in the navigation panels have the following meaning: +</p> +<table border="1"> + <tr> + <th> Button </th> + <th> Name </th> + <th> Go to </th> + <th> From 1.2.3 go to</th> + </tr> + <tr> + <td class="button-direction-about"> [ << ] </td> + <td class="name-direction-about">FastBack</td> + <td>Beginning of this chapter or previous chapter</td> + <td>1</td> + </tr> + <tr> + <td class="button-direction-about"> [ < ] </td> + <td class="name-direction-about">Back</td> + <td>Previous section in reading order</td> + <td>1.2.2</td> + </tr> + <tr> + <td class="button-direction-about"> [ Up ] </td> + <td class="name-direction-about">Up</td> + <td>Up section</td> + <td>1.2</td> + </tr> + <tr> + <td class="button-direction-about"> [ > ] </td> + <td class="name-direction-about">Forward</td> + <td>Next section in reading order</td> + <td>1.2.4</td> + </tr> + <tr> + <td class="button-direction-about"> [ >> ] </td> + <td class="name-direction-about">FastForward</td> + <td>Next chapter</td> + <td>2</td> + </tr> + <tr> + <td class="button-direction-about"> [Top] </td> + <td class="name-direction-about">Top</td> + <td>Cover (top) of document</td> + <td> </td> + </tr> + <tr> + <td class="button-direction-about"> [Contents] </td> + <td class="name-direction-about">Contents</td> + <td>Table of contents</td> + <td> </td> + </tr> + <tr> + <td class="button-direction-about"> [Index] </td> + <td class="name-direction-about">Index</td> + <td>Index</td> + <td> </td> + </tr> + <tr> + <td class="button-direction-about"> [ ? ] </td> + <td class="name-direction-about">About</td> + <td>About (help)</td> + <td> </td> + </tr> +</table> + +<p> + where the <strong class="strong"> Example </strong> assumes that the current position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of a document of the following structure: +</p> + +<ul> + <li> 1. Section One + <ul> + <li>1.1 Subsection One-One + <ul> + <li>...</li> + </ul> + </li> + <li>1.2 Subsection One-Two + <ul> + <li>1.2.1 Subsubsection One-Two-One</li> + <li>1.2.2 Subsubsection One-Two-Two</li> + <li>1.2.3 Subsubsection One-Two-Three + <strong><== Current Position </strong></li> + <li>1.2.4 Subsubsection One-Two-Four</li> + </ul> + </li> + <li>1.3 Subsection One-Three + <ul> + <li>...</li> + </ul> + </li> + <li>1.4 Subsection One-Four</li> + </ul> + </li> +</ul> +</div><hr> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td> +<td>[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[Index]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<p> + <span class="program-in-footer">This document was generated on <em class="emph">a sunny day</em> using <a class="uref" href="http://www.gnu.org/software/texinfo/"><em class="emph">texi2any</em></a>.</span> +</p> + + +</body> +</html> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_toc.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_toc.html new file mode 100644 index 0000000000..e163957513 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/navigation_toc.html @@ -0,0 +1,61 @@ +<!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>Table of Contents (File used for navigation testing)</title> + +<meta name="description" content="Table of Contents (File used for navigation testing)"> +<meta name="keywords" content="Table of Contents (File used for navigation testing)"> +<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="navigation_abt.html#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="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<hr> +<h1 class="contents-heading">Table of Contents</h1> + +<div class="contents"> + +<ul class="toc-numbered-mark"> + <li><a id="toc-First-chapter" href="chapter.html">1 First chapter</a> + <ul class="toc-numbered-mark"> + <li><a id="toc-Section-in-chapter" href="navigation_abt.html#section">1.1 Section in chapter</a> + <ul class="toc-numbered-mark"> + <li><a id="toc-Sub-section-in-section" href="subsection.html">1.1.1 Sub section in section</a></li> + </ul></li> + </ul></li> +</ul> +</div> +</div><hr> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="navigation_abt.html#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="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<p> + <span class="program-in-footer">This document was generated on <em class="emph">a sunny day</em> using <a class="uref" href="http://www.gnu.org/software/texinfo/"><em class="emph">texi2any</em></a>.</span> +</p> + + +</body> +</html> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/section.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/section.html new file mode 100644 index 0000000000..9b81dd960b --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/section.html @@ -0,0 +1,23 @@ +<!DOCTYPE html> +<html> +<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> +<!-- This file redirects to the location of a node or anchor --> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<title>section (File used for navigation testing)</title> + +<meta name="description" content="section (File used for navigation testing)"> +<meta name="keywords" content="section (File used for navigation testing)"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="Generator" content="texi2any"> + +<meta http-equiv="Refresh" content="0; url=navigation_abt.html#section"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +</head> + +<body lang="en"> + +<p>The node you are looking for is at <a href="navigation_abt.html#section">section</a>.</p> +</body> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/subsection.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/subsection.html new file mode 100644 index 0000000000..10eee53d7a --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_test_misc_file_collision/res_html/subsection.html @@ -0,0 +1,56 @@ +<!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>1.1.1 Sub section in section (File used for navigation testing)</title> + +<meta name="description" content="1.1.1 Sub section in section (File used for navigation testing)"> +<meta name="keywords" content="1.1.1 Sub section in section (File used for navigation testing)"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="Generator" content="texi2any"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +<style type="text/css"> +<!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} +span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} +--> +</style> + + +</head> + +<body lang="en"> +<div class="subsection-level-extent" id="subsection"> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="chapter.html" title="Beginning of this chapter or previous chapter"> << </a>]</td> +<td>[<a href="navigation_abt.html#section" title="Previous section in reading order"> < </a>]</td> +<td>[<a href="navigation_abt.html#section" title="Up section"> Up </a>]</td> +<td>[ > ]</td> +<td>[ >> ]</td> +<td> </td> +<td> </td> +<td> </td> +<td> </td> +<td>[<a href="navigation_abt.html#Top" title="Cover (top) of document">Top</a>]</td> +<td>[<a href="navigation_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[Index]</td> +<td>[<a href="navigation_abt.html#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<hr> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> + + +</div> +</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/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl b/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl index d36b28165c..b768bac314 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical.pl @@ -12,57 +12,20 @@ $result_trees{'navigation_vertical'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'navigation.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'navigation.info' - }, - 'source_info' => { - 'file_name' => 'navigation.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'navigation_vertical'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'navigation_vertical'} = { 'text' => 'File used for navigation testing' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -130,9 +90,11 @@ $result_trees{'navigation_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -140,7 +102,7 @@ $result_trees{'navigation_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -151,6 +113,12 @@ $result_trees{'navigation_vertical'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -172,18 +140,9 @@ $result_trees{'navigation_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 9, + 'line_nr' => 7, 'macro' => '' }, 'type' => 'menu_entry' @@ -196,28 +155,34 @@ $result_trees{'navigation_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -227,12 +192,15 @@ $result_trees{'navigation_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -244,32 +212,27 @@ $result_trees{'navigation_vertical'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -281,9 +244,11 @@ $result_trees{'navigation_vertical'} = { 'text' => 'First chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -298,9 +263,11 @@ $result_trees{'navigation_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -308,7 +275,7 @@ $result_trees{'navigation_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -319,6 +286,12 @@ $result_trees{'navigation_vertical'} = { 'text' => 'section' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'section' + }, 'type' => 'menu_entry_node' }, { @@ -340,18 +313,9 @@ $result_trees{'navigation_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' }, 'type' => 'menu_entry' @@ -364,28 +328,34 @@ $result_trees{'navigation_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 15, + 'line_nr' => 13, 'macro' => '' } }, @@ -395,12 +365,15 @@ $result_trees{'navigation_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 13, + 'line_nr' => 11, 'macro' => '' } }, @@ -412,32 +385,27 @@ $result_trees{'navigation_vertical'} = { 'text' => 'section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'section' - } - ], - 'normalized' => 'section', - 'spaces_before_argument' => ' ' + 'normalized' => 'section' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 19, + 'line_nr' => 17, 'macro' => '' } }, @@ -449,9 +417,11 @@ $result_trees{'navigation_vertical'} = { 'text' => 'Section in chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -652,9 +622,11 @@ $result_trees{'navigation_vertical'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -662,7 +634,7 @@ $result_trees{'navigation_vertical'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -673,6 +645,12 @@ $result_trees{'navigation_vertical'} = { 'text' => 'subsection' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'subsection' + }, 'type' => 'menu_entry_node' }, { @@ -694,18 +672,9 @@ $result_trees{'navigation_vertical'} = { 'type' => 'menu_entry_description' } ], - 'extra' => { - 'menu_entry_description' => {}, - 'menu_entry_node' => { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 50, + 'line_nr' => 48, 'macro' => '' }, 'type' => 'menu_entry' @@ -718,28 +687,34 @@ $result_trees{'navigation_vertical'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 51, + 'line_nr' => 49, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 49, + 'line_nr' => 47, 'macro' => '' } }, @@ -749,12 +724,15 @@ $result_trees{'navigation_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 20, + 'line_nr' => 18, 'macro' => '' } }, @@ -766,32 +744,27 @@ $result_trees{'navigation_vertical'} = { 'text' => 'subsection' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'subsection' - } - ], - 'normalized' => 'subsection', - 'spaces_before_argument' => ' ' + 'normalized' => 'subsection' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 53, + 'line_nr' => 51, 'macro' => '' } }, @@ -803,9 +776,11 @@ $result_trees{'navigation_vertical'} = { 'text' => 'Sub section in section' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -822,13 +797,13 @@ $result_trees{'navigation_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 56, + 'line_nr' => 54, 'macro' => '' } }, @@ -838,12 +813,15 @@ $result_trees{'navigation_vertical'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'navigation.texi', - 'line_nr' => 54, + 'line_nr' => 52, 'macro' => '' } }, @@ -852,7 +830,7 @@ $result_trees{'navigation_vertical'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -860,25 +838,12 @@ $result_trees{'navigation_vertical'} = { ], 'type' => 'document_root' }; -$result_trees{'navigation_vertical'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[3]; -$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'navigation_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[7]{'args'}[0]{'contents'}[0]; +$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]; +$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'navigation_vertical'} = '\\input texinfo @c -*-texinfo-*- -@setfilename navigation.info - @node Top @top File used for navigation testing @@ -936,8 +901,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. '; -$result_texts{'navigation_vertical'} = ' -File used for navigation testing +$result_texts{'navigation_vertical'} = 'File used for navigation testing ******************************** * chapter:: diff --git a/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical/res_html/navigation.html b/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical/res_html/navigation.html index b96ce1b161..a61b618644 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical/res_html/navigation.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/navigation_vertical/res_html/navigation.html @@ -14,7 +14,9 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.button-direction-about {text-align:center} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} @@ -27,7 +29,6 @@ ul.toc-numbered-mark {list-style: none} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table border="0" cellpadding="0" cellspacing="0"> <tr> @@ -54,7 +55,7 @@ ul.toc-numbered-mark {list-style: none} </table> </td> <td> -<h1 class="top" id="File-used-for-navigation-testing">File used for navigation testing</h1> +<h1 class="top" id="File-used-for-navigation-testing"><span>File used for navigation testing<a class="copiable-link" href="#File-used-for-navigation-testing"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#chapter">1 First chapter</a></td><td> </td><td class="menu-entry-description"> @@ -112,7 +113,7 @@ ul.toc-numbered-mark {list-style: none} </table> </td> <td> -<h1 class="chapter" id="First-chapter">1 First chapter</h1> +<h1 class="chapter" id="First-chapter"><span>1 First chapter<a class="copiable-link" href="#First-chapter"> ¶</a></span></h1> <table class="menu" border="0" cellspacing="0"> <tr><td class="menu-entry-destination"><a href="#section">1.1 Section in chapter</a></td><td> </td><td class="menu-entry-description"> @@ -136,7 +137,7 @@ ul.toc-numbered-mark {list-style: none} <td>[Index]</td> <td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h2 class="section" id="Section-in-chapter">1.1 Section in chapter</h2> +<h2 class="section" id="Section-in-chapter"><span>1.1 Section in chapter<a class="copiable-link" href="#Section-in-chapter"> ¶</a></span></h2> <p>AAAA </p> @@ -187,7 +188,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b bb b bb. <td>[Index]</td> <td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h3 class="subsection" id="Sub-section-in-section">1.1.1 Sub section in section</h3> +<h3 class="subsection" id="Sub-section-in-section"><span>1.1.1 Sub section in section<a class="copiable-link" href="#Sub-section-in-section"> ¶</a></span></h3> </td> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl index 623c296d01..02aef72cc0 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl +++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic.pl @@ -12,57 +12,20 @@ $result_trees{'no_monolithic'} = { { 'contents' => [ { - 'contents' => [ - { - 'text' => '\\input texinfo @c -*-texinfo-*- -', - 'type' => 'text_before_beginning' - }, - { - 'text' => ' + 'text' => '\\input texinfo @c -*-texinfo-*- ', - 'type' => 'text_before_beginning' - } - ], - 'type' => 'preamble_before_beginning' - } - ], - 'type' => 'preamble_before_setfilename' - }, - { - 'contents' => [ - { - 'args' => [ - { - 'contents' => [ - { - 'text' => 'no_monolithic.info' - } - ], - 'extra' => { - 'spaces_after_argument' => ' -' - }, - 'type' => 'line_arg' - } - ], - 'cmdname' => 'setfilename', - 'extra' => { - 'spaces_before_argument' => ' ', - 'text_arg' => 'no_monolithic.info' - }, - 'source_info' => { - 'file_name' => 'no_monolithic.texi', - 'line_nr' => 3, - 'macro' => '' - } + 'type' => 'text_before_beginning' }, { 'text' => ' ', - 'type' => 'empty_line' + 'type' => 'text_before_beginning' } ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], 'type' => 'preamble_before_content' } ], @@ -76,32 +39,27 @@ $result_trees{'no_monolithic'} = { 'text' => 'Top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'node', 'extra' => { - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'Top' - } - ], - 'normalized' => 'Top', - 'spaces_before_argument' => ' ' + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 5, + 'line_nr' => 3, 'macro' => '' } }, @@ -113,9 +71,11 @@ $result_trees{'no_monolithic'} = { 'text' => 'Not monolithic' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -151,7 +111,7 @@ $result_trees{'no_monolithic'} = { 'cmdname' => 'footnote', 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 8, + 'line_nr' => 6, 'macro' => '' } }, @@ -175,32 +135,31 @@ $result_trees{'no_monolithic'} = { 'text' => 'top' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, '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' - }, - 'spaces_before_argument' => ' ' + 'element_node' => {}, + 'index_entry' => [ + 'cp', + 1 + ] + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 10, + 'line_nr' => 8, 'macro' => '' }, 'type' => 'index_entry_command' @@ -213,9 +172,11 @@ $result_trees{'no_monolithic'} = { { 'args' => [ { - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'block_line_arg' } @@ -223,7 +184,7 @@ $result_trees{'no_monolithic'} = { 'cmdname' => 'menu', 'contents' => [ { - 'args' => [ + 'contents' => [ { 'text' => '* ', 'type' => 'menu_entry_leading_text' @@ -234,6 +195,12 @@ $result_trees{'no_monolithic'} = { 'text' => 'chapter' } ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, 'type' => 'menu_entry_node' }, { @@ -255,18 +222,9 @@ $result_trees{'no_monolithic'} = { '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, + 'line_nr' => 11, 'macro' => '' }, 'type' => 'menu_entry' @@ -279,28 +237,34 @@ $result_trees{'no_monolithic'} = { 'text' => 'menu' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } ], 'cmdname' => 'end', 'extra' => { - 'spaces_before_argument' => ' ', 'text_arg' => 'menu' }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 14, + 'line_nr' => 12, 'macro' => '' } } ], 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 12, + 'line_nr' => 10, 'macro' => '' } }, @@ -310,12 +274,15 @@ $result_trees{'no_monolithic'} = { 'type' => 'empty_line' } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 6, + 'line_nr' => 4, 'macro' => '' } }, @@ -327,9 +294,11 @@ $result_trees{'no_monolithic'} = { 'text' => 'chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -337,23 +306,16 @@ $result_trees{'no_monolithic'} = { 'cmdname' => 'node', 'extra' => { 'isindex' => 1, - 'node_content' => [ - {} - ], - 'nodes_manuals' => [ - { - 'node_content' => [ - {} - ], - 'normalized' => 'chapter' - } - ], - 'normalized' => 'chapter', - 'spaces_before_argument' => ' ' + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 16, + 'line_nr' => 14, 'macro' => '' } }, @@ -365,9 +327,11 @@ $result_trees{'no_monolithic'} = { 'text' => 'Chapter' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -398,13 +362,13 @@ $result_trees{'no_monolithic'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'contents', 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 21, + 'line_nr' => 19, 'macro' => '' } }, @@ -413,13 +377,13 @@ $result_trees{'no_monolithic'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'shortcontents', 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 22, + 'line_nr' => 20, 'macro' => '' } }, @@ -436,9 +400,11 @@ $result_trees{'no_monolithic'} = { 'text' => 'cp' } ], - 'extra' => { - 'spaces_after_argument' => ' + 'info' => { + 'spaces_after_argument' => { + 'text' => ' ' + } }, 'type' => 'line_arg' } @@ -447,22 +413,29 @@ $result_trees{'no_monolithic'} = { 'extra' => { 'misc_args' => [ 'cp' - ], - 'spaces_before_argument' => ' ' + ] + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 24, + 'line_nr' => 22, 'macro' => '' } } ], - 'extra' => { - 'spaces_before_argument' => ' ' + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } }, 'source_info' => { 'file_name' => 'no_monolithic.texi', - 'line_nr' => 17, + 'line_nr' => 15, 'macro' => '' } }, @@ -471,7 +444,7 @@ $result_trees{'no_monolithic'} = { { 'text' => ' ', - 'type' => 'misc_arg' + 'type' => 'rawline_arg' } ], 'cmdname' => 'bye' @@ -479,21 +452,11 @@ $result_trees{'no_monolithic'} = { ], 'type' => 'document_root' }; -$result_trees{'no_monolithic'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'no_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'no_monolithic'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'no_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'} = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}; -$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'} = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}; -$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'} = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]; -$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'} = $result_trees{'no_monolithic'}{'contents'}[1]; -$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_description'} = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[3]; -$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[1]{'contents'}[0]; -$result_trees{'no_monolithic'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'no_monolithic'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'no_monolithic'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'no_monolithic'}{'contents'}[3]{'args'}[0]{'contents'}[0]; +$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'} = $result_trees{'no_monolithic'}{'contents'}[1]; +$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0]; $result_texis{'no_monolithic'} = '\\input texinfo @c -*-texinfo-*- -@setfilename no_monolithic.info - @node Top @top Not monolithic @@ -518,8 +481,7 @@ Chapter. '; -$result_texts{'no_monolithic'} = ' -Not monolithic +$result_texts{'no_monolithic'} = 'Not monolithic ************** Not monolitic manual. diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html index 1f5125fd36..cc8670b133 100644 --- a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html +++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic/res_html/no_monolithic.html @@ -14,14 +14,16 @@ <style type="text/css"> <!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter-printindex {text-decoration: none} span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} td.menu-entry-description {vertical-align: top} td.menu-entry-destination {vertical-align: top} td.printindex-index-entry {vertical-align: top} -td.printindex-index-section {vertical-align: top} +td.printindex-index-section {vertical-align: top; padding-left: 1em} th.entries-header-printindex {text-align:left} -th.sections-header-printindex {text-align:left} +th.sections-header-printindex {text-align:left; padding-left: 1em} --> </style> @@ -29,7 +31,6 @@ th.sections-header-printindex {text-align:left} </head> <body lang="en"> - <div class="top-level-extent" id="Top"> <table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> <tr><td>[ < ]</td> @@ -39,7 +40,7 @@ th.sections-header-printindex {text-align:left} <td>[<a href="#chapter" title="Index">Index</a>]</td> <td>[<a href="no_monolithic_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="top" id="Not-monolithic">Not monolithic</h1> +<h1 class="top" id="Not-monolithic"><span>Not monolithic<a class="copiable-link" href="#Not-monolithic"> ¶</a></span></h1> <p>Not monolitic manual<a class="footnote" id="DOCF1" href="no_monolithic_fot.html#FOOT1"><sup>1</sup></a>. </p> @@ -67,18 +68,18 @@ th.sections-header-printindex {text-align:left} <td>[<a href="#chapter" title="Index">Index</a>]</td> <td>[<a href="no_monolithic_abt.html#SEC_About" title="About (help)"> ? </a>]</td> </tr></table> -<h1 class="chapter" id="Chapter">1 Chapter</h1> +<h1 class="chapter" id="Chapter"><span>1 Chapter<a class="copiable-link" href="#Chapter"> ¶</a></span></h1> <p>Chapter. </p> <div class="printindex cp-printindex"> <table class="cp-entries-printindex" border="0"> -<tr><td></td><th class="entries-header-printindex">Index Entry</th><td> </td><th class="sections-header-printindex"> Section</th></tr> -<tr><td colspan="4"> <hr></td></tr> -<tr><th id="Chapter_cp_letter-T">T</th><td></td><td></td></tr> -<tr><td></td><td class="printindex-index-entry"><a href="#index-top">top</a></td><td> </td><td class="printindex-index-section"><a href="#Top">Not monolithic</a></td></tr> -<tr><td colspan="4"> <hr></td></tr> +<tr><td></td><th class="entries-header-printindex">Index Entry</th><th class="sections-header-printindex">Section</th></tr> +<tr><td colspan="3"><hr></td></tr> +<tr><th id="Chapter_cp_letter-T">T</th></tr> +<tr><td></td><td class="printindex-index-entry"><a href="#index-top">top</a></td><td class="printindex-index-section"><a href="#Top">Not monolithic</a></td></tr> +<tr><td colspan="3"><hr></td></tr> </table> </div> </div> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic_only_toc_out.pl b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic_only_toc_out.pl new file mode 100644 index 0000000000..76fc812fef --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic_only_toc_out.pl @@ -0,0 +1,627 @@ +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' => [ + { + 'text' => '\\input texinfo @c -*-texinfo-*- +', + 'type' => 'text_before_beginning' + }, + { + 'text' => ' +', + 'type' => 'text_before_beginning' + } + ], + 'type' => 'preamble_before_beginning' + }, + { + 'contents' => [], + 'type' => 'preamble_before_content' + } + ], + 'type' => 'before_node_section' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Top' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 3, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Not monolithic' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + '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' => 6, + 'macro' => '' + } + }, + { + 'text' => '. +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'top' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'cindex', + 'extra' => { + 'element_node' => {}, + 'index_entry' => [ + 'cp', + 1 + ] + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 8, + 'macro' => '' + }, + 'type' => 'index_entry_command' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'block_line_arg' + } + ], + 'cmdname' => 'menu', + 'contents' => [ + { + 'contents' => [ + { + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'text' => 'chapter' + } + ], + 'extra' => { + 'node_content' => [ + {} + ], + 'normalized' => 'chapter' + }, + 'type' => 'menu_entry_node' + }, + { + 'text' => '::', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ + { + 'contents' => [ + { + 'text' => ' +' + } + ], + 'type' => 'preformatted' + } + ], + 'type' => 'menu_entry_description' + } + ], + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 11, + 'macro' => '' + }, + 'type' => 'menu_entry' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'menu' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'text_arg' => 'menu' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 12, + 'macro' => '' + } + } + ], + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 10, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' + } + ], + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 4, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'chapter' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'extra' => { + 'isindex' => 1, + 'normalized' => 'chapter' + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 14, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'Chapter' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'chapter', + 'contents' => [ + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'contents' => [ + { + 'text' => 'Chapter. +' + } + ], + 'type' => 'paragraph' + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'text' => ' +', + 'type' => 'rawline_arg' + } + ], + 'cmdname' => 'contents', + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 19, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'text' => ' +', + 'type' => 'rawline_arg' + } + ], + 'cmdname' => 'shortcontents', + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 20, + 'macro' => '' + } + }, + { + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'text' => 'cp' + } + ], + 'info' => { + 'spaces_after_argument' => { + 'text' => ' +' + } + }, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'printindex', + 'extra' => { + 'misc_args' => [ + 'cp' + ] + }, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 22, + 'macro' => '' + } + } + ], + 'extra' => {}, + 'info' => { + 'spaces_before_argument' => { + 'text' => ' ' + } + }, + 'source_info' => { + 'file_name' => 'no_monolithic.texi', + 'line_nr' => 15, + 'macro' => '' + } + }, + { + 'args' => [ + { + 'text' => ' +', + 'type' => 'rawline_arg' + } + ], + 'cmdname' => 'bye' + } + ], + 'type' => 'document_root' +}; +$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'} = $result_trees{'no_monolithic_only_toc_out'}{'contents'}[1]; +$result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'no_monolithic_only_toc_out'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0]; + +$result_texis{'no_monolithic_only_toc_out'} = '\\input texinfo @c -*-texinfo-*- + +@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' + }, + 'structure' => {} + } + }, + 'structure' => { + 'section_childs' => [ + { + 'cmdname' => 'chapter', + 'extra' => { + 'associated_node' => { + 'cmdname' => 'node', + 'extra' => { + 'isindex' => 1, + 'normalized' => 'chapter' + }, + 'structure' => {} + } + }, + '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' => {}, + 'structure' => {} + }, + 'menus' => [ + { + 'cmdname' => 'menu' + } + ], + 'normalized' => 'Top' + }, + 'structure' => { + 'menu_child' => { + 'cmdname' => 'node', + 'extra' => { + 'associated_section' => { + 'cmdname' => 'chapter', + 'extra' => {}, + 'structure' => { + 'section_number' => 1 + } + }, + 'isindex' => 1, + 'normalized' => 'chapter' + }, + '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' + }, + 'structure' => { + 'menu_child' => { + 'cmdname' => 'node', + 'extra' => { + 'isindex' => 1, + 'normalized' => 'chapter' + }, + '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/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html new file mode 100644 index 0000000000..126348bb59 --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic.html @@ -0,0 +1,239 @@ +<!DOCTYPE html> +<html> +<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ --> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<title>Not monolithic</title> + +<meta name="description" content="Not monolithic"> +<meta name="keywords" content="Not monolithic"> +<meta name="resource-type" content="document"> +<meta name="distribution" content="global"> +<meta name="Generator" content="texi2any"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + +<style type="text/css"> +<!-- +a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em} +a.summary-letter-printindex {text-decoration: none} +span.program-in-footer {font-size: smaller} +span:hover a.copiable-link {visibility: visible} +td.button-direction-about {text-align:center} +td.menu-entry-description {vertical-align: top} +td.menu-entry-destination {vertical-align: top} +td.name-direction-about {text-align:center} +td.printindex-index-entry {vertical-align: top} +td.printindex-index-section {vertical-align: top; padding-left: 1em} +th.entries-header-printindex {text-align:left} +th.sections-header-printindex {text-align:left; padding-left: 1em} +ul.toc-numbered-mark {list-style: none} +--> +</style> + + +</head> + +<body lang="en"> +<div class="top-level-extent" id="Top"> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[ < ]</td> +<td>[<a href="#chapter" title="Next section in reading order"> > </a>]</td> +<td> </td> +<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[<a href="#chapter" title="Index">Index</a>]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<h1 class="top" id="Not-monolithic"><span>Not monolithic<a class="copiable-link" href="#Not-monolithic"> ¶</a></span></h1> + +<p>Not monolitic manual<a class="footnote" id="DOCF1" href="#FOOT1"><sup>1</sup></a>. +</p> +<a class="index-entry-id" id="index-top"></a> + +<table class="menu" border="0" cellspacing="0"> +<tr><td class="menu-entry-destination"><a href="#chapter" rel="index">1 Chapter</a></td><td> </td><td class="menu-entry-description"> +</td></tr> +</table> + +<hr style="height: 6px;"> +<div class="chapter-level-extent" id="chapter"> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="#Top" title="Beginning of this chapter or previous chapter"> << </a>]</td> +<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td> +<td>[<a href="#Top" title="Up section"> Up </a>]</td> +<td>[ > ]</td> +<td>[ >> ]</td> +<td> </td> +<td> </td> +<td> </td> +<td> </td> +<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td> +<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[<a href="#chapter" title="Index">Index</a>]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<h1 class="chapter" id="Chapter"><span>1 Chapter<a class="copiable-link" href="#Chapter"> ¶</a></span></h1> + +<p>Chapter. +</p> + +<div class="printindex cp-printindex"> +<table class="cp-entries-printindex" border="0"> +<tr><td></td><th class="entries-header-printindex">Index Entry</th><th class="sections-header-printindex">Section</th></tr> +<tr><td colspan="3"><hr></td></tr> +<tr><th id="Chapter_cp_letter-T">T</th></tr> +<tr><td></td><td class="printindex-index-entry"><a href="#index-top">top</a></td><td class="printindex-index-section"><a href="#Top">Not monolithic</a></td></tr> +<tr><td colspan="3"><hr></td></tr> +</table> +</div> +<hr style="height: 6px;"> +</div> +</div> +<div class="element-footnotes" id="SEC_Footnotes"> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td> +<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[<a href="#chapter" title="Index">Index</a>]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<h1 class="footnotes-heading">Footnotes</h1> + +<h5 class="footnote-body-heading"><a id="FOOT1" href="#DOCF1">(1)</a></h5> +<p>my footnote</p> +</div><hr> +<div class="element-shortcontents" id="SEC_Shortcontents"> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td> +<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[<a href="#chapter" title="Index">Index</a>]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<h1 class="shortcontents-heading">Short Table of Contents</h1> + +<div class="shortcontents"> +<ul class="toc-numbered-mark"> +<li><a id="stoc-Chapter" href="#chapter" rel="index">1 Chapter</a></li> +</ul> +</div> +</div><hr> +<div class="element-about" id="SEC_About"> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td> +<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[<a href="#chapter" title="Index">Index</a>]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<h1 class="about-heading">About This Document</h1> + +<p> + This document was generated on <em class="emph">a sunny day</em> using <a class="uref" href="http://www.gnu.org/software/texinfo/"><em class="emph">texi2any</em></a>. +</p> +<p> + The buttons in the navigation panels have the following meaning: +</p> +<table border="1"> + <tr> + <th> Button </th> + <th> Name </th> + <th> Go to </th> + <th> From 1.2.3 go to</th> + </tr> + <tr> + <td class="button-direction-about"> [ << ] </td> + <td class="name-direction-about">FastBack</td> + <td>Beginning of this chapter or previous chapter</td> + <td>1</td> + </tr> + <tr> + <td class="button-direction-about"> [ < ] </td> + <td class="name-direction-about">Back</td> + <td>Previous section in reading order</td> + <td>1.2.2</td> + </tr> + <tr> + <td class="button-direction-about"> [ Up ] </td> + <td class="name-direction-about">Up</td> + <td>Up section</td> + <td>1.2</td> + </tr> + <tr> + <td class="button-direction-about"> [ > ] </td> + <td class="name-direction-about">Forward</td> + <td>Next section in reading order</td> + <td>1.2.4</td> + </tr> + <tr> + <td class="button-direction-about"> [ >> ] </td> + <td class="name-direction-about">FastForward</td> + <td>Next chapter</td> + <td>2</td> + </tr> + <tr> + <td class="button-direction-about"> [Top] </td> + <td class="name-direction-about">Top</td> + <td>Cover (top) of document</td> + <td> </td> + </tr> + <tr> + <td class="button-direction-about"> [Contents] </td> + <td class="name-direction-about">Contents</td> + <td>Table of contents</td> + <td> </td> + </tr> + <tr> + <td class="button-direction-about"> [Index] </td> + <td class="name-direction-about">Index</td> + <td>Index</td> + <td> </td> + </tr> + <tr> + <td class="button-direction-about"> [ ? ] </td> + <td class="name-direction-about">About</td> + <td>About (help)</td> + <td> </td> + </tr> +</table> + +<p> + where the <strong class="strong"> Example </strong> assumes that the current position is at <strong class="strong"> Subsubsection One-Two-Three </strong> of a document of the following structure: +</p> + +<ul> + <li> 1. Section One + <ul> + <li>1.1 Subsection One-One + <ul> + <li>...</li> + </ul> + </li> + <li>1.2 Subsection One-Two + <ul> + <li>1.2.1 Subsubsection One-Two-One</li> + <li>1.2.2 Subsubsection One-Two-Two</li> + <li>1.2.3 Subsubsection One-Two-Three + <strong><== Current Position </strong></li> + <li>1.2.4 Subsubsection One-Two-Four</li> + </ul> + </li> + <li>1.3 Subsection One-Three + <ul> + <li>...</li> + </ul> + </li> + <li>1.4 Subsection One-Four</li> + </ul> + </li> +</ul> +</div><hr> +<table class="nav-panel" cellpadding="1" cellspacing="1" border="0"> +<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td> +<td>[<a href="no_monolithic_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td> +<td>[<a href="#chapter" title="Index">Index</a>]</td> +<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td> +</tr></table> +<p> + <span class="program-in-footer">This document was generated on <em class="emph">a sunny day</em> using <a class="uref" href="http://www.gnu.org/software/texinfo/"><em class="emph">texi2any</em></a>.</span> +</p> + + +</body> +</html> diff --git a/macros/texinfo/texinfo/tp/t/results/layout/no_monolithic_only_toc_out/res_html/no_monolithic_toc.html b/macros/texinfo/texinfo/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/macros/texinfo/texinfo/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> |