[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sat, 1 Oct 2022 17:41:20 -0400 (EDT) |
branch: master
commit 168c2599b9ddbb6d81b6920e120356aeb1e45105
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Oct 1 23:30:14 2022 +0200
t/20preformatted.t: output full html including headers
---
tp/t/20preformatted.t | 3 +-
tp/t/results/preformatted/caption_in_example.pl | 43 ++++++++++++++++++++-
.../comment_example_and_blank_lines.pl | 43 ++++++++++++++++++++-
tp/t/results/preformatted/comments_in_example.pl | 41 +++++++++++++++++++-
tp/t/results/preformatted/def_in_example.pl | 44 +++++++++++++++++++++-
tp/t/results/preformatted/empty_line.pl | 41 +++++++++++++++++++-
.../preformatted/insertcopying_in_example.pl | 41 +++++++++++++++++++-
.../preformatted/nested_example_and_comment.pl | 41 +++++++++++++++++++-
tp/t/results/preformatted/nested_formats.pl | 41 +++++++++++++++++++-
tp/t/results/preformatted/page_in_example.pl | 41 +++++++++++++++++++-
tp/t/results/preformatted/quote_dash_in_display.pl | 42 ++++++++++++++++++++-
tp/t/results/preformatted/quote_dash_in_example.pl | 41 +++++++++++++++++++-
.../preformatted/text_on_display_command_line.pl | 42 ++++++++++++++++++++-
.../preformatted/text_on_example_command_line.pl | 41 +++++++++++++++++++-
tp/t/results/preformatted/titlefont_in_example.pl | 30 ++++++++++++++-
15 files changed, 558 insertions(+), 17 deletions(-)
diff --git a/tp/t/20preformatted.t b/tp/t/20preformatted.t
index b00443ad22..775050556d 100644
--- a/tp/t/20preformatted.t
+++ b/tp/t/20preformatted.t
@@ -200,10 +200,11 @@ after empty} line
foreach my $test (@test_cases) {
push @{$test->[2]->{'test_formats'}}, 'plaintext';
- push @{$test->[2]->{'test_formats'}}, 'html_text';
+ push @{$test->[2]->{'test_formats'}}, 'html';
push @{$test->[2]->{'test_formats'}}, 'docbook';
push @{$test->[2]->{'test_formats'}}, 'xml';
push @{$test->[2]->{'test_formats'}}, 'latex_text';
+ $test->[2]->{'test_input_file_name'} = $test->[0] . '.texi';
}
run_all('preformatted', [@test_cases, @test_invalid]);
diff --git a/tp/t/results/preformatted/caption_in_example.pl
b/tp/t/results/preformatted/caption_in_example.pl
index 441a3190e2..48687e77f7 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -308,7 +308,30 @@ float: caption
';
-$result_converted{'html_text'}->{'caption_in_example'} = '<div class="float">
+$result_converted{'html'}->{'caption_in_example'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="float">
<div class="example">
<pre class="example-preformatted">in example
@@ -318,7 +341,23 @@ $result_converted{'html_text'}->{'caption_in_example'} =
'<div class="float">
After caption
</pre></div>
-<div class="caption"><p><strong class="strong">float:
</strong>caption</p></div></div>';
+<div class="caption"><p><strong class="strong">float:
</strong>caption</p></div></div>
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'caption_in_example'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'caption_in_example.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
$result_converted{'docbook'}->{'caption_in_example'} = '
diff --git a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
index ce5ffd3056..7fb418b667 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -501,7 +501,30 @@
$result_converted{'plaintext'}->{'comment_example_and_blank_lines'} = 'Para.
';
-$result_converted{'html_text'}->{'comment_example_and_blank_lines'} = '<p>Para.
+$result_converted{'html'}->{'comment_example_and_blank_lines'} = '<!DOCTYPE
html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<p>Para.
</p>
<div class="example">
<pre class="example-preformatted">comment, blank after </pre></div>
@@ -522,7 +545,23 @@
$result_converted{'html_text'}->{'comment_example_and_blank_lines'} = '<p>Para.
<pre class="example-preformatted">no comment, no blank after
</pre></div>
<p>Para.
-</p>';
+</p>
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'comment_example_and_blank_lines'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'comment_example_and_blank_lines.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
$result_converted{'docbook'}->{'comment_example_and_blank_lines'} =
'<para>Para.
diff --git a/tp/t/results/preformatted/comments_in_example.pl
b/tp/t/results/preformatted/comments_in_example.pl
index 3f8675b2bb..22eb4a3465 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -418,7 +418,30 @@ $result_converted{'plaintext'}->{'comments_in_example'} =
'Example with comments
';
-$result_converted{'html_text'}->{'comments_in_example'} = '<p>Example with
comments 2 lines
+$result_converted{'html'}->{'comments_in_example'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<p>Example with comments 2 lines
</p><div class="example">
<pre class="example-preformatted">line second line </pre></div>
@@ -431,8 +454,24 @@ $result_converted{'html_text'}->{'comments_in_example'} =
'<p>Example with comme
<pre class="example-preformatted">line
second line
</pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'comments_in_example'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'comments_in_example.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'comments_in_example'} = '<para>Example with
comments 2 lines
</para><screen>line <!-- comment -->
diff --git a/tp/t/results/preformatted/def_in_example.pl
b/tp/t/results/preformatted/def_in_example.pl
index 73ac9e3bcc..1516fbe889 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -287,14 +287,56 @@ $result_converted{'plaintext'}->{'def_in_example'} = '
-- Function: name ar
';
-$result_converted{'html_text'}->{'def_in_example'} = '<div class="example">
+$result_converted{'html'}->{'def_in_example'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+a.copiable-link {visibility: hidden; text-decoration: none; line-height: 0em}
+div.example {margin-left: 3.2em}
+span:hover a.copiable-link {visibility: visible}
+strong.def-name {font-family: monospace; font-weight: bold; font-size: larger}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="example">
<dl class="first-deffn first-defun-alias-first-deffn">
<dt class="deffn defun-alias-deffn" id="index-name"><span
class="category-def">Function: </span><span><strong
class="def-name">name</strong> <var class="def-var-arguments">arg</var><a
class="copiable-link" href=\'#index-name\'> ¶</a></span></dt>
<dd><pre class="example-preformatted">in defun
</pre></dd></dl>
</div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'def_in_example'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'def_in_example.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'def_in_example'} = '<synopsis><indexterm
role="fn"><primary>name</primary></indexterm><phrase role="category"><emphasis
role="bold">Function</emphasis>:</phrase> <function>name</function> <emphasis
role="arg">arg</emphasis></synopsis>
<blockquote><screen>in defun
diff --git a/tp/t/results/preformatted/empty_line.pl
b/tp/t/results/preformatted/empty_line.pl
index f198f63988..71ce43a7a3 100644
--- a/tp/t/results/preformatted/empty_line.pl
+++ b/tp/t/results/preformatted/empty_line.pl
@@ -125,13 +125,52 @@ $result_converted{'plaintext'}->{'empty_line'} = '
example
';
-$result_converted{'html_text'}->{'empty_line'} = '<div class="example">
+$result_converted{'html'}->{'empty_line'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="example">
<pre class="example-preformatted">example
after empty line
</pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'empty_line'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'empty_line.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'empty_line'} = '<screen>example
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl
b/tp/t/results/preformatted/insertcopying_in_example.pl
index 20de720969..6e5675bdbf 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -126,11 +126,50 @@
$result_converted{'plaintext'}->{'insertcopying_in_example'} = ' text
';
-$result_converted{'html_text'}->{'insertcopying_in_example'} = '<div
class="example">
+$result_converted{'html'}->{'insertcopying_in_example'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="example">
<pre class="example-preformatted">text
</pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'insertcopying_in_example'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'insertcopying_in_example.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'insertcopying_in_example'} = '<screen>text
</screen>';
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl
b/tp/t/results/preformatted/nested_example_and_comment.pl
index ea57e598b9..fb2bf3712f 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -647,7 +647,30 @@
$result_converted{'plaintext'}->{'nested_example_and_comment'} = ' First lin
';
-$result_converted{'html_text'}->{'nested_example_and_comment'} = '<div
class="example">
+$result_converted{'html'}->{'nested_example_and_comment'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="example">
<pre class="example-preformatted">First line 0 </pre><div class="example">
<pre class="example-preformatted">Nested example
</pre></div>
@@ -664,8 +687,24 @@
$result_converted{'html_text'}->{'nested_example_and_comment'} = '<div class="ex
<pre class="example-preformatted">First line 2 </pre><div class="example">
<pre class="example-preformatted">Nested example </pre></div>
<pre class="example-preformatted">In first one </pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'nested_example_and_comment'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'nested_example_and_comment.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'nested_example_and_comment'} = '<screen>First
line 0 <!-- -->
</screen><screen>Nested example
diff --git a/tp/t/results/preformatted/nested_formats.pl
b/tp/t/results/preformatted/nested_formats.pl
index 43a7854e3a..28d0102c62 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -343,7 +343,30 @@ $result_converted{'plaintext'}->{'nested_formats'} = '
';
-$result_converted{'html_text'}->{'nested_formats'} = '<div class="format">
+$result_converted{'html'}->{'nested_formats'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="format">
<div class="example">
<pre class="example-preformatted">
@@ -360,8 +383,24 @@ in -- example/format
</pre></div>
</div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'nested_formats'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'nested_formats.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'nested_formats'} = '<screen>
in -- format/example
diff --git a/tp/t/results/preformatted/page_in_example.pl
b/tp/t/results/preformatted/page_in_example.pl
index 884ddfef29..4ee1391fc5 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -122,11 +122,50 @@ $result_converted{'plaintext'}->{'page_in_example'} = '
text
';
-$result_converted{'html_text'}->{'page_in_example'} = '<div class="example">
+$result_converted{'html'}->{'page_in_example'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="example">
<pre class="example-preformatted">text
</pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'page_in_example'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'page_in_example.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'page_in_example'} = '<screen>text
</screen>';
diff --git a/tp/t/results/preformatted/quote_dash_in_display.pl
b/tp/t/results/preformatted/quote_dash_in_display.pl
index c567e85bbe..4610f44a06 100644
--- a/tp/t/results/preformatted/quote_dash_in_display.pl
+++ b/tp/t/results/preformatted/quote_dash_in_display.pl
@@ -125,13 +125,53 @@ $result_converted{'plaintext'}->{'quote_dash_in_display'}
= ' and now – ye
';
-$result_converted{'html_text'}->{'quote_dash_in_display'} = '
+$result_converted{'html'}->{'quote_dash_in_display'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.display {margin-left: 3.2em}
+pre.display-preformatted {font-family: inherit}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+
<div class="display">
<pre class="display-preformatted">and now – yes—now and
“so”.
</pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'quote_dash_in_display'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'quote_dash_in_display.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'quote_dash_in_display'} = '
<literallayout>and now – yes—now and “so”.
diff --git a/tp/t/results/preformatted/quote_dash_in_example.pl
b/tp/t/results/preformatted/quote_dash_in_example.pl
index fad2b8eaeb..d2cfccadb9 100644
--- a/tp/t/results/preformatted/quote_dash_in_example.pl
+++ b/tp/t/results/preformatted/quote_dash_in_example.pl
@@ -125,13 +125,52 @@ $result_converted{'plaintext'}->{'quote_dash_in_example'}
= ' and now -- yes
';
-$result_converted{'html_text'}->{'quote_dash_in_example'} = '
+$result_converted{'html'}->{'quote_dash_in_example'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+
<div class="example">
<pre class="example-preformatted">and now -- yes---now and ``so\'\'.
</pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'quote_dash_in_example'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'quote_dash_in_example.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'quote_dash_in_example'} = '
<screen>and now -- yes---now and ``so\'\'.
diff --git a/tp/t/results/preformatted/text_on_display_command_line.pl
b/tp/t/results/preformatted/text_on_display_command_line.pl
index 261a5aa900..b0a9eb054a 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -419,7 +419,31 @@
$result_converted{'plaintext'}->{'text_on_display_command_line'} = '
';
-$result_converted{'html_text'}->{'text_on_display_command_line'} = '
+$result_converted{'html'}->{'text_on_display_command_line'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.display {margin-left: 3.2em}
+pre.display-preformatted {font-family: inherit}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+
<div class="display">
<pre class="display-preformatted">normal text
</pre></div>
@@ -428,8 +452,24 @@
$result_converted{'html_text'}->{'text_on_display_command_line'} = '
<pre class="display-preformatted">in display
</pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'text_on_display_command_line'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'text_on_display_command_line.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'text_on_display_command_line'} = '
<literallayout>normal text
diff --git a/tp/t/results/preformatted/text_on_example_command_line.pl
b/tp/t/results/preformatted/text_on_example_command_line.pl
index 9e688a958b..86911658de 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -419,7 +419,30 @@
$result_converted{'plaintext'}->{'text_on_example_command_line'} = '
';
-$result_converted{'html_text'}->{'text_on_example_command_line'} = '
+$result_converted{'html'}->{'text_on_example_command_line'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+
<div class="example user-text-on-line-followed-by-text">
<pre class="example-preformatted">normal text
</pre></div>
@@ -428,8 +451,24 @@
$result_converted{'html_text'}->{'text_on_example_command_line'} = '
<pre class="example-preformatted">in example
</pre></div>
+
+
+
+</body>
+</html>
';
+$result_converted_errors{'html'}->{'text_on_example_command_line'} = [
+ {
+ 'error_line' => 'warning: must specify a title with a title command or @top
+',
+ 'file_name' => 'text_on_example_command_line.texi',
+ 'text' => 'must specify a title with a title command or @top',
+ 'type' => 'warning'
+ }
+];
+
+
$result_converted{'docbook'}->{'text_on_example_command_line'} = '
<screen>normal text
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl
b/tp/t/results/preformatted/titlefont_in_example.pl
index cab9cd8cb3..ff53ca7bd6 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -140,11 +140,39 @@ $result_converted{'plaintext'}->{'titlefont_in_example'}
= ' Title
';
-$result_converted{'html_text'}->{'titlefont_in_example'} = '<div
class="example">
+$result_converted{'html'}->{'titlefont_in_example'} = '<!DOCTYPE html>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Title</title>
+
+<meta name="description" content="Title">
+<meta name="keywords" content="Title">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<style type="text/css">
+<!--
+div.example {margin-left: 3.2em}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<div class="example">
<h1 class="titlefont">Title</h1><pre class="example-preformatted">
Text.
</pre></div>
+
+
+
+</body>
+</html>
';