summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/cjk-gs-integrate/cjk-gs-integrate.pl177
-rw-r--r--Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog28
-rwxr-xr-xMaster/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh4
-rwxr-xr-xMaster/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl177
4 files changed, 337 insertions, 49 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 cbbaa362b07..f95e3757b6d 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
@@ -28,7 +28,7 @@ use Cwd 'abs_path';
use strict;
(my $prg = basename($0)) =~ s/\.pl$//;
-my $version = '20170220.0';
+my $version = '20170309.0';
if (win32()) {
print_error("Sorry, currently not supported on Windows!\n");
@@ -333,7 +333,7 @@ sub main {
my $fn = ($opt_listallaliases ? "-" : $fontdb{$t}{'target'} );
# should always be the same ;-)
$cl = $fontdb{$t}{'class'};
- if (!$opt_listallaliases && ($fontdb{$t}{'type'} eq 'TTC' or $fontdb{$t}{'type'} eq 'OTC')) {
+ if (!$opt_listallaliases && ($fontdb{$t}{'type'} eq 'TTC' || $fontdb{$t}{'type'} eq 'OTC')) {
$fn .= "($fontdb{$t}{'subfont'})";
}
if ($opt_machine) {
@@ -666,6 +666,7 @@ sub do_aliases {
}
}
if (!$class) {
+ print_warning("Alias candidate for $al is empty!\n") if (!%{$aliases{$al}});
# search lowest number
my @ks = keys(%{$aliases{$al}});
my $first = (sort { $a <=> $b} @ks)[0];
@@ -743,7 +744,7 @@ sub info_found_fonts {
print "Type: $fontdb{$k}{'type'}\n";
print "Class: $fontdb{$k}{'class'}\n";
my $fn = $fontdb{$k}{'target'};
- if ($fontdb{$k}{'type'} eq 'TTC' or $fontdb{$k}{'type'} eq 'OTC') {
+ if ($fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC') {
$fn .= "($fontdb{$k}{'subfont'})";
}
print "File: $fn\n";
@@ -908,7 +909,7 @@ sub check_for_files {
if ($mf =~ m/^(.*)\((\d*)\)$/) { $sf = $2; }
$fontdb{$k}{'target'} = $fontdb{$k}{'files'}{$mf}{'target'};
$fontdb{$k}{'type'} = $fontdb{$k}{'files'}{$mf}{'type'};
- $fontdb{$k}{'subfont'} = $sf if ($fontdb{$k}{'type'} eq 'TTF' or $fontdb{$k}{'type'} eq 'TTC' or $fontdb{$k}{'type'} eq 'OTC');
+ $fontdb{$k}{'subfont'} = $sf if ($fontdb{$k}{'type'} eq 'TTF' || $fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC');
}
# not needed anymore
# delete $fontdb{$k}{'files'};
@@ -925,8 +926,10 @@ sub compute_aliases {
for my $k (keys %fontdb) {
if ($fontdb{$k}{'available'}) {
for my $p (keys %{$fontdb{$k}{'provides'}}) {
- # do not check alias if the real font is available
- next if $fontdb{$p}{'available'};
+ # do not check alias if the real font is available in OTF/TTF/TTC format
+ if ($fontdb{$p}{'available'}) {
+ next if ($fontdb{$p}{'type'} ne 'OTC');
+ }
# use the priority as key
# if priorities are double, this will pick one at chance
if ($aliases{$p}{$fontdb{$k}{'provides'}{$p}}) {
@@ -1451,12 +1454,15 @@ PSName: RyuminPr6N-Light
Class: Japan
Provides(10): Ryumin-Light
Provides(10): RyuminPro-Light
+Provides(10): HiraMinProN-W3
+Provides(10): HiraMinPro-W3
OTFname: A-OTF-RyuminPr6N-Light.otf
Name: A-OTF-RyuminPro-Light
PSName: RyuminPro-Light
Class: Japan
Provides(20): Ryumin-Light
+Provides(20): HiraMinPro-W3
OTFname: A-OTF-RyuminPro-Light.otf
Name: A-OTF-FutoMinA101Pr6N-Bold
@@ -1464,12 +1470,15 @@ PSName: FutoMinA101Pr6N-Bold
Class: Japan
Provides(10): FutoMinA101-Bold
Provides(10): FutoMinA101Pro-Bold
+Provides(10): HiraMinProN-W6
+Provides(10): HiraMinPro-W6
OTFname: A-OTF-FutoMinA101Pr6N-Bold.otf
Name: A-OTF-FutoMinA101Pro-Bold
PSName: FutoMinA101Pro-Bold
Class: Japan
Provides(20): FutoMinA101-Bold
+Provides(20): HiraMinPro-W6
OTFname: A-OTF-FutoMinA101Pro-Bold.otf
Name: A-OTF-GothicBBBPr6N-Medium
@@ -1477,12 +1486,15 @@ PSName: GothicBBBPr6N-Medium
Class: Japan
Provides(10): GothicBBB-Medium
Provides(10): GothicBBBPro-Medium
+Provides(10): HiraKakuProN-W3
+Provides(10): HiraKakuPro-W3
OTFname: A-OTF-GothicBBBPr6N-Medium.otf
Name: A-OTF-GothicBBBPro-Medium
PSName: GothicBBBPro-Medium
Class: Japan
Provides(20): GothicBBB-Medium
+Provides(20): HiraKakuPro-W3
OTFname: A-OTF-GothicBBBPro-Medium.otf
Name: A-OTF-FutoGoB101Pr6N-Bold
@@ -1490,12 +1502,15 @@ PSName: FutoGoB101Pr6N-Bold
Class: Japan
Provides(10): FutoGoB101-Bold
Provides(10): FutoGoB101Pro-Bold
+Provides(10): HiraKakuProN-W6
+Provides(10): HiraKakuPro-W6
OTFname: A-OTF-FutoGoB101Pr6N-Bold.otf
Name: A-OTF-FutoGoB101Pro-Bold
PSName: FutoGoB101Pro-Bold
Class: Japan
Provides(20): FutoGoB101-Bold
+Provides(20): HiraKakuPro-W6
OTFname: A-OTF-FutoGoB101Pro-Bold.otf
Name: A-OTF-MidashiGoPr6N-MB31
@@ -1503,12 +1518,15 @@ PSName: MidashiGoPr6N-MB31
Class: Japan
Provides(10): MidashiGo-MB31
Provides(10): MidashiGoPro-MB31
+Provides(10): HiraKakuStdN-W8
+Provides(10): HiraKakuStd-W8
OTFname: A-OTF-MidashiGoPr6N-MB31.otf
Name: A-OTF-MidashiGoPro-MB31
PSName: MidashiGoPro-MB31
Class: Japan
Provides(20): MidashiGo-MB31
+Provides(20): HiraKakuStd-W8
OTFname: A-OTF-MidashiGoPro-MB31.otf
# A-OTF-Jun101Pr6N-Light has been replaced by A-OTF-ShinMGoPr6N-Light
@@ -1519,12 +1537,15 @@ PSName: Jun101Pr6N-Light
Class: Japan
Provides(11): Jun101-Light
Provides(11): Jun101Pro-Light
+Provides(11): HiraMaruProN-W4
+Provides(11): HiraMaruPro-W4
OTFname: A-OTF-Jun101Pr6N-Light.otf
Name: A-OTF-Jun101Pro-Light
PSName: Jun101Pro-Light
Class: Japan
Provides(20): Jun101-Light
+Provides(20): HiraMaruPro-W4
OTFname: A-OTF-Jun101Pro-Light.otf
Name: A-OTF-ShinMGoPr6N-Light
@@ -1532,6 +1553,8 @@ PSName: ShinMGoPr6N-Light
Class: Japan
Provides(10): Jun101-Light
Provides(10): Jun101Pro-Light
+Provides(10): HiraMaruProN-W4
+Provides(10): HiraMaruPro-W4
OTFname: A-OTF-ShinMGoPr6N-Light.otf
# Morisawa others (for moriprop);
@@ -1540,19 +1563,19 @@ OTFname: A-OTF-ShinMGoPr6N-Light.otf
Name: A-OTF-Jun201Pro-Regular
PSName: Jun201Pro-Regular
Class: Japan
-Provides(20): Jun201Pro-Regular
+Provides(20): Jun201-Regular
OTFname: A-OTF-Jun201Pro-Regular.otf
Name: A-OTF-Jun34Pro-Medium
PSName: Jun34Pro-Medium
Class: Japan
-Provides(20): Jun34Pro-Medium
+Provides(20): Jun34-Medium
OTFname: A-OTF-Jun34Pro-Medium.otf
Name: A-OTF-Jun501Pro-Bold
PSName: Jun501Pro-Bold
Class: Japan
-Provides(20): Jun501Pro-Bold
+Provides(20): Jun501-Bold
OTFname: A-OTF-Jun501Pro-Bold.otf
Name: A-OTF-RyuminPro-Regular
@@ -1570,7 +1593,7 @@ OTFname: A-OTF-RyuminPro-Medium.otf
Name: A-OTF-RyuminPro-Bold
PSName: RyuminPro-Bold
Class: Japan
-Provides(20): RyuminPro-Bold
+Provides(20): Ryumin-Bold
OTFname: A-OTF-RyuminPro-Bold.otf
Name: A-OTF-RyuminPro-Heavy
@@ -1606,7 +1629,7 @@ OTFname: A-OTF-ShinGoPro-Medium.otf
Name: A-OTF-ShinGoPro-Bold
PSName: ShinGoPro-Bold
Class: Japan
-Provides(20): ShinGoPro-Bold
+Provides(20): ShinGo-Bold
OTFname: A-OTF-ShinGoPro-Bold.otf
Name: A-OTF-ShinGoPro-Heavy
@@ -1704,70 +1727,60 @@ OTCname(28): HiraginoSans-W8.ttc(3)
Name: HiraginoSans-W0
Class: Japan
-Provides(30): HiraginoSans-W0
OTCname(30): ヒラギノ角ゴシック W0.ttc(0)
OTCname(29): ヒラギノ角ゴシック W0.ttc(0)
OTCname(28): HiraginoSans-W0.ttc(0)
Name: HiraginoSans-W1
Class: Japan
-Provides(30): HiraginoSans-W1
OTCname(30): ヒラギノ角ゴシック W1.ttc(0)
OTCname(29): ヒラギノ角ゴシック W1.ttc(0)
OTCname(28): HiraginoSans-W1.ttc(0)
Name: HiraginoSans-W2
Class: Japan
-Provides(30): HiraginoSans-W2
OTCname(30): ヒラギノ角ゴシック W2.ttc(0)
OTCname(29): ヒラギノ角ゴシック W2.ttc(0)
OTCname(28): HiraginoSans-W2.ttc(0)
Name: HiraginoSans-W3
Class: Japan
-Provides(30): HiraginoSans-W3
OTCname(30): ヒラギノ角ゴシック W3.ttc(0)
OTCname(29): ヒラギノ角ゴシック W3.ttc(0)
OTCname(28): HiraginoSans-W3.ttc(0)
Name: HiraginoSans-W4
Class: Japan
-Provides(30): HiraginoSans-W4
OTCname(30): ヒラギノ角ゴシック W4.ttc(0)
OTCname(29): ヒラギノ角ゴシック W4.ttc(0)
OTCname(28): HiraginoSans-W4.ttc(0)
Name: HiraginoSans-W5
Class: Japan
-Provides(30): HiraginoSans-W5
OTCname(30): ヒラギノ角ゴシック W5.ttc(0)
OTCname(29): ヒラギノ角ゴシック W5.ttc(0)
OTCname(28): HiraginoSans-W5.ttc(0)
Name: HiraginoSans-W6
Class: Japan
-Provides(30): HiraginoSans-W6
OTCname(30): ヒラギノ角ゴシック W6.ttc(0)
OTCname(29): ヒラギノ角ゴシック W6.ttc(0)
OTCname(28): HiraginoSans-W6.ttc(0)
Name: HiraginoSans-W7
Class: Japan
-Provides(30): HiraginoSans-W7
OTCname(30): ヒラギノ角ゴシック W7.ttc(0)
OTCname(29): ヒラギノ角ゴシック W7.ttc(0)
OTCname(28): HiraginoSans-W7.ttc(0)
Name: HiraginoSans-W8
Class: Japan
-Provides(30): HiraginoSans-W8
OTCname(30): ヒラギノ角ゴシック W8.ttc(0)
OTCname(29): ヒラギノ角ゴシック W8.ttc(0)
OTCname(28): HiraginoSans-W8.ttc(0)
Name: HiraginoSans-W9
Class: Japan
-Provides(30): HiraginoSans-W9
OTCname(30): ヒラギノ角ゴシック W9.ttc(0)
OTCname(29): ヒラギノ角ゴシック W9.ttc(0)
OTCname(28): HiraginoSans-W9.ttc(0)
@@ -1936,6 +1949,8 @@ Name: YuMincho-Regular
Class: Japan
Provides(90): Ryumin-Light
Provides(90): RyuminPro-Light
+Provides(90): HiraMinProN-W3
+Provides(90): HiraMinPro-W3
TTFname(20): yumin.ttf
#TTFname(21): YuMincho-Regular.ttf
@@ -1948,6 +1963,8 @@ Name: YuMincho-DemiBold
Class: Japan
Provides(90): FutoMinA101-Bold
Provides(90): FutoMinA101Pro-Bold
+Provides(90): HiraMinProN-W6
+Provides(90): HiraMinPro-W6
TTFname(20): yumindb.ttf
#TTFname(21): YuMincho-DemiBold.ttf
@@ -1955,6 +1972,8 @@ Name: YuGothic-Regular
Class: Japan
Provides(90): GothicBBB-Medium
Provides(90): GothicBBBPro-Medium
+Provides(90): HiraKakuProN-W3
+Provides(90): HiraKakuPro-W3
TTFname(20): yugothic.ttf
#TTFname(21): YuGothic-Regular.ttf
TTCname(30): YuGothR.ttc(0)
@@ -1973,10 +1992,16 @@ Name: YuGothic-Bold
Class: Japan
Provides(90): FutoGoB101-Bold
Provides(90): FutoGoB101Pro-Bold
+Provides(90): HiraKakuProN-W6
+Provides(90): HiraKakuPro-W6
Provides(90): Jun101-Light
Provides(90): Jun101Pro-Light
+Provides(90): HiraMaruProN-W4
+Provides(90): HiraMaruPro-W4
Provides(90): MidashiGo-MB31
Provides(90): MidashiGoPro-MB31
+Provides(90): HiraKakuStdN-W8
+Provides(90): HiraKakuStd-W8
TTFname(20): yugothib.ttf
TTFname(21): YuGothic-Bold.ttf
TTCname(30): YuGothB.ttc(0)
@@ -1987,8 +2012,12 @@ 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
TTFname(20): ipam.ttf
#TTFname(21): IPAMincho.ttf
@@ -1996,12 +2025,20 @@ 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): Jun101-Light
Provides(130): Jun101Pro-Light
+Provides(130): HiraMaruProN-W4
+Provides(130): HiraMaruPro-W4
Provides(130): MidashiGo-MB31
Provides(130): MidashiGoPro-MB31
+Provides(130): HiraKakuStdN-W8
+Provides(130): HiraKakuStd-W8
TTFname(20): ipag.ttf
#TTFname(21): IPAGothic.ttf
@@ -2009,8 +2046,12 @@ 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
TTFname(20): ipaexm.ttf
#TTFname(21): IPAexMincho.ttf
@@ -2018,12 +2059,20 @@ 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): Jun101-Light
Provides(120): Jun101Pro-Light
+Provides(120): HiraMaruProN-W4
+Provides(120): HiraMaruPro-W4
Provides(120): MidashiGo-MB31
Provides(120): MidashiGoPro-MB31
+Provides(120): HiraKakuStdN-W8
+Provides(120): HiraKakuStd-W8
TTFname(20): ipaexg.ttf
#TTFname(21): IPAexGothic.ttf
@@ -2045,12 +2094,16 @@ Name: MogaMincho-Regular
Class: Japan
Provides(110): Ryumin-Light
Provides(110): RyuminPro-Light
+Provides(110): HiraMinProN-W3
+Provides(110): HiraMinPro-W3
TTCname: mogam.ttc(0)
Name: MogaExMincho-Regular
Class: Japan
Provides(100): Ryumin-Light
Provides(100): RyuminPro-Light
+Provides(100): HiraMinProN-W3
+Provides(100): HiraMinPro-W3
TTCname: mogam.ttc(1)
Name: MogaExMincho-Italic
@@ -2073,12 +2126,16 @@ Name: MogaMincho-Bold
Class: Japan
Provides(110): FutoMinA101-Bold
Provides(110): FutoMinA101Pro-Bold
+Provides(110): HiraMinProN-W6
+Provides(110): HiraMinPro-W6
TTCname: mogamb.ttc(0)
Name: MogaExMincho-Bold
Class: Japan
Provides(100): FutoMinA101-Bold
Provides(100): FutoMinA101Pro-Bold
+Provides(100): HiraMinProN-W6
+Provides(100): HiraMinPro-W6
TTCname: mogamb.ttc(1)
Name: Moga90Mincho-Bold
@@ -2133,12 +2190,16 @@ Name: MogaGothic-Regular
Class: Japan
Provides(110): GothicBBB-Medium
Provides(110): GothicBBBPro-Medium
+Provides(110): HiraKakuProN-W3
+Provides(110): HiraKakuPro-W3
TTCname: mogag.ttc(0)
Name: MogaExGothic-Regular
Class: Japan
Provides(100): GothicBBB-Medium
Provides(100): GothicBBBPro-Medium
+Provides(100): HiraKakuProN-W3
+Provides(100): HiraKakuPro-W3
TTCname: mogag.ttc(1)
Name: Moga90Gothic-Regular
@@ -2153,16 +2214,24 @@ Name: MogaGothic-Bold
Class: Japan
Provides(110): FutoGoB101-Bold
Provides(110): FutoGoB101Pro-Bold
+Provides(110): HiraKakuProN-W6
+Provides(110): HiraKakuPro-W6
Provides(110): MidashiGo-MB31
Provides(110): MidashiGoPro-MB31
+Provides(110): HiraKakuStdN-W8
+Provides(110): HiraKakuStd-W8
TTCname: mogagb.ttc(0)
Name: MogaExGothic-Bold
Class: Japan
Provides(100): FutoGoB101-Bold
Provides(100): FutoGoB101Pro-Bold
+Provides(100): HiraKakuProN-W6
+Provides(100): HiraKakuPro-W6
Provides(100): MidashiGo-MB31
Provides(100): MidashiGoPro-MB31
+Provides(100): HiraKakuStdN-W8
+Provides(100): HiraKakuStd-W8
TTCname: mogagb.ttc(1)
Name: Moga90Gothic-Bold
@@ -2177,12 +2246,16 @@ Name: MoboGothic-Regular
Class: Japan
Provides(110): Jun101-Light
Provides(110): Jun101Pro-Light
+Provides(110): HiraMaruProN-W4
+Provides(110): HiraMaruPro-W4
TTCname: mobog.ttc(0)
Name: MoboExGothic-Regular
Class: Japan
Provides(100): Jun101-Light
Provides(100): Jun101Pro-Light
+Provides(100): HiraMaruProN-W4
+Provides(100): HiraMaruPro-W4
TTCname: mobog.ttc(1)
Name: Mobo90Gothic-Regular
@@ -2219,8 +2292,12 @@ Name: Ume-Mincho
Class: Japan
Provides(140): Ryumin-Light
Provides(140): RyuminPro-Light
+Provides(140): HiraMinProN-W3
+Provides(140): HiraMinPro-W3
Provides(140): FutoMinA101-Bold
Provides(140): FutoMinA101Pro-Bold
+Provides(140): HiraMinProN-W6
+Provides(140): HiraMinPro-W6
TTFname(10): ume-tmo3.ttf
#TTFname(11): ume-tms3.ttf
@@ -2228,12 +2305,20 @@ Name: Ume-Gothic
Class: Japan
Provides(140): GothicBBB-Medium
Provides(140): GothicBBBPro-Medium
+Provides(140): HiraKakuProN-W3
+Provides(140): HiraKakuPro-W3
Provides(140): FutoGoB101-Bold
Provides(140): FutoGoB101Pro-Bold
+Provides(140): HiraKakuProN-W6
+Provides(140): HiraKakuPro-W6
Provides(140): Jun101-Light
Provides(140): Jun101Pro-Light
+Provides(140): HiraMaruProN-W4
+Provides(140): HiraMaruPro-W4
Provides(140): MidashiGo-MB31
Provides(140): MidashiGoPro-MB31
+Provides(140): HiraKakuStdN-W8
+Provides(140): HiraKakuStd-W8
TTFname(10): ume-tgo4.ttf
Name: Ume-Gothic-O5
@@ -2313,20 +2398,28 @@ Name: KozGoPr6N-Bold
Class: Japan
Provides(50): FutoGoB101-Bold
Provides(50): FutoGoB101Pro-Bold
+Provides(50): HiraKakuProN-W6
+Provides(50): HiraKakuPro-W6
OTFname: KozGoPr6N-Bold.otf
Name: KozGoPr6N-Heavy
Class: Japan
Provides(50): Jun101-Light
Provides(50): Jun101Pro-Light
+Provides(50): HiraMaruProN-W4
+Provides(50): HiraMaruPro-W4
Provides(50): MidashiGo-MB31
Provides(50): MidashiGoPro-MB31
+Provides(50): HiraKakuStdN-W8
+Provides(50): HiraKakuStd-W8
OTFname: KozGoPr6N-Heavy.otf
Name: KozGoPr6N-Medium
Class: Japan
Provides(50): GothicBBB-Medium
Provides(50): GothicBBBPro-Medium
+Provides(50): HiraKakuProN-W3
+Provides(50): HiraKakuPro-W3
OTFname: KozGoPr6N-Medium.otf
Name: KozGoPr6N-Regular
@@ -2345,20 +2438,28 @@ Name: KozGoPro-Bold
Class: Japan
Provides(70): FutoGoB101-Bold
Provides(70): FutoGoB101Pro-Bold
+Provides(70): HiraKakuProN-W6
+Provides(70): HiraKakuPro-W6
OTFname: KozGoPro-Bold.otf
Name: KozGoPro-Heavy
Class: Japan
Provides(70): Jun101-Light
Provides(70): Jun101Pro-Light
+Provides(70): HiraMaruProN-W4
+Provides(70): HiraMaruPro-W4
Provides(70): MidashiGo-MB31
Provides(70): MidashiGoPro-MB31
+Provides(70): HiraKakuStdN-W8
+Provides(70): HiraKakuStd-W8
OTFname: KozGoPro-Heavy.otf
Name: KozGoPro-Medium
Class: Japan
Provides(70): GothicBBB-Medium
Provides(70): GothicBBBPro-Medium
+Provides(70): HiraKakuProN-W3
+Provides(70): HiraKakuPro-W3
OTFname: KozGoPro-Medium.otf
Name: KozGoPro-Regular
@@ -2377,20 +2478,28 @@ Name: KozGoProVI-Bold
Class: Japan
Provides(60): FutoGoB101-Bold
Provides(60): FutoGoB101Pro-Bold
+Provides(60): HiraKakuProN-W6
+Provides(60): HiraKakuPro-W6
OTFname: KozGoProVI-Bold.otf
Name: KozGoProVI-Heavy
Class: Japan
Provides(60): Jun101-Light
Provides(60): Jun101Pro-Light
+Provides(60): HiraMaruProN-W4
+Provides(60): HiraMaruPro-W4
Provides(60): MidashiGo-MB31
Provides(60): MidashiGoPro-MB31
+Provides(60): HiraKakuStdN-W8
+Provides(60): HiraKakuStd-W8
OTFname: KozGoProVI-Heavy.otf
Name: KozGoProVI-Medium
Class: Japan
Provides(60): GothicBBB-Medium
Provides(60): GothicBBBPro-Medium
+Provides(60): HiraKakuProN-W3
+Provides(60): HiraKakuPro-W3
OTFname: KozGoProVI-Medium.otf
Name: KozGoProVI-Regular
@@ -2401,6 +2510,8 @@ Name: KozMinPr6N-Bold
Class: Japan
Provides(50): FutoMinA101-Bold
Provides(50): FutoMinA101Pro-Bold
+Provides(50): HiraMinProN-W6
+Provides(50): HiraMinPro-W6
OTFname: KozMinPr6N-Bold.otf
Name: KozMinPr6N-Heavy
@@ -2415,6 +2526,8 @@ Name: KozMinPr6N-Regular
Class: Japan
Provides(50): Ryumin-Light
Provides(50): RyuminPro-Light
+Provides(50): HiraMinProN-W3
+Provides(50): HiraMinPro-W3
OTFname: KozMinPr6N-Regular.otf
Name: KozMinPr6N-ExtraLight
@@ -2429,6 +2542,8 @@ Name: KozMinPro-Bold
Class: Japan
Provides(70): FutoMinA101-Bold
Provides(70): FutoMinA101Pro-Bold
+Provides(70): HiraMinProN-W6
+Provides(70): HiraMinPro-W6
OTFname: KozMinPro-Bold.otf
Name: KozMinPro-Heavy
@@ -2443,6 +2558,8 @@ Name: KozMinPro-Regular
Class: Japan
Provides(70): Ryumin-Light
Provides(70): RyuminPro-Light
+Provides(70): HiraMinProN-W3
+Provides(70): HiraMinPro-W3
OTFname: KozMinPro-Regular.otf
Name: KozMinPro-ExtraLight
@@ -2457,12 +2574,16 @@ Name: KozMinProVI-Bold
Class: Japan
Provides(60): FutoMinA101-Bold
Provides(60): FutoMinA101Pro-Bold
+Provides(60): HiraMinProN-W6
+Provides(60): HiraMinPro-W6
OTFname: KozMinProVI-Bold.otf
Name: KozMinProVI-Regular
Class: Japan
Provides(60): Ryumin-Light
Provides(60): RyuminPro-Light
+Provides(60): HiraMinProN-W3
+Provides(60): HiraMinPro-W3
OTFname: KozMinProVI-Regular.otf
Name: KozMinProVI-Light
@@ -3486,14 +3607,20 @@ Name: MS-Gothic
Class: Japan
Provides(95): GothicBBB-Medium
Provides(95): GothicBBBPro-Medium
-Provides(95): MidashiGo-MB31
-Provides(95): MidashiGoPro-MB31
+Provides(95): HiraKakuProN-W3
+Provides(95): HiraKakuPro-W3
Provides(95): FutoGoB101-Bold
Provides(95): FutoGoB101Pro-Bold
+Provides(95): HiraKakuProN-W6
+Provides(95): HiraKakuPro-W6
Provides(95): MidashiGo-MB31
Provides(95): MidashiGoPro-MB31
+Provides(95): HiraKakuStdN-W8
+Provides(95): HiraKakuStd-W8
Provides(95): Jun101-Light
Provides(95): Jun101Pro-Light
+Provides(95): HiraMaruProN-W4
+Provides(95): HiraMaruPro-W4
TTFname(50): MS Gothic.ttf
TTFname(30): MS-Gothic.ttf
@@ -3501,8 +3628,12 @@ Name: MS-Mincho
Class: Japan
Provides(95): Ryumin-Light
Provides(95): RyuminPro-Light
+Provides(95): HiraMinProN-W3
+Provides(95): HiraMinPro-W3
Provides(95): FutoMinA101-Bold
Provides(95): FutoMinA101Pro-Bold
+Provides(95): HiraMinProN-W6
+Provides(95): HiraMinPro-W6
TTFname(50): MS Mincho.ttf
TTFname(30): MS-Mincho.ttf
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
index 6ee02f44107..631870c138f 100644
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
@@ -1,6 +1,30 @@
+2017-03-09 Norbert Preining <norbert@preining.info>
+
+ * Release 20170309.0 (HEAD -> master) [8ce526f]
+
+2017-03-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * comment (origin/master, origin/hira-aliases) [efcd6ec]
+
+2017-03-07 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * Fix for Hiragino aliases (#23) [b1fb331]
+
+2017-03-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * Hiragino aliases (gs9.20 without OTC support) [1c494b6]
+
+2017-03-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * bug fix for morisawa aliases [bcbce0c]
+
+2017-02-24 Norbert Preining <norbert@preining.info>
+
+ * update release script for CTAN location [f2ae343]
+
2017-02-20 Norbert Preining <norbert@preining.info>
- * Release 20170220.0 (HEAD -> master) [4997503]
+ * Release 20170220.0 (tag: 20170220.0) [4997503]
2017-02-20 Norbert Preining <norbert@preining.info>
@@ -12,7 +36,7 @@
2017-02-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
- * alias priority: New priority for Simplified/Traditional Chinese (origin/master) [4f02658]
+ * alias priority: New priority for Simplified/Traditional Chinese [4f02658]
2017-02-08 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh
index 7871fba69de..1b37c1a0603 100755
--- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh
+++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/tools/release.sh
@@ -49,8 +49,10 @@ echo " git push && git tag $VER && git push origin $VER"
echo
echo Informations for submitting CTAN:
echo " CONTRIBUTION: $PROJECT"
+echo " VERSION: $VER"
+echo " AUTHOR: Japanese TeX Development Community"
echo " SUMMARY: Tools to integrate CJK fonts into Ghostscript"
-echo " DIRECTORY: fonts/$PROJECT"
+echo " DIRECTORY: fonts/utilities/$PROJECT"
echo " LICENSE: free/GPLv3"
echo " FILE: $DIR/$PROJECT-$VER.tar.gz"
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 cbbaa362b07..f95e3757b6d 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
@@ -28,7 +28,7 @@ use Cwd 'abs_path';
use strict;
(my $prg = basename($0)) =~ s/\.pl$//;
-my $version = '20170220.0';
+my $version = '20170309.0';
if (win32()) {
print_error("Sorry, currently not supported on Windows!\n");
@@ -333,7 +333,7 @@ sub main {
my $fn = ($opt_listallaliases ? "-" : $fontdb{$t}{'target'} );
# should always be the same ;-)
$cl = $fontdb{$t}{'class'};
- if (!$opt_listallaliases && ($fontdb{$t}{'type'} eq 'TTC' or $fontdb{$t}{'type'} eq 'OTC')) {
+ if (!$opt_listallaliases && ($fontdb{$t}{'type'} eq 'TTC' || $fontdb{$t}{'type'} eq 'OTC')) {
$fn .= "($fontdb{$t}{'subfont'})";
}
if ($opt_machine) {
@@ -666,6 +666,7 @@ sub do_aliases {
}
}
if (!$class) {
+ print_warning("Alias candidate for $al is empty!\n") if (!%{$aliases{$al}});
# search lowest number
my @ks = keys(%{$aliases{$al}});
my $first = (sort { $a <=> $b} @ks)[0];
@@ -743,7 +744,7 @@ sub info_found_fonts {
print "Type: $fontdb{$k}{'type'}\n";
print "Class: $fontdb{$k}{'class'}\n";
my $fn = $fontdb{$k}{'target'};
- if ($fontdb{$k}{'type'} eq 'TTC' or $fontdb{$k}{'type'} eq 'OTC') {
+ if ($fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC') {
$fn .= "($fontdb{$k}{'subfont'})";
}
print "File: $fn\n";
@@ -908,7 +909,7 @@ sub check_for_files {
if ($mf =~ m/^(.*)\((\d*)\)$/) { $sf = $2; }
$fontdb{$k}{'target'} = $fontdb{$k}{'files'}{$mf}{'target'};
$fontdb{$k}{'type'} = $fontdb{$k}{'files'}{$mf}{'type'};
- $fontdb{$k}{'subfont'} = $sf if ($fontdb{$k}{'type'} eq 'TTF' or $fontdb{$k}{'type'} eq 'TTC' or $fontdb{$k}{'type'} eq 'OTC');
+ $fontdb{$k}{'subfont'} = $sf if ($fontdb{$k}{'type'} eq 'TTF' || $fontdb{$k}{'type'} eq 'TTC' || $fontdb{$k}{'type'} eq 'OTC');
}
# not needed anymore
# delete $fontdb{$k}{'files'};
@@ -925,8 +926,10 @@ sub compute_aliases {
for my $k (keys %fontdb) {
if ($fontdb{$k}{'available'}) {
for my $p (keys %{$fontdb{$k}{'provides'}}) {
- # do not check alias if the real font is available
- next if $fontdb{$p}{'available'};
+ # do not check alias if the real font is available in OTF/TTF/TTC format
+ if ($fontdb{$p}{'available'}) {
+ next if ($fontdb{$p}{'type'} ne 'OTC');
+ }
# use the priority as key
# if priorities are double, this will pick one at chance
if ($aliases{$p}{$fontdb{$k}{'provides'}{$p}}) {
@@ -1451,12 +1454,15 @@ PSName: RyuminPr6N-Light
Class: Japan
Provides(10): Ryumin-Light
Provides(10): RyuminPro-Light
+Provides(10): HiraMinProN-W3
+Provides(10): HiraMinPro-W3
OTFname: A-OTF-RyuminPr6N-Light.otf
Name: A-OTF-RyuminPro-Light
PSName: RyuminPro-Light
Class: Japan
Provides(20): Ryumin-Light
+Provides(20): HiraMinPro-W3
OTFname: A-OTF-RyuminPro-Light.otf
Name: A-OTF-FutoMinA101Pr6N-Bold
@@ -1464,12 +1470,15 @@ PSName: FutoMinA101Pr6N-Bold
Class: Japan
Provides(10): FutoMinA101-Bold
Provides(10): FutoMinA101Pro-Bold
+Provides(10): HiraMinProN-W6
+Provides(10): HiraMinPro-W6
OTFname: A-OTF-FutoMinA101Pr6N-Bold.otf
Name: A-OTF-FutoMinA101Pro-Bold
PSName: FutoMinA101Pro-Bold
Class: Japan
Provides(20): FutoMinA101-Bold
+Provides(20): HiraMinPro-W6
OTFname: A-OTF-FutoMinA101Pro-Bold.otf
Name: A-OTF-GothicBBBPr6N-Medium
@@ -1477,12 +1486,15 @@ PSName: GothicBBBPr6N-Medium
Class: Japan
Provides(10): GothicBBB-Medium
Provides(10): GothicBBBPro-Medium
+Provides(10): HiraKakuProN-W3
+Provides(10): HiraKakuPro-W3
OTFname: A-OTF-GothicBBBPr6N-Medium.otf
Name: A-OTF-GothicBBBPro-Medium
PSName: GothicBBBPro-Medium
Class: Japan
Provides(20): GothicBBB-Medium
+Provides(20): HiraKakuPro-W3
OTFname: A-OTF-GothicBBBPro-Medium.otf
Name: A-OTF-FutoGoB101Pr6N-Bold
@@ -1490,12 +1502,15 @@ PSName: FutoGoB101Pr6N-Bold
Class: Japan
Provides(10): FutoGoB101-Bold
Provides(10): FutoGoB101Pro-Bold
+Provides(10): HiraKakuProN-W6
+Provides(10): HiraKakuPro-W6
OTFname: A-OTF-FutoGoB101Pr6N-Bold.otf
Name: A-OTF-FutoGoB101Pro-Bold
PSName: FutoGoB101Pro-Bold
Class: Japan
Provides(20): FutoGoB101-Bold
+Provides(20): HiraKakuPro-W6
OTFname: A-OTF-FutoGoB101Pro-Bold.otf
Name: A-OTF-MidashiGoPr6N-MB31
@@ -1503,12 +1518,15 @@ PSName: MidashiGoPr6N-MB31
Class: Japan
Provides(10): MidashiGo-MB31
Provides(10): MidashiGoPro-MB31
+Provides(10): HiraKakuStdN-W8
+Provides(10): HiraKakuStd-W8
OTFname: A-OTF-MidashiGoPr6N-MB31.otf
Name: A-OTF-MidashiGoPro-MB31
PSName: MidashiGoPro-MB31
Class: Japan
Provides(20): MidashiGo-MB31
+Provides(20): HiraKakuStd-W8
OTFname: A-OTF-MidashiGoPro-MB31.otf
# A-OTF-Jun101Pr6N-Light has been replaced by A-OTF-ShinMGoPr6N-Light
@@ -1519,12 +1537,15 @@ PSName: Jun101Pr6N-Light
Class: Japan
Provides(11): Jun101-Light
Provides(11): Jun101Pro-Light
+Provides(11): HiraMaruProN-W4
+Provides(11): HiraMaruPro-W4
OTFname: A-OTF-Jun101Pr6N-Light.otf
Name: A-OTF-Jun101Pro-Light
PSName: Jun101Pro-Light
Class: Japan
Provides(20): Jun101-Light
+Provides(20): HiraMaruPro-W4
OTFname: A-OTF-Jun101Pro-Light.otf
Name: A-OTF-ShinMGoPr6N-Light
@@ -1532,6 +1553,8 @@ PSName: ShinMGoPr6N-Light
Class: Japan
Provides(10): Jun101-Light
Provides(10): Jun101Pro-Light
+Provides(10): HiraMaruProN-W4
+Provides(10): HiraMaruPro-W4
OTFname: A-OTF-ShinMGoPr6N-Light.otf
# Morisawa others (for moriprop);
@@ -1540,19 +1563,19 @@ OTFname: A-OTF-ShinMGoPr6N-Light.otf
Name: A-OTF-Jun201Pro-Regular
PSName: Jun201Pro-Regular
Class: Japan
-Provides(20): Jun201Pro-Regular
+Provides(20): Jun201-Regular
OTFname: A-OTF-Jun201Pro-Regular.otf
Name: A-OTF-Jun34Pro-Medium
PSName: Jun34Pro-Medium
Class: Japan
-Provides(20): Jun34Pro-Medium
+Provides(20): Jun34-Medium
OTFname: A-OTF-Jun34Pro-Medium.otf
Name: A-OTF-Jun501Pro-Bold
PSName: Jun501Pro-Bold
Class: Japan
-Provides(20): Jun501Pro-Bold
+Provides(20): Jun501-Bold
OTFname: A-OTF-Jun501Pro-Bold.otf
Name: A-OTF-RyuminPro-Regular
@@ -1570,7 +1593,7 @@ OTFname: A-OTF-RyuminPro-Medium.otf
Name: A-OTF-RyuminPro-Bold
PSName: RyuminPro-Bold
Class: Japan
-Provides(20): RyuminPro-Bold
+Provides(20): Ryumin-Bold
OTFname: A-OTF-RyuminPro-Bold.otf
Name: A-OTF-RyuminPro-Heavy
@@ -1606,7 +1629,7 @@ OTFname: A-OTF-ShinGoPro-Medium.otf
Name: A-OTF-ShinGoPro-Bold
PSName: ShinGoPro-Bold
Class: Japan
-Provides(20): ShinGoPro-Bold
+Provides(20): ShinGo-Bold
OTFname: A-OTF-ShinGoPro-Bold.otf
Name: A-OTF-ShinGoPro-Heavy
@@ -1704,70 +1727,60 @@ OTCname(28): HiraginoSans-W8.ttc(3)
Name: HiraginoSans-W0
Class: Japan
-Provides(30): HiraginoSans-W0
OTCname(30): ヒラギノ角ゴシック W0.ttc(0)
OTCname(29): ヒラギノ角ゴシック W0.ttc(0)
OTCname(28): HiraginoSans-W0.ttc(0)
Name: HiraginoSans-W1
Class: Japan
-Provides(30): HiraginoSans-W1
OTCname(30): ヒラギノ角ゴシック W1.ttc(0)
OTCname(29): ヒラギノ角ゴシック W1.ttc(0)
OTCname(28): HiraginoSans-W1.ttc(0)
Name: HiraginoSans-W2
Class: Japan
-Provides(30): HiraginoSans-W2
OTCname(30): ヒラギノ角ゴシック W2.ttc(0)
OTCname(29): ヒラギノ角ゴシック W2.ttc(0)
OTCname(28): HiraginoSans-W2.ttc(0)
Name: HiraginoSans-W3
Class: Japan
-Provides(30): HiraginoSans-W3
OTCname(30): ヒラギノ角ゴシック W3.ttc(0)
OTCname(29): ヒラギノ角ゴシック W3.ttc(0)
OTCname(28): HiraginoSans-W3.ttc(0)
Name: HiraginoSans-W4
Class: Japan
-Provides(30): HiraginoSans-W4
OTCname(30): ヒラギノ角ゴシック W4.ttc(0)
OTCname(29): ヒラギノ角ゴシック W4.ttc(0)
OTCname(28): HiraginoSans-W4.ttc(0)
Name: HiraginoSans-W5
Class: Japan
-Provides(30): HiraginoSans-W5
OTCname(30): ヒラギノ角ゴシック W5.ttc(0)
OTCname(29): ヒラギノ角ゴシック W5.ttc(0)
OTCname(28): HiraginoSans-W5.ttc(0)
Name: HiraginoSans-W6
Class: Japan
-Provides(30): HiraginoSans-W6
OTCname(30): ヒラギノ角ゴシック W6.ttc(0)
OTCname(29): ヒラギノ角ゴシック W6.ttc(0)
OTCname(28): HiraginoSans-W6.ttc(0)
Name: HiraginoSans-W7
Class: Japan
-Provides(30): HiraginoSans-W7
OTCname(30): ヒラギノ角ゴシック W7.ttc(0)
OTCname(29): ヒラギノ角ゴシック W7.ttc(0)
OTCname(28): HiraginoSans-W7.ttc(0)
Name: HiraginoSans-W8
Class: Japan
-Provides(30): HiraginoSans-W8
OTCname(30): ヒラギノ角ゴシック W8.ttc(0)
OTCname(29): ヒラギノ角ゴシック W8.ttc(0)
OTCname(28): HiraginoSans-W8.ttc(0)
Name: HiraginoSans-W9
Class: Japan
-Provides(30): HiraginoSans-W9
OTCname(30): ヒラギノ角ゴシック W9.ttc(0)
OTCname(29): ヒラギノ角ゴシック W9.ttc(0)
OTCname(28): HiraginoSans-W9.ttc(0)
@@ -1936,6 +1949,8 @@ Name: YuMincho-Regular
Class: Japan
Provides(90): Ryumin-Light
Provides(90): RyuminPro-Light
+Provides(90): HiraMinProN-W3
+Provides(90): HiraMinPro-W3
TTFname(20): yumin.ttf
#TTFname(21): YuMincho-Regular.ttf
@@ -1948,6 +1963,8 @@ Name: YuMincho-DemiBold
Class: Japan
Provides(90): FutoMinA101-Bold
Provides(90): FutoMinA101Pro-Bold
+Provides(90): HiraMinProN-W6
+Provides(90): HiraMinPro-W6
TTFname(20): yumindb.ttf
#TTFname(21): YuMincho-DemiBold.ttf
@@ -1955,6 +1972,8 @@ Name: YuGothic-Regular
Class: Japan
Provides(90): GothicBBB-Medium
Provides(90): GothicBBBPro-Medium
+Provides(90): HiraKakuProN-W3
+Provides(90): HiraKakuPro-W3
TTFname(20): yugothic.ttf
#TTFname(21): YuGothic-Regular.ttf
TTCname(30): YuGothR.ttc(0)
@@ -1973,10 +1992,16 @@ Name: YuGothic-Bold
Class: Japan
Provides(90): FutoGoB101-Bold
Provides(90): FutoGoB101Pro-Bold
+Provides(90): HiraKakuProN-W6
+Provides(90): HiraKakuPro-W6
Provides(90): Jun101-Light
Provides(90): Jun101Pro-Light
+Provides(90): HiraMaruProN-W4
+Provides(90): HiraMaruPro-W4
Provides(90): MidashiGo-MB31
Provides(90): MidashiGoPro-MB31
+Provides(90): HiraKakuStdN-W8
+Provides(90): HiraKakuStd-W8
TTFname(20): yugothib.ttf
TTFname(21): YuGothic-Bold.ttf
TTCname(30): YuGothB.ttc(0)
@@ -1987,8 +2012,12 @@ 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
TTFname(20): ipam.ttf
#TTFname(21): IPAMincho.ttf
@@ -1996,12 +2025,20 @@ 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): Jun101-Light
Provides(130): Jun101Pro-Light
+Provides(130): HiraMaruProN-W4
+Provides(130): HiraMaruPro-W4
Provides(130): MidashiGo-MB31
Provides(130): MidashiGoPro-MB31
+Provides(130): HiraKakuStdN-W8
+Provides(130): HiraKakuStd-W8
TTFname(20): ipag.ttf
#TTFname(21): IPAGothic.ttf
@@ -2009,8 +2046,12 @@ 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
TTFname(20): ipaexm.ttf
#TTFname(21): IPAexMincho.ttf
@@ -2018,12 +2059,20 @@ 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): Jun101-Light
Provides(120): Jun101Pro-Light
+Provides(120): HiraMaruProN-W4
+Provides(120): HiraMaruPro-W4
Provides(120): MidashiGo-MB31
Provides(120): MidashiGoPro-MB31
+Provides(120): HiraKakuStdN-W8
+Provides(120): HiraKakuStd-W8
TTFname(20): ipaexg.ttf
#TTFname(21): IPAexGothic.ttf
@@ -2045,12 +2094,16 @@ Name: MogaMincho-Regular
Class: Japan
Provides(110): Ryumin-Light
Provides(110): RyuminPro-Light
+Provides(110): HiraMinProN-W3
+Provides(110): HiraMinPro-W3
TTCname: mogam.ttc(0)
Name: MogaExMincho-Regular
Class: Japan
Provides(100): Ryumin-Light
Provides(100): RyuminPro-Light
+Provides(100): HiraMinProN-W3
+Provides(100): HiraMinPro-W3
TTCname: mogam.ttc(1)
Name: MogaExMincho-Italic
@@ -2073,12 +2126,16 @@ Name: MogaMincho-Bold
Class: Japan
Provides(110): FutoMinA101-Bold
Provides(110): FutoMinA101Pro-Bold
+Provides(110): HiraMinProN-W6
+Provides(110): HiraMinPro-W6
TTCname: mogamb.ttc(0)
Name: MogaExMincho-Bold
Class: Japan
Provides(100): FutoMinA101-Bold
Provides(100): FutoMinA101Pro-Bold
+Provides(100): HiraMinProN-W6
+Provides(100): HiraMinPro-W6
TTCname: mogamb.ttc(1)
Name: Moga90Mincho-Bold
@@ -2133,12 +2190,16 @@ Name: MogaGothic-Regular
Class: Japan
Provides(110): GothicBBB-Medium
Provides(110): GothicBBBPro-Medium
+Provides(110): HiraKakuProN-W3
+Provides(110): HiraKakuPro-W3
TTCname: mogag.ttc(0)
Name: MogaExGothic-Regular
Class: Japan
Provides(100): GothicBBB-Medium
Provides(100): GothicBBBPro-Medium
+Provides(100): HiraKakuProN-W3
+Provides(100): HiraKakuPro-W3
TTCname: mogag.ttc(1)
Name: Moga90Gothic-Regular
@@ -2153,16 +2214,24 @@ Name: MogaGothic-Bold
Class: Japan
Provides(110): FutoGoB101-Bold
Provides(110): FutoGoB101Pro-Bold
+Provides(110): HiraKakuProN-W6
+Provides(110): HiraKakuPro-W6
Provides(110): MidashiGo-MB31
Provides(110): MidashiGoPro-MB31
+Provides(110): HiraKakuStdN-W8
+Provides(110): HiraKakuStd-W8
TTCname: mogagb.ttc(0)
Name: MogaExGothic-Bold
Class: Japan
Provides(100): FutoGoB101-Bold
Provides(100): FutoGoB101Pro-Bold
+Provides(100): HiraKakuProN-W6
+Provides(100): HiraKakuPro-W6
Provides(100): MidashiGo-MB31
Provides(100): MidashiGoPro-MB31
+Provides(100): HiraKakuStdN-W8
+Provides(100): HiraKakuStd-W8
TTCname: mogagb.ttc(1)
Name: Moga90Gothic-Bold
@@ -2177,12 +2246,16 @@ Name: MoboGothic-Regular
Class: Japan
Provides(110): Jun101-Light
Provides(110): Jun101Pro-Light
+Provides(110): HiraMaruProN-W4
+Provides(110): HiraMaruPro-W4
TTCname: mobog.ttc(0)
Name: MoboExGothic-Regular
Class: Japan
Provides(100): Jun101-Light
Provides(100): Jun101Pro-Light
+Provides(100): HiraMaruProN-W4
+Provides(100): HiraMaruPro-W4
TTCname: mobog.ttc(1)
Name: Mobo90Gothic-Regular
@@ -2219,8 +2292,12 @@ Name: Ume-Mincho
Class: Japan
Provides(140): Ryumin-Light
Provides(140): RyuminPro-Light
+Provides(140): HiraMinProN-W3
+Provides(140): HiraMinPro-W3
Provides(140): FutoMinA101-Bold
Provides(140): FutoMinA101Pro-Bold
+Provides(140): HiraMinProN-W6
+Provides(140): HiraMinPro-W6
TTFname(10): ume-tmo3.ttf
#TTFname(11): ume-tms3.ttf
@@ -2228,12 +2305,20 @@ Name: Ume-Gothic
Class: Japan
Provides(140): GothicBBB-Medium
Provides(140): GothicBBBPro-Medium
+Provides(140): HiraKakuProN-W3
+Provides(140): HiraKakuPro-W3
Provides(140): FutoGoB101-Bold
Provides(140): FutoGoB101Pro-Bold
+Provides(140): HiraKakuProN-W6
+Provides(140): HiraKakuPro-W6
Provides(140): Jun101-Light
Provides(140): Jun101Pro-Light
+Provides(140): HiraMaruProN-W4
+Provides(140): HiraMaruPro-W4
Provides(140): MidashiGo-MB31
Provides(140): MidashiGoPro-MB31
+Provides(140): HiraKakuStdN-W8
+Provides(140): HiraKakuStd-W8
TTFname(10): ume-tgo4.ttf
Name: Ume-Gothic-O5
@@ -2313,20 +2398,28 @@ Name: KozGoPr6N-Bold
Class: Japan
Provides(50): FutoGoB101-Bold
Provides(50): FutoGoB101Pro-Bold
+Provides(50): HiraKakuProN-W6
+Provides(50): HiraKakuPro-W6
OTFname: KozGoPr6N-Bold.otf
Name: KozGoPr6N-Heavy
Class: Japan
Provides(50): Jun101-Light
Provides(50): Jun101Pro-Light
+Provides(50): HiraMaruProN-W4
+Provides(50): HiraMaruPro-W4
Provides(50): MidashiGo-MB31
Provides(50): MidashiGoPro-MB31
+Provides(50): HiraKakuStdN-W8
+Provides(50): HiraKakuStd-W8
OTFname: KozGoPr6N-Heavy.otf
Name: KozGoPr6N-Medium
Class: Japan
Provides(50): GothicBBB-Medium
Provides(50): GothicBBBPro-Medium
+Provides(50): HiraKakuProN-W3
+Provides(50): HiraKakuPro-W3
OTFname: KozGoPr6N-Medium.otf
Name: KozGoPr6N-Regular
@@ -2345,20 +2438,28 @@ Name: KozGoPro-Bold
Class: Japan
Provides(70): FutoGoB101-Bold
Provides(70): FutoGoB101Pro-Bold
+Provides(70): HiraKakuProN-W6
+Provides(70): HiraKakuPro-W6
OTFname: KozGoPro-Bold.otf
Name: KozGoPro-Heavy
Class: Japan
Provides(70): Jun101-Light
Provides(70): Jun101Pro-Light
+Provides(70): HiraMaruProN-W4
+Provides(70): HiraMaruPro-W4
Provides(70): MidashiGo-MB31
Provides(70): MidashiGoPro-MB31
+Provides(70): HiraKakuStdN-W8
+Provides(70): HiraKakuStd-W8
OTFname: KozGoPro-Heavy.otf
Name: KozGoPro-Medium
Class: Japan
Provides(70): GothicBBB-Medium
Provides(70): GothicBBBPro-Medium
+Provides(70): HiraKakuProN-W3
+Provides(70): HiraKakuPro-W3
OTFname: KozGoPro-Medium.otf
Name: KozGoPro-Regular
@@ -2377,20 +2478,28 @@ Name: KozGoProVI-Bold
Class: Japan
Provides(60): FutoGoB101-Bold
Provides(60): FutoGoB101Pro-Bold
+Provides(60): HiraKakuProN-W6
+Provides(60): HiraKakuPro-W6
OTFname: KozGoProVI-Bold.otf
Name: KozGoProVI-Heavy
Class: Japan
Provides(60): Jun101-Light
Provides(60): Jun101Pro-Light
+Provides(60): HiraMaruProN-W4
+Provides(60): HiraMaruPro-W4
Provides(60): MidashiGo-MB31
Provides(60): MidashiGoPro-MB31
+Provides(60): HiraKakuStdN-W8
+Provides(60): HiraKakuStd-W8
OTFname: KozGoProVI-Heavy.otf
Name: KozGoProVI-Medium
Class: Japan
Provides(60): GothicBBB-Medium
Provides(60): GothicBBBPro-Medium
+Provides(60): HiraKakuProN-W3
+Provides(60): HiraKakuPro-W3
OTFname: KozGoProVI-Medium.otf
Name: KozGoProVI-Regular
@@ -2401,6 +2510,8 @@ Name: KozMinPr6N-Bold
Class: Japan
Provides(50): FutoMinA101-Bold
Provides(50): FutoMinA101Pro-Bold
+Provides(50): HiraMinProN-W6
+Provides(50): HiraMinPro-W6
OTFname: KozMinPr6N-Bold.otf
Name: KozMinPr6N-Heavy
@@ -2415,6 +2526,8 @@ Name: KozMinPr6N-Regular
Class: Japan
Provides(50): Ryumin-Light
Provides(50): RyuminPro-Light
+Provides(50): HiraMinProN-W3
+Provides(50): HiraMinPro-W3
OTFname: KozMinPr6N-Regular.otf
Name: KozMinPr6N-ExtraLight
@@ -2429,6 +2542,8 @@ Name: KozMinPro-Bold
Class: Japan
Provides(70): FutoMinA101-Bold
Provides(70): FutoMinA101Pro-Bold
+Provides(70): HiraMinProN-W6
+Provides(70): HiraMinPro-W6
OTFname: KozMinPro-Bold.otf
Name: KozMinPro-Heavy
@@ -2443,6 +2558,8 @@ Name: KozMinPro-Regular
Class: Japan
Provides(70): Ryumin-Light
Provides(70): RyuminPro-Light
+Provides(70): HiraMinProN-W3
+Provides(70): HiraMinPro-W3
OTFname: KozMinPro-Regular.otf
Name: KozMinPro-ExtraLight
@@ -2457,12 +2574,16 @@ Name: KozMinProVI-Bold
Class: Japan
Provides(60): FutoMinA101-Bold
Provides(60): FutoMinA101Pro-Bold
+Provides(60): HiraMinProN-W6
+Provides(60): HiraMinPro-W6
OTFname: KozMinProVI-Bold.otf
Name: KozMinProVI-Regular
Class: Japan
Provides(60): Ryumin-Light
Provides(60): RyuminPro-Light
+Provides(60): HiraMinProN-W3
+Provides(60): HiraMinPro-W3
OTFname: KozMinProVI-Regular.otf
Name: KozMinProVI-Light
@@ -3486,14 +3607,20 @@ Name: MS-Gothic
Class: Japan
Provides(95): GothicBBB-Medium
Provides(95): GothicBBBPro-Medium
-Provides(95): MidashiGo-MB31
-Provides(95): MidashiGoPro-MB31
+Provides(95): HiraKakuProN-W3
+Provides(95): HiraKakuPro-W3
Provides(95): FutoGoB101-Bold
Provides(95): FutoGoB101Pro-Bold
+Provides(95): HiraKakuProN-W6
+Provides(95): HiraKakuPro-W6
Provides(95): MidashiGo-MB31
Provides(95): MidashiGoPro-MB31
+Provides(95): HiraKakuStdN-W8
+Provides(95): HiraKakuStd-W8
Provides(95): Jun101-Light
Provides(95): Jun101Pro-Light
+Provides(95): HiraMaruProN-W4
+Provides(95): HiraMaruPro-W4
TTFname(50): MS Gothic.ttf
TTFname(30): MS-Gothic.ttf
@@ -3501,8 +3628,12 @@ Name: MS-Mincho
Class: Japan
Provides(95): Ryumin-Light
Provides(95): RyuminPro-Light
+Provides(95): HiraMinProN-W3
+Provides(95): HiraMinPro-W3
Provides(95): FutoMinA101-Bold
Provides(95): FutoMinA101Pro-Bold
+Provides(95): HiraMinProN-W6
+Provides(95): HiraMinPro-W6
TTFname(50): MS Mincho.ttf
TTFname(30): MS-Mincho.ttf