summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-03 22:13:02 +0000
committerKarl Berry <karl@freefriends.org>2019-03-03 22:13:02 +0000
commit2b78358ef16ab678380bd9a5da79f4e86bb265e8 (patch)
tree0713c986e15cda111020d0c1b44590c12a7e3d20
parentc14b45aa7baaa0f202866157d9349f2e397f16d7 (diff)
cjk-gs-integrate (3mar19)
git-svn-id: svn://tug.org/texlive/trunk@50214 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl754
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog118
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-apple.dat119
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-arphic.dat46
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-bizud.dat32
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-cjkuni.dat66
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-dynacomware.dat49
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-fandol.dat39
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-hancom.dat26
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-heisei.dat54
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-ipa.dat103
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-macos-removeonly.dat20
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-monotype.dat30
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-nanum.dat78
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notosans.dat182
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notoserif.dat141
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sazanami.dat12
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehansans.dat182
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehanserif.dat142
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-unfonts.dat112
-rw-r--r--Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-wenquanyi.dat56
-rwxr-xr-xMaster/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl754
-rw-r--r--Master/texmf-dist/source/fonts/cjk-gs-integrate/Makefile (renamed from Master/texmf-dist/doc/fonts/cjk-gs-integrate/Makefile)0
23 files changed, 1789 insertions, 1326 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl b/Build/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl
index 892dbb5ffe6..3da4763053e 100755
--- a/Build/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl
+++ b/Build/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl
@@ -2,8 +2,8 @@
#
# cjk-gs-integrate - setup Ghostscript for CID/TTF CJK fonts
#
-# Copyright 2015-2018 by Norbert Preining
-# Copyright 2016-2018 by Japanese TeX Development Community
+# Copyright 2015-2019 by Norbert Preining
+# Copyright 2016-2019 by Japanese TeX Development Community
#
# This work is based on research and work by (in alphabetical order)
# Yusuke Kuroki
@@ -39,7 +39,7 @@ use Cwd 'abs_path';
use strict;
(my $prg = basename($0)) =~ s/\.pl$//;
-my $version = '20180306.0';
+my $version = '20190303.0';
if (win32()) {
# conversion between internal (utf-8) and console (cp932):
@@ -97,6 +97,7 @@ my %encode_list = (
Adobe-Japan1-4
Adobe-Japan1-5
Adobe-Japan1-6
+ Adobe-Japan1-7
EUC-H
EUC-V
Ext-H
@@ -297,6 +298,7 @@ my $opt_listallaliases = 0;
my $opt_listfonts = 0;
my $opt_info = 0;
my $opt_machine = 0;
+my $opt_strictpsname = 0;
my $dry_run = 0;
my $opt_quiet = 0;
my $opt_debug = 0;
@@ -323,6 +325,7 @@ if (! GetOptions(
"list-fonts" => \$opt_listfonts,
"info" => \$opt_info,
"machine-readable" => \$opt_machine,
+ "strict-psname" => \$opt_strictpsname, # hidden option for debugging
"n|dry-run" => \$dry_run,
"q|quiet" => \$opt_quiet,
"d|debug+" => \$opt_debug,
@@ -353,9 +356,17 @@ if ($opt_debug >= 2) {
my $otfinfo_available;
chomp(my $otfinfo_help = `otfinfo --help 2>$nul`);
if ($?) {
- print_warning("The program 'otfinfo' not found in PATH.\n");
- print_warning("Sorry, we can't be safe enough to distinguish\n");
- print_warning("uppercase / lowercase file names.\n");
+ # to tell the truth, we want to show below as a warning
+ # but BasicTeX (scheme-small) does not have 'otfinfo' (lcdf-typetools);
+ # show info only for debugging
+ print_debug("The program 'otfinfo' not found in PATH.\n");
+ print_debug("Sorry, we can't be safe enough to distinguish\n");
+ print_debug("uppercase / lowercase file names.\n");
+ # but the below should be an error!
+ if ($opt_strictpsname) {
+ print_error("'otfinfo' not found, cannot proceed!\n");
+ exit(1);
+ }
$otfinfo_available = 0;
} else {
$otfinfo_available = 1;
@@ -524,7 +535,7 @@ sub main {
}
# do actual setup/removing operations
- if (! $opt_output) {
+ if (!$opt_output) {
print_info("searching for Ghostscript resource\n");
my $gsres = find_gs_resource();
if (!$gsres) {
@@ -555,11 +566,15 @@ sub main {
print_info(($opt_remove ? "removing" : "generating") . " links, snippets and cidfmap.local for non-CID fonts ...\n");
do_nonotf_fonts();
}
- write_winbatch() if ($opt_winbatch);
+ write_winbatch() if $opt_winbatch;
}
print_info(($opt_remove ? "removing" : "generating") . " snippets and cidfmap.aliases for font aliases ...\n");
do_aliases();
- write_akotfps_datafile() if ($opt_akotfps);
+ write_akotfps_datafile() if $opt_akotfps;
+ if ($opt_texmflink && !$dry_run) {
+ print_info("running mktexlsr ...\n");
+ system("mktexlsr");
+ }
print_info("finished\n");
if ($opt_winbatch) {
if (-f $winbatch) {
@@ -783,7 +798,7 @@ sub do_aliases {
update_master_cidfmap('cidfmap.aliases');
# if we are in cleanup mode, also remove cidfmap.aliases itself
if (-f "$opt_output/$cidfmap_aliases_pathpart") {
- unlink "$opt_output/$cidfmap_aliases_pathpart" if ($opt_cleanup);
+ unlink "$opt_output/$cidfmap_aliases_pathpart" if $opt_cleanup;
}
}
@@ -815,16 +830,16 @@ sub update_master_cidfmap {
} elsif (m/^\s*\(cidfmap\.TeXLive\)\s\s*\.runlibfile\s*$/) {
# if found, it has to be disabled in add mode in a way in which it can
# be detected in the (future) remove mode
- next if ($found_tl); # skip it as duplicate (though unlikely to happen)
+ next if $found_tl; # skip it as duplicate (though unlikely to happen)
$found_tl = 1;
$newmaster .= "\%" if (!$opt_remove); # in add mode, disable it
$newmaster .= $_; # pass it as-is
} elsif (m/^\s*\%\%*\s*\(cidfmap\.TeXLive\)\s\s*\.runlibfile\s*$/) {
# if found, it should be the one disabled by myself in the previous run;
# restore it in remove mode
- next if ($found_tl); # skip it as duplicate (though unlikely to happen)
+ next if $found_tl; # skip it as duplicate (though unlikely to happen)
$found_tl = 1;
- $_ =~ s/\%//g if ($opt_remove); # in remove mode, enable it
+ $_ =~ s/\%//g if $opt_remove; # in remove mode, enable it
$newmaster .= $_; # pass it
} else {
$newmaster .= $_;
@@ -929,7 +944,7 @@ pop
sub add_akotfps_data {
my ($fn) = @_;
return if $dry_run;
- if (! $opt_remove) {
+ if (!$opt_remove) {
$akotfps_datacontent .= "$fn\n";
}
}
@@ -1018,7 +1033,7 @@ sub link_font {
# if we are still here and $do_unlink is set, remove it
maybe_unlink($target) if $do_unlink;
# recreate link if we are not in the remove case
- if (! $opt_remove) {
+ if (!$opt_remove) {
maybe_symlink($f, $target) || die("Cannot link font $f to $target: $!");
}
}
@@ -1061,14 +1076,14 @@ sub maybe_symlink {
if ($opt_winbatch) {
# re-encoding of $winbatch_content is done by write_winbatch()
$winbatch_content .= "if not exist \"$targetname\" mklink ";
- $winbatch_content .= "/h " if ($opt_hardlink);
+ $winbatch_content .= "/h " if $opt_hardlink;
$winbatch_content .= "\"$targetname\" \"$realname\"\n";
} else {
# should be encoded in cp932 for win32 console
$realname = encode_utftocp($realname);
$targetname = encode_utftocp($targetname);
my $cmdl = "cmd.exe /c if not exist \"$targetname\" mklink ";
- $cmdl .= "/h " if ($opt_hardlink);
+ $cmdl .= "/h " if $opt_hardlink;
$cmdl .= "\"$targetname\" \"$realname\"";
my @ret = `$cmdl`;
# sometimes hard link creation may fail due to "Access denied"
@@ -1323,8 +1338,8 @@ sub check_for_files {
# comment out -- HY (2016/09/27)
# my $newotf = join($sep, @extradirs) . $sep;
# my $newttf = $newotf;
- # $newotf .= $ENV{'OPENTYPEFONTS'} if ($ENV{'OPENTYPEFONTS'});
- # $newttf .= $ENV{'TTFONTS'} if ($ENV{'TTFONTS'});
+ # $newotf .= $ENV{'OPENTYPEFONTS'} if $ENV{'OPENTYPEFONTS'};
+ # $newttf .= $ENV{'TTFONTS'} if $ENV{'TTFONTS'};
# $ENV{'OPENTYPEFONTS'} = $newotf;
# $ENV{'TTFONTS'} = $newttf;
# new code for uppercase/lowercase workaround -- HY (2016/09/27)
@@ -1354,6 +1369,7 @@ sub check_for_files {
# map basenames to filenames
my %bntofn;
for my $f (@foundfiles) {
+ $f =~ s/[\r\n]+\z//; # perl's chomp() on git-bash cannot strip CR of CRLF ??
my $realf = abs_path($f);
if (!$realf) {
print_warning("dead link or strange file found: $f - ignored!\n");
@@ -1406,7 +1422,8 @@ sub check_for_files {
# both uppercase/lowercase font files are possible and they are different
my $actualpsname;
my $bname;
- for my $b (keys %{$bntofn{$realfile}}) {
+ for my $b (sort keys %{$bntofn{$realfile}}) {
+ $fontdb{$k}{'casefold'} = "debug" if $opt_strictpsname;
if ($fontdb{$k}{'casefold'} && $otfinfo_available &&
($fontdb{$k}{'files'}{$f}{'type'} eq 'OTF' || $fontdb{$k}{'files'}{$f}{'type'} eq 'TTF')) {
print_debug("We need to test whether\n");
@@ -1418,12 +1435,14 @@ sub check_for_files {
# still there is a chance that Ghostscript supports, so don't discard it
print_debug("... command exited with $?!\n");
print_debug("OK, I'll take this, but it may not work properly.\n");
+ print_warning("otfinfo check failed for $b\n") if $opt_strictpsname;
$bname = $b;
last;
}
if ($actualpsname ne $k) {
print_debug("... PSName returned by otfinfo ($actualpsname) is\n");
print_debug("different from our database ($k), discarding!\n");
+ print_warning("otfinfo check failed for $b\n") if $opt_strictpsname;
} else {
print_debug("... test passed.\n");
$bname = $b;
@@ -1585,6 +1604,7 @@ sub read_font_database {
die("Cannot find $opt_fontdef: $!");
@dbl = <FDB>;
close(FDB);
+ print_debug("New database file: $opt_fontdef...\n");
} else {
@dbl = <DATA>;
}
@@ -1598,6 +1618,7 @@ sub read_font_database {
die("Cannot find $_: $!");
@dbl = <FDB>;
close(FDB);
+ print_debug("Additional database file: $_...\n");
read_each_font_database(@dbl);
}
}
@@ -2237,30 +2258,41 @@ __DATA__
# CJK FONT DEFINITIONS
#
+# Noto
+INCLUDE cjkgs-notoserif.dat
+INCLUDE cjkgs-notosans.dat
+
+# SourceHan
+INCLUDE cjkgs-sourcehanserif.dat
+INCLUDE cjkgs-sourcehansans.dat
+
#
# JAPANESE FONTS
#
-# Morisawa -- Provides level 10(Pr6N), 15(Pr6), 18(Pr5), 20(Pro)
+# Morisawa -- Provides J10(Pr6N), J15(Pr6), J18(Pr5), J20(Pro)
INCLUDE cjkgs-morisawa.dat
-INCLUDE cjkgs-morisawa-extra.dat
+#INCLUDE cjkgs-morisawa-extra.dat
-# Hiragino -- Provides level 30(ProN), 40(Pro)
+# Hiragino -- Provides J30(ProN), J40(Pro)
INCLUDE cjkgs-hiragino.dat
-# Kozuka -- Provides level 50(Pr6N), 55(ProVI), 60(Pro), 65(Std)
+# Kozuka -- Provides J50(Pr6N), J55(ProVI), J60(Pro), J65(Std)
INCLUDE cjkgs-kozuka.dat
INCLUDE cjkgs-ryokana.dat
-# Yu-fonts MacOS version -- Provides level 80
+# Yu-fonts MacOS version -- Provides J80
INCLUDE cjkgs-yu-osx.dat
-# Yu-fonts Windows/MSOffice version -- Provides level 90
+# Yu-fonts Windows/MSOffice version -- Provides J90
INCLUDE cjkgs-yu-win.dat
-# MS -- Provides level 95
+# MS -- Provides J95
INCLUDE cjkgs-microsoft.dat
+# BIZ UD
+INCLUDE cjkgs-bizud.dat
+
# TypeBank
INCLUDE cjkgs-typebank.dat
@@ -2270,113 +2302,20 @@ INCLUDE cjkgs-fontworks.dat
# Toppan
INCLUDE cjkgs-toppan.dat
-# Moga-Mobo from Y.Oz Vox (free) -- Provides level 100(Ex), 110(none)
-INCLUDE cjkgs-mogamobo.dat
-
-# Ume-font (free) -- Provides level 140
-INCLUDE cjkgs-ume.dat
-
-# IPA (free) -- Provides level 120(Ex), 130(none)
-
-Name: IPAMincho
-Class: Japan
-Provides(130): Ryumin-Light
-Provides(130): RyuminPro-Light
-Provides(130): HiraMinProN-W3
-Provides(130): HiraMinPro-W3
-Provides(130): FutoMinA101-Bold
-Provides(130): FutoMinA101Pro-Bold
-Provides(130): HiraMinProN-W6
-Provides(130): HiraMinPro-W6
-Provides(130): MidashiMin-MA31
-Provides(130): MidashiMinPro-MA31
-TTFname(20): ipam.ttf
-#TTFname(21): IPAMincho.ttf
-
-Name: IPAGothic
-Class: Japan
-Provides(130): GothicBBB-Medium
-Provides(130): GothicBBBPro-Medium
-Provides(130): HiraKakuProN-W3
-Provides(130): HiraKakuPro-W3
-Provides(130): FutoGoB101-Bold
-Provides(130): FutoGoB101Pro-Bold
-Provides(130): HiraKakuProN-W6
-Provides(130): HiraKakuPro-W6
-Provides(130): MidashiGo-MB31
-Provides(130): MidashiGoPro-MB31
-Provides(130): HiraKakuStdN-W8
-Provides(130): HiraKakuStd-W8
-Provides(130): Jun101-Light
-Provides(130): Jun101Pro-Light
-Provides(130): HiraMaruProN-W4
-Provides(130): HiraMaruPro-W4
-TTFname(20): ipag.ttf
-#TTFname(21): IPAGothic.ttf
-
-Name: IPAexMincho
-Class: Japan
-Provides(120): Ryumin-Light
-Provides(120): RyuminPro-Light
-Provides(120): HiraMinProN-W3
-Provides(120): HiraMinPro-W3
-Provides(120): FutoMinA101-Bold
-Provides(120): FutoMinA101Pro-Bold
-Provides(120): HiraMinProN-W6
-Provides(120): HiraMinPro-W6
-Provides(120): MidashiMin-MA31
-Provides(120): MidashiMinPro-MA31
-TTFname(20): ipaexm.ttf
-#TTFname(21): IPAexMincho.ttf
-
-Name: IPAexGothic
-Class: Japan
-Provides(120): GothicBBB-Medium
-Provides(120): GothicBBBPro-Medium
-Provides(120): HiraKakuProN-W3
-Provides(120): HiraKakuPro-W3
-Provides(120): FutoGoB101-Bold
-Provides(120): FutoGoB101Pro-Bold
-Provides(120): HiraKakuProN-W6
-Provides(120): HiraKakuPro-W6
-Provides(120): MidashiGo-MB31
-Provides(120): MidashiGoPro-MB31
-Provides(120): HiraKakuStdN-W8
-Provides(120): HiraKakuStd-W8
-Provides(120): Jun101-Light
-Provides(120): Jun101Pro-Light
-Provides(120): HiraMaruProN-W4
-Provides(120): HiraMaruPro-W4
-TTFname(20): ipaexg.ttf
-#TTFname(21): IPAexGothic.ttf
-
-# IPA proportional (free)
-
-Name: IPAPMincho
-Class: Japan
-TTFname(20): ipamp.ttf
-#TTFname(21): IPAPMincho.ttf
+# Heisei
+INCLUDE cjkgs-heisei.dat
-Name: IPAPGothic
-Class: Japan
-TTFname(20): ipagp.ttf
-#TTFname(21): IPAPGothic.ttf
+# Moga-Mobo from Y.Oz Vox (free) -- Provides J100(Ex), J110(none)
+INCLUDE cjkgs-mogamobo.dat
-# IPA MJ (free)
+# IPA (free) -- Provides J120(Ex), J130(none)
+INCLUDE cjkgs-ipa.dat
-Name: IPAmjMincho
-Class: Japan
-TTFname: ipamjm.ttf
+# Ume-font (free) -- Provides J140
+INCLUDE cjkgs-ume.dat
# Sazanami (free)
-
-Name: Sazanami-Mincho-Regular
-Class: Japan
-TTFname: sazanami-mincho.ttf
-
-Name: Sazanami-Gothic-Regular
-Class: Japan
-TTFname: sazanami-gothic.ttf
+INCLUDE cjkgs-sazanami.dat
# Osaka (Apple)
@@ -2392,98 +2331,26 @@ TTFname: OsakaMono.ttf
# CHINESE FONTS
#
-# Adobe -- Provides level 30
+# Adobe -- Provides S30, T30
INCLUDE cjkgs-adobe.dat
-# Hiragino -- Provides level 50
+# Hiragino -- Provides S50
# (already included in JAPANESE section)
-# Beijing Founder Electronics -- Provides level 55
+# Beijing Founder Electronics -- Provides S55
INCLUDE cjkgs-founder.dat
-# DynaComware -- Provides level ??
-INCLUDE cjkgs-dynacomware.dat
-
-# Changzhou SinoType -- Provides level ??
+# Changzhou SinoType -- Provides S??
INCLUDE cjkgs-sinotype.dat
-# Arphic Font Design Team (OS X)
-
-Name: WeibeiSC-Bold
-PSName: Weibei-SC-Bold
-Class: GB
-OTFname: WeibeiSC-Bold.otf
-
-Name: WeibeiTC-Bold
-PSName: Weibei-TC-Bold
-Class: CNS
-OTFname: WeibeiTC-Bold.otf
-
-# Monotype Imaging (OS X)
-
-Name: YuppySC-Regular
-Class: GB
-OTFname: YuppySC-Regular.otf
-
-Name: YuppyTC-Regular
-Class: CNS
-OTFname: YuppyTC-Regular.otf
-
-# Monotype Hong Kong (OS X)
-
-Name: LingWaiSC-Medium
-PSName: MLingWaiMedium-SC
-Class: GB
-OTFname: LingWaiSC-Medium.otf
-
-Name: LingWaiTC-Medium
-PSName: MLingWaiMedium-TC
-Class: CNS
-OTFname: LingWaiTC-Medium.otf
-
-# DynaComware Taiwan (OS X)
-
-Name: WawaSC-Regular
-PSName: DFWaWaSC-W5
-Class: GB
-OTFname: WawaSC-Regular.otf
-
-Name: WawaTC-Regular
-PSName: DFWaWaTC-W5
-Class: CNS
-OTFname: WawaTC-Regular.otf
-
-Name: HannotateSC-W5
-Class: GB
-OTCname: Hannotate.ttc(0)
-
-Name: HannotateTC-W5
-Class: CNS
-OTCname: Hannotate.ttc(1)
-
-Name: HannotateSC-W7
-Class: GB
-OTCname: Hannotate.ttc(2)
-
-Name: HannotateTC-W7
-Class: CNS
-OTCname: Hannotate.ttc(3)
-
-Name: HanziPenSC-W3
-Class: GB
-OTCname: Hanzipen.ttc(0)
+# DynaComware -- Provides T??
+INCLUDE cjkgs-dynacomware.dat
-Name: HanziPenTC-W3
-Class: CNS
-OTCname: Hanzipen.ttc(1)
+# Monotype
+INCLUDE cjkgs-monotype.dat
-Name: HanziPenSC-W5
-Class: GB
-OTCname: Hanzipen.ttc(2)
-
-Name: HanziPenTC-W5
-Class: CNS
-OTCname: Hanzipen.ttc(3)
+# Apple
+INCLUDE cjkgs-apple.dat
# Shanghai Ikarus Ltd./URW Software & Type GmbH
@@ -2495,195 +2362,18 @@ Name: SIL-Kai-Reg-Jian
Class: GB
TTFname: Kai.ttf
-# Apple
-
-Name: LiSungLight
-Class: CNS
-TTFname(20): Apple LiSung Light.ttf
-TTFname(10): LiSungLight.ttf
-
-Name: LiGothicMed
-Class: CNS
-TTFname(20): Apple LiGothic Medium.ttf
-TTFname(10): LiGothicMed.ttf
-
-# Fandol (free)
-
-Name: FandolSong-Regular
-Class: GB
-Provides(40): STSong-Light
-OTFname(10): FandolSong-Regular.otf
-
-Name: FandolSong-Bold
-Provides(40): STSong-Regular
-Class: GB
-OTFname(10): FandolSong-Bold.otf
-
-Name: FandolKai-Regular
-Class: GB
-Provides(40): STKaiti-Regular
-OTFname(10): FandolKai-Regular.otf
-
-Name: FandolHei-Regular
-Class: GB
-Provides(40): STHeiti-Regular
-Provides(40): STHeiti-Light
-OTFname(10): FandolHei-Regular.otf
-
-Name: FandolHei-Bold
-Class: GB
-OTFname(10): FandolHei-Bold.otf
-
-Name: FandolFang-Regular
-Class: GB
-Provides(40): STFangsong-Light
-Provides(40): STFangsong-Regular
-OTFname(10): FandolFang-Regular.otf
-
-# Arphic (free)
-
-Name: BousungEG-Light-GB
-Class: GB
-Provides(80): STSong-Light
-Provides(80): STSong-Regular
-Provides(80): STFangsong-Light
-Provides(80): STFangsong-Regular
-TTFname: gbsn00lp.ttf
-
-Name: GBZenKai-Medium
-Class: GB
-Provides(80): STKaiti-Regular
-Provides(80): STHeiti-Regular
-Provides(80): STHeiti-Light
-TTFname: gkai00mp.ttf
-
-Name: ShanHeiSun-Light
-Class: CNS
-Provides(80): MSung-Light
-Provides(80): MSung-Medium
-TTFname: bsmi00lp.ttf
-
-Name: ZenKai-Medium
-Class: CNS
-Provides(80): MKai-Medium
-Provides(80): MHei-Medium
-TTFname: bkai00mp.ttf
-
-# CJK-Unifonts new ttc edition (free)
-
-Name: UMingCN
-Class: GB
-Provides(70): STSong-Light
-Provides(70): STSong-Regular
-Provides(70): STFangsong-Light
-Provides(70): STFangsong-Regular
-TTCname: uming.ttc(0)
+# Fandol (free) -- Provides S40
+INCLUDE cjkgs-fandol.dat
-Name: UMingTW
-Class: CNS
-Provides(70): MSung-Light
-Provides(70): MSung-Medium
-TTCname: uming.ttc(2)
-
-Name: UKaiCN
-Class: GB
-Provides(70): STKaiti-Regular
-Provides(70): STHeiti-Regular
-Provides(70): STHeiti-Light
-TTCname: ukai.ttc(0)
-
-Name: UKaiTW
-Class: CNS
-Provides(70): MKai-Medium
-Provides(70): MHei-Medium
-TTCname: ukai.ttc(2)
-
-# CJK-Unifonts old ttf edition (free)
+# Arphic (free) -- Provides S80, T80
+INCLUDE cjkgs-arphic.dat
-# CNS
-Name: ShanHeiSun-Uni
-Class: CNS
-Provides(90): MSung-Light
-Provides(90): MSung-Medium
-TTFname: uming.ttf
-
-# GB
-Name: ShanHeiSun-Uni-Adobe-GB1
-Class: GB
-Provides(90): STSong-Light
-Provides(90): STSong-Regular
-Provides(90): STFangsong-Light
-Provides(90): STFangsong-Regular
-TTFname: uming.ttf
-
-# CNS
-Name: ZenKai-Uni
-Class: CNS
-Provides(90): MKai-Medium
-Provides(90): MHei-Medium
-TTFname: ukai.ttf
-
-# GB
-Name: ZenKai-Uni-Adobe-GB1
-Class: GB
-Provides(90): STKaiti-Regular
-Provides(90): STHeiti-Regular
-Provides(90): STHeiti-Light
-TTFname: ukai.ttf
+# CJK-Unifonts new ttc edition (free) -- Provides T70, S70
+# CJK-Unifonts old ttf edition (free) -- Provides T90, S90
+INCLUDE cjkgs-cjkuni.dat
# WenQuanYi (free)
-
-# GB
-Name: WenQuanYiMicroHei
-Class: GB
-TTCname(10): wqy-microhei.ttc(0)
-
-# CNS
-Name: WenQuanYiMicroHei-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-microhei.ttc(0)
-
-# GB
-Name: WenQuanYiMicroHeiMono
-Class: GB
-TTCname(10): wqy-microhei.ttc(1)
-
-# CNS
-Name: WenQuanYiMicroHeiMono-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-microhei.ttc(1)
-
-# GB
-Name: WenQuanYiZenHei
-Class: GB
-TTCname(10): wqy-zenhei.ttc(0)
-TTFname(20): wqy-zenhei.ttf
-
-# CNS
-Name: WenQuanYiZenHei-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-zenhei.ttc(0)
-TTFname(20): wqy-zenhei.ttf
-
-# GB
-Name: WenQuanYiZenHeiMono
-Class: GB
-TTCname(10): wqy-zenhei.ttc(1)
-
-# CNS:
-Name: WenQuanYiZenHeiMono-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-zenhei.ttc(1)
-
-# GB
-Name: WenQuanYiZenHeiSharp
-Class: GB
-TTCname(10): wqy-zenhei.ttc(2)
-
-# CNS
-Name: WenQuanYiZenHeiSharp-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-zenhei.ttc(2)
+INCLUDE cjkgs-wenquanyi.dat
# cwTeX (free)
@@ -2711,10 +2401,10 @@ TTFname: cwfs.ttf
# KOREAN FONTS
#
-# Adobe -- Provides level 30
+# Adobe -- Provides K30/80
# (already included in CHINESE section)
-# Solaris -- Provides level 40
+# Solaris -- Provides K40
INCLUDE cjkgs-solaris.dat
# Baekmuk (free)
@@ -2748,180 +2438,11 @@ Class: Korea
TTFname(20): hline.ttf
TTFname(10): Baekmuk-Headline.ttf
-# Unfonts-core (free)
-
-Name: UnBatang
-Class: Korea
-Provides(60): HYSMyeongJo-Medium
-TTFname: UnBatang.ttf
-
-Name: UnBatang-Bold
-Class: Korea
-TTFname: UnBatangBold.ttf
-
-Name: UnDotum
-Class: Korea
-Provides(60): HYGoThic-Medium
-TTFname: UnDotum.ttf
-
-Name: UnDotum-Bold
-Class: Korea
-TTFname: UnDotumBold.ttf
-
-Name: UnDinaru
-Class: Korea
-Provides(60): HYRGoThic-Medium
-TTFname: UnDinaru.ttf
-
-Name: UnDinaru-Bold
-Class: Korea
-TTFname: UnDinaruBold.ttf
-
-Name: UnDinaru-Light
-Class: Korea
-TTFname: UnDinaruLight.ttf
-
-Name: UnGraphic
-Class: Korea
-TTFname: UnGraphic.ttf
-
-Name: UnGraphic-Bold
-Class: Korea
-TTFname: UnGraphicBold.ttf
-
-Name: UnGungseo
-Class: Korea
-TTFname: UnGungseo.ttf
-
-Name: UnPilgi
-Class: Korea
-TTFname: UnPilgi.ttf
-
-Name: UnPilgi-Bold
-Class: Korea
-TTFname: UnPilgiBold.ttf
-
-# Unfonts-extra (free)
-
-Name: UnBom
-Class: Korea
-TTFname: UnBom.ttf
-
-Name: UnPen
-Class: Korea
-TTFname: UnPen.ttf
-
-Name: UnPenheulim
-Class: Korea
-TTFname: UnPenheulim.ttf
-
-Name: UnPilgia
-Class: Korea
-TTFname: UnPilgia.ttf
-
-Name: UnShinmun
-Class: Korea
-TTFname: UnShinmun.ttf
-
-Name: UnVada
-Class: Korea
-TTFname: UnVada.ttf
-
-Name: UnYetgul
-Class: Korea
-TTFname: UnYetgul.ttf
-
-Name: UnTaza
-Class: Korea
-TTFname: UnTaza.ttf
-
-# UnJamo... family has proportional metrics
-Name: UnJamoBatang
-Class: Korea
-TTFname: UnJamoBatang.ttf
-
-Name: UnJamoDotum
-Class: Korea
-TTFname: UnJamoDotum.ttf
-
-Name: UnJamoNovel
-Class: Korea
-TTFname: UnJamoNovel.ttf
-
-Name: UnJamoSora
-Class: Korea
-TTFname: UnJamoSora.ttf
-
-# Nanum (free - TTF files) and Nanum OS X (free - TTC files)
-# note that all fonts have narrow metrics
-
-Name: NanumMyeongjo
-Class: Korea
-TTFname(10): NanumMyeongjo.ttf
-TTCname(20): NanumMyeongjo.ttc(0)
-
-Name: NanumMyeongjoBold
-Class: Korea
-TTFname(10): NanumMyeongjoBold.ttf
-TTCname(20): NanumMyeongjo.ttc(1)
-
-Name: NanumMyeongjoExtraBold
-Class: Korea
-TTFname(10): NanumMyeongjoExtraBold.ttf
-TTCname(20): NanumMyeongjo.ttc(2)
-
-Name: NanumGothic
-Class: Korea
-TTFname(10): NanumGothic.ttf
-TTCname(20): NanumGothic.ttc(0)
-
-Name: NanumGothicBold
-Class: Korea
-TTFname(10): NanumGothicBold.ttf
-TTCname(20): NanumGothic.ttc(1)
-
-Name: NanumGothicExtraBold
-Class: Korea
-TTFname(10): NanumGothicExtraBold.ttf
-TTCname(20): NanumGothic.ttc(2)
-
-Name: NanumGothicLight
-Class: Korea
-TTFname(10): NanumGothicLight.ttf
-
-Name: NanumBarunGothic
-Class: Korea
-TTFname(10): NanumBarunGothic.ttf
-
-Name: NanumBarunGothicBold
-Class: Korea
-TTFname(10): NanumBarunGothicBold.ttf
-
-Name: NanumBarunGothicLight
-Class: Korea
-TTFname(10): NanumBarunGothicLight.ttf
-
-Name: NanumBarunGothicUltraLight
-Class: Korea
-TTFname(10): NanumBarunGothicUltraLight.ttf
-
-Name: NanumBarunpen
-Class: Korea
-TTFname(10): NanumBarunpenR.ttf
-
-Name: NanumBarunpen-Bold
-Class: Korea
-TTFname(10): NanumBarunpenB.ttf
-
-Name: NanumBrush
-Class: Korea
-TTFname(10): NanumBrush.ttf
-TTCname(20): NanumScript.ttc(0)
+# Unfonts (free) -- Provides K60
+INCLUDE cjkgs-unfonts.dat
-Name: NanumPen
-Class: Korea
-TTFname(10): NanumPen.ttf
-TTCname(20): NanumScript.ttc(1)
+# Nanum (free)
+INCLUDE cjkgs-nanum.dat
# Design font by Ho-Seok Ee, aka. "ALee's font" (free)
@@ -2952,97 +2473,8 @@ Class: Korea
TTFname: BM-HANNA.ttf
# Hancom HCR (free)
-# note that all fonts have narrow metrics
-
-Name: HCRBatang
-Class: Korea
-TTFname: HANBatang.ttf
-
-Name: HCRBatang-Bold
-Class: Korea
-TTFname: HANBatangB.ttf
-
-Name: HCRDotum
-Class: Korea
-TTFname: HANDotum.ttf
-
-Name: HCRDotum-Bold
-Class: Korea
-TTFname: HANDotumB.ttf
-
-# Apple
-
-Name: AppleMyungjo
-Class: Korea
-#Provides(??): HYSMyeongJo-Medium # fails
-TTFname: AppleMyungjo.ttf
-
-Name: AppleGothic
-Class: Korea
-#Provides(??): HYGoThic-Medium # fails
-#Provides(??): HYRGoThic-Medium # fails
-TTFname: AppleGothic.ttf
-
-Name: AppleSDGothicNeo-Regular
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Regular.otf
-OTCname(20): AppleSDGothicNeo.ttc(0)
-
-Name: AppleSDGothicNeo-Medium
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Medium.otf
-OTCname(20): AppleSDGothicNeo.ttc(2)
-
-Name: AppleSDGothicNeo-SemiBold
-Class: Korea
-OTFname(10): AppleSDGothicNeo-SemiBold.otf
-OTCname(20): AppleSDGothicNeo.ttc(4)
-
-Name: AppleSDGothicNeo-Bold
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Bold.otf
-OTCname(20): AppleSDGothicNeo.ttc(6)
-
-Name: AppleSDGothicNeo-Light
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Light.otf
-OTCname(20): AppleSDGothicNeo.ttc(8)
+INCLUDE cjkgs-hancom.dat
-Name: AppleSDGothicNeo-Thin
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Thin.otf
-OTCname(20): AppleSDGothicNeo.ttc(10)
-
-Name: AppleSDGothicNeo-UltraLight
-Class: Korea
-OTFname(10): AppleSDGothicNeo-UltraLight.otf
-OTCname(20): AppleSDGothicNeo.ttc(12)
-
-Name: AppleSDGothicNeo-ExtraBold
-Class: Korea
-OTFname(10): AppleSDGothicNeo-ExtraBold.otf
-OTCname(20): AppleSDGothicNeo.ttc(14)
-
-Name: AppleSDGothicNeo-Heavy
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Heavy.otf
-OTCname(20): AppleSDGothicNeo.ttc(16)
-
-Name: JCsmPC
-Class: Korea
-TTFname: PCmyoungjo.ttf
-
-Name: JCfg
-Class: Korea
-TTFname: Pilgiche.ttf
-
-Name: JCkg
-Class: Korea
-TTFname: Gungseouche.ttf
-
-Name: JCHEadA
-Class: Korea
-TTFname: HeadlineA.ttf
#
# Microsoft Windows, Windows/Mac Office fonts
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
index 5b927b62198..c763974f5fd 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
@@ -1,10 +1,122 @@
-2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+2019-03-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * Release 20190303.0 (HEAD -> master) [131b0f4]
+
+2019-03-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * copyright year (origin/master, origin/HEAD) [0732219]
+
+2019-03-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * cjk-gs-integrate-macos.pl: warning for macOS newer than known version [dd747ad]
+
+2018-11-10 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * cjk-gs-integrate,pl: make sure CR is stripped [510c7a5]
+
+2018-11-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * database/cjkgs-{noto,sourcehan}*.dat: priority [276565c]
+
+2018-11-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * database/cjkgs-{noto,sourcehan}*.dat [18dcc41]
+
+2018-10-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * forgotten removeonly database [d037c14]
+
+2018-10-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate more database [106a2f5]
+
+2018-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * cjk-gs-integrate-macos.pl: support 10.14 Mojave (mostly safe) [4aa6618]
+
+2018-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate cjkuni database [d285e93]
+
+2018-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate fandol database [2bc5564]
+
+2018-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate arphic database, more [adf6ae2]
+
+2018-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate arphic database [30fcfed]
+
+2018-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate monotype database [2a38d6d]
+
+2018-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate dynacomware taiwan [d279791]
+
+2018-09-26 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * tools/fontlist_mac.sh: Font5 [dac2a0b]
+
+2018-08-15 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * more debug code [4d6c622]
+
+2018-08-15 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * add bizud database [1958d12]
+
+2018-08-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * Adobe-Japan1-7 [a5bc97b]
+
+2018-08-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * hidden option --strict-psname for me debugging [2f10f6c]
+
+2018-08-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * execute 'mktexlsr' when --link-texmf is enabled [2d20f05]
+
+2018-08-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * cleanup code [c28d11d]
+
+2018-08-01 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * cjkgs-morisawa-extra is not ready [9ff11f7]
+
+2018-05-20 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * add heisei database (more) [7e0eeba]
+
+2018-05-20 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * add heisei database [2b3a5e4]
+
+2018-05-19 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate apple database [876176d]
+
+2018-05-19 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * information for apple database [1fcc897]
+
+2018-05-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * separate apple database [7f9f0b8]
+
+2018-03-31 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * Release 20180306.0 (HEAD -> master) [6c941b5]
+ * sort keys for $bntofn without this, link target differs from time to time. e.g. Office for Mac 2016 have the same font files for Excel, Word and PowerPoint. [796fd66]
2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * Release 20180306.0 (tag: 20180306.0, origin/master, origin/HEAD) [409e696]
+ * Release 20180306.0 (tag: 20180306.0) [409e696]
2018-03-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-apple.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-apple.dat
new file mode 100644
index 00000000000..95d70a2610a
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-apple.dat
@@ -0,0 +1,119 @@
+# Apple
+
+### TRADITIONAL CHINESE ###
+
+# Note about Mac (Mac OS X 10.6 -- macOS 10.13)
+# Apple LiSung Light.ttf
+# Apple LiGothic Medium.ttf
+# are bundled with macOS 10.12.6 Sierra or earlier versions.
+# AppleLiSung-Light.ttf
+# AppleLiGothic-Medium.ttf
+# are bundled with macOS 10.13 High Sierra or later versions.
+
+Name: LiSungLight
+Class: CNS
+TTFname(20): Apple LiSung Light.ttf
+TTFname(19): AppleLiSung-Light.ttf
+TTFname(10): LiSungLight.ttf
+
+Name: LiGothicMed
+Class: CNS
+TTFname(20): Apple LiGothic Medium.ttf
+TTFname(19): AppleLiGothic-Medium.ttf
+TTFname(10): LiGothicMed.ttf
+
+### KOREAN ###
+
+# Note about Mac (Mac OS X 10.6 -- macOS 10.13)
+# AppleMyungjo.ttf
+# AppleGothic.ttf
+# PCmyoungjo.ttf
+# Pilgiche.ttf
+# Gungseouche.ttf
+# HeadlineA.ttf
+# are bundled with all versions.
+# AppleSDGothicNeo-Regular.otf
+# AppleSDGothicNeo-Medium.otf
+# AppleSDGothicNeo-SemiBold.otf
+# AppleSDGothicNeo-Bold.otf
+# AppleSDGothicNeo-Light.otf
+# AppleSDGothicNeo-Thin.otf
+# AppleSDGothicNeo-UltraLight.otf
+# AppleSDGothicNeo-ExtraBold.otf
+# AppleSDGothicNeo-Heavy.otf
+# are bundled with OS X 10.10.5 Yosemite or earlier versions.
+# AppleSDGothicNeo.ttc
+# is bundled with OS X 10.11 El Capitan or later versions.
+
+Name: AppleMyungjo
+Class: Korea
+#Provides(??): HYSMyeongJo-Medium # fails
+TTFname: AppleMyungjo.ttf
+
+Name: AppleGothic
+Class: Korea
+#Provides(??): HYGoThic-Medium # fails
+#Provides(??): HYRGoThic-Medium # fails
+TTFname: AppleGothic.ttf
+
+Name: AppleSDGothicNeo-Regular
+Class: Korea
+OTFname(10): AppleSDGothicNeo-Regular.otf
+OTCname(20): AppleSDGothicNeo.ttc(0)
+
+Name: AppleSDGothicNeo-Medium
+Class: Korea
+OTFname(10): AppleSDGothicNeo-Medium.otf
+OTCname(20): AppleSDGothicNeo.ttc(2)
+
+Name: AppleSDGothicNeo-SemiBold
+Class: Korea
+OTFname(10): AppleSDGothicNeo-SemiBold.otf
+OTCname(20): AppleSDGothicNeo.ttc(4)
+
+Name: AppleSDGothicNeo-Bold
+Class: Korea
+OTFname(10): AppleSDGothicNeo-Bold.otf
+OTCname(20): AppleSDGothicNeo.ttc(6)
+
+Name: AppleSDGothicNeo-Light
+Class: Korea
+OTFname(10): AppleSDGothicNeo-Light.otf
+OTCname(20): AppleSDGothicNeo.ttc(8)
+
+Name: AppleSDGothicNeo-Thin
+Class: Korea
+OTFname(10): AppleSDGothicNeo-Thin.otf
+OTCname(20): AppleSDGothicNeo.ttc(10)
+
+Name: AppleSDGothicNeo-UltraLight
+Class: Korea
+OTFname(10): AppleSDGothicNeo-UltraLight.otf
+OTCname(20): AppleSDGothicNeo.ttc(12)
+
+Name: AppleSDGothicNeo-ExtraBold
+Class: Korea
+OTFname(10): AppleSDGothicNeo-ExtraBold.otf
+OTCname(20): AppleSDGothicNeo.ttc(14)
+
+Name: AppleSDGothicNeo-Heavy
+Class: Korea
+OTFname(10): AppleSDGothicNeo-Heavy.otf
+OTCname(20): AppleSDGothicNeo.ttc(16)
+
+Name: JCsmPC
+Class: Korea
+TTFname: PCmyoungjo.ttf
+
+Name: JCfg
+Class: Korea
+TTFname: Pilgiche.ttf
+
+Name: JCkg
+Class: Korea
+TTFname: Gungseouche.ttf
+
+Name: JCHEadA
+Class: Korea
+TTFname: HeadlineA.ttf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-arphic.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-arphic.dat
new file mode 100644
index 00000000000..80b4b45d00c
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-arphic.dat
@@ -0,0 +1,46 @@
+# Arphic Technology
+
+### SIMPLIFIED/TRADITIONAL CHINESE ###
+
+# Note about TeX Live:
+# gbsn00lp.ttf
+# gkai00mp.ttf
+# bsmi00lp.ttf
+# bkai00mp.ttf
+# are available as "arphic" package for free.
+
+# Note about Mac (Mac OS X 10.6 -- macOS 10.13)
+# WeibeiSC-Bold.otf (PSName: Weibei-SC-Bold)
+# WeibeiTC-Bold.otf (PSName: Weibei-TC-Bold)
+# are bundled with macOS 10.12.6 Sierra or earlier versions.
+# WeibeiSC-Bold.otf (PSName: WeibeiSC-Bold)
+# WeibeiTC-Bold.otf (PSName: WeibeiTC-Bold)
+# are bundled with macOS 10.13 High Sierra or later versions.
+
+Name: BousungEG-Light-GB
+Class: GB
+Provides(80): STSong-Light
+Provides(80): STSong-Regular
+Provides(80): STFangsong-Light
+Provides(80): STFangsong-Regular
+TTFname: gbsn00lp.ttf
+
+Name: GBZenKai-Medium
+Class: GB
+Provides(80): STKaiti-Regular
+Provides(80): STHeiti-Regular
+Provides(80): STHeiti-Light
+TTFname: gkai00mp.ttf
+
+Name: ShanHeiSun-Light
+Class: CNS
+Provides(80): MSung-Light
+Provides(80): MSung-Medium
+TTFname: bsmi00lp.ttf
+
+Name: ZenKai-Medium
+Class: CNS
+Provides(80): MKai-Medium
+Provides(80): MHei-Medium
+TTFname: bkai00mp.ttf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-bizud.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-bizud.dat
new file mode 100644
index 00000000000..784024d1faa
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-bizud.dat
@@ -0,0 +1,32 @@
+# BIZ UD (Morisawa)
+
+### JAPANESE ###
+
+# Note:
+# BIZ-UD*.ttc (3 files)
+# are available from https://bizplus.morisawa.co.jp for Win/Mac.
+
+Name: BIZ-UDGothic-B
+Class: Japan
+TTCname: BIZ-UDGothic-B.ttc(0)
+
+Name: BIZ-UDPGothic-B
+Class: Japan
+TTCname: BIZ-UDGothic-B.ttc(1)
+
+Name: BIZ-UDGothic-R
+Class: Japan
+TTCname: BIZ-UDGothic-R.ttc(0)
+
+Name: BIZ-UDPGothic-R
+Class: Japan
+TTCname: BIZ-UDGothic-R.ttc(1)
+
+Name: BIZ-UDMincho-M
+Class: Japan
+TTCname: BIZ-UDMincho-M.ttc(0)
+
+Name: BIZ-UDPMincho-M
+Class: Japan
+TTCname: BIZ-UDMincho-M.ttc(1)
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-cjkuni.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-cjkuni.dat
new file mode 100644
index 00000000000..9e63d805e2c
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-cjkuni.dat
@@ -0,0 +1,66 @@
+# CJK-Unifonts new ttc edition (free)
+
+### SIMPLIFIED/TRADITIONAL CHINESE ###
+
+Name: UMingCN
+Class: GB
+Provides(70): STSong-Light
+Provides(70): STSong-Regular
+Provides(70): STFangsong-Light
+Provides(70): STFangsong-Regular
+TTCname: uming.ttc(0)
+
+Name: UMingTW
+Class: CNS
+Provides(70): MSung-Light
+Provides(70): MSung-Medium
+TTCname: uming.ttc(2)
+
+Name: UKaiCN
+Class: GB
+Provides(70): STKaiti-Regular
+Provides(70): STHeiti-Regular
+Provides(70): STHeiti-Light
+TTCname: ukai.ttc(0)
+
+Name: UKaiTW
+Class: CNS
+Provides(70): MKai-Medium
+Provides(70): MHei-Medium
+TTCname: ukai.ttc(2)
+
+# CJK-Unifonts old ttf edition (free)
+
+### SIMPLIFIED/TRADITIONAL CHINESE ###
+
+# CNS
+Name: ShanHeiSun-Uni
+Class: CNS
+Provides(90): MSung-Light
+Provides(90): MSung-Medium
+TTFname: uming.ttf
+
+# GB
+Name: ShanHeiSun-Uni-Adobe-GB1
+Class: GB
+Provides(90): STSong-Light
+Provides(90): STSong-Regular
+Provides(90): STFangsong-Light
+Provides(90): STFangsong-Regular
+TTFname: uming.ttf
+
+# CNS
+Name: ZenKai-Uni
+Class: CNS
+Provides(90): MKai-Medium
+Provides(90): MHei-Medium
+TTFname: ukai.ttf
+
+# GB
+Name: ZenKai-Uni-Adobe-GB1
+Class: GB
+Provides(90): STKaiti-Regular
+Provides(90): STHeiti-Regular
+Provides(90): STHeiti-Light
+TTFname: ukai.ttf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-dynacomware.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-dynacomware.dat
index ac99b67c334..8fef04f1392 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-dynacomware.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-dynacomware.dat
@@ -1,4 +1,4 @@
-# DynaComware
+# DynaComware, Dynacomware Taiwan
### SIMPLIFIED/TRADITIONAL CHINESE ###
@@ -9,6 +9,11 @@
# LiHeiPro.ttf
# LiSongPro.ttf
# are bundled with macOS 10.13 High Sierra or later versions.
+# WawaSC-Regular.otf
+# WawaTC-Regular.otf
+# Hannotate.ttc
+# Hanzipen.ttc
+# are bundled with OS X 10.9 Mavericks or later versions.
# PingFang.ttc
# index 0--17: PingFang*
# index 18--35: .PingFang* (hidden fonts)
@@ -27,6 +32,48 @@ Class: CNS
TTFname(20): 儷宋 Pro.ttf
TTFname(10): LiSongPro.ttf
+Name: WawaSC-Regular
+PSName: DFWaWaSC-W5
+Class: GB
+OTFname: WawaSC-Regular.otf
+
+Name: WawaTC-Regular
+PSName: DFWaWaTC-W5
+Class: CNS
+OTFname: WawaTC-Regular.otf
+
+Name: HannotateSC-W5
+Class: GB
+OTCname: Hannotate.ttc(0)
+
+Name: HannotateTC-W5
+Class: CNS
+OTCname: Hannotate.ttc(1)
+
+Name: HannotateSC-W7
+Class: GB
+OTCname: Hannotate.ttc(2)
+
+Name: HannotateTC-W7
+Class: CNS
+OTCname: Hannotate.ttc(3)
+
+Name: HanziPenSC-W3
+Class: GB
+OTCname: Hanzipen.ttc(0)
+
+Name: HanziPenTC-W3
+Class: CNS
+OTCname: Hanzipen.ttc(1)
+
+Name: HanziPenSC-W5
+Class: GB
+OTCname: Hanzipen.ttc(2)
+
+Name: HanziPenTC-W5
+Class: CNS
+OTCname: Hanzipen.ttc(3)
+
Name: PingFangHK-Regular
Class: CNS # HK
OTCname: PingFang.ttc(0)
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-fandol.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-fandol.dat
new file mode 100644
index 00000000000..c2e10bd2b92
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-fandol.dat
@@ -0,0 +1,39 @@
+# Fandol (free)
+
+### SIMPLIFIED CHINESE ###
+
+# Note about TeX Live:
+# Fandol*.otf (6 files)
+# are available as "fandol" package for free.
+
+Name: FandolSong-Regular
+Class: GB
+Provides(40): STSong-Light
+OTFname(10): FandolSong-Regular.otf
+
+Name: FandolSong-Bold
+Provides(40): STSong-Regular
+Class: GB
+OTFname(10): FandolSong-Bold.otf
+
+Name: FandolKai-Regular
+Class: GB
+Provides(40): STKaiti-Regular
+OTFname(10): FandolKai-Regular.otf
+
+Name: FandolHei-Regular
+Class: GB
+Provides(40): STHeiti-Regular
+Provides(40): STHeiti-Light
+OTFname(10): FandolHei-Regular.otf
+
+Name: FandolHei-Bold
+Class: GB
+OTFname(10): FandolHei-Bold.otf
+
+Name: FandolFang-Regular
+Class: GB
+Provides(40): STFangsong-Light
+Provides(40): STFangsong-Regular
+OTFname(10): FandolFang-Regular.otf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-hancom.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-hancom.dat
new file mode 100644
index 00000000000..9f1609cde89
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-hancom.dat
@@ -0,0 +1,26 @@
+# Hancom HCR (free)
+
+# Note:
+# HAN*.ttf (4 files)
+# are available from Hancom Office website for free.
+
+### KOREAN ###
+
+# note that all fonts have narrow metrics
+
+Name: HCRBatang
+Class: Korea
+TTFname: HANBatang.ttf
+
+Name: HCRBatang-Bold
+Class: Korea
+TTFname: HANBatangB.ttf
+
+Name: HCRDotum
+Class: Korea
+TTFname: HANDotum.ttf
+
+Name: HCRDotum-Bold
+Class: Korea
+TTFname: HANDotumB.ttf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-heisei.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-heisei.dat
new file mode 100644
index 00000000000..9c092f4c90f
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-heisei.dat
@@ -0,0 +1,54 @@
+# Heisei (Adobe)
+
+### JAPANESE ###
+
+Name: HeiseiMinStd-W3
+Class: Japan
+OTFname(20): Heisei Mincho Std W3.otf # ?
+OTFname(10): HeiseiMinStd-W3.otf
+
+Name: HeiseiMinStd-W5
+Class: Japan
+OTFname(20): Heisei Mincho Std W5.otf # ?
+OTFname(10): HeiseiMinStd-W5.otf
+
+Name: HeiseiMinStd-W7
+Class: Japan
+OTFname(20): Heisei Mincho Std W7.otf # ?
+OTFname(10): HeiseiMinStd-W7.otf
+
+Name: HeiseiMinStd-W9
+Class: Japan
+OTFname(20): Heisei Mincho Std W9.otf # ?
+OTFname(10): HeiseiMinStd-W9.otf
+
+Name: HeiseiKakuGoStd-W3
+Class: Japan
+OTFname(20): Heisei Kaku Gothic Std W3.otf # ?
+OTFname(10): HeiseiKakuGoStd-W3.otf
+
+Name: HeiseiKakuGoStd-W5
+Class: Japan
+OTFname(20): Heisei Kaku Gothic Std W5.otf # ?
+OTFname(10): HeiseiKakuGoStd-W5.otf
+
+Name: HeiseiKakuGoStd-W7
+Class: Japan
+OTFname(20): Heisei Kaku Gothic Std W7.otf # ?
+OTFname(10): HeiseiKakuGoStd-W7.otf
+
+Name: HeiseiKakuGoStd-W9
+Class: Japan
+OTFname(20): Heisei Kaku Gothic Std W9.otf # ?
+OTFname(10): HeiseiKakuGoStd-W9.otf
+
+Name: HeiseiMaruGoStd-W4
+Class: Japan
+OTFname(20): Heisei Maru Gothic Std W4.otf # ?
+OTFname(10): HeiseiMaruGoStd-W4.otf
+
+Name: HeiseiMaruGoStd-W8
+Class: Japan
+OTFname(20): Heisei Maru Gothic Std W8.otf # ?
+OTFname(10): HeiseiMaruGoStd-W8.otf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-ipa.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-ipa.dat
new file mode 100644
index 00000000000..132fe33c7f6
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-ipa.dat
@@ -0,0 +1,103 @@
+# IPA (free)
+
+### JAPANESE ###
+
+# Note about TeX Live:
+# ipam.ttf
+# ipag.ttf
+# ipaexm.ttf
+# ipaexg.ttf
+# ipapm.ttf
+# ipapg.ttf
+# are available as "ipaex" package for free.
+
+Name: IPAMincho
+Class: Japan
+Provides(130): Ryumin-Light
+Provides(130): RyuminPro-Light
+Provides(130): HiraMinProN-W3
+Provides(130): HiraMinPro-W3
+Provides(130): FutoMinA101-Bold
+Provides(130): FutoMinA101Pro-Bold
+Provides(130): HiraMinProN-W6
+Provides(130): HiraMinPro-W6
+Provides(130): MidashiMin-MA31
+Provides(130): MidashiMinPro-MA31
+TTFname(20): ipam.ttf
+#TTFname(21): IPAMincho.ttf
+
+Name: IPAGothic
+Class: Japan
+Provides(130): GothicBBB-Medium
+Provides(130): GothicBBBPro-Medium
+Provides(130): HiraKakuProN-W3
+Provides(130): HiraKakuPro-W3
+Provides(130): FutoGoB101-Bold
+Provides(130): FutoGoB101Pro-Bold
+Provides(130): HiraKakuProN-W6
+Provides(130): HiraKakuPro-W6
+Provides(130): MidashiGo-MB31
+Provides(130): MidashiGoPro-MB31
+Provides(130): HiraKakuStdN-W8
+Provides(130): HiraKakuStd-W8
+Provides(130): Jun101-Light
+Provides(130): Jun101Pro-Light
+Provides(130): HiraMaruProN-W4
+Provides(130): HiraMaruPro-W4
+TTFname(20): ipag.ttf
+#TTFname(21): IPAGothic.ttf
+
+Name: IPAexMincho
+Class: Japan
+Provides(120): Ryumin-Light
+Provides(120): RyuminPro-Light
+Provides(120): HiraMinProN-W3
+Provides(120): HiraMinPro-W3
+Provides(120): FutoMinA101-Bold
+Provides(120): FutoMinA101Pro-Bold
+Provides(120): HiraMinProN-W6
+Provides(120): HiraMinPro-W6
+Provides(120): MidashiMin-MA31
+Provides(120): MidashiMinPro-MA31
+TTFname(20): ipaexm.ttf
+#TTFname(21): IPAexMincho.ttf
+
+Name: IPAexGothic
+Class: Japan
+Provides(120): GothicBBB-Medium
+Provides(120): GothicBBBPro-Medium
+Provides(120): HiraKakuProN-W3
+Provides(120): HiraKakuPro-W3
+Provides(120): FutoGoB101-Bold
+Provides(120): FutoGoB101Pro-Bold
+Provides(120): HiraKakuProN-W6
+Provides(120): HiraKakuPro-W6
+Provides(120): MidashiGo-MB31
+Provides(120): MidashiGoPro-MB31
+Provides(120): HiraKakuStdN-W8
+Provides(120): HiraKakuStd-W8
+Provides(120): Jun101-Light
+Provides(120): Jun101Pro-Light
+Provides(120): HiraMaruProN-W4
+Provides(120): HiraMaruPro-W4
+TTFname(20): ipaexg.ttf
+#TTFname(21): IPAexGothic.ttf
+
+# IPA proportional (free)
+
+Name: IPAPMincho
+Class: Japan
+TTFname(20): ipamp.ttf
+#TTFname(21): IPAPMincho.ttf
+
+Name: IPAPGothic
+Class: Japan
+TTFname(20): ipagp.ttf
+#TTFname(21): IPAPGothic.ttf
+
+# IPA MJ (free)
+
+Name: IPAmjMincho
+Class: Japan
+TTFname: ipamjm.ttf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-macos-removeonly.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-macos-removeonly.dat
index cc6440d73f9..ce9ff48eb27 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-macos-removeonly.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-macos-removeonly.dat
@@ -560,3 +560,23 @@ Name: STYuanti-TC-Regular
Class: CNS
RMVname(30): Yuanti.ttc(5)
+# Arphic Technology
+
+Name: WeibeiSC-Bold
+PSName: Weibei-SC-Bold
+Class: GB
+OTFname: WeibeiSC-Bold.otf
+
+#Name: WeibeiSC-Bold
+#Class: GB
+#OTFname: WeibeiSC-Bold.otf
+
+Name: WeibeiTC-Bold
+PSName: Weibei-TC-Bold
+Class: CNS
+OTFname: WeibeiTC-Bold.otf
+
+#Name: WeibeiTC-Bold
+#Class: CNS
+#OTFname: WeibeiTC-Bold.otf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-monotype.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-monotype.dat
new file mode 100644
index 00000000000..caeeb14e7a4
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-monotype.dat
@@ -0,0 +1,30 @@
+# Monotype Imaging, Monotype Hong Kong
+
+### SIMPLIFIED/TRADITIONAL CHINESE ###
+
+# Note about Mac (Mac OS X 10.6 -- macOS 10.13)
+# YuppySC-Regular.otf
+# YuppyTC-Regular.otf
+# are bundled with OS X 10.9 Mavericks or later versions.
+# LingWaiSC-Medium.otf
+# LingWaiTC-Medium.otf
+# are bundled with macOS 10.12 Sierra or later versions.
+
+Name: YuppySC-Regular
+Class: GB
+OTFname: YuppySC-Regular.otf
+
+Name: YuppyTC-Regular
+Class: CNS
+OTFname: YuppyTC-Regular.otf
+
+Name: LingWaiSC-Medium
+PSName: MLingWaiMedium-SC
+Class: GB
+OTFname: LingWaiSC-Medium.otf
+
+Name: LingWaiTC-Medium
+PSName: MLingWaiMedium-TC
+Class: CNS
+OTFname: LingWaiTC-Medium.otf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-nanum.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-nanum.dat
new file mode 100644
index 00000000000..533a3d9e995
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-nanum.dat
@@ -0,0 +1,78 @@
+# Nanum (free) (including Nanum MacOS version)
+
+# Note about Mac (Mac OS X 10.6 -- macOS 10.13)
+# Nanum*.ttc (3 files)
+# are bundled with ???.
+
+### KOREAN ###
+
+# note that all fonts have narrow metrics
+
+Name: NanumMyeongjo
+Class: Korea
+TTFname(10): NanumMyeongjo.ttf
+TTCname(20): NanumMyeongjo.ttc(0)
+
+Name: NanumMyeongjoBold
+Class: Korea
+TTFname(10): NanumMyeongjoBold.ttf
+TTCname(20): NanumMyeongjo.ttc(1)
+
+Name: NanumMyeongjoExtraBold
+Class: Korea
+TTFname(10): NanumMyeongjoExtraBold.ttf
+TTCname(20): NanumMyeongjo.ttc(2)
+
+Name: NanumGothic
+Class: Korea
+TTFname(10): NanumGothic.ttf
+TTCname(20): NanumGothic.ttc(0)
+
+Name: NanumGothicBold
+Class: Korea
+TTFname(10): NanumGothicBold.ttf
+TTCname(20): NanumGothic.ttc(1)
+
+Name: NanumGothicExtraBold
+Class: Korea
+TTFname(10): NanumGothicExtraBold.ttf
+TTCname(20): NanumGothic.ttc(2)
+
+Name: NanumGothicLight
+Class: Korea
+TTFname(10): NanumGothicLight.ttf
+
+Name: NanumBarunGothic
+Class: Korea
+TTFname(10): NanumBarunGothic.ttf
+
+Name: NanumBarunGothicBold
+Class: Korea
+TTFname(10): NanumBarunGothicBold.ttf
+
+Name: NanumBarunGothicLight
+Class: Korea
+TTFname(10): NanumBarunGothicLight.ttf
+
+Name: NanumBarunGothicUltraLight
+Class: Korea
+TTFname(10): NanumBarunGothicUltraLight.ttf
+
+Name: NanumBarunpen
+Class: Korea
+TTFname(10): NanumBarunpenR.ttf
+
+Name: NanumBarunpen-Bold
+Class: Korea
+TTFname(10): NanumBarunpenB.ttf
+
+Name: NanumBrush
+Class: Korea
+TTFname(10): NanumBrush.ttf
+TTCname(20): NanumScript.ttc(0)
+
+Name: NanumPen
+Class: Korea
+TTFname(10): NanumPen.ttf
+TTCname(20): NanumScript.ttc(1)
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notosans.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notosans.dat
new file mode 100644
index 00000000000..d93b43f73fb
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notosans.dat
@@ -0,0 +1,182 @@
+# NotoSans
+
+Name: NotoSansCJKjp-Thin
+Class: Japan
+OTFname(10): NotoSansCJKjp-Thin.otf
+OTCname(20): NotoSansCJK-Thin.ttc(0)
+
+Name: NotoSansCJKjp-Light
+Class: Japan
+OTFname(10): NotoSansCJKjp-Light.otf
+OTCname(20): NotoSansCJK-Light.ttc(0)
+
+Name: NotoSansCJKjp-DemiLight
+Class: Japan
+OTFname(10): NotoSansCJKjp-DemiLight.otf
+OTCname(20): NotoSansCJK-DemiLight.ttc(0)
+
+Name: NotoSansCJKjp-Regular
+Class: Japan
+OTFname(10): NotoSansCJKjp-Regular.otf
+OTCname(20): NotoSansCJK-Regular.ttc(0)
+
+Name: NotoSansCJKjp-Medium
+Class: Japan
+OTFname(10): NotoSansCJKjp-Medium.otf
+OTCname(20): NotoSansCJK-Medium.ttc(0)
+
+Name: NotoSansCJKjp-Bold
+Class: Japan
+OTFname(10): NotoSansCJKjp-Bold.otf
+OTCname(20): NotoSansCJK-Bold.ttc(0)
+
+Name: NotoSansCJKjp-Black
+Class: Japan
+OTFname(10): NotoSansCJKjp-Black.otf
+OTCname(20): NotoSansCJK-Black.ttc(0)
+
+Name: NotoSansCJKkr-Thin
+Class: Korea
+OTFname(10): NotoSansCJKkr-Thin.otf
+OTCname(20): NotoSansCJK-Thin.ttc(1)
+
+Name: NotoSansCJKkr-Light
+Class: Korea
+OTFname(10): NotoSansCJKkr-Light.otf
+OTCname(20): NotoSansCJK-Light.ttc(1)
+
+Name: NotoSansCJKkr-DemiLight
+Class: Korea
+OTFname(10): NotoSansCJKkr-DemiLight.otf
+OTCname(20): NotoSansCJK-DemiLight.ttc(1)
+
+Name: NotoSansCJKkr-Regular
+Class: Korea
+OTFname(10): NotoSansCJKkr-Regular.otf
+OTCname(20): NotoSansCJK-Regular.ttc(1)
+
+Name: NotoSansCJKkr-Medium
+Class: Korea
+OTFname(10): NotoSansCJKkr-Medium.otf
+OTCname(20): NotoSansCJK-Medium.ttc(1)
+
+Name: NotoSansCJKkr-Bold
+Class: Korea
+OTFname(10): NotoSansCJKkr-Bold.otf
+OTCname(20): NotoSansCJK-Bold.ttc(1)
+
+Name: NotoSansCJKkr-Black
+Class: Korea
+OTFname(10): NotoSansCJKkr-Black.otf
+OTCname(20): NotoSansCJK-Black.ttc(1)
+
+Name: NotoSansCJKsc-Thin
+Class: GB
+OTFname(10): NotoSansCJKsc-Thin.otf
+OTCname(20): NotoSansCJK-Thin.ttc(2)
+
+Name: NotoSansCJKsc-Light
+Class: GB
+OTFname(10): NotoSansCJKsc-Light.otf
+OTCname(20): NotoSansCJK-Light.ttc(2)
+
+Name: NotoSansCJKsc-DemiLight
+Class: GB
+OTFname(10): NotoSansCJKsc-DemiLight.otf
+OTCname(20): NotoSansCJK-DemiLight.ttc(2)
+
+Name: NotoSansCJKsc-Regular
+Class: GB
+OTFname(10): NotoSansCJKsc-Regular.otf
+OTCname(20): NotoSansCJK-Regular.ttc(2)
+
+Name: NotoSansCJKsc-Medium
+Class: GB
+OTFname(10): NotoSansCJKsc-Medium.otf
+OTCname(20): NotoSansCJK-Medium.ttc(2)
+
+Name: NotoSansCJKsc-Bold
+Class: GB
+OTFname(10): NotoSansCJKsc-Bold.otf
+OTCname(20): NotoSansCJK-Bold.ttc(2)
+
+Name: NotoSansCJKsc-Black
+Class: GB
+OTFname(10): NotoSansCJKsc-Black.otf
+OTCname(20): NotoSansCJK-Black.ttc(2)
+
+Name: NotoSansCJKtc-Thin
+Class: CNS
+OTFname(10): NotoSansCJKtc-Thin.otf
+OTCname(20): NotoSansCJK-Thin.ttc(3)
+
+Name: NotoSansCJKtc-Light
+Class: CNS
+OTFname(10): NotoSansCJKtc-Light.otf
+OTCname(20): NotoSansCJK-Light.ttc(3)
+
+Name: NotoSansCJKtc-DemiLight
+Class: CNS
+OTFname(10): NotoSansCJKtc-DemiLight.otf
+OTCname(20): NotoSansCJK-DemiLight.ttc(3)
+
+Name: NotoSansCJKtc-Regular
+Class: CNS
+OTFname(10): NotoSansCJKtc-Regular.otf
+OTCname(20): NotoSansCJK-Regular.ttc(3)
+
+Name: NotoSansCJKtc-Medium
+Class: CNS
+OTFname(10): NotoSansCJKtc-Medium.otf
+OTCname(20): NotoSansCJK-Medium.ttc(3)
+
+Name: NotoSansCJKtc-Bold
+Class: CNS
+OTFname(10): NotoSansCJKtc-Bold.otf
+OTCname(20): NotoSansCJK-Bold.ttc(3)
+
+Name: NotoSansCJKtc-Black
+Class: CNS
+OTFname(10): NotoSansCJKtc-Black.otf
+OTCname(20): NotoSansCJK-Black.ttc(3)
+
+Name: NotoSansMonoCJKjp-Regular
+Class: Japan
+OTFname(10): NotoSansMonoCJKjp-Regular.otf
+OTCname(20): NotoSansCJK-Regular.ttc(4)
+
+Name: NotoSansMonoCJKjp-Bold
+Class: Japan
+OTFname(10): NotoSansMonoCJKjp-Bold.otf
+OTCname(20): NotoSansCJK-Bold.ttc(4)
+
+Name: NotoSansMonoCJKkr-Regular
+Class: Korea
+OTFname(10): NotoSansMonoCJKkr-Regular.otf
+OTCname(20): NotoSansCJK-Regular.ttc(5)
+
+Name: NotoSansMonoCJKkr-Bold
+Class: Korea
+OTFname(10): NotoSansMonoCJKkr-Bold.otf
+OTCname(20): NotoSansCJK-Bold.ttc(5)
+
+Name: NotoSansMonoCJKsc-Regular
+Class: GB
+OTFname(10): NotoSansMonoCJKsc-Regular.otf
+OTCname(20): NotoSansCJK-Regular.ttc(6)
+
+Name: NotoSansMonoCJKsc-Bold
+Class: GB
+OTFname(10): NotoSansMonoCJKsc-Bold.otf
+OTCname(20): NotoSansCJK-Bold.ttc(6)
+
+Name: NotoSansMonoCJKtc-Regular
+Class: CNS
+OTFname(10): NotoSansMonoCJKtc-Regular.otf
+OTCname(20): NotoSansCJK-Regular.ttc(7)
+
+Name: NotoSansMonoCJKtc-Bold
+Class: CNS
+OTFname(10): NotoSansMonoCJKtc-Bold.otf
+OTCname(20): NotoSansCJK-Bold.ttc(7)
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notoserif.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notoserif.dat
new file mode 100644
index 00000000000..e9131668073
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notoserif.dat
@@ -0,0 +1,141 @@
+# NotoSerif
+
+Name: NotoSerifCJKjp-ExtraLight
+Class: Japan
+OTFname(10): NotoSerifCJKjp-ExtraLight.otf
+OTCname(20): NotoSerifCJK-ExtraLight.ttc(0)
+
+Name: NotoSerifCJKjp-Light
+Class: Japan
+OTFname(10): NotoSerifCJKjp-Light.otf
+OTCname(20): NotoSerifCJK-Light.ttc(0)
+
+Name: NotoSerifCJKjp-Regular
+Class: Japan
+OTFname(10): NotoSerifCJKjp-Regular.otf
+OTCname(20): NotoSerifCJK-Regular.ttc(0)
+
+Name: NotoSerifCJKjp-Medium
+Class: Japan
+OTFname(10): NotoSerifCJKjp-Medium.otf
+OTCname(20): NotoSerifCJK-Medium.ttc(0)
+
+Name: NotoSerifCJKjp-SemiBold
+Class: Japan
+OTFname(10): NotoSerifCJKjp-SemiBold.otf
+OTCname(20): NotoSerifCJK-SemiBold.ttc(0)
+
+Name: NotoSerifCJKjp-Bold
+Class: Japan
+OTFname(10): NotoSerifCJKjp-Bold.otf
+OTCname(20): NotoSerifCJK-Bold.ttc(0)
+
+Name: NotoSerifCJKjp-Black
+Class: Japan
+OTFname(10): NotoSerifCJKjp-Black.otf
+OTCname(20): NotoSerifCJK-Black.ttc(0)
+
+Name: NotoSerifCJKkr-ExtraLight
+Class: Korea
+OTFname(10): NotoSerifCJKkr-ExtraLight.otf
+OTCname(20): NotoSerifCJK-ExtraLight.ttc(1)
+
+Name: NotoSerifCJKkr-Light
+Class: Korea
+OTFname(10): NotoSerifCJKkr-Light.otf
+OTCname(20): NotoSerifCJK-Light.ttc(1)
+
+Name: NotoSerifCJKkr-Regular
+Class: Korea
+OTFname(10): NotoSerifCJKkr-Regular.otf
+OTCname(20): NotoSerifCJK-Regular.ttc(1)
+
+Name: NotoSerifCJKkr-Medium
+Class: Korea
+OTFname(10): NotoSerifCJKkr-Medium.otf
+OTCname(20): NotoSerifCJK-Medium.ttc(1)
+
+Name: NotoSerifCJKkr-SemiBold
+Class: Korea
+OTFname(10): NotoSerifCJKkr-SemiBold.otf
+OTCname(20): NotoSerifCJK-SemiBold.ttc(1)
+
+Name: NotoSerifCJKkr-Bold
+Class: Korea
+OTFname(10): NotoSerifCJKkr-Bold.otf
+OTCname(20): NotoSerifCJK-Bold.ttc(1)
+
+Name: NotoSerifCJKkr-Black
+Class: Korea
+OTFname(10): NotoSerifCJKkr-Black.otf
+OTCname(20): NotoSerifCJK-Black.ttc(1)
+
+Name: NotoSerifCJKsc-ExtraLight
+Class: GB
+OTFname(10): NotoSerifCJKsc-ExtraLight.otf
+OTCname(20): NotoSerifCJK-ExtraLight.ttc(2)
+
+Name: NotoSerifCJKsc-Light
+Class: GB
+OTFname(10): NotoSerifCJKsc-Light.otf
+OTCname(20): NotoSerifCJK-Light.ttc(2)
+
+Name: NotoSerifCJKsc-Regular
+Class: GB
+OTFname(10): NotoSerifCJKsc-Regular.otf
+OTCname(20): NotoSerifCJK-Regular.ttc(2)
+
+Name: NotoSerifCJKsc-Medium
+Class: GB
+OTFname(10): NotoSerifCJKsc-Medium.otf
+OTCname(20): NotoSerifCJK-Medium.ttc(2)
+
+Name: NotoSerifCJKsc-SemiBold
+Class: GB
+OTFname(10): NotoSerifCJKsc-SemiBold.otf
+OTCname(20): NotoSerifCJK-SemiBold.ttc(2)
+
+Name: NotoSerifCJKsc-Bold
+Class: GB
+OTFname(10): NotoSerifCJKsc-Bold.otf
+OTCname(20): NotoSerifCJK-Bold.ttc(2)
+
+Name: NotoSerifCJKsc-Black
+Class: GB
+OTFname(10): NotoSerifCJKsc-Black.otf
+OTCname(20): NotoSerifCJK-Black.ttc(2)
+
+Name: NotoSerifCJKtc-ExtraLight
+Class: CNS
+OTFname(10): NotoSerifCJKtc-ExtraLight.otf
+OTCname(20): NotoSerifCJK-ExtraLight.ttc(3)
+
+Name: NotoSerifCJKtc-Light
+Class: CNS
+OTFname(10): NotoSerifCJKtc-Light.otf
+OTCname(20): NotoSerifCJK-Light.ttc(3)
+
+Name: NotoSerifCJKtc-Regular
+Class: CNS
+OTFname(10): NotoSerifCJKtc-Regular.otf
+OTCname(20): NotoSerifCJK-Regular.ttc(3)
+
+Name: NotoSerifCJKtc-Medium
+Class: CNS
+OTFname(10): NotoSerifCJKtc-Medium.otf
+OTCname(20): NotoSerifCJK-Medium.ttc(3)
+
+Name: NotoSerifCJKtc-SemiBold
+Class: CNS
+OTFname(10): NotoSerifCJKtc-SemiBold.otf
+OTCname(20): NotoSerifCJK-SemiBold.ttc(3)
+
+Name: NotoSerifCJKtc-Bold
+Class: CNS
+OTFname(10): NotoSerifCJKtc-Bold.otf
+OTCname(20): NotoSerifCJK-Bold.ttc(3)
+
+Name: NotoSerifCJKtc-Black
+Class: CNS
+OTFname(10): NotoSerifCJKtc-Black.otf
+OTCname(20): NotoSerifCJK-Black.ttc(3)
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sazanami.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sazanami.dat
new file mode 100644
index 00000000000..a8ee6a481ef
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sazanami.dat
@@ -0,0 +1,12 @@
+# Sazanami (free)
+
+### JAPANESE ###
+
+Name: Sazanami-Mincho-Regular
+Class: Japan
+TTFname: sazanami-mincho.ttf
+
+Name: Sazanami-Gothic-Regular
+Class: Japan
+TTFname: sazanami-gothic.ttf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehansans.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehansans.dat
new file mode 100644
index 00000000000..e480b7dc6ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehansans.dat
@@ -0,0 +1,182 @@
+# SourceHanSans
+
+Name: SourceHanSans-ExtraLight
+Class: Japan
+OTFname(10): SourceHanSans-ExtraLight.otf
+OTCname(20): SourceHanSans-ExtraLight.ttc(0)
+
+Name: SourceHanSans-Light
+Class: Japan
+OTFname(10): SourceHanSans-Light.otf
+OTCname(20): SourceHanSans-Light.ttc(0)
+
+Name: SourceHanSans-Normal
+Class: Japan
+OTFname(10): SourceHanSans-Normal.otf
+OTCname(20): SourceHanSans-Normal.ttc(0)
+
+Name: SourceHanSans-Regular
+Class: Japan
+OTFname(10): SourceHanSans-Regular.otf
+OTCname(20): SourceHanSans-Regular.ttc(0)
+
+Name: SourceHanSans-Medium
+Class: Japan
+OTFname(10): SourceHanSans-Medium.otf
+OTCname(20): SourceHanSans-Medium.ttc(0)
+
+Name: SourceHanSans-Bold
+Class: Japan
+OTFname(10): SourceHanSans-Bold.otf
+OTCname(20): SourceHanSans-Bold.ttc(0)
+
+Name: SourceHanSans-Heavy
+Class: Japan
+OTFname(10): SourceHanSans-Heavy.otf
+OTCname(20): SourceHanSans-Heavy.ttc(0)
+
+Name: SourceHanSansK-ExtraLight
+Class: Korea
+OTFname(10): SourceHanSansK-ExtraLight.otf
+OTCname(20): SourceHanSans-ExtraLight.ttc(1)
+
+Name: SourceHanSansK-Light
+Class: Korea
+OTFname(10): SourceHanSansK-Light.otf
+OTCname(20): SourceHanSans-Light.ttc(1)
+
+Name: SourceHanSansK-Normal
+Class: Korea
+OTFname(10): SourceHanSansK-Normal.otf
+OTCname(20): SourceHanSans-Normal.ttc(1)
+
+Name: SourceHanSansK-Regular
+Class: Korea
+OTFname(10): SourceHanSansK-Regular.otf
+OTCname(20): SourceHanSans-Regular.ttc(1)
+
+Name: SourceHanSansK-Medium
+Class: Korea
+OTFname(10): SourceHanSansK-Medium.otf
+OTCname(20): SourceHanSans-Medium.ttc(1)
+
+Name: SourceHanSansK-Bold
+Class: Korea
+OTFname(10): SourceHanSansK-Bold.otf
+OTCname(20): SourceHanSans-Bold.ttc(1)
+
+Name: SourceHanSansK-Heavy
+Class: Korea
+OTFname(10): SourceHanSansK-Heavy.otf
+OTCname(20): SourceHanSans-Heavy.ttc(1)
+
+Name: SourceHanSansSC-ExtraLight
+Class: GB
+OTFname(10): SourceHanSansSC-ExtraLight.otf
+OTCname(20): SourceHanSans-ExtraLight.ttc(2)
+
+Name: SourceHanSansSC-Light
+Class: GB
+OTFname(10): SourceHanSansSC-Light.otf
+OTCname(20): SourceHanSans-Light.ttc(2)
+
+Name: SourceHanSansSC-Normal
+Class: GB
+OTFname(10): SourceHanSansSC-Normal.otf
+OTCname(20): SourceHanSans-Normal.ttc(2)
+
+Name: SourceHanSansSC-Regular
+Class: GB
+OTFname(10): SourceHanSansSC-Regular.otf
+OTCname(20): SourceHanSans-Regular.ttc(2)
+
+Name: SourceHanSansSC-Medium
+Class: GB
+OTFname(10): SourceHanSansSC-Medium.otf
+OTCname(20): SourceHanSans-Medium.ttc(2)
+
+Name: SourceHanSansSC-Bold
+Class: GB
+OTFname(10): SourceHanSansSC-Bold.otf
+OTCname(20): SourceHanSans-Bold.ttc(2)
+
+Name: SourceHanSansSC-Heavy
+Class: GB
+OTFname(10): SourceHanSansSC-Heavy.otf
+OTCname(20): SourceHanSans-Heavy.ttc(2)
+
+Name: SourceHanSansTC-ExtraLight
+Class: CNS
+OTFname(10): SourceHanSansTC-ExtraLight.otf
+OTCname(20): SourceHanSans-ExtraLight.ttc(3)
+
+Name: SourceHanSansTC-Light
+Class: CNS
+OTFname(10): SourceHanSansTC-Light.otf
+OTCname(20): SourceHanSans-Light.ttc(3)
+
+Name: SourceHanSansTC-Normal
+Class: CNS
+OTFname(10): SourceHanSansTC-Normal.otf
+OTCname(20): SourceHanSans-Normal.ttc(3)
+
+Name: SourceHanSansTC-Regular
+Class: CNS
+OTFname(10): SourceHanSansTC-Regular.otf
+OTCname(20): SourceHanSans-Regular.ttc(3)
+
+Name: SourceHanSansTC-Medium
+Class: CNS
+OTFname(10): SourceHanSansTC-Medium.otf
+OTCname(20): SourceHanSans-Medium.ttc(3)
+
+Name: SourceHanSansTC-Bold
+Class: CNS
+OTFname(10): SourceHanSansTC-Bold.otf
+OTCname(20): SourceHanSans-Bold.ttc(3)
+
+Name: SourceHanSansTC-Heavy
+Class: CNS
+OTFname(10): SourceHanSansTC-Heavy.otf
+OTCname(20): SourceHanSans-Heavy.ttc(3)
+
+Name: SourceHanSansHW-Regular
+Class: Japan
+OTFname(10): SourceHanSansHW-Regular.otf
+OTCname(20): SourceHanSans-Regular.ttc(4)
+
+Name: SourceHanSansHW-Bold
+Class: Japan
+OTFname(10): SourceHanSansHW-Bold.otf
+OTCname(20): SourceHanSans-Bold.ttc(4)
+
+Name: SourceHanSansHWK-Regular
+Class: Korea
+OTFname(10): SourceHanSansHWK-Regular.otf
+OTCname(20): SourceHanSans-Regular.ttc(5)
+
+Name: SourceHanSansHWK-Bold
+Class: Korea
+OTFname(10): SourceHanSansHWK-Bold.otf
+OTCname(20): SourceHanSans-Bold.ttc(5)
+
+Name: SourceHanSansHWSC-Regular
+Class: GB
+OTFname(10): SourceHanSansHWSC-Regular.otf
+OTCname(20): SourceHanSans-Regular.ttc(6)
+
+Name: SourceHanSansHWSC-Bold
+Class: GB
+OTFname(10): SourceHanSansHWSC-Bold.otf
+OTCname(20): SourceHanSans-Bold.ttc(6)
+
+Name: SourceHanSansHWTC-Regular
+Class: CNS
+OTFname(10): SourceHanSansHWTC-Regular.otf
+OTCname(20): SourceHanSans-Regular.ttc(7)
+
+Name: SourceHanSansHWTC-Bold
+Class: CNS
+OTFname(10): SourceHanSansHWTC-Bold.otf
+OTCname(20): SourceHanSans-Bold.ttc(7)
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehanserif.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehanserif.dat
new file mode 100644
index 00000000000..a3c3ec1beea
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehanserif.dat
@@ -0,0 +1,142 @@
+# SourceHanSerif
+
+Name: SourceHanSerif-ExtraLight
+Class: Japan
+OTFname(10): SourceHanSerif-ExtraLight.otf
+OTCname(20): SourceHanSerif-ExtraLight.ttc(0)
+
+Name: SourceHanSerif-Light
+Class: Japan
+OTFname(10): SourceHanSerif-Light.otf
+OTCname(20): SourceHanSerif-Light.ttc(0)
+
+Name: SourceHanSerif-Regular
+Class: Japan
+OTFname(10): SourceHanSerif-Regular.otf
+OTCname(20): SourceHanSerif-Regular.ttc(0)
+
+Name: SourceHanSerif-Medium
+Class: Japan
+OTFname(10): SourceHanSerif-Medium.otf
+OTCname(20): SourceHanSerif-Medium.ttc(0)
+
+Name: SourceHanSerif-SemiBold
+Class: Japan
+OTFname(10): SourceHanSerif-SemiBold.otf
+OTCname(20): SourceHanSerif-SemiBold.ttc(0)
+
+Name: SourceHanSerif-Bold
+Class: Japan
+OTFname(10): SourceHanSerif-Bold.otf
+OTCname(20): SourceHanSerif-Bold.ttc(0)
+
+Name: SourceHanSerif-Heavy
+Class: Japan
+OTFname(10): SourceHanSerif-Heavy.otf
+OTCname(20): SourceHanSerif-Heavy.ttc(0)
+
+Name: SourceHanSerifK-ExtraLight
+Class: Korea
+OTFname(10): SourceHanSerifK-ExtraLight.otf
+OTCname(20): SourceHanSerif-ExtraLight.ttc(1)
+
+Name: SourceHanSerifK-Light
+Class: Korea
+OTFname(10): SourceHanSerifK-Light.otf
+OTCname(20): SourceHanSerif-Light.ttc(1)
+
+Name: SourceHanSerifK-Regular
+Class: Korea
+OTFname(10): SourceHanSerifK-Regular.otf
+OTCname(20): SourceHanSerif-Regular.ttc(1)
+
+Name: SourceHanSerifK-Medium
+Class: Korea
+OTFname(10): SourceHanSerifK-Medium.otf
+OTCname(20): SourceHanSerif-Medium.ttc(1)
+
+Name: SourceHanSerifK-SemiBold
+Class: Korea
+OTFname(10): SourceHanSerifK-SemiBold.otf
+OTCname(20): SourceHanSerif-SemiBold.ttc(1)
+
+Name: SourceHanSerifK-Bold
+Class: Korea
+OTFname(10): SourceHanSerifK-Bold.otf
+OTCname(20): SourceHanSerif-Bold.ttc(1)
+
+Name: SourceHanSerifK-Heavy
+Class: Korea
+OTFname(10): SourceHanSerifK-Heavy.otf
+OTCname(20): SourceHanSerif-Heavy.ttc(1)
+
+Name: SourceHanSerifSC-ExtraLight
+Class: GB
+OTFname(10): SourceHanSerifSC-ExtraLight.otf
+OTCname(20): SourceHanSerif-ExtraLight.ttc(2)
+
+Name: SourceHanSerifSC-Light
+Class: GB
+OTFname(10): SourceHanSerifSC-Light.otf
+OTCname(20): SourceHanSerif-Light.ttc(2)
+
+Name: SourceHanSerifSC-Regular
+Class: GB
+OTFname(10): SourceHanSerifSC-Regular.otf
+OTCname(20): SourceHanSerif-Regular.ttc(2)
+
+Name: SourceHanSerifSC-Medium
+Class: GB
+OTFname(10): SourceHanSerifSC-Medium.otf
+OTCname(20): SourceHanSerif-Medium.ttc(2)
+
+Name: SourceHanSerifSC-SemiBold
+Class: GB
+OTFname(10): SourceHanSerifSC-SemiBold.otf
+OTCname(20): SourceHanSerif-SemiBold.ttc(2)
+
+Name: SourceHanSerifSC-Bold
+Class: GB
+OTFname(10): SourceHanSerifSC-Bold.otf
+OTCname(20): SourceHanSerif-Bold.ttc(2)
+
+Name: SourceHanSerifSC-Heavy
+Class: GB
+OTFname(10): SourceHanSerifSC-Heavy.otf
+OTCname(20): SourceHanSerif-Heavy.ttc(2)
+
+Name: SourceHanSerifTC-ExtraLight
+Class: CNS
+OTFname(10): SourceHanSerifTC-ExtraLight.otf
+OTCname(20): SourceHanSerif-ExtraLight.ttc(3)
+
+Name: SourceHanSerifTC-Light
+Class: CNS
+OTFname(10): SourceHanSerifTC-Light.otf
+OTCname(20): SourceHanSerif-Light.ttc(3)
+
+Name: SourceHanSerifTC-Regular
+Class: CNS
+OTFname(10): SourceHanSerifTC-Regular.otf
+OTCname(20): SourceHanSerif-Regular.ttc(3)
+
+Name: SourceHanSerifTC-Medium
+Class: CNS
+OTFname(10): SourceHanSerifTC-Medium.otf
+OTCname(20): SourceHanSerif-Medium.ttc(3)
+
+Name: SourceHanSerifTC-SemiBold
+Class: CNS
+OTFname(10): SourceHanSerifTC-SemiBold.otf
+OTCname(20): SourceHanSerif-SemiBold.ttc(3)
+
+Name: SourceHanSerifTC-Bold
+Class: CNS
+OTFname(10): SourceHanSerifTC-Bold.otf
+OTCname(20): SourceHanSerif-Bold.ttc(3)
+
+Name: SourceHanSerifTC-Heavy
+Class: CNS
+OTFname(10): SourceHanSerifTC-Heavy.otf
+OTCname(20): SourceHanSerif-Heavy.ttc(3)
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-unfonts.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-unfonts.dat
new file mode 100644
index 00000000000..1b1201b478d
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-unfonts.dat
@@ -0,0 +1,112 @@
+# Unfonts (free)
+
+### KOREAN ###
+
+# Note about TeX Live:
+# Un*.ttf (23 files, excluding UnBom.ttf for license issue)
+# are available as "unfonts-{core,extra}" package for free.
+
+# Unfonts-core (free)
+
+Name: UnBatang
+Class: Korea
+Provides(60): HYSMyeongJo-Medium
+TTFname: UnBatang.ttf
+
+Name: UnBatang-Bold
+Class: Korea
+TTFname: UnBatangBold.ttf
+
+Name: UnDotum
+Class: Korea
+Provides(60): HYGoThic-Medium
+TTFname: UnDotum.ttf
+
+Name: UnDotum-Bold
+Class: Korea
+TTFname: UnDotumBold.ttf
+
+Name: UnDinaru
+Class: Korea
+Provides(60): HYRGoThic-Medium
+TTFname: UnDinaru.ttf
+
+Name: UnDinaru-Bold
+Class: Korea
+TTFname: UnDinaruBold.ttf
+
+Name: UnDinaru-Light
+Class: Korea
+TTFname: UnDinaruLight.ttf
+
+Name: UnGraphic
+Class: Korea
+TTFname: UnGraphic.ttf
+
+Name: UnGraphic-Bold
+Class: Korea
+TTFname: UnGraphicBold.ttf
+
+Name: UnGungseo
+Class: Korea
+TTFname: UnGungseo.ttf
+
+Name: UnPilgi
+Class: Korea
+TTFname: UnPilgi.ttf
+
+Name: UnPilgi-Bold
+Class: Korea
+TTFname: UnPilgiBold.ttf
+
+# Unfonts-extra (free)
+
+#Name: UnBom
+#Class: Korea
+#TTFname: UnBom.ttf
+
+Name: UnPen
+Class: Korea
+TTFname: UnPen.ttf
+
+Name: UnPenheulim
+Class: Korea
+TTFname: UnPenheulim.ttf
+
+Name: UnPilgia
+Class: Korea
+TTFname: UnPilgia.ttf
+
+Name: UnShinmun
+Class: Korea
+TTFname: UnShinmun.ttf
+
+Name: UnVada
+Class: Korea
+TTFname: UnVada.ttf
+
+Name: UnYetgul
+Class: Korea
+TTFname: UnYetgul.ttf
+
+Name: UnTaza
+Class: Korea
+TTFname: UnTaza.ttf
+
+# UnJamo... family has proportional metrics
+Name: UnJamoBatang
+Class: Korea
+TTFname: UnJamoBatang.ttf
+
+Name: UnJamoDotum
+Class: Korea
+TTFname: UnJamoDotum.ttf
+
+Name: UnJamoNovel
+Class: Korea
+TTFname: UnJamoNovel.ttf
+
+Name: UnJamoSora
+Class: Korea
+TTFname: UnJamoSora.ttf
+
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-wenquanyi.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-wenquanyi.dat
new file mode 100644
index 00000000000..8d0f2264a85
--- /dev/null
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-wenquanyi.dat
@@ -0,0 +1,56 @@
+# WenQuanYi (free)
+
+### SIMPLIFIED/TRADITIONAL CHINESE ###
+
+# GB
+Name: WenQuanYiMicroHei
+Class: GB
+TTCname(10): wqy-microhei.ttc(0)
+
+# CNS
+Name: WenQuanYiMicroHei-Adobe-CNS1
+Class: CNS
+TTCname(10): wqy-microhei.ttc(0)
+
+# GB
+Name: WenQuanYiMicroHeiMono
+Class: GB
+TTCname(10): wqy-microhei.ttc(1)
+
+# CNS
+Name: WenQuanYiMicroHeiMono-Adobe-CNS1
+Class: CNS
+TTCname(10): wqy-microhei.ttc(1)
+
+# GB
+Name: WenQuanYiZenHei
+Class: GB
+TTCname(10): wqy-zenhei.ttc(0)
+TTFname(20): wqy-zenhei.ttf
+
+# CNS
+Name: WenQuanYiZenHei-Adobe-CNS1
+Class: CNS
+TTCname(10): wqy-zenhei.ttc(0)
+TTFname(20): wqy-zenhei.ttf
+
+# GB
+Name: WenQuanYiZenHeiMono
+Class: GB
+TTCname(10): wqy-zenhei.ttc(1)
+
+# CNS:
+Name: WenQuanYiZenHeiMono-Adobe-CNS1
+Class: CNS
+TTCname(10): wqy-zenhei.ttc(1)
+
+# GB
+Name: WenQuanYiZenHeiSharp
+Class: GB
+TTCname(10): wqy-zenhei.ttc(2)
+
+# CNS
+Name: WenQuanYiZenHeiSharp-Adobe-CNS1
+Class: CNS
+TTCname(10): wqy-zenhei.ttc(2)
+
diff --git a/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl b/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl
index 892dbb5ffe6..3da4763053e 100755
--- a/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl
+++ b/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl
@@ -2,8 +2,8 @@
#
# cjk-gs-integrate - setup Ghostscript for CID/TTF CJK fonts
#
-# Copyright 2015-2018 by Norbert Preining
-# Copyright 2016-2018 by Japanese TeX Development Community
+# Copyright 2015-2019 by Norbert Preining
+# Copyright 2016-2019 by Japanese TeX Development Community
#
# This work is based on research and work by (in alphabetical order)
# Yusuke Kuroki
@@ -39,7 +39,7 @@ use Cwd 'abs_path';
use strict;
(my $prg = basename($0)) =~ s/\.pl$//;
-my $version = '20180306.0';
+my $version = '20190303.0';
if (win32()) {
# conversion between internal (utf-8) and console (cp932):
@@ -97,6 +97,7 @@ my %encode_list = (
Adobe-Japan1-4
Adobe-Japan1-5
Adobe-Japan1-6
+ Adobe-Japan1-7
EUC-H
EUC-V
Ext-H
@@ -297,6 +298,7 @@ my $opt_listallaliases = 0;
my $opt_listfonts = 0;
my $opt_info = 0;
my $opt_machine = 0;
+my $opt_strictpsname = 0;
my $dry_run = 0;
my $opt_quiet = 0;
my $opt_debug = 0;
@@ -323,6 +325,7 @@ if (! GetOptions(
"list-fonts" => \$opt_listfonts,
"info" => \$opt_info,
"machine-readable" => \$opt_machine,
+ "strict-psname" => \$opt_strictpsname, # hidden option for debugging
"n|dry-run" => \$dry_run,
"q|quiet" => \$opt_quiet,
"d|debug+" => \$opt_debug,
@@ -353,9 +356,17 @@ if ($opt_debug >= 2) {
my $otfinfo_available;
chomp(my $otfinfo_help = `otfinfo --help 2>$nul`);
if ($?) {
- print_warning("The program 'otfinfo' not found in PATH.\n");
- print_warning("Sorry, we can't be safe enough to distinguish\n");
- print_warning("uppercase / lowercase file names.\n");
+ # to tell the truth, we want to show below as a warning
+ # but BasicTeX (scheme-small) does not have 'otfinfo' (lcdf-typetools);
+ # show info only for debugging
+ print_debug("The program 'otfinfo' not found in PATH.\n");
+ print_debug("Sorry, we can't be safe enough to distinguish\n");
+ print_debug("uppercase / lowercase file names.\n");
+ # but the below should be an error!
+ if ($opt_strictpsname) {
+ print_error("'otfinfo' not found, cannot proceed!\n");
+ exit(1);
+ }
$otfinfo_available = 0;
} else {
$otfinfo_available = 1;
@@ -524,7 +535,7 @@ sub main {
}
# do actual setup/removing operations
- if (! $opt_output) {
+ if (!$opt_output) {
print_info("searching for Ghostscript resource\n");
my $gsres = find_gs_resource();
if (!$gsres) {
@@ -555,11 +566,15 @@ sub main {
print_info(($opt_remove ? "removing" : "generating") . " links, snippets and cidfmap.local for non-CID fonts ...\n");
do_nonotf_fonts();
}
- write_winbatch() if ($opt_winbatch);
+ write_winbatch() if $opt_winbatch;
}
print_info(($opt_remove ? "removing" : "generating") . " snippets and cidfmap.aliases for font aliases ...\n");
do_aliases();
- write_akotfps_datafile() if ($opt_akotfps);
+ write_akotfps_datafile() if $opt_akotfps;
+ if ($opt_texmflink && !$dry_run) {
+ print_info("running mktexlsr ...\n");
+ system("mktexlsr");
+ }
print_info("finished\n");
if ($opt_winbatch) {
if (-f $winbatch) {
@@ -783,7 +798,7 @@ sub do_aliases {
update_master_cidfmap('cidfmap.aliases');
# if we are in cleanup mode, also remove cidfmap.aliases itself
if (-f "$opt_output/$cidfmap_aliases_pathpart") {
- unlink "$opt_output/$cidfmap_aliases_pathpart" if ($opt_cleanup);
+ unlink "$opt_output/$cidfmap_aliases_pathpart" if $opt_cleanup;
}
}
@@ -815,16 +830,16 @@ sub update_master_cidfmap {
} elsif (m/^\s*\(cidfmap\.TeXLive\)\s\s*\.runlibfile\s*$/) {
# if found, it has to be disabled in add mode in a way in which it can
# be detected in the (future) remove mode
- next if ($found_tl); # skip it as duplicate (though unlikely to happen)
+ next if $found_tl; # skip it as duplicate (though unlikely to happen)
$found_tl = 1;
$newmaster .= "\%" if (!$opt_remove); # in add mode, disable it
$newmaster .= $_; # pass it as-is
} elsif (m/^\s*\%\%*\s*\(cidfmap\.TeXLive\)\s\s*\.runlibfile\s*$/) {
# if found, it should be the one disabled by myself in the previous run;
# restore it in remove mode
- next if ($found_tl); # skip it as duplicate (though unlikely to happen)
+ next if $found_tl; # skip it as duplicate (though unlikely to happen)
$found_tl = 1;
- $_ =~ s/\%//g if ($opt_remove); # in remove mode, enable it
+ $_ =~ s/\%//g if $opt_remove; # in remove mode, enable it
$newmaster .= $_; # pass it
} else {
$newmaster .= $_;
@@ -929,7 +944,7 @@ pop
sub add_akotfps_data {
my ($fn) = @_;
return if $dry_run;
- if (! $opt_remove) {
+ if (!$opt_remove) {
$akotfps_datacontent .= "$fn\n";
}
}
@@ -1018,7 +1033,7 @@ sub link_font {
# if we are still here and $do_unlink is set, remove it
maybe_unlink($target) if $do_unlink;
# recreate link if we are not in the remove case
- if (! $opt_remove) {
+ if (!$opt_remove) {
maybe_symlink($f, $target) || die("Cannot link font $f to $target: $!");
}
}
@@ -1061,14 +1076,14 @@ sub maybe_symlink {
if ($opt_winbatch) {
# re-encoding of $winbatch_content is done by write_winbatch()
$winbatch_content .= "if not exist \"$targetname\" mklink ";
- $winbatch_content .= "/h " if ($opt_hardlink);
+ $winbatch_content .= "/h " if $opt_hardlink;
$winbatch_content .= "\"$targetname\" \"$realname\"\n";
} else {
# should be encoded in cp932 for win32 console
$realname = encode_utftocp($realname);
$targetname = encode_utftocp($targetname);
my $cmdl = "cmd.exe /c if not exist \"$targetname\" mklink ";
- $cmdl .= "/h " if ($opt_hardlink);
+ $cmdl .= "/h " if $opt_hardlink;
$cmdl .= "\"$targetname\" \"$realname\"";
my @ret = `$cmdl`;
# sometimes hard link creation may fail due to "Access denied"
@@ -1323,8 +1338,8 @@ sub check_for_files {
# comment out -- HY (2016/09/27)
# my $newotf = join($sep, @extradirs) . $sep;
# my $newttf = $newotf;
- # $newotf .= $ENV{'OPENTYPEFONTS'} if ($ENV{'OPENTYPEFONTS'});
- # $newttf .= $ENV{'TTFONTS'} if ($ENV{'TTFONTS'});
+ # $newotf .= $ENV{'OPENTYPEFONTS'} if $ENV{'OPENTYPEFONTS'};
+ # $newttf .= $ENV{'TTFONTS'} if $ENV{'TTFONTS'};
# $ENV{'OPENTYPEFONTS'} = $newotf;
# $ENV{'TTFONTS'} = $newttf;
# new code for uppercase/lowercase workaround -- HY (2016/09/27)
@@ -1354,6 +1369,7 @@ sub check_for_files {
# map basenames to filenames
my %bntofn;
for my $f (@foundfiles) {
+ $f =~ s/[\r\n]+\z//; # perl's chomp() on git-bash cannot strip CR of CRLF ??
my $realf = abs_path($f);
if (!$realf) {
print_warning("dead link or strange file found: $f - ignored!\n");
@@ -1406,7 +1422,8 @@ sub check_for_files {
# both uppercase/lowercase font files are possible and they are different
my $actualpsname;
my $bname;
- for my $b (keys %{$bntofn{$realfile}}) {
+ for my $b (sort keys %{$bntofn{$realfile}}) {
+ $fontdb{$k}{'casefold'} = "debug" if $opt_strictpsname;
if ($fontdb{$k}{'casefold'} && $otfinfo_available &&
($fontdb{$k}{'files'}{$f}{'type'} eq 'OTF' || $fontdb{$k}{'files'}{$f}{'type'} eq 'TTF')) {
print_debug("We need to test whether\n");
@@ -1418,12 +1435,14 @@ sub check_for_files {
# still there is a chance that Ghostscript supports, so don't discard it
print_debug("... command exited with $?!\n");
print_debug("OK, I'll take this, but it may not work properly.\n");
+ print_warning("otfinfo check failed for $b\n") if $opt_strictpsname;
$bname = $b;
last;
}
if ($actualpsname ne $k) {
print_debug("... PSName returned by otfinfo ($actualpsname) is\n");
print_debug("different from our database ($k), discarding!\n");
+ print_warning("otfinfo check failed for $b\n") if $opt_strictpsname;
} else {
print_debug("... test passed.\n");
$bname = $b;
@@ -1585,6 +1604,7 @@ sub read_font_database {
die("Cannot find $opt_fontdef: $!");
@dbl = <FDB>;
close(FDB);
+ print_debug("New database file: $opt_fontdef...\n");
} else {
@dbl = <DATA>;
}
@@ -1598,6 +1618,7 @@ sub read_font_database {
die("Cannot find $_: $!");
@dbl = <FDB>;
close(FDB);
+ print_debug("Additional database file: $_...\n");
read_each_font_database(@dbl);
}
}
@@ -2237,30 +2258,41 @@ __DATA__
# CJK FONT DEFINITIONS
#
+# Noto
+INCLUDE cjkgs-notoserif.dat
+INCLUDE cjkgs-notosans.dat
+
+# SourceHan
+INCLUDE cjkgs-sourcehanserif.dat
+INCLUDE cjkgs-sourcehansans.dat
+
#
# JAPANESE FONTS
#
-# Morisawa -- Provides level 10(Pr6N), 15(Pr6), 18(Pr5), 20(Pro)
+# Morisawa -- Provides J10(Pr6N), J15(Pr6), J18(Pr5), J20(Pro)
INCLUDE cjkgs-morisawa.dat
-INCLUDE cjkgs-morisawa-extra.dat
+#INCLUDE cjkgs-morisawa-extra.dat
-# Hiragino -- Provides level 30(ProN), 40(Pro)
+# Hiragino -- Provides J30(ProN), J40(Pro)
INCLUDE cjkgs-hiragino.dat
-# Kozuka -- Provides level 50(Pr6N), 55(ProVI), 60(Pro), 65(Std)
+# Kozuka -- Provides J50(Pr6N), J55(ProVI), J60(Pro), J65(Std)
INCLUDE cjkgs-kozuka.dat
INCLUDE cjkgs-ryokana.dat
-# Yu-fonts MacOS version -- Provides level 80
+# Yu-fonts MacOS version -- Provides J80
INCLUDE cjkgs-yu-osx.dat
-# Yu-fonts Windows/MSOffice version -- Provides level 90
+# Yu-fonts Windows/MSOffice version -- Provides J90
INCLUDE cjkgs-yu-win.dat
-# MS -- Provides level 95
+# MS -- Provides J95
INCLUDE cjkgs-microsoft.dat
+# BIZ UD
+INCLUDE cjkgs-bizud.dat
+
# TypeBank
INCLUDE cjkgs-typebank.dat
@@ -2270,113 +2302,20 @@ INCLUDE cjkgs-fontworks.dat
# Toppan
INCLUDE cjkgs-toppan.dat
-# Moga-Mobo from Y.Oz Vox (free) -- Provides level 100(Ex), 110(none)
-INCLUDE cjkgs-mogamobo.dat
-
-# Ume-font (free) -- Provides level 140
-INCLUDE cjkgs-ume.dat
-
-# IPA (free) -- Provides level 120(Ex), 130(none)
-
-Name: IPAMincho
-Class: Japan
-Provides(130): Ryumin-Light
-Provides(130): RyuminPro-Light
-Provides(130): HiraMinProN-W3
-Provides(130): HiraMinPro-W3
-Provides(130): FutoMinA101-Bold
-Provides(130): FutoMinA101Pro-Bold
-Provides(130): HiraMinProN-W6
-Provides(130): HiraMinPro-W6
-Provides(130): MidashiMin-MA31
-Provides(130): MidashiMinPro-MA31
-TTFname(20): ipam.ttf
-#TTFname(21): IPAMincho.ttf
-
-Name: IPAGothic
-Class: Japan
-Provides(130): GothicBBB-Medium
-Provides(130): GothicBBBPro-Medium
-Provides(130): HiraKakuProN-W3
-Provides(130): HiraKakuPro-W3
-Provides(130): FutoGoB101-Bold
-Provides(130): FutoGoB101Pro-Bold
-Provides(130): HiraKakuProN-W6
-Provides(130): HiraKakuPro-W6
-Provides(130): MidashiGo-MB31
-Provides(130): MidashiGoPro-MB31
-Provides(130): HiraKakuStdN-W8
-Provides(130): HiraKakuStd-W8
-Provides(130): Jun101-Light
-Provides(130): Jun101Pro-Light
-Provides(130): HiraMaruProN-W4
-Provides(130): HiraMaruPro-W4
-TTFname(20): ipag.ttf
-#TTFname(21): IPAGothic.ttf
-
-Name: IPAexMincho
-Class: Japan
-Provides(120): Ryumin-Light
-Provides(120): RyuminPro-Light
-Provides(120): HiraMinProN-W3
-Provides(120): HiraMinPro-W3
-Provides(120): FutoMinA101-Bold
-Provides(120): FutoMinA101Pro-Bold
-Provides(120): HiraMinProN-W6
-Provides(120): HiraMinPro-W6
-Provides(120): MidashiMin-MA31
-Provides(120): MidashiMinPro-MA31
-TTFname(20): ipaexm.ttf
-#TTFname(21): IPAexMincho.ttf
-
-Name: IPAexGothic
-Class: Japan
-Provides(120): GothicBBB-Medium
-Provides(120): GothicBBBPro-Medium
-Provides(120): HiraKakuProN-W3
-Provides(120): HiraKakuPro-W3
-Provides(120): FutoGoB101-Bold
-Provides(120): FutoGoB101Pro-Bold
-Provides(120): HiraKakuProN-W6
-Provides(120): HiraKakuPro-W6
-Provides(120): MidashiGo-MB31
-Provides(120): MidashiGoPro-MB31
-Provides(120): HiraKakuStdN-W8
-Provides(120): HiraKakuStd-W8
-Provides(120): Jun101-Light
-Provides(120): Jun101Pro-Light
-Provides(120): HiraMaruProN-W4
-Provides(120): HiraMaruPro-W4
-TTFname(20): ipaexg.ttf
-#TTFname(21): IPAexGothic.ttf
-
-# IPA proportional (free)
-
-Name: IPAPMincho
-Class: Japan
-TTFname(20): ipamp.ttf
-#TTFname(21): IPAPMincho.ttf
+# Heisei
+INCLUDE cjkgs-heisei.dat
-Name: IPAPGothic
-Class: Japan
-TTFname(20): ipagp.ttf
-#TTFname(21): IPAPGothic.ttf
+# Moga-Mobo from Y.Oz Vox (free) -- Provides J100(Ex), J110(none)
+INCLUDE cjkgs-mogamobo.dat
-# IPA MJ (free)
+# IPA (free) -- Provides J120(Ex), J130(none)
+INCLUDE cjkgs-ipa.dat
-Name: IPAmjMincho
-Class: Japan
-TTFname: ipamjm.ttf
+# Ume-font (free) -- Provides J140
+INCLUDE cjkgs-ume.dat
# Sazanami (free)
-
-Name: Sazanami-Mincho-Regular
-Class: Japan
-TTFname: sazanami-mincho.ttf
-
-Name: Sazanami-Gothic-Regular
-Class: Japan
-TTFname: sazanami-gothic.ttf
+INCLUDE cjkgs-sazanami.dat
# Osaka (Apple)
@@ -2392,98 +2331,26 @@ TTFname: OsakaMono.ttf
# CHINESE FONTS
#
-# Adobe -- Provides level 30
+# Adobe -- Provides S30, T30
INCLUDE cjkgs-adobe.dat
-# Hiragino -- Provides level 50
+# Hiragino -- Provides S50
# (already included in JAPANESE section)
-# Beijing Founder Electronics -- Provides level 55
+# Beijing Founder Electronics -- Provides S55
INCLUDE cjkgs-founder.dat
-# DynaComware -- Provides level ??
-INCLUDE cjkgs-dynacomware.dat
-
-# Changzhou SinoType -- Provides level ??
+# Changzhou SinoType -- Provides S??
INCLUDE cjkgs-sinotype.dat
-# Arphic Font Design Team (OS X)
-
-Name: WeibeiSC-Bold
-PSName: Weibei-SC-Bold
-Class: GB
-OTFname: WeibeiSC-Bold.otf
-
-Name: WeibeiTC-Bold
-PSName: Weibei-TC-Bold
-Class: CNS
-OTFname: WeibeiTC-Bold.otf
-
-# Monotype Imaging (OS X)
-
-Name: YuppySC-Regular
-Class: GB
-OTFname: YuppySC-Regular.otf
-
-Name: YuppyTC-Regular
-Class: CNS
-OTFname: YuppyTC-Regular.otf
-
-# Monotype Hong Kong (OS X)
-
-Name: LingWaiSC-Medium
-PSName: MLingWaiMedium-SC
-Class: GB
-OTFname: LingWaiSC-Medium.otf
-
-Name: LingWaiTC-Medium
-PSName: MLingWaiMedium-TC
-Class: CNS
-OTFname: LingWaiTC-Medium.otf
-
-# DynaComware Taiwan (OS X)
-
-Name: WawaSC-Regular
-PSName: DFWaWaSC-W5
-Class: GB
-OTFname: WawaSC-Regular.otf
-
-Name: WawaTC-Regular
-PSName: DFWaWaTC-W5
-Class: CNS
-OTFname: WawaTC-Regular.otf
-
-Name: HannotateSC-W5
-Class: GB
-OTCname: Hannotate.ttc(0)
-
-Name: HannotateTC-W5
-Class: CNS
-OTCname: Hannotate.ttc(1)
-
-Name: HannotateSC-W7
-Class: GB
-OTCname: Hannotate.ttc(2)
-
-Name: HannotateTC-W7
-Class: CNS
-OTCname: Hannotate.ttc(3)
-
-Name: HanziPenSC-W3
-Class: GB
-OTCname: Hanzipen.ttc(0)
+# DynaComware -- Provides T??
+INCLUDE cjkgs-dynacomware.dat
-Name: HanziPenTC-W3
-Class: CNS
-OTCname: Hanzipen.ttc(1)
+# Monotype
+INCLUDE cjkgs-monotype.dat
-Name: HanziPenSC-W5
-Class: GB
-OTCname: Hanzipen.ttc(2)
-
-Name: HanziPenTC-W5
-Class: CNS
-OTCname: Hanzipen.ttc(3)
+# Apple
+INCLUDE cjkgs-apple.dat
# Shanghai Ikarus Ltd./URW Software & Type GmbH
@@ -2495,195 +2362,18 @@ Name: SIL-Kai-Reg-Jian
Class: GB
TTFname: Kai.ttf
-# Apple
-
-Name: LiSungLight
-Class: CNS
-TTFname(20): Apple LiSung Light.ttf
-TTFname(10): LiSungLight.ttf
-
-Name: LiGothicMed
-Class: CNS
-TTFname(20): Apple LiGothic Medium.ttf
-TTFname(10): LiGothicMed.ttf
-
-# Fandol (free)
-
-Name: FandolSong-Regular
-Class: GB
-Provides(40): STSong-Light
-OTFname(10): FandolSong-Regular.otf
-
-Name: FandolSong-Bold
-Provides(40): STSong-Regular
-Class: GB
-OTFname(10): FandolSong-Bold.otf
-
-Name: FandolKai-Regular
-Class: GB
-Provides(40): STKaiti-Regular
-OTFname(10): FandolKai-Regular.otf
-
-Name: FandolHei-Regular
-Class: GB
-Provides(40): STHeiti-Regular
-Provides(40): STHeiti-Light
-OTFname(10): FandolHei-Regular.otf
-
-Name: FandolHei-Bold
-Class: GB
-OTFname(10): FandolHei-Bold.otf
-
-Name: FandolFang-Regular
-Class: GB
-Provides(40): STFangsong-Light
-Provides(40): STFangsong-Regular
-OTFname(10): FandolFang-Regular.otf
-
-# Arphic (free)
-
-Name: BousungEG-Light-GB
-Class: GB
-Provides(80): STSong-Light
-Provides(80): STSong-Regular
-Provides(80): STFangsong-Light
-Provides(80): STFangsong-Regular
-TTFname: gbsn00lp.ttf
-
-Name: GBZenKai-Medium
-Class: GB
-Provides(80): STKaiti-Regular
-Provides(80): STHeiti-Regular
-Provides(80): STHeiti-Light
-TTFname: gkai00mp.ttf
-
-Name: ShanHeiSun-Light
-Class: CNS
-Provides(80): MSung-Light
-Provides(80): MSung-Medium
-TTFname: bsmi00lp.ttf
-
-Name: ZenKai-Medium
-Class: CNS
-Provides(80): MKai-Medium
-Provides(80): MHei-Medium
-TTFname: bkai00mp.ttf
-
-# CJK-Unifonts new ttc edition (free)
-
-Name: UMingCN
-Class: GB
-Provides(70): STSong-Light
-Provides(70): STSong-Regular
-Provides(70): STFangsong-Light
-Provides(70): STFangsong-Regular
-TTCname: uming.ttc(0)
+# Fandol (free) -- Provides S40
+INCLUDE cjkgs-fandol.dat
-Name: UMingTW
-Class: CNS
-Provides(70): MSung-Light
-Provides(70): MSung-Medium
-TTCname: uming.ttc(2)
-
-Name: UKaiCN
-Class: GB
-Provides(70): STKaiti-Regular
-Provides(70): STHeiti-Regular
-Provides(70): STHeiti-Light
-TTCname: ukai.ttc(0)
-
-Name: UKaiTW
-Class: CNS
-Provides(70): MKai-Medium
-Provides(70): MHei-Medium
-TTCname: ukai.ttc(2)
-
-# CJK-Unifonts old ttf edition (free)
+# Arphic (free) -- Provides S80, T80
+INCLUDE cjkgs-arphic.dat
-# CNS
-Name: ShanHeiSun-Uni
-Class: CNS
-Provides(90): MSung-Light
-Provides(90): MSung-Medium
-TTFname: uming.ttf
-
-# GB
-Name: ShanHeiSun-Uni-Adobe-GB1
-Class: GB
-Provides(90): STSong-Light
-Provides(90): STSong-Regular
-Provides(90): STFangsong-Light
-Provides(90): STFangsong-Regular
-TTFname: uming.ttf
-
-# CNS
-Name: ZenKai-Uni
-Class: CNS
-Provides(90): MKai-Medium
-Provides(90): MHei-Medium
-TTFname: ukai.ttf
-
-# GB
-Name: ZenKai-Uni-Adobe-GB1
-Class: GB
-Provides(90): STKaiti-Regular
-Provides(90): STHeiti-Regular
-Provides(90): STHeiti-Light
-TTFname: ukai.ttf
+# CJK-Unifonts new ttc edition (free) -- Provides T70, S70
+# CJK-Unifonts old ttf edition (free) -- Provides T90, S90
+INCLUDE cjkgs-cjkuni.dat
# WenQuanYi (free)
-
-# GB
-Name: WenQuanYiMicroHei
-Class: GB
-TTCname(10): wqy-microhei.ttc(0)
-
-# CNS
-Name: WenQuanYiMicroHei-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-microhei.ttc(0)
-
-# GB
-Name: WenQuanYiMicroHeiMono
-Class: GB
-TTCname(10): wqy-microhei.ttc(1)
-
-# CNS
-Name: WenQuanYiMicroHeiMono-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-microhei.ttc(1)
-
-# GB
-Name: WenQuanYiZenHei
-Class: GB
-TTCname(10): wqy-zenhei.ttc(0)
-TTFname(20): wqy-zenhei.ttf
-
-# CNS
-Name: WenQuanYiZenHei-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-zenhei.ttc(0)
-TTFname(20): wqy-zenhei.ttf
-
-# GB
-Name: WenQuanYiZenHeiMono
-Class: GB
-TTCname(10): wqy-zenhei.ttc(1)
-
-# CNS:
-Name: WenQuanYiZenHeiMono-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-zenhei.ttc(1)
-
-# GB
-Name: WenQuanYiZenHeiSharp
-Class: GB
-TTCname(10): wqy-zenhei.ttc(2)
-
-# CNS
-Name: WenQuanYiZenHeiSharp-Adobe-CNS1
-Class: CNS
-TTCname(10): wqy-zenhei.ttc(2)
+INCLUDE cjkgs-wenquanyi.dat
# cwTeX (free)
@@ -2711,10 +2401,10 @@ TTFname: cwfs.ttf
# KOREAN FONTS
#
-# Adobe -- Provides level 30
+# Adobe -- Provides K30/80
# (already included in CHINESE section)
-# Solaris -- Provides level 40
+# Solaris -- Provides K40
INCLUDE cjkgs-solaris.dat
# Baekmuk (free)
@@ -2748,180 +2438,11 @@ Class: Korea
TTFname(20): hline.ttf
TTFname(10): Baekmuk-Headline.ttf
-# Unfonts-core (free)
-
-Name: UnBatang
-Class: Korea
-Provides(60): HYSMyeongJo-Medium
-TTFname: UnBatang.ttf
-
-Name: UnBatang-Bold
-Class: Korea
-TTFname: UnBatangBold.ttf
-
-Name: UnDotum
-Class: Korea
-Provides(60): HYGoThic-Medium
-TTFname: UnDotum.ttf
-
-Name: UnDotum-Bold
-Class: Korea
-TTFname: UnDotumBold.ttf
-
-Name: UnDinaru
-Class: Korea
-Provides(60): HYRGoThic-Medium
-TTFname: UnDinaru.ttf
-
-Name: UnDinaru-Bold
-Class: Korea
-TTFname: UnDinaruBold.ttf
-
-Name: UnDinaru-Light
-Class: Korea
-TTFname: UnDinaruLight.ttf
-
-Name: UnGraphic
-Class: Korea
-TTFname: UnGraphic.ttf
-
-Name: UnGraphic-Bold
-Class: Korea
-TTFname: UnGraphicBold.ttf
-
-Name: UnGungseo
-Class: Korea
-TTFname: UnGungseo.ttf
-
-Name: UnPilgi
-Class: Korea
-TTFname: UnPilgi.ttf
-
-Name: UnPilgi-Bold
-Class: Korea
-TTFname: UnPilgiBold.ttf
-
-# Unfonts-extra (free)
-
-Name: UnBom
-Class: Korea
-TTFname: UnBom.ttf
-
-Name: UnPen
-Class: Korea
-TTFname: UnPen.ttf
-
-Name: UnPenheulim
-Class: Korea
-TTFname: UnPenheulim.ttf
-
-Name: UnPilgia
-Class: Korea
-TTFname: UnPilgia.ttf
-
-Name: UnShinmun
-Class: Korea
-TTFname: UnShinmun.ttf
-
-Name: UnVada
-Class: Korea
-TTFname: UnVada.ttf
-
-Name: UnYetgul
-Class: Korea
-TTFname: UnYetgul.ttf
-
-Name: UnTaza
-Class: Korea
-TTFname: UnTaza.ttf
-
-# UnJamo... family has proportional metrics
-Name: UnJamoBatang
-Class: Korea
-TTFname: UnJamoBatang.ttf
-
-Name: UnJamoDotum
-Class: Korea
-TTFname: UnJamoDotum.ttf
-
-Name: UnJamoNovel
-Class: Korea
-TTFname: UnJamoNovel.ttf
-
-Name: UnJamoSora
-Class: Korea
-TTFname: UnJamoSora.ttf
-
-# Nanum (free - TTF files) and Nanum OS X (free - TTC files)
-# note that all fonts have narrow metrics
-
-Name: NanumMyeongjo
-Class: Korea
-TTFname(10): NanumMyeongjo.ttf
-TTCname(20): NanumMyeongjo.ttc(0)
-
-Name: NanumMyeongjoBold
-Class: Korea
-TTFname(10): NanumMyeongjoBold.ttf
-TTCname(20): NanumMyeongjo.ttc(1)
-
-Name: NanumMyeongjoExtraBold
-Class: Korea
-TTFname(10): NanumMyeongjoExtraBold.ttf
-TTCname(20): NanumMyeongjo.ttc(2)
-
-Name: NanumGothic
-Class: Korea
-TTFname(10): NanumGothic.ttf
-TTCname(20): NanumGothic.ttc(0)
-
-Name: NanumGothicBold
-Class: Korea
-TTFname(10): NanumGothicBold.ttf
-TTCname(20): NanumGothic.ttc(1)
-
-Name: NanumGothicExtraBold
-Class: Korea
-TTFname(10): NanumGothicExtraBold.ttf
-TTCname(20): NanumGothic.ttc(2)
-
-Name: NanumGothicLight
-Class: Korea
-TTFname(10): NanumGothicLight.ttf
-
-Name: NanumBarunGothic
-Class: Korea
-TTFname(10): NanumBarunGothic.ttf
-
-Name: NanumBarunGothicBold
-Class: Korea
-TTFname(10): NanumBarunGothicBold.ttf
-
-Name: NanumBarunGothicLight
-Class: Korea
-TTFname(10): NanumBarunGothicLight.ttf
-
-Name: NanumBarunGothicUltraLight
-Class: Korea
-TTFname(10): NanumBarunGothicUltraLight.ttf
-
-Name: NanumBarunpen
-Class: Korea
-TTFname(10): NanumBarunpenR.ttf
-
-Name: NanumBarunpen-Bold
-Class: Korea
-TTFname(10): NanumBarunpenB.ttf
-
-Name: NanumBrush
-Class: Korea
-TTFname(10): NanumBrush.ttf
-TTCname(20): NanumScript.ttc(0)
+# Unfonts (free) -- Provides K60
+INCLUDE cjkgs-unfonts.dat
-Name: NanumPen
-Class: Korea
-TTFname(10): NanumPen.ttf
-TTCname(20): NanumScript.ttc(1)
+# Nanum (free)
+INCLUDE cjkgs-nanum.dat
# Design font by Ho-Seok Ee, aka. "ALee's font" (free)
@@ -2952,97 +2473,8 @@ Class: Korea
TTFname: BM-HANNA.ttf
# Hancom HCR (free)
-# note that all fonts have narrow metrics
-
-Name: HCRBatang
-Class: Korea
-TTFname: HANBatang.ttf
-
-Name: HCRBatang-Bold
-Class: Korea
-TTFname: HANBatangB.ttf
-
-Name: HCRDotum
-Class: Korea
-TTFname: HANDotum.ttf
-
-Name: HCRDotum-Bold
-Class: Korea
-TTFname: HANDotumB.ttf
-
-# Apple
-
-Name: AppleMyungjo
-Class: Korea
-#Provides(??): HYSMyeongJo-Medium # fails
-TTFname: AppleMyungjo.ttf
-
-Name: AppleGothic
-Class: Korea
-#Provides(??): HYGoThic-Medium # fails
-#Provides(??): HYRGoThic-Medium # fails
-TTFname: AppleGothic.ttf
-
-Name: AppleSDGothicNeo-Regular
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Regular.otf
-OTCname(20): AppleSDGothicNeo.ttc(0)
-
-Name: AppleSDGothicNeo-Medium
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Medium.otf
-OTCname(20): AppleSDGothicNeo.ttc(2)
-
-Name: AppleSDGothicNeo-SemiBold
-Class: Korea
-OTFname(10): AppleSDGothicNeo-SemiBold.otf
-OTCname(20): AppleSDGothicNeo.ttc(4)
-
-Name: AppleSDGothicNeo-Bold
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Bold.otf
-OTCname(20): AppleSDGothicNeo.ttc(6)
-
-Name: AppleSDGothicNeo-Light
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Light.otf
-OTCname(20): AppleSDGothicNeo.ttc(8)
+INCLUDE cjkgs-hancom.dat
-Name: AppleSDGothicNeo-Thin
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Thin.otf
-OTCname(20): AppleSDGothicNeo.ttc(10)
-
-Name: AppleSDGothicNeo-UltraLight
-Class: Korea
-OTFname(10): AppleSDGothicNeo-UltraLight.otf
-OTCname(20): AppleSDGothicNeo.ttc(12)
-
-Name: AppleSDGothicNeo-ExtraBold
-Class: Korea
-OTFname(10): AppleSDGothicNeo-ExtraBold.otf
-OTCname(20): AppleSDGothicNeo.ttc(14)
-
-Name: AppleSDGothicNeo-Heavy
-Class: Korea
-OTFname(10): AppleSDGothicNeo-Heavy.otf
-OTCname(20): AppleSDGothicNeo.ttc(16)
-
-Name: JCsmPC
-Class: Korea
-TTFname: PCmyoungjo.ttf
-
-Name: JCfg
-Class: Korea
-TTFname: Pilgiche.ttf
-
-Name: JCkg
-Class: Korea
-TTFname: Gungseouche.ttf
-
-Name: JCHEadA
-Class: Korea
-TTFname: HeadlineA.ttf
#
# Microsoft Windows, Windows/Mac Office fonts
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/Makefile b/Master/texmf-dist/source/fonts/cjk-gs-integrate/Makefile
index 21f16209ff9..21f16209ff9 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/Makefile
+++ b/Master/texmf-dist/source/fonts/cjk-gs-integrate/Makefile