texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/HTML.pm (_default_format_ele


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/HTML.pm (_default_format_element_header) (_convert_tree_unit_type, _default_format_element_footer) (_html_set_pages_files), tp/Texinfo/Structuring.pm (split_by_node) (split_by_section, elements_directions, elements_file_directions): put unit_prev and unit_next in structure.
Date: Fri, 31 Dec 2021 11:49:16 -0500

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 5bd6d041df * tp/Texinfo/Convert/HTML.pm 
(_default_format_element_header) (_convert_tree_unit_type, 
_default_format_element_footer) (_html_set_pages_files), 
tp/Texinfo/Structuring.pm (split_by_node) (split_by_section, 
elements_directions, elements_file_directions): put unit_prev and unit_next in 
structure.
5bd6d041df is described below

commit 5bd6d041df16b6c632e7ed45d63761821dc3cab9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 31 17:49:04 2021 +0100

    * tp/Texinfo/Convert/HTML.pm (_default_format_element_header)
    (_convert_tree_unit_type, _default_format_element_footer)
    (_html_set_pages_files), tp/Texinfo/Structuring.pm (split_by_node)
    (split_by_section, elements_directions, elements_file_directions):
    put unit_prev and unit_next in structure.
---
 ChangeLog                                          |   9 +
 tp/Texinfo/Convert/HTML.pm                         |  32 +-
 tp/Texinfo/Structuring.pm                          |  40 +-
 .../html_tests/footnotestyle_separate_late.pl      |  18 +-
 tp/t/results/html_tests/index_below.pl             |  18 +-
 tp/t/results/html_tests/redirection_same_labels.pl |  18 +-
 .../sectioning/chapter_before_and_after_part.pl    |   9 +-
 tp/t/results/sectioning/chapter_before_part.pl     |   9 +-
 tp/t/results/sectioning/chapter_sections.pl        |  63 +-
 .../sectioning/character_and_spaces_in_refs_out.pl | 834 +++++++++++----------
 tp/t/results/sectioning/complex.pl                 | 108 +--
 tp/t/results/sectioning/complex_split_at_node.pl   | 126 ++--
 tp/t/results/sectioning/double_part.pl             |  18 +-
 .../results/sectioning/explicit_node_directions.pl |  18 +-
 tp/t/results/sectioning/internal_top_node_up.pl    |   9 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |  18 +-
 .../sectioning/node_part_chapter_after_top.pl      |   9 +-
 tp/t/results/sectioning/node_up_external_node.pl   |   9 +-
 .../nodes_after_top_before_chapter_nodes.pl        |  18 +-
 .../nodes_after_top_before_section_nodes.pl        |  18 +-
 .../nodes_no_node_top_explicit_directions.pl       |   9 +-
 .../non_automatic_internal_top_node_up.pl          |   9 +-
 .../non_automatic_top_node_up_and_url.pl           |   9 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |   9 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |   9 +-
 tp/t/results/sectioning/part_node_after_top.pl     |   9 +-
 .../sectioning/part_node_chapter_after_top.pl      |   9 +-
 .../sectioning/part_node_chapter_appendix.pl       |  18 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |  18 +-
 .../sectioning/part_node_node_part_appendix.pl     |  18 +-
 tp/t/results/sectioning/part_node_part_appendix.pl |  18 +-
 .../sectioning/part_node_part_node_appendix.pl     |  18 +-
 .../results/sectioning/sectioning_part_appendix.pl |  81 +-
 .../sectioning/sectioning_part_appendix_no_top.pl  |  72 +-
 tp/t/results/sectioning/top_chapter_sections.pl    |  72 +-
 tp/t/results/sectioning/top_node_up_url.pl         |   9 +-
 tp/t/results/sectioning/top_part_chapter.pl        |   9 +-
 .../sectioning/top_without_node_sections.pl        |   9 +-
 .../transliterated_split_equivalent_nodes.pl       |  27 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |   9 +-
 .../sectioning/two_nodes_between_chapters.pl       |  18 +-
 .../sectioning/unnumbered_before_node_top_top.pl   |   9 +-
 .../unnumbered_top_without_node_nodes.pl           |   9 +-
 .../unnumbered_top_without_node_sections.pl        |  18 +-
 44 files changed, 1009 insertions(+), 887 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4697134d62..b387c6fd6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-12-31  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_default_format_element_header)
+       (_convert_tree_unit_type, _default_format_element_footer)
+       (_html_set_pages_files), tp/Texinfo/Structuring.pm (split_by_node)
+       (split_by_section, elements_directions, elements_file_directions):
+       put unit_prev and unit_next in structure.
+
+
 2021-12-31  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (from_element_direction)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 0d221ff603..9c35befe9e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2736,12 +2736,12 @@ sub _default_format_element_header($$$$)
        or (!$tree_unit->{'contents'}->[0]->{'cmdname'}
             and $tree_unit->{'contents'}->[1] eq $command))
       # and there is more than one element
-      and ($tree_unit->{'unit_next'} or $tree_unit->{'unit_prev'})) {
+      and ($tree_unit->{'structure'}->{'unit_next'} or 
$tree_unit->{'structure'}->{'unit_prev'})) {
     my $is_top = $self->element_is_tree_unit_top($tree_unit);
     my $first_in_page = (defined($tree_unit->{'filename'})
            and $self->{'counter_in_file'}->{$tree_unit->{'filename'}} == 1);
-    my $previous_is_top = ($tree_unit->{'unit_prev'}
-                   and 
$self->element_is_tree_unit_top($tree_unit->{'unit_prev'}));
+    my $previous_is_top = ($tree_unit->{'structure'}->{'unit_prev'}
+                   and 
$self->element_is_tree_unit_top($tree_unit->{'structure'}->{'unit_prev'}));
 
     print STDERR "Header ($previous_is_top, $is_top, $first_in_page): "
       
.Texinfo::Convert::Texinfo::root_element_command_to_texinfo($command)."\n"
@@ -5215,9 +5215,9 @@ sub _convert_tree_unit_type($$$$)
   }
   my $result = '';
   my $tree_unit = $element;
-  if (!$tree_unit->{'unit_prev'}) {
+  if (!$tree_unit->{'structure'}->{'unit_prev'}) {
     $result .= $self->_print_title();
-    if (!$tree_unit->{'unit_next'}) {
+    if (!$tree_unit->{'structure'}->{'unit_next'}) {
       # only one unit, use simplfied formatting
       $result .= $content;
       # if there is one unit it also means that there is no formatting
@@ -5250,15 +5250,15 @@ sub _default_format_element_footer($$$$)
 
   my $result = '';
   my $is_top = $self->element_is_tree_unit_top($element);
-  my $next_is_top = ($element->{'unit_next'}
-                     and 
$self->element_is_tree_unit_top($element->{'unit_next'}));
-  my $next_is_special = (defined($element->{'unit_next'})
-                   and defined($element->{'unit_next'}->{'type'})
-                   and $element->{'unit_next'}->{'type'} eq 'special_element');
+  my $next_is_top = ($element->{'structure'}->{'unit_next'}
+                     and 
$self->element_is_tree_unit_top($element->{'structure'}->{'unit_next'}));
+  my $next_is_special = (defined($element->{'structure'}->{'unit_next'})
+                   and 
defined($element->{'structure'}->{'unit_next'}->{'type'})
+                   and $element->{'structure'}->{'unit_next'}->{'type'} eq 
'special_element');
 
-  my $end_page = (!$element->{'unit_next'}
+  my $end_page = (!$element->{'structure'}->{'unit_next'}
        or (defined($element->{'filename'})
-           and $element->{'filename'} ne $element->{'unit_next'}->{'filename'}
+           and $element->{'filename'} ne 
$element->{'structure'}->{'unit_next'}->{'filename'}
            and $self->{'file_counters'}->{$element->{'filename'}} == 1));
 
   my $is_special = (defined($element->{'type'})
@@ -5310,9 +5310,9 @@ sub _default_format_element_footer($$$$)
   # FIXME the following condition is almost a duplication of the
   # condition appearing in end_page except that the file counter
   # needs not to be 1
-  if ((!$element->{'unit_next'}
+  if ((!$element->{'structure'}->{'unit_next'}
        or (defined($element->{'filename'})
-           and $element->{'filename'} ne 
$element->{'unit_next'}->{'filename'}))
+           and $element->{'filename'} ne 
$element->{'structure'}->{'unit_next'}->{'filename'}))
       and $self->get_conf('footnotestyle') eq 'end') {
     $result .= &{$self->{'format_footnotes_text'}}($self);
   }
@@ -6345,8 +6345,8 @@ sub _html_set_pages_files($$$$$$$$)
         print STDERR "Special page $special_element: 
$special_element->{'filename'}($self->{'file_counters'}->{$special_element->{'filename'}})\n"
           if ($self->get_conf('DEBUG'));
       }
-      $special_element->{'unit_prev'} = $previous_tree_unit;
-      $previous_tree_unit->{'unit_next'} = $special_element;
+      $special_element->{'structure'}->{'unit_prev'} = $previous_tree_unit;
+      $previous_tree_unit->{'structure'}->{'unit_next'} = $special_element;
       $previous_tree_unit = $special_element;
     }
   }
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index de52a87c39..16518c63bd 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -845,8 +845,8 @@ sub split_by_node($)
         $current->{'extra'}->{'node'} = $content;
       } else {
         $current = { 'type' => 'unit', 'extra' => {'node' => $content}};
-        $current->{'unit_prev'} = $tree_units->[-1];
-        $tree_units->[-1]->{'unit_next'} = $current;
+        $current->{'structure'}->{'unit_prev'} = $tree_units->[-1];
+        $tree_units->[-1]->{'structure'}->{'unit_next'} = $current;
         push @$tree_units, $current;
       }
       $tree_units->[-1]->{'extra'}->{'unit_command'} = $content;
@@ -898,8 +898,8 @@ sub split_by_section($)
         $current = { 'type' => 'unit',
                      'extra' => {'section' => $new_section,
                                  'unit_command' => $new_section}};
-        $current->{'unit_prev'} = $tree_units->[-1];
-        $tree_units->[-1]->{'unit_next'} = $current;
+        $current->{'structure'}->{'unit_prev'} = $tree_units->[-1];
+        $tree_units->[-1]->{'structure'}->{'unit_next'} = $current;
         push @$tree_units, $current;
       }
     } elsif ($content->{'cmdname'} and $content->{'cmdname'} ne 'node'
@@ -911,8 +911,8 @@ sub split_by_section($)
       } elsif ($current->{'extra'}->{'section'} ne $content) {
         $current = { 'type' => 'unit', 'extra' => {'section' => $content,
                                               'unit_command' => $content}};
-        $current->{'unit_prev'} = $tree_units->[-1];
-        $tree_units->[-1]->{'unit_next'} = $current;
+        $current->{'structure'}->{'unit_prev'} = $tree_units->[-1];
+        $tree_units->[-1]->{'structure'}->{'unit_next'} = $current;
         push @$tree_units, $current;
       }
     }
