cjk-gs-integrate (7mar20)

git-svn-id: svn://tug.org/texlive/trunk@54155 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 298 insertions, 130 deletions

diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-haranoaji.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-haranoaji.dat
index e3517f67d3c..686e1732711 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-haranoaji.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-haranoaji.dat
@@ -8,10 +8,16 @@ OTFname: HaranoAjiMincho-ExtraLight.otf
 
 Name: HaranoAjiMincho-Light
 Class: Japan
+Provides(70): Ryumin-Light
+Provides(70): RyuminPro-Light
+Provides(70): HiraMinProN-W3
+Provides(70): HiraMinPro-W3
 OTFname: HaranoAjiMincho-Light.otf
 
 Name: HaranoAjiMincho-Regular
 Class: Japan
+Provides(70): FutoMinA101-Bold
+Provides(70): FutoMinA101Pro-Bold
 OTFname: HaranoAjiMincho-Regular.otf
 
 Name: HaranoAjiMincho-Medium
@@ -20,10 +26,18 @@ OTFname: HaranoAjiMincho-Medium.otf
 
 Name: HaranoAjiMincho-SemiBold
 Class: Japan
+Provides(70): MidashiMin-MA31
+Provides(70): MidashiMinPro-MA31
+Provides(70): HiraMinProN-W6
+Provides(70): HiraMinPro-W6
 OTFname: HaranoAjiMincho-SemiBold.otf
 
 Name: HaranoAjiMincho-Bold
 Class: Japan
+Provides(71): MidashiMin-MA31
+Provides(71): MidashiMinPro-MA31
+Provides(71): HiraMinProN-W6
+Provides(71): HiraMinPro-W6
 OTFname: HaranoAjiMincho-Bold.otf
 
 Name: HaranoAjiMincho-Heavy
@@ -40,21 +54,39 @@ OTFname: HaranoAjiGothic-Light.otf
 
 Name: HaranoAjiGothic-Normal
 Class: Japan
+Provides(70): HiraKakuProN-W3
+Provides(70): HiraKakuPro-W3
 OTFname: HaranoAjiGothic-Normal.otf
 
 Name: HaranoAjiGothic-Regular
 Class: Japan
+Provides(70): GothicBBB-Medium
+Provides(70): GothicBBBPro-Medium
+Provides(71): HiraKakuProN-W3
+Provides(71): HiraKakuPro-W3
 OTFname: HaranoAjiGothic-Regular.otf
 
 Name: HaranoAjiGothic-Medium
 Class: Japan
+Provides(70): FutoGoB101-Bold
+Provides(70): FutoGoB101Pro-Bold
+Provides(70): HiraKakuProN-W6
+Provides(70): HiraKakuPro-W6
 OTFname: HaranoAjiGothic-Medium.otf
 
 Name: HaranoAjiGothic-Bold
 Class: Japan
+Provides(70): MidashiGo-MB31
+Provides(70): MidashiGoPro-MB31
+Provides(70): HiraKakuStdN-W8
+Provides(70): HiraKakuStd-W8
 OTFname: HaranoAjiGothic-Bold.otf
 
 Name: HaranoAjiGothic-Heavy
 Class: Japan
+Provides(70): Jun101-Light
+Provides(70): Jun101Pro-Light
+Provides(70): HiraMaruProN-W4
+Provides(70): HiraMaruPro-W4
 OTFname: HaranoAjiGothic-Heavy.otf
 
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 ce9ff48eb27..bb98673dab4 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
@@ -395,6 +395,7 @@ RMVname(40): 楷体.ttc(3)
 Name: STKaiti-Adobe-CNS1
 Class: CNS
 #Provides(??): MKai-Medium # fails
+Doublecheck: false
 TTFname(10): STKaiti.ttf
 TTFname(11): STKAITI.TTF
 TTFname(20): 华文楷体.ttf
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-microsoft.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-microsoft.dat
index 0c0a373233b..68a632360a0 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-microsoft.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-microsoft.dat
@@ -31,6 +31,12 @@
 # are bundled with Office for Mac 2016.
 
 # [TODO] I don't know when the TTC index of msgothic.ttc changed!
+# Office for Mac 2016 (Ver.15.32.0, 2017-03)：
+#   msgothic.ttc Version 5.10i : old (P -> UI)
+# Office for Mac 2016 (at least Ver.16.16.14, 2019-09)：
+#   msgothic.ttc Version 5.30  : new (UI -> P)
+# Windows 8.1 (at least 2014-12)
+#   msgothic.ttc Version 5.10  : new (UI -> P)
 
 # [TODO] Check about HG* fonts, and move Chinese/Korean fonts
 
@@ -84,13 +90,13 @@ Doublecheck: true
 TTFname(50): MS PGothic.ttf
 TTFname(30): MS-PGothic.ttf
 TTCname(20): msgothic.ttc(1) # old
