[no subject]

[Patrice Dumas]

branch: master
commit b7cfc562a5690f0ac3fde89b6bb093c70940387f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Mar 28 22:06:01 2024 +0100

    * tp/Texinfo/Convert/HTML.pm (@global_directions): use the same order
    as in C code HTML_GLOBAL_DIRECTIONS_LIST.
    
    * tp/Texinfo/XS/convert/convert_html.c
    (html_prepare_conversion_units): do not call
    set_global_document_commands on contents commands, as it is already
    done in Perl.
---
 ChangeLog                            | 10 ++++++++++
 tp/Texinfo/Convert/HTML.pm           |  3 ++-
 tp/Texinfo/XS/convert/convert_html.c |  7 ++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 221d9b20f8..782c27f393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-03-28  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (@global_directions): use the same order
+       as in C code HTML_GLOBAL_DIRECTIONS_LIST.
+
+       * tp/Texinfo/XS/convert/convert_html.c
+       (html_prepare_conversion_units): do not call
+       set_global_document_commands on contents commands, as it is already
+       done in Perl.
+
 2024-03-28  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/convert_html.c
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 312c24cc45..b7af816712 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2555,7 +2555,8 @@ my %default_special_unit_info = (
    },
 );
 
-my @global_directions = ('First', 'Last', 'Index', 'Top');
+# to be kept in the same order as C code HTML_GLOBAL_DIRECTIONS_LIST.
+my @global_directions = ('First', 'Top', 'Index', 'Last');
 my %global_and_special_directions;
 foreach my $global_direction (@global_directions) {
   $global_and_special_directions{$global_direction} = 1;
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 5a0d295e96..d0590537d9 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -1678,8 +1678,10 @@ add_special_target (CONVERTER *self, enum 
special_target_type type,
 }
 
 
+/*
 static const enum command_id contents_elements_options[]
              = {CM_contents, CM_shortcontents, CM_summarycontents, 0};
+ */
 
 static const enum command_id conf_for_special_units[]
                           = {CM_footnotestyle, 0};
@@ -1695,9 +1697,8 @@ html_prepare_conversion_units (CONVERTER *self)
     output_units_descriptor = split_by_section (self->document);
   self->output_units_descriptors[OUDT_units] = output_units_descriptor;
 
-  /* the presence of contents elements in the document is used in diverse
-     places, set it once for all here */
-  set_global_document_commands (self, CL_last, contents_elements_options);
+  /* configuration used to determine if a special element is to be done
+     (in addition to contents) */
   set_global_document_commands (self, CL_last, conf_for_special_units);
   /*
     NOTE if the last value of footnotestyle is separate, all the footnotes