texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Gavin D. Smith
Date: Tue, 1 Aug 2023 15:20:12 -0400 (EDT)

branch: master
commit 82336910ae2045ad6851d7906c5518fd7e74225f
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Aug 1 20:20:02 2023 +0100

    * tp/t/10menu.t (nodedescription_descriptions): Adjust test so
    it tests what was tested before with a node description only fitting
    on the next line in a menu.
---
 ChangeLog                                         |  6 ++++
 tp/t/10menu.t                                     |  4 +--
 tp/t/results/menu/nodedescription_descriptions.pl | 41 ++++++++++++-----------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 964ca87732..a3f5175778 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-08-01  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/t/10menu.t (nodedescription_descriptions): Adjust test so
+       it tests what was tested before with a node description only fitting
+       on the next line in a menu.
+
 2023-08-01  Gavin Smith <gavinsmith0123@gmail.com>
 
        * doc/texinfo.texi: Start removing @menu throughout.
diff --git a/tp/t/10menu.t b/tp/t/10menu.t
index 64de35b35b..0cd3785b2f 100644
--- a/tp/t/10menu.t
+++ b/tp/t/10menu.t
@@ -524,7 +524,7 @@ Text
 
 * name of last: last. desc of last
 * a somewhat long node without description nor following space::
-* a very long node without description with little space left for::
+* a very long node without description with very little space left for::
 * very very long node extending past the max columns and without description::
 @end menu
 
@@ -553,7 +553,7 @@ Text
 
 @nodedescription not as long as the node
 
-@node a very long node without description with little space left for
+@node a very long node without description with very little space left for
 @chapter Very long
 
 @nodedescription starting the desciption with a somewhat long word