-TTCname(20): msgothic.ttc(2) # new
+TTCname(19): msgothic.ttc(2) # new
 
 Name: MS-UIGothic
 Class: Japan
 Doublecheck: true
 TTCname(20): msgothic.ttc(2) # old
-TTCname(20): msgothic.ttc(1) # new
+TTCname(19): msgothic.ttc(1) # new
 
 Name: Meiryo
 Class: Japan
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
index d93b43f73fb..1eac4da6ddd 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notosans.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notosans.dat
@@ -1,182 +1,182 @@
 # NotoSans
 
 Name: NotoSansCJKjp-Thin
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansCJKjp-Thin.otf
 OTCname(20): NotoSansCJK-Thin.ttc(0)
 
 Name: NotoSansCJKjp-Light
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansCJKjp-Light.otf
 OTCname(20): NotoSansCJK-Light.ttc(0)
 
 Name: NotoSansCJKjp-DemiLight
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansCJKjp-DemiLight.otf
 OTCname(20): NotoSansCJK-DemiLight.ttc(0)
 
 Name: NotoSansCJKjp-Regular
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansCJKjp-Regular.otf
 OTCname(20): NotoSansCJK-Regular.ttc(0)
 
 Name: NotoSansCJKjp-Medium
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansCJKjp-Medium.otf
 OTCname(20): NotoSansCJK-Medium.ttc(0)
 
 Name: NotoSansCJKjp-Bold
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansCJKjp-Bold.otf
 OTCname(20): NotoSansCJK-Bold.ttc(0)
 
 Name: NotoSansCJKjp-Black
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansCJKjp-Black.otf
 OTCname(20): NotoSansCJK-Black.ttc(0)
 
 Name: NotoSansCJKkr-Thin
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansCJKkr-Thin.otf
 OTCname(20): NotoSansCJK-Thin.ttc(1)
 
 Name: NotoSansCJKkr-Light
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansCJKkr-Light.otf
 OTCname(20): NotoSansCJK-Light.ttc(1)
 
 Name: NotoSansCJKkr-DemiLight
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansCJKkr-DemiLight.otf
 OTCname(20): NotoSansCJK-DemiLight.ttc(1)
 
 Name: NotoSansCJKkr-Regular
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansCJKkr-Regular.otf
 OTCname(20): NotoSansCJK-Regular.ttc(1)
 
 Name: NotoSansCJKkr-Medium
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansCJKkr-Medium.otf
 OTCname(20): NotoSansCJK-Medium.ttc(1)
 
 Name: NotoSansCJKkr-Bold
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansCJKkr-Bold.otf
 OTCname(20): NotoSansCJK-Bold.ttc(1)
 
 Name: NotoSansCJKkr-Black
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansCJKkr-Black.otf
 OTCname(20): NotoSansCJK-Black.ttc(1)
 
 Name: NotoSansCJKsc-Thin
-Class: GB
+Class: AI0
 OTFname(10): NotoSansCJKsc-Thin.otf
 OTCname(20): NotoSansCJK-Thin.ttc(2)
 
 Name: NotoSansCJKsc-Light
-Class: GB
+Class: AI0
 OTFname(10): NotoSansCJKsc-Light.otf
 OTCname(20): NotoSansCJK-Light.ttc(2)
 
 Name: NotoSansCJKsc-DemiLight
-Class: GB
+Class: AI0
 OTFname(10): NotoSansCJKsc-DemiLight.otf
 OTCname(20): NotoSansCJK-DemiLight.ttc(2)
 
 Name: NotoSansCJKsc-Regular
-Class: GB
+Class: AI0
 OTFname(10): NotoSansCJKsc-Regular.otf
 OTCname(20): NotoSansCJK-Regular.ttc(2)
 
 Name: NotoSansCJKsc-Medium
-Class: GB
+Class: AI0
 OTFname(10): NotoSansCJKsc-Medium.otf
 OTCname(20): NotoSansCJK-Medium.ttc(2)
 
 Name: NotoSansCJKsc-Bold
-Class: GB
+Class: AI0
 OTFname(10): NotoSansCJKsc-Bold.otf
 OTCname(20): NotoSansCJK-Bold.ttc(2)
 
 Name: NotoSansCJKsc-Black
-Class: GB
+Class: AI0
 OTFname(10): NotoSansCJKsc-Black.otf
 OTCname(20): NotoSansCJK-Black.ttc(2)
 
 Name: NotoSansCJKtc-Thin
-Class: CNS
+Class: AI0
 OTFname(10): NotoSansCJKtc-Thin.otf
 OTCname(20): NotoSansCJK-Thin.ttc(3)
 
 Name: NotoSansCJKtc-Light
-Class: CNS
+Class: AI0
 OTFname(10): NotoSansCJKtc-Light.otf
 OTCname(20): NotoSansCJK-Light.ttc(3)
 
 Name: NotoSansCJKtc-DemiLight
