summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-12-07 12:43:45 +0900
committerNorbert Preining <norbert@preining.info>2020-12-07 12:56:58 +0900
commit1e95da670632d2f8d6ec5ff5d7f1fb362f5b0577 (patch)
treee8e845bd33f497cb2f106538a365d7bb50307699
parent1c687defbbcedd7c17eb7588f579fc212764fe3d (diff)
cjk-gs-integrate-macos 20201206
-rw-r--r--texmf-dist/doc/fonts/cjk-gs-integrate-macos/README.md2
-rwxr-xr-xtexmf-dist/scripts/cjk-gs-integrate-macos/cjk-gs-integrate-macos.pl18
-rw-r--r--tlpkg/texlive.tlpdb4
3 files changed, 11 insertions, 13 deletions
diff --git a/texmf-dist/doc/fonts/cjk-gs-integrate-macos/README.md b/texmf-dist/doc/fonts/cjk-gs-integrate-macos/README.md
index 07aee10..0ac2d4c 100644
--- a/texmf-dist/doc/fonts/cjk-gs-integrate-macos/README.md
+++ b/texmf-dist/doc/fonts/cjk-gs-integrate-macos/README.md
@@ -25,7 +25,7 @@ We provide the following additional databases:
[cjkgs-macos-elcapitan.dat](https://raw.githubusercontent.com/texjporg/cjk-gs-support/master/cjkgs-macos-elcapitan.dat)
- for Sierra (10.12):
[cjkgs-macos-sierra.dat](https://raw.githubusercontent.com/texjporg/cjk-gs-support/master/cjkgs-macos-sierra.dat)
-- for High Sierra (10.13):
+- for High Sierra (10.13) or later:
[cjkgs-macos-highsierra.dat](https://raw.githubusercontent.com/texjporg/cjk-gs-support/master/cjkgs-macos-highsierra.dat)
Download the database file (`*.dat`) which is suitable for
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 088bc5a..5068963 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
@@ -48,15 +48,13 @@ if (macosx()) {
$addname = "elcapitan";
} elsif ($macos_ver_minor==12) {
$addname = "sierra";
- } elsif ($macos_ver_minor==13) {
- $addname = "highsierra";
- } elsif ($macos_ver_minor==14) {
- $addname = "highsierra"; # mojave
- } 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)
+ } elsif ($macos_ver_minor>=13) {
+ $addname = "highsierra"; # macOS 10.x was ended with x=15 (catalina)
+ }
+ } elsif ($macos_ver_major==11) {
+ if ($macos_ver_minor==0) {
+ print STDERR "Warning: macOS 11.$macos_ver_minor is untested.\n";
+ $addname = "highsierra"; # big sur -- new major version
}
}
}
@@ -67,7 +65,7 @@ push @newarg, @ARGV;
if (-f "cjk-gs-integrate.pl") {
system("perl cjk-gs-integrate.pl @newarg");
} else {
- system("cjk-gs-integrate @newarg");
+ system("cjk-gs-integrate @newarg");
}
diff --git a/tlpkg/texlive.tlpdb b/tlpkg/texlive.tlpdb
index fc377f5..42783dd 100644
--- a/tlpkg/texlive.tlpdb
+++ b/tlpkg/texlive.tlpdb
@@ -7,7 +7,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2100-nonfree
-depend revision/292
+depend revision/293
name 00texlive.installation
category TLCore
@@ -1093,7 +1093,7 @@ catalogue-topics chemistry diagram
name cjk-gs-integrate-macos
category Package
-revision 271
+revision 293
depend cjk-gs-integrate-macos.ARCH
docfiles size=1
texmf-dist/doc/fonts/cjk-gs-integrate-macos/README.md