[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/results/info_tes...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/results/info_tes... |
|
Date: |
Sat, 30 Apr 2011 17:34:50 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/04/30 17:34:49
Modified files:
tp/Texinfo : Parser.pm
tp/t/results/info_tests: direntry_dircategory_and_commands.pl
space_at_menu_end.pl
tp/t/results/invalid_nestings:
table_not_closed_in_menu_comment.pl
tp/t/results/macro: macro_in_menu.pl
tp/t/results/menu: dash_in_menu.pl detailmenu.pl
detailmenu_on_subnodes.pl
example_in_menu_comment.pl formats_in_menu.pl
menu_no_closed_after_empty_line.pl simple.pl
simple_no_menu.pl
tp/t/results/sectioning: complex.pl
Log message:
Put the after_description_line within the preformatted in the
menu_comment.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.248&r2=1.249
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/space_at_menu_end.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/dash_in_menu.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/example_in_menu_comment.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple_no_menu.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/complex.pl?cvsroot=texinfo&r1=1.15&r2=1.16
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -b -r1.248 -r1.249
--- Texinfo/Parser.pm 30 Apr 2011 16:44:12 -0000 1.248
+++ Texinfo/Parser.pm 30 Apr 2011 17:34:47 -0000 1.249
@@ -1995,13 +1995,13 @@
'parent' => $current,
'contents' => [] };
$current = $current->{'contents'}->[-1];
- push @{$current->{'contents'}}, { 'type' => 'after_description_line',
- 'text' => $empty_line->{'text'},
- 'parent' => $current };
push @{$current->{'contents'}}, { 'type' => 'preformatted',
'parent' => $current,
'contents' => [] };
$current = $current->{'contents'}->[-1];
+ push @{$current->{'contents'}}, { 'type' => 'after_description_line',
+ 'text' => $empty_line->{'text'},
+ 'parent' => $current };
push @{$self->{'context_stack'}}, 'preformatted';
print STDERR "MENU: END DESCRIPTION, OPEN COMMENT\n" if
($self->{'DEBUG'});
} elsif (!$no_paragraph_contexts{$self->{'context_stack'}->[-1]}) {
Index: t/results/info_tests/direntry_dircategory_and_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/info_tests/direntry_dircategory_and_commands.pl 30 Apr 2011
16:44:12 -0000 1.3
+++ t/results/info_tests/direntry_dircategory_and_commands.pl 30 Apr 2011
17:34:48 -0000 1.4
@@ -334,14 +334,14 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
},
{
- 'contents' => [
- {
'parent' => {},
'text' => 'menutitle
'
@@ -583,9 +583,9 @@
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[1]
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1];
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0];
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
Index: t/results/info_tests/space_at_menu_end.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/space_at_menu_end.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/info_tests/space_at_menu_end.pl 30 Apr 2011 16:44:12 -0000
1.3
+++ t/results/info_tests/space_at_menu_end.pl 30 Apr 2011 17:34:48 -0000
1.4
@@ -108,6 +108,8 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
@@ -115,6 +117,10 @@
}
],
'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
'type' => 'menu_comment'
},
{
@@ -221,6 +227,7 @@
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
Index: t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 30 Apr
2011 16:44:12 -0000 1.23
+++ t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 30 Apr
2011 17:34:48 -0000 1.24
@@ -71,10 +71,16 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'args' => [
@@ -232,6 +238,7 @@
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[3];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[1];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/macro/macro_in_menu.pl 30 Apr 2011 16:44:12 -0000 1.28
+++ t/results/macro/macro_in_menu.pl 30 Apr 2011 17:34:48 -0000 1.29
@@ -327,14 +327,14 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
},
{
- 'contents' => [
- {
'parent' => {},
'text' => 'menu comment
'
@@ -659,9 +659,9 @@
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'extra'}{'menu_entry_description'}
= $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'args'}[3];
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'args'}[1]{'contents'}[0];
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[19];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[0];
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2];
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'parent'} =
$result_trees{'macro_in_menu'}{'contents'}[19];
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3];
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[1];
Index: t/results/menu/dash_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/menu/dash_in_menu.pl 30 Apr 2011 16:44:13 -0000 1.7
+++ t/results/menu/dash_in_menu.pl 30 Apr 2011 17:34:49 -0000 1.8
@@ -100,14 +100,14 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
},
{
- 'contents' => [
- {
'parent' => {},
'text' => 'comment --- in.
'
@@ -187,9 +187,9 @@
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'args'}[3];
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'args'}[3];
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'dash_in_menu'}{'contents'}[1];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2];
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'dash_in_menu'}{'contents'}[1];
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0];
Index: t/results/menu/detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/menu/detailmenu.pl 30 Apr 2011 16:44:13 -0000 1.23
+++ t/results/menu/detailmenu.pl 30 Apr 2011 17:34:49 -0000 1.24
@@ -75,6 +75,8 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
@@ -82,6 +84,10 @@
}
],
'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
'type' => 'menu_comment'
},
{
@@ -254,6 +260,7 @@
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
= $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'args'}[3];
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'detailmenu'}{'contents'}[1];
+$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[2];
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'detailmenu'}{'contents'}[1];
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3];
Index: t/results/menu/detailmenu_on_subnodes.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/menu/detailmenu_on_subnodes.pl 30 Apr 2011 16:44:13 -0000
1.4
+++ t/results/menu/detailmenu_on_subnodes.pl 30 Apr 2011 17:34:49 -0000
1.5
@@ -157,6 +157,8 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
@@ -164,6 +166,10 @@
}
],
'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
'type' => 'menu_comment'
},
{
@@ -1295,6 +1301,7 @@
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_description'}
=
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0];
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1];
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
Index: t/results/menu/example_in_menu_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/menu/example_in_menu_comment.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/menu/example_in_menu_comment.pl 30 Apr 2011 16:44:13 -0000
1.7
+++ t/results/menu/example_in_menu_comment.pl 30 Apr 2011 17:34:49 -0000
1.8
@@ -69,10 +69,16 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'cmdname' => 'example',
@@ -241,6 +247,7 @@
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[3];
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'example_in_menu_comment'}{'contents'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2];
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
Index: t/results/menu/formats_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/menu/formats_in_menu.pl 30 Apr 2011 16:44:13 -0000 1.5
+++ t/results/menu/formats_in_menu.pl 30 Apr 2011 17:34:49 -0000 1.6
@@ -226,6 +226,8 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
@@ -233,6 +235,10 @@
}
],
'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
'type' => 'menu_comment'
},
{
@@ -503,10 +509,16 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'cmdname' => 'example',
@@ -705,6 +717,7 @@
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
@@ -752,6 +765,7 @@
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'line_nr'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[0]{'line_nr'};
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
Index: t/results/menu/menu_no_closed_after_empty_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/menu/menu_no_closed_after_empty_line.pl 30 Apr 2011 16:44:13
-0000 1.17
+++ t/results/menu/menu_no_closed_after_empty_line.pl 30 Apr 2011 17:34:49
-0000 1.18
@@ -71,14 +71,14 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
},
{
- 'contents' => [
- {
'parent' => {},
'text' => '
',
@@ -113,9 +113,9 @@
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[3];
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
=
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0];
+$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
+$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2];
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0];
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'parent'} =
$result_trees{'menu_no_closed_after_empty_line'};
Index: t/results/menu/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/menu/simple.pl 30 Apr 2011 16:44:13 -0000 1.26
+++ t/results/menu/simple.pl 30 Apr 2011 17:34:49 -0000 1.27
@@ -304,14 +304,14 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
},
{
- 'contents' => [
- {
'parent' => {},
'text' => 'new comment
'
@@ -503,9 +503,9 @@
$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_description'}
= $result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3];
$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0];
$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'parent'} =
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[0];
$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[3]{'contents'}[6];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[1];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'simple'}{'contents'}[3]{'contents'}[6];
$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'parent'} =
$result_trees{'simple'}{'contents'}[3];
$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'simple'}{'contents'}[3]{'contents'}[7];
$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1];
Index: t/results/menu/simple_no_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple_no_menu.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/menu/simple_no_menu.pl 30 Apr 2011 16:44:13 -0000 1.3
+++ t/results/menu/simple_no_menu.pl 30 Apr 2011 17:34:49 -0000 1.4
@@ -304,14 +304,14 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'after_description_line'
},
{
- 'contents' => [
- {
'parent' => {},
'text' => 'new comment
'
@@ -503,9 +503,9 @@
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_description'}
= $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3];
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0];
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'parent'} =
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[0];
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[1];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6];
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'parent'} =
$result_trees{'simple_no_menu'}{'contents'}[3];
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'}
= $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7];
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1];
Index: t/results/sectioning/complex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/complex.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/sectioning/complex.pl 30 Apr 2011 16:44:13 -0000 1.15
+++ t/results/sectioning/complex.pl 30 Apr 2011 17:34:49 -0000 1.16
@@ -728,6 +728,8 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
@@ -735,6 +737,10 @@
}
],
'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
'type' => 'menu_comment'
},
{
@@ -2526,6 +2532,7 @@
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'extra'}{'menu_entry_description'}
=
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'args'}[3];
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'args'}[1]{'contents'}[0];
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'complex'}{'contents'}[4]{'contents'}[2];
+$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0];
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'complex'}{'contents'}[4]{'contents'}[2];
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0];