texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp TODO Texinfo/Structuring.pm t/result...


From: Patrice Dumas
Subject: texinfo/tp TODO Texinfo/Structuring.pm t/result...
Date: Wed, 28 Sep 2011 19:02:50 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/09/28 19:02:50

Modified files:
        tp             : TODO 
        tp/Texinfo     : Structuring.pm 
        tp/t/results/sectioning: part_node_chapter_after_top.pl 

Log message:
        Treat @part more like @node for association with elements.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.23&r2=1.24

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- TODO        27 Sep 2011 21:16:03 -0000      1.176
+++ TODO        28 Sep 2011 19:02:49 -0000      1.177
@@ -2,10 +2,6 @@
 perl -w t/02coverage.t -o
 xmllint --nonet --noout --valid commands.xml
 
-cd t/output_files/sectioning
-export XML_CATALOG_FILES=~/src/texinfo/tp/catalog.xml
-xmllint --nonet --noout --valid part_node_chapter_after_top.xml
-
 Test
 @definfoenclose headword, , :
  to define address@hidden' as an Info

Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- Texinfo/Structuring.pm      28 Sep 2011 06:53:38 -0000      1.88
+++ Texinfo/Structuring.pm      28 Sep 2011 19:02:50 -0000      1.89
@@ -626,28 +626,33 @@
   my $current = { 'type' => 'element', 'extra' => {'no_section' => 1}};
   push @$elements, $current; 
   foreach my $content (@{$root->{'contents'}}) {
-    if ($content->{'cmdname'} and $content->{'cmdname'} eq 'part'
-        and $content->{'extra'}->{'part_associated_section'}) {
-      push @pending_parts, $content;
-      next;
+    if ($content->{'cmdname'}
+        and (($content->{'cmdname'} eq 'node' 
+              and $content->{'extra'}->{'associated_section'})
+             or ($content->{'cmdname'} eq 'part'
+                 and $content->{'extra'}->{'part_associated_section'}))) {
+      my $new_section;
+      if ($content->{'cmdname'} eq 'node') {
+        $new_section = $content->{'extra'}->{'associated_section'};
+      } else {
+        $new_section = $content->{'extra'}->{'part_associated_section'};
     }
-    if ($content->{'cmdname'} and $content->{'cmdname'} eq 'node' 
-         and $content->{'extra'}->{'associated_section'}) {
+      if (! $current->{'extra'}->{'section'}
+        or $new_section ne $current->{'extra'}->{'section'}) {
       if ($current->{'extra'}->{'no_section'}) {
         delete $current->{'extra'}->{'no_section'};
         $current->{'extra'}->{'section'} 
-          = $content->{'extra'}->{'associated_section'};
-        $current->{'extra'}->{'node'} = $content;
+            = $new_section;
       } else {
-        $current = { 'type' => 'element', 'extra' 
-                => {'section' => $content->{'extra'}->{'associated_section'},
-                    'node' => $content }};
+          $current = { 'type' => 'element', 
+                       'extra' => {'section' => $new_section}};
         $current->{'element_prev'} = $elements->[-1];
         $elements->[-1]->{'element_next'} = $current;
         push @$elements, $current;
       }
       $elements->[-1]->{'extra'}->{'element_command'} 
-        = $content->{'extra'}->{'associated_section'};
+          = $new_section;
+      }
     # FIXME Handle part differently? (associate with prev sectioning command?)
     } elsif ($content->{'cmdname'} and $content->{'cmdname'} ne 'node' 
                                    and $content->{'cmdname'} ne 'bye') {
@@ -663,12 +668,9 @@
         push @$elements, $current;
       }
     }
-    if (@pending_parts) {
-      foreach my $part (@pending_parts) {
-        push @{$current->{'contents'}}, $part;
-        $part->{'parent'} = $current;
-      }
-      @pending_parts = ();
+    if ($content->{'cmdname'} and $content->{'cmdname'} eq 'node' 
+        and $content->{'extra'}->{'associated_section'}) {
+      $current->{'extra'}->{'node'} = $content;
     }
     push @{$current->{'contents'}}, $content;
     $content->{'parent'} = $current;

Index: t/results/sectioning/part_node_chapter_after_top.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/sectioning/part_node_chapter_after_top.pl 17 Sep 2011 21:34:25 
-0000      1.23
+++ t/results/sectioning/part_node_chapter_after_top.pl 28 Sep 2011 19:02:50 
-0000      1.24
@@ -292,7 +292,17 @@
           'macro' => ''
         },
         'parent' => {}
+      }
+    ],
+    'extra' => {
+      'element_command' => {},
+      'node' => {},
+      'section' => {}
       },
