texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/XS/convert/call_html_perl_function.c


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/XS/convert/call_html_perl_function.c, tp/Texinfo/XS/main/call_perl_function.c (get_call_index_entries_sorted_by_letter): move get_call_index_entries_sorted_by_letter to call_perl_function.c.
Date: Thu, 01 Feb 2024 05:18:04 -0500

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 9eb9d583e0 * tp/Texinfo/XS/convert/call_html_perl_function.c, 
tp/Texinfo/XS/main/call_perl_function.c 
(get_call_index_entries_sorted_by_letter): move 
get_call_index_entries_sorted_by_letter to call_perl_function.c.
9eb9d583e0 is described below

commit 9eb9d583e0d63bda5071e891e10e7a5bb49c180f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 1 11:17:53 2024 +0100

    * tp/Texinfo/XS/convert/call_html_perl_function.c,
    tp/Texinfo/XS/main/call_perl_function.c
    (get_call_index_entries_sorted_by_letter): move
    get_call_index_entries_sorted_by_letter to call_perl_function.c.
    
    * tp/Texinfo/XS/convert/converter.c
    (converter_sort_indices_by_letter),
    tp/Texinfo/XS/main/manipulate_indices.c: move
    converter_sort_indices_by_letter to converter.c.
    
    * tp/Texinfo/Convert/Converter.pm (%XS_overrides)
    (_XS_get_converter_indices_sorted_by_letter)
    (get_converter_indices_sorted_by_letter),
    tp/Texinfo/Convert/HTML.pm (get_info),
    tp/Texinfo/Indices.pm (%XS_convert_overrides),
    tp/Texinfo/XS/convert/ConvertXS.xs
    (get_converter_indices_sorted_by_letter),
    tp/Texinfo/XS/main/IndicesXS.xs,
    tp/Texinfo/XS/convert/convert_html.c,
    tp/Texinfo/XS/convert/converter.c
    (get_converter_indices_sorted_by_letter): add
    get_converter_indices_sorted_by_letter based on get_info in HTML.pm
    and associated _XS_get_converter_indices_sorted_by_letter based on
    get_converter_indices_sorted_by_letter in Texinfo::Indices.
    Remove Texinfo::Indices::get_converter_indices_sorted_by_letter.
    Move get_converter_indices_sorted_by_letter to ConvertXS.xs.
    Rename html_get_info_index_entries_by_letter as
    get_converter_indices_sorted_by_letter and move to converter.c.
---
 ChangeLog                                       | 31 +++++++++++++++
 tp/Texinfo/Convert/Converter.pm                 | 46 +++++++++++++++++++++
 tp/Texinfo/Convert/HTML.pm                      | 30 ++------------
 tp/Texinfo/Indices.pm                           | 12 ------
 tp/Texinfo/XS/convert/ConvertXS.xs              | 20 ++++++++++
 tp/Texinfo/XS/convert/call_html_perl_function.c | 51 ------------------------
 tp/Texinfo/XS/convert/call_html_perl_function.h |  2 -
 tp/Texinfo/XS/convert/convert_html.c            | 21 +---------
 tp/Texinfo/XS/convert/convert_html.h            |  2 -
 tp/Texinfo/XS/convert/converter.c               | 38 ++++++++++++++++++
 tp/Texinfo/XS/convert/converter.h               |  4 ++
 tp/Texinfo/XS/main/IndicesXS.xs                 | 20 ----------
 tp/Texinfo/XS/main/call_perl_function.c         | 53 +++++++++++++++++++++++++
 tp/Texinfo/XS/main/call_perl_function.h         |  2 +
 tp/Texinfo/XS/main/manipulate_indices.c         | 15 -------
 tp/Texinfo/XS/main/manipulate_indices.h         |  1 -
 16 files changed, 198 insertions(+), 150 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0fb7b753b4..ae5fd49fd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2024-02-01  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/call_html_perl_function.c,
