texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * Pod-Simple-Texinfo/pod2texi.pl: do not ignore a


From: Patrice Dumas
Subject: branch master updated: * Pod-Simple-Texinfo/pod2texi.pl: do not ignore an input file that cannot be searched for the manual name.
Date: Fri, 18 Feb 2022 11:50:38 -0500

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 7362253d8b * Pod-Simple-Texinfo/pod2texi.pl: do not ignore an input 
file that cannot be searched for the manual name.
7362253d8b is described below

commit 7362253d8bb21183d3aa87aebd473cd7abd655cf
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Feb 18 17:50:30 2022 +0100

    * Pod-Simple-Texinfo/pod2texi.pl: do not ignore an input file that
    cannot be searched for the manual name.
    
    * doc/tp_api/Makefile.am (tp_api_TEXINFOS): add tp_api_indices.texi.
---
 ChangeLog                      |  9 ++++++++-
 Pod-Simple-Texinfo/pod2texi.pl | 12 +++++-------
 doc/tp_api/Makefile.am         |  2 +-
 man/pod2texi.1                 |  9 +++++++--
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc7ac9cb7d..ffd684842f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+2022-02-18  Patrice Dumas  <pertusus@free.fr>
+
+       * Pod-Simple-Texinfo/pod2texi.pl: do not ignore an input file that
+       cannot be searched for the manual name.
+
+       * doc/tp_api/Makefile.am (tp_api_TEXINFOS): add tp_api_indices.texi.
+
 2022-02-18  Patrice Dumas  <pertusus@free.fr>
 
        * Pod-Simple-Texinfo/pod2texi.pl (--setfilename): add --setfilename
        option to be able to pass @setfilename argument for top boilerplate,
-       in prticular if outputting on stdout.
+       in particular if outputting on stdout.
 
        * doc/tp_api/Makefile.am, doc/tp_api/tp_api_indices.texi: prepend
        tp_api_indices.texi to tp_api.texi to output indices.
diff --git a/Pod-Simple-Texinfo/pod2texi.pl b/Pod-Simple-Texinfo/pod2texi.pl
index 028632cdf8..e781926c56 100755
--- a/Pod-Simple-Texinfo/pod2texi.pl
+++ b/Pod-Simple-Texinfo/pod2texi.pl
@@ -204,15 +204,16 @@ die sprintf(__("%s: missing file argument\n"), 
$real_command_name)
    .sprintf(__("Try `%s --help' for more information.\n"), $real_command_name)
      unless (scalar(@input_files) >= 1);
 
-my @processed_files;
 # First gather all the manual names
 if ($base_level > 0) {
   foreach my $file (@input_files) {
     # we don't want to read from STDIN, as the input read would be lost
     # same with named pipe and socket...
     # FIXME are there other file types that have the same problem?
-    # FIXME the file is ignored in the output!
-    next if ($file eq '-' or -p $file or -S $file);
+    if ($file eq '-' or -p $file or -S $file) {
+      push @all_manual_names, undef;
+      next;
+    }
     # not really used, only the manual name is used.
     my $parser = Pod::Simple::PullParserRun->new();
     $parser->parse_file($file);
@@ -229,10 +230,7 @@ if ($base_level > 0) {
       }
       push @all_manual_names, undef;
     }
-    push @processed_files, $file;
   }
-} else {
-  @processed_files = @input_files;
 }
 
 sub _fix_texinfo_tree($$$$;$)
@@ -331,7 +329,7 @@ my $file_nr = 0;
 # Full manual is collected to generate the top node menu, if $section_nodes
 my $full_manual = '';
 my @included;
-foreach my $file (@processed_files) {
+foreach my $file (@input_files) {
   my $manual_texi = '';
   my $outfile;
   my $outfile_name;
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index a44f5f1b7d..ca4fd0e2fd 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -37,7 +37,7 @@ TEXINFO_TEX = ../texinfo.tex
 
 # dependencies are in api_includes/ directory but we do not want to list
 # them explicitely
-#tp_api_TEXINFOS = 
+tp_api_TEXINFOS = tp_api_indices.texi
 #dist_tp_api_TEXINFOS = 
 EXTRA_DIST = api_includes
 
diff --git a/man/pod2texi.1 b/man/pod2texi.1
index 903a821074..985cafda13 100644
--- a/man/pod2texi.1
+++ b/man/pod2texi.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "POD2TEXI 1"
-.TH POD2TEXI 1 "2022-02-08" "perl v5.32.1" "User Contributed Perl 
Documentation"
+.TH POD2TEXI 1 "2022-02-18" "perl v5.34.0" "User Contributed Perl 
Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -207,6 +207,11 @@ Ordinarily, it's good to keep the sectioning hierarchy 
intact.
 Insert \fI\s-1STR\s0\fR as top boilerplate before menu and includes.  If 
\fI\s-1STR\s0\fR is
 set to \f(CW\*(C`\-\*(C'\fR, read the top boilerplate from the standard input. 
 The default top
 boilerplate is a minimal beginning for a Texinfo document.
+.IP "\fB\-\-setfilename\fR=\fI\s-1STR\s0\fR" 4
+.IX Item "--setfilename=STR"
+Use \fI\s-1STR\s0\fR in top boilerplate before menu and includes for 
\f(CW@setfilename\fR.
+The default is based onthe output file name.  This option is especially
+useful if the top boilerplate is output on the standard output.
 .IP "\fB\-\-subdir\fR=\fI\s-1NAME\s0\fR" 4
 .IX Item "--subdir=NAME"
 If there is a main manual with include files (each corresponding to



reply via email to

[Prev in Thread] Current Thread [Next in Thread]