-Class: CNS
+Class: AI0
 OTFname(10): NotoSansCJKtc-DemiLight.otf
 OTCname(20): NotoSansCJK-DemiLight.ttc(3)
 
 Name: NotoSansCJKtc-Regular
-Class: CNS
+Class: AI0
 OTFname(10): NotoSansCJKtc-Regular.otf
 OTCname(20): NotoSansCJK-Regular.ttc(3)
 
 Name: NotoSansCJKtc-Medium
-Class: CNS
+Class: AI0
 OTFname(10): NotoSansCJKtc-Medium.otf
 OTCname(20): NotoSansCJK-Medium.ttc(3)
 
 Name: NotoSansCJKtc-Bold
-Class: CNS
+Class: AI0
 OTFname(10): NotoSansCJKtc-Bold.otf
 OTCname(20): NotoSansCJK-Bold.ttc(3)
 
 Name: NotoSansCJKtc-Black
-Class: CNS
+Class: AI0
 OTFname(10): NotoSansCJKtc-Black.otf
 OTCname(20): NotoSansCJK-Black.ttc(3)
 
 Name: NotoSansMonoCJKjp-Regular
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansMonoCJKjp-Regular.otf
 OTCname(20): NotoSansCJK-Regular.ttc(4)
 
 Name: NotoSansMonoCJKjp-Bold
-Class: Japan
+Class: AI0
 OTFname(10): NotoSansMonoCJKjp-Bold.otf
 OTCname(20): NotoSansCJK-Bold.ttc(4)
 
 Name: NotoSansMonoCJKkr-Regular
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansMonoCJKkr-Regular.otf
 OTCname(20): NotoSansCJK-Regular.ttc(5)
 
 Name: NotoSansMonoCJKkr-Bold
-Class: Korea
+Class: AI0
 OTFname(10): NotoSansMonoCJKkr-Bold.otf
 OTCname(20): NotoSansCJK-Bold.ttc(5)
 
 Name: NotoSansMonoCJKsc-Regular
-Class: GB
+Class: AI0
 OTFname(10): NotoSansMonoCJKsc-Regular.otf
 OTCname(20): NotoSansCJK-Regular.ttc(6)
 
 Name: NotoSansMonoCJKsc-Bold
-Class: GB
+Class: AI0
 OTFname(10): NotoSansMonoCJKsc-Bold.otf
 OTCname(20): NotoSansCJK-Bold.ttc(6)
 
 Name: NotoSansMonoCJKtc-Regular
-Class: CNS
+Class: AI0
 OTFname(10): NotoSansMonoCJKtc-Regular.otf
 OTCname(20): NotoSansCJK-Regular.ttc(7)
 
 Name: NotoSansMonoCJKtc-Bold
-Class: CNS
+Class: AI0
 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
index e9131668073..deac6765555 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notoserif.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-notoserif.dat
@@ -1,141 +1,141 @@
 # NotoSerif
 
 Name: NotoSerifCJKjp-ExtraLight
-Class: Japan
+Class: AI0
 OTFname(10): NotoSerifCJKjp-ExtraLight.otf
 OTCname(20): NotoSerifCJK-ExtraLight.ttc(0)
 
 Name: NotoSerifCJKjp-Light
-Class: Japan
+Class: AI0
 OTFname(10): NotoSerifCJKjp-Light.otf
 OTCname(20): NotoSerifCJK-Light.ttc(0)
 
 Name: NotoSerifCJKjp-Regular
-Class: Japan
+Class: AI0
 OTFname(10): NotoSerifCJKjp-Regular.otf
 OTCname(20): NotoSerifCJK-Regular.ttc(0)
 
 Name: NotoSerifCJKjp-Medium
-Class: Japan
+Class: AI0
 OTFname(10): NotoSerifCJKjp-Medium.otf
 OTCname(20): NotoSerifCJK-Medium.ttc(0)
 
 Name: NotoSerifCJKjp-SemiBold
-Class: Japan
+Class: AI0
 OTFname(10): NotoSerifCJKjp-SemiBold.otf
 OTCname(20): NotoSerifCJK-SemiBold.ttc(0)
 
 Name: NotoSerifCJKjp-Bold
-Class: Japan
+Class: AI0
 OTFname(10): NotoSerifCJKjp-Bold.otf
 OTCname(20): NotoSerifCJK-Bold.ttc(0)
 
 Name: NotoSerifCJKjp-Black
-Class: Japan
+Class: AI0
 OTFname(10): NotoSerifCJKjp-Black.otf
 OTCname(20): NotoSerifCJK-Black.ttc(0)
 
 Name: NotoSerifCJKkr-ExtraLight
-Class: Korea
+Class: AI0
 OTFname(10): NotoSerifCJKkr-ExtraLight.otf
 OTCname(20): NotoSerifCJK-ExtraLight.ttc(1)
 
 Name: NotoSerifCJKkr-Light
