summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-22 20:52:35 +0000
committerKarl Berry <karl@freefriends.org>2020-10-22 20:52:35 +0000
commite9796652e0cf6adbaae8a90ce7d990febb638d28 (patch)
treec88f2943e7869fa8326386ae0b5ab4dcef1be3e7
parent700c78615396e6d1751932b05cbab52007dd5e52 (diff)
pdfxup (22oct20)
git-svn-id: svn://tug.org/texlive/trunk@56736 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pdfxup/pdfxup53
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/fmtutil.pl49
-rw-r--r--Master/texmf-dist/doc/man/man1/pdfxup.12
-rw-r--r--Master/texmf-dist/doc/man/man1/pdfxup.man1.pdfbin22395 -> 22314 bytes
-rw-r--r--Master/texmf-dist/doc/support/pdfxup/README4
-rw-r--r--Master/texmf-dist/doc/support/pdfxup/RELEASES12
-rw-r--r--Master/texmf-dist/doc/support/pdfxup/pdfxup.pdfbin89855 -> 89691 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/pdfxup/pdfxup53
8 files changed, 81 insertions, 92 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup b/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
index f1bc490fcb1..52baf20ddc2 100755
--- a/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
+++ b/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
@@ -2,8 +2,8 @@
shopt -s extglob
shopt -s lastpipe
-VERSION="1.60"
-VDATE="2020/06/24"
+VERSION="1.61"
+VDATE="2020/10/21"
## see release notes at the end of this file.
@@ -15,6 +15,7 @@ VDATE="2020/06/24"
## dimtopt() and testdim()
## ifinrangelist()
## cleancslor() [clean comma-sep. list of ranges]
+## cleanup
## 2) script:
## - set default options
## - test for ghostscript and pdflatex
@@ -58,10 +59,10 @@ function defaultvalues()
: ${dfpdfxupNOBB=""}
: ${dfpdfxupKBB="0"}
: ${dfpdfxupGBB="0"}
- : ${dfpdfxupVERB=1}
- : ${dfpdfxupDEBUG=0}
- : ${dfpdfxupWMPERIOD=1}
- : ${dfpdfxupALLOWOW=0}
+ : ${dfpdfxupVERB="1"}
+ : ${dfpdfxupDEBUG="0"}
+ : ${dfpdfxupWMPERIOD="1"}
+ : ${dfpdfxupALLOWOW="0"}
: ${dfpdfxupFORCEBB=""}
}
@@ -91,7 +92,7 @@ function setdefaultvalues()
WATERMARKPERIOD=$dfpdfxupWMPERIOD;
KBB=$dfpdfxupKBB;
GBB=$dfpdfxupGBB;
- ALLOWOVERWITE=$dfpdfxupALLOWOW;
+ ALLOWOVERWRITE=$dfpdfxupALLOWOW;
SBB=0;
x0=-1
y0=-1
@@ -167,7 +168,6 @@ Available OPTIONS are:
##
##
##
-
exit 0;
}
@@ -335,6 +335,15 @@ function cleancslor()
done
}
+function cleanup()
+{
+ if [[ $DEBUG == 0 ]]; then
+ myecho 1+ "-> cleaning";
+ myecho 2+ " * rm $RMopt *$filename.*"
+ rm $RMopt *$filename.*
+ fi
+}
+
ARGS=$@;
if [ $# -eq 0 ]; then
usage;
@@ -532,7 +541,7 @@ while [ $# != 0 ]; do
OUTF=$ANS;
shift;;
-ow)
- ALLOWOVERWRITE=1;
+ ALLOWOVERWRITE="1";
shift;;
-ihm|--innerhmargin)
dimtopt $2 $dfpdfxupIHM "$1 $2";
@@ -1097,6 +1106,7 @@ fi
if [[ $GBB != 0 ]]; then
myecho 1+ " final bounding box: x=$x y=$y X=$w Y=$h";
+ cleanup;
exit 0;
fi
@@ -1408,34 +1418,20 @@ esac
######################################################################
if [[ $LATEXFAILED -eq 1 ]]; then
myecho 1+ ": failed!"
- if [[ $DEBUG == 0 ]]; then
- myecho 1+ "-> cleaning";
- myecho 2+ " * rm $RMopt $filename.* $inputfilename.*"
- rm $RMopt $filename.* $inputfilename.*
- fi
+ cleanup
exit 0;
fi
if [[ $EMPTYBB -eq 0 ]]; then
myecho 1+ " final scale: "`cat $filename.scl | sed -e "s/pt$//"`"%"
fi
-## pass "-i" option to avoid overwriting...
-## You may avoir this by running 'MVopt="-f" pdfxup ...'
-if [[ "$ALLOWOVERWRITE" ]]; then
+if [[ $ALLOWOVERWRITE -eq 1 ]]; then
myecho 2+ " * mv $MVopt $filename.pdf \"$OUTF\""
mv $MVopt $filename.pdf "$OUTF"
else
myecho 2+ " * mv $MVopt -i $filename.pdf \"$OUTF\""
- mv $MVopt -i $filename.pdf "$OUTF"
+ mv $MVopt -i $filename.pdf "$OUTF"
fi
-if [[ $DEBUG == 0 ]]; then
- myecho 1+ "-> cleaning";
- myecho 2+ " * rm $RMopt $filename.* $inputfilename.pdf"
- rm $RMopt $filename.* $inputfilename.pdf
- [[ -e $watermarkfilename.pdf ]] && \
- myecho 2+ " * rm $RMopt $watermarkfilename.pdf" && \
- rm $RMopt $watermarkfilename.pdf
-fi
-
+cleanup
exit 0
@@ -1581,3 +1577,6 @@ v1.60 (2020/06/24)
(thanks to Janis Kalofolias for pointing out the problem)
- allow file names containing spaces
- better inclusion of watermarks
+
+v1.61 (2020/10/21)
+ - clean up after option '-g' (thanks to Oliver Redner)
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index 0cde1639919..60d72e60c90 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: fmtutil.pl 55294 2020-05-27 02:43:58Z preining $
+# $Id: fmtutil.pl 56682 2020-10-17 06:08:28Z preining $
# fmtutil - utility to maintain format files.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -24,11 +24,11 @@ BEGIN {
TeX::Update->import();
}
-my $svnid = '$Id: fmtutil.pl 55294 2020-05-27 02:43:58Z preining $';
-my $lastchdate = '$Date: 2020-05-27 04:43:58 +0200 (Wed, 27 May 2020) $';
+my $svnid = '$Id: fmtutil.pl 56682 2020-10-17 06:08:28Z preining $';
+my $lastchdate = '$Date: 2020-10-17 08:08:28 +0200 (Sat, 17 Oct 2020) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 55294 $';
+my $svnrev = '$Revision: 56682 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -407,32 +407,21 @@ sub callback_build_formats {
my $nobuild = 0;
my $notavail = 0;
my $total = 0;
- for my $fmt (keys %{$alldata->{'merged'}}) {
- for my $eng (keys %{$alldata->{'merged'}{$fmt}}) {
- next if ($fmt ne $eng);
- $total++;
- my $val = select_and_rebuild_format($fmt, $eng, $what, $whatarg);
- if ($val == $FMT_DISABLED) { $disabled++; }
- elsif ($val == $FMT_NOTSELECTED) { $nobuild++; }
- elsif ($val == $FMT_FAILURE) { $err++; push (@err, "$eng/$fmt"); }
- elsif ($val == $FMT_SUCCESS) { $suc++; }
- elsif ($val == $FMT_NOTAVAIL) { $notavail++; }
- else { print_error("callback_build_format (round 1): unknown return "
- . "from select_and_rebuild.\n"); }
- }
- }
- for my $fmt (keys %{$alldata->{'merged'}}) {
- for my $eng (keys %{$alldata->{'merged'}{$fmt}}) {
- next if ($fmt eq $eng);
- $total++;
- my $val = select_and_rebuild_format($fmt, $eng, $what, $whatarg);
- if ($val == $FMT_DISABLED) { $disabled++; }
- elsif ($val == $FMT_NOTSELECTED) { $nobuild++; }
- elsif ($val == $FMT_FAILURE) { $err++; push (@err, "$eng/$fmt"); }
- elsif ($val == $FMT_SUCCESS) { $suc++; }
- elsif ($val == $FMT_NOTAVAIL) { $notavail++; }
- else { print_error("callback_build_format (round 2): unknown return "
- . "from select_and_rebuild.\n"); }
+ for my $swi (qw/format=engine format!=engine/) {
+ for my $fmt (keys %{$alldata->{'merged'}}) {
+ for my $eng (keys %{$alldata->{'merged'}{$fmt}}) {
+ next if ($swi eq "format=engine" && $fmt ne $eng);
+ next if ($swi eq "format!=engine" && $fmt eq $eng);
+ $total++;
+ my $val = select_and_rebuild_format($fmt, $eng, $what, $whatarg);
+ if ($val == $FMT_DISABLED) { $disabled++; }
+ elsif ($val == $FMT_NOTSELECTED) { $nobuild++; }
+ elsif ($val == $FMT_FAILURE) { $err++; push (@err, "$eng/$fmt"); }
+ elsif ($val == $FMT_SUCCESS) { $suc++; }
+ elsif ($val == $FMT_NOTAVAIL) { $notavail++; }
+ else { print_error("callback_build_format (round 1): unknown return "
+ . "from select_and_rebuild.\n"); }
+ }
}
}
diff --git a/Master/texmf-dist/doc/man/man1/pdfxup.1 b/Master/texmf-dist/doc/man/man1/pdfxup.1
index 2f10be30d7c..57b547e524d 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 "24 june 2020" "1.60" "pdfxup man page"
+.TH man 1 "21 october 2020" "1.61" "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 af17bd33b9b..632ec802f00 100644
--- a/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/pdfxup/README b/Master/texmf-dist/doc/support/pdfxup/README
index 7423f6d4d55..ba3c0f05fa1 100644
--- a/Master/texmf-dist/doc/support/pdfxup/README
+++ b/Master/texmf-dist/doc/support/pdfxup/README
@@ -1,4 +1,4 @@
-PDFXUP -- v1.60 (2020/06/24)
+PDFXUP -- v1.61 (2020/10/21)
N. Markey <pdfxup@markey.fr>
@@ -18,7 +18,7 @@ graphicx package) in order to produce the new document.
-%% (c) 2020/06/24 Nicolas Markey <pdfxup at markey dot fr>
+%% (c) 2020/10/21 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
diff --git a/Master/texmf-dist/doc/support/pdfxup/RELEASES b/Master/texmf-dist/doc/support/pdfxup/RELEASES
index 18050aff3a2..3cd0fc61660 100644
--- a/Master/texmf-dist/doc/support/pdfxup/RELEASES
+++ b/Master/texmf-dist/doc/support/pdfxup/RELEASES
@@ -31,8 +31,10 @@ v1.50 (2019/12/31)
v1.51 (2020/01/06)
- corrected bug in dimtopt() (conversion mm to pt)
-v1.60 (2020/06/24)
- - added --allow-file-read=... option for ghostscript >= 9.28
- (thanks to Janis Kalofolias for pointing out the problem)
- - allow file names containing spaces
- - better inclusion of watermarks
+v1.60 (2020/06/27)
+ - allow file names containing spaces
+ - added --allow-file-read=... option to ghostscript >= 9.50
+
+v1.61 (2020/10/21)
+ - minor bug corrected (would not clean-up with option -g)
+ (thanks to Oliver Redner for pointing out the bug) \ 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 d6b137b2a6c..651c92495f8 100644
--- a/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf
+++ b/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/pdfxup/pdfxup b/Master/texmf-dist/scripts/pdfxup/pdfxup
index f1bc490fcb1..52baf20ddc2 100755
--- a/Master/texmf-dist/scripts/pdfxup/pdfxup
+++ b/Master/texmf-dist/scripts/pdfxup/pdfxup
@@ -2,8 +2,8 @@
shopt -s extglob
shopt -s lastpipe
-VERSION="1.60"
-VDATE="2020/06/24"
+VERSION="1.61"
+VDATE="2020/10/21"
## see release notes at the end of this file.
@@ -15,6 +15,7 @@ VDATE="2020/06/24"
## dimtopt() and testdim()
## ifinrangelist()
## cleancslor() [clean comma-sep. list of ranges]
+## cleanup
## 2) script:
## - set default options
## - test for ghostscript and pdflatex
@@ -58,10 +59,10 @@ function defaultvalues()
: ${dfpdfxupNOBB=""}
: ${dfpdfxupKBB="0"}
: ${dfpdfxupGBB="0"}
- : ${dfpdfxupVERB=1}
- : ${dfpdfxupDEBUG=0}
- : ${dfpdfxupWMPERIOD=1}
- : ${dfpdfxupALLOWOW=0}
+ : ${dfpdfxupVERB="1"}
+ : ${dfpdfxupDEBUG="0"}
+ : ${dfpdfxupWMPERIOD="1"}
+ : ${dfpdfxupALLOWOW="0"}
: ${dfpdfxupFORCEBB=""}
}
@@ -91,7 +92,7 @@ function setdefaultvalues()
WATERMARKPERIOD=$dfpdfxupWMPERIOD;
KBB=$dfpdfxupKBB;
GBB=$dfpdfxupGBB;
- ALLOWOVERWITE=$dfpdfxupALLOWOW;
+ ALLOWOVERWRITE=$dfpdfxupALLOWOW;
SBB=0;
x0=-1
y0=-1
@@ -167,7 +168,6 @@ Available OPTIONS are:
##
##
##
-
exit 0;
}
@@ -335,6 +335,15 @@ function cleancslor()
done
}
+function cleanup()
+{
+ if [[ $DEBUG == 0 ]]; then
+ myecho 1+ "-> cleaning";
+ myecho 2+ " * rm $RMopt *$filename.*"
+ rm $RMopt *$filename.*
+ fi
+}
+
ARGS=$@;
if [ $# -eq 0 ]; then
usage;
@@ -532,7 +541,7 @@ while [ $# != 0 ]; do
OUTF=$ANS;
shift;;
-ow)
- ALLOWOVERWRITE=1;
+ ALLOWOVERWRITE="1";
shift;;
-ihm|--innerhmargin)
dimtopt $2 $dfpdfxupIHM "$1 $2";
@@ -1097,6 +1106,7 @@ fi
if [[ $GBB != 0 ]]; then
myecho 1+ " final bounding box: x=$x y=$y X=$w Y=$h";
+ cleanup;
exit 0;
fi
@@ -1408,34 +1418,20 @@ esac
######################################################################
if [[ $LATEXFAILED -eq 1 ]]; then
myecho 1+ ": failed!"
- if [[ $DEBUG == 0 ]]; then
- myecho 1+ "-> cleaning";
- myecho 2+ " * rm $RMopt $filename.* $inputfilename.*"
- rm $RMopt $filename.* $inputfilename.*
- fi
+ cleanup
exit 0;
fi
if [[ $EMPTYBB -eq 0 ]]; then
myecho 1+ " final scale: "`cat $filename.scl | sed -e "s/pt$//"`"%"
fi
-## pass "-i" option to avoid overwriting...
-## You may avoir this by running 'MVopt="-f" pdfxup ...'
-if [[ "$ALLOWOVERWRITE" ]]; then
+if [[ $ALLOWOVERWRITE -eq 1 ]]; then
myecho 2+ " * mv $MVopt $filename.pdf \"$OUTF\""
mv $MVopt $filename.pdf "$OUTF"
else
myecho 2+ " * mv $MVopt -i $filename.pdf \"$OUTF\""
- mv $MVopt -i $filename.pdf "$OUTF"
+ mv $MVopt -i $filename.pdf "$OUTF"
fi
-if [[ $DEBUG == 0 ]]; then
- myecho 1+ "-> cleaning";
- myecho 2+ " * rm $RMopt $filename.* $inputfilename.pdf"
- rm $RMopt $filename.* $inputfilename.pdf
- [[ -e $watermarkfilename.pdf ]] && \
- myecho 2+ " * rm $RMopt $watermarkfilename.pdf" && \
- rm $RMopt $watermarkfilename.pdf
-fi
-
+cleanup
exit 0
@@ -1581,3 +1577,6 @@ v1.60 (2020/06/24)
(thanks to Janis Kalofolias for pointing out the problem)
- allow file names containing spaces
- better inclusion of watermarks
+
+v1.61 (2020/10/21)
+ - clean up after option '-g' (thanks to Oliver Redner)