branch master updated: * tp/Texinfo/XS/convert/create_buttons.c (new_button_specification) (new_button_specification_list, new_base_navigation_buttons) (new_base_links_buttons, new_base_navigation_section_buttons) (new_base_navigation_section_footer_buttons), tp/Texinfo/XS/convert/html_converter_init_options.c, tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES): put buttons creations functions in a separate file, create_buttons.c. Rename some functions.

[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 74abf43743 * tp/Texinfo/XS/convert/create_buttons.c 
(new_button_specification) (new_button_specification_list, 
new_base_navigation_buttons) (new_base_links_buttons, 
new_base_navigation_section_buttons) 
(new_base_navigation_section_footer_buttons), 
tp/Texinfo/XS/convert/html_converter_init_options.c, tp/Texinfo/XS/Makefile.am 
(libtexinfo_convert_la_SOURCES): put buttons creations functions in a separate 
file, create_buttons.c.  Rename some functions.
74abf43743 is described below

commit 74abf43743ec6060b4194561d60baf8f3ff8daad
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Aug 10 11:54:02 2024 +0200

    * tp/Texinfo/XS/convert/create_buttons.c (new_button_specification)
    (new_button_specification_list, new_base_navigation_buttons)
    (new_base_links_buttons, new_base_navigation_section_buttons)
    (new_base_navigation_section_footer_buttons),
    tp/Texinfo/XS/convert/html_converter_init_options.c,
    tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES): put buttons
    creations functions in a separate file, create_buttons.c.  Rename some
    functions.
---
 ChangeLog                                          |  11 +
 tp/Texinfo/XS/Makefile.am                          |   2 +
 ...l_converter_init_options.c => create_buttons.c} | 270 ++++-----------------
 tp/Texinfo/XS/convert/create_buttons.h             |  34 +++
 .../XS/convert/html_converter_init_options.c       | 228 +----------------
 5 files changed, 109 insertions(+), 436 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5379fd912..026671d4be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,17 @@
        its argument, after that the implementation moved into an inline
        function.
 
+2024-08-10  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/convert/create_buttons.c (new_button_specification)
+       (new_button_specification_list, new_base_navigation_buttons)
+       (new_base_links_buttons, new_base_navigation_section_buttons)
+       (new_base_navigation_section_footer_buttons),
+       tp/Texinfo/XS/convert/html_converter_init_options.c,
+       tp/Texinfo/XS/Makefile.am (libtexinfo_convert_la_SOURCES): put buttons
+       creations functions in a separate file, create_buttons.c.  Rename some
+       functions.
+
 2024-08-10  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/utils.c (list_add_option)
diff --git a/tp/Texinfo/XS/Makefile.am b/tp/Texinfo/XS/Makefile.am
index 9770966e72..8289a55170 100644
--- a/tp/Texinfo/XS/Makefile.am
+++ b/tp/Texinfo/XS/Makefile.am
@@ -384,6 +384,8 @@ C_libtexinfo_convert_sources = \
                        convert/convert_html.c \
                        convert/converters_defaults.c \
                        convert/converters_defaults.h \
+                       convert/create_buttons.c \
+                       convert/create_buttons.h \
                        convert/html_converter_init_options.c \
                        convert/html_converter_init_options.h \
                        convert/texinfo.c \
diff --git a/tp/Texinfo/XS/convert/html_converter_init_options.c 
b/tp/Texinfo/XS/convert/create_buttons.c
similarity index 52%
copy from tp/Texinfo/XS/convert/html_converter_init_options.c
copy to tp/Texinfo/XS/convert/create_buttons.c
index fa63c84f87..dd940d0929 100644
--- a/tp/Texinfo/XS/convert/html_converter_init_options.c
+++ b/tp/Texinfo/XS/convert/create_buttons.c
@@ -23,10 +23,12 @@
 #include "tree_types.h"
 #include "option_types.h"
 #include "converter_types.h"
-#include "converters_defaults.h"
+/* html_get_direction_index */
 #include "utils.h"