+       tp/Texinfo/XS/main/call_perl_function.c
+       (get_call_index_entries_sorted_by_letter): move
+       get_call_index_entries_sorted_by_letter to call_perl_function.c.
+
+       * tp/Texinfo/XS/convert/converter.c
+       (converter_sort_indices_by_letter),
+       tp/Texinfo/XS/main/manipulate_indices.c: move
+       converter_sort_indices_by_letter to converter.c.
+
+       * tp/Texinfo/Convert/Converter.pm (%XS_overrides)
+       (_XS_get_converter_indices_sorted_by_letter)
+       (get_converter_indices_sorted_by_letter),
+       tp/Texinfo/Convert/HTML.pm (get_info),
+       tp/Texinfo/Indices.pm (%XS_convert_overrides),
+       tp/Texinfo/XS/convert/ConvertXS.xs
+       (get_converter_indices_sorted_by_letter),
+       tp/Texinfo/XS/main/IndicesXS.xs,
+       tp/Texinfo/XS/convert/convert_html.c,
+       tp/Texinfo/XS/convert/converter.c
+       (get_converter_indices_sorted_by_letter): add
+       get_converter_indices_sorted_by_letter based on get_info in HTML.pm
+       and associated _XS_get_converter_indices_sorted_by_letter based on
+       get_converter_indices_sorted_by_letter in Texinfo::Indices.
+       Remove Texinfo::Indices::get_converter_indices_sorted_by_letter.
+       Move get_converter_indices_sorted_by_letter to ConvertXS.xs.
+       Rename html_get_info_index_entries_by_letter as
+       get_converter_indices_sorted_by_letter and move to converter.c.
+
 2024-01-31  Patrice Dumas  <pertusus@free.fr>
 
        Sort index entries on demand in HTML
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index a96e353c72..91be2b2bcd 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -96,6 +96,8 @@ my %XS_overrides = (
    => "Texinfo::Convert::ConvertXS::get_conf",
   "Texinfo::Convert::Converter::_XS_set_document"
    => "Texinfo::Convert::ConvertXS::converter_set_document",
+  "Texinfo::Convert::Converter::_XS_get_converter_indices_sorted_by_letter"
+   => "Texinfo::Convert::ConvertXS::get_converter_indices_sorted_by_letter",
 
   # fully overriden for all the converters
   "Texinfo::Convert::Converter::get_converter_errors"
@@ -1700,6 +1702,50 @@ sub comma_index_subentries_tree {
   return undef;
 }
 
+# Perl version should not be called, only used for the XS override.
+sub _XS_get_converter_indices_sorted_by_letter($$)
+{
+  my $converter = shift;
+  my $indices_information = shift;
+
+  return undef;
+}
+
+# TODO document
+sub get_converter_indices_sorted_by_letter($)
+{
+  my $self = shift;
+
+  if ($self->{'index_entries_by_letter'}) {
+    return $self->{'index_entries_by_letter'};
+  }
+
+  my $indices_information;
+  if ($self->{'document'}) {
+    $indices_information = $self->{'document'}->indices_information();
+  }
+
+  if ($indices_information) {
+    if (!$self->get_conf('TEST') and $self->{'converter_descriptor'}
+        and $XS_convert) {
+      # get from XS
+      $self->{'index_entries_by_letter'}
+        = _XS_get_converter_indices_sorted_by_letter($self,
+                                                     $indices_information);
+    } else {
+      my $merged_index_entries
+        = $self->{'document'}->merged_indices();
+
+      my $index_entries_sort_strings;
+      ($self->{'index_entries_by_letter'}, $index_entries_sort_strings)
+          = Texinfo::Indices::sort_indices_by_letter(undef, $self,
+                                           $merged_index_entries,
+                                           $indices_information);
+    }
+  }
+  return $self->{'index_entries_by_letter'};
+}
+
 sub _count_converted_text($$)
 {
   my $converted_text = shift;
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1b33574862..53363f77da 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2325,33 +2325,9 @@ sub get_info($$)
   #} else {
   #  cluck();
   } elsif ($converter_info eq 'index_entries_by_letter') {
-    my $indices_information;
-    if ($self->{'document'}) {
-      $indices_information = $self->{'document'}->indices_information();
-    }
-
-    if ($indices_information) {
-      if (!$self->get_conf('TEST') and $self->{'converter_descriptor'}
-          and $XS_convert) {
-        # get from XS
-        $self->{'index_entries_by_letter'}
-          = Texinfo::Indices::get_converter_indices_sorted_by_letter($self,
-                                                       $indices_information);
-      } else {
-        my $merged_index_entries
-          = $self->{'document'}->merged_indices();
-        my $index_entries_sort_strings;
-
-        ($self->{'index_entries_by_letter'}, $index_entries_sort_strings)
-            = Texinfo::Indices::sort_indices_by_letter(undef, $self,
-                                             $merged_index_entries,
-                                             $indices_information);
-
-      }
-      $self->{'converter_info'}->{'index_entries_by_letter'}
-        = $self->{'index_entries_by_letter'};
-      return $self->{'index_entries_by_letter'};
-    }
+    $self->{'converter_info'}->{'index_entries_by_letter'}
+      = $self->get_converter_indices_sorted_by_letter();
+    return $self->{'converter_info'}->{'index_entries_by_letter'};
   }
   return undef;
 }
