texinfo/tp Texinfo/Structuring.pm t/results/sec...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/22 22:06:22

Modified files:
        tp/Texinfo     : Structuring.pm 
        tp/t/results/sectioning: lowered_subsubsection.pl 
                                 menutextorder.pl 
                                 nodename_parentheses.pl 
                                 section_chapter_before_top_nodes.pl 
                                 semi_auto.pl 

Log message:
        Add more messages with menu and automatic sectioning directions 
mismatches.
        Remove redundant message.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/lowered_subsubsection.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/menutextorder.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodename_parentheses.pl?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_chapter_before_top_nodes.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/semi_auto.pl?cvsroot=texinfo&r1=1.20&r2=1.21

Patches:
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- Texinfo/Structuring.pm      22 Nov 2011 00:34:58 -0000      1.105
+++ Texinfo/Structuring.pm      22 Nov 2011 22:06:22 -0000      1.106
@@ -474,7 +474,17 @@
                 last;
               }
             }
-            next if ($node->{'node_'.$direction});
+            if ($node->{'node_'.$direction}) {
+              if ($self->{'SHOW_MENU'} and !$node->{'menu_'.$direction}) {
+                $self->line_warn(sprintf($self->
+                  __("Node `%s' is %s for `%s' in sectioning but not in 
menu"), 
+                
Texinfo::Parser::_node_extra_to_texi($node->{'node_'.$direction}->{'extra'}), 
+                $direction,
+                Texinfo::Parser::_node_extra_to_texi($node->{'extra'})),
+                $node->{'line_nr'});
+              }
+              next;
+            }
           }
           if ($node->{'menu_'.$direction} 
               and !$node->{'menu_'.$direction}->{'extra'}->{'manual_content'}) 
{
@@ -492,13 +502,8 @@
         }
         if ($self->{'SHOW_MENU'}) {
           if ($node->{'node_next'}) {
-            if (!defined($node->{'menu_next'})) {
-              $self->line_warn(sprintf($self->
-                 __("No node following `%s' in menu, but `%s' follows in 
sectioning"), 
-               Texinfo::Parser::_node_extra_to_texi($node->{'extra'}), 
-               
Texinfo::Parser::_node_extra_to_texi($node->{'node_next'}->{'extra'})), 
-               $node->{'line_nr'});
-            } elsif ($node->{'menu_next'} ne $node->{'node_next'}) {
+            if ($node->{'menu_next'}
+                and $node->{'menu_next'} ne $node->{'node_next'}) {
               $self->line_warn(sprintf($self->
                  __("Node following `%s' in menu `%s' and in sectioning `%s' 
differ"), 
               Texinfo::Parser::_node_extra_to_texi($node->{'extra'}),
@@ -506,11 +511,6 @@
               
Texinfo::Parser::_node_extra_to_texi($node->{'node_next'}->{'extra'})),
               $node->{'line_nr'});
             }
-          #} elsif (defined($node->{'menu_next'})) {
-          #  $self->line_warn(sprintf($self->
-          #    __("Node following `%s' in menu, nothing follows in 
sectioning"), 
-          #    Texinfo::Parser::_node_extra_to_texi($node->{'extra'})), 
-          #    $node->{'line_nr'});
           }
         }
       } else {

Index: t/results/sectioning/lowered_subsubsection.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/lowered_subsubsection.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/lowered_subsubsection.pl       22 Nov 2011 00:35:08 
-0000      1.11
+++ t/results/sectioning/lowered_subsubsection.pl       22 Nov 2011 22:06:22 
-0000      1.12
@@ -2117,12 +2117,21 @@
 
 $result_errors{'lowered_subsubsection'} = [
   {
-    'error_line' => ':34: warning: No node following `Lowered subsec\' in 
menu, but `Lowered subsubsection\' follows in sectioning
+    'error_line' => ':34: warning: Node `Lowered subsubsection\' is next for 
`Lowered subsec\' in sectioning but not in menu
 ',
     'file_name' => '',
     'line_nr' => 34,
     'macro' => '',
-    'text' => 'No node following `Lowered subsec\' in menu, but `Lowered 
subsubsection\' follows in sectioning',
+    'text' => 'Node `Lowered subsubsection\' is next for `Lowered subsec\' in 
sectioning but not in menu',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':41: warning: Node `Lowered subsec\' is prev for `Lowered 
subsubsection\' in sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 41,
+    'macro' => '',
+    'text' => 'Node `Lowered subsec\' is prev for `Lowered subsubsection\' in 
sectioning but not in menu',
     'type' => 'warning'
   },
   {

Index: t/results/sectioning/menutextorder.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/menutextorder.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/menutextorder.pl       22 Nov 2011 00:35:08 -0000      
1.10
+++ t/results/sectioning/menutextorder.pl       22 Nov 2011 22:06:22 -0000      
1.11
@@ -1831,12 +1831,12 @@
     'type' => 'error continuation'
   },
   {
-    'error_line' => ':6: warning: No node following `bar\' in menu, but `foo\' 
follows in sectioning
+    'error_line' => ':6: warning: Node `foo\' is next for `bar\' in sectioning 
but not in menu
 ',
     'file_name' => '',
     'line_nr' => 6,
     'macro' => '',
-    'text' => 'No node following `bar\' in menu, but `foo\' follows in 
sectioning',
+    'text' => 'Node `foo\' is next for `bar\' in sectioning but not in menu',
     'type' => 'warning'
   },
   {
@@ -1849,12 +1849,21 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':13: warning: No node following `onesub1\' in menu, but 
`onesub2\' follows in sectioning
+    'error_line' => ':13: warning: Node `onesub2\' is next for `onesub1\' in 
sectioning but not in menu
 ',
     'file_name' => '',
     'line_nr' => 13,
     'macro' => '',
-    'text' => 'No node following `onesub1\' in menu, but `onesub2\' follows in 
sectioning',
+    'text' => 'Node `onesub2\' is next for `onesub1\' in sectioning but not in 
menu',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':13: warning: Node `bar\' is up for `onesub1\' in 
sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 13,
+    'macro' => '',
+    'text' => 'Node `bar\' is up for `onesub1\' in sectioning but not in menu',
     'type' => 'warning'
   },
   {
@@ -1867,6 +1876,15 @@
     'type' => 'error'
   },
   {
+    'error_line' => ':16: warning: Node `onesub1\' is prev for `onesub2\' in 
sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 16,
+    'macro' => '',
+    'text' => 'Node `onesub1\' is prev for `onesub2\' in sectioning but not in 
menu',
+    'type' => 'warning'
+  },
+  {
     'error_line' => ':20: warning: unreferenced node `foo\'
 ',
     'file_name' => '',
@@ -1876,6 +1894,15 @@
     'type' => 'warning'
   },
   {
+    'error_line' => ':20: warning: Node `bar\' is prev for `foo\' in 
sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => '',
+    'text' => 'Node `bar\' is prev for `foo\' in sectioning but not in menu',
+    'type' => 'warning'
+  },
+  {
     'error_line' => ':29: warning: Node following `sub1\' in menu `sub3\' and 
in sectioning `sub2\' differ
 ',
     'file_name' => '',
@@ -1885,12 +1912,12 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':32: warning: No node following `sub2\' in menu, but 
`sub3\' follows in sectioning
+    'error_line' => ':32: warning: Node `sub3\' is next for `sub2\' in 
sectioning but not in menu
 ',
     'file_name' => '',
     'line_nr' => 32,
     'macro' => '',
-    'text' => 'No node following `sub2\' in menu, but `sub3\' follows in 
sectioning',
+    'text' => 'Node `sub3\' is next for `sub2\' in sectioning but not in menu',
     'type' => 'warning'
   },
   {

Index: t/results/sectioning/nodename_parentheses.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/sectioning/nodename_parentheses.pl        22 Nov 2011 00:35:09 
-0000      1.46
+++ t/results/sectioning/nodename_parentheses.pl        22 Nov 2011 22:06:22 
-0000      1.47
@@ -1328,6 +1328,24 @@
     'type' => 'warning'
   },
   {
+    'error_line' => ':22: warning: Node `Other node\' is prev for `node\' in 
sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 22,
+    'macro' => '',
+    'text' => 'Node `Other node\' is prev for `node\' in sectioning but not in 
menu',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':22: warning: Node `Top\' is up for `node\' in sectioning 
but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 22,
+    'macro' => '',
+    'text' => 'Node `Top\' is up for `node\' in sectioning but not in menu',
+    'type' => 'warning'
+  },
+  {
     'error_line' => ':1: Node `Top\' lacks menu item for `node\' despite being 
its Up target
 ',
     'file_name' => '',

Index: t/results/sectioning/section_chapter_before_top_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/section_chapter_before_top_nodes.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/sectioning/section_chapter_before_top_nodes.pl    22 Nov 2011 
00:35:10 -0000      1.16
+++ t/results/sectioning/section_chapter_before_top_nodes.pl    22 Nov 2011 
22:06:22 -0000      1.17
@@ -888,6 +888,15 @@
     'type' => 'error'
   },
   {
+    'error_line' => ':1: warning: Node `chapter node\' is next for `section 
node\' in sectioning but not in menu
+',
+    'file_name' => '',
+    'line_nr' => 1,
+    'macro' => '',
+    'text' => 'Node `chapter node\' is next for `section node\' in sectioning 
but not in menu',
+    'type' => 'warning'
+  },
+  {
     'error_line' => ':1: warning: Node `chapter node\' is up for `section 
node\' in menu but not in sectioning
 ',
     'file_name' => '',
@@ -897,30 +906,30 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':1: warning: No node following `section node\' in menu, 
but `chapter node\' follows in sectioning
+    'error_line' => ':4: warning: Node `Top\' is next for `chapter node\' in 
sectioning but not in menu
 ',
     'file_name' => '',
-    'line_nr' => 1,
+    'line_nr' => 4,
     'macro' => '',
-    'text' => 'No node following `section node\' in menu, but `chapter node\' 
follows in sectioning',
+    'text' => 'Node `Top\' is next for `chapter node\' in sectioning but not 
in menu',
     'type' => 'warning'
   },
   {
-    'error_line' => ':4: warning: Node `Top\' is up for `chapter node\' in 
menu but not in sectioning
+    'error_line' => ':4: warning: Node `section node\' is prev for `chapter 
node\' in sectioning but not in menu
 ',
     'file_name' => '',
     'line_nr' => 4,
     'macro' => '',
-    'text' => 'Node `Top\' is up for `chapter node\' in menu but not in 
sectioning',
+    'text' => 'Node `section node\' is prev for `chapter node\' in sectioning 
but not in menu',
     'type' => 'warning'
   },
   {
-    'error_line' => ':4: warning: No node following `chapter node\' in menu, 
but `Top\' follows in sectioning
+    'error_line' => ':4: warning: Node `Top\' is up for `chapter node\' in 
menu but not in sectioning
 ',
     'file_name' => '',
     'line_nr' => 4,
     'macro' => '',
-    'text' => 'No node following `chapter node\' in menu, but `Top\' follows 
in sectioning',
+    'text' => 'Node `Top\' is up for `chapter node\' in menu but not in 
sectioning',
     'type' => 'warning'
   }
 ];

Index: t/results/sectioning/semi_auto.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/semi_auto.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/sectioning/semi_auto.pl   22 Nov 2011 00:35:10 -0000      1.20
+++ t/results/sectioning/semi_auto.pl   22 Nov 2011 22:06:22 -0000      1.21
@@ -1155,12 +1155,12 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':16: warning: No node following `Sec in chapter\' in 
menu, but `Section non auto\' follows in sectioning
+    'error_line' => ':16: warning: Node `Section non auto\' is next for `Sec 
in chapter\' in sectioning but not in menu
 ',
     'file_name' => '',
     'line_nr' => 16,
     'macro' => '',
-    'text' => 'No node following `Sec in chapter\' in menu, but `Section non 
auto\' follows in sectioning',
+    'text' => 'Node `Section non auto\' is next for `Sec in chapter\' in 
sectioning but not in menu',
     'type' => 'warning'
   }
 ];