branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert_argument_and_end_line): use $self->format_comment_or_return_end_line() to better collect comments.

[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 93149f5  * tp/Texinfo/Convert/DocBook.pm 
(_convert_argument_and_end_line): use 
$self->format_comment_or_return_end_line() to better collect comments.
93149f5 is described below

commit 93149f5dd0616c3fd9a183f99aab8e82c3930168
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Sep 11 17:55:30 2021 +0200

    * tp/Texinfo/Convert/DocBook.pm (_convert_argument_and_end_line):
    use $self->format_comment_or_return_end_line() to better collect
    comments.
---
 ChangeLog                                          |  6 ++++
 tp/Texinfo/Convert/DocBook.pm                      | 42 +++++++++-------------
 .../misc_commands/comment_space_command_on_line.pl |  6 ++--
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index acf04dd..d82ef17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-09-11  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/DocBook.pm (_convert_argument_and_end_line):
+       use $self->format_comment_or_return_end_line() to better collect
+       comments.
+
+2021-09-11  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Convert/HTML.pm (html_attribute_class)
        (from_element_direction, _noticed_line_warn),
        tp/init/book.pm, tp/init/highlight_syntax.pm,
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 3dff03a..08e466b 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -210,7 +210,7 @@ my %def_argument_types_docbook = (
 
 my %ignored_types;
 foreach my $type (
-           'empty_line_after_command',
+            'empty_line_after_command',
             'empty_spaces_after_close_brace', 
             'empty_spaces_after_command', 
             'empty_spaces_before_argument',
@@ -388,6 +388,7 @@ foreach my $special_unnumbered ('acknowledgements', 
'colophon',
   $docbook_special_unnumbered{$special_unnumbered} = 1;
 }
 
+# element is not texinfo tree element here, but xml element
 sub _docbook_section_element($$)
 {
   my $self = shift;
@@ -506,18 +507,7 @@ sub _convert_argument_and_end_line($$)
   my $element = shift;
 
   my $converted = $self->convert_tree($element->{'args'}->[-1]);
-
-  my $end_line = '';
-
-  if ($element->{'extra'} and $element->{'extra'}->{'comment_at_end'}) {
-    $end_line = $self->convert_tree($element->{'extra'}->{'comment_at_end'});
-  } else {
-    if (chomp($converted)) {
-      $end_line = "\n";
-    } else {
-      $end_line = "";
-    }
-  }
+  my $end_line = $self->format_comment_or_return_end_line($element);
   return ($converted, $end_line);
 }
 
@@ -660,9 +650,9 @@ sub _convert($$;$)
         $self->set_informative_command_value($element);
         return '';
       }
-      my $command;
+      my $docbook_element;
       if (exists ($docbook_misc_elements_with_arg_map{$element->{'cmdname'}})) 
{
-        $command = $docbook_misc_elements_with_arg_map{$element->{'cmdname'}};
+        $docbook_element = 
$docbook_misc_elements_with_arg_map{$element->{'cmdname'}};
       }
       my $type = $docbook_misc_commands{$element->{'cmdname'}};
       if ($type eq 'text') {
@@ -697,8 +687,8 @@ sub _convert($$;$)
             # section title, so only the letter is used.
             $label = $element->{'number'};
           }
-          $command = $self->_docbook_section_element($element);
-          if (! $docbook_special_unnumbered{$command}) {
+          my $docbook_sectioning_element = 
$self->_docbook_section_element($element);
+          if (! $docbook_special_unnumbered{$docbook_sectioning_element}) {
             $attribute = " label=\"$label\"";
           }
           if ($element->{'extra'} and 
$element->{'extra'}->{'associated_node'}) {
@@ -712,14 +702,15 @@ sub _convert($$;$)
             }
           }
           push @{$self->{'lang_stack'}}, $language;
-          $result .= "<$command${attribute}>\n";
+          $result .= "<$docbook_sectioning_element${attribute}>\n";
           if ($element->{'args'} and $element->{'args'}->[0]) {
             my ($arg, $end_line) = 
$self->_convert_argument_and_end_line($element);
             $result .= "<title>$arg</title>$end_line";
             chomp ($result);
             $result .= "\n";
           }
-          if ($command eq 'part' and 
!Texinfo::Common::is_content_empty($element)) {
+          if ($docbook_sectioning_element eq 'part'
+              and !Texinfo::Common::is_content_empty($element)) {
             $result .= "<partintro>\n";
           }
         } elsif ($Texinfo::Common::sectioning_commands{$element->{'cmdname'}}) 
{
@@ -734,13 +725,13 @@ sub _convert($$;$)
           return '';
         } else {
           my $attribute = '';
-          if (defined($command)) {
+          if (defined($docbook_element)) {
             my ($arg, $end_line)
               = $self->_convert_argument_and_end_line($element);
-            if ($command eq '') {
+            if ($docbook_element eq '') {
               $result .= "$arg$end_line";
             } else {
-              $result .= "<$command${attribute}>$arg</$command>$end_line";
+              $result .= 
"<$docbook_element${attribute}>$arg</$docbook_element>$end_line";
             }
             chomp ($result);
             $result .= "\n";
@@ -1478,15 +1469,16 @@ sub _convert($$;$)
     if ($element->{'type'} and $element->{'type'} eq 'unit') {
       $element = $element->{'extra'}->{'unit_command'};
     }
-    my $command = $self->_docbook_section_element($element);
-    if ($command eq 'part' and !Texinfo::Common::is_content_empty($element)) {
+    my $docbook_sectioning_element = $self->_docbook_section_element($element);
+    if ($docbook_sectioning_element eq 'part'
+        and !Texinfo::Common::is_content_empty($element)) {
       $result .= "</partintro>\n";
     }
     my $level_adjusted_cmdname
         = Texinfo::Structuring::section_level_adjusted_command_name($element);
     if (!($element->{'section_childs'} and 
scalar(@{$element->{'section_childs'}}))
         or $level_adjusted_cmdname eq 'top') {
-      $result .= "</$command>\n";
+      $result .= "</$docbook_sectioning_element>\n";
       pop @{$self->{'lang_stack'}};
       my $current = $element;
       while ($current->{'section_up'}
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index e88e139..fc161d1 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -874,15 +874,15 @@ 
$result_converted{'html_text'}->{'comment_space_command_on_line'} = '
 ';
 
 
-$result_converted{'docbook'}->{'comment_space_command_on_line'} = 
'<title>Settitle &#160;</title>
+$result_converted{'docbook'}->{'comment_space_command_on_line'} = 
'<title>Settitle &#160;</title><!-- settittle -->
 
 <chapter label="" id="Top">
-<title>top element&#160;</title>
+<title>top element&#160;</title><!-- @top -->
 
 
 <indexterm role="cp"><primary>index entry &#160;</primary></indexterm><!-- 
index entry -->
 
-<bridgehead renderas="sect1">Heading &#160;</bridgehead>
+<bridgehead renderas="sect1">Heading &#160;</bridgehead><!-- heading -->
 
 <index role="cp"></index>