[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Wed, 2 Oct 2024 11:47:13 -0400 (EDT) |
branch: master
commit cffde1d606327b050ab03acd05e8c2dcfdda79bd
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Oct 2 17:47:16 2024 +0200
* tp/Texinfo/XS/convert/get_converter_perl_info.c
(reset_output_init_conf), tp/Texinfo/XS/main/get_perl_info.c: move
reset_output_init_conf to get_converter_perl_info.c.
---
ChangeLog | 6 ++++++
tp/Texinfo/XS/convert/converters_defaults.c | 3 +++
tp/Texinfo/XS/convert/get_converter_perl_info.c | 20 ++++++++++++++++++++
tp/Texinfo/XS/main/get_perl_info.c | 20 --------------------
4 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 292e87a9b9..5892315898 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2024-10-02 Patrice Dumas <pertusus@free.fr>
+ * tp/Texinfo/XS/convert/get_converter_perl_info.c
+ (reset_output_init_conf), tp/Texinfo/XS/main/get_perl_info.c: move
+ reset_output_init_conf to get_converter_perl_info.c.
+
+2024-08-02 Patrice Dumas <pertusus@free.fr>
+
* tp/Texinfo/XS/main/build_perl_info.c (get_sv_conf): rename get_conf
as get_sv_conf. Update callers.
diff --git a/tp/Texinfo/XS/convert/converters_defaults.c
b/tp/Texinfo/XS/convert/converters_defaults.c
index 491bf044e9..863ec1ab4a 100644
--- a/tp/Texinfo/XS/convert/converters_defaults.c
+++ b/tp/Texinfo/XS/convert/converters_defaults.c
@@ -15,6 +15,7 @@ void set_array_cmdline_regular_defaults (OPTIONS *options)
set_conf (&options->CSS_REFS, -2, 0);
set_conf (&options->EXPANDED_FORMATS, -2, 0);
set_conf (&options->INCLUDE_DIRECTORIES, -2, 0);
+ set_conf (&options->TEXINFO_LANGUAGE_DIRECTORIES, -2, 0);
}
@@ -118,6 +119,7 @@ void set_converter_customization_regular_defaults (OPTIONS
*options)
set_conf (&options->L2H_L2H, -2, 0);
set_conf (&options->L2H_SKIP, -1, 0);
set_conf (&options->L2H_TMP, -2, 0);
+ set_conf (&options->MATHJAX_CONFIGURATION, -2, 0);
set_conf (&options->MATHJAX_SCRIPT, -2, 0);
set_conf (&options->MATHJAX_SOURCE, -2, 0);
set_conf (&options->MAX_HEADER_LEVEL, -1, 0);
@@ -179,6 +181,7 @@ void set_converter_customization_regular_defaults (OPTIONS
*options)
set_conf (&options->XS_EXTERNAL_CONVERSION, -1, 0);
set_conf (&options->XS_EXTERNAL_FORMATTING, -1, 0);
set_conf (&options->XS_STRXFRM_COLLATION_LOCALE, -2, 0);
+ set_conf (&options->_INLINE_STYLE_WIDTH, -1, 0);
}
diff --git a/tp/Texinfo/XS/convert/get_converter_perl_info.c
b/tp/Texinfo/XS/convert/get_converter_perl_info.c
index 1751b1a2eb..2915639407 100644
--- a/tp/Texinfo/XS/convert/get_converter_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_converter_perl_info.c
@@ -238,6 +238,26 @@ converter_initialize (SV *converter_sv)
return converter_descriptor;
}
+/* currently unused */
+/* reset output_init_conf. Can be called after it has been modified */
+void
+reset_output_init_conf (SV *sv_in)
+{
+ CONVERTER *converter;
+
+ dTHX;
+
+ converter = get_sv_converter (sv_in, "reset_output_init_conf");
+
+ if (converter)
+ {
+ HV *hv_in = (HV *)SvRV (sv_in);
+
+ copy_converter_conf_sv (hv_in, converter, &converter->init_conf,
+ "output_init_conf", 1);
+ }
+}
+
/* output format specific */
/* map hash reference of Convert::Text options to TEXT_OPTIONS */
diff --git a/tp/Texinfo/XS/main/get_perl_info.c
b/tp/Texinfo/XS/main/get_perl_info.c
index 5b78ee4ed7..7060a7f095 100644
--- a/tp/Texinfo/XS/main/get_perl_info.c
+++ b/tp/Texinfo/XS/main/get_perl_info.c
@@ -565,26 +565,6 @@ converter_initialize_sv (SV *converter_sv, CONVERTER
*converter,
converter->conf);
}
-/* currently unused */
-/* reset output_init_conf. Can be called after it has been modified */
-void
-reset_output_init_conf (SV *sv_in)
-{
- CONVERTER *converter;
-
- dTHX;
-
- converter = get_sv_converter (sv_in, "reset_output_init_conf");
-
- if (converter)
- {
- HV *hv_in = (HV *)SvRV (sv_in);
-
- copy_converter_conf_sv (hv_in, converter, &converter->init_conf,
- "output_init_conf", 1);
- }
-}
-
INDEX_ENTRY *
find_index_entry_sv (const SV *index_entry_sv, INDEX_LIST *indices_info,
const char *warn_string, const INDEX **entry_idx,