ptex-fontmaps (25jun21)

git-svn-id: svn://tug.org/texlive/trunk@59711 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 12 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/README b/Master/texmf-dist/doc/fonts/ptex-fontmaps/README
index 3d6de917c20..a6ec7ac4170 100644
--- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/README
+++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/README
@@ -1,7 +1,7 @@
 ptex-fontmaps
 =============
 
-Current release: 20201227.0
+Current release: 20210625.0
 
 The files contained in this package contains font maps for dvipdfmx to
 make various Japanese/Chinese/Korean fonts available for (u)ptex and
@@ -399,7 +399,7 @@ The (deprecated) file updmap-otf.sh and the (in perl rewritten version)
 kanji-config-updmap.pl are licensed under the following terms:
   Copyright 2004-2006 by KOBAYASHI Taizo
   Copyright 2011-2016 by PREINING Norbert
-  Copyright 2016-2020 by Japanese TeX Development Community
+  Copyright 2016-2021 by Japanese TeX Development Community
 Licensed under the GPL version 3 or any later version, 
 see the file for details.
 
diff --git a/Master/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.pdf b/Master/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.pdf
index 59aa7f34273..dd771f2c9ee 100644
--- a/Master/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.pdf
+++ b/Master/texmf-dist/doc/fonts/ptex-fontmaps/kanji-config-updmap.pdf
diff --git a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl
index eee71cf2bba..bb385d1d1a4 100755
--- a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl
+++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
 # kanji-config-updmap: setup Japanese font embedding
-# Version 20201227.0
+# Version 20210625.0
 #
 # formerly known as updmap-setup-kanji
 #
 # Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf)
-# Copyright 2011-2020 by PREINING Norbert
-# Copyright 2016-2020 by Japanese TeX Development Community
+# Copyright 2011-2021 by PREINING Norbert
+# Copyright 2016-2021 by Japanese TeX Development Community
 #
 # This file is licensed under GPL version 3 or any later version.
 # For copyright statements see end of file.
@@ -22,7 +22,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
 
 my $prg = "kanji-config-updmap";
-my $version = '20201227.0';
+my $version = '20210625.0';
 
 my $updmap_real = "updmap";
 my $updmap = $updmap_real;
@@ -149,10 +149,10 @@ sub macosx_new {
     $macos_ver_major =~ s/^(\d+)\.(\d+).*/$1/;
     my $macos_ver_minor = $macos_ver;
     $macos_ver_minor =~ s/^(\d+)\.(\d+).*/$2/;
-    if ($macos_ver_major==10) {
-      if ($macos_ver_minor>=11) {
-        return 1;
-      }
+    if ($macos_ver_major==10 && $macos_ver_minor>=11) {
+      return 1; # macOS 10.11 (El Capitan) or later
+    } elsif ($macos_ver_major>=11) {
+      return 1; # macOS 11.0 (Big Sur) or later
     }
   }
   return 0;
diff --git a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl
index bfad277bc51..87775b6aba1 100755
--- a/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl
+++ b/Master/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl
@@ -2,7 +2,7 @@
 #
 # kanji-fontmap-creator
 # (c) 2012-2014 Norbert Preining
-# Version: 20201227.0
+# Version: 20210625.0
 # Licenced under the GPLv2 or any higher version
 #
 # gui to create map files for (kanji-config-)updmap
@@ -41,7 +41,7 @@ my $opt_help = 0;
 my $opt_version = 0;
 
 my $prg = "kanji-fontmap-creator";
-my $version = "20201227.0";
+my $version = "20210625.0";
 
 #
 # global vars configuring operation