+/*
 #include "converter.h"
-#include "html_converter_init_options.h"
+ */
+#include "create_buttons.h"
 
 /* HTML converter options setting and initialization.  Not with format
    specific converter code, since this code is called from generic
@@ -103,6 +105,46 @@ new_button_specification_list (size_t buttons_nr)
   return result;
 }
 
+/* a negative direction in DIRECTIONS corresponds to a special direction
+    which index is not known early and is better stored as a string.
+
+    Mainly called for texi2html style navigation buttons, but also for
+    default special units navigation panel buttons.
+  */
+BUTTON_SPECIFICATION_LIST *
+new_directions_list_buttons_specifications (CONVERTER *self,
+                                            const int* directions)
+{
+  int buttons_nr = 0;
+  int i;
+  BUTTON_SPECIFICATION_LIST *result;
+
+  for (buttons_nr = 0; directions[buttons_nr] != -1; buttons_nr++) {};
+
+  result = new_button_specification_list (buttons_nr);
+
+  for (i = 0; i < buttons_nr; i++)
+    {
+      int direction_index = directions[i];
+      int direction;
+      const char *direction_string = 0;
+      if (direction_index < 0)
+        {
+          int name_idx = -direction_index - 2;
+          direction_string = buttons_special_units_names[name_idx];
+          direction = html_get_direction_index (self, direction_string);
+          if (direction >= 0)
+            direction_string = 0;
+        }
+      else
+        direction = direction_index;
+
+      new_button_specification (&result->list[i], BST_direction,
+                        0, direction, direction_string, 0, 0, 0);
+    }
+  return result;
+}
+
 static void
 new_special_unit_direction_button (BUTTON_SPECIFICATION *button,
                                    int direction, const char *name)