+    'type' => 'element'
+  },
+  {
+    'contents' => [
       {
         'args' => [
           {
@@ -467,17 +477,7 @@
           'macro' => ''
         },
         'parent' => {}
-      }
-    ],
-    'extra' => {
-      'element_command' => {},
-      'node' => {},
-      'section' => {}
     },
-    'type' => 'element'
-  },
-  {
-    'contents' => [
       {
         'args' => [
           {
@@ -629,34 +629,6 @@
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
 $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[1];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[2];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[3];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[3];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[3]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'extra'}{'node_content'};
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[2]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'args'}[3]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[0];
 $result_trees{'part_node_chapter_after_top'}[0]{'extra'}{'element_command'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
 $result_trees{'part_node_chapter_after_top'}[0]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[1];
 $result_trees{'part_node_chapter_after_top'}[0]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[2];
@@ -665,21 +637,49 @@
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'extra'}{'node_content'};
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
 $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[1];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'associated_part'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[3];
-$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[2]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
 $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'extra'}{'node_content'};
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'extra'}{'associated_part'}
 = $result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[1];
 $result_trees{'part_node_chapter_after_top'}[1]{'element_prev'} = 
$result_trees{'part_node_chapter_after_top'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[0];
-$result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[1];
+$result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'element_command'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
+$result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[2];
+$result_trees{'part_node_chapter_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
 
 $result_texis{'part_node_chapter_after_top'} = '@node Top
 @top top
@@ -884,6 +884,7 @@
             'directions' => {
               'Back' => {},
               'FastBack' => {},
+              'NodeBack' => {},
               'NodePrev' => {},
               'NodeUp' => {},
               'This' => {},
@@ -934,7 +935,6 @@
         },
         'Forward' => {},
         'Next' => {},
-        'NodeBack' => {},
         'NodeForward' => {},
         'NodeNext' => {},
         'NodeUp' => {
@@ -964,19 +964,19 @@
 ];
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Back'}
 = $result_elements{'part_node_chapter_after_top'}[0];
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'FastBack'}
 = $result_elements{'part_node_chapter_after_top'}[0];
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
 = $result_elements{'part_node_chapter_after_top'}[0];
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'part_node_chapter_after_top'}[0];
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodePrev'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'NodeUp'}
 = $result_elements{'part_node_chapter_after_top'}[0];
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'This'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = $result_elements{'part_node_chapter_after_top'}[0];
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'directions'}{'Up'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_next'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'}{'menu_child'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_up'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'section'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'element_command'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'Forward'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'Next'}
 = $result_elements{'part_node_chapter_after_top'}[0];
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeBack'}
 = $result_elements{'part_node_chapter_after_top'}[0];
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeForward'}
 = $result_elements{'part_node_chapter_after_top'}[0];
-$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeNext'}
 = $result_elements{'part_node_chapter_after_top'}[0];
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'Next'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeForward'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
+$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeNext'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'NodeUp'}{'extra'}{'top_node_up'}
 = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'This'}
 = $result_elements{'part_node_chapter_after_top'}[0];
 $result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'node'} = 
$result_elements{'part_node_chapter_after_top'}[0]{'extra'}{'directions'}{'FastForward'}{'extra'}{'node'}{'menu_prev'}{'menu_up'};
@@ -988,19 +988,19 @@
 $result_directions_text{'part_node_chapter_after_top'} = 'element: @top top
   FastForward: @chapter chapter
   Forward: @chapter chapter
-  Next: @top top
-  NodeBack: @top top
-  NodeForward: @top top
-  NodeNext: @top top
+  Next: @chapter chapter
+  NodeForward: @chapter chapter
+  NodeNext: @chapter chapter
   NodeUp: (dir)
   This: @top top
 element: @chapter chapter
   Back: @top top
   FastBack: @top top
-  NodePrev: @top top
+  NodeBack: @top top
+  NodePrev: @chapter chapter
   NodeUp: @top top
   This: @chapter chapter
-  Up: @top top
+  Up: @chapter chapter
 ';
 
 
@@ -1137,12 +1137,12 @@
 
</pre></menudescription></menuentry><menuentry><menunode>chapter</menunode><menudescription><pre
 xml:space="preserve">
 </pre></menudescription></menuentry></menu>
 
+</top>
 <part><sectiontitle>part</sectiontitle>
 
 <node name="a-node-after-part"><nodename>a node after 
part</nodename><nodenext>chapter</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>
 <para>After a node after part
 </para>
-</top>
 <node name="chapter"><nodename>chapter</nodename><nodeprev automatic="on">a 
node after part</nodeprev><nodeup automatic="on">Top</nodeup></node>
 <chapter><sectiontitle>chapter </sectiontitle>
 </chapter>



reply via email to

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