branch master updated: * tp/Texinfo/XS/main/build_perl_info.c (html_build_direction_icons): return the icon as value.

[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 37c14690c0 * tp/Texinfo/XS/main/build_perl_info.c 
(html_build_direction_icons): return the icon as value.
37c14690c0 is described below

commit 37c14690c0f928fbc2d73d71f3560bba494767c2
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Jan 4 13:18:07 2024 +0100

    * tp/Texinfo/XS/main/build_perl_info.c (html_build_direction_icons):
    return the icon as value.
    
    * tp/maintain/regenerate_C_options_info.pl (build_sv_option): return
    icons.
    
    * tp/Texinfo/Convert/HTML.pm (_default_format_special_body_about):
    check if get_conf('ACTIVE_ICONS') is defined before using it.
---
 ChangeLog                                | 11 +++++++++++
 tp/Texinfo/Convert/Converter.pm          |  3 ++-
 tp/Texinfo/Convert/HTML.pm               |  4 ++--
 tp/Texinfo/XS/convert/convert_html.c     |  4 +++-
 tp/Texinfo/XS/main/build_perl_info.c     |  2 +-
 tp/maintain/regenerate_C_options_info.pl |  2 +-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index acd644628c..1b3754313a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-01-04  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XS/main/build_perl_info.c (html_build_direction_icons):
+       return the icon as value.
+
+       * tp/maintain/regenerate_C_options_info.pl (build_sv_option): return
+       icons.
+
+       * tp/Texinfo/Convert/HTML.pm (_default_format_special_body_about):
+       check if get_conf('ACTIVE_ICONS') is defined before using it.
+
 2024-01-04  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_XS_reset_output_init_conf),
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 4622dd2221..81b1a5cb50 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -612,7 +612,8 @@ sub get_conf($$)
   }
 
   if ($self->{'converter_descriptor'} and $XS_convert) {
-    return _XS_get_conf($self, $conf);
+    my $result = _XS_get_conf($self, $conf);
+    return $result;
   }
 
   return $self->{'conf'}->{$conf};
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 7ed394c328..1109cc1c1e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -11326,8 +11326,8 @@ EOT
           = $self->direction_string($direction, 'button', 'string');
       # FIXME strip FirstInFile from $button to get active icon file?
       $about .=
-        (($self->get_conf('ICONS') &&
-           $self->get_conf('ACTIVE_ICONS')->{$direction}) ?
+        (($self->get_conf('ICONS') and $self->get_conf('ACTIVE_ICONS')
+          and $self->get_conf('ACTIVE_ICONS')->{$direction}) ?
             &{$self->formatting_function('format_button_icon_img')}($self,
              $button_name_string, 
$self->get_conf('ACTIVE_ICONS')->{$direction})
         : ' [' . $self->direction_string($direction, 'text') . '] ');
diff --git a/tp/Texinfo/XS/convert/convert_html.c 
b/tp/Texinfo/XS/convert/convert_html.c
index 8fdf9a3ada..1b02a1eb7a 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -7032,8 +7032,10 @@ html_default_format_button (CONVERTER *self,
                   && self->conf->ACTIVE_ICONS.icons->list[button->direction]
                   && strlen (self->conf->ACTIVE_ICONS.icons
                                                 ->list[button->direction]))
-                active_icon = self->conf->ACTIVE_ICONS.icons
+                {
+                  active_icon = self->conf->ACTIVE_ICONS.icons
                                                   ->list[button->direction];
+                }
 
               text_init (&active_text);
               if (!active_icon)
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index d9abbbe725..89d8b221a6 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -1923,7 +1923,7 @@ html_build_direction_icons (CONVERTER *converter,
           const char *direction_name
             = converter->direction_unit_direction_name[i];
           hv_store (icons_hv, direction_name, strlen (direction_name),
-                    newSVpv_utf8 (direction_name, 0), 0);
+                    newSVpv_utf8 (direction_icons->list[i], 0), 0);
         }
     }
   return newRV_noinc ((SV *)icons_hv);
diff --git a/tp/maintain/regenerate_C_options_info.pl 
b/tp/maintain/regenerate_C_options_info.pl
index 0d1a50be06..5f188fc125 100755
--- a/tp/maintain/regenerate_C_options_info.pl
+++ b/tp/maintain/regenerate_C_options_info.pl
@@ -386,7 +386,7 @@ foreach my $category (sort(keys(%option_categories))) {
     }\n";
     } elsif ($type eq 'icons') {
       print GET "    {
-      html_build_direction_icons (converter, options->$option.icons);
+      return html_build_direction_icons (converter, options->$option.icons);
     }\n";
     } else {
       print GET "    {return newSV (0);}\n";