texinfo/tp Texinfo/Structuring.pm t/automatic_m...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/02/04 13:03:10

Modified files:
        tp/Texinfo     : Structuring.pm 
        tp/t           : automatic_menus.t 

Log message:
        Handle correctly @appendix stopping  @part when generating @top menus.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/automatic_menus.t?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- Texinfo/Structuring.pm      4 Feb 2013 12:47:30 -0000       1.147
+++ Texinfo/Structuring.pm      4 Feb 2013 13:03:10 -0000       1.148
@@ -1646,6 +1646,10 @@
             push @node_childs, $child->{'extra'}->{'associated_node'};
           }
         }
+      } elsif ($current->{'extra'}->{'associated_node'}) {
+        # for @appendix, and what follows, as it stops a @part, but is 
+        # not below @top
+        push @node_childs, $current->{'extra'}->{'associated_node'};
       }
     }
   }

Index: t/automatic_menus.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/automatic_menus.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/automatic_menus.t 16 Apr 2012 22:19:23 -0000      1.2
+++ t/automatic_menus.t 4 Feb 2013 13:03:10 -0000       1.3
@@ -1,7 +1,7 @@
 use strict;
 
 use Test::More;
-BEGIN { plan tests => 4 };
+BEGIN { plan tests => 5 };
 
 use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
 use lib 'maintain/lib/libintl-perl/lib/';
@@ -106,3 +106,80 @@
 @chapter chap2
 ', 'menu completed before');
 
+test('@node Top
address@hidden top
+
address@hidden nchap1
address@hidden nchap1
+
address@hidden nchap2
address@hidden nchap2
+
address@hidden
+
address@hidden pnchap1
address@hidden pnchap1
+
address@hidden pnchap2
address@hidden pnchap2
+
address@hidden napp
address@hidden app
+
address@hidden nsapp
address@hidden sapp
+
address@hidden anchap1
address@hidden achap1
+
address@hidden p2
+
address@hidden apnchap1
address@hidden apchap1
+
+', '@node Top
address@hidden top
+
address@hidden
+* nchap1::
+* nchap2::
+* pnchap1::
+* pnchap2::
+* napp::
+* anchap1::
+* apnchap1::
address@hidden menu
+
address@hidden nchap1
address@hidden nchap1
+
address@hidden nchap2
address@hidden nchap2
+
address@hidden
+
address@hidden pnchap1
address@hidden pnchap1
+
address@hidden pnchap2
address@hidden pnchap2
+
address@hidden napp
address@hidden app
+
address@hidden
+* nsapp::
address@hidden menu
+
address@hidden nsapp
address@hidden sapp
+
address@hidden anchap1
address@hidden achap1
+
address@hidden p2
+
address@hidden apnchap1
address@hidden apchap1
+
+', 'parts');