[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Common.pm Texinfo/Parse...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Common.pm Texinfo/Parse... |
|
Date: |
Tue, 03 Jan 2012 01:47:55 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/01/03 01:47:55
Modified files:
tp : TODO
tp/Texinfo : Common.pm Parser.pm
tp/Texinfo/Convert: Converter.pm DocBook.pm HTML.pm Plaintext.pm
Text.pm
tp/init : html32.pm latex2html.pm tex4ht.pm
tp/t/results/conditionals: many_conditionals.pl
tp/t/results/coverage: symbol_after_block.pl
tp/t/results/coverage_braces: raw_expanded_in_style.pl
raw_in_style.pl
tp/t/results/html_tests: raw_html.pl tex_expanded_in_copying.pl
tp/t/results/macro: space_macro_after_end.pl
tp/t/results/menu: formats_in_menu.pl
tp/t/results/plaintext_tests: expanded_tex.pl html_expanded.pl
isolated_html_expanded.pl
tp/t/results/raw: braces_in_tex.pl misc_raw.pl
misc_raw_comments.pl
raw_commands_and_end_of_lines.pl
raw_in_brace_command.pl raw_in_example.pl
raw_in_para.pl raw_not_closed.pl
tex_not_closed.pl
tp/t/results/test_count: expanded_tex.pl
tp/t/results/xml_tests: raw.pl
Log message:
Expand @-commands in format raw environments.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.230&r2=1.231
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.345&r2=1.346
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.218&r2=1.219
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.196&r2=1.197
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/html32.pm?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/latex2html.pm?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/tex4ht.pm?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/conditionals/many_conditionals.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/symbol_after_block.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/raw_expanded_in_style.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/raw_in_style.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/raw_html.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/tex_expanded_in_copying.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/space_macro_after_end.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/expanded_tex.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/html_expanded.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/braces_in_tex.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/misc_raw.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/misc_raw_comments.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_commands_and_end_of_lines.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_in_brace_command.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_in_example.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_in_para.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/raw_not_closed.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/raw/tex_not_closed.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/expanded_tex.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/raw.pl?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- TODO 12 Dec 2011 22:44:58 -0000 1.230
+++ TODO 3 Jan 2012 01:47:52 -0000 1.231
@@ -2,6 +2,11 @@
perl -w t/02coverage.t -o
xmllint --nonet --noout --valid commands.xml
+Redo macros/space_macro_after_end with @verbatim
+duplicate coverage_braces/'raw_in_style','raw_expanded_in_style'
+and raw/'raw_in_brace_command'
+
+
Before next release
===================
@@ -47,6 +52,8 @@
Missing tests
=============
+Test for @html in @copying when expanding @html.
+
Test for the handling of #line.
Test tree leading to non empty preamble_before_setfilename. Currently there
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- Texinfo/Common.pm 30 Dec 2011 18:49:42 -0000 1.110
+++ Texinfo/Common.pm 3 Jan 2012 01:47:52 -0000 1.111
@@ -599,22 +599,21 @@
$preformatted_commands{$preformatted_command} = 1;
}
-our @out_formats = ('html', 'tex', 'xml', 'docbook');
-our %preformatted_raw_commands;
-foreach my $preformatted_raw_command(@out_formats) {
-# $block_commands{$preformatted_raw_command} = 0;
-# $preformatted_raw_commands{$preformatted_raw_command} = 1;
+our %format_raw_commands;
+foreach my $format_raw_command('html', 'tex', 'xml', 'docbook') {
+ $block_commands{$format_raw_command} = 0;
+ $format_raw_commands{$format_raw_command} = 1;
}
our %raw_commands;
# macro/rmacro are special
-foreach my $raw_command ('verbatim', @out_formats,
+foreach my $raw_command ('verbatim',
'ignore', 'macro', 'rmacro') {
$block_commands{$raw_command} = 'raw';
$raw_commands{$raw_command} = 1;
}
-foreach my $command (@out_formats, 'info', 'plaintext') {
+foreach my $command (keys(%format_raw_commands), 'info', 'plaintext') {
$block_commands{'if' . $command} = 'conditional';
$block_commands{'ifnot' . $command} = 'conditional';
}
@@ -635,7 +634,8 @@
foreach my $block_command (keys(%block_commands)) {
$close_paragraph_commands{$block_command} = 1
unless ($block_commands{$block_command} eq 'raw' or
- $block_commands{$block_command} eq 'conditional');
+ $block_commands{$block_command} eq 'conditional'
+ or $format_raw_commands{$block_command});
}
$close_paragraph_commands{'verbatim'} = 1;
@@ -1611,7 +1611,12 @@
=item %raw_commands
@-commands that have no expansion of @-commands in their bodies,
-as C<@macro>, C<@verbatim>, C<@ignore>, or C<@html>.
+as C<@macro>, C<@verbatim> or C<@ignore>.
+
+=item %format_raw_commands
+
address@hidden associated with raw output format, like C<@html>, or
+C<@docbook>.
=item %def_commands
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -b -r1.345 -r1.346
--- Texinfo/Parser.pm 30 Dec 2011 18:49:42 -0000 1.345
+++ Texinfo/Parser.pm 3 Jan 2012 01:47:52 -0000 1.346
@@ -190,9 +190,9 @@
# is also in that structure.
# misc_commands the same than %misc_commands below, but with index
# entry commands dynamically added
-# close_paragraph_commands same than %close_paragraph_command, but with
+# close_paragraph_commands same than %close_paragraph_commands, but with
# insertcopying removed if INLINE_INSERTCOPYING
-# close_preformatted_commands same than %close_preformatted_command, but with
+# close_preformatted_commands same than %close_preformatted_commands, but
with
# insertcopying removed if INLINE_INSERTCOPYING
# no_paragraph_commands the same than %default_no_paragraph_commands
# below, with index
@@ -246,12 +246,11 @@
my %def_aliases = %Texinfo::Common::def_aliases;
my %menu_commands = %Texinfo::Common::menu_commands;
my %preformatted_commands = %Texinfo::Common::preformatted_commands;
-my %preformatted_raw_commands = %Texinfo::Common::preformatted_raw_commands;
+my %format_raw_commands = %Texinfo::Common::format_raw_commands;
my %item_container_commands = %Texinfo::Common::item_container_commands;
my %item_line_commands = %Texinfo::Common::item_line_commands;
my %deprecated_commands = %Texinfo::Common::deprecated_commands;
my %root_commands = %Texinfo::Common::root_commands;
-my @out_formats = @Texinfo::Common::out_formats;
my %command_index_prefix = %Texinfo::Common::command_index_prefix;
my %command_structuring_level = %Texinfo::Common::command_structuring_level;
my %ref_commands = %Texinfo::Common::ref_commands;
@@ -357,12 +356,17 @@
$default_no_paragraph_commands{$block_command} = 1;
$block_arg_commands{$block_command} = 1
if ($block_commands{$block_command} ne 'raw');
+# and ! $format_raw_commands{$block_command});
}
my %close_preformatted_commands = %close_paragraph_commands;
foreach my $no_close_preformatted('sp') {
delete $close_preformatted_commands{$no_close_preformatted};
}
+# FIXME to close preformated or not to close?
+#foreach my $format_raw_command(keys(%format_raw_commands)) {
+# $close_preformatted_commands{$format_raw_command} = 1;
+#}
# commands that may appear in accents
my %in_accent_commands = (%accent_commands);
@@ -385,7 +389,7 @@
$in_full_text_commands{$misc_command_in_full_text} = 1;
}
-foreach my $out_format (@out_formats) {
+foreach my $out_format (keys(%format_raw_commands)) {
$in_full_text_commands{$out_format} = 1;
}
delete $in_full_text_commands{'caption'};
@@ -1052,7 +1056,7 @@
{ 'type' => $self->{'context_stack'}->[-1],
'parent' => $current, 'contents' => [] };
$current = $current->{'contents'}->[-1];
- print STDERR "PREFORMATTED\n" if ($self->{'DEBUG'});
+ print STDERR "PREFORMATTED $self->{'context_stack'}->[-1]\n" if
($self->{'DEBUG'});
}
return $current;
}
@@ -1167,7 +1171,7 @@
$current = _close_all_style_commands($self, $current, $line_nr);
if ($current->{'type'} and $preformatted_contexts{$current->{'type'}}) {
- print STDERR "CLOSE PREFORMATTED\n" if ($self->{'DEBUG'});
+ print STDERR "CLOSE PREFORMATTED $current->{'type'}\n" if
($self->{'DEBUG'});
# completly remove void preformatted contexts
if (address@hidden>{'contents'}}) {
my $removed = pop @{$current->{'parent'}->{'contents'}};
@@ -1582,7 +1586,7 @@
my $context = pop @{$self->{'context_stack'}};
warn "BUG: closing preformatted_command $closed_command wrong context
$context"
if ($context ne 'preformatted');
- } elsif ($preformatted_raw_commands{$current->{'cmdname'}}) {
+ } elsif ($format_raw_commands{$current->{'cmdname'}}) {
my $context = pop @{$self->{'context_stack'}};
warn "BUG: closing preformatted_command $closed_command wrong context
$context"
if ($context ne 'rawpreformatted');
@@ -2974,7 +2978,8 @@
push @{$self->{'context_stack'}}, 'preformatted';
}
}
- $current = $self->_begin_preformatted($current);
+ $current = $self->_begin_preformatted($current)
+ if ($close_preformatted_commands{$end_command});
}
} else {
$current = $self->_begin_preformatted($current)
@@ -3302,7 +3307,7 @@
print STDERR "".Data::Dumper->Dump([$root], ['$root']);
my $line_text = '';
$line_text = "$line_nr->{'line_nr'}.$line_nr->{'macro'}" if ($line_nr);
- print STDERR "NEW
LINE($self->{'context_stack'}->[-1]:@{$self->{'conditionals_stack'}}:$line_text):
$line";
+ print STDERR "NEW LINE(".join('|',
@{$self->{'context_stack'}}).":@{$self->{'conditionals_stack'}}:$line_text):
$line";
#print STDERR "CONTEXT_STACK
".join('|',@{$self->{'context_stack'}})."\n";
delete $current->{'HERE !!!!'};
}
@@ -4233,7 +4238,7 @@
if ($block_arg_commands{$command}) {
if ($preformatted_commands{$command}) {
push @{$self->{'context_stack'}}, 'preformatted';
- } elsif ($preformatted_raw_commands{$command}) {
+ } elsif ($format_raw_commands{$command}) {
push @{$self->{'context_stack'}}, 'rawpreformatted';
}
if ($region_commands{$command}) {
@@ -4427,6 +4432,11 @@
'text' => '' };
print STDERR "BRACKETED in def/multitable\n" if ($self->{'DEBUG'});
+ # lone braces accepted right in a rawpreformatted
+ } elsif ($current->{'type'}
+ and $current->{'type'} eq 'rawpreformatted') {
+ push @{$current->{'contents'}}, {'text' => '{' };
+ # matching braces accepted in a rawpreformatted or math
} elsif ($self->{'context_stack'}->[-1] eq 'math'
or $self->{'context_stack'}->[-1] eq 'rawpreformatted') {
push @{$current->{'contents'}},
@@ -4571,6 +4581,10 @@
$current = $current->{'parent'}->{'parent'};
$current = $self->_begin_preformatted ($current)
if ($close_preformatted_commands{$closed_command});
+ # lone braces accepted right in a rawpreformatted
+ } elsif ($current->{'type'}
+ and $current->{'type'} eq 'rawpreformatted') {
+ push @{$current->{'contents'}}, {'text' => '}' };
# footnote caption closing, when there is a paragraph inside.
} elsif ($context_brace_commands{$self->{'context_stack'}->[-1]}) {
# closing the context under broader situations
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- Texinfo/Convert/Converter.pm 27 Dec 2011 23:11:41 -0000 1.69
+++ Texinfo/Convert/Converter.pm 3 Jan 2012 01:47:52 -0000 1.70
@@ -79,6 +79,7 @@
'firstparagraphindent' => 'none',
'allowcodebreaks' => 'true',
'footnotestyle' => 'end',
+ 'deftypefnnewline' => 'off',
# This is the default, mainly for tests; the caller should set them. These
# values are what is used in tests of the Converters.
'PACKAGE_AND_VERSION' => 'texinfo',
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Texinfo/Convert/DocBook.pm 25 Nov 2011 00:31:19 -0000 1.35
+++ Texinfo/Convert/DocBook.pm 3 Jan 2012 01:47:52 -0000 1.36
@@ -1077,13 +1077,15 @@
push @elements, $element;
} elsif ($root->{'cmdname'} eq 'copying') {
push @elements, ('bookinfo', 'legalnotice');
- } elsif ($Texinfo::Common::block_commands{$root->{'cmdname'}} eq 'raw') {
+ } elsif ($Texinfo::Common::format_raw_commands{$root->{'cmdname'}}) {
return '' if (!$self->{'expanded_formats_hash'}->{$root->{'cmdname'}});
if ($root->{'cmdname'} eq 'docbook') {
# the context is here only for the command, so this is forgotten
# once al the raw internal text has been formatted
$self->{'document_context'}->[-1]->{'raw'} = 1;
}
+ } elsif ($Texinfo::Common::block_commands{$root->{'cmdname'}} eq 'raw') {
+ return '';
} elsif ($Texinfo::Common::menu_commands{$root->{'cmdname'}}) {
return '';
}
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- Texinfo/Convert/HTML.pm 28 Dec 2011 23:35:55 -0000 1.218
+++ Texinfo/Convert/HTML.pm 3 Jan 2012 01:47:52 -0000 1.219
@@ -71,7 +71,7 @@
my %explained_commands = %Texinfo::Common::explained_commands;
my %item_container_commands = %Texinfo::Common::item_container_commands;
my %raw_commands = %Texinfo::Common::raw_commands;
-my @out_formats = @Texinfo::Common::out_formats;
+my %format_raw_commands = %Texinfo::Common::format_raw_commands;
my %code_style_commands = %Texinfo::Common::code_style_commands;
my %preformatted_code_commands = %Texinfo::Common::preformatted_code_commands;
my %default_index_commands = %Texinfo::Common::default_index_commands;
@@ -151,6 +151,12 @@
return $self->{'document_context'}->[-1]->{'verbatim'};
}
+sub in_raw($)
+{
+ my $self = shift;
+ return $self->{'document_context'}->[-1]->{'raw'};
+}
+
sub paragraph_number($)
{
my $self = shift;
@@ -971,7 +977,6 @@
'BODYTEXT' => undef,
'documentlanguage' => 'en',
'xrefautomaticsectiontitle' => 'off',
- 'deftypefnnewline' => 'off',
'SHOW_TITLE' => 1,
'USE_TITLEPAGE_FOR_TITLE' => 0,
'MONOLITHIC' => 1,
@@ -2285,7 +2290,7 @@
return $self->protect_text($content);
}
-foreach my $command (@out_formats) {
+foreach my $command (keys(%format_raw_commands)) {
$default_commands_conversion{$command} = \&_convert_raw_command;
}
@@ -2578,9 +2583,6 @@
my $begin_row = '';
my $end_row = '';
if ($self->_in_preformatted_in_menu()) {
- #my $pre_class = $self->_preformatted_class();
- #return $self->_attribute_class('pre', $pre_class).">".$content."</pre>";
-
$begin_row = '<tr><td>';
$end_row = '</td></tr>';
}
@@ -3484,18 +3486,9 @@
}
return '' if ($content eq '');
+ return $content if ($type eq 'rawpreformatted');
my $pre_class = $self->_preformatted_class();
- #while ($current->{'parent'}) {
- # $current = $current->{'parent'};
- # if ($current->{'cmdname'} and $pre_class_commands{$current->{'cmdname'}})
{
- # $pre_class = $pre_class_commands{$current->{'cmdname'}};
- # last;
- # } elsif ($current->{'type'} and $pre_class_types{$current->{'type'}}) {
- # $pre_class = $pre_class_types{$current->{'type'}};
- # last;
- # }
- #}
if ($self->top_format() eq 'multitable') {
$content =~ s/^\s*//;
@@ -3530,6 +3523,7 @@
}
$default_types_conversion{'preformatted'} = \&_convert_preformatted_type;
+$default_types_conversion{'rawpreformatted'} = \&_convert_preformatted_type;
sub _convert_bracketed_type($$$$) {
my $self = shift;
@@ -3567,7 +3561,8 @@
if ($self->in_verbatim()) {
return $self->protect_text($text);
}
- return $text if ($type and $type eq 'raw');
+ #return $text if ($type and $type eq 'raw');
+ return $text if ($self->in_raw());
$text = uc($text) if ($self->in_upper_case());
$text = $self->protect_text($text);
if ($self->get_conf('ENABLE_ENCODING') and
@@ -4435,11 +4430,6 @@
%{$self->{'css_map'}} = %css_map;
- foreach my $format (@out_formats) {
- $default_commands_conversion{$format} = undef
- unless ($self->{'expanded_formats_hash'}->{$format});
- }
-
$self->{'htmlxref'} = {};
if ($self->{'htmlxref_files'}) {
$self->{'htmlxref'} = Texinfo::Common::parse_htmlxref_files($self,
@@ -4476,6 +4466,8 @@
if (!$self->get_conf('SHOW_MENU')
and ($command eq 'menu' or $command eq 'detailmenu')) {
$self->{'commands_conversion'}->{$command} = undef;
+ } elsif ($format_raw_commands{$command}
+ and !$self->{'expanded_formats_hash'}->{$command}) {
} elsif (exists($default_commands_conversion{$command})) {
$self->{'commands_conversion'}->{$command}
= $default_commands_conversion{$command};
@@ -7179,7 +7171,9 @@
push @{$self->{'document_context'}->[-1]->{'preformatted_classes'}},
$pre_class_commands{$command_name};
}
- if ($command_name eq 'verb' or $command_name eq 'verbatim') {
+ if ($format_raw_commands{$command_name}) {
+ $self->{'document_context'}->[-1]->{'raw'}++;
+ } elsif ($command_name eq 'verb' or $command_name eq 'verbatim') {
$self->{'document_context'}->[-1]->{'verbatim'}++;
}
if ($code_style_commands{$command_name} or
@@ -7271,7 +7265,9 @@
} elsif ($command_name eq 'w') {
$self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'space_protected'}--;
}
- if ($command_name eq 'verb' or $command_name eq 'verbatim') {
+ if ($format_raw_commands{$command_name}) {
+ $self->{'document_context'}->[-1]->{'raw'}--;
+ } elsif ($command_name eq 'verb' or $command_name eq 'verbatim') {
$self->{'document_context'}->[-1]->{'verbatim'}--;
}
if (exists($block_commands{$command_name})) {
@@ -7299,7 +7295,8 @@
if ($root->{'cmdname'});
if ($root->{'type'} eq 'paragraph') {
$self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'paragraph_number'}++;
- } elsif ($root->{'type'} eq 'preformatted') {
+ } elsif ($root->{'type'} eq 'preformatted'
+ or $root->{'type'} eq 'rawpreformatted') {
$self->{'document_context'}->[-1]->{'formatting_context'}->[-1]->{'preformatted_number'}++;
} elsif ($root->{'type'} eq 'element') {
$self->{'current_element'} = $root;
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -b -r1.196 -r1.197
--- Texinfo/Convert/Plaintext.pm 28 Dec 2011 23:35:55 -0000 1.196
+++ Texinfo/Convert/Plaintext.pm 3 Jan 2012 01:47:52 -0000 1.197
@@ -88,7 +88,7 @@
my %explained_commands = %Texinfo::Common::explained_commands;
my %item_container_commands = %Texinfo::Common::item_container_commands;
my %raw_commands = %Texinfo::Common::raw_commands;
-my @out_formats = @Texinfo::Common::out_formats;
+my %format_raw_commands = %Texinfo::Common::format_raw_commands;
my %code_style_commands = %Texinfo::Common::code_style_commands;
my %preformatted_code_commands = %Texinfo::Common::preformatted_code_commands;
my %default_index_commands = %Texinfo::Common::default_index_commands;
@@ -140,7 +140,8 @@
# paragraph number incremented with paragraphs, center, listoffloats
# and block commands except: html and such, group, raggedright, menu*, float
-my %default_preformatted_context_commands = %preformatted_commands;
+my %default_preformatted_context_commands = (%preformatted_commands,
+ %format_raw_commands);
foreach my $preformatted_command ('verbatim', keys(%menu_commands)) {
$default_preformatted_context_commands{$preformatted_command} = 1;
}
@@ -351,7 +352,7 @@
$self->{'footnote_index'} = 0;
$self->{'pending_footnotes'} = [];
- foreach my $format (@out_formats) {
+ foreach my $format (keys(%format_raw_commands)) {
$self->{'ignored_commands'}->{$format} = 1
unless ($self->{'expanded_formats_hash'}->{$format});
}
@@ -1654,6 +1655,13 @@
}
if ($self->{'preformatted_context_commands'}->{$root->{'cmdname'}}
or $root->{'cmdname'} eq 'float') {
+ if ($self->{'formatters'}->[-1]->{'type'} eq 'paragraph'
+ and $format_raw_commands{$root->{'cmdname'}}) {
+ $result .= $self->_count_added($formatter->{'container'},
+ $formatter->{'container'}->add_pending_word(1));
+ $result .= $self->_count_added($formatter->{'container'},
+ $formatter->{'container'}->end_line());
+ }
push @{$self->{'context'}}, $root->{'cmdname'};
} elsif ($flush_commands{$root->{'cmdname'}}) {
push @{$self->{'context'}}, $root->{'cmdname'};
@@ -1688,7 +1696,8 @@
# command (ie if it is menu or verbatim, and not example or
# similar)
if ($self->{'preformatted_context_commands'}->{$root->{'cmdname'}}
- and ! $preformatted_commands{$root->{'cmdname'}}) {
+ and ! $preformatted_commands{$root->{'cmdname'}}
+ and ! $format_raw_commands{$root->{'cmdname'}}) {
$preformatted = $self->new_formatter('unfilled');
push @{$self->{'formatters'}}, $preformatted;
}
@@ -2134,10 +2143,12 @@
push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0,
'locations' => []};
}
- } elsif ($root->{'type'} eq 'preformatted') {
+ } elsif ($root->{'type'} eq 'preformatted'
+ or $root->{'type'} eq 'rawpreformatted') {
# if in a description reuse the main menu unfilled, to keep things
# simpler and avoid having to do a separate count.
- if ((!$root->{'parent'}->{'type'})
+ if ($root->{'type'} eq 'rawpreformatted'
+ or !$root->{'parent'}->{'type'}
or $root->{'parent'}->{'type'} ne 'menu_entry_description') {
$preformatted = $self->new_formatter('unfilled');
push @{$self->{'formatters'}}, $preformatted;
Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- Texinfo/Convert/Text.pm 27 Dec 2011 23:11:41 -0000 1.87
+++ Texinfo/Convert/Text.pm 3 Jan 2012 01:47:53 -0000 1.88
@@ -350,7 +350,9 @@
my $result = '';
if (defined($root->{'text'})) {
$result = $root->{'text'};
- if (! defined($root->{'type'}) or $root->{'type'} ne 'raw') {
+ if ((! defined($root->{'type'})
+ or $root->{'type'} ne 'raw')
+ and !$options->{'raw'}) {
if ($options->{'sc'}) {
$result = uc($result);
}
@@ -448,6 +450,8 @@
chomp ($result);
$result .= "\n" if ($result =~ /\S/);
}
+ } elsif ($options->{'expanded_formats_hash'}->{$root->{'cmdname'}}) {
+ $options->{'raw'} = 1;
} elsif ($formatting_misc_commands{$root->{'cmdname'}} and
$root->{'args'}) {
if ($root->{'cmdname'} eq 'sp') {
if ($root->{'extra'} and $root->{'extra'}->{'misc_args'}
@@ -469,7 +473,7 @@
$result = heading ($root, $result, $options->{'converter'},
$options->{'NUMBER_SECTIONS'});
} else {
- # we always want an end of line even if is was eaten by a
+ # we always want an end of line even if is was eaten by a command
chomp ($result);
$result .= "\n";
}
@@ -513,7 +517,8 @@
}
}
if (!$root->{'parent'}->{'type'}
- or $root->{'parent'}->{'type'} ne 'preformatted') {
+ or ($root->{'parent'}->{'type'} ne 'preformatted'
+ and $root->{'parent'}->{'type'} ne 'rawpreformatted')) {
chomp($result);
$result .= "\n";
}
Index: init/html32.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/html32.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- init/html32.pm 18 Oct 2011 18:47:22 -0000 1.4
+++ init/html32.pm 3 Jan 2012 01:47:53 -0000 1.5
@@ -105,7 +105,7 @@
if ($self->in_verbatim()) {
return $self->protect_text($text);
}
- return $text if ($type and $type eq 'raw');
+ return $text if ($self->in_raw());
$text = uc($text) if ($self->in_upper_case());
$text = $self->protect_text($text);
Index: init/latex2html.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/latex2html.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- init/latex2html.pm 13 Nov 2011 23:04:30 -0000 1.2
+++ init/latex2html.pm 3 Jan 2012 01:47:53 -0000 1.3
@@ -212,6 +212,10 @@
and $tree->{'contents'}->[0]->{'type'} eq
'empty_line_after_command') {
shift @{$tree->{'contents'}};
}
+ if ($tree->{'contents'}->[-1]->{'cmdname'}
+ and $tree->{'contents'}->[-1]->{'cmdname'} eq 'end') {
+ pop @{$tree->{'contents'}};
+ }
}
my $text = Texinfo::Convert::Texinfo::convert($tree);
#$text .= "\n" if ($command eq 'tex');
Index: init/tex4ht.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/tex4ht.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- init/tex4ht.pm 13 Nov 2011 23:04:30 -0000 1.8
+++ init/tex4ht.pm 3 Jan 2012 01:47:53 -0000 1.9
@@ -154,6 +154,10 @@
and $tree->{'contents'}->[0]->{'type'} eq
'empty_line_after_command') {
shift @{$tree->{'contents'}};
}
+ if ($tree->{'contents'}->[-1]->{'cmdname'}
+ and $tree->{'contents'}->[-1]->{'cmdname'} eq 'end') {
+ pop @{$tree->{'contents'}};
+ }
}
my $text = Texinfo::Convert::Texinfo::convert($tree);
$commands{$command}->{'commands'}->[$counter-1] = $root;
Index: t/results/conditionals/many_conditionals.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/conditionals/many_conditionals.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/conditionals/many_conditionals.pl 26 Sep 2011 17:15:47 -0000
1.15
+++ t/results/conditionals/many_conditionals.pl 3 Jan 2012 01:47:53 -0000
1.16
@@ -20,32 +20,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'This is html text.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'This is html text.',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -124,32 +158,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'This is tex text.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'This is tex text.',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 23,
+ 'line_nr' => 25,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -179,33 +247,45 @@
};
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'many_conditionals'}{'contents'}[0];
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[0];
+$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[1];
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[0];
+$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2];
+$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2];
+$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'many_conditionals'}{'contents'}[0];
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[0];
+$result_trees{'many_conditionals'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2];
$result_trees{'many_conditionals'}{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'};
-$result_trees{'many_conditionals'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'many_conditionals'}{'contents'}[0];
$result_trees{'many_conditionals'}{'contents'}[1]{'parent'} =
$result_trees{'many_conditionals'};
+$result_trees{'many_conditionals'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[2];
$result_trees{'many_conditionals'}{'contents'}[2]{'parent'} =
$result_trees{'many_conditionals'};
-$result_trees{'many_conditionals'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[3];
$result_trees{'many_conditionals'}{'contents'}[3]{'parent'} =
$result_trees{'many_conditionals'};
$result_trees{'many_conditionals'}{'contents'}[4]{'parent'} =
$result_trees{'many_conditionals'};
$result_trees{'many_conditionals'}{'contents'}[5]{'parent'} =
$result_trees{'many_conditionals'};
+$result_trees{'many_conditionals'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[6];
$result_trees{'many_conditionals'}{'contents'}[6]{'parent'} =
$result_trees{'many_conditionals'};
-$result_trees{'many_conditionals'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[7];
$result_trees{'many_conditionals'}{'contents'}[7]{'parent'} =
$result_trees{'many_conditionals'};
$result_trees{'many_conditionals'}{'contents'}[8]{'parent'} =
$result_trees{'many_conditionals'};
$result_trees{'many_conditionals'}{'contents'}[9]{'parent'} =
$result_trees{'many_conditionals'};
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'many_conditionals'}{'contents'}[10];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[10];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[1];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[1]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[10];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'many_conditionals'}{'contents'}[10];
+$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[10];
+$result_trees{'many_conditionals'}{'contents'}[10]{'extra'}{'end_command'} =
$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2];
$result_trees{'many_conditionals'}{'contents'}[10]{'parent'} =
$result_trees{'many_conditionals'};
-$result_trees{'many_conditionals'}{'contents'}[11]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'many_conditionals'}{'contents'}[11];
-$result_trees{'many_conditionals'}{'contents'}[11]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[11];
-$result_trees{'many_conditionals'}{'contents'}[11]{'contents'}[1]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[11];
-$result_trees{'many_conditionals'}{'contents'}[11]{'contents'}[2]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[11];
$result_trees{'many_conditionals'}{'contents'}[11]{'parent'} =
$result_trees{'many_conditionals'};
-$result_trees{'many_conditionals'}{'contents'}[12]{'extra'}{'command'} =
$result_trees{'many_conditionals'}{'contents'}[11];
$result_trees{'many_conditionals'}{'contents'}[12]{'parent'} =
$result_trees{'many_conditionals'};
+$result_trees{'many_conditionals'}{'contents'}[13]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[13];
$result_trees{'many_conditionals'}{'contents'}[13]{'parent'} =
$result_trees{'many_conditionals'};
-$result_trees{'many_conditionals'}{'contents'}[14]{'parent'} =
$result_trees{'many_conditionals'};
-$result_trees{'many_conditionals'}{'contents'}[15]{'contents'}[0]{'parent'} =
$result_trees{'many_conditionals'}{'contents'}[15];
-$result_trees{'many_conditionals'}{'contents'}[15]{'parent'} =
$result_trees{'many_conditionals'};
$result_texis{'many_conditionals'} = '@html
This is html text.
Index: t/results/coverage/symbol_after_block.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/symbol_after_block.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/symbol_after_block.pl 11 Nov 2011 15:16:09 -0000
1.12
+++ t/results/coverage/symbol_after_block.pl 3 Jan 2012 01:47:53 -0000
1.13
@@ -20,34 +20,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'In html',
- 'type' => 'raw'
+ 'text' => 'In html
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html. On the line.'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html. On the line.'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => ''
},
'parent' => {}
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '. On the line.
-'
}
],
- 'parent' => {},
- 'type' => 'paragraph'
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -68,38 +100,74 @@
'type' => 'empty_line_after_command'
},
{
- 'parent' => {},
- 'text' => 'In html',
- 'type' => 'raw'
- },
+ 'contents' => [
{
'parent' => {},
- 'text' => '
-',
- 'type' => 'last_raw_newline'
+ 'text' => 'In html
+'
}
],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 5,
- 'macro' => ''
- },
- 'parent' => {}
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
},
{
+ 'args' => [
+ {
'contents' => [
{
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ },
+ {
'cmdname' => '@',
'parent' => {}
},
{
'parent' => {},
- 'text' => ' On the line.
-'
+ 'text' => ' On the line.'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
}
],
'parent' => {},
- 'type' => 'paragraph'
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html@ On the line.'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -1748,40 +1816,82 @@
};
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[2]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[2]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[3];
-$result_trees{'symbol_after_block'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[3];
-$result_trees{'symbol_after_block'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[3];
-$result_trees{'symbol_after_block'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[3];
$result_trees{'symbol_after_block'}{'contents'}[3]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[4];
-$result_trees{'symbol_after_block'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[4];
$result_trees{'symbol_after_block'}{'contents'}[4]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[5]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[6];
$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[6];
+$result_trees{'symbol_after_block'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[6];
$result_trees{'symbol_after_block'}{'contents'}[6]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[7];
$result_trees{'symbol_after_block'}{'contents'}[7]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[8]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[8];
-$result_trees{'symbol_after_block'}{'contents'}[8]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[8];
-$result_trees{'symbol_after_block'}{'contents'}[8]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[8];
$result_trees{'symbol_after_block'}{'contents'}[8]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[9];
$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[9];
+$result_trees{'symbol_after_block'}{'contents'}[9]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[9];
$result_trees{'symbol_after_block'}{'contents'}[9]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[10];
+$result_trees{'symbol_after_block'}{'contents'}[10]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[10];
$result_trees{'symbol_after_block'}{'contents'}[10]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[11]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[11];
-$result_trees{'symbol_after_block'}{'contents'}[11]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[11];
-$result_trees{'symbol_after_block'}{'contents'}[11]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[11];
$result_trees{'symbol_after_block'}{'contents'}[11]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[12]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[12];
-$result_trees{'symbol_after_block'}{'contents'}[12]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[12];
$result_trees{'symbol_after_block'}{'contents'}[12]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[13]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[14];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[14];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[14];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[14];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[14];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[14]{'args'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[14]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[14]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[14]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[15]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[16]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[16];
@@ -1805,6 +1915,7 @@
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[16];
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[16];
@@ -1813,37 +1924,29 @@
$result_trees{'symbol_after_block'}{'contents'}[16]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[16]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[16]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[17]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[18];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[18];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[18];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[18];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[18];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[18]{'args'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[18]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[18]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[18]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[19]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[20];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[20];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[20];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[20];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[20];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[20]{'args'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[20]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[20]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[20]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[21]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[22];
@@ -1860,6 +1963,7 @@
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[22];
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[22];
@@ -1868,30 +1972,54 @@
$result_trees{'symbol_after_block'}{'contents'}[22]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[22]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[22]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[23]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[24];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[24];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[24];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[24];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[24];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[24]{'args'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[24]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[24]{'contents'}[1];
$result_trees{'symbol_after_block'}{'contents'}[24]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[25]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[26];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[26];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[26];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'line_nr'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[26];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[26];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[26];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'extra'}{'misc_args'};
+$result_trees{'symbol_after_block'}{'contents'}[26]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[26]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[26]{'line_nr'} =
$result_trees{'symbol_after_block'}{'contents'}[26]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'symbol_after_block'}{'contents'}[26]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[27]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[28];
@@ -1933,6 +2061,7 @@
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[28];
$result_trees{'symbol_after_block'}{'contents'}[28]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[28];
@@ -1941,55 +2070,21 @@
$result_trees{'symbol_after_block'}{'contents'}[28]{'line_nr'} =
$result_trees{'symbol_after_block'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'symbol_after_block'}{'contents'}[28]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[29]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[30];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[30];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0];
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[30];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'line_nr'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'line_nr'};
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[30];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[30];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[30];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'extra'}{'misc_args'};
-$result_trees{'symbol_after_block'}{'contents'}[30]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[30]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[30]{'line_nr'} =
$result_trees{'symbol_after_block'}{'contents'}[30]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'symbol_after_block'}{'contents'}[30]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[31]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[32];
$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[32];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[32];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[32];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[32];
+$result_trees{'symbol_after_block'}{'contents'}[32]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[32]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[32]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[33]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[34];
@@ -2000,28 +2095,28 @@
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[34];
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[34];
$result_trees{'symbol_after_block'}{'contents'}[34]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[34]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[34]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[35]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[36];
$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[36];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[36];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[36];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[36];
-$result_trees{'symbol_after_block'}{'contents'}[36]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[36]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[36]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[37]{'parent'} =
$result_trees{'symbol_after_block'};
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[38];
$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[38];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[1];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[38];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[38];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[38];
+$result_trees{'symbol_after_block'}{'contents'}[38]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[38]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[38]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[39]{'parent'} =
$result_trees{'symbol_after_block'};
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[40];
@@ -2032,26 +2127,12 @@
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0];
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[40];
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[40];
$result_trees{'symbol_after_block'}{'contents'}[40]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[40]{'contents'}[2];
$result_trees{'symbol_after_block'}{'contents'}[40]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[41]{'parent'} =
$result_trees{'symbol_after_block'};
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[42];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[0]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[42];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[1];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[1]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[42];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'symbol_after_block'}{'contents'}[42];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2]{'parent'} =
$result_trees{'symbol_after_block'}{'contents'}[42];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'extra'}{'end_command'} =
$result_trees{'symbol_after_block'}{'contents'}[42]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[42]{'parent'} =
$result_trees{'symbol_after_block'};
$result_texis{'symbol_after_block'} = '@html
In html
@@ -2127,9 +2208,7 @@
';
-$result_texts{'symbol_after_block'} = '. On the line.
-
-@ On the line.
+$result_texts{'symbol_after_block'} = '
Verbatim:
@@ -2174,22 +2253,22 @@
$result_errors{'symbol_after_block'} = [
{
- 'error_line' => ':3: warning: Superfluous argument to @end html: . On the
line.
+ 'error_line' => ':3: Superfluous argument to @end html: . On the line.
',
'file_name' => '',
'line_nr' => 3,
'macro' => '',
'text' => 'Superfluous argument to @end html: . On the line.',
- 'type' => 'warning'
+ 'type' => 'error'
},
{
- 'error_line' => ':7: warning: Superfluous argument to @end html: @@ On the
line.
+ 'error_line' => ':7: Superfluous argument to @end html: @@ On the line.
',
'file_name' => '',
'line_nr' => 7,
'macro' => '',
'text' => 'Superfluous argument to @end html: @@ On the line.',
- 'type' => 'warning'
+ 'type' => 'error'
},
{
'error_line' => ':13: warning: Superfluous argument to @end verbatim: ;
Index: t/results/coverage_braces/raw_expanded_in_style.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/raw_expanded_in_style.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/coverage_braces/raw_expanded_in_style.pl 7 Nov 2011 22:20:18
-0000 1.8
+++ t/results/coverage_braces/raw_expanded_in_style.pl 3 Jan 2012 01:47:53
-0000 1.9
@@ -31,32 +31,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in html
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'in html',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -82,11 +116,17 @@
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0];
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw_expanded_in_style'}{'contents'}[0];
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'parent'} =
$result_trees{'raw_expanded_in_style'};
Index: t/results/coverage_braces/raw_in_style.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/raw_in_style.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/coverage_braces/raw_in_style.pl 26 Sep 2011 17:15:47 -0000
1.7
+++ t/results/coverage_braces/raw_in_style.pl 3 Jan 2012 01:47:53 -0000
1.8
@@ -31,32 +31,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in html
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'in html',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -82,11 +116,17 @@
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0];
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'raw_in_style'}{'contents'}[0];
$result_trees{'raw_in_style'}{'contents'}[0]{'parent'} =
$result_trees{'raw_in_style'};
Index: t/results/html_tests/raw_html.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/html_tests/raw_html.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/html_tests/raw_html.pl 1 Nov 2011 12:01:39 -0000 1.4
+++ t/results/html_tests/raw_html.pl 3 Jan 2012 01:47:53 -0000 1.5
@@ -20,43 +20,83 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '<i>
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => '<i>',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'type' => 'text_root'
};
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} =
$result_trees{'raw_html'}{'contents'}[0];
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'raw_html'}{'contents'}[0];
+$result_trees{'raw_html'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_html'}{'contents'}[0]{'contents'}[1];
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'raw_html'}{'contents'}[0];
+$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_html'}{'contents'}[0]{'contents'}[2];
+$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2];
+$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'} =
$result_trees{'raw_html'}{'contents'}[0];
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'raw_html'}{'contents'}[0];
+$result_trees{'raw_html'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[2];
$result_trees{'raw_html'}{'contents'}[0]{'parent'} = $result_trees{'raw_html'};
-$result_trees{'raw_html'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'raw_html'}{'contents'}[0];
-$result_trees{'raw_html'}{'contents'}[1]{'parent'} = $result_trees{'raw_html'};
$result_texis{'raw_html'} = '@html
<i>
Index: t/results/html_tests/tex_expanded_in_copying.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/html_tests/tex_expanded_in_copying.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/html_tests/tex_expanded_in_copying.pl 6 Nov 2011 17:48:55
-0000 1.1
+++ t/results/html_tests/tex_expanded_in_copying.pl 3 Jan 2012 01:47:53
-0000 1.2
@@ -32,32 +32,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aa
+'
+ }
+ ],
'parent' => {},
- 'text' => 'aa',
- 'type' => 'raw'
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'args' => [
@@ -117,19 +151,25 @@
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0];
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1];
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1];
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[1];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0];
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[3];
+$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[2];
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'parent'} =
$result_trees{'tex_expanded_in_copying'};
$result_texis{'tex_expanded_in_copying'} = '@copying
Index: t/results/macro/space_macro_after_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/space_macro_after_end.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/macro/space_macro_after_end.pl 11 Nov 2011 15:16:10 -0000
1.21
+++ t/results/macro/space_macro_after_end.pl 3 Jan 2012 01:47:54 -0000
1.22
@@ -70,31 +70,65 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in html
+'
+ }
+ ],
'parent' => {},
- 'text' => 'in html',
- 'type' => 'raw'
+ 'type' => 'rawpreformatted'
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => '
-',
- 'type' => 'last_raw_newline'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 7,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'type' => 'text_root'
@@ -108,11 +142,17 @@
$result_trees{'space_macro_after_end'}{'contents'}[2]{'parent'} =
$result_trees{'space_macro_after_end'};
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'space_macro_after_end'}{'contents'}[3];
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'space_macro_after_end'}{'contents'}[3];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[1];
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'space_macro_after_end'}{'contents'}[3];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'args'}[0];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'args'}[0];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'args'}[0];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'space_macro_after_end'}{'contents'}[3];
$result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'space_macro_after_end'}{'contents'}[3];
+$result_trees{'space_macro_after_end'}{'contents'}[3]{'extra'}{'end_command'}
= $result_trees{'space_macro_after_end'}{'contents'}[3]{'contents'}[2];
$result_trees{'space_macro_after_end'}{'contents'}[3]{'parent'} =
$result_trees{'space_macro_after_end'};
-$result_trees{'space_macro_after_end'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'space_macro_after_end'}{'contents'}[3];
-$result_trees{'space_macro_after_end'}{'contents'}[4]{'parent'} =
$result_trees{'space_macro_after_end'};
$result_texis{'space_macro_after_end'} = '@macro spaces
@@ -126,17 +166,7 @@
$result_texts{'space_macro_after_end'} = '
';
-$result_errors{'space_macro_after_end'} = [
- {
- 'error_line' => ':7: warning: Superfluous argument to @end html: @spaces{}
-',
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => '',
- 'text' => 'Superfluous argument to @end html: @spaces{}',
- 'type' => 'warning'
- }
-];
+$result_errors{'space_macro_after_end'} = [];
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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/menu/formats_in_menu.pl 1 Nov 2011 12:01:41 -0000 1.20
+++ t/results/menu/formats_in_menu.pl 3 Jan 2012 01:47:54 -0000 1.21
@@ -441,38 +441,72 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line'
},
{
'parent' => {},
- 'text' => '<i></i>',
- 'type' => 'raw'
+ 'text' => '<i></i>
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 19,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -856,13 +890,19 @@
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_description'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[3];
@@ -1115,7 +1155,8 @@
* texinfo:: in @ verbatim
</pre></td></tr>
<tr><td align="left" valign="top">• <a href="manual2.html#Top"
accesskey="3">(manual2)</a>:</td><td> </td><td align="left"
valign="top">%
-Log$
+
+<i></i>Log$
</td></tr>
<tr><td align="left" valign="top">• <a href="truc.html#Top"
accesskey="4">(truc)</a>:</td><td> </td><td align="left"
valign="top"><acronym>description
* acronym::</acronym>
Index: t/results/plaintext_tests/expanded_tex.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/expanded_tex.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/plaintext_tests/expanded_tex.pl 7 Nov 2011 22:20:18 -0000
1.2
+++ t/results/plaintext_tests/expanded_tex.pl 3 Jan 2012 01:47:54 -0000
1.3
@@ -27,44 +27,76 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'TTT
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
'text' => 'GGG
-',
- 'type' => 'raw'
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'HHH
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'parent' => {},
- 'text' => 'HHH',
- 'type' => 'raw'
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 6,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -81,14 +113,20 @@
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[0];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
-$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
-$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[0];
-$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[0];
-$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[0];
$result_trees{'expanded_tex'}{'contents'}[0]{'parent'} =
$result_trees{'expanded_tex'};
$result_texis{'expanded_tex'} = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Index: t/results/plaintext_tests/html_expanded.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/html_expanded.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/plaintext_tests/html_expanded.pl 7 Nov 2011 22:20:18 -0000
1.8
+++ t/results/plaintext_tests/html_expanded.pl 3 Jan 2012 01:47:54 -0000
1.9
@@ -27,32 +27,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'html',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -69,12 +103,18 @@
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'html_expanded'}{'contents'}[0];
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1];
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1];
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1];
+$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'html_expanded'}{'contents'}[0];
-$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[1];
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'html_expanded'}{'contents'}[0];
-$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'html_expanded'}{'contents'}[0];
$result_trees{'html_expanded'}{'contents'}[0]{'parent'} =
$result_trees{'html_expanded'};
$result_texis{'html_expanded'} = 'Before
Index: t/results/plaintext_tests/isolated_html_expanded.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/isolated_html_expanded.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/plaintext_tests/isolated_html_expanded.pl 26 Sep 2011 17:15:53
-0000 1.7
+++ t/results/plaintext_tests/isolated_html_expanded.pl 3 Jan 2012 01:47:54
-0000 1.8
@@ -26,32 +26,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'html
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'html',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'type' => 'text_root'
@@ -59,11 +93,17 @@
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'parent'} =
$result_trees{'isolated_html_expanded'};
$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1];
$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[1];
$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1];
$result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1];
+$result_trees{'isolated_html_expanded'}{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'isolated_html_expanded'}{'contents'}[1]{'contents'}[2];
$result_trees{'isolated_html_expanded'}{'contents'}[1]{'parent'} =
$result_trees{'isolated_html_expanded'};
-$result_trees{'isolated_html_expanded'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'isolated_html_expanded'}{'contents'}[1];
-$result_trees{'isolated_html_expanded'}{'contents'}[2]{'parent'} =
$result_trees{'isolated_html_expanded'};
$result_texis{'isolated_html_expanded'} = '
@html
Index: t/results/raw/braces_in_tex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/braces_in_tex.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/raw/braces_in_tex.pl 26 Sep 2011 17:15:53 -0000 1.10
+++ t/results/raw/braces_in_tex.pl 3 Jan 2012 01:47:54 -0000 1.11
@@ -26,56 +26,92 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '$$
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
- 'text' => '\\chi^2 = \\sum_{i=1}^N
-',
- 'type' => 'raw'
+ 'text' => '\\chi^2 = \\sum_'
+ },
+ {
+ 'text' => '{i=1'
+ },
+ {
+ 'text' => '}^N
+'
},
{
'parent' => {},
'text' => '\\left(y_i - (a + b x_i)
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
'text' => '\\over \\sigma_i\\right)^2
-',
- 'type' => 'raw'
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '$$
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => '$$',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 8,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -116,56 +152,92 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '$$
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
- 'text' => '\\chi^2 = \\sum_{i=1}^N
-',
- 'type' => 'raw'
+ 'text' => '\\chi^2 = \\sum_'
+ },
+ {
+ 'text' => '{i=1'
+ },
+ {
+ 'text' => '}^N
+'
},
{
'parent' => {},
'text' => '\\left(y_i - (a + b x_i)
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
'text' => '\\over \\sigma_i\\right)^2
-',
- 'type' => 'raw'
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '$$
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => '$$',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 18,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -234,41 +306,53 @@
$result_trees{'braces_in_tex'}{'contents'}[0]{'parent'} =
$result_trees{'braces_in_tex'};
$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[1];
$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1];
$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[1];
$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[1];
-$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[1];
-$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[1];
-$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[1];
-$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[1]{'extra'}{'end_command'} =
$result_trees{'braces_in_tex'}{'contents'}[1]{'contents'}[2];
$result_trees{'braces_in_tex'}{'contents'}[1]{'parent'} =
$result_trees{'braces_in_tex'};
-$result_trees{'braces_in_tex'}{'contents'}[2]{'extra'}{'command'} =
$result_trees{'braces_in_tex'}{'contents'}[1];
$result_trees{'braces_in_tex'}{'contents'}[2]{'parent'} =
$result_trees{'braces_in_tex'};
$result_trees{'braces_in_tex'}{'contents'}[3]{'parent'} =
$result_trees{'braces_in_tex'};
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[4];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[4];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[6]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[4];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[4];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[4];
+$result_trees{'braces_in_tex'}{'contents'}[4]{'extra'}{'end_command'} =
$result_trees{'braces_in_tex'}{'contents'}[4]{'contents'}[2];
$result_trees{'braces_in_tex'}{'contents'}[4]{'parent'} =
$result_trees{'braces_in_tex'};
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[5];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[5];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[6]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[1]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[5];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'braces_in_tex'}{'contents'}[5];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2]{'parent'} =
$result_trees{'braces_in_tex'}{'contents'}[5];
-$result_trees{'braces_in_tex'}{'contents'}[5]{'extra'}{'end_command'} =
$result_trees{'braces_in_tex'}{'contents'}[5]{'contents'}[2];
$result_trees{'braces_in_tex'}{'contents'}[5]{'parent'} =
$result_trees{'braces_in_tex'};
-$result_trees{'braces_in_tex'}{'contents'}[6]{'parent'} =
$result_trees{'braces_in_tex'};
$result_texis{'braces_in_tex'} = '
@tex
Index: t/results/raw/misc_raw.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/misc_raw.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/raw/misc_raw.pl 11 Nov 2011 15:16:10 -0000 1.26
+++ t/results/raw/misc_raw.pl 3 Jan 2012 01:47:54 -0000 1.27
@@ -26,66 +26,203 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in html <br> @end html
-',
- 'type' => 'raw'
+ 'text' => 'in html <br> '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'raw'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
- 'text' => '@tex in tex
+ 'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => '@end tex
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in tex'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
',
- 'type' => 'raw'
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'raw'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
- 'text' => '@verbatim
+ 'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line'
},
{
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'in v---erbatim`` <>
+ 'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line_after_command'
},
{
'parent' => {},
- 'text' => 'in verbatim2
+ 'text' => 'in v---erbatim`` <>
',
'type' => 'raw'
},
{
'parent' => {},
- 'text' => '@end verbatim
+ 'text' => 'in verbatim2
',
'type' => 'raw'
}
],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 8,
'macro' => ''
},
'parent' => {}
+ },
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
}
],
'type' => 'text_root'
@@ -93,16 +230,41 @@
$result_trees{'misc_raw'}{'contents'}[0]{'parent'} = $result_trees{'misc_raw'};
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[1];
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'misc_raw'}{'contents'}[1]{'contents'}[1];
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2];
+$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[1];
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[1]{'extra'}{'end_command'} =
$result_trees{'misc_raw'}{'contents'}[1]{'contents'}[2];
$result_trees{'misc_raw'}{'contents'}[1]{'parent'} = $result_trees{'misc_raw'};
+$result_trees{'misc_raw'}{'contents'}[2]{'parent'} = $result_trees{'misc_raw'};
+$result_trees{'misc_raw'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw'}{'contents'}[3];
+$result_trees{'misc_raw'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[3]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[3]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[3]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[3];
+$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[3];
+$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[3];
+$result_trees{'misc_raw'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'misc_raw'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'misc_raw'}{'contents'}[3]{'extra'}{'end_command'} =
$result_trees{'misc_raw'}{'contents'}[3]{'contents'}[0];
+$result_trees{'misc_raw'}{'contents'}[3]{'parent'} = $result_trees{'misc_raw'};
+$result_trees{'misc_raw'}{'contents'}[4]{'parent'} = $result_trees{'misc_raw'};
+$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[0]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[5];
+$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[5];
+$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[5];
+$result_trees{'misc_raw'}{'contents'}[5]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw'}{'contents'}[5];
+$result_trees{'misc_raw'}{'contents'}[5]{'parent'} = $result_trees{'misc_raw'};
+$result_trees{'misc_raw'}{'contents'}[6]{'extra'}{'command'} =
$result_trees{'misc_raw'}{'contents'}[5];
+$result_trees{'misc_raw'}{'contents'}[6]{'parent'} = $result_trees{'misc_raw'};
$result_texis{'misc_raw'} = '
@html
@@ -115,26 +277,32 @@
in v---erbatim`` <>
in verbatim2
@end verbatim
address@hidden html';
+';
$result_texts{'misc_raw'} = '
+
+
+in v---erbatim`` <>
+in verbatim2
';
$result_errors{'misc_raw'} = [
{
- 'error_line' => ':11: No matching address@hidden html\'
+ 'error_line' => ':3: warning: @end should only appear at a line beginning
',
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => 'No matching address@hidden html\'',
- 'type' => 'error'
+ 'text' => '@end should only appear at a line beginning',
+ 'type' => 'warning'
}
];
-$result_converted{'plaintext'}->{'misc_raw'} = '';
+$result_converted{'plaintext'}->{'misc_raw'} = 'in v---erbatim`` <>
+in verbatim2
+';
1;
Index: t/results/raw/misc_raw_comments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/misc_raw_comments.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/raw/misc_raw_comments.pl 11 Nov 2011 15:16:10 -0000 1.25
+++ t/results/raw/misc_raw_comments.pl 3 Jan 2012 01:47:54 -0000 1.26
@@ -14,7 +14,8 @@
'type' => 'empty_line'
},
{
- 'cmdname' => 'html',
+ 'args' => [
+ {
'contents' => [
{
'extra' => {
@@ -22,93 +23,290 @@
},
'parent' => {},
'text' => ' ',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_spaces_after_command'
},
{
+ 'args' => [
+ {
'parent' => {},
- 'text' => '@c comment space
+ 'text' => ' comment space
',
- 'type' => 'raw'
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in html '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
+ 'args' => [
+ {
'parent' => {},
- 'text' => 'in html @end address@hidden comment no space
+ 'text' => ' comment no space
',
- 'type' => 'raw'
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => '@tex in tex
-',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'parent' => {},
- 'text' => '@end tex @c comment after end tex
-',
- 'type' => 'raw'
+ 'text' => 'in tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'raw'
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
},
{
+ 'args' => [
+ {
'parent' => {},
- 'text' => '@verbatim
+ 'text' => ' comment after end tex
',
- 'type' => 'raw'
+ 'type' => 'misc_arg'
+ }
+ ],
+ 'cmdname' => 'c',
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'end_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
- 'text' => 'in verbatim @c in verbatim
+ 'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line'
},
{
+ 'cmdname' => 'verbatim',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'in verbatim2
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in verbatim @c in verbatim
',
'type' => 'raw'
},
{
'parent' => {},
- 'text' => '@end verbatim
+ 'text' => 'in verbatim2
',
'type' => 'raw'
}
],
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 8,
'macro' => ''
},
'parent' => {}
+ },
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
}
],
'type' => 'text_root'
};
$result_trees{'misc_raw_comments'}{'contents'}[0]{'parent'} =
$result_trees{'misc_raw_comments'};
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[0];
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[1];
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[10]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[1]{'extra'}{'end_command'} =
$result_trees{'misc_raw_comments'}{'contents'}[1]{'contents'}[1];
$result_trees{'misc_raw_comments'}{'contents'}[1]{'parent'} =
$result_trees{'misc_raw_comments'};
+$result_trees{'misc_raw_comments'}{'contents'}[2]{'parent'} =
$result_trees{'misc_raw_comments'};
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[3];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[3];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[3];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[3];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'misc_raw_comments'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'extra'}{'end_command'} =
$result_trees{'misc_raw_comments'}{'contents'}[3]{'contents'}[0];
+$result_trees{'misc_raw_comments'}{'contents'}[3]{'parent'} =
$result_trees{'misc_raw_comments'};
+$result_trees{'misc_raw_comments'}{'contents'}[4]{'parent'} =
$result_trees{'misc_raw_comments'};
+$result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'misc_raw_comments'}{'contents'}[5];
+$result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[5];
+$result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[1]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[5];
+$result_trees{'misc_raw_comments'}{'contents'}[5]{'contents'}[2]{'parent'} =
$result_trees{'misc_raw_comments'}{'contents'}[5];
+$result_trees{'misc_raw_comments'}{'contents'}[5]{'parent'} =
$result_trees{'misc_raw_comments'};
+$result_trees{'misc_raw_comments'}{'contents'}[6]{'extra'}{'command'} =
$result_trees{'misc_raw_comments'}{'contents'}[5];
+$result_trees{'misc_raw_comments'}{'contents'}[6]{'parent'} =
$result_trees{'misc_raw_comments'};
$result_texis{'misc_raw_comments'} = '
@html @c comment space
@@ -121,26 +319,32 @@
in verbatim @c in verbatim
in verbatim2
@end verbatim
address@hidden html';
+';
$result_texts{'misc_raw_comments'} = '
+
+
+in verbatim @c in verbatim
+in verbatim2
';
$result_errors{'misc_raw_comments'} = [
{
- 'error_line' => ':11: No matching address@hidden html\'
+ 'error_line' => ':3: warning: @end should only appear at a line beginning
',
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 3,
'macro' => '',
- 'text' => 'No matching address@hidden html\'',
- 'type' => 'error'
+ 'text' => '@end should only appear at a line beginning',
+ 'type' => 'warning'
}
];
-$result_converted{'plaintext'}->{'misc_raw_comments'} = '';
+$result_converted{'plaintext'}->{'misc_raw_comments'} = 'in verbatim @c in
verbatim
+in verbatim2
+';
1;
Index: t/results/raw/raw_commands_and_end_of_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/raw/raw_commands_and_end_of_lines.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/raw/raw_commands_and_end_of_lines.pl 26 Sep 2011 17:15:54
-0000 1.6
+++ t/results/raw/raw_commands_and_end_of_lines.pl 3 Jan 2012 01:47:54
-0000 1.7
@@ -26,32 +26,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'Surrounded by empty lines.',
- 'type' => 'raw'
+ 'text' => 'Surrounded by empty lines.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -79,38 +113,71 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'in block
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
- 'text' => 'in block l2',
- 'type' => 'raw'
+ 'text' => 'in block l2
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 10,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -146,32 +213,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 15,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -207,36 +308,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html after the closing command.'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html after the closing command.'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 20,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
},
- {
- 'parent' => {},
- 'text' => 'after the closing command.
-'
+ 'parent' => {}
}
],
'parent' => {},
@@ -267,32 +398,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 22,
+ 'line_nr' => 24,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -328,28 +493,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html. A symbol after the closing command.'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html. A symbol after the closing command.'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 27,
+ 'line_nr' => 29,
'macro' => ''
},
'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
},
- {
- 'parent' => {},
- 'text' => '. A symbol after the closing command.
-'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 27,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -369,37 +572,71 @@
'command' => {}
},
'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Surrounded by empty lines.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
},
{
'parent' => {},
- 'text' => 'Surrounded by empty lines.',
- 'type' => 'raw'
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 31,
+ 'line_nr' => 33,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 31,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -427,32 +664,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 36,
+ 'line_nr' => 38,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 36,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -488,32 +759,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 41,
+ 'line_nr' => 43,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 41,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -549,36 +854,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex after the closing command.'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex after the closing command.'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 46,
+ 'line_nr' => 48,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 46,
+ 'macro' => ''
},
- {
- 'parent' => {},
- 'text' => 'after the closing command.
-'
+ 'parent' => {}
}
],
'parent' => {},
@@ -609,32 +944,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 50,
+ 'line_nr' => 52,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 50,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -670,28 +1039,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in block',
- 'type' => 'raw'
+ 'text' => 'in block
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex. A symbol after the closing command.'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex. A symbol after the closing command.'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 55,
+ 'line_nr' => 57,
'macro' => ''
},
'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
},
- {
- 'parent' => {},
- 'text' => '. A symbol after the closing command.
-'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 55,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -1045,186 +1452,258 @@
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'contents'}[2];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[2]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[3]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[4]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[5]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[6]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[7]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[8]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[9]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[10]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[11]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[12]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'contents'}[2];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[13]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[14];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[15]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[16]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[17]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[18]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[19]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[20]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[21]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[22]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'contents'}[3]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[23]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[24]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'contents'}[2]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[25];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[26]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[27];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[28]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[29];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[30]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[32]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[31];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[32]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[33]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[33];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[33]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[34];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[35]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[37]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[36];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[37]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[38]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[38];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[38]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[39];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[40]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[42]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[41];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[42]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[43]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[43];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[43]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[44];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[45]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[47]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[46];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[47]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[48]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[48];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[48]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
+$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[49]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50];
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[50]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[51]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[51];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[51]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[51];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[51]{'contents'}[1]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[51];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[51]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[52]{'contents'}[0]{'parent'}
= $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[52];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[52]{'parent'} =
$result_trees{'raw_commands_and_end_of_lines'};
$result_texis{'raw_commands_and_end_of_lines'} = '
@html
@@ -1321,24 +1800,20 @@
Before the opening command end commands on a line.
-Before the opening command after the closing command.
-
+Before the opening command
Before the opening command . A symbol on a line.
-Before the opening command . A symbol after the closing command.
-
+Before the opening command
Block commands on a line
end commands on a line.
Before the opening command end commands on a line.
-Before the opening command after the closing command.
-
+Before the opening command
Before the opening command . A symbol on a line.
-Before the opening command . A symbol after the closing command.
-
+Before the opening command
Surrounded by empty lines.
Block commands on a line
@@ -1378,13 +1853,13 @@
'type' => 'warning'
},
{
- 'error_line' => ':20: warning: Superfluous argument to @end html: after
the closing command.
+ 'error_line' => ':20: Superfluous argument to @end html: after the
closing command.
',
'file_name' => '',
'line_nr' => 20,
'macro' => '',
'text' => 'Superfluous argument to @end html: after the closing command.',
- 'type' => 'warning'
+ 'type' => 'error'
},
{
'error_line' => ':22: warning: @html should only appear at a line beginning
@@ -1405,13 +1880,13 @@
'type' => 'warning'
},
{
- 'error_line' => ':29: warning: Superfluous argument to @end html: . A
symbol after the closing command.
+ 'error_line' => ':29: Superfluous argument to @end html: . A symbol after
the closing command.
',
'file_name' => '',
'line_nr' => 29,
'macro' => '',
'text' => 'Superfluous argument to @end html: . A symbol after the closing
command.',
- 'type' => 'warning'
+ 'type' => 'error'
},
{
'error_line' => ':41: warning: @tex should only appear at a line beginning
@@ -1432,13 +1907,13 @@
'type' => 'warning'
},
{
- 'error_line' => ':48: warning: Superfluous argument to @end tex: after
the closing command.
+ 'error_line' => ':48: Superfluous argument to @end tex: after the closing
command.
',
'file_name' => '',
'line_nr' => 48,
'macro' => '',
'text' => 'Superfluous argument to @end tex: after the closing command.',
- 'type' => 'warning'
+ 'type' => 'error'
},
{
'error_line' => ':50: warning: @tex should only appear at a line beginning
@@ -1459,13 +1934,13 @@
'type' => 'warning'
},
{
- 'error_line' => ':57: warning: Superfluous argument to @end tex: . A
symbol after the closing command.
+ 'error_line' => ':57: Superfluous argument to @end tex: . A symbol after
the closing command.
',
'file_name' => '',
'line_nr' => 57,
'macro' => '',
'text' => 'Superfluous argument to @end tex: . A symbol after the closing
command.',
- 'type' => 'warning'
+ 'type' => 'error'
},
{
'error_line' => ':69: warning: @verbatim should only appear at a line
beginning
@@ -1529,21 +2004,21 @@
Before the opening command end commands on a line.
- Before the opening command after the closing command.
+ Before the opening command
Before the opening command . A symbol on a line.
- Before the opening command . A symbol after the closing command.
+ Before the opening command
Block commands on a line end commands on a line.
Before the opening command end commands on a line.
- Before the opening command after the closing command.
+ Before the opening command
Before the opening command . A symbol on a line.
- Before the opening command . A symbol after the closing command.
+ Before the opening command
Surrounded by empty lines.
Index: t/results/raw/raw_in_brace_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/raw_in_brace_command.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/raw/raw_in_brace_command.pl 29 Oct 2011 14:44:50 -0000
1.16
+++ t/results/raw/raw_in_brace_command.pl 3 Jan 2012 01:47:55 -0000
1.17
@@ -31,32 +31,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
- 'text' => 'in html',
- 'type' => 'raw'
+ 'text' => 'in html
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -165,11 +199,17 @@
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0];
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_brace_command'}{'contents'}[0];
$result_trees{'raw_in_brace_command'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'raw_in_brace_command'}{'contents'}[0];
Index: t/results/raw/raw_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/raw_in_example.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/raw/raw_in_example.pl 26 Sep 2011 17:15:54 -0000 1.9
+++ t/results/raw/raw_in_example.pl 3 Jan 2012 01:47:55 -0000 1.10
@@ -34,32 +34,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in html
+'
+ }
+ ],
'parent' => {},
- 'text' => 'in html',
- 'type' => 'raw'
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
}
],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 4,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -123,11 +157,17 @@
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'raw_in_example'}{'contents'}[0];
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'raw_in_example'}{'contents'}[0];
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2];
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0];
Index: t/results/raw/raw_in_para.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/raw_in_para.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/raw/raw_in_para.pl 26 Sep 2011 17:15:54 -0000 1.21
+++ t/results/raw/raw_in_para.pl 3 Jan 2012 01:47:55 -0000 1.22
@@ -79,32 +79,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in html
+'
+ }
+ ],
'parent' => {},
- 'text' => 'in html',
- 'type' => 'raw'
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'html'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'html',
+ 'text_arg' => 'html'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 9,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -141,44 +175,77 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'in tex1
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'in tex2
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'in tex2',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 17,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -216,24 +283,36 @@
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[4];
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[4];
-$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[4];
-$result_trees{'raw_in_para'}{'contents'}[4]{'contents'}[3]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[4];
$result_trees{'raw_in_para'}{'contents'}[4]{'parent'} =
$result_trees{'raw_in_para'};
$result_trees{'raw_in_para'}{'contents'}[5]{'parent'} =
$result_trees{'raw_in_para'};
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[6];
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1];
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1];
+$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'contents'}[2];
$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[6];
-$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_in_para'}{'contents'}[6]{'contents'}[2]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[6];
$result_trees{'raw_in_para'}{'contents'}[6]{'parent'} =
$result_trees{'raw_in_para'};
$result_trees{'raw_in_para'}{'contents'}[7]{'parent'} =
$result_trees{'raw_in_para'};
$result_trees{'raw_in_para'}{'contents'}[8]{'contents'}[0]{'parent'} =
$result_trees{'raw_in_para'}{'contents'}[8];
Index: t/results/raw/raw_not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/raw_not_closed.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/raw/raw_not_closed.pl 3 Jul 2011 14:51:02 -0000 1.13
+++ t/results/raw/raw_not_closed.pl 3 Jan 2012 01:47:55 -0000 1.14
@@ -20,22 +20,26 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line'
},
{
'parent' => {},
'text' => 'This is some html
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
'text' => '<address> my address </address>
-',
- 'type' => 'raw'
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
}
],
'line_nr' => {
@@ -50,16 +54,18 @@
};
$result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw_not_closed'}{'contents'}[0];
$result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'raw_not_closed'}{'contents'}[0];
+$result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[1];
+$result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[1];
+$result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[1];
$result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'raw_not_closed'}{'contents'}[0];
-$result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'raw_not_closed'}{'contents'}[0];
-$result_trees{'raw_not_closed'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'raw_not_closed'}{'contents'}[0];
$result_trees{'raw_not_closed'}{'contents'}[0]{'parent'} =
$result_trees{'raw_not_closed'};
$result_texis{'raw_not_closed'} = '@html
This is some html
<address> my address </address>
address@hidden html';
address@hidden html
+';
$result_texts{'raw_not_closed'} = '';
Index: t/results/raw/tex_not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/raw/tex_not_closed.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/raw/tex_not_closed.pl 3 Jul 2011 14:51:02 -0000 1.13
+++ t/results/raw/tex_not_closed.pl 3 Jan 2012 01:47:55 -0000 1.14
@@ -20,16 +20,27 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
- 'type' => 'raw'
+ 'type' => 'empty_line'
},
{
'parent' => {},
- 'text' => 'This is some \\LaTeX{}
-',
- 'type' => 'raw'
+ 'text' => 'This is some \\LaTeX'
+ },
+ {
+ 'text' => '{'
+ },
+ {
+ 'text' => '}
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
}
],
'line_nr' => {
@@ -44,14 +55,16 @@
};
$result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'tex_not_closed'}{'contents'}[0];
$result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'tex_not_closed'}{'contents'}[0];
+$result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1];
+$result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1];
$result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'tex_not_closed'}{'contents'}[0];
-$result_trees{'tex_not_closed'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'tex_not_closed'}{'contents'}[0];
$result_trees{'tex_not_closed'}{'contents'}[0]{'parent'} =
$result_trees{'tex_not_closed'};
$result_texis{'tex_not_closed'} = '@tex
This is some \\LaTeX{}
address@hidden tex';
address@hidden tex
+';
$result_texts{'tex_not_closed'} = '';
Index: t/results/test_count/expanded_tex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/expanded_tex.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/test_count/expanded_tex.pl 11 Nov 2011 15:16:11 -0000
1.3
+++ t/results/test_count/expanded_tex.pl 3 Jan 2012 01:47:55 -0000
1.4
@@ -27,38 +27,71 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'TTT
-',
- 'type' => 'raw'
+'
},
{
'parent' => {},
- 'text' => 'GGG',
- 'type' => 'raw'
+ 'text' => 'GGG
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 2,
+ 'line_nr' => 5,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -83,7 +116,8 @@
'
},
{
- 'cmdname' => 'tex',
+ 'args' => [
+ {
'contents' => [
{
'extra' => {
@@ -91,33 +125,95 @@
},
'parent' => {},
'text' => ' ',
- 'type' => 'empty_line_after_command'
+ 'type' => 'empty_spaces_after_command'
},
{
'parent' => {},
- 'text' => 'FFF
-',
- 'type' => 'raw'
+ 'text' => 'FFF'
},
{
'parent' => {},
- 'text' => 'GGG @end tex
+ 'text' => '
',
- 'type' => 'raw'
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'tex',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'GGG '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
},
{
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'After2.
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
',
- 'type' => 'raw'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'end_command' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 9,
'macro' => ''
},
'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'After2.
+'
}
],
'parent' => {},
@@ -129,22 +225,40 @@
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[0];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
-$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[0];
-$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[0];
-$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[0];
$result_trees{'expanded_tex'}{'contents'}[0]{'parent'} =
$result_trees{'expanded_tex'};
$result_trees{'expanded_tex'}{'contents'}[1]{'parent'} =
$result_trees{'expanded_tex'};
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[2];
-$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
-$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
-$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
= $result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[2];
+$result_trees{'expanded_tex'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'expanded_tex'}{'contents'}[2];
$result_trees{'expanded_tex'}{'contents'}[2]{'parent'} =
$result_trees{'expanded_tex'};
$result_texis{'expanded_tex'} = 'AAA
@@ -158,24 +272,25 @@
@tex FFF
GGG @end tex
After2.
address@hidden tex';
+';
$result_texts{'expanded_tex'} = 'AAA
After
second
+After2.
';
$result_errors{'expanded_tex'} = [
{
- 'error_line' => ':11: No matching address@hidden tex\'
+ 'error_line' => ':10: warning: @end should only appear at a line beginning
',
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => '',
- 'text' => 'No matching address@hidden tex\'',
- 'type' => 'error'
+ 'text' => '@end should only appear at a line beginning',
+ 'type' => 'warning'
}
];
@@ -188,15 +303,15 @@
[4] (3,0) @tex
[5] (5,1) :empty_line_after_command:text|\\n|
[5] (5,1)
- [6] (5,1) :raw:text|TTT\\n|
- [6] (9,2)
- [7] (9,2) :raw:text|GGG|
+ [6] (5,1) :rawpreformatted
+ [7] (5,1) :text|TTT\\n|
[7] (9,2)
- [8] (9,2) :last_raw_newline:text|\\n|
+ [8] (9,2) :text|GGG\\n|
[8] (13,3)
- [4] (13,3)
- [9] (13,3) :empty_line_after_command:text|\\n|
+ [6] (13,3)
+ [9] (13,3) @end
[9] (13,3)
+ [4] (13,3)
[10] (13,3) :text|After\\n|
[10] (18,3)
[2] (19,4)
@@ -206,25 +321,24 @@
[13] (20,5) :text|second\\n|
[13] (29,5)
[14] (29,5) @tex
- [15] (31,6) :empty_line_after_command:text| |
- [15] (31,6)
- [16] (31,6) :raw:text|FFF\\n|
- [16] (35,7)
- [17] (35,7) :raw:text|GGG @end tex\\n|
- [17] (48,8)
- [18] (48,8) :raw:text|After2.\\n|
- [18] (56,9)
- [14] (56,9)
- [12] (56,9)
- [1] (56,9)
+ [15] (31,6) :rawpreformatted
+ [16] (31,6) :text|GGG |
+ [16] (35,6)
+ [15] (36,7)
+ [17] (36,7) @end
+ [17] (36,7)
+ [14] (36,7)
+ [18] (36,7) :text|After2.\\n|
+ [18] (43,7)
+ [12] (44,8)
+ [1] (44,8)
AAA
TTT
GGG
After
second
-FFF
-GGG @end tex
+GGG
After2.
';
Index: t/results/xml_tests/raw.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xml_tests/raw.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/xml_tests/raw.pl 26 Sep 2011 18:03:33 -0000 1.3
+++ t/results/xml_tests/raw.pl 3 Jan 2012 01:47:55 -0000 1.4
@@ -20,33 +20,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in <tex>
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
'parent' => {},
- 'text' => 'in <tex>',
- 'type' => 'raw'
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'tex'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
- 'extra' => {},
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'tex',
+ 'text_arg' => 'tex'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 1,
+ 'line_nr' => 3,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
},
{
'parent' => {},
@@ -74,33 +107,66 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '<in>
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
'parent' => {},
- 'text' => '<in>',
- 'type' => 'raw'
+ 'text' => 'xml'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'last_raw_newline'
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
}
],
- 'extra' => {},
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'xml',
+ 'text_arg' => 'xml'
+ },
'line_nr' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 8,
'macro' => ''
},
'parent' => {}
- },
- {
+ }
+ ],
'extra' => {
- 'command' => {}
+ 'end_command' => {}
},
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
}
],
'parent' => {},
@@ -111,21 +177,33 @@
};
$result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'} =
$result_trees{'raw'}{'contents'}[0];
$result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'raw'}{'contents'}[0];
+$result_trees{'raw'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'raw'}{'contents'}[0]{'contents'}[1];
$result_trees{'raw'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'raw'}{'contents'}[0];
+$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw'}{'contents'}[0]{'contents'}[2];
+$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'raw'}{'contents'}[0]{'contents'}[2];
+$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'extra'}{'command'} =
$result_trees{'raw'}{'contents'}[0];
$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'raw'}{'contents'}[0];
+$result_trees{'raw'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'raw'}{'contents'}[0]{'contents'}[2];
$result_trees{'raw'}{'contents'}[0]{'parent'} = $result_trees{'raw'};
-$result_trees{'raw'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'raw'}{'contents'}[0];
$result_trees{'raw'}{'contents'}[1]{'parent'} = $result_trees{'raw'};
+$result_trees{'raw'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'raw'}{'contents'}[2];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'raw'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'raw'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'raw'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'raw'}{'contents'}[2]{'contents'}[1];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'} =
$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'raw'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'raw'}{'contents'}[2];
$result_trees{'raw'}{'contents'}[2]{'parent'} = $result_trees{'raw'};
-$result_trees{'raw'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'raw'}{'contents'}[3];
-$result_trees{'raw'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'raw'}{'contents'}[3]{'contents'}[1];
-$result_trees{'raw'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'raw'}{'contents'}[3]{'contents'}[1];
-$result_trees{'raw'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'raw'}{'contents'}[3]{'contents'}[1];
-$result_trees{'raw'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'raw'}{'contents'}[3]{'contents'}[1];
-$result_trees{'raw'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'raw'}{'contents'}[3];
-$result_trees{'raw'}{'contents'}[3]{'contents'}[2]{'extra'}{'command'} =
$result_trees{'raw'}{'contents'}[3]{'contents'}[1];
-$result_trees{'raw'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'raw'}{'contents'}[3];
-$result_trees{'raw'}{'contents'}[3]{'parent'} = $result_trees{'raw'};
$result_texis{'raw'} = '@tex
in <tex>
@@ -150,8 +228,8 @@
in <tex>
</tex>
-
<para>Para
-<in></para>';
+<in>
+</para>';
1;
- texinfo/tp TODO Texinfo/Common.pm Texinfo/Parse...,
Patrice Dumas <=