texinfo-commits
[Top][All Lists]
Advanced

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

[7441] include parent on menu_star


From: gavinsmith0123
Subject: [7441] include parent on menu_star
Date: Sat, 8 Oct 2016 12:22:45 +0000 (UTC)

Revision: 7441
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7441
Author:   gavin
Date:     2016-10-08 12:22:45 +0000 (Sat, 08 Oct 2016)
Log Message:
-----------
include parent on menu_star

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/menu/bad_beginning.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-10-08 11:56:59 UTC (rev 7440)
+++ trunk/ChangeLog     2016-10-08 12:22:45 UTC (rev 7441)
@@ -1,5 +1,10 @@
 2016-10-08  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi): Include 'parent' on 
+       'menu_star' element.
+
+2016-10-08  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_texi): If 'menu' element is not 
        directly under a "root element" (@node or sectioning), don't record
        it in the list of menus for that node, and issue a warning.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-10-08 11:56:59 UTC (rev 7440)
+++ trunk/tp/Texinfo/Parser.pm  2016-10-08 12:22:45 UTC (rev 7441)
@@ -4048,7 +4048,8 @@
         print STDERR "MENU STAR\n" if ($self->{'DEBUG'});
         _abort_empty_line($self, $current);
         $line =~ s/^\*//;
-        push @{$current->{'contents'}}, { 'type' => 'menu_star',
+        push @{$current->{'contents'}}, { 'parent' => $current,
+                                          'type' => 'menu_star',
                                           'text' => '*' };
       # a space after a * at the beginning of a menu line
       } elsif ($current->{'contents'} and @{$current->{'contents'}} 

Modified: trunk/tp/t/results/menu/bad_beginning.pl
===================================================================
--- trunk/tp/t/results/menu/bad_beginning.pl    2016-10-08 11:56:59 UTC (rev 
7440)
+++ trunk/tp/t/results/menu/bad_beginning.pl    2016-10-08 12:22:45 UTC (rev 
7441)
@@ -34,10 +34,12 @@
 '
                 },
                 {
+                  'parent' => {},
                   'text' => '*something::
 '
                 },
                 {
+                  'parent' => {},
                   'text' => '*'
                 },
                 {
@@ -129,6 +131,8 @@
 $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'bad_beginning'}{'contents'}[0];
 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4];
 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[1]{'contents'}[0];




reply via email to

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