branch master updated: tp/t/22xtable.t: add DocBook output to the tests.

[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 ff8d7308eb tp/t/22xtable.t: add DocBook output to the tests.
ff8d7308eb is described below

commit ff8d7308ebd0cbb6c6e72287fadd59f56436270d
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Nov 26 23:13:54 2022 +0100

    tp/t/22xtable.t: add DocBook output to the tests.
---
 tp/t/22xtable.t                                    |  1 +
 tp/t/results/xtable/accent_on_table_line.pl        |  8 +++
 tp/t/results/xtable/block_commands_in_table.pl     |  3 +
 .../xtable/comment_and_itemx_before_item.pl        |  5 ++
 .../results/xtable/definfoenclose_on_table_line.pl |  8 +++
 tp/t/results/xtable/empty_item_itemx.pl            | 11 ++++
 .../xtable/index_command_before_end_table.pl       |  9 +++
 .../results/xtable/inter_item_commands_in_table.pl | 73 ++++++++++++++++++++++
 .../inter_item_commands_in_table_in_example.pl     | 11 ++++
 tp/t/results/xtable/long_item.pl                   |  7 +++
 tp/t/results/xtable/table_nested.pl                | 60 ++++++++++++++++++
 11 files changed, 196 insertions(+)

diff --git a/tp/t/22xtable.t b/tp/t/22xtable.t
index 441043bf03..b2e6594ab0 100644
--- a/tp/t/22xtable.t
+++ b/tp/t/22xtable.t
@@ -336,6 +336,7 @@ foreach my $test (@test_cases) {
   push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
   push @{$test->[2]->{'test_formats'}}, 'xml';
+  push @{$test->[2]->{'test_formats'}}, 'docbook';
   if (grep {$_ eq $test->[0]} @file_latex_tests_cases_tests) {
     push @{$test->[2]->{'test_formats'}}, 'file_latex';
     $test->[2]->{'test_input_file_name'} = $test->[0] . '.texi';
diff --git a/tp/t/results/xtable/accent_on_table_line.pl 
b/tp/t/results/xtable/accent_on_table_line.pl
index 9132a35820..3f6e34efd4 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -416,4 +416,12 @@ $result_converted{'xml'}->{'accent_on_table_line'} = 
'<table commandarg="asis" s
 </tableterm></tableentry></table>
 ';
 
+
+$result_converted{'docbook'}->{'accent_on_table_line'} = 
'<variablelist><varlistentry><term>first item
+</term></varlistentry><varlistentry><term>no at-command <literal>code</literal>
+</term></varlistentry></variablelist>
+<variablelist><varlistentry><term>acc brace first item
+</term></varlistentry><varlistentry><term>no at-command <literal>code acc 
brace</literal>
+</term></varlistentry></variablelist>';
+
 1;
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 830b0eb56c..df9bffd087 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -1559,4 +1559,7 @@ end example.
 </para></top>
 ';
 
+
+$result_converted{'docbook'}->{'block_commands_in_table'} = '';
+
 1;
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl 
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index f467cee638..c507a4db0d 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -180,4 +180,9 @@ $result_converted{'xml'}->{'comment_and_itemx_before_item'} 
= '<table commandarg
 </tableterm></tableentry></table>
 ';
 
+
+$result_converted{'docbook'}->{'comment_and_itemx_before_item'} = 
'<variablelist><!-- comment -->
+<varlistentry><term><literal>in itemx</literal>
+</term></varlistentry></variablelist>';
+
 1;
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl 
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index 9198a28936..5f73429663 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -273,4 +273,12 @@ $result_converted{'xml'}->{'definfoenclose_on_table_line'} 
= '<definfoenclose sp
 </para></tableitem></tableentry></table>
 ';
 
+
+$result_converted{'docbook'}->{'definfoenclose_on_table_line'} = '
+<variablelist><varlistentry><term>item
+</term><term>item x
+</term><listitem>
+<para>table content.
+</para></listitem></varlistentry></variablelist>';
+
 1;
diff --git a/tp/t/results/xtable/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index f3e73625e3..88a33d1843 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -415,4 +415,15 @@ $result_converted{'xml'}->{'empty_item_itemx'} = '<vtable 
commandarg="asis" spac
 </tableterm></tableentry></vtable>
 ';
 
+
+$result_converted{'docbook'}->{'empty_item_itemx'} = '<variablelist>
+<para>VTable
+</para>
+<varlistentry><term><indexterm role="vr"><primary>first 
item</primary></indexterm>first item
+</term><term>
+</term><term><indexterm role="vr"><primary>after an empty itemx, before an 
empty item</primary></indexterm>after an empty itemx, before an empty item
+</term></varlistentry><varlistentry><term>
+</term></varlistentry><varlistentry><term><indexterm role="vr"><primary>in 
item before end table</primary></indexterm>in item before end table
+</term></varlistentry></variablelist>';
+
 1;
diff --git a/tp/t/results/xtable/index_command_before_end_table.pl 
b/tp/t/results/xtable/index_command_before_end_table.pl
index 64531657ce..4e01595059 100644
--- a/tp/t/results/xtable/index_command_before_end_table.pl
+++ b/tp/t/results/xtable/index_command_before_end_table.pl
@@ -278,4 +278,13 @@ 
$result_converted{'xml'}->{'index_command_before_end_table'} = '
 </tableitem></tableentry></table>
 ';
 
+
+$result_converted{'docbook'}->{'index_command_before_end_table'} = '
+<variablelist><varlistentry><term><literal>in item</literal>
+</term><term><literal>in itemx</literal>
+</term><listitem><para>aaaaa
+</para>
+<indexterm role="vr"><primary>var</primary></indexterm>
+</listitem></varlistentry></variablelist>';
+
 1;
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index 7a9a83591a..0cdcc44cfe 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -3157,6 +3157,79 @@ 
$result_converted{'xml'}->{'inter_item_commands_in_table'} = '<node name="Top" s
 </tableterm></tableentry></table>
 
 
+</chapter>
+';
+
+
+$result_converted{'docbook'}->{'inter_item_commands_in_table'} = '<chapter 
label="1" id="chapter">
+<title>chap</title>
+
+<variablelist><!-- comment in table -->
+<varlistentry><term><indexterm 
role="vr"><primary>acode--b</primary></indexterm><literal>acode--b</literal>
+</term><listitem><para>l&#8211;ine
+</para></listitem></varlistentry></variablelist>
+<variablelist><varlistentry><term><indexterm 
role="vr"><primary>aasis--b</primary></indexterm>aasis&#8211;b
+</term><!-- comment between item and itemx -->
+<term><indexterm role="vr"><primary>b</primary></indexterm>b
+</term><listitem><para>l&#8211;ine
+</para></listitem></varlistentry></variablelist>
+<variablelist><varlistentry><term><indexterm 
role="fn"><primary>avar--b</primary></indexterm><replaceable>avar&#8211;b</replaceable>
+</term><indexterm role="cp"><primary>index entry between item and 
itemx</primary></indexterm>
+<!-- and a comment -->
+<!-- and another comment -->
+<term><indexterm 
role="fn"><primary>b</primary></indexterm><replaceable>b</replaceable>
+</term><listitem><para>l&#8211;ine
+</para></listitem></varlistentry><varlistentry><term><indexterm 
role="fn"><primary>c</primary></indexterm><replaceable>c</replaceable>
+</term>
+<!-- comment between lines -->
+
+<term><indexterm 
role="fn"><primary>d</primary></indexterm><replaceable>d</replaceable>
+</term><listitem>
+<!-- comment at end -->
+</listitem></varlistentry></variablelist>
+<variablelist><varlistentry><term><indexterm 
role="fn"><primary>a</primary></indexterm><emphasis>a</emphasis>
+</term><indexterm role="cp"><primary>index entry between item and 
itemx</primary></indexterm>
+<term><indexterm 
role="fn"><primary>b</primary></indexterm><emphasis>b</emphasis>
+</term><listitem><para>l&#8211;ine
+</para></listitem></varlistentry></variablelist>
+<variablelist><indexterm role="cp"><primary>cindex in 
table</primary></indexterm>
+<!-- comment in table -->
+<varlistentry><term><literal>abb</literal>
+</term><listitem><para>l&#8211;ine
+</para></listitem></varlistentry></variablelist>
+<variablelist><indexterm role="cp"><primary>cindex in 
table</primary></indexterm>
+<para>Texte before first item.
+</para><varlistentry><term><literal>abb</literal>
+</term></varlistentry></variablelist>
+<variablelist><indexterm role="cp"><primary>samp cindex in 
table</primary></indexterm>
+<!-- samp comment in table -->
+<varlistentry><term>&#8216;<literal>asamp--bb</literal>&#8217;
+</term><listitem><para>l&#8211;ine samp
+</para></listitem></varlistentry></variablelist>
+<variablelist><indexterm role="cp"><primary>samp cindex in 
table</primary></indexterm>
+<para>Texte before first item samp.
+</para><varlistentry><term>&#8216;<literal>asamp--bb</literal>&#8217;
+</term></varlistentry></variablelist>
+<variablelist>
+<indexterm role="cp"><primary>cindex between lines</primary></indexterm>
+
+<varlistentry><term>&#8216;<literal>asamp--bb1</literal>&#8217;
+</term></varlistentry></variablelist>
+<variablelist><indexterm role="cp"><primary>cindex before 
line</primary></indexterm>
+
+<varlistentry><term>&#8216;<literal>asamp--bb2</literal>&#8217;
+</term></varlistentry></variablelist>
+<variablelist>
+<varlistentry><indexterm role="cp"><primary>cindex after 
line</primary></indexterm>
+<term>&#8216;<literal>asamp--bb2</literal>&#8217;
+</term></varlistentry></variablelist>
+<variablelist><indexterm role="cp"><primary>cindex first</primary></indexterm>
+<!-- commant -->
+<varlistentry><indexterm role="cp"><primary>second</primary></indexterm>
+<indexterm role="cp"><primary>third</primary></indexterm>
+<term>&#8216;<literal>asamp--bb2</literal>&#8217;
+</term></varlistentry></variablelist>
+
 </chapter>
 ';
 
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl 
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index f14b14f671..34bba95ecc 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -454,4 +454,15 @@ 
$result_converted{'xml'}->{'inter_item_commands_in_table_in_example'} = '<exampl
 </example>
 ';
 
+
+$result_converted{'docbook'}->{'inter_item_commands_in_table_in_example'} = 
'<variablelist><varlistentry><term><replaceable>a--b</replaceable>
+</term><screen><indexterm role="cp"><primary>index entry between item and 
itemx</primary></indexterm><!-- and a comment -->
+<!-- and another comment -->
+</screen><term><replaceable>b</replaceable>
+</term><screen>
+</screen><term><replaceable>c</replaceable>
+</term><listitem><screen>l--ine
+</screen></listitem></varlistentry><varlistentry><term><replaceable>d</replaceable>
+</term></varlistentry></variablelist>';
+
 1;
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index 184eaf062c..686d4a46c3 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -207,4 +207,11 @@ $result_converted{'xml'}->{'long_item'} = '<table 
commandarg="emph" spaces=" " e
 </para></tableitem></tableentry></table>
 ';
 
+
+$result_converted{'docbook'}->{'long_item'} = 
'<variablelist><varlistentry><term><emphasis>first item      
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa</emphasis>
+</term><term><emphasis>second itemx bbbbbbbbbbbbbbbbbbbbbbbbbbbbb b b b b b b 
b b b b b b b</emphasis>
+</term><listitem>
+<para>Text.
+</para></listitem></varlistentry></variablelist>';
+
 1;
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index f58ed95f68..ad198a78ec 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -2429,4 +2429,64 @@ Something.
 </quotation>
 ';
 
+
+$result_converted{'docbook'}->{'table_nested'} = '
+<para>Quotation
+</para><blockquote><variablelist><varlistentry><term><indexterm 
role="vr"><primary>first item</primary></indexterm>first item
+</term><term><indexterm role="vr"><primary>second 
itemx</primary></indexterm>second itemx
+</term><listitem>
+<para>Text.
+</para>
+</listitem></varlistentry><varlistentry><term><indexterm 
role="vr"><primary>second item</primary></indexterm>second item
+</term><listitem>
+<para>Text 2
+</para>
+</listitem></varlistentry><varlistentry><term><indexterm 
role="vr"><primary>last</primary></indexterm>last
+</term></varlistentry></variablelist>
+<para>Something.
+</para><variablelist><varlistentry><term><emphasis>in item</emphasis>
+</term><listitem><para>Text without blank line
+</para></listitem></varlistentry><varlistentry><term><emphasis>second 
item</emphasis>
+</term><listitem><para>Text without blank line 2
+</para></listitem></varlistentry></variablelist><para>After table.
+</para></blockquote>
+<para>Example
+</para><variablelist><varlistentry><term><indexterm role="vr"><primary>first 
item</primary></indexterm>first item
+</term><term><indexterm role="vr"><primary>second 
itemx</primary></indexterm>second itemx
+</term><listitem><screen>
+Text.
+
+</screen></listitem></varlistentry><varlistentry><term><indexterm 
role="vr"><primary>second item</primary></indexterm>second item
+</term><listitem><screen>
+Text 2
+
+</screen></listitem></varlistentry><varlistentry><term><indexterm 
role="vr"><primary>last</primary></indexterm>last
+</term></varlistentry></variablelist><screen>
+Something.
+</screen><variablelist><varlistentry><term><emphasis>in item</emphasis>
+</term><listitem><screen>Text without blank line
+</screen></listitem></varlistentry><varlistentry><term><emphasis>second 
item</emphasis>
+</term><listitem><screen>Text without blank line 2
+</screen></listitem></varlistentry></variablelist><screen>After table.
+</screen>
+<para>Double quotation
+</para><blockquote><blockquote><variablelist><varlistentry><term><indexterm 
role="vr"><primary>first item</primary></indexterm>first item
+</term><term><indexterm role="vr"><primary>second 
itemx</primary></indexterm>second itemx
+</term><listitem>
+<para>Text.
+</para>
+</listitem></varlistentry><varlistentry><term><indexterm 
role="vr"><primary>second item</primary></indexterm>second item
+</term><listitem>
+<para>Text 2
+</para>
+</listitem></varlistentry><varlistentry><term><indexterm 
role="vr"><primary>last</primary></indexterm>last
+</term></varlistentry></variablelist>
+<para>Something.
+</para><variablelist><varlistentry><term><emphasis>in item</emphasis>
+</term><listitem><para>Text without blank line
+</para></listitem></varlistentry><varlistentry><term><emphasis>second 
item</emphasis>
+</term><listitem><para>Text without blank line 2
+</para></listitem></varlistentry></variablelist><para>After table.
+</para></blockquote></blockquote>';
+
 1;