[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Tue, 1 Oct 2024 11:57:58 -0400 (EDT) |
branch: master
commit 514b985efaae3183cb0a7633c695261225089cf7
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jul 24 18:01:44 2024 +0200
* tp/Texinfo/XS/convert/ConvertXS.xs
(html_prepare_output_units_global_targets),
tp/Texinfo/XS/convert/build_html_perl_state.c
(html_pass_output_units_global_targets): remove code used in
html_prepare_output_units_global_targets to pass data to Perl, put in
html_pass_output_units_global_targets new function.
---
ChangeLog | 9 +++++++++
tp/Texinfo/XS/convert/ConvertXS.xs | 15 ++-------------
tp/Texinfo/XS/convert/build_html_perl_state.c | 18 ++++++++++++++++++
tp/Texinfo/XS/convert/build_html_perl_state.h | 4 ++++
4 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fa28e923bc..6a65674de7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,15 @@
(call_formatting_function_format_single_footnote): check and reset
flags in build_html_formatting_state.
+2024-07-24 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/convert/ConvertXS.xs
+ (html_prepare_output_units_global_targets),
+ tp/Texinfo/XS/convert/build_html_perl_state.c
+ (html_pass_output_units_global_targets): remove code used in
+ html_prepare_output_units_global_targets to pass data to Perl, put in
+ html_pass_output_units_global_targets new function.
+
2024-07-24 Patrice Dumas <pertusus@free.fr>
XS override for HTML::output
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 1974478ad5..d3c9251ba5 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -2309,19 +2309,8 @@ html_prepare_output_units_global_targets (SV
*converter_in, SV *output_units_in,
"html_prepare_output_units_global_targets");
html_prepare_output_units_global_targets (self);
- if (self->external_references_number > 0)
- {
- rebuild_output_units_list (self->document, output_units_in,
- self->output_units_descriptors[OUDT_units]);
- rebuild_output_units_list (self->document, special_units_in,
- self->output_units_descriptors[OUDT_special_units]);
- rebuild_output_units_list (self->document,
- associated_special_units_in,
- self->output_units_descriptors[OUDT_associated_special_units]);
-
- html_setup_global_units_direction_names (self);
- }
-
+ html_pass_output_units_global_targets (self, output_units_in,
+ special_units_in, associated_special_units_in);
void
html_translate_names (SV *converter_in)
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.c
b/tp/Texinfo/XS/convert/build_html_perl_state.c
index 8fb3e8f77e..7a0285ee58 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_state.c
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.c
@@ -532,6 +532,24 @@ html_pass_units_directions_files (CONVERTER *converter,
}
}
+void
+html_pass_output_units_global_targets (CONVERTER *self, SV *output_units_sv,
+ SV *special_units_sv, SV *associated_special_units_sv)
+{
+ if (self->external_references_number > 0)
+ {
+ rebuild_output_units_list (self->document, output_units_sv,
+ self->output_units_descriptors[OUDT_units]);
+ rebuild_output_units_list (self->document, special_units_sv,
+ self->output_units_descriptors[OUDT_special_units]);
+ rebuild_output_units_list (self->document,
+ associated_special_units_sv,
+ self->output_units_descriptors[OUDT_associated_special_units]);
+
+ html_setup_global_units_direction_names (self);
+ }
+}
+
void
build_html_translated_names (HV *hv, CONVERTER *converter)
{
diff --git a/tp/Texinfo/XS/convert/build_html_perl_state.h
b/tp/Texinfo/XS/convert/build_html_perl_state.h
index 7bdf2ced2c..c6c40e713d 100644
--- a/tp/Texinfo/XS/convert/build_html_perl_state.h
+++ b/tp/Texinfo/XS/convert/build_html_perl_state.h
@@ -30,6 +30,10 @@ void html_pass_units_directions_files (CONVERTER *converter,
SV *special_units_sv,
SV *associated_special_units_sv);
+void html_pass_output_units_global_targets (CONVERTER *self,
+ SV *output_units_sv,
+ SV *special_units_sv, SV *associated_special_units_sv);
+
SV *build_html_files_source_info
(const FILE_SOURCE_INFO_LIST *files_source_info);
void pass_html_global_units_directions (SV *converter_sv,