branch master updated: * tp/Texinfo/Convert/DocBook.pm (_convert): use <sidebar> for @cartouche. Based on a report from Arnold Robbins.

[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 86baed5c1c * tp/Texinfo/Convert/DocBook.pm (_convert): use <sidebar> 
for @cartouche. Based on a report from Arnold Robbins.
86baed5c1c is described below

commit 86baed5c1cfb97ce6bcefef67d3a7a89ca206a13
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 19 16:10:07 2022 +0100

    * tp/Texinfo/Convert/DocBook.pm (_convert): use <sidebar> for
    @cartouche. Based on a report from Arnold Robbins.
---
 ChangeLog                                                |  5 +++++
 tp/Texinfo/Convert/DocBook.pm                            |  2 ++
 tp/t/results/coverage/cartouche.pl                       |  4 ++--
 tp/t/results/coverage/cartouche_in_example.pl            |  4 ++--
 tp/t/results/coverage/cartouche_in_quotation.pl          |  4 ++--
 tp/t/results/coverage/comment_on_cartouche_line.pl       |  4 ++--
 .../layout/res_parser/formatting_docbook/formatting.xml  | 16 ++++++++--------
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57671f5deb..62629c55c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-12-19  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/DocBook.pm (_convert): use <sidebar> for
+       @cartouche. Based on a report from Arnold Robbins.
+
 2022-12-17  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/texinfo.tex (\-): Provide definition of @- to allow
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 81fa15f1d9..b984065510 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1543,6 +1543,8 @@ sub _convert($$;$)
         }
         $format_element = 'blockquote' if (!defined($format_element));
         push @format_elements, $format_element;
+      } elsif ($element->{'cmdname'} eq 'cartouche') {
+        push @format_elements, 'sidebar';
       } elsif ($Texinfo::Commands::block_commands{$element->{'cmdname'}} eq 
'format_raw') {
         return '' if 
(!$self->{'expanded_formats_hash'}->{$element->{'cmdname'}});
         # the context is here only for the command, so this is forgotten
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 55b0042687..36261bc016 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -104,7 +104,7 @@ in cartouche.
 ';
 
 
-$result_converted{'docbook'}->{'cartouche'} = '<para>in cartouche.
-</para>';
+$result_converted{'docbook'}->{'cartouche'} = '<sidebar><para>in cartouche.
+</para></sidebar>';
 
 1;
diff --git a/tp/t/results/coverage/cartouche_in_example.pl 
b/tp/t/results/coverage/cartouche_in_example.pl
index 409820aa9d..2a9a7b1d03 100644
--- a/tp/t/results/coverage/cartouche_in_example.pl
+++ b/tp/t/results/coverage/cartouche_in_example.pl
@@ -202,8 +202,8 @@ $result_converted{'latex_text'}->{'cartouche_in_example'} = 
'\\begin{Texinfoinde
 
 
 $result_converted{'docbook'}->{'cartouche_in_example'} = '<screen>In example
-</screen><screen>In cartouche in example
-</screen><screen>end example
+</screen><sidebar><screen>In cartouche in example
+</screen></sidebar><screen>end example
 </screen>';
 
 1;
diff --git a/tp/t/results/coverage/cartouche_in_quotation.pl 
b/tp/t/results/coverage/cartouche_in_quotation.pl
index 15ebd0db68..224d2428db 100644
--- a/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -196,8 +196,8 @@ end quotation
 
 
 $result_converted{'docbook'}->{'cartouche_in_quotation'} = 
'<blockquote><para>In quotation
-</para><para>In cartouche in quotation
-</para><para>end quotation
+</para><sidebar><para>In cartouche in quotation
+</para></sidebar><para>end quotation
 </para></blockquote>';
 
 1;
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 452519d072..946071a5f9 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -127,7 +127,7 @@ in cartouche.
 ';
 
 
-$result_converted{'docbook'}->{'comment_on_cartouche_line'} = '<para>in 
cartouche.
-</para>';
+$result_converted{'docbook'}->{'comment_on_cartouche_line'} = 
'<sidebar><para>in cartouche.
+</para></sidebar>';
 
 1;
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index b78c6324ca..85d70819ec 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -683,8 +683,8 @@ ref&#8221; in <filename>a comma&#44; in file</filename>
 </term><term>&#8216;<literal>a2--samp</literal>&#8217;
 </term><listitem><para>Value&#8211;table samp
 </para></listitem></varlistentry></variablelist>
-<para>c&#8211;artouche
-</para>
+<sidebar><para>c&#8211;artouche
+</para></sidebar>
 <para>f&#8211;lushleft
 more text
 </para>
@@ -1610,8 +1610,8 @@ ref&#8221; in <filename>a comma&#44; in file</filename>
 </term><term>&#8216;<literal>a2--samp</literal>&#8217;
 </term><listitem><para>Value&#8211;table samp
 </para></listitem></varlistentry></variablelist>
-<para>c&#8211;artouche
-</para>
+<sidebar><para>c&#8211;artouche
+</para></sidebar>
 <para>f&#8211;lushleft
 more text
 </para>
@@ -2524,8 +2524,8 @@ ref&#8221; in <filename>a comma&#44; in file</filename>
 </term><term>&#8216;<literal>a2--samp</literal>&#8217;
 </term><listitem><para>Value&#8211;table samp
 </para></listitem></varlistentry></variablelist>
-<para>c&#8211;artouche
-</para>
+<sidebar><para>c&#8211;artouche
+</para></sidebar>
 <para>f&#8211;lushleft
 more text
 </para>
@@ -3430,8 +3430,8 @@ section ``title with uref2 <ulink 
url="href://http/myhost.com/index2.html">uref2
 </term><term>&#8216;<literal>a2--samp</literal>&#8217;
 </term><listitem><screen>Value--table samp
 </screen></listitem></varlistentry></variablelist><screen>
-</screen><screen>c--artouche
-</screen><screen>
+</screen><sidebar><screen>c--artouche
+</screen></sidebar><screen>
 </screen><screen>f--lushleft
 more text
 </screen><screen>