[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/results/macro/ma...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/results/macro/ma... |
|
Date: |
Sun, 10 Oct 2010 00:59:23 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/10 00:59:23
Modified files:
tp/Texinfo : Parser.pm
tp/t/results/macro: macro_in_menu.pl
tp/t/results/menu: menu_entry_name.pl menu_entry_node.pl
simple.pl
tp/t/results/value: value_in_node.pl
Log message:
Handle user defined macros for menu separators.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_node.pl?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- Texinfo/Parser.pm 9 Oct 2010 23:28:29 -0000 1.57
+++ Texinfo/Parser.pm 10 Oct 2010 00:59:22 -0000 1.58
@@ -1545,7 +1545,8 @@
$line =~ s/^\*//;
push @{$current->{'contents'}}, { 'type' => 'menu_star',
'text' => '*' };
- } elsif ($line =~ /^\s+/ and @{$current->{'contents'}}
+ } elsif ($line =~ /^\s+/ and $current->{'contents'}
+ and @{$current->{'contents'}}
and $current->{'contents'}->[-1]->{'type'}
and $current->{'contents'}->[-1]->{'type'} eq 'menu_star') {
print STDERR "MENU ENTRY (certainly)\n" if ($self->{'debug'});
@@ -1571,12 +1572,56 @@
'contents' => [],
'parent' => $current } ];
$current = $current->{'args'}->[-1];
- # * folllowed by something else than a space.
- } elsif (@{$current->{'contents'}}
+ # * followed by something else than a space.
+ } elsif ($current->{'contents'} and @{$current->{'contents'}}
and $current->{'contents'}->[-1]->{'type'}
and $current->{'contents'}->[-1]->{'type'} eq 'menu_star') {
print STDERR "ABORT MENU STAR ($line)\n" if ($self->{'debug'});
delete $current->{'contents'}->[-1]->{'type'};
+ # after a separator in menu
+ } elsif ($current->{'args'} and @{$current->{'args'}}
+ and $current->{'args'}->[-1]->{'type'}
+ and $current->{'args'}->[-1]->{'type'} eq
'menu_entry_separator') {
+ my $separator = $current->{'args'}->[-1]->{'text'};
+ # separator is ::, we let it be in order to collect spaces below
+ if ($separator eq ':' and $line =~ s/^(:)//) {
+ $current->{'args'}->[-1]->{'text'} .= $1;
+ # a . not followed by a space. Not a separator.
+ } elsif ($separator eq '.' and $line =~ /^\S/) {
+ pop @{$current->{'args'}};
+ $current = $current->{'args'}->[-1];
+ $current = _merge_text ($self, $current, $separator);
+ # here we collect spaces following separators.
+ } elsif ($line =~ s/^([^\S\n]+)//) {
+ # FIXME a trailing end of line could be considered to be part
+ # of the separator. Right now it is part of the description,
+ # since it is catched (in the next while) just below
+ $current->{'args'}->[-1]->{'text'} .= $1;
+ # now handle the menu part that was closed
+ } elsif ($separator =~ /^::/) {
+ print STDERR "MENU NODE no entry $separator\n" if ($self->{'debug'});
+ # it was previously registered as menu_entry_name, it is
+ # changed to node
+ $current->{'args'}->[-2]->{'type'} = 'menu_entry_node';
+ push @{$current->{'args'}}, { 'type' => 'menu_entry_description',
+ 'contents' => [],
+ 'parent' => $current };
+ $current = $current->{'args'}->[-1];
+ # end of the menu entry name
+ } elsif ($separator =~ /^:/) {
+ print STDERR "MENU ENTRY $separator\n" if ($self->{'debug'});
+ push @{$current->{'args'}}, { 'type' => 'menu_entry_node',
+ 'contents' => [],
+ 'parent' => $current };
+ $current = $current->{'args'}->[-1];
+ # anything else is the end of the menu node following a menu_entry_name
+ } else {
+ print STDERR "MENU NODE $separator\n" if ($self->{'debug'});
+ push @{$current->{'args'}}, { 'type' => 'menu_entry_description',
+ 'contents' => [],
+ 'parent' => $current };
+ $current = $current->{'args'}->[-1];
+ }
# REMACRO
} elsif ($line =~ s/^\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])//o
or $line =~ s/^\@([[:alnum:]][[:alnum:]-]*)//o) {
@@ -1964,6 +2009,7 @@
}
} elsif ($separator eq ','
and $current->{'parent'}->{'remaining_args'}) {
+ # FIXME this won't work if there is a user macro
$line =~ s/^\s*//;
my $type = $current->{'type'};
$current = $current->{'parent'};
@@ -1971,69 +2017,23 @@
push @{$current->{'args'}},
{ 'type' => $type, 'parent' => $current, 'contents' => [] };
$current = $current->{'args'}->[-1];
- }
# end of menu node (. must be followed by a space to stop the node).
- elsif ($separator =~ /[,\t.]/ and $current->{'type'}
- and $current->{'type'} eq 'menu_entry_node') {
- if ($separator eq '.' and $line =~ /^\S/) {
- $current = _merge_text ($self, $current, $separator);
- } else {
- $line =~ s/^(\s*)//;
- $separator .= $1;
- print STDERR "MENU NODE $separator\n" if ($self->{'debug'});
+ } elsif (($separator =~ /[,\t.]/ and $current->{'type'}
+ and $current->{'type'} eq 'menu_entry_node')
+ or ($separator eq ':' and $current->{'type'}
+ and $current->{'type'} eq 'menu_entry_name')) {
$current = $current->{'parent'};
push @{$current->{'args'}}, { 'type' => 'menu_entry_separator',
'text' => $separator,
'parent' => $current };
- push @{$current->{'args'}}, { 'type' => 'menu_entry_description',
- 'contents' => [],
- 'parent' => $current };
- $current = $current->{'args'}->[-1];
- if ($line eq '') {
- $current = _end_line($self, $current, $line_nr);
- last;
- }
- }
- # end of menu_entry_name
- } elsif ($separator eq ':' and $current->{'type'}
- and $current->{'type'} eq 'menu_entry_name') {
- # menu node. Transform the menu_entry_name in to a node, add the
- # separator and open a description
- if ($line =~ s/^(:\s*)//) {
- $separator .= $1;
- print STDERR "MENU ENTRY $separator\n" if ($self->{'debug'});
- $current->{'type'} = 'menu_entry_node';
- $current = $current->{'parent'};
- push @{$current->{'args'}}, { 'type' => 'menu_entry_separator',
- 'text' => $separator,
- 'parent' => $current };
- push @{$current->{'args'}}, { 'type' => 'menu_entry_description',
- 'contents' => [],
- 'parent' => $current };
- # end of the menu_entry_name, open the menu_entry_node.
- } else {
- $line =~ s/^([ \t]*)//;
- $separator .= $1;
- $current = $current->{'parent'};
- push @{$current->{'args'}}, { 'type' => 'menu_entry_separator',
- 'text' => $separator,
- 'parent' => $current };
- push @{$current->{'args'}}, { 'type' => 'menu_entry_node',
- 'contents' => [],
- 'parent' => $current };
- }
- $current = $current->{'args'}->[-1];
- if ($line eq '') {
- $current = _end_line($self, $current, $line_nr);
- last;
- }
} else {
$current = _merge_text ($self, $current, $separator);
}
- # Misc text
+ # Misc text except end of line
} elsif ($line =~ s/^([^{}@,:\t.\n]+)//) {
my $new_text = $1;
$current = _merge_text ($self, $current, $new_text);
+ # end of line
} else {
if ($self->{'debug'}) {
print STDERR "END LINE: ". _print_current($current)."\n";
Index: t/results/macro/macro_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/macro/macro_in_menu.pl 9 Oct 2010 23:22:52 -0000 1.3
+++ t/results/macro/macro_in_menu.pl 10 Oct 2010 00:59:22 -0000 1.4
@@ -185,14 +185,14 @@
},
{
'parent' => {},
- 'text' => '::',
+ 'text' => ':: ',
'type' => 'menu_entry_separator'
},
{
'contents' => [
{
'parent' => {},
- 'text' => ' description
+ 'text' => 'description
'
}
],
@@ -239,12 +239,17 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => '::',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -271,12 +276,17 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => '::',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -310,15 +320,25 @@
'contents' => [
{
'parent' => {},
- 'text' => 'entry. description
-'
+ 'text' => 'entry'
}
],
'parent' => {},
'type' => 'menu_entry_node'
},
{
- 'contents' => [],
+ 'parent' => {},
+ 'text' => '. ',
+ 'type' => 'menu_entry_separator'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'description
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -366,12 +386,14 @@
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[2]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[11];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[2]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[3];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[3]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[11];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
@@ -381,6 +403,8 @@
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[4]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[5]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[5]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[11];
$result_trees{'macro_in_menu'}{'contents'}[11]{'parent'} =
$result_trees{'macro_in_menu'};
Index: t/results/menu/menu_entry_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_name.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/menu/menu_entry_name.pl 27 Sep 2010 07:33:47 -0000 1.1
+++ t/results/menu/menu_entry_name.pl 10 Oct 2010 00:59:22 -0000 1.2
@@ -81,12 +81,17 @@
},
{
'parent' => {},
- 'text' => ',
-',
+ 'text' => ',',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -128,12 +133,17 @@
},
{
'parent' => {},
- 'text' => ',
-',
+ 'text' => ', ',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -227,12 +237,17 @@
},
{
'parent' => {},
- 'text' => '.
-',
+ 'text' => '. ',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -274,12 +289,17 @@
},
{
'parent' => {},
- 'text' => '.
-',
+ 'text' => '.',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -373,12 +393,17 @@
},
{
'parent' => {},
- 'text' => '.
-',
+ 'text' => '.',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -420,12 +445,17 @@
},
{
'parent' => {},
- 'text' => '.
-',
+ 'text' => '. ',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -505,6 +535,7 @@
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[4]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[5]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[5];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[5]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'menu_entry_name'}{'contents'}[0];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2];
@@ -514,6 +545,7 @@
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[3];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[4]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[5]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[5];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[5]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'menu_entry_name'}{'contents'}[0];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3];
@@ -533,6 +565,7 @@
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[3];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[4]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[5]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[5];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[5]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'menu_entry_name'}{'contents'}[0];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5];
@@ -542,6 +575,7 @@
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[3];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[4]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[5]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[5];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[5]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'menu_entry_name'}{'contents'}[0];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6];
@@ -561,6 +595,7 @@
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[3];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[4]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[5]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[5];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[5]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'parent'} =
$result_trees{'menu_entry_name'}{'contents'}[0];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8];
@@ -570,6 +605,7 @@
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[3];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[4]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[5]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[5];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[5]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'parent'} =
$result_trees{'menu_entry_name'}{'contents'}[0];
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
= $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9];
Index: t/results/menu/menu_entry_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_node.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/menu/menu_entry_node.pl 27 Sep 2010 07:33:47 -0000 1.1
+++ t/results/menu/menu_entry_node.pl 10 Oct 2010 00:59:22 -0000 1.2
@@ -24,12 +24,17 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => '::',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -56,12 +61,17 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => ':: ',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -137,12 +147,17 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => ':: ',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -159,12 +174,14 @@
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'args'}[1];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'args'}[3];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'menu_entry_node'}{'contents'}[0];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[1];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[2]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[3];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'menu_entry_node'}{'contents'}[0];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2];
@@ -181,6 +198,7 @@
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[3]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[1];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[2]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[3];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[3]{'parent'}
= $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3];
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'menu_entry_node'}{'contents'}[0];
$result_trees{'menu_entry_node'}{'contents'}[0]{'parent'} =
$result_trees{'menu_entry_node'};
Index: t/results/menu/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/simple.pl 9 Oct 2010 17:51:37 -0000 1.2
+++ t/results/menu/simple.pl 10 Oct 2010 00:59:22 -0000 1.3
@@ -145,12 +145,17 @@
},
{
'parent' => {},
- 'text' => ',
-',
+ 'text' => ', ',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -177,14 +182,18 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => '::',
'type' => 'menu_entry_separator'
},
{
'contents' => [
{
'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
'text' => ' description next line
'
},
@@ -237,12 +246,17 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => '::',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -282,6 +296,7 @@
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3];
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[4]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[5]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[5];
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[5]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'simple'}{'contents'}[1];
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
@@ -290,6 +305,7 @@
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3];
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'}
= $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[2]{'parent'}
= $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3];
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'simple'}{'contents'}[1];
$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'simple'}{'contents'}[1];
@@ -299,6 +315,7 @@
$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'args'}[1];
$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'args'}[1]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[7];
$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'args'}[2]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[7];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'args'}[3];
$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'args'}[3]{'parent'} =
$result_trees{'simple'}{'contents'}[1]{'contents'}[7];
$result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'simple'}{'contents'}[1];
$result_trees{'simple'}{'contents'}[1]{'parent'} = $result_trees{'simple'};
Index: t/results/value/value_in_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_in_node.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/value/value_in_node.pl 9 Oct 2010 17:51:38 -0000 1.3
+++ t/results/value/value_in_node.pl 10 Oct 2010 00:59:23 -0000 1.4
@@ -117,12 +117,17 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => '::',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -249,12 +254,17 @@
},
{
'parent' => {},
- 'text' => '::
-',
+ 'text' => '::',
'type' => 'menu_entry_separator'
},
{
- 'contents' => [],
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
'parent' => {},
'type' => 'menu_entry_description'
}
@@ -372,6 +382,7 @@
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'args'}[1];
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0];
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'args'}[3];
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'args'}[3]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0];
$result_trees{'value_in_node'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[5];
$result_trees{'value_in_node'}{'contents'}[5]{'parent'} =
$result_trees{'value_in_node'};
@@ -396,6 +407,7 @@
$result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0]{'args'}[1];
$result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0];
$result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0]{'args'}[3];
$result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0]{'args'}[3]{'parent'}
= $result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0];
$result_trees{'value_in_node'}{'contents'}[12]{'contents'}[0]{'parent'} =
$result_trees{'value_in_node'}{'contents'}[12];
$result_trees{'value_in_node'}{'contents'}[12]{'parent'} =
$result_trees{'value_in_node'};