[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7091] do not generate prototypes_line extra value in parser
|
From: |
Gavin D. Smith |
|
Subject: |
[7091] do not generate prototypes_line extra value in parser |
|
Date: |
Sun, 03 Apr 2016 15:42:10 +0000 |
Revision: 7091
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7091
Author: gavin
Date: 2016-04-03 15:42:09 +0000 (Sun, 03 Apr 2016)
Log Message:
-----------
do not generate prototypes_line extra value in parser
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/TexinfoXML.pm
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/float/complex_float.pl
trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
trunk/tp/t/results/info_tests/nested_multitable_anchor_index.pl
trunk/tp/t/results/invalid_nestings/bad_tab_nesting.pl
trunk/tp/t/results/invalid_nestings/center.pl
trunk/tp/t/results/invalid_nestings/multitable_in_style_command.pl
trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
trunk/tp/t/results/invalid_nestings/on_block_command_line.pl
trunk/tp/t/results/invalid_nestings/tab_in_index.pl
trunk/tp/t/results/multitable/empty_multitable_with_cells.pl
trunk/tp/t/results/multitable/multitable_begin_with_tab.pl
trunk/tp/t/results/multitable/multitable_not_closed.pl
trunk/tp/t/results/multitable/multitable_not_closed_item.pl
trunk/tp/t/results/multitable/multitable_not_closed_item_tab.pl
trunk/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
trunk/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
trunk/tp/t/results/plaintext_tests/multitable.pl
trunk/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
trunk/tp/t/results/plaintext_tests/nested_multitable.pl
trunk/tp/t/results/test_count/multitable.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/ChangeLog 2016-04-03 15:42:09 UTC (rev 7091)
@@ -1,3 +1,10 @@
+2016-04-03 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Parser.pm (_end_line) <@multitable prototypes>: Don't
+ save a 'prototypes_line' extra value for the multitable element.
+ * tp/Texinfo/Convert/TexinfoXML.pm (_convert) <@multitable>:
+ Reconstruct the information that was in 'prototypes_line'.
+
2016-03-29 Masamichi Hosoda <address@hidden>
* doc/texinfo.tex (\skipspaces, \getfilename):
Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm 2016-04-03 14:32:49 UTC (rev
7090)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm 2016-04-03 15:42:09 UTC (rev
7091)
@@ -1359,8 +1359,47 @@
my $contents_possible_comment;
# in that case the end of line is in the columnfractions line
# or in the columnprototypes.
- if ($root->{'cmdname'} eq 'multitable' and $root->{'extra'}) {
- if ($root->{'extra'}->{'prototypes_line'}) {
+
+ if ($root->{'cmdname'} eq 'multitable') {
+ if (not $root->{'extra'}->{'columnfractions'}) {
+ # Like 'prototypes' extra value, but keeping spaces information
+ my @prototype_line;
+ if (defined $root->{'args'}[0]
+ and defined $root->{'args'}[0]->{'type'}
+ and $root->{'args'}[0]->{'type'} eq 'block_line_arg') {
+ foreach my $content (@{$root->{'args'}[0]{'contents'}}) {
+ if ($content->{'type'} and $content->{'type'} eq
'bracketed') {
+ push @prototype_line, $content;
+ } elsif ($content->{'text'}) {
+ # The regexp breaks between characters, with a non space
followed
+ # by a space or a space followed by non space. It is
like \b, but
+ # for \s \S, and not \w \W.
+ foreach my $prototype_or_space (split
/(?<=\S)(?=\s)|(?=\S)(?<=\s)/,
+ $content->{'text'}) {
+ if ($prototype_or_space =~ /\S/) {
+ push @prototype_line, {'text' => $prototype_or_space,
+ 'type' => 'row_prototype' };
+ } elsif ($prototype_or_space =~ /\s/) {
+ push @prototype_line, {'text' => $prototype_or_space,
+ 'type' => 'prototype_space' };
+ }
+ }
+ } else {
+ # FIXME could this happen? Should be a debug message?
+ if (!$content->{'cmdname'}) {
+ } elsif ($content->{'cmdname'} eq 'c'
+ or $content->{'cmdname'} eq 'comment') {
+ } else {
+ push @prototype_line, $content;
+ }
+ }
+ }
+ $root->{'extra'}->{'prototypes_line'} = address@hidden;
+ }
+ }
+
+ if ($root->{'extra'}
+ and $root->{'extra'}->{'prototypes_line'}) {
$result .= $self->open_element('columnprototypes');
my $first_proto = 1;
foreach my $prototype
(@{$root->{'extra'}->{'prototypes_line'}}) {
@@ -1386,7 +1425,8 @@
$result .= $self->close_element('columnprototypes');
$contents_possible_comment
= $root->{'args'}->[-1]->{'contents'};
- } elsif ($root->{'extra'}->{'columnfractions'}) {
+ } elsif ($root->{'extra'}
+ and $root->{'extra'}->{'columnfractions'}) {
my $cmd;
foreach my $content (@{$root->{'args'}->[0]->{'contents'}}) {
if ($content->{'cmdname'}
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/Texinfo/Parser.pm 2016-04-03 15:42:09 UTC (rev 7091)
@@ -3029,14 +3029,11 @@
and $current->{'parent'}->{'cmdname'} eq 'multitable') {
# parse the prototypes and put them in a special arg
my @prototype_row;
- # do the same but keeping spaces information
- my @prototype_line;
foreach my $content (@{$current->{'contents'}}) {
if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
push @prototype_row, { 'contents' => $content->{'contents'},
'parent' => $content->{'parent'},
'type' => 'bracketed_multitable_prototype'};
- push @prototype_line, $content;
} elsif ($content->{'text'}) {
if ($content->{'text'} =~ /\S/) {
foreach my $prototype (split /\s+/, $content->{'text'}) {
@@ -3044,19 +3041,6 @@
'type' => 'row_prototype' } unless ($prototype eq
'');
}
}
- # The regexp breaks between characters, with a non space followed
- # by a space or a space followed by non space. It is like \b, but
- # for \s \S, and not \w \W.
- foreach my $prototype_or_space (split /(?<=\S)(?=\s)|(?=\S)(?<=\s)/,
- $content->{'text'}) {
- if ($prototype_or_space =~ /\S/) {
- push @prototype_line, {'text' => $prototype_or_space,
- 'type' => 'row_prototype' };
- } elsif ($prototype_or_space =~ /\s/) {
- push @prototype_line, {'text' => $prototype_or_space,
- 'type' => 'prototype_space' };
- }
- }
} else {
# FIXME could this happen? Should be a debug message?
if (!$content->{'cmdname'}) {
@@ -3068,7 +3052,6 @@
or $content->{'cmdname'} eq 'comment') {
} else {
push @prototype_row, $content;
- push @prototype_line, $content;
}
}
}
@@ -3080,7 +3063,6 @@
$self->__("empty multitable"));
}
$multitable->{'extra'}->{'prototypes'} = address@hidden;
- $multitable->{'extra'}->{'prototypes_line'} = address@hidden;
} else {
_isolate_last_space($self, $current, 'space_at_end_block_command');
@@ -7233,9 +7215,7 @@
The key I<max_columns> holds the maximal number of columns. If there
are prototypes on the line they are in the array associated with
-I<prototypes>. In that case, I<prototypes_line> also holds this
-information, and, in addition, keeps spaces with type C<prototype_space>.
-If there is a C<@columnfractions> as argument, then the
+I<prototypes>. If there is a C<@columnfractions> as argument, then the
I<columnfractions> key is associated with the array of columnfractions
arguments, holding all the column fractions.
Modified: trunk/tp/t/results/float/complex_float.pl
===================================================================
--- trunk/tp/t/results/float/complex_float.pl 2016-04-03 14:32:49 UTC (rev
7090)
+++ trunk/tp/t/results/float/complex_float.pl 2016-04-03 15:42:09 UTC (rev
7091)
@@ -1757,23 +1757,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -3436,23 +3419,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -4573,8 +4539,6 @@
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'spaces_after_command'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[12];
@@ -4911,8 +4875,6 @@
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'spaces_after_command'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'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'}[9]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9];
Modified: trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
===================================================================
--- trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -1007,23 +1007,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1377,8 +1360,6 @@
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
Modified: trunk/tp/t/results/info_tests/nested_multitable_anchor_index.pl
===================================================================
--- trunk/tp/t/results/info_tests/nested_multitable_anchor_index.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/info_tests/nested_multitable_anchor_index.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -382,23 +382,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -687,23 +670,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -951,8 +917,6 @@
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -1011,8 +975,6 @@
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
Modified: trunk/tp/t/results/invalid_nestings/bad_tab_nesting.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/bad_tab_nesting.pl 2016-04-03
14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/invalid_nestings/bad_tab_nesting.pl 2016-04-03
15:42:09 UTC (rev 7091)
@@ -209,23 +209,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -277,8 +260,6 @@
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0];
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0];
-$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'parent'} =
$result_trees{'bad_tab_nesting'};
Modified: trunk/tp/t/results/invalid_nestings/center.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/center.pl 2016-04-03 14:32:49 UTC
(rev 7090)
+++ trunk/tp/t/results/invalid_nestings/center.pl 2016-04-03 15:42:09 UTC
(rev 7091)
@@ -1577,23 +1577,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -2081,8 +2064,6 @@
$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[33]{'args'}[0];
$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[1]{'contents'}
= $result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[1]{'parent'} =
$result_trees{'center'}{'contents'}[33]{'args'}[0];
-$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes_line'}[1] =
$result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes_line'}[3] =
$result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[3];
$result_trees{'center'}{'contents'}[33]{'extra'}{'spaces_after_command'} =
$result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[0];
$result_trees{'center'}{'contents'}[33]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[34]{'parent'} = $result_trees{'center'};
Modified: trunk/tp/t/results/invalid_nestings/multitable_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/multitable_in_style_command.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/invalid_nestings/multitable_in_style_command.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -225,23 +225,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -296,8 +279,6 @@
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0];
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0];
-$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'parent'} =
$result_trees{'multitable_in_style_command'};
Modified: trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -178,23 +178,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -243,8 +226,6 @@
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0];
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_item_in_index'};
Modified: trunk/tp/t/results/invalid_nestings/on_block_command_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_block_command_line.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/invalid_nestings/on_block_command_line.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -221,23 +221,6 @@
},
{}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {},
@@ -523,8 +506,6 @@
$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0];
$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[1]
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3];
-$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'on_block_command_line'}{'contents'}[0]{'line_nr'} =
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'on_block_command_line'}{'contents'}[0]{'parent'} =
$result_trees{'on_block_command_line'};
Modified: trunk/tp/t/results/invalid_nestings/tab_in_index.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/tab_in_index.pl 2016-04-03 14:32:49 UTC
(rev 7090)
+++ trunk/tp/t/results/invalid_nestings/tab_in_index.pl 2016-04-03 15:42:09 UTC
(rev 7091)
@@ -255,23 +255,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -336,8 +319,6 @@
$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0];
$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0];
-$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] =
$result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] =
$result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'tab_in_index'}{'contents'}[0]{'parent'} =
$result_trees{'tab_in_index'};
Modified: trunk/tp/t/results/multitable/empty_multitable_with_cells.pl
===================================================================
--- trunk/tp/t/results/multitable/empty_multitable_with_cells.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/multitable/empty_multitable_with_cells.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -133,13 +133,6 @@
'end_command' => {},
'max_columns' => 0,
'prototypes' => [],
- 'prototypes_line' => [
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
Modified: trunk/tp/t/results/multitable/multitable_begin_with_tab.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_begin_with_tab.pl 2016-04-03
14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/multitable/multitable_begin_with_tab.pl 2016-04-03
15:42:09 UTC (rev 7091)
@@ -134,23 +134,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -342,23 +325,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -397,8 +363,6 @@
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0];
-$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_begin_with_tab'};
$result_trees{'multitable_begin_with_tab'}{'contents'}[1]{'parent'} =
$result_trees{'multitable_begin_with_tab'};
@@ -436,8 +400,6 @@
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0];
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0];
-$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'parent'} =
$result_trees{'multitable_begin_with_tab'};
Modified: trunk/tp/t/results/multitable/multitable_not_closed.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_not_closed.pl 2016-04-03
14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/multitable/multitable_not_closed.pl 2016-04-03
15:42:09 UTC (rev 7091)
@@ -69,23 +69,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -111,8 +94,6 @@
$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0];
-$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_not_closed'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_not_closed'};
Modified: trunk/tp/t/results/multitable/multitable_not_closed_item.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_not_closed_item.pl 2016-04-03
14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/multitable/multitable_not_closed_item.pl 2016-04-03
15:42:09 UTC (rev 7091)
@@ -119,23 +119,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -169,8 +152,6 @@
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0];
-$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_not_closed_item'};
Modified: trunk/tp/t/results/multitable/multitable_not_closed_item_tab.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_not_closed_item_tab.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/multitable/multitable_not_closed_item_tab.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -148,23 +148,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -205,8 +188,6 @@
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0];
-$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_not_closed_item_tab'};
Modified: trunk/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -376,18 +376,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -467,7 +455,6 @@
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[1];
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0];
-$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'parent'}
= $result_trees{'multitable_one_column_too_much_cells'};
Modified: trunk/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -122,13 +122,6 @@
'end_command' => {},
'max_columns' => 0,
'prototypes' => [],
- 'prototypes_line' => [
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
Modified: trunk/tp/t/results/plaintext_tests/multitable.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/multitable.pl 2016-04-03 14:32:49 UTC
(rev 7090)
+++ trunk/tp/t/results/plaintext_tests/multitable.pl 2016-04-03 15:42:09 UTC
(rev 7091)
@@ -262,23 +262,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1419,23 +1402,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1778,23 +1744,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1993,18 +1942,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -2295,23 +2232,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -2375,8 +2295,6 @@
$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[0]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[0]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[0]{'parent'} =
$result_trees{'multitable'};
$result_trees{'multitable'}{'contents'}[1]{'parent'} =
$result_trees{'multitable'};
@@ -2600,8 +2518,6 @@
$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[2]{'args'}[0];
$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[2]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[2]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[2]{'parent'} =
$result_trees{'multitable'};
$result_trees{'multitable'}{'contents'}[3]{'parent'} =
$result_trees{'multitable'};
@@ -2670,8 +2586,6 @@
$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[4]{'args'}[0];
$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[4]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[4]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[4]{'parent'} =
$result_trees{'multitable'};
$result_trees{'multitable'}{'contents'}[5]{'parent'} =
$result_trees{'multitable'};
@@ -2708,7 +2622,6 @@
$result_trees{'multitable'}{'contents'}[6]{'extra'}{'end_command'} =
$result_trees{'multitable'}{'contents'}[6]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[6]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[6]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[6]{'parent'} =
$result_trees{'multitable'};
$result_trees{'multitable'}{'contents'}[7]{'parent'} =
$result_trees{'multitable'};
@@ -2763,8 +2676,6 @@
$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[8]{'args'}[0];
$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[8]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[8]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[8]{'parent'} =
$result_trees{'multitable'};
Modified:
trunk/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
2016-04-03 14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
2016-04-03 15:42:09 UTC (rev 7091)
@@ -206,21 +206,6 @@
'type' => 'row_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {
- 'text' => 'a',
- 'type' => 'row_prototype'
- },
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
Modified: trunk/tp/t/results/plaintext_tests/nested_multitable.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/nested_multitable.pl 2016-04-03
14:32:49 UTC (rev 7090)
+++ trunk/tp/t/results/plaintext_tests/nested_multitable.pl 2016-04-03
15:42:09 UTC (rev 7091)
@@ -268,23 +268,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -485,23 +468,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -565,8 +531,6 @@
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -607,8 +571,6 @@
$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0];
-$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[1]
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[3]
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'spaces_after_command'}
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'parent'} =
$result_trees{'nested_multitable'};
Modified: trunk/tp/t/results/test_count/multitable.pl
===================================================================
--- trunk/tp/t/results/test_count/multitable.pl 2016-04-03 14:32:49 UTC (rev
7090)
+++ trunk/tp/t/results/test_count/multitable.pl 2016-04-03 15:42:09 UTC (rev
7091)
@@ -367,28 +367,6 @@
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => '
-',
- 'type' => 'prototype_space'
- }
- ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -472,9 +450,6 @@
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'args'}[0];
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[2]{'contents'}
=
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'};
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[2]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'args'}[0];
-$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[5] =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[5];
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[1]{'parent'} =
$result_trees{'multitable'};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7091] do not generate prototypes_line extra value in parser,
Gavin D. Smith <=