-Class: Korea
+Class: AI0
 OTFname(10): NotoSerifCJKkr-Light.otf
 OTCname(20): NotoSerifCJK-Light.ttc(1)
 
 Name: NotoSerifCJKkr-Regular
-Class: Korea
+Class: AI0
 OTFname(10): NotoSerifCJKkr-Regular.otf
 OTCname(20): NotoSerifCJK-Regular.ttc(1)
 
 Name: NotoSerifCJKkr-Medium
-Class: Korea
+Class: AI0
 OTFname(10): NotoSerifCJKkr-Medium.otf
 OTCname(20): NotoSerifCJK-Medium.ttc(1)
 
 Name: NotoSerifCJKkr-SemiBold
-Class: Korea
+Class: AI0
 OTFname(10): NotoSerifCJKkr-SemiBold.otf
 OTCname(20): NotoSerifCJK-SemiBold.ttc(1)
 
 Name: NotoSerifCJKkr-Bold
-Class: Korea
+Class: AI0
 OTFname(10): NotoSerifCJKkr-Bold.otf
 OTCname(20): NotoSerifCJK-Bold.ttc(1)
 
 Name: NotoSerifCJKkr-Black
-Class: Korea
+Class: AI0
 OTFname(10): NotoSerifCJKkr-Black.otf
 OTCname(20): NotoSerifCJK-Black.ttc(1)
 
 Name: NotoSerifCJKsc-ExtraLight
-Class: GB
+Class: AI0
 OTFname(10): NotoSerifCJKsc-ExtraLight.otf
 OTCname(20): NotoSerifCJK-ExtraLight.ttc(2)
 
 Name: NotoSerifCJKsc-Light
-Class: GB
+Class: AI0
 OTFname(10): NotoSerifCJKsc-Light.otf
 OTCname(20): NotoSerifCJK-Light.ttc(2)
 
 Name: NotoSerifCJKsc-Regular
-Class: GB
+Class: AI0
 OTFname(10): NotoSerifCJKsc-Regular.otf
 OTCname(20): NotoSerifCJK-Regular.ttc(2)
 
 Name: NotoSerifCJKsc-Medium
-Class: GB
+Class: AI0
 OTFname(10): NotoSerifCJKsc-Medium.otf
 OTCname(20): NotoSerifCJK-Medium.ttc(2)
 
 Name: NotoSerifCJKsc-SemiBold
-Class: GB
+Class: AI0
 OTFname(10): NotoSerifCJKsc-SemiBold.otf
 OTCname(20): NotoSerifCJK-SemiBold.ttc(2)
 
 Name: NotoSerifCJKsc-Bold
-Class: GB
+Class: AI0
 OTFname(10): NotoSerifCJKsc-Bold.otf
 OTCname(20): NotoSerifCJK-Bold.ttc(2)
 
 Name: NotoSerifCJKsc-Black
-Class: GB
+Class: AI0
 OTFname(10): NotoSerifCJKsc-Black.otf
 OTCname(20): NotoSerifCJK-Black.ttc(2)
 
 Name: NotoSerifCJKtc-ExtraLight
-Class: CNS
+Class: AI0
 OTFname(10): NotoSerifCJKtc-ExtraLight.otf
 OTCname(20): NotoSerifCJK-ExtraLight.ttc(3)
 
 Name: NotoSerifCJKtc-Light
-Class: CNS
+Class: AI0
 OTFname(10): NotoSerifCJKtc-Light.otf
 OTCname(20): NotoSerifCJK-Light.ttc(3)
 
 Name: NotoSerifCJKtc-Regular
-Class: CNS
+Class: AI0
 OTFname(10): NotoSerifCJKtc-Regular.otf
 OTCname(20): NotoSerifCJK-Regular.ttc(3)
 
 Name: NotoSerifCJKtc-Medium
-Class: CNS
+Class: AI0
 OTFname(10): NotoSerifCJKtc-Medium.otf
 OTCname(20): NotoSerifCJK-Medium.ttc(3)
 
 Name: NotoSerifCJKtc-SemiBold
-Class: CNS
+Class: AI0
 OTFname(10): NotoSerifCJKtc-SemiBold.otf
 OTCname(20): NotoSerifCJK-SemiBold.ttc(3)
 
 Name: NotoSerifCJKtc-Bold
-Class: CNS
+Class: AI0
 OTFname(10): NotoSerifCJKtc-Bold.otf
 OTCname(20): NotoSerifCJK-Bold.ttc(3)
 
 Name: NotoSerifCJKtc-Black