diff --git a/tp/Texinfo/Indices.pm b/tp/Texinfo/Indices.pm
index 012b251027..065804e1b1 100644
--- a/tp/Texinfo/Indices.pm
+++ b/tp/Texinfo/Indices.pm
@@ -80,9 +80,6 @@ my %XS_convert_overrides = (
     => "Texinfo::IndicesXS::index_entry_element_sort_string",
   "Texinfo::Indices::setup_index_entry_keys_formatting",
     => "Texinfo::IndicesXS::setup_index_entry_keys_formatting",
-  "Texinfo::Indices::get_converter_indices_sorted_by_letter"
-    => "Texinfo::IndicesXS::get_converter_indices_sorted_by_letter",
-
 );
 
 our $module_loaded = 0;
@@ -600,15 +597,6 @@ sub sort_indices_by_letter($$$$;$)
   return ($sorted_index_entries, $index_entries_sort_strings);
 }
 
-# Perl version should not be called, only used for the XS override.
-sub get_converter_indices_sorted_by_letter($$)
-{
-  my $converter = shift;
-  my $indices_information = shift;
-
-  return undef;
-}
-
 sub merge_indices($)
 {
   my $indices_information = shift;
diff --git a/tp/Texinfo/XS/convert/ConvertXS.xs 
b/tp/Texinfo/XS/convert/ConvertXS.xs
index 22d0445d61..0554f8d49c 100644
--- a/tp/Texinfo/XS/convert/ConvertXS.xs
+++ b/tp/Texinfo/XS/convert/ConvertXS.xs
@@ -180,6 +180,26 @@ converter_document_warn (SV *converter_in, text, ...)
                       self->conf, MSG_document_warning, continuation, strdup 
(text));
            }
 
+SV *
+get_converter_indices_sorted_by_letter (SV *converter_sv, SV 
*indices_information)
+     PREINIT:
+        CONVERTER *self;
+     CODE:
+        self = get_sv_converter (converter_sv,
+                                 "get_converter_indices_sorted_by_letter");
+        if (self)
+          {
+            INDEX_SORTED_BY_LETTER *index_entries_by_letter
+              = converter_sort_indices_by_letter (self);
+            RETVAL
+             = build_sorted_indices_by_letter (index_entries_by_letter,
+                                               indices_information);
+          }
+        else
+          RETVAL = newSV (0);
+    OUTPUT:
+         RETVAL
+
 # pass the stream of an unclosed file path.
 # tried with OutputStream instead of FILE, but it did not work, there
 # was an error with a missing type.
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.c 
b/tp/Texinfo/XS/convert/call_html_perl_function.c
index 7acf951019..daa44eeec4 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.c
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.c
@@ -40,8 +40,6 @@
 #include "build_perl_info.h"
 #include "debug.h"
 #include "build_html_perl_state.h"
