[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Fri, 8 Dec 2023 13:06:07 -0500 (EST) |
branch: master
commit e622ca18a57e264bd35a85f9812c224e4a629a0f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 8 19:05:58 2023 +0100
* tp/t/test_utils.pl (convert_to_html): get XS error messages by
calling get_converter_errors.
* tp/init/documentation_examples.pm (my_convert_paragraph_type): call
get_associated_formatted_inline_content as it should be.
---
ChangeLog | 8 ++++++++
tp/init/documentation_examples.pm | 2 ++
tp/t/test_utils.pl | 8 ++++++++
3 files changed, 18 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 5cdfee3cc1..5ed18493d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-12-08 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/test_utils.pl (convert_to_html): get XS error messages by
+ calling get_converter_errors.
+
+ * tp/init/documentation_examples.pm (my_convert_paragraph_type): call
+ get_associated_formatted_inline_content as it should be.
+
2023-12-08 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm (_noticed_line_warn): do not return a
diff --git a/tp/init/documentation_examples.pm
b/tp/init/documentation_examples.pm
index 93a956a6d6..cc34e108dd 100644
--- a/tp/init/documentation_examples.pm
+++ b/tp/init/documentation_examples.pm
@@ -125,6 +125,8 @@ sub my_convert_paragraph_type($$$$)
$content = '' if (!defined($content));
+ $content =
$converter->get_associated_formatted_inline_content($element).$content;
+
return $content if ($converter->in_string());
my @contents = @{$element->{'contents'}};
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 79a1b5bd0f..8f70399fb5 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -588,6 +588,14 @@ sub convert_to_html($$$$$$;$)
$result = $converter->output($document);
close_files($converter);
}
+
+ my $converter_errors = $converter->get_converter_errors();
+ if (defined($converter_errors)) {
+ foreach my $error (@$converter_errors) {
+ $converter->add_formatted_message($error);
+ }
+ }
+
die if (!defined($converter_options->{'SUBDIR'}) and !defined($result));
my ($errors, $error_nrs) = $converter->errors();
return ($errors, $result, $converter);