branch master updated: * tp/Texinfo/Convert/TexinfoXML.pm (_leading_trailing_spaces_arg): avoid code duplication.

[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 926d61d  * tp/Texinfo/Convert/TexinfoXML.pm 
(_leading_trailing_spaces_arg): avoid code duplication.
926d61d is described below

commit 926d61dbffe0264e070a94e17b81ffacd89ca72d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Sep 11 11:31:09 2021 +0200

    * tp/Texinfo/Convert/TexinfoXML.pm (_leading_trailing_spaces_arg):
    avoid code duplication.
---
 ChangeLog                        |  5 +++++
 tp/Texinfo/Convert/TexinfoXML.pm | 16 +++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6bf9807..82214b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2021-09-11  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Convert/TexinfoXML.pm (_leading_trailing_spaces_arg):
+       avoid code duplication.
+
+2021-09-11  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Convert/Converter.pm (_end_line_or_comment),
        tp/Texinfo/Convert/TexinfoXML.pm (_texinfo_line, _convert):
        check if 'args' exist in function and not in _convert().
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index fa74598..e16e8fe 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -590,7 +590,7 @@ sub _leading_spaces_before_argument($)
   }
 }
 
-# return spaces only, as end of line is already returned by other functions
+# return spaces only, end of line is gathered by calling _end_line_or_comment
 sub _end_line_spaces
 {
   my $element = shift;
@@ -639,16 +639,8 @@ sub _leading_trailing_spaces_arg($$)
   my $self = shift;
   my $element = shift;
 
-  my @result;
-  @result = _leading_spaces_before_argument($element);
-
-  my @spaces = $self->_collect_leading_trailing_spaces_arg($element);
-  if (defined($spaces[1])) {
-    chomp($spaces[1]);
-    if ($spaces[1] ne '') {
-      push @result, ('trailingspaces', _protect_in_spaces($spaces[1]));
-    }
-  }
+  my @result = _leading_spaces_before_argument($element);
+  push @result, $self->_trailing_spaces_arg($element);
   return @result;
 }
 
@@ -914,8 +906,6 @@ sub _convert($$;$)
               $pending_empty_directions = '';
             } else {
               if ($element->{'args'}->[$direction_index]) {
-                my $spaces_attribute = $self->_leading_trailing_spaces_arg(
-                                 $element->{'args'}->[$direction_index]);
                 $pending_empty_directions .= 
$self->open_element($format_element,
                     [$self->_leading_trailing_spaces_arg(
                                  $element->{'args'}->[$direction_index])])