diff options
author | Norbert Preining <norbert@preining.info> | 2021-07-04 03:01:24 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-07-04 03:01:24 +0000 |
commit | 7994f86ec5e18f9d0d9f90161a2f26dd26d26af7 (patch) | |
tree | 88edb7d1a1aed3183a1350202c898716b4ac59ce /macros/texinfo/texinfo/tp/t/results/menu | |
parent | 03fa062b03ce2bb5385f8f30888f94d441fa5cb4 (diff) |
CTAN sync 202107040301
Diffstat (limited to 'macros/texinfo/texinfo/tp/t/results/menu')
39 files changed, 834 insertions, 593 deletions
diff --git a/macros/texinfo/texinfo/tp/t/results/menu/bad_beginning.pl b/macros/texinfo/texinfo/tp/t/results/menu/bad_beginning.pl index 5864b15d57..0a1844a971 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/bad_beginning.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/bad_beginning.pl @@ -149,26 +149,10 @@ $result_texts{'bad_beginning'} = '* *in code:: '; -$result_errors{'bad_beginning'} = [ - { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'bad_beginning'} = []; + + +$result_floats{'bad_beginning'} = {}; 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl index f1487d5348..bd54bd6ada 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl @@ -37,7 +37,9 @@ $result_trees{'block_commands_in_menu_description'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -392,7 +394,11 @@ $result_trees{'block_commands_in_menu_description'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 11, + 'macro' => '' + }, 'parent' => {} }, { @@ -591,7 +597,7 @@ $result_trees{'block_commands_in_menu_description'}{'contents'}[0]{'parent'} = $ $result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'args'}[0]; $result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[1]; $result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'block_commands_in_menu_description'}{'contents'}[1]{'parent'} = $result_trees{'block_commands_in_menu_description'}; $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'args'}[0]; $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]; @@ -642,7 +648,6 @@ $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1 $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]; $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'extra'}{'command_as_argument'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]; $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'extra'}{'end_command'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'contents'}[2]; -$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'line_nr'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]; $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'contents'}[0]; $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'contents'}[0]; @@ -799,6 +804,9 @@ $result_menus{'block_commands_in_menu_description'} = { $result_errors{'block_commands_in_menu_description'} = []; +$result_floats{'block_commands_in_menu_description'} = {}; + + $result_converted{'plaintext'}->{'block_commands_in_menu_description'} = 'top *** @@ -829,14 +837,16 @@ $result_converted{'html'}->{'block_commands_in_menu_description'} = '<!DOCTYPE h <meta name="keywords" content="top"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -845,6 +855,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -853,10 +864,11 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><span id="top"></span><h1 class="top">top</h1> +<div class="top" id="Top"> +<span id="top"></span><h1 class="top">top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a>:</td><td> </td><td align="left" valign="top"> <ul> <li><pre class="menu-preformatted"> @@ -867,7 +879,7 @@ ul.no-bullet {list-style: none} <dd><pre class="menu-preformatted"> </pre></dd> -<dt>table item</dt> +<dt><span>table item</span></dt> <dd><pre class="menu-preformatted"> Text. @@ -880,7 +892,7 @@ Text. <pre class="verbatim"> </pre></td></tr> </table> -<hr> +<hr></div> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl b/macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl index d06b76b2cc..fe7734b946 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl @@ -179,7 +179,9 @@ $result_trees{'comment_on_menu_line'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -249,7 +251,9 @@ $result_trees{'comment_on_menu_line'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'first' } ], @@ -290,7 +294,7 @@ $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'en $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'comment_on_menu_line'}{'contents'}[1]; $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'comment_on_menu_line'}{'contents'}[1]; $result_trees{'comment_on_menu_line'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'comment_on_menu_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'comment_on_menu_line'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'comment_on_menu_line'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'comment_on_menu_line'}{'contents'}[1]{'parent'} = $result_trees{'comment_on_menu_line'}; $result_trees{'comment_on_menu_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comment_on_menu_line'}{'contents'}[2]{'args'}[0]; $result_trees{'comment_on_menu_line'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'comment_on_menu_line'}{'contents'}[2]; @@ -298,7 +302,7 @@ $result_trees{'comment_on_menu_line'}{'contents'}[2]{'parent'} = $result_trees{' $result_trees{'comment_on_menu_line'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'comment_on_menu_line'}{'contents'}[3]{'args'}[0]; $result_trees{'comment_on_menu_line'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'comment_on_menu_line'}{'contents'}[3]; $result_trees{'comment_on_menu_line'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'comment_on_menu_line'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'comment_on_menu_line'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'comment_on_menu_line'}{'contents'}[3]{'extra'}{'node_content'}; +$result_trees{'comment_on_menu_line'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'comment_on_menu_line'}{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'comment_on_menu_line'}{'contents'}[3]{'parent'} = $result_trees{'comment_on_menu_line'}; $result_texis{'comment_on_menu_line'} = '@node Top @@ -410,6 +414,9 @@ $result_menus{'comment_on_menu_line'}{'menu_child'}{'menu_up'} = $result_menus{' $result_errors{'comment_on_menu_line'} = []; +$result_floats{'comment_on_menu_line'} = {}; + + $result_converted{'plaintext'}->{'comment_on_menu_line'} = '* Menu: @@ -432,14 +439,16 @@ $result_converted{'html'}->{'comment_on_menu_line'} = '<!DOCTYPE html PUBLIC "-/ <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -448,6 +457,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -456,13 +466,14 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><div class="header"> +<div class="chapter" id="Top"> +<div class="header"> <p> Next: <a href="#first" accesskey="n" rel="next">first</a> </p> </div> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#first" accesskey="1">first</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#first" accesskey="1">first</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> @@ -470,10 +481,10 @@ Next: <a href="#first" accesskey="n" rel="next">first</a> </p> <hr> <span id="first"></span><div class="header"> <p> -Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p> +Previous: <a href="#Top" accesskey="p" rel="prev">first</a>, Up: <a href="#Top" accesskey="u" rel="up">first</a> </p> </div> <h4 class="node-heading">first</h4> -<hr> +</div> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl index 859dc3af9a..0f8c4af2d0 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl @@ -226,26 +226,10 @@ $result_texts{'dash_in_menu'} = ' comment -- in. '; -$result_errors{'dash_in_menu'} = [ - { - 'error_line' => ':2: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 2, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':2: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 2, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'dash_in_menu'} = []; + + +$result_floats{'dash_in_menu'} = {}; @@ -268,13 +252,15 @@ $result_converted{'html'}->{'dash_in_menu'} = '<!DOCTYPE html PUBLIC "-//W3C//DT <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -283,6 +269,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -293,7 +280,7 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="manual.html#n_002d_002d_002dode" accesskey="1">entry—in</a></td><td> </td><td align="left" valign="top">description — in. +<tr><td align="left" valign="top">• <a href="manual.html#n_002d_002d_002dode" accesskey="1">entry—in</a>:</td><td> </td><td align="left" valign="top">description — in. </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu.pl b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu.pl index 0e209b4f35..4295bacee3 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu.pl @@ -310,44 +310,10 @@ $result_texts{'detailmenu'} = ' * detailmenu:: '; -$result_errors{'detailmenu'} = [ - { - 'error_line' => ':2: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 2, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':2: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 2, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - }, - { - 'error_line' => ':5: @detailmenu seen before first @node -', - 'file_name' => '', - 'line_nr' => 5, - 'macro' => '', - 'text' => '@detailmenu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':5: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 5, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'detailmenu'} = []; + + +$result_floats{'detailmenu'} = {}; @@ -370,13 +336,15 @@ $result_converted{'html'}->{'detailmenu'} = '<!DOCTYPE html PUBLIC "-//W3C//DTD <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -385,6 +353,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -395,11 +364,11 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• Copying Conditions</td><td> </td><td align="left" valign="top">Your rights. +<tr><td align="left" valign="top">• Copying Conditions:</td><td> </td><td align="left" valign="top">Your rights. </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> -</pre></th></tr><tr><td align="left" valign="top">• detailmenu</td><td> </td><td align="left" valign="top"> +</pre></th></tr><tr><td align="left" valign="top">• detailmenu:</td><td> </td><td align="left" valign="top"> </td></tr> </table> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_in_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_in_description.pl index 1786cfaba7..3b274e242b 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_in_description.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_in_description.pl @@ -287,44 +287,10 @@ $result_texts{'detailmenu_in_description'} = ' * detailmenu:: '; -$result_errors{'detailmenu_in_description'} = [ - { - 'error_line' => ':2: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 2, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':2: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 2, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - }, - { - 'error_line' => ':4: @detailmenu seen before first @node -', - 'file_name' => '', - 'line_nr' => 4, - 'macro' => '', - 'text' => '@detailmenu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':4: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 4, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'detailmenu_in_description'} = []; + + +$result_floats{'detailmenu_in_description'} = {}; @@ -346,13 +312,15 @@ $result_converted{'html'}->{'detailmenu_in_description'} = '<!DOCTYPE html PUBLI <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -361,6 +329,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -371,9 +340,9 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• Copying Conditions</td><td> </td><td align="left" valign="top">Your rights. +<tr><td align="left" valign="top">• Copying Conditions:</td><td> </td><td align="left" valign="top">Your rights. </td></tr> -<tr><td align="left" valign="top">• detailmenu</td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• detailmenu:</td><td> </td><td align="left" valign="top"> </td></tr> </table> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl index 6573577154..d8a52ff325 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl @@ -37,7 +37,9 @@ $result_trees{'detailmenu_on_subnodes'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -622,7 +624,9 @@ $result_trees{'detailmenu_on_subnodes'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'chapter' } ], @@ -815,7 +819,9 @@ $result_trees{'detailmenu_on_subnodes'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'section' } ], @@ -892,7 +898,9 @@ $result_trees{'detailmenu_on_subnodes'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'chapter-2' } ], @@ -1142,7 +1150,9 @@ $result_trees{'detailmenu_on_subnodes'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'section-chap-2' } ], @@ -1219,7 +1229,9 @@ $result_trees{'detailmenu_on_subnodes'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'unnumberedsec' } ], @@ -1270,7 +1282,7 @@ $result_trees{'detailmenu_on_subnodes'}{'contents'}[0]{'parent'} = $result_trees $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'parent'} = $result_trees{'detailmenu_on_subnodes'}; $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]; @@ -1361,7 +1373,7 @@ $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'parent'} = $result_trees $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'extra'}{'node_content'}; +$result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[3]{'parent'} = $result_trees{'detailmenu_on_subnodes'}; $result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[4]; @@ -1388,7 +1400,7 @@ $result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'parent'} = $result_trees $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'extra'}{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]{'contents'}[0]; -$result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'extra'}{'node_content'}; +$result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'args'}[0]{'contents'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[5]{'parent'} = $result_trees{'detailmenu_on_subnodes'}; $result_trees{'detailmenu_on_subnodes'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[6]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[6]; @@ -1397,7 +1409,7 @@ $result_trees{'detailmenu_on_subnodes'}{'contents'}[6]{'parent'} = $result_trees $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'extra'}{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]{'contents'}[0]; -$result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'extra'}{'node_content'}; +$result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'args'}[0]{'contents'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[7]{'parent'} = $result_trees{'detailmenu_on_subnodes'}; $result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[8]; @@ -1434,7 +1446,7 @@ $result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'parent'} = $result_trees $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'extra'}{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]{'contents'}[0]; -$result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'extra'}{'node_content'}; +$result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'args'}[0]{'contents'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[9]{'parent'} = $result_trees{'detailmenu_on_subnodes'}; $result_trees{'detailmenu_on_subnodes'}{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[10]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[10]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[10]; @@ -1443,7 +1455,7 @@ $result_trees{'detailmenu_on_subnodes'}{'contents'}[10]{'parent'} = $result_tree $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'extra'}{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]{'contents'}[0]; -$result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'extra'}{'node_content'}; +$result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'args'}[0]{'contents'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[11]{'parent'} = $result_trees{'detailmenu_on_subnodes'}; $result_trees{'detailmenu_on_subnodes'}{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[12]{'args'}[0]; $result_trees{'detailmenu_on_subnodes'}{'contents'}[12]{'args'}[0]{'parent'} = $result_trees{'detailmenu_on_subnodes'}{'contents'}[12]; @@ -1879,6 +1891,9 @@ $result_menus{'detailmenu_on_subnodes'}{'menu_child'}{'menu_up'} = $result_menus $result_errors{'detailmenu_on_subnodes'} = []; +$result_floats{'detailmenu_on_subnodes'} = {}; + + $result_converted{'plaintext'}->{'detailmenu_on_subnodes'} = 'top *** @@ -1933,14 +1948,16 @@ $result_converted{'html'}->{'detailmenu_on_subnodes'} = '<!DOCTYPE html PUBLIC " <meta name="keywords" content="top"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -1949,6 +1966,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -1957,78 +1975,89 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><div class="header"> +<div class="top" id="Top"> +<div class="header"> <p> Next: <a href="#chapter" accesskey="n" rel="next">chapter</a> </p> </div> <span id="top"></span><h1 class="top">top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#chapter" accesskey="1">chapter</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#chapter" accesskey="1">chapter</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="#chapter-2" accesskey="2">chapter 2</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#chapter-2" accesskey="2">chapter 2</a>:</td><td> </td><td align="left" valign="top"> </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> -</pre></th></tr><tr><td align="left" valign="top">• <a href="#section" accesskey="3">section</a></td><td> </td><td align="left" valign="top"> +</pre></th></tr><tr><td align="left" valign="top">• <a href="#section" accesskey="3">section</a>:</td><td> </td><td align="left" valign="top"> </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> </pre></th></tr><tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">Chap 2 -</pre></th></tr><tr><td align="left" valign="top">• <a href="#section-chap-2" accesskey="4">section chap 2</a></td><td> </td><td align="left" valign="top"> +</pre></th></tr><tr><td align="left" valign="top">• <a href="#section-chap-2" accesskey="4">section chap 2</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="#unnumberedsec" accesskey="5">unnumberedsec</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#unnumberedsec" accesskey="5">unnumberedsec</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> <hr> -<span id="chapter"></span><div class="header"> +<div class="chapter" id="chapter"> +<div class="header"> <p> -Next: <a href="#chapter-2" accesskey="n" rel="next">chapter 2</a>, Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p> +Next: <a href="#chapter-2" accesskey="n" rel="next">chapter 2</a>, Previous: <a href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> </p> </div> <span id="chapter-1"></span><h2 class="chapter">1 chapter</h2> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#section" accesskey="1">section</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#section" accesskey="1">section</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> <hr> -<span id="section"></span><div class="header"> +<div class="section" id="section"> +<div class="header"> <p> Up: <a href="#chapter" accesskey="u" rel="up">chapter</a> </p> </div> <span id="section-1"></span><h3 class="section">1.1 section</h3> <hr> -<span id="chapter-2"></span><div class="header"> +</div> +</div> +<div class="chapter" id="chapter-2"> +<div class="header"> <p> -Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p> +Previous: <a href="#chapter" accesskey="p" rel="prev">chapter</a>, Up: <a href="#Top" accesskey="u" rel="up">top</a> </p> </div> <span id="chapter-2-1"></span><h2 class="chapter">2 chapter 2</h2> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#section-chap-2" accesskey="1">section chap 2</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#section-chap-2" accesskey="1">section chap 2</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="#unnumberedsec" accesskey="2">unnumberedsec</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#unnumberedsec" accesskey="2">unnumberedsec</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> <hr> -<span id="section-chap-2"></span><div class="header"> +<div class="section" id="section-chap-2"> +<div class="header"> <p> Next: <a href="#unnumberedsec" accesskey="n" rel="next">unnumberedsec</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> </p> </div> <span id="section-chap-2-1"></span><h3 class="section">2.1 section chap 2</h3> <hr> -<span id="unnumberedsec"></span><div class="header"> +</div> +<div class="unnumberedsec" id="unnumberedsec"> +<div class="header"> <p> Previous: <a href="#section-chap-2" accesskey="p" rel="prev">section chap 2</a>, Up: <a href="#chapter-2" accesskey="u" rel="up">chapter 2</a> </p> </div> <span id="unnumberedsec-1"></span><h3 class="unnumberedsec">unnumberedsec</h3> -<hr> +</div> +</div> +</div> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl index 7eb0a54639..cfb0e58f68 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/detailmenu_unknown_node.pl @@ -207,7 +207,9 @@ $result_trees{'detailmenu_unknown_node'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -253,7 +255,7 @@ $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'detailmenu_unknown_node'}{'contents'}[1]; $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'parent'} = $result_trees{'detailmenu_unknown_node'}; $result_texis{'detailmenu_unknown_node'} = '@node Top @@ -316,6 +318,9 @@ $result_errors{'detailmenu_unknown_node'} = [ ]; +$result_floats{'detailmenu_unknown_node'} = {}; + + $result_converted{'plaintext'}->{'detailmenu_unknown_node'} = '* Menu: @@ -334,14 +339,16 @@ $result_converted{'html'}->{'detailmenu_unknown_node'} = '<!DOCTYPE html PUBLIC <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -350,6 +357,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -361,13 +369,12 @@ ul.no-bullet {list-style: none} <span id="Top"></span><h1 class="node-heading">Top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• unknown</td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• unknown:</td><td> </td><td align="left" valign="top"> </td></tr> </table> <hr> - </body> </html> '; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl b/macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl index 1fd8ab91b6..72d91d0656 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/direntry_dircategory_after_first_node.pl @@ -37,7 +37,9 @@ $result_trees{'direntry_dircategory_after_first_node'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -256,7 +258,7 @@ $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[0]{'parent'} $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'args'}[0]; $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]; $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[1]{'parent'} = $result_trees{'direntry_dircategory_after_first_node'}; $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'args'}[0]; $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]; @@ -372,4 +374,7 @@ $result_errors{'direntry_dircategory_after_first_node'} = [ ]; +$result_floats{'direntry_dircategory_after_first_node'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl b/macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl index b1acb5ef06..248bc44599 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/empty_menu_entry_name.pl @@ -246,7 +246,9 @@ $result_trees{'empty_menu_entry_name'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -285,7 +287,9 @@ $result_trees{'empty_menu_entry_name'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'aaa' } ], @@ -343,12 +347,12 @@ $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'extra'}{'e $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'empty_menu_entry_name'}{'contents'}[1]; $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'empty_menu_entry_name'}{'contents'}[1]; $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'parent'} = $result_trees{'empty_menu_entry_name'}; $result_trees{'empty_menu_entry_name'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'empty_menu_entry_name'}{'contents'}[2]{'args'}[0]; $result_trees{'empty_menu_entry_name'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'empty_menu_entry_name'}{'contents'}[2]; $result_trees{'empty_menu_entry_name'}{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'empty_menu_entry_name'}{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'empty_menu_entry_name'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'empty_menu_entry_name'}{'contents'}[2]{'extra'}{'node_content'}; +$result_trees{'empty_menu_entry_name'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'empty_menu_entry_name'}{'contents'}[2]{'args'}[0]{'contents'}[0]; $result_trees{'empty_menu_entry_name'}{'contents'}[2]{'parent'} = $result_trees{'empty_menu_entry_name'}; $result_texis{'empty_menu_entry_name'} = '@node Top @@ -443,4 +447,7 @@ $result_errors{'empty_menu_entry_name'} = [ ]; +$result_floats{'empty_menu_entry_name'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl b/macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl index 66f2e01ef3..2d8ee0140c 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/entry_after_detailmenu.pl @@ -484,7 +484,9 @@ $result_trees{'entry_after_detailmenu'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -523,7 +525,9 @@ $result_trees{'entry_after_detailmenu'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'first' } ], @@ -562,7 +566,9 @@ $result_trees{'entry_after_detailmenu'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'second' } ], @@ -654,17 +660,17 @@ $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'extra'}{' $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'entry_after_detailmenu'}{'contents'}[1]; $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'entry_after_detailmenu'}{'contents'}[1]; $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'parent'} = $result_trees{'entry_after_detailmenu'}; $result_trees{'entry_after_detailmenu'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'entry_after_detailmenu'}{'contents'}[2]{'args'}[0]; $result_trees{'entry_after_detailmenu'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'entry_after_detailmenu'}{'contents'}[2]; $result_trees{'entry_after_detailmenu'}{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'entry_after_detailmenu'}{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'entry_after_detailmenu'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'entry_after_detailmenu'}{'contents'}[2]{'extra'}{'node_content'}; +$result_trees{'entry_after_detailmenu'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'entry_after_detailmenu'}{'contents'}[2]{'args'}[0]{'contents'}[0]; $result_trees{'entry_after_detailmenu'}{'contents'}[2]{'parent'} = $result_trees{'entry_after_detailmenu'}; $result_trees{'entry_after_detailmenu'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'entry_after_detailmenu'}{'contents'}[3]{'args'}[0]; $result_trees{'entry_after_detailmenu'}{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'entry_after_detailmenu'}{'contents'}[3]; $result_trees{'entry_after_detailmenu'}{'contents'}[3]{'extra'}{'node_content'}[0] = $result_trees{'entry_after_detailmenu'}{'contents'}[3]{'args'}[0]{'contents'}[0]; -$result_trees{'entry_after_detailmenu'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'entry_after_detailmenu'}{'contents'}[3]{'extra'}{'node_content'}; +$result_trees{'entry_after_detailmenu'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'entry_after_detailmenu'}{'contents'}[3]{'args'}[0]{'contents'}[0]; $result_trees{'entry_after_detailmenu'}{'contents'}[3]{'parent'} = $result_trees{'entry_after_detailmenu'}; $result_texis{'entry_after_detailmenu'} = '@node Top @@ -787,6 +793,9 @@ $result_menus{'entry_after_detailmenu'}{'menu_child'}{'menu_up'} = $result_menus $result_errors{'entry_after_detailmenu'} = []; +$result_floats{'entry_after_detailmenu'} = {}; + + $result_converted{'plaintext'}->{'entry_after_detailmenu'} = '* Menu: @@ -813,14 +822,16 @@ $result_converted{'html'}->{'entry_after_detailmenu'} = '<!DOCTYPE html PUBLIC " <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -829,6 +840,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -844,19 +856,19 @@ Next: <a href="#first" accesskey="n" rel="next">first</a> </p> <h1 class="node-heading">Top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#second" accesskey="1">second</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#second" accesskey="1">second</a>:</td><td> </td><td align="left" valign="top"> </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> Menu comment -</pre></th></tr><tr><td align="left" valign="top">• <a href="#first" accesskey="2">first</a></td><td> </td><td align="left" valign="top"> +</pre></th></tr><tr><td align="left" valign="top">• <a href="#first" accesskey="2">first</a>:</td><td> </td><td align="left" valign="top"> </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> -</pre></th></tr><tr><td align="left" valign="top">• <a href="#second" accesskey="3">second</a></td><td> </td><td align="left" valign="top"> +</pre></th></tr><tr><td align="left" valign="top">• <a href="#second" accesskey="3">second</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="#second" accesskey="4">second</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="#second" accesskey="4">second</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> @@ -872,7 +884,6 @@ Next: <a href="#second" accesskey="n" rel="next">second</a>, Previous: <a href=" Previous: <a href="#first" accesskey="p" rel="prev">first</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p> </div> <h4 class="node-heading">second</h4> -<hr> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_comment.pl b/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_comment.pl index 950774c4f6..ebc5ed66e5 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_comment.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_comment.pl @@ -297,26 +297,10 @@ menu comment. '; -$result_errors{'example_in_menu_comment'} = [ - { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'example_in_menu_comment'} = []; + + +$result_floats{'example_in_menu_comment'} = {}; @@ -344,13 +328,15 @@ $result_converted{'html'}->{'example_in_menu_comment'} = '<!DOCTYPE html PUBLIC <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -359,6 +345,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -368,7 +355,7 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• entry</td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• entry:</td><td> </td><td align="left" valign="top"> </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl index f377016974..eeaebaabe2 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/example_in_menu_description.pl @@ -37,7 +37,9 @@ $result_trees{'example_in_menu_description'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -305,7 +307,7 @@ $result_trees{'example_in_menu_description'}{'contents'}[0]{'parent'} = $result_ $result_trees{'example_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'example_in_menu_description'}{'contents'}[1]{'args'}[0]; $result_trees{'example_in_menu_description'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'example_in_menu_description'}{'contents'}[1]; $result_trees{'example_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'example_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'example_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'example_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'example_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'example_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'example_in_menu_description'}{'contents'}[1]{'parent'} = $result_trees{'example_in_menu_description'}; $result_trees{'example_in_menu_description'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'example_in_menu_description'}{'contents'}[2]{'args'}[0]; $result_trees{'example_in_menu_description'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'example_in_menu_description'}{'contents'}[2]; @@ -453,6 +455,9 @@ $result_menus{'example_in_menu_description'} = { $result_errors{'example_in_menu_description'} = []; +$result_floats{'example_in_menu_description'} = {}; + + $result_converted{'plaintext'}->{'example_in_menu_description'} = 'top *** @@ -478,14 +483,16 @@ $result_converted{'html'}->{'example_in_menu_description'} = '<!DOCTYPE html PUB <meta name="keywords" content="top"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -494,6 +501,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -502,10 +510,11 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><span id="top"></span><h1 class="top">top</h1> +<div class="top" id="Top"> +<span id="top"></span><h1 class="top">top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a>:</td><td> </td><td align="left" valign="top"> <div class="example"> <pre class="example">in @@ -515,7 +524,7 @@ example <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> </pre></th></tr></table> -<hr> +<hr></div> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl index 71f4992db2..422e87d8c5 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl @@ -211,7 +211,11 @@ $result_trees{'formats_in_menu'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} } ], @@ -586,7 +590,11 @@ $result_trees{'formats_in_menu'} = { ] } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 21, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -737,7 +745,9 @@ $result_trees{'formats_in_menu'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -783,7 +793,6 @@ $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'a $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]; -$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'line_nr'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]; @@ -849,7 +858,6 @@ $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'a $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[3]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_description'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[3]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[1]; -$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[0]{'contents'}[0]{'line_nr'}; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]; @@ -872,7 +880,7 @@ $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'p $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]; $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}{'contents'}[1]; $result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'formats_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'formats_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'formats_in_menu'}{'contents'}[1]{'parent'} = $result_trees{'formats_in_menu'}; $result_texis{'formats_in_menu'} = '@node Top @@ -981,6 +989,9 @@ $result_menus{'formats_in_menu'} = { $result_errors{'formats_in_menu'} = []; +$result_floats{'formats_in_menu'} = {}; + + $result_converted{'plaintext'}->{'formats_in_menu'} = '* Menu: @@ -1013,14 +1024,16 @@ $result_converted{'html'}->{'formats_in_menu'} = '<!DOCTYPE html PUBLIC "-//W3C/ <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -1029,6 +1042,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -1040,25 +1054,25 @@ ul.no-bullet {list-style: none} <span id="Top"></span><h1 class="node-heading">Top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="gcc.html#Top" accesskey="1">(gcc)</a></td><td> </td><td align="left" valign="top">text +<tr><td align="left" valign="top">• <a href="gcc.html#Top" accesskey="1">(gcc)</a>:</td><td> </td><td align="left" valign="top">text <dl compact="compact"> -<dt>item</dt> +<dt><span>item</span></dt> <dd><pre class="menu-preformatted">* table line:: </pre></dd> </dl> </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> -</pre></th></tr><tr><td align="left" valign="top">• <a href="info.html#Top" accesskey="2">(info)</a></td><td> </td><td align="left" valign="top"> +</pre></th></tr><tr><td align="left" valign="top">• <a href="info.html#Top" accesskey="2">(info)</a>:</td><td> </td><td align="left" valign="top"> <pre class="verbatim">some @ verb{x atim * texinfo:: in @ verbatim </pre></td></tr> -<tr><td align="left" valign="top">• <a href="manual2.html#Top" accesskey="3">(manual2)</a></td><td> </td><td align="left" valign="top">% +<tr><td align="left" valign="top">• <a href="manual2.html#Top" accesskey="3">(manual2)</a>:</td><td> </td><td align="left" valign="top">% <i></i> Log$ </td></tr> -<tr><td align="left" valign="top">• <a href="truc.html#Top" accesskey="4">(truc)</a></td><td> </td><td align="left" valign="top"><acronym>description +<tr><td align="left" valign="top">• <a href="truc.html#Top" accesskey="4">(truc)</a>:</td><td> </td><td align="left" valign="top"><acronym>description * acronym::</acronym> </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> @@ -1073,7 +1087,6 @@ Menu comment <hr> - </body> </html> '; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl index 67d08eafda..206fb2bf19 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl @@ -37,7 +37,9 @@ $result_trees{'inlineraw_in_menu_description'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -285,7 +287,7 @@ $result_trees{'inlineraw_in_menu_description'}{'contents'}[0]{'parent'} = $resul $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'args'}[0]; $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]; $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'inlineraw_in_menu_description'}{'contents'}[1]{'parent'} = $result_trees{'inlineraw_in_menu_description'}; $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'args'}[0]; $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]; @@ -426,6 +428,9 @@ $result_menus{'inlineraw_in_menu_description'} = { $result_errors{'inlineraw_in_menu_description'} = []; +$result_floats{'inlineraw_in_menu_description'} = {}; + + $result_converted{'plaintext'}->{'inlineraw_in_menu_description'} = 'top *** @@ -449,14 +454,16 @@ $result_converted{'html'}->{'inlineraw_in_menu_description'} = '<!DOCTYPE html P <meta name="keywords" content="top"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -465,6 +472,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -473,10 +481,11 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><span id="top"></span><h1 class="top">top</h1> +<div class="top" id="Top"> +<span id="top"></span><h1 class="top">top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a>:</td><td> </td><td align="left" valign="top"> in inline raw end inlineraw @@ -484,7 +493,7 @@ end inlineraw <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> </pre></th></tr></table> -<hr> +<hr></div> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl b/macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl index 7423001967..8b56742e4a 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/invalid_info_menu_entry.pl @@ -131,7 +131,11 @@ $result_trees{'invalid_info_menu_entry'} = { 'normalized' => 'a_003a' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -233,7 +237,11 @@ $result_trees{'invalid_info_menu_entry'} = { 'normalized' => 'node' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -335,7 +343,11 @@ $result_trees{'invalid_info_menu_entry'} = { 'normalized' => 'node_002e-' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 6, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -437,7 +449,11 @@ $result_trees{'invalid_info_menu_entry'} = { 'normalized' => 'node_002cn' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 7, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -539,7 +555,11 @@ $result_trees{'invalid_info_menu_entry'} = { 'normalized' => 'node-n' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 8, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -591,7 +611,9 @@ $result_trees{'invalid_info_menu_entry'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -629,7 +651,6 @@ $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]; -$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3]{'line_nr'}; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'args'}[0]; @@ -650,7 +671,6 @@ $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_name'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[3]; -$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'line_nr'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]; @@ -671,7 +691,6 @@ $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_name'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[3]; -$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[3]{'line_nr'}; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]; @@ -692,7 +711,6 @@ $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_name'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[3]; -$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'line_nr'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[3]{'line_nr'}; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[1]; @@ -713,7 +731,6 @@ $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_name'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[3]; -$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[3]{'line_nr'}; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[6]; @@ -721,7 +738,7 @@ $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[6]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'parent'} = $result_trees{'invalid_info_menu_entry'}; $result_texis{'invalid_info_menu_entry'} = '@node Top @@ -802,6 +819,9 @@ $result_menus{'invalid_info_menu_entry'} = { $result_errors{'invalid_info_menu_entry'} = []; +$result_floats{'invalid_info_menu_entry'} = {}; + + $result_converted{'plaintext'}->{'invalid_info_menu_entry'} = '* Menu: @@ -873,14 +893,16 @@ $result_converted{'html'}->{'invalid_info_menu_entry'} = '<!DOCTYPE html PUBLIC <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -889,6 +911,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -900,21 +923,20 @@ ul.no-bullet {list-style: none} <span id="Top"></span><h1 class="node-heading">Top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="f.html#a_003a" accesskey="1">(f)a:</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#a_003a" accesskey="1">(f)a:</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#node" accesskey="2">name:</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#node" accesskey="2">name:</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#node_002e-" accesskey="3">name</a></td><td> </td><td align="left" valign="top">d +<tr><td align="left" valign="top">• <a href="f.html#node_002e-" accesskey="3">name</a>:</td><td> </td><td align="left" valign="top">d </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#node_002cn" accesskey="4">name</a></td><td> </td><td align="left" valign="top">d2 +<tr><td align="left" valign="top">• <a href="f.html#node_002cn" accesskey="4">name</a>:</td><td> </td><td align="left" valign="top">d2 </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#node-n" accesskey="5">name</a></td><td> </td><td align="left" valign="top">d3 +<tr><td align="left" valign="top">• <a href="f.html#node-n" accesskey="5">name</a>:</td><td> </td><td align="left" valign="top">d3 </td></tr> </table> <hr> - </body> </html> '; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_name.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_name.pl index 0379525fbc..7c744a599f 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_name.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_name.pl @@ -1159,26 +1159,10 @@ $result_texts{'menu_entry_name'} = '* a: (f)b * a: (f)b3.c. d '; -$result_errors{'menu_entry_name'} = [ - { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'menu_entry_name'} = []; + + +$result_floats{'menu_entry_name'} = {}; @@ -1208,13 +1192,15 @@ $result_converted{'html'}->{'menu_entry_name'} = '<!DOCTYPE html PUBLIC "-//W3C/ <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -1223,6 +1209,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -1232,24 +1219,24 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="f.html#b" accesskey="1">a</a></td><td> </td><td align="left" valign="top"></td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b1_002ec" accesskey="2">a</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#b" accesskey="1">a</a>:</td><td> </td><td align="left" valign="top"></td></tr> +<tr><td align="left" valign="top">• <a href="f.html#b1_002ec" accesskey="2">a</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b2_002ec" accesskey="3">a</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#b2_002ec" accesskey="3">a</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b3_002ec" accesskey="4">a</a></td><td> </td><td align="left" valign="top">d +<tr><td align="left" valign="top">• <a href="f.html#b3_002ec" accesskey="4">a</a>:</td><td> </td><td align="left" valign="top">d </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b1_002e" accesskey="5">a</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#b1_002e" accesskey="5">a</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b2-_002e" accesskey="6">a </a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#b2-_002e" accesskey="6">a </a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b3_002e" accesskey="7">a.n</a></td><td> </td><td align="left" valign="top">d +<tr><td align="left" valign="top">• <a href="f.html#b3_002e" accesskey="7">a.n</a>:</td><td> </td><td align="left" valign="top">d </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b1_002ec" accesskey="8">a</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#b1_002ec" accesskey="8">a</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b2_002ec" accesskey="9">a</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#b2_002ec" accesskey="9">a</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b3_002ec">a</a></td><td> </td><td align="left" valign="top">d +<tr><td align="left" valign="top">• <a href="f.html#b3_002ec">a</a>:</td><td> </td><td align="left" valign="top">d </td></tr> </table> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_name_comment.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_name_comment.pl index c194307aa1..734dfa3d6d 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_name_comment.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_name_comment.pl @@ -689,26 +689,10 @@ $result_texts{'menu_entry_name_comment'} = '* a: (f)b * a: (f)b3c.c, d '; -$result_errors{'menu_entry_name_comment'} = [ - { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'menu_entry_name_comment'} = []; + + +$result_floats{'menu_entry_name_comment'} = {}; @@ -733,13 +717,15 @@ $result_converted{'html'}->{'menu_entry_name_comment'} = '<!DOCTYPE html PUBLIC <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -748,6 +734,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -757,11 +744,11 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="f.html#b" accesskey="1">a</a></td><td> </td><td align="left" valign="top"></td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b" accesskey="2">a</a></td><td> </td><td align="left" valign="top"></td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b1c_002ec" accesskey="3">a</a></td><td> </td><td align="left" valign="top"></td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b2c_002ec" accesskey="4">a</a></td><td> </td><td align="left" valign="top"></td></tr> -<tr><td align="left" valign="top">• <a href="f.html#b3c_002ec" accesskey="5">a</a></td><td> </td><td align="left" valign="top">d</td></tr> +<tr><td align="left" valign="top">• <a href="f.html#b" accesskey="1">a</a>:</td><td> </td><td align="left" valign="top"></td></tr> +<tr><td align="left" valign="top">• <a href="f.html#b" accesskey="2">a</a>:</td><td> </td><td align="left" valign="top"></td></tr> +<tr><td align="left" valign="top">• <a href="f.html#b1c_002ec" accesskey="3">a</a>:</td><td> </td><td align="left" valign="top"></td></tr> +<tr><td align="left" valign="top">• <a href="f.html#b2c_002ec" accesskey="4">a</a>:</td><td> </td><td align="left" valign="top"></td></tr> +<tr><td align="left" valign="top">• <a href="f.html#b3c_002ec" accesskey="5">a</a>:</td><td> </td><td align="left" valign="top">d</td></tr> </table> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry.pl index 414af2cc19..28390f873a 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry.pl @@ -254,26 +254,10 @@ $result_texts{'menu_entry_no_entry'} = '* a1: * a1c:* a2c: * a4a: * a5b: '; -$result_errors{'menu_entry_no_entry'} = [ - { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'menu_entry_no_entry'} = []; + + +$result_floats{'menu_entry_no_entry'} = {}; @@ -297,13 +281,15 @@ $result_converted{'html'}->{'menu_entry_no_entry'} = '<!DOCTYPE html PUBLIC "-// <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -312,6 +298,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry_location.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry_location.pl index 07d6f7f40e..30945ccd3b 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry_location.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_no_entry_location.pl @@ -344,26 +344,10 @@ with text. * (last manual):: '; -$result_errors{'menu_entry_no_entry_location'} = [ - { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'menu_entry_no_entry_location'} = []; + + +$result_floats{'menu_entry_no_entry_location'} = {}; @@ -390,13 +374,15 @@ $result_converted{'html'}->{'menu_entry_no_entry_location'} = '<!DOCTYPE html PU <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -405,6 +391,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -414,15 +401,15 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a></td><td> </td><td align="left" valign="top">begin description +<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a>:</td><td> </td><td align="left" valign="top">begin description * not an entry ? </td></tr> -<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="2">(manual)</a></td><td> </td><td align="left" valign="top">an entry +<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="2">(manual)</a>:</td><td> </td><td align="left" valign="top">an entry in description * and here ? with text. </td></tr> -<tr><td align="left" valign="top">• <a href="last manual.html#Top" accesskey="3">(last manual)</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="last manual.html#Top" accesskey="3">(last manual)</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_node.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_node.pl index 90da755825..74f7b6d4b8 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_node.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_node.pl @@ -444,26 +444,10 @@ $result_texts{'menu_entry_node'} = '* (f)a1:: * (f)@a:: '; -$result_errors{'menu_entry_node'} = [ - { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'menu_entry_node'} = []; + + +$result_floats{'menu_entry_node'} = {}; @@ -487,13 +471,15 @@ $result_converted{'html'}->{'menu_entry_node'} = '<!DOCTYPE html PUBLIC "-//W3C/ <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -502,6 +488,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -511,13 +498,13 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="f.html#a1" accesskey="1">(f)a1</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#a1" accesskey="1">(f)a1</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#a2" accesskey="2">(f)a2</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#a2" accesskey="2">(f)a2</a>:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#a3" accesskey="3">(f)a3</a></td><td> </td><td align="left" valign="top">d +<tr><td align="left" valign="top">• <a href="f.html#a3" accesskey="3">(f)a3</a>:</td><td> </td><td align="left" valign="top">d </td></tr> -<tr><td align="left" valign="top">• <a href="f.html#g_t_0040a" accesskey="4">(f)@a</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="f.html#g_t_0040a" accesskey="4">(f)@a</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_node_comments.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_node_comments.pl index f36b0b0853..21a6a312a5 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_node_comments.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_entry_node_comments.pl @@ -504,26 +504,10 @@ $result_texts{'menu_entry_node_comments'} = '* (f)a1c:: * (f) a4 :: '; -$result_errors{'menu_entry_node_comments'} = [ - { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'menu_entry_node_comments'} = []; + + +$result_floats{'menu_entry_node_comments'} = {}; @@ -547,13 +531,15 @@ $result_converted{'html'}->{'menu_entry_node_comments'} = '<!DOCTYPE html PUBLIC <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -562,6 +548,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -571,10 +558,10 @@ ul.no-bullet {list-style: none} <body lang="en"> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="f.html#a1c" accesskey="1">(f)a1c</a></td><td> </td><td align="left" valign="top"></td></tr> -<tr><td align="left" valign="top">• <a href="f.html#a2c" accesskey="2">(f)a2c</a></td><td> </td><td align="left" valign="top"></td></tr> -<tr><td align="left" valign="top">• <a href="f.html#a3c" accesskey="3">(f)a3c</a></td><td> </td><td align="left" valign="top">d</td></tr> -<tr><td align="left" valign="top">• <a href="f.html#a4" accesskey="4">(f)a4 </a></td><td> </td><td align="left" valign="top"></td></tr> +<tr><td align="left" valign="top">• <a href="f.html#a1c" accesskey="1">(f)a1c</a>:</td><td> </td><td align="left" valign="top"></td></tr> +<tr><td align="left" valign="top">• <a href="f.html#a2c" accesskey="2">(f)a2c</a>:</td><td> </td><td align="left" valign="top"></td></tr> +<tr><td align="left" valign="top">• <a href="f.html#a3c" accesskey="3">(f)a3c</a>:</td><td> </td><td align="left" valign="top">d</td></tr> +<tr><td align="left" valign="top">• <a href="f.html#a4" accesskey="4">(f)a4 </a>:</td><td> </td><td align="left" valign="top"></td></tr> </table> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl index c6544490f8..063743454b 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl @@ -285,7 +285,11 @@ $result_trees{'menu_in_deffn'} = { 'end_command' => {}, 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, 'parent' => {} } ], @@ -295,7 +299,9 @@ $result_trees{'menu_in_deffn'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -354,10 +360,9 @@ $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'arg $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]; $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; -$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'menu_in_deffn'}{'contents'}[1]; $result_trees{'menu_in_deffn'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'menu_in_deffn'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'menu_in_deffn'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'menu_in_deffn'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'menu_in_deffn'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'menu_in_deffn'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'menu_in_deffn'}{'contents'}[1]{'parent'} = $result_trees{'menu_in_deffn'}; $result_texis{'menu_in_deffn'} = '@node Top @@ -406,4 +411,7 @@ $result_errors{'menu_in_deffn'} = [ ]; +$result_floats{'menu_in_deffn'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl index 8c4a470d8f..3fe789e75c 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_in_example.pl @@ -540,7 +540,9 @@ $result_trees{'menu_in_example'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -645,7 +647,7 @@ $result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'p $result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; $result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'menu_in_example'}{'contents'}[1]; $result_trees{'menu_in_example'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'menu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'menu_in_example'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'menu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'menu_in_example'}{'contents'}[1]{'parent'} = $result_trees{'menu_in_example'}; $result_texis{'menu_in_example'} = '@node Top @@ -709,6 +711,9 @@ $result_errors{'menu_in_example'} = [ ]; +$result_floats{'menu_in_example'} = {}; + + $result_converted{'plaintext'}->{'menu_in_example'} = '* Menu: @@ -733,14 +738,16 @@ $result_converted{'html'}->{'menu_in_example'} = '<!DOCTYPE html PUBLIC "-//W3C/ <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -749,6 +756,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -781,7 +789,6 @@ ul.no-bullet {list-style: none} <hr> - </body> </html> '; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl index 0de20a3bd7..22d6bbc47f 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl @@ -152,24 +152,6 @@ $result_texts{'menu_no_closed_after_empty_line'} = '* (manual_in_menu):: desc2 $result_errors{'menu_no_closed_after_empty_line'} = [ { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - }, - { 'error_line' => ':4: no matching `@end menu\' ', 'file_name' => '', @@ -181,4 +163,7 @@ $result_errors{'menu_no_closed_after_empty_line'} = [ ]; +$result_floats{'menu_no_closed_after_empty_line'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_entry_beginning.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_entry_beginning.pl index e768205da2..bf0b426d55 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_entry_beginning.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_entry_beginning.pl @@ -61,24 +61,6 @@ $result_texts{'menu_no_closed_entry_beginning'} = '* node'; $result_errors{'menu_no_closed_entry_beginning'} = [ { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - }, - { 'error_line' => ':2: no matching `@end menu\' ', 'file_name' => '', @@ -90,4 +72,7 @@ $result_errors{'menu_no_closed_entry_beginning'} = [ ]; +$result_floats{'menu_no_closed_entry_beginning'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_description.pl index 54b9a7b0d6..c2f11ca687 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_description.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_description.pl @@ -118,24 +118,6 @@ $result_texts{'menu_no_closed_in_description'} = '* (manual_in_menu):: desc $result_errors{'menu_no_closed_in_description'} = [ { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - }, - { 'error_line' => ':2: no matching `@end menu\' ', 'file_name' => '', @@ -147,4 +129,7 @@ $result_errors{'menu_no_closed_in_description'} = [ ]; +$result_floats{'menu_no_closed_in_description'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_entry.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_entry.pl index c9f8a747e3..14c26ae859 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_entry.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_entry.pl @@ -74,24 +74,6 @@ $result_texts{'menu_no_closed_in_entry'} = '* a1: $result_errors{'menu_no_closed_in_entry'} = [ { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - }, - { 'error_line' => ':2: no matching `@end menu\' ', 'file_name' => '', @@ -103,4 +85,7 @@ $result_errors{'menu_no_closed_in_entry'} = [ ]; +$result_floats{'menu_no_closed_in_entry'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_star.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_star.pl index f64753124d..9500aa225a 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_star.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_no_closed_star.pl @@ -61,24 +61,6 @@ $result_texts{'menu_no_closed_star'} = '* '; $result_errors{'menu_no_closed_star'} = [ { - 'error_line' => ':1: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':1: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 1, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - }, - { 'error_line' => ':2: no matching `@end menu\' ', 'file_name' => '', @@ -90,4 +72,7 @@ $result_errors{'menu_no_closed_star'} = [ ]; +$result_floats{'menu_no_closed_star'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_node_unterminated.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_node_unterminated.pl new file mode 100644 index 0000000000..bc638a8eba --- /dev/null +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_node_unterminated.pl @@ -0,0 +1,273 @@ +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); + +use utf8; + +$result_trees{'menu_node_unterminated'} = { + 'contents' => [ + { + 'contents' => [], + 'parent' => {}, + 'type' => 'text_root' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'Top' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'node', + 'contents' => [ + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line' + }, + { + 'cmdname' => 'menu', + 'contents' => [ + { + 'extra' => { + 'command' => {} + }, + 'parent' => {}, + 'text' => ' +', + 'type' => 'empty_line_after_command' + }, + { + 'args' => [ + { + 'parent' => {}, + 'text' => '* ', + 'type' => 'menu_entry_leading_text' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'Example' + } + ], + 'parent' => {}, + 'type' => 'menu_entry_name' + }, + { + 'parent' => {}, + 'text' => ': ', + 'type' => 'menu_entry_separator' + }, + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'Examples of Login Verification Functions' + }, + { + 'parent' => {}, + 'text' => ' +', + 'type' => 'space_at_end_menu_node' + } + ], + 'parent' => {}, + 'type' => 'menu_entry_node' + }, + { + 'contents' => [], + 'parent' => {}, + 'type' => 'menu_entry_description' + } + ], + 'extra' => { + 'menu_entry_description' => {}, + 'menu_entry_name' => {}, + 'menu_entry_node' => { + 'node_content' => [ + {}, + {} + ], + 'normalized' => 'Examples-of-Login-Verification-Functions' + } + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '' + }, + 'parent' => {}, + 'type' => 'menu_entry' + }, + { + 'args' => [ + { + 'contents' => [ + { + 'parent' => {}, + 'text' => 'menu' + } + ], + 'extra' => { + 'spaces_after_argument' => ' +' + }, + 'parent' => {}, + 'type' => 'line_arg' + } + ], + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'menu', + 'spaces_before_argument' => ' ', + 'text_arg' => 'menu' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'end_command' => {} + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 3, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'extra' => { + 'node_content' => [ + {} + ], + 'nodes_manuals' => [ + { + 'node_content' => [ + {} + ], + 'normalized' => 'Top' + } + ], + 'normalized' => 'Top', + 'spaces_before_argument' => ' ' + }, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 1, + 'macro' => '' + }, + 'parent' => {} + } + ], + 'type' => 'document_root' +}; +$result_trees{'menu_node_unterminated'}{'contents'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[4]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_name'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[1] = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'menu_node_unterminated'}{'contents'}[1]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]{'contents'}[0]; +$result_trees{'menu_node_unterminated'}{'contents'}[1]{'parent'} = $result_trees{'menu_node_unterminated'}; + +$result_texis{'menu_node_unterminated'} = '@node Top + +@menu +* Example: Examples of Login Verification Functions +@end menu +'; + + +$result_texts{'menu_node_unterminated'} = ' +* Example: Examples of Login Verification Functions +'; + +$result_sectioning{'menu_node_unterminated'} = {}; + +$result_nodes{'menu_node_unterminated'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top', + 'spaces_before_argument' => ' ' + }, + 'menus' => [ + { + 'cmdname' => 'menu', + 'extra' => { + 'end_command' => { + 'cmdname' => 'end', + 'extra' => { + 'command_argument' => 'menu', + 'spaces_before_argument' => ' ', + 'text_arg' => 'menu' + } + } + } + } + ] +}; + +$result_menus{'menu_node_unterminated'} = { + 'cmdname' => 'node', + 'extra' => { + 'normalized' => 'Top', + 'spaces_before_argument' => ' ' + } +}; + +$result_errors{'menu_node_unterminated'} = [ + { + 'error_line' => ':4: @menu reference to nonexistent node `Examples of Login Verification Functions +\' +', + 'file_name' => '', + 'line_nr' => 4, + 'macro' => '', + 'text' => '@menu reference to nonexistent node `Examples of Login Verification Functions +\'', + 'type' => 'error' + } +]; + + +$result_floats{'menu_node_unterminated'} = {}; + + +1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl index f1217165ee..5f9889bb38 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_pointing_to_anchor.pl @@ -37,7 +37,9 @@ $result_trees{'menu_pointing_to_anchor'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -262,7 +264,7 @@ $result_trees{'menu_pointing_to_anchor'}{'contents'}[0]{'parent'} = $result_tree $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'args'}[0]; $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]; $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'menu_pointing_to_anchor'}{'contents'}[1]{'parent'} = $result_trees{'menu_pointing_to_anchor'}; $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'args'}[0]; $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]; @@ -401,6 +403,9 @@ $result_menus{'menu_pointing_to_anchor'}{'menu_child'}{'menu_up'} = $result_menu $result_errors{'menu_pointing_to_anchor'} = []; +$result_floats{'menu_pointing_to_anchor'} = {}; + + $result_converted{'plaintext'}->{'menu_pointing_to_anchor'} = 'top *** @@ -424,14 +429,16 @@ $result_converted{'html'}->{'menu_pointing_to_anchor'} = '<!DOCTYPE html PUBLIC <meta name="keywords" content="top"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -440,6 +447,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -448,16 +456,17 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><span id="top"></span><h1 class="top">top</h1> +<div class="top" id="Top"> +<span id="top"></span><h1 class="top">top</h1> <p>Text </p> <span id="An-anchor"></span> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#An-anchor" accesskey="1">An anchor</a></td><td> </td><td align="left" valign="top">menu entry pointing to the anchor. +<tr><td align="left" valign="top">• <a href="#An-anchor" accesskey="1">An anchor</a>:</td><td> </td><td align="left" valign="top">menu entry pointing to the anchor. </td></tr> </table> -<hr> +<hr></div> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl b/macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl index 8dda68b5a9..e7a9529dee 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/menu_title_before_entries.pl @@ -177,7 +177,9 @@ $result_trees{'menu_title_before_entries'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -216,7 +218,9 @@ $result_trees{'menu_title_before_entries'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'subnode' } ], @@ -259,12 +263,12 @@ $result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'extra' $result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'menu_title_before_entries'}{'contents'}[1]; $result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'menu_title_before_entries'}{'contents'}[1]; $result_trees{'menu_title_before_entries'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'menu_title_before_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'menu_title_before_entries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'menu_title_before_entries'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'menu_title_before_entries'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'menu_title_before_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'menu_title_before_entries'}{'contents'}[1]{'parent'} = $result_trees{'menu_title_before_entries'}; $result_trees{'menu_title_before_entries'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'menu_title_before_entries'}{'contents'}[2]{'args'}[0]; $result_trees{'menu_title_before_entries'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'menu_title_before_entries'}{'contents'}[2]; $result_trees{'menu_title_before_entries'}{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'menu_title_before_entries'}{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'menu_title_before_entries'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'menu_title_before_entries'}{'contents'}[2]{'extra'}{'node_content'}; +$result_trees{'menu_title_before_entries'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'menu_title_before_entries'}{'contents'}[2]{'args'}[0]{'contents'}[0]; $result_trees{'menu_title_before_entries'}{'contents'}[2]{'parent'} = $result_trees{'menu_title_before_entries'}; $result_texis{'menu_title_before_entries'} = '@node Top @@ -345,6 +349,9 @@ $result_menus{'menu_title_before_entries'}{'menu_child'}{'menu_up'} = $result_me $result_errors{'menu_title_before_entries'} = []; +$result_floats{'menu_title_before_entries'} = {}; + + $result_converted{'plaintext'}->{'menu_title_before_entries'} = '* Menu: @@ -365,14 +372,16 @@ $result_converted{'html'}->{'menu_title_before_entries'} = '<!DOCTYPE html PUBLI <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -381,6 +390,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -397,7 +407,7 @@ Next: <a href="#subnode" accesskey="n" rel="next">subnode</a> </p> <table class="menu" border="0" cellspacing="0"> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">Horizontal space -</pre></th></tr><tr><td align="left" valign="top">• <a href="#subnode" accesskey="1">subnode</a></td><td> </td><td align="left" valign="top"> +</pre></th></tr><tr><td align="left" valign="top">• <a href="#subnode" accesskey="1">subnode</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> @@ -407,7 +417,6 @@ Next: <a href="#subnode" accesskey="n" rel="next">subnode</a> </p> Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> </p> </div> <h4 class="node-heading">subnode</h4> -<hr> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl b/macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl index 218a83ab73..ebfa9932c6 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/multiple_menus.pl @@ -300,7 +300,9 @@ $result_trees{'multiple_menus'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -365,7 +367,7 @@ $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'pa $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'} = $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[2]; $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'multiple_menus'}{'contents'}[1]; $result_trees{'multiple_menus'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'multiple_menus'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'multiple_menus'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'multiple_menus'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'multiple_menus'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'multiple_menus'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'multiple_menus'}{'contents'}[1]{'parent'} = $result_trees{'multiple_menus'}; $result_texis{'multiple_menus'} = '@node Top @@ -467,4 +469,7 @@ $result_errors{'multiple_menus'} = [ ]; +$result_floats{'multiple_menus'} = {}; + + 1; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl index 4f3eb9913f..fec65eb00f 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/no_colon_in_menu.pl @@ -114,7 +114,9 @@ $result_trees{'no_colon_in_menu'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -146,7 +148,7 @@ $result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{' $result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; $result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'no_colon_in_menu'}{'contents'}[1]; $result_trees{'no_colon_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'no_colon_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'no_colon_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'no_colon_in_menu'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'no_colon_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'no_colon_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'no_colon_in_menu'}{'contents'}[1]{'parent'} = $result_trees{'no_colon_in_menu'}; $result_texis{'no_colon_in_menu'} = '@node Top @@ -197,6 +199,9 @@ $result_menus{'no_colon_in_menu'} = { $result_errors{'no_colon_in_menu'} = []; +$result_floats{'no_colon_in_menu'} = {}; + + $result_converted{'plaintext'}->{'no_colon_in_menu'} = '* Menu: @@ -215,14 +220,16 @@ $result_converted{'html'}->{'no_colon_in_menu'} = '<!DOCTYPE html PUBLIC "-//W3C <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -231,6 +238,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -247,7 +255,6 @@ ul.no-bullet {list-style: none} <hr> - </body> </html> '; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl b/macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl index 770a73cbdb..a4164dc7e1 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/reference_to_external_manual.pl @@ -168,7 +168,9 @@ $result_trees{'reference_to_external_manual'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -210,7 +212,7 @@ $result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'con $result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = $result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[2]; $result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'reference_to_external_manual'}{'contents'}[1]; $result_trees{'reference_to_external_manual'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'reference_to_external_manual'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'reference_to_external_manual'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'reference_to_external_manual'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'reference_to_external_manual'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'reference_to_external_manual'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'reference_to_external_manual'}{'contents'}[1]{'parent'} = $result_trees{'reference_to_external_manual'}; $result_texis{'reference_to_external_manual'} = ' @@ -283,6 +285,9 @@ $result_menus{'reference_to_external_manual'} = { $result_errors{'reference_to_external_manual'} = []; +$result_floats{'reference_to_external_manual'} = {}; + + $result_converted{'plaintext'}->{'reference_to_external_manual'} = '* Menu: @@ -301,14 +306,16 @@ $result_converted{'html'}->{'reference_to_external_manual'} = '<!DOCTYPE html PU <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -317,6 +324,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -329,13 +337,12 @@ ul.no-bullet {list-style: none} <span id="Top"></span><h1 class="node-heading">Top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="info.html#Top" accesskey="1">(info)</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="info.html#Top" accesskey="1">(info)</a>:</td><td> </td><td align="left" valign="top"> </td></tr> </table> <hr> - </body> </html> '; diff --git a/macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl b/macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl index 30622092ad..1e2574cf6c 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/sc_in_menu.pl @@ -113,7 +113,11 @@ $result_trees{'sc_in_menu'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} } ], @@ -144,7 +148,11 @@ $result_trees{'sc_in_menu'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {} }, { @@ -171,7 +179,11 @@ $result_trees{'sc_in_menu'} = { 'normalized' => 'NODE' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 5, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -281,7 +293,11 @@ $result_trees{'sc_in_menu'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 10, + 'macro' => '' + }, 'parent' => {} }, { @@ -303,7 +319,11 @@ $result_trees{'sc_in_menu'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 10, + 'macro' => '' + }, 'parent' => {} }, { @@ -447,7 +467,9 @@ $result_trees{'sc_in_menu'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -597,7 +619,11 @@ $result_trees{'sc_in_menu'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => '' + }, 'parent' => {} } ], @@ -628,7 +654,11 @@ $result_trees{'sc_in_menu'} = { ], 'cmdname' => 'sc', 'contents' => [], - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => '' + }, 'parent' => {} }, { @@ -658,7 +688,11 @@ $result_trees{'sc_in_menu'} = { 'normalized' => 'EXAMPLE-NODE' } }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 20, + 'macro' => '' + }, 'parent' => {}, 'type' => 'menu_entry' }, @@ -802,14 +836,20 @@ $result_trees{'sc_in_menu'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'NODE' } ], 'normalized' => 'NODE', 'spaces_before_argument' => ' ' }, - 'line_nr' => {}, + 'line_nr' => { + 'file_name' => '', + 'line_nr' => 16, + 'macro' => '' + }, 'parent' => {} } ], @@ -830,13 +870,11 @@ $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'} $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'args'}[0]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]; -$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]; -$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]; @@ -844,7 +882,6 @@ $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'} $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_name'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]; -$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]; @@ -862,12 +899,10 @@ $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'conten $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]; -$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5]; -$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'}; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[7]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]; @@ -889,7 +924,7 @@ $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command' $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[2]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'sc_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'sc_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'sc_in_menu'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'sc_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'sc_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'sc_in_menu'}{'contents'}[1]{'parent'} = $result_trees{'sc_in_menu'}; $result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0]; @@ -911,13 +946,11 @@ $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'conten $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'args'}[0]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'args'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]; -$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[4]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]; -$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[5]; @@ -926,7 +959,6 @@ $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'conten $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_name'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0] = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0] = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[3]; -$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'line_nr'}; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]; @@ -947,8 +979,7 @@ $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command' $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]; $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_trees{'sc_in_menu'}{'contents'}[2]; $result_trees{'sc_in_menu'}{'contents'}[2]{'extra'}{'node_content'}[0] = $result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0]; -$result_trees{'sc_in_menu'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'extra'}{'node_content'}; -$result_trees{'sc_in_menu'}{'contents'}[2]{'line_nr'} = $result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'}; +$result_trees{'sc_in_menu'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0]; $result_trees{'sc_in_menu'}{'contents'}[2]{'parent'} = $result_trees{'sc_in_menu'}; $result_texis{'sc_in_menu'} = ' @@ -1067,6 +1098,9 @@ $result_errors{'sc_in_menu'} = [ ]; +$result_floats{'sc_in_menu'} = {}; + + $result_converted{'plaintext'}->{'sc_in_menu'} = '* Menu: @@ -1098,14 +1132,16 @@ $result_converted{'html'}->{'sc_in_menu'} = '<!DOCTYPE html PUBLIC "-//W3C//DTD <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -1114,6 +1150,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -1130,7 +1167,7 @@ Next: <a href="#NODE" accesskey="n" rel="next"><small>NODE</small></a> </ <h1 class="node-heading">Top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="#NODE" accesskey="1"><small>VALUE</small></a></td><td> </td><td align="left" valign="top"><small>DESCRIP TION</small> +<tr><td align="left" valign="top">• <a href="#NODE" accesskey="1"><small>VALUE</small></a>:</td><td> </td><td align="left" valign="top"><small>DESCRIP TION</small> </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> @@ -1159,7 +1196,6 @@ EXAMPLE COMMENT </pre></td></tr></table> </div> -<hr> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/simple.pl b/macros/texinfo/texinfo/tp/t/results/menu/simple.pl index 704ecba240..fb609a1615 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/simple.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/simple.pl @@ -597,26 +597,10 @@ new comment After menu. '; -$result_errors{'simple'} = [ - { - 'error_line' => ':4: @menu seen before first @node -', - 'file_name' => '', - 'line_nr' => 4, - 'macro' => '', - 'text' => '@menu seen before first @node', - 'type' => 'error' - }, - { - 'error_line' => ':4: perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo? -', - 'file_name' => '', - 'line_nr' => 4, - 'macro' => '', - 'text' => 'perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?', - 'type' => 'error' - } -]; +$result_errors{'simple'} = []; + + +$result_floats{'simple'} = {}; @@ -650,13 +634,15 @@ $result_converted{'html'}->{'simple'} = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -665,6 +651,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -678,20 +665,20 @@ ul.no-bullet {list-style: none} </p> <table class="menu" border="0" cellspacing="0"> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment">comment -</pre></th></tr><tr><td align="left" valign="top">• menu entry name </td><td> </td><td align="left" valign="top">description +</pre></th></tr><tr><td align="left" valign="top">• menu entry name :</td><td> </td><td align="left" valign="top">description </td></tr> -<tr><td align="left" valign="top">• node name</td><td> </td><td align="left" valign="top">description new +<tr><td align="left" valign="top">• node name:</td><td> </td><td align="left" valign="top">description new </td></tr> -<tr><td align="left" valign="top">• other entry</td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• other entry:</td><td> </td><td align="left" valign="top"> </td></tr> -<tr><td align="left" valign="top">• last</td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• last:</td><td> </td><td align="left" valign="top"> description next line still description </td></tr> <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> new comment -</pre></th></tr><tr><td align="left" valign="top">• last node entry </td><td> </td><td align="left" valign="top"> +</pre></th></tr><tr><td align="left" valign="top">• last node entry :</td><td> </td><td align="left" valign="top"> </td></tr> </table> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/simple_no_menu.pl b/macros/texinfo/texinfo/tp/t/results/menu/simple_no_menu.pl index 6ab4b656ca..410ba89983 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/simple_no_menu.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/simple_no_menu.pl @@ -600,6 +600,9 @@ After menu. $result_errors{'simple_no_menu'} = []; +$result_floats{'simple_no_menu'} = {}; + + $result_converted{'plaintext'}->{'simple_no_menu'} = 'Before menu. @@ -618,13 +621,15 @@ $result_converted{'html'}->{'simple_no_menu'} = '<!DOCTYPE html PUBLIC "-//W3C// <meta name="keywords" content="Untitled Document"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -633,6 +638,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> diff --git a/macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl b/macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl index f58d88bfc9..f1e8ce986d 100644 --- a/macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl +++ b/macros/texinfo/texinfo/tp/t/results/menu/verb_in_menu_description.pl @@ -37,7 +37,9 @@ $result_trees{'verb_in_menu_description'} = { ], 'nodes_manuals' => [ { - 'node_content' => [], + 'node_content' => [ + {} + ], 'normalized' => 'Top' } ], @@ -268,7 +270,7 @@ $result_trees{'verb_in_menu_description'}{'contents'}[0]{'parent'} = $result_tre $result_trees{'verb_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'verb_in_menu_description'}{'contents'}[1]{'args'}[0]; $result_trees{'verb_in_menu_description'}{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'verb_in_menu_description'}{'contents'}[1]; $result_trees{'verb_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees{'verb_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]; -$result_trees{'verb_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'} = $result_trees{'verb_in_menu_description'}{'contents'}[1]{'extra'}{'node_content'}; +$result_trees{'verb_in_menu_description'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0] = $result_trees{'verb_in_menu_description'}{'contents'}[1]{'args'}[0]{'contents'}[0]; $result_trees{'verb_in_menu_description'}{'contents'}[1]{'parent'} = $result_trees{'verb_in_menu_description'}; $result_trees{'verb_in_menu_description'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'verb_in_menu_description'}{'contents'}[2]{'args'}[0]; $result_trees{'verb_in_menu_description'}{'contents'}[2]{'args'}[0]{'parent'} = $result_trees{'verb_in_menu_description'}{'contents'}[2]; @@ -408,6 +410,9 @@ $result_menus{'verb_in_menu_description'} = { $result_errors{'verb_in_menu_description'} = []; +$result_floats{'verb_in_menu_description'} = {}; + + $result_converted{'plaintext'}->{'verb_in_menu_description'} = 'top *** @@ -433,14 +438,16 @@ $result_converted{'html'}->{'verb_in_menu_description'} = '<!DOCTYPE html PUBLIC <meta name="keywords" content="top"> <meta name="resource-type" content="document"> <meta name="distribution" content="global"> +<meta name="viewport" content="width=device-width,initial-scale=1"> + <link href="#Top" rel="start" title="Top"> <style type="text/css"> <!-- +a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em} a.summary-letter {text-decoration: none} blockquote.indentedblock {margin-right: 0em} div.display {margin-left: 3.2em} div.example {margin-left: 3.2em} -div.lisp {margin-left: 3.2em} kbd {font-style: oblique} pre.display {font-family: inherit} pre.format {font-family: inherit} @@ -449,6 +456,7 @@ pre.menu-preformatted {font-family: serif} span.nolinebreak {white-space: nowrap} span.roman {font-family: initial; font-weight: normal} span.sansserif {font-family: sans-serif; font-weight: normal} +span:hover a.copiable-anchor {visibility: visible} ul.no-bullet {list-style: none} --> </style> @@ -457,10 +465,11 @@ ul.no-bullet {list-style: none} </head> <body lang="en"> -<span id="Top"></span><span id="top"></span><h1 class="top">top</h1> +<div class="top" id="Top"> +<span id="top"></span><h1 class="top">top</h1> <table class="menu" border="0" cellspacing="0"> -<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a></td><td> </td><td align="left" valign="top"> +<tr><td align="left" valign="top">• <a href="manual.html#Top" accesskey="1">(manual)</a>:</td><td> </td><td align="left" valign="top"> <tt> in verb </tt> @@ -468,7 +477,7 @@ ul.no-bullet {list-style: none} <tr><th colspan="3" align="left" valign="top"><pre class="menu-comment"> </pre></th></tr></table> -<hr> +<hr></div> |