From 3d1055e1e00548f29b9d4ba0a79c717b9b6b2ae3 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 26 Jun 2021 03:00:56 +0000 Subject: CTAN sync 202106260300 --- fonts/ptex-fontmaps/script/kanji-config-updmap.pl | 16 ++++++++-------- fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'fonts/ptex-fontmaps/script') diff --git a/fonts/ptex-fontmaps/script/kanji-config-updmap.pl b/fonts/ptex-fontmaps/script/kanji-config-updmap.pl index eee71cf2bb..bb385d1d1a 100755 --- a/fonts/ptex-fontmaps/script/kanji-config-updmap.pl +++ b/fonts/ptex-fontmaps/script/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/fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl b/fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl index bfad277bc5..87775b6aba 100644 --- a/fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl +++ b/fonts/ptex-fontmaps/script/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 -- cgit v1.2.3