summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-26 03:00:56 +0000
committerNorbert Preining <norbert@preining.info>2021-06-26 03:00:56 +0000
commit3d1055e1e00548f29b9d4ba0a79c717b9b6b2ae3 (patch)
tree81d89c6859163c396aa9344ddb05c271e9ab760c /fonts
parent644c44d0c55a2960e53623b0c19448c1b8015d1e (diff)
CTAN sync 202106260300
Diffstat (limited to 'fonts')
-rw-r--r--fonts/ptex-fontmaps/README4
-rw-r--r--fonts/ptex-fontmaps/kanji-config-updmap.pdfbin148246 -> 148039 bytes
-rwxr-xr-xfonts/ptex-fontmaps/script/kanji-config-updmap.pl16
-rw-r--r--fonts/ptex-fontmaps/script/kanji-fontmap-creator.pl4
-rw-r--r--fonts/utilities/cjk-gs-integrate/ChangeLog44
-rw-r--r--fonts/utilities/cjk-gs-integrate/README.md9
-rwxr-xr-xfonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl27
-rw-r--r--fonts/utilities/cjk-gs-integrate/database/cjkgs-fontworks.dat45
-rw-r--r--fonts/utilities/cjk-gs-integrate/database/cjkgs-haranoaji.dat185
9 files changed, 300 insertions, 34 deletions
diff --git a/fonts/ptex-fontmaps/README b/fonts/ptex-fontmaps/README
index 3d6de917c2..a6ec7ac417 100644
--- a/fonts/ptex-fontmaps/README
+++ b/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/fonts/ptex-fontmaps/kanji-config-updmap.pdf b/fonts/ptex-fontmaps/kanji-config-updmap.pdf
index 59aa7f3427..dd771f2c9e 100644
--- a/fonts/ptex-fontmaps/kanji-config-updmap.pdf
+++ b/fonts/ptex-fontmaps/kanji-config-updmap.pdf
Binary files differ
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
diff --git a/fonts/utilities/cjk-gs-integrate/ChangeLog b/fonts/utilities/cjk-gs-integrate/ChangeLog
index bac77bb47b..7f57c4afc7 100644
--- a/fonts/utilities/cjk-gs-integrate/ChangeLog
+++ b/fonts/utilities/cjk-gs-integrate/ChangeLog
@@ -1,10 +1,38 @@
+2021-06-25 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * Release 20210625.0 (HEAD -> master) [a418289]
+
+2021-06-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * macOS 12.x version check (origin/master, origin/HEAD) [abbeb0b]
+
+2021-06-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * copyright year [9cdeb62]
+
+2021-06-07 Jun Kurihara <kurihara@ieee.org>
+
+ * macos 11.x workaround (junkurihara/master) [df744a2]
+
+2021-01-20 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * add Fontworks-made Google Fonts [195c233]
+
+2020-12-24 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * cjkgs-haranoaji.dat: aliases (trueroad/master) [0317845]
+
+2020-12-19 Masamichi Hosoda <trueroad@trueroad.jp>
+
+ * Add Harano Aji Fonts CN, TW, and K1 [eb824d9]
+
2020-12-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * Release 20201206.0 (HEAD -> master) [0652eb8]
+ * Release 20201206.0 (tag: 20201206.0) [0652eb8]
2020-12-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * README (tag: 20201206.0, origin/master, origin/HEAD) [6ad1f11]
+ * README [6ad1f11]
2020-12-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
@@ -16,7 +44,7 @@
2020-11-21 Masamichi Hosoda <trueroad@trueroad.jp>
- * Update README.md [13a4810]
+ * Update README.md (trueroad/add-win32-symlink) [13a4810]
2020-11-21 Masamichi Hosoda <trueroad@trueroad.jp>
@@ -52,7 +80,7 @@
2020-03-23 Masamichi Hosoda <trueroad@trueroad.jp>
- * Add support for environments without Encode::Locale [7f0ebd9]
+ * Add support for environments without Encode::Locale (trueroad/remove-cp932-dependency) [7f0ebd9]
2020-03-23 Masamichi Hosoda <trueroad@trueroad.jp>
@@ -60,7 +88,7 @@
2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
- * Delete win32 encoding comment [576256d]
+ * Delete win32 encoding comment (trueroad/experiment-20200322) [576256d]
2020-03-22 Masamichi Hosoda <trueroad@trueroad.jp>
@@ -152,7 +180,7 @@
2020-03-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * 'CMap:' entry is unsupported for class other than AI0 (trueroad/master) [f499f39]
+ * 'CMap:' entry is unsupported for class other than AI0 [f499f39]
2020-03-05 Masamichi Hosoda <trueroad@trueroad.jp>
@@ -448,7 +476,7 @@
2018-01-13 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * cjk-gs-integrate-macos.pl: typo [ca1bba1]
+ * cjk-gs-integrate-macos.pl: typo (aminophen/master) [ca1bba1]
2018-01-13 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
@@ -580,7 +608,7 @@
2017-11-10 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * rename cjkgs-morisawa-standard.dat -> cjkgs-morisawa.dat (aminophen/master) [3afc59a]
+ * rename cjkgs-morisawa-standard.dat -> cjkgs-morisawa.dat [3afc59a]
2017-11-10 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
diff --git a/fonts/utilities/cjk-gs-integrate/README.md b/fonts/utilities/cjk-gs-integrate/README.md
index 6aed094819..db259bc65b 100644
--- a/fonts/utilities/cjk-gs-integrate/README.md
+++ b/fonts/utilities/cjk-gs-integrate/README.md
@@ -182,18 +182,19 @@ alias if necessary.
For the Japanese fonts:
Morisawa Pr6N, Morisawa, Hiragino ProN, Hiragino,
Kozuka Pr6N, Kozuka ProVI, Kozuka Pro, Kozuka Std,
- HaranoAji,
- Yu OS X, Yu Win, MS,
+ HaranoAji, Yu OS X, Yu Win, MS,
Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume
For the Korean fonts:
(Hanyang,) Adobe, Solaris, MS, Unfonts, Baekmuk
For the Simplified Chinese:
- Adobe, Fandol, Hiragino, Founder, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf
+ Adobe, Fandol, HaranoAji, Hiragino, Founder, MS,
+ CJKUnifonts, Arphic, CJKUnifonts-ttf
For the Traditional Chinese:
- Adobe, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf
+ Adobe, HaranoAji, MS,
+ CJKUnifonts, Arphic, CJKUnifonts-ttf
#### Overriding aliases ####
diff --git a/fonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl b/fonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl
index 68ea6e6198..69426cbacf 100755
--- a/fonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl
+++ b/fonts/utilities/cjk-gs-integrate/cjk-gs-integrate.pl
@@ -2,8 +2,8 @@
#
# cjk-gs-integrate - setup Ghostscript for CID/TTF CJK fonts
#
-# Copyright 2015-2020 by Norbert Preining
-# Copyright 2016-2020 by Japanese TeX Development Community
+# Copyright 2015-2021 by Norbert Preining
+# Copyright 2016-2021 by Japanese TeX Development Community
#
# This work is based on research and work by (in alphabetical order)
# Masamichi Hosoda
@@ -53,7 +53,7 @@ binmode (STDERR, ':encoding(console_out)');
@ARGV = map{ decode('locale', $_) }@ARGV;
(my $prg = basename(decode('locale', $0))) =~ s/\.pl$//;
-my $version = '20201206.0';
+my $version = '20210625.0';
if (win32()) {
# some perl functions (symlink, -l test) does not work
@@ -2323,18 +2323,19 @@ alias if necessary.
For the Japanese fonts:
Morisawa Pr6N, Morisawa, Hiragino ProN, Hiragino,
Kozuka Pr6N, Kozuka ProVI, Kozuka Pro, Kozuka Std,
- HaranoAji,
- Yu OS X, Yu Win, MS,
+ HaranoAji, Yu OS X, Yu Win, MS,
Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume
For the Korean fonts:
(Hanyang,) Adobe, Solaris, MS, Unfonts, Baekmuk
For the Simplified Chinese:
- Adobe, Fandol, Hiragino, Founder, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf
+ Adobe, Fandol, HaranoAji, Hiragino, Founder, MS,
+ CJKUnifonts, Arphic, CJKUnifonts-ttf
For the Traditional Chinese:
- Adobe, MS, CJKUnifonts, Arphic, CJKUnifonts-ttf
+ Adobe, HaranoAji, MS,
+ CJKUnifonts, Arphic, CJKUnifonts-ttf
#### Overriding aliases ####
@@ -2519,6 +2520,9 @@ TTFname: OsakaMono.ttf
# Adobe -- Provides S30, T30
INCLUDE cjkgs-adobe.dat
+# HaranoAji -- Provides S45, T45
+# (already included in JAPANESE section)
+
# Hiragino -- Provides S50
# (already included in JAPANESE section)
@@ -2534,9 +2538,6 @@ INCLUDE cjkgs-dynacomware.dat
# Monotype
INCLUDE cjkgs-monotype.dat
-# Apple
-INCLUDE cjkgs-apple.dat
-
# Shanghai Ikarus Ltd./URW Software & Type GmbH
Name: SIL-Hei-Med-Jian
@@ -2592,6 +2593,9 @@ TTFname: cwfs.ttf
# Solaris -- Provides K40
INCLUDE cjkgs-solaris.dat
+# HaranoAji -- Provides K45
+# (already included in JAPANESE section)
+
# Baekmuk (free)
# This is a special case, because "batang.ttf" in baekmuk and
# "Batang.ttf" in Microsoft Mac Office font share the same filename;
@@ -2629,6 +2633,9 @@ INCLUDE cjkgs-unfonts.dat
# Nanum (free)
INCLUDE cjkgs-nanum.dat
+# Apple
+INCLUDE cjkgs-apple.dat
+
# Design font by Ho-Seok Ee, aka. "ALee's font" (free)
Name: Bandal
diff --git a/fonts/utilities/cjk-gs-integrate/database/cjkgs-fontworks.dat b/fonts/utilities/cjk-gs-integrate/database/cjkgs-fontworks.dat
index 0a40e4f5ef..bab8493b7d 100644
--- a/fonts/utilities/cjk-gs-integrate/database/cjkgs-fontworks.dat
+++ b/fonts/utilities/cjk-gs-integrate/database/cjkgs-fontworks.dat
@@ -2,11 +2,56 @@
### JAPANESE ###
+# Note (as of 2021-01-15):
+# DotGothic16-Regular.ttf
+# KleeOne-Regular.ttf
+# KleeOne-SemiBold.ttf
+# RampartOne-Regular.ttf
+# ReggaeOne-Regular.ttf
+# RocknRollOne-Regular.ttf
+# Stick-Regular.ttf
+# TrainOne-Regular.ttf
+# are prepared for Google Fonts for free (SIL Open Font License).
+# * https://github.com/fontworks-fonts
+# * https://fontworks.co.jp/news/2021/01/15/9531/
+
# Note about Mac (Mac OS X 10.6 -- macOS 10.13)
# Klee.ttc
# Tsukushi{A,B}MaruGothic.ttc
# are bundled with OS X 10.11 El Capitan or later versions.
+Name: DotGothic16-Regular
+Class: Japan
+TTFname: DotGothic16-Regular.ttf
+
+Name: KleeOne-Regular
+Class: Japan
+TTFname: KleeOne-Regular.ttf
+
+Name: KleeOne-SemiBold
+Class: Japan
+TTFname: KleeOne-SemiBold.ttf
+
+Name: RampartOne-Regular
+Class: Japan
+TTFname: RampartOne-Regular.ttf
+
+Name: ReggaeOne-Regular
+Class: Japan
+TTFname: ReggaeOne-Regular.ttf
+
+Name: RocknRollOne-Regular
+Class: Japan
+TTFname: RocknRollOne-Regular.ttf
+
+Name: Stick-Regular
+Class: Japan
+TTFname: Stick-Regular.ttf
+
+Name: TrainOne-Regular
+Class: Japan
+TTFname: TrainOne-Regular.ttf
+
Name: FOT-KleePro-M
PSName: KleePro-M
Class: Japan
diff --git a/fonts/utilities/cjk-gs-integrate/database/cjkgs-haranoaji.dat b/fonts/utilities/cjk-gs-integrate/database/cjkgs-haranoaji.dat
index 686e173271..9cc493e4bd 100644
--- a/fonts/utilities/cjk-gs-integrate/database/cjkgs-haranoaji.dat
+++ b/fonts/utilities/cjk-gs-integrate/database/cjkgs-haranoaji.dat
@@ -90,3 +90,188 @@ Provides(70): HiraMaruProN-W4
Provides(70): HiraMaruPro-W4
OTFname: HaranoAjiGothic-Heavy.otf
+### SIMPLIFIED CHINESE ###
+
+Name: HaranoAjiMinchoCN-ExtraLight
+Class: GB
+OTFname: HaranoAjiMinchoCN-ExtraLight.otf
+
+Name: HaranoAjiMinchoCN-Light
+Class: GB
+OTFname: HaranoAjiMinchoCN-Light.otf
+
+Name: HaranoAjiMinchoCN-Regular
+Class: GB
+Provides(45): STSong-Light
+Provides(45): STSong-Regular
+OTFname: HaranoAjiMinchoCN-Regular.otf
+
+Name: HaranoAjiMinchoCN-Medium
+Class: GB
+OTFname: HaranoAjiMinchoCN-Medium.otf
+
+Name: HaranoAjiMinchoCN-SemiBold
+Class: GB
+OTFname: HaranoAjiMinchoCN-SemiBold.otf
+
+Name: HaranoAjiMinchoCN-Bold
+Class: GB
+OTFname: HaranoAjiMinchoCN-Bold.otf
+
+Name: HaranoAjiMinchoCN-Heavy
+Class: GB
+OTFname: HaranoAjiMinchoCN-Heavy.otf
+
+Name: HaranoAjiGothicCN-ExtraLight
+Class: GB
+OTFname: HaranoAjiGothicCN-ExtraLight.otf
+
+Name: HaranoAjiGothicCN-Light
+Class: GB
+OTFname: HaranoAjiGothicCN-Light.otf
+
+Name: HaranoAjiGothicCN-Normal
+Class: GB
+OTFname: HaranoAjiGothicCN-Normal.otf
+
+Name: HaranoAjiGothicCN-Regular
+Class: GB
+OTFname: HaranoAjiGothicCN-Regular.otf
+
+Name: HaranoAjiGothicCN-Medium
+Class: GB
+Provides(45): STHeiti-Light
+Provides(45): STHeiti-Regular
+Provides(45): STKaiti-Regular
+OTFname: HaranoAjiGothicCN-Medium.otf
+
+Name: HaranoAjiGothicCN-Bold
+Class: GB
+OTFname: HaranoAjiGothicCN-Bold.otf
+
+Name: HaranoAjiGothicCN-Heavy
+Class: GB
+OTFname: HaranoAjiGothicCN-Heavy.otf
+
+### TRADITIONAL CHINESE ###
+
+Name: HaranoAjiMinchoTW-ExtraLight
+Class: CNS
+OTFname: HaranoAjiMinchoTW-ExtraLight.otf
+
+Name: HaranoAjiMinchoTW-Light
+Class: CNS
+OTFname: HaranoAjiMinchoTW-Light.otf
+
+Name: HaranoAjiMinchoTW-Regular
+Class: CNS
+Provides(45): MSung-Light
+Provides(45): MSung-Medium
+OTFname: HaranoAjiMinchoTW-Regular.otf
+
+Name: HaranoAjiMinchoTW-Medium
+Class: CNS
+Provides(45): MHei-Medium
+Provides(45): MKai-Medium
+OTFname: HaranoAjiMinchoTW-Medium.otf
+
+Name: HaranoAjiMinchoTW-SemiBold
+Class: CNS
+OTFname: HaranoAjiMinchoTW-SemiBold.otf
+
+Name: HaranoAjiMinchoTW-Bold
+Class: CNS
+OTFname: HaranoAjiMinchoTW-Bold.otf
+
+Name: HaranoAjiMinchoTW-Heavy
+Class: CNS
+OTFname: HaranoAjiMinchoTW-Heavy.otf
+
+Name: HaranoAjiGothicTW-ExtraLight
+Class: CNS
+OTFname: HaranoAjiGothicTW-ExtraLight.otf
+
+Name: HaranoAjiGothicTW-Light
+Class: CNS
+OTFname: HaranoAjiGothicTW-Light.otf
+
+Name: HaranoAjiGothicTW-Normal
+Class: CNS
+OTFname: HaranoAjiGothicTW-Normal.otf
+
+Name: HaranoAjiGothicTW-Regular
+Class: CNS
+OTFname: HaranoAjiGothicTW-Regular.otf
+
+Name: HaranoAjiGothicTW-Medium
+Class: CNS
+OTFname: HaranoAjiGothicTW-Medium.otf
+
+Name: HaranoAjiGothicTW-Bold
+Class: CNS
+OTFname: HaranoAjiGothicTW-Bold.otf
+
+Name: HaranoAjiGothicTW-Heavy
+Class: CNS
+OTFname: HaranoAjiGothicTW-Heavy.otf
+
+### KOREAN ###
+
+Name: HaranoAjiMinchoK1-ExtraLight
+Class: Korea
+OTFname: HaranoAjiMinchoK1-ExtraLight.otf
+
+Name: HaranoAjiMinchoK1-Light
+Class: Korea
+OTFname: HaranoAjiMinchoK1-Light.otf
+
+Name: HaranoAjiMinchoK1-Regular
+Class: Korea
+Provides(45): HYSMyeongJo-Medium
+OTFname: HaranoAjiMinchoK1-Regular.otf
+
+Name: HaranoAjiMinchoK1-Medium
+Class: Korea
+OTFname: HaranoAjiMinchoK1-Medium.otf
+
+Name: HaranoAjiMinchoK1-SemiBold
+Class: Korea
+OTFname: HaranoAjiMinchoK1-SemiBold.otf
+
+Name: HaranoAjiMinchoK1-Bold
+Class: Korea
+OTFname: HaranoAjiMinchoK1-Bold.otf
+
+Name: HaranoAjiMinchoK1-Heavy
+Class: Korea
+OTFname: HaranoAjiMinchoK1-Heavy.otf
+
+Name: HaranoAjiGothicK1-ExtraLight
+Class: Korea
+OTFname: HaranoAjiGothicK1-ExtraLight.otf
+
+Name: HaranoAjiGothicK1-Light
+Class: Korea
+OTFname: HaranoAjiGothicK1-Light.otf
+
+Name: HaranoAjiGothicK1-Normal
+Class: Korea
+OTFname: HaranoAjiGothicK1-Normal.otf
+
+Name: HaranoAjiGothicK1-Regular
+Class: Korea
+OTFname: HaranoAjiGothicK1-Regular.otf
+
+Name: HaranoAjiGothicK1-Medium
+Class: Korea
+Provides(45): HYGoThic-Medium
+Provides(45): HYRGoThic-Medium
+OTFname: HaranoAjiGothicK1-Medium.otf
+
+Name: HaranoAjiGothicK1-Bold
+Class: Korea
+OTFname: HaranoAjiGothicK1-Bold.otf
+
+Name: HaranoAjiGothicK1-Heavy
+Class: Korea
+OTFname: HaranoAjiGothicK1-Heavy.otf