@@ -1012,14 +1012,14 @@ sub elements_directions($$$)
   foreach my $tree_unit (@$tree_units) {
     my $directions;
     $directions->{'This'} = $tree_unit;
-    $directions->{'Forward'} = $tree_unit->{'unit_next'}
-      if ($tree_unit->{'unit_next'}
-          and defined($tree_unit->{'unit_next'}->{'type'})
-          and $tree_unit->{'unit_next'}->{'type'} eq 'unit');
-    $directions->{'Back'} = $tree_unit->{'unit_prev'}
-      if ($tree_unit->{'unit_prev'}
-          and defined($tree_unit->{'unit_prev'}->{'type'})
-          and $tree_unit->{'unit_prev'}->{'type'} eq 'unit');
+    $directions->{'Forward'} = $tree_unit->{'structure'}->{'unit_next'}
+      if ($tree_unit->{'structure'}->{'unit_next'}
+          and defined($tree_unit->{'structure'}->{'unit_next'}->{'type'})
+          and $tree_unit->{'structure'}->{'unit_next'}->{'type'} eq 'unit');
+    $directions->{'Back'} = $tree_unit->{'structure'}->{'unit_prev'}
+      if ($tree_unit->{'structure'}->{'unit_prev'}
+          and defined($tree_unit->{'structure'}->{'unit_prev'}->{'type'})
+          and $tree_unit->{'structure'}->{'unit_prev'}->{'type'} eq 'unit');
     if ($tree_unit->{'extra'}->{'node'}) {
       my $node = $tree_unit->{'extra'}->{'node'};
       foreach my $direction(['NodeUp', 'node_up'], ['NodeNext', 'node_next'],
@@ -1068,8 +1068,8 @@ sub elements_directions($$$)
       # Use it as FastBack if the section is top level, or use the FastBack.
       my $section_element;
       my $current = $tree_unit;
-      while ($current->{'unit_prev'}) {
-        $current = $current->{'unit_prev'};
+      while ($current->{'structure'}->{'unit_prev'}) {
+        $current = $current->{'structure'}->{'unit_prev'};
         if ($current->{'extra'}->{'section'}) {
           $section_element = $current;
           last;
@@ -1178,8 +1178,8 @@ sub elements_file_directions($)
         @first_element_in_file_directions = keys 
%{$tree_unit->{'structure'}->{'directions'}};
         $current_filename = $filename;
       }
-      while ($current_tree_unit->{'unit_prev'}) {
-        $current_tree_unit = $current_tree_unit->{'unit_prev'};
+      while ($current_tree_unit->{'structure'}->{'unit_prev'}) {
+        $current_tree_unit = $current_tree_unit->{'structure'}->{'unit_prev'};
         if (defined($current_tree_unit->{'filename'})) {
           if ($current_tree_unit->{'filename'} ne $filename) {
             $tree_unit->{'structure'}->{'directions'}->{'PrevFile'}
@@ -1191,8 +1191,8 @@ sub elements_file_directions($)
         }
       }
       $current_tree_unit = $tree_unit;
-      while ($current_tree_unit->{'unit_next'}) {
-        $current_tree_unit = $current_tree_unit->{'unit_next'};
+      while ($current_tree_unit->{'structure'}->{'unit_next'}) {
+        $current_tree_unit = $current_tree_unit->{'structure'}->{'unit_next'};
         if (defined($current_tree_unit->{'filename'})) {
           if ($current_tree_unit->{'filename'} ne $filename) {
             $tree_unit->{'structure'}->{'directions'}->{'NextFile'}
diff --git a/tp/t/results/html_tests/footnotestyle_separate_late.pl 
b/tp/t/results/html_tests/footnotestyle_separate_late.pl
index 1ead4b5c25..0ca620827e 100644
--- a/tp/t/results/html_tests/footnotestyle_separate_late.pl
+++ b/tp/t/results/html_tests/footnotestyle_separate_late.pl
@@ -268,9 +268,10 @@ $result_trees{'footnotestyle_separate_late'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -435,9 +436,10 @@ $result_trees{'footnotestyle_separate_late'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'footnotestyle_separate_late'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -476,7 +478,7 @@ 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1]{'parent'} = $resu
 $result_trees{'footnotestyle_separate_late'}[1]{'extra'}{'node'} = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[1]{'extra'}{'section'} = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[1];
 $result_trees{'footnotestyle_separate_late'}[1]{'extra'}{'unit_command'} = 
$result_trees{'footnotestyle_separate_late'}[1]{'contents'}[0];
-$result_trees{'footnotestyle_separate_late'}[1]{'unit_prev'} = 
$result_trees{'footnotestyle_separate_late'}[0];
+$result_trees{'footnotestyle_separate_late'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'footnotestyle_separate_late'}[0];
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0];
 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -499,7 +501,7 @@ 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1]{'parent'} = $resu
 $result_trees{'footnotestyle_separate_late'}[2]{'extra'}{'node'} = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0];
 $result_trees{'footnotestyle_separate_late'}[2]{'extra'}{'section'} = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[1];
 $result_trees{'footnotestyle_separate_late'}[2]{'extra'}{'unit_command'} = 
$result_trees{'footnotestyle_separate_late'}[2]{'contents'}[0];
-$result_trees{'footnotestyle_separate_late'}[2]{'unit_prev'} = 
$result_trees{'footnotestyle_separate_late'}[1];
+$result_trees{'footnotestyle_separate_late'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'footnotestyle_separate_late'}[1];
 
 $result_texis{'footnotestyle_separate_late'} = '@setfilename 
footnotestyle_separate_late.info
 
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 99f87a0de6..cd2b49db17 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -103,9 +103,10 @@ $result_trees{'index_below'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -223,9 +224,10 @@ $result_trees{'index_below'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'index_below'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[0];
@@ -241,7 +243,7 @@ 
$result_trees{'index_below'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $resul
 $result_trees{'index_below'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[1];
 $result_trees{'index_below'}[1]{'extra'}{'section'} = 
$result_trees{'index_below'}[1]{'contents'}[0];
 $result_trees{'index_below'}[1]{'extra'}{'unit_command'} = 
$result_trees{'index_below'}[1]{'contents'}[0];
-$result_trees{'index_below'}[1]{'unit_prev'} = $result_trees{'index_below'}[0];
+$result_trees{'index_below'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'index_below'}[0];
 
$result_trees{'index_below'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_below'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'index_below'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
 $result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
@@ -257,7 +259,7 @@ 
$result_trees{'index_below'}[2]{'contents'}[0]{'contents'}[2]{'parent'} = $resul
 $result_trees{'index_below'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'index_below'}[2];
 $result_trees{'index_below'}[2]{'extra'}{'section'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
 $result_trees{'index_below'}[2]{'extra'}{'unit_command'} = 
$result_trees{'index_below'}[2]{'contents'}[0];
-$result_trees{'index_below'}[2]{'unit_prev'} = $result_trees{'index_below'}[1];
+$result_trees{'index_below'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'index_below'}[1];
 
 $result_texis{'index_below'} = '@top top
 
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 385fd2687b..357edddaf3 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -839,9 +839,10 @@ $result_trees{'redirection_same_labels'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1123,9 +1124,10 @@ $result_trees{'redirection_same_labels'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -1245,7 +1247,7 @@ 
$result_trees{'redirection_same_labels'}[1]{'contents'}[3]{'parent'} = $result_t
 $result_trees{'redirection_same_labels'}[1]{'extra'}{'node'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[1]{'extra'}{'section'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1];
 $result_trees{'redirection_same_labels'}[1]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[1]{'contents'}[1];
-$result_trees{'redirection_same_labels'}[1]{'unit_prev'} = 
$result_trees{'redirection_same_labels'}[0];
+$result_trees{'redirection_same_labels'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'redirection_same_labels'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'redirection_same_labels'}[2]{'contents'}[0];
 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1285,7 +1287,7 @@ 
$result_trees{'redirection_same_labels'}[2]{'contents'}[2]{'parent'} = $result_t
 $result_trees{'redirection_same_labels'}[2]{'extra'}{'node'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[0];
 $result_trees{'redirection_same_labels'}[2]{'extra'}{'section'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1];
 $result_trees{'redirection_same_labels'}[2]{'extra'}{'unit_command'} = 
$result_trees{'redirection_same_labels'}[2]{'contents'}[1];
-$result_trees{'redirection_same_labels'}[2]{'unit_prev'} = 
$result_trees{'redirection_same_labels'}[1];
+$result_trees{'redirection_same_labels'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'redirection_same_labels'}[1];
 
 $result_texis{'redirection_same_labels'} = '@setfilename 
redirection_same_labels.info
 
diff --git a/tp/t/results/sectioning/chapter_before_and_after_part.pl 
b/tp/t/results/sectioning/chapter_before_and_after_part.pl
index 69ad7fe61c..7c0f695cda 100644
--- a/tp/t/results/sectioning/chapter_before_and_after_part.pl
+++ b/tp/t/results/sectioning/chapter_before_and_after_part.pl
@@ -159,9 +159,10 @@ $result_trees{'chapter_before_and_after_part'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'chapter_before_and_after_part'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_before_and_after_part'}[0];
@@ -184,7 +185,7 @@ 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1]{'extra'}{'assoc
 $result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'chapter_before_and_after_part'}[1];
 $result_trees{'chapter_before_and_after_part'}[1]{'extra'}{'section'} = 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1];
 $result_trees{'chapter_before_and_after_part'}[1]{'extra'}{'unit_command'} = 
$result_trees{'chapter_before_and_after_part'}[1]{'contents'}[1];
-$result_trees{'chapter_before_and_after_part'}[1]{'unit_prev'} = 
$result_trees{'chapter_before_and_after_part'}[0];
+$result_trees{'chapter_before_and_after_part'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_before_and_after_part'}[0];
 
 $result_texis{'chapter_before_and_after_part'} = '@chapter chapter
 
diff --git a/tp/t/results/sectioning/chapter_before_part.pl 
b/tp/t/results/sectioning/chapter_before_part.pl
index 2e2bccebfe..32c07c0f94 100644
--- a/tp/t/results/sectioning/chapter_before_part.pl
+++ b/tp/t/results/sectioning/chapter_before_part.pl
@@ -96,9 +96,10 @@ $result_trees{'chapter_before_part'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'chapter_before_part'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_before_part'}[0];
@@ -113,7 +114,7 @@ 
$result_trees{'chapter_before_part'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $r
 $result_trees{'chapter_before_part'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_before_part'}[1];
 $result_trees{'chapter_before_part'}[1]{'extra'}{'section'} = 
$result_trees{'chapter_before_part'}[1]{'contents'}[0];
 $result_trees{'chapter_before_part'}[1]{'extra'}{'unit_command'} = 
$result_trees{'chapter_before_part'}[1]{'contents'}[0];
-$result_trees{'chapter_before_part'}[1]{'unit_prev'} = 
$result_trees{'chapter_before_part'}[0];
+$result_trees{'chapter_before_part'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_before_part'}[0];
 
 $result_texis{'chapter_before_part'} = '@chapter chapter
 
diff --git a/tp/t/results/sectioning/chapter_sections.pl 
b/tp/t/results/sectioning/chapter_sections.pl
index 6bb9182238..99ea8140c7 100644
--- a/tp/t/results/sectioning/chapter_sections.pl
+++ b/tp/t/results/sectioning/chapter_sections.pl
@@ -103,9 +103,10 @@ $result_trees{'chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -152,9 +153,10 @@ $result_trees{'chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -201,9 +203,10 @@ $result_trees{'chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -250,9 +253,10 @@ $result_trees{'chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -299,9 +303,10 @@ $result_trees{'chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -348,9 +353,10 @@ $result_trees{'chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -390,9 +396,10 @@ $result_trees{'chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'chapter_sections'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[0];
@@ -408,48 +415,48 @@ 
$result_trees{'chapter_sections'}[1]{'contents'}[0]{'contents'}[0]{'parent'} = $
 $result_trees{'chapter_sections'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[1];
 $result_trees{'chapter_sections'}[1]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[1]{'contents'}[0];
 $result_trees{'chapter_sections'}[1]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[1]{'contents'}[0];
-$result_trees{'chapter_sections'}[1]{'unit_prev'} = 
$result_trees{'chapter_sections'}[0];
+$result_trees{'chapter_sections'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_sections'}[0];
 
$result_trees{'chapter_sections'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
 $result_trees{'chapter_sections'}[2]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
 $result_trees{'chapter_sections'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[2];
 $result_trees{'chapter_sections'}[2]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
 $result_trees{'chapter_sections'}[2]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[2]{'contents'}[0];
-$result_trees{'chapter_sections'}[2]{'unit_prev'} = 
$result_trees{'chapter_sections'}[1];
+$result_trees{'chapter_sections'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_sections'}[1];
 
$result_trees{'chapter_sections'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[3]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
 $result_trees{'chapter_sections'}[3]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
 $result_trees{'chapter_sections'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[3];
 $result_trees{'chapter_sections'}[3]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
 $result_trees{'chapter_sections'}[3]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[3]{'contents'}[0];
-$result_trees{'chapter_sections'}[3]{'unit_prev'} = 
$result_trees{'chapter_sections'}[2];
+$result_trees{'chapter_sections'}[3]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_sections'}[2];
 
$result_trees{'chapter_sections'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[4]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[4]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
 $result_trees{'chapter_sections'}[4]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
 $result_trees{'chapter_sections'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[4];
 $result_trees{'chapter_sections'}[4]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
 $result_trees{'chapter_sections'}[4]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[4]{'contents'}[0];
-$result_trees{'chapter_sections'}[4]{'unit_prev'} = 
$result_trees{'chapter_sections'}[3];
+$result_trees{'chapter_sections'}[4]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_sections'}[3];
 
$result_trees{'chapter_sections'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[5]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[5]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
 $result_trees{'chapter_sections'}[5]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
 $result_trees{'chapter_sections'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[5];
 $result_trees{'chapter_sections'}[5]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
 $result_trees{'chapter_sections'}[5]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[5]{'contents'}[0];
-$result_trees{'chapter_sections'}[5]{'unit_prev'} = 
$result_trees{'chapter_sections'}[4];
+$result_trees{'chapter_sections'}[5]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_sections'}[4];
 
$result_trees{'chapter_sections'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[6]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[6]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
 $result_trees{'chapter_sections'}[6]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
 $result_trees{'chapter_sections'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[6];
 $result_trees{'chapter_sections'}[6]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
 $result_trees{'chapter_sections'}[6]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[6]{'contents'}[0];
-$result_trees{'chapter_sections'}[6]{'unit_prev'} = 
$result_trees{'chapter_sections'}[5];
+$result_trees{'chapter_sections'}[6]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_sections'}[5];
 
$result_trees{'chapter_sections'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'chapter_sections'}[7]{'contents'}[0]{'args'}[0];
 $result_trees{'chapter_sections'}[7]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[7]{'contents'}[0];
 $result_trees{'chapter_sections'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'chapter_sections'}[7];
 $result_trees{'chapter_sections'}[7]{'extra'}{'section'} = 
$result_trees{'chapter_sections'}[7]{'contents'}[0];
 $result_trees{'chapter_sections'}[7]{'extra'}{'unit_command'} = 
$result_trees{'chapter_sections'}[7]{'contents'}[0];
-$result_trees{'chapter_sections'}[7]{'unit_prev'} = 
$result_trees{'chapter_sections'}[6];
+$result_trees{'chapter_sections'}[7]{'structure'}{'unit_prev'} = 
$result_trees{'chapter_sections'}[6];
 
 $result_texis{'chapter_sections'} = '@unnumbered unnumbered
 
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
index 100e849582..56b2a4093a 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
@@ -686,384 +686,386 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'node' => {},
                         'unit_command' => {}
                       },
-                      'structure' => {},
-                      'type' => 'unit',
-                      'unit_prev' => {
-                        'contents' => [
-                          {
-                            'args' => [
-                              {
-                                'contents' => [
-                                  {
-                                    'parent' => {},
-                                    'text' => 'other nodes'
-                                  }
-                                ],
-                                'parent' => {},
-                                'type' => 'line_arg'
-                              },
-                              {
-                                'contents' => [
-                                  {
-                                    'parent' => {},
-                                    'text' => '!_"#$%&\'()*+-.'
-                                  }
-                                ],
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
-                                'parent' => {},
-                                'type' => 'line_arg'
-                              },
-                              {
-                                'contents' => [
-                                  {
-                                    'parent' => {},
-                                    'text' => 'Top'
-                                  }
-                                ],
-                                'extra' => {
-                                  'spaces_before_argument' => ' '
-                                },
-                                'parent' => {},
-                                'type' => 'line_arg'
-                              },
-                              {
-                                'contents' => [
-                                  {
-                                    'parent' => {},
-                                    'text' => 'Top'
-                                  }
-                                ],
-                                'extra' => {
-                                  'spaces_after_argument' => '
-',
-                                  'spaces_before_argument' => ' '
-                                },
-                                'parent' => {},
-                                'type' => 'line_arg'
-                              }
-                            ],
-                            'cmdname' => 'node',
-                            'contents' => [],
-                            'extra' => {
-                              'node_content' => [
-                                {}
-                              ],
-                              'nodes_manuals' => [
+                      'structure' => {
+                        'unit_prev' => {
+                          'contents' => [
+                            {
+                              'args' => [
                                 {
-                                  'node_content' => [
-                                    {}
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'other nodes'
+                                    }
                                   ],
-                                  'normalized' => 'other-nodes'
+                                  'parent' => {},
+                                  'type' => 'line_arg'
                                 },
                                 {
-                                  'node_content' => [
-                                    {}
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => '!_"#$%&\'()*+-.'
+                                    }
                                   ],
-                                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'parent' => {},
+                                  'type' => 'line_arg'
                                 },
                                 {
-                                  'node_content' => [
-                                    {}
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'Top'
+                                    }
                                   ],
-                                  'normalized' => 'Top'
+                                  'extra' => {
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'parent' => {},
+                                  'type' => 'line_arg'
                                 },
                                 {
-                                  'node_content' => [
-                                    {}
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'Top'
+                                    }
                                   ],
-                                  'normalized' => 'Top'
+                                  'extra' => {
+                                    'spaces_after_argument' => '
+',
+                                    'spaces_before_argument' => ' '
+                                  },
+                                  'parent' => {},
+                                  'type' => 'line_arg'
                                 }
                               ],
-                              'normalized' => 'other-nodes',
-                              'spaces_before_argument' => ' '
-                            },
-                            'line_nr' => {
-                              'file_name' => '',
-                              'line_nr' => 23,
-                              'macro' => ''
-                            },
-                            'parent' => {}
-                          },
-                          {
-                            'args' => [
-                              {
-                                'contents' => [
-                                  {
-                                    'parent' => {},
-                                    'text' => 'Chapter with nodes'
-                                  }
+                              'cmdname' => 'node',
+                              'contents' => [],
+                              'extra' => {
+                                'node_content' => [
+                                  {}
                                 ],
-                                'extra' => {
-                                  'spaces_after_argument' => '
-'
-                                },
-                                'parent' => {},
-                                'type' => 'line_arg'
-                              }
-                            ],
-                            'cmdname' => 'chapter',
-                            'contents' => [
-                              {
-                                'parent' => {},
-                                'text' => '
-',
-                                'type' => 'empty_line'
-                              },
-                              {
-                                'cmdname' => 'menu',
-                                'contents' => [
+                                'nodes_manuals' => [
                                   {
-                                    'extra' => {
-                                      'command' => {}
-                                    },
-                                    'parent' => {},
-                                    'text' => '
-',
-                                    'type' => 'empty_line_after_command'
+                                    'node_content' => [
+                                      {}
+                                    ],
+                                    'normalized' => 'other-nodes'
                                   },
                                   {
-                                    'args' => [
-                                      {
-                                        'parent' => {},
-                                        'text' => '* ',
-                                        'type' => 'menu_entry_leading_text'
-                                      },
-                                      {
-                                        'contents' => [
-                                          {
-                                            'parent' => {},
-                                            'text' => '!_"#$%&\'()*+-.'
-                                          }
-                                        ],
-                                        'parent' => {},
-                                        'type' => 'menu_entry_node'
-                                      },
-                                      {
-                                        'parent' => {},
-                                        'text' => '::',
-                                        'type' => 'menu_entry_separator'
-                                      },
-                                      {
-                                        'contents' => [
-                                          {
-                                            'contents' => [
-                                              {
-                                                'parent' => {},
-                                                'text' => '
-'
-                                              }
-                                            ],
-                                            'parent' => {},
-                                            'type' => 'preformatted'
-                                          }
-                                        ],
-                                        'parent' => {},
-                                        'type' => 'menu_entry_description'
-                                      }
+                                    'node_content' => [
+                                      {}
                                     ],
-                                    'extra' => {
-                                      'menu_entry_description' => {},
-                                      'menu_entry_node' => {
-                                        'node_content' => [
-                                          {}
-                                        ],
-                                        'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
-                                      }
-                                    },
-                                    'line_nr' => {
-                                      'file_name' => '',
-                                      'line_nr' => 27,
-                                      'macro' => ''
-                                    },
-                                    'parent' => {},
-                                    'type' => 'menu_entry'
+                                    'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
                                   },
                                   {
-                                    'args' => [
-                                      {
-                                        'parent' => {},
-                                        'text' => '* ',
-                                        'type' => 'menu_entry_leading_text'
-                                      },
-                                      {
-                                        'contents' => [
-                                          {
-                                            'parent' => {},
-                                            'text' => '/;<=>?[\\]^_`|~'
-                                          }
-                                        ],
-                                        'parent' => {},
-                                        'type' => 'menu_entry_node'
-                                      },
-                                      {
-                                        'parent' => {},
-                                        'text' => '::',
-                                        'type' => 'menu_entry_separator'
-                                      },
-                                      {
-                                        'contents' => [
-                                          {
-                                            'contents' => [
-                                              {
-                                                'parent' => {},
-                                                'text' => '
-'
-                                              }
-                                            ],
-                                            'parent' => {},
-                                            'type' => 'preformatted'
-                                          }
-                                        ],
-                                        'parent' => {},
-                                        'type' => 'menu_entry_description'
-                                      }
+                                    'node_content' => [
+                                      {}
                                     ],
-                                    'extra' => {
-                                      'menu_entry_description' => {},
-                                      'menu_entry_node' => {
-                                        'node_content' => [
-                                          {}
-                                        ],
-                                        'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
-                                      }
-                                    },
-                                    'line_nr' => {
-                                      'file_name' => '',
-                                      'line_nr' => 28,
-                                      'macro' => ''
-                                    },
-                                    'parent' => {},
-                                    'type' => 'menu_entry'
+                                    'normalized' => 'Top'
                                   },
                                   {
-                                    'args' => [
-                                      {
-                                        'parent' => {},
-                                        'text' => '* ',
-                                        'type' => 'menu_entry_leading_text'
+                                    'node_content' => [
+                                      {}
+                                    ],
+                                    'normalized' => 'Top'
+                                  }
+                                ],
+                                'normalized' => 'other-nodes',
+                                'spaces_before_argument' => ' '
+                              },
+                              'line_nr' => {
+                                'file_name' => '',
+                                'line_nr' => 23,
+                                'macro' => ''
+                              },
+                              'parent' => {}
+                            },
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [
+                                    {
+                                      'parent' => {},
+                                      'text' => 'Chapter with nodes'
+                                    }
+                                  ],
+                                  'extra' => {
+                                    'spaces_after_argument' => '
+'
+                                  },
+                                  'parent' => {},
+                                  'type' => 'line_arg'
+                                }
+                              ],
+                              'cmdname' => 'chapter',
+                              'contents' => [
+                                {
+                                  'parent' => {},
+                                  'text' => '
+',
+                                  'type' => 'empty_line'
+                                },
+                                {
+                                  'cmdname' => 'menu',
+                                  'contents' => [
+                                    {
+                                      'extra' => {
+                                        'command' => {}
                                       },
-                                      {
-                                        'contents' => [
-                                          {
-                                            'parent' => {},
-                                            'text' => 'local node'
-                                          }
-                                        ],
-                                        'parent' => {},
-                                        'type' => 'menu_entry_node'
+                                      'parent' => {},
+                                      'text' => '
+',
+                                      'type' => 'empty_line_after_command'
+                                    },
+                                    {
+                                      'args' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => '* ',
+                                          'type' => 'menu_entry_leading_text'
+                                        },
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => '!_"#$%&\'()*+-.'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'menu_entry_node'
+                                        },
+                                        {
+                                          'parent' => {},
+                                          'text' => '::',
+                                          'type' => 'menu_entry_separator'
+                                        },
+                                        {
+                                          'contents' => [
+                                            {
+                                              'contents' => [
+                                                {
+                                                  'parent' => {},
+                                                  'text' => '
+'
+                                                }
+                                              ],
+                                              'parent' => {},
+                                              'type' => 'preformatted'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'menu_entry_description'
+                                        }
+                                      ],
+                                      'extra' => {
+                                        'menu_entry_description' => {},
+                                        'menu_entry_node' => {
+                                          'node_content' => [
+                                            {}
+                                          ],
+                                          'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                                        }
                                       },
-                                      {
-                                        'parent' => {},
-                                        'text' => '::',
-                                        'type' => 'menu_entry_separator'
+                                      'line_nr' => {
+                                        'file_name' => '',
+                                        'line_nr' => 27,
+                                        'macro' => ''
                                       },
-                                      {
-                                        'contents' => [
-                                          {
-                                            'contents' => [
-                                              {
-                                                'parent' => {},
-                                                'text' => '
-'
-                                              }
-                                            ],
-                                            'parent' => {},
-                                            'type' => 'preformatted'
-                                          }
-                                        ],
-                                        'parent' => {},
-                                        'type' => 'menu_entry_description'
-                                      }
-                                    ],
-                                    'extra' => {
-                                      'menu_entry_description' => {},
-                                      'menu_entry_node' => {
-                                        'node_content' => [
-                                          {}
-                                        ],
-                                        'normalized' => 'local-node'
-                                      }
-                                    },
-                                    'line_nr' => {
-                                      'file_name' => '',
-                                      'line_nr' => 29,
-                                      'macro' => ''
+                                      'parent' => {},
+                                      'type' => 'menu_entry'
                                     },
-                                    'parent' => {},
-                                    'type' => 'menu_entry'
-                                  },
-                                  {
-                                    'args' => [
-                                      {
-                                        'contents' => [
-                                          {
-                                            'parent' => {},
-                                            'text' => 'menu'
-                                          }
-                                        ],
-                                        'extra' => {
-                                          'spaces_after_argument' => '
-'
+                                    {
+                                      'args' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => '* ',
+                                          'type' => 'menu_entry_leading_text'
                                         },
-                                        'parent' => {},
-                                        'type' => 'line_arg'
-                                      }
-                                    ],
-                                    'cmdname' => 'end',
-                                    'extra' => {
-                                      'command_argument' => 'menu',
-                                      'spaces_before_argument' => ' ',
-                                      'text_arg' => 'menu'
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => '/;<=>?[\\]^_`|~'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'menu_entry_node'
+                                        },
+                                        {
+                                          'parent' => {},
+                                          'text' => '::',
+                                          'type' => 'menu_entry_separator'
+                                        },
+                                        {
+                                          'contents' => [
+                                            {
+                                              'contents' => [
+                                                {
+                                                  'parent' => {},
+                                                  'text' => '
+'
+                                                }
+                                              ],
+                                              'parent' => {},
+                                              'type' => 'preformatted'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'menu_entry_description'
+                                        }
+                                      ],
+                                      'extra' => {
+                                        'menu_entry_description' => {},
+                                        'menu_entry_node' => {
+                                          'node_content' => [
+                                            {}
+                                          ],
+                                          'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                                        }
+                                      },
+                                      'line_nr' => {
+                                        'file_name' => '',
+                                        'line_nr' => 28,
+                                        'macro' => ''
+                                      },
+                                      'parent' => {},
+                                      'type' => 'menu_entry'
                                     },
-                                    'line_nr' => {
-                                      'file_name' => '',
-                                      'line_nr' => 30,
-                                      'macro' => ''
+                                    {
+                                      'args' => [
+                                        {
+                                          'parent' => {},
+                                          'text' => '* ',
+                                          'type' => 'menu_entry_leading_text'
+                                        },
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => 'local node'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'menu_entry_node'
+                                        },
+                                        {
+                                          'parent' => {},
+                                          'text' => '::',
+                                          'type' => 'menu_entry_separator'
+                                        },
+                                        {
+                                          'contents' => [
+                                            {
+                                              'contents' => [
+                                                {
+                                                  'parent' => {},
+                                                  'text' => '
+'
+                                                }
+                                              ],
+                                              'parent' => {},
+                                              'type' => 'preformatted'
+                                            }
+                                          ],
+                                          'parent' => {},
+                                          'type' => 'menu_entry_description'
+                                        }
+                                      ],
+                                      'extra' => {
+                                        'menu_entry_description' => {},
+                                        'menu_entry_node' => {
+                                          'node_content' => [
+                                            {}
+                                          ],
+                                          'normalized' => 'local-node'
+                                        }
+                                      },
+                                      'line_nr' => {
+                                        'file_name' => '',
+                                        'line_nr' => 29,
+                                        'macro' => ''
+                                      },
+                                      'parent' => {},
+                                      'type' => 'menu_entry'
                                     },
-                                    'parent' => {}
-                                  }
-                                ],
-                                'extra' => {
-                                  'end_command' => {}
-                                },
-                                'line_nr' => {
-                                  'file_name' => '',
-                                  'line_nr' => 26,
-                                  'macro' => ''
+                                    {
+                                      'args' => [
+                                        {
+                                          'contents' => [
+                                            {
+                                              'parent' => {},
+                                              'text' => 'menu'
+                                            }
+                                          ],
+                                          'extra' => {
+                                            'spaces_after_argument' => '
+'
+                                          },
+                                          'parent' => {},
+                                          'type' => 'line_arg'
+                                        }
+                                      ],
+                                      'cmdname' => 'end',
+                                      'extra' => {
+                                        'command_argument' => 'menu',
+                                        'spaces_before_argument' => ' ',
+                                        'text_arg' => 'menu'
+                                      },
+                                      'line_nr' => {
+                                        'file_name' => '',
+                                        'line_nr' => 30,
+                                        'macro' => ''
+                                      },
+                                      'parent' => {}
+                                    }
+                                  ],
+                                  'extra' => {
+                                    'end_command' => {}
+                                  },
+                                  'line_nr' => {
+                                    'file_name' => '',
+                                    'line_nr' => 26,
+                                    'macro' => ''
+                                  },
+                                  'parent' => {}
                                 },
-                                'parent' => {}
-                              },
-                              {
-                                'parent' => {},
-                                'text' => '
+                                {
+                                  'parent' => {},
+                                  'text' => '
 ',
-                                'type' => 'empty_line'
-                              }
-                            ],
-                            'extra' => {
-                              'spaces_before_argument' => ' '
-                            },
-                            'level' => 1,
-                            'line_nr' => {
-                              'file_name' => '',
-                              'line_nr' => 24,
-                              'macro' => ''
-                            },
-                            'number' => 1,
-                            'parent' => {}
-                          }
-                        ],
-                        'extra' => {
-                          'node' => {},
-                          'section' => {},
-                          'unit_command' => {}
-                        },
-                        'structure' => {},
-                        'type' => 'unit',
-                        'unit_prev' => {}
-                      }
+                                  'type' => 'empty_line'
+                                }
+                              ],
+                              'extra' => {
+                                'spaces_before_argument' => ' '
+                              },
+                              'level' => 1,
+                              'line_nr' => {
+                                'file_name' => '',
+                                'line_nr' => 24,
+                                'macro' => ''
+                              },
+                              'number' => 1,
+                              'parent' => {}
+                            }
+                          ],
+                          'extra' => {
+                            'node' => {},
+                            'section' => {},
+                            'unit_command' => {}
+                          },
+                          'structure' => {
+                            'unit_prev' => {}
+                          },
+                          'type' => 'unit'
+                        }
+                      },
+                      'type' => 'unit'
                     }
                   },
                   'node_argument' => {
@@ -1204,9 +1206,10 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'node' => {},
                         'unit_command' => {}
                       },
-                      'structure' => {},
-                      'type' => 'unit',
-                      'unit_prev' => {}
+                      'structure' => {
+                        'unit_prev' => {}
+                      },
+                      'type' => 'unit'
                     }
                   },
                   'node_argument' => {
@@ -1390,9 +1393,10 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                         'node' => {},
                         'unit_command' => {}
                       },
-                      'structure' => {},
-                      'type' => 'unit',
-                      'unit_prev' => {}
+                      'structure' => {
+                        'unit_prev' => {}
+                      },
+                      'type' => 'unit'
                     }
                   },
                   'node_argument' => {
@@ -1551,66 +1555,66 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'extra'}{'section'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'contents'}[0];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'}{'unit_prev'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[1]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[2]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[2]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'args'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'extra'}{'section'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'contents'}[0];
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}{'structure'}{'unit_prev'}
 = $result_trees{'character_and_spaces_in_refs_out'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
@@ -1633,7 +1637,7 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'contents'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'unit_prev'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
@@ -1662,7 +1666,7 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'extra'}{'node'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'extra'}{'unit_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'};
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'unit_prev'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'};
+$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'};
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'node_argument'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[7]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9];
@@ -1672,7 +1676,7 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'parent'} =
 $result_trees{'character_and_spaces_in_refs_out'}[0]{'extra'}{'node'} = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1];
 $result_trees{'character_and_spaces_in_refs_out'}[0]{'extra'}{'section'} = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2];
 $result_trees{'character_and_spaces_in_refs_out'}[0]{'extra'}{'unit_command'} 
= $result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[1] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'unit_prev'};
+$result_trees{'character_and_spaces_in_refs_out'}[1] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'}{'structure'}{'unit_prev'};
 $result_trees{'character_and_spaces_in_refs_out'}[2] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[0]{'extra'}{'label'}{'parent'};
 $result_trees{'character_and_spaces_in_refs_out'}[3] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[2]{'extra'}{'label'}{'parent'};
 $result_trees{'character_and_spaces_in_refs_out'}[4] = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[2]{'contents'}[9]{'contents'}[6]{'extra'}{'label'}{'parent'};
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index a598559025..d4bd334c11 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -911,9 +911,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1288,9 +1289,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1378,9 +1380,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1468,9 +1471,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1558,9 +1562,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1648,9 +1653,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1854,9 +1860,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1950,9 +1957,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2134,9 +2142,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2304,9 +2313,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2411,9 +2421,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2693,9 +2704,10 @@ $result_trees{'complex'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'complex'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'complex'}[0];
@@ -2847,7 +2859,7 @@ $result_trees{'complex'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[1]{'extra'}{'node'} = 
$result_trees{'complex'}[1]{'contents'}[0];
 $result_trees{'complex'}[1]{'extra'}{'section'} = 
$result_trees{'complex'}[1]{'contents'}[1];
 $result_trees{'complex'}[1]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[1]{'contents'}[1];
-$result_trees{'complex'}[1]{'unit_prev'} = $result_trees{'complex'}[0];
+$result_trees{'complex'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[0];
 $result_trees{'complex'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[2]{'contents'}[0];
 $result_trees{'complex'}[2]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2908,7 +2920,7 @@ $result_trees{'complex'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[2]{'extra'}{'node'} = 
$result_trees{'complex'}[2]{'contents'}[0];
 $result_trees{'complex'}[2]{'extra'}{'section'} = 
$result_trees{'complex'}[2]{'contents'}[1];
 $result_trees{'complex'}[2]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[2]{'contents'}[1];
-$result_trees{'complex'}[2]{'unit_prev'} = $result_trees{'complex'}[1];
+$result_trees{'complex'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[1];
 $result_trees{'complex'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[3]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[3]{'contents'}[0];
 $result_trees{'complex'}[3]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2921,7 +2933,7 @@ $result_trees{'complex'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[3]{'extra'}{'node'} = 
$result_trees{'complex'}[3]{'contents'}[0];
 $result_trees{'complex'}[3]{'extra'}{'section'} = 
$result_trees{'complex'}[3]{'contents'}[1];
 $result_trees{'complex'}[3]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[3]{'contents'}[1];
-$result_trees{'complex'}[3]{'unit_prev'} = $result_trees{'complex'}[2];
+$result_trees{'complex'}[3]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[2];
 $result_trees{'complex'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[4]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[4]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[4]{'contents'}[0];
 $result_trees{'complex'}[4]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2934,7 +2946,7 @@ $result_trees{'complex'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[4]{'extra'}{'node'} = 
$result_trees{'complex'}[4]{'contents'}[0];
 $result_trees{'complex'}[4]{'extra'}{'section'} = 
$result_trees{'complex'}[4]{'contents'}[1];
 $result_trees{'complex'}[4]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[4]{'contents'}[1];
-$result_trees{'complex'}[4]{'unit_prev'} = $result_trees{'complex'}[3];
+$result_trees{'complex'}[4]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[3];
 $result_trees{'complex'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[5]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[5]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[5]{'contents'}[0];
 $result_trees{'complex'}[5]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2947,7 +2959,7 @@ $result_trees{'complex'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[5]{'extra'}{'node'} = 
$result_trees{'complex'}[5]{'contents'}[0];
 $result_trees{'complex'}[5]{'extra'}{'section'} = 
$result_trees{'complex'}[5]{'contents'}[1];
 $result_trees{'complex'}[5]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[5]{'contents'}[1];
-$result_trees{'complex'}[5]{'unit_prev'} = $result_trees{'complex'}[4];
+$result_trees{'complex'}[5]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[4];
 $result_trees{'complex'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[6]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[6]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[6]{'contents'}[0];
 $result_trees{'complex'}[6]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2960,7 +2972,7 @@ $result_trees{'complex'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[6]{'extra'}{'node'} = 
$result_trees{'complex'}[6]{'contents'}[0];
 $result_trees{'complex'}[6]{'extra'}{'section'} = 
$result_trees{'complex'}[6]{'contents'}[1];
 $result_trees{'complex'}[6]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[6]{'contents'}[1];
-$result_trees{'complex'}[6]{'unit_prev'} = $result_trees{'complex'}[5];
+$result_trees{'complex'}[6]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[5];
 $result_trees{'complex'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[7]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[7]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[7]{'contents'}[0];
 $result_trees{'complex'}[7]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2991,7 +3003,7 @@ $result_trees{'complex'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[7]{'extra'}{'node'} = 
$result_trees{'complex'}[7]{'contents'}[0];
 $result_trees{'complex'}[7]{'extra'}{'section'} = 
$result_trees{'complex'}[7]{'contents'}[1];
 $result_trees{'complex'}[7]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[7]{'contents'}[1];
-$result_trees{'complex'}[7]{'unit_prev'} = $result_trees{'complex'}[6];
+$result_trees{'complex'}[7]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[6];
 $result_trees{'complex'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[8]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[8]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[8]{'contents'}[0];
 $result_trees{'complex'}[8]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3005,7 +3017,7 @@ $result_trees{'complex'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[8]{'extra'}{'node'} = 
$result_trees{'complex'}[8]{'contents'}[0];
 $result_trees{'complex'}[8]{'extra'}{'section'} = 
$result_trees{'complex'}[8]{'contents'}[1];
 $result_trees{'complex'}[8]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[8]{'contents'}[1];
-$result_trees{'complex'}[8]{'unit_prev'} = $result_trees{'complex'}[7];
+$result_trees{'complex'}[8]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[7];
 $result_trees{'complex'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[9]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[9]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[9]{'contents'}[0];
 $result_trees{'complex'}[9]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3032,7 +3044,7 @@ $result_trees{'complex'}[9]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}[
 $result_trees{'complex'}[9]{'extra'}{'node'} = 
$result_trees{'complex'}[9]{'contents'}[0];
 $result_trees{'complex'}[9]{'extra'}{'section'} = 
$result_trees{'complex'}[9]{'contents'}[1];
 $result_trees{'complex'}[9]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[9]{'contents'}[1];
-$result_trees{'complex'}[9]{'unit_prev'} = $result_trees{'complex'}[8];
+$result_trees{'complex'}[9]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[8];
 
$result_trees{'complex'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[10]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[10]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[10]{'contents'}[0];
 
$result_trees{'complex'}[10]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[10]{'contents'}[0]{'args'}[1];
@@ -3059,7 +3071,7 @@ $result_trees{'complex'}[10]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}
 $result_trees{'complex'}[10]{'extra'}{'node'} = 
$result_trees{'complex'}[10]{'contents'}[0];
 $result_trees{'complex'}[10]{'extra'}{'section'} = 
$result_trees{'complex'}[10]{'contents'}[1];
 $result_trees{'complex'}[10]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[10]{'contents'}[1];
-$result_trees{'complex'}[10]{'unit_prev'} = $result_trees{'complex'}[9];
+$result_trees{'complex'}[10]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[9];
 
$result_trees{'complex'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[11]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[11]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[11]{'contents'}[0];
 $result_trees{'complex'}[11]{'contents'}[0]{'extra'}{'node_content'}[0] = 
$result_trees{'complex'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3075,7 +3087,7 @@ $result_trees{'complex'}[11]{'contents'}[1]{'parent'} = 
$result_trees{'complex'}
 $result_trees{'complex'}[11]{'extra'}{'node'} = 
$result_trees{'complex'}[11]{'contents'}[0];
 $result_trees{'complex'}[11]{'extra'}{'section'} = 
$result_trees{'complex'}[11]{'contents'}[1];
 $result_trees{'complex'}[11]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[11]{'contents'}[1];
-$result_trees{'complex'}[11]{'unit_prev'} = $result_trees{'complex'}[10];
+$result_trees{'complex'}[11]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[10];
 
$result_trees{'complex'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[12]{'contents'}[0]{'args'}[0];
 $result_trees{'complex'}[12]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'complex'}[12]{'contents'}[0];
 
$result_trees{'complex'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'complex'}[12]{'contents'}[0]{'args'}[1];
@@ -3118,7 +3130,7 @@ $result_trees{'complex'}[12]{'contents'}[3]{'parent'} = 
$result_trees{'complex'}
 $result_trees{'complex'}[12]{'extra'}{'node'} = 
$result_trees{'complex'}[12]{'contents'}[0];
 $result_trees{'complex'}[12]{'extra'}{'section'} = 
$result_trees{'complex'}[12]{'contents'}[1];
 $result_trees{'complex'}[12]{'extra'}{'unit_command'} = 
$result_trees{'complex'}[12]{'contents'}[1];
-$result_trees{'complex'}[12]{'unit_prev'} = $result_trees{'complex'}[11];
+$result_trees{'complex'}[12]{'structure'}{'unit_prev'} = 
$result_trees{'complex'}[11];
 
 $result_texis{'complex'} = '@node Top,First node,(dir)
 @top
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index 615ed0bbe2..843db4a4ab 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -911,9 +911,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1288,9 +1289,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1378,9 +1380,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1468,9 +1471,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1558,9 +1562,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1648,9 +1653,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1854,9 +1860,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -1950,9 +1957,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2041,9 +2049,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2145,9 +2154,10 @@ $result_trees{'complex_split_at_node'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2315,9 +2325,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2422,9 +2433,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2589,9 +2601,10 @@ $result_trees{'complex_split_at_node'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -2715,9 +2728,10 @@ $result_trees{'complex_split_at_node'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'complex_split_at_node'}[0];
@@ -2869,7 +2883,7 @@ 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[1]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[1]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[1]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[1]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[1]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[0];
+$result_trees{'complex_split_at_node'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[0];
 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[2]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2930,7 +2944,7 @@ 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[2]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[2]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[2]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[2]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[2]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[1];
+$result_trees{'complex_split_at_node'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[1];
 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[3]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2943,7 +2957,7 @@ 
$result_trees{'complex_split_at_node'}[3]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[3]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[3]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[3]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[3]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[3]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[2];
+$result_trees{'complex_split_at_node'}[3]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[2];
 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[4]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2956,7 +2970,7 @@ 
$result_trees{'complex_split_at_node'}[4]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[4]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[4]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[4]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[4]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[4]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[3];
+$result_trees{'complex_split_at_node'}[4]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[3];
 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[5]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2969,7 +2983,7 @@ 
$result_trees{'complex_split_at_node'}[5]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[5]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[5]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[5]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[5]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[5]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[4];
+$result_trees{'complex_split_at_node'}[5]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[4];
 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[6]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2982,7 +2996,7 @@ 
$result_trees{'complex_split_at_node'}[6]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[6]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[6]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[6]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[6]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[6]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[5];
+$result_trees{'complex_split_at_node'}[6]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[5];
 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[7]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3013,7 +3027,7 @@ 
$result_trees{'complex_split_at_node'}[7]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[7]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[7]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[7]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[7]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[7]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[6];
+$result_trees{'complex_split_at_node'}[7]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[6];
 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[8]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3027,7 +3041,7 @@ 
$result_trees{'complex_split_at_node'}[8]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[8]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[8]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[8]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[8]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[8]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[7];
+$result_trees{'complex_split_at_node'}[8]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[7];
 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[9]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3040,7 +3054,7 @@ 
$result_trees{'complex_split_at_node'}[9]{'contents'}[1]{'parent'} = $result_tre
 $result_trees{'complex_split_at_node'}[9]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[9]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[9]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[9]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[9]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[8];
+$result_trees{'complex_split_at_node'}[9]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[8];
 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[10]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'args'}[1]{'parent'} 
= $result_trees{'complex_split_at_node'}[10]{'contents'}[0];
@@ -3057,7 +3071,7 @@ 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'extra'}{'nodes_manual
 $result_trees{'complex_split_at_node'}[10]{'contents'}[0]{'parent'} = 
$result_trees{'complex_split_at_node'}[10];
 $result_trees{'complex_split_at_node'}[10]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[10]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[10]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[10]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[9];
+$result_trees{'complex_split_at_node'}[10]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[9];
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[11]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[11]{'contents'}[0]{'args'}[1];
@@ -3084,7 +3098,7 @@ 
$result_trees{'complex_split_at_node'}[11]{'contents'}[1]{'parent'} = $result_tr
 $result_trees{'complex_split_at_node'}[11]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[11]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[11]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[11]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[11]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[10];
+$result_trees{'complex_split_at_node'}[11]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[10];
 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[12]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3100,7 +3114,7 @@ 
$result_trees{'complex_split_at_node'}[12]{'contents'}[1]{'parent'} = $result_tr
 $result_trees{'complex_split_at_node'}[12]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[12]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[12]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[12]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[12]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[11];
+$result_trees{'complex_split_at_node'}[12]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[11];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[13]{'contents'}[0];
 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[13]{'contents'}[0]{'args'}[1];
@@ -3126,7 +3140,7 @@ 
$result_trees{'complex_split_at_node'}[13]{'contents'}[1]{'parent'} = $result_tr
 $result_trees{'complex_split_at_node'}[13]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[13]{'extra'}{'section'} = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[1];
 $result_trees{'complex_split_at_node'}[13]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[13]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[13]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[12];
+$result_trees{'complex_split_at_node'}[13]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[12];
 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[0];
 $result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'complex_split_at_node'}[14]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[14]{'contents'}[0]{'args'}[1]{'parent'} 
= $result_trees{'complex_split_at_node'}[14]{'contents'}[0];
@@ -3146,7 +3160,7 @@ 
$result_trees{'complex_split_at_node'}[14]{'contents'}[1]{'args'}[0]{'parent'} =
 $result_trees{'complex_split_at_node'}[14]{'contents'}[1]{'parent'} = 
$result_trees{'complex_split_at_node'}[14];
 $result_trees{'complex_split_at_node'}[14]{'extra'}{'node'} = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0];
 $result_trees{'complex_split_at_node'}[14]{'extra'}{'unit_command'} = 
$result_trees{'complex_split_at_node'}[14]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[14]{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[13];
+$result_trees{'complex_split_at_node'}[14]{'structure'}{'unit_prev'} = 
$result_trees{'complex_split_at_node'}[13];
 
 $result_texis{'complex_split_at_node'} = '@node Top,First node,(dir)
 @top
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 455a48aefe..fe4daacedc 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -273,9 +273,10 @@ $result_trees{'double_part'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -414,9 +415,10 @@ $result_trees{'double_part'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'double_part'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'double_part'}[0];
@@ -460,7 +462,7 @@ $result_trees{'double_part'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'double
 $result_trees{'double_part'}[1]{'extra'}{'first_in_page'} = 
$result_trees{'double_part'}[1];
 $result_trees{'double_part'}[1]{'extra'}{'section'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
 $result_trees{'double_part'}[1]{'extra'}{'unit_command'} = 
$result_trees{'double_part'}[1]{'contents'}[0];
-$result_trees{'double_part'}[1]{'unit_prev'} = $result_trees{'double_part'}[0];
+$result_trees{'double_part'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'double_part'}[0];
 
$result_trees{'double_part'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_part'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'double_part'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'double_part'}[2]{'contents'}[0];
 
$result_trees{'double_part'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_part'}[2]{'contents'}[0]{'contents'}[0];
@@ -481,7 +483,7 @@ $result_trees{'double_part'}[2]{'extra'}{'first_in_page'} = 
$result_trees{'doubl
 $result_trees{'double_part'}[2]{'extra'}{'node'} = 
$result_trees{'double_part'}[2]{'contents'}[1];
 $result_trees{'double_part'}[2]{'extra'}{'section'} = 
$result_trees{'double_part'}[2]{'contents'}[2];
 $result_trees{'double_part'}[2]{'extra'}{'unit_command'} = 
$result_trees{'double_part'}[2]{'contents'}[2];
-$result_trees{'double_part'}[2]{'unit_prev'} = $result_trees{'double_part'}[1];
+$result_trees{'double_part'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'double_part'}[1];
 
 $result_texis{'double_part'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 4544f23a5d..e53c469b61 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -370,9 +370,10 @@ $result_trees{'explicit_node_directions'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -460,9 +461,10 @@ $result_trees{'explicit_node_directions'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'explicit_node_directions'}[0];
@@ -523,7 +525,7 @@ 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'extra'}{'nodes_manu
 $result_trees{'explicit_node_directions'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'explicit_node_directions'}[1];
 $result_trees{'explicit_node_directions'}[1]{'extra'}{'node'} = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[1]{'extra'}{'unit_command'} = 
$result_trees{'explicit_node_directions'}[1]{'contents'}[0];
-$result_trees{'explicit_node_directions'}[1]{'unit_prev'} = 
$result_trees{'explicit_node_directions'}[0];
+$result_trees{'explicit_node_directions'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'explicit_node_directions'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'explicit_node_directions'}[2]{'contents'}[0];
 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'explicit_node_directions'}[2]{'contents'}[0];
@@ -538,7 +540,7 @@ 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'extra'}{'nodes_manu
 $result_trees{'explicit_node_directions'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'explicit_node_directions'}[2];
 $result_trees{'explicit_node_directions'}[2]{'extra'}{'node'} = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0];
 $result_trees{'explicit_node_directions'}[2]{'extra'}{'unit_command'} = 
$result_trees{'explicit_node_directions'}[2]{'contents'}[0];
-$result_trees{'explicit_node_directions'}[2]{'unit_prev'} = 
$result_trees{'explicit_node_directions'}[1];
+$result_trees{'explicit_node_directions'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'explicit_node_directions'}[1];
 
 $result_texis{'explicit_node_directions'} = '@node Top
 Top node
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index acfa8b6180..aca60e4de9 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -264,9 +264,10 @@ $result_trees{'internal_top_node_up'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'internal_top_node_up'}[0];
@@ -307,7 +308,7 @@ 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'
 $result_trees{'internal_top_node_up'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'internal_top_node_up'}[1];
 $result_trees{'internal_top_node_up'}[1]{'extra'}{'node'} = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0];
 $result_trees{'internal_top_node_up'}[1]{'extra'}{'unit_command'} = 
$result_trees{'internal_top_node_up'}[1]{'contents'}[0];
-$result_trees{'internal_top_node_up'}[1]{'unit_prev'} = 
$result_trees{'internal_top_node_up'}[0];
+$result_trees{'internal_top_node_up'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'internal_top_node_up'}[0];
 
 $result_texis{'internal_top_node_up'} = '@node Top
 @top internal top node up
diff --git a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl 
b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
index e81c2810d3..76fd4fbd1c 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -367,9 +367,10 @@ $result_trees{'node_part_chapter_after_chapter'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -513,9 +514,10 @@ $result_trees{'node_part_chapter_after_chapter'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'node_part_chapter_after_chapter'}[0];
@@ -572,7 +574,7 @@ 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1]{'parent'} = $
 $result_trees{'node_part_chapter_after_chapter'}[1]{'extra'}{'node'} = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[0];
 $result_trees{'node_part_chapter_after_chapter'}[1]{'extra'}{'section'} = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1];
 $result_trees{'node_part_chapter_after_chapter'}[1]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[1]{'contents'}[1];
-$result_trees{'node_part_chapter_after_chapter'}[1]{'unit_prev'} = 
$result_trees{'node_part_chapter_after_chapter'}[0];
+$result_trees{'node_part_chapter_after_chapter'}[1]{'structure'}{'unit_prev'} 
= $result_trees{'node_part_chapter_after_chapter'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -592,7 +594,7 @@ 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2]{'parent'} = $
 $result_trees{'node_part_chapter_after_chapter'}[2]{'extra'}{'node'} = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[0];
 $result_trees{'node_part_chapter_after_chapter'}[2]{'extra'}{'section'} = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2];
 $result_trees{'node_part_chapter_after_chapter'}[2]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_chapter'}[2]{'contents'}[2];
-$result_trees{'node_part_chapter_after_chapter'}[2]{'unit_prev'} = 
$result_trees{'node_part_chapter_after_chapter'}[1];
+$result_trees{'node_part_chapter_after_chapter'}[2]{'structure'}{'unit_prev'} 
= $result_trees{'node_part_chapter_after_chapter'}[1];
 
 $result_texis{'node_part_chapter_after_chapter'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/node_part_chapter_after_top.pl 
b/tp/t/results/sectioning/node_part_chapter_after_top.pl
index 16d7eb844d..2140784e9d 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -334,9 +334,10 @@ $result_trees{'node_part_chapter_after_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'node_part_chapter_after_top'}[0];
@@ -386,7 +387,7 @@ 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2]{'parent'} = $resu
 $result_trees{'node_part_chapter_after_top'}[1]{'extra'}{'node'} = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[0];
 $result_trees{'node_part_chapter_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2];
 $result_trees{'node_part_chapter_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'node_part_chapter_after_top'}[1]{'contents'}[2];
-$result_trees{'node_part_chapter_after_top'}[1]{'unit_prev'} = 
$result_trees{'node_part_chapter_after_top'}[0];
+$result_trees{'node_part_chapter_after_top'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'node_part_chapter_after_top'}[0];
 
 $result_texis{'node_part_chapter_after_top'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index de67a7b843..636f515e61 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -310,9 +310,10 @@ $result_trees{'node_up_external_node'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'node_up_external_node'}[0];
@@ -364,7 +365,7 @@ 
$result_trees{'node_up_external_node'}[1]{'contents'}[0]{'extra'}{'nodes_manuals
 $result_trees{'node_up_external_node'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'node_up_external_node'}[1];
 $result_trees{'node_up_external_node'}[1]{'extra'}{'node'} = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0];
 $result_trees{'node_up_external_node'}[1]{'extra'}{'unit_command'} = 
$result_trees{'node_up_external_node'}[1]{'contents'}[0];
-$result_trees{'node_up_external_node'}[1]{'unit_prev'} = 
$result_trees{'node_up_external_node'}[0];
+$result_trees{'node_up_external_node'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'node_up_external_node'}[0];
 
 $result_texis{'node_up_external_node'} = '@node Top
 
diff --git a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
index 21b7e4c0e0..38f02eaecc 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
@@ -370,9 +370,10 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -492,9 +493,10 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[0];
@@ -555,7 +557,7 @@ 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'extra'}
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[1];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'unit_prev'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[1]{'structure'}{'unit_prev'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
@@ -574,7 +576,7 @@ 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[1]{'parent'
 $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
 $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'extra'}{'section'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'unit_prev'} = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[1];
+$result_trees{'nodes_after_top_before_chapter_nodes'}[2]{'structure'}{'unit_prev'}
 = $result_trees{'nodes_after_top_before_chapter_nodes'}[1];
 
 $result_texis{'nodes_after_top_before_chapter_nodes'} = '@node Top
 Top node
diff --git a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl 
b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
index 3552b5a3c8..c1c03428a6 100644
--- a/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
+++ b/tp/t/results/sectioning/nodes_after_top_before_section_nodes.pl
@@ -370,9 +370,10 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -492,9 +493,10 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[0];
@@ -555,7 +557,7 @@ 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'extra'}
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[1];
 $result_trees{'nodes_after_top_before_section_nodes'}[1]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[1]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[1]{'unit_prev'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[0];
+$result_trees{'nodes_after_top_before_section_nodes'}[1]{'structure'}{'unit_prev'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
@@ -574,7 +576,7 @@ 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[1]{'parent'
 $result_trees{'nodes_after_top_before_section_nodes'}[2]{'extra'}{'node'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
 $result_trees{'nodes_after_top_before_section_nodes'}[2]{'extra'}{'section'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_nodes'}[2]{'extra'}{'unit_command'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[2]{'contents'}[0];
-$result_trees{'nodes_after_top_before_section_nodes'}[2]{'unit_prev'} = 
$result_trees{'nodes_after_top_before_section_nodes'}[1];
+$result_trees{'nodes_after_top_before_section_nodes'}[2]{'structure'}{'unit_prev'}
 = $result_trees{'nodes_after_top_before_section_nodes'}[1];
 
 $result_texis{'nodes_after_top_before_section_nodes'} = '@node Top
 Top node
diff --git a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl 
b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
index 64f5590200..68cd1b3fcc 100644
--- a/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
+++ b/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl
@@ -329,9 +329,10 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[0];
@@ -386,7 +387,7 @@ 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'extra'
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[1];
 $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'extra'}{'node'} = 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'extra'}{'unit_command'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[1]{'contents'}[0];
-$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'unit_prev'} = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0];
+$result_trees{'nodes_no_node_top_explicit_directions'}[1]{'structure'}{'unit_prev'}
 = $result_trees{'nodes_no_node_top_explicit_directions'}[0];
 
 $result_texis{'nodes_no_node_top_explicit_directions'} = '@node first,,,(dir)
 first node
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index aa5bd3e4bb..a6e94cf37d 100644
--- a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -547,9 +547,10 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'non_automatic_internal_top_node_up'}[0];
@@ -635,7 +636,7 @@ 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'extra'}{'
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'non_automatic_internal_top_node_up'}[1];
 $result_trees{'non_automatic_internal_top_node_up'}[1]{'extra'}{'node'} = 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[1]{'extra'}{'unit_command'} 
= $result_trees{'non_automatic_internal_top_node_up'}[1]{'contents'}[0];
-$result_trees{'non_automatic_internal_top_node_up'}[1]{'unit_prev'} = 
$result_trees{'non_automatic_internal_top_node_up'}[0];
+$result_trees{'non_automatic_internal_top_node_up'}[1]{'structure'}{'unit_prev'}
 = $result_trees{'non_automatic_internal_top_node_up'}[0];
 
 $result_texis{'non_automatic_internal_top_node_up'} = '@node Top, first, 
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals, @acronym{GNU, 
@acronym{GNU}\'s Not Unix} manuals
 @top internal top node up
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index 3dac716a22..dafc11c048 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -547,9 +547,10 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[0];
@@ -635,7 +636,7 @@ 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'extra'}{'n
 $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[1];
 $result_trees{'non_automatic_top_node_up_and_url'}[1]{'extra'}{'node'} = 
$result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
 $result_trees{'non_automatic_top_node_up_and_url'}[1]{'extra'}{'unit_command'} 
= $result_trees{'non_automatic_top_node_up_and_url'}[1]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_and_url'}[1]{'unit_prev'} = 
$result_trees{'non_automatic_top_node_up_and_url'}[0];
+$result_trees{'non_automatic_top_node_up_and_url'}[1]{'structure'}{'unit_prev'}
 = $result_trees{'non_automatic_top_node_up_and_url'}[0];
 
 $result_texis{'non_automatic_top_node_up_and_url'} = '@node Top, first, 
@acronym{GNU, @acronym{GNU}\'s Not Unix} manuals, @acronym{GNU, 
@acronym{GNU}\'s Not Unix} manuals
 @top internal top node up
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index 198ccde525..a0e7bbe405 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -385,9 +385,10 @@ $result_trees{'non_automatic_top_node_up_url'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'non_automatic_top_node_up_url'}[0];
@@ -450,7 +451,7 @@ 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes
 $result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'non_automatic_top_node_up_url'}[1];
 $result_trees{'non_automatic_top_node_up_url'}[1]{'extra'}{'node'} = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
 $result_trees{'non_automatic_top_node_up_url'}[1]{'extra'}{'unit_command'} = 
$result_trees{'non_automatic_top_node_up_url'}[1]{'contents'}[0];
-$result_trees{'non_automatic_top_node_up_url'}[1]{'unit_prev'} = 
$result_trees{'non_automatic_top_node_up_url'}[0];
+$result_trees{'non_automatic_top_node_up_url'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'non_automatic_top_node_up_url'}[0];
 
 $result_texis{'non_automatic_top_node_up_url'} = '@node Top, first, (dir), 
(dir)
 @top internal top node up
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index cbe30868da..3831051c27 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -334,9 +334,10 @@ $result_trees{'part_chapter_after_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_chapter_after_top'}[0];
@@ -386,7 +387,7 @@ 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2]{'parent'} = $result_tr
 $result_trees{'part_chapter_after_top'}[1]{'extra'}{'node'} = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[1];
 $result_trees{'part_chapter_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2];
 $result_trees{'part_chapter_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_chapter_after_top'}[1]{'contents'}[2];
-$result_trees{'part_chapter_after_top'}[1]{'unit_prev'} = 
$result_trees{'part_chapter_after_top'}[0];
+$result_trees{'part_chapter_after_top'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'part_chapter_after_top'}[0];
 
 $result_texis{'part_chapter_after_top'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index c444328677..862ca8dcfb 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -294,9 +294,10 @@ $result_trees{'part_node_after_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_after_top'}[0];
@@ -340,7 +341,7 @@ 
$result_trees{'part_node_after_top'}[1]{'contents'}[0]{'args'}[0]{'parent'} = $r
 $result_trees{'part_node_after_top'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_after_top'}[1];
 $result_trees{'part_node_after_top'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_after_top'}[1]{'contents'}[0];
 $result_trees{'part_node_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_after_top'}[1]{'contents'}[0];
-$result_trees{'part_node_after_top'}[1]{'unit_prev'} = 
$result_trees{'part_node_after_top'}[0];
+$result_trees{'part_node_after_top'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_after_top'}[0];
 
 $result_texis{'part_node_after_top'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/part_node_chapter_after_top.pl 
b/tp/t/results/sectioning/part_node_chapter_after_top.pl
index 5204a51c1a..166a1f1334 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -547,9 +547,10 @@ $result_trees{'part_node_chapter_after_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_after_top'}[0];
@@ -633,7 +634,7 @@ 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3]{'parent'} = $resu
 $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_trees{'part_node_chapter_after_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_after_top'}[1]{'contents'}[3];
-$result_trees{'part_node_chapter_after_top'}[1]{'unit_prev'} = 
$result_trees{'part_node_chapter_after_top'}[0];
+$result_trees{'part_node_chapter_after_top'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_chapter_after_top'}[0];
 
 $result_texis{'part_node_chapter_after_top'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index c74d757e77..b8bbb3783b 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -341,9 +341,10 @@ $result_trees{'part_node_chapter_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -383,9 +384,10 @@ $result_trees{'part_node_chapter_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_appendix'}[0];
@@ -436,13 +438,13 @@ 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2]{'parent'} = $resul
 $result_trees{'part_node_chapter_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_chapter_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_chapter_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_appendix'}[1]{'contents'}[2];
-$result_trees{'part_node_chapter_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_chapter_appendix'}[0];
+$result_trees{'part_node_chapter_appendix'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_chapter_appendix'}[0];
 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_appendix'}[2];
 $result_trees{'part_node_chapter_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_chapter_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_appendix'}[2]{'contents'}[0];
-$result_trees{'part_node_chapter_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_chapter_appendix'}[1];
+$result_trees{'part_node_chapter_appendix'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_chapter_appendix'}[1];
 
 $result_texis{'part_node_chapter_appendix'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
index 28f0d3e25a..43e00b48b9 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -398,9 +398,10 @@ $result_trees{'part_node_chapter_node_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -482,9 +483,10 @@ $result_trees{'part_node_chapter_node_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_chapter_node_appendix'}[0];
@@ -545,7 +547,7 @@ 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2]{'parent'} = $
 $result_trees{'part_node_chapter_node_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_chapter_node_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_chapter_node_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[1]{'contents'}[2];
-$result_trees{'part_node_chapter_node_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_chapter_node_appendix'}[0];
+$result_trees{'part_node_chapter_node_appendix'}[1]{'structure'}{'unit_prev'} 
= $result_trees{'part_node_chapter_node_appendix'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -557,7 +559,7 @@ 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1]{'parent'} = $
 $result_trees{'part_node_chapter_node_appendix'}[2]{'extra'}{'node'} = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_chapter_node_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_chapter_node_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_chapter_node_appendix'}[2]{'contents'}[1];
-$result_trees{'part_node_chapter_node_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_chapter_node_appendix'}[1];
+$result_trees{'part_node_chapter_node_appendix'}[2]{'structure'}{'unit_prev'} 
= $result_trees{'part_node_chapter_node_appendix'}[1];
 
 $result_texis{'part_node_chapter_node_appendix'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/part_node_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_node_part_appendix.pl
index 560a9b656c..85f07d5ad9 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -398,9 +398,10 @@ $result_trees{'part_node_node_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -520,9 +521,10 @@ $result_trees{'part_node_node_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_node_part_appendix'}[0];
@@ -583,7 +585,7 @@ 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2]{'parent'} = $res
 $result_trees{'part_node_node_part_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_node_part_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_node_part_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[1]{'contents'}[2];
-$result_trees{'part_node_node_part_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_node_part_appendix'}[0];
+$result_trees{'part_node_node_part_appendix'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_node_part_appendix'}[0];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0];
 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -600,7 +602,7 @@ 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2]{'parent'} = $res
 $result_trees{'part_node_node_part_appendix'}[2]{'extra'}{'node'} = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[0];
 $result_trees{'part_node_node_part_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2];
 $result_trees{'part_node_node_part_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_node_part_appendix'}[2]{'contents'}[2];
-$result_trees{'part_node_node_part_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_node_part_appendix'}[1];
+$result_trees{'part_node_node_part_appendix'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_node_part_appendix'}[1];
 
 $result_texis{'part_node_node_part_appendix'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index 546753b343..4d7f57752d 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -341,9 +341,10 @@ $result_trees{'part_node_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -421,9 +422,10 @@ $result_trees{'part_node_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_part_appendix'}[0];
@@ -474,7 +476,7 @@ 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2]{'parent'} = $result_t
 $result_trees{'part_node_part_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_part_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_part_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_appendix'}[1]{'contents'}[2];
-$result_trees{'part_node_part_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_part_appendix'}[0];
+$result_trees{'part_node_part_appendix'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_part_appendix'}[0];
 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'part_node_part_appendix'}[2]{'contents'}[0];
 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_appendix'}[2]{'contents'}[0];
@@ -485,7 +487,7 @@ 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1]{'extra'}{'associated_
 $result_trees{'part_node_part_appendix'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'part_node_part_appendix'}[2];
 $result_trees{'part_node_part_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_part_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_appendix'}[2]{'contents'}[1];
-$result_trees{'part_node_part_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_part_appendix'}[1];
+$result_trees{'part_node_part_appendix'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_part_appendix'}[1];
 
 $result_texis{'part_node_part_appendix'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/part_node_part_node_appendix.pl 
b/tp/t/results/sectioning/part_node_part_node_appendix.pl
index bce2008918..dcbe4244f2 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -398,9 +398,10 @@ $result_trees{'part_node_part_node_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -520,9 +521,10 @@ $result_trees{'part_node_part_node_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'part_node_part_node_appendix'}[0];
@@ -583,7 +585,7 @@ 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2]{'parent'} = $res
 $result_trees{'part_node_part_node_appendix'}[1]{'extra'}{'node'} = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[1];
 $result_trees{'part_node_part_node_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2];
 $result_trees{'part_node_part_node_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[1]{'contents'}[2];
-$result_trees{'part_node_part_node_appendix'}[1]{'unit_prev'} = 
$result_trees{'part_node_part_node_appendix'}[0];
+$result_trees{'part_node_part_node_appendix'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_part_node_appendix'}[0];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0];
 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[2]{'contents'}[0];
@@ -600,7 +602,7 @@ 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2]{'parent'} = $res
 $result_trees{'part_node_part_node_appendix'}[2]{'extra'}{'node'} = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[1];
 $result_trees{'part_node_part_node_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2];
 $result_trees{'part_node_part_node_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'part_node_part_node_appendix'}[2]{'contents'}[2];
-$result_trees{'part_node_part_node_appendix'}[2]{'unit_prev'} = 
$result_trees{'part_node_part_node_appendix'}[1];
+$result_trees{'part_node_part_node_appendix'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'part_node_part_node_appendix'}[1];
 
 $result_texis{'part_node_part_node_appendix'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/sectioning_part_appendix.pl 
b/tp/t/results/sectioning/sectioning_part_appendix.pl
index 0edb9c3937..defa2009b3 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix.pl
@@ -103,9 +103,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -152,9 +153,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -201,9 +203,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -250,9 +253,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -337,9 +341,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -386,9 +391,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -434,9 +440,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -483,9 +490,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -525,9 +533,10 @@ $result_trees{'sectioning_part_appendix'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'sectioning_part_appendix'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[0];
@@ -543,28 +552,28 @@ 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0]{'contents'}[0]{'pare
 $result_trees{'sectioning_part_appendix'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[1];
 $result_trees{'sectioning_part_appendix'}[1]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[1]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[1]{'contents'}[0];
-$result_trees{'sectioning_part_appendix'}[1]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[0];
+$result_trees{'sectioning_part_appendix'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[0];
 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[2];
 $result_trees{'sectioning_part_appendix'}[2]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[2]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[2]{'contents'}[0];
-$result_trees{'sectioning_part_appendix'}[2]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[1];
+$result_trees{'sectioning_part_appendix'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[1];
 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[3];
 $result_trees{'sectioning_part_appendix'}[3]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[3]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[3]{'contents'}[0];
-$result_trees{'sectioning_part_appendix'}[3]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[2];
+$result_trees{'sectioning_part_appendix'}[3]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[2];
 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[4];
 $result_trees{'sectioning_part_appendix'}[4]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[4]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[4]{'contents'}[0];
-$result_trees{'sectioning_part_appendix'}[4]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[3];
+$result_trees{'sectioning_part_appendix'}[4]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[3];
 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[5]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[5]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[5]{'contents'}[0];
@@ -576,34 +585,34 @@ 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1]{'extra'}{'associated
 $result_trees{'sectioning_part_appendix'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[5];
 $result_trees{'sectioning_part_appendix'}[5]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1];
 $result_trees{'sectioning_part_appendix'}[5]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[5]{'contents'}[1];
-$result_trees{'sectioning_part_appendix'}[5]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[4];
+$result_trees{'sectioning_part_appendix'}[5]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[4];
 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[6];
 $result_trees{'sectioning_part_appendix'}[6]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[6]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[6]{'contents'}[0];
-$result_trees{'sectioning_part_appendix'}[6]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[5];
+$result_trees{'sectioning_part_appendix'}[6]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[5];
 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[7];
 $result_trees{'sectioning_part_appendix'}[7]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[7]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[7]{'contents'}[0];
-$result_trees{'sectioning_part_appendix'}[7]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[6];
+$result_trees{'sectioning_part_appendix'}[7]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[6];
 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[8];
 $result_trees{'sectioning_part_appendix'}[8]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[8]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[8]{'contents'}[0];
-$result_trees{'sectioning_part_appendix'}[8]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[7];
+$result_trees{'sectioning_part_appendix'}[8]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[7];
 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[9]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix'}[9]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[9]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix'}[9];
 $result_trees{'sectioning_part_appendix'}[9]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0];
 $result_trees{'sectioning_part_appendix'}[9]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix'}[9]{'contents'}[0];
-$result_trees{'sectioning_part_appendix'}[9]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[8];
+$result_trees{'sectioning_part_appendix'}[9]{'structure'}{'unit_prev'} = 
$result_trees{'sectioning_part_appendix'}[8];
 
 $result_texis{'sectioning_part_appendix'} = '@top top
 
diff --git a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl 
b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
index 26f4d639bd..fd528ec1b9 100644
--- a/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
+++ b/tp/t/results/sectioning/sectioning_part_appendix_no_top.pl
@@ -104,9 +104,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -153,9 +154,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -202,9 +204,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -289,9 +292,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -338,9 +342,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -386,9 +391,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -435,9 +441,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -477,9 +484,10 @@ $result_trees{'sectioning_part_appendix_no_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'sectioning_part_appendix_no_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[0];
@@ -495,21 +503,21 @@ 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0]{'contents'}[0
 $result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1];
 $result_trees{'sectioning_part_appendix_no_top'}[1]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1]{'contents'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[1]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[0];
+$result_trees{'sectioning_part_appendix_no_top'}[1]{'structure'}{'unit_prev'} 
= $result_trees{'sectioning_part_appendix_no_top'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2];
 $result_trees{'sectioning_part_appendix_no_top'}[2]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[2]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2]{'contents'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[2]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[1];
+$result_trees{'sectioning_part_appendix_no_top'}[2]{'structure'}{'unit_prev'} 
= $result_trees{'sectioning_part_appendix_no_top'}[1];
 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3];
 $result_trees{'sectioning_part_appendix_no_top'}[3]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[3]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3]{'contents'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[3]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[2];
+$result_trees{'sectioning_part_appendix_no_top'}[3]{'structure'}{'unit_prev'} 
= $result_trees{'sectioning_part_appendix_no_top'}[2];
 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[0];
@@ -521,34 +529,34 @@ 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1]{'extra'}{'ass
 $result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4];
 $result_trees{'sectioning_part_appendix_no_top'}[4]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1];
 $result_trees{'sectioning_part_appendix_no_top'}[4]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4]{'contents'}[1];
-$result_trees{'sectioning_part_appendix_no_top'}[4]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[3];
+$result_trees{'sectioning_part_appendix_no_top'}[4]{'structure'}{'unit_prev'} 
= $result_trees{'sectioning_part_appendix_no_top'}[3];
 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5];
 $result_trees{'sectioning_part_appendix_no_top'}[5]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[5]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5]{'contents'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[5]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[4];
+$result_trees{'sectioning_part_appendix_no_top'}[5]{'structure'}{'unit_prev'} 
= $result_trees{'sectioning_part_appendix_no_top'}[4];
 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6];
 $result_trees{'sectioning_part_appendix_no_top'}[6]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[6]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6]{'contents'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[6]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[5];
+$result_trees{'sectioning_part_appendix_no_top'}[6]{'structure'}{'unit_prev'} 
= $result_trees{'sectioning_part_appendix_no_top'}[5];
 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7];
 $result_trees{'sectioning_part_appendix_no_top'}[7]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[7]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7]{'contents'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[7]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[6];
+$result_trees{'sectioning_part_appendix_no_top'}[7]{'structure'}{'unit_prev'} 
= $result_trees{'sectioning_part_appendix_no_top'}[6];
 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0]{'args'}[0];
 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_part_appendix_no_top'}[8];
 $result_trees{'sectioning_part_appendix_no_top'}[8]{'extra'}{'section'} = 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0];
 $result_trees{'sectioning_part_appendix_no_top'}[8]{'extra'}{'unit_command'} = 
$result_trees{'sectioning_part_appendix_no_top'}[8]{'contents'}[0];
-$result_trees{'sectioning_part_appendix_no_top'}[8]{'unit_prev'} = 
$result_trees{'sectioning_part_appendix_no_top'}[7];
+$result_trees{'sectioning_part_appendix_no_top'}[8]{'structure'}{'unit_prev'} 
= $result_trees{'sectioning_part_appendix_no_top'}[7];
 
 $result_texis{'sectioning_part_appendix_no_top'} = '@chapter chapter
 
diff --git a/tp/t/results/sectioning/top_chapter_sections.pl 
b/tp/t/results/sectioning/top_chapter_sections.pl
index 16439b256e..a9f737ba6f 100644
--- a/tp/t/results/sectioning/top_chapter_sections.pl
+++ b/tp/t/results/sectioning/top_chapter_sections.pl
@@ -102,9 +102,10 @@ $result_trees{'top_chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -151,9 +152,10 @@ $result_trees{'top_chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -200,9 +202,10 @@ $result_trees{'top_chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -249,9 +252,10 @@ $result_trees{'top_chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -298,9 +302,10 @@ $result_trees{'top_chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -347,9 +352,10 @@ $result_trees{'top_chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -396,9 +402,10 @@ $result_trees{'top_chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -438,9 +445,10 @@ $result_trees{'top_chapter_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'top_chapter_sections'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[0];
@@ -456,55 +464,55 @@ 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 $result_trees{'top_chapter_sections'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[1];
 $result_trees{'top_chapter_sections'}[1]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[1]{'contents'}[0];
-$result_trees{'top_chapter_sections'}[1]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[0];
+$result_trees{'top_chapter_sections'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[0];
 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[2]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[2];
 $result_trees{'top_chapter_sections'}[2]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[2]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[2]{'contents'}[0];
-$result_trees{'top_chapter_sections'}[2]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[1];
+$result_trees{'top_chapter_sections'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[1];
 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[3]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[3];
 $result_trees{'top_chapter_sections'}[3]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[3]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[3]{'contents'}[0];
-$result_trees{'top_chapter_sections'}[3]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[2];
+$result_trees{'top_chapter_sections'}[3]{'structure'}{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[2];
 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[4]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[4];
 $result_trees{'top_chapter_sections'}[4]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[4]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[4]{'contents'}[0];
-$result_trees{'top_chapter_sections'}[4]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[3];
+$result_trees{'top_chapter_sections'}[4]{'structure'}{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[3];
 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[5]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[5];
 $result_trees{'top_chapter_sections'}[5]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[5]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[5]{'contents'}[0];
-$result_trees{'top_chapter_sections'}[5]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[4];
+$result_trees{'top_chapter_sections'}[5]{'structure'}{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[4];
 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[6]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[6];
 $result_trees{'top_chapter_sections'}[6]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[6]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[6]{'contents'}[0];
-$result_trees{'top_chapter_sections'}[6]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[5];
+$result_trees{'top_chapter_sections'}[6]{'structure'}{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[5];
 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0];
 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[7]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[7];
 $result_trees{'top_chapter_sections'}[7]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[7]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[7]{'contents'}[0];
-$result_trees{'top_chapter_sections'}[7]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[6];
+$result_trees{'top_chapter_sections'}[7]{'structure'}{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[6];
 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'top_chapter_sections'}[8]{'contents'}[0]{'args'}[0];
 $result_trees{'top_chapter_sections'}[8]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[8]{'contents'}[0]{'parent'} = 
$result_trees{'top_chapter_sections'}[8];
 $result_trees{'top_chapter_sections'}[8]{'extra'}{'section'} = 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0];
 $result_trees{'top_chapter_sections'}[8]{'extra'}{'unit_command'} = 
$result_trees{'top_chapter_sections'}[8]{'contents'}[0];
-$result_trees{'top_chapter_sections'}[8]{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[7];
+$result_trees{'top_chapter_sections'}[8]{'structure'}{'unit_prev'} = 
$result_trees{'top_chapter_sections'}[7];
 
 $result_texis{'top_chapter_sections'} = '@top top
 
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index 299ca8bea3..b9e6ad6bd0 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -264,9 +264,10 @@ $result_trees{'top_node_up_url'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_node_up_url'}[0];
@@ -307,7 +308,7 @@ 
$result_trees{'top_node_up_url'}[1]{'contents'}[0]{'extra'}{'nodes_manuals'}[0]{
 $result_trees{'top_node_up_url'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'top_node_up_url'}[1];
 $result_trees{'top_node_up_url'}[1]{'extra'}{'node'} = 
$result_trees{'top_node_up_url'}[1]{'contents'}[0];
 $result_trees{'top_node_up_url'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_node_up_url'}[1]{'contents'}[0];
-$result_trees{'top_node_up_url'}[1]{'unit_prev'} = 
$result_trees{'top_node_up_url'}[0];
+$result_trees{'top_node_up_url'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'top_node_up_url'}[0];
 
 $result_texis{'top_node_up_url'} = '@node Top
 @top internal top node up
diff --git a/tp/t/results/sectioning/top_part_chapter.pl 
b/tp/t/results/sectioning/top_part_chapter.pl
index 2895535e39..cde358aaed 100644
--- a/tp/t/results/sectioning/top_part_chapter.pl
+++ b/tp/t/results/sectioning/top_part_chapter.pl
@@ -134,9 +134,10 @@ $result_trees{'top_part_chapter'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'top_part_chapter'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_part_chapter'}[0];
@@ -156,7 +157,7 @@ 
$result_trees{'top_part_chapter'}[1]{'contents'}[1]{'extra'}{'associated_part'}
 $result_trees{'top_part_chapter'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'top_part_chapter'}[1];
 $result_trees{'top_part_chapter'}[1]{'extra'}{'section'} = 
$result_trees{'top_part_chapter'}[1]{'contents'}[1];
 $result_trees{'top_part_chapter'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_part_chapter'}[1]{'contents'}[1];
-$result_trees{'top_part_chapter'}[1]{'unit_prev'} = 
$result_trees{'top_part_chapter'}[0];
+$result_trees{'top_part_chapter'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'top_part_chapter'}[0];
 
 $result_texis{'top_part_chapter'} = '@top top
 
diff --git a/tp/t/results/sectioning/top_without_node_sections.pl 
b/tp/t/results/sectioning/top_without_node_sections.pl
index b7b1949ce1..a975cc00b5 100644
--- a/tp/t/results/sectioning/top_without_node_sections.pl
+++ b/tp/t/results/sectioning/top_without_node_sections.pl
@@ -202,9 +202,10 @@ $result_trees{'top_without_node_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'top_without_node_sections'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'top_without_node_sections'}[0];
@@ -237,7 +238,7 @@ 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1]{'parent'} = $result
 $result_trees{'top_without_node_sections'}[1]{'extra'}{'node'} = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[0];
 $result_trees{'top_without_node_sections'}[1]{'extra'}{'section'} = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1];
 $result_trees{'top_without_node_sections'}[1]{'extra'}{'unit_command'} = 
$result_trees{'top_without_node_sections'}[1]{'contents'}[1];
-$result_trees{'top_without_node_sections'}[1]{'unit_prev'} = 
$result_trees{'top_without_node_sections'}[0];
+$result_trees{'top_without_node_sections'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'top_without_node_sections'}[0];
 
 $result_texis{'top_without_node_sections'} = '@top top section
 Top section
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index b5623d35be..30da2cefa4 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -408,9 +408,10 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -467,9 +468,10 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -537,9 +539,10 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
       'node' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[0];
@@ -603,7 +606,7 @@ 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'extra'
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1];
 $result_trees{'transliterated_split_equivalent_nodes'}[1]{'extra'}{'node'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[1]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1]{'contents'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[1]{'unit_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[0];
+$result_trees{'transliterated_split_equivalent_nodes'}[1]{'structure'}{'unit_prev'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
@@ -612,7 +615,7 @@ 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'extra'
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2];
 $result_trees{'transliterated_split_equivalent_nodes'}[2]{'extra'}{'node'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[2]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2]{'contents'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[2]{'unit_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[1];
+$result_trees{'transliterated_split_equivalent_nodes'}[2]{'structure'}{'unit_prev'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'args'}[0];
@@ -622,7 +625,7 @@ 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'extra'
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[3];
 $result_trees{'transliterated_split_equivalent_nodes'}[3]{'extra'}{'node'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[3]{'extra'}{'unit_command'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[3]{'contents'}[0];
-$result_trees{'transliterated_split_equivalent_nodes'}[3]{'unit_prev'} = 
$result_trees{'transliterated_split_equivalent_nodes'}[2];
+$result_trees{'transliterated_split_equivalent_nodes'}[3]{'structure'}{'unit_prev'}
 = $result_trees{'transliterated_split_equivalent_nodes'}[2];
 
 $result_texis{'transliterated_split_equivalent_nodes'} = '@node Top
 
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index 25e85219fb..f0a32ef2a4 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -578,9 +578,10 @@ $result_trees{'two_nodes_at_the_end'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'two_nodes_at_the_end'}[0];
@@ -669,7 +670,7 @@ 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[3]{'parent'} = $result_tree
 $result_trees{'two_nodes_at_the_end'}[1]{'extra'}{'node'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[0];
 $result_trees{'two_nodes_at_the_end'}[1]{'extra'}{'section'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[1];
 $result_trees{'two_nodes_at_the_end'}[1]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_at_the_end'}[1]{'contents'}[1];
-$result_trees{'two_nodes_at_the_end'}[1]{'unit_prev'} = 
$result_trees{'two_nodes_at_the_end'}[0];
+$result_trees{'two_nodes_at_the_end'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'two_nodes_at_the_end'}[0];
 
 $result_texis{'two_nodes_at_the_end'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 41ff7a72f4..244eec2605 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -520,9 +520,10 @@ $result_trees{'two_nodes_between_chapters'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -604,9 +605,10 @@ $result_trees{'two_nodes_between_chapters'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'two_nodes_between_chapters'}[0];
@@ -687,7 +689,7 @@ 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[2]{'parent'} = $resul
 $result_trees{'two_nodes_between_chapters'}[1]{'extra'}{'node'} = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[1]{'extra'}{'section'} = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[1];
 $result_trees{'two_nodes_between_chapters'}[1]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[1]{'contents'}[1];
-$result_trees{'two_nodes_between_chapters'}[1]{'unit_prev'} = 
$result_trees{'two_nodes_between_chapters'}[0];
+$result_trees{'two_nodes_between_chapters'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'two_nodes_between_chapters'}[0];
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0];
 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'extra'}{'node_content'}[0]
 = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -699,7 +701,7 @@ 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1]{'parent'} = $resul
 $result_trees{'two_nodes_between_chapters'}[2]{'extra'}{'node'} = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[0];
 $result_trees{'two_nodes_between_chapters'}[2]{'extra'}{'section'} = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1];
 $result_trees{'two_nodes_between_chapters'}[2]{'extra'}{'unit_command'} = 
$result_trees{'two_nodes_between_chapters'}[2]{'contents'}[1];
-$result_trees{'two_nodes_between_chapters'}[2]{'unit_prev'} = 
$result_trees{'two_nodes_between_chapters'}[1];
+$result_trees{'two_nodes_between_chapters'}[2]{'structure'}{'unit_prev'} = 
$result_trees{'two_nodes_between_chapters'}[1];
 
 $result_texis{'two_nodes_between_chapters'} = '@node Top
 @top top
diff --git a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl 
b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
index e311f7eaba..2941ff5363 100644
--- a/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
+++ b/tp/t/results/sectioning/unnumbered_before_node_top_top.pl
@@ -166,9 +166,10 @@ $result_trees{'unnumbered_before_node_top_top'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'unnumbered_before_node_top_top'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'unnumbered_before_node_top_top'}[0];
@@ -194,7 +195,7 @@ 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1]{'parent'} = $r
 $result_trees{'unnumbered_before_node_top_top'}[1]{'extra'}{'node'} = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[0];
 $result_trees{'unnumbered_before_node_top_top'}[1]{'extra'}{'section'} = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1];
 $result_trees{'unnumbered_before_node_top_top'}[1]{'extra'}{'unit_command'} = 
$result_trees{'unnumbered_before_node_top_top'}[1]{'contents'}[1];
-$result_trees{'unnumbered_before_node_top_top'}[1]{'unit_prev'} = 
$result_trees{'unnumbered_before_node_top_top'}[0];
+$result_trees{'unnumbered_before_node_top_top'}[1]{'structure'}{'unit_prev'} = 
$result_trees{'unnumbered_before_node_top_top'}[0];
 
 $result_texis{'unnumbered_before_node_top_top'} = '@unnumbered before nodes
 
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
index f82eb5c35e..6873f5e482 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_nodes.pl
@@ -333,9 +333,10 @@ $result_trees{'unnumbered_top_without_node_nodes'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 $result_trees{'unnumbered_top_without_node_nodes'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[0];
@@ -388,7 +389,7 @@ 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1]{'parent'} =
 $result_trees{'unnumbered_top_without_node_nodes'}[1]{'extra'}{'node'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0];
 $result_trees{'unnumbered_top_without_node_nodes'}[1]{'extra'}{'section'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[1];
 $result_trees{'unnumbered_top_without_node_nodes'}[1]{'extra'}{'unit_command'} 
= $result_trees{'unnumbered_top_without_node_nodes'}[1]{'contents'}[0];
-$result_trees{'unnumbered_top_without_node_nodes'}[1]{'unit_prev'} = 
$result_trees{'unnumbered_top_without_node_nodes'}[0];
+$result_trees{'unnumbered_top_without_node_nodes'}[1]{'structure'}{'unit_prev'}
 = $result_trees{'unnumbered_top_without_node_nodes'}[0];
 
 $result_texis{'unnumbered_top_without_node_nodes'} = '@node a node,,,(dir)
 @unnumbered unnumbered
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index bb82118231..def9e34209 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -207,9 +207,10 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   },
   {
     'contents' => [
@@ -344,9 +345,10 @@ $result_trees{'unnumbered_top_without_node_sections'} = [
       'section' => {},
       'unit_command' => {}
     },
-    'structure' => {},
-    'type' => 'unit',
-    'unit_prev' => {}
+    'structure' => {
+      'unit_prev' => {}
+    },
+    'type' => 'unit'
   }
 ];
 
$result_trees{'unnumbered_top_without_node_sections'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0];
@@ -380,7 +382,7 @@ 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'content
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1];
 $result_trees{'unnumbered_top_without_node_sections'}[1]{'extra'}{'section'} = 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[1]{'extra'}{'unit_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1]{'contents'}[0];
-$result_trees{'unnumbered_top_without_node_sections'}[1]{'unit_prev'} = 
$result_trees{'unnumbered_top_without_node_sections'}[0];
+$result_trees{'unnumbered_top_without_node_sections'}[1]{'structure'}{'unit_prev'}
 = $result_trees{'unnumbered_top_without_node_sections'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0]{'args'}[1]{'parent'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0];
@@ -402,7 +404,7 @@ 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1]{'parent'
 $result_trees{'unnumbered_top_without_node_sections'}[2]{'extra'}{'node'} = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[0];
 $result_trees{'unnumbered_top_without_node_sections'}[2]{'extra'}{'section'} = 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1];
 
$result_trees{'unnumbered_top_without_node_sections'}[2]{'extra'}{'unit_command'}
 = $result_trees{'unnumbered_top_without_node_sections'}[2]{'contents'}[1];
-$result_trees{'unnumbered_top_without_node_sections'}[2]{'unit_prev'} = 
$result_trees{'unnumbered_top_without_node_sections'}[1];
+$result_trees{'unnumbered_top_without_node_sections'}[2]{'structure'}{'unit_prev'}
 = $result_trees{'unnumbered_top_without_node_sections'}[1];
 
 $result_texis{'unnumbered_top_without_node_sections'} = '@node a node,,,(dir)
 @unnumbered unnumbered



reply via email to

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