[no subject]

[Patrice Dumas]

branch: master
commit 6e19f4b4e1a5d2e2d7f618a5f7c1b1e0f0ae646e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun May 5 13:35:05 2024 +0200

    * tp/Texinfo/Convert/DocBook.pm (%type_elements): leave content of
    before_defline as is without any element.
---
 ChangeLog                                        | 5 +++++
 tp/Texinfo/Convert/DocBook.pm                    | 2 --
 tp/t/results/def/comment_index_before_defline.pl | 4 ++--
 tp/t/results/def/defblock_no_defline.pl          | 4 ++--
 tp/t/results/def/text_block_before_defline.pl    | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23800f1848..b93b6f0dc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-05-05  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/DocBook.pm (%type_elements): leave content of
+       before_defline as is without any element.
+
 2024-05-05  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_gather_def_item),
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 26e10a8412..685f3aa8a2 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -251,8 +251,6 @@ my %type_elements = (
   'multitable_body' => 'tbody',
   # Unfortunatly there does not seem to be anything better in DocBook.
   'def_item' => 'blockquote',
-  # FIXME or nothing?
-  'before_defline' => 'blockquote',
 );
 
 my %default_context_block_commands = (
diff --git a/tp/t/results/def/comment_index_before_defline.pl 
b/tp/t/results/def/comment_index_before_defline.pl
index 11dc746686..97ed1db8aa 100644
--- a/tp/t/results/def/comment_index_before_defline.pl
+++ b/tp/t/results/def/comment_index_before_defline.pl
@@ -366,11 +366,11 @@ 
$result_converted{'latex'}->{'comment_index_before_defline'} = '\\documentclass{
 ';
 
 
-$result_converted{'docbook'}->{'comment_index_before_defline'} = 
'<blockquote><!-- a comment -->
+$result_converted{'docbook'}->{'comment_index_before_defline'} = '<!-- a 
comment -->
 <indexterm role="cp"><primary>entry</primary></indexterm>
 <!-- another -->
 
-</blockquote><synopsis><phrase role="category"><emphasis 
role="bold">a</emphasis>:</phrase> <varname>b</varname> <emphasis 
role="arg">c</emphasis> <emphasis role="arg">d</emphasis></synopsis>
+<synopsis><phrase role="category"><emphasis role="bold">a</emphasis>:</phrase> 
<varname>b</varname> <emphasis role="arg">c</emphasis> <emphasis 
role="arg">d</emphasis></synopsis>
 ';
 
 
diff --git a/tp/t/results/def/defblock_no_defline.pl 
b/tp/t/results/def/defblock_no_defline.pl
index 4456cf295c..d0dffcc3e7 100644
--- a/tp/t/results/def/defblock_no_defline.pl
+++ b/tp/t/results/def/defblock_no_defline.pl
@@ -193,8 +193,8 @@ misc text inside
 ';
 
 
-$result_converted{'docbook'}->{'defblock_no_defline'} = 
'<blockquote><para>misc text inside
-</para></blockquote>';
+$result_converted{'docbook'}->{'defblock_no_defline'} = '<para>misc text inside
+</para>';
 
 
 $result_converted{'xml'}->{'defblock_no_defline'} = '<defblock endspaces=" ">
diff --git a/tp/t/results/def/text_block_before_defline.pl 
b/tp/t/results/def/text_block_before_defline.pl
index db78e33a98..979a515d8b 100644
--- a/tp/t/results/def/text_block_before_defline.pl
+++ b/tp/t/results/def/text_block_before_defline.pl
@@ -826,12 +826,12 @@ Some text\\footnote{In footnote}.
 $result_converted{'docbook'}->{'text_block_before_defline'} = '<chapter 
label="1" id="chapt">
 <title>Chap</title>
 
-<blockquote><para>Some text<footnote><para>In footnote</para></footnote>.
+<para>Some text<footnote><para>In footnote</para></footnote>.
 </para>
 <screen>an example
 </screen>
 
-</blockquote><synopsis><phrase role="category"><emphasis 
role="bold">a</emphasis>:</phrase> <varname>b</varname> <emphasis 
role="arg">c</emphasis> <emphasis role="arg">d</emphasis></synopsis>
+<synopsis><phrase role="category"><emphasis role="bold">a</emphasis>:</phrase> 
<varname>b</varname> <emphasis role="arg">c</emphasis> <emphasis 
role="arg">d</emphasis></synopsis>
 </chapter>
 ';