texinfo-commits
[Top][All Lists]
Advanced

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

[8160] simplify abort_empty_line


From: gavinsmith0123
Subject: [8160] simplify abort_empty_line
Date: Sat, 8 Sep 2018 20:05:42 -0400 (EDT)

Revision: 8160
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8160
Author:   gavin
Date:     2018-09-08 20:05:42 -0400 (Sat, 08 Sep 2018)
Log Message:
-----------
simplify abort_empty_line

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/Texinfo/XS/misc.c
    
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
    trunk/tp/t/results/coverage/def.pl
    trunk/tp/t/results/coverage/symbol_after_command.pl
    trunk/tp/t/results/def/empty_def_arguments.pl
    trunk/tp/t/results/indices/encoding_index_latin1.pl
    trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
    trunk/tp/t/results/indices/encoding_index_utf8.pl
    trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
    trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl
    trunk/tp/t/results/sectioning/node_empty_direction.pl
    trunk/tp/t/results/value/set_flag_command_equivalent.pl
    trunk/tp/tests/layout/res_parser/navigation_no_header/navigation.html

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-08 23:00:20 UTC (rev 8159)
+++ trunk/ChangeLog     2018-09-09 00:05:42 UTC (rev 8160)
@@ -1,5 +1,17 @@
 2018-09-09  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_abort_empty_line): Always get the
+       element that refers to the space element through the 'command'
+       value.  This saves the trouble of looking at $current, 
+       $current->{'parent'}, $current->{'parent'}->{'parent'} etc.
+       Delete the 'spaces_after_command_elt' value properly.
+       (_parse_texi): Set 'command' on created 
+       'empty_spaces_before_argument' elements.
+       * tp/Texinfo/XS/misc.c (xs_abort_empty_line): Make the same 
+       change.
+
+2018-09-09  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_start_empty_line_after_command):
        Refer to spaces element at start of line as
        'spaces_after_command_elt' instead of 'spaces_after_command'.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-09-08 23:00:20 UTC (rev 8159)
+++ trunk/tp/Texinfo/Parser.pm  2018-09-09 00:05:42 UTC (rev 8160)
@@ -2126,26 +2126,6 @@
     if ($spaces_element->{'extra'}
         and $spaces_element->{'extra'}->{'command'}) {
       $owning_element = $spaces_element->{'extra'}->{'command'};
-    } elsif ($current->{'extra'} 
-        and $current->{'extra'}->{'spaces_before_argument_elt'}
-        and $current->{'extra'}->{'spaces_before_argument_elt'} 
-              eq $spaces_element) {
-      $owning_element = $current;
-    } elsif ($current->{'parent'} and $current->{'parent'}->{'extra'} 
-        and $current->{'parent'}->{'extra'}->{'spaces_before_argument_elt'}
-        and $current->{'parent'}->{'extra'}->{'spaces_before_argument_elt'} 
-              eq $spaces_element) {
-      $owning_element = $current->{'parent'};
-    } elsif ($current->{'extra'} 
-        and $current->{'extra'}->{'spaces_after_command_elt'}
-        and $current->{'extra'}->{'spaces_after_command_elt'} 
-              eq $spaces_element) {
-      $owning_element = $current;
-    } elsif ($current->{'parent'} and $current->{'parent'}->{'extra'} 
-        and $current->{'parent'}->{'extra'}->{'spaces_after_command_elt'}
-        and $current->{'parent'}->{'extra'}->{'spaces_after_command_elt'} 
-              eq $spaces_element) {
-      $owning_element = $current->{'parent'};
     }
 
     print STDERR "ABORT EMPTY "
@@ -2165,8 +2145,8 @@
         delete ($owning_element->{'extra'})
           if !(keys(%{$owning_element->{'extra'}}));
       } elsif ($owning_element
-          and $owning_element->{'extra'}->{'spaces_after_command'}) {
-        delete ($owning_element->{'extra'}->{'spaces_after_command'});
+          and $owning_element->{'extra'}->{'spaces_after_command_elt'}) {
+        delete ($owning_element->{'extra'}->{'spaces_after_command_elt'});
         delete ($owning_element->{'extra'})
           if !(keys(%{$owning_element->{'extra'}}));
       }