-/* for get_sv_index_entries_sorted_by_letter */
-#include "get_perl_info.h"
 #include "call_html_perl_function.h"
 
  /* TODO the NOTE in build_perl_info.c about not using malloc/free should
@@ -2505,52 +2503,3 @@ call_button_direction_function (CONVERTER *self,
 }
 
 
-INDEX_SORTED_BY_LETTER *
-get_call_index_entries_sorted_by_letter (CONVERTER *self)
-{
-  int count;
-  INDEX_SORTED_BY_LETTER *result = 0;
-  SV *index_entries_sorted_by_letter_sv;
-
-  dTHX;
-
-  if (!self->hv)
-    return 0;
-
-  dSP;
-
-  ENTER;
-  SAVETMPS;
-
-  PUSHMARK(SP);
-  EXTEND(SP, 1);
-
-  PUSHs(sv_2mortal (newRV_inc (self->hv)));
-  PUSHs(sv_2mortal (newSVpv ("index_entries_by_letter", 0)));
-
-  PUTBACK;
-
-  count = call_pv ("Texinfo::Convert::HTML::get_info",
-                   G_SCALAR);
-
-  SPAGAIN;
-
-  if (count != 1)
-    croak("get_index_entries_sorted_by_letter should return 1 item\n");
-
-  index_entries_sorted_by_letter_sv = POPs;
-  if (SvOK (index_entries_sorted_by_letter_sv))
-    {
-      result
-        = get_sv_index_entries_sorted_by_letter (self->document->index_names,
-                                          index_entries_sorted_by_letter_sv);
-    }
-
-  PUTBACK;
-
-  FREETMPS;
-  LEAVE;
-
-  return result;
-}
-
diff --git a/tp/Texinfo/XS/convert/call_html_perl_function.h 
b/tp/Texinfo/XS/convert/call_html_perl_function.h
index f2eab2b9c9..c2f26636b6 100644
--- a/tp/Texinfo/XS/convert/call_html_perl_function.h
+++ b/tp/Texinfo/XS/convert/call_html_perl_function.h
@@ -160,6 +160,4 @@ FORMATTED_BUTTON_INFO *call_button_direction_function 
(CONVERTER *self,
                              void *formatting_reference_sv,
                              int direction, const ELEMENT *element);
 
-INDEX_SORTED_BY_LETTER *get_call_index_entries_sorted_by_letter
-                                                   (CONVERTER *self);
 #endif
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index f6030b3b9a..082f36f47a 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -4669,25 +4669,6 @@ get_copiable_anchor (CONVERTER *self, const char *id)
   return 0;
 }
 
-INDEX_SORTED_BY_LETTER *
-html_get_info_index_entries_by_letter (CONVERTER *self)
-{
-  if (self->index_entries_by_letter)
-    return self->index_entries_by_letter;
-
-  if (self->document->index_names)
-    {
-      /* get Perl sorting for reproducible tests */
-      if (self->conf->TEST.integer > 0)
-        self->index_entries_by_letter
-         = get_call_index_entries_sorted_by_letter (self);
-      else /* sets self->index_entries_by_letter */
-        converter_sort_indices_by_letter (self);
-    }
-
-  return self->index_entries_by_letter;
-}
-
 int
 compare_index_name (const void *a, const void *b)
 {
@@ -12459,7 +12440,7 @@ convert_printindex_command (CONVERTER *self, const enum 
command_id cmd,
   char *alpha_text = 0;
   char *non_alpha_text = 0;
   INDEX_SORTED_BY_LETTER *index_entries_by_letter
-    = html_get_info_index_entries_by_letter (self);
+    = get_converter_indices_sorted_by_letter (self);
 
   if (!index_entries_by_letter)
     return;
diff --git a/tp/Texinfo/XS/convert/convert_html.h 
b/tp/Texinfo/XS/convert/convert_html.h
index a563b7380b..656ebc5c68 100644
--- a/tp/Texinfo/XS/convert/convert_html.h
+++ b/tp/Texinfo/XS/convert/convert_html.h
@@ -168,8 +168,6 @@ size_t html_check_htmlxref_already_warned (CONVERTER *self,
                                            const char *manual_name,
                                            const SOURCE_INFO *source_info);
 
-INDEX_SORTED_BY_LETTER *html_get_info_index_entries_by_letter (CONVERTER 
*self);
-
 void html_prepare_conversion_units (CONVERTER *self,
                                     int *output_units_descriptor_ref,
                                     int *special_units_descriptor_ref,
diff --git a/tp/Texinfo/XS/convert/converter.c 
b/tp/Texinfo/XS/convert/converter.c
index ba2fbbbdcf..52014cf255 100644
--- a/tp/Texinfo/XS/convert/converter.c
+++ b/tp/Texinfo/XS/convert/converter.c
@@ -40,6 +40,9 @@
 #include "translations.h"
 #include "manipulate_tree.h"
 #include "unicode.h"
+#include "manipulate_indices.h"
+#include "document.h"
+#include "call_perl_function.h"
 #include "converter.h"
 
 /* associate lower case no brace accent command to the upper case
@@ -638,6 +641,41 @@ free_comma_index_subentries_tree (ELEMENT_LIST 
*element_list)
   destroy_list (element_list);
 }
 
+INDEX_SORTED_BY_LETTER *
+converter_sort_indices_by_letter (CONVERTER *self)
+{
+  if (self->index_entries_by_letter)
+    return self->index_entries_by_letter;
+
+  const MERGED_INDICES *merged_indices
+    = document_merged_indices (self->document);
+
+  self->index_entries_by_letter
+    = sort_indices_by_letter (&self->error_messages, self->conf,
+                              merged_indices,
+                              self->document->index_names);
+  return self->index_entries_by_letter;
+}
+
+INDEX_SORTED_BY_LETTER *
+get_converter_indices_sorted_by_letter (CONVERTER *self)
+{
+  if (self->index_entries_by_letter)
+    return self->index_entries_by_letter;
+
+  if (self->document->index_names)
+    {
+      /* get Perl sorting for reproducible tests */
+      if (self->conf->TEST.integer > 0)
+        self->index_entries_by_letter
+         = get_call_index_entries_sorted_by_letter (self);
+      else /* sets self->index_entries_by_letter */
+        converter_sort_indices_by_letter (self);
+    }
+
+  return self->index_entries_by_letter;
+}
+
 /* to be freed by caller */
 char *
 top_node_filename (CONVERTER *self, char *document_name)
diff --git a/tp/Texinfo/XS/convert/converter.h 
b/tp/Texinfo/XS/convert/converter.h
index a9a3730368..63170a55fa 100644
--- a/tp/Texinfo/XS/convert/converter.h
+++ b/tp/Texinfo/XS/convert/converter.h
@@ -114,6 +114,10 @@ ELEMENT_LIST *comma_index_subentries_tree (const ELEMENT 
*current_entry,
                                            char *separator);
 void free_comma_index_subentries_tree (ELEMENT_LIST *element);
 
+INDEX_SORTED_BY_LETTER *converter_sort_indices_by_letter (CONVERTER *self);
+INDEX_SORTED_BY_LETTER *get_converter_indices_sorted_by_letter
+                                                 (CONVERTER *self);
+
 char *top_node_filename (CONVERTER *self, char *document_name);
 
 ELEMENT *float_type_number (CONVERTER *self, const ELEMENT *float_e);
diff --git a/tp/Texinfo/XS/main/IndicesXS.xs b/tp/Texinfo/XS/main/IndicesXS.xs
index 5cb9491003..6bf14e2f93 100644
--- a/tp/Texinfo/XS/main/IndicesXS.xs
+++ b/tp/Texinfo/XS/main/IndicesXS.xs
@@ -154,26 +154,6 @@ index_entry_element_sort_string (SV 
*customization_info_sv, SV *main_entry_sv, S
     OUTPUT:
          RETVAL
 
-SV *
-get_converter_indices_sorted_by_letter (SV *converter_sv, SV 
*indices_information)
-     PREINIT:
-        CONVERTER *self;
-     CODE:
-        self = get_sv_converter (converter_sv, "get_indices_sorted_by_letter");
-        if (self)
-          {
-            INDEX_SORTED_BY_LETTER *index_entries_by_letter
-              = converter_sort_indices_by_letter (self);
-            RETVAL
-             = build_sorted_indices_by_letter (index_entries_by_letter,
-                                               indices_information);
-          }
-        else
-          RETVAL = newSV (0);
-    OUTPUT:
-         RETVAL
-
-
 #void
 #sort_indices_by_letter (SV *registrar, SV *customization_information, SV 
*index_entries, SV *indices_information, ...)
 #     PROTOTYPE: $$$$;$
diff --git a/tp/Texinfo/XS/main/call_perl_function.c 
b/tp/Texinfo/XS/main/call_perl_function.c
index 60c657bf34..183bd9e796 100644
--- a/tp/Texinfo/XS/main/call_perl_function.c
+++ b/tp/Texinfo/XS/main/call_perl_function.c
@@ -35,6 +35,8 @@
 #include "tree_types.h"
 #include "converter_types.h"
 #include "build_perl_info.h"
+/* for get_sv_index_entries_sorted_by_letter */
+#include "get_perl_info.h"
 #include "call_perl_function.h"
 
  /* The NOTE in build_perl_info.c about not using malloc/free should
@@ -155,3 +157,54 @@ call_latex_convert_to_latex_math (CONVERTER *self, ELEMENT 
*element)
 
   return result;
 }
+
+INDEX_SORTED_BY_LETTER *
+get_call_index_entries_sorted_by_letter (CONVERTER *self)
+{
+  int count;
+  INDEX_SORTED_BY_LETTER *result = 0;
+  SV *index_entries_sorted_by_letter_sv;
+
+  dTHX;
+
+  if (!self->hv)
+    return 0;
+
+  dSP;
+
+  ENTER;
+  SAVETMPS;
+
+  PUSHMARK(SP);
+  EXTEND(SP, 1);
+
+  PUSHs(sv_2mortal (newRV_inc (self->hv)));
+  PUSHs(sv_2mortal (newSVpv ("index_entries_by_letter", 0)));
+
+  PUTBACK;
+
+  count = call_pv (
+    "Texinfo::Convert::Converter::get_converter_indices_sorted_by_letter",
+                   G_SCALAR);
+
+  SPAGAIN;
+
+  if (count != 1)
+    croak("get_converter_indices_sorted_by_letter should return 1 item\n");
+
+  index_entries_sorted_by_letter_sv = POPs;
+  if (SvOK (index_entries_sorted_by_letter_sv))
+    {
+      result
+        = get_sv_index_entries_sorted_by_letter (self->document->index_names,
+                                          index_entries_sorted_by_letter_sv);
+    }
+
+  PUTBACK;
+
+  FREETMPS;
+  LEAVE;
+
+  return result;
+}
+
diff --git a/tp/Texinfo/XS/main/call_perl_function.h 
b/tp/Texinfo/XS/main/call_perl_function.h
index c1e5a89af9..cbeb404915 100644
--- a/tp/Texinfo/XS/main/call_perl_function.h
+++ b/tp/Texinfo/XS/main/call_perl_function.h
@@ -9,4 +9,6 @@ char *call_nodenamenormalization_unicode_to_transliterate (char 
*text);
 
 char *call_latex_convert_to_latex_math (CONVERTER *self, ELEMENT *element);
 
+INDEX_SORTED_BY_LETTER *get_call_index_entries_sorted_by_letter
+                                                   (CONVERTER *self);
 #endif
diff --git a/tp/Texinfo/XS/main/manipulate_indices.c 
b/tp/Texinfo/XS/main/manipulate_indices.c
index 78e88ff21c..2a315219cd 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.c
+++ b/tp/Texinfo/XS/main/manipulate_indices.c
@@ -805,18 +805,3 @@ sort_indices_by_letter (ERROR_MESSAGE_LIST *error_messages,
   return sorted_index_entries;
 }
 
-INDEX_SORTED_BY_LETTER *
-converter_sort_indices_by_letter (CONVERTER *self)
-{
-  if (self->index_entries_by_letter)
-    return self->index_entries_by_letter;
-
-  const MERGED_INDICES *merged_indices
-    = document_merged_indices (self->document);
-
-  self->index_entries_by_letter
-    = sort_indices_by_letter (&self->error_messages, self->conf,
-                              merged_indices,
-                              self->document->index_names);
-  return self->index_entries_by_letter;
-}
diff --git a/tp/Texinfo/XS/main/manipulate_indices.h 
b/tp/Texinfo/XS/main/manipulate_indices.h
index e305b334ed..1655972208 100644
--- a/tp/Texinfo/XS/main/manipulate_indices.h
+++ b/tp/Texinfo/XS/main/manipulate_indices.h
@@ -50,5 +50,4 @@ INDEX_SORTED_BY_LETTER *sort_indices_by_letter (
                         ERROR_MESSAGE_LIST *error_messages,
                         OPTIONS *options, const MERGED_INDICES *merged_indices,
                         INDEX **indices_information);
-INDEX_SORTED_BY_LETTER *converter_sort_indices_by_letter (CONVERTER *self);
 #endif



reply via email to

[Prev in Thread] Current Thread [Next in Thread]