branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add multitable space after argument.

[Patrice Dumas]

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 4c4729d731 * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add 
multitable space after argument.
4c4729d731 is described below

commit 4c4729d731ec0ee98af8a508aecf7a795f836312
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 11 20:23:16 2022 +0100

    * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add multitable
    space after argument.
---
 ChangeLog                                                   | 5 +++++
 tp/Texinfo/Convert/TexinfoMarkup.pm                         | 5 ++++-
 tp/t/results/invalid_nestings/section_on_multitable_line.pl | 4 ++--
 tp/t/results/xml_tests/commands_and_spaces.pl               | 2 +-
 tp/t/results/xml_tests/comments_on_block_command_lines.pl   | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a436f3ea8f..9e03f73e25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-12-11  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add multitable
+       space after argument.
+
 2022-12-11  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/XS/xspara.c (xspara_add_text) <space>,
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 3bfdae6694..13120933d6 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1481,7 +1481,10 @@ sub _convert($$;$)
                   $first_proto = 0;
                 }
                 $result .= $self->txi_markup_close_element('columnprototypes');
-                $result .= $self->format_comment_or_return_end_line($element);
+                my $end_space
+                  = _end_line_spaces($self, $element);
+                $result .= $end_space
+                          .$self->format_comment_or_return_end_line($element);
               } elsif ($element->{'args'} and $element->{'args'}->[0]
                        and $element->{'args'}->[0]->{'contents'}
                        and (($element->{'extra'}
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 a46a17eace..7266d3c0f3 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -414,11 +414,11 @@ $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>
+<multitable spaces=" 
"><columnprototypes><columnprototype><code>this</code></columnprototype></columnprototypes>
 </multitable>
 </section>
 <section spaces=" "><sectiontitle>second</sectiontitle>
 
-<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">aaa</columnprototype> <columnprototype 
bracketed="on">bbb</columnprototype></columnprototypes></multitable>
+<multitable spaces=" "><columnprototypes><columnprototype 
bracketed="on">aaa</columnprototype> <columnprototype 
bracketed="on">bbb</columnprototype></columnprototypes> </multitable>
 </section>
 <section spaces=" "><sectiontitle>third</sectiontitle>
 </section>
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 6e923f56c6..f9a7f84b8c 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1891,7 +1891,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>  
<columnprototype><var>cmd</var></columnprototype><columnprototype>gg</columnprototype>
 <columnprototype>hh</columnprototype> 
<columnprototype>j</columnprototype></columnprototypes> 
 </multitable>
 
 <verbatim xml:space="preserve" endspaces=" ">  
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 f604da6a78..1c343895b6 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
@@ -2320,7 +2320,7 @@ 
$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize comman
 <tbody><row><entry command="item"> <para>a </para></entry><entry 
command="tab"> <para>b
 </para></entry></row></tbody></multitable>
 
-<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">aaa</columnprototype> <columnprototype 
bracketed="on">bbb</columnprototype></columnprototypes><!-- c c -->
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype 
bracketed="on">aaa</columnprototype> <columnprototype 
bracketed="on">bbb</columnprototype></columnprototypes> <!-- c c -->
 <tbody><row><entry command="item"> <para>aaa </para></entry><entry 
command="tab"> <para>bbb
 </para></entry></row></tbody></multitable>