branch master updated: * 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.

[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 2aa4e17d56 * 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.
2aa4e17d56 is described below

commit 2aa4e17d562f01d34a9ae47e5259fe6bfb8a8361
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 12 22:30:25 2022 +0100

    * 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.
---
 ChangeLog                           | 6 ++++++
 tp/Texinfo/Convert/TexinfoMarkup.pm | 8 +++++---
 tp/t/results/raw/nested_macros.pl   | 6 ++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f49e22784b..b13b6d2eaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@
        for iconv in loop.  Crash for "info groff" reported by Jakub Wilk
        via Hilmar Preuße <hille42@web.de>.
 
+2022-12-12  Patrice Dumas  <pertusus@free.fr>
+
+       * 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.
+
 2022-12-12  Patrice Dumas  <pertusus@free.fr>
 
        * tp/t/converters_tests.t: in form_feeds test, add more form feeds for
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 6a97306602..137a454ff1 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1524,12 +1524,14 @@ sub _convert($$;$)
               $result .= "\n" unless ($result =~ /\n/);
             }
           }
-        } else {
-          # happens for @def* as @def* line args are in
-          # the first def contents, the def_line type.
+        # @def* line args are in the first def contents, the def_line type
+        # and processed below.
+        } elsif (not
+           exists($Texinfo::Commands::def_commands{$element->{'cmdname'}})) {
           # happens for bogus empty @macro immediately followed by
           # newline.
           #print STDERR "no args: $element->{'cmdname'}\n";
+          $result .= "\n";
         }
         unshift @close_format_elements, $element->{'cmdname'};
       }
diff --git a/tp/t/results/raw/nested_macros.pl 
b/tp/t/results/raw/nested_macros.pl
index e4e39220f5..ed09ec1d70 100644
--- a/tp/t/results/raw/nested_macros.pl
+++ b/tp/t/results/raw/nested_macros.pl
@@ -181,9 +181,11 @@ $result_converted{'plaintext'}->{'nested_macros'} = '';
 
 $result_converted{'xml'}->{'nested_macros'} = '<macro name="truc" line=" truc  
 { arg,  ex}" endspaces=" "><formalarg>arg</formalarg><formalarg>ex</formalarg>
 in macro \\arg\\
-<macro line=" othermacro " endspaces=" ">other macro
+<macro line=" othermacro " endspaces=" ">
+other macro
+</macro>
+<macro endspaces=" ">
 </macro>
-<macro endspaces=" "></macro>
 </macro>
 ';