[no subject]

[Patrice Dumas]

branch: master
commit 6c6cc159750e514c0725585956ddd26c796d9fbe
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Apr 4 00:05:34 2024 +0200

    Remove NO_USE_SETFILENAME customization variable
    
    * NEWS, doc/texinfo.texi (Other Customization Variables),
    tp/Texinfo/Convert/Converter.pm (determine_files_and_directory),
    tp/Texinfo/options_data.txt, tp/Texinfo/Convert/HTML.pm
    (_set_variables_texi2html): remove NO_USE_SETFILENAME customization
    variable.  There are other ways to set setfilename or output file name
    and the @setfilename can be removed from document.
---
 ChangeLog                       | 11 +++++++++++
 NEWS                            |  2 +-
 doc/texinfo.texi                |  5 -----
 tp/Texinfo/Convert/Converter.pm |  6 ++----
 tp/Texinfo/Convert/HTML.pm      |  1 -
 tp/Texinfo/options_data.txt     |  1 -
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d75d545305..d822ec8e90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-04-03  Patrice Dumas  <pertusus@free.fr>
+
+       Remove NO_USE_SETFILENAME customization variable
+
+       * NEWS, doc/texinfo.texi (Other Customization Variables),
+       tp/Texinfo/Convert/Converter.pm (determine_files_and_directory),
+       tp/Texinfo/options_data.txt, tp/Texinfo/Convert/HTML.pm
+       (_set_variables_texi2html): remove NO_USE_SETFILENAME customization
+       variable.  There are other ways to set setfilename or output file name
+       and the @setfilename can be removed from document.
+
 2024-04-03  Patrice Dumas  <pertusus@free.fr>
 
        * doc/texinfo.texi: update cross-references to customization variables
diff --git a/NEWS b/NEWS
index ddc45dfe1f..1bdf910550 100644
--- a/NEWS
+++ b/NEWS
@@ -27,7 +27,7 @@ See the manual for detailed information.
    use of Unicode collation when sorting indices
  . remove SIMPLE_MENU customization option and tree transformation.
  . remove FRAMES and FRAMESET_DOCTYPE customization options.
- . remove AVOID_MENU_REDUNDANCY customization option.
+ . remove AVOID_MENU_REDUNDANCY and NO_USE_SETFILENAME customization options.
  . set CHECK_NORMAL_MENU_STRUCTURE in the default case.
  . rename COMPLEX_FORMAT_IN_TABLE customization option as
    INDENTED_BLOCK_COMMANDS_IN_TABLE.
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 653b677541..0351305248 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -15857,11 +15857,6 @@ the title and copying informations are always output.  
This option
 is kept for DocBook for compatibility, as before 2022 the Top node was output
 in DocBook.  It could be removed in the future.
 
-@item NO_USE_SETFILENAME
-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_MENU
 If set, use node names in menu entries, otherwise prefer section names;
 default true.
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 261a30099c..2dbfb6c3f4 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -710,8 +710,7 @@ sub determine_files_and_directory($$)
   # determine output file and output file name
   my $output_file;
   if (!defined($self->get_conf('OUTFILE'))) {
-    if (defined($setfilename_for_outfile)
-        and !$self->get_conf('NO_USE_SETFILENAME')) {
+    if (defined($setfilename_for_outfile)) {
       $output_file = $setfilename_for_outfile;
       $document_path = $setfilename_for_outfile;
       $document_path =~ s/\.[^\.]*$//;
@@ -747,8 +746,7 @@ sub determine_files_and_directory($$)
   # in this case one wants to get the result in a string and there
   # is a setfilename.  The setfilename is used to get something.
   # This happens in the test suite.
-  if ($output_file eq '' and defined($setfilename_for_outfile)
-      and !$self->get_conf('NO_USE_SETFILENAME')) {
+  if ($output_file eq '' and defined($setfilename_for_outfile)) {
     $output_filepath = $setfilename_for_outfile;
     $document_path = $setfilename_for_outfile;
     $document_path =~ s/\.[^\.]*$//;
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index a6bd875326..14c094a151 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -13598,7 +13598,6 @@ sub _set_variables_texi2html($)
   #['DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>'],
   #['DOCTYPE', '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" 
"http://www.w3.org/TR/html4/strict.dtd";>'],
   ['FORMAT_MENU', 'menu'],
-  ['NO_USE_SETFILENAME', 1],
   ['USE_SETFILENAME_EXTENSION', 0],
   ['footnotestyle', 'separate'],
   ['CONTENTS_OUTPUT_LOCATION', 'separate_element'],
diff --git a/tp/Texinfo/options_data.txt b/tp/Texinfo/options_data.txt
index b2792f731a..a8840ab451 100644
--- a/tp/Texinfo/options_data.txt
+++ b/tp/Texinfo/options_data.txt
@@ -276,7 +276,6 @@ NO_CUSTOM_HTML_ATTRIBUTE           converter_customization 
undef   integer
 NODE_NAME_IN_INDEX                 converter_customization undef   integer
 NODE_NAME_IN_MENU                  converter_customization undef   integer
 NO_TOP_NODE_OUTPUT                 converter_customization undef   integer
-NO_USE_SETFILENAME                 converter_customization undef   integer
 OPEN_DOUBLE_QUOTE_SYMBOL           converter_customization undef   char
 OPEN_QUOTE_SYMBOL                  converter_customization undef   char
 OUTPUT_CHARACTERS                  converter_customization undef   integer