branch master updated: * tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides): reorder code.

[Patrice Dumas]

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 367e9905eb * tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides): 
reorder code.
367e9905eb is described below

commit 367e9905eb59b9f7ceaf1967008e3043cbcf6baa
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Oct 18 18:31:02 2024 +0200

    * tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides): reorder code.
    
    * tp/Texinfo/XS/convert/texinfo.c, tp/Texinfo/XS/main/utils.c,
    tp/Texinfo/XS/main/utils.h: change in comments, rebase flag values.
---
 ChangeLog                       |  7 +++++++
 tp/Texinfo/Convert/HTML.pm      | 23 +++++++++++++++--------
 tp/Texinfo/XS/convert/texinfo.c | 10 +---------
 tp/Texinfo/XS/main/utils.c      |  3 ++-
 tp/Texinfo/XS/main/utils.h      | 25 ++-----------------------
 5 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e066d57a9..6714a1889c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-10-18  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (%XS_conversion_overrides): reorder code.
+
+       * tp/Texinfo/XS/convert/texinfo.c, tp/Texinfo/XS/main/utils.c,
+       tp/Texinfo/XS/main/utils.h: change in comments, rebase flag values.
+
 2024-10-18  Gavin Smith <gavinsmith0123@gmail.com>
 
        Remove C++ source files
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 3414acf3ac..0848a66a89 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -103,20 +103,22 @@ my %XS_overrides = (
 );
 
 my %XS_conversion_overrides = (
+  "Texinfo::Convert::HTML::_XS_format_setup"
+   => "Texinfo::Convert::ConvertXS::html_format_setup",
+
   "Texinfo::Convert::HTML::converter_defaults"
    => "Texinfo::Convert::ConvertXS::converter_defaults",
+  "Texinfo::Convert::HTML::_XS_html_converter_initialize_beginning"
+   => "Texinfo::Convert::ConvertXS::html_converter_initialize_beginning",
+  "Texinfo::Convert::HTML::_XS_html_converter_get_customization"
+   => "Texinfo::Convert::ConvertXS::html_converter_get_customization_sv",
+
   "Texinfo::Convert::HTML::output"
    => "Texinfo::Convert::ConvertXS::html_output",
   "Texinfo::Convert::HTML::convert"
    => "Texinfo::Convert::ConvertXS::html_convert",
 
   # following are not called when output and convert are overriden
-  "Texinfo::Convert::HTML::_XS_format_setup"
-   => "Texinfo::Convert::ConvertXS::html_format_setup",
-  "Texinfo::Convert::HTML::_XS_html_converter_initialize_beginning"
-   => "Texinfo::Convert::ConvertXS::html_converter_initialize_beginning",
-  "Texinfo::Convert::HTML::_XS_html_converter_get_customization"
-   => "Texinfo::Convert::ConvertXS::html_converter_get_customization_sv",
   "Texinfo::Convert::HTML::conversion_initialization"
    => "Texinfo::Convert::ConvertXS::html_conversion_initialization",
   "Texinfo::Convert::HTML::_setup_convert"
@@ -130,13 +132,16 @@ my %XS_conversion_overrides = (
   "Texinfo::Convert::HTML::_prepare_converted_output_info"
    => "Texinfo::Convert::ConvertXS::html_prepare_converted_output_info",
 
+  # not called when _prepare_conversion_units is overriden
   "Texinfo::Convert::HTML::_register_id"
    => "Texinfo::Convert::ConvertXS::html_register_id",
   "Texinfo::Convert::HTML::_id_is_registered"
    => "Texinfo::Convert::ConvertXS::html_id_is_registered",
 
+  # only called from overriden functions
   "Texinfo::Convert::HTML::_get_target"
    => "Texinfo::Convert::ConvertXS::html_get_target",
+
   "Texinfo::Convert::HTML::command_id"
    => "Texinfo::Convert::ConvertXS::html_command_id",
   "Texinfo::Convert::HTML::command_contents_target"
@@ -290,14 +295,16 @@ my %XS_conversion_overrides = (
   "Texinfo::Convert::HTML::_check_htmlxref_already_warned"
    => "Texinfo::Convert::ConvertXS::html_check_htmlxref_already_warned",
 
+  "Texinfo::Convert::HTML::_translate_names"
+   => "Texinfo::Convert::ConvertXS::html_translate_names",
+
+  # following are not called when output and convert are overriden
   "Texinfo::Convert::HTML::_prepare_conversion_units"
    => "Texinfo::Convert::ConvertXS::html_prepare_conversion_units",
   "Texinfo::Convert::HTML::_prepare_units_directions_files"
    => "Texinfo::Convert::ConvertXS::html_prepare_units_directions_files",
   "Texinfo::Convert::HTML::_prepare_output_units_global_targets"
    => "Texinfo::Convert::ConvertXS::html_prepare_output_units_global_targets",
-  "Texinfo::Convert::HTML::_translate_names"
-   => "Texinfo::Convert::ConvertXS::html_translate_names",
   "Texinfo::Convert::HTML::_prepare_title_titlepage"
    => "Texinfo::Convert::ConvertXS::html_prepare_title_titlepage",
   "Texinfo::Convert::HTML::_html_convert_convert"
diff --git a/tp/Texinfo/XS/convert/texinfo.c b/tp/Texinfo/XS/convert/texinfo.c
index 72ad411f97..0fa96bcfb3 100644
--- a/tp/Texinfo/XS/convert/texinfo.c
+++ b/tp/Texinfo/XS/convert/texinfo.c
@@ -287,7 +287,7 @@ err_add_option_string_value (OPTIONS_LIST *options_list,
 }
 
 /* converter setup. Similar to an initialization of converter
-   from texi2any */
+   in texi2any */
 CONVERTER *
 txi_converter_setup (const char *format_str,
                      const char *output_format,
@@ -371,14 +371,6 @@ txi_converter_setup (const char *format_str,
 
 /* formats conversion */
 
-/*
-char *
-txi_output (CONVERTER *converter, DOCUMENT *document)
-{
-  return converter_output (converter, document);
-}
-*/
-
 /* similar to Texinfo::Convert::HTML->output */
 char *
 txi_html_output (CONVERTER *converter, DOCUMENT *document)
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index 19b32cca04..05bf350dd0 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -102,7 +102,8 @@ DEF_ALIAS def_aliases[] = {
    pgdt_context_noop("category of methods with data type in object-oriented 
programming for @deftypemethod",
                      "Method")},
 
-  /* the following aliases are not used in the XS parser */
+  /* the following aliases are not used in the parser.  They do not need
+     to be marked for translation as it is already done just above */
   {CM_defunx, CM_deffnx, "Function", "category of functions for @defun"},
   {CM_defmacx, CM_deffnx, "Macro", 0},
   {CM_defspecx, CM_deffnx, "Special Form", 0},
diff --git a/tp/Texinfo/XS/main/utils.h b/tp/Texinfo/XS/main/utils.h
index 7b059cdc00..44cd249209 100644
--- a/tp/Texinfo/XS/main/utils.h
+++ b/tp/Texinfo/XS/main/utils.h
@@ -100,29 +100,8 @@ extern const enum command_id 
small_block_associated_command[][2];
 
 /* HTML modified state flags */
 #define HMSF_current_root            0x0001
-/*
-#define HMSF_  0x0002
-#define HMSF_      0x0004
-#define HMSF_     0x0008
-#define HMSF_    0x0010
-#define HMSF_          0x0020
-#define HMSF_               0x0040
-#define HMSF_  0x0080
-#define HMSF_        0x0100
- */
-#define HMSF_current_node            0x0200
-/*
-#define HMSF_     0x0400
-#define HMSF_        0x0800
-#define HMSF_           0x1000
-#define HMSF_           0x2000
-*/
-#define HMSF_translations            0x4000
-/*
-#define HMSF_            0x8000
-#define HMSF_            0x00010000
-#define HMSF_  0x00020000
- */
+#define HMSF_current_node            0x0002
+#define HMSF_translations            0x0004
 
 typedef struct ACCENTS_STACK {
     ELEMENT_STACK stack;