-Class: CNS
+Class: AI0
 OTFname(10): NotoSerifCJKtc-Black.otf
 OTCname(20): NotoSerifCJK-Black.ttc(3)
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sinotype.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sinotype.dat
index 37a032391e2..49327b229ca 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sinotype.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sinotype.dat
@@ -115,6 +115,7 @@ TTFname(20): 华文楷体.ttf
 Name: STKaiti-Adobe-CNS1
 Class: CNS
 #Provides(??): MKai-Medium # fails
+Doublecheck: false
 TTFname(10): STKaiti.ttf
 TTFname(11): STKAITI.TTF
 TTFname(20): 华文楷体.ttf
diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehansans.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehansans.dat
index e480b7dc6ba..2a0a5f6a363 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehansans.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehansans.dat
@@ -1,182 +1,254 @@
 # SourceHanSans
 
 Name: SourceHanSans-ExtraLight
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansJP-UTF16-H
+CMap: UniSourceHanSansJP-UTF32-H
 OTFname(10): SourceHanSans-ExtraLight.otf
 OTCname(20): SourceHanSans-ExtraLight.ttc(0)
 
 Name: SourceHanSans-Light
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansJP-UTF16-H
+CMap: UniSourceHanSansJP-UTF32-H
 OTFname(10): SourceHanSans-Light.otf
 OTCname(20): SourceHanSans-Light.ttc(0)
 
 Name: SourceHanSans-Normal
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansJP-UTF16-H
+CMap: UniSourceHanSansJP-UTF32-H
 OTFname(10): SourceHanSans-Normal.otf
 OTCname(20): SourceHanSans-Normal.ttc(0)
 
 Name: SourceHanSans-Regular
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansJP-UTF16-H
+CMap: UniSourceHanSansJP-UTF32-H
 OTFname(10): SourceHanSans-Regular.otf
 OTCname(20): SourceHanSans-Regular.ttc(0)
 
 Name: SourceHanSans-Medium
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansJP-UTF16-H
+CMap: UniSourceHanSansJP-UTF32-H
 OTFname(10): SourceHanSans-Medium.otf
 OTCname(20): SourceHanSans-Medium.ttc(0)
 
 Name: SourceHanSans-Bold
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansJP-UTF16-H
+CMap: UniSourceHanSansJP-UTF32-H
 OTFname(10): SourceHanSans-Bold.otf
 OTCname(20): SourceHanSans-Bold.ttc(0)
 
 Name: SourceHanSans-Heavy
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansJP-UTF16-H
+CMap: UniSourceHanSansJP-UTF32-H
 OTFname(10): SourceHanSans-Heavy.otf
 OTCname(20): SourceHanSans-Heavy.ttc(0)
 
 Name: SourceHanSansK-ExtraLight
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansKR-UTF16-H
+CMap: UniSourceHanSansKR-UTF32-H
 OTFname(10): SourceHanSansK-ExtraLight.otf
 OTCname(20): SourceHanSans-ExtraLight.ttc(1)
 
 Name: SourceHanSansK-Light
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansKR-UTF16-H
+CMap: UniSourceHanSansKR-UTF32-H
 OTFname(10): SourceHanSansK-Light.otf
 OTCname(20): SourceHanSans-Light.ttc(1)
 
 Name: SourceHanSansK-Normal
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansKR-UTF16-H
+CMap: UniSourceHanSansKR-UTF32-H
 OTFname(10): SourceHanSansK-Normal.otf
 OTCname(20): SourceHanSans-Normal.ttc(1)
 
 Name: SourceHanSansK-Regular
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansKR-UTF16-H
+CMap: UniSourceHanSansKR-UTF32-H
 OTFname(10): SourceHanSansK-Regular.otf
 OTCname(20): SourceHanSans-Regular.ttc(1)
 
 Name: SourceHanSansK-Medium
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansKR-UTF16-H
+CMap: UniSourceHanSansKR-UTF32-H
 OTFname(10): SourceHanSansK-Medium.otf
 OTCname(20): SourceHanSans-Medium.ttc(1)
 
 Name: SourceHanSansK-Bold
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansKR-UTF16-H
+CMap: UniSourceHanSansKR-UTF32-H
 OTFname(10): SourceHanSansK-Bold.otf
 OTCname(20): SourceHanSans-Bold.ttc(1)
 
 Name: SourceHanSansK-Heavy
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansKR-UTF16-H
+CMap: UniSourceHanSansKR-UTF32-H
 OTFname(10): SourceHanSansK-Heavy.otf
 OTCname(20): SourceHanSans-Heavy.ttc(1)
 
 Name: SourceHanSansSC-ExtraLight
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansCN-UTF16-H
+CMap: UniSourceHanSansCN-UTF32-H
 OTFname(10): SourceHanSansSC-ExtraLight.otf
 OTCname(20): SourceHanSans-ExtraLight.ttc(2)
 
 Name: SourceHanSansSC-Light
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansCN-UTF16-H
+CMap: UniSourceHanSansCN-UTF32-H
 OTFname(10): SourceHanSansSC-Light.otf
 OTCname(20): SourceHanSans-Light.ttc(2)
 
 Name: SourceHanSansSC-Normal
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansCN-UTF16-H
+CMap: UniSourceHanSansCN-UTF32-H
 OTFname(10): SourceHanSansSC-Normal.otf
 OTCname(20): SourceHanSans-Normal.ttc(2)
 
 Name: SourceHanSansSC-Regular
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansCN-UTF16-H
+CMap: UniSourceHanSansCN-UTF32-H
 OTFname(10): SourceHanSansSC-Regular.otf
 OTCname(20): SourceHanSans-Regular.ttc(2)
 
 Name: SourceHanSansSC-Medium
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansCN-UTF16-H
+CMap: UniSourceHanSansCN-UTF32-H
 OTFname(10): SourceHanSansSC-Medium.otf
 OTCname(20): SourceHanSans-Medium.ttc(2)
 
 Name: SourceHanSansSC-Bold
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansCN-UTF16-H
+CMap: UniSourceHanSansCN-UTF32-H
 OTFname(10): SourceHanSansSC-Bold.otf
 OTCname(20): SourceHanSans-Bold.ttc(2)
 
 Name: SourceHanSansSC-Heavy
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansCN-UTF16-H
+CMap: UniSourceHanSansCN-UTF32-H
 OTFname(10): SourceHanSansSC-Heavy.otf
 OTCname(20): SourceHanSans-Heavy.ttc(2)
 
 Name: SourceHanSansTC-ExtraLight
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansTW-UTF16-H
+CMap: UniSourceHanSansTW-UTF32-H
 OTFname(10): SourceHanSansTC-ExtraLight.otf
 OTCname(20): SourceHanSans-ExtraLight.ttc(3)
 
 Name: SourceHanSansTC-Light
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansTW-UTF16-H
+CMap: UniSourceHanSansTW-UTF32-H
 OTFname(10): SourceHanSansTC-Light.otf
 OTCname(20): SourceHanSans-Light.ttc(3)
 
 Name: SourceHanSansTC-Normal
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansTW-UTF16-H
+CMap: UniSourceHanSansTW-UTF32-H
 OTFname(10): SourceHanSansTC-Normal.otf
 OTCname(20): SourceHanSans-Normal.ttc(3)
 
 Name: SourceHanSansTC-Regular
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansTW-UTF16-H
+CMap: UniSourceHanSansTW-UTF32-H
 OTFname(10): SourceHanSansTC-Regular.otf
 OTCname(20): SourceHanSans-Regular.ttc(3)
 
 Name: SourceHanSansTC-Medium
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansTW-UTF16-H
+CMap: UniSourceHanSansTW-UTF32-H
 OTFname(10): SourceHanSansTC-Medium.otf
 OTCname(20): SourceHanSans-Medium.ttc(3)
 
 Name: SourceHanSansTC-Bold
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansTW-UTF16-H
+CMap: UniSourceHanSansTW-UTF32-H
 OTFname(10): SourceHanSansTC-Bold.otf
 OTCname(20): SourceHanSans-Bold.ttc(3)
 
 Name: SourceHanSansTC-Heavy
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansTW-UTF16-H
+CMap: UniSourceHanSansTW-UTF32-H
 OTFname(10): SourceHanSansTC-Heavy.otf
 OTCname(20): SourceHanSans-Heavy.ttc(3)
 
 Name: SourceHanSansHW-Regular
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansHWJP-UTF16-H
+CMap: UniSourceHanSansHWJP-UTF32-H
 OTFname(10): SourceHanSansHW-Regular.otf
 OTCname(20): SourceHanSans-Regular.ttc(4)
 
 Name: SourceHanSansHW-Bold
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSansHWJP-UTF16-H
+CMap: UniSourceHanSansHWJP-UTF32-H
 OTFname(10): SourceHanSansHW-Bold.otf
 OTCname(20): SourceHanSans-Bold.ttc(4)
 
 Name: SourceHanSansHWK-Regular
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansHWKR-UTF16-H
+CMap: UniSourceHanSansHWKR-UTF32-H
 OTFname(10): SourceHanSansHWK-Regular.otf
 OTCname(20): SourceHanSans-Regular.ttc(5)
 
 Name: SourceHanSansHWK-Bold
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSansHWKR-UTF16-H
+CMap: UniSourceHanSansHWKR-UTF32-H
 OTFname(10): SourceHanSansHWK-Bold.otf
 OTCname(20): SourceHanSans-Bold.ttc(5)
 
 Name: SourceHanSansHWSC-Regular
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansHWCN-UTF16-H
+CMap: UniSourceHanSansHWCN-UTF32-H
 OTFname(10): SourceHanSansHWSC-Regular.otf
 OTCname(20): SourceHanSans-Regular.ttc(6)
 
 Name: SourceHanSansHWSC-Bold