@@ -117,9 +159,9 @@ new_special_unit_direction_button (BUTTON_SPECIFICATION 
*button,
 
 /* BFT_type_panel_directions */
 BUTTON_SPECIFICATION_LIST *
-new_basic_buttons (const CONVERTER *self,
-                   enum button_function_type function_type,
-                   int with_about)
+new_base_navigation_buttons (const CONVERTER *self,
+                             enum button_function_type function_type,
+                             int with_about)
 {
   BUTTON_SPECIFICATION_LIST *result;
   int buttons_nr = 6;
@@ -157,7 +199,7 @@ new_basic_buttons (const CONVERTER *self,
 }
 
 BUTTON_SPECIFICATION_LIST *
-new_link_buttons (const CONVERTER *self)
+new_base_links_buttons (const CONVERTER *self)
 {
   BUTTON_SPECIFICATION_LIST *result = new_button_specification_list (7);
   /* this function may be called too early for special units direction
@@ -186,222 +228,14 @@ new_link_buttons (const CONVERTER *self)
 }
 
 BUTTON_SPECIFICATION_LIST *
-new_section_buttons (const CONVERTER *self)
+new_base_navigation_section_buttons (const CONVERTER *self)
 {
-  return new_basic_buttons (self, BFT_type_panel_directions, 1);
+  return new_base_navigation_buttons (self, BFT_type_panel_directions, 1);
 }
 
 BUTTON_SPECIFICATION_LIST *
-new_section_footer_buttons (const CONVERTER *self)
-{
-  return new_basic_buttons (self, BFT_type_panel_section_footer, 0);
-}
-
-
-
-static const int DEFAULT_MISC_BUTTONS[] = {
- D_direction_Top, BSUD_D_Contents, D_direction_Index, BSUD_D_About,
- -1
-};
-
-/* same as NODE_FOOTER_BUTTONS */
-static const int T2H_SECTION_BUTTONS[] = {
- D_direction_FastBack, D_direction_Back, D_direction_Up, D_direction_Forward,
- D_direction_FastForward,
- D_direction_Space, D_direction_Space, D_direction_Space, D_direction_Space,
- D_direction_Top, BSUD_D_Contents, D_direction_Index, BSUD_D_About,
- -1
-};
-
-/* same as TOP_FOOTER_BUTTONS */
-static const int T2H_TOP_BUTTONS[] = {
- D_direction_Back, D_direction_Forward, D_direction_Space,
- BSUD_D_Contents, D_direction_Index, BSUD_D_About,
- -1
-};
-
-/* same as CHAPTER_FOOTER_BUTTONS */
-static const int T2H_CHAPTER_BUTTONS[] = {
- D_direction_FastBack, D_direction_FastForward, D_direction_Space,
- D_direction_Space, D_direction_Space, D_direction_Space, D_direction_Space,
- D_direction_Top, BSUD_D_Contents, D_direction_Index, BSUD_D_About,
- -1
-};
-
-static const int T2H_SECTION_FOOTER_BUTTONS[] = {
- D_direction_FastBack, D_direction_FirstInFileBack, D_direction_FirstInFileUp,
- D_direction_Forward, D_direction_FastForward,
- -1
-};
-
-/* a negative direction in DIRECTIONS corresponds to a special direction
-   which index is not known early and is better stored as a string.
-
-   Mainly called for texi2html style navigation buttons, but also for
-   default special units navigation panel buttons.
- */
-BUTTON_SPECIFICATION_LIST *
-new_directions_list_buttons_specifications (const CONVERTER *self,
-                                            const int* directions)
-{
-  int buttons_nr = 0;
-  int i;
-  BUTTON_SPECIFICATION_LIST *result;
-
-  for (buttons_nr = 0; directions[buttons_nr] != -1; buttons_nr++) {};
-
-  result = new_button_specification_list (buttons_nr);
-
-  for (i = 0; i < buttons_nr; i++)
-    {
-      int direction_index = directions[i];
-      int direction;
-      const char *direction_string = 0;
-      if (direction_index < 0)
-        {
-          int name_idx = -direction_index - 2;
-          direction_string = buttons_special_units_names[name_idx];
-          direction = html_get_direction_index (self, direction_string);
-          if (direction >= 0)
-            direction_string = 0;
-        }
-      else
-        direction = direction_index;
-
-      new_button_specification (&result->list[i], BST_direction,
-                        0, direction, direction_string, 0, 0, 0);
-    }
-  return result;
-}
-
-
-
-static void
-set_option_buttons_specification (OPTION *option,
-                                 BUTTON_SPECIFICATION_LIST *buttons)
+new_base_navigation_section_footer_buttons (const CONVERTER *self)
 {
-  if (option->o.buttons)
-    html_free_button_specification_list (option->o.buttons);
-  option->o.buttons = buttons;
+  return new_base_navigation_buttons (self, BFT_type_panel_section_footer, 0);
 }
 
-static void
-set_html_default_buttons_specifications (CONVERTER *self)
-{
-  OPTIONS *options = self->conf;
-  set_option_buttons_specification (&options->SECTION_BUTTONS,
-                                    new_section_buttons (self));
-  set_option_buttons_specification (&options->SECTION_FOOTER_BUTTONS,
-                                    new_section_footer_buttons (self));
-  set_option_buttons_specification (&options->LINKS_BUTTONS,
-                                    new_link_buttons (self));
-  set_option_buttons_specification (&options->NODE_FOOTER_BUTTONS,
-                  new_basic_buttons (self, BFT_type_panel_node_footer, 0));
-  set_option_buttons_specification (&options->CHAPTER_BUTTONS,
-                                    new_section_buttons (self));
-  set_option_buttons_specification (&options->MISC_BUTTONS,
-      new_directions_list_buttons_specifications (self, DEFAULT_MISC_BUTTONS));
-  set_option_buttons_specification (&options->TOP_BUTTONS,
-                                    new_section_buttons (self));
-  set_option_buttons_specification (&options->CHAPTER_FOOTER_BUTTONS,
-                                    new_section_footer_buttons (self));
-  set_option_buttons_specification (&options->TOP_FOOTER_BUTTONS,
-                                    new_section_footer_buttons (self));
-}
-
-static void
-set_texi2html_default_buttons_specifications (CONVERTER *self)
-{
-  OPTIONS *options = self->conf;
-  set_option_buttons_specification (&options->SECTION_BUTTONS,
-      new_directions_list_buttons_specifications (self, T2H_SECTION_BUTTONS));
-
-  set_option_buttons_specification (&options->TOP_BUTTONS,
-      new_directions_list_buttons_specifications (self, T2H_TOP_BUTTONS));
-
-  set_option_buttons_specification (&options->TOP_FOOTER_BUTTONS,
-      new_directions_list_buttons_specifications (self, T2H_TOP_BUTTONS));
-
-  set_option_buttons_specification (&options->MISC_BUTTONS,
-      new_directions_list_buttons_specifications (self, DEFAULT_MISC_BUTTONS));
-
-  set_option_buttons_specification (&options->CHAPTER_BUTTONS,
-      new_directions_list_buttons_specifications (self, T2H_CHAPTER_BUTTONS));
-
-  set_option_buttons_specification (&options->SECTION_FOOTER_BUTTONS,
- new_directions_list_buttons_specifications (self, 
T2H_SECTION_FOOTER_BUTTONS));
-
-  set_option_buttons_specification (&options->CHAPTER_FOOTER_BUTTONS,
-      new_directions_list_buttons_specifications (self, T2H_CHAPTER_BUTTONS));
-
-  set_option_buttons_specification (&options->NODE_FOOTER_BUTTONS,
-      new_directions_list_buttons_specifications (self, T2H_SECTION_BUTTONS));
-}
-
-void
-html_converter_defaults (CONVERTER *self,
-                         CONVERTER_INITIALIZATION_INFO *conf)
-{
-  set_html_regular_options_defaults (self->conf);
-  set_html_default_buttons_specifications (self);
-
-  if (conf)
-    {
-      size_t t2h_conf_number = self->conf->TEXI2HTML.number;
-      size_t i;
-
-      for (i = 0; i < conf->conf.number; i++)
-        {
-          OPTION *option = conf->conf.list[i];
-          if (option->number == t2h_conf_number)
-            {
-              if (option->o.integer >= 0)
-                {
-                  set_texi2html_regular_options_defaults (self->conf);
-                  set_texi2html_default_buttons_specifications (self);
-                  return;
-                }
-              break;
-            }
-        }
-    }
-}
-
-/* this code corresponds to the Perl converter_initialize code, only for
-   code to be called before Perl customization setup information is passed */
-void
-html_converter_initialize (CONVERTER *self)
-{
-  const char *split = self->conf->SPLIT.o.string;
-  int max_header_level = self->conf->MAX_HEADER_LEVEL.o.integer;
-
-  if (!self->conf->FORMAT_MENU.o.string)
-    option_force_conf (&self->conf->FORMAT_MENU, 0, "");
-
- /* NOTE we reset silently if the split specification is not one known.
-    The main program warns if the specific command line option value is
-    not known.  We could add a warning here to catch mistakes in init
-    files.  Wait for user reports.
-  */
-  if (split && strlen (split) && strcmp (split, "chapter")
-      && strcmp (split, "section") && strcmp (split, "node"))
-    option_force_conf (&self->conf->SPLIT, 0, "node");
-
-  if (max_header_level < 0)
-    option_force_conf (&self->conf->MAX_HEADER_LEVEL, 4, 0);
-  else if (max_header_level < 1)
-    option_force_conf (&self->conf->MAX_HEADER_LEVEL, 1, 0);
-
-  /* For CONTENTS_OUTPUT_LOCATION
-     should lead to contents not output, but if not, it is not an issue,
-     the way to set contents to be output or not should be through the
-     contents and shortcontents @-commands and customization options.
-   */
-
-  if (!self->conf->CONTENTS_OUTPUT_LOCATION.o.string)
-    option_force_conf (&self->conf->CONTENTS_OUTPUT_LOCATION, 0, "");
-  if (!self->conf->INDEX_ENTRY_COLON.o.string)
-    option_force_conf (&self->conf->INDEX_ENTRY_COLON, 0, "");
-  if (!self->conf->MENU_ENTRY_COLON.o.string)
-    option_force_conf (&self->conf->MENU_ENTRY_COLON, 0, "");
-}
diff --git a/tp/Texinfo/XS/convert/create_buttons.h 
b/tp/Texinfo/XS/convert/create_buttons.h
new file mode 100644
index 0000000000..398289884e
--- /dev/null
+++ b/tp/Texinfo/XS/convert/create_buttons.h
@@ -0,0 +1,34 @@
+/* create_buttons.h - definitions for create_buttons.c */
+#ifndef CREATE_BUTTONS_H
+#define CREATE_BUTTONS_H
+
+#include <stddef.h>
+
+#include "tree_types.h"
+#include "option_types.h"
+#include "converter_types.h"
+
+
+void new_button_specification (BUTTON_SPECIFICATION *button,
+                          enum button_specification_type type,
+                          enum button_information_type info_type,
+                          int direction, const char *direction_string,
+                          const char *string,
+                          enum button_function_type function_type,
+                          enum html_text_type text_type);
+BUTTON_SPECIFICATION_LIST *new_button_specification_list (size_t buttons_nr);
+
+BUTTON_SPECIFICATION_LIST *new_directions_list_buttons_specifications
+                                           (CONVERTER *self,
+                                            const int* directions);
+
+BUTTON_SPECIFICATION_LIST *new_base_navigation_buttons (const CONVERTER *self,
+                             enum button_function_type function_type,
+                             int with_about);
+BUTTON_SPECIFICATION_LIST *new_base_links_buttons (const CONVERTER *self);
+BUTTON_SPECIFICATION_LIST *new_base_navigation_section_buttons
+                                                   (const CONVERTER *self);
+BUTTON_SPECIFICATION_LIST *new_base_navigation_section_footer_buttons
+                                                   (const CONVERTER *self);
+
+#endif
diff --git a/tp/Texinfo/XS/convert/html_converter_init_options.c 
b/tp/Texinfo/XS/convert/html_converter_init_options.c
index fa63c84f87..554efadbd3 100644
--- a/tp/Texinfo/XS/convert/html_converter_init_options.c
+++ b/tp/Texinfo/XS/convert/html_converter_init_options.c
@@ -15,190 +15,22 @@
 
 #include <config.h>
 
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stddef.h>
 
-#include "tree_types.h"
 #include "option_types.h"
 #include "converter_types.h"
 #include "converters_defaults.h"
+/* option_force_conf */
 #include "utils.h"
-#include "converter.h"
+#include "create_buttons.h"
 #include "html_converter_init_options.h"
 
 /* HTML converter options setting and initialization.  Not with format
    specific converter code, since this code is called from generic
    converter code. */
 
-/* should be consistent with enum BUTTON_special_unit_directions.  See
-   the comment there */
-static const char *buttons_special_units_names[] = {
-    "Contents",
-    "About",
-};
-
-/* create button specification */
-void
-new_button_specification (BUTTON_SPECIFICATION *button,
-                          enum button_specification_type type,
-                          enum button_information_type info_type,
-                          int direction, const char *direction_string,
-                          const char *string,
-                          enum button_function_type function_type,
-                          enum html_text_type text_type)
-{
-  button->type = type;
-  button->direction_string = direction_string;
-
-  if (type == BST_string)
-    {
-      if (string)
-        button->b.string = strdup (string);
-    }
-  else if (type == BST_direction)
-    button->b.direction = direction;
-  else if (type == BST_direction_info)
-    {
-      BUTTON_SPECIFICATION_INFO *button_spec
-       = (BUTTON_SPECIFICATION_INFO *)
-           malloc (sizeof (BUTTON_SPECIFICATION_INFO));
-      memset (button_spec, 0, sizeof (BUTTON_SPECIFICATION_INFO));
-
-      button->b.button_info = button_spec;
-
-      button_spec->type = info_type;
-      button_spec->direction = direction;
-
-      if (info_type == BIT_string)
-        {
-          if (string)
-            button_spec->bi.string = strdup (string);
-        }
-      else if (info_type == BIT_function)
-        button_spec->bi.button_function.type = function_type;
-      else if (info_type == BIT_selected_direction_information_type
-               || info_type == BIT_href_direction_information_type)
-        button_spec->bi.direction_information_type = text_type;
-    }
-}
-
-BUTTON_SPECIFICATION_LIST *
-new_button_specification_list (size_t buttons_nr)
-{
-  BUTTON_SPECIFICATION_LIST *result;
-
-  result = (BUTTON_SPECIFICATION_LIST *)
-              malloc (sizeof (BUTTON_SPECIFICATION_LIST));
-
-  result->BIT_user_function_number = 0;
-  result->number = buttons_nr;
-  result->av = 0;
-
-  result->list = (BUTTON_SPECIFICATION *) malloc (buttons_nr *
-                   sizeof (BUTTON_SPECIFICATION));
-  memset (result->list, 0, buttons_nr * sizeof (BUTTON_SPECIFICATION));
-
-  return result;
-}
-
-static void
-new_special_unit_direction_button (BUTTON_SPECIFICATION *button,
-                                   int direction, const char *name)
-{
-  if (direction < 0)
-    new_button_specification (button, BST_direction,
-                              0, -1, name, 0, 0, 0);
-  else
-    new_button_specification (button, BST_direction,
-                              0, direction, 0, 0, 0, 0);
-}
-
-/* BFT_type_panel_directions */
-BUTTON_SPECIFICATION_LIST *
-new_basic_buttons (const CONVERTER *self,
-                   enum button_function_type function_type,
-                   int with_about)
-{
-  BUTTON_SPECIFICATION_LIST *result;
-  int buttons_nr = 6;
-
-  if (with_about)
-    buttons_nr++;
-
-  result = new_button_specification_list (buttons_nr);
-  /* this function may be called too early for special units direction
-     indices to be known, in that case we register direction string name
-     for such directions, directions are set afterwards.
-   */
-  int contents_direction = html_get_direction_index (self, "Contents");
-  int about_direction = html_get_direction_index (self, "About");
-
-  new_button_specification (&result->list[0], BST_direction_info,
-                            BIT_function, D_direction_Next, 0, 0,
-                            function_type, 0);
-  new_button_specification (&result->list[1], BST_direction_info,
-                            BIT_function, D_direction_Prev, 0, 0,
-                            function_type, 0);
-  new_button_specification (&result->list[2], BST_direction_info,
-                            BIT_function, D_direction_Up, 0, 0,
-                            function_type, 0);
-  new_button_specification (&result->list[3], BST_direction, 0,
-                            D_direction_Space, 0, 0, 0, 0);
-  new_special_unit_direction_button (&result->list[4], contents_direction,
-                                     "Contents");
-  new_button_specification (&result->list[5], BST_direction, 0,
-                            D_direction_Index, 0, 0, 0, 0);
-  if (with_about)
-    new_special_unit_direction_button (&result->list[6], about_direction,
-                                       "About");
-  return result;
-}
-
-BUTTON_SPECIFICATION_LIST *
-new_link_buttons (const CONVERTER *self)
-{
-  BUTTON_SPECIFICATION_LIST *result = new_button_specification_list (7);
-  /* this function may be called too early for special units direction
-     indices to be known, in that case we register direction string name
-     for such directions, directions are set afterwards.
-   */
-  int contents_direction = html_get_direction_index (self, "Contents");
-  int about_direction = html_get_direction_index (self, "About");
-  new_button_specification (&result->list[0], BST_direction,
-                            0, D_direction_Top, 0, 0, 0, 0);
-  new_button_specification (&result->list[1], BST_direction,
-                            0, D_direction_Index, 0, 0, 0, 0);
-
-  new_special_unit_direction_button (&result->list[2], contents_direction,
-                                     "Contents");
-  new_special_unit_direction_button (&result->list[3], about_direction,
-                                     "About");
-
-  new_button_specification (&result->list[4], BST_direction,
-                            0, D_direction_NodeUp, 0, 0, 0, 0);
-  new_button_specification (&result->list[5], BST_direction,
-                            0, D_direction_NodeNext, 0, 0, 0, 0);
-  new_button_specification (&result->list[6], BST_direction,
-                            0, D_direction_NodePrev, 0, 0, 0, 0);
-  return result;
-}
-
-BUTTON_SPECIFICATION_LIST *
-new_section_buttons (const CONVERTER *self)
-{
-  return new_basic_buttons (self, BFT_type_panel_directions, 1);
-}
-
-BUTTON_SPECIFICATION_LIST *
-new_section_footer_buttons (const CONVERTER *self)
-{
-  return new_basic_buttons (self, BFT_type_panel_section_footer, 0);
-}
-
-
-
 static const int DEFAULT_MISC_BUTTONS[] = {
  D_direction_Top, BSUD_D_Contents, D_direction_Index, BSUD_D_About,
  -1
@@ -234,46 +66,6 @@ static const int T2H_SECTION_FOOTER_BUTTONS[] = {
  -1
 };
 
-/* a negative direction in DIRECTIONS corresponds to a special direction
-   which index is not known early and is better stored as a string.
-
-   Mainly called for texi2html style navigation buttons, but also for
-   default special units navigation panel buttons.
- */
-BUTTON_SPECIFICATION_LIST *
-new_directions_list_buttons_specifications (const CONVERTER *self,
-                                            const int* directions)
-{
-  int buttons_nr = 0;
-  int i;
-  BUTTON_SPECIFICATION_LIST *result;
-
-  for (buttons_nr = 0; directions[buttons_nr] != -1; buttons_nr++) {};
-
-  result = new_button_specification_list (buttons_nr);
-
-  for (i = 0; i < buttons_nr; i++)
-    {
-      int direction_index = directions[i];
-      int direction;
-      const char *direction_string = 0;
-      if (direction_index < 0)
-        {
-          int name_idx = -direction_index - 2;
-          direction_string = buttons_special_units_names[name_idx];
-          direction = html_get_direction_index (self, direction_string);
-          if (direction >= 0)
-            direction_string = 0;
-        }
-      else
-        direction = direction_index;
-
-      new_button_specification (&result->list[i], BST_direction,
-                        0, direction, direction_string, 0, 0, 0);
-    }
-  return result;
-}
-
 
 
 static void
@@ -290,23 +82,23 @@ set_html_default_buttons_specifications (CONVERTER *self)
 {
   OPTIONS *options = self->conf;
   set_option_buttons_specification (&options->SECTION_BUTTONS,
-                                    new_section_buttons (self));
+                                    new_base_navigation_section_buttons 
(self));
   set_option_buttons_specification (&options->SECTION_FOOTER_BUTTONS,
-                                    new_section_footer_buttons (self));
+                           new_base_navigation_section_footer_buttons (self));
   set_option_buttons_specification (&options->LINKS_BUTTONS,
-                                    new_link_buttons (self));
+                                    new_base_links_buttons (self));
   set_option_buttons_specification (&options->NODE_FOOTER_BUTTONS,
-                  new_basic_buttons (self, BFT_type_panel_node_footer, 0));
+           new_base_navigation_buttons (self, BFT_type_panel_node_footer, 0));
   set_option_buttons_specification (&options->CHAPTER_BUTTONS,
-                                    new_section_buttons (self));
+                                    new_base_navigation_section_buttons 
(self));
   set_option_buttons_specification (&options->MISC_BUTTONS,
       new_directions_list_buttons_specifications (self, DEFAULT_MISC_BUTTONS));
   set_option_buttons_specification (&options->TOP_BUTTONS,
-                                    new_section_buttons (self));
+                                    new_base_navigation_section_buttons 
(self));
   set_option_buttons_specification (&options->CHAPTER_FOOTER_BUTTONS,
-                                    new_section_footer_buttons (self));
+                          new_base_navigation_section_footer_buttons (self));
   set_option_buttons_specification (&options->TOP_FOOTER_BUTTONS,
-                                    new_section_footer_buttons (self));
+                            new_base_navigation_section_footer_buttons (self));
 }
 
 static void