[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/results/coverage...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/results/coverage... |
|
Date: |
Wed, 07 Sep 2011 22:41:23 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/09/07 22:41:23
Modified files:
tp/Texinfo : Parser.pm
tp/t/results/coverage: comment_on_cartouche_line.pl
comment_on_group_line.pl
tp/t/results/menu: comment_on_menu_line.pl
tp/t/results/preformatted: text_on_command_line.pl
tp/t/results/xml_tests: comments_on_block_command_lines.pl
Log message:
Consider that all the block @-commands have arguments, except for
raw block @-commands. That way, a comment on the line is in the
'args' and not in the contents.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.292&r2=1.293
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/comment_on_group_line.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/comment_on_menu_line.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/text_on_command_line.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.2&r2=1.3
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -b -r1.292 -r1.293
--- Texinfo/Parser.pm 4 Sep 2011 12:14:02 -0000 1.292
+++ Texinfo/Parser.pm 7 Sep 2011 22:41:21 -0000 1.293
@@ -515,10 +515,7 @@
$begin_line_commands{$block_command} = 1;
$default_no_paragraph_commands{$block_command} = 1;
$block_arg_commands{$block_command} = 1
- if ($block_command eq 'multitable'
- or $def_commands{$block_command}
- or ($block_commands{$block_command}
- and $block_commands{$block_command} =~ /^\d+$/));
+ if ($block_commands{$block_command} ne 'raw');
}
my %close_preformatted_commands = %close_paragraph_commands;
@@ -2721,6 +2718,18 @@
'contents' => [], 'parent', $current };
$current = $current->{'contents'}->[-1];
}
+ if ($current->{'cmdname'} and $menu_commands{$current->{'cmdname'}}) {
+ push @{$current->{'contents'}}, {'type' => 'menu_comment',
+ 'parent' => $current,
+ 'contents' => [] };
+ $current = $current->{'contents'}->[-1];
+ #push @{$current->{'contents'}}, {'type' => 'preformatted',
+ # 'parent' => $current,
+ # 'contents' => [] };
+ #$current = $current->{'contents'}->[-1];
+ print STDERR "MENU_COMMENT OPEN\n" if ($self->{'DEBUG'});
+ push @{$self->{'context_stack'}}, 'preformatted';
+ }
$current = $self->_begin_preformatted($current);
# if we are after a @end verbatim, we must restart a preformatted if needed,
@@ -4199,19 +4208,8 @@
push @{$current->{'contents'}}, $block;
}
$current = $current->{'contents'}->[-1];
- if ($block_arg_commands{$command}) {
- $current->{'args'} = [ {
- 'type' => 'block_line_arg',
- 'contents' => [],
- 'parent' => $current } ];
- $current->{'remaining_args'} = $block_commands{$command} -1
- if ($block_commands{$command} =~ /^\d+$/
- and $block_commands{$command} -1);
- $current = $current->{'args'}->[-1];
- push @{$self->{'context_stack'}}, 'line'
- unless ($def_commands{$command});
- } else {
+ if ($block_arg_commands{$command}) {
push @{$self->{'context_stack'}}, 'preformatted'
if ($preformatted_commands{$command});
if ($region_commands{$command}) {
@@ -4246,19 +4244,18 @@
push @{$self->{'info'}->{'unassociated_menus'}}, $current;
}
}
- push @{$current->{'contents'}}, {'type' => 'menu_comment',
- 'parent' => $current,
- 'contents' => [] };
- $current = $current->{'contents'}->[-1];
- #push @{$current->{'contents'}}, {'type' => 'preformatted',
- # 'parent' => $current,
- # 'contents' => [] };
- #$current = $current->{'contents'}->[-1];
- print STDERR "MENU_COMMENT OPEN\n" if ($self->{'DEBUG'});
- push @{$self->{'context_stack'}}, 'preformatted';
}
- $current = $self->_begin_preformatted($current)
- unless ($block_commands{$command} eq 'raw');
+ $current->{'args'} = [ {
+ 'type' => 'block_line_arg',
+ 'contents' => [],
+ 'parent' => $current } ];
+
+ $current->{'remaining_args'} = $block_commands{$command} -1
+ if ($block_commands{$command} =~ /^\d+$/
+ and $block_commands{$command} -1 > 0);
+ $current = $current->{'args'}->[-1];
+ push @{$self->{'context_stack'}}, 'line'
+ unless ($def_commands{$command});
}
$block->{'line_nr'} = $line_nr;
$block->{'extra'}->{'invalid_nesting'} = 1 if ($invalid);
Index: t/results/coverage/comment_on_cartouche_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/comment_on_cartouche_line.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage/comment_on_cartouche_line.pl 6 Sep 2011 23:04:03
-0000 1.6
+++ t/results/coverage/comment_on_cartouche_line.pl 7 Sep 2011 22:41:21
-0000 1.7
@@ -8,7 +8,8 @@
$result_trees{'comment_on_cartouche_line'} = {
'contents' => [
{
- 'cmdname' => 'cartouche',
+ 'args' => [
+ {
'contents' => [
{
'extra' => {
@@ -29,7 +30,14 @@
],
'cmdname' => 'c',
'parent' => {}
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'cartouche',
+ 'contents' => [
{
'contents' => [
{
@@ -95,20 +103,21 @@
],
'type' => 'text_root'
};
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0];
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[1];
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'parent'} =
$result_trees{'comment_on_cartouche_line'};
$result_texis{'comment_on_cartouche_line'} = '@cartouche @c comment
Index: t/results/coverage/comment_on_group_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/comment_on_group_line.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/coverage/comment_on_group_line.pl 6 Sep 2011 23:04:04 -0000
1.6
+++ t/results/coverage/comment_on_group_line.pl 7 Sep 2011 22:41:22 -0000
1.7
@@ -8,7 +8,8 @@
$result_trees{'comment_on_group_line'} = {
'contents' => [
{
- 'cmdname' => 'group',
+ 'args' => [
+ {
'contents' => [
{
'extra' => {
@@ -29,7 +30,14 @@
],
'cmdname' => 'c',
'parent' => {}
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'group',
+ 'contents' => [
{
'contents' => [
{
@@ -95,20 +103,21 @@
],
'type' => 'text_root'
};
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_group_line'}{'contents'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_group_line'}{'contents'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'comment_on_group_line'}{'contents'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0];
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'comment_on_group_line'}{'contents'}[0];
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'comment_on_group_line'}{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'comment_on_group_line'}{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[3];
+$result_trees{'comment_on_group_line'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[1];
$result_trees{'comment_on_group_line'}{'contents'}[0]{'parent'} =
$result_trees{'comment_on_group_line'};
$result_texis{'comment_on_group_line'} = '@group @c comment
Index: t/results/menu/comment_on_menu_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/comment_on_menu_line.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/menu/comment_on_menu_line.pl 19 Aug 2011 23:09:43 -0000
1.6
+++ t/results/menu/comment_on_menu_line.pl 7 Sep 2011 22:41:22 -0000
1.7
@@ -48,10 +48,7 @@
'type' => 'empty_line'
},
{
- 'cmdname' => 'menu',
- 'contents' => [
- {
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
@@ -76,12 +73,11 @@
}
],
'parent' => {},
- 'type' => 'preformatted'
+ 'type' => 'block_line_arg'
}
],
- 'parent' => {},
- 'type' => 'menu_comment'
- },
+ 'cmdname' => 'menu',
+ 'contents' => [
{
'args' => [
{
@@ -317,30 +313,29 @@
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0];
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'comment_on_menu_line'}{'contents'}[1];
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[2]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
+$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1];
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'comment_on_menu_line'}{'contents'}[1];
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[1];
@@ -537,7 +532,7 @@
</div>
<table class="menu" border="0" cellspacing="0">
-<tr><th colspan="3" align="left" valign="top"></th></tr><tr><td align="left"
valign="top">• <a href="#first"
accesskey="1">first</a>:</td><td> </td><td align="left" valign="top">
+<tr><td align="left" valign="top">• <a href="#first"
accesskey="1">first</a>:</td><td> </td><td align="left" valign="top">
</td></tr>
</table>
Index: t/results/preformatted/text_on_command_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/preformatted/text_on_command_line.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/preformatted/text_on_command_line.pl 4 Sep 2011 13:26:23
-0000 1.11
+++ t/results/preformatted/text_on_command_line.pl 7 Sep 2011 22:41:23
-0000 1.12
@@ -8,8 +8,7 @@
$result_trees{'text_on_command_line'} = {
'contents' => [
{
- 'cmdname' => 'example',
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
@@ -22,13 +21,21 @@
},
{
'parent' => {},
- 'text' => 'text on line
-'
+ 'text' => 'text on line'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
- 'type' => 'preformatted'
- },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
+ 'contents' => [
{
'args' => [
{
@@ -71,6 +78,11 @@
}
],
'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
'end_command' => {}
},
'line_nr' => {
@@ -87,8 +99,7 @@
'type' => 'empty_line'
},
{
- 'cmdname' => 'example',
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
@@ -101,11 +112,25 @@
},
{
'parent' => {},
- 'text' => 'text on line followed by text
-'
+ 'text' => 'text on line followed by text'
},
{
'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
'text' => 'normal text
'
}
@@ -155,6 +180,11 @@
}
],
'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
'end_command' => {}
},
'line_nr' => {
@@ -379,24 +409,28 @@
],
'type' => 'text_root'
};
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'text_on_command_line'}{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[0];
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'text_on_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0];
$result_trees{'text_on_command_line'}{'contents'}[0]{'parent'} =
$result_trees{'text_on_command_line'};
$result_trees{'text_on_command_line'}{'contents'}[1]{'parent'} =
$result_trees{'text_on_command_line'};
-$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[2];
+$result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[2];
+$result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'text_on_command_line'}{'contents'}[2];
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0];
-$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0];
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2];
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1];
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
@@ -405,6 +439,7 @@
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1];
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'text_on_command_line'}{'contents'}[2];
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[2];
+$result_trees{'text_on_command_line'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'text_on_command_line'}{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'text_on_command_line'}{'contents'}[2]{'extra'}{'end_command'} =
$result_trees{'text_on_command_line'}{'contents'}[2]{'contents'}[1];
$result_trees{'text_on_command_line'}{'contents'}[2]{'parent'} =
$result_trees{'text_on_command_line'};
$result_trees{'text_on_command_line'}{'contents'}[3]{'parent'} =
$result_trees{'text_on_command_line'};
@@ -463,9 +498,7 @@
';
-$result_texts{'text_on_command_line'} = 'text on line
-
-text on line followed by text
+$result_texts{'text_on_command_line'} = '
normal text
in example
@@ -495,10 +528,7 @@
-$result_converted{'plaintext'}->{'text_on_command_line'} = ' text on line
-
- text on line followed by text
- normal text
+$result_converted{'plaintext'}->{'text_on_command_line'} = ' normal text
in example
@@ -506,12 +536,7 @@
$result_converted{'html_text'}->{'text_on_command_line'} = '<div
class="example">
-<pre class="example">text on line
-</pre></div>
-
-<div class="example">
-<pre class="example">text on line followed by text
-normal text
+<pre class="example">normal text
</pre></div>
<div class="example">
Index: t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/xml_tests/comments_on_block_command_lines.pl 6 Sep 2011
23:27:52 -0000 1.2
+++ t/results/xml_tests/comments_on_block_command_lines.pl 7 Sep 2011
22:41:23 -0000 1.3
@@ -1037,7 +1037,8 @@
'type' => 'empty_line'
},
{
- 'cmdname' => 'group',
+ 'args' => [
+ {
'contents' => [
{
'extra' => {
@@ -1058,7 +1059,14 @@
],
'cmdname' => 'c',
'parent' => {}
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'group',
+ 'contents' => [
{
'contents' => [
{
@@ -1128,8 +1136,7 @@
'type' => 'empty_line'
},
{
- 'cmdname' => 'example',
- 'contents' => [
+ 'args' => [
{
'contents' => [
{
@@ -1151,7 +1158,16 @@
],
'cmdname' => 'c',
'parent' => {}
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'contents' => [
{
'parent' => {},
'text' => 'in ex
@@ -1763,7 +1779,8 @@
'type' => 'empty_line'
},
{
- 'cmdname' => 'flushright',
+ 'args' => [
+ {
'contents' => [
{
'extra' => {
@@ -1784,7 +1801,14 @@
],
'cmdname' => 'c',
'parent' => {}
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'flushright',
+ 'contents' => [
{
'contents' => [
{
@@ -1854,7 +1878,8 @@
'type' => 'empty_line'
},
{
- 'cmdname' => 'raggedright',
+ 'args' => [
+ {
'contents' => [
{
'extra' => {
@@ -1875,7 +1900,14 @@
],
'cmdname' => 'c',
'parent' => {}
- },
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'raggedright',
+ 'contents' => [
{
'contents' => [
{
@@ -2124,27 +2156,29 @@
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[14]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[15]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'args'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[2]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[16];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[3];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[16]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[17]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[18];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[18];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'args'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[18];
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'contents'}[1];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[18];
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[18]{'contents'}[1]{'args'}[0];
@@ -2255,36 +2289,38 @@
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'args'}[0]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[24]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[25]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'args'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[2]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[26];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[3];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[26]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[27]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'args'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[2]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'args'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[28];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[3];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[28]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[29]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm t/results/coverage...,
Patrice Dumas <=