@@ -4394,14 +4374,8 @@
               my $misc_line_args = {'type' => 'misc_line_arg',
                      'parent' => $misc};
               $misc->{'args'} = [$misc_line_args];
-              my $spaces_after_command 
-                = { 'type' => 'empty_spaces_after_command',
-                    'text' => ' ',
-                    'parent' => $misc_line_args,
-                  };
-              $misc->{'extra'}->{'spaces_after_command'} 
-                 = $spaces_after_command;
-              $misc_line_args->{'contents'} = [ $spaces_after_command,
+              $misc->{'extra'}->{'spaces_before_argument'} = ' ';
+              $misc_line_args->{'contents'} = [
                 { 'text' => $arg,
                   'parent' => $misc_line_args, },
                 { 'text' => "\n",
@@ -4991,8 +4965,10 @@
               $line =~ s/([^\S\f\n]*)//;
               $current->{'type'} = 'brace_command_context';
               push @{$current->{'contents'}}, { 'type' => 
'empty_spaces_before_argument', 
-                                        'text' => $1,
-                                        'parent' => $current };
+                            'text' => $1,
+                            'parent' => $current,
+                            'extra' => {'command' => $current->{'parent'}}
+                                      };
               $current->{'parent'}->{'extra'}->{'spaces_before_argument_elt'}
                  = $current->{'contents'}->[-1];
             } else {
@@ -5002,8 +4978,10 @@
                        or $simple_text_commands{$command})) {
                 push @{$current->{'contents'}}, 
                   {'type' => 'empty_spaces_before_argument',
-                   'text' => '',
-                   'parent' => $current };
+                            'text' => '',
+                            'parent' => $current,
+                            'extra' => {'command' => $current}
+                                      };
                 $current->{'extra'}->{'spaces_before_argument_elt'}
                    = $current->{'contents'}->[-1];
               }
@@ -5032,7 +5010,9 @@
             push @{$current->{'contents'}}, 
                 {'type' => 'empty_spaces_before_argument',
                  'text' => '',
-                 'parent' => $current };
+                 'parent' => $current,
+                 'extra' => {'command' => $current}
+               };
             print STDERR "BRACKETED in def/multitable\n" if ($self->{'DEBUG'});
             $current->{'extra'}->{'spaces_before_argument_elt'}
                = $current->{'contents'}->[-1];
