[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (run_stage_handlers)
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (run_stage_handlers), tp/Texinfo/Convert/TexinfoXML.pm (output): fix the call of document_error(). |
|
Date: |
Tue, 21 Dec 2021 03:57:08 -0500 |
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 796ba54 * tp/Texinfo/Convert/HTML.pm (run_stage_handlers),
tp/Texinfo/Convert/TexinfoXML.pm (output): fix the call of document_error().
796ba54 is described below
commit 796ba54c2258096785b0f3dd41a644968b861af9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 21 09:56:55 2021 +0100
* tp/Texinfo/Convert/HTML.pm (run_stage_handlers),
tp/Texinfo/Convert/TexinfoXML.pm (output): fix the call of
document_error().
* tp/Texinfo/Report.pm: correct the orer of arguments in
document_error() documentation.
---
ChangeLog | 9 +++++++++
tp/Texinfo/Convert/HTML.pm | 9 ++++++---
tp/Texinfo/Convert/TexinfoXML.pm | 6 ++++--
tp/Texinfo/Report.pm | 4 ++--
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 51b219c..30e8629 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-12-21 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (run_stage_handlers),
+ tp/Texinfo/Convert/TexinfoXML.pm (output): fix the call of
+ document_error().
+
+ * tp/Texinfo/Report.pm: correct the orer of arguments in
+ document_error() documentation.
+
2021-12-20 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (html_attribute_class): fix case
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 8241c4b..e601235 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -7624,9 +7624,9 @@ sub run_stage_handlers($$$)
#if ($converter->get_conf('VERBOSE')) {
# print STDERR "Handler $handler of $stage($priority) failed\n";
#}
- $converter->document_error(sprintf(__(
- "handler %s of stage %s priority %s failed"),
- $handler, $stage, $priority));
+ $converter->document_error($converter,
+ sprintf(__("handler %s of stage %s priority %s failed"),
+ $handler, $stage, $priority));
return $status;
}
}
@@ -8513,6 +8513,9 @@ sub _convert($$;$)
sub _set_variables_texi2html()
{
my @texi2html_options = (
+ # added hopefully temporarily to be able to validate with W3C validator
+ #['DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>'],
+ #['DOCTYPE', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>'],
['FORMAT_MENU', 'menu'],
['NO_USE_SETFILENAME', 1],
['USE_SETFILENAME_EXTENSION', 0],
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 0c7926f..3db9b2f 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -450,7 +450,8 @@ sub output($$)
$self->output_files_information(), $self,
$output_file);
if (!$fh) {
- $self->document_error(sprintf(__("could not open %s for writing: %s"),
+ $self->document_error($self,
+ sprintf(__("could not open %s for writing: %s"),
$output_file, $!));
return undef;
}
@@ -469,7 +470,8 @@ sub output($$)
Texinfo::Common::output_files_register_closed(
$self->output_files_information(), $output_file);
if (!close ($fh)) {
- $self->document_error(sprintf(__("error on closing %s: %s"),
+ $self->document_error($self,
+ sprintf(__("error on closing %s: %s"),
$output_file, $!));
}
}
diff --git a/tp/Texinfo/Report.pm b/tp/Texinfo/Report.pm
index 9cce8d1..7efe1ff 100644
--- a/tp/Texinfo/Report.pm
+++ b/tp/Texinfo/Report.pm
@@ -315,9 +315,9 @@ for the @-commands. The I<$line_nr> structure is described
in L<errors|($error_warnings_list, $error_count) = errors ($registrar)>
above.
-=item $registrar->document_warn($text, $configuration_informations)
+=item $registrar->document_warn($configuration_informations, $text)
-=item $registrar->document_error($text, $configuration_informations)
+=item $registrar->document_error($configuration_informations, $text)
Register a document-wide error or warning. I<$text> is the error or
warning message. The I<$configuration_informations> object gives
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (run_stage_handlers), tp/Texinfo/Convert/TexinfoXML.pm (output): fix the call of document_error().,
Patrice Dumas <=