[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert):
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): do not modify the tree when preparing a modified multitable prototype line. |
|
Date: |
Tue, 13 Sep 2022 05:22:51 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 9edefe627f * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): do not
modify the tree when preparing a modified multitable prototype line.
9edefe627f is described below
commit 9edefe627f5669d215f942fef03ceb08d7fe0167
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Sep 13 11:22:39 2022 +0200
* tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): do not modify
the tree when preparing a modified multitable prototype line.
* tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm,
tp/Texinfo/Convert/IXINSXML.pm, tp/Texinfo/Convert/LaTeX.pm,
tp/Texinfo/Convert/PlainTexinfo.pm, tp/Texinfo/Convert/Plaintext.pm,
tp/Texinfo/Convert/TexinfoSXML.pm, tp/Texinfo/Convert/TexinfoXML.pm:
Remove 'OUTFILE' and 'SUBDIR' from converter %defaults if undef
like the default.
* tp/Texinfo/Convert/TexinfoMarkup.pm
(_protect_in_spaces_attribute_text): rename _protect_in_spaces as
_protect_in_spaces_attribute_text.
---
ChangeLog | 16 +++++
tp/Texinfo/Convert/DocBook.pm | 7 +--
tp/Texinfo/Convert/HTML.pm | 2 -
tp/Texinfo/Convert/IXINSXML.pm | 2 -
tp/Texinfo/Convert/LaTeX.pm | 2 -
tp/Texinfo/Convert/PlainTexinfo.pm | 3 +-
tp/Texinfo/Convert/Plaintext.pm | 4 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 73 +++++++++++-----------
tp/Texinfo/Convert/TexinfoSXML.pm | 12 +---
tp/Texinfo/Convert/TexinfoXML.pm | 11 ----
tp/Texinfo/Convert/TextContent.pm | 1 +
tp/t/results/coverage/multitable.pl | 10 ---
.../inter_item_commands_in_multitable.pl | 8 ---
tp/t/results/multitable/multitable_figure_space.pl | 10 ---
tp/t/results/multitable/multitable_in_example.pl | 10 ---
.../results/multitable/not_letters_in_prototype.pl | 14 -----
tp/t/results/multitable/paragraph_in_cells.pl | 10 ---
.../results/multitable/prototype_brace_no_brace.pl | 12 ----
.../multitable/prototype_brace_no_brace_comment.pl | 12 ----
tp/t/results/multitable/prototype_no_brace.pl | 24 -------
tp/t/results/multitable/w_in_multitable.pl | 10 ---
tp/t/results/xml_tests/commands_and_spaces.pl | 36 -----------
.../xml_tests/comments_on_block_command_lines.pl | 10 ---
23 files changed, 61 insertions(+), 238 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 50e45d8c62..3a0b86d5ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2022-09-13 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): do not modify
+ the tree when preparing a modified multitable prototype line.
+
+ * tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm,
+ tp/Texinfo/Convert/IXINSXML.pm, tp/Texinfo/Convert/LaTeX.pm,
+ tp/Texinfo/Convert/PlainTexinfo.pm, tp/Texinfo/Convert/Plaintext.pm,
+ tp/Texinfo/Convert/TexinfoSXML.pm, tp/Texinfo/Convert/TexinfoXML.pm:
+ Remove 'OUTFILE' and 'SUBDIR' from converter %defaults if undef
+ like the default.
+
+ * tp/Texinfo/Convert/TexinfoMarkup.pm
+ (_protect_in_spaces_attribute_text): rename _protect_in_spaces as
+ _protect_in_spaces_attribute_text.
+
2022-09-12 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/TexinfoMarkup.pm (txi_markup_convert_text),
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index c9e3388ec7..711cd9c05e 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -49,8 +49,6 @@ my %defaults = (
'FORMAT_MENU' => 'nomenu',
'EXTENSION' => 'xml', # dbk?
'OUTPUT_ENCODING_NAME' => 'utf-8',
- 'OUTFILE' => undef,
- 'SUBDIR' => undef,
'converted_format' => 'docbook',
'SPLIT' => 0,
'documentlanguage' => undef,
@@ -300,8 +298,9 @@ sub convert_tree($$)
return $self->_convert($root);
}
-# not the same as a default for @documentlanguage as it appears
-# as an empty string on the lang_stack.
+# not the same as a default for @documentlanguage. $DEFAULT_LANG
+# is used in the lang attribute, but if there is no @documentlanguag,
+# the lang_stack will start with an empty string, not with $DEFAULT_LANG.
my $DEFAULT_LANG = 'en';
sub output($$)
{
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 6cf8227eba..9acb58b029 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1775,9 +1775,7 @@ my %defaults = (
# if set, no css is used.
'NO_CSS' => 0,
'OUTPUT_ENCODING_NAME' => 'utf-8',
- 'OUTFILE' => undef,
'SPLIT' => 'node',
- 'SUBDIR' => undef,
'USE_NODES' => 1,
'USE_NODE_DIRECTIONS' => undef,
'OPEN_QUOTE_SYMBOL' => undef,
diff --git a/tp/Texinfo/Convert/IXINSXML.pm b/tp/Texinfo/Convert/IXINSXML.pm
index dd3f096303..e243a1923b 100644
--- a/tp/Texinfo/Convert/IXINSXML.pm
+++ b/tp/Texinfo/Convert/IXINSXML.pm
@@ -47,8 +47,6 @@ my %defaults = (
'FORMAT_MENU' => 'menu',
'EXTENSION' => 'ixin',
'OUTPUT_ENCODING_NAME' => 'utf-8',
- 'OUTFILE' => undef,
- 'SUBDIR' => undef,
# next two are replaced by the main program value if called from
# the main program. 'output_format' is also 'ixinsxml' when set by
# the main program, but 'converted_format' is set to 'ixinsxml'.
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index b36f6712d2..7501176951 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -748,8 +748,6 @@ my %defaults = (
'FORMAT_MENU' => 'nomenu',
'EXTENSION' => 'tex',
- 'OUTFILE' => undef,
- 'SUBDIR' => undef,
'documentlanguage' => undef,
'converted_format' => 'latex',
diff --git a/tp/Texinfo/Convert/PlainTexinfo.pm
b/tp/Texinfo/Convert/PlainTexinfo.pm
index 6052a7e9b4..b6f1a69ce3 100644
--- a/tp/Texinfo/Convert/PlainTexinfo.pm
+++ b/tp/Texinfo/Convert/PlainTexinfo.pm
@@ -36,8 +36,9 @@ $VERSION = '6.8dev';
my %defaults = (
- 'OUTFILE' => '-',
'EXTENSION' => 'texi',
+ # different from the default, which is undef
+ 'OUTFILE' => '-',
);
sub converter_defaults($$)
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 32f7f10496..9947212088 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -342,10 +342,8 @@ my %defaults = (
'EXTENSION' => 'txt',
#'USE_SETFILENAME_EXTENSION' => 1,
'INFO_SPECIAL_CHARS_WARNING' => undef,
-
- #'OUTFILE' => undef,
+ # different from the default, which is undef
'OUTFILE' => '-',
- 'SUBDIR' => undef,
'documentlanguage' => undef,
'converted_format' => '',
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index f8662b4cdb..85d3ed46a7 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -314,7 +314,7 @@ sub output($$)
$result .= $self->convert_document_sections($root, $fh);
}
$result .=
$self->write_or_return($self->txi_markup_close_element('texinfo')."\n", $fh);
- # FIXME add format_footer?
+ # FIXME add txi_markup_footer() to format a footer for the file?
if ($fh and $output_file ne '-') {
Texinfo::Common::output_files_register_closed(
$self->output_files_information(), $encoded_output_file);
@@ -429,8 +429,8 @@ sub convert_tree($$)
return $self->_convert($root);
}
-# FIXME is that function markup format specific or abstract?
-sub _protect_in_spaces($)
+# FIXME is that function markup format specific or not?
+sub _protect_in_spaces_attribute_text($)
{
my $text = shift;
$text =~ s/\n/\\n/g;
@@ -443,8 +443,8 @@ sub _leading_spaces_arg($)
my $element = shift;
if ($element->{'extra'} and $element->{'extra'}->{'spaces_before_argument'}
and $element->{'extra'}->{'spaces_before_argument'} ne '') {
- return ['spaces', _protect_in_spaces(
- $element->{'extra'}->{'spaces_before_argument'})];
+ return ['spaces', _protect_in_spaces_attribute_text(
+ $element->{'extra'}->{'spaces_before_argument'})];
} else {
return ();
}
@@ -494,7 +494,7 @@ sub _trailing_spaces_arg($)
my $spaces = $element->{'extra'}->{'spaces_after_argument'};
chomp($spaces);
if ($spaces ne '') {
- return ['trailingspaces', _protect_in_spaces($spaces)];
+ return ['trailingspaces', _protect_in_spaces_attribute_text($spaces)];
}
}
return ();
@@ -732,7 +732,6 @@ sub _convert($$;$)
} else {
$nodename = '';
}
- # FIXME avoid protection, here?
$result .= $self->txi_markup_open_element('node', [['name',
$nodename],
_leading_spaces_arg($element)]);
push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
@@ -740,7 +739,7 @@ sub _convert($$;$)
[_trailing_spaces_arg($element->{'args'}->[0])])
.$self->_convert({'contents' =>
$element->{'extra'}->{'node_content'}})
.$self->txi_markup_close_element('nodename');
- # first arg is the node name.
+ # first arg is the node name, directions start at 1.
my $direction_index = 1;
my $pending_empty_directions = '';
foreach my $direction(@node_directions) {
@@ -748,12 +747,12 @@ sub _convert($$;$)
if ($element->{'structure'}->{'node_'.lc($direction)}) {
my $node_direction =
$element->{'structure'}->{'node_'.lc($direction)};
my $node_name = '';
- my $attribute = [];
+ my $attributes = [];
if (!
defined($element->{'extra'}->{'nodes_manuals'}->[$direction_index])) {
- push @$attribute, ['automatic', 'on'];
+ push @$attributes, ['automatic', 'on'];
}
if ($element->{'args'}->[$direction_index]) {
- push @$attribute, _leading_trailing_spaces_arg(
+ push @$attributes, _leading_trailing_spaces_arg(
$element->{'args'}->[$direction_index]);
}
if ($node_direction->{'extra'}->{'manual_content'}) {
@@ -767,7 +766,7 @@ sub _convert($$;$)
'contents' =>
$node_direction->{'extra'}->{'node_content'}}));
}
$result .= "$pending_empty_directions".
- $self->txi_markup_open_element($format_element,
$attribute).$node_name.
+ $self->txi_markup_open_element($format_element,
$attributes).$node_name.
$self->txi_markup_close_element($format_element);
$pending_empty_directions = '';
} else {
@@ -1071,7 +1070,9 @@ sub _convert($$;$)
if
(defined($element->{'extra'}->{'node_argument'}->{'normalized'})) {
$normalized =
$element->{'extra'}->{'node_argument'}->{'normalized'};
} else {
- $normalized =
Texinfo::Convert::NodeNameNormalization::normalize_node( {'contents' =>
$element->{'extra'}->{'node_argument'}->{'node_content'} } );
+ $normalized
+ = Texinfo::Convert::NodeNameNormalization::normalize_node(
+ {'contents' =>
$element->{'extra'}->{'node_argument'}->{'node_content'}});
}
if ($normalized) {
push @$attribute, ['label', $normalized];
@@ -1245,13 +1246,13 @@ sub _convert($$;$)
# in that case the end of line is in the columnfractions line
# or in the columnprototypes.
if ($element->{'cmdname'} eq 'multitable') {
+ my @prototype_line;
if (not $element->{'extra'}->{'columnfractions'}) {
# Like 'prototypes' extra value, but keeping spaces information
- my @prototype_line;
- if (defined $element->{'args'}[0]
- and defined $element->{'args'}[0]->{'type'}
- and $element->{'args'}[0]->{'type'} eq 'block_line_arg') {
- foreach my $content (@{$element->{'args'}[0]{'contents'}}) {
+ if (defined $element->{'args'}->[0]
+ and defined $element->{'args'}->[0]->{'type'}
+ and $element->{'args'}->[0]->{'type'} eq 'block_line_arg')
{
+ foreach my $content
(@{$element->{'args'}->[0]->{'contents'}}) {
if ($content->{'type'} and $content->{'type'} eq
'bracketed') {
push @prototype_line, $content;
} elsif ($content->{'text'}) {
@@ -1268,25 +1269,25 @@ sub _convert($$;$)
'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;
- }
+ # $content->{'cmdname'} should be defined at this point,
if not,
+ # there should be a perl warning
+ } elsif ($content->{'cmdname'} eq 'c'
+ or $content->{'cmdname'} eq 'comment') {
+ # NOTE it does not happen right now, because a comment
+ # will be in extra comment_at_end. If comments are back
+ # in the tree, they should be ignored here, as they would
+ # better be handled in format_comment_or_return_end_line
+ } else { # a command
+ push @prototype_line, $content;
}
}
- $element->{'extra'}->{'prototypes_line'} = \@prototype_line;
}
}
- if ($element->{'extra'}
- and $element->{'extra'}->{'prototypes_line'}) {
+ if (scalar(@prototype_line) > 0) {
$result .= $self->txi_markup_open_element('columnprototypes');
my $first_proto = 1;
- foreach my $prototype
(@{$element->{'extra'}->{'prototypes_line'}}) {
+ foreach my $prototype (@prototype_line) {
if ($prototype->{'text'} and $prototype->{'text'} !~ /\S/) {
if (!$first_proto) {
my $spaces = $prototype->{'text'};
@@ -1294,15 +1295,15 @@ sub _convert($$;$)
$result .= $spaces;
}
} else {
- my $attribute = [];
+ my $attributes = [];
if ($prototype->{'type'}
and $prototype->{'type'} eq 'bracketed') {
- push @$attribute, ['bracketed', 'on'];
- push @$attribute,
+ push @$attributes, ['bracketed', 'on'];
+ push @$attributes,
_leading_spaces_arg($prototype);
}
$result .=
$self->txi_markup_open_element('columnprototype',
- $attribute)
+ $attributes)
.$self->_convert($prototype)
.$self->txi_markup_close_element('columnprototype');
}
@@ -1374,8 +1375,8 @@ sub _convert($$;$)
my $leading_spaces = $element->{'extra'}->{'spaces_before_argument'};
# may happen without any argument, remove as a \n is added below
$leading_spaces =~ s/\n//;
- $leading_spaces_attribute_spec = [['spaces', _protect_in_spaces(
- $leading_spaces)]]
+ $leading_spaces_attribute_spec = [['spaces',
+ _protect_in_spaces_attribute_text($leading_spaces)]]
if ($leading_spaces ne '');
}
$result .= $self->txi_markup_open_element($element->{'cmdname'},
diff --git a/tp/Texinfo/Convert/TexinfoSXML.pm
b/tp/Texinfo/Convert/TexinfoSXML.pm
index 2847cfc578..b6eb80c617 100644
--- a/tp/Texinfo/Convert/TexinfoSXML.pm
+++ b/tp/Texinfo/Convert/TexinfoSXML.pm
@@ -40,8 +40,6 @@ my %defaults = (
'FORMAT_MENU' => 'menu',
'EXTENSION' => 'sxml',
'OUTPUT_ENCODING_NAME' => 'utf-8',
- 'OUTFILE' => undef,
- 'SUBDIR' => undef,
'converted_format' => 'texinfosxml',
'SPLIT' => 0,
'documentlanguage' => 'en',
@@ -53,8 +51,6 @@ sub converter_defaults($$)
}
-# format specific. Used in few places where plain text is used outside
-# of attributes.
sub txi_markup_protect_text($$)
{
my $self = shift;
@@ -83,7 +79,6 @@ sub _sxml_attributes($$)
return $result . ')';
}
-# format specific
sub txi_markup_element($$$)
{
my $self = shift;
@@ -96,7 +91,6 @@ sub txi_markup_element($$$)
return $result;
}
-# format specific
sub txi_markup_open_element($$$)
{
my $self = shift;
@@ -109,7 +103,6 @@ sub txi_markup_open_element($$$)
return $result;
}
-# format specific
sub txi_markup_close_element($$)
{
my $self = shift;
@@ -133,8 +126,7 @@ sub txi_markup_atom($$)
}
}
-# format specific
-#FIXME
+# TODO is there a way to mark comments in SXML?
sub txi_markup_comment($$)
{
my $self = shift;
@@ -143,7 +135,6 @@ sub txi_markup_comment($$)
return '';
}
-# format specific
sub txi_markup_convert_text($$)
{
my $self = shift;
@@ -162,7 +153,6 @@ sub txi_markup_convert_text($$)
return '"'.$result.'" ';
}
-# output format specific
sub txi_markup_header($)
{
my $self = shift;
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 61437a7c06..fdb9190921 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -44,8 +44,6 @@ my %defaults = (
'FORMAT_MENU' => 'menu',
'EXTENSION' => 'xml',
'OUTPUT_ENCODING_NAME' => 'utf-8',
- 'OUTFILE' => undef,
- 'SUBDIR' => undef,
'converted_format' => 'xml',
'SPLIT' => 0,
'documentlanguage' => 'en',
@@ -59,8 +57,6 @@ sub converter_defaults($$)
# Following are XML specific formatting functions.
-# format specific. Used in few places where plain text is used outside
-# of attributes.
sub txi_markup_protect_text($$)
{
my $self = shift;
@@ -113,7 +109,6 @@ sub _xml_attributes($$)
return $result;
}
-# format specific
sub txi_markup_element($$$)
{
my $self = shift;
@@ -126,7 +121,6 @@ sub txi_markup_element($$$)
return $result;
}
-# format specific
sub txi_markup_open_element($$$)
{
my $self = shift;
@@ -139,7 +133,6 @@ sub txi_markup_open_element($$$)
return $result;
}
-# format specific
sub txi_markup_close_element($$)
{
my $self = shift;
@@ -151,7 +144,6 @@ sub txi_markup_close_element($$)
my %no_arg_commands_formatting
= %Texinfo::Convert::TexinfoMarkup::no_arg_commands_formatting;
-# format specific
sub txi_markup_atom($$)
{
my $self = shift;
@@ -163,7 +155,6 @@ sub txi_markup_atom($$)
}
}
-# format specific
sub txi_markup_comment($$)
{
my $self = shift;
@@ -182,7 +173,6 @@ sub _protect_text($$)
return $result;
}
-# format specific
sub txi_markup_convert_text($$)
{
my $self = shift;
@@ -202,7 +192,6 @@ sub txi_markup_convert_text($$)
return $result;
}
-# output format specific
sub txi_markup_header($)
{
my $self = shift;
diff --git a/tp/Texinfo/Convert/TextContent.pm
b/tp/Texinfo/Convert/TextContent.pm
index 7961326eba..f8c38867cf 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -53,6 +53,7 @@ foreach my $type ('empty_line_after_command',
'preamble_before_beginning',
my %defaults = (
'FORMAT_MENU' => 'menu',
+ # different from the default, which is undef
'OUTFILE' => '-',
);
diff --git a/tp/t/results/coverage/multitable.pl
b/tp/t/results/coverage/multitable.pl
index cafe2dded7..5312247725 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -578,14 +578,6 @@ $result_trees{'multitable'} = {
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {}
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -676,8 +668,6 @@
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}[0]
=
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes_line'}[2]
=
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2];
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'multitable'}{'contents'}[0];
$result_trees{'multitable'}{'contents'}[0]{'parent'} =
$result_trees{'multitable'};
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index 5686b53fe8..0c23547a40 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -258,9 +258,6 @@ $result_trees{'inter_item_commands_in_multitable'} = {
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {}
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -847,9 +844,6 @@ $result_trees{'inter_item_commands_in_multitable'} = {
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {}
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -904,7 +898,6 @@
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -981,7 +974,6 @@
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'parent'} =
$result_trees{'inter_item_commands_in_multitable'};
diff --git a/tp/t/results/multitable/multitable_figure_space.pl
b/tp/t/results/multitable/multitable_figure_space.pl
index 2932e500f2..882aaf66b3 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -304,14 +304,6 @@ $result_trees{'multitable_figure_space'} = {
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {}
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -367,8 +359,6 @@
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
=
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[2]
=
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'multitable_figure_space'}{'contents'}[0];
$result_trees{'multitable_figure_space'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_figure_space'};
diff --git a/tp/t/results/multitable/multitable_in_example.pl
b/tp/t/results/multitable/multitable_in_example.pl
index a1b7e47388..eeda7bfc07 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -279,14 +279,6 @@ $result_trees{'multitable_in_example'} = {
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {}
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -372,8 +364,6 @@
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[2]
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl
b/tp/t/results/multitable/not_letters_in_prototype.pl
index 7fbe03cc47..d591ca132b 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -144,20 +144,6 @@ $result_trees{'not_letters_in_prototype'} = {
'type' => 'row_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => '1.3',
- 'type' => 'row_prototype'
- },
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {
- 'text' => '5-6',
- 'type' => 'row_prototype'
- }
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl
b/tp/t/results/multitable/paragraph_in_cells.pl
index 1788d41c87..9d17758be4 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -273,14 +273,6 @@ $result_trees{'paragraph_in_cells'} = {
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {}
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -334,8 +326,6 @@
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0];
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
=
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[2]
=
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'paragraph_in_cells'}{'contents'}[0];
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'parent'} =
$result_trees{'paragraph_in_cells'};
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index f56d7bffe9..859d24f78e 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -82,17 +82,6 @@ $result_trees{'prototype_brace_no_brace'} = {
'type' => 'row_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {
- 'text' => 'bb',
- 'type' => 'row_prototype'
- }
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -117,7 +106,6 @@
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'content
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'prototype_brace_no_brace'}{'contents'}[0];
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'parent'} =
$result_trees{'prototype_brace_no_brace'};
diff --git a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
index 66f6d0ba50..37f2dc1aa5 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -98,17 +98,6 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
'type' => 'row_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {
- 'text' => 'bb',
- 'type' => 'row_prototype'
- }
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -135,7 +124,6 @@
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0];
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'parent'} =
$result_trees{'prototype_brace_no_brace_comment'};
diff --git a/tp/t/results/multitable/prototype_no_brace.pl
b/tp/t/results/multitable/prototype_no_brace.pl
index ed5e8e9634..dd4cee0c61 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -100,29 +100,6 @@ $result_trees{'prototype_no_brace'} = {
'type' => 'row_prototype'
}
],
- 'prototypes_line' => [
- {
- 'text' => 'aa',
- 'type' => 'row_prototype'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {
- 'text' => 'b',
- 'type' => 'row_prototype'
- },
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {
- 'text' => 'cc',
- 'type' => 'row_prototype'
- }
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -148,7 +125,6 @@
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'pa
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0];
-$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'prototype_no_brace'}{'contents'}[0];
$result_trees{'prototype_no_brace'}{'contents'}[0]{'parent'} =
$result_trees{'prototype_no_brace'};
diff --git a/tp/t/results/multitable/w_in_multitable.pl
b/tp/t/results/multitable/w_in_multitable.pl
index 1c772b7d11..13c61fad86 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -196,14 +196,6 @@ $result_trees{'w_in_multitable'} = {
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {}
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -245,8 +237,6 @@
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'a
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0];
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
=
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[2]
=
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'w_in_multitable'}{'contents'}[0];
$result_trees{'w_in_multitable'}{'contents'}[0]{'parent'} =
$result_trees{'w_in_multitable'};
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 63e4c1895c..81abdd95f4 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1021,39 +1021,6 @@ $result_trees{'commands_and_spaces'} = {
'type' => 'row_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {},
- {
- 'text' => 'gg',
- 'type' => 'row_prototype'
- },
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {
- 'text' => 'hh',
- 'type' => 'row_prototype'
- },
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {
- 'text' => 'j',
- 'type' => 'row_prototype'
- }
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -1969,9 +1936,6 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]{'contents'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[2]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[2];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[4]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[4];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[28]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index 85e4d580e0..ba7fbb8598 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -2005,14 +2005,6 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'bracketed_multitable_prototype'
}
],
- 'prototypes_line' => [
- {},
- {
- 'text' => ' ',
- 'type' => 'prototype_space'
- },
- {}
- ],
'spaces_before_argument' => ' '
},
'parent' => {},
@@ -2563,8 +2555,6 @@
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes'}[1]{'contents'}[0]
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes_line'}[0]
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes_line'}[2]
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[2];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[33]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'args'}[0];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): do not modify the tree when preparing a modified multitable prototype line.,
Patrice Dumas <=