@@ -5442,7 +5422,9 @@
           push @{$current->{'contents'}}, 
                  {'type' => 'empty_spaces_before_argument',
                   'text' => '',
-                  'parent' => $current };
+                  'parent' => $current,
+                  'extra' => {'command' => $current}
+                };
           $current->{'extra'}->{'spaces_before_argument_elt'}
             = $current->{'contents'}->[-1];
         } elsif ($separator eq ',' and $current->{'type'}

Modified: trunk/tp/Texinfo/XS/misc.c
===================================================================
--- trunk/tp/Texinfo/XS/misc.c  2018-09-08 23:00:20 UTC (rev 8159)
+++ trunk/tp/Texinfo/XS/misc.c  2018-09-09 00:05:42 UTC (rev 8160)
@@ -54,8 +54,7 @@
   SV **svp;
   int contents_num;
   HV *spaces_elt;
-  char *key;
-  HV *test_elt;
+  //char *key;
   HV *test_extra;
 
   HV *owning_elt = 0;
@@ -114,74 +113,16 @@
   if (svp)
     {
       test_extra = (HV *) SvRV (*svp);
-      key = "command";
-      svp = hv_fetch (test_extra, key, strlen (key), 0);
+      svp = hv_fetch (test_extra, "command",
+                      strlen ("command"), 0);
       if (svp)
         {
-          test_elt = (HV *) SvRV (*svp);
-          svp = hv_fetch (test_elt, "extra", strlen ("extra"), 0);
+          owning_elt = (HV *) SvRV (*svp);
+          svp = hv_fetch (owning_elt, "extra", strlen ("extra"), 0);
           test_extra = (HV *) SvRV (*svp);
-          goto found;
         }
     }
 
-  /* Look for another reference to spaces_elt. */
-
-  test_elt = current;
-
-  svp = hv_fetch (test_elt, "extra", strlen ("extra"), 0);
-  if (svp)
-    {
-      test_extra = (HV *) SvRV (*svp);
-      key = "spaces_before_argument_elt";
-      svp = hv_fetch (test_extra, key, strlen (key), 0);
-      if (svp)
-        {
-          if ((HV *) SvRV (*svp) == spaces_elt)
-            goto found;
-        }
-
-      key = "spaces_after_command_elt";
-      svp = hv_fetch (test_extra, key, strlen (key), 0);
-      if (svp)
-        {
-          if ((HV *) SvRV (*svp) == spaces_elt)
-            goto found;
-        }
-    }
-
-  svp = hv_fetch (current, "parent", strlen ("parent"), 0);
-  if (svp)
-    {
-      test_elt = (HV *) SvRV (*svp);
-      svp = hv_fetch (test_elt, "extra", strlen ("extra"), 0);
-      if (svp)
-        {
-          test_extra = (HV *) SvRV (*svp);
-          key = "spaces_before_argument_elt";
-          svp = hv_fetch (test_extra, key, strlen (key), 0);
-          if (svp)
-            {
-              if ((HV *) SvRV (*svp) == spaces_elt)
-                goto found;
-            }
-
-          key = "spaces_after_command_elt";
-          svp = hv_fetch (test_extra, key, strlen (key), 0);
-          if (svp)
-            {
-              if ((HV *) SvRV (*svp) == spaces_elt)
-                goto found;
-            }
-        }
-    }
-
-  if (0)
-    {
-found:
-      owning_elt = test_elt;
-    }
-
   svp = hv_fetch (spaces_elt, "text", strlen ("text"), 0);
   if (!svp)
     return 0; /* or create it? change last arg from 0 to 1 */
@@ -199,12 +140,19 @@
       if (owning_elt)
         {
           /* We found an "extra" reference to this element.  Remove it. */
-          hv_delete (test_extra, key, strlen (key), G_DISCARD);
+          hv_delete (test_extra,
+                     "spaces_before_argument_elt",
+                     strlen ("spaces_before_argument_elt"),
+                     G_DISCARD);
+          hv_delete (test_extra,
+                     "spaces_after_command_elt",
+                     strlen ("spaces_after_command_elt"),
+                     G_DISCARD);
 
           /* If the extra hash now empty, remove it as well. */
           hv_iterinit (test_extra);
           if (!hv_iternext (test_extra))
-            hv_delete (test_elt, "extra", strlen ("extra"), G_DISCARD);
+            hv_delete (owning_elt, "extra", strlen ("extra"), G_DISCARD);
         }
     }
   else if (!strcmp (type, "empty_line"))

Modified: 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
===================================================================
--- 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2018-09-08 23:00:20 UTC (rev 8159)
+++ 
trunk/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
 2018-09-09 00:05:42 UTC (rev 8160)
@@ -213,10 +213,10 @@
    *note ≥ ≤ →::
 
    *note ª º ★ £ ⊣ ¿ ®:: *note ⇒ ° a b a sunny day å:: *note Å æ œ Æ Œ ø