-Class: GB
+Class: AI0
+CMap: UniSourceHanSansHWCN-UTF16-H
+CMap: UniSourceHanSansHWCN-UTF32-H
 OTFname(10): SourceHanSansHWSC-Bold.otf
 OTCname(20): SourceHanSans-Bold.ttc(6)
 
 Name: SourceHanSansHWTC-Regular
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansHWTW-UTF16-H
+CMap: UniSourceHanSansHWTW-UTF32-H
 OTFname(10): SourceHanSansHWTC-Regular.otf
 OTCname(20): SourceHanSans-Regular.ttc(7)
 
 Name: SourceHanSansHWTC-Bold
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSansHWTW-UTF16-H
+CMap: UniSourceHanSansHWTW-UTF32-H
 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
index a3c3ec1beea..1189c4f7492 100644
--- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehanserif.dat
+++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-sourcehanserif.dat
@@ -1,142 +1,198 @@
 # SourceHanSerif
 
 Name: SourceHanSerif-ExtraLight
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSerifJP-UTF16-H
+CMap: UniSourceHanSerifJP-UTF32-H
 OTFname(10): SourceHanSerif-ExtraLight.otf
 OTCname(20): SourceHanSerif-ExtraLight.ttc(0)
 
 Name: SourceHanSerif-Light
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSerifJP-UTF16-H
+CMap: UniSourceHanSerifJP-UTF32-H
 OTFname(10): SourceHanSerif-Light.otf
 OTCname(20): SourceHanSerif-Light.ttc(0)
 
 Name: SourceHanSerif-Regular
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSerifJP-UTF16-H
+CMap: UniSourceHanSerifJP-UTF32-H
 OTFname(10): SourceHanSerif-Regular.otf
 OTCname(20): SourceHanSerif-Regular.ttc(0)
 
 Name: SourceHanSerif-Medium
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSerifJP-UTF16-H
+CMap: UniSourceHanSerifJP-UTF32-H
 OTFname(10): SourceHanSerif-Medium.otf
 OTCname(20): SourceHanSerif-Medium.ttc(0)
 
 Name: SourceHanSerif-SemiBold
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSerifJP-UTF16-H
+CMap: UniSourceHanSerifJP-UTF32-H
 OTFname(10): SourceHanSerif-SemiBold.otf
 OTCname(20): SourceHanSerif-SemiBold.ttc(0)
 
 Name: SourceHanSerif-Bold
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSerifJP-UTF16-H
+CMap: UniSourceHanSerifJP-UTF32-H
 OTFname(10): SourceHanSerif-Bold.otf
 OTCname(20): SourceHanSerif-Bold.ttc(0)
 
 Name: SourceHanSerif-Heavy
