[no subject]

[Patrice Dumas]

branch: master
commit 9358d801c582f777402790ec9cfe1586f639f5b0
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Oct 2 20:41:36 2024 +0200

    * tp/Texinfo/XS/convert/get_converter_perl_info.c: remove
    reset_output_init_conf.
    
    * tp/Texinfo/XS/convert/get_converter_perl_info.c
    (copy_sv_options_for_convert_text): fix init_copy_sv_options calls.
    
    * tp/Texinfo/XS/main/get_perl_info.h: declare
    get_sorted_options_key_sv_option.
---
 ChangeLog                                       | 11 +++++++++++
 tp/Texinfo/XS/convert/get_converter_perl_info.c | 24 ++----------------------
 tp/Texinfo/XS/main/get_perl_info.h              |  3 +++
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a793088019..1cb99aa23f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-10-02  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/get_converter_perl_info.c: remove
+       reset_output_init_conf.
+
+       * tp/Texinfo/XS/convert/get_converter_perl_info.c
+       (copy_sv_options_for_convert_text): fix init_copy_sv_options calls.
+
+       * tp/Texinfo/XS/main/get_perl_info.h: declare
+       get_sorted_options_key_sv_option.
+
 2024-08-03  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/ConvertXS.xs,
diff --git a/tp/Texinfo/XS/convert/get_converter_perl_info.c 
b/tp/Texinfo/XS/convert/get_converter_perl_info.c
index 5a162a9510..1d8fce947f 100644
--- a/tp/Texinfo/XS/convert/get_converter_perl_info.c
+++ b/tp/Texinfo/XS/convert/get_converter_perl_info.c
@@ -308,26 +308,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);
-    }
-}
-
 /* output format specific */
 
 /* map hash reference of Convert::Text options to TEXT_OPTIONS */
@@ -406,13 +386,13 @@ copy_sv_options_for_convert_text (SV *sv_in)
           SV **conf_sv = hv_fetch (converter_hv, "conf", strlen ("conf"), 0);
           if (conf_sv)
             text_options->other_converter_options
-              = init_copy_sv_options (*conf_sv, 0, 1);
+              = init_copy_sv_options (*conf_sv, 0, 1, 0);
         }
     }
   else
     {
       text_options->self_converter_options
-       = init_copy_sv_options (sv_in, 0, 1);
+       = init_copy_sv_options (sv_in, 0, 1, 0);
     }
 
   return text_options;
diff --git a/tp/Texinfo/XS/main/get_perl_info.h 
b/tp/Texinfo/XS/main/get_perl_info.h
index 6102b8228f..231df0a5a6 100644
--- a/tp/Texinfo/XS/main/get_perl_info.h
+++ b/tp/Texinfo/XS/main/get_perl_info.h
@@ -30,6 +30,9 @@ void set_option_key_configured (OPTIONS *options, const char 
*key,
 void get_sv_options (SV *sv, OPTIONS *options, OPTION **sorted_options,
                      CONVERTER *converter, int force);
 void set_translated_commands (CONVERTER *converter, HV *hv_in);
+int get_sorted_options_key_sv_option (OPTIONS *options, OPTION 
**sorted_options,
+                                      const char *key, SV *value,
+                                      int force, const CONVERTER *converter);
 
 DOCUMENT *get_sv_tree_document (SV *tree_in, char *warn_string);
 DOCUMENT *get_sv_document_document (SV *document_in, char *warn_string);