branch master updated: * doc/texinfo.texi (HTML Customization Variables), tp/Texinfo/Convert/HTML.pm (%default, output) (_set_variables_texi2html), tp/t/95moreindices.t: set NODE_NAME_IN_INDEX based on USE_NODES is undef. Move NODE_NAME_IN_INDEX documentation to HTML Customization Variables.

[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 032dc858b1 * doc/texinfo.texi (HTML Customization Variables), 
tp/Texinfo/Convert/HTML.pm (%default, output) (_set_variables_texi2html), 
tp/t/95moreindices.t: set NODE_NAME_IN_INDEX based on USE_NODES is undef.  Move 
NODE_NAME_IN_INDEX documentation to HTML Customization Variables.
032dc858b1 is described below

commit 032dc858b1c8f05b1e53ff0485da557b550d0c60
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 30 16:07:33 2022 +0100

    * doc/texinfo.texi (HTML Customization Variables),
    tp/Texinfo/Convert/HTML.pm (%default, output)
    (_set_variables_texi2html), tp/t/95moreindices.t: set
    NODE_NAME_IN_INDEX based on USE_NODES is undef.  Move
    NODE_NAME_IN_INDEX documentation to HTML Customization Variables.
---
 ChangeLog                  |  8 ++++++++
 doc/texinfo.texi           |  8 ++++----
 tp/Texinfo/Convert/HTML.pm |  6 ++++--
 tp/t/95moreindices.t       | 14 +++++++-------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09ab29978e..1e95f8295c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,14 @@
        Adjust copyright notice slightly to match recommended wording.
        From Hilmar Preuße.
 
+2022-12-30  Patrice Dumas  <pertusus@free.fr>
+
+       * doc/texinfo.texi (HTML Customization Variables),
+       tp/Texinfo/Convert/HTML.pm (%default, output)
+       (_set_variables_texi2html), tp/t/95moreindices.t: set
+       NODE_NAME_IN_INDEX based on USE_NODES is undef.  Move
+       NODE_NAME_IN_INDEX documentation to HTML Customization Variables.
+
 2022-12-30  Patrice Dumas  <pertusus@free.fr>
 
        * tp/t/95moreindices.t: do not set TEXI2HTML, instead set specific
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 70d7e1d728..7a7c36ef49 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16485,6 +16485,10 @@ Do not output HTML with custom attributes in elements; 
default false.
 Symbol used for footnotes if @code{NUMBER_FOOTNOTES} is false.
 Default is @code{*}.
 
+@item NODE_NAME_IN_INDEX
+If true, use node names in index entries, otherwise prefer section names.
+If undefined, use @code{USE_NODES} value in HTML.  Default is undefined.
+
 @item PRE_BODY_CLOSE
 If set, the given text will appear at the footer of each
 HTML file; default unset.
@@ -16965,10 +16969,6 @@ If set, do not use @code{@@setfilename} to set the 
document name;
 instead, base the output document name only on the input file name.
 The default is false.
 
-@item NODE_NAME_IN_INDEX
-If set, use node names in index entries, otherwise prefer section names;
-default true.
-
 @item NODE_NAME_IN_MENU
 If set, use node names in menu entries, otherwise prefer section names;
 default true.
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 380ed8a22c..91d43db1ad 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1856,7 +1856,6 @@ my %defaults = (
   'NO_CSS'                => 0,
   'NO_NUMBER_FOOTNOTE_SYMBOL' => '*',
   'NODE_NAME_IN_MENU'     => 1,
-  'NODE_NAME_IN_INDEX'    => 1,
   'OPEN_QUOTE_SYMBOL'     => undef,
   'OUTPUT_ENCODING_NAME'  => 'utf-8',
   'SECTION_NAME_IN_TITLE' => 0,
@@ -10399,6 +10398,10 @@ sub output($$)
   }
   $self->set_conf('EXTERNAL_CROSSREF_SPLIT', $self->get_conf('SPLIT'));
 
+  if (not defined($self->get_conf('NODE_NAME_IN_INDEX'))) {
+    $self->set_conf('NODE_NAME_IN_INDEX', $self->get_conf('USE_NODES'));
+  }
+
   my $handler_fatal_error_level = $self->get_conf('HANDLER_FATAL_ERROR_LEVEL');
 
   if ($self->get_conf('HTML_MATH')
@@ -11434,7 +11437,6 @@ sub _set_variables_texi2html()
   ['MENU_ENTRY_COLON', ''],
   ['INDEX_ENTRY_COLON', ''],
   ['DO_ABOUT', undef],
-  ['NODE_NAME_IN_INDEX', 0],
   ['CHAPTER_HEADER_LEVEL', 1],
   ['BIG_RULE', '<hr style="height: 6px;">'],
   ['FOOTNOTE_END_HEADER_LEVEL', 3],
diff --git a/tp/t/95moreindices.t b/tp/t/95moreindices.t
index eb3183a87c..c17d554825 100644
--- a/tp/t/95moreindices.t
+++ b/tp/t/95moreindices.t
@@ -12,12 +12,12 @@ my @test_cases = (
 ['double_index_entry',
   undef,
   {'test_file' => 'double_index_entry.texi' },
-  {'SPLIT' => '', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
+  {'SPLIT' => '', 'USE_NODES' => 0}
 ],
 ['split_chapter_index',
   undef,
   {'test_file' => 'split_chapter_index.texi' },
-  {'SPLIT' => 'chapter', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
+  {'SPLIT' => 'chapter', 'USE_NODES' => 0}
 ],
 ['index_split',
   undef,
@@ -26,7 +26,7 @@ my @test_cases = (
   # It also tests for node with directions after section which is
   # also in 96moresectioning.t
   {'test_file' => 'index_split.texi', 'CHECK_NORMAL_MENU_STRUCTURE' => 1},
-  {'SPLIT' => 'chapter', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
+  {'SPLIT' => 'chapter', 'USE_NODES' => 0}
 ],
 ['index_split_nodes',
   undef,
@@ -35,12 +35,12 @@ my @test_cases = (
 ['index_no_node',
   undef,
   {'test_file' => 'index_no_node.texi' },
-  {'SPLIT' => 'chapter', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
+  {'SPLIT' => 'chapter', 'USE_NODES' => 0}
 ],
 ['nodes_before_top',
   undef,
   {'test_file' => 'nodes_before_top.texi' },
-  {'USE_NODES' => 1, 'SPLIT' => 'chapter', 'NODE_NAME_IN_INDEX', 0}
+  {'USE_NODES' => 1, 'SPLIT' => 'chapter'}
 ],
 ['nodes_before_top_nodes',
   undef,
@@ -49,12 +49,12 @@ my @test_cases = (
 ['nodes_before_top_no_nodes',
   undef,
   {'test_file' => 'nodes_before_top.texi' },
-  {'SPLIT' => 'chapter', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
+  {'SPLIT' => 'chapter', 'USE_NODES' => 0}
 ],
 ['nodes_before_top_and_sections',
   undef,
   {'test_file' => 'nodes_before_top_and_sections.texi' },
-  {'SPLIT' => '', 'USE_NODES' => 0, 'NODE_NAME_IN_INDEX', 0}
+  {'SPLIT' => '', 'USE_NODES' => 0}
 ],
 );