-Class: Japan
+Class: AI0
+CMap: UniSourceHanSerifJP-UTF16-H
+CMap: UniSourceHanSerifJP-UTF32-H
 OTFname(10): SourceHanSerif-Heavy.otf
 OTCname(20): SourceHanSerif-Heavy.ttc(0)
 
 Name: SourceHanSerifK-ExtraLight
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSerifKR-UTF16-H
+CMap: UniSourceHanSerifKR-UTF32-H
 OTFname(10): SourceHanSerifK-ExtraLight.otf
 OTCname(20): SourceHanSerif-ExtraLight.ttc(1)
 
 Name: SourceHanSerifK-Light
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSerifKR-UTF16-H
+CMap: UniSourceHanSerifKR-UTF32-H
 OTFname(10): SourceHanSerifK-Light.otf
 OTCname(20): SourceHanSerif-Light.ttc(1)
 
 Name: SourceHanSerifK-Regular
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSerifKR-UTF16-H
+CMap: UniSourceHanSerifKR-UTF32-H
 OTFname(10): SourceHanSerifK-Regular.otf
 OTCname(20): SourceHanSerif-Regular.ttc(1)
 
 Name: SourceHanSerifK-Medium
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSerifKR-UTF16-H
+CMap: UniSourceHanSerifKR-UTF32-H
 OTFname(10): SourceHanSerifK-Medium.otf
 OTCname(20): SourceHanSerif-Medium.ttc(1)
 
 Name: SourceHanSerifK-SemiBold
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSerifKR-UTF16-H
+CMap: UniSourceHanSerifKR-UTF32-H
 OTFname(10): SourceHanSerifK-SemiBold.otf
 OTCname(20): SourceHanSerif-SemiBold.ttc(1)
 
 Name: SourceHanSerifK-Bold
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSerifKR-UTF16-H
+CMap: UniSourceHanSerifKR-UTF32-H
 OTFname(10): SourceHanSerifK-Bold.otf
 OTCname(20): SourceHanSerif-Bold.ttc(1)
 
 Name: SourceHanSerifK-Heavy