diff --git a/tp/t/results/menu/nodedescription_descriptions.pl 
b/tp/t/results/menu/nodedescription_descriptions.pl
index 49dd517e9c..8c0ab593b5 100644
--- a/tp/t/results/menu/nodedescription_descriptions.pl
+++ b/tp/t/results/menu/nodedescription_descriptions.pl
@@ -358,14 +358,14 @@ $result_trees{'nodedescription_descriptions'} = {
                 {
                   'contents' => [
                     {
-                      'text' => 'a very long node without description with 
little space left for'
+                      'text' => 'a very long node without description with 
very little space left for'
                     }
                   ],
                   'extra' => {
                     'node_content' => [
                       {}
                     ],
-                    'normalized' => 
'a-very-long-node-without-description-with-little-space-left-for'
+                    'normalized' => 
'a-very-long-node-without-description-with-very-little-space-left-for'
                   },
                   'type' => 'menu_entry_node'
                 },
@@ -1128,7 +1128,7 @@ $result_trees{'nodedescription_descriptions'} = {
         {
           'contents' => [
             {
-              'text' => 'a very long node without description with little 
space left for'
+              'text' => 'a very long node without description with very little 
space left for'
             }
           ],
           'info' => {
@@ -1174,7 +1174,7 @@ $result_trees{'nodedescription_descriptions'} = {
             'macro' => ''
           }
         },
-        'normalized' => 
'a-very-long-node-without-description-with-little-space-left-for'
+        'normalized' => 
'a-very-long-node-without-description-with-very-little-space-left-for'
       },
       'info' => {
         'spaces_before_argument' => {
@@ -1367,7 +1367,7 @@ $result_texis{'nodedescription_descriptions'} = '@node Top
 
 * name of last: last. desc of last
 * a somewhat long node without description nor following space::
-* a very long node without description with little space left for::
+* a very long node without description with very little space left for::
 * very very long node extending past the max columns and without description::
 @end menu
 
@@ -1396,7 +1396,7 @@ $result_texis{'nodedescription_descriptions'} = '@node Top
 
 @nodedescription not as long as the node
 
-@node a very long node without description with little space left for
+@node a very long node without description with very little space left for
 @chapter Very long
 
 @nodedescription starting the desciption with a somewhat long word
@@ -1417,7 +1417,7 @@ $result_texts{'nodedescription_descriptions'} = 'test of 
nodedescription used in
 
 * name of last: last. desc of last
 * a somewhat long node without description nor following space::
-* a very long node without description with little space left for::
+* a very long node without description with very little space left for::
 * very very long node extending past the max columns and without description::
 
 1 Toto
@@ -1570,7 +1570,7 @@ $result_sectioning{'nodedescription_descriptions'} = {
                 'associated_node' => {
                   'cmdname' => 'node',
                   'extra' => {
-                    'normalized' => 
'a-very-long-node-without-description-with-little-space-left-for'
+                    'normalized' => 
'a-very-long-node-without-description-with-very-little-space-left-for'
                   },
                   'structure' => {}
                 }
@@ -1733,7 +1733,7 @@ $result_nodes{'nodedescription_descriptions'} = {
                                 'section_number' => 6
                               }
                             },
-                            'normalized' => 
'a-very-long-node-without-description-with-little-space-left-for'
+                            'normalized' => 
'a-very-long-node-without-description-with-very-little-space-left-for'
                           },
                           'structure' => {
                             'node_next' => {
@@ -1835,7 +1835,7 @@ $result_menus{'nodedescription_descriptions'} = {
                         'menu_next' => {
                           'cmdname' => 'node',
                           'extra' => {
-                            'normalized' => 
'a-very-long-node-without-description-with-little-space-left-for'
+                            'normalized' => 
'a-very-long-node-without-description-with-very-little-space-left-for'
                           },
                           'structure' => {
                             'menu_next' => {
@@ -1929,8 +1929,9 @@ 
$result_converted{'plaintext'}->{'nodedescription_descriptions'} = 'test of node
 * name of last: last. desc of last
 * a somewhat long node without description nor following space:: not as long as
                                the node
-* a very long node without description with little space left for:: starting
-                               the desciption with a somewhat long word
+* a very long node without description with very little space left for::
+                               starting the desciption with a somewhat long
+                               word
 * very very long node extending past the max columns and without description::
                                Not long
 
@@ -2004,7 +2005,7 @@ Next: <a href="#toto" accesskey="n" rel="next">Toto</a> 
&nbsp; </p>
 </pre></th></tr><tr><td class="menu-entry-destination">&bull; <a href="#last" 
accesskey="4">name of last</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">desc of last
 </td></tr>
 <tr><td class="menu-entry-destination">&bull; <a 
href="#a-somewhat-long-node-without-description-nor-following-space" 
accesskey="5">a somewhat long node without description nor following 
space</a>:</td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">not as 
long as the node</td></tr>
-<tr><td class="menu-entry-destination">&bull; <a 
href="#a-very-long-node-without-description-with-little-space-left-for" 
accesskey="6">a very long node without description with little space left 
for</a>:</td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">starting 
the desciption with a somewhat long word</td></tr>
+<tr><td class="menu-entry-destination">&bull; <a 
href="#a-very-long-node-without-description-with-very-little-space-left-for" 
accesskey="6">a very long node without description with very little space left 
for</a>:</td><td>&nbsp;&nbsp;</td><td class="menu-entry-description">starting 
the desciption with a somewhat long word</td></tr>
 <tr><td class="menu-entry-destination">&bull; <a 
href="#very-very-long-node-extending-past-the-max-columns-and-without-description"
 accesskey="7">very very long node extending past the max columns and without 
description</a>:</td><td>&nbsp;&nbsp;</td><td 
class="menu-entry-description">Not long</td></tr>
 </table>
 
@@ -2052,14 +2053,14 @@ Next: <a 
href="#a-somewhat-long-node-without-description-nor-following-space" ac
 <div class="chapter-level-extent" 
id="a-somewhat-long-node-without-description-nor-following-space">
 <div class="nav-panel">
 <p>
-Next: <a 
href="#a-very-long-node-without-description-with-little-space-left-for" 
accesskey="n" rel="next">Very long</a>, Previous: <a href="#last" accesskey="p" 
rel="prev">Last</a>, Up: <a href="#Top" accesskey="u" rel="up">test of 
nodedescription used in menu</a> &nbsp; </p>
+Next: <a 
href="#a-very-long-node-without-description-with-very-little-space-left-for" 
accesskey="n" rel="next">Very long</a>, Previous: <a href="#last" accesskey="p" 
rel="prev">Last</a>, Up: <a href="#Top" accesskey="u" rel="up">test of 
nodedescription used in menu</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="Somewhat-long"><span>5 Somewhat long<a 
class="copiable-link" href="#Somewhat-long"> &para;</a></span></h2>
 
 
 <hr>
 </div>
-<div class="chapter-level-extent" 
id="a-very-long-node-without-description-with-little-space-left-for">
+<div class="chapter-level-extent" 
id="a-very-long-node-without-description-with-very-little-space-left-for">
 <div class="nav-panel">
 <p>
 Next: <a 
href="#very-very-long-node-extending-past-the-max-columns-and-without-description"
 accesskey="n" rel="next">Past max columns</a>, Previous: <a 
href="#a-somewhat-long-node-without-description-nor-following-space" 
accesskey="p" rel="prev">Somewhat long</a>, Up: <a href="#Top" accesskey="u" 
rel="up">test of nodedescription used in menu</a> &nbsp; </p>
@@ -2072,7 +2073,7 @@ Next: <a 
href="#very-very-long-node-extending-past-the-max-columns-and-without-d
 <div class="chapter-level-extent" 
id="very-very-long-node-extending-past-the-max-columns-and-without-description">
 <div class="nav-panel">
 <p>
-Previous: <a 
href="#a-very-long-node-without-description-with-little-space-left-for" 
accesskey="p" rel="prev">Very long</a>, Up: <a href="#Top" accesskey="u" 
rel="up">test of nodedescription used in menu</a> &nbsp; </p>
+Previous: <a 
href="#a-very-long-node-without-description-with-very-little-space-left-for" 
accesskey="p" rel="prev">Very long</a>, Up: <a href="#Top" accesskey="u" 
rel="up">test of nodedescription used in menu</a> &nbsp; </p>
 </div>
 <h2 class="chapter" id="Past-max-columns"><span>7 Past max columns<a 
class="copiable-link" href="#Past-max-columns"> &para;</a></span></h2>
 
@@ -2096,7 +2097,7 @@ 
$result_converted{'xml'}->{'nodedescription_descriptions'} = '<node name="Top" s
 </pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
 </pre></menucomment><menuentry><menuleadingtext>* 
</menuleadingtext><menutitle>name of last</menutitle><menuseparator>: 
</menuseparator><menunode>last</menunode><menuseparator>. 
</menuseparator><menudescription><pre xml:space="preserve">desc of last
 </pre></menudescription></menuentry><menuentry><menuleadingtext>* 
</menuleadingtext><menunode>a somewhat long node without description nor 
following 
space</menunode><menuseparator>::</menuseparator><menudescription><pre 
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menuleadingtext>* 
</menuleadingtext><menunode>a very long node without description with little 
space left for</menunode><menuseparator>::</menuseparator><menudescription><pre 
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menuleadingtext>* 
</menuleadingtext><menunode>a very long node without description with very 
little space left 
for</menunode><menuseparator>::</menuseparator><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry><menuentry><menuleadingtext>* 
</menuleadingtext><menunode>very very long node extending past the max columns 
and without 
description</menunode><menuseparator>::</menuseparator><menudescription><pre 
xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
@@ -2125,19 +2126,19 @@ 
$result_converted{'xml'}->{'nodedescription_descriptions'} = '<node name="Top" s
 <nodedescription spaces=" ">we are last</nodedescription>
 
 </chapter>
-<node name="a-somewhat-long-node-without-description-nor-following-space" 
spaces=" "><nodename>a somewhat long node without description nor following 
space</nodename><nodenext automatic="on">a very long node without description 
with little space left for</nodenext><nodeprev 
automatic="on">last</nodeprev><nodeup automatic="on">Top</nodeup></node>
+<node name="a-somewhat-long-node-without-description-nor-following-space" 
spaces=" "><nodename>a somewhat long node without description nor following 
space</nodename><nodenext automatic="on">a very long node without description 
with very little space left for</nodenext><nodeprev 
automatic="on">last</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>Somewhat long</sectiontitle>
 
 <nodedescription spaces=" ">not as long as the node</nodedescription>
 
 </chapter>
-<node name="a-very-long-node-without-description-with-little-space-left-for" 
spaces=" "><nodename>a very long node without description with little space 
left for</nodename><nodenext automatic="on">very very long node extending past 
the max columns and without description</nodenext><nodeprev automatic="on">a 
somewhat long node without description nor following space</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
+<node 
name="a-very-long-node-without-description-with-very-little-space-left-for" 
spaces=" "><nodename>a very long node without description with very little 
space left for</nodename><nodenext automatic="on">very very long node extending 
past the max columns and without description</nodenext><nodeprev 
automatic="on">a somewhat long node without description nor following 
space</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>Very long</sectiontitle>
 
 <nodedescription spaces=" ">starting the desciption with a somewhat long 
word</nodedescription>
 
 </chapter>
-<node 
name="very-very-long-node-extending-past-the-max-columns-and-without-description"
 spaces=" "><nodename>very very long node extending past the max columns and 
without description</nodename><nodeprev automatic="on">a very long node without 
description with little space left for</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
+<node 
name="very-very-long-node-extending-past-the-max-columns-and-without-description"
 spaces=" "><nodename>very very long node extending past the max columns and 
without description</nodename><nodeprev automatic="on">a very long node without 
description with very little space left for</nodeprev><nodeup 
automatic="on">Top</nodeup></node>
 <chapter spaces=" "><sectiontitle>Past max columns</sectiontitle>
 
 <nodedescription spaces=" ">Not long</nodedescription>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]