[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch release/7.0 updated: * util/htmlxref.cnf: add manuals, in particu
|
From: |
Gavin D. Smith |
|
Subject: |
branch release/7.0 updated: * util/htmlxref.cnf: add manuals, in particular mono manuals and fix some issues with existing manuals. Report from Tzvetelin Katchov. Rename mairix manual as mairix-el, and smalltalk* manuals as gst*. |
|
Date: |
Sat, 12 Nov 2022 18:19:24 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch release/7.0
in repository texinfo.
The following commit(s) were added to refs/heads/release/7.0 by this push:
new c003e27956 * util/htmlxref.cnf: add manuals, in particular mono
manuals and fix some issues with existing manuals. Report from Tzvetelin
Katchov. Rename mairix manual as mairix-el, and smalltalk* manuals as gst*.
c003e27956 is described below
commit c003e27956e343a9c31e8d626470aa51c27a0914
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Nov 12 23:19:13 2022 +0000
* util/htmlxref.cnf: add manuals, in particular mono manuals
and fix some issues with existing manuals. Report from Tzvetelin
Katchov.
Rename mairix manual as mairix-el, and smalltalk* manuals as
gst*.
---
tp/Texinfo/Convert/HTML.pm | 3 ++-
tp/t/results/preformatted/titlefont_in_example.pl | 17 +++--------------
tp/t/results/sectioning/unnumbered_before_top_node.pl | 16 +++-------------
3 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 80683cd31f..0fd68beca8 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -9927,7 +9927,8 @@ sub output($$)
if (!$fulltitle and $self->{'global_commands'}->{'titlefont'}
and $self->{'global_commands'}->{'titlefont'}->[0]->{'args'}
and
defined($self->{'global_commands'}->{'titlefont'}->[0]->{'args'}->[0])
- and $self->{'global_commands'}->{'titlefont'}->[0]->{'contents'}
+ and $self->{'global_commands'}->{'titlefont'}->[0]
+ ->{'args'}->[0]->{'contents'}
and
@{$self->{'global_commands'}->{'titlefont'}->[0]->{'args'}->[0]->{'contents'}})
{
$fulltitle = $self->{'global_commands'}->{'titlefont'}->[0];
}
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl
b/tp/t/results/preformatted/titlefont_in_example.pl
index 9b97554876..d35b4e7fdc 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -121,10 +121,10 @@ $result_converted{'html'}->{'titlefont_in_example'} =
'<!DOCTYPE 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>
+<title>Title</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<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">
@@ -151,17 +151,6 @@ Text.
</html>
';
-$result_converted_errors{'html'}->{'titlefont_in_example'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'titlefont_in_example.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
$result_converted{'docbook'}->{'titlefont_in_example'} = 'Title<screen>
Text.
diff --git a/tp/t/results/sectioning/unnumbered_before_top_node.pl
b/tp/t/results/sectioning/unnumbered_before_top_node.pl
index c051159adc..8f7800a166 100644
--- a/tp/t/results/sectioning/unnumbered_before_top_node.pl
+++ b/tp/t/results/sectioning/unnumbered_before_top_node.pl
@@ -298,10 +298,10 @@ $result_converted{'html'}->{'unnumbered_before_top_node'}
= '<!DOCTYPE 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>
+<title>Title titlefont</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="Title titlefont">
+<meta name="keywords" content="Title titlefont">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -327,16 +327,6 @@ $result_converted{'html'}->{'unnumbered_before_top_node'}
= '<!DOCTYPE html>
</html>
';
-$result_converted_errors{'html'}->{'unnumbered_before_top_node'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
$result_converted{'docbook'}->{'unnumbered_before_top_node'} = '<chapter
label="">
<title>before nodes</title>