-Class: Korea
+Class: AI0
+CMap: UniSourceHanSerifKR-UTF16-H
+CMap: UniSourceHanSerifKR-UTF32-H
 OTFname(10): SourceHanSerifK-Heavy.otf
 OTCname(20): SourceHanSerif-Heavy.ttc(1)
 
 Name: SourceHanSerifSC-ExtraLight
-Class: GB
+Class: AI0
+CMap: UniSourceHanSerifCN-UTF16-H
+CMap: UniSourceHanSerifCN-UTF32-H
 OTFname(10): SourceHanSerifSC-ExtraLight.otf
 OTCname(20): SourceHanSerif-ExtraLight.ttc(2)
 
 Name: SourceHanSerifSC-Light
-Class: GB
+Class: AI0
+CMap: UniSourceHanSerifCN-UTF16-H
+CMap: UniSourceHanSerifCN-UTF32-H
 OTFname(10): SourceHanSerifSC-Light.otf
 OTCname(20): SourceHanSerif-Light.ttc(2)
 
 Name: SourceHanSerifSC-Regular
-Class: GB
+Class: AI0
+CMap: UniSourceHanSerifCN-UTF16-H
+CMap: UniSourceHanSerifCN-UTF32-H
 OTFname(10): SourceHanSerifSC-Regular.otf
 OTCname(20): SourceHanSerif-Regular.ttc(2)
 
 Name: SourceHanSerifSC-Medium
-Class: GB
+Class: AI0
+CMap: UniSourceHanSerifCN-UTF16-H
+CMap: UniSourceHanSerifCN-UTF32-H
 OTFname(10): SourceHanSerifSC-Medium.otf
 OTCname(20): SourceHanSerif-Medium.ttc(2)
 
 Name: SourceHanSerifSC-SemiBold
-Class: GB
+Class: AI0
+CMap: UniSourceHanSerifCN-UTF16-H
+CMap: UniSourceHanSerifCN-UTF32-H
 OTFname(10): SourceHanSerifSC-SemiBold.otf
 OTCname(20): SourceHanSerif-SemiBold.ttc(2)
 
 Name: SourceHanSerifSC-Bold
-Class: GB
+Class: AI0
+CMap: UniSourceHanSerifCN-UTF16-H
+CMap: UniSourceHanSerifCN-UTF32-H
 OTFname(10): SourceHanSerifSC-Bold.otf
 OTCname(20): SourceHanSerif-Bold.ttc(2)
 
 Name: SourceHanSerifSC-Heavy
-Class: GB
+Class: AI0
+CMap: UniSourceHanSerifCN-UTF16-H
+CMap: UniSourceHanSerifCN-UTF32-H
 OTFname(10): SourceHanSerifSC-Heavy.otf
 OTCname(20): SourceHanSerif-Heavy.ttc(2)
 
 Name: SourceHanSerifTC-ExtraLight
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSerifTW-UTF16-H
+CMap: UniSourceHanSerifTW-UTF32-H
 OTFname(10): SourceHanSerifTC-ExtraLight.otf
 OTCname(20): SourceHanSerif-ExtraLight.ttc(3)
 
 Name: SourceHanSerifTC-Light
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSerifTW-UTF16-H
+CMap: UniSourceHanSerifTW-UTF32-H
 OTFname(10): SourceHanSerifTC-Light.otf
 OTCname(20): SourceHanSerif-Light.ttc(3)
 
 Name: SourceHanSerifTC-Regular
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSerifTW-UTF16-H
+CMap: UniSourceHanSerifTW-UTF32-H
 OTFname(10): SourceHanSerifTC-Regular.otf
 OTCname(20): SourceHanSerif-Regular.ttc(3)
 
 Name: SourceHanSerifTC-Medium
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSerifTW-UTF16-H
+CMap: UniSourceHanSerifTW-UTF32-H
 OTFname(10): SourceHanSerifTC-Medium.otf
 OTCname(20): SourceHanSerif-Medium.ttc(3)
 
 Name: SourceHanSerifTC-SemiBold
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSerifTW-UTF16-H
+CMap: UniSourceHanSerifTW-UTF32-H
 OTFname(10): SourceHanSerifTC-SemiBold.otf
 OTCname(20): SourceHanSerif-SemiBold.ttc(3)
 
 Name: SourceHanSerifTC-Bold
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSerifTW-UTF16-H
+CMap: UniSourceHanSerifTW-UTF32-H
 OTFname(10): SourceHanSerifTC-Bold.otf
 OTCname(20): SourceHanSerif-Bold.ttc(3)
 
 Name: SourceHanSerifTC-Heavy
-Class: CNS
+Class: AI0
+CMap: UniSourceHanSerifTW-UTF16-H
+CMap: UniSourceHanSerifTW-UTF32-H
 OTFname(10): SourceHanSerifTC-Heavy.otf
 OTCname(20): SourceHanSerif-Heavy.ttc(3)