branch master updated: * tp/Texinfo/Structuring.pm (complete_node_tree_with_menus): add missing extra for menus key.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new a8e8d29f25 * tp/Texinfo/Structuring.pm 
(complete_node_tree_with_menus): add missing extra for menus key.
a8e8d29f25 is described below

commit a8e8d29f25196d4b68fc02459f9cf2b523885b95
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 19 09:30:15 2023 +0200

    * tp/Texinfo/Structuring.pm (complete_node_tree_with_menus): add
    missing extra for menus key.
---
 ChangeLog                                          |  5 +++
 tp/Texinfo/Structuring.pm                          |  6 ++--
 .../moresectioning/lowered_subsubsection.pl        | 18 +++++++++++
 tp/t/results/sectioning/menutextorder.pl           | 36 ++++++++++++++++++++++
 tp/t/results/sectioning/nodename_parentheses.pl    | 18 +++++++++++
 tp/t/results/sectioning/semi_auto.pl               |  9 ++++++
 6 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ec74a7094..553f8cc939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-08-19  Patrice Dumas <pertusus@free.fr>
+
+       * tp/Texinfo/Structuring.pm (complete_node_tree_with_menus): add
+       missing extra for menus key.
+
 2023-08-18  Gavin Smith <gavinsmith0123@gmail.com>
 
        * install-info/tests/ii-0059-test: Fix malformed menu entry.
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index bc21985478..6d360d5176 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -660,9 +660,11 @@ sub complete_node_tree_with_menus($$$$)
           and $section->{'structure'}->{'section_up'}
                                                 
->{'extra'}->{'associated_node'}
           and $section->{'structure'}->{'section_up'}
-                                     
->{'extra'}->{'associated_node'}->{'menus'}
+                        ->{'extra'}->{'associated_node'}->{'extra'}
+          and $section->{'structure'}->{'section_up'}
+                        ->{'extra'}->{'associated_node'}->{'extra'}->{'menus'}
           and @{$section->{'structure'}->{'section_up'}
-                                    
->{'extra'}->{'associated_node'}->{'menus'}}
+                        ->{'extra'}->{'associated_node'}->{'extra'}->{'menus'}}
                     and !$node->{'structure'}->{'menu_'.$direction}) {
                   $registrar->line_warn($customization_information,
            sprintf(__("node %s for `%s' is `%s' in sectioning but not in 
menu"),
diff --git a/tp/t/results/moresectioning/lowered_subsubsection.pl 
b/tp/t/results/moresectioning/lowered_subsubsection.pl
index 4ecda0aed7..fceddcdf52 100644
--- a/tp/t/results/moresectioning/lowered_subsubsection.pl
+++ b/tp/t/results/moresectioning/lowered_subsubsection.pl
@@ -1585,6 +1585,24 @@ 
$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'
 
$result_menus{'lowered_subsubsection'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'lowered_subsubsection'};
 
 $result_errors{'lowered_subsubsection'} = [
+  {
+    'error_line' => 'warning: node next for `Lowered subsec\' is `Lowered 
subsubsection\' in sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 34,
+    'macro' => '',
+    'text' => 'node next for `Lowered subsec\' is `Lowered subsubsection\' in 
sectioning but not in menu',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: node prev for `Lowered subsubsection\' is 
`Lowered subsec\' in sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 41,
+    'macro' => '',
+    'text' => 'node prev for `Lowered subsubsection\' is `Lowered subsec\' in 
sectioning but not in menu',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: node up pointer for `Lowered subsubsection\' is 
`Subsection\' but up is `Lowered subsec\' in menu
 ',
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 582ddb92df..0ca972c672 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -1331,6 +1331,24 @@ $result_menus{'menutextorder'} = {
 
$result_menus{'menutextorder'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
 = $result_menus{'menutextorder'};
 
 $result_errors{'menutextorder'} = [
+  {
+    'error_line' => 'warning: node next for `onesub1\' is `onesub2\' in 
sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 13,
+    'macro' => '',
+    'text' => 'node next for `onesub1\' is `onesub2\' in sectioning but not in 
menu',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: node up for `onesub1\' is `bar\' in sectioning 
but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 13,
+    'macro' => '',
+    'text' => 'node up for `onesub1\' is `bar\' in sectioning but not in menu',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: node `bar\' lacks menu item for `onesub1\' 
despite being its Up target
 ',
@@ -1340,6 +1358,15 @@ $result_errors{'menutextorder'} = [
     'text' => 'node `bar\' lacks menu item for `onesub1\' despite being its Up 
target',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: node prev for `onesub2\' is `onesub1\' in 
sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 16,
+    'macro' => '',
+    'text' => 'node prev for `onesub2\' is `onesub1\' in sectioning but not in 
menu',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: node next pointer for `sub1\' is `sub2\' but 
next is `sub3\' in menu
 ',
@@ -1349,6 +1376,15 @@ $result_errors{'menutextorder'} = [
     'text' => 'node next pointer for `sub1\' is `sub2\' but next is `sub3\' in 
menu',
     'type' => 'warning'
   },
+  {
+    'error_line' => 'warning: node next for `sub2\' is `sub3\' in sectioning 
but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 32,
+    'macro' => '',
+    'text' => 'node next for `sub2\' is `sub3\' in sectioning but not in menu',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: node prev pointer for `sub2\' is `sub1\' but 
prev is `sub3\' in menu
 ',
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index cf75181d3d..c88ea62f52 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -962,6 +962,24 @@ $result_errors{'nodename_parentheses'} = [
     'text' => 'syntax for an external node used for `(manual)anchor\'',
     'type' => 'error'
   },
+  {
+    'error_line' => 'warning: node prev for `(manual)node\' is `Other node\' 
in sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 22,
+    'macro' => '',
+    'text' => 'node prev for `(manual)node\' is `Other node\' in sectioning 
but not in menu',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: node up for `(manual)node\' is `Top\' in 
sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 22,
+    'macro' => '',
+    'text' => 'node up for `(manual)node\' is `Top\' in sectioning but not in 
menu',
+    'type' => 'warning'
+  },
   {
     'error_line' => 'warning: node `Top\' lacks menu item for `(manual)node\' 
despite being its Up target
 ',
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index d8d777a322..78d47e6222 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -853,6 +853,15 @@ $result_errors{'semi_auto'} = [
     'macro' => '',
     'text' => 'node `Section non auto\' is next for `Chap1\' in menu but not 
in sectioning',
     'type' => 'warning'
+  },
+  {
+    'error_line' => 'warning: node next for `Sec in chapter\' is `Section non 
auto\' in sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 16,
+    'macro' => '',
+    'text' => 'node next for `Sec in chapter\' is `Section non auto\' in 
sectioning but not in menu',
+    'type' => 'warning'
   }
 ];