texlive[53345] trunk: pdfxup (7jan20)

[commits+karl at tug.org]

Revision: 53345
          http://tug.org/svn/texlive?view=revision&revision=53345
Author:   karl
Date:     2020-01-07 22:34:25 +0100 (Tue, 07 Jan 2020)
Log Message:
-----------
pdfxup (7jan20)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
    trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
    trunk/Master/texmf-dist/doc/man/man1/pdfxup.1
    trunk/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf
    trunk/Master/texmf-dist/doc/support/pdfxup/README
    trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES
    trunk/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf
    trunk/Master/texmf-dist/scripts/pdfxup/pdfxup

Modified: trunk/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
===================================================================
(Binary files differ)

Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl	2020-01-07 21:34:04 UTC (rev 53344)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl	2020-01-07 21:34:25 UTC (rev 53345)
@@ -1,9 +1,9 @@
 #!/usr/bin/env perl
-# $Id: fmtutil.pl 52741 2019-11-11 23:16:13Z karl $
+# $Id: fmtutil.pl 53340 2020-01-06 23:55:32Z preining $
 # fmtutil - utility to maintain format files.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
-# Copyright 2014-2018 Norbert Preining
+# Copyright 2014-2020 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -24,11 +24,11 @@
   TeX::Update->import();
 }
 
-my $svnid = '$Id: fmtutil.pl 52741 2019-11-11 23:16:13Z karl $';
-my $lastchdate = '$Date: 2019-11-12 00:16:13 +0100 (Tue, 12 Nov 2019) $';
+my $svnid = '$Id: fmtutil.pl 53340 2020-01-06 23:55:32Z preining $';
+my $lastchdate = '$Date: 2020-01-07 00:55:32 +0100 (Tue, 07 Jan 2020) $';
 $lastchdate =~ s/^\$Date:\s*//;
 $lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 52741 $';
+my $svnrev = '$Revision: 53340 $';
 $svnrev =~ s/^\$Revision:\s*//;
 $svnrev =~ s/\s*\$$//;
 my $version = "r$svnrev ($lastchdate)";
@@ -1040,7 +1040,18 @@
     my @tmp;
     for my $f (@{$opts{'cnffile'}}) {
       if (! -f $f) {
-        die "$prg: Config file \"$f\" not found";
+        # if $f is a pure file name, that is dirname $f == ".",
+        # then try to find it via kpsewhich
+        if (dirname($f) eq ".") {
+          chomp(my $kpfile = `kpsewhich $f`);
+          if ($kpfile ne "") {
+            $f = $kpfile;
+          } else {
+            die "$prg: Config file \"$f\" cannot be found via kpsewhich";
+          }
+        } else {
+          die "$prg: Config file \"$f\" not found";
+        }
       }
       push @tmp, (win32() ? lc($f) : $f);
     }
@@ -1363,7 +1374,9 @@
   If --cnffile is specified on the command line (possibly multiple
   times), its value(s) are used.  Otherwise, fmtutil reads all the
   fmtutil.cnf files found by running \`kpsewhich -all fmtutil.cnf', in the
-  order returned by kpsewhich.
+  order returned by kpsewhich. Files passed in via --cnffile are
+  first tried to be loaded directly, and if not found and the file names
+  don't contain directory parts, are searched via kpsewhich.
 
   In any case, if multiple fmtutil.cnf files are found, all the format
   definitions found in all the fmtutil.cnf files are merged.

Modified: trunk/Master/texmf-dist/doc/man/man1/pdfxup.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/pdfxup.1	2020-01-07 21:34:04 UTC (rev 53344)
+++ trunk/Master/texmf-dist/doc/man/man1/pdfxup.1	2020-01-07 21:34:25 UTC (rev 53345)
@@ -1,6 +1,6 @@
 .\" Manpage for pdfxup.
 .\" Contact pdfxup at markey.fr to correct errors or typos.
-.TH man 1 "31 december 2019" "1.50" "pdfxup man page"
+.TH man 1 "06 january 2020" "1.51" "pdfxup man page"
 .SH NAME
 pdfxup \- n-up tool with reduced margins
 .SH SYNOPSIS

Modified: trunk/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/support/pdfxup/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/pdfxup/README	2020-01-07 21:34:04 UTC (rev 53344)
+++ trunk/Master/texmf-dist/doc/support/pdfxup/README	2020-01-07 21:34:25 UTC (rev 53345)
@@ -1,4 +1,4 @@
-PDFXUP -- v1.50 (2019/12/31)
+PDFXUP -- v1.51 (2020/01/06)
 N. Markey <pdfxup at markey.fr>
 
 
@@ -18,7 +18,7 @@
 
 
 
-%% (c) 2019/12/31 Nicolas Markey <pdfxup at markey dot fr>
+%% (c) 2020/01/06 Nicolas Markey <pdfxup at markey dot fr>
 %%
 %% This work may  be distributed and/or modified under  the conditions of
 %% the LaTeX Project  Public License, either version 1.3  of this license

Modified: trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES
===================================================================
--- trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES	2020-01-07 21:34:04 UTC (rev 53344)
+++ trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES	2020-01-07 21:34:25 UTC (rev 53345)
@@ -27,4 +27,7 @@
 v1.50 (2019/12/31)
  - added the -c option (to clip pages)
  - corrected + improved option -p
- - added watermarking
\ No newline at end of file
+ - added watermarking
+
+v1.51 (2020/01/06)
+ - corrected bug in dimtopt() (conversion mm to pt)
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/scripts/pdfxup/pdfxup
===================================================================
(Binary files differ)