From 778cdd72ffb3d8ee8c2ec667d9a12e3b7555ac42 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 8 Mar 2020 17:17:00 +0900 Subject: cjk-gs-integrate-macos --- .../fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-elcapitan.dat | 1 + .../fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-highsierra.dat | 1 + .../fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mavericks.dat | 1 + .../fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mountainlion.dat | 1 + texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-sierra.dat | 1 + texmf-dist/scripts/cjk-gs-integrate-macos/cjk-gs-integrate-macos.pl | 6 ++++-- 6 files changed, 9 insertions(+), 2 deletions(-) (limited to 'texmf-dist') diff --git a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-elcapitan.dat b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-elcapitan.dat index de423316..bad523c3 100644 --- a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-elcapitan.dat +++ b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-elcapitan.dat @@ -298,6 +298,7 @@ TTCname(30): Kaiti.ttc(4) Name: STKaiti-Adobe-CNS1 Class: CNS #Provides(??): MKai-Medium # fails +Doublecheck: false TTFname(10): STKaiti.ttf TTFname(11): STKAITI.TTF TTFname(20): 华文楷体.ttf diff --git a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-highsierra.dat b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-highsierra.dat index 412bdb40..0cb40428 100644 --- a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-highsierra.dat +++ b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-highsierra.dat @@ -359,6 +359,7 @@ TTCname(30): Kaiti.ttc(1) Name: STKaiti-Adobe-CNS1 Class: CNS #Provides(??): MKai-Medium # fails +Doublecheck: false TTFname(10): STKaiti.ttf TTFname(11): STKAITI.TTF TTFname(20): 华文楷体.ttf diff --git a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mavericks.dat b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mavericks.dat index 22087bd7..da25eda2 100644 --- a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mavericks.dat +++ b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mavericks.dat @@ -22,6 +22,7 @@ TTCname(30): Kaiti.ttc(4) Name: STKaiti-Adobe-CNS1 Class: CNS #Provides(??): MKai-Medium # fails +Doublecheck: false TTFname(10): STKaiti.ttf TTFname(11): STKAITI.TTF TTFname(20): 华文楷体.ttf diff --git a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mountainlion.dat b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mountainlion.dat index cfdbc9cd..9f81b790 100644 --- a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mountainlion.dat +++ b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-mountainlion.dat @@ -24,6 +24,7 @@ TTCname(40): 楷体.ttc(3) Name: STKaiti-Adobe-CNS1 Class: CNS #Provides(??): MKai-Medium # fails +Doublecheck: false TTFname(10): STKaiti.ttf TTFname(11): STKAITI.TTF TTFname(20): 华文楷体.ttf diff --git a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-sierra.dat b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-sierra.dat index 915bc8f8..8b0df202 100644 --- a/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-sierra.dat +++ b/texmf-dist/fonts/misc/cjk-gs-integrate-macos/cjkgs-macos-sierra.dat @@ -357,6 +357,7 @@ TTCname(30): Kaiti.ttc(1) Name: STKaiti-Adobe-CNS1 Class: CNS #Provides(??): MKai-Medium # fails +Doublecheck: false TTFname(10): STKaiti.ttf TTFname(11): STKAITI.TTF TTFname(20): 华文楷体.ttf diff --git a/texmf-dist/scripts/cjk-gs-integrate-macos/cjk-gs-integrate-macos.pl b/texmf-dist/scripts/cjk-gs-integrate-macos/cjk-gs-integrate-macos.pl index 5e05ae47..088bc5ab 100755 --- a/texmf-dist/scripts/cjk-gs-integrate-macos/cjk-gs-integrate-macos.pl +++ b/texmf-dist/scripts/cjk-gs-integrate-macos/cjk-gs-integrate-macos.pl @@ -2,7 +2,7 @@ # # cjk-gs-integrate-macos - wrapper for cjk-gs-integrate on macOS # -# Copyright 2017-2019 by Japanese TeX Development Community +# Copyright 2017-2020 by Japanese TeX Development Community # # This file is licensed under GPL version 3 or any later version. # For copyright statements see end of file. @@ -52,7 +52,9 @@ if (macosx()) { $addname = "highsierra"; } elsif ($macos_ver_minor==14) { $addname = "highsierra"; # mojave - } elsif ($macos_ver_minor>=15) { + } elsif ($macos_ver_minor==15) { + $addname = "highsierra"; # catalina -- at least nothing is wrong + } elsif ($macos_ver_minor>=16) { print STDERR "Warning: macOS 10.$macos_ver_minor is untested.\n"; $addname = "highsierra"; # (the most recent one) } -- cgit v1.2.3