summaryrefslogtreecommitdiff
path: root/Build/source/texk/texlive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-04-27 13:34:28 +0000
committerKarl Berry <karl@freefriends.org>2021-04-27 13:34:28 +0000
commit20c4130a2e70664159f514bb24152b7124294ff5 (patch)
tree1ced2ffd70f4a853ebcbd4260eff6e89ba2280f7 /Build/source/texk/texlive
parent60b6bdc7cad5409422b39769269b516354b23025 (diff)
pdfxup (26apr21)
git-svn-id: svn://tug.org/texlive/trunk@59001 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/texlive')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pdfxup/pdfxup61
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/fmtutil.pl8
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl24
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/updmap.pl16
4 files changed, 72 insertions, 37 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup b/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
index 12ac684ede8..c53607b82ab 100755
--- a/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
+++ b/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
@@ -2,12 +2,12 @@
shopt -s extglob
shopt -s lastpipe
-VERSION="2.00"
-VDATE="2020/12/17"
+VERSION="2.10"
+VDATE="2021/04/25"
## see release notes at the end of this file.
-## (c) 2020/12/17 Nicolas Markey <pdfxup at markey dot fr>
+## (c) 2021/04/25 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
@@ -83,6 +83,8 @@ function defaultvalues()
: ${dfpdfxupSILENTLY_OVERWRITE="0"}
: ${dfpdfxupSET_BBOX=""}
: ${dfpdfxupTIGHT_FRAME="0"}
+ : ${dfpdfxupCOLUMN="0"}
+ : ${dfpdfxupBALANCELAST="0"}
}
function setdefaultvalues()
@@ -140,11 +142,16 @@ function setdefaultvalues()
TIGHT_FRAME=$dfpdfxupTIGHT_FRAME;
# initial bounding box
SET_BBOX=$dfpdfxupSET_BBOX
-
+ # pages displayed left-to-right first (default), or top-to-bottom first
+ COLUMN=$dfpdfxupCOLUMN
+ # balance last page (corresponds to option 'columnstrict' option
+ # in the pdfpages manual; also works in "non-column" mode)
+ BALANCELAST=$dfpdfxupBALANCELAST
+
## Notice: the names for h and w should actually be X and Y:
## they are not width and height, but coordinates of upper right corner.
- ## Notice: PAGES, INCLUDE_FOR_BBOX and EXCLUDE_FOR_BBOX will be set to default values if empty after
- ## processing options
+ ## Notice: PAGES, INCLUDE_FOR_BBOX and EXCLUDE_FOR_BBOX will be set to
+ ## default values if empty after processing options
}
######################################################################
@@ -204,9 +211,11 @@ See the manual page ('man pdfxup') for the list of all options.";
## -ow allow overwriting [default: \"$dfpdfxupSILENTLY_OVERWRITE\"]
## -ps s output paper size [default: \"$dfpdfxupPAPERSIZE\"]
## -tf draw tight frame around each page [default: \"$dfpdfxupTIGHT_FRAME\"]
+## -col arrange pages top-to-bottom first [default: \"$dfpdfxupCOLUMN\"]
+## -bal balance last page [default: \"$dfpdfxupBALANCELAST\"]
## -q run quietly (equiv. '-V=0')
## -h show this help message
-## -V [0-3] select verbosity [default: \"$dfpdfxupVERBOSITY\"]
+## -V [0-3] select verbosity [default: \"$dfpdfxupVERBOSITY\"]
##
##
##
@@ -445,15 +454,16 @@ fi
defaultvalues;
setdefaultvalues;
filename="temp-pdfxup-`date +%s`";
-inputfilename="input-$filename";
-watermarkfilename="watermark-$filename";
+inputfilename="input-pdfxup-$filename";
+watermarkfilename="watermark-pdfxup-$filename";
######################################################################
## check for ghostscript and pdflatex
######################################################################
## GS could be specified from command-line
: ${GS=`which gs`}
-GSVERSION=`$GS --version 2>/dev/null`;
+## regexp keeps only first two numbers of version number (eg. 9.53.3 -> 9.53)
+GSVERSION=`$GS --version 2>/dev/null |sed -e "s/\(.\.[^\.]*\)\..*/\\1/"`;
if [ ! "$GSVERSION" ]; then
echo " /!\\ ghostscript not found; aborting.";
exit 1;
@@ -620,6 +630,18 @@ while [ $# != 0 ]; do
myecho 0+ " /!\ configuration file $TMP not found"
fi
shift;;
+ -?(-)col|--column|--column-mode|-?(-)vert?(ical))
+ COLUMN=1
+ shift;;
+ -?(-)row|--row-mode|-?(-)line?(s)|-?(-)horiz?(ontal))
+ COLUMN=0
+ shift;;
+ -?(-)bal|--balance|--balancelast|--balance-last)
+ BALANCELAST=1
+ shift;;
+ -?(-)no-bal|--no-balance|--no-balancelast|--no-balance-last)
+ BALANCELAST=0
+ shift;;
-c|--clip)
case $2 in
1|yes|y|true)
@@ -674,7 +696,7 @@ while [ $# != 0 ]; do
shift 2;;
-p*|--page*)
ANS=`echo $1|sed -re "s/--?p(ages?)?=?//"`;
- PAGES=+="$ANS,";
+ PAGES+="$ANS,";
shift;;
-o|--out|--output-file|--outfile)
OUTPUTFILE=$2;
@@ -1351,7 +1373,7 @@ EOF
case $BOOKLET in
0)
echo " \bookletfalse" >> $filename.tex;;
- se)
+ 2)
echo " \booklettrue" >> $filename.tex
echo " \longedgefalse" >> $filename.tex;;
*)
@@ -1387,6 +1409,8 @@ cat >> $filename.tex <<EOF
\def\pdfxupwidefbox{$WIDE_FRAMEBOX}
\def\pdfxuptightfbox{$TIGHT_FRAMEBOX}
\def\pdfxupbbox{$BBOPTION}
+ \def\columnmode{$COLUMN}
+ \def\balancelast{$BALANCELAST}
\input{pdfxup-template}
@@ -1539,7 +1563,7 @@ pdfxup has numerous options:
##
##################################################################
Author: Nicolas Markey
-Please send your comments to <pdfxup@markey.fr>
+Please send your comments and bug reports to <pdfxup@markey.fr>
v1.00 (2015/08/23)
- first release
@@ -1585,3 +1609,14 @@ v2.00 (2020/12/17)
for frequent situations.
- cleaned-up man page, adding some missing options (thanks
to Louis Gostiaux for pointing undocumented options)
+
+v2.10 (2021/04/25)
+ - fixed a bug with ghostscript adding a patch-level number in their
+ version number. This is the bug reported in
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=976080
+ It was solved with the help of Christian Gnaegi.
+ - fixed 2 bugs in the computations of size of pages
+ - fixed a bug which inhibited short-edge option of booklets
+ - added options --col (to fill in pages vertically first) and --bal
+ (to balance columns (or rows) the last page). This feature was
+ requested by Philipp Killinger.
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index abe01330a84..21c9b79088c 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 58847 2021-04-12 01:00:22Z preining $
+# $Id: fmtutil.pl 58961 2021-04-22 00:55:07Z 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 58847 2021-04-12 01:00:22Z preining $';
-my $lastchdate = '$Date: 2021-04-12 03:00:22 +0200 (Mon, 12 Apr 2021) $';
+my $svnid = '$Id: fmtutil.pl 58961 2021-04-22 00:55:07Z preining $';
+my $lastchdate = '$Date: 2021-04-22 02:55:07 +0200 (Thu, 22 Apr 2021) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 58847 $';
+my $svnrev = '$Revision: 58961 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 220cf7de261..239cd08b8d4 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 58862 2021-04-13 01:01:37Z preining $
+# $Id: tlmgr.pl 58961 2021-04-22 00:55:07Z preining $
#
# Copyright 2008-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 58862 $';
-my $datrev = '$Date: 2021-04-13 03:01:37 +0200 (Tue, 13 Apr 2021) $';
+my $svnrev = '$Revision: 58961 $';
+my $datrev = '$Date: 2021-04-22 02:55:07 +0200 (Thu, 22 Apr 2021) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -873,7 +873,7 @@ sub handle_execute_actions {
# only existing formats are recreated
if (!$localtlpdb->option("create_formats")) {
$invoke_fmtutil .= " --refresh";
- info("only existing formats will be refreshed per user option (create_formats=0)\n");
+ debug("only existing formats will be refreshed per user option (create_formats=0)\n");
}
if ($::files_changed) {
@@ -7007,9 +7007,9 @@ sub _init_tlmedia {
# choose a mirror if we are asked.
if ($location =~ m/^ctan$/i) {
$location = give_ctan_mirror();
- } elsif ($location =~ m,^$TeXLiveServerURL,) {
+ } elsif ($location =~ m,^$TeXLiveServerURLRegexp,) {
my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base();
- $location =~ s,^$TeXLiveServerURL,$mirrorbase,;
+ $location =~ s,^$TeXLiveServerURLRegexp,$mirrorbase,;
}
my $errormsg;
@@ -7049,9 +7049,9 @@ sub setup_one_remotetlpdb {
# choose a mirror if we are asked.
if ($location =~ m/^ctan$/i) {
$location = give_ctan_mirror();
- } elsif ($location =~ m,^$TeXLiveServerURL,) {
+ } elsif ($location =~ m,^$TeXLiveServerURLRegexp,) {
my $mirrorbase = TeXLive::TLUtils::give_ctan_mirror_base();
- $location =~ s,^$TeXLiveServerURL,$mirrorbase,;
+ $location =~ s,^$TeXLiveServerURLRegexp,$mirrorbase,;
}
# if we talk about a net location try to download the hash of the tlpdb
@@ -7698,7 +7698,7 @@ with C<tlmgr>:
=item C<tlmgr option repository ctan>
-=item C<tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet>
+=item C<tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet>
Tell C<tlmgr> to use a nearby CTAN mirror for future updates; useful if
you installed TeX Live from the DVD image and want to have continuing
@@ -7781,7 +7781,7 @@ Equivalent ways of specifying a local directory.
=item C<ctan>
-=item C<http://mirror.ctan.org/systems/texlive/tlnet>
+=item C<https://mirror.ctan.org/systems/texlive/tlnet>
Pick a CTAN mirror automatically, trying for one that is both nearby and
up-to-date. The chosen mirror is used for the entire download. The bare
@@ -8557,7 +8557,7 @@ One common use of C<option> is to permanently change the installation to
get further updates from the Internet, after originally installing from
DVD. To do this, you can run
- tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet
+ tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet
The C<install-tl> documentation has more information about the possible
values for C<repository>. (For backward compatibility, C<location> can
@@ -10116,7 +10116,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 58862 2021-04-13 01:01:37Z preining $
+$Id: tlmgr.pl 58961 2021-04-22 00:55:07Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index 40dd22ef003..f2cfbe78693 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
@@ -1,9 +1,9 @@
#!/usr/bin/env perl
-# $Id: updmap.pl 51338 2019-06-07 16:36:59Z karl $
+# $Id: updmap.pl 58960 2021-04-22 00:52:00Z preining $
# updmap - maintain map files for outline fonts.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
-# Copyright 2011-2019 Norbert Preining
+# Copyright 2011-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -14,7 +14,7 @@
# the original versions were licensed under the following agreement:
# Anyone may freely use, modify, and/or distribute this file, without
-my $svnid = '$Id: updmap.pl 51338 2019-06-07 16:36:59Z karl $';
+my $svnid = '$Id: updmap.pl 58960 2021-04-22 00:52:00Z preining $';
my $TEXMFROOT;
BEGIN {
@@ -27,10 +27,10 @@ BEGIN {
unshift(@INC, "$TEXMFROOT/tlpkg");
}
-my $lastchdate = '$Date: 2019-06-07 18:36:59 +0200 (Fri, 07 Jun 2019) $';
+my $lastchdate = '$Date: 2021-04-22 02:52:00 +0200 (Thu, 22 Apr 2021) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 51338 $';
+my $svnrev = '$Revision: 58960 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -1373,10 +1373,10 @@ The following files have been generated as listed above,
but will not be found because overriding files exist, listed below.
");
#
- if ($prg eq "updmap-sys") {
+ if ($opts{'sys'}) {
print_and_log ("
-Perhaps you have run updmap in the past, but are running updmap-sys
-now. Once you run updmap the first time, you have to keep using it,
+Perhaps you have run updmap-user in the past, but are running updmap-sys
+now. Once you run updmap-user the first time, you have to keep using it,
or else remove the personal configuration files it creates (the ones
listed below).
");