[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7236] skip over ignored conditional instead of using conditionals stack
|
From: |
gavinsmith0123 |
|
Subject: |
[7236] skip over ignored conditional instead of using conditionals stack |
|
Date: |
Sun, 26 Jun 2016 11:53:14 +0000 (UTC) |
Revision: 7236
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7236
Author: gavin
Date: 2016-06-26 11:53:14 +0000 (Sun, 26 Jun 2016)
Log Message:
-----------
skip over ignored conditional instead of using conditionals stack
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/16raw.t
trunk/tp/t/converters_tests.t
trunk/tp/t/nodenormalization.t
trunk/tp/t/results/conditionals/many_conditionals.pl
trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
trunk/tp/t/results/converters_tests/inline.pl
trunk/tp/t/results/converters_tests/inline_expand_tex.pl
trunk/tp/t/results/converters_tests/inlinefmtifelse.pl
trunk/tp/t/results/converters_tests/inlineifsetifclear.pl
trunk/tp/t/results/macro/ignored_macro_definition.pl
trunk/tp/t/results/raw/inline_in_example.pl
trunk/tp/t/results/raw/inline_missing_first_arg.pl
trunk/tp/t/results/value/ignored_value_definition.pl
trunk/tp/t/xml_tests.t
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-06-25 20:20:46 UTC (rev 7235)
+++ trunk/ChangeLog 2016-06-26 11:53:14 UTC (rev 7236)
@@ -1,3 +1,20 @@
+2016-06-26 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Parser.pm (_parse_texi): For raw block commands
+ (like @tex) and raw inline commands (@inlinefmt), skip over the
+ part of the conditional that isn't expanded, instead of parsing
+ it as usual and using a stack of expanded conditionals. Add a
+ dummy argument to the parse tree for the skipped-over argument.
+ This will mean that there is no use for the
+ _ignore_global_commands function. This change is intended to
+ make implementation of the parser module in C easier, and should
+ also make the Perl module itself simpler.
+
+ (_close_current, _close_commands): Do not refer to
+ $self->{'expanded_formats_stack'}.
+
+ (_ignore_global_commands): Always return 0.
+
2016-06-25 Gavin Smith <address@hidden>
* tp/t/test_utils.pl (set_converter_option_defaults): Set
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-06-25 20:20:46 UTC (rev 7235)
+++ trunk/tp/Texinfo/Parser.pm 2016-06-26 11:53:14 UTC (rev 7236)
@@ -556,6 +556,7 @@
sub _ignore_global_commands($)
{
my $self = shift;
+ return 0;
return !$self->{'expanded_formats_stack'}->[-1];
}
@@ -1738,8 +1739,8 @@
or $menu_commands{$current->{'cmdname'}}
or $format_raw_commands{$current->{'cmdname'}}) {
my $context = pop @{$self->{'context_stack'}};
- pop @{$self->{'expanded_formats_stack'}}
- if ($format_raw_commands{$current->{'cmdname'}});
+ #pop @{$self->{'expanded_formats_stack'}}
+ # if ($format_raw_commands{$current->{'cmdname'}});
}
pop @{$self->{'regions_stack'}}
if ($region_commands{$current->{'cmdname'}});
@@ -1834,7 +1835,7 @@
$self->_bug_message("context $context instead of rawpreformatted for
$closed_command",
$line_nr, $current);
}
- pop @{$self->{'expanded_formats_stack'}};
+ #pop @{$self->{'expanded_formats_stack'}};
} elsif ($menu_commands{$current->{'cmdname'}}) {
my $context = pop @{$self->{'context_stack'}};
# may be in menu, but context is preformatted if in a preformatted too.
@@ -4846,11 +4847,29 @@
push @{$self->{'context_stack'}}, 'preformatted';
} elsif ($format_raw_commands{$command}) {
push @{$self->{'context_stack'}}, 'rawpreformatted';
- if ($self->{'expanded_formats_hash'}->{$command}
- and $self->{'expanded_formats_stack'}->[-1]) {
- push @{$self->{'expanded_formats_stack'}}, $command;
- } else {
- push @{$self->{'expanded_formats_stack'}}, 0;
+ if (not $self->{'expanded_formats_hash'}->{$command}) {
+ push $current->{'contents'}, {
+ 'parent' => $current,
+ 'type' => 'elided_block',
+ 'contents' => []
+ };
+ while (not $line =~ /address@hidden/) {
+ ($line, $line_nr) = _new_line($self, $line_nr, $current);
+ if (!$line) {
+ # unclosed block
+ $line = '';
+ last;
+ }
+ }
+ push @{$current->{'contents'}},
+ { 'type' => 'empty_line_after_command',
+ 'text' => "\n",
+ 'parent' => $current };
+ push @{$current->{'contents'}}, { 'type' => 'empty_line',
+ 'text' => '',
+ 'parent' => $current };
+ next;
+ #push @{$self->{'expanded_formats_stack'}}, 0;
}
}
if ($region_commands{$command}) {
@@ -5037,7 +5056,7 @@
}
if ($inline_commands{$command}) {
# this is changed when the first argument is known.
- push @{$self->{'expanded_formats_stack'}}, 0;
+ #push @{$self->{'expanded_formats_stack'}}, 0;
push @{$self->{'context_stack'}}, $command
if ($command eq 'inlineraw');
}
@@ -5090,7 +5109,6 @@
} elsif ($separator eq '}') {
_abort_empty_line($self, $current);
- #print STDERR "GGGGG". _print_current ($current);
if ($current->{'type'} and ($current->{'type'} eq 'bracketed')) {
$current = $current->{'parent'};
# the following will not happen for footnote if there is
@@ -5222,7 +5240,7 @@
die;
}
}
- pop @{$self->{'expanded_formats_stack'}};
+ #pop @{$self->{'expanded_formats_stack'}};
}
if (address@hidden>{'args'}}
or address@hidden>{'extra'}->{'brace_command_contents'}}
@@ -5347,46 +5365,111 @@
my $type = $current->{'type'};
$current = $current->{'parent'};
if ($inline_commands{$current->{'cmdname'}}) {
+ my $expandp = 0;
if (! $current->{'extra'}->{'format'}) {
- # change the top of the raw_formats_stack now that we know the
- # first arg of the inlineraw
- my $inline_type
- = Texinfo::Convert::Text::convert({'contents' =>
- $current->{'extra'}->{'brace_command_contents'}->[0]},
- {Texinfo::Common::_convert_text_options($self)});
- if ($self->{'expanded_formats_stack'}->[-2]) {
- if ($inline_format_commands{$current->{'cmdname'}}) {
- if ($self->{'expanded_formats_hash'}->{$inline_type}) {
- $self->{'expanded_formats_stack'}->[-1] = $inline_type;
- $current->{'extra'}->{'expand_index'} = 1;
- } else {
- $self->{'expanded_formats_stack'}->[-1] = 0;
- }
- } elsif (($current->{'cmdname'} eq 'inlineifset'
- and exists($self->{'values'}->{$inline_type}))
- or ($current->{'cmdname'} eq 'inlineifclear'
- and ! exists($self->{'values'}->{$inline_type})))
{
- $self->{'expanded_formats_stack'}->[-1]
- = "$current->{'cmdname'} $inline_type";
+ my @contents;
+ my $inline_type;
+ if (defined
+ $current->{'extra'}->{'brace_command_contents'}->[0]) {
+ @contents
+ = @{$current->{'extra'}->{'brace_command_contents'}->[0]};
+ _trim_spaces_comment_from_content (address@hidden);
+ $inline_type = $contents[0]->{'text'};
+ }
+
+ if (!$inline_type) {
+ # condition is missing for some reason
+ } elsif ($inline_format_commands{$current->{'cmdname'}}) {
+ if ($self->{'expanded_formats_hash'}->{$inline_type}) {
+ $expandp = 1;
$current->{'extra'}->{'expand_index'} = 1;
} else {
- $self->{'expanded_formats_stack'}->[-1] = 0;
+ $expandp = 0;
}
+ } elsif (($current->{'cmdname'} eq 'inlineifset'
+ and exists($self->{'values'}->{$inline_type}))
+ or ($current->{'cmdname'} eq 'inlineifclear'
+ and ! exists($self->{'values'}->{$inline_type}))) {
+ $expandp = 1;
+ $current->{'extra'}->{'expand_index'} = 1;
} else {
- $self->{'expanded_formats_stack'}->[-1] = 0;
+ $expandp = 0;
}
$current->{'extra'}->{'format'} = $inline_type;
- } else {
- # happens for the second arg of inlinefmtifelse
- my $inline_type = $current->{'extra'}->{'format'};
- if ($self->{'expanded_formats_stack'}->[-2]
- and ! ($self->{'expanded_formats_hash'}->{$inline_type})) {
- $self->{'expanded_formats_stack'}->[-1] = $inline_type;
+
+ # Skip first argument for a false @inlinefmtifelse
+ if (!$expandp and $current->{'cmdname'} eq 'inlinefmtifelse') {
$current->{'extra'}->{'expand_index'} = 2;
- } else {
- $self->{'expanded_formats_stack'}->[-1] = 0;
+
+ # Add a dummy argument for the first argument.
+ push $current->{'args'}, {'type' => 'elided',
+ 'parent' => $current,
+ 'contents' => []};
+ _register_command_arg($self, $current->{'args'}->[-1],
+ 'brace_command_contents');
+
+ # Scan forward to get the next argument.
+ my $brace_count = 1;
+ while ($brace_count > 0) {
+ # Forward to next comma or brace
+ if ($line =~ s/[^{,}]*([,{}])//) {
+ if ($1 eq ',' and $brace_count == 1) {
+ last;
+ } elsif ($1 eq '{') {
+ $brace_count++;
+ } elsif ($1 eq '}') {
+ $brace_count--;
+ }
+ } else {
+ my $new_text;
+ ($new_text, $line_nr) = _next_text($self,
+ $line_nr, $current);
+ if (!$new_text) {
+ # ERROR - unbalanced brace
+ }
+ $line .= $new_text;
+ }
+ }
+ if ($brace_count == 0) {
+ # second arg missing
+ $line = '}' . $line;
+ }
+ $current->{'remaining_args'}--;
+ $expandp = 1;
}
+ } elsif ($current->{'cmdname'} eq 'inlinefmtifelse') {
+ # Second arg of @inlinefmtifelse when condition is true.
+ # Discard second argument.
+ $expandp = 0;
}
+ # If this command is not being expanded, add a dummy argument,
+ # and scan forward to the closing brace.
+ if (!$expandp) {
+ push $current->{'args'}, {'type' => 'elided',
+ 'parent' => $current,
+ 'contents' => []};
+ my $brace_count = 1;
+ while ($brace_count > 0) {
+ if ($line =~ s/[^{}]*([{}])//) {
+ if ($1 eq '{') {
+ $brace_count++;
+ } else {
+ $brace_count--;
+ }
+ } else {
+ my $new_text;
+ ($new_text, $line_nr) = _next_text($self,
+ $line_nr, $current);
+ $line .= $new_text;
+ if (!$line) {
+ # ERROR - unbalanced brace
+ }
+ }
+ }
+ $current = $current->{'args'}->[-1];
+ $line = '}' . $line;
+ next;
+ }
}
$current->{'remaining_args'}--;
push @{$current->{'args'}},
Modified: trunk/tp/t/16raw.t
===================================================================
--- trunk/tp/t/16raw.t 2016-06-25 20:20:46 UTC (rev 7235)
+++ trunk/tp/t/16raw.t 2016-06-26 11:53:14 UTC (rev 7236)
@@ -26,7 +26,9 @@
in v---erbatim`` <>
in verbatim2
@end verbatim
-'],
+',
+{'expanded_formats' => ['tex', 'html']}
+],
['misc_raw_comments','
@html @c comment space
in html @end address@hidden comment no space
@@ -38,7 +40,9 @@
in verbatim @c in verbatim
in verbatim2
@end verbatim
-'],
+',
+{'expanded_formats' => ['tex', 'html']}
+],
['raw_in_para',
'para
@verbatim
@@ -59,7 +63,9 @@
@end tex
End.
-'],
+',
+{'expanded_formats' => ['tex', 'html']}
+],
['raw_in_example',
'@example
@html
@@ -87,7 +93,9 @@
@end example
-'],
+',
+{'expanded_formats' => ['tex', 'html']}
+],
['braces_in_tex',
'
@tex
@@ -120,7 +128,9 @@
@html
{
@end html
-'],
+',
+{'expanded_formats' => ['html']}
+],
['verbatim_and_verbatiminclude',
'@verbatim
In verbatim @@
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbb
@@ -272,7 +282,9 @@
Before the opening command @verbatim
in block
@end verbatim. A symbol after the closing command.
-'],
+',
+{'expanded_formats' => ['tex', 'html']}
+],
['inlinefmt',
'A @inlinefmt{plaintext, plaintext `` @lbracechar{} } a. Now html
@inlinefmt{html, in <i>@acronym{HTML}</i>}.
@@ -294,7 +306,7 @@
in <i>@acronym{HTML}</i>}.
@end example
',
-{'expanded_formats' => ['plaintext']}
+{'expanded_formats' => ['plaintext', 'html']}
],
['raw_in_style',
'@code{
Modified: trunk/tp/t/converters_tests.t
===================================================================
--- trunk/tp/t/converters_tests.t 2016-06-25 20:20:46 UTC (rev 7235)
+++ trunk/tp/t/converters_tests.t 2016-06-26 11:53:14 UTC (rev 7236)
@@ -608,7 +608,7 @@
{'expanded_formats' => ['tex']},
],
['inline',
-$inline_text
+$inline_text,
],
['inline_expand_tex',
$inline_text, {'expanded_formats' => ['tex']},
@@ -630,7 +630,9 @@
@inlinefmtifelse{docbook,if docbook,else docbook}.
@inlinefmtifelse{tex,if tex,else tex}.
-'],
+',
+{'expanded_formats' => []}
+],
['inlineifsetifclear',
'@inlineifclear{aaa, iclear first }.
Modified: trunk/tp/t/nodenormalization.t
===================================================================
--- trunk/tp/t/nodenormalization.t 2016-06-25 20:20:46 UTC (rev 7235)
+++ trunk/tp/t/nodenormalization.t 2016-06-26 11:53:14 UTC (rev 7236)
@@ -33,10 +33,11 @@
Locale::Messages::bindtextdomain ('texinfo_document', 't/locales');
my $parser = Texinfo::Parser::parser({'TEST' => 1,
- 'include_directories' => [
+ 'include_directories' => [
't/include_dir/',
't/include/',
- $srcdir.'t/include/'],});
+ $srcdir.'t/include/'],
+ 'expanded_formats' => ['html', 'tex']});
my $invalid_line = '@noindent Text @titlefont{in titlefont} @anchor{in
address@hidden @exdent exdent';
Modified: trunk/tp/t/results/conditionals/many_conditionals.pl
===================================================================
--- trunk/tp/t/results/conditionals/many_conditionals.pl 2016-06-25
20:20:46 UTC (rev 7235)
+++ trunk/tp/t/results/conditionals/many_conditionals.pl 2016-06-26
11:53:14 UTC (rev 7236)
@@ -151,26 +151,17 @@
'cmdname' => 'tex',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
+ 'contents' => [],
'parent' => {},
+ 'type' => 'elided_block'
+ },
+ {
+ 'parent' => {},
'text' => '
',
'type' => 'empty_line_after_command'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'This is tex text.
-'
- }
- ],
- 'parent' => {},
- 'type' => 'rawpreformatted'
- },
- {
'args' => [
{
'contents' => [
@@ -213,14 +204,8 @@
}
],
'extra' => {
- 'end_command' => {},
- 'spaces_after_command' => {}
+ 'end_command' => {}
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 23,
- 'macro' => ''
- },
'parent' => {}
},
{
@@ -275,9 +260,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];
@@ -288,7 +271,6 @@
$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0];
$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]{'extra'}{'spaces_after_command'}
= $result_trees{'many_conditionals'}{'contents'}[10]{'contents'}[0];
$result_trees{'many_conditionals'}{'contents'}[10]{'parent'} =
$result_trees{'many_conditionals'};
$result_trees{'many_conditionals'}{'contents'}[11]{'parent'} =
$result_trees{'many_conditionals'};
$result_trees{'many_conditionals'}{'contents'}[12]{'parent'} =
$result_trees{'many_conditionals'};
@@ -308,7 +290,6 @@
@tex
-This is tex text.
@end tex
Modified: trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_raw.pl 2016-06-25
20:20:46 UTC (rev 7235)
+++ trunk/tp/t/results/converters_tests/at_commands_in_raw.pl 2016-06-26
11:53:14 UTC (rev 7236)
@@ -309,1102 +309,18 @@
'cmdname' => 'tex',
'contents' => [
{
- 'extra' => {
- 'command' => {}
- },
+ 'contents' => [],
'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
+ 'type' => 'elided_block'
},
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'code'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'kbdinputstyle',
- 'extra' => {
- 'misc_args' => [
- 'code'
- ],
- 'spaces_after_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 14,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => 'in tex'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'footnote in tex'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_context'
- }
- ],
- 'cmdname' => 'footnote',
- 'contents' => [],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 15,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'anchor in tex'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'anchor',
- 'contents' => [],
- 'extra' => {
- 'brace_command_contents' => [
- [
- {}
- ]
- ],
- 'node_content' => [
- {}
- ],
- 'normalized' => 'anchor-in-tex'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 16,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_spaces_after_close_brace'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'entry'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'cindex',
- 'extra' => {
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [],
- 'index_at_command' => 'cindex',
- 'index_name' => 'cp',
- 'index_type_command' => 'cindex',
- 'node' => {},
- 'number' => undef
- },
- 'misc_content' => [],
- 'spaces_after_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 17,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'index_entry_command'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'fentry1'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'findex',
- 'extra' => {
- 'index_entry' => {
- 'command' => {},
- 'content' => [
- {}
- ],
- 'content_normalized' => [],
- 'index_at_command' => 'findex',
- 'index_name' => 'fn',
- 'index_type_command' => 'findex',
- 'node' => {},
- 'number' => undef
- },
- 'misc_content' => [],
- 'spaces_after_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 18,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'index_entry_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'extra' => {},
'parent' => {},
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'Figs'
- }
- ],
- 'parent' => {},
- 'type' => 'block_line_arg'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'f1'
- },
- {
- 'parent' => {},
- 'text' => '
+ 'text' => '
',
- 'type' => 'space_at_end_block_command'
- }
- ],
- 'parent' => {},
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'float',
- 'contents' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Float
-'
- }
- ],
- 'parent' => {},
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Fcaption'
- }
- ],
- 'parent' => {},
- 'type' => 'paragraph'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_context'
- }
- ],
- 'cmdname' => 'caption',
- 'contents' => [],
- 'extra' => {
- 'float' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 22,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'float'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command' => {},
- 'command_argument' => 'float',
- 'spaces_after_command' => {},
- 'text_arg' => 'float'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 23,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'block_command_line_contents' => [
- [
- {}
- ],
- [
- {}
- ]
- ],
- 'caption' => {},
- 'end_command' => {},
- 'node_content' => [
- {}
- ],
- 'normalized' => 'f1',
- 'spaces_after_command' => {},
- 'type' => {
- 'content' => [
- {}
- ],
- 'normalized' => 'Figs'
- }
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 20,
- 'macro' => ''
- },
- 'parent' => {}
+ 'type' => 'empty_line_after_command'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'parent' => {},
- 'type' => 'rawpreformatted'
- },
- {
- 'cmdname' => 'menu',
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => '* ',
- 'type' => 'menu_entry_leading_text'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'n'
- }
- ],
- 'parent' => {},
- 'type' => 'menu_entry_node'
- },
- {
- 'parent' => {},
- 'text' => '::',
- 'type' => 'menu_entry_separator'
- },
- {
- 'contents' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-'
- }
- ],
- 'parent' => {},
- 'type' => 'preformatted'
- }
- ],
- 'parent' => {},
- 'type' => 'menu_entry_description'
- }
- ],
- 'extra' => {
- 'menu_entry_description' => {},
- 'menu_entry_node' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'n'
- }
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 26,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'menu_entry'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'menu'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'end',
- 'extra' => {
- 'command' => {},
- 'command_argument' => 'menu',
- 'spaces_after_command' => {},
- 'text_arg' => 'menu'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 27,
- 'macro' => ''
- },
- 'parent' => {}
- }
- ],
- 'extra' => {
- 'end_command' => {},
- 'spaces_after_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 25,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'FF'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'Fi Foo'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'acronym',
- 'contents' => [],
- 'extra' => {
- 'brace_command_contents' => [
- [
- {}
- ],
- [
- {}
- ]
- ]
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 29,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'cp fn'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'synindex',
- 'extra' => {
- 'misc_args' => [
- 'cp',
- 'fn'
- ],
- 'spaces_after_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 31,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'new'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'defindex',
- 'extra' => {
- 'misc_args' => [
- 'new'
- ],
- 'spaces_after_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 33,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'a,:,:'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'definfoenclose',
- 'extra' => {
- 'misc_args' => [
- 'a',
- ':',
- ':'
- ],
- 'spaces_after_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 35,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'moviecite = cite'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'alias',
- 'extra' => {
- 'misc_args' => [
- 'moviecite',
- 'cite'
- ],
- 'spaces_after_command' => {}
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 37,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'fr'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
- 'cmdname' => 'documentlanguage',
- 'extra' => {
- 'spaces_after_command' => {},
- 'text_arg' => 'fr'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 39,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'mymsg'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'errormsg',
- 'contents' => [],
- 'extra' => {
- 'brace_command_contents' => [
- [
- {}
- ]
- ]
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 41,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Somewhere'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'ref',
- 'contents' => [],
- 'extra' => {
- 'brace_command_contents' => [
- [
- {}
- ]
- ],
- 'node_argument' => {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Somewhere'
- }
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 43,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '.
-'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => 'flag',
- 'type' => 'misc_arg'
- },
- {
- 'parent' => {},
- 'text' => 'soemthing',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'set',
- 'extra' => {
- 'arg_line' => ' flag soemthing
-',
- 'misc_args' => [
- 'flag',
- 'soemthing'
- ]
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
- 'cmdname' => 'macro',
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'truc',
- 'type' => 'raw'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'last_raw_newline'
- }
- ],
- 'extra' => {
- 'arg_line' => ' mymacro{}
-'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 47,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => 'macroarg',
- 'type' => 'macro_name'
- },
- {
- 'parent' => {},
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
- 'cmdname' => 'macro',
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'Some \\arg\\.',
- 'type' => 'raw'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'last_raw_newline'
- }
- ],
- 'extra' => {
- 'arg_line' => ' macroarg{arg}
-',
- 'args_index' => {
- 'arg' => 0
- }
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 51,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => 'othermacro',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'unmacro',
- 'extra' => {
- 'arg_line' => ' othermacro
-',
- 'misc_args' => [
- 'othermacro'
- ]
- },
- 'parent' => {}
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
- 'parent' => {},
- 'type' => 'rawpreformatted'
- },
- {
'args' => [
{
'contents' => [
@@ -1447,14 +363,8 @@
}
],
'extra' => {
- 'end_command' => {},
- 'spaces_after_command' => {}
+ 'end_command' => {}
},
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
'parent' => {}
},
{
@@ -2039,208 +949,17 @@
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'at_commands_in_raw'}{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'at_commands_in_raw'}{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'extra'}{'node_content'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[4]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[5]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'};
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'misc_content'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'};
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[6]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'};
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'misc_content'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'};
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[7]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[8]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'float'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'block_command_line_contents'}[1][0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'caption'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'end_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[3];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'node_content'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[3];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[3]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[3];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'extra'}{'end_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[4]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[1]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[3]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[4]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[5]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[6]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[7]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[8]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[9]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[10]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[11]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[12]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[13]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[14]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[15]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[16]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[17]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[18]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[19]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20]{'args'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[20]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[21]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[23]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[22];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[23]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[24]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'args'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[26]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[25];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[26]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[27]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[28]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[29]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[5]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'command'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6]{'parent'}
= $result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[6];
-$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'extra'}{'spaces_after_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
+$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
=
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'at_commands_in_raw'}{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'at_commands_in_raw'}{'contents'}[1];
$result_trees{'at_commands_in_raw'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'at_commands_in_raw'}{'contents'}[1];
@@ -2347,49 +1066,6 @@
@kbd{in kbd before address@hidden footnote}.
@tex
address@hidden code
-in address@hidden in tex}
address@hidden in tex}
address@hidden entry
address@hidden fentry1
-
address@hidden Figs, f1
-Float
address@hidden
address@hidden float
-
address@hidden
-* n::
address@hidden menu
-
address@hidden, Fi Foo}
-
address@hidden cp fn
-
address@hidden new
-
address@hidden a,:,:
-
address@hidden moviecite = cite
-
address@hidden fr
-
address@hidden
-
address@hidden
-
address@hidden flag soemthing
-
address@hidden mymacro{}
-truc
address@hidden macro
-
address@hidden macroarg{arg}
-Some \\arg\\.
address@hidden macro
-
address@hidden othermacro
-
@end tex
@@ -2728,47 +1404,6 @@
<para><kbd>in kbd before tex</kbd><footnote><para>second
footnote</para></footnote>.
</para>
<tex endspaces=" ">
-<kbdinputstyle value="code" line=" code"></kbdinputstyle>
-in tex<footnote><para>footnote in tex</para></footnote>
-<anchor name="anchor-in-tex">anchor in tex</anchor>
-<cindex index="cp" spaces=" "><indexterm index="cp">entry</indexterm></cindex>
-<findex index="fn" spaces=" "><indexterm
index="fn">fentry1</indexterm></findex>
-
-<float name="f1" type="Figs" spaces=" " endspaces="
"><floattype>Figs</floattype><floatname spaces=" ">f1</floatname>
-Float
-<caption><para>Fcaption</para></caption>
-</float>
-
-<menu endspaces=" ">
-<menuentry leadingtext="* "><menunode
separator="::">n</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry></menu>
-
-<acronym><acronymword>FF</acronymword><acronymdesc spaces=" ">Fi
Foo</acronymdesc></acronym>
-
-<synindex from="cp" to="fn" line=" cp fn"></synindex>
-
-<defindex value="new" line=" new"></defindex>
-
-<definfoenclose command="a" open=":" close=":" line=" a,:,:"></definfoenclose>
-
-<alias new="moviecite" existing="cite" line=" moviecite = cite"></alias>
-
-<documentlanguage xml:lang="fr" spaces=" ">fr</documentlanguage>
-
-<errormsg>mymsg</errormsg>
-
-<ref label="Somewhere"><xrefnodename>Somewhere</xrefnodename></ref>.
-
-<set name="flag" line=" flag soemthing">soemthing</set>
-
-<macro name="mymacro" line=" mymacro{}">truc
-</macro>
-
-<macro name="macroarg" line=" macroarg{arg}"><formalarg>arg</formalarg>Some
\\arg\\.
-</macro>
-
-<unmacro name="othermacro" line=" othermacro"></unmacro>
-
</tex>
Modified: trunk/tp/t/results/converters_tests/inline.pl
===================================================================
--- trunk/tp/t/results/converters_tests/inline.pl 2016-06-25 20:20:46 UTC
(rev 7235)
+++ trunk/tp/t/results/converters_tests/inline.pl 2016-06-26 11:53:14 UTC
(rev 7236)
@@ -244,67 +244,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => '$\\underline'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'a < b '
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'tex \\hbox'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' code '
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 6,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {},
- 'parent' => {}
- }
- ],
- 'line_nr' => {},
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'parent' => {},
- 'text' => '$ ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlinefmt',
@@ -314,15 +256,15 @@
[
{}
],
- [
- {},
- {},
- {}
- ]
+ undef
],
'format' => 'tex'
},
- 'line_nr' => {},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -577,67 +519,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'raw $\\underline'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'a < b '
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'tex \\hbox'
- },
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' code '
- }
- ],
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 13,
- 'macro' => ''
- },
- 'parent' => {},
- 'type' => 'bracketed'
- }
- ],
- 'parent' => {},
- 'type' => 'brace_command_arg'
- }
- ],
- 'cmdname' => 'code',
- 'contents' => [],
- 'line_nr' => {},
- 'parent' => {}
- }
- ],
- 'line_nr' => {},
- 'parent' => {},
- 'type' => 'bracketed'
- },
- {
- 'parent' => {},
- 'text' => '$ ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlineraw',
@@ -647,15 +531,15 @@
[
{}
],
- [
- {},
- {},
- {}
- ]
+ undef
],
'format' => 'tex'
},
- 'line_nr' => {},
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
'parent' => {}
},
{
@@ -709,24 +593,8 @@
$result_trees{'inline'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'inline'}{'contents'}[1];
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0];
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} =
$result_trees{'inline'}{'contents'}[1]{'contents'}[8];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'line_nr'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'line_nr'}
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[3]{'parent'}
= $result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1];
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'} =
$result_trees{'inline'}{'contents'}[1]{'contents'}[8];
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[3];
-$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'line_nr'} =
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'inline'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'inline'}{'contents'}[1];
$result_trees{'inline'}{'contents'}[1]{'contents'}[9]{'parent'} =
$result_trees{'inline'}{'contents'}[1];
$result_trees{'inline'}{'contents'}[1]{'parent'} = $result_trees{'inline'};
@@ -770,24 +638,8 @@
$result_trees{'inline'}{'contents'}[4]{'contents'}[7]{'parent'} =
$result_trees{'inline'}{'contents'}[4];
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0];
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'} =
$result_trees{'inline'}{'contents'}[4]{'contents'}[8];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'line_nr'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'line_nr'}
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[3]{'parent'}
= $result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1];
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'parent'} =
$result_trees{'inline'}{'contents'}[4]{'contents'}[8];
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[1];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[3];
-$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'line_nr'} =
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'args'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'inline'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'inline'}{'contents'}[4];
$result_trees{'inline'}{'contents'}[4]{'contents'}[9]{'parent'} =
$result_trees{'inline'}{'contents'}[4];
$result_trees{'inline'}{'contents'}[4]{'parent'} = $result_trees{'inline'};
@@ -797,14 +649,14 @@
@inlinefmt{plaintext, plaintext ``},
@inlinefmt{xml, <para>xml</para> ``},
@inlinefmt{docbook, <emphasis>docbook</emphasis> ``},
address@hidden, $\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
address@hidden,}
@inlineraw{html, raw <blink>html</blink> ``},
@inlineraw{plaintext, raw plaintext ``},
@inlineraw{xml, raw <para>xml</para> ``},
@inlineraw{docbook, raw <emphasis>docbook</emphasis> ``},
address@hidden, raw $\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
address@hidden,}
';
@@ -854,14 +706,14 @@
<inlinefmt><inlinefmtformat>plaintext</inlinefmtformat><inlinefmtcontent
spaces=" ">plaintext &textldquo;</inlinefmtcontent></inlinefmt>,
<para>xml</para> &textldquo;,
<inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent
spaces=" "><emphasis>docbook</emphasis>
&textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>tex</inlinefmtformat><inlinefmtcontent spaces="
">$\\underline{a < b <code>tex \\hbox{ code }</code>}$
&textldquo;</inlinefmtcontent></inlinefmt>
+<inlinefmt><inlinefmtformat>tex</inlinefmtformat></inlinefmt>
</para>
<para><inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent
spaces=" ">raw <blink>html</blink>
&textldquo;</inlinerawcontent></inlineraw>,
<inlineraw><inlinerawformat>plaintext</inlinerawformat><inlinerawcontent
spaces=" ">raw plaintext &textldquo;</inlinerawcontent></inlineraw>,
raw <para>xml</para> ``,
<inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent
spaces=" ">raw <emphasis>docbook</emphasis>
&textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>tex</inlinerawformat><inlinerawcontent spaces="
">raw $\\underline{a < b <code>tex \\hbox{ code }</code>}$
&textldquo;</inlinerawcontent></inlineraw>
+<inlineraw><inlinerawformat>tex</inlinerawformat></inlineraw>
</para>';
Modified: trunk/tp/t/results/converters_tests/inline_expand_tex.pl
===================================================================
--- trunk/tp/t/results/converters_tests/inline_expand_tex.pl 2016-06-25
20:20:46 UTC (rev 7235)
+++ trunk/tp/t/results/converters_tests/inline_expand_tex.pl 2016-06-26
11:53:14 UTC (rev 7236)
@@ -28,19 +28,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => '<blink>html</blink> ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlinefmt',
@@ -50,9 +40,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'html'
},
@@ -81,19 +69,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'plaintext ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlinefmt',
@@ -103,9 +81,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'plaintext'
},
@@ -134,19 +110,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => '<para>xml</para> ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlinefmt',
@@ -156,9 +122,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'xml'
},
@@ -187,19 +151,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => '<emphasis>docbook</emphasis> ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlinefmt',
@@ -209,9 +163,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'docbook'
},
@@ -331,19 +283,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'raw <blink>html</blink> ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlineraw',
@@ -353,9 +295,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'html'
},
@@ -384,19 +324,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'raw plaintext ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlineraw',
@@ -406,9 +336,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'plaintext'
},
@@ -437,19 +365,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'raw <para>xml</para> ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlineraw',
@@ -459,9 +377,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'xml'
},
@@ -490,19 +406,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'raw <emphasis>docbook</emphasis> ``'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlineraw',
@@ -512,9 +418,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'docbook'
},
@@ -640,38 +544,26 @@
$result_trees{'inline_expand_tex'}{'contents'}[0]{'parent'} =
$result_trees{'inline_expand_tex'};
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[1]{'contents'}[8]{'args'}[0];
@@ -693,38 +585,26 @@
$result_trees{'inline_expand_tex'}{'contents'}[3]{'parent'} =
$result_trees{'inline_expand_tex'};
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'args'}[1]{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[3]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'args'}[1]{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[4]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[5]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[1];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[6]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[7]{'parent'} =
$result_trees{'inline_expand_tex'}{'contents'}[4];
$result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_expand_tex'}{'contents'}[4]{'contents'}[8]{'args'}[0];
@@ -752,17 +632,17 @@
$result_trees{'inline_expand_tex'}{'contents'}[4]{'parent'} =
$result_trees{'inline_expand_tex'};
$result_texis{'inline_expand_tex'} = '
address@hidden, <blink>html</blink> ``},
address@hidden, plaintext ``},
address@hidden, <para>xml</para> ``},
address@hidden, <emphasis>docbook</emphasis> ``},
address@hidden,},
address@hidden,},
address@hidden,},
address@hidden,},
@inlinefmt{tex, $\\underlinea < b @code{tex \\hbox code }}$ ``
address@hidden, raw <blink>html</blink> ``},
address@hidden, raw plaintext ``},
address@hidden, raw <para>xml</para> ``},
address@hidden, raw <emphasis>docbook</emphasis> ``},
address@hidden,},
address@hidden,},
address@hidden,},
address@hidden,},
@inlineraw{tex, raw $\\underline{a < b @code{tex \\hbox{ code }}}$ ``}
';
@@ -846,17 +726,17 @@
$result_converted{'xml'}->{'inline_expand_tex'} = '
-<para><inlinefmt><inlinefmtformat>html</inlinefmtformat><inlinefmtcontent
spaces=" "><blink>html</blink>
&textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>plaintext</inlinefmtformat><inlinefmtcontent
spaces=" ">plaintext &textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>xml</inlinefmtformat><inlinefmtcontent spaces="
"><para>xml</para> &textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent
spaces=" "><emphasis>docbook</emphasis>
&textldquo;</inlinefmtcontent></inlinefmt>,
+<para><inlinefmt><inlinefmtformat>html</inlinefmtformat></inlinefmt>,
+<inlinefmt><inlinefmtformat>plaintext</inlinefmtformat></inlinefmt>,
+<inlinefmt><inlinefmtformat>xml</inlinefmtformat></inlinefmt>,
+<inlinefmt><inlinefmtformat>docbook</inlinefmtformat></inlinefmt>,
$\\underlinea < b <code>tex \\hbox code </code>$ &textldquo;
</para>
-<para><inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent
spaces=" ">raw <blink>html</blink>
&textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>plaintext</inlinerawformat><inlinerawcontent
spaces=" ">raw plaintext &textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>xml</inlinerawformat><inlinerawcontent spaces="
">raw <para>xml</para> &textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent
spaces=" ">raw <emphasis>docbook</emphasis>
&textldquo;</inlinerawcontent></inlineraw>,
+<para><inlineraw><inlinerawformat>html</inlinerawformat></inlineraw>,
+<inlineraw><inlinerawformat>plaintext</inlinerawformat></inlineraw>,
+<inlineraw><inlinerawformat>xml</inlinerawformat></inlineraw>,
+<inlineraw><inlinerawformat>docbook</inlinerawformat></inlineraw>,
raw $\\underline{a < b <code>tex \\hbox{ code }</code>}$ ``
</para>';
Modified: trunk/tp/t/results/converters_tests/inlinefmtifelse.pl
===================================================================
--- trunk/tp/t/results/converters_tests/inlinefmtifelse.pl 2016-06-25
20:20:46 UTC (rev 7235)
+++ trunk/tp/t/results/converters_tests/inlinefmtifelse.pl 2016-06-26
11:53:14 UTC (rev 7236)
@@ -24,7 +24,7 @@
{
'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
},
{
'contents' => [
@@ -49,7 +49,7 @@
{}
]
],
- 'expand_index' => 1,
+ 'expand_index' => 2,
'format' => 'html'
},
'line_nr' => {
@@ -77,14 +77,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'if html'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
},
{
'contents' => [
@@ -104,14 +99,12 @@
[
{}
],
+ undef,
[
{}
- ],
- [
- {}
]
],
- 'expand_index' => 1,
+ 'expand_index' => 2,
'format' => 'html'
},
'line_nr' => {
@@ -151,13 +144,13 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'if plaintext no second arg'
- }
- ],
+ 'contents' => [],
'parent' => {},
+ 'type' => 'elided'
+ },
+ {
+ 'contents' => [],
+ 'parent' => {},
'type' => 'brace_command_arg'
}
],
@@ -168,11 +161,10 @@
[
{}
],
- [
- {}
- ]
+ undef,
+ undef
],
- 'expand_index' => 1,
+ 'expand_index' => 2,
'format' => 'plaintext'
},
'line_nr' => {
@@ -200,14 +192,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'if plaintext'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
},
{
'contents' => [
@@ -227,14 +214,12 @@
[
{}
],
+ undef,
[
{}
- ],
- [
- {}
]
],
- 'expand_index' => 1,
+ 'expand_index' => 2,
'format' => 'plaintext'
},
'line_nr' => {
@@ -274,14 +259,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'if xml empty second arg'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
},
{
'contents' => [],
@@ -296,12 +276,10 @@
[
{}
],
- [
- {}
- ],
+ undef,
undef
],
- 'expand_index' => 1,
+ 'expand_index' => 2,
'format' => 'xml'
},
'line_nr' => {
@@ -351,24 +329,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'if docbook spaces'
- },
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces_at_end'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
},
{
'contents' => [
@@ -393,14 +356,12 @@
[
{}
],
+ undef,
[
{}
- ],
- [
- {}
]
],
- 'expand_index' => 1,
+ 'expand_index' => 2,
'format' => 'docbook',
'spaces_before_argument' => {}
},
@@ -451,24 +412,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'if tex spaces'
- },
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'spaces_at_end'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
},
{
'contents' => [
@@ -493,11 +439,9 @@
[
{}
],
+ undef,
[
{}
- ],
- [
- {}
]
],
'expand_index' => 2,
@@ -541,14 +485,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'if docbook'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
},
{
'contents' => [
@@ -568,14 +507,12 @@
[
{}
],
+ undef,
[
{}
- ],
- [
- {}
]
],
- 'expand_index' => 1,
+ 'expand_index' => 2,
'format' => 'docbook'
},
'line_nr' => {
@@ -615,14 +552,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'if tex'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
},
{
'contents' => [
@@ -642,11 +574,9 @@
[
{}
],
+ undef,
[
{}
- ],
- [
- {}
]
],
'expand_index' => 2,
@@ -682,12 +612,10 @@
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2];
-$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[2][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[0];
@@ -695,20 +623,17 @@
$result_trees{'inlinefmtifelse'}{'contents'}[1]{'parent'} =
$result_trees{'inlinefmtifelse'};
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0];
+$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
-$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[1]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'extra'}{'brace_command_contents'}[2][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'args'}[2]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[2]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[2]{'contents'}[3]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[2];
@@ -716,11 +641,9 @@
$result_trees{'inlinefmtifelse'}{'contents'}[3]{'parent'} =
$result_trees{'inlinefmtifelse'};
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[4];
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[4];
$result_trees{'inlinefmtifelse'}{'contents'}[4]{'parent'} =
$result_trees{'inlinefmtifelse'};
@@ -729,15 +652,11 @@
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1];
-$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1];
-$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[2]{'contents'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'extra'}{'spaces_before_argument'}
=
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[6];
@@ -748,15 +667,11 @@
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1];
-$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1];
-$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[2]{'contents'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'extra'}{'spaces_before_argument'}
=
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[8]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[8];
@@ -765,12 +680,10 @@
$result_trees{'inlinefmtifelse'}{'contents'}[9]{'parent'} =
$result_trees{'inlinefmtifelse'};
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[1]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'args'}[2]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[10];
$result_trees{'inlinefmtifelse'}{'contents'}[10]{'contents'}[1]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[10];
@@ -778,32 +691,30 @@
$result_trees{'inlinefmtifelse'}{'contents'}[11]{'parent'} =
$result_trees{'inlinefmtifelse'};
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[1];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2]{'parent'}
= $result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[1]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'extra'}{'brace_command_contents'}[2][0]
=
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'args'}[2]{'contents'}[0];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[0]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[12];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'contents'}[1]{'parent'} =
$result_trees{'inlinefmtifelse'}{'contents'}[12];
$result_trees{'inlinefmtifelse'}{'contents'}[12]{'parent'} =
$result_trees{'inlinefmtifelse'};
$result_texis{'inlinefmtifelse'} = '@inlinefmtifelse{html,,else html no if}.
address@hidden,if html,else html}.
address@hidden,,else html}.
address@hidden,if plaintext no second arg}.
address@hidden,if plaintext,else plaintext}.
address@hidden,,}.
address@hidden,,else plaintext}.
address@hidden,if xml empty second arg,}.
address@hidden,,}.
address@hidden docbook , if docbook spaces , else docbook spaces }.
address@hidden docbook ,, else docbook spaces }.
address@hidden tex , if tex spaces , else tex spaces }.
address@hidden tex ,, else tex spaces }.
address@hidden,if docbook,else docbook}.
address@hidden,,else docbook}.
address@hidden,if tex,else tex}.
address@hidden,,else tex}.
';
@@ -830,7 +741,7 @@
$result_converted{'plaintext'}->{'inlinefmtifelse'} = 'else html no if. else
html.
- if plaintext no second arg. if plaintext.
+ . .
.
@@ -845,7 +756,7 @@
$result_converted{'html_text'}->{'inlinefmtifelse'} = '<p>.
-if html.
+.
</p>
<p>.
else plaintext.
@@ -863,20 +774,20 @@
$result_converted{'xml'}->{'inlinefmtifelse'} =
'<para><inlinefmtifelse><inlinefmtifelseformat>html</inlinefmtifelseformat><inlinefmtifelsecontentelse>else
html no if</inlinefmtifelsecontentelse></inlinefmtifelse>.
-<inlinefmtifelse><inlinefmtifelseformat>html</inlinefmtifelseformat><inlinefmtifelsecontentif>if
html</inlinefmtifelsecontentif><inlinefmtifelsecontentelse>else
html</inlinefmtifelsecontentelse></inlinefmtifelse>.
+<inlinefmtifelse><inlinefmtifelseformat>html</inlinefmtifelseformat><inlinefmtifelsecontentelse>else
html</inlinefmtifelsecontentelse></inlinefmtifelse>.
</para>
-<para><inlinefmtifelse><inlinefmtifelseformat>plaintext</inlinefmtifelseformat><inlinefmtifelsecontentif>if
plaintext no second arg</inlinefmtifelsecontentif></inlinefmtifelse>.
-<inlinefmtifelse><inlinefmtifelseformat>plaintext</inlinefmtifelseformat><inlinefmtifelsecontentif>if
plaintext</inlinefmtifelsecontentif><inlinefmtifelsecontentelse>else
plaintext</inlinefmtifelsecontentelse></inlinefmtifelse>.
+<para><inlinefmtifelse><inlinefmtifelseformat>plaintext</inlinefmtifelseformat></inlinefmtifelse>.
+<inlinefmtifelse><inlinefmtifelseformat>plaintext</inlinefmtifelseformat><inlinefmtifelsecontentelse>else
plaintext</inlinefmtifelsecontentelse></inlinefmtifelse>.
</para>
<para>.
</para>
-<para><inlinefmtifelse spaces=" "><inlinefmtifelseformat>docbook
</inlinefmtifelseformat><inlinefmtifelsecontentif spaces=" ">if docbook spaces
</inlinefmtifelsecontentif><inlinefmtifelsecontentelse spaces=" ">else docbook
spaces </inlinefmtifelsecontentelse></inlinefmtifelse>.
+<para><inlinefmtifelse spaces=" "><inlinefmtifelseformat>docbook
</inlinefmtifelseformat><inlinefmtifelsecontentelse spaces=" ">else docbook
spaces </inlinefmtifelsecontentelse></inlinefmtifelse>.
</para>
-<para><inlinefmtifelse spaces=" "><inlinefmtifelseformat>tex
</inlinefmtifelseformat><inlinefmtifelsecontentif spaces=" ">if tex spaces
</inlinefmtifelsecontentif><inlinefmtifelsecontentelse spaces=" ">else tex
spaces </inlinefmtifelsecontentelse></inlinefmtifelse>.
+<para><inlinefmtifelse spaces=" "><inlinefmtifelseformat>tex
</inlinefmtifelseformat><inlinefmtifelsecontentelse spaces=" ">else tex spaces
</inlinefmtifelsecontentelse></inlinefmtifelse>.
</para>
-<para><inlinefmtifelse><inlinefmtifelseformat>docbook</inlinefmtifelseformat><inlinefmtifelsecontentif>if
docbook</inlinefmtifelsecontentif><inlinefmtifelsecontentelse>else
docbook</inlinefmtifelsecontentelse></inlinefmtifelse>.
+<para><inlinefmtifelse><inlinefmtifelseformat>docbook</inlinefmtifelseformat><inlinefmtifelsecontentelse>else
docbook</inlinefmtifelsecontentelse></inlinefmtifelse>.
</para>
-<para><inlinefmtifelse><inlinefmtifelseformat>tex</inlinefmtifelseformat><inlinefmtifelsecontentif>if
tex</inlinefmtifelsecontentif><inlinefmtifelsecontentelse>else
tex</inlinefmtifelsecontentelse></inlinefmtifelse>.
+<para><inlinefmtifelse><inlinefmtifelseformat>tex</inlinefmtifelseformat><inlinefmtifelsecontentelse>else
tex</inlinefmtifelsecontentelse></inlinefmtifelse>.
</para>';
@@ -888,11 +799,11 @@
</para>
<para>.
</para>
-<para>if docbook spaces.
+<para>.
</para>
<para>else tex spaces .
</para>
-<para>if docbook.
+<para>.
</para>
<para>else tex.
</para>';
Modified: trunk/tp/t/results/converters_tests/inlineifsetifclear.pl
===================================================================
--- trunk/tp/t/results/converters_tests/inlineifsetifclear.pl 2016-06-25
20:20:46 UTC (rev 7235)
+++ trunk/tp/t/results/converters_tests/inlineifsetifclear.pl 2016-06-26
11:53:14 UTC (rev 7236)
@@ -88,19 +88,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'ifset first '
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlineifset',
@@ -110,9 +100,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'aaa'
},
@@ -183,19 +171,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'ifclear second '
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlineifclear',
@@ -205,9 +183,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'aaa'
},
@@ -309,11 +285,8 @@
$result_trees{'inlineifsetifclear'}{'contents'}[1]{'parent'} =
$result_trees{'inlineifsetifclear'};
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0];
-$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1];
-$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1];
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0];
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'inlineifsetifclear'}{'contents'}[2];
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'inlineifsetifclear'}{'contents'}[2];
$result_trees{'inlineifsetifclear'}{'contents'}[2]{'parent'} =
$result_trees{'inlineifsetifclear'};
@@ -324,11 +297,8 @@
$result_trees{'inlineifsetifclear'}{'contents'}[5]{'parent'} =
$result_trees{'inlineifsetifclear'};
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0];
-$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1];
-$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1];
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0];
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[0]{'parent'} =
$result_trees{'inlineifsetifclear'}{'contents'}[6];
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'contents'}[1]{'parent'} =
$result_trees{'inlineifsetifclear'}{'contents'}[6];
$result_trees{'inlineifsetifclear'}{'contents'}[6]{'parent'} =
$result_trees{'inlineifsetifclear'};
@@ -346,11 +316,11 @@
$result_texis{'inlineifsetifclear'} = '@inlineifclear{aaa, iclear first }.
address@hidden, ifset first }.
address@hidden,}.
@set aaa
address@hidden, ifclear second }.
address@hidden,}.
@inlineifset{aaa, ifset second }.
';
@@ -393,11 +363,11 @@
$result_converted{'xml'}->{'inlineifsetifclear'} =
'<para><inlineifclear><inlineifclearformat>aaa</inlineifclearformat><inlineifclearcontent
spaces=" ">iclear first </inlineifclearcontent></inlineifclear>.
</para>
-<para><inlineifset><inlineifsetformat>aaa</inlineifsetformat><inlineifsetcontent
spaces=" ">ifset first </inlineifsetcontent></inlineifset>.
+<para><inlineifset><inlineifsetformat>aaa</inlineifsetformat></inlineifset>.
</para>
<set name="aaa" line=" aaa"></set>
-<para><inlineifclear><inlineifclearformat>aaa</inlineifclearformat><inlineifclearcontent
spaces=" ">ifclear second </inlineifclearcontent></inlineifclear>.
+<para><inlineifclear><inlineifclearformat>aaa</inlineifclearformat></inlineifclear>.
</para>
<para><inlineifset><inlineifsetformat>aaa</inlineifsetformat><inlineifsetcontent
spaces=" ">ifset second </inlineifsetcontent></inlineifset>.
</para>';
Modified: trunk/tp/t/results/macro/ignored_macro_definition.pl
===================================================================
--- trunk/tp/t/results/macro/ignored_macro_definition.pl 2016-06-25
20:20:46 UTC (rev 7235)
+++ trunk/tp/t/results/macro/ignored_macro_definition.pl 2016-06-26
11:53:14 UTC (rev 7236)
@@ -76,76 +76,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => 'mymacro',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'unmacro',
- 'extra' => {
- 'arg_line' => ' mymacro
-',
- 'misc_args' => [
- 'mymacro'
- ]
- },
- 'parent' => {}
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
- 'cmdname' => 'macro',
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'in inlinefmt tex',
- 'type' => 'raw'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'last_raw_newline'
- }
- ],
- 'extra' => {
- 'arg_line' => ' mymacro{}
-'
- },
- 'line_nr' => {
- 'file_name' => '',
- 'line_nr' => 8,
- 'macro' => ''
- },
- 'parent' => {}
- },
- {
- 'extra' => {
- 'command' => {}
- },
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line_after_command'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlinefmt',
@@ -155,11 +88,7 @@
[
{}
],
- [
- {},
- {},
- {}
- ]
+ undef
],
'format' => 'tex'
},
@@ -209,20 +138,8 @@
$result_trees{'ignored_macro_definition'}{'contents'}[3]{'parent'} =
$result_trees{'ignored_macro_definition'};
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3]{'extra'}{'command'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[1];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][1]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[2];
-$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][2]
=
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'args'}[1]{'contents'}[3];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[4];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'ignored_macro_definition'}{'contents'}[4];
$result_trees{'ignored_macro_definition'}{'contents'}[4]{'parent'} =
$result_trees{'ignored_macro_definition'};
@@ -235,12 +152,7 @@
@end macro
address@hidden,
address@hidden mymacro
address@hidden mymacro{}
-in inlinefmt tex
address@hidden macro
-}
address@hidden,}
outside.
';
Modified: trunk/tp/t/results/raw/inline_in_example.pl
===================================================================
--- trunk/tp/t/results/raw/inline_in_example.pl 2016-06-25 20:20:46 UTC (rev
7235)
+++ trunk/tp/t/results/raw/inline_in_example.pl 2016-06-26 11:53:14 UTC (rev
7236)
@@ -262,6 +262,7 @@
{}
]
],
+ 'expand_index' => 1,
'format' => 'html'
},
'line_nr' => {
Modified: trunk/tp/t/results/raw/inline_missing_first_arg.pl
===================================================================
--- trunk/tp/t/results/raw/inline_missing_first_arg.pl 2016-06-25 20:20:46 UTC
(rev 7235)
+++ trunk/tp/t/results/raw/inline_missing_first_arg.pl 2016-06-26 11:53:14 UTC
(rev 7236)
@@ -23,19 +23,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'aaa'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlinefmt',
@@ -43,11 +33,9 @@
'extra' => {
'brace_command_contents' => [
undef,
- [
- {}
- ]
+ undef
],
- 'format' => '',
+ 'format' => undef,
'spaces_before_argument' => {}
},
'line_nr' => {
@@ -69,19 +57,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'parent' => {},
- 'text' => 'bbb'
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlineraw',
@@ -89,11 +67,9 @@
'extra' => {
'brace_command_contents' => [
undef,
- [
- {}
- ]
+ undef
],
- 'format' => ''
+ 'format' => undef
},
'line_nr' => {},
'parent' => {}
@@ -112,24 +88,18 @@
};
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0];
-$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1];
-$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0];
-$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_before_argument'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2];
-$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1];
-$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2];
-$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[1];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'line_nr'}
=
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'inline_missing_first_arg'}{'contents'}[0];
$result_trees{'inline_missing_first_arg'}{'contents'}[0]{'parent'} =
$result_trees{'inline_missing_first_arg'};
-$result_texis{'inline_missing_first_arg'} = '@inlinefmt{ , aaa}. @inlineraw{,
bbb}.
+$result_texis{'inline_missing_first_arg'} = '@inlinefmt{ ,}. @inlineraw{,}.
';
Modified: trunk/tp/t/results/value/ignored_value_definition.pl
===================================================================
--- trunk/tp/t/results/value/ignored_value_definition.pl 2016-06-25
20:20:46 UTC (rev 7235)
+++ trunk/tp/t/results/value/ignored_value_definition.pl 2016-06-26
11:53:14 UTC (rev 7236)
@@ -52,40 +52,9 @@
'type' => 'brace_command_arg'
},
{
- 'contents' => [
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_spaces_before_argument'
- },
- {
- 'args' => [
- {
- 'parent' => {},
- 'text' => 'aa',
- 'type' => 'misc_arg'
- },
- {
- 'parent' => {},
- 'text' => 'in inlinefmt tex',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'set',
- 'extra' => {
- 'arg_line' => ' aa in inlinefmt tex
-',
- 'misc_args' => [
- 'aa',
- 'in inlinefmt tex'
- ]
- },
- 'parent' => {}
- }
- ],
+ 'contents' => [],
'parent' => {},
- 'type' => 'brace_command_arg'
+ 'type' => 'elided'
}
],
'cmdname' => 'inlinefmt',
@@ -95,9 +64,7 @@
[
{}
],
- [
- {}
- ]
+ undef
],
'format' => 'tex'
},
@@ -143,13 +110,8 @@
$result_trees{'ignored_value_definition'}{'contents'}[1]{'parent'} =
$result_trees{'ignored_value_definition'};
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0];
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0];
-$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1];
-$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
-$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'args'}[1]{'parent'}
=
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
-$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1];
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0];
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'args'}[1]{'contents'}[1];
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'ignored_value_definition'}{'contents'}[2];
$result_trees{'ignored_value_definition'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'ignored_value_definition'}{'contents'}[2];
$result_trees{'ignored_value_definition'}{'contents'}[2]{'parent'} =
$result_trees{'ignored_value_definition'};
@@ -159,9 +121,7 @@
$result_texis{'ignored_value_definition'} = '@set aa outside
address@hidden,
address@hidden aa in inlinefmt tex
-}
address@hidden,}
outside.
';
Modified: trunk/tp/t/xml_tests.t
===================================================================
--- trunk/tp/t/xml_tests.t 2016-06-25 20:20:46 UTC (rev 7235)
+++ trunk/tp/t/xml_tests.t 2016-06-26 11:53:14 UTC (rev 7236)
@@ -189,7 +189,9 @@
@xml
<in />
@end xml
-'],
+',
+{'expanded_formats' => ['tex', 'xml']}
+],
['raw_and_comments',
'@tex @c comment
in <tex>
@@ -199,7 +201,9 @@
@xml @c in xml comment
<in />
@end xml @comment end xml comment
-'],
+',
+{'expanded_formats' => ['tex', 'xml']}
+],
['node_no_section',
'@node Top
'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7236] skip over ignored conditional instead of using conditionals stack,
gavinsmith0123 <=