branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add end of line for multitable with prototype interrupted by another @-command.

[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 50af3532d4 * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add end 
of line for multitable with prototype interrupted by another @-command.
50af3532d4 is described below

commit 50af3532d49ba6c3f53f2208cd0301f5ad1cbeea
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 12 22:42:51 2022 +0100

    * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add end of line
    for multitable with prototype interrupted by another @-command.
---
 ChangeLog                                                   | 7 ++++++-
 tp/Texinfo/Convert/TexinfoMarkup.pm                         | 3 +++
 tp/t/results/invalid_nestings/section_on_multitable_line.pl | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b13b6d2eaa..c9beaab0e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-12-12  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add end of line
+       for multitable with prototype interrupted by another @-command.
+
 2022-12-12  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * info/util.c (text_buffer_iconv): Correctly update arguments
@@ -8,7 +13,7 @@
 
        * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add end of line
        for block commands with missing args key, except for @def*, which have
-       a sêcial processing of their line.
+       a special processing of their line.
 
 2022-12-12  Patrice Dumas  <pertusus@free.fr>
 
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 137a454ff1..271c2c6b6b 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1490,6 +1490,9 @@ sub _convert($$;$)
                   = _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]
                        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 7266d3c0f3..b91f679ca2 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,13 @@ $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>