summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-08 21:41:53 +0000
committerKarl Berry <karl@freefriends.org>2019-06-08 21:41:53 +0000
commitf59eaadd336001e0df9b784bab26f72ea6ae83c3 (patch)
tree1355186465d2b404681366aff13d10065a1829a3 /Build
parent05fdcf5329e9cad9bf82381d8e588fbe86d84326 (diff)
lwarp (8jun19)
git-svn-id: svn://tug.org/texlive/trunk@51346 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua4
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/updmap.pl15
2 files changed, 12 insertions, 7 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
index 6a88ea8d90d..c65a9fd7354 100755
--- a/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
+++ b/Build/source/texk/texlive/linked_scripts/lwarp/lwarpmk.lua
@@ -1,8 +1,8 @@
#!/usr/bin/env texlua
--- Copyright 2016-2018 Brian Dunn
+-- Copyright 2016-2019 Brian Dunn
-printversion = "v0.71"
+printversion = "v0.72"
requiredconfversion = "2" -- also at *lwarpmk.conf
function printhelp ()
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index d1cfe6c5df2..40dd22ef003 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: updmap.pl 50442 2019-03-18 11:35:23Z hironobu $
+# $Id: updmap.pl 51338 2019-06-07 16:36:59Z karl $
# updmap - maintain map files for outline fonts.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -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 50442 2019-03-18 11:35:23Z hironobu $';
+my $svnid = '$Id: updmap.pl 51338 2019-06-07 16:36:59Z karl $';
my $TEXMFROOT;
BEGIN {
@@ -27,10 +27,10 @@ BEGIN {
unshift(@INC, "$TEXMFROOT/tlpkg");
}
-my $lastchdate = '$Date: 2019-03-18 12:35:23 +0100 (Mon, 18 Mar 2019) $';
+my $lastchdate = '$Date: 2019-06-07 18:36:59 +0200 (Fri, 07 Jun 2019) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 50442 $';
+my $svnrev = '$Revision: 51338 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "r$svnrev ($lastchdate)";
@@ -2075,7 +2075,12 @@ sub read_map_files {
my @fullpath = `kpsewhich --format=map @maps`;
chomp @fullpath;
foreach my $map (@maps) {
- my ($ff) = grep /\/$map(\.map)?$/, @fullpath;
+ # in case they give an absolute path (not needed/desired, but ...);
+ # Windows not supported.
+ my $dirsep = ($map =~ m!^/!) ? "" : "/";
+ # quotemeta the map string to avoid perl regexp warning, e.g.,
+ # if map name contains "\Users", the "\U" should be literal.
+ my ($ff) = grep /$dirsep\Q$map\E(\.map)?$/, @fullpath;
if ($ff) {
$alldata->{'maps'}{$map}{'fullpath'} = $ff;
} else {