From 4f9a537a10387c6cc0ce75079dd23e170566cf6d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 7 Jan 2020 21:34:25 +0000 Subject: pdfxup (7jan20) git-svn-id: svn://tug.org/texlive/trunk@53345 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/pdfxup/pdfxup | 6 ++--- .../texk/texlive/linked_scripts/texlive/fmtutil.pl | 27 +++++++++++++++------ Master/texmf-dist/doc/man/man1/pdfxup.1 | 2 +- Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf | Bin 22457 -> 22671 bytes Master/texmf-dist/doc/support/pdfxup/README | 4 +-- Master/texmf-dist/doc/support/pdfxup/RELEASES | 5 +++- Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf | Bin 90154 -> 89898 bytes Master/texmf-dist/scripts/pdfxup/pdfxup | 6 ++--- 8 files changed, 33 insertions(+), 17 deletions(-) diff --git a/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup b/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup index 62226cb45ab..d0216122b5d 100755 --- a/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup +++ b/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup @@ -181,15 +181,15 @@ function dimtopt() ;; *mm) dim=${dim%mm}; - eval dim=$((dim*2845/100))pt; + eval dim=$((dim*2845/1000))pt; ;; *cm) dim=${dim%cm}; - eval dim=$((dim*284/10))pt; + eval dim=$((dim*2845/100))pt; ;; *in) dim=${dim%in}; - eval dim=$((dim*723/10))pt; + eval dim=$((dim*7228/100))pt; ;; *[!0-9]*) ## should not occur... has been filtered out by main 'case' diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl index 69b829b3a45..2f085a5c6f3 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl @@ -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 @@ BEGIN { 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 @@ sub determine_config_files { 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 @@ Explanation of trees and files normally used: 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. diff --git a/Master/texmf-dist/doc/man/man1/pdfxup.1 b/Master/texmf-dist/doc/man/man1/pdfxup.1 index 4286906d00b..f2853bde926 100644 --- a/Master/texmf-dist/doc/man/man1/pdfxup.1 +++ b/Master/texmf-dist/doc/man/man1/pdfxup.1 @@ -1,6 +1,6 @@ .\" Manpage for pdfxup. .\" Contact pdfxup@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 diff --git a/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf b/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf index 31630c95154..72743eedd31 100644 Binary files a/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf and b/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/pdfxup/README b/Master/texmf-dist/doc/support/pdfxup/README index 9bbe0d49f2e..20aacc92db1 100644 --- a/Master/texmf-dist/doc/support/pdfxup/README +++ b/Master/texmf-dist/doc/support/pdfxup/README @@ -1,4 +1,4 @@ -PDFXUP -- v1.50 (2019/12/31) +PDFXUP -- v1.51 (2020/01/06) N. Markey @@ -18,7 +18,7 @@ graphicx package) in order to produce the new document. -%% (c) 2019/12/31 Nicolas Markey +%% (c) 2020/01/06 Nicolas Markey %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license diff --git a/Master/texmf-dist/doc/support/pdfxup/RELEASES b/Master/texmf-dist/doc/support/pdfxup/RELEASES index 15c8903b46e..e9c3a97191e 100644 --- a/Master/texmf-dist/doc/support/pdfxup/RELEASES +++ b/Master/texmf-dist/doc/support/pdfxup/RELEASES @@ -27,4 +27,7 @@ v1.30 (2015/10/06) 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 diff --git a/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf b/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf index d51a6c1ca42..15ea3953f0a 100644 Binary files a/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf and b/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf differ diff --git a/Master/texmf-dist/scripts/pdfxup/pdfxup b/Master/texmf-dist/scripts/pdfxup/pdfxup index 62226cb45ab..d0216122b5d 100755 --- a/Master/texmf-dist/scripts/pdfxup/pdfxup +++ b/Master/texmf-dist/scripts/pdfxup/pdfxup @@ -181,15 +181,15 @@ function dimtopt() ;; *mm) dim=${dim%mm}; - eval dim=$((dim*2845/100))pt; + eval dim=$((dim*2845/1000))pt; ;; *cm) dim=${dim%cm}; - eval dim=$((dim*284/10))pt; + eval dim=$((dim*2845/100))pt; ;; *in) dim=${dim%in}; - eval dim=$((dim*723/10))pt; + eval dim=$((dim*7228/100))pt; ;; *[!0-9]*) ## should not occur... has been filtered out by main 'case' -- cgit v1.2.3