branch master updated: * tp/Texinfo/Common.pm (@variable_string_settables), tp/Texinfo/Convert/Converter.pm (xml_accents), tp/Texinfo/Convert/HTML.pm (%defaults, _set_variables_texi2html), doc/texinfo.texi (Other Customization Variables), tp/t/accents.t: rename USE_NUMERIC_ENTITY as FALLBACK_TO_NUMERIC_ENTITY.

[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 26be1ac  * tp/Texinfo/Common.pm (@variable_string_settables), 
tp/Texinfo/Convert/Converter.pm (xml_accents), tp/Texinfo/Convert/HTML.pm 
(%defaults, _set_variables_texi2html), doc/texinfo.texi (Other Customization 
Variables), tp/t/accents.t: rename USE_NUMERIC_ENTITY as 
FALLBACK_TO_NUMERIC_ENTITY.
26be1ac is described below

commit 26be1acf598c264ce8fd10639b507705ace794cd
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Dec 19 12:17:09 2021 +0100

    * tp/Texinfo/Common.pm (@variable_string_settables),
    tp/Texinfo/Convert/Converter.pm (xml_accents),
    tp/Texinfo/Convert/HTML.pm (%defaults, _set_variables_texi2html),
    doc/texinfo.texi (Other Customization Variables),
    tp/t/accents.t: rename USE_NUMERIC_ENTITY as
    FALLBACK_TO_NUMERIC_ENTITY.
---
 ChangeLog                       | 9 +++++++++
 doc/texinfo.texi                | 2 +-
 tp/Texinfo/Common.pm            | 2 +-
 tp/Texinfo/Convert/Converter.pm | 2 +-
 tp/Texinfo/Convert/HTML.pm      | 4 ++--
 tp/t/accents.t                  | 4 ++--
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9834d0..d89dd6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-12-19  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Common.pm (@variable_string_settables),
+       tp/Texinfo/Convert/Converter.pm (xml_accents), 
+       tp/Texinfo/Convert/HTML.pm (%defaults, _set_variables_texi2html),
+       doc/texinfo.texi (Other Customization Variables),
+       tp/t/accents.t: rename USE_NUMERIC_ENTITY as
+       FALLBACK_TO_NUMERIC_ENTITY.
+
 2021-12-18  Gavin Smith  <gavinsmith0123@gmail.com>
 
        No more doctypes
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 4943472..bbcd66b 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16794,7 +16794,7 @@ Preferentially use nodes to decide where elements are 
separated.  If
 set to false, preferentially use sectioning to decide where elements
 are separated.  The default is true.
 
-@item USE_NUMERIC_ENTITY
+@item FALLBACK_TO_NUMERIC_ENTITY
 For HTML and XML@.  If set, use numeric entities instead of ASCII
 characters when there is no named entity.  By default, set to true for
 HTML.
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 0ca2f04..9f9fbe4 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -280,6 +280,7 @@ my @variable_string_settables = (
 'EXTERNAL_CROSSREF_SPLIT',
 'EXTERNAL_DIR',
 'EXTRA_HEAD',
+'FALLBACK_TO_NUMERIC_ENTITY',
 'FOOTNOTE_END_HEADER_LEVEL',
 'FOOTNOTE_SEPARATE_HEADER_LEVEL',
 'FRAMES',
@@ -347,7 +348,6 @@ my @variable_string_settables = (
 'USE_LINKS',
 'USE_NODES',
 'USE_NODE_DIRECTIONS',
-'USE_NUMERIC_ENTITY',
 'USE_REL_REV',
 'USE_SETFILENAME_EXTENSION',
 'USE_TITLEPAGE_FOR_TITLE',
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 88964eb..302aca1 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1551,7 +1551,7 @@ sub xml_accents($$;$)
   my $in_upper_case = shift;
 
   my $format_accents;
-  if ($self->get_conf('USE_NUMERIC_ENTITY')) {
+  if ($self->get_conf('FALLBACK_TO_NUMERIC_ENTITY')) {
     $format_accents = \&_xml_accent_numeric_entities;
   } else {
     $format_accents = \&xml_accent;
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index ade1e89..d5ed74d 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1035,7 +1035,7 @@ my %defaults = (
   'EXTENSION'            => 'html',
   'TOP_NODE_FILE_TARGET' => 'index.html',
   'USE_LINKS'            => 1,
-  'USE_NUMERIC_ENTITY'   => 1,
+  'FALLBACK_TO_NUMERIC_ENTITY'   => 1,
   'ENABLE_ENCODING_USE_ENTITY'   => 1,
   'DATE_IN_HEADER'       => 0,
   'AVOID_MENU_REDUNDANCY' => 0,
@@ -8344,7 +8344,7 @@ sub _set_variables_texi2html()
   ['USE_REL_REV', 0],
   ['USE_LINKS', 0],
   ['USE_NODES', 0],
-  ['USE_NUMERIC_ENTITY', 1],
+  ['FALLBACK_TO_NUMERIC_ENTITY', 1],
   ['SPLIT', ''],
   ['PROGRAM_NAME_IN_FOOTER', 1],
   ['HEADER_IN_TABLE', 1],
diff --git a/tp/t/accents.t b/tp/t/accents.t
index f9e11a2..af756d5 100644
--- a/tp/t/accents.t
+++ b/tp/t/accents.t
@@ -99,10 +99,10 @@ sub test_enable_encoding ($)
                                 
\&Texinfo::Convert::Text::ascii_accent_fallback);
 
   my $html_converter = Texinfo::Convert::HTML->converter();
-  $html_converter->{'conf'}->{'USE_NUMERIC_ENTITY'} = 0;
+  $html_converter->{'conf'}->{'FALLBACK_TO_NUMERIC_ENTITY'} = 0;
   my $result_xml = Texinfo::Convert::Converter::xml_accents($html_converter, 
                                                             $tree);
-  $html_converter->{'conf'}->{'USE_NUMERIC_ENTITY'} = 1;
+  $html_converter->{'conf'}->{'FALLBACK_TO_NUMERIC_ENTITY'} = 1;
   my $result_xml_entity 
       = Texinfo::Convert::Converter::xml_accents($html_converter, $tree);