new jfontmaps with renamed scripts

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

86 files changed, 1346 insertions, 697 deletions

diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
new file mode 100644
index 00000000000..29820f5fc4f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
@@ -0,0 +1,92 @@
+
+% TEXT, 90JIS
+hminl-h	H	HiraMinProN-W2.otf
+hminl-v	V	HiraMinProN-W2.otf
+hminr-h	H	HiraMinProN-W3.otf
+hminr-v	V	HiraMinProN-W3.otf
+hminb-h	H	HiraMinProN-W6.otf
+hminb-v	V	HiraMinProN-W6.otf
+hgothr-h	H	HiraKakuProN-W3.otf
+hgothr-v	V	HiraKakuProN-W3.otf
+hgothb-h	H	HiraKakuProN-W6.otf
+hgothb-v	V	HiraKakuProN-W6.otf
+hgotheb-h	H	HiraKakuStdN-W8.otf
+hgotheb-v	V	HiraKakuStdN-W8.otf
+hmgothr-h	H	HiraMaruProN-W4.otf
+hmgothr-v	V	HiraMaruProN-W4.otf
+
+% TEXT, JIS04
+hminln-h	H	HiraMinProN-W2.otf
+hminln-v	V	HiraMinProN-W2.otf
+hminrn-h	H	HiraMinProN-W3.otf
+hminrn-v	V	HiraMinProN-W3.otf
+hminbn-h	H	HiraMinProN-W6.otf
+hminbn-v	V	HiraMinProN-W6.otf
+hgothrn-h	H	HiraKakuProN-W3.otf
+hgothrn-v	V	HiraKakuProN-W3.otf
+hgothbn-h	H	HiraKakuProN-W6.otf
+hgothbn-v	V	HiraKakuProN-W6.otf
+hgothebn-h	H	HiraKakuStdN-W8.otf
+hgothebn-v	V	HiraKakuStdN-W8.otf
+hmgothrn-h	H	HiraMaruProN-W4.otf
+hmgothrn-v	V	HiraMaruProN-W4.otf
+
+% CID
+otf-cjml-h	Identity-H	HiraMinProN-W2.otf
+otf-cjml-v	Identity-V	HiraMinProN-W2.otf
+otf-cjmr-h	Identity-H	HiraMinProN-W3.otf
+otf-cjmr-v	Identity-V	HiraMinProN-W3.otf
+otf-cjmb-h	Identity-H	HiraMinProN-W6.otf
+otf-cjmb-v	Identity-V	HiraMinProN-W6.otf
+otf-cjgr-h	Identity-H	HiraKakuProN-W3.otf
+otf-cjgr-v	Identity-V	HiraKakuProN-W3.otf
+otf-cjgb-h	Identity-H	HiraKakuProN-W6.otf
+otf-cjgb-v	Identity-V	HiraKakuProN-W6.otf
+otf-cjge-h	Identity-H	HiraKakuStdN-W8.otf
+otf-cjge-v	Identity-V	HiraKakuStdN-W8.otf
+otf-cjmgr-h	Identity-H	HiraMaruProN-W4.otf
+otf-cjmgr-v	Identity-V	HiraMaruProN-W4.otf
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	HiraMinProN-W2.otf
+otf-ujml-v	UniJIS-UTF16-V	HiraMinProN-W2.otf
+otf-ujmr-h	UniJIS-UTF16-H	HiraMinProN-W3.otf
+otf-ujmr-v	UniJIS-UTF16-V	HiraMinProN-W3.otf
+otf-ujmb-h	UniJIS-UTF16-H	HiraMinProN-W6.otf
+otf-ujmb-v	UniJIS-UTF16-V	HiraMinProN-W6.otf
+otf-ujgr-h	UniJIS-UTF16-H	HiraKakuProN-W3.otf
+otf-ujgr-v	UniJIS-UTF16-V	HiraKakuProN-W3.otf
+otf-ujgb-h	UniJIS-UTF16-H	HiraKakuProN-W6.otf
+otf-ujgb-v	UniJIS-UTF16-V	HiraKakuProN-W6.otf
+otf-ujge-h	UniJIS-UTF16-H	HiraKakuStdN-W8.otf
+otf-ujge-v	UniJIS-UTF16-V	HiraKakuStdN-W8.otf
+otf-ujmgr-h	UniJIS-UTF16-H	HiraMaruProN-W4.otf
+otf-ujmgr-v	UniJIS-UTF16-V	HiraMaruProN-W4.otf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	HiraMinProN-W2.otf
+otf-ujmln-v	UniJIS2004-UTF16-V	HiraMinProN-W2.otf
+otf-ujmrn-h	UniJIS2004-UTF16-H	HiraMinProN-W3.otf
+otf-ujmrn-v	UniJIS2004-UTF16-V	HiraMinProN-W3.otf
+otf-ujmbn-h	UniJIS2004-UTF16-H	HiraMinProN-W6.otf
+otf-ujmbn-v	UniJIS2004-UTF16-V	HiraMinProN-W6.otf
+otf-ujgrn-h	UniJIS2004-UTF16-H	HiraKakuProN-W3.otf
+otf-ujgrn-v	UniJIS2004-UTF16-V	HiraKakuProN-W3.otf
+otf-ujgbn-h	UniJIS2004-UTF16-H	HiraKakuProN-W6.otf
+otf-ujgbn-v	UniJIS2004-UTF16-V	HiraKakuProN-W6.otf
+otf-ujgen-h	UniJIS2004-UTF16-H	HiraKakuStdN-W8.otf
+otf-ujgen-v	UniJIS2004-UTF16-V	HiraKakuStdN-W8.otf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	HiraMaruProN-W4.otf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	HiraMaruProN-W4.otf
+
+% hiraprop
+hiramin-w3-h Identity-H HiraMinProN-W3
+hiramin-w6-h Identity-H HiraMinProN-W6
+hirakaku-w3-h Identity-H HiraKakuProN-W3
+hirakaku-w6-h Identity-H HiraKakuProN-W6
+hiramaru-w4-h Identity-H HiraMaruProN-W4
+hiramin-w3-v Identity-V HiraMinProN-W3
+hiramin-w6-v Identity-V HiraMinProN-W6
+hirakaku-w3-v Identity-V HiraKakuProN-W3
+hirakaku-w6-v Identity-V HiraKakuProN-W6
+hiramaru-w4-v Identity-V HiraMaruProN-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
new file mode 100644
index 00000000000..3afddb038b7
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	HiraMinProN-W2.otf
+uphminl-v	UniJIS-UTF16-V	HiraMinProN-W2.otf
+uphminr-h	UniJIS-UTF16-H	HiraMinProN-W3.otf
+uphminr-v	UniJIS-UTF16-V	HiraMinProN-W3.otf
+uphminb-h	UniJIS-UTF16-H	HiraMinProN-W6.otf
+uphminb-v	UniJIS-UTF16-V	HiraMinProN-W6.otf
+uphgothr-h	UniJIS-UTF16-H	HiraKakuProN-W3.otf
+uphgothr-v	UniJIS-UTF16-V	HiraKakuProN-W3.otf
+uphgothb-h	UniJIS-UTF16-H	HiraKakuProN-W6.otf
+uphgothb-v	UniJIS-UTF16-V	HiraKakuProN-W6.otf
+uphgotheb-h	UniJIS-UTF16-H	HiraKakuStdN-W8.otf
+uphgotheb-v	UniJIS-UTF16-V	HiraKakuStdN-W8.otf
+uphmgothr-h	UniJIS-UTF16-H	HiraMaruProN-W4.otf
+uphmgothr-v	UniJIS-UTF16-V	HiraMaruProN-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map
new file mode 100644
index 00000000000..769ad550031
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map
@@ -0,0 +1,4 @@
+rml	2004-H	HiraMinProN-W3.otf
+rmlv	2004-V	HiraMinProN-W3.otf
+gbm	2004-H	HiraKakuProN-W6.otf
+gbmv	2004-V	HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map
new file mode 100644
index 00000000000..406c4e2dd9d
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map
@@ -0,0 +1,4 @@
+rml	H	HiraMinProN-W3.otf
+rmlv	V	HiraMinProN-W3.otf
+gbm	H	HiraKakuProN-W6.otf
+gbmv	V	HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map
new file mode 100644
index 00000000000..113f1a01b42
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map
@@ -0,0 +1,10 @@
+urml	UniJIS2004-UTF16-H	HiraMinProN-W3.otf
+urmlv	UniJIS2004-UTF16-V	HiraMinProN-W3.otf
+ugbm	UniJIS2004-UTF16-H	HiraKakuProN-W6.otf
+ugbmv	UniJIS2004-UTF16-V	HiraKakuProN-W6.otf
+uprml-h	UniJIS2004-UTF16-H	HiraMinProN-W3.otf
+uprml-v	UniJIS2004-UTF16-V	HiraMinProN-W3.otf
+upgbm-h	UniJIS2004-UTF16-H	HiraKakuProN-W6.otf
+upgbm-v	UniJIS2004-UTF16-V	HiraKakuProN-W6.otf
+uprml-hq	UniJIS-UCS2-H	HiraMinProN-W3.otf
+upgbm-hq	UniJIS-UCS2-H	HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map
new file mode 100644
index 00000000000..061bd5269c3
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	HiraMinProN-W3.otf
+urmlv	UniJIS-UTF16-V	HiraMinProN-W3.otf
+ugbm	UniJIS-UTF16-H	HiraKakuProN-W6.otf
+ugbmv	UniJIS-UTF16-V	HiraKakuProN-W6.otf
+uprml-h	UniJIS-UTF16-H	HiraMinProN-W3.otf
+uprml-v	UniJIS-UTF16-V	HiraMinProN-W3.otf
+upgbm-h	UniJIS-UTF16-H	HiraKakuProN-W6.otf
+upgbm-v	UniJIS-UTF16-V	HiraKakuProN-W6.otf
+uprml-hq	UniJIS-UCS2-H	HiraMinProN-W3.otf
+upgbm-hq	UniJIS-UCS2-H	HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
new file mode 100644
index 00000000000..79b3ae94dc1
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
@@ -0,0 +1,92 @@
+
+% TEXT, 90JIS
+hminl-h	H	HiraMinPro-W2.otf
+hminl-v	V	HiraMinPro-W2.otf
+hminr-h	H	HiraMinPro-W3.otf
+hminr-v	V	HiraMinPro-W3.otf
+hminb-h	H	HiraMinPro-W6.otf
+hminb-v	V	HiraMinPro-W6.otf
+hgothr-h	H	HiraKakuPro-W3.otf
+hgothr-v	V	HiraKakuPro-W3.otf
+hgothb-h	H	HiraKakuPro-W6.otf
+hgothb-v	V	HiraKakuPro-W6.otf
+hgotheb-h	H	HiraKakuStd-W8.otf
+hgotheb-v	V	HiraKakuStd-W8.otf
+hmgothr-h	H	HiraMaruPro-W4.otf
+hmgothr-v	V	HiraMaruPro-W4.otf
+
+% TEXT, JIS04
+hminln-h	H	HiraMinPro-W2.otf
+hminln-v	V	HiraMinPro-W2.otf
+hminrn-h	H	HiraMinPro-W3.otf
+hminrn-v	V	HiraMinPro-W3.otf
+hminbn-h	H	HiraMinPro-W6.otf
+hminbn-v	V	HiraMinPro-W6.otf
+hgothrn-h	H	HiraKakuPro-W3.otf
+hgothrn-v	V	HiraKakuPro-W3.otf
+hgothbn-h	H	HiraKakuPro-W6.otf
+hgothbn-v	V	HiraKakuPro-W6.otf
+hgothebn-h	H	HiraKakuStd-W8.otf
+hgothebn-v	V	HiraKakuStd-W8.otf
+hmgothrn-h	H	HiraMaruPro-W4.otf
+hmgothrn-v	V	HiraMaruPro-W4.otf
+
+% CID
+otf-cjml-h	Identity-H	HiraMinPro-W2.otf
+otf-cjml-v	Identity-V	HiraMinPro-W2.otf
+otf-cjmr-h	Identity-H	HiraMinPro-W3.otf
+otf-cjmr-v	Identity-V	HiraMinPro-W3.otf
+otf-cjmb-h	Identity-H	HiraMinPro-W6.otf
+otf-cjmb-v	Identity-V	HiraMinPro-W6.otf
+otf-cjgr-h	Identity-H	HiraKakuPro-W3.otf
+otf-cjgr-v	Identity-V	HiraKakuPro-W3.otf
+otf-cjgb-h	Identity-H	HiraKakuPro-W6.otf
+otf-cjgb-v	Identity-V	HiraKakuPro-W6.otf
+otf-cjge-h	Identity-H	HiraKakuStd-W8.otf
+otf-cjge-v	Identity-V	HiraKakuStd-W8.otf
+otf-cjmgr-h	Identity-H	HiraMaruPro-W4.otf
+otf-cjmgr-v	Identity-V	HiraMaruPro-W4.otf
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	HiraMinPro-W2.otf
+otf-ujml-v	UniJIS-UTF16-V	HiraMinPro-W2.otf
+otf-ujmr-h	UniJIS-UTF16-H	HiraMinPro-W3.otf
+otf-ujmr-v	UniJIS-UTF16-V	HiraMinPro-W3.otf
+otf-ujmb-h	UniJIS-UTF16-H	HiraMinPro-W6.otf
+otf-ujmb-v	UniJIS-UTF16-V	HiraMinPro-W6.otf
+otf-ujgr-h	UniJIS-UTF16-H	HiraKakuPro-W3.otf
+otf-ujgr-v	UniJIS-UTF16-V	HiraKakuPro-W3.otf
+otf-ujgb-h	UniJIS-UTF16-H	HiraKakuPro-W6.otf
+otf-ujgb-v	UniJIS-UTF16-V	HiraKakuPro-W6.otf
+otf-ujge-h	UniJIS-UTF16-H	HiraKakuStd-W8.otf
+otf-ujge-v	UniJIS-UTF16-V	HiraKakuStd-W8.otf
+otf-ujmgr-h	UniJIS-UTF16-H	HiraMaruPro-W4.otf
+otf-ujmgr-v	UniJIS-UTF16-V	HiraMaruPro-W4.otf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	HiraMinPro-W2.otf
+otf-ujmln-v	UniJIS2004-UTF16-V	HiraMinPro-W2.otf
+otf-ujmrn-h	UniJIS2004-UTF16-H	HiraMinPro-W3.otf
+otf-ujmrn-v	UniJIS2004-UTF16-V	HiraMinPro-W3.otf
+otf-ujmbn-h	UniJIS2004-UTF16-H	HiraMinPro-W6.otf
+otf-ujmbn-v	UniJIS2004-UTF16-V	HiraMinPro-W6.otf
+otf-ujgrn-h	UniJIS2004-UTF16-H	HiraKakuPro-W3.otf
+otf-ujgrn-v	UniJIS2004-UTF16-V	HiraKakuPro-W3.otf
+otf-ujgbn-h	UniJIS2004-UTF16-H	HiraKakuPro-W6.otf
+otf-ujgbn-v	UniJIS2004-UTF16-V	HiraKakuPro-W6.otf
+otf-ujgen-h	UniJIS2004-UTF16-H	HiraKakuStd-W8.otf
+otf-ujgen-v	UniJIS2004-UTF16-V	HiraKakuStd-W8.otf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	HiraMaruPro-W4.otf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	HiraMaruPro-W4.otf
+
+% hiraprop
+hiramin-w3-h Identity-H HiraMinPro-W3
+hiramin-w6-h Identity-H HiraMinPro-W6
+hirakaku-w3-h Identity-H HiraKakuPro-W3
+hirakaku-w6-h Identity-H HiraKakuPro-W6
+hiramaru-w4-h Identity-H HiraMaruPro-W4
+hiramin-w3-v Identity-V HiraMinPro-W3
+hiramin-w6-v Identity-V HiraMinPro-W6
+hirakaku-w3-v Identity-V HiraKakuPro-W3
+hirakaku-w6-v Identity-V HiraKakuPro-W6
+hiramaru-w4-v Identity-V HiraMaruPro-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
new file mode 100644
index 00000000000..7f5cc5a3025
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	HiraMinPro-W2.otf
+uphminl-v	UniJIS-UTF16-V	HiraMinPro-W2.otf
+uphminr-h	UniJIS-UTF16-H	HiraMinPro-W3.otf
+uphminr-v	UniJIS-UTF16-V	HiraMinPro-W3.otf
+uphminb-h	UniJIS-UTF16-H	HiraMinPro-W6.otf
+uphminb-v	UniJIS-UTF16-V	HiraMinPro-W6.otf
+uphgothr-h	UniJIS-UTF16-H	HiraKakuPro-W3.otf
+uphgothr-v	UniJIS-UTF16-V	HiraKakuPro-W3.otf
+uphgothb-h	UniJIS-UTF16-H	HiraKakuPro-W6.otf
+uphgothb-v	UniJIS-UTF16-V	HiraKakuPro-W6.otf
+uphgotheb-h	UniJIS-UTF16-H	HiraKakuStd-W8.otf
+uphgotheb-v	UniJIS-UTF16-V	HiraKakuStd-W8.otf
+uphmgothr-h	UniJIS-UTF16-H	HiraMaruPro-W4.otf
+uphmgothr-v	UniJIS-UTF16-V	HiraMaruPro-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map
new file mode 100644
index 00000000000..c91cedd405e
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map
@@ -0,0 +1,4 @@
+rml	2004-H	HiraMinPro-W3.otf
+rmlv	2004-V	HiraMinPro-W3.otf
+gbm	2004-H	HiraKakuPro-W6.otf
+gbmv	2004-V	HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map
new file mode 100644
index 00000000000..a5421735a80
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map
@@ -0,0 +1,4 @@
+rml	H	HiraMinPro-W3.otf
+rmlv	V	HiraMinPro-W3.otf
+gbm	H	HiraKakuPro-W6.otf
+gbmv	V	HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map
new file mode 100644
index 00000000000..ec445a4fc5b
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map
@@ -0,0 +1,10 @@
+urml	UniJIS2004-UTF16-H	HiraMinPro-W3.otf
+urmlv	UniJIS2004-UTF16-V	HiraMinPro-W3.otf
+ugbm	UniJIS2004-UTF16-H	HiraKakuPro-W6.otf
+ugbmv	UniJIS2004-UTF16-V	HiraKakuPro-W6.otf
+uprml-h	UniJIS2004-UTF16-H	HiraMinPro-W3.otf
+uprml-v	UniJIS2004-UTF16-V	HiraMinPro-W3.otf
+upgbm-h	UniJIS2004-UTF16-H	HiraKakuPro-W6.otf
+upgbm-v	UniJIS2004-UTF16-V	HiraKakuPro-W6.otf
+uprml-hq	UniJIS-UCS2-H	HiraMinPro-W3.otf
+upgbm-hq	UniJIS-UCS2-H	HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map
new file mode 100644
index 00000000000..2dfac238d72
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	HiraMinPro-W3.otf
+urmlv	UniJIS-UTF16-V	HiraMinPro-W3.otf
+ugbm	UniJIS-UTF16-H	HiraKakuPro-W6.otf
+ugbmv	UniJIS-UTF16-V	HiraKakuPro-W6.otf
+uprml-h	UniJIS-UTF16-H	HiraMinPro-W3.otf
+uprml-v	UniJIS-UTF16-V	HiraMinPro-W3.otf
+upgbm-h	UniJIS-UTF16-H	HiraKakuPro-W6.otf
+upgbm-v	UniJIS-UTF16-V	HiraKakuPro-W6.otf
+uprml-hq	UniJIS-UCS2-H	HiraMinPro-W3.otf
+upgbm-hq	UniJIS-UCS2-H	HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map
new file mode 100644
index 00000000000..cd2249ba0c4
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	ipam.ttf
+hminl-v	V	ipam.ttf
+hminr-h	H	ipam.ttf
+hminr-v	V	ipam.ttf
+hminb-h	H	ipam.ttf
+hminb-v	V	ipam.ttf
+hgothr-h	H	ipag.ttf
+hgothr-v	V	ipag.ttf
+hgothb-h	H	ipag.ttf
+hgothb-v	V	ipag.ttf
+hgotheb-h	H	ipag.ttf
+hgotheb-v	V	ipag.ttf
+hmgothr-h	H	ipag.ttf
+hmgothr-v	V	ipag.ttf
+
+% TEXT, JIS04
+hminln-h	H	ipam.ttf
+hminln-v	V	ipam.ttf
+hminrn-h	H	ipam.ttf
+hminrn-v	V	ipam.ttf
+hminbn-h	H	ipam.ttf
+hminbn-v	V	ipam.ttf
+hgothrn-h	H	ipag.ttf
+hgothrn-v	V	ipag.ttf
+hgothbn-h	H	ipag.ttf
+hgothbn-v	V	ipag.ttf
+hgothebn-h	H	ipag.ttf
+hgothebn-v	V	ipag.ttf
+hmgothrn-h	H	ipag.ttf
+hmgothrn-v	V	ipag.ttf
+
+% CID
+otf-cjml-h	Identity-H	ipam.ttf/AJ16
+otf-cjml-v	Identity-V	ipam.ttf/AJ16
+otf-cjmr-h	Identity-H	ipam.ttf/AJ16
+otf-cjmr-v	Identity-V	ipam.ttf/AJ16
+otf-cjmb-h	Identity-H	ipam.ttf/AJ16
+otf-cjmb-v	Identity-V	ipam.ttf/AJ16
+otf-cjgr-h	Identity-H	ipag.ttf/AJ16
+otf-cjgr-v	Identity-V	ipag.ttf/AJ16
+otf-cjgb-h	Identity-H	ipag.ttf/AJ16
+otf-cjgb-v	Identity-V	ipag.ttf/AJ16
+otf-cjge-h	Identity-H	ipag.ttf/AJ16
+otf-cjge-v	Identity-V	ipag.ttf/AJ16
+otf-cjmgr-h	Identity-H	ipag.ttf/AJ16
+otf-cjmgr-v	Identity-V	ipag.ttf/AJ16
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	ipam.ttf
+otf-ujml-v	UniJIS-UTF16-V	ipam.ttf
+otf-ujmr-h	UniJIS-UTF16-H	ipam.ttf
+otf-ujmr-v	UniJIS-UTF16-V	ipam.ttf
+otf-ujmb-h	UniJIS-UTF16-H	ipam.ttf
+otf-ujmb-v	UniJIS-UTF16-V	ipam.ttf
+otf-ujgr-h	UniJIS-UTF16-H	ipag.ttf
+otf-ujgr-v	UniJIS-UTF16-V	ipag.ttf
+otf-ujgb-h	UniJIS-UTF16-H	ipag.ttf
+otf-ujgb-v	UniJIS-UTF16-V	ipag.ttf
+otf-ujge-h	UniJIS-UTF16-H	ipag.ttf
+otf-ujge-v	UniJIS-UTF16-V	ipag.ttf
+otf-ujmgr-h	UniJIS-UTF16-H	ipag.ttf
+otf-ujmgr-v	UniJIS-UTF16-V	ipag.ttf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	ipam.ttf
+otf-ujmln-v	UniJIS2004-UTF16-V	ipam.ttf
+otf-ujmrn-h	UniJIS2004-UTF16-H	ipam.ttf
+otf-ujmrn-v	UniJIS2004-UTF16-V	ipam.ttf
+otf-ujmbn-h	UniJIS2004-UTF16-H	ipam.ttf
+otf-ujmbn-v	UniJIS2004-UTF16-V	ipam.ttf
+otf-ujgrn-h	UniJIS2004-UTF16-H	ipag.ttf
+otf-ujgrn-v	UniJIS2004-UTF16-V	ipag.ttf
+otf-ujgbn-h	UniJIS2004-UTF16-H	ipag.ttf
+otf-ujgbn-v	UniJIS2004-UTF16-V	ipag.ttf
+otf-ujgen-h	UniJIS2004-UTF16-H	ipag.ttf
+otf-ujgen-v	UniJIS2004-UTF16-V	ipag.ttf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	ipag.ttf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	ipag.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map
new file mode 100644
index 00000000000..776b8dffde6
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	ipam.ttf
+uphminl-v	UniJIS-UTF16-V	ipam.ttf
+uphminr-h	UniJIS-UTF16-H	ipam.ttf
+uphminr-v	UniJIS-UTF16-V	ipam.ttf
+uphminb-h	UniJIS-UTF16-H	ipam.ttf
+uphminb-v	UniJIS-UTF16-V	ipam.ttf
+uphgothr-h	UniJIS-UTF16-H	ipag.ttf
+uphgothr-v	UniJIS-UTF16-V	ipag.ttf
+uphgothb-h	UniJIS-UTF16-H	ipag.ttf
+uphgothb-v	UniJIS-UTF16-V	ipag.ttf
+uphgotheb-h	UniJIS-UTF16-H	ipag.ttf
+uphgotheb-v	UniJIS-UTF16-V	ipag.ttf
+uphmgothr-h	UniJIS-UTF16-H	ipag.ttf
+uphmgothr-v	UniJIS-UTF16-V	ipag.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map
new file mode 100644
index 00000000000..d30a31fe748
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map
@@ -0,0 +1,4 @@
+rml	H	ipam.ttf
+rmlv	V	ipam.ttf
+gbm	H	ipag.ttf
+gbmv	V	ipag.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map
new file mode 100644
index 00000000000..1ad6b704a3a
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	ipam.ttf
+urmlv	UniJIS-UTF16-V	ipam.ttf
+ugbm	UniJIS-UTF16-H	ipag.ttf
+ugbmv	UniJIS-UTF16-V	ipag.ttf
+uprml-h	UniJIS-UTF16-H	ipam.ttf
+uprml-v	UniJIS-UTF16-V	ipam.ttf
+upgbm-h	UniJIS-UTF16-H	ipag.ttf
+upgbm-v	UniJIS-UTF16-V	ipag.ttf
+uprml-hq	UniJIS-UCS2-H	ipam.ttf
+upgbm-hq	UniJIS-UCS2-H	ipag.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map
new file mode 100644
index 00000000000..0f713442ebc
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	ipaexm.ttf
+hminl-v	V	ipaexm.ttf
+hminr-h	H	ipaexm.ttf
+hminr-v	V	ipaexm.ttf
+hminb-h	H	ipaexm.ttf
+hminb-v	V	ipaexm.ttf
+hgothr-h	H	ipaexg.ttf
+hgothr-v	V	ipaexg.ttf
+hgothb-h	H	ipaexg.ttf
+hgothb-v	V	ipaexg.ttf
+hgotheb-h	H	ipaexg.ttf
+hgotheb-v	V	ipaexg.ttf
+hmgothr-h	H	ipaexg.ttf
+hmgothr-v	V	ipaexg.ttf
+
+% TEXT, JIS04
+hminln-h	H	ipaexm.ttf
+hminln-v	V	ipaexm.ttf
+hminrn-h	H	ipaexm.ttf
+hminrn-v	V	ipaexm.ttf
+hminbn-h	H	ipaexm.ttf
+hminbn-v	V	ipaexm.ttf
+hgothrn-h	H	ipaexg.ttf
+hgothrn-v	V	ipaexg.ttf
+hgothbn-h	H	ipaexg.ttf
+hgothbn-v	V	ipaexg.ttf
+hgothebn-h	H	ipaexg.ttf
+hgothebn-v	V	ipaexg.ttf
+hmgothrn-h	H	ipaexg.ttf
+hmgothrn-v	V	ipaexg.ttf
+
+% CID
+otf-cjml-h	Identity-H	ipaexm.ttf/AJ16
+otf-cjml-v	Identity-V	ipaexm.ttf/AJ16
+otf-cjmr-h	Identity-H	ipaexm.ttf/AJ16
+otf-cjmr-v	Identity-V	ipaexm.ttf/AJ16
+otf-cjmb-h	Identity-H	ipaexm.ttf/AJ16
+otf-cjmb-v	Identity-V	ipaexm.ttf/AJ16
+otf-cjgr-h	Identity-H	ipaexg.ttf/AJ16
+otf-cjgr-v	Identity-V	ipaexg.ttf/AJ16
+otf-cjgb-h	Identity-H	ipaexg.ttf/AJ16
+otf-cjgb-v	Identity-V	ipaexg.ttf/AJ16
+otf-cjge-h	Identity-H	ipaexg.ttf/AJ16
+otf-cjge-v	Identity-V	ipaexg.ttf/AJ16
+otf-cjmgr-h	Identity-H	ipaexg.ttf/AJ16
+otf-cjmgr-v	Identity-V	ipaexg.ttf/AJ16
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	ipaexm.ttf
+otf-ujml-v	UniJIS-UTF16-V	ipaexm.ttf
+otf-ujmr-h	UniJIS-UTF16-H	ipaexm.ttf
+otf-ujmr-v	UniJIS-UTF16-V	ipaexm.ttf
+otf-ujmb-h	UniJIS-UTF16-H	ipaexm.ttf
+otf-ujmb-v	UniJIS-UTF16-V	ipaexm.ttf
+otf-ujgr-h	UniJIS-UTF16-H	ipaexg.ttf
+otf-ujgr-v	UniJIS-UTF16-V	ipaexg.ttf
+otf-ujgb-h	UniJIS-UTF16-H	ipaexg.ttf
+otf-ujgb-v	UniJIS-UTF16-V	ipaexg.ttf
+otf-ujge-h	UniJIS-UTF16-H	ipaexg.ttf
+otf-ujge-v	UniJIS-UTF16-V	ipaexg.ttf
+otf-ujmgr-h	UniJIS-UTF16-H	ipaexg.ttf
+otf-ujmgr-v	UniJIS-UTF16-V	ipaexg.ttf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	ipaexm.ttf
+otf-ujmln-v	UniJIS2004-UTF16-V	ipaexm.ttf
+otf-ujmrn-h	UniJIS2004-UTF16-H	ipaexm.ttf
+otf-ujmrn-v	UniJIS2004-UTF16-V	ipaexm.ttf
+otf-ujmbn-h	UniJIS2004-UTF16-H	ipaexm.ttf
+otf-ujmbn-v	UniJIS2004-UTF16-V	ipaexm.ttf
+otf-ujgrn-h	UniJIS2004-UTF16-H	ipaexg.ttf
+otf-ujgrn-v	UniJIS2004-UTF16-V	ipaexg.ttf
+otf-ujgbn-h	UniJIS2004-UTF16-H	ipaexg.ttf
+otf-ujgbn-v	UniJIS2004-UTF16-V	ipaexg.ttf
+otf-ujgen-h	UniJIS2004-UTF16-H	ipaexg.ttf
+otf-ujgen-v	UniJIS2004-UTF16-V	ipaexg.ttf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	ipaexg.ttf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	ipaexg.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map
new file mode 100644
index 00000000000..2a05f9aecce
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	ipaexm.ttf
+uphminl-v	UniJIS-UTF16-V	ipaexm.ttf
+uphminr-h	UniJIS-UTF16-H	ipaexm.ttf
+uphminr-v	UniJIS-UTF16-V	ipaexm.ttf
+uphminb-h	UniJIS-UTF16-H	ipaexm.ttf
+uphminb-v	UniJIS-UTF16-V	ipaexm.ttf
+uphgothr-h	UniJIS-UTF16-H	ipaexg.ttf
+uphgothr-v	UniJIS-UTF16-V	ipaexg.ttf
+uphgothb-h	UniJIS-UTF16-H	ipaexg.ttf
+uphgothb-v	UniJIS-UTF16-V	ipaexg.ttf
+uphgotheb-h	UniJIS-UTF16-H	ipaexg.ttf
+uphgotheb-v	UniJIS-UTF16-V	ipaexg.ttf
+uphmgothr-h	UniJIS-UTF16-H	ipaexg.ttf
+uphmgothr-v	UniJIS-UTF16-V	ipaexg.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map
new file mode 100644
index 00000000000..c11f3e11317
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map
@@ -0,0 +1,4 @@
+rml	H	ipaexm.ttf
+rmlv	V	ipaexm.ttf
+gbm	H	ipaexg.ttf
+gbmv	V	ipaexg.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map
new file mode 100644
index 00000000000..afc58b146a1
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	ipaexm.ttf
+urmlv	UniJIS-UTF16-V	ipaexm.ttf
+ugbm	UniJIS-UTF16-H	ipaexg.ttf
+ugbmv	UniJIS-UTF16-V	ipaexg.ttf
+uprml-h	UniJIS-UTF16-H	ipaexm.ttf
+uprml-v	UniJIS-UTF16-V	ipaexm.ttf
+upgbm-h	UniJIS-UTF16-H	ipaexg.ttf
+upgbm-v	UniJIS-UTF16-V	ipaexg.ttf
+uprml-hq	UniJIS-UCS2-H	ipaexm.ttf
+upgbm-hq	UniJIS-UCS2-H	ipaexg.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map
new file mode 100644
index 00000000000..af409f34bc0
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	KozMinProVI-Light.otf
+hminl-v	V	KozMinProVI-Light.otf
+hminr-h	H	KozMinProVI-Regular.otf
+hminr-v	V	KozMinProVI-Regular.otf
+hminb-h	H	KozMinProVI-Bold.otf
+hminb-v	V	KozMinProVI-Bold.otf
+hgothr-h	H	KozGoProVI-Regular.otf
+hgothr-v	V	KozGoProVI-Regular.otf
+hgothb-h	H	KozGoProVI-Bold.otf
+hgothb-v	V	KozGoProVI-Bold.otf
+hgotheb-h	H	KozGoProVI-Heavy.otf
+hgotheb-v	V	KozGoProVI-Heavy.otf
+hmgothr-h	H	KozGoProVI-Heavy.otf
+hmgothr-v	V	KozGoProVI-Heavy.otf
+
+% TEXT, JIS04
+hminln-h	H	KozMinProVI-Light.otf
+hminln-v	V	KozMinProVI-Light.otf
+hminrn-h	H	KozMinProVI-Regular.otf
+hminrn-v	V	KozMinProVI-Regular.otf
+hminbn-h	H	KozMinProVI-Bold.otf
+hminbn-v	V	KozMinProVI-Bold.otf
+hgothrn-h	H	KozGoProVI-Regular.otf
+hgothrn-v	V	KozGoProVI-Regular.otf
+hgothbn-h	H	KozGoProVI-Bold.otf
+hgothbn-v	V	KozGoProVI-Bold.otf
+hgothebn-h	H	KozGoProVI-Heavy.otf
+hgothebn-v	V	KozGoProVI-Heavy.otf
+hmgothrn-h	H	KozGoProVI-Heavy.otf
+hmgothrn-v	V	KozGoProVI-Heavy.otf
+
+% CID
+otf-cjml-h	Identity-H	KozMinProVI-Light.otf
+otf-cjml-v	Identity-V	KozMinProVI-Light.otf
+otf-cjmr-h	Identity-H	KozMinProVI-Regular.otf
+otf-cjmr-v	Identity-V	KozMinProVI-Regular.otf
+otf-cjmb-h	Identity-H	KozMinProVI-Bold.otf
+otf-cjmb-v	Identity-V	KozMinProVI-Bold.otf
+otf-cjgr-h	Identity-H	KozGoProVI-Regular.otf
+otf-cjgr-v	Identity-V	KozGoProVI-Regular.otf
+otf-cjgb-h	Identity-H	KozGoProVI-Bold.otf
+otf-cjgb-v	Identity-V	KozGoProVI-Bold.otf
+otf-cjge-h	Identity-H	KozGoProVI-Heavy.otf
+otf-cjge-v	Identity-V	KozGoProVI-Heavy.otf
+otf-cjmgr-h	Identity-H	KozGoProVI-Heavy.otf
+otf-cjmgr-v	Identity-V	KozGoProVI-Heavy.otf
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	KozMinProVI-Light.otf
+otf-ujml-v	UniJIS-UTF16-V	KozMinProVI-Light.otf
+otf-ujmr-h	UniJIS-UTF16-H	KozMinProVI-Regular.otf
+otf-ujmr-v	UniJIS-UTF16-V	KozMinProVI-Regular.otf
+otf-ujmb-h	UniJIS-UTF16-H	KozMinProVI-Bold.otf
+otf-ujmb-v	UniJIS-UTF16-V	KozMinProVI-Bold.otf
+otf-ujgr-h	UniJIS-UTF16-H	KozGoProVI-Regular.otf
+otf-ujgr-v	UniJIS-UTF16-V	KozGoProVI-Regular.otf
+otf-ujgb-h	UniJIS-UTF16-H	KozGoProVI-Bold.otf
+otf-ujgb-v	UniJIS-UTF16-V	KozGoProVI-Bold.otf
+otf-ujge-h	UniJIS-UTF16-H	KozGoProVI-Heavy.otf
+otf-ujge-v	UniJIS-UTF16-V	KozGoProVI-Heavy.otf
+otf-ujmgr-h	UniJIS-UTF16-H	KozGoProVI-Heavy.otf
+otf-ujmgr-v	UniJIS-UTF16-V	KozGoProVI-Heavy.otf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	KozMinProVI-Light.otf
+otf-ujmln-v	UniJIS2004-UTF16-V	KozMinProVI-Light.otf
+otf-ujmrn-h	UniJIS2004-UTF16-H	KozMinProVI-Regular.otf
+otf-ujmrn-v	UniJIS2004-UTF16-V	KozMinProVI-Regular.otf
+otf-ujmbn-h	UniJIS2004-UTF16-H	KozMinProVI-Bold.otf
+otf-ujmbn-v	UniJIS2004-UTF16-V	KozMinProVI-Bold.otf
+otf-ujgrn-h	UniJIS2004-UTF16-H	KozGoProVI-Regular.otf
+otf-ujgrn-v	UniJIS2004-UTF16-V	KozGoProVI-Regular.otf
+otf-ujgbn-h	UniJIS2004-UTF16-H	KozGoProVI-Bold.otf
+otf-ujgbn-v	UniJIS2004-UTF16-V	KozGoProVI-Bold.otf
+otf-ujgen-h	UniJIS2004-UTF16-H	KozGoProVI-Heavy.otf
+otf-ujgen-v	UniJIS2004-UTF16-V	KozGoProVI-Heavy.otf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	KozGoProVI-Heavy.otf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	KozGoProVI-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
new file mode 100644
index 00000000000..fdf09fe4677
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	KozMinProVI-Light.otf
+uphminl-v	UniJIS-UTF16-V	KozMinProVI-Light.otf
+uphminr-h	UniJIS-UTF16-H	KozMinProVI-Regular.otf
+uphminr-v	UniJIS-UTF16-V	KozMinProVI-Regular.otf
+uphminb-h	UniJIS-UTF16-H	KozMinProVI-Bold.otf
+uphminb-v	UniJIS-UTF16-V	KozMinProVI-Bold.otf
+uphgothr-h	UniJIS-UTF16-H	KozGoProVI-Regular.otf
+uphgothr-v	UniJIS-UTF16-V	KozGoProVI-Regular.otf
+uphgothb-h	UniJIS-UTF16-H	KozGoProVI-Bold.otf
+uphgothb-v	UniJIS-UTF16-V	KozGoProVI-Bold.otf
+uphgotheb-h	UniJIS-UTF16-H	KozGoProVI-Heavy.otf
+uphgotheb-v	UniJIS-UTF16-V	KozGoProVI-Heavy.otf
+uphmgothr-h	UniJIS-UTF16-H	KozGoProVI-Heavy.otf
+uphmgothr-v	UniJIS-UTF16-V	KozGoProVI-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map
new file mode 100644
index 00000000000..419cbacd19f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map
@@ -0,0 +1,4 @@
+rml	2004-H	KozMinProVI-Regular.otf
+rmlv	2004-V	KozMinProVI-Regular.otf
+gbm	2004-H	KozGoProVI-Medium.otf
+gbmv	2004-V	KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map
new file mode 100644
index 00000000000..b4b281e21e0
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map
@@ -0,0 +1,4 @@
+rml	H	KozMinProVI-Regular.otf
+rmlv	V	KozMinProVI-Regular.otf
+gbm	H	KozGoProVI-Medium.otf
+gbmv	V	KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map
new file mode 100644
index 00000000000..e8f3308d557
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map
@@ -0,0 +1,10 @@
+urml	UniJIS2004-UTF16-H	KozMinProVI-Regular.otf
+urmlv	UniJIS2004-UTF16-V	KozMinProVI-Regular.otf
+ugbm	UniJIS2004-UTF16-H	KozGoProVI-Medium.otf
+ugbmv	UniJIS2004-UTF16-V	KozGoProVI-Medium.otf
+uprml-h	UniJIS2004-UTF16-H	KozMinProVI-Regular.otf
+uprml-v	UniJIS2004-UTF16-V	KozMinProVI-Regular.otf
+upgbm-h	UniJIS2004-UTF16-H	KozGoProVI-Medium.otf
+upgbm-v	UniJIS2004-UTF16-V	KozGoProVI-Medium.otf
+uprml-hq	UniJIS-UCS2-H	KozMinProVI-Regular.otf
+upgbm-hq	UniJIS-UCS2-H	KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map
new file mode 100644
index 00000000000..7521c9900ab
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	KozMinProVI-Regular.otf
+urmlv	UniJIS-UTF16-V	KozMinProVI-Regular.otf
+ugbm	UniJIS-UTF16-H	KozGoProVI-Medium.otf
+ugbmv	UniJIS-UTF16-V	KozGoProVI-Medium.otf
+uprml-h	UniJIS-UTF16-H	KozMinProVI-Regular.otf
+uprml-v	UniJIS-UTF16-V	KozMinProVI-Regular.otf
+upgbm-h	UniJIS-UTF16-H	KozGoProVI-Medium.otf
+upgbm-v	UniJIS-UTF16-V	KozGoProVI-Medium.otf
+uprml-hq	UniJIS-UCS2-H	KozMinProVI-Regular.otf
+upgbm-hq	UniJIS-UCS2-H	KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map
new file mode 100644
index 00000000000..b0ad481ff34
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	KozMinPr6N-Light.otf
+hminl-v	V	KozMinPr6N-Light.otf
+hminr-h	H	KozMinPr6N-Regular.otf
+hminr-v	V	KozMinPr6N-Regular.otf
+hminb-h	H	KozMinPr6N-Bold.otf
+hminb-v	V	KozMinPr6N-Bold.otf
+hgothr-h	H	KozGoPr6N-Regular.otf
+hgothr-v	V	KozGoPr6N-Regular.otf
+hgothb-h	H	KozGoPr6N-Bold.otf
+hgothb-v	V	KozGoPr6N-Bold.otf
+hgotheb-h	H	KozGoPr6N-Heavy.otf
+hgotheb-v	V	KozGoPr6N-Heavy.otf
+hmgothr-h	H	KozGoPr6N-Heavy.otf
+hmgothr-v	V	KozGoPr6N-Heavy.otf
+
+% TEXT, JIS04
+hminln-h	H	KozMinPr6N-Light.otf
+hminln-v	V	KozMinPr6N-Light.otf
+hminrn-h	H	KozMinPr6N-Regular.otf
+hminrn-v	V	KozMinPr6N-Regular.otf
+hminbn-h	H	KozMinPr6N-Bold.otf
+hminbn-v	V	KozMinPr6N-Bold.otf
+hgothrn-h	H	KozGoPr6N-Regular.otf
+hgothrn-v	V	KozGoPr6N-Regular.otf
+hgothbn-h	H	KozGoPr6N-Bold.otf
+hgothbn-v	V	KozGoPr6N-Bold.otf
+hgothebn-h	H	KozGoPr6N-Heavy.otf
+hgothebn-v	V	KozGoPr6N-Heavy.otf
+hmgothrn-h	H	KozGoPr6N-Heavy.otf
+hmgothrn-v	V	KozGoPr6N-Heavy.otf
+
+% CID
+otf-cjml-h	Identity-H	KozMinPr6N-Light.otf
+otf-cjml-v	Identity-V	KozMinPr6N-Light.otf
+otf-cjmr-h	Identity-H	KozMinPr6N-Regular.otf
+otf-cjmr-v	Identity-V	KozMinPr6N-Regular.otf
+otf-cjmb-h	Identity-H	KozMinPr6N-Bold.otf
+otf-cjmb-v	Identity-V	KozMinPr6N-Bold.otf
+otf-cjgr-h	Identity-H	KozGoPr6N-Regular.otf
+otf-cjgr-v	Identity-V	KozGoPr6N-Regular.otf
+otf-cjgb-h	Identity-H	KozGoPr6N-Bold.otf
+otf-cjgb-v	Identity-V	KozGoPr6N-Bold.otf
+otf-cjge-h	Identity-H	KozGoPr6N-Heavy.otf
+otf-cjge-v	Identity-V	KozGoPr6N-Heavy.otf
+otf-cjmgr-h	Identity-H	KozGoPr6N-Heavy.otf
+otf-cjmgr-v	Identity-V	KozGoPr6N-Heavy.otf
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	KozMinPr6N-Light.otf
+otf-ujml-v	UniJIS-UTF16-V	KozMinPr6N-Light.otf
+otf-ujmr-h	UniJIS-UTF16-H	KozMinPr6N-Regular.otf
+otf-ujmr-v	UniJIS-UTF16-V	KozMinPr6N-Regular.otf
+otf-ujmb-h	UniJIS-UTF16-H	KozMinPr6N-Bold.otf
+otf-ujmb-v	UniJIS-UTF16-V	KozMinPr6N-Bold.otf
+otf-ujgr-h	UniJIS-UTF16-H	KozGoPr6N-Regular.otf
+otf-ujgr-v	UniJIS-UTF16-V	KozGoPr6N-Regular.otf
+otf-ujgb-h	UniJIS-UTF16-H	KozGoPr6N-Bold.otf
+otf-ujgb-v	UniJIS-UTF16-V	KozGoPr6N-Bold.otf
+otf-ujge-h	UniJIS-UTF16-H	KozGoPr6N-Heavy.otf
+otf-ujge-v	UniJIS-UTF16-V	KozGoPr6N-Heavy.otf
+otf-ujmgr-h	UniJIS-UTF16-H	KozGoPr6N-Heavy.otf
+otf-ujmgr-v	UniJIS-UTF16-V	KozGoPr6N-Heavy.otf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	KozMinPr6N-Light.otf
+otf-ujmln-v	UniJIS2004-UTF16-V	KozMinPr6N-Light.otf
+otf-ujmrn-h	UniJIS2004-UTF16-H	KozMinPr6N-Regular.otf
+otf-ujmrn-v	UniJIS2004-UTF16-V	KozMinPr6N-Regular.otf
+otf-ujmbn-h	UniJIS2004-UTF16-H	KozMinPr6N-Bold.otf
+otf-ujmbn-v	UniJIS2004-UTF16-V	KozMinPr6N-Bold.otf
+otf-ujgrn-h	UniJIS2004-UTF16-H	KozGoPr6N-Regular.otf
+otf-ujgrn-v	UniJIS2004-UTF16-V	KozGoPr6N-Regular.otf
+otf-ujgbn-h	UniJIS2004-UTF16-H	KozGoPr6N-Bold.otf
+otf-ujgbn-v	UniJIS2004-UTF16-V	KozGoPr6N-Bold.otf
+otf-ujgen-h	UniJIS2004-UTF16-H	KozGoPr6N-Heavy.otf
+otf-ujgen-v	UniJIS2004-UTF16-V	KozGoPr6N-Heavy.otf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	KozGoPr6N-Heavy.otf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	KozGoPr6N-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
new file mode 100644
index 00000000000..8a34d0186a4
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	KozMinPr6N-Light.otf
+uphminl-v	UniJIS-UTF16-V	KozMinPr6N-Light.otf
+uphminr-h	UniJIS-UTF16-H	KozMinPr6N-Regular.otf
+uphminr-v	UniJIS-UTF16-V	KozMinPr6N-Regular.otf
+uphminb-h	UniJIS-UTF16-H	KozMinPr6N-Bold.otf
+uphminb-v	UniJIS-UTF16-V	KozMinPr6N-Bold.otf
+uphgothr-h	UniJIS-UTF16-H	KozGoPr6N-Regular.otf
+uphgothr-v	UniJIS-UTF16-V	KozGoPr6N-Regular.otf
+uphgothb-h	UniJIS-UTF16-H	KozGoPr6N-Bold.otf
+uphgothb-v	UniJIS-UTF16-V	KozGoPr6N-Bold.otf
+uphgotheb-h	UniJIS-UTF16-H	KozGoPr6N-Heavy.otf
+uphgotheb-v	UniJIS-UTF16-V	KozGoPr6N-Heavy.otf
+uphmgothr-h	UniJIS-UTF16-H	KozGoPr6N-Heavy.otf
+uphmgothr-v	UniJIS-UTF16-V	KozGoPr6N-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map
new file mode 100644
index 00000000000..ba254ca7c03
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map
@@ -0,0 +1,4 @@
+rml	2004-H	KozMinPr6N-Regular.otf
+rmlv	2004-V	KozMinPr6N-Regular.otf
+gbm	2004-H	KozGoPr6N-Medium.otf
+gbmv	2004-V	KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map
new file mode 100644
index 00000000000..03272e2b87a
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map
@@ -0,0 +1,4 @@
+rml	H	KozMinPr6N-Regular.otf
+rmlv	V	KozMinPr6N-Regular.otf
+gbm	H	KozGoPr6N-Medium.otf
+gbmv	V	KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map
new file mode 100644
index 00000000000..a5d0e7de04d
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map
@@ -0,0 +1,10 @@
+urml	UniJIS2004-UTF16-H	KozMinPr6N-Regular.otf
+urmlv	UniJIS2004-UTF16-V	KozMinPr6N-Regular.otf
+ugbm	UniJIS2004-UTF16-H	KozGoPr6N-Medium.otf
+ugbmv	UniJIS2004-UTF16-V	KozGoPr6N-Medium.otf
+uprml-h	UniJIS2004-UTF16-H	KozMinPr6N-Regular.otf
+uprml-v	UniJIS2004-UTF16-V	KozMinPr6N-Regular.otf
+upgbm-h	UniJIS2004-UTF16-H	KozGoPr6N-Medium.otf
+upgbm-v	UniJIS2004-UTF16-V	KozGoPr6N-Medium.otf
+uprml-hq	UniJIS-UCS2-H	KozMinPr6N-Regular.otf
+upgbm-hq	UniJIS-UCS2-H	KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map
new file mode 100644
index 00000000000..7210d879ab5
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	KozMinPr6N-Regular.otf
+urmlv	UniJIS-UTF16-V	KozMinPr6N-Regular.otf
+ugbm	UniJIS-UTF16-H	KozGoPr6N-Medium.otf
+ugbmv	UniJIS-UTF16-V	KozGoPr6N-Medium.otf
+uprml-h	UniJIS-UTF16-H	KozMinPr6N-Regular.otf
+uprml-v	UniJIS-UTF16-V	KozMinPr6N-Regular.otf
+upgbm-h	UniJIS-UTF16-H	KozGoPr6N-Medium.otf
+upgbm-v	UniJIS-UTF16-V	KozGoPr6N-Medium.otf
+uprml-hq	UniJIS-UCS2-H	KozMinPr6N-Regular.otf
+upgbm-hq	UniJIS-UCS2-H	KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map
new file mode 100644
index 00000000000..46630111453
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	KozMinPro-Light.otf
+hminl-v	V	KozMinPro-Light.otf
+hminr-h	H	KozMinPro-Regular.otf
+hminr-v	V	KozMinPro-Regular.otf
+hminb-h	H	KozMinPro-Bold.otf
+hminb-v	V	KozMinPro-Bold.otf
+hgothr-h	H	KozGoPro-Regular.otf
+hgothr-v	V	KozGoPro-Regular.otf
+hgothb-h	H	KozGoPro-Bold.otf
+hgothb-v	V	KozGoPro-Bold.otf
+hgotheb-h	H	KozGoPro-Heavy.otf
+hgotheb-v	V	KozGoPro-Heavy.otf
+hmgothr-h	H	KozGoPro-Heavy.otf
+hmgothr-v	V	KozGoPro-Heavy.otf
+
+% TEXT, JIS04
+hminln-h	H	KozMinPro-Light.otf
+hminln-v	V	KozMinPro-Light.otf
+hminrn-h	H	KozMinPro-Regular.otf
+hminrn-v	V	KozMinPro-Regular.otf
+hminbn-h	H	KozMinPro-Bold.otf
+hminbn-v	V	KozMinPro-Bold.otf
+hgothrn-h	H	KozGoPro-Regular.otf
+hgothrn-v	V	KozGoPro-Regular.otf
+hgothbn-h	H	KozGoPro-Bold.otf
+hgothbn-v	V	KozGoPro-Bold.otf
+hgothebn-h	H	KozGoPro-Heavy.otf
+hgothebn-v	V	KozGoPro-Heavy.otf
+hmgothrn-h	H	KozGoPro-Heavy.otf
+hmgothrn-v	V	KozGoPro-Heavy.otf
+
+% CID
+otf-cjml-h	Identity-H	KozMinPro-Light.otf
+otf-cjml-v	Identity-V	KozMinPro-Light.otf
+otf-cjmr-h	Identity-H	KozMinPro-Regular.otf
+otf-cjmr-v	Identity-V	KozMinPro-Regular.otf
+otf-cjmb-h	Identity-H	KozMinPro-Bold.otf
+otf-cjmb-v	Identity-V	KozMinPro-Bold.otf
+otf-cjgr-h	Identity-H	KozGoPro-Regular.otf
+otf-cjgr-v	Identity-V	KozGoPro-Regular.otf
+otf-cjgb-h	Identity-H	KozGoPro-Bold.otf
+otf-cjgb-v	Identity-V	KozGoPro-Bold.otf
+otf-cjge-h	Identity-H	KozGoPro-Heavy.otf
+otf-cjge-v	Identity-V	KozGoPro-Heavy.otf
+otf-cjmgr-h	Identity-H	KozGoPro-Heavy.otf
+otf-cjmgr-v	Identity-V	KozGoPro-Heavy.otf
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	KozMinPro-Light.otf
+otf-ujml-v	UniJIS-UTF16-V	KozMinPro-Light.otf
+otf-ujmr-h	UniJIS-UTF16-H	KozMinPro-Regular.otf
+otf-ujmr-v	UniJIS-UTF16-V	KozMinPro-Regular.otf
+otf-ujmb-h	UniJIS-UTF16-H	KozMinPro-Bold.otf
+otf-ujmb-v	UniJIS-UTF16-V	KozMinPro-Bold.otf
+otf-ujgr-h	UniJIS-UTF16-H	KozGoPro-Regular.otf
+otf-ujgr-v	UniJIS-UTF16-V	KozGoPro-Regular.otf
+otf-ujgb-h	UniJIS-UTF16-H	KozGoPro-Bold.otf
+otf-ujgb-v	UniJIS-UTF16-V	KozGoPro-Bold.otf
+otf-ujge-h	UniJIS-UTF16-H	KozGoPro-Heavy.otf
+otf-ujge-v	UniJIS-UTF16-V	KozGoPro-Heavy.otf
+otf-ujmgr-h	UniJIS-UTF16-H	KozGoPro-Heavy.otf
+otf-ujmgr-v	UniJIS-UTF16-V	KozGoPro-Heavy.otf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	KozMinPro-Light.otf
+otf-ujmln-v	UniJIS2004-UTF16-V	KozMinPro-Light.otf
+otf-ujmrn-h	UniJIS2004-UTF16-H	KozMinPro-Regular.otf
+otf-ujmrn-v	UniJIS2004-UTF16-V	KozMinPro-Regular.otf
+otf-ujmbn-h	UniJIS2004-UTF16-H	KozMinPro-Bold.otf
+otf-ujmbn-v	UniJIS2004-UTF16-V	KozMinPro-Bold.otf
+otf-ujgrn-h	UniJIS2004-UTF16-H	KozGoPro-Regular.otf
+otf-ujgrn-v	UniJIS2004-UTF16-V	KozGoPro-Regular.otf
+otf-ujgbn-h	UniJIS2004-UTF16-H	KozGoPro-Bold.otf
+otf-ujgbn-v	UniJIS2004-UTF16-V	KozGoPro-Bold.otf
+otf-ujgen-h	UniJIS2004-UTF16-H	KozGoPro-Heavy.otf
+otf-ujgen-v	UniJIS2004-UTF16-V	KozGoPro-Heavy.otf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	KozGoPro-Heavy.otf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	KozGoPro-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
new file mode 100644
index 00000000000..0f1ef5f6bc3
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	KozMinPro-Light.otf
+uphminl-v	UniJIS-UTF16-V	KozMinPro-Light.otf
+uphminr-h	UniJIS-UTF16-H	KozMinPro-Regular.otf
+uphminr-v	UniJIS-UTF16-V	KozMinPro-Regular.otf
+uphminb-h	UniJIS-UTF16-H	KozMinPro-Bold.otf
+uphminb-v	UniJIS-UTF16-V	KozMinPro-Bold.otf
+uphgothr-h	UniJIS-UTF16-H	KozGoPro-Regular.otf
+uphgothr-v	UniJIS-UTF16-V	KozGoPro-Regular.otf
+uphgothb-h	UniJIS-UTF16-H	KozGoPro-Bold.otf
+uphgothb-v	UniJIS-UTF16-V	KozGoPro-Bold.otf
+uphgotheb-h	UniJIS-UTF16-H	KozGoPro-Heavy.otf
+uphgotheb-v	UniJIS-UTF16-V	KozGoPro-Heavy.otf
+uphmgothr-h	UniJIS-UTF16-H	KozGoPro-Heavy.otf
+uphmgothr-v	UniJIS-UTF16-V	KozGoPro-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map
new file mode 100644
index 00000000000..83c0241abfd
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map
@@ -0,0 +1,4 @@
+rml	2004-H	KozMinPro-Regular.otf
+rmlv	2004-V	KozMinPro-Regular.otf
+gbm	2004-H	KozGoPro-Medium.otf
+gbmv	2004-V	KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map
new file mode 100644
index 00000000000..8f3158e513a
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map
@@ -0,0 +1,4 @@
+rml	H	KozMinPro-Regular.otf
+rmlv	V	KozMinPro-Regular.otf
+gbm	H	KozGoPro-Medium.otf
+gbmv	V	KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map
new file mode 100644
index 00000000000..0b647bf3807
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map
@@ -0,0 +1,10 @@
+urml	UniJIS2004-UTF16-H	KozMinPro-Regular.otf
+urmlv	UniJIS2004-UTF16-V	KozMinPro-Regular.otf
+ugbm	UniJIS2004-UTF16-H	KozGoPro-Medium.otf
+ugbmv	UniJIS2004-UTF16-V	KozGoPro-Medium.otf
+uprml-h	UniJIS2004-UTF16-H	KozMinPro-Regular.otf
+uprml-v	UniJIS2004-UTF16-V	KozMinPro-Regular.otf
+upgbm-h	UniJIS2004-UTF16-H	KozGoPro-Medium.otf
+upgbm-v	UniJIS2004-UTF16-V	KozGoPro-Medium.otf
+uprml-hq	UniJIS-UCS2-H	KozMinPro-Regular.otf
+upgbm-hq	UniJIS-UCS2-H	KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map
new file mode 100644
index 00000000000..fde211af58f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	KozMinPro-Regular.otf
+urmlv	UniJIS-UTF16-V	KozMinPro-Regular.otf
+ugbm	UniJIS-UTF16-H	KozGoPro-Medium.otf
+ugbmv	UniJIS-UTF16-V	KozGoPro-Medium.otf
+uprml-h	UniJIS-UTF16-H	KozMinPro-Regular.otf
+uprml-v	UniJIS-UTF16-V	KozMinPro-Regular.otf
+upgbm-h	UniJIS-UTF16-H	KozGoPro-Medium.otf
+upgbm-v	UniJIS-UTF16-V	KozGoPro-Medium.otf
+uprml-hq	UniJIS-UCS2-H	KozMinPro-Regular.otf
+upgbm-hq	UniJIS-UCS2-H	KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map
new file mode 100644
index 00000000000..861f04d2d8f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	A-OTF-RyuminPr6N-Light.otf
+hminl-v	V	A-OTF-RyuminPr6N-Light.otf
+hminr-h	H	A-OTF-RyuminPr6N-Light.otf
+hminr-v	V	A-OTF-RyuminPr6N-Light.otf
+hminb-h	H	A-OTF-FutoMinA101Pr6N-Bold.otf
+hminb-v	V	A-OTF-FutoMinA101Pr6N-Bold.otf
+hgothr-h	H	A-OTF-GothicBBBPr6N-Medium.otf
+hgothr-v	V	A-OTF-GothicBBBPr6N-Medium.otf
+hgothb-h	H	A-OTF-FutoGoB101Pr6N-Bold.otf
+hgothb-v	V	A-OTF-FutoGoB101Pr6N-Bold.otf
+hgotheb-h	H	A-OTF-MidashiGoPr6N-MB31.otf
+hgotheb-v	V	A-OTF-MidashiGoPr6N-MB31.otf
+hmgothr-h	H	A-OTF-Jun101Pr6N-Light.otf
+hmgothr-v	V	A-OTF-Jun101Pr6N-Light.otf
+
+% TEXT, JIS04
+hminln-h	H	A-OTF-RyuminPr6N-Light.otf
+hminln-v	V	A-OTF-RyuminPr6N-Light.otf
+hminrn-h	H	A-OTF-RyuminPr6N-Light.otf
+hminrn-v	V	A-OTF-RyuminPr6N-Light.otf
+hminbn-h	H	A-OTF-FutoMinA101Pr6N-Bold.otf
+hminbn-v	V	A-OTF-FutoMinA101Pr6N-Bold.otf
+hgothrn-h	H	A-OTF-GothicBBBPr6N-Medium.otf
+hgothrn-v	V	A-OTF-GothicBBBPr6N-Medium.otf
+hgothbn-h	H	A-OTF-FutoGoB101Pr6N-Bold.otf
+hgothbn-v	V	A-OTF-FutoGoB101Pr6N-Bold.otf
+hgothebn-h	H	A-OTF-MidashiGoPr6N-MB31.otf
+hgothebn-v	V	A-OTF-MidashiGoPr6N-MB31.otf
+hmgothrn-h	H	A-OTF-Jun101Pr6N-Light.otf
+hmgothrn-v	V	A-OTF-Jun101Pr6N-Light.otf
+
+% CID
+otf-cjml-h	Identity-H	A-OTF-RyuminPr6N-Light.otf
+otf-cjml-v	Identity-V	A-OTF-RyuminPr6N-Light.otf
+otf-cjmr-h	Identity-H	A-OTF-RyuminPr6N-Light.otf
+otf-cjmr-v	Identity-V	A-OTF-RyuminPr6N-Light.otf
+otf-cjmb-h	Identity-H	A-OTF-FutoMinA101Pr6N-Bold.otf
+otf-cjmb-v	Identity-V	A-OTF-FutoMinA101Pr6N-Bold.otf
+otf-cjgr-h	Identity-H	A-OTF-GothicBBBPr6N-Medium.otf
+otf-cjgr-v	Identity-V	A-OTF-GothicBBBPr6N-Medium.otf
+otf-cjgb-h	Identity-H	A-OTF-FutoGoB101Pr6N-Bold.otf
+otf-cjgb-v	Identity-V	A-OTF-FutoGoB101Pr6N-Bold.otf
+otf-cjge-h	Identity-H	A-OTF-MidashiGoPr6N-MB31.otf
+otf-cjge-v	Identity-V	A-OTF-MidashiGoPr6N-MB31.otf
+otf-cjmgr-h	Identity-H	A-OTF-Jun101Pr6N-Light.otf
+otf-cjmgr-v	Identity-V	A-OTF-Jun101Pr6N-Light.otf
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+otf-ujml-v	UniJIS-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+otf-ujmr-h	UniJIS-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+otf-ujmr-v	UniJIS-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+otf-ujmb-h	UniJIS-UTF16-H	A-OTF-FutoMinA101Pr6N-Bold.otf
+otf-ujmb-v	UniJIS-UTF16-V	A-OTF-FutoMinA101Pr6N-Bold.otf
+otf-ujgr-h	UniJIS-UTF16-H	A-OTF-GothicBBBPr6N-Medium.otf
+otf-ujgr-v	UniJIS-UTF16-V	A-OTF-GothicBBBPr6N-Medium.otf
+otf-ujgb-h	UniJIS-UTF16-H	A-OTF-FutoGoB101Pr6N-Bold.otf
+otf-ujgb-v	UniJIS-UTF16-V	A-OTF-FutoGoB101Pr6N-Bold.otf
+otf-ujge-h	UniJIS-UTF16-H	A-OTF-MidashiGoPr6N-MB31.otf
+otf-ujge-v	UniJIS-UTF16-V	A-OTF-MidashiGoPr6N-MB31.otf
+otf-ujmgr-h	UniJIS-UTF16-H	A-OTF-Jun101Pr6N-Light.otf
+otf-ujmgr-v	UniJIS-UTF16-V	A-OTF-Jun101Pr6N-Light.otf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+otf-ujmln-v	UniJIS2004-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+otf-ujmrn-h	UniJIS2004-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+otf-ujmrn-v	UniJIS2004-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+otf-ujmbn-h	UniJIS2004-UTF16-H	A-OTF-FutoMinA101Pr6N-Bold.otf
+otf-ujmbn-v	UniJIS2004-UTF16-V	A-OTF-FutoMinA101Pr6N-Bold.otf
+otf-ujgrn-h	UniJIS2004-UTF16-H	A-OTF-GothicBBBPr6N-Medium.otf
+otf-ujgrn-v	UniJIS2004-UTF16-V	A-OTF-GothicBBBPr6N-Medium.otf
+otf-ujgbn-h	UniJIS2004-UTF16-H	A-OTF-FutoGoB101Pr6N-Bold.otf
+otf-ujgbn-v	UniJIS2004-UTF16-V	A-OTF-FutoGoB101Pr6N-Bold.otf
+otf-ujgen-h	UniJIS2004-UTF16-H	A-OTF-MidashiGoPr6N-MB31.otf
+otf-ujgen-v	UniJIS2004-UTF16-V	A-OTF-MidashiGoPr6N-MB31.otf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	A-OTF-Jun101Pr6N-Light.otf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	A-OTF-Jun101Pr6N-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
new file mode 100644
index 00000000000..041ec3de639
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+uphminl-v	UniJIS-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+uphminr-h	UniJIS-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+uphminr-v	UniJIS-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+uphminb-h	UniJIS-UTF16-H	A-OTF-FutoMinA101Pr6N-Bold.otf
+uphminb-v	UniJIS-UTF16-V	A-OTF-FutoMinA101Pr6N-Bold.otf
+uphgothr-h	UniJIS-UTF16-H	A-OTF-GothicBBBPr6N-Medium.otf
+uphgothr-v	UniJIS-UTF16-V	A-OTF-GothicBBBPr6N-Medium.otf
+uphgothb-h	UniJIS-UTF16-H	A-OTF-FutoGoB101Pr6N-Bold.otf
+uphgothb-v	UniJIS-UTF16-V	A-OTF-FutoGoB101Pr6N-Bold.otf
+uphgotheb-h	UniJIS-UTF16-H	A-OTF-MidashiGoPr6N-MB31.otf
+uphgotheb-v	UniJIS-UTF16-V	A-OTF-MidashiGoPr6N-MB31.otf
+uphmgothr-h	UniJIS-UTF16-H	A-OTF-Jun101Pr6N-Light.otf
+uphmgothr-v	UniJIS-UTF16-V	A-OTF-Jun101Pr6N-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map
new file mode 100644
index 00000000000..19182643b37
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map
@@ -0,0 +1,4 @@
+rml	2004-H	A-OTF-RyuminPr6N-Light.otf
+rmlv	2004-V	A-OTF-RyuminPr6N-Light.otf
+gbm	2004-H	A-OTF-GothicBBBPr6N-Medium.otf
+gbmv	2004-V	A-OTF-GothicBBBPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map
new file mode 100644
index 00000000000..fcb8549cec7
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map
@@ -0,0 +1,4 @@
+rml	H	A-OTF-RyuminPr6N-Light.otf
+rmlv	V	A-OTF-RyuminPr6N-Light.otf
+gbm	H	A-OTF-GothicBBBPr6N-Medium.otf
+gbmv	V	A-OTF-GothicBBBPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map
new file mode 100644
index 00000000000..c5ec04765f2
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map
@@ -0,0 +1,10 @@
+urml	UniJIS2004-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+urmlv	UniJIS2004-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+ugbm	UniJIS2004-UTF16-H	A-OTF-GothicBBBPr6N-Medium.otf
+ugbmv	UniJIS2004-UTF16-V	A-OTF-GothicBBBPr6N-Medium.otf
+uprml-h	UniJIS2004-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+uprml-v	UniJIS2004-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+upgbm-h	UniJIS2004-UTF16-H	A-OTF-GothicBBBPr6N-Medium.otf
+upgbm-v	UniJIS2004-UTF16-V	A-OTF-GothicBBBPr6N-Medium.otf
+uprml-hq	UniJIS-UCS2-H	A-OTF-RyuminPr6N-Light.otf
+upgbm-hq	UniJIS-UCS2-H	A-OTF-GothicBBBPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map
new file mode 100644
index 00000000000..c20f5c7c78e
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+urmlv	UniJIS-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+ugbm	UniJIS-UTF16-H	A-OTF-GothicBBBPr6N-Medium.otf
+ugbmv	UniJIS-UTF16-V	A-OTF-GothicBBBPr6N-Medium.otf
+uprml-h	UniJIS-UTF16-H	A-OTF-RyuminPr6N-Light.otf
+uprml-v	UniJIS-UTF16-V	A-OTF-RyuminPr6N-Light.otf
+upgbm-h	UniJIS-UTF16-H	A-OTF-GothicBBBPr6N-Medium.otf
+upgbm-v	UniJIS-UTF16-V	A-OTF-GothicBBBPr6N-Medium.otf
+uprml-hq	UniJIS-UCS2-H	A-OTF-RyuminPr6N-Light.otf
+upgbm-hq	UniJIS-UCS2-H	A-OTF-GothicBBBPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map
new file mode 100644
index 00000000000..d03de2c9782
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	A-OTF-RyuminPro-Light.otf
+hminl-v	V	A-OTF-RyuminPro-Light.otf
+hminr-h	H	A-OTF-RyuminPro-Light.otf
+hminr-v	V	A-OTF-RyuminPro-Light.otf
+hminb-h	H	A-OTF-FutoMinA101Pro-Bold.otf
+hminb-v	V	A-OTF-FutoMinA101Pro-Bold.otf
+hgothr-h	H	A-OTF-GothicBBBPro-Medium.otf
+hgothr-v	V	A-OTF-GothicBBBPro-Medium.otf
+hgothb-h	H	A-OTF-FutoGoB101Pro-Bold.otf
+hgothb-v	V	A-OTF-FutoGoB101Pro-Bold.otf
+hgotheb-h	H	A-OTF-MidashiGoPro-MB31.otf
+hgotheb-v	V	A-OTF-MidashiGoPro-MB31.otf
+hmgothr-h	H	A-OTF-Jun101Pro-Light.otf
+hmgothr-v	V	A-OTF-Jun101Pro-Light.otf
+
+% TEXT, JIS04
+hminln-h	H	A-OTF-RyuminPro-Light.otf
+hminln-v	V	A-OTF-RyuminPro-Light.otf
+hminrn-h	H	A-OTF-RyuminPro-Light.otf
+hminrn-v	V	A-OTF-RyuminPro-Light.otf
+hminbn-h	H	A-OTF-FutoMinA101Pro-Bold.otf
+hminbn-v	V	A-OTF-FutoMinA101Pro-Bold.otf
+hgothrn-h	H	A-OTF-GothicBBBPro-Medium.otf
+hgothrn-v	V	A-OTF-GothicBBBPro-Medium.otf
+hgothbn-h	H	A-OTF-FutoGoB101Pro-Bold.otf
+hgothbn-v	V	A-OTF-FutoGoB101Pro-Bold.otf
+hgothebn-h	H	A-OTF-MidashiGoPro-MB31.otf
+hgothebn-v	V	A-OTF-MidashiGoPro-MB31.otf
+hmgothrn-h	H	A-OTF-Jun101Pro-Light.otf
+hmgothrn-v	V	A-OTF-Jun101Pro-Light.otf
+
+% CID
+otf-cjml-h	Identity-H	A-OTF-RyuminPro-Light.otf
+otf-cjml-v	Identity-V	A-OTF-RyuminPro-Light.otf
+otf-cjmr-h	Identity-H	A-OTF-RyuminPro-Light.otf
+otf-cjmr-v	Identity-V	A-OTF-RyuminPro-Light.otf
+otf-cjmb-h	Identity-H	A-OTF-FutoMinA101Pro-Bold.otf
+otf-cjmb-v	Identity-V	A-OTF-FutoMinA101Pro-Bold.otf
+otf-cjgr-h	Identity-H	A-OTF-GothicBBBPro-Medium.otf
+otf-cjgr-v	Identity-V	A-OTF-GothicBBBPro-Medium.otf
+otf-cjgb-h	Identity-H	A-OTF-FutoGoB101Pro-Bold.otf
+otf-cjgb-v	Identity-V	A-OTF-FutoGoB101Pro-Bold.otf
+otf-cjge-h	Identity-H	A-OTF-MidashiGoPro-MB31.otf
+otf-cjge-v	Identity-V	A-OTF-MidashiGoPro-MB31.otf
+otf-cjmgr-h	Identity-H	A-OTF-Jun101Pro-Light.otf
+otf-cjmgr-v	Identity-V	A-OTF-Jun101Pro-Light.otf
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	A-OTF-RyuminPro-Light.otf
+otf-ujml-v	UniJIS-UTF16-V	A-OTF-RyuminPro-Light.otf
+otf-ujmr-h	UniJIS-UTF16-H	A-OTF-RyuminPro-Light.otf
+otf-ujmr-v	UniJIS-UTF16-V	A-OTF-RyuminPro-Light.otf
+otf-ujmb-h	UniJIS-UTF16-H	A-OTF-FutoMinA101Pro-Bold.otf
+otf-ujmb-v	UniJIS-UTF16-V	A-OTF-FutoMinA101Pro-Bold.otf
+otf-ujgr-h	UniJIS-UTF16-H	A-OTF-GothicBBBPro-Medium.otf
+otf-ujgr-v	UniJIS-UTF16-V	A-OTF-GothicBBBPro-Medium.otf
+otf-ujgb-h	UniJIS-UTF16-H	A-OTF-FutoGoB101Pro-Bold.otf
+otf-ujgb-v	UniJIS-UTF16-V	A-OTF-FutoGoB101Pro-Bold.otf
+otf-ujge-h	UniJIS-UTF16-H	A-OTF-MidashiGoPro-MB31.otf
+otf-ujge-v	UniJIS-UTF16-V	A-OTF-MidashiGoPro-MB31.otf
+otf-ujmgr-h	UniJIS-UTF16-H	A-OTF-Jun101Pro-Light.otf
+otf-ujmgr-v	UniJIS-UTF16-V	A-OTF-Jun101Pro-Light.otf
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	A-OTF-RyuminPro-Light.otf
+otf-ujmln-v	UniJIS2004-UTF16-V	A-OTF-RyuminPro-Light.otf
+otf-ujmrn-h	UniJIS2004-UTF16-H	A-OTF-RyuminPro-Light.otf
+otf-ujmrn-v	UniJIS2004-UTF16-V	A-OTF-RyuminPro-Light.otf
+otf-ujmbn-h	UniJIS2004-UTF16-H	A-OTF-FutoMinA101Pro-Bold.otf
+otf-ujmbn-v	UniJIS2004-UTF16-V	A-OTF-FutoMinA101Pro-Bold.otf
+otf-ujgrn-h	UniJIS2004-UTF16-H	A-OTF-GothicBBBPro-Medium.otf
+otf-ujgrn-v	UniJIS2004-UTF16-V	A-OTF-GothicBBBPro-Medium.otf
+otf-ujgbn-h	UniJIS2004-UTF16-H	A-OTF-FutoGoB101Pro-Bold.otf
+otf-ujgbn-v	UniJIS2004-UTF16-V	A-OTF-FutoGoB101Pro-Bold.otf
+otf-ujgen-h	UniJIS2004-UTF16-H	A-OTF-MidashiGoPro-MB31.otf
+otf-ujgen-v	UniJIS2004-UTF16-V	A-OTF-MidashiGoPro-MB31.otf
+otf-ujmgrn-h	UniJIS2004-UTF16-H	A-OTF-Jun101Pro-Light.otf
+otf-ujmgrn-v	UniJIS2004-UTF16-V	A-OTF-Jun101Pro-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
new file mode 100644
index 00000000000..a9d3a7a1147
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	A-OTF-RyuminPro-Light.otf
+uphminl-v	UniJIS-UTF16-V	A-OTF-RyuminPro-Light.otf
+uphminr-h	UniJIS-UTF16-H	A-OTF-RyuminPro-Light.otf
+uphminr-v	UniJIS-UTF16-V	A-OTF-RyuminPro-Light.otf
+uphminb-h	UniJIS-UTF16-H	A-OTF-FutoMinA101Pro-Bold.otf
+uphminb-v	UniJIS-UTF16-V	A-OTF-FutoMinA101Pro-Bold.otf
+uphgothr-h	UniJIS-UTF16-H	A-OTF-GothicBBBPro-Medium.otf
+uphgothr-v	UniJIS-UTF16-V	A-OTF-GothicBBBPro-Medium.otf
+uphgothb-h	UniJIS-UTF16-H	A-OTF-FutoGoB101Pro-Bold.otf
+uphgothb-v	UniJIS-UTF16-V	A-OTF-FutoGoB101Pro-Bold.otf
+uphgotheb-h	UniJIS-UTF16-H	A-OTF-MidashiGoPro-MB31.otf
+uphgotheb-v	UniJIS-UTF16-V	A-OTF-MidashiGoPro-MB31.otf
+uphmgothr-h	UniJIS-UTF16-H	A-OTF-Jun101Pro-Light.otf
+uphmgothr-v	UniJIS-UTF16-V	A-OTF-Jun101Pro-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map
new file mode 100644
index 00000000000..2fa430a6cbd
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map
@@ -0,0 +1,4 @@
+rml	2004-H	A-OTF-RyuminPro-Light.otf
+rmlv	2004-V	A-OTF-RyuminPro-Light.otf
+gbm	2004-H	A-OTF-GothicBBBPro-Medium.otf
+gbmv	2004-V	A-OTF-GothicBBBPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map
new file mode 100644
index 00000000000..4084ac0ac0e
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map
@@ -0,0 +1,4 @@
+rml	H	A-OTF-RyuminPro-Light.otf
+rmlv	V	A-OTF-RyuminPro-Light.otf
+gbm	H	A-OTF-GothicBBBPro-Medium.otf
+gbmv	V	A-OTF-GothicBBBPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map
new file mode 100644
index 00000000000..b81559c269c
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map
@@ -0,0 +1,10 @@
+urml	UniJIS2004-UTF16-H	A-OTF-RyuminPro-Light.otf
+urmlv	UniJIS2004-UTF16-V	A-OTF-RyuminPro-Light.otf
+ugbm	UniJIS2004-UTF16-H	A-OTF-GothicBBBPro-Medium.otf
+ugbmv	UniJIS2004-UTF16-V	A-OTF-GothicBBBPro-Medium.otf
+uprml-h	UniJIS2004-UTF16-H	A-OTF-RyuminPro-Light.otf
+uprml-v	UniJIS2004-UTF16-V	A-OTF-RyuminPro-Light.otf
+upgbm-h	UniJIS2004-UTF16-H	A-OTF-GothicBBBPro-Medium.otf
+upgbm-v	UniJIS2004-UTF16-V	A-OTF-GothicBBBPro-Medium.otf
+uprml-hq	UniJIS-UCS2-H	A-OTF-RyuminPro-Light.otf
+upgbm-hq	UniJIS-UCS2-H	A-OTF-GothicBBBPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map
new file mode 100644
index 00000000000..e4a7870dc65
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	A-OTF-RyuminPro-Light.otf
+urmlv	UniJIS-UTF16-V	A-OTF-RyuminPro-Light.otf
+ugbm	UniJIS-UTF16-H	A-OTF-GothicBBBPro-Medium.otf
+ugbmv	UniJIS-UTF16-V	A-OTF-GothicBBBPro-Medium.otf
+uprml-h	UniJIS-UTF16-H	A-OTF-RyuminPro-Light.otf
+uprml-v	UniJIS-UTF16-V	A-OTF-RyuminPro-Light.otf
+upgbm-h	UniJIS-UTF16-H	A-OTF-GothicBBBPro-Medium.otf
+upgbm-v	UniJIS-UTF16-V	A-OTF-GothicBBBPro-Medium.otf
+uprml-hq	UniJIS-UCS2-H	A-OTF-RyuminPro-Light.otf
+upgbm-hq	UniJIS-UCS2-H	A-OTF-GothicBBBPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map
new file mode 100644
index 00000000000..44ef877e29e
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	:0:msmincho.ttc
+hminl-v	V	:0:msmincho.ttc
+hminr-h	H	:0:msmincho.ttc
+hminr-v	V	:0:msmincho.ttc
+hminb-h	H	:0:msmincho.ttc
+hminb-v	V	:0:msmincho.ttc
+hgothr-h	H	:0:msgothic.ttc
+hgothr-v	V	:0:msgothic.ttc
+hgothb-h	H	:0:msgothic.ttc
+hgothb-v	V	:0:msgothic.ttc
+hgotheb-h	H	:0:msgothic.ttc
+hgotheb-v	V	:0:msgothic.ttc
+hmgothr-h	H	:0:msgothic.ttc
+hmgothr-v	V	:0:msgothic.ttc
+
+% TEXT, JIS04
+hminln-h	H	:0:msmincho.ttc
+hminln-v	V	:0:msmincho.ttc
+hminrn-h	H	:0:msmincho.ttc
+hminrn-v	V	:0:msmincho.ttc
+hminbn-h	H	:0:msmincho.ttc
+hminbn-v	V	:0:msmincho.ttc
+hgothrn-h	H	:0:msgothic.ttc
+hgothrn-v	V	:0:msgothic.ttc
+hgothbn-h	H	:0:msgothic.ttc
+hgothbn-v	V	:0:msgothic.ttc
+hgothebn-h	H	:0:msgothic.ttc
+hgothebn-v	V	:0:msgothic.ttc
+hmgothrn-h	H	:0:msgothic.ttc
+hmgothrn-v	V	:0:msgothic.ttc
+
+% CID
+otf-cjml-h	Identity-H	:0:msmincho.ttc/AJ16
+otf-cjml-v	Identity-V	:0:msmincho.ttc/AJ16
+otf-cjmr-h	Identity-H	:0:msmincho.ttc/AJ16
+otf-cjmr-v	Identity-V	:0:msmincho.ttc/AJ16
+otf-cjmb-h	Identity-H	:0:msmincho.ttc/AJ16
+otf-cjmb-v	Identity-V	:0:msmincho.ttc/AJ16
+otf-cjgr-h	Identity-H	:0:msgothic.ttc/AJ16
+otf-cjgr-v	Identity-V	:0:msgothic.ttc/AJ16
+otf-cjgb-h	Identity-H	:0:msgothic.ttc/AJ16
+otf-cjgb-v	Identity-V	:0:msgothic.ttc/AJ16
+otf-cjge-h	Identity-H	:0:msgothic.ttc/AJ16
+otf-cjge-v	Identity-V	:0:msgothic.ttc/AJ16
+otf-cjmgr-h	Identity-H	:0:msgothic.ttc/AJ16
+otf-cjmgr-v	Identity-V	:0:msgothic.ttc/AJ16
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	:0:msmincho.ttc
+otf-ujml-v	UniJIS-UTF16-V	:0:msmincho.ttc
+otf-ujmr-h	UniJIS-UTF16-H	:0:msmincho.ttc
+otf-ujmr-v	UniJIS-UTF16-V	:0:msmincho.ttc
+otf-ujmb-h	UniJIS-UTF16-H	:0:msmincho.ttc
+otf-ujmb-v	UniJIS-UTF16-V	:0:msmincho.ttc
+otf-ujgr-h	UniJIS-UTF16-H	:0:msgothic.ttc
+otf-ujgr-v	UniJIS-UTF16-V	:0:msgothic.ttc
+otf-ujgb-h	UniJIS-UTF16-H	:0:msgothic.ttc
+otf-ujgb-v	UniJIS-UTF16-V	:0:msgothic.ttc
+otf-ujge-h	UniJIS-UTF16-H	:0:msgothic.ttc
+otf-ujge-v	UniJIS-UTF16-V	:0:msgothic.ttc
+otf-ujmgr-h	UniJIS-UTF16-H	:0:msgothic.ttc
+otf-ujmgr-v	UniJIS-UTF16-V	:0:msgothic.ttc
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	:0:msmincho.ttc
+otf-ujmln-v	UniJIS2004-UTF16-V	:0:msmincho.ttc
+otf-ujmrn-h	UniJIS2004-UTF16-H	:0:msmincho.ttc
+otf-ujmrn-v	UniJIS2004-UTF16-V	:0:msmincho.ttc
+otf-ujmbn-h	UniJIS2004-UTF16-H	:0:msmincho.ttc
+otf-ujmbn-v	UniJIS2004-UTF16-V	:0:msmincho.ttc
+otf-ujgrn-h	UniJIS2004-UTF16-H	:0:msgothic.ttc
+otf-ujgrn-v	UniJIS2004-UTF16-V	:0:msgothic.ttc
+otf-ujgbn-h	UniJIS2004-UTF16-H	:0:msgothic.ttc
+otf-ujgbn-v	UniJIS2004-UTF16-V	:0:msgothic.ttc
+otf-ujgen-h	UniJIS2004-UTF16-H	:0:msgothic.ttc
+otf-ujgen-v	UniJIS2004-UTF16-V	:0:msgothic.ttc
+otf-ujmgrn-h	UniJIS2004-UTF16-H	:0:msgothic.ttc
+otf-ujmgrn-v	UniJIS2004-UTF16-V	:0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
new file mode 100644
index 00000000000..f64eda024ba
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	:0:msmincho.ttc
+uphminl-v	UniJIS-UTF16-V	:0:msmincho.ttc
+uphminr-h	UniJIS-UTF16-H	:0:msmincho.ttc
+uphminr-v	UniJIS-UTF16-V	:0:msmincho.ttc
+uphminb-h	UniJIS-UTF16-H	:0:msmincho.ttc
+uphminb-v	UniJIS-UTF16-V	:0:msmincho.ttc
+uphgothr-h	UniJIS-UTF16-H	:0:msgothic.ttc
+uphgothr-v	UniJIS-UTF16-V	:0:msgothic.ttc
+uphgothb-h	UniJIS-UTF16-H	:0:msgothic.ttc
+uphgothb-v	UniJIS-UTF16-V	:0:msgothic.ttc
+uphgotheb-h	UniJIS-UTF16-H	:0:msgothic.ttc
+uphgotheb-v	UniJIS-UTF16-V	:0:msgothic.ttc
+uphmgothr-h	UniJIS-UTF16-H	:0:msgothic.ttc
+uphmgothr-v	UniJIS-UTF16-V	:0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map
new file mode 100644
index 00000000000..5f38aeeee21
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map
@@ -0,0 +1,4 @@
+rml	H	:0:msmincho.ttc
+rmlv	V	:0:msmincho.ttc
+gbm	H	:0:msgothic.ttc
+gbmv	V	:0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map
new file mode 100644
index 00000000000..56150b88fce
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	:0:msmincho.ttc
+urmlv	UniJIS-UTF16-V	:0:msmincho.ttc
+ugbm	UniJIS-UTF16-H	:0:msgothic.ttc
+ugbmv	UniJIS-UTF16-V	:0:msgothic.ttc
+uprml-h	UniJIS-UTF16-H	:0:msmincho.ttc
+uprml-v	UniJIS-UTF16-V	:0:msmincho.ttc
+upgbm-h	UniJIS-UTF16-H	:0:msgothic.ttc
+upgbm-v	UniJIS-UTF16-V	:0:msgothic.ttc
+uprml-hq	UniJIS-UCS2-H	:0:msmincho.ttc
+upgbm-hq	UniJIS-UCS2-H	:0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map
new file mode 100644
index 00000000000..7638546cc51
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h	H	!Ryumin-Light
+hminl-v	V	!Ryumin-Light
+hminr-h	H	!Ryumin-Light
+hminr-v	V	!Ryumin-Light
+hminb-h	H	!Ryumin-Light,Bold
+hminb-v	V	!Ryumin-Light,Bold
+hgothr-h	H	!GothicBBB-Medium
+hgothr-v	V	!GothicBBB-Medium
+hgothb-h	H	!GothicBBB-Medium,Bold
+hgothb-v	V	!GothicBBB-Medium,Bold
+hgotheb-h	H	!GothicBBB-Medium,Bold
+hgotheb-v	V	!GothicBBB-Medium,Bold
+hmgothr-h	H	!GothicBBB-Medium
+hmgothr-v	V	!GothicBBB-Medium
+
+% TEXT, JIS04
+hminln-h	H	!Ryumin-Light
+hminln-v	V	!Ryumin-Light
+hminrn-h	H	!Ryumin-Light
+hminrn-v	V	!Ryumin-Light
+hminbn-h	H	!Ryumin-Light,Bold
+hminbn-v	V	!Ryumin-Light,Bold
+hgothrn-h	H	!GothicBBB-Medium
+hgothrn-v	V	!GothicBBB-Medium
+hgothbn-h	H	!GothicBBB-Medium,Bold
+hgothbn-v	V	!GothicBBB-Medium,Bold
+hgothebn-h	H	!GothicBBB-Medium,Bold
+hgothebn-v	V	!GothicBBB-Medium,Bold
+hmgothrn-h	H	!GothicBBB-Medium
+hmgothrn-v	V	!GothicBBB-Medium
+
+% CID
+otf-cjml-h	Identity-H	!Ryumin-Light
+otf-cjml-v	Identity-V	!Ryumin-Light
+otf-cjmr-h	Identity-H	!Ryumin-Light
+otf-cjmr-v	Identity-V	!Ryumin-Light
+otf-cjmb-h	Identity-H	!Ryumin-Light,Bold
+otf-cjmb-v	Identity-V	!Ryumin-Light,Bold
+otf-cjgr-h	Identity-H	!GothicBBB-Medium
+otf-cjgr-v	Identity-V	!GothicBBB-Medium
+otf-cjgb-h	Identity-H	!GothicBBB-Medium,Bold
+otf-cjgb-v	Identity-V	!GothicBBB-Medium,Bold
+otf-cjge-h	Identity-H	!GothicBBB-Medium,Bold
+otf-cjge-v	Identity-V	!GothicBBB-Medium,Bold
+otf-cjmgr-h	Identity-H	!GothicBBB-Medium
+otf-cjmgr-v	Identity-V	!GothicBBB-Medium
+
+% Unicode 90JIS
+otf-ujml-h	UniJIS-UTF16-H	!Ryumin-Light
+otf-ujml-v	UniJIS-UTF16-V	!Ryumin-Light
+otf-ujmr-h	UniJIS-UTF16-H	!Ryumin-Light
+otf-ujmr-v	UniJIS-UTF16-V	!Ryumin-Light
+otf-ujmb-h	UniJIS-UTF16-H	!Ryumin-Light,Bold
+otf-ujmb-v	UniJIS-UTF16-V	!Ryumin-Light,Bold
+otf-ujgr-h	UniJIS-UTF16-H	!GothicBBB-Medium
+otf-ujgr-v	UniJIS-UTF16-V	!GothicBBB-Medium
+otf-ujgb-h	UniJIS-UTF16-H	!GothicBBB-Medium,Bold
+otf-ujgb-v	UniJIS-UTF16-V	!GothicBBB-Medium,Bold
+otf-ujge-h	UniJIS-UTF16-H	!GothicBBB-Medium,Bold
+otf-ujge-v	UniJIS-UTF16-V	!GothicBBB-Medium,Bold
+otf-ujmgr-h	UniJIS-UTF16-H	!GothicBBB-Medium
+otf-ujmgr-v	UniJIS-UTF16-V	!GothicBBB-Medium
+
+% Unicode JIS04
+otf-ujmln-h	UniJIS2004-UTF16-H	!Ryumin-Light
+otf-ujmln-v	UniJIS2004-UTF16-V	!Ryumin-Light
+otf-ujmrn-h	UniJIS2004-UTF16-H	!Ryumin-Light
+otf-ujmrn-v	UniJIS2004-UTF16-V	!Ryumin-Light
+otf-ujmbn-h	UniJIS2004-UTF16-H	!Ryumin-Light,Bold
+otf-ujmbn-v	UniJIS2004-UTF16-V	!Ryumin-Light,Bold
+otf-ujgrn-h	UniJIS2004-UTF16-H	!GothicBBB-Medium
+otf-ujgrn-v	UniJIS2004-UTF16-V	!GothicBBB-Medium
+otf-ujgbn-h	UniJIS2004-UTF16-H	!GothicBBB-Medium,Bold
+otf-ujgbn-v	UniJIS2004-UTF16-V	!GothicBBB-Medium,Bold
+otf-ujgen-h	UniJIS2004-UTF16-H	!GothicBBB-Medium,Bold
+otf-ujgen-v	UniJIS2004-UTF16-V	!GothicBBB-Medium,Bold
+otf-ujmgrn-h	UniJIS2004-UTF16-H	!GothicBBB-Medium
+otf-ujmgrn-v	UniJIS2004-UTF16-V	!GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
new file mode 100644
index 00000000000..77f0e8882af
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
@@ -0,0 +1,16 @@
+
+% TEXT, 90JIS
+uphminl-h	UniJIS-UTF16-H	!Ryumin-Light
+uphminl-v	UniJIS-UTF16-V	!Ryumin-Light
+uphminr-h	UniJIS-UTF16-H	!Ryumin-Light
+uphminr-v	UniJIS-UTF16-V	!Ryumin-Light
+uphminb-h	UniJIS-UTF16-H	!Ryumin-Light,Bold
+uphminb-v	UniJIS-UTF16-V	!Ryumin-Light,Bold
+uphgothr-h	UniJIS-UTF16-H	!GothicBBB-Medium
+uphgothr-v	UniJIS-UTF16-V	!GothicBBB-Medium
+uphgothb-h	UniJIS-UTF16-H	!GothicBBB-Medium,Bold
+uphgothb-v	UniJIS-UTF16-V	!GothicBBB-Medium,Bold
+uphgotheb-h	UniJIS-UTF16-H	!GothicBBB-Medium,Bold
+uphgotheb-v	UniJIS-UTF16-V	!GothicBBB-Medium,Bold
+uphmgothr-h	UniJIS-UTF16-H	!GothicBBB-Medium
+uphmgothr-v	UniJIS-UTF16-V	!GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map
new file mode 100644
index 00000000000..e309b88c893
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map
@@ -0,0 +1,4 @@
+rml	2004-H	!Ryumin-Light
+rmlv	2004-V	!Ryumin-Light
+gbm	2004-H	!GothicBBB-Medium
+gbmv	2004-V	!GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map
new file mode 100644
index 00000000000..8f46d970813
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map
@@ -0,0 +1,4 @@
+rml	H	!Ryumin-Light
+rmlv	V	!Ryumin-Light
+gbm	H	!GothicBBB-Medium
+gbmv	V	!GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map
new file mode 100644
index 00000000000..eb3088babc9
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map
@@ -0,0 +1,10 @@
+urml	UniJIS2004-UTF16-H	!Ryumin-Light
+urmlv	UniJIS2004-UTF16-V	!Ryumin-Light
+ugbm	UniJIS2004-UTF16-H	!GothicBBB-Medium
+ugbmv	UniJIS2004-UTF16-V	!GothicBBB-Medium
+uprml-h	UniJIS2004-UTF16-H	!Ryumin-Light
+uprml-v	UniJIS2004-UTF16-V	!Ryumin-Light
+upgbm-h	UniJIS2004-UTF16-H	!GothicBBB-Medium
+upgbm-v	UniJIS2004-UTF16-V	!GothicBBB-Medium
+uprml-hq	UniJIS-UCS2-H	!Ryumin-Light
+upgbm-hq	UniJIS-UCS2-H	!GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map
new file mode 100644
index 00000000000..e2670c1f5cb
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map
@@ -0,0 +1,10 @@
+urml	UniJIS-UTF16-H	!Ryumin-Light
+urmlv	UniJIS-UTF16-V	!Ryumin-Light
+ugbm	UniJIS-UTF16-H	!GothicBBB-Medium
+ugbmv	UniJIS-UTF16-V	!GothicBBB-Medium
+uprml-h	UniJIS-UTF16-H	!Ryumin-Light
+uprml-v	UniJIS-UTF16-V	!Ryumin-Light
+upgbm-h	UniJIS-UTF16-H	!GothicBBB-Medium
+upgbm-v	UniJIS-UTF16-V	!GothicBBB-Medium
+uprml-hq	UniJIS-UCS2-H	!Ryumin-Light
+upgbm-hq	UniJIS-UCS2-H	!GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-hiragino.map
deleted file mode 100644
index 40917c42494..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-hiragino.map
+++ /dev/null
@@ -1,90 +0,0 @@
-otf-ujmr-h      UniJIS-UTF16-H        HiraMinPro-W3
-otf-ujmr-v      UniJIS-UTF16-V        HiraMinPro-W3
-otf-cjmr-h       Identity-H      HiraMinPro-W3
-otf-cjmr-v       Identity-V  HiraMinPro-W3
-hminr-h   H HiraMinPro-W3
-hminr-v V HiraMinPro-W3
-
-otf-ujgr-h    UniJIS-UTF16-H       HiraKakuPro-W3
-otf-ujgr-v    UniJIS-UTF16-V       HiraKakuPro-W3
-otf-cjgr-h     Identity-H     HiraKakuPro-W3
-otf-cjgr-v     Identity-V HiraKakuPro-W3
-hgothr-h   H HiraKakuPro-W3
-hgothr-v V HiraKakuPro-W3
-
-otf-ujmb-h      UniJIS-UTF16-H    HiraMinPro-W6
-otf-ujmb-v      UniJIS-UTF16-V    HiraMinPro-W6
-otf-cjmb-h  Identity-H HiraMinPro-W6
-otf-cjmb-v  Identity-V HiraMinPro-W6
-hminb-h   H HiraMinPro-W6
-hminb-v V HiraMinPro-W6
-
-otf-ujgb-h    UniJIS-UTF16-H    HiraKakuPro-W6
-otf-ujgb-v    UniJIS-UTF16-V    HiraKakuPro-W6
-otf-cjgb-h  Identity-H HiraKakuPro-W6
-otf-cjgb-v  Identity-V HiraKakuPro-W6
-hgothb-h   H HiraKakuPro-W6
-hgothb-v V HiraKakuPro-W6
-
-hgotheb-h H HiraKakuStd-W8
-hgotheb-v V HiraKakuStd-W8
-
-otf-ujmgr-h    UniJIS-UTF16-H       HiraMaruPro-W4
-otf-ujmgr-v    UniJIS-UTF16-V       HiraMaruPro-W4
-otf-cjmgr-h     Identity-H     HiraMaruPro-W4
-otf-cjmgr-v     Identity-V HiraMaruPro-W4
-hmgothr-h    H HiraMaruPro-W4
-hmgothr-v  V HiraMaruPro-W4
-
-otf-ujml-h      UniJIS-UTF16-H        HiraMinPro-W2
-otf-ujml-v      UniJIS-UTF16-V        HiraMinPro-W2
-otf-cjml-h       Identity-H      HiraMinPro-W2
-otf-cjml-v       Identity-V  HiraMinPro-W2
-hminl-h   H HiraMinPro-W2
-hminl-v V HiraMinPro-W2
-
-% for 1-byte part of Hiragino OpenType fonts
-% this part doesn't exist in other otf-*.map
-hiramin-w3-h Identity-H HiraMinPro-W3
-hiramin-w6-h Identity-H HiraMinPro-W6
-hirakaku-w3-h Identity-H HiraKakuPro-W3
-hirakaku-w6-h Identity-H HiraKakuPro-W6
-hiramaru-w4-h Identity-H HiraMaruPro-W4
-hiramin-w3-v Identity-V HiraMinPro-W3
-hiramin-w6-v Identity-V HiraMinPro-W6
-hirakaku-w3-v Identity-V HiraKakuPro-W3
-hirakaku-w6-v Identity-V HiraKakuPro-W6
-hiramaru-w4-v Identity-V HiraMaruPro-W4
-
-%
-% JIS 2004
-%
-otf-ujmrn-h      UniJIS2004-UTF16-H        HiraMinProN-W3
-otf-ujmrn-v      UniJIS2004-UTF16-V        HiraMinProN-W3
-hminrn-h   H HiraMinProN-W3
-hminrn-v V HiraMinProN-W3
-
-otf-ujgrn-h    UniJIS2004-UTF16-H       HiraKakuProN-W3
-otf-ujgrn-v    UniJIS2004-UTF16-V       HiraKakuProN-W3
-hgothrn-h   H HiraKakuProN-W3
-hgothrn-v V HiraKakuProN-W3
-
-otf-ujmbn-h      UniJIS2004-UTF16-H    HiraMinProN-W6
-otf-ujmbn-v      UniJIS2004-UTF16-V    HiraMinProN-W6
-hminbn-h   H HiraMinProN-W6
-hminbn-v V HiraMinProN-W6
-
-otf-ujgbn-h    UniJIS2004-UTF16-H    HiraKakuProN-W6
-otf-ujgbn-v    UniJIS2004-UTF16-V    HiraKakuProN-W6
-hgothbn-h   H HiraKakuProN-W6
-hgothbn-v V HiraKakuProN-W6
-
-otf-ujmgrn-h    UniJIS2004-UTF16-H       HiraMaruProN-W4
-otf-ujmgrn-v    UniJIS2004-UTF16-V       HiraMaruProN-W4
-hmgothrn-h    H HiraMaruProN-W4
-hmgothrn-v  V HiraMaruProN-W4
-
-otf-ujmln-h      UniJIS2004-UTF16-H        HiraMinProN-W2
-otf-ujmln-v      UniJIS2004-UTF16-V        HiraMinProN-W2
-hminln-h   H HiraMinProN-W2
-hminln-v V HiraMinProN-W2
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-ipa.map
deleted file mode 100644
index 34c0803da17..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-ipa.map
+++ /dev/null
@@ -1,75 +0,0 @@
-otf-ujmr-h    UniJIS-UTF16-H     ipam.ttf
-otf-ujmr-v    UniJIS-UTF16-V     ipam.ttf
-otf-cjmr-h    Identity-H         ipam.ttf/AJ16
-otf-cjmr-v    Identity-V         ipam.ttf/AJ16
-hminr-h       H                  ipam.ttf
-hminr-v       V                  ipam.ttf
-
-otf-ujgr-h    UniJIS-UTF16-H     ipag.ttf
-otf-ujgr-v    UniJIS-UTF16-V     ipag.ttf
-otf-cjgr-h    Identity-H         ipag.ttf/AJ16
-otf-cjgr-v    Identity-V         ipag.ttf/AJ16
-hgothr-h      H                  ipag.ttf
-hgothr-v      V                  ipag.ttf
-
-otf-ujmb-h    UniJIS-UTF16-H     ipam.ttf
-otf-ujmb-v    UniJIS-UTF16-V     ipam.ttf
-otf-cjmb-h    Identity-H         ipam.ttf/AJ16
-otf-cjmb-v    Identity-V         ipam.ttf/AJ16
-hminb-h       H                  ipam.ttf
-hminb-v       V                  ipam.ttf
-
-otf-ujgb-h    UniJIS-UTF16-H     ipag.ttf
-otf-ujgb-v    UniJIS-UTF16-V     ipag.ttf
-otf-cjgb-h    Identity-H         ipag.ttf/AJ16
-otf-cjgb-v    Identity-V         ipag.ttf/AJ16
-hgothb-h      H                  ipag.ttf
-hgothb-v      V                  ipag.ttf
-
-hgotheb-h     H                  ipag.ttf
-hgotheb-v     V                  ipag.ttf
-
-otf-ujmgr-h   UniJIS-UTF16-H     ipag.ttf
-otf-ujmgr-v   UniJIS-UTF16-V     ipag.ttf
-otf-cjmgr-h   Identity-H         ipag.ttf/AJ16
-otf-cjmgr-v   Identity-V         ipag.ttf/AJ16
-hmgothr-h     H                  ipag.ttf
-hmgothr-v     V                  ipag.ttf
-
-otf-ujml-h    UniJIS-UTF16-H     ipam.ttf
-otf-ujml-v    UniJIS-UTF16-V     ipam.ttf
-otf-cjml-h    Identity-H         ipam.ttf/AJ16
-otf-cjml-v    Identity-V         ipam.ttf/AJ16
-hminl-h       H                  ipam.ttf
-hminl-v       V                  ipam.ttf
-
-%for JIS X 0213:2004
-otf-ujmrn-h   UniJIS2004-UTF16-H ipam.ttf
-otf-ujmrn-v   UniJIS2004-UTF16-V ipam.ttf
-hminrn-h      H                  ipam.ttf
-hminrn-v      V                  ipam.ttf
-
-otf-ujgrn-h   UniJIS2004-UTF16-H ipag.ttf
-otf-ujgrn-v   UniJIS2004-UTF16-V ipag.ttf
-hgothrn-h     H                  ipag.ttf
-hgothrn-v     V                  ipag.ttf
-
-otf-ujmbn-h   UniJIS2004-UTF16-H ipam.ttf
-otf-ujmbn-v   UniJIS2004-UTF16-V ipam.ttf
-hminbn-h      H                  ipam.ttf
-hminbn-v      V                  ipam.ttf
-
-otf-ujgbn-h   UniJIS2004-UTF16-H ipag.ttf
-otf-ujgbn-v   UniJIS2004-UTF16-V ipag.ttf
-hgothbn-h     H                  ipag.ttf
-hgothbn-v     V                  ipag.ttf
-
-otf-ujmgrn-h  UniJIS2004-UTF16-H ipag.ttf
-otf-ujmgrn-v  UniJIS2004-UTF16-V ipag.ttf
-hmgothrn-h    H                  ipag.ttf
-hmgothrn-v    V                  ipag.ttf
-
-otf-ujmln-h   UniJIS2004-UTF16-H ipam.ttf
-otf-ujmln-v   UniJIS2004-UTF16-V ipam.ttf
-hminln-h      H                  ipam.ttf
-hminln-v      V                  ipam.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-ipaex.map
deleted file mode 100644
index d45021565a1..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-ipaex.map
+++ /dev/null
@@ -1,75 +0,0 @@
-otf-ujmr-h    UniJIS-UTF16-H     ipaexm.ttf
-otf-ujmr-v    UniJIS-UTF16-V     ipaexm.ttf
-otf-cjmr-h    Identity-H         ipaexm.ttf/AJ16
-otf-cjmr-v    Identity-V         ipaexm.ttf/AJ16
-hminr-h       H                  ipaexm.ttf
-hminr-v       V                  ipaexm.ttf
-
-otf-ujgr-h    UniJIS-UTF16-H     ipaexg.ttf
-otf-ujgr-v    UniJIS-UTF16-V     ipaexg.ttf
-otf-cjgr-h    Identity-H         ipaexg.ttf/AJ16
-otf-cjgr-v    Identity-V         ipaexg.ttf/AJ16
-hgothr-h      H                  ipaexg.ttf
-hgothr-v      V                  ipaexg.ttf
-
-otf-ujmb-h    UniJIS-UTF16-H     ipaexm.ttf
-otf-ujmb-v    UniJIS-UTF16-V     ipaexm.ttf
-otf-cjmb-h    Identity-H         ipaexm.ttf/AJ16
-otf-cjmb-v    Identity-V         ipaexm.ttf/AJ16
-hminb-h       H                  ipaexm.ttf
-hminb-v       V                  ipaexm.ttf
-
-otf-ujgb-h    UniJIS-UTF16-H     ipaexg.ttf
-otf-ujgb-v    UniJIS-UTF16-V     ipaexg.ttf
-otf-cjgb-h    Identity-H         ipaexg.ttf/AJ16
-otf-cjgb-v    Identity-V         ipaexg.ttf/AJ16
-hgothb-h      H                  ipaexg.ttf
-hgothb-v      V                  ipaexg.ttf
-
-hgotheb-h     H                  ipaexg.ttf
-hgotheb-v     V                  ipaexg.ttf
-
-otf-ujmgr-h   UniJIS-UTF16-H     ipaexg.ttf
-otf-ujmgr-v   UniJIS-UTF16-V     ipaexg.ttf
-otf-cjmgr-h   Identity-H         ipaexg.ttf/AJ16
-otf-cjmgr-v   Identity-V         ipaexg.ttf/AJ16
-hmgothr-h     H                  ipaexg.ttf
-hmgothr-v     V                  ipaexg.ttf
-
-otf-ujml-h    UniJIS-UTF16-H     ipaexm.ttf
-otf-ujml-v    UniJIS-UTF16-V     ipaexm.ttf
-otf-cjml-h    Identity-H         ipaexm.ttf/AJ16
-otf-cjml-v    Identity-V         ipaexm.ttf/AJ16
-hminl-h       H                  ipaexm.ttf
-hminl-v       V                  ipaexm.ttf
-
-%for JIS X 0213:2004
-otf-ujmrn-h   UniJIS2004-UTF16-H ipaexm.ttf
-otf-ujmrn-v   UniJIS2004-UTF16-V ipaexm.ttf
-hminrn-h      H                  ipaexm.ttf
-hminrn-v      V                  ipaexm.ttf
-
-otf-ujgrn-h   UniJIS2004-UTF16-H ipaexg.ttf
-otf-ujgrn-v   UniJIS2004-UTF16-V ipaexg.ttf
-hgothrn-h     H                  ipaexg.ttf
-hgothrn-v     V                  ipaexg.ttf
-
-otf-ujmbn-h   UniJIS2004-UTF16-H ipaexm.ttf
-otf-ujmbn-v   UniJIS2004-UTF16-V ipaexm.ttf
-hminbn-h      H                  ipaexm.ttf
-hminbn-v      V                  ipaexm.ttf
-
-otf-ujgbn-h   UniJIS2004-UTF16-H ipaexg.ttf
-otf-ujgbn-v   UniJIS2004-UTF16-V ipaexg.ttf
-hgothbn-h     H                  ipaexg.ttf
-hgothbn-v     V                  ipaexg.ttf
-
-otf-ujmgrn-h  UniJIS2004-UTF16-H ipaexg.ttf
-otf-ujmgrn-v  UniJIS2004-UTF16-V ipaexg.ttf
-hmgothrn-h    H                  ipaexg.ttf
-hmgothrn-v    V                  ipaexg.ttf
-
-otf-ujmln-h   UniJIS2004-UTF16-H ipaexm.ttf
-otf-ujmln-v   UniJIS2004-UTF16-V ipaexm.ttf
-hminln-h      H                  ipaexm.ttf
-hminln-v      V                  ipaexm.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-kozuka.map
deleted file mode 100644
index b9854821df7..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-kozuka.map
+++ /dev/null
@@ -1,77 +0,0 @@
-otf-ujmr-h      UniJIS-UTF16-H        KozMinPro-Regular.otf
-otf-ujmr-v      UniJIS-UTF16-V        KozMinPro-Regular.otf
-otf-cjmr-h       Identity-H      KozMinPro-Regular.otf
-otf-cjmr-v       Identity-V  KozMinPro-Regular.otf
-hminr-h   H KozMinPro-Regular.otf
-hminr-v V KozMinPro-Regular.otf
-
-otf-ujgr-h    UniJIS-UTF16-H       KozGoPro-Regular.otf
-otf-ujgr-v    UniJIS-UTF16-V       KozGoPro-Regular.otf
-otf-cjgr-h     Identity-H     KozGoPro-Regular.otf
-otf-cjgr-v     Identity-V KozGoPro-Regular.otf
-hgothr-h   H KozGoPro-Regular.otf
-hgothr-v V KozGoPro-Regular.otf
-
-otf-ujmb-h      UniJIS-UTF16-H    KozMinPro-Bold.otf
-otf-ujmb-v      UniJIS-UTF16-V    KozMinPro-Bold.otf
-otf-cjmb-h  Identity-H KozMinPro-Bold.otf
-otf-cjmb-v  Identity-V KozMinPro-Bold.otf
-hminb-h   H KozMinPro-Bold.otf
-hminb-v V KozMinPro-Bold.otf
-
-otf-ujgb-h    UniJIS-UTF16-H    KozGoPro-Bold.otf
-otf-ujgb-v    UniJIS-UTF16-V    KozGoPro-Bold.otf
-otf-cjgb-h  Identity-H KozGoPro-Bold.otf
-otf-cjgb-v  Identity-V KozGoPro-Bold.otf
-hgothb-h   H KozGoPro-Bold.otf
-hgothb-v V KozGoPro-Bold.otf
-
-hgotheb-h H KozGoPro-Heavy.otf
-hgotheb-v V KozGoPro-Heavy.otf
-
-otf-ujmgr-h    UniJIS-UTF16-H       KozGoPro-Heavy.otf
-otf-ujmgr-v    UniJIS-UTF16-V       KozGoPro-Heavy.otf
-otf-cjmgr-h     Identity-H     KozGoPro-Heavy.otf
-otf-cjmgr-v     Identity-V KozGoPro-Heavy.otf
-hmgothr-h    H KozGoPro-Heavy.otf
-hmgothr-v  V KozGoPro-Heavy.otf
-
-otf-ujml-h      UniJIS-UTF16-H        KozGoPro-Light.otf
-otf-ujml-v      UniJIS-UTF16-V        KozGoPro-Light.otf
-otf-cjml-h       Identity-H      KozGoPro-Light.otf
-otf-cjml-v       Identity-V  KozGoPro-Light.otf
-hminl-h   H KozMinPro-Light.otf
-hminl-v V KozMinPro-Light.otf
-
-%
-% JIS 2004
-%
-otf-ujmrn-h      UniJIS2004-UTF16-H        KozMinPr6N-Regular.otf
-otf-ujmrn-v      UniJIS2004-UTF16-V        KozMinPr6N-Regular.otf
-hminrn-h   H KozMinPr6N-Regular.otf
-hminrn-v V KozMinPr6N-Regular.otf
-
-otf-ujgrn-h    UniJIS2004-UTF16-H       KozGoPr6N-Regular.otf
-otf-ujgrn-v    UniJIS2004-UTF16-V       KozGoPr6N-Regular.otf
-hgothrn-h   H KozGoPr6N-Regular.otf
-hgothrn-v V KozGoPr6N-Regular.otf
-
-otf-ujmbn-h      UniJIS2004-UTF16-H    KozMinPr6N-Bold.otf
-otf-ujmbn-v      UniJIS2004-UTF16-V    KozMinPr6N-Bold.otf
-hminbn-h   H KozMinPr6N-Bold.otf
-hminbn-v V KozMinPr6N-Bold.otf
-
-otf-ujgbn-h    UniJIS2004-UTF16-H    KozGoPr6N-Bold.otf
-otf-ujgbn-v    UniJIS2004-UTF16-V    KozGoPr6N-Bold.otf
-hgothbn-h   H KozGoPr6N-Bold.otf
-hgothbn-v V KozGoPr6N-Bold.otf
-
-otf-ujmgrn-h    UniJIS2004-UTF16-H       KozGoPr6N-Heavy.otf
-otf-ujmgrn-v    UniJIS2004-UTF16-V       KozGoPr6N-Heavy.otf
-hmgothrn-h    H KozGoPr6N-Heavy.otf
-hmgothrn-v  V KozGoPr6N-Heavy.otf
-
-otf-ujmln-h      UniJIS2004-UTF16-H        KozGoPro-Light.otf
-otf-ujmln-v      UniJIS2004-UTF16-V        KozGoPro-Light.otf
-hminln-h   H KozMinPro-Light.otf
-hminln-v V KozMinPro-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-morisawa.map
deleted file mode 100644
index 2dab843dc8c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-morisawa.map
+++ /dev/null
@@ -1,77 +0,0 @@
-otf-ujmr-h      UniJIS-UTF16-H        A-OTF-RyuminPro-Light.otf
-otf-ujmr-v      UniJIS-UTF16-V        A-OTF-RyuminPro-Light.otf
-otf-cjmr-h       Identity-H      A-OTF-RyuminPro-Light.otf
-otf-cjmr-v       Identity-V  A-OTF-RyuminPro-Light.otf
-hminr-h   H A-OTF-RyuminPro-Light.otf
-hminr-v V A-OTF-RyuminPro-Light.otf
-
-otf-ujgr-h    UniJIS-UTF16-H       A-OTF-GothicBBBPro-Medium.otf
-otf-ujgr-v    UniJIS-UTF16-V       A-OTF-GothicBBBPro-Medium.otf
-otf-cjgr-h     Identity-H     A-OTF-GothicBBBPro-Medium.otf
-otf-cjgr-v     Identity-V A-OTF-GothicBBBPro-Medium.otf
-hgothr-h   H A-OTF-GothicBBBPro-Medium.otf
-hgothr-v V A-OTF-GothicBBBPro-Medium.otf
-
-otf-ujmb-h      UniJIS-UTF16-H    A-OTF-FutoMinA101Pro-Bold.otf
-otf-ujmb-v      UniJIS-UTF16-V    A-OTF-FutoMinA101Pro-Bold.otf
-otf-cjmb-h  Identity-H A-OTF-FutoMinA101Pro-Bold.otf
-otf-cjmb-v  Identity-V A-OTF-FutoMinA101Pro-Bold.otf
-hminb-h   H A-OTF-FutoMinA101Pro-Bold.otf
-hminb-v V A-OTF-FutoMinA101Pro-Bold.otf
-
-otf-ujgb-h    UniJIS-UTF16-H    A-OTF-FutoGoB101Pro-Bold.otf
-otf-ujgb-v    UniJIS-UTF16-V    A-OTF-FutoGoB101Pro-Bold.otf
-otf-cjgb-h  Identity-H A-OTF-FutoGoB101Pro-Bold.otf
-otf-cjgb-v  Identity-V A-OTF-FutoGoB101Pro-Bold.otf
-hgothb-h   H A-OTF-FutoGoB101Pro-Bold.otf
-hgothb-v V A-OTF-FutoGoB101Pro-Bold.otf
-
-hgotheb-h H A-OTF-MidashiGoPro-MB31.otf
-hgotheb-v V A-OTF-MidashiGoPro-MB31.otf
-
-otf-ujmgr-h    UniJIS-UTF16-H       A-OTF-Jun101Pro-Light.otf
-otf-ujmgr-v    UniJIS-UTF16-V       A-OTF-Jun101Pro-Light.otf
-otf-cjmgr-h     Identity-H     A-OTF-Jun101Pro-Light.otf
-otf-cjmgr-v     Identity-V A-OTF-Jun101Pro-Light.otf
-hmgothr-h    H A-OTF-Jun101Pro-Light.otf
-hmgothr-v  V A-OTF-Jun101Pro-Light.otf
-
-otf-ujml-h      UniJIS-UTF16-H        A-OTF-RyuminPro-Light.otf
-otf-ujml-v      UniJIS-UTF16-V        A-OTF-RyuminPro-Light.otf
-otf-cjml-h       Identity-H      A-OTF-RyuminPro-Light.otf
-otf-cjml-v       Identity-V  A-OTF-RyuminPro-Light.otf
-hminl-h   H A-OTF-RyuminPro-Light.otf
-hminl-v V A-OTF-RyuminPro-Light.otf
-
-%
-% JIS 2004
-%
-otf-ujmrn-h      UniJIS2004-UTF16-H        A-OTF-RyuminPr6N-Light.otf
-otf-ujmrn-v      UniJIS2004-UTF16-V        A-OTF-RyuminPr6N-Light.otf
-hminrn-h   H A-OTF-RyuminPr6N-Light.otf
-hminrn-v V A-OTF-RyuminPr6N-Light.otf
-
-otf-ujgrn-h    UniJIS2004-UTF16-H       A-OTF-GothicBBBPr6N-Medium.otf
-otf-ujgrn-v    UniJIS2004-UTF16-V       A-OTF-GothicBBBPr6N-Medium.otf
-hgothrn-h   H A-OTF-GothicBBBPr6N-Medium.otf
-hgothrn-v V A-OTF-GothicBBBPr6N-Medium.otf
-
-otf-ujmbn-h      UniJIS2004-UTF16-H    A-OTF-FutoMinA101Pr6N-Bold.otf
-otf-ujmbn-v      UniJIS2004-UTF16-V    A-OTF-FutoMinA101Pr6N-Bold.otf
-hminbn-h   H A-OTF-FutoMinA101Pr6N-Bold.otf
-hminbn-v V A-OTF-FutoMinA101Pr6N-Bold.otf
-
-otf-ujgbn-h    UniJIS2004-UTF16-H    A-OTF-FutoGoB101Pr6N-Bold.otf
-otf-ujgbn-v    UniJIS2004-UTF16-V    A-OTF-FutoGoB101Pr6N-Bold.otf
-hgothbn-h   H A-OTF-FutoGoB101Pr6N-Bold.otf
-hgothbn-v V A-OTF-FutoGoB101Pr6N-Bold.otf
-
-otf-ujmgrn-h    UniJIS2004-UTF16-H       A-OTF-Jun101Pr6N-Light.otf
-otf-ujmgrn-v    UniJIS2004-UTF16-V       A-OTF-Jun101Pr6N-Light.otf
-hmgothrn-h    H A-OTF-Jun101Pr6N-Light.otf
-hmgothrn-v  V A-OTF-Jun101Pr6N-Light.otf
-
-otf-ujmln-h      UniJIS2004-UTF16-H        A-OTF-RyuminPr6N-Light.otf
-otf-ujmln-v      UniJIS2004-UTF16-V        A-OTF-RyuminPr6N-Light.otf
-hminln-h   H A-OTF-RyuminPr6N-Light.otf
-hminln-v V A-OTF-RyuminPr6N-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-hiragino.map
deleted file mode 100644
index b92ea835f88..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-hiragino.map
+++ /dev/null
@@ -1,19 +0,0 @@
-%
-% otf-up-hiragino.map
-% map file to support Hiragino fonts in uptex
-% based on the patch of TANAKA Takuji
-% from uptex-1.00-20120115a
-uphminr-h   UniJIS-UTF16-H HiraMinPro-W3
-uphminr-v   UniJIS-UTF16-V HiraMinPro-W3
-uphgothr-h  UniJIS-UTF16-H HiraKakuPro-W3
-uphgothr-v  UniJIS-UTF16-V HiraKakuPro-W3
-uphminb-h   UniJIS-UTF16-H HiraMinPro-W6
-uphminb-v   UniJIS-UTF16-V HiraMinPro-W6
-uphgothb-h  UniJIS-UTF16-H HiraKakuPro-W6
-uphgothb-v  UniJIS-UTF16-V HiraKakuPro-W6
-uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8
-uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8
-uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4
-uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4
-uphminl-h   UniJIS-UTF16-H HiraMinPro-W2
-uphminl-v   UniJIS-UTF16-V HiraMinPro-W2
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-ipa.map
deleted file mode 100644
index 3099e52fd01..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-ipa.map
+++ /dev/null
@@ -1,43 +0,0 @@
-% otf on upTeX
-uphminr-h     UniJIS-UTF16-H     ipam.ttf
-uphminr-v     UniJIS-UTF16-V     ipam.ttf
-
-uphgothr-h    UniJIS-UTF16-H     ipag.ttf
-uphgothr-v    UniJIS-UTF16-V     ipag.ttf
-
-uphminb-h     UniJIS-UTF16-H     ipam.ttf
-uphminb-v     UniJIS-UTF16-V     ipam.ttf
-
-uphgothb-h    UniJIS-UTF16-H     ipag.ttf
-uphgothb-v    UniJIS-UTF16-V     ipag.ttf
-
-uphgotheb-h   UniJIS-UTF16-H     ipag.ttf
-uphgotheb-v   UniJIS-UTF16-V     ipag.ttf
-
-uphmgothr-h   UniJIS-UTF16-H     ipag.ttf
-uphmgothr-v   UniJIS-UTF16-V     ipag.ttf
-
-uphminl-h     UniJIS-UTF16-H     ipam.ttf
-uphminl-v     UniJIS-UTF16-V     ipam.ttf
-
-% otf on upTeX, JIS2004
-uphminrn-h     UniJIS2004-UTF16-H     ipam.ttf
-uphminrn-v     UniJIS2004-UTF16-V     ipam.ttf
-
-uphgothrn-h    UniJIS2004-UTF16-H     ipag.ttf
-uphgothrn-v    UniJIS2004-UTF16-V     ipag.ttf
-
-uphminbn-h     UniJIS2004-UTF16-H     ipam.ttf
-uphminbn-v     UniJIS2004-UTF16-V     ipam.ttf
-
-uphgothbn-h    UniJIS2004-UTF16-H     ipag.ttf
-uphgothbn-v    UniJIS2004-UTF16-V     ipag.ttf
-
-uphgothebn-h   UniJIS2004-UTF16-H     ipag.ttf
-uphgothebn-v   UniJIS2004-UTF16-V     ipag.ttf
-
-uphmgothrn-h   UniJIS2004-UTF16-H     ipag.ttf
-uphmgothrn-v   UniJIS2004-UTF16-V     ipag.ttf
-
-uphminln-h     UniJIS2004-UTF16-H     ipam.ttf
-uphminln-v     UniJIS2004-UTF16-V     ipam.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-ipaex.map
deleted file mode 100644
index 826a0b91853..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-ipaex.map
+++ /dev/null
@@ -1,43 +0,0 @@
-% otf on upTeX
-uphminr-h     UniJIS-UTF16-H     ipaexm.ttf
-uphminr-v     UniJIS-UTF16-V     ipaexm.ttf
-
-uphgothr-h    UniJIS-UTF16-H     ipaexg.ttf
-uphgothr-v    UniJIS-UTF16-V     ipaexg.ttf
-
-uphminb-h     UniJIS-UTF16-H     ipaexm.ttf
-uphminb-v     UniJIS-UTF16-V     ipaexm.ttf
-
-uphgothb-h    UniJIS-UTF16-H     ipaexg.ttf
-uphgothb-v    UniJIS-UTF16-V     ipaexg.ttf
-
-uphgotheb-h   UniJIS-UTF16-H     ipaexg.ttf
-uphgotheb-v   UniJIS-UTF16-V     ipaexg.ttf
-
-uphmgothr-h   UniJIS-UTF16-H     ipaexg.ttf
-uphmgothr-v   UniJIS-UTF16-V     ipaexg.ttf
-
-uphminl-h     UniJIS-UTF16-H     ipaexm.ttf
-uphminl-v     UniJIS-UTF16-V     ipaexm.ttf
-
-% otf on upTeX, JIS2004
-uphminrn-h     UniJIS2004-UTF16-H     ipaexm.ttf
-uphminrn-v     UniJIS2004-UTF16-V     ipaexm.ttf
-
-uphgothrn-h    UniJIS2004-UTF16-H     ipaexg.ttf
-uphgothrn-v    UniJIS2004-UTF16-V     ipaexg.ttf
-
-uphminbn-h     UniJIS2004-UTF16-H     ipaexm.ttf
-uphminbn-v     UniJIS2004-UTF16-V     ipaexm.ttf
-
-uphgothbn-h    UniJIS2004-UTF16-H     ipaexg.ttf
-uphgothbn-v    UniJIS2004-UTF16-V     ipaexg.ttf
-
-uphgothebn-h   UniJIS2004-UTF16-H     ipaexg.ttf
-uphgothebn-v   UniJIS2004-UTF16-V     ipaexg.ttf
-
-uphmgothrn-h   UniJIS2004-UTF16-H     ipaexg.ttf
-uphmgothrn-v   UniJIS2004-UTF16-V     ipaexg.ttf
-
-uphminln-h     UniJIS2004-UTF16-H     ipaexm.ttf
-uphminln-v     UniJIS2004-UTF16-V     ipaexm.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-kozuka.map
deleted file mode 100644
index 701fd615219..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-kozuka.map
+++ /dev/null
@@ -1,15 +0,0 @@
-%
-% otf-up-kozuka.map
-% map file to support Kozuka fonts in uptex
-% based on the patch of TANAKA Takuji
-% from uptex-1.00-20120115a
-uphminr-h     UniJIS-UTF16-H KozMinPro-Regular.otf
-uphminr-v     UniJIS-UTF16-V KozMinPro-Regular.otf
-uphgothr-h    UniJIS-UTF16-H KozGoStd-Regular.otf
-uphgothr-v    UniJIS-UTF16-V KozGoStd-Regular.otf
-uphminb-h     UniJIS-UTF16-H KozMinStd-Bold.otf
-uphminb-v     UniJIS-UTF16-V KozMinStd-Bold.otf
-uphgothb-h    UniJIS-UTF16-H KozGoStd-Bold.otf
-uphgothb-v    UniJIS-UTF16-V KozGoStd-Bold.otf
-uphmgothr-h   UniJIS-UTF16-H KozGoStd-Heavy.otf
-uphmgothr-v   UniJIS-UTF16-V KozGoStd-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-morisawa.map
deleted file mode 100644
index 8c66911d355..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/otf-up-morisawa.map
+++ /dev/null
@@ -1,15 +0,0 @@
-%
-% otf-up-morisawa.map
-% map file to support Morisawa fonts in uptex
-% based on the patch of TANAKA Takuji
-% from uptex-1.00-20120115a
-uphminr-h   UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
-uphminr-v   UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
-uphgothr-h  UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf
-uphgothr-v  UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf
-uphminb-h   UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf
-uphminb-v   UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf
-uphgothb-h  UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf
-uphgothb-v  UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf
-uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf
-uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino-04.map
deleted file mode 100644
index 9de30b9c898..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino-04.map
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml       H               HiraMinProN-W3.otf
-rmlv      V               HiraMinProN-W3.otf
-gbm       H               HiraKakuProN-W3.otf
-gbmv      V               HiraKakuProN-W3.otf
-
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino.map
deleted file mode 100644
index 54be2188e63..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-hiragino.map
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml       H               HiraMinPro-W3.otf
-rmlv      V               HiraMinPro-W3.otf
-gbm       H               HiraKakuPro-W3.otf
-gbmv      V               HiraKakuPro-W3.otf
-
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-ipa.map
deleted file mode 100644
index 132acccc936..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-ipa.map
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml       H               ipam.ttf
-rmlv      V               ipam.ttf
-gbm       H               ipag.ttf
-gbmv      V               ipag.ttf
-
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-ipaex.map
deleted file mode 100644
index c1717951026..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-ipaex.map
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml       H               ipaexm.ttf
-rmlv      V               ipaexm.ttf
-gbm       H               ipaexg.ttf
-gbmv      V               ipaexg.ttf
-
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka-04.map
deleted file mode 100644
index c8d864310c5..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka-04.map
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml       H               KozMinPr6N-Regular.otf
-rmlv      V               KozMinPr6N-Regular.otf
-gbm       H               KozGoPr6N-Regular.otf
-gbmv      V               KozGoPr6N-Regular.otf
-
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka.map
deleted file mode 100644
index d302b80955b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-kozuka.map
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml       H               KozMinPro-Regular.otf
-rmlv      V               KozMinPro-Regular.otf
-gbm       H               KozGoPro-Regular.otf
-gbmv      V               KozGoPro-Regular.otf
-
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa-04.map
deleted file mode 100644
index 82f82dc786a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa-04.map
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml       H               A-OTF-RyuminPr6N-Light.otf
-rmlv      V               A-OTF-RyuminPr6N-Light.otf
-gbm       H               A-OTF-GothicBBBPr6N-Medium.otf
-gbmv      V               A-OTF-GothicBBBPr6N-Medium.otf
-
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa.map
deleted file mode 100644
index 1c2fa50fce8..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ptex-morisawa.map
+++ /dev/null
@@ -1,9 +0,0 @@
-%%
-%% ASCII pTeX
-%%
-
-rml       H               A-OTF-RyuminPro-Light.otf
-rmlv      V               A-OTF-RyuminPro-Light.otf
-gbm       H               A-OTF-GothicBBBPro-Medium.otf
-gbmv      V               A-OTF-GothicBBBPro-Medium.otf
-
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino-04.map
deleted file mode 100644
index d3599199c2b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino-04.map
+++ /dev/null
@@ -1,11 +0,0 @@
-urml      UniJIS-UTF16-H  HiraMinProN-W3.otf
-urmlv     UniJIS-UTF16-V  HiraMinProN-W3.otf
-ugbm      UniJIS-UTF16-H  HiraKakuProN-W3.otf
-ugbmv     UniJIS-UTF16-V  HiraKakuProN-W3.otf
-
-uprml-h   UniJIS-UTF16-H  HiraMinProN-W3.otf
-uprml-v   UniJIS-UTF16-V  HiraMinProN-W3.otf
-upgbm-h   UniJIS-UTF16-H  HiraKakuProN-W3.otf
-upgbm-v   UniJIS-UTF16-V  HiraKakuProN-W3.otf
-uprml-hq  UniJIS-UCS2-H   HiraMinProN-W3.otf
-upgbm-hq  UniJIS-UCS2-H   HiraKakuProN-W3.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino.map
deleted file mode 100644
index b9752e266c0..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-hiragino.map
+++ /dev/null
@@ -1,11 +0,0 @@
-urml      UniJIS-UTF16-H  HiraMinPro-W3.otf
-urmlv     UniJIS-UTF16-V  HiraMinPro-W3.otf
-ugbm      UniJIS-UTF16-H  HiraKakuPro-W3.otf
-ugbmv     UniJIS-UTF16-V  HiraKakuPro-W3.otf
-
-uprml-h   UniJIS-UTF16-H  HiraMinPro-W3.otf
-uprml-v   UniJIS-UTF16-V  HiraMinPro-W3.otf
-upgbm-h   UniJIS-UTF16-H  HiraKakuPro-W3.otf
-upgbm-v   UniJIS-UTF16-V  HiraKakuPro-W3.otf
-uprml-hq  UniJIS-UCS2-H   HiraMinPro-W3.otf
-upgbm-hq  UniJIS-UCS2-H   HiraKakuPro-W3.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-ipa.map
deleted file mode 100644
index baf933ea05a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-ipa.map
+++ /dev/null
@@ -1,15 +0,0 @@
-%%
-%% upTeX
-%%
-
-urml      UniJIS-UTF16-H  ipam.ttf
-urmlv     UniJIS-UTF16-V  ipam.ttf
-ugbm      UniJIS-UTF16-H  ipag.ttf
-ugbmv     UniJIS-UTF16-V  ipag.ttf
-
-uprml-h   UniJIS-UTF16-H  ipam.ttf
-uprml-v   UniJIS-UTF16-V  ipam.ttf
-upgbm-h   UniJIS-UTF16-H  ipag.ttf
-upgbm-v   UniJIS-UTF16-V  ipag.ttf
-uprml-hq  UniJIS-UCS2-H   ipam.ttf
-upgbm-hq  UniJIS-UCS2-H   ipag.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-ipaex.map
deleted file mode 100644
index 9dfdac5f80b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-ipaex.map
+++ /dev/null
@@ -1,15 +0,0 @@
-%%
-%% upTeX
-%%
-
-urml      UniJIS-UTF16-H  ipaexm.ttf
-urmlv     UniJIS-UTF16-V  ipaexm.ttf
-ugbm      UniJIS-UTF16-H  ipaexg.ttf
-ugbmv     UniJIS-UTF16-V  ipaexg.ttf
-
-uprml-h   UniJIS-UTF16-H  ipaexm.ttf
-uprml-v   UniJIS-UTF16-V  ipaexm.ttf
-upgbm-h   UniJIS-UTF16-H  ipaexg.ttf
-upgbm-v   UniJIS-UTF16-V  ipaexg.ttf
-uprml-hq  UniJIS-UCS2-H   ipaexm.ttf
-upgbm-hq  UniJIS-UCS2-H   ipaexg.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka-04.map
deleted file mode 100644
index 63b13a9a015..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka-04.map
+++ /dev/null
@@ -1,11 +0,0 @@
-urml      UniJIS-UTF16-H  KozMinPr6N-Regular.otf
-urmlv     UniJIS-UTF16-V  KozMinPr6N-Regular.otf
-ugbm      UniJIS-UTF16-H  KozGoPr6N-Regular.otf
-ugbmv     UniJIS-UTF16-V  KozGoPr6N-Regular.otf
-
-uprml-h   UniJIS-UTF16-H  KozMinPr6N-Regular.otf
-uprml-v   UniJIS-UTF16-V  KozMinPr6N-Regular.otf
-upgbm-h   UniJIS-UTF16-H  KozGoPr6N-Regular.otf
-upgbm-v   UniJIS-UTF16-V  KozGoPr6N-Regular.otf
-uprml-hq  UniJIS-UCS2-H   KozMinPr6N-Regular.otf
-upgbm-hq  UniJIS-UCS2-H   KozGoPr6N-Regular.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka.map
deleted file mode 100644
index 15ea7242917..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-kozuka.map
+++ /dev/null
@@ -1,11 +0,0 @@
-urml      UniJIS-UTF16-H  KozMinPro-Regular.otf
-urmlv     UniJIS-UTF16-V  KozMinPro-Regular.otf
-ugbm      UniJIS-UTF16-H  KozGoPro-Regular.otf
-ugbmv     UniJIS-UTF16-V  KozGoPro-Regular.otf
-
-uprml-h   UniJIS-UTF16-H  KozMinPro-Regular.otf
-uprml-v   UniJIS-UTF16-V  KozMinPro-Regular.otf
-upgbm-h   UniJIS-UTF16-H  KozGoPro-Regular.otf
-upgbm-v   UniJIS-UTF16-V  KozGoPro-Regular.otf
-uprml-hq  UniJIS-UCS2-H   KozMinPro-Regular.otf
-upgbm-hq  UniJIS-UCS2-H   KozGoPro-Regular.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa-04.map
deleted file mode 100644
index 5c67f915aa0..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa-04.map
+++ /dev/null
@@ -1,11 +0,0 @@
-urml      UniJIS-UTF16-H  A-OTF-RyuminPr6N-Light.otf
-urmlv     UniJIS-UTF16-V  A-OTF-RyuminPr6N-Light.otf
-ugbm      UniJIS-UTF16-H  A-OTF-GothicBBBPr6N-Medium.otf
-ugbmv     UniJIS-UTF16-V  A-OTF-GothicBBBPr6N-Medium.otf
-
-uprml-h   UniJIS-UTF16-H  A-OTF-RyuminPr6N-Light.otf
-uprml-v   UniJIS-UTF16-V  A-OTF-RyuminPr6N-Light.otf
-upgbm-h   UniJIS-UTF16-H  A-OTF-GothicBBBPr6N-Medium.otf
-upgbm-v   UniJIS-UTF16-V  A-OTF-GothicBBBPr6N-Medium.otf
-uprml-hq  UniJIS-UCS2-H   A-OTF-RyuminPr6N-Light.otf
-upgbm-hq  UniJIS-UCS2-H   A-OTF-GothicBBBPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa.map
deleted file mode 100644
index ddd6bb82ba3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/uptex-morisawa.map
+++ /dev/null
@@ -1,11 +0,0 @@
-urml      UniJIS-UTF16-H  A-OTF-RyuminPro-Light.otf
-urmlv     UniJIS-UTF16-V  A-OTF-RyuminPro-Light.otf
-ugbm      UniJIS-UTF16-H  A-OTF-GothicBBBPro-Medium.otf
-ugbmv     UniJIS-UTF16-V  A-OTF-GothicBBBPro-Medium.otf
-
-uprml-h   UniJIS-UTF16-H  A-OTF-RyuminPro-Light.otf
-uprml-v   UniJIS-UTF16-V  A-OTF-RyuminPro-Light.otf
-upgbm-h   UniJIS-UTF16-H  A-OTF-GothicBBBPro-Medium.otf
-upgbm-v   UniJIS-UTF16-V  A-OTF-GothicBBBPro-Medium.otf
-uprml-hq  UniJIS-UCS2-H   A-OTF-RyuminPro-Light.otf
-upgbm-hq  UniJIS-UCS2-H   A-OTF-GothicBBBPro-Medium.otf