branch master updated: * Pod-Simple-Texinfo/pod2texi.pl, doc/tp_api/Makefile.am: no @setfilename output if --setfilename is not given in argument of pod2texi.pl. Remove --setfilename from the rule generating texi2any_internals.texi.

[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 e04b074a87 * Pod-Simple-Texinfo/pod2texi.pl, doc/tp_api/Makefile.am: 
no @setfilename output if --setfilename is not given in argument of 
pod2texi.pl. Remove --setfilename from the rule generating 
texi2any_internals.texi.
e04b074a87 is described below

commit e04b074a87c6a6e1d29fe0221a920b85069350d3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 24 23:03:56 2022 +0200

    * Pod-Simple-Texinfo/pod2texi.pl, doc/tp_api/Makefile.am:
    no @setfilename output if --setfilename is not given in argument
    of pod2texi.pl.
    Remove --setfilename from the rule generating texi2any_internals.texi.
---
 ChangeLog                      |  7 +++++++
 Pod-Simple-Texinfo/pod2texi.pl | 20 ++++++++------------
 doc/pod2texi.texi              |  3 +--
 doc/tp_api/Makefile.am         |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c71a5a07a..ff66e1a5f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-10-24  Patrice Dumas  <pertusus@free.fr>
+
+       * Pod-Simple-Texinfo/pod2texi.pl, doc/tp_api/Makefile.am:
+       no @setfilename output if --setfilename is not given in argument
+       of pod2texi.pl.
+       Remove --setfilename from the rule generating texi2any_internals.texi.
+
 2022-10-24  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/Convert/HTML.pm (_convert_menu_entry_type):
diff --git a/Pod-Simple-Texinfo/pod2texi.pl b/Pod-Simple-Texinfo/pod2texi.pl
index b6ed81d115..057ebe5062 100755
--- a/Pod-Simple-Texinfo/pod2texi.pl
+++ b/Pod-Simple-Texinfo/pod2texi.pl
@@ -531,24 +531,21 @@ if ($base_level > 0) {
   }
 
   # We output utf8 as it is default for Texinfo and is consistent with no
-  # @documentencoding, and it also because is the best choice or encoding.
+  # @documentencoding, and it also because is the best choice for encoding.
   binmode($fh, ':encoding(utf8)');
 
-  if (not defined($setfilename)) {
-    my $outfile_name = $output;
-
-    $outfile_name = $STDOUT_DOCU_NAME if ($outfile_name eq '-');
-    $outfile_name =~ s/\.te?x(i|info)?$//;
-    $outfile_name .= '.info';
-    $setfilename = $outfile_name;
+  my $setfilename_string = '';
+  if (defined($setfilename)) {
+    $setfilename_string = '@setfilename '
+              . Pod::Simple::Texinfo::_protect_text($setfilename)."\n";
   }
 
   my $preamble_result;
 
   if (! defined ($preamble)) {
     $preamble_result = '\input texinfo
-@setfilename ' . Pod::Simple::Texinfo::_protect_text($setfilename) . "
-\@settitle $top
+' . $setfilename_string
+. "\@settitle $top
 \@shorttitlepage $top
 \@headings on
 
@@ -694,8 +691,7 @@ boilerplate is a minimal beginning for a Texinfo document.
 =item B<--setfilename>=I<STR>
 
 Use I<STR> in top boilerplate before menu and includes for C<@setfilename>.
-The default is based on the output file name.  This option is especially
-useful if the top boilerplate is output on the standard output.
+No C<@setfilename> is output in the default case.
 
 =item B<--subdir>=I<NAME>
 
diff --git a/doc/pod2texi.texi b/doc/pod2texi.texi
index 8cfa0782e2..7f909ec0c5 100644
--- a/doc/pod2texi.texi
+++ b/doc/pod2texi.texi
@@ -107,8 +107,7 @@ boilerplate is a minimal beginning for a Texinfo document.
 @anchor{pod2texi @strong{@asis{}-@asis{}-@asis{}setfilename}=@emph{STR}}
 
 Use @emph{STR} in top boilerplate before menu and includes for 
@code{@@setfilename}.
-The default is based on the output file name.  This option is especially
-useful if the top boilerplate is output on the standard output.
+No @code{@@setfilename} is output in the default case.
 
 @item @strong{@asis{}-@asis{}-@asis{}subdir}=@emph{NAME}
 @anchor{pod2texi @strong{@asis{}-@asis{}-@asis{}subdir}=@emph{NAME}}
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index 57681aaef9..493c45682c 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -61,6 +61,6 @@ texi2any_internals_dependencies = \
   $(top_srcdir)/tp/Texinfo/Convert/Plaintext.pm
 
 texi2any_internals.texi: $(texi2any_internals_dependencies) 
texi2any_internals_indices.texi
-       $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
-I $(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib/ -I 
$(top_srcdir)/tp/maintain/lib/libintl-perl/lib/ -I 
$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --setfilename 
texi2any_internals.info --top 'Texinfo modules documentation' 
--subdir=api_includes $(texi2any_internals_dependencies) | sed -e 
's/^@bye/@__bye/' | sed -e '/^@__bye/r $(srcdir) [...]
+       $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
-I $(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib/ -I 
$(top_srcdir)/tp/maintain/lib/libintl-perl/lib/ -I 
$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --top 
'Texinfo modules documentation' --subdir=api_includes 
$(texi2any_internals_dependencies) | sed -e 's/^@bye/@__bye/' | sed -e 
'/^@__bye/r $(srcdir)/texi2any_internals_indices.texi' | se [...]
 
 endif