texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Sun, 29 Sep 2024 17:24:18 -0400 (EDT)

branch: master
commit c0167c6ae3beeaf820f9625da664f262394058de
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jul 12 10:12:50 2024 +0200

    * tp/Texinfo/Convert/HTML.pm (converter_initialize)
    (conversion_initialization): get customization from
    GNUT_get_no_arg_command_formatting in converter_initialize, set
    $self->{'customized_no_arg_commands_formatting'} and use
    customized_no_arg_commands_formatting in conversion_initialization.
---
 ChangeLog                  |  8 ++++++++
 tp/Texinfo/Convert/HTML.pm | 21 +++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 364b40a25d..9c136a665f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-07-12  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (converter_initialize)
+       (conversion_initialization): get customization from
+       GNUT_get_no_arg_command_formatting in converter_initialize, set
+       $self->{'customized_no_arg_commands_formatting'} and use
+       customized_no_arg_commands_formatting in conversion_initialization.
+
 2024-07-12  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (converter_initialize)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 4b18ebe8a0..58e13f1fda 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -9034,6 +9034,7 @@ sub _load_htmlxref_files {
 #  types_open
 #
 #    API exists for setting, not for getting and used in commands_conversion
+#  customized_no_arg_commands_formatting
 #  no_arg_commands_formatting
 #  style_commands_formatting
 #
@@ -9267,6 +9268,22 @@ sub converter_initialize($)
   }
   #print STDERR Data::Dumper->Dump([$self->{'accent_entities'}]);
 
+  # get customization only at that point, as the defaults may be changed
+  # with the encoding
+  $self->{'customized_no_arg_commands_formatting'} = {};
+  foreach my $command (keys(%{$default_no_arg_commands_formatting{'normal'}})) 
{
+    $self->{'customized_no_arg_commands_formatting'}->{$command} = {};
+    foreach my $context ('normal', 'preformatted', 'string', 'css_string') {
+      my $no_arg_command_customized_formatting
+        = Texinfo::Config::GNUT_get_no_arg_command_formatting($command,
+                                                              $context);
+      if (defined($no_arg_command_customized_formatting)) {
+        
$self->{'customized_no_arg_commands_formatting'}->{$command}->{$context}
+           = $no_arg_command_customized_formatting;
+      }
+    }
+  }
+
   $self->{'file_id_setting'} = {};
   my $customized_file_id_setting_references
     = Texinfo::Config::GNUT_get_file_id_setting_references();
@@ -12329,8 +12346,8 @@ sub conversion_initialization($;$)
     $self->{'no_arg_commands_formatting'}->{$command} = {};
     foreach my $context ('normal', 'preformatted', 'string', 'css_string') {
       my $no_arg_command_customized_formatting
-        = Texinfo::Config::GNUT_get_no_arg_command_formatting($command,
-                                                              $context);
+        = $self->{'customized_no_arg_commands_formatting'}
+                                             ->{$command}->{$context};
       if (defined($no_arg_command_customized_formatting)) {
         $self->{'no_arg_commands_formatting'}->{$command}->{$context}
            = $no_arg_command_customized_formatting;



reply via email to

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