branch master updated: * tp/Texinfo/Convert/DocBook.pm (%docbook_preformatted_formats): use literallayout for @format and @smallformat (same as @display).

[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 7407096fa7 * tp/Texinfo/Convert/DocBook.pm 
(%docbook_preformatted_formats): use literallayout for @format and @smallformat 
(same as @display).
7407096fa7 is described below

commit 7407096fa7e00e1efc6b6ba5591f9ccea7f9aeff
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Feb 16 23:41:38 2022 +0100

    * tp/Texinfo/Convert/DocBook.pm (%docbook_preformatted_formats):
    use literallayout for @format and @smallformat (same as @display).
---
 ChangeLog                                          |  5 +++
 tp/Texinfo/Convert/DocBook.pm                      |  4 +-
 tp/t/results/coverage/preformatted.pl              |  4 +-
 tp/t/results/preformatted/nested_formats.pl        |  4 +-
 .../res_parser/formatting_docbook/formatting.xml   | 48 +++++++++++-----------
 5 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 555add8f21..6193fc29c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-02-16  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/DocBook.pm (%docbook_preformatted_formats):
+       use literallayout for @format and @smallformat (same as @display).
+
 2022-02-16  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/DocBook.pm (output): switch to DocBook
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 1242b370b7..ecf027c466 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -242,8 +242,8 @@ my %docbook_preformatted_formats = (
    'smalldisplay' => 'literallayout',
    'lisp' => 'programlisting',
    'smalllisp' => 'programlisting',
-   'format' => 'abstract',
-   'smallformat' => 'screen',
+   'format' => 'literallayout',
+   'smallformat' => 'literallayout',
 # type
    'menu_comment' => 'literallayout',
    'menu_description' => 'literallayout',
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index bc22a8617b..218f6b1ce0 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -444,8 +444,8 @@ $result_converted{'docbook'}->{'preformatted'} = '
    text
 </screen>
 <variablelist><varlistentry><term><indexterm role="vr"><primary>item in table 
in format</primary></indexterm><literal>item in table in format</literal>
-</term><listitem><abstract>
+</term><listitem><literallayout>
 in table in format
-</abstract></listitem></varlistentry></variablelist>';
+</literallayout></listitem></varlistentry></variablelist>';
 
 1;
diff --git a/tp/t/results/preformatted/nested_formats.pl 
b/tp/t/results/preformatted/nested_formats.pl
index c05da22d4b..01c3f07a17 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -387,10 +387,10 @@ $result_converted{'docbook'}->{'nested_formats'} = 
'<screen>
 in -- format/example
 
 </screen>
-<abstract>
+<literallayout>
 in -- example/format
 
-</abstract>';
+</literallayout>';
 
 
 $result_converted{'xml'}->{'nested_formats'} = '<format endspaces=" ">
diff --git a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml 
b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
index b7f53935d1..426493ad51 100644
--- a/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
@@ -396,10 +396,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </programlisting>
 <programlisting>s--malllisp
 </programlisting>
-<abstract>f&#8211;ormat
-</abstract>
-<screen>s&#8211;mallformat
-</screen>
+<literallayout>f&#8211;ormat
+</literallayout>
+<literallayout>s&#8211;mallformat
+</literallayout>
 <informalequation><mathphrase>disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu 
\over \sigma}\right)^2</superscript>
 </mathphrase></informalequation>
@@ -1207,10 +1207,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </programlisting>
 <programlisting>s--malllisp
 </programlisting>
-<abstract>f&#8211;ormat
-</abstract>
-<screen>s&#8211;mallformat
-</screen>
+<literallayout>f&#8211;ormat
+</literallayout>
+<literallayout>s&#8211;mallformat
+</literallayout>
 <informalequation><mathphrase>disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu 
\over \sigma}\right)^2</superscript>
 </mathphrase></informalequation>
@@ -2019,10 +2019,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </programlisting>
 <programlisting>s--malllisp
 </programlisting>
-<abstract>f&#8211;ormat
-</abstract>
-<screen>s&#8211;mallformat
-</screen>
+<literallayout>f&#8211;ormat
+</literallayout>
+<literallayout>s&#8211;mallformat
+</literallayout>
 <informalequation><mathphrase>disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu 
\over \sigma}\right)^2</superscript>
 </mathphrase></informalequation>
@@ -2849,10 +2849,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </programlisting>
 <programlisting>s--malllisp
 </programlisting>
-<abstract>f&#8211;ormat
-</abstract>
-<screen>s&#8211;mallformat
-</screen>
+<literallayout>f&#8211;ormat
+</literallayout>
+<literallayout>s&#8211;mallformat
+</literallayout>
 <informalequation><mathphrase>disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu 
\over \sigma}\right)^2</superscript>
 </mathphrase></informalequation>
@@ -3660,10 +3660,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </programlisting>
 <programlisting>s--malllisp
 </programlisting>
-<abstract>f&#8211;ormat
-</abstract>
-<screen>s&#8211;mallformat
-</screen>
+<literallayout>f&#8211;ormat
+</literallayout>
+<literallayout>s&#8211;mallformat
+</literallayout>
 <informalequation><mathphrase>disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu 
\over \sigma}\right)^2</superscript>
 </mathphrase></informalequation>
@@ -4465,10 +4465,10 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </programlisting><screen>
 </screen><programlisting>s--malllisp
 </programlisting><screen>
-</screen><abstract>f--ormat
-</abstract><screen>
-</screen><screen>s--mallformat
-</screen><screen>
+</screen><literallayout>f--ormat
+</literallayout><screen>
+</screen><literallayout>s--mallformat
+</literallayout><screen>
 </screen><informalequation><mathphrase>disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e<superscript>-{1 \over 2}\left({x-\mu 
\over \sigma}\right)^2</superscript>
 </mathphrase></informalequation><screen>