-Ø ß ł Ł Ð ð Þ þ:: *note ä ẽ î â à é ç ē e̊ e̋ ę:: *note ė ĕ e̲ ẹ ě j ee͡::
-*note ı Ḕ Ḉ:: *note “ ” ‘ ’ „ ‚:: *note « » « » ‹ ›:: *note `` '' --- --
-` ':: *note AAA (fff) AAA BBB:: *note CCC (rrr) CCC DDD:: *note the
-someone <address@hidden> <address@hidden>:: *note [f--ile1] [image 
src="f--ile.png" alt="alt" text="Image description\"\"\\."]:: *note
+Ø ß ł Ł Ð ð Þ þ:: *note ä ẽ î â à é ç ē e̊ e̋ ę:: *note ė ĕ e̲ ẹ ě j
+ee͡:: *note ı Ḕ Ḉ:: *note “ ” ‘ ’ „ ‚:: *note « » « » ‹ ›:: *note `` ''
+--- -- ` ':: *note AAA (fff) AAA BBB:: *note CCC (rrr) CCC DDD:: *note
+the someone <address@hidden> <address@hidden>:: *note [f--ile1] [image 
src="f--ile.png" alt="alt" text="Image description\"\"\\."]:: *note
  @ {} . :: *note cite asis in @w b in r SC *str* t VAR dfn i:: *note env
 code option samp command file C-x <ESC>:: *note 8.27in:: *note sansserif
 slanted:: *note indicateurl:: *note _{g}H 3^{rd}:: *note

Modified: trunk/tp/t/results/coverage/def.pl
===================================================================
--- trunk/tp/t/results/coverage/def.pl  2018-09-08 23:00:20 UTC (rev 8159)
+++ trunk/tp/t/results/coverage/def.pl  2018-09-09 00:05:42 UTC (rev 8160)
@@ -1220,15 +1220,7 @@
               'key' => 'machin',
               'number' => 10
             },
-            'original_def_cmdname' => 'deffnx',
-            'spaces_after_command_elt' => {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
-              'text' => '',
-              'type' => 'empty_line_after_command'
-            }
+            'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
           'parent' => {},
@@ -1309,15 +1301,7 @@
               'key' => 'bidule machin',
               'number' => 11
             },
-            'original_def_cmdname' => 'deffnx',
-            'spaces_after_command_elt' => {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
-              'text' => '',
-              'type' => 'empty_line_after_command'
-            }
+            'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
           'parent' => {},
@@ -1396,15 +1380,7 @@
               'key' => 'machin',
               'number' => 12
             },
-            'original_def_cmdname' => 'deffnx',
-            'spaces_after_command_elt' => {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
-              'text' => '',
-              'type' => 'empty_line_after_command'
-            }
+            'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
           'parent' => {},
@@ -2086,8 +2062,6 @@
 
$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[7];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[7];
-$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0];
 $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'line_nr'} = 
$result_trees{'def'}{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'def'}{'contents'}[5]{'contents'}[7]{'parent'} = 
$result_trees{'def'}{'contents'}[5];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
@@ -2102,8 +2076,6 @@
 
$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[8];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[8];
-$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0];
 $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'line_nr'} = 
$result_trees{'def'}{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'def'}{'contents'}[5]{'contents'}[8]{'parent'} = 
$result_trees{'def'}{'contents'}[5];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0];
@@ -2117,8 +2089,6 @@
 
$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[9];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[9];
-$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0];
 $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'line_nr'} = 
$result_trees{'def'}{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'def'}{'contents'}[5]{'contents'}[9]{'parent'} = 
$result_trees{'def'}{'contents'}[5];
 
$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];

