[no subject]

[Patrice Dumas]

branch: master
commit 03d03b9f753f0273bbd7bf5e6ce0541cb0225aa6
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jan 3 21:28:59 2024 +0100

    * tp/Texinfo/Convert/HTML.pm (convert, output): use get_conf instead
    of accessing directly 'conf'.
    
    * tp/t/accents.t (test_enable_encoding): use set_conf instead of
    accessing directly 'conf'.
---
 ChangeLog                  |  8 ++++++++
 tp/Texinfo/Convert/HTML.pm | 12 ++++++------
 tp/t/accents.t             |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fb2ac5db17..48fc3652c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-01-03  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (convert, output): use get_conf instead
+       of accessing directly 'conf'.
+
+       * tp/t/accents.t (test_enable_encoding): use set_conf instead of
+       accessing directly 'conf'.
+
 2024-01-03  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.am (Commands.pm, Options.pm): have generated files
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index df7a9be0ce..e4e11c5332 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -11697,9 +11697,9 @@ sub convert($$)
   $self->_sort_index_entries();
 
   # cache, as it is checked for each text element
-  if ($self->{'conf'}->{'OUTPUT_CHARACTERS'}
-      and $self->{'conf'}->{'OUTPUT_ENCODING_NAME'}
-      and $self->{'conf'}->{'OUTPUT_ENCODING_NAME'} eq 'utf-8') {
+  if ($self->get_conf('OUTPUT_CHARACTERS')
+      and $self->get_conf('OUTPUT_ENCODING_NAME')
+      and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
     $self->{'use_unicode_text'} = 1;
   }
 
@@ -12359,9 +12359,9 @@ sub output($$)
   $self->_sort_index_entries();
 
   # cache, as it is checked for each text element
-  if ($self->{'conf'}->{'OUTPUT_CHARACTERS'}
-      and $self->{'conf'}->{'OUTPUT_ENCODING_NAME'}
-      and $self->{'conf'}->{'OUTPUT_ENCODING_NAME'} eq 'utf-8') {
+  if ($self->get_conf('OUTPUT_CHARACTERS')
+      and $self->get_conf('OUTPUT_ENCODING_NAME')
+      and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
     $self->{'use_unicode_text'} = 1;
   }
 
diff --git a/tp/t/accents.t b/tp/t/accents.t
index 98f5103733..09b4ed9e0f 100644
--- a/tp/t/accents.t
+++ b/tp/t/accents.t
@@ -111,7 +111,7 @@ sub test_enable_encoding ($)
   $html_converter->_initialize_output_state('_test_accents');
   my $result_xml = Texinfo::Convert::Converter::xml_accents($html_converter,
                                                             $accent_tree);
-  $html_converter->{'conf'}->{'USE_NUMERIC_ENTITY'} = 1;
+  $html_converter->set_conf('USE_NUMERIC_ENTITY', 1);
   my $result_xml_numeric_entity
       = Texinfo::Convert::Converter::xml_accents($html_converter, 
$accent_tree);