branch master updated: * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): collect trailing spaces in @def* bracketed content.

[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 2bbc33f929 * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): collect 
trailing spaces in @def* bracketed content.
2bbc33f929 is described below

commit 2bbc33f9295a3c45fc5adc90da4e191581dddf32
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 2 00:52:56 2022 +0200

    * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): collect trailing
    spaces in @def* bracketed content.
    
    * util/txixml2texi.pl: output leading spaces for bracketed container
    and trailing spaces at the right place for the different types of
    commands.
---
 ChangeLog                                                |  9 +++++++++
 tp/Texinfo/Convert/TexinfoMarkup.pm                      |  2 +-
 tp/t/results/converters_tests/form_feeds.pl              |  2 +-
 tp/t/results/coverage/def.pl                             |  2 +-
 tp/t/results/xml_tests/commands_and_spaces.pl            |  2 +-
 tp/tests/layout/res_parser/formatting_xml/formatting.xml |  8 ++++----
 util/txixml2texi.pl                                      | 16 ++++++++++------
 7 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3c7dbf1cb..4f2cabf71e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-10-01  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): collect trailing
+       spaces in @def* bracketed content.
+
+       * util/txixml2texi.pl: output leading spaces for bracketed container
+       and trailing spaces at the right place for the different types of
+       commands.
+
 2022-10-01  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): on block command
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 4479032ac6..f063cb4072 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1477,7 +1477,7 @@ sub _convert($$;$)
                 and ($arg->{'type'} eq 'bracketed_def_content'
                   or ($arg->{'type'} eq 'bracketed_inserted'))) {
               push @$attribute, ['bracketed', 'on'];
-              push @$attribute, _leading_spaces_arg($arg);
+              push @$attribute, _leading_trailing_spaces_arg($arg);
             }
             $result
               .= $self->txi_markup_open_element("def$format_element", 
$attribute)
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 70f9d51924..8d12c5e91b 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -1380,7 +1380,7 @@ $result_converted{'xml'}->{'form_feeds'} = '<node 
name="Top" spaces=" "><nodenam
 
 <para><indicateurl> &formfeed; in indicateurl</indicateurl>
 </para>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="1">machin</indexterm><defcategory bracketed="on" spaces=" 
\\f">truc</defcategory> <deffunction bracketed="on" spaces=" 
">machin</deffunction>  <defparam bracketed="on" spaces=" ">bidule</defparam>  
<defparam bracketed="on" spaces=" \\f ">chose</defparam> <defparam 
bracketed="on" spaces="  ">arg</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="1">machin</indexterm><defcategory bracketed="on" spaces=" \\f" 
trailingspaces=" ">truc</defcategory> <deffunction bracketed="on" spaces=" " 
trailingspaces=" ">machin</deffunction>  <defparam bracketed="on" spaces=" " 
trailingspaces=" ">bidule</defparam>  <defparam bracketed="on" spaces=" \\f " 
trailingspaces=" \\f">chose</defparam> <defparam bracketed="on" spaces="  " 
trailingspaces="\\f ">arg</defparam></defin [...]
 <definitionitem><para>T
 </para></definitionitem></deffn>
 
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 701876c07f..0e3dbbc9f4 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -2492,7 +2492,7 @@ $result_converted{'xml'}->{'def'} = '
 <deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="4">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="5">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="6">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
trailingspaces=" ">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="8"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="9"><b>id 
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory> 
<deffunction><b>id <samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
 <deffnx><definitionterm><indexterm index="fn" 
number="10">machin</indexterm><defcategory bracketed="on"></defcategory> 
<deffunction>machin</deffunction></definitionterm></deffnx>
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 5486987888..5bd87f6636 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -2300,7 +2300,7 @@ in tex
 </para>
 <para><indicateurl> http://ggg </indicateurl>
 </para>