Modified: trunk/tp/t/results/coverage/symbol_after_command.pl
===================================================================
--- trunk/tp/t/results/coverage/symbol_after_command.pl 2018-09-08 23:00:20 UTC 
(rev 8159)
+++ trunk/tp/t/results/coverage/symbol_after_command.pl 2018-09-09 00:05:42 UTC 
(rev 8160)
@@ -62,15 +62,7 @@
                   'extra' => {
                     'misc_content' => [
                       {}
-                    ],
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    ]
                   },
                   'line_nr' => {
                     'file_name' => '',
@@ -114,15 +106,7 @@
                   'extra' => {
                     'misc_content' => [
                       {}
-                    ],
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    ]
                   },
                   'line_nr' => {
                     'file_name' => '',
@@ -176,15 +160,7 @@
                       {},
                       {},
                       {}
-                    ],
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    ]
                   },
                   'line_nr' => {
                     'file_name' => '',
@@ -238,15 +214,7 @@
                       {},
                       {},
                       {}
-                    ],
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    ]
                   },
                   'line_nr' => {
                     'file_name' => '',
@@ -290,15 +258,7 @@
                   'extra' => {
                     'misc_content' => [
                       {}
-                    ],
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    ]
                   },
                   'line_nr' => {
                     'file_name' => '',
@@ -342,15 +302,7 @@
                   'extra' => {
                     'misc_content' => [
                       {}
-                    ],
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    ]
                   },
                   'line_nr' => {
                     'file_name' => '',
@@ -394,15 +346,7 @@
                   'extra' => {
                     'misc_content' => [
                       {}
-                    ],
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    ]
                   },
                   'line_nr' => {
                     'file_name' => '',
@@ -560,8 +504,6 @@
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];
@@ -569,8 +511,6 @@
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];
@@ -582,8 +522,6 @@
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];
@@ -595,8 +533,6 @@
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[1]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[2]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];
@@ -604,8 +540,6 @@
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];
@@ -613,8 +547,6 @@
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[5]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];
@@ -622,8 +554,6 @@
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[6]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];

Modified: trunk/tp/t/results/def/empty_def_arguments.pl
===================================================================
--- trunk/tp/t/results/def/empty_def_arguments.pl       2018-09-08 23:00:20 UTC 
(rev 8159)
+++ trunk/tp/t/results/def/empty_def_arguments.pl       2018-09-09 00:05:42 UTC 
(rev 8160)
@@ -376,15 +376,7 @@
             'def_parsed_hash' => {
               'category' => {}
             },
-            'original_def_cmdname' => 'deffnx',
-            'spaces_after_command_elt' => {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
-              'text' => '',
-              'type' => 'empty_line_after_command'
-            }
+            'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
           'parent' => {},
@@ -451,15 +443,7 @@
               'category' => {},
               'name' => {}
             },
-            'original_def_cmdname' => 'deffnx',
-            'spaces_after_command_elt' => {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
-              'text' => '',
-              'type' => 'empty_line_after_command'
-            }
+            'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
           'parent' => {},
@@ -507,15 +491,7 @@
             'def_parsed_hash' => {
               'category' => {}
             },
-            'original_def_cmdname' => 'deffnx',
-            'spaces_after_command_elt' => {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
-              'text' => '',
-              'type' => 'empty_line_after_command'
-            }
+            'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
           'parent' => {},
@@ -576,15 +552,7 @@
               'category' => {},
               'name' => {}
             },
-            'original_def_cmdname' => 'deffnx',
-            'spaces_after_command_elt' => {
-              'extra' => {
-                'command' => {}
-              },
-              'parent' => {},
-              'text' => '',
-              'type' => 'empty_line_after_command'
-            }
+            'original_def_cmdname' => 'deffnx'
           },
           'line_nr' => {},
           'parent' => {},
