[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 29 Sep 2024 09:46:16 -0400 (EDT) |
branch: master
commit 957ac2f3d2b403efad3099a822f5181d8224219f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jul 1 19:12:16 2024 +0200
* tp/Texinfo/Convert/DocBook.pm (_convert): simplify conditions on
element args for @U. Remove error message for empty @U as there is
already the same message output un Parser.
* tp/t/03coverage_braces.t: add docbook as test_formats for all the
tests in @test_cases.
---
ChangeLog | 9 +++
tp/Texinfo/Convert/DocBook.pm | 13 +--
tp/t/03coverage_braces.t | 1 +
tp/t/results/coverage/invalid_U.pl | 11 ---
tp/t/results/coverage_braces/abbr_acronym.pl | 9 +++
tp/t/results/coverage_braces/abbr_no_braces.pl | 3 +
.../coverage_braces/brace_command_no_braces.pl | 3 +
tp/t/results/coverage_braces/caption_no_braces.pl | 3 +
tp/t/results/coverage_braces/command_in_U.pl | 3 +
tp/t/results/coverage_braces/command_in_dotless.pl | 3 +
.../coverage_braces/contain_plain_text_nestings.pl | 17 ++++
.../definfoenclose_texinfo_commands.pl | 9 +++
tp/t/results/coverage_braces/email_no_braces.pl | 3 +
.../results/coverage_braces/email_possibilities.pl | 6 ++
tp/t/results/coverage_braces/empty_commands.pl | 6 ++
.../results/coverage_braces/empty_line_in_email.pl | 7 ++
.../coverage_braces/empty_second_email_argument.pl | 3 +
tp/t/results/coverage_braces/end_line_in_anchor.pl | 3 +
tp/t/results/coverage_braces/footnote.pl | 5 ++
.../footnote_ending_on_empty_line.pl | 5 ++
.../footnote_ending_on_empty_line_spaces.pl | 5 ++
tp/t/results/coverage_braces/footnote_no_braces.pl | 3 +
tp/t/results/coverage_braces/footnote_no_node.pl | 8 ++
.../coverage_braces/form_feed_in_brace_commands.pl | 4 +
.../format_on_first_footnote_line.pl | 9 +++
.../results/coverage_braces/heading_in_footnote.pl | 8 ++
.../coverage_braces/hyphenation_no_braces.pl | 3 +
tp/t/results/coverage_braces/image_no_braces.pl | 3 +
.../coverage_braces/inforef_too_much_args.pl | 6 ++
tp/t/results/coverage_braces/kbd.pl | 18 +++++
tp/t/results/coverage_braces/math_no_braces.pl | 3 +
tp/t/results/coverage_braces/nested.pl | 3 +
tp/t/results/coverage_braces/nested_args.pl | 3 +
tp/t/results/coverage_braces/nested_in_sc.pl | 5 ++
.../one_argument_leading_trailing_spaces.pl | 7 ++
tp/t/results/coverage_braces/recursive_acronym.pl | 4 +
.../recursive_acronym_definition.pl | 4 +
.../coverage_braces/ref_in_style_command.pl | 3 +
tp/t/results/coverage_braces/simple.pl | 3 +
.../coverage_braces/space_command_in_image.pl | 3 +
tp/t/results/coverage_braces/space_in_anchor.pl | 4 +
tp/t/results/coverage_braces/space_in_footnote.pl | 3 +
tp/t/results/coverage_braces/space_in_image.pl | 3 +
tp/t/results/coverage_braces/strong_no_braces.pl | 3 +
tp/t/results/coverage_braces/test_image.pl | 94 ++++++++++++++++++++++
tp/t/results/coverage_braces/test_w.pl | 37 +++++++++
tp/t/results/coverage_braces/too_much_args.pl | 3 +
.../coverage_braces/two_footnotes_in_nodes.pl | 15 ++++
.../two_footnotes_in_nodes_separate.pl | 15 ++++
.../two_footnotes_in_nodes_separate_no_header.pl | 15 ++++
tp/t/results/coverage_braces/uref_in_ref.pl | 4 +
tp/t/results/coverage_braces/uref_url.pl | 12 +++
.../uref_with_commands_characters.pl | 4 +
tp/t/results/coverage_braces/url_no_braces.pl | 3 +
tp/t/results/coverage_braces/verb_in_xref.pl | 8 ++
tp/t/results/coverage_braces/w_end_sentence.pl | 3 +
.../res_parser/formatting_docbook/formatting.2 | 4 -
57 files changed, 433 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8ae871f9cd..fb5f55f4db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-07-01 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/DocBook.pm (_convert): simplify conditions on
+ element args for @U. Remove error message for empty @U as there is
+ already the same message output un Parser.
+
+ * tp/t/03coverage_braces.t: add docbook as test_formats for all the
+ tests in @test_cases.
+
2024-07-01 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/DocBook.pm: simplify conditions on element args.
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 78e9de95e3..e557fac6ce 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1533,20 +1533,15 @@ sub _convert($$;$)
}
} elsif ($element->{'cmdname'} eq 'U') {
- my $argument;
+ my $argument_text;
if ($element->{'args'}
- and $element->{'args'}->[0]
and $element->{'args'}->[0]->{'contents'}
- and $element->{'args'}->[0]->{'contents'}->[0]
and $element->{'args'}->[0]->{'contents'}->[0]->{'text'}) {
- $argument = $element->{'args'}->[0]->{'contents'}->[0]->{'text'};
+ $argument_text =
$element->{'args'}->[0]->{'contents'}->[0]->{'text'};
}
- if ($argument) {
- $result = "&#x$argument;";
+ if ($argument_text) {
+ $result = "&#x$argument_text;";
} else {
- $self->converter_line_warn(
- __("no argument specified for \@U"),
- $element->{'source_info'});
$result = '';
}
return $result;
diff --git a/tp/t/03coverage_braces.t b/tp/t/03coverage_braces.t
index 2554b1aa30..6c486c112b 100644
--- a/tp/t/03coverage_braces.t
+++ b/tp/t/03coverage_braces.t
@@ -425,6 +425,7 @@ foreach my $test (@test_cases) {
push @{$test->[2]->{'test_formats'}}, 'html_text'
unless grep {$_ eq 'html'} @{$test->[2]->{'test_formats'}};
push @{$test->[2]->{'test_formats'}}, 'latex_text';
+ push @{$test->[2]->{'test_formats'}}, 'docbook';
}
run_all('coverage_braces', [@test_cases, @test_invalid]);
diff --git a/tp/t/results/coverage/invalid_U.pl
b/tp/t/results/coverage/invalid_U.pl
index ad91ac9774..6870db5fec 100644
--- a/tp/t/results/coverage/invalid_U.pl
+++ b/tp/t/results/coverage/invalid_U.pl
@@ -305,15 +305,4 @@ $result_converted{'docbook'}->{'invalid_U'} = '<para>
&#xz; ઼ �
# � &#xwxyz;
</para>';
-$result_converted_errors{'docbook'}->{'invalid_U'} = [
- {
- 'error_line' => 'warning: no argument specified for @U
-',
- 'line_nr' => 1,
- 'text' => 'no argument specified for @U',
- 'type' => 'warning'
- }
-];
-
-
1;
diff --git a/tp/t/results/coverage_braces/abbr_acronym.pl
b/tp/t/results/coverage_braces/abbr_acronym.pl
index c4d75c2220..0052951dec 100644
--- a/tp/t/results/coverage_braces/abbr_acronym.pl
+++ b/tp/t/results/coverage_braces/abbr_acronym.pl
@@ -341,4 +341,13 @@ $result_converted{'latex_text'}->{'abbr_acronym'} = '--a
(an accronym)
\\\'{E}--a.\\@ ,A.\\@
';
+
+$result_converted{'docbook'}->{'abbr_acronym'} =
'<para><acronym>–a</acronym> (an accronym)
+<acronym>–a</acronym>
+<acronym>–a</acronym> (an accronym , ...)
+</para>
+<para><abbrev>É–a. ,A.</abbrev> (Étude–,
<emphasis role="bold">Autonome</emphasis>)
+<abbrev>É–a. ,A.</abbrev>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/abbr_no_braces.pl
b/tp/t/results/coverage_braces/abbr_no_braces.pl
index a1aba14d40..09b09e21fd 100644
--- a/tp/t/results/coverage_braces/abbr_no_braces.pl
+++ b/tp/t/results/coverage_braces/abbr_no_braces.pl
@@ -55,4 +55,7 @@ $result_converted{'html_text'}->{'abbr_no_braces'} =
'<p><abbr class="abbr"></ab
$result_converted{'latex_text'}->{'abbr_no_braces'} = '';
+
+$result_converted{'docbook'}->{'abbr_no_braces'} = '<para></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/brace_command_no_braces.pl
b/tp/t/results/coverage_braces/brace_command_no_braces.pl
index b0244713e2..aabf2e1c7e 100644
--- a/tp/t/results/coverage_braces/brace_command_no_braces.pl
+++ b/tp/t/results/coverage_braces/brace_command_no_braces.pl
@@ -55,4 +55,7 @@ $result_converted{'html_text'}->{'brace_command_no_braces'} =
'';
$result_converted{'latex_text'}->{'brace_command_no_braces'} = '';
+
+$result_converted{'docbook'}->{'brace_command_no_braces'} = '<para></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/caption_no_braces.pl
b/tp/t/results/coverage_braces/caption_no_braces.pl
index 491b36fcd2..2e1eaaf4b1 100644
--- a/tp/t/results/coverage_braces/caption_no_braces.pl
+++ b/tp/t/results/coverage_braces/caption_no_braces.pl
@@ -50,4 +50,7 @@ $result_converted{'html_text'}->{'caption_no_braces'} = '';
$result_converted{'latex_text'}->{'caption_no_braces'} = '';
+
+$result_converted{'docbook'}->{'caption_no_braces'} = '';
+
1;
diff --git a/tp/t/results/coverage_braces/command_in_U.pl
b/tp/t/results/coverage_braces/command_in_U.pl
index 861fd30a7e..35a230c7b6 100644
--- a/tp/t/results/coverage_braces/command_in_U.pl
+++ b/tp/t/results/coverage_braces/command_in_U.pl
@@ -78,4 +78,7 @@ $result_converted{'html_text'}->{'command_in_U'} =
'<p>&#x<code class="code">09A
$result_converted{'latex_text'}->{'command_in_U'} = '';
+
+$result_converted{'docbook'}->{'command_in_U'} = '<para></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/command_in_dotless.pl
b/tp/t/results/coverage_braces/command_in_dotless.pl
index 3b21de64ee..b2ce704c36 100644
--- a/tp/t/results/coverage_braces/command_in_dotless.pl
+++ b/tp/t/results/coverage_braces/command_in_dotless.pl
@@ -86,4 +86,7 @@ $result_converted{'html_text'}->{'command_in_dotless'} =
'<p><code class="code">
$result_converted{'latex_text'}->{'command_in_dotless'} =
'\\textbackslash{}texttt\\{i\\}';
+
+$result_converted{'docbook'}->{'command_in_dotless'} =
'<para><literal>i</literal></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
index 3fd2ce2d72..a952f1f88a 100644
--- a/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
+++ b/tp/t/results/coverage_braces/contain_plain_text_nestings.pl
@@ -952,4 +952,21 @@ Text
\\hbox{\\hyperref[anchor:Top]{\\chaptername~\\ref*{anchor:Top} [Top], page~
\\printindex[cp]
';
+
+$result_converted{'docbook'}->{'contain_plain_text_nestings'} = '<chapter
label="1" id="chap">
+<title>Chap</title>
+
+<para>Text <literal>code&#160;in&#160;w</literal>&#160;text<!--
/@w -->.
+<keycap><literal>code in key</literal> text</keycap>
+<indexterm role="cp"><primary>ii</primary></indexterm>
+</para>
+<!-- no warning for @ref in @w -->
+<para>Text <link
linkend="Top">cross&#160;in&#160;w</link>&#160;text<!-- /@w -->.
+<keycap><link linkend="Top">cross in key</link> text</keycap>
+<indexterm role="cp"><primary>ii</primary></indexterm>
+</para>
+<index role="cp"></index>
+</chapter>
+';
+
1;
diff --git a/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
b/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
index fd3dfdbf32..98d07a6f61 100644
--- a/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
+++ b/tp/t/results/coverage_braces/definfoenclose_texinfo_commands.pl
@@ -421,4 +421,13 @@
$result_converted{'latex_text'}->{'definfoenclose_texinfo_commands'} = '
\\end{quote}
';
+
+$result_converted{'docbook'}->{'definfoenclose_texinfo_commands'} = '
+<para><literal>aaa</literal>.
+</para>
+<para>&tex;. in strong.
+</para>
+<important><para>in quotation
+</para></important>';
+
1;
diff --git a/tp/t/results/coverage_braces/email_no_braces.pl
b/tp/t/results/coverage_braces/email_no_braces.pl
index 9998748cbd..27bffd206f 100644
--- a/tp/t/results/coverage_braces/email_no_braces.pl
+++ b/tp/t/results/coverage_braces/email_no_braces.pl
@@ -55,4 +55,7 @@ $result_converted{'html_text'}->{'email_no_braces'} = '';
$result_converted{'latex_text'}->{'email_no_braces'} = '';
+
+$result_converted{'docbook'}->{'email_no_braces'} = '<para></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/email_possibilities.pl
b/tp/t/results/coverage_braces/email_possibilities.pl
index 35cd1b4cd5..a64f1e361b 100644
--- a/tp/t/results/coverage_braces/email_possibilities.pl
+++ b/tp/t/results/coverage_braces/email_possibilities.pl
@@ -125,4 +125,10 @@ $result_converted{'latex_text'}->{'email_possibilities'} =
'\\href{mailto:--a}{-
\\href{mailto:--a}{\\nolinkurl{--a}}
';
+
+$result_converted{'docbook'}->{'email_possibilities'} = '<para><ulink
url="mailto:--a";>–b</ulink>
+–b
+<email>--a</email>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/empty_commands.pl
b/tp/t/results/coverage_braces/empty_commands.pl
index 237d7ab30e..8106a29b67 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -209,4 +209,10 @@ $result_converted{'latex_text'}->{'empty_commands'} = '
\\texttt{}\\footnote{} \\~{}
';
+
+$result_converted{'docbook'}->{'empty_commands'} = '
+
+<para><ulink url=""></ulink> <literal></literal><footnote></footnote> ̃
<literal></literal>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/empty_line_in_email.pl
b/tp/t/results/coverage_braces/empty_line_in_email.pl
index 924b83ccc8..bbdf043902 100644
--- a/tp/t/results/coverage_braces/empty_line_in_email.pl
+++ b/tp/t/results/coverage_braces/empty_line_in_email.pl
@@ -124,4 +124,11 @@ $result_converted{'latex_text'}->{'empty_line_in_email'} =
'\\href{mailto:
text
';
+
+$result_converted{'docbook'}->{'empty_line_in_email'} = '<para><email>
+</email></para><para>mail,
+</para>
+<para>text
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/empty_second_email_argument.pl
b/tp/t/results/coverage_braces/empty_second_email_argument.pl
index 8db9322690..dab3acf3c1 100644
--- a/tp/t/results/coverage_braces/empty_second_email_argument.pl
+++ b/tp/t/results/coverage_braces/empty_second_email_argument.pl
@@ -77,4 +77,7 @@
$result_converted{'html_text'}->{'empty_second_email_argument'} = '<p><a class="
$result_converted{'latex_text'}->{'empty_second_email_argument'} =
'\\href{mailto:a@b.c}{\\nolinkurl{a@b.c}}';
+
+$result_converted{'docbook'}->{'empty_second_email_argument'} =
'<para><email>a@b.c</email></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/end_line_in_anchor.pl
b/tp/t/results/coverage_braces/end_line_in_anchor.pl
index afddb59c4a..1f8ddd1766 100644
--- a/tp/t/results/coverage_braces/end_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/end_line_in_anchor.pl
@@ -68,4 +68,7 @@ $result_converted{'html_text'}->{'end_line_in_anchor'} = '<a
class="anchor" id="
$result_converted{'latex_text'}->{'end_line_in_anchor'} =
'\\label{anchor:an-anchor}%
';
+
+$result_converted{'docbook'}->{'end_line_in_anchor'} = '<anchor
id="an-anchor"/>';
+
1;
diff --git a/tp/t/results/coverage_braces/footnote.pl
b/tp/t/results/coverage_braces/footnote.pl
index a85f2cdedd..3082bbc673 100644
--- a/tp/t/results/coverage_braces/footnote.pl
+++ b/tp/t/results/coverage_braces/footnote.pl
@@ -120,4 +120,9 @@ $result_converted{'latex_text'}->{'footnote'} =
'text\\footnote{in footnote.
\\textnormal{in footnote r}. } after footnote.';
+
+$result_converted{'docbook'}->{'footnote'} = '<para>text<footnote><para>in
footnote.
+</para>
+<para>in footnote r. </para></footnote> after footnote.</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
index 59f69d5547..8d5d05e8b8 100644
--- a/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
+++ b/tp/t/results/coverage_braces/footnote_ending_on_empty_line.pl
@@ -95,4 +95,9 @@
$result_converted{'latex_text'}->{'footnote_ending_on_empty_line'} = 'text\\foot
}';
+
+$result_converted{'docbook'}->{'footnote_ending_on_empty_line'} =
'<para>text<footnote><para>in footnote.
+</para>
+</footnote></para>';
+
1;
diff --git
a/tp/t/results/coverage_braces/footnote_ending_on_empty_line_spaces.pl
b/tp/t/results/coverage_braces/footnote_ending_on_empty_line_spaces.pl
index cecde36068..07d4e1bfc0 100644
--- a/tp/t/results/coverage_braces/footnote_ending_on_empty_line_spaces.pl
+++ b/tp/t/results/coverage_braces/footnote_ending_on_empty_line_spaces.pl
@@ -99,4 +99,9 @@
$result_converted{'latex_text'}->{'footnote_ending_on_empty_line_spaces'} = 'tex
}';
+
+$result_converted{'docbook'}->{'footnote_ending_on_empty_line_spaces'} =
'<para>text<footnote><para>in footnote.
+</para>
+</footnote></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/footnote_no_braces.pl
b/tp/t/results/coverage_braces/footnote_no_braces.pl
index e28b639f4c..eb2f546746 100644
--- a/tp/t/results/coverage_braces/footnote_no_braces.pl
+++ b/tp/t/results/coverage_braces/footnote_no_braces.pl
@@ -60,4 +60,7 @@ $result_converted{'html_text'}->{'footnote_no_braces'} = '';
$result_converted{'latex_text'}->{'footnote_no_braces'} = '\\footnote{}';
+
+$result_converted{'docbook'}->{'footnote_no_braces'} = '<para></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/footnote_no_node.pl
b/tp/t/results/coverage_braces/footnote_no_node.pl
index 19a79b5d9e..129c8209c8 100644
--- a/tp/t/results/coverage_braces/footnote_no_node.pl
+++ b/tp/t/results/coverage_braces/footnote_no_node.pl
@@ -150,4 +150,12 @@ $result_converted{'latex_text'}->{'footnote_no_node'} =
'\\part*{{top}}
F\\footnote{In footnote}.
';
+
+$result_converted{'docbook'}->{'footnote_no_node'} = '<chapter label="">
+<title>top</title>
+
+<para>F<footnote><para>In footnote</para></footnote>.
+</para></chapter>
+';
+
1;
diff --git a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
index 5d6a329cea..36a322450d 100644
--- a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
+++ b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
@@ -247,4 +247,8 @@ something \\href{mailto:aaa}{fff}\\footnote{ f1 \\par{}
jj}.
';
+
+$result_converted{'docbook'}->{'form_feed_in_brace_commands'} =
'<para><option> aa</option> <anchor id="aa"/></para> <para>something <ulink
url="mailto:aaa";>fff</ulink><footnote><para>f1 </para> </footnote>
<footnote><para>gg</para> <para>jj</para></footnote>.
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
index 7f2e951b5f..635941e158 100644
--- a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
+++ b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
@@ -281,4 +281,13 @@ Last text \\footnote{\\begin{Texinfoindented}
}
';
+
+$result_converted{'docbook'}->{'format_on_first_footnote_line'} =
'<para>Texte<footnote><blockquote><para>in quotation on the first footnote line
+</para></blockquote></footnote>.
+</para>
+<para>Last text <footnote><screen>in example
+</screen>
+</footnote>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 828cac1931..6310a3b281 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -199,4 +199,12 @@ BBB
}
';
+
+$result_converted{'docbook'}->{'heading_in_footnote'} =
'<para>T<footnote><para>AAA
+</para><bridgehead renderas="sect1">H1</bridgehead>
+<indexterm role="cp"><primary>ind e</primary></indexterm>
+<para>BBB
+</para></footnote>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/hyphenation_no_braces.pl
b/tp/t/results/coverage_braces/hyphenation_no_braces.pl
index 309423a972..582c995b47 100644
--- a/tp/t/results/coverage_braces/hyphenation_no_braces.pl
+++ b/tp/t/results/coverage_braces/hyphenation_no_braces.pl
@@ -50,4 +50,7 @@ $result_converted{'html_text'}->{'hyphenation_no_braces'} =
'';
$result_converted{'latex_text'}->{'hyphenation_no_braces'} = '\\hyphenation{}';
+
+$result_converted{'docbook'}->{'hyphenation_no_braces'} = '';
+
1;
diff --git a/tp/t/results/coverage_braces/image_no_braces.pl
b/tp/t/results/coverage_braces/image_no_braces.pl
index 337501810f..a0667e9342 100644
--- a/tp/t/results/coverage_braces/image_no_braces.pl
+++ b/tp/t/results/coverage_braces/image_no_braces.pl
@@ -55,4 +55,7 @@ $result_converted{'html_text'}->{'image_no_braces'} = '';
$result_converted{'latex_text'}->{'image_no_braces'} = '';
+
+$result_converted{'docbook'}->{'image_no_braces'} = '';
+
1;
diff --git a/tp/t/results/coverage_braces/inforef_too_much_args.pl
b/tp/t/results/coverage_braces/inforef_too_much_args.pl
index 00d1f29bad..f35ccbe084 100644
--- a/tp/t/results/coverage_braces/inforef_too_much_args.pl
+++ b/tp/t/results/coverage_braces/inforef_too_much_args.pl
@@ -168,4 +168,10 @@ $result_converted{'latex_text'}->{'inforef_too_much_args'}
= '\\label{anchor:cha
Section ``chapter\'\' in \\texttt{file name,\\ spurious arg}
';
+
+$result_converted{'docbook'}->{'inforef_too_much_args'} = '<anchor
id="chapter"/>
+
+<para>See section “cross ref name” in <filename>file name,
spurious arg</filename>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/kbd.pl
b/tp/t/results/coverage_braces/kbd.pl
index cddfd94eab..76def94a36 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -457,4 +457,22 @@ in format
\\end{Texinfopreformatted}
';
+
+$result_converted{'docbook'}->{'kbd'} = '<para>kbd: <literal>in kbd</literal>.
+</para>
+<para>kbd in code: <literal>in first <userinput>in nested
kbd</userinput></literal>.
+</para>
+<para>kbd in kbd: <userinput>in top kbd <userinput>in nested
kbd</userinput></userinput>.
+</para>
+<para>kbd in @example:
+</para>
+<screen>in example
+<literal>in example in kbd</literal>.
+</screen>
+<para>kbd in @format:
+</para>
+<literallayout>in format
+<literal>in format in kbd</literal>.
+</literallayout>';
+
1;
diff --git a/tp/t/results/coverage_braces/math_no_braces.pl
b/tp/t/results/coverage_braces/math_no_braces.pl
index 16af3f98a8..f38dcbf1c3 100644
--- a/tp/t/results/coverage_braces/math_no_braces.pl
+++ b/tp/t/results/coverage_braces/math_no_braces.pl
@@ -55,4 +55,7 @@ $result_converted{'html_text'}->{'math_no_braces'} = '';
$result_converted{'latex_text'}->{'math_no_braces'} = '';
+
+$result_converted{'docbook'}->{'math_no_braces'} = '<para></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/nested.pl
b/tp/t/results/coverage_braces/nested.pl
index aeae546cf6..c95107e2dc 100644
--- a/tp/t/results/coverage_braces/nested.pl
+++ b/tp/t/results/coverage_braces/nested.pl
@@ -80,4 +80,7 @@ $result_converted{'html_text'}->{'nested'} = '<p>type the
characters <kbd class=
$result_converted{'latex_text'}->{'nested'} = 'type the characters
\\Texinfocommandstyletextkbd{l o g o u t \\texttt{RET}}.';
+
+$result_converted{'docbook'}->{'nested'} = '<para>type the characters
<userinput>l o g o u t <keycap>RET</keycap></userinput>.</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/nested_args.pl
b/tp/t/results/coverage_braces/nested_args.pl
index ba9c572ed8..a4597ec9a3 100644
--- a/tp/t/results/coverage_braces/nested_args.pl
+++ b/tp/t/results/coverage_braces/nested_args.pl
@@ -181,4 +181,7 @@ $result_converted{'html_text'}->{'nested_args'} = '<p>See
<a data-manual="manual
$result_converted{'latex_text'}->{'nested_args'} = 'See Section
``S\\~{e}ction\'\' in \\texttt{\\Texinfocommandstyletextcite{manual}}.';
+
+$result_converted{'docbook'}->{'nested_args'} = '<para>See section
“Sẽction” in
<filename><citetitle>manual</citetitle></filename>.</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl
b/tp/t/results/coverage_braces/nested_in_sc.pl
index 1da5db8ae6..b8528a3123 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -252,4 +252,9 @@ $result_converted{'latex_text'}->{'nested_in_sc'} =
'\\textsc{\\textsc{aaa \\~{n
\\verb:in verb:}}
';
+
+$result_converted{'docbook'}->{'nested_in_sc'} = '<para>AAA Ñ Å
&tex; Å̃ <footnote><para>In footnote</para></footnote>,
<abbrev>ABR</abbrev> (EXPL),
+<literal>IN VERB</literal>
+</para>';
+
1;
diff --git
a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
index b8a3f8d1f8..a67fd3073a 100644
--- a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
@@ -394,4 +394,11 @@
$result_converted{'latex_text'}->{'one_argument_leading_trailing_spaces'} = '\\t
\\aa{} \\dots{}
';
+
+$result_converted{'docbook'}->{'one_argument_leading_trailing_spaces'} =
'<para><literal> in code </literal> in slanted <replaceable> var
</replaceable> <subscript> sub </subscript>
+<literal> http://example.com </literal> ሴ &#160;w&#160;<!-- /@w
--> <literal> verb </literal>.
+ e ̂ a ̊ i bb ͡
+å ...
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/recursive_acronym.pl
b/tp/t/results/coverage_braces/recursive_acronym.pl
index 45b589e2de..3379df53f6 100644
--- a/tp/t/results/coverage_braces/recursive_acronym.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym.pl
@@ -95,4 +95,8 @@ $result_converted{'html_text'}->{'recursive_acronym'} =
'<p><abbr class="acronym
$result_converted{'latex_text'}->{'recursive_acronym'} = 'GNU (GNU\'s Not Unix)
';
+
+$result_converted{'docbook'}->{'recursive_acronym'} =
'<para><acronym>GNU</acronym> (<acronym>GNU</acronym>’s Not Unix)
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
index b92af824b3..9f7bf8d5c5 100644
--- a/tp/t/results/coverage_braces/recursive_acronym_definition.pl
+++ b/tp/t/results/coverage_braces/recursive_acronym_definition.pl
@@ -137,4 +137,8 @@
$result_converted{'html_text'}->{'recursive_acronym_definition'} = '<p><abbr cla
$result_converted{'latex_text'}->{'recursive_acronym_definition'} = 'GNU (GNU
(GNU (is something)\'s Not Unix)\'s Not Unix)
';
+
+$result_converted{'docbook'}->{'recursive_acronym_definition'} =
'<para><acronym>GNU</acronym> (<acronym>GNU</acronym> (<acronym>GNU</acronym>
(is something)’s Not Unix)’s Not Unix)
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/ref_in_style_command.pl
b/tp/t/results/coverage_braces/ref_in_style_command.pl
index fefd6cfe71..8ed717134b 100644
--- a/tp/t/results/coverage_braces/ref_in_style_command.pl
+++ b/tp/t/results/coverage_braces/ref_in_style_command.pl
@@ -97,4 +97,7 @@ $result_converted{'html_text'}->{'ref_in_style_command'} =
'<p>‘<samp clas
$result_converted{'latex_text'}->{'ref_in_style_command'} =
'`\\texttt{(manula)other node}\'.';
+
+$result_converted{'docbook'}->{'ref_in_style_command'} =
'<para>‘<literal><link>(manula)other
node</link></literal>’.</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/simple.pl
b/tp/t/results/coverage_braces/simple.pl
index 9bdff619ef..3528a5173b 100644
--- a/tp/t/results/coverage_braces/simple.pl
+++ b/tp/t/results/coverage_braces/simple.pl
@@ -61,4 +61,7 @@ $result_converted{'html_text'}->{'simple'} = '<p><b
class="b">in b</b>.</p>';
$result_converted{'latex_text'}->{'simple'} = '\\textbf{in b}.';
+
+$result_converted{'docbook'}->{'simple'} = '<para><emphasis role="bold">in
b</emphasis>.</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/space_command_in_image.pl
b/tp/t/results/coverage_braces/space_command_in_image.pl
index e2d02760a7..54b85a26c4 100644
--- a/tp/t/results/coverage_braces/space_command_in_image.pl
+++ b/tp/t/results/coverage_braces/space_command_in_image.pl
@@ -106,4 +106,7 @@ $result_converted{'html_text'}->{'space_command_in_image'}
= '<img class="image"
$result_converted{'latex_text'}->{'space_command_in_image'} =
'\\includegraphics{f--ile} \\includegraphics{f--ile}';
+
+$result_converted{'docbook'}->{'space_command_in_image'} =
'<informalfigure><mediaobject><imageobject><imagedata fileref="f--ile.png"
format="PNG"></imagedata></imageobject><textobject><literallayout>Image
description""\\.</literallayout></textobject></mediaobject></informalfigure>
<informalfigure><mediaobject><imageobject><imagedata fileref="f--ile.png"
format="PNG"></imagedata></imageobject><textobject><literallayout>Image
description""\\.</literallayout></textobjec [...]
+
1;
diff --git a/tp/t/results/coverage_braces/space_in_anchor.pl
b/tp/t/results/coverage_braces/space_in_anchor.pl
index 556efa1fea..f5376df29f 100644
--- a/tp/t/results/coverage_braces/space_in_anchor.pl
+++ b/tp/t/results/coverage_braces/space_in_anchor.pl
@@ -79,4 +79,8 @@ $result_converted{'latex_text'}->{'space_in_anchor'} =
'\\label{anchor:anchor-na
.
';
+
+$result_converted{'docbook'}->{'space_in_anchor'} = '<anchor
id="anchor-name"/><para>.
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/space_in_footnote.pl
b/tp/t/results/coverage_braces/space_in_footnote.pl
index 9a95547223..75adf4e966 100644
--- a/tp/t/results/coverage_braces/space_in_footnote.pl
+++ b/tp/t/results/coverage_braces/space_in_footnote.pl
@@ -84,4 +84,7 @@ $result_converted{'html_text'}->{'space_in_footnote'} =
'<p>text<a class="footno
$result_converted{'latex_text'}->{'space_in_footnote'} = 'text\\footnote{in
footnote.}';
+
+$result_converted{'docbook'}->{'space_in_footnote'} =
'<para>text<footnote><para>in footnote.</para></footnote></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/space_in_image.pl
b/tp/t/results/coverage_braces/space_in_image.pl
index bf8bae6af5..3b4e2c868e 100644
--- a/tp/t/results/coverage_braces/space_in_image.pl
+++ b/tp/t/results/coverage_braces/space_in_image.pl
@@ -185,4 +185,7 @@ $result_converted_errors{'latex_text'}->{'space_in_image'}
= [
];
+
+$result_converted{'docbook'}->{'space_in_image'} =
'<informalfigure><mediaobject><imageobject><imagedata fileref="a.jpg"
format="JPG"></imagedata></imageobject><textobject><literallayout>An image text
before
paragraph.</literallayout></textobject></mediaobject></informalfigure><para>.
<inlinemediaobject><imageobject><imagedata fileref="f.jpg"
format="JPG"></imagedata></imageobject><textobject><literallayout>Another image
text, in paragraph.</literallayout></textobject></inlinemediaobject [...]
+
1;
diff --git a/tp/t/results/coverage_braces/strong_no_braces.pl
b/tp/t/results/coverage_braces/strong_no_braces.pl
index 32bc9f9405..ed226c0275 100644
--- a/tp/t/results/coverage_braces/strong_no_braces.pl
+++ b/tp/t/results/coverage_braces/strong_no_braces.pl
@@ -56,4 +56,7 @@ $result_converted{'html_text'}->{'strong_no_braces'} = '';
$result_converted{'latex_text'}->{'strong_no_braces'} = '\\textbf{}';
+
+$result_converted{'docbook'}->{'strong_no_braces'} = '<para></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index 2c8f518131..a6fbce0f36 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -3383,4 +3383,98 @@ $result_converted_errors{'latex_text'}->{'test_image'} =
[
];
+
+$result_converted{'docbook'}->{'test_image'} = '<anchor id="chapter"/>
+
+<informalfigure><mediaobject><imageobject><imagedata fileref="f@i--le..
a@<"%@ < & @ % " .jpg"
format="JPG"></imagedata></imageobject></mediaobject></informalfigure>
+
+<para>In text <inlinemediaobject><imageobject><imagedata fileref="f@i--le..
a@<"%@ < & @ % " .jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject>.
+</para>
+<para>Insertcopying
+</para><para>Text in copying.
+<inlinemediaobject><imageobject><imagedata fileref="f@i--le.. a@<"%@
< & @ % " .jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject>
+</para>
+<para>In text <inlinemediaobject><imageobject><imagedata fileref="f@i--le..
a@<"%@ < & @ % " .jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject>.
+</para>
+<screen><inlinemediaobject><imageobject><imagedata fileref="f@i--le..
a@<"%@ < & @ % " .jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject>
+
+In text <inlinemediaobject><imageobject><imagedata fileref="f@i--le..
a@<"%@ < & @ % " .jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject>.
+</screen>
+<anchor id="Image-with-commands"/>
+<informalfigure><mediaobject><imageobject><imagedata fileref="f@i--le..
a@<"%@ < & @ % " .jpg"
format="JPG"></imagedata></imageobject></mediaobject></informalfigure>
+
+<para>In text <inlinemediaobject><imageobject><imagedata fileref="f@i--le..
a@<"%@ < & @ % " .jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject>.
+</para>
+
+
+';
+
+$result_converted_errors{'docbook'}->{'test_image'} = [
+ {
+ 'error_line' => 'warning: @image file `f@i--le.. a@<"%@ < & @ % " \' not
found, using `f@i--le.. a@<"%@ < & @ % " .jpg\' (possibly involving
@files-char)
+',
+ 'line_nr' => 15,
+ 'macro' => 'files-char',
+ 'text' => '@image file `f@i--le.. a@<"%@ < & @ % " \' not found, using
`f@i--le.. a@<"%@ < & @ % " .jpg\'',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @image file `f@i--le.. a@<"%@ < & @ % " \' not
found, using `f@i--le.. a@<"%@ < & @ % " .jpg\' (possibly involving
@files-char)
+',
+ 'line_nr' => 15,
+ 'macro' => 'files-char',
+ 'text' => '@image file `f@i--le.. a@<"%@ < & @ % " \' not found, using
`f@i--le.. a@<"%@ < & @ % " .jpg\'',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @image file `f@i--le.. a@<"%@ < & @ % " \' not
found, using `f@i--le.. a@<"%@ < & @ % " .jpg\' (possibly involving
@files-char)
+',
+ 'line_nr' => 9,
+ 'macro' => 'files-char',
+ 'text' => '@image file `f@i--le.. a@<"%@ < & @ % " \' not found, using
`f@i--le.. a@<"%@ < & @ % " .jpg\'',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @image file `f@i--le.. a@<"%@ < & @ % " \' not
found, using `f@i--le.. a@<"%@ < & @ % " .jpg\' (possibly involving
@files-char)
+',
+ 'line_nr' => 9,
+ 'macro' => 'files-char',
+ 'text' => '@image file `f@i--le.. a@<"%@ < & @ % " \' not found, using
`f@i--le.. a@<"%@ < & @ % " .jpg\'',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @image file `f@i--le.. a@<"%@ < & @ % " \' not
found, using `f@i--le.. a@<"%@ < & @ % " .jpg\' (possibly involving
@files-char)
+',
+ 'line_nr' => 21,
+ 'macro' => 'files-char',
+ 'text' => '@image file `f@i--le.. a@<"%@ < & @ % " \' not found, using
`f@i--le.. a@<"%@ < & @ % " .jpg\'',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @image file `f@i--le.. a@<"%@ < & @ % " \' not
found, using `f@i--le.. a@<"%@ < & @ % " .jpg\' (possibly involving
@files-char)
+',
+ 'line_nr' => 21,
+ 'macro' => 'files-char',
+ 'text' => '@image file `f@i--le.. a@<"%@ < & @ % " \' not found, using
`f@i--le.. a@<"%@ < & @ % " .jpg\'',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @image file `f@i--le.. a@<"%@ < & @ % " \' not
found, using `f@i--le.. a@<"%@ < & @ % " .jpg\' (possibly involving
@files-char)
+',
+ 'line_nr' => 25,
+ 'macro' => 'files-char',
+ 'text' => '@image file `f@i--le.. a@<"%@ < & @ % " \' not found, using
`f@i--le.. a@<"%@ < & @ % " .jpg\'',
+ 'type' => 'warning'
+ },
+ {
+ 'error_line' => 'warning: @image file `f@i--le.. a@<"%@ < & @ % " \' not
found, using `f@i--le.. a@<"%@ < & @ % " .jpg\' (possibly involving
@files-char)
+',
+ 'line_nr' => 25,
+ 'macro' => 'files-char',
+ 'text' => '@image file `f@i--le.. a@<"%@ < & @ % " \' not found, using
`f@i--le.. a@<"%@ < & @ % " .jpg\'',
+ 'type' => 'warning'
+ }
+];
+
+
1;
diff --git a/tp/t/results/coverage_braces/test_w.pl
b/tp/t/results/coverage_braces/test_w.pl
index 4a4a0ad37e..4bf34b5c2e 100644
--- a/tp/t/results/coverage_braces/test_w.pl
+++ b/tp/t/results/coverage_braces/test_w.pl
@@ -752,4 +752,41 @@ convention should be followed in Texinfo files. TeX
converts
two single quotes to left- and right-hand doubled.
';
+
+$result_converted{'docbook'}->{'test_w'} =
'<para>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&#160;bbbbbbbbbbbbb&#160;bbbbb&#160;bbb&#160;b&#160;b&#160;b&#160;b&#160;b&#160;b&#160;b&#160;b&#160;b&#160;bb&#160;.&#160;ccc&#160;dddd<!--
/@w -->.
+</para>
+<para>a a a a a a a a a a a a a a a a a a a a a a a a a a a a
b&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a&#160;a<!--
/@w -->
+</para>
+
+<para><!-- /@w -->
+</para>
+<para>&#160;a&#160;rr&#160;&#160;ggg.<!-- /@w -->
+</para>
+<para>AA<!-- /@w -->bbb.
+</para>
+<para>FFd<!-- /@w -->nnn.
+</para>
+<para>aa&#160;f&#160;f<!-- /@w -->ggg.
+</para>
+<para>aa2&#160;f&#160;f&#160;<!-- /@w -->ggg2.
+</para>
+
+<para>aa3 &#160;f&#160;f&#160;<!-- /@w -->ggg3.
+</para>
+
+<para>aa4 &#160;f&#160;f&#160;<!-- /@w --> ggg4.
+</para>
+<para>aa5 <!-- /@w --> ggg5.
+</para>
+<para>aa6 <!-- /@w -->ggg6.
+</para>
+<para>aa6<!-- /@w --> ggg6.
+</para>
+<para>aaf &#160;<!-- /@w --> bbb.
+</para>
+<para>begin and end quotations: <literal>`<!-- /@w -->`…\'<!-- /@w
-->\'</literal><!-- /@w -->. This
+convention should be followed in Texinfo files. TeX converts
+two single quotes to left- and right-hand doubled.
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/too_much_args.pl
b/tp/t/results/coverage_braces/too_much_args.pl
index 35ae5a1465..e47c00d5b8 100644
--- a/tp/t/results/coverage_braces/too_much_args.pl
+++ b/tp/t/results/coverage_braces/too_much_args.pl
@@ -71,4 +71,7 @@ $result_converted{'html_text'}->{'too_much_args'} = '<p><abbr
class="abbr" title
$result_converted{'latex_text'}->{'too_much_args'} = 'AZE (A truc Z b, E eep)';
+
+$result_converted{'docbook'}->{'too_much_args'} = '<para><abbrev>AZE</abbrev>
(A truc Z b, E eep)</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
index d8c7897889..79874b7de5 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -822,4 +822,19 @@ para2}
';
+
+$result_converted{'docbook'}->{'two_footnotes_in_nodes'} = '<chapter label="1"
id="chapter">
+<title>chapter</title>
+
+<para>C<footnote><para>Footnote chapter/1
+</para>
+<para>para2</para></footnote>
+</para>
+<para>D<footnote><para>Footnote chapter/2
+</para>
+<para>para2</para></footnote>
+</para>
+</chapter>
+';
+
1;
diff --git a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
index a6e3fa973d..f4ba277848 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate.pl
@@ -860,4 +860,19 @@ para2}
';
+
+$result_converted{'docbook'}->{'two_footnotes_in_nodes_separate'} = '<chapter
label="1" id="chapter">
+<title>chapter</title>
+
+<para>C<footnote><para>Footnote chapter/1
+</para>
+<para>para2</para></footnote>
+</para>
+<para>D<footnote><para>Footnote chapter/2
+</para>
+<para>para2</para></footnote>
+</para>
+</chapter>
+';
+
1;
diff --git
a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
index 80576c52d8..c5b5dfe589 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes_separate_no_header.pl
@@ -848,4 +848,19 @@ para2}
';
+
+$result_converted{'docbook'}->{'two_footnotes_in_nodes_separate_no_header'} =
'<chapter label="1" id="chapter">
+<title>chapter</title>
+
+<para>C<footnote><para>Footnote chapter/1
+</para>
+<para>para2</para></footnote>
+</para>
+<para>D<footnote><para>Footnote chapter/2
+</para>
+<para>para2</para></footnote>
+</para>
+</chapter>
+';
+
1;
diff --git a/tp/t/results/coverage_braces/uref_in_ref.pl
b/tp/t/results/coverage_braces/uref_in_ref.pl
index aba227c2da..2e703aa671 100644
--- a/tp/t/results/coverage_braces/uref_in_ref.pl
+++ b/tp/t/results/coverage_braces/uref_in_ref.pl
@@ -250,4 +250,8 @@ $result_converted{'html_text'}->{'uref_in_ref'} = '<p><a
data-manual="info file
$result_converted{'latex_text'}->{'uref_in_ref'} = 'Section ``title with uref2
\\href{href://http/myhost.com/index2.html}{uref2
(\\nolinkurl{href://http/myhost.com/index2.html})}\'\' in \\textsl{printed
manual with uref4 \\href{href://http/myhost.com/index4.html}{uref4
(\\nolinkurl{href://http/myhost.com/index4.html})}}
';
+
+$result_converted{'docbook'}->{'uref_in_ref'} = '<para>section “title
with uref2 <ulink url="href://http/myhost.com/index2.html">uref2</ulink>”
in <citetitle>printed manual with uref4 <ulink
url="href://http/myhost.com/index4.html">uref4</ulink></citetitle>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/uref_url.pl
b/tp/t/results/coverage_braces/uref_url.pl
index caf86a6400..d6480dbf05 100644
--- a/tp/t/results/coverage_braces/uref_url.pl
+++ b/tp/t/results/coverage_braces/uref_url.pl
@@ -337,4 +337,16 @@ $result_converted{'latex_text'}->{'uref_url'} =
'\\href{--a}{--b (\\nolinkurl{--
--q
';
+
+$result_converted{'docbook'}->{'uref_url'} = '<para><ulink
url="--a">–b</ulink>
+<ulink url="--c">--c</ulink>
+<ulink url="">–d</ulink>
+<ulink url="--e">–f</ulink>
+<ulink url="">–h</ulink>
+<ulink url="--j">–k</ulink>
+<ulink url="">–l</ulink>
+<ulink url="--m">–n</ulink>
+<ulink url="--o">–p</ulink>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/uref_with_commands_characters.pl
b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
index e6f5ead6fe..1650111ace 100644
--- a/tp/t/results/coverage_braces/uref_with_commands_characters.pl
+++ b/tp/t/results/coverage_braces/uref_with_commands_characters.pl
@@ -141,4 +141,8 @@
$result_converted{'html_text'}->{'uref_with_commands_characters'} = '<p><a class
$result_converted{'latex_text'}->{'uref_with_commands_characters'} =
'\\href{http://my-host.com/~toto\\%5Cs\'q"a&e?b\\}b\\{ba@s\\\\s p+h\\#aaa}{see
that \\textbf{\\LaTeX{}}
(\\nolinkurl{http://my-host.com/~toto\\%5Cs\'q"a&e?b\\}b\\{ba@s\\\\s
p+h\\#aaa})}
';
+
+$result_converted{'docbook'}->{'uref_with_commands_characters'} =
'<para><ulink url="http://my-host.com/~toto%5Cs\'q"a&e?b}b{ba@s\\s
p+h#aaa">see that <emphasis role="bold">&latex;</emphasis></ulink>
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/url_no_braces.pl
b/tp/t/results/coverage_braces/url_no_braces.pl
index 54f35aa754..678d914cd4 100644
--- a/tp/t/results/coverage_braces/url_no_braces.pl
+++ b/tp/t/results/coverage_braces/url_no_braces.pl
@@ -55,4 +55,7 @@ $result_converted{'html_text'}->{'url_no_braces'} = '';
$result_converted{'latex_text'}->{'url_no_braces'} = '';
+
+$result_converted{'docbook'}->{'url_no_braces'} = '<para></para>';
+
1;
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl
b/tp/t/results/coverage_braces/verb_in_xref.pl
index 8bc11e267d..be553259c4 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -170,4 +170,12 @@ $result_converted{'latex_text'}->{'verb_in_xref'} =
'\\label{anchor:point}%
See \\hyperref[anchor:point]{[point], page~\\pageref*{anchor:point}}.
';
+
+$result_converted{'docbook'}->{'verb_in_xref'} = '<anchor id="point"/>
+<para>See <link linkend="point"><literal>with
+verb
+
+ggg </literal></link>.
+</para>';
+
1;
diff --git a/tp/t/results/coverage_braces/w_end_sentence.pl
b/tp/t/results/coverage_braces/w_end_sentence.pl
index 0c2e01e01f..a72cc55a9d 100644
--- a/tp/t/results/coverage_braces/w_end_sentence.pl
+++ b/tp/t/results/coverage_braces/w_end_sentence.pl
@@ -61,4 +61,7 @@ $result_converted{'html_text'}->{'w_end_sentence'} = '<p>a.
b<!-- /@w --></p>';
$result_converted{'latex_text'}->{'w_end_sentence'} = 'a. \\hbox{b}';
+
+$result_converted{'docbook'}->{'w_end_sentence'} = '<para>a. b<!-- /@w
--></para>';
+
1;
diff --git a/tp/tests/coverage/res_parser/formatting_docbook/formatting.2
b/tp/tests/coverage/res_parser/formatting_docbook/formatting.2
index 4e20fa5a36..7aeb16300e 100644
--- a/tp/tests/coverage/res_parser/formatting_docbook/formatting.2
+++ b/tp/tests/coverage/res_parser/formatting_docbook/formatting.2
@@ -327,22 +327,18 @@ formatting.texi:88: @ref reference to nonexistent node
`node' (possibly involvin
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
formatting.texi:88: @ref reference to nonexistent node `node' (possibly
involving @mymacro)
-formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
formatting.texi:22: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
formatting.texi:22: warning: @image file `f--ile@.' not found, using
`f--ile@..jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `filejk _" %@' not found, using
`filejk _" %@.jpg' (possibly involving @mymacro)
-formatting.texi:22: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:22: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
formatting.texi:22: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
formatting.texi:22: warning: @image file `f--ile@.' not found, using
`f--ile@..jpg' (possibly involving @mymacro)
formatting.texi:22: warning: @image file `filejk _" %@' not found, using
`filejk _" %@.jpg' (possibly involving @mymacro)
-formatting.texi:81: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:81: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
formatting.texi:81: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
formatting.texi:81: warning: @image file `f--ile@.' not found, using
`f--ile@..jpg' (possibly involving @mymacro)
formatting.texi:81: warning: @image file `filejk _" %@' not found, using
`filejk _" %@.jpg' (possibly involving @mymacro)
-formatting.texi:88: warning: no argument specified for @U (possibly involving
@mymacro)
formatting.texi:88: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
formatting.texi:88: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
formatting.texi:88: warning: @image file `f--ile@.' not found, using
`f--ile@..jpg' (possibly involving @mymacro)