[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): use directly the multitable line argument and the bracketed on that line to determine the prototype, instead of extra prototypes. |
|
Date: |
Tue, 07 Mar 2023 06:55:55 -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 e783edda25 * tp/Texinfo/Convert/DocBook.pm (_convert),
tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm
(_convert), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): use directly the
multitable line argument and the bracketed on that line to determine the
prototype, instead of extra prototypes.
e783edda25 is described below
commit e783edda252cf82317f95540c2a5aae291c74cce
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Mar 7 12:55:42 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): use directly the
multitable line argument and the bracketed on that line to determine
the prototype, instead of extra prototypes.
* tp/t/plaintext_tests.t, tp/Makefile.tres: use braces on @multitable
line for multitable_in_example_extraneous_tab, and add
multitable_in_example_extraneous_item_tab without braces.
---
ChangeLog | 13 +++
tp/Makefile.tres | 1 +
tp/Texinfo/Convert/DocBook.pm | 27 ++++--
tp/Texinfo/Convert/LaTeX.pm | 24 +++--
tp/Texinfo/Convert/Plaintext.pm | 29 ++++--
tp/Texinfo/Convert/TexinfoMarkup.pm | 101 ++++++---------------
tp/t/plaintext_tests.t | 8 ++
.../invalid_nestings/section_on_multitable_line.pl | 2 +-
.../results/multitable/not_letters_in_prototype.pl | 4 +-
.../results/multitable/prototype_brace_no_brace.pl | 2 +-
.../multitable/prototype_brace_no_brace_comment.pl | 2 +-
tp/t/results/multitable/prototype_no_brace.pl | 2 +-
...> multitable_in_example_extraneous_item_tab.pl} | 12 +--
.../multitable_in_example_extraneous_tab.pl | 16 +++-
tp/t/results/xml_tests/commands_and_spaces.pl | 2 +-
15 files changed, 126 insertions(+), 119 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5b432c5f6f..c1ec886fde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2023-03-07 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): use directly the
+ multitable line argument and the bracketed on that line to determine
+ the prototype, instead of extra prototypes.
+
+ * tp/t/plaintext_tests.t, tp/Makefile.tres: use braces on @multitable
+ line for multitable_in_example_extraneous_tab, and add
+ multitable_in_example_extraneous_item_tab without braces.
+
2023-03-07 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Common.pm (_copy_tree, _substitute_references): handle
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index c9476c7a1d..533187e347 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1533,6 +1533,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/plaintext_tests/multiline_image_and_align.pl \
t/results/plaintext_tests/multiline_verb_after_space.pl \
t/results/plaintext_tests/multitable.pl \
+ t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl \
t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl \
t/results/plaintext_tests/nested_code_commands.pl \
t/results/plaintext_tests/nested_indentedblock.pl \
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index d31c7e5a84..59e0b0153b 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1502,18 +1502,25 @@ sub _convert($$;$)
if ($element->{'extra'}) {
my @fractions;
my $multiply;
- if ($element->{'extra'}->{'prototypes'}) {
- $multiply = 1;
- foreach my $prototype (@{$element->{'extra'}->{'prototypes'}}) {
- my $prototype_text
- = Texinfo::Convert::Text::convert_to_text($prototype,
-
{Texinfo::Convert::Text::copy_options_for_convert_text($self, 1)});
- push @fractions,
- Texinfo::Convert::Unicode::string_width($prototype_text);
- }
- } elsif ($element->{'extra'}->{'columnfractions'}) {
+ if ($element->{'extra'}->{'columnfractions'}) {
@fractions =
@{$element->{'extra'}->{'columnfractions'}->{'extra'}->{'misc_args'}};
$multiply = 100;
+ } elsif ($element->{'args'} and scalar(@{$element->{'args'}})
+ and $element->{'args'}->[0]->{'contents'}) {
+ $multiply = 1;
+ foreach my $content (@{$element->{'args'}->[0]->{'contents'}}) {
+ if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
+ my $prototype_text = '';
+ if ($content->{'contents'}) {
+ $prototype_text
+ = Texinfo::Convert::Text::convert_to_text(
+ {'contents' => $content->{'contents'}},
+ {Texinfo::Convert::Text::copy_options_for_convert_text($self, 1)});
+ }
+ push @fractions,
+ Texinfo::Convert::Unicode::string_width($prototype_text);
+ }
+ }
}
foreach my $fraction (@fractions) {
$appended .= '<colspec colwidth="'.($fraction*$multiply)
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index e32987b4bb..ae83593001 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3632,18 +3632,24 @@ sub _convert($$)
if ($element->{'extra'}->{'columnfractions'}) {
@fractions
= @{$element->{'extra'}->{'columnfractions'}->{'extra'}->{'misc_args'}};
- } elsif ($element->{'extra'}->{'prototypes'}) {
+ } elsif ($element->{'args'} and scalar(@{$element->{'args'}})
+ and $element->{'args'}->[0]->{'contents'}) {
my @prototypes_length;
my $total_length = 0.;
- foreach my $prototype (@{$element->{'extra'}->{'prototypes'}}) {
- # not clear what to do here. For now use the text width
- my $prototype_text
- = Texinfo::Convert::Text::convert_to_text($prototype,
- $self->{'convert_text_options'});
- my $length
+ foreach my $content (@{$element->{'args'}->[0]->{'contents'}}) {
+ if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
+ my $prototype_text = '';
+ if ($content->{'contents'}) {
+ $prototype_text
+ = Texinfo::Convert::Text::convert_to_text(
+ {'contents' => $content->{'contents'}},
+ $self->{'convert_text_options'});
+ }
+ my $length
= Texinfo::Convert::Unicode::string_width($prototype_text);
- $total_length += $length;
- push @prototypes_length, $length;
+ $total_length += $length;
+ push @prototypes_length, $length;
+ }
}
if ($total_length > 0.) {
foreach my $length (@prototypes_length) {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index ef0e179f35..f4a7fe5fea 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2645,7 +2645,7 @@ sub _convert($$)
} elsif ($menu_commands{$command}) {
$result .= $self->_menu($element);
} elsif ($command eq 'multitable') {
- my $columnsize;
+ my $columnsize = [];
if ($element->{'extra'}->{'columnfractions'}) {
foreach my $fraction (@{$element->{'extra'}->{'columnfractions'}
->{'extra'}->{'misc_args'}}) {
@@ -2653,14 +2653,22 @@ sub _convert($$)
int($fraction
* $self->{'text_element_context'}->[-1]->{'max'} +0.5);
}
- } elsif ($element->{'extra'}->{'prototypes'}) {
- foreach my $prototype (@{$element->{'extra'}->{'prototypes'}}) {
- push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
- my ($formatted_prototype) = $self->convert_line($prototype,
+ } 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') {
+ my $column_size = 0;
+ if ($content->{'contents'}) {
+ push @{$self->{'count_context'}}, {'lines' => 0, 'bytes' => 0};
+ my ($formatted_prototype) = $self->convert_line(
+ {'contents' => $content->{'contents'}},
{'indent_length' => 0});
- pop @{$self->{'count_context'}};
- push @$columnsize,
-
2+Texinfo::Convert::Unicode::string_width($formatted_prototype);
+ pop @{$self->{'count_context'}};
+ $column_size
+ =
Texinfo::Convert::Unicode::string_width($formatted_prototype);
+ }
+ push @$columnsize, 2+$column_size;
+ }
}
}
$self->{'format_context'}->[-1]->{'columns_size'} = $columnsize;
@@ -2792,7 +2800,9 @@ sub _convert($$)
->[$element->{'extra'}->{'cell_number'}-1];
$self->{'format_context'}->[-1]->{'item_command'} = $command
if ($command ne 'tab');
- die if (!defined($cell_width));
+ #die if (!defined($cell_width));
+ # happens with bogus multitables
+ $cell_width = 2 if (!defined ($cell_width));
$self->{'empty_lines_count'}
= $self->{'format_context'}->[-1]->{'row_empty_lines_count'};
@@ -3428,6 +3438,7 @@ sub _convert($$)
$cell_beginnings[$cell_idx] = $cell_beginning;
my $cell_width
= $self->{'format_context'}->[-1]->{'columns_size'}->[$cell_idx];
+ $cell_width = 2 if (!defined($cell_width));
$cell_beginning += $cell_width +1;
$cell_lines[$cell_idx] = [ split /^/, $cell ];
$max_lines = scalar(@{$cell_lines[$cell_idx]})
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 8aeba3afea..d2918d547e 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1395,80 +1395,7 @@ 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 ($element->{'extra'}->{'prototypes'}) {
- # Like 'prototypes' extra value, but keeping spaces information
- if (defined $element->{'args'}->[0]
- and defined $element->{'args'}->[0]->{'type'}
- and $element->{'args'}->[0]->{'type'} eq 'block_line_arg'
- and $element->{'args'}->[0]->{'contents'}) {
- foreach my $content
(@{$element->{'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' };
- }
- }
- # $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
- # here will be in info 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;
- }
- }
- }
- }
-
- if (scalar(@prototype_line) > 0) {
- $result .= $self->txi_markup_open_element('columnprototypes');
- my $first_proto = 1;
- foreach my $prototype (@prototype_line) {
- if ($prototype->{'text'} and $prototype->{'text'} !~ /\S/) {
- if (!$first_proto) {
- my $spaces = $prototype->{'text'};
- chomp($spaces);
- $result .= $spaces;
- }
- } else {
- my $attributes = [];
- if ($prototype->{'type'}
- and $prototype->{'type'} eq 'bracketed') {
- push @$attributes, ['bracketed', 'on'];
- push @$attributes,
- _leading_spaces_arg($prototype);
- }
- $result .=
$self->txi_markup_open_element('columnprototype',
- $attributes)
- .$self->_convert($prototype)
- .$self->txi_markup_close_element('columnprototype');
- }
- $first_proto = 0;
- }
- $result .= $self->txi_markup_close_element('columnprototypes');
- my $end_space
- = _end_line_spaces($self, $element);
- $result .= $end_space
- .$self->format_comment_or_return_end_line($element);
- # happens for multitable line with prototypes interrupted
- # by another @-command
- $result .= "\n" unless ($result =~ /\n/);
- } elsif ($element->{'args'} and $element->{'args'}->[0]
+ if ($element->{'args'} and $element->{'args'}->[0]
and $element->{'args'}->[0]->{'contents'}
and (($element->{'extra'}
and $element->{'extra'}->{'columnfractions'})
@@ -1488,6 +1415,32 @@ sub _convert($$;$)
}
$result
.= _format_columnfractions($self, $columnfractions_element);
+ } elsif ($element->{'args'} and scalar(@{$element->{'args'}})
+ and $element->{'args'}->[0]->{'contents'}) {
+ $result .= $self->txi_markup_open_element('columnprototypes');
+ foreach my $arg (@{$element->{'args'}->[0]->{'contents'}}) {
+ if ($arg->{'type'}
+ and $arg->{'type'} eq 'bracketed') {
+ my $attributes = [];
+ push @$attributes, ['bracketed', 'on'];
+ push @$attributes,
+ _leading_spaces_arg($arg);
+ $result .=
$self->txi_markup_open_element('columnprototype',
+ $attributes)
+ .$self->_convert($arg)
+ .$self->txi_markup_close_element('columnprototype');
+ } else {
+ $result .= $self->_convert($arg);
+ }
+ }
+ $result .= $self->txi_markup_close_element('columnprototypes');
+ my $end_space
+ = _end_line_spaces($self, $element);
+ $result .= $end_space
+ .$self->format_comment_or_return_end_line($element);
+ # happens for multitable line with prototypes interrupted
+ # by another @-command
+ $result .= "\n" unless ($result =~ /\n/);
} else { # bogus multitable
$result .= "\n";
}
diff --git a/tp/t/plaintext_tests.t b/tp/t/plaintext_tests.t
index ba2aebe527..ff8010cb95 100644
--- a/tp/t/plaintext_tests.t
+++ b/tp/t/plaintext_tests.t
@@ -554,6 +554,14 @@ bb*}.
'],
['multitable_in_example_extraneous_tab',
'@example
+@multitable {a}
+@item ita @tab tmp
+@item secit @tab
+@end multitable
+@end example
+'],
+['multitable_in_example_extraneous_item_tab',
+'@example
@multitable a
@item ita @tab tmp
@item secit @tab
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 e38e640092..24f0f6b163 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -436,7 +436,7 @@ $result_converted{'xml'}->{'section_on_multitable_line'} =
'<multitable spaces="
</multitable>
<section spaces=" "><sectiontitle>first</sectiontitle>
-<multitable spaces="
"><columnprototypes><columnprototype><code>this</code></columnprototype></columnprototypes>
+<multitable spaces=" "><columnprototypes><code>this</code></columnprototypes>
</multitable>
</section>
<section spaces=" "><sectiontitle>second</sectiontitle>
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl
b/tp/t/results/multitable/not_letters_in_prototype.pl
index 09854daf53..eee356d080 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -172,7 +172,7 @@ $result_floats{'not_letters_in_prototype'} = {};
-$result_converted{'plaintext'}->{'not_letters_in_prototype'} = '1.3 5-6
+$result_converted{'plaintext'}->{'not_letters_in_prototype'} = '1.35-6
';
@@ -183,7 +183,7 @@
$result_converted{'html_text'}->{'not_letters_in_prototype'} = '<table class="mu
';
-$result_converted{'xml'}->{'not_letters_in_prototype'} = '<multitable spaces="
" endspaces=" "><columnprototypes><columnprototype>1.3</columnprototype>
<columnprototype>5-6</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'not_letters_in_prototype'} = '<multitable spaces="
" endspaces=" "><columnprototypes>1.3 5-6</columnprototypes>
<tbody><row><entry command="item"> <para>1.3 </para></entry><entry
command="tab"> <para>5-6
</para></entry></row></tbody></multitable>
';
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index 95b408aede..5b1815df43 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -123,7 +123,7 @@
$result_converted{'plaintext'}->{'prototype_brace_no_brace'} = '';
$result_converted{'html_text'}->{'prototype_brace_no_brace'} = '';
-$result_converted{'xml'}->{'prototype_brace_no_brace'} = '<multitable spaces="
" endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa</columnprototype>
<columnprototype>bb</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'prototype_brace_no_brace'} = '<multitable spaces="
" endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa</columnprototype> bb</columnprototypes>
</multitable>
';
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 9c13a23f01..3b00603b70 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -129,7 +129,7 @@
$result_converted{'plaintext'}->{'prototype_brace_no_brace_comment'} = '';
$result_converted{'html_text'}->{'prototype_brace_no_brace_comment'} = '';
-$result_converted{'xml'}->{'prototype_brace_no_brace_comment'} = '<multitable
spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa</columnprototype>
<columnprototype>bb</columnprototype></columnprototypes><!-- comment cc -->
+$result_converted{'xml'}->{'prototype_brace_no_brace_comment'} = '<multitable
spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa</columnprototype> bb</columnprototypes><!-- comment cc -->
</multitable>
';
diff --git a/tp/t/results/multitable/prototype_no_brace.pl
b/tp/t/results/multitable/prototype_no_brace.pl
index 8370e05fb7..a061c7119e 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -147,7 +147,7 @@ $result_converted{'plaintext'}->{'prototype_no_brace'} = '';
$result_converted{'html_text'}->{'prototype_no_brace'} = '';
-$result_converted{'xml'}->{'prototype_no_brace'} = '<multitable spaces=" "
endspaces="
"><columnprototypes><columnprototype>aa</columnprototype><columnprototype><var>FF</var></columnprototype>
<columnprototype>b</columnprototype>
<columnprototype>cc</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'prototype_no_brace'} = '<multitable spaces=" "
endspaces=" "><columnprototypes>aa<var>FF</var> b cc</columnprototypes>
</multitable>
';
diff --git
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
similarity index 95%
copy from tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
copy to
tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
index cd18e06308..e0e76394e6 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
@@ -5,7 +5,7 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'multitable_in_example_extraneous_tab'} = {
+$result_trees{'multitable_in_example_extraneous_item_tab'} = {
'contents' => [
{
'contents' => [
@@ -235,7 +235,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
'type' => 'document_root'
};
-$result_texis{'multitable_in_example_extraneous_tab'} = '@example
+$result_texis{'multitable_in_example_extraneous_item_tab'} = '@example
@multitable a
@item ita tmp
@item secit
@@ -244,10 +244,10 @@ $result_texis{'multitable_in_example_extraneous_tab'} =
'@example
';
-$result_texts{'multitable_in_example_extraneous_tab'} = 'ita tmp
+$result_texts{'multitable_in_example_extraneous_item_tab'} = 'ita tmp
secit ';
-$result_errors{'multitable_in_example_extraneous_tab'} = [
+$result_errors{'multitable_in_example_extraneous_item_tab'} = [
{
'error_line' => 'too many columns in multitable item (max 1)
',
@@ -269,11 +269,11 @@ $result_errors{'multitable_in_example_extraneous_tab'} = [
];
-$result_floats{'multitable_in_example_extraneous_tab'} = {};
+$result_floats{'multitable_in_example_extraneous_item_tab'} = {};
-$result_converted{'plaintext'}->{'multitable_in_example_extraneous_tab'} = '
ita
+$result_converted{'plaintext'}->{'multitable_in_example_extraneous_item_tab'}
= ' ita
tmp
secit
';
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 cd18e06308..6722125c42 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
@@ -28,7 +28,12 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
{
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'bracketed'
}
],
'info' => {
@@ -173,8 +178,10 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
'max_columns' => 1,
'prototypes' => [
{
- 'text' => 'a',
- 'type' => 'row_prototype'
+ 'contents' => [
+ {}
+ ],
+ 'type' => 'bracketed_multitable_prototype'
}
]
},
@@ -234,9 +241,10 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
],
'type' => 'document_root'
};
+$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
=
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'multitable_in_example_extraneous_tab'} = '@example
-@multitable a
+@multitable {a}
@item ita tmp
@item secit
@end multitable
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 36118b88e2..444db2c044 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1976,7 +1976,7 @@ $result_converted{'xml'}->{'commands_and_spaces'} = '<set
name="foo" line=" foo
<multitable spaces=" " endspaces=" "><columnfractions spaces=" " line="0.4
0.6 "><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
</multitable>
-<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa b</columnprototype> <columnprototype bracketed="on" spaces="
">r </columnprototype>
<columnprototype><var>cmd</var></columnprototype><columnprototype>gg</columnprototype>
<columnprototype>hh</columnprototype>
<columnprototype>j</columnprototype></columnprototypes>
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa b</columnprototype> <columnprototype bracketed="on" spaces="
">r </columnprototype> <var>cmd</var>gg hh j</columnprototypes>
</multitable>
<verbatim xml:space="preserve" endspaces=" ">
| [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): use directly the multitable line argument and the bracketed on that line to determine the prototype, instead of extra prototypes.,
Patrice Dumas <=