@@ -688,8 +656,6 @@
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'line_nr'} 
= 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'empty_def_arguments'}{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
@@ -701,8 +667,6 @@
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'line_nr'} 
= 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'empty_def_arguments'}{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
@@ -710,8 +674,6 @@
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'line_nr'} 
= 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'empty_def_arguments'}{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
@@ -722,8 +684,6 @@
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'line_nr'} 
= 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'line_nr'};
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'empty_def_arguments'}{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[9]{'args'}[0];

Modified: trunk/tp/t/results/indices/encoding_index_latin1.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_latin1.pl 2018-09-08 23:00:20 UTC 
(rev 8159)
+++ trunk/tp/t/results/indices/encoding_index_latin1.pl 2018-09-09 00:05:42 UTC 
(rev 8160)
@@ -163,7 +163,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => "\x{e9} \x{e9}"
+                  'text' => 'é é'
                 },
                 {
                   'parent' => {},

Modified: trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
2018-09-08 23:00:20 UTC (rev 8159)
+++ trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
2018-09-09 00:05:42 UTC (rev 8160)
@@ -163,7 +163,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => "\x{e9} \x{e9}"
+                  'text' => 'é é'
                 },
                 {
                   'parent' => {},

Modified: trunk/tp/t/results/indices/encoding_index_utf8.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_utf8.pl   2018-09-08 23:00:20 UTC 
(rev 8159)
+++ trunk/tp/t/results/indices/encoding_index_utf8.pl   2018-09-09 00:05:42 UTC 
(rev 8160)
@@ -163,7 +163,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => "\x{e9} \x{e9}"
+                  'text' => 'é é'
                 },
                 {
                   'parent' => {},

Modified: trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl   
2018-09-08 23:00:20 UTC (rev 8159)
+++ trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl   
2018-09-09 00:05:42 UTC (rev 8160)
@@ -163,7 +163,7 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => "\x{e9} \x{e9}"
+                  'text' => 'é é'
                 },
                 {
                   'parent' => {},

Modified: trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl     
2018-09-08 23:00:20 UTC (rev 8159)
+++ trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl     
2018-09-09 00:05:42 UTC (rev 8160)
@@ -115,15 +115,7 @@
                   'cmdname' => 'item',
                   'contents' => [],
                   'extra' => {
-                    'cell_number' => 1,
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    'cell_number' => 1
                   },
                   'line_nr' => {},
                   'parent' => {}
@@ -132,15 +124,7 @@
                   'cmdname' => 'tab',
                   'contents' => [],
                   'extra' => {
-                    'cell_number' => 2,
-                    'spaces_after_command_elt' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    'cell_number' => 2
                   },
                   'line_nr' => {},
                   'parent' => {}
@@ -266,12 +250,8 @@
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command_elt'}{'extra'}{'command'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command_elt'}{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0];

Modified: trunk/tp/t/results/sectioning/node_empty_direction.pl
===================================================================
--- trunk/tp/t/results/sectioning/node_empty_direction.pl       2018-09-08 
23:00:20 UTC (rev 8159)
+++ trunk/tp/t/results/sectioning/node_empty_direction.pl       2018-09-09 
00:05:42 UTC (rev 8160)
@@ -27,6 +27,9 @@
         {
           'contents' => [
             {
+              'extra' => {
+                'command' => {}
+              },
               'parent' => {},
               'text' => ' ',
               'type' => 'empty_spaces_before_argument'
@@ -68,6 +71,7 @@
 $result_trees{'node_empty_direction'}{'contents'}[0]{'parent'} = 
$result_trees{'node_empty_direction'};
 
$result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0];
 $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'node_empty_direction'}{'contents'}[1];
+$result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1];
 
$result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1];
 
$result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1]{'extra'}{'spaces_before_argument_elt'}
 = 
$result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1]{'contents'}[0];
 $result_trees{'node_empty_direction'}{'contents'}[1]{'args'}[1]{'parent'} = 
$result_trees{'node_empty_direction'}{'contents'}[1];

Modified: trunk/tp/t/results/value/set_flag_command_equivalent.pl
===================================================================
--- trunk/tp/t/results/value/set_flag_command_equivalent.pl     2018-09-08 
23:00:20 UTC (rev 8159)
+++ trunk/tp/t/results/value/set_flag_command_equivalent.pl     2018-09-09 
00:05:42 UTC (rev 8160)
@@ -13,11 +13,6 @@
           'contents' => [
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'empty_spaces_after_command'
-            },
-            {
-              'parent' => {},
               'text' => 'on'
             },
             {
@@ -36,7 +31,7 @@
         'misc_args' => [
           'on'
         ],
-        'spaces_after_command' => {}
+        'spaces_before_argument' => ' '
       },
       'line_nr' => {
         'file_name' => '',
@@ -74,11 +69,6 @@
           'contents' => [
             {
               'parent' => {},
-              'text' => ' ',
-              'type' => 'empty_spaces_after_command'
-            },
-            {
-              'parent' => {},
               'text' => 'off'
             },
             {
@@ -97,7 +87,7 @@
         'misc_args' => [
           'off'
         ],
-        'spaces_after_command' => {}
+        'spaces_before_argument' => ' '
       },
       'line_nr' => {
         'file_name' => '',
@@ -111,9 +101,7 @@
 };
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'args'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'args'}[0];
-$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'args'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[0];
-$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'set_flag_command_equivalent'}{'contents'}[0]{'parent'} = 
$result_trees{'set_flag_command_equivalent'};
 $result_trees{'set_flag_command_equivalent'}{'contents'}[1]{'parent'} = 
$result_trees{'set_flag_command_equivalent'};
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[2];
@@ -121,9 +109,7 @@
 $result_trees{'set_flag_command_equivalent'}{'contents'}[3]{'parent'} = 
$result_trees{'set_flag_command_equivalent'};
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'args'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'args'}[0];
-$result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'args'}[0];
 
$result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'set_flag_command_equivalent'}{'contents'}[4];
-$result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'args'}[0]{'contents'}[0];
 $result_trees{'set_flag_command_equivalent'}{'contents'}[4]{'parent'} = 
$result_trees{'set_flag_command_equivalent'};
 
 $result_texis{'set_flag_command_equivalent'} = '@codequoteundirected on

Modified: trunk/tp/tests/layout/res_parser/navigation_no_header/navigation.html
===================================================================
--- trunk/tp/tests/layout/res_parser/navigation_no_header/navigation.html       
2018-09-08 23:00:20 UTC (rev 8159)
+++ trunk/tp/tests/layout/res_parser/navigation_no_header/navigation.html       
2018-09-09 00:05:42 UTC (rev 8160)
@@ -22,4 +22,98 @@
 div.smalldisplay {margin-left: 3.2em}
 div.smallexample {margin-left: 3.2em}
 div.smalllisp {margin-left: 3.2em}
-kbd {font-style:
\ No newline at end of file
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+
+<a name="Top"></a>
+<a name="File-used-for-navigation-testing"></a>
+<h1 class="top">File used for navigation testing</h1>
+
+
+<hr size="6">
+<a name="chapter"></a>
+<a name="First-chapter"></a>
+<h1 class="chapter">1 First chapter</h1>
+
+
+<hr>
+<a name="section"></a>
+<a name="Section-in-chapter"></a>
+<h2 class="section">1.1 Section in chapter</h2>
+
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>AAAA
+</p>
+<p>b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b 
+b b b b b b b b b b b b b b b b  b b b b b bb b b b b b b  bb  b bb.
+</p>
+
+<hr>
+<a name="subsection"></a>
+<a name="Sub-section-in-section"></a>
+<h3 class="subsection">1.1.1 Sub section in section</h3>
+
+
+<hr size="6">
+<a name="SEC_Contents"></a>
+<h1 class="contents-heading">Table of Contents</h1>
+
+<div class="contents">
+
+<ul class="no-bullet">
+  <li><a name="toc-First-chapter" href="#chapter">1 First chapter</a>
+  <ul class="no-bullet">
+    <li><a name="toc-Section-in-chapter" href="#section">1.1 Section in 
chapter</a>
+    <ul class="no-bullet">
+      <li><a name="toc-Sub-section-in-section" href="#subsection">1.1.1 Sub 
section in section</a></li>
+    </ul></li>
+  </ul></li>
+</ul>
+</div>
+<hr>
+<p><font size="-1">
+  This document was generated on <em>a sunny day</em> using <a 
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</font></p>
+
+
+</body>
+</html>




reply via email to

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