-<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="1">machin</indexterm><defcategory bracketed="on" spaces=" 
">truc</defcategory> <deffunction bracketed="on" spaces=" 
">machin</deffunction>  <defparam bracketed="on" spaces=" ">bidule</defparam>  
<defparam bracketed="on" spaces="  ">chose</defparam> <defparam bracketed="on" 
spaces="  ">arg</defparam></definitionterm>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn" 
number="1">machin</indexterm><defcategory bracketed="on" spaces=" " 
trailingspaces=" ">truc</defcategory> <deffunction bracketed="on" spaces=" " 
trailingspaces=" ">machin</deffunction>  <defparam bracketed="on" spaces=" " 
trailingspaces=" ">bidule</defparam>  <defparam bracketed="on" spaces="  " 
trailingspaces=" ">chose</defparam> <defparam bracketed="on" spaces="  " 
trailingspaces=" ">arg</defparam></definitionterm>
 <definitionitem><para>T
 </para></definitionitem></deffn>
 
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index f9fc94dc41..614bf93919 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -1802,7 +1802,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="6">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="7">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="8">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="9">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
trailingspaces=" ">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="10"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="11"><b>id 
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory> 
<deffunction><b>id <samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory> 
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
@@ -2941,7 +2941,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="58">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="59">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="60">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="61">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="61">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
trailingspaces=" ">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="62"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="63"><b>id 
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory> 
<deffunction><b>id <samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory> 
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
@@ -4107,7 +4107,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="110">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="111">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="112">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="113">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="113">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
trailingspaces=" ">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="114"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="115"><b>id 
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory> 
<deffunction><b>id <samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory> 
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
@@ -5241,7 +5241,7 @@ Less recent versions are also present.
 </pre><deffnx spaces=" "><definitionterm><indexterm index="fn" 
number="162">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="163">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="164">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn" number="165">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn" number="165">log 
trap2</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
trailingspaces=" ">log trap2</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="166"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn" number="167"><b>id 
<samp>i</samp> ule</b></indexterm><defcategory>cmde2</defcategory> 
<deffunction><b>id <samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory> 
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
diff --git a/util/txixml2texi.pl b/util/txixml2texi.pl
index 371b9a0d57..d42733ca48 100755
--- a/util/txixml2texi.pl
+++ b/util/txixml2texi.pl
@@ -434,6 +434,7 @@ while ($reader->read) {
       if (defined($reader->getAttribute('bracketed'))
           and $reader->getAttribute('bracketed') eq 'on') {
         print '{';
+        print "$spaces";
       }
       if (defined($reader->getAttribute('leadingtext'))) {
         print $reader->getAttribute('leadingtext');
@@ -449,9 +450,16 @@ while ($reader->read) {
     if ($Texinfo::Convert::TexinfoMarkup::commands_args_elements{$name}) {
       pop @commands_with_args_stack;
     }
+    my $trailingspaces = '';
+    if ($reader->hasAttributes()
+        and defined($reader->getAttribute('trailingspaces'))) {
+      $trailingspaces = $reader->getAttribute('trailingspaces');
+      $trailingspaces =~ s/\\f/\f/g;
+    }
     if ($reader->hasAttributes()) {
       if (defined($reader->getAttribute('bracketed'))
           and $reader->getAttribute('bracketed') eq 'on') {
+        print "$trailingspaces";
         print '}';
       }
     }
@@ -474,6 +482,7 @@ while ($reader->read) {
       if ($Texinfo::Common::root_commands{$name} and $name ne 'node') {
         $eat_space = 1;
       }
+      print "$trailingspaces";
     } elsif ($elements_end_attributes{$name}) {
       if ($name eq 'accent') {
         if ($reader->hasAttributes()) {
@@ -487,18 +496,13 @@ while ($reader->read) {
       } elsif ($reader->hasAttributes()
                and defined($reader->getAttribute('separator'))) {
         print $reader->getAttribute('separator');
+        print "$trailingspaces";
       }
     } elsif ($eat_space_elements{$name}) {
       $eat_space = 1;
     } else {
       print STDERR "END UNKNOWN $name\n" if ($debug);
     }
-    if ($reader->hasAttributes()
-        and defined($reader->getAttribute('trailingspaces'))) {
-      my $trailingspaces = $reader->getAttribute('trailingspaces');
-      $trailingspaces =~ s/\\f/\f/g;
-      print $trailingspaces;
-    }
   } elsif ($reader->nodeType() eq XML_READER_TYPE_ENTITY_REFERENCE) {
     if (defined($entity_texts{$name})) {
       print $entity_texts{$name};