[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Te
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _split_def_args) (_end_line_starting_block, _handle_close_brace), tp/Texinfo/XS/parsetexi/close.c (close_current), tp/Texinfo/XS/parsetexi/def.c (split_def_args), tp/Texinfo/XS/parsetexi/end [...] |
|
Date: |
Fri, 10 Mar 2023 15:29:33 -0500 |
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 934c1b2894 * tp/Texinfo/Convert/DocBook.pm (_convert),
tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm
(_convert), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm
(_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _split_def_args)
(_end_line_starting_block, _handle_close_brace),
tp/Texinfo/XS/parsetexi/close.c (close_current), tp/Texinfo/XS/parsetexi/def.c
(split_def_args), tp/Tex [...]
934c1b2894 is described below
commit 934c1b28949b30fd2a155d5f1201214a45247ad1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Mar 10 21:29:22 2023 +0100
* tp/Texinfo/Convert/DocBook.pm (_convert),
tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (_convert),
tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/Convert/Text.pm (_convert),
tp/Texinfo/Convert/TextContent.pm (_convert),
tp/Texinfo/ParserNonXS.pm (_close_current, _split_def_args)
(_end_line_starting_block, _handle_close_brace),
tp/Texinfo/XS/parsetexi/close.c (close_current),
tp/Texinfo/XS/parsetexi/def.c (split_def_args),
tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block),
tp/Texinfo/XS/parsetexi/separator.c (handle_open_brace)
(handle_close_brace): use 'bracketed_arg' instead of 'bracketed' on
@multitable line for column prototypes.
---
ChangeLog | 17 ++++++++++++++++
tp/Texinfo/Convert/DocBook.pm | 7 ++-----
tp/Texinfo/Convert/LaTeX.pm | 2 +-
tp/Texinfo/Convert/Plaintext.pm | 2 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 8 +++-----
tp/Texinfo/Convert/Text.pm | 5 +----
tp/Texinfo/Convert/TextContent.pm | 5 +----
tp/Texinfo/ParserNonXS.pm | 23 +++++++++++-----------
tp/Texinfo/XS/parsetexi/close.c | 1 +
tp/Texinfo/XS/parsetexi/def.c | 6 ++----
tp/Texinfo/XS/parsetexi/end_line.c | 2 +-
tp/Texinfo/XS/parsetexi/separator.c | 5 +++--
tp/t/results/coverage/multitable.pl | 4 ++--
tp/t/results/float/complex_float.pl | 8 ++++----
.../multitable_anchor_and_index_entry.pl | 4 ++--
.../info_tests/nested_multitable_anchor_index.pl | 8 ++++----
tp/t/results/invalid_nestings/bad_tab_nesting.pl | 4 ++--
tp/t/results/invalid_nestings/center.pl | 4 ++--
.../multitable_in_style_command.pl | 4 ++--
.../invalid_nestings/multitable_item_in_index.pl | 4 ++--
.../invalid_nestings/on_block_command_line.pl | 2 +-
.../invalid_nestings/section_on_multitable_line.pl | 4 ++--
tp/t/results/invalid_nestings/tab_in_index.pl | 4 ++--
.../inter_item_commands_in_multitable.pl | 4 ++--
.../multitable/multitable_begin_with_tab.pl | 8 ++++----
...ultitable_bracketed_no_inter_space_prototype.pl | 4 ++--
...titable_bracketed_prototype_empty_not_closed.pl | 2 +-
...bracketed_prototype_empty_not_closed_comment.pl | 2 +-
..._bracketed_prototype_empty_spaces_not_closed.pl | 2 +-
...ed_prototype_empty_spaces_not_closed_comment.pl | 2 +-
.../multitable_bracketed_prototype_not_closed.pl | 2 +-
...table_bracketed_prototype_not_closed_comment.pl | 2 +-
...bracketed_prototype_not_closed_space_comment.pl | 2 +-
.../multitable_empty_bracketed_prototype.pl | 4 ++--
tp/t/results/multitable/multitable_figure_space.pl | 4 ++--
tp/t/results/multitable/multitable_in_example.pl | 4 ++--
tp/t/results/multitable/multitable_not_closed.pl | 4 ++--
.../multitable/multitable_not_closed_item.pl | 4 ++--
.../multitable/multitable_not_closed_item_tab.pl | 4 ++--
.../multitable_one_column_too_much_cells.pl | 2 +-
tp/t/results/multitable/paragraph_in_cells.pl | 4 ++--
.../results/multitable/prototype_brace_no_brace.pl | 2 +-
.../multitable/prototype_brace_no_brace_comment.pl | 2 +-
tp/t/results/multitable/w_in_multitable.pl | 4 ++--
tp/t/results/plaintext_tests/multitable.pl | 18 ++++++++---------
.../multitable_in_example_extraneous_tab.pl | 2 +-
tp/t/results/plaintext_tests/nested_multitable.pl | 8 ++++----
tp/t/results/xml_tests/commands_and_spaces.pl | 4 ++--
.../xml_tests/comments_on_block_command_lines.pl | 4 ++--
49 files changed, 122 insertions(+), 115 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 798ca0f75b..e6cc61c4a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2023-03-10 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/DocBook.pm (_convert),
+ tp/Texinfo/Convert/LaTeX.pm (_convert),
+ tp/Texinfo/Convert/Plaintext.pm (_convert),
+ tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+ tp/Texinfo/Convert/Text.pm (_convert),
+ tp/Texinfo/Convert/TextContent.pm (_convert),
+ tp/Texinfo/ParserNonXS.pm (_close_current, _split_def_args)
+ (_end_line_starting_block, _handle_close_brace),
+ tp/Texinfo/XS/parsetexi/close.c (close_current),
+ tp/Texinfo/XS/parsetexi/def.c (split_def_args),
+ tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block),
+ tp/Texinfo/XS/parsetexi/separator.c (handle_open_brace)
+ (handle_close_brace): use 'bracketed_arg' instead of 'bracketed' on
+ @multitable line for column prototypes.
+
2023-03-10 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Translations.pm (complete_indices)
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index b47d8f1ec0..0eb74f8f4e 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1520,7 +1520,7 @@ sub _convert($$;$)
and $element->{'args'}->[0]->{'contents'}) {
$multiply = 1;
foreach my $content (@{$element->{'args'}->[0]->{'contents'}}) {
- if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
+ if ($content->{'type'} and $content->{'type'} eq
'bracketed_arg') {
my $prototype_text = '';
if ($content->{'contents'}) {
$prototype_text
@@ -1714,10 +1714,7 @@ sub _convert($$;$)
}
}
$result = '{'.$result.'}'
- if ($element->{'type'} and $element->{'type'} eq 'bracketed'
- and (!$element->{'parent'}->{'type'} or
- ($element->{'parent'}->{'type'} ne 'block_line_arg'
- and $element->{'parent'}->{'type'} ne 'line_arg')));
+ if ($element->{'type'} and $element->{'type'} eq 'bracketed');
foreach my $format_element (@close_format_elements) {
$result .= "</$format_element>";
}
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index f57ce77bfa..c5cea6aaaf 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3639,7 +3639,7 @@ sub _convert($$)
my @prototypes_length;
my $total_length = 0.;
foreach my $content (@{$element->{'args'}->[0]->{'contents'}}) {
- if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
+ if ($content->{'type'} and $content->{'type'} eq 'bracketed_arg') {
my $prototype_text = '';
if ($content->{'contents'}) {
$prototype_text
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 07748c4889..14b2e5920b 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2670,7 +2670,7 @@ sub _convert($$)
} elsif ($element->{'args'} and scalar(@{$element->{'args'}})
and $element->{'args'}->[0]->{'contents'}) {
foreach my $content (@{$element->{'args'}->[0]->{'contents'}}) {
- if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
+ if ($content->{'type'} and $content->{'type'} eq 'bracketed_arg') {
my $column_size = 0;
if ($content->{'contents'}) {
push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 520201541e..c57e714213 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1417,7 +1417,7 @@ sub _convert($$;$)
$result .= $self->txi_markup_open_element('columnprototypes');
foreach my $arg (@{$element->{'args'}->[0]->{'contents'}}) {
if ($arg->{'type'}
- and $arg->{'type'} eq 'bracketed') {
+ and $arg->{'type'} eq 'bracketed_arg') {
my $attributes = [];
push @$attributes, ['bracketed', 'on'];
push @$attributes,
@@ -1573,10 +1573,8 @@ sub _convert($$;$)
}
}
$result = '{'.$result.'}'
- if ($element->{'type'} and $element->{'type'} eq 'bracketed'
- and (!$element->{'parent'}->{'type'} or
- ($element->{'parent'}->{'type'} ne 'block_line_arg'
- and $element->{'parent'}->{'type'} ne 'line_arg')));
+ if ($element->{'type'} and $element->{'type'} eq 'bracketed');
+
foreach my $format_element (@close_format_elements) {
$result .= $self->txi_markup_close_element($format_element);
}
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index d0e7d64b81..4b0497582b 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -665,10 +665,7 @@ sub _convert($;$)
$options->{'_raw_state'}-- if ($in_raw);
$options->{'_code_state'}-- if ($in_code);
}
- if ($element->{'type'} and $element->{'type'} eq 'bracketed'
- and (!$element->{'parent'}->{'type'} or
- ($element->{'parent'}->{'type'} ne 'block_line_arg'
- and $element->{'parent'}->{'type'} ne 'line_arg'))) {
+ if ($element->{'type'} and $element->{'type'} eq 'bracketed') {
$result = '{'.$result.'}';
} elsif ($element->{'type'} and $element->{'type'} eq 'menu_entry'
and (!$element->{'parent'}->{'type'}
diff --git a/tp/Texinfo/Convert/TextContent.pm
b/tp/Texinfo/Convert/TextContent.pm
index e41b657bd3..2136b5cb17 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -172,10 +172,7 @@ sub _convert($$)
}
}
$result = '{'.$result.'}'
- if ($element->{'type'} and $element->{'type'} eq 'bracketed'
- and (!$element->{'parent'}->{'type'} or
- ($element->{'parent'}->{'type'} ne 'block_line_arg'
- and $element->{'parent'}->{'type'} ne 'line_arg')));
+ if ($element->{'type'} and $element->{'type'} eq 'bracketed');
if ($element->{'type'} and $element->{'type'} eq 'line_arg') {
$result .= "\n";
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index b3a52e771d..cf18ff752c 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2044,7 +2044,8 @@ sub _close_current($$$;$$)
}
} elsif ($current->{'type'}) {
print STDERR "CLOSING type $current->{'type'}\n" if ($self->{'DEBUG'});
- if ($current->{'type'} eq 'bracketed') {
+ if ($current->{'type'} eq 'bracketed'
+ or $current->{'type'} eq 'bracketed_arg') {
# unclosed bracketed
$self->_command_error($current, $source_info, __("misplaced {"));
if ($current->{'contents'}
@@ -2782,7 +2783,7 @@ sub _isolate_last_space
return if (!$current->{'contents'});
# $current->{'type'} is always set, to line_arg, block_line_arg,
- # brace_command_arg, bracketed or menu_entry_node
+ # brace_command_arg, bracketed_arg or menu_entry_node
# Store a final comment command in the 'info' hash, except for brace
# commands
@@ -2950,9 +2951,8 @@ sub _split_def_args
$source_info, $current);
}
return @elements;
- } elsif ($root->{'type'} and $root->{'type'} eq 'bracketed') {
+ } elsif ($root->{'type'} and $root->{'type'} eq 'bracketed_arg') {
_isolate_last_space($self, $root);
- $root->{'type'} = 'bracketed_arg';
}
return $root;
}
@@ -3050,7 +3050,7 @@ sub _parse_def($$$$)
}
if ($token->{'type'} and ($token->{'type'} eq 'bracketed_arg'
- or $token->{'type'} eq 'bracketed_inserted')) {
+ or $token->{'type'} eq 'bracketed_inserted')) {
$result{$arg} = $token;
shift @contents;
$arg = shift (@args);
@@ -3751,7 +3751,7 @@ sub _end_line_starting_block($$$)
my $max_columns = 0;
if ($current->{'contents'}) {
foreach my $content (@{$current->{'contents'}}) {
- if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
+ if ($content->{'type'} and $content->{'type'} eq 'bracketed_arg') {
$max_columns++;
} elsif ($content->{'text'}) {
# TODO: this should be a warning or an error - all prototypes
@@ -5666,7 +5666,7 @@ sub _handle_open_brace($$$$)
and $current->{'parent'}->{'type'} eq 'def_line'))) {
_abort_empty_line($self, $current);
push @{$current->{'contents'}},
- { 'type' => 'bracketed',
+ { 'type' => 'bracketed_arg',
'parent' => $current };
$current = $current->{'contents'}->[-1];
# we need the line number here in case @ protects end of line
@@ -5725,8 +5725,9 @@ sub _handle_close_brace($$$)
$current = _end_paragraph($self, $current, $source_info);
}
- if ($current->{'type'} and ($current->{'type'} eq 'bracketed')) {
- # Used in @math
+ if ($current->{'type'}
+ and ($current->{'type'} eq 'bracketed'
+ or $current->{'type'} eq 'bracketed_arg')) {
_abort_empty_line($self, $current);
$current = $current->{'parent'};
} elsif ($current->{'parent'}
@@ -8258,11 +8259,11 @@ are present as elements in the tree.
=item bracketed
This a special type containing content in brackets in the context
-where they are valid, in C<@math>.
+where they are valid, in C<@math> and in raw output formats.
=item bracketed_arg
-Bracketed argument. On definition command lines.
+Bracketed argument. On definition command and on C<@multitable> line.
=item def_aggregate
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index cf2e3ff59d..87354af197 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -425,6 +425,7 @@ close_current (ELEMENT *current,
switch (current->type)
{
case ET_bracketed:
+ case ET_bracketed_arg:
command_error (current, "misplaced {");
if (current->contents.number > 0
&& current->contents.list[0]->type
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index 47bd9e8d83..b1317a6ac1 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -222,8 +222,7 @@ split_delimiters (ELEMENT *current, int starting_idx)
/* Divide any text elements into separate elements, separating whitespace
- and non-whitespace. Change ET_bracketed elements to
- ET_bracketed_arg. */
+ and non-whitespace. */
static void
split_def_args (ELEMENT *current, int starting_idx)
{
@@ -239,10 +238,9 @@ split_def_args (ELEMENT *current, int starting_idx)
uint8_t *u8_text = 0;
uint8_t *u8_p;
- if (e->type == ET_bracketed)
+ if (e->type == ET_bracketed_arg)
{
isolate_last_space (e);
- e->type = ET_bracketed_arg;
continue;
}
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 83bc522cfa..df88f32ac0 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -769,7 +769,7 @@ end_line_starting_block (ELEMENT *current)
{
ELEMENT *e = contents_child_by_index(current, i);
- if (e->type == ET_bracketed)
+ if (e->type == ET_bracketed_arg)
{
max_columns++;
}
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index 47fc2d7080..aea0e7900e 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -170,7 +170,7 @@ handle_open_brace (ELEMENT *current, char **line_inout)
{
ELEMENT *b, *e;
abort_empty_line (¤t, NULL);
- b = new_element (ET_bracketed);
+ b = new_element (ET_bracketed_arg);
add_to_element_contents (current, b);
current = b;
@@ -244,7 +244,8 @@ handle_close_brace (ELEMENT *current, char **line_inout)
current = end_paragraph (current, 0, 0);
}
- if (current->type == ET_bracketed)
+ if (current->type == ET_bracketed
+ || current->type == ET_bracketed_arg)
{
/* Used in @math */
abort_empty_line (¤t, NULL);
diff --git a/tp/t/results/coverage/multitable.pl
b/tp/t/results/coverage/multitable.pl
index 4175fc3224..a0bd87c6fa 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -389,7 +389,7 @@ $result_trees{'multitable'} = {
'text' => 'truc'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -400,7 +400,7 @@ $result_trees{'multitable'} = {
'text' => 'bidule'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index 9ff6dca379..72ec9a7c7c 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -1316,7 +1316,7 @@ $result_trees{'complex_float'} = {
'text' => 'truc'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -1327,7 +1327,7 @@ $result_trees{'complex_float'} = {
'text' => 'bidule'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -2667,7 +2667,7 @@ $result_trees{'complex_float'} = {
'text' => 'truc'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -2678,7 +2678,7 @@ $result_trees{'complex_float'} = {
'text' => 'bidule'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index 768344529f..29d6167fca 100644
--- a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -436,7 +436,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
'text' => 'A'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -447,7 +447,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
'text' => 'B'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index 9bb465aa06..2246c19b33 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -44,7 +44,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
'text' => 'truc AAAA machin'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -55,7 +55,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
'text' => 'bidule'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -91,7 +91,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
'text' => 'AAAA'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -102,7 +102,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
'text' => 'machin'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index 421d93bf14..edaf985150 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -19,7 +19,7 @@ $result_trees{'bad_tab_nesting'} = {
'text' => 'truc'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'bad_tab_nesting'} = {
'text' => 'bidule'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/center.pl
b/tp/t/results/invalid_nestings/center.pl
index 4b9ab94638..449907d375 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -976,7 +976,7 @@ $result_trees{'center'} = {
'text' => 'AAA'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -987,7 +987,7 @@ $result_trees{'center'} = {
'text' => 'BBB'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
index 5eeda1d77b..fd40947f46 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -47,7 +47,7 @@ $result_trees{'multitable_in_style_command'} = {
'text' => 'truc'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -58,7 +58,7 @@ $result_trees{'multitable_in_style_command'} = {
'text' => 'machin'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
index 7b99cd13a6..f35210d0c6 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable_item_in_index'} = {
'text' => 'aaa'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'multitable_item_in_index'} = {
'text' => 'bbb'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index 2cdeac428d..fe1805268f 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -37,7 +37,7 @@ $result_trees{'on_block_command_line'} = {
}
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
diff --git a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
index 62ea38a981..d0112518f1 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -149,7 +149,7 @@ $result_trees{'section_on_multitable_line'} = {
'text' => 'aaa'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -160,7 +160,7 @@ $result_trees{'section_on_multitable_line'} = {
'text' => 'bbb'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl
b/tp/t/results/invalid_nestings/tab_in_index.pl
index b8d7e7e136..8f003de1d3 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -19,7 +19,7 @@ $result_trees{'tab_in_index'} = {
'text' => 'one nonlettered character'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'tab_in_index'} = {
'text' => 'normal text'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
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 06ee4e6912..dc0f5600a2 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -19,7 +19,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
'text' => 'truc'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -609,7 +609,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
'text' => 'thing'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/multitable_begin_with_tab.pl
b/tp/t/results/multitable/multitable_begin_with_tab.pl
index 939933bef9..e081f92270 100644
--- a/tp/t/results/multitable/multitable_begin_with_tab.pl
+++ b/tp/t/results/multitable/multitable_begin_with_tab.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable_begin_with_tab'} = {
'text' => 'a'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'multitable_begin_with_tab'} = {
'text' => 'b'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -124,7 +124,7 @@ $result_trees{'multitable_begin_with_tab'} = {
'text' => 'c'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -135,7 +135,7 @@ $result_trees{'multitable_begin_with_tab'} = {
'text' => 'd'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git
a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
index 8e3d2cfc48..3e0aee798f 100644
--- a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
+++ b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
@@ -24,7 +24,7 @@
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
'text' => 'a'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'contents' => [
@@ -32,7 +32,7 @@
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
'text' => 'b'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
index bd2ee7d22e..3ed801ea74 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
@@ -25,7 +25,7 @@
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
'
}
},
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'type' => 'block_line_arg'
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
index 0441b14795..928819a065 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
@@ -31,7 +31,7 @@
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
'cmdname' => 'comment'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'type' => 'block_line_arg'
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
index 51c971c6f8..b923e27c74 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
@@ -25,7 +25,7 @@
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
'
}
},
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'type' => 'block_line_arg'
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
index d99d002f9b..4b915fc655 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
@@ -36,7 +36,7 @@
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
'text' => ' '
}
},
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'type' => 'block_line_arg'
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
index dd55781b1b..62e812681c 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
@@ -30,7 +30,7 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
'text' => ' '
}
},
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'type' => 'block_line_arg'
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
index b298315c3b..0c85d32569 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
@@ -34,7 +34,7 @@
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
'cmdname' => 'c'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'type' => 'block_line_arg'
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
index 6e1ee7e354..de2cb6c9f0 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
@@ -34,7 +34,7 @@
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
'cmdname' => 'c'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'type' => 'block_line_arg'
diff --git a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
index f38610dd4c..286ed01b9b 100644
--- a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
+++ b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
{
'contents' => [
{
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
'text' => 'a'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/multitable_figure_space.pl
b/tp/t/results/multitable/multitable_figure_space.pl
index 273bdcec68..55205c727c 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable_figure_space'} = {
'text' => '999999999'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'multitable_figure_space'} = {
'text' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/multitable_in_example.pl
b/tp/t/results/multitable/multitable_in_example.pl
index 5d2082a99a..14b022ec8b 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_in_example'} = {
'text' => 'AAA'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -44,7 +44,7 @@ $result_trees{'multitable_in_example'} = {
'text' => 'BBB'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/multitable_not_closed.pl
b/tp/t/results/multitable/multitable_not_closed.pl
index 0b1aee3e22..b2d80cf17b 100644
--- a/tp/t/results/multitable/multitable_not_closed.pl
+++ b/tp/t/results/multitable/multitable_not_closed.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable_not_closed'} = {
'text' => 'r'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'multitable_not_closed'} = {
'text' => 't'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/multitable_not_closed_item.pl
b/tp/t/results/multitable/multitable_not_closed_item.pl
index abb01a4961..b3ec5b613f 100644
--- a/tp/t/results/multitable/multitable_not_closed_item.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable_not_closed_item'} = {
'text' => 'r'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'multitable_not_closed_item'} = {
'text' => 't'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/multitable_not_closed_item_tab.pl
b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
index 2b8428575d..fae2b11e2c 100644
--- a/tp/t/results/multitable/multitable_not_closed_item_tab.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
'text' => 'r'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
'text' => 't'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
index 627ce144cf..00daf2be76 100644
--- a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
'text' => 'a'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl
b/tp/t/results/multitable/paragraph_in_cells.pl
index 296b4589dd..4125d1de84 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -19,7 +19,7 @@ $result_trees{'paragraph_in_cells'} = {
'text' => 'AAA'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'paragraph_in_cells'} = {
'text' => 'BBB'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index 7eac873cc6..dd02a643b8 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -19,7 +19,7 @@ $result_trees{'prototype_brace_no_brace'} = {
'text' => 'aa'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' bb'
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 617a758096..72afff788b 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -19,7 +19,7 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
'text' => 'aa'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' bb'
diff --git a/tp/t/results/multitable/w_in_multitable.pl
b/tp/t/results/multitable/w_in_multitable.pl
index f9be54627e..b732f70ac1 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -19,7 +19,7 @@ $result_trees{'w_in_multitable'} = {
'text' => 'aaaaaaaaa'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'w_in_multitable'} = {
'text' => 'bbbbbbbbbbb'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/plaintext_tests/multitable.pl
b/tp/t/results/plaintext_tests/multitable.pl
index 5d551812be..bd4656f466 100644
--- a/tp/t/results/plaintext_tests/multitable.pl
+++ b/tp/t/results/plaintext_tests/multitable.pl
@@ -19,7 +19,7 @@ $result_trees{'multitable'} = {
'text' => 'truc'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -30,7 +30,7 @@ $result_trees{'multitable'} = {
'text' => 'bidule'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -229,7 +229,7 @@ $result_trees{'multitable'} = {
'text' => 't'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -240,7 +240,7 @@ $result_trees{'multitable'} = {
'text' => 'b'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -1152,7 +1152,7 @@ $result_trees{'multitable'} = {
'text' => 'AA'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -1163,7 +1163,7 @@ $result_trees{'multitable'} = {
'text' => 'BB'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -1421,7 +1421,7 @@ $result_trees{'multitable'} = {
'text' => 'A'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -1574,7 +1574,7 @@ $result_trees{'multitable'} = {
'text' => 'A'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -1585,7 +1585,7 @@ $result_trees{'multitable'} = {
'text' => 'B'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
index 53b2edfee8..73c15a5c29 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
@@ -33,7 +33,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
'text' => 'a'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl
b/tp/t/results/plaintext_tests/nested_multitable.pl
index feb4bfdff1..38b6afac94 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -30,7 +30,7 @@ $result_trees{'nested_multitable'} = {
'text' => ' machin'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -41,7 +41,7 @@ $result_trees{'nested_multitable'} = {
'text' => 'bidule'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
@@ -77,7 +77,7 @@ $result_trees{'nested_multitable'} = {
'text' => 'AAAA'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -88,7 +88,7 @@ $result_trees{'nested_multitable'} = {
'text' => 'machin'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 04195e947e..544b2be412 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -868,7 +868,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => 'aa b'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -884,7 +884,7 @@ $result_trees{'commands_and_spaces'} = {
'text' => ' '
}
},
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
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 df89aa505d..fe14ec4e80 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
@@ -1699,7 +1699,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'aaa'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
@@ -1710,7 +1710,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'text' => 'bbb'
}
],
- 'type' => 'bracketed'
+ 'type' => 'bracketed_arg'
}
],
'info' => {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _split_def_args) (_end_line_starting_block, _handle_close_brace), tp/Texinfo/XS/parsetexi/close.c (close_current), tp/Texinfo/XS/parsetexi/def.c (split_def_args), tp/Texinfo/XS/parsetexi/end [...],
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Translations.pm (complete_indices) (_non_bracketed_contents): fix _non_bracketed_contents by using 'bracketed_arg' as the type, to match with the type on @def* lines. But do not call _non_bracketed_contents as it is not clear that it is better to avoid the 'bracketed_arg' type.
- Next by Date:
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm (_convert_balanced_braces_type), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _handle_open_brace) (_ [...]
- Previous by thread:
branch master updated: * tp/Texinfo/Translations.pm (complete_indices) (_non_bracketed_contents): fix _non_bracketed_contents by using 'bracketed_arg' as the type, to match with the type on @def* lines. But do not call _non_bracketed_contents as it is not clear that it is better to avoid the 'bracketed_arg' type.
- Next by thread:
branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm (_convert_balanced_braces_type), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/NodeNameNormalization.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_close_current, _handle_open_brace) (_ [...]
- Index(es):