[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Pl...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Pl... |
|
Date: |
Sun, 30 Jan 2011 17:00:55 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/01/30 17:00:53
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: Plaintext.pm
tp/t : 20preformatted.t
tp/t/results/coverage: exdent_and_commands.pl
exdent_and_formats.pl preformatted.pl
tp/t/results/float: complex_float.pl
tp/t/results/invalid_nestings: block_not_matching.pl
formats_not_closed_in_example.pl
tp/t/results/macro: macro_in_misc_commands.pl
tp/t/results/misc_commands: double_exdent.pl
tp/t/results/multitable: multitable_in_example.pl
tp/t/results/preformatted: empty_line.pl
empty_line_style_command.pl
tp/t/results/test_count: commands.pl
tp/t/results/value: value_in_misc_commands.pl
Added files:
tp/t/results/preformatted: text_on_command_line.pl
Log message:
Add a preformatted container for preformatted content.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.182&r2=1.183
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/20preformatted.t?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/exdent_and_formats.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/double_exdent.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_in_example.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/empty_line.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/empty_line_style_command.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/text_on_command_line.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_misc_commands.pl?cvsroot=texinfo&r1=1.37&r2=1.38
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -b -r1.182 -r1.183
--- Texinfo/Parser.pm 30 Jan 2011 11:37:44 -0000 1.182
+++ Texinfo/Parser.pm 30 Jan 2011 17:00:47 -0000 1.183
@@ -981,6 +981,19 @@
return 0;
}
+sub _begin_preformatted($)
+{
+ my $self = shift;
+ my $current = shift;
+ if ($self->{'context_stack'}->[-1] eq 'preformatted') {
+ push @{$current->{'contents'}},
+ { 'type' => 'preformatted', 'parent' => $current, 'contents' => [] };
+ $current = $current->{'contents'}->[-1];
+ print STDERR "PREFORMATTED\n" if ($self->{'DEBUG'});
+ }
+ return $current;
+}
+
# currently doesn't do much more than
# return $_[1]->{'parent'}
sub _close_brace_command($$$)
@@ -1046,7 +1059,8 @@
print STDERR "CLOSE PREFORMATTED\n" if ($self->{'DEBUG'});
#Â completly remove void preformatted contexts
if (address@hidden>{'contents'}}) {
- pop @{$current->{'parent'}->{'contents'}};
+ my $removed = pop @{$current->{'parent'}->{'contents'}};
+ print STDERR "popping $removed->{'type'}\n" if ($self->{'DEBUG'});
}
$current = $current->{'parent'};
}
@@ -1126,6 +1140,7 @@
my $command = shift;
$current = _end_paragraph($self, $current, $line_nr);
+ $current = _end_preformatted($self, $current, $line_nr);
# stop if the command is found
while (!($command and $current->{'cmdname'}
@@ -1789,8 +1804,8 @@
$empty_line->{'parent'} = $current;
} elsif ($current->{'type'}
and $current->{'type'} eq 'menu_entry_description') {
- # first parent is menu_entry
my $empty_line = pop @{$current->{'contents'}};
+ # first parent is menu_entry
$current = $current->{'parent'}->{'parent'};
push @{$current->{'contents'}}, { 'type' => 'after_description_line',
@@ -2064,6 +2079,7 @@
'contents' => [], 'parent', $current };
$current = $current->{'contents'}->[-1];
}
+ $current = $self->_begin_preformatted($current);
# misc command line arguments
} elsif ($current->{'type'}
@@ -2185,6 +2201,8 @@
}
}
$current = $current->{'parent'};
+ $current = $self->_begin_preformatted($current)
+ if ($close_preformatted_commands{$command});
# if a file was included, remove completly the include file command.
# Also ignore @setfilename in included file, as said in the manual.
if ($included_file or ($command eq 'setfilename'
@@ -2232,13 +2250,24 @@
} elsif ($current->{'contents'} and @{$current->{'contents'}}
and $current->{'contents'}->[-1]->{'type'}
and $current->{'contents'}->[-1]->{'type'} eq
'empty_line_after_command') {
+ if ($current->{'type'}
+ and $current->{'type'} eq 'preformatted') {
+ print STDERR "LINE AFTER COMMAND IN PREFORMATTED\n" if
($self->{'DEBUG'});
+ my $empty_line = pop @{$current->{'contents'}};
+ $empty_line->{'parent'} = $current->{'parent'};
+ my $preformatted = pop @{$current->{'parent'}->{'contents'}};
+ push @{$current->{'parent'}->{'contents'}}, $empty_line;
+ push @{$current->{'parent'}->{'contents'}}, $preformatted;
+ }
# empty line after a @menu. Reparent to the menu
if ($current->{'type'}
and $current->{'type'} eq 'menu_comment') {
print STDERR "EMPTY LINE AFTER MENU\n" if ($self->{'DEBUG'});
my $empty_line = pop @{$current->{'contents'}};
$empty_line->{'parent'} = $current->{'parent'};
- unshift @{$current->{'parent'}->{'contents'}}, $empty_line;
+ my $menu_comment = pop @{$current->{'parent'}->{'contents'}};
+ push @{$current->{'parent'}->{'contents'}}, $empty_line;
+ push @{$current->{'parent'}->{'contents'}}, $menu_comment;
}
}
@@ -2398,10 +2427,8 @@
sub _parse_texi($;$)
{
my $self = shift;
-# my $first_lines = shift;
-
-# my $root = { 'contents' => [], 'type' => 'text_root' };
my $root = shift;
+
$root = { 'contents' => [], 'type' => 'text_root' } if (!defined($root));
my $current = $root;
@@ -2942,6 +2969,7 @@
($closed_command, $current)
= _close_commands($self, $current, $line_nr, $end_command);
}
+ $current = $self->_begin_preformatted($current);
$line = _start_empty_line_after_command($line, $current);
next;
}
@@ -2957,6 +2985,9 @@
if ($close_paragraph_commands{$command}) {
$current = _end_paragraph($self, $current, $line_nr);
}
+ if ($close_preformatted_commands{$command}) {
+ $current = _end_preformatted($self, $current, $line_nr);
+ }
# commands without braces and not block commands, ie no @end
if (defined($self->{'misc_commands'}->{$command})) {
@@ -3057,6 +3088,7 @@
{'item_number' => $parent->{'items_count'}} };
push @{$parent->{'contents'}}, $misc;
$current = $parent->{'contents'}->[-1];
+ $current = $self->_begin_preformatted($current);
} else {
$self->line_error (sprintf($self->__("address@hidden not
meaningful inside address@hidden' block"), $command, $parent->{'cmdname'}),
$line_nr);
}
@@ -3093,6 +3125,7 @@
{'cell_number' => $row->{'cells_count'}} };
push @{$row->{'contents'}}, $misc;
$current = $row->{'contents'}->[-1];
+ $current = $self->_begin_preformatted($current);
print STDERR "TAB\n" if ($self->{'DEBUG'});
}
} else {
@@ -3109,6 +3142,7 @@
'extra' => {'cell_number' => 1}};
push @{$row->{'contents'}}, $misc;
$current = $row->{'contents'}->[-1];
+ $current = $self->_begin_preformatted($current);
}
} else {
$self->line_error (sprintf($self->__("address@hidden not
meaningful inside address@hidden' block"), $command, $parent->{'cmdname'}),
$line_nr);
@@ -3336,7 +3370,7 @@
$current = $current->{'contents'}->[-1];
print STDERR "MENU_COMMENT OPEN\n" if ($self->{'DEBUG'});
}
-
+ $current = $self->_begin_preformatted($current);
}
$block->{'extra'}->{'invalid_nesting'} = 1 if ($invalid);
$self->_register_global_command($command, $block, $line_nr);
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- Texinfo/Convert/Plaintext.pm 29 Jan 2011 23:57:21 -0000 1.60
+++ Texinfo/Convert/Plaintext.pm 30 Jan 2011 17:00:48 -0000 1.61
@@ -1124,8 +1124,8 @@
return '';
}
- my $preformatted;
my $cell;
+ my $preformatted;
if ($root->{'cmdname'}) {
my $unknown_command;
my $command = $root->{'cmdname'};
@@ -1416,7 +1416,8 @@
};
$self->{'format_context'}->[-1]->{'indent_level'}++
if ($indented_commands{$root->{'cmdname'}});
- if ($self->{'context'}->[-1] eq 'preformatted') {
+ if ($self->{'context'}->[-1] eq 'preformatted'
+ and ! $preformatted_commands{$root->{'cmdname'}}) {
$preformatted = $self->new_formatter('unfilled');
push @{$self->{'formatters'}}, $preformatted;
}
@@ -1567,10 +1568,6 @@
'max' => $cell_width - 2 };
push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0,
'locations' => []};
- if ($self->{'context'}->[-1] eq 'preformatted') {
- $preformatted = $self->new_formatter('unfilled');
- push @{$self->{'formatters'}}, $preformatted;
- }
$cell = 1;
} elsif ($root->{'cmdname'} eq 'center') {
#my ($counts, $new_locations);
@@ -1787,6 +1784,9 @@
} else {
return '';
}
+ } elsif ($root->{'type'} eq 'preformatted') {
+ $preformatted = $self->new_formatter('unfilled');
+ push @{$self->{'formatters'}}, $preformatted;
} elsif ($root->{'type'} eq 'def_line') {
if ($root->{'extra'} and $root->{'extra'}->{'def_args'}
and @{$root->{'extra'}->{'def_args'}}) {
@@ -1858,7 +1858,8 @@
while (@contents) {
my $content = shift @contents;
my $text = $self->_convert($content);
- $self->{'empty_lines_count'} = 0 if ($preformatted and $text ne '');
+ $self->{'empty_lines_count'} = 0
+ if ($self->{'context'}->[-1] eq 'preformatted' and $text ne '');
$result .= $text;
}
pop @{$self->{'current_contents'}};
Index: t/20preformatted.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/20preformatted.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/20preformatted.t 1 Dec 2010 22:39:44 -0000 1.2
+++ t/20preformatted.t 30 Jan 2011 17:00:48 -0000 1.3
@@ -10,6 +10,23 @@
after empty line
@end example
'],
+['text_on_command_line',
+'@example text on line
address@hidden example
+
address@hidden text on line followed by text
+normal text
address@hidden example
+
address@hidden
+in example
address@hidden example text after end
+
address@hidden
address@hidden
address@hidden example text after end example nested in example
address@hidden example
+']
);
my @test_invalid = (
Index: t/results/coverage/exdent_and_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage/exdent_and_commands.pl 7 Dec 2010 20:34:27 -0000
1.2
+++ t/results/coverage/exdent_and_commands.pl 30 Jan 2011 17:00:49 -0000
1.3
@@ -165,9 +165,15 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'example
'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'args' => [
@@ -207,9 +213,15 @@
'parent' => {}
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'following
'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'args' => [
@@ -269,11 +281,17 @@
'parent' => {}
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'after exdented
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -317,6 +335,7 @@
$result_trees{'exdent_and_commands'}{'contents'}[1]{'parent'} =
$result_trees{'exdent_and_commands'};
$result_trees{'exdent_and_commands'}{'contents'}[2]{'parent'} =
$result_trees{'exdent_and_commands'};
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'exdent_and_commands'}{'contents'}[3];
+$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[1];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'exdent_and_commands'}{'contents'}[3];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0];
@@ -325,6 +344,7 @@
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'extra'}{'misc_content'}[1]
=
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[2];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'exdent_and_commands'}{'contents'}[3];
+$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[3];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[3]{'parent'} =
$result_trees{'exdent_and_commands'}{'contents'}[3];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0];
@@ -340,6 +360,7 @@
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'extra'}{'misc_content'}[3]
=
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[4];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'extra'}{'misc_content'}[4]
=
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[5];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[4]{'parent'} =
$result_trees{'exdent_and_commands'}{'contents'}[3];
+$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[5];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'contents'}[5]{'parent'} =
$result_trees{'exdent_and_commands'}{'contents'}[3];
$result_trees{'exdent_and_commands'}{'contents'}[3]{'parent'} =
$result_trees{'exdent_and_commands'};
$result_trees{'exdent_and_commands'}{'contents'}[4]{'parent'} =
$result_trees{'exdent_and_commands'};
Index: t/results/coverage/exdent_and_formats.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/exdent_and_formats.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/coverage/exdent_and_formats.pl 7 Dec 2010 20:34:27 -0000
1.2
+++ t/results/coverage/exdent_and_formats.pl 30 Jan 2011 17:00:49 -0000
1.3
@@ -14,6 +14,8 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => ' Example Hoho. '
},
@@ -55,6 +57,10 @@
'text' => '
',
'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'args' => [
@@ -94,11 +100,17 @@
'parent' => {}
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'not exdented
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -166,9 +178,15 @@
'parent' => {}
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'Not exdented
'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'args' => [
@@ -208,11 +226,17 @@
'parent' => {}
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'Not exdented
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -511,9 +535,15 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'Example Hoho.
'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'cmdname' => 'example',
@@ -525,9 +555,15 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'Nested Other line
'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'args' => [
@@ -1159,22 +1195,24 @@
'type' => 'text_root'
};
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1];
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
+$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3];
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[6]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[8]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'args'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'extra'}{'misc_content'}[0]
=
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[10]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[0];
$result_trees{'exdent_and_formats'}{'contents'}[0]{'parent'} =
$result_trees{'exdent_and_formats'};
$result_trees{'exdent_and_formats'}{'contents'}[1]{'parent'} =
$result_trees{'exdent_and_formats'};
$result_trees{'exdent_and_formats'}{'contents'}[2]{'parent'} =
$result_trees{'exdent_and_formats'};
@@ -1186,6 +1224,7 @@
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[1];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[4];
+$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[2];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[4];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3]{'args'}[0];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3]{'args'}[0];
@@ -1193,6 +1232,7 @@
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3]{'extra'}{'misc_content'}[0]
=
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[3]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[4];
+$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[4];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'contents'}[4]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[4];
$result_trees{'exdent_and_formats'}{'contents'}[4]{'parent'} =
$result_trees{'exdent_and_formats'};
$result_trees{'exdent_and_formats'}{'contents'}[5]{'parent'} =
$result_trees{'exdent_and_formats'};
@@ -1244,8 +1284,10 @@
$result_trees{'exdent_and_formats'}{'contents'}[30]{'parent'} =
$result_trees{'exdent_and_formats'};
$result_trees{'exdent_and_formats'}{'contents'}[31]{'parent'} =
$result_trees{'exdent_and_formats'};
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[0]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[32];
+$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[1];
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[1]{'parent'} =
$result_trees{'exdent_and_formats'}{'contents'}[32];
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2];
+$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2]{'contents'}[1];
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2];
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2]{'contents'}[2]{'args'}[0];
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'exdent_and_formats'}{'contents'}[32]{'contents'}[2]{'contents'}[2]{'args'}[0];
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/coverage/preformatted.pl 7 Dec 2010 20:34:27 -0000 1.27
+++ t/results/coverage/preformatted.pl 30 Jan 2011 17:00:49 -0000 1.28
@@ -20,6 +20,8 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'e--xample some
'
@@ -36,6 +38,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -131,6 +137,8 @@
'parent' => {}
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
@@ -142,6 +150,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'extra' => {
'block_command_line_contents' => [
[
@@ -172,9 +184,10 @@
};
$result_trees{'preformatted'}{'contents'}[0]{'parent'} =
$result_trees{'preformatted'};
$result_trees{'preformatted'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'preformatted'}{'contents'}[1];
+$result_trees{'preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'preformatted'}{'contents'}[1]{'contents'}[1];
+$result_trees{'preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'preformatted'}{'contents'}[1]{'contents'}[1];
+$result_trees{'preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'preformatted'}{'contents'}[1]{'contents'}[1];
$result_trees{'preformatted'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'preformatted'}{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'preformatted'}{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'preformatted'}{'contents'}[1];
$result_trees{'preformatted'}{'contents'}[1]{'parent'} =
$result_trees{'preformatted'};
$result_trees{'preformatted'}{'contents'}[2]{'parent'} =
$result_trees{'preformatted'};
$result_trees{'preformatted'}{'contents'}[3]{'parent'} =
$result_trees{'preformatted'};
@@ -192,8 +205,9 @@
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'misc_content'}
=
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1];
+$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'preformatted'}{'contents'}[4];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'preformatted'}{'contents'}[4];
Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/float/complex_float.pl 28 Jan 2011 23:54:30 -0000 1.2
+++ t/results/float/complex_float.pl 30 Jan 2011 17:00:49 -0000 1.3
@@ -959,11 +959,17 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'example
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -2330,11 +2336,17 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'example 2
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -3481,6 +3493,7 @@
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[2];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[2]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[2];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
@@ -3722,6 +3735,7 @@
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
Index: t/results/invalid_nestings/block_not_matching.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/invalid_nestings/block_not_matching.pl 30 Jan 2011 11:37:46
-0000 1.17
+++ t/results/invalid_nestings/block_not_matching.pl 30 Jan 2011 17:00:50
-0000 1.18
@@ -299,11 +299,17 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'example
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
}
],
@@ -520,6 +526,7 @@
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[1]{'parent'} =
$result_trees{'block_not_matching'}{'contents'}[9];
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2];
+$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2]{'contents'}[1];
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2];
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2]{'parent'} =
$result_trees{'block_not_matching'}{'contents'}[9];
$result_trees{'block_not_matching'}{'contents'}[9]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'block_not_matching'}{'contents'}[9]{'args'}[0]{'contents'}[1];
Index: t/results/invalid_nestings/formats_not_closed_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/invalid_nestings/formats_not_closed_in_example.pl 7 Dec 2010
20:34:29 -0000 1.15
+++ t/results/invalid_nestings/formats_not_closed_in_example.pl 30 Jan 2011
17:00:50 -0000 1.16
@@ -14,10 +14,16 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'args' => [
@@ -84,6 +90,8 @@
'parent' => {}
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'table line
'
@@ -98,6 +106,10 @@
'parent' => {},
'text' => 'Some text.
'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'cmdname' => 'enumerate',
@@ -111,6 +123,8 @@
{
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => '
',
@@ -118,12 +132,18 @@
}
],
'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {},
'type' => 'before_item'
},
{
'cmdname' => 'item',
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => ' ',
'type' => 'empty_spaces_after_command'
@@ -134,6 +154,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'extra' => {
'item_number' => 1
},
@@ -143,6 +167,8 @@
'cmdname' => 'item',
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => ' ',
'type' => 'empty_spaces_after_command'
@@ -159,6 +185,10 @@
'type' => 'empty_line'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'extra' => {
'item_number' => 2
},
@@ -194,6 +224,7 @@
'type' => 'text_root'
};
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -206,20 +237,24 @@
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[1];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[2]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'parent'} =
$result_trees{'formats_not_closed_in_example'};
Index: t/results/macro/macro_in_misc_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- t/results/macro/macro_in_misc_commands.pl 15 Jan 2011 11:57:02 -0000
1.44
+++ t/results/macro/macro_in_misc_commands.pl 30 Jan 2011 17:00:50 -0000
1.45
@@ -1178,6 +1178,8 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'args' => [
{
'contents' => [
@@ -1200,6 +1202,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -3321,10 +3327,11 @@
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[55]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[56]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[0]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'contents'}[2]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[57]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[58]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[59]{'parent'}
= $result_trees{'macro_in_misc_commands'}{'contents'}[2];
Index: t/results/misc_commands/double_exdent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/double_exdent.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/misc_commands/double_exdent.pl 7 Dec 2010 20:34:30 -0000
1.2
+++ t/results/misc_commands/double_exdent.pl 30 Jan 2011 17:00:51 -0000
1.3
@@ -14,9 +14,15 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'Example Hoho.
'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'cmdname' => 'example',
@@ -28,9 +34,15 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'Nested Other line
'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
},
{
'args' => [
@@ -115,8 +127,10 @@
'type' => 'text_root'
};
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'double_exdent'}{'contents'}[0];
+$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[1];
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'double_exdent'}{'contents'}[0];
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2];
+$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2];
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
Index: t/results/multitable/multitable_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_in_example.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/multitable/multitable_in_example.pl 1 Jan 2011 16:11:01
-0000 1.3
+++ t/results/multitable/multitable_in_example.pl 30 Jan 2011 17:00:51
-0000 1.4
@@ -69,6 +69,8 @@
'cmdname' => 'item',
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => ' ',
'type' => 'empty_spaces_after_command'
@@ -78,6 +80,10 @@
'text' => 'truc '
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'extra' => {
'cell_number' => 1
},
@@ -87,6 +93,8 @@
'cmdname' => 'tab',
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => ' ',
'type' => 'empty_spaces_after_command'
@@ -97,6 +105,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'extra' => {
'cell_number' => 2
},
@@ -115,6 +127,8 @@
'cmdname' => 'item',
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => ' ',
'type' => 'empty_spaces_after_command'
@@ -142,6 +156,10 @@
'type' => 'empty_line'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'extra' => {
'cell_number' => 1
},
@@ -151,6 +169,8 @@
'cmdname' => 'tab',
'contents' => [
{
+ 'contents' => [
+ {
'parent' => {},
'text' => ' ',
'type' => 'empty_spaces_after_command'
@@ -172,6 +192,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'extra' => {
'cell_number' => 2
},
@@ -229,23 +253,27 @@
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
Index: t/results/preformatted/empty_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/preformatted/empty_line.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/preformatted/empty_line.pl 7 Dec 2010 20:34:31 -0000
1.9
+++ t/results/preformatted/empty_line.pl 30 Jan 2011 17:00:52 -0000
1.10
@@ -14,6 +14,8 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'example
'
@@ -30,6 +32,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -42,9 +48,10 @@
'type' => 'text_root'
};
$result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'empty_line'}{'contents'}[0];
+$result_trees{'empty_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'empty_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'empty_line'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_line'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'empty_line'}{'contents'}[0]{'contents'}[1];
$result_trees{'empty_line'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'empty_line'}{'contents'}[0];
-$result_trees{'empty_line'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'empty_line'}{'contents'}[0];
-$result_trees{'empty_line'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'empty_line'}{'contents'}[0];
$result_trees{'empty_line'}{'contents'}[0]{'parent'} =
$result_trees{'empty_line'};
$result_trees{'empty_line'}{'contents'}[1]{'parent'} =
$result_trees{'empty_line'};
Index: t/results/preformatted/empty_line_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/preformatted/empty_line_style_command.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/preformatted/empty_line_style_command.pl 7 Dec 2010 20:34:31
-0000 1.8
+++ t/results/preformatted/empty_line_style_command.pl 30 Jan 2011 17:00:52
-0000 1.9
@@ -14,6 +14,8 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'example '
},
@@ -51,6 +53,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -63,13 +69,14 @@
'type' => 'text_root'
};
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'empty_line_style_command'}{'contents'}[0];
+$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1];
+$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1];
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'empty_line_style_command'}{'contents'}[0];
-$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'empty_line_style_command'}{'contents'}[0];
-$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'empty_line_style_command'}{'contents'}[0];
$result_trees{'empty_line_style_command'}{'contents'}[0]{'parent'} =
$result_trees{'empty_line_style_command'};
$result_trees{'empty_line_style_command'}{'contents'}[1]{'parent'} =
$result_trees{'empty_line_style_command'};
Index: t/results/test_count/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/test_count/commands.pl 28 Jan 2011 07:24:41 -0000 1.2
+++ t/results/test_count/commands.pl 30 Jan 2011 17:00:52 -0000 1.3
@@ -121,11 +121,17 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'parent' => {},
'text' => 'truc
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -268,6 +274,7 @@
$result_trees{'commands'}{'contents'}[2]{'parent'} = $result_trees{'commands'};
$result_trees{'commands'}{'contents'}[3]{'parent'} = $result_trees{'commands'};
$result_trees{'commands'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'commands'}{'contents'}[4];
+$result_trees{'commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[4]{'contents'}[1];
$result_trees{'commands'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'commands'}{'contents'}[4];
$result_trees{'commands'}{'contents'}[4]{'parent'} = $result_trees{'commands'};
$result_trees{'commands'}{'contents'}[5]{'parent'} = $result_trees{'commands'};
@@ -356,36 +363,38 @@
[16] (33,4) @example
[17] (33,4) :empty_line_after_command:text
[17] (33,4)
- [18] (33,4) :text
+ [18] (33,4) :preformatted
+ [19] (33,4) :text
+ [19] (43,5)
[18] (43,5)
[16] (43,5)
- [19] (43,5) :empty_line_after_command:text
- [19] (43,5)
- [20] (43,5) :empty_line:text
- [20] (44,6)
- [21] (44,6) @vtable
- [22] (44,6) :before_item
- [22] (44,6)
- [23] (44,6) @item
- [24] (44,6)
- [25] (44,6) @samp
- [26] (44,6) :brace_command_arg
- [27] (44,6) :text
+ [20] (43,5) :empty_line_after_command:text
+ [20] (43,5)
+ [21] (43,5) :empty_line:text
+ [21] (44,6)
+ [22] (44,6) @vtable
+ [23] (44,6) :before_item
+ [23] (44,6)
+ [24] (44,6) @item
+ [25] (44,6)
+ [26] (44,6) @samp
+ [27] (44,6) :brace_command_arg
+ [28] (44,6) :text
+ [28] (50,6)
[27] (50,6)
[26] (50,6)
[25] (50,6)
- [24] (50,6)
- [23] (58,7)
+ [24] (58,7)
locations (1) l 7
- [28] (58,7) :empty_line:text
- [28] (59,8)
- [29] (59,8) :paragraph
- [30] (59,8) :text
- [30] (68,8)
- [29] (69,9)
- [21] (69,9)
- [31] (69,9) :empty_line_after_command:text
- [31] (69,9)
+ [29] (58,7) :empty_line:text
+ [29] (59,8)
+ [30] (59,8) :paragraph
+ [31] (59,8) :text
+ [31] (68,8)
+ [30] (69,9)
+ [22] (69,9)
+ [32] (69,9) :empty_line_after_command:text
+ [32] (69,9)
[1] (69,9)
TeX. Ab. @. e~, i^
Index: t/results/value/value_in_misc_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/value/value_in_misc_commands.pl 15 Jan 2011 11:57:02 -0000
1.37
+++ t/results/value/value_in_misc_commands.pl 30 Jan 2011 17:00:53 -0000
1.38
@@ -982,6 +982,8 @@
'type' => 'empty_line_after_command'
},
{
+ 'contents' => [
+ {
'args' => [
{
'contents' => [
@@ -1004,6 +1006,10 @@
'
}
],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
'parent' => {}
},
{
@@ -2733,10 +2739,11 @@
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[46]{'parent'}
= $result_trees{'value_in_misc_commands'}{'contents'}[2];
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[47]{'parent'}
= $result_trees{'value_in_misc_commands'}{'contents'}[2];
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[0]{'parent'}
= $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48];
-$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'args'}[0];
-$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1];
+$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'contents'}[0];
+$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1];
+$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1];
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'parent'}
= $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48];
-$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[2]{'parent'}
= $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48];
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'parent'}
= $result_trees{'value_in_misc_commands'}{'contents'}[2];
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'parent'}
= $result_trees{'value_in_misc_commands'}{'contents'}[2];
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'parent'}
= $result_trees{'value_in_misc_commands'}{'contents'}[2];
Index: t/results/preformatted/text_on_command_line.pl
===================================================================
RCS file: t/results/preformatted/text_on_command_line.pl
diff -N t/results/preformatted/text_on_command_line.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/preformatted/text_on_command_line.pl 30 Jan 2011 17:00:52
-0000 1.1
@@ -0,0 +1,248 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors);
+
+$result_trees{'text_on_command_line'} = {
+ 'contents' => [
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'text on line
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'text on line followed by text
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'normal text
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'in example
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'text after end
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'text after end example nested in example
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[0]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[1]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[2]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[3]{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[3]{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[3]{'contents'}[0];
+$result_trees{'text_on_command_line'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[3];
+$result_trees{'text_on_command_line'}{'contents'}[3]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[4]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[5]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[6];
+$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1];
+$result_trees{'text_on_command_line'}{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[6];
+$result_trees{'text_on_command_line'}{'contents'}[6]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[7]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[8]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[8];
+$result_trees{'text_on_command_line'}{'contents'}[8]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[9]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[10];
+$result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[1];
+$result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[10];
+$result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[2];
+$result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[2];
+$result_trees{'text_on_command_line'}{'contents'}[10]{'contents'}[2]{'parent'}
= $result_trees{'text_on_command_line'}{'contents'}[10];
+$result_trees{'text_on_command_line'}{'contents'}[10]{'parent'} =
$result_trees{'text_on_command_line'};
+$result_trees{'text_on_command_line'}{'contents'}[11]{'parent'} =
$result_trees{'text_on_command_line'};
+
+$result_texis{'text_on_command_line'} = '@example text on line
address@hidden example
+
address@hidden text on line followed by text
+normal text
address@hidden example
+
address@hidden
+in example
address@hidden example text after end
+
address@hidden
address@hidden
address@hidden example text after end example nested in example
address@hidden example
+';
+
+
+$result_texts{'text_on_command_line'} = 'text on line
+
+text on line followed by text
+normal text
+
+in example
+text after end
+
+text after end example nested in example
+';
+
+$result_errors{'text_on_command_line'} = [];
+
+
+
+$result_converted{'plaintext'}->{'text_on_command_line'} = ' text on line
+
+ text on line followed by text
+ normal text
+
+ in example
+text after end
+
+ text after end example nested in example
+';
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Pl...,
Patrice Dumas <=