summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog30
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/README19
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map140
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map56
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map140
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map56
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map140
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map56
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map140
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map56
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map56
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map140
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map56
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map140
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map20
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl15
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl4
-rwxr-xr-xMaster/texmf-dist/source/jfontmaps/tools/mkmap.lua148
35 files changed, 855 insertions, 789 deletions
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
index 82cf7fcba00..39b079dabbd 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
@@ -1,6 +1,30 @@
+2014-03-01 Norbert Preining <preining@logic.at>
+
+ * Release 20140301.0 (HEAD, master) [d7ef001]
+
+2014-02-26 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Changed symlink name for yu-osx into YuMin-Medium.otf etc. (origin/master, gito-h7ks/h7k, h7k) [608f753]
+
+2014-02-26 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Merge branch 'master' into h7k [db5bbb1]
+
+2014-02-25 Norbert Preining <preining@logic.at>
+
+ * fix yu versus yu-osx and yu-win in kanji-setup-updmap [2e12f61]
+
+2014-02-24 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Use ShinMGoPr6N-Light in morisawa Pr6N [f0204e7]
+
+2014-02-23 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Use "%!PS" syntax [359bf3c]
+
2014-01-20 Norbert Preining <preining@logic.at>
- * Release 20140120.0 (HEAD, master) [eef8b75]
+ * Release 20140120.0 (tag: 20140120.0) [eef8b75]
2014-01-20 Norbert Preining <preining@logic.at>
@@ -12,7 +36,7 @@
2013-11-20 Norbert Preining <preining@logic.at>
- * fix info for yu-win fonts (origin/master) [a8de4bc]
+ * fix info for yu-win fonts [a8de4bc]
2013-11-20 Norbert Preining <preining@logic.at>
@@ -24,7 +48,7 @@
2013-11-20 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
- * Regenerated map files by tools/mkmap.lua. (gito-h7ks/h7k, h7k) [542c445]
+ * Regenerated map files by tools/mkmap.lua. [542c445]
2013-11-20 Norbert Preining <preining@logic.at>
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/README b/Master/texmf-dist/doc/fonts/jfontmaps/README
index 754582d0f78..8a21311156a 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/README
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/README
@@ -1,7 +1,7 @@
jfontmaps
=========
-Current release: 20140120.0
+Current release: 20140301.0
The files contained in this package contains font maps for dvipdfmx to
make various Japanese fonts available for (u)ptex and related programs
@@ -47,12 +47,12 @@ X ms - MS Mincho and MS Gothic, shipped with Windows
yugothic.ttf
yugothib.ttf
-O? yu-osx - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
+O yu-osx - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
bundled with OSX 10.9.
- YuGothic-Bold.otf (<= "Yu Gothic Bold.otf")
- YuGothic-Medium.otf (<= "Yu Gothic Medium.otf")
- YuMincho-Demibold.otf (<= "Yu Mincho Demibold.otf")
- YuMincho-Medium.otf (<= "Yu Mincho Medium.otf")
+ YuGo-Bold.otf (<= "Yu Gothic Bold.otf")
+ YuGo-Medium.otf (<= "Yu Gothic Medium.otf")
+ YuMin-Demibold.otf (<= "Yu Mincho Demibold.otf")
+ YuMin-Medium.otf (<= "Yu Mincho Medium.otf")
4 ipa - IPA fonts from Information-technology Promotion Agency
@@ -104,7 +104,12 @@ P morisawa - by Morisawa Inc.
A-OTF-RyuminPro-Light.otf
O morisawa-pr6n - see above
- same with Pr6N instead of Pro
+ A-OTF-FutoGoB101Pr6N-Bold.otf
+ A-OTF-FutoMinA101Pr6N-Bold.otf
+ A-OTF-GothicBBBPr6N-Medium.otf
+ A-OTF-ShinMGoPr6N-Light.otf
+ A-OTF-MidashiGoPr6N-MB31.otf
+ A-OTF-RyuminPr6N-Light.otf
Copyright/License
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
index cd2249ba0c4..611554f510a 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map
@@ -1,80 +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
+hminl-h H ipam.ttf %!PS IPAMincho
+hminl-v V ipam.ttf %!PS IPAMincho
+hminr-h H ipam.ttf %!PS IPAMincho
+hminr-v V ipam.ttf %!PS IPAMincho
+hminb-h H ipam.ttf %!PS IPAMincho
+hminb-v V ipam.ttf %!PS IPAMincho
+hgothr-h H ipag.ttf %!PS IPAGothic
+hgothr-v V ipag.ttf %!PS IPAGothic
+hgothb-h H ipag.ttf %!PS IPAGothic
+hgothb-v V ipag.ttf %!PS IPAGothic
+hgotheb-h H ipag.ttf %!PS IPAGothic
+hgotheb-v V ipag.ttf %!PS IPAGothic
+hmgothr-h H ipag.ttf %!PS IPAGothic
+hmgothr-v V ipag.ttf %!PS IPAGothic
% 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
+hminln-h H ipam.ttf %!PS IPAMincho
+hminln-v V ipam.ttf %!PS IPAMincho
+hminrn-h H ipam.ttf %!PS IPAMincho
+hminrn-v V ipam.ttf %!PS IPAMincho
+hminbn-h H ipam.ttf %!PS IPAMincho
+hminbn-v V ipam.ttf %!PS IPAMincho
+hgothrn-h H ipag.ttf %!PS IPAGothic
+hgothrn-v V ipag.ttf %!PS IPAGothic
+hgothbn-h H ipag.ttf %!PS IPAGothic
+hgothbn-v V ipag.ttf %!PS IPAGothic
+hgothebn-h H ipag.ttf %!PS IPAGothic
+hgothebn-v V ipag.ttf %!PS IPAGothic
+hmgothrn-h H ipag.ttf %!PS IPAGothic
+hmgothrn-v V ipag.ttf %!PS IPAGothic
% 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
+otf-cjml-h Identity-H ipam.ttf/AJ16 %!PS IPAMincho
+otf-cjml-v Identity-V ipam.ttf/AJ16 %!PS IPAMincho
+otf-cjmr-h Identity-H ipam.ttf/AJ16 %!PS IPAMincho
+otf-cjmr-v Identity-V ipam.ttf/AJ16 %!PS IPAMincho
+otf-cjmb-h Identity-H ipam.ttf/AJ16 %!PS IPAMincho
+otf-cjmb-v Identity-V ipam.ttf/AJ16 %!PS IPAMincho
+otf-cjgr-h Identity-H ipag.ttf/AJ16 %!PS IPAGothic
+otf-cjgr-v Identity-V ipag.ttf/AJ16 %!PS IPAGothic
+otf-cjgb-h Identity-H ipag.ttf/AJ16 %!PS IPAGothic
+otf-cjgb-v Identity-V ipag.ttf/AJ16 %!PS IPAGothic
+otf-cjge-h Identity-H ipag.ttf/AJ16 %!PS IPAGothic
+otf-cjge-v Identity-V ipag.ttf/AJ16 %!PS IPAGothic
+otf-cjmgr-h Identity-H ipag.ttf/AJ16 %!PS IPAGothic
+otf-cjmgr-v Identity-V ipag.ttf/AJ16 %!PS IPAGothic
% 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
+otf-ujml-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
+otf-ujml-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
+otf-ujmr-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
+otf-ujmr-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
+otf-ujmb-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
+otf-ujmb-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
+otf-ujgr-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+otf-ujgr-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
+otf-ujgb-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+otf-ujgb-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
+otf-ujge-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+otf-ujge-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
+otf-ujmgr-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+otf-ujmgr-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
% 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
+otf-ujmln-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
+otf-ujmln-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
+otf-ujmrn-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
+otf-ujmrn-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
+otf-ujmbn-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
+otf-ujmbn-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
+otf-ujgrn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
+otf-ujgrn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
+otf-ujgbn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
+otf-ujgbn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
+otf-ujgen-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
+otf-ujgen-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
+otf-ujmgrn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
+otf-ujmgrn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
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
index 42ccf257a22..ef5f32ec81b 100644
--- 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
@@ -1,32 +1,32 @@
% 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
+uphminl-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
+uphminl-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
+uphminr-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
+uphminr-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
+uphminb-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
+uphminb-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
+uphgothr-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+uphgothr-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
+uphgothb-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+uphgothb-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
+uphgotheb-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+uphgotheb-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
+uphmgothr-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+uphmgothr-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H ipam.ttf
-uphminln-v UniJIS2004-UTF16-V ipam.ttf
-uphminrn-h UniJIS2004-UTF16-H ipam.ttf
-uphminrn-v UniJIS2004-UTF16-V ipam.ttf
-uphminbn-h UniJIS2004-UTF16-H ipam.ttf
-uphminbn-v UniJIS2004-UTF16-V ipam.ttf
-uphgothrn-h UniJIS2004-UTF16-H ipag.ttf
-uphgothrn-v UniJIS2004-UTF16-V ipag.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 %!PS IPAMincho
+uphminln-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
+uphminrn-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
+uphminrn-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
+uphminbn-h UniJIS2004-UTF16-H ipam.ttf %!PS IPAMincho
+uphminbn-v UniJIS2004-UTF16-V ipam.ttf %!PS IPAMincho
+uphgothrn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
+uphgothrn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
+uphgothbn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
+uphgothbn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
+uphgothebn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
+uphgothebn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
+uphmgothrn-h UniJIS2004-UTF16-H ipag.ttf %!PS IPAGothic
+uphmgothrn-v UniJIS2004-UTF16-V ipag.ttf %!PS IPAGothic
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
index d30a31fe748..d1ab1809d0c 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map
@@ -1,4 +1,4 @@
-rml H ipam.ttf
-rmlv V ipam.ttf
-gbm H ipag.ttf
-gbmv V ipag.ttf
+rml H ipam.ttf %!PS IPAMincho
+rmlv V ipam.ttf %!PS IPAMincho
+gbm H ipag.ttf %!PS IPAGothic
+gbmv V ipag.ttf %!PS IPAGothic
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
index 1ad6b704a3a..22e92e35cc4 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map
@@ -1,10 +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
+urml UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
+urmlv UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
+ugbm UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+ugbmv UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
+uprml-h UniJIS-UTF16-H ipam.ttf %!PS IPAMincho
+uprml-v UniJIS-UTF16-V ipam.ttf %!PS IPAMincho
+upgbm-h UniJIS-UTF16-H ipag.ttf %!PS IPAGothic
+upgbm-v UniJIS-UTF16-V ipag.ttf %!PS IPAGothic
+uprml-hq UniJIS-UCS2-H ipam.ttf %!PS IPAMincho
+upgbm-hq UniJIS-UCS2-H ipag.ttf %!PS IPAGothic
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
index 0f713442ebc..02036bcd1fc 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map
@@ -1,80 +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
+hminl-h H ipaexm.ttf %!PS IPAexMincho
+hminl-v V ipaexm.ttf %!PS IPAexMincho
+hminr-h H ipaexm.ttf %!PS IPAexMincho
+hminr-v V ipaexm.ttf %!PS IPAexMincho
+hminb-h H ipaexm.ttf %!PS IPAexMincho
+hminb-v V ipaexm.ttf %!PS IPAexMincho
+hgothr-h H ipaexg.ttf %!PS IPAexGothic
+hgothr-v V ipaexg.ttf %!PS IPAexGothic
+hgothb-h H ipaexg.ttf %!PS IPAexGothic
+hgothb-v V ipaexg.ttf %!PS IPAexGothic
+hgotheb-h H ipaexg.ttf %!PS IPAexGothic
+hgotheb-v V ipaexg.ttf %!PS IPAexGothic
+hmgothr-h H ipaexg.ttf %!PS IPAexGothic
+hmgothr-v V ipaexg.ttf %!PS IPAexGothic
% 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
+hminln-h H ipaexm.ttf %!PS IPAexMincho
+hminln-v V ipaexm.ttf %!PS IPAexMincho
+hminrn-h H ipaexm.ttf %!PS IPAexMincho
+hminrn-v V ipaexm.ttf %!PS IPAexMincho
+hminbn-h H ipaexm.ttf %!PS IPAexMincho
+hminbn-v V ipaexm.ttf %!PS IPAexMincho
+hgothrn-h H ipaexg.ttf %!PS IPAexGothic
+hgothrn-v V ipaexg.ttf %!PS IPAexGothic
+hgothbn-h H ipaexg.ttf %!PS IPAexGothic
+hgothbn-v V ipaexg.ttf %!PS IPAexGothic
+hgothebn-h H ipaexg.ttf %!PS IPAexGothic
+hgothebn-v V ipaexg.ttf %!PS IPAexGothic
+hmgothrn-h H ipaexg.ttf %!PS IPAexGothic
+hmgothrn-v V ipaexg.ttf %!PS IPAexGothic
% 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
+otf-cjml-h Identity-H ipaexm.ttf/AJ16 %!PS IPAexMincho
+otf-cjml-v Identity-V ipaexm.ttf/AJ16 %!PS IPAexMincho
+otf-cjmr-h Identity-H ipaexm.ttf/AJ16 %!PS IPAexMincho
+otf-cjmr-v Identity-V ipaexm.ttf/AJ16 %!PS IPAexMincho
+otf-cjmb-h Identity-H ipaexm.ttf/AJ16 %!PS IPAexMincho
+otf-cjmb-v Identity-V ipaexm.ttf/AJ16 %!PS IPAexMincho
+otf-cjgr-h Identity-H ipaexg.ttf/AJ16 %!PS IPAexGothic
+otf-cjgr-v Identity-V ipaexg.ttf/AJ16 %!PS IPAexGothic
+otf-cjgb-h Identity-H ipaexg.ttf/AJ16 %!PS IPAexGothic
+otf-cjgb-v Identity-V ipaexg.ttf/AJ16 %!PS IPAexGothic
+otf-cjge-h Identity-H ipaexg.ttf/AJ16 %!PS IPAexGothic
+otf-cjge-v Identity-V ipaexg.ttf/AJ16 %!PS IPAexGothic
+otf-cjmgr-h Identity-H ipaexg.ttf/AJ16 %!PS IPAexGothic
+otf-cjmgr-v Identity-V ipaexg.ttf/AJ16 %!PS IPAexGothic
% 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
+otf-ujml-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
+otf-ujml-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
+otf-ujmr-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
+otf-ujmr-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
+otf-ujmb-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
+otf-ujmb-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
+otf-ujgr-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+otf-ujgr-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
+otf-ujgb-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+otf-ujgb-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
+otf-ujge-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+otf-ujge-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
+otf-ujmgr-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+otf-ujmgr-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
% 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
+otf-ujmln-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
+otf-ujmln-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
+otf-ujmrn-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
+otf-ujmrn-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
+otf-ujmbn-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
+otf-ujmbn-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
+otf-ujgrn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
+otf-ujgrn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
+otf-ujgbn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
+otf-ujgbn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
+otf-ujgen-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
+otf-ujgen-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
+otf-ujmgrn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
+otf-ujmgrn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
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
index 8844c8c0613..58fc9294ada 100644
--- 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
@@ -1,32 +1,32 @@
% 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
+uphminl-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
+uphminl-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
+uphminr-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
+uphminr-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
+uphminb-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
+uphminb-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
+uphgothr-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+uphgothr-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
+uphgothb-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+uphgothb-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
+uphgotheb-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+uphgotheb-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
+uphmgothr-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+uphmgothr-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H ipaexm.ttf
-uphminln-v UniJIS2004-UTF16-V ipaexm.ttf
-uphminrn-h UniJIS2004-UTF16-H ipaexm.ttf
-uphminrn-v UniJIS2004-UTF16-V ipaexm.ttf
-uphminbn-h UniJIS2004-UTF16-H ipaexm.ttf
-uphminbn-v UniJIS2004-UTF16-V ipaexm.ttf
-uphgothrn-h UniJIS2004-UTF16-H ipaexg.ttf
-uphgothrn-v UniJIS2004-UTF16-V ipaexg.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 %!PS IPAexMincho
+uphminln-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
+uphminrn-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
+uphminrn-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
+uphminbn-h UniJIS2004-UTF16-H ipaexm.ttf %!PS IPAexMincho
+uphminbn-v UniJIS2004-UTF16-V ipaexm.ttf %!PS IPAexMincho
+uphgothrn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
+uphgothrn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
+uphgothbn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
+uphgothbn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
+uphgothebn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
+uphgothebn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
+uphmgothrn-h UniJIS2004-UTF16-H ipaexg.ttf %!PS IPAexGothic
+uphmgothrn-v UniJIS2004-UTF16-V ipaexg.ttf %!PS IPAexGothic
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
index c11f3e11317..77e7adba347 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map
@@ -1,4 +1,4 @@
-rml H ipaexm.ttf
-rmlv V ipaexm.ttf
-gbm H ipaexg.ttf
-gbmv V ipaexg.ttf
+rml H ipaexm.ttf %!PS IPAexMincho
+rmlv V ipaexm.ttf %!PS IPAexMincho
+gbm H ipaexg.ttf %!PS IPAexGothic
+gbmv V ipaexg.ttf %!PS IPAexGothic
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
index afc58b146a1..3fa3ca510b9 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map
@@ -1,10 +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
+urml UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
+urmlv UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
+ugbm UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+ugbmv UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
+uprml-h UniJIS-UTF16-H ipaexm.ttf %!PS IPAexMincho
+uprml-v UniJIS-UTF16-V ipaexm.ttf %!PS IPAexMincho
+upgbm-h UniJIS-UTF16-H ipaexg.ttf %!PS IPAexGothic
+upgbm-v UniJIS-UTF16-V ipaexg.ttf %!PS IPAexGothic
+uprml-hq UniJIS-UCS2-H ipaexm.ttf %!PS IPAexMincho
+upgbm-hq UniJIS-UCS2-H ipaexg.ttf %!PS IPAexGothic
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
index 861f04d2d8f..b9693f80c09 100644
--- 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
@@ -1,80 +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
+hminl-h H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+hminl-v V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+hminr-h H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+hminr-v V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+hminb-h H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+hminb-v V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+hgothr-h H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+hgothr-v V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+hgothb-h H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+hgothb-v V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+hgotheb-h H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+hgotheb-v V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+hmgothr-h H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
+hmgothr-v V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
% 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
+hminln-h H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+hminln-v V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+hminrn-h H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+hminrn-v V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+hminbn-h H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+hminbn-v V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+hgothrn-h H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+hgothrn-v V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+hgothbn-h H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+hgothbn-v V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+hgothebn-h H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+hgothebn-v V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+hmgothrn-h H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
+hmgothrn-v V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
% 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
+otf-cjml-h Identity-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-cjml-v Identity-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-cjmr-h Identity-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-cjmr-v Identity-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-cjmb-h Identity-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+otf-cjmb-v Identity-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+otf-cjgr-h Identity-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+otf-cjgr-v Identity-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+otf-cjgb-h Identity-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+otf-cjgb-v Identity-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+otf-cjge-h Identity-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+otf-cjge-v Identity-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+otf-cjmgr-h Identity-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
+otf-cjmgr-v Identity-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
% 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
+otf-ujml-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-ujml-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-ujmr-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-ujmr-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-ujmb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+otf-ujmb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+otf-ujgr-h UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+otf-ujgr-v UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+otf-ujgb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+otf-ujgb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+otf-ujge-h UniJIS-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+otf-ujge-v UniJIS-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+otf-ujmgr-h UniJIS-UTF16-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
+otf-ujmgr-v UniJIS-UTF16-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
% 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
+otf-ujmln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-ujmln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-ujmrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-ujmrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+otf-ujmbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+otf-ujmbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+otf-ujgrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+otf-ujgrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+otf-ujgbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+otf-ujgbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+otf-ujgen-h UniJIS2004-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+otf-ujgen-v UniJIS2004-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+otf-ujmgrn-h UniJIS2004-UTF16-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
+otf-ujmgrn-v UniJIS2004-UTF16-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
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
index 30070641592..c1cd7c8e02e 100644
--- 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
@@ -1,32 +1,32 @@
% 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
+uphminl-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uphminl-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uphminr-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uphminr-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+uphminb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+uphgothr-v UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+uphgothb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+uphgotheb-h UniJIS-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+uphgotheb-v UniJIS-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+uphmgothr-h UniJIS-UTF16-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
+uphmgothr-v UniJIS-UTF16-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
-uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
-uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
-uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
-uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf
-uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
-uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
-uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf
-uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf
-uphmgothrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pr6N-Light.otf
-uphmgothrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pr6N-Light.otf
+uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf %!PS FutoMinA101Pr6N-Bold
+uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf %!PS FutoGoB101Pr6N-Bold
+uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf %!PS MidashiGoPr6N-MB31
+uphmgothrn-h UniJIS2004-UTF16-H A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
+uphmgothrn-v UniJIS2004-UTF16-V A-OTF-ShinMGoPr6N-Light.otf %!PS ShinMGoPr6N-Light
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
index 19182643b37..7138d023e08 100644
--- 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
@@ -1,4 +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
+rml 2004-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+rmlv 2004-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+gbm 2004-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+gbmv 2004-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
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
index fcb8549cec7..fb7d625d2c3 100644
--- 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
@@ -1,4 +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
+rml H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+rmlv V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+gbm H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+gbmv V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
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
index c5ec04765f2..54f10e7272b 100644
--- 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
@@ -1,10 +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
+urml UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+urmlv UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+ugbm UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+ugbmv UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+uprml-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uprml-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+upgbm-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+upgbm-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+uprml-hq UniJIS-UCS2-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
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
index c20f5c7c78e..d239a660e3a 100644
--- 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
@@ -1,10 +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
+urml UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+urmlv UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+ugbm UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+ugbmv UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+uprml-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+uprml-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+upgbm-h UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+upgbm-v UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
+uprml-hq UniJIS-UCS2-H A-OTF-RyuminPr6N-Light.otf %!PS RyuminPr6N-Light
+upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPr6N-Medium.otf %!PS GothicBBBPr6N-Medium
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
index d03de2c9782..c8e1fdee340 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map
@@ -1,80 +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
+hminl-h H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+hminl-v V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+hminr-h H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+hminr-v V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+hminb-h H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+hminb-v V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+hgothr-h H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+hgothr-v V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+hgothb-h H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+hgothb-v V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+hgotheb-h H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+hgotheb-v V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+hmgothr-h H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
+hmgothr-v V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
% 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
+hminln-h H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+hminln-v V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+hminrn-h H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+hminrn-v V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+hminbn-h H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+hminbn-v V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+hgothrn-h H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+hgothrn-v V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+hgothbn-h H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+hgothbn-v V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+hgothebn-h H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+hgothebn-v V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+hmgothrn-h H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
+hmgothrn-v V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
% 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
+otf-cjml-h Identity-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-cjml-v Identity-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-cjmr-h Identity-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-cjmr-v Identity-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-cjmb-h Identity-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+otf-cjmb-v Identity-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+otf-cjgr-h Identity-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+otf-cjgr-v Identity-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+otf-cjgb-h Identity-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+otf-cjgb-v Identity-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+otf-cjge-h Identity-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+otf-cjge-v Identity-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+otf-cjmgr-h Identity-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
+otf-cjmgr-v Identity-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
% 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
+otf-ujml-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-ujml-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-ujmr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-ujmr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-ujmb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+otf-ujmb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+otf-ujgr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+otf-ujgr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+otf-ujgb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+otf-ujgb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+otf-ujge-h UniJIS-UTF16-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+otf-ujge-v UniJIS-UTF16-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+otf-ujmgr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
+otf-ujmgr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
% 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
+otf-ujmln-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-ujmln-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-ujmrn-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-ujmrn-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+otf-ujmbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+otf-ujmbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+otf-ujgrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+otf-ujgrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+otf-ujgbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+otf-ujgbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+otf-ujgen-h UniJIS2004-UTF16-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+otf-ujgen-v UniJIS2004-UTF16-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+otf-ujmgrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
+otf-ujmgrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
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
index fa2b7cf96f7..34c93e34ad1 100644
--- 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
@@ -1,32 +1,32 @@
% 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
+uphminl-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uphminl-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uphminr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uphminr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+uphminb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+uphgothr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+uphgothb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+uphgotheb-h UniJIS-UTF16-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+uphgotheb-v UniJIS-UTF16-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
+uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf
-uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf
-uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf
-uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf
-uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf
-uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf
-uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf
-uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPro-MB31.otf
-uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPro-MB31.otf
-uphmgothrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pro-Light.otf
-uphmgothrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pro-Light.otf
+uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf %!PS FutoMinA101Pro-Bold
+uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf %!PS FutoGoB101Pro-Bold
+uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPro-MB31.otf %!PS MidashiGoPro-MB31
+uphmgothrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
+uphmgothrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pro-Light.otf %!PS Jun101Pro-Light
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
index 2fa430a6cbd..ae049847591 100644
--- 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
@@ -1,4 +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
+rml 2004-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+rmlv 2004-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+gbm 2004-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+gbmv 2004-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
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
index 4084ac0ac0e..db7516431d2 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map
@@ -1,4 +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
+rml H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+rmlv V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+gbm H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+gbmv V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
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
index b81559c269c..5c9c57d84ac 100644
--- 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
@@ -1,10 +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
+urml UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+urmlv UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+ugbm UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+ugbmv UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+uprml-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uprml-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+upgbm-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+upgbm-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+uprml-hq UniJIS-UCS2-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
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
index e4a7870dc65..fa4d56ddb62 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map
@@ -1,10 +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
+urml UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+urmlv UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+ugbm UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+ugbmv UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+uprml-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+uprml-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+upgbm-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+upgbm-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
+uprml-hq UniJIS-UCS2-H A-OTF-RyuminPro-Light.otf %!PS RyuminPro-Light
+upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPro-Medium.otf %!PS GothicBBBPro-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map
index 3f9870ca639..cf65d10471d 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map
@@ -1,32 +1,32 @@
% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H YuMincho-Medium.otf
-uphminl-v UniJIS-UTF16-V YuMincho-Medium.otf
-uphminr-h UniJIS-UTF16-H YuMincho-Medium.otf
-uphminr-v UniJIS-UTF16-V YuMincho-Medium.otf
-uphminb-h UniJIS-UTF16-H YuMincho-Demibold.otf
-uphminb-v UniJIS-UTF16-V YuMincho-Demibold.otf
-uphgothr-h UniJIS-UTF16-H YuGothic-Medium.otf
-uphgothr-v UniJIS-UTF16-V YuGothic-Medium.otf
-uphgothb-h UniJIS-UTF16-H YuGothic-Bold.otf
-uphgothb-v UniJIS-UTF16-V YuGothic-Bold.otf
-uphgotheb-h UniJIS-UTF16-H YuGothic-Bold.otf
-uphgotheb-v UniJIS-UTF16-V YuGothic-Bold.otf
-uphmgothr-h UniJIS-UTF16-H YuGothic-Bold.otf
-uphmgothr-v UniJIS-UTF16-V YuGothic-Bold.otf
+uphminl-h UniJIS-UTF16-H YuMin-Medium.otf
+uphminl-v UniJIS-UTF16-V YuMin-Medium.otf
+uphminr-h UniJIS-UTF16-H YuMin-Medium.otf
+uphminr-v UniJIS-UTF16-V YuMin-Medium.otf
+uphminb-h UniJIS-UTF16-H YuMin-Demibold.otf
+uphminb-v UniJIS-UTF16-V YuMin-Demibold.otf
+uphgothr-h UniJIS-UTF16-H YuGo-Medium.otf
+uphgothr-v UniJIS-UTF16-V YuGo-Medium.otf
+uphgothb-h UniJIS-UTF16-H YuGo-Bold.otf
+uphgothb-v UniJIS-UTF16-V YuGo-Bold.otf
+uphgotheb-h UniJIS-UTF16-H YuGo-Bold.otf
+uphgotheb-v UniJIS-UTF16-V YuGo-Bold.otf
+uphmgothr-h UniJIS-UTF16-H YuGo-Bold.otf
+uphmgothr-v UniJIS-UTF16-V YuGo-Bold.otf
% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H YuMincho-Medium.otf
-uphminln-v UniJIS2004-UTF16-V YuMincho-Medium.otf
-uphminrn-h UniJIS2004-UTF16-H YuMincho-Medium.otf
-uphminrn-v UniJIS2004-UTF16-V YuMincho-Medium.otf
-uphminbn-h UniJIS2004-UTF16-H YuMincho-Demibold.otf
-uphminbn-v UniJIS2004-UTF16-V YuMincho-Demibold.otf
-uphgothrn-h UniJIS2004-UTF16-H YuGothic-Medium.otf
-uphgothrn-v UniJIS2004-UTF16-V YuGothic-Medium.otf
-uphgothbn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
-uphgothebn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
-uphmgothrn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
-uphmgothrn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
+uphminln-h UniJIS2004-UTF16-H YuMin-Medium.otf
+uphminln-v UniJIS2004-UTF16-V YuMin-Medium.otf
+uphminrn-h UniJIS2004-UTF16-H YuMin-Medium.otf
+uphminrn-v UniJIS2004-UTF16-V YuMin-Medium.otf
+uphminbn-h UniJIS2004-UTF16-H YuMin-Demibold.otf
+uphminbn-v UniJIS2004-UTF16-V YuMin-Demibold.otf
+uphgothrn-h UniJIS2004-UTF16-H YuGo-Medium.otf
+uphgothrn-v UniJIS2004-UTF16-V YuGo-Medium.otf
+uphgothbn-h UniJIS2004-UTF16-H YuGo-Bold.otf
+uphgothbn-v UniJIS2004-UTF16-V YuGo-Bold.otf
+uphgothebn-h UniJIS2004-UTF16-H YuGo-Bold.otf
+uphgothebn-v UniJIS2004-UTF16-V YuGo-Bold.otf
+uphmgothrn-h UniJIS2004-UTF16-H YuGo-Bold.otf
+uphmgothrn-v UniJIS2004-UTF16-V YuGo-Bold.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map
index 5026302c739..7ab78c040d4 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map
@@ -1,80 +1,80 @@
% TEXT, 90JIS
-hminl-h H YuMincho-Medium.otf
-hminl-v V YuMincho-Medium.otf
-hminr-h H YuMincho-Medium.otf
-hminr-v V YuMincho-Medium.otf
-hminb-h H YuMincho-Demibold.otf
-hminb-v V YuMincho-Demibold.otf
-hgothr-h H YuGothic-Medium.otf
-hgothr-v V YuGothic-Medium.otf
-hgothb-h H YuGothic-Bold.otf
-hgothb-v V YuGothic-Bold.otf
-hgotheb-h H YuGothic-Bold.otf
-hgotheb-v V YuGothic-Bold.otf
-hmgothr-h H YuGothic-Bold.otf
-hmgothr-v V YuGothic-Bold.otf
+hminl-h H YuMin-Medium.otf
+hminl-v V YuMin-Medium.otf
+hminr-h H YuMin-Medium.otf
+hminr-v V YuMin-Medium.otf
+hminb-h H YuMin-Demibold.otf
+hminb-v V YuMin-Demibold.otf
+hgothr-h H YuGo-Medium.otf
+hgothr-v V YuGo-Medium.otf
+hgothb-h H YuGo-Bold.otf
+hgothb-v V YuGo-Bold.otf
+hgotheb-h H YuGo-Bold.otf
+hgotheb-v V YuGo-Bold.otf
+hmgothr-h H YuGo-Bold.otf
+hmgothr-v V YuGo-Bold.otf
% TEXT, JIS04
-hminln-h H YuMincho-Medium.otf
-hminln-v V YuMincho-Medium.otf
-hminrn-h H YuMincho-Medium.otf
-hminrn-v V YuMincho-Medium.otf
-hminbn-h H YuMincho-Demibold.otf
-hminbn-v V YuMincho-Demibold.otf
-hgothrn-h H YuGothic-Medium.otf
-hgothrn-v V YuGothic-Medium.otf
-hgothbn-h H YuGothic-Bold.otf
-hgothbn-v V YuGothic-Bold.otf
-hgothebn-h H YuGothic-Bold.otf
-hgothebn-v V YuGothic-Bold.otf
-hmgothrn-h H YuGothic-Bold.otf
-hmgothrn-v V YuGothic-Bold.otf
+hminln-h H YuMin-Medium.otf
+hminln-v V YuMin-Medium.otf
+hminrn-h H YuMin-Medium.otf
+hminrn-v V YuMin-Medium.otf
+hminbn-h H YuMin-Demibold.otf
+hminbn-v V YuMin-Demibold.otf
+hgothrn-h H YuGo-Medium.otf
+hgothrn-v V YuGo-Medium.otf
+hgothbn-h H YuGo-Bold.otf
+hgothbn-v V YuGo-Bold.otf
+hgothebn-h H YuGo-Bold.otf
+hgothebn-v V YuGo-Bold.otf
+hmgothrn-h H YuGo-Bold.otf
+hmgothrn-v V YuGo-Bold.otf
% CID
-otf-cjml-h Identity-H YuMincho-Medium.otf
-otf-cjml-v Identity-V YuMincho-Medium.otf
-otf-cjmr-h Identity-H YuMincho-Medium.otf
-otf-cjmr-v Identity-V YuMincho-Medium.otf
-otf-cjmb-h Identity-H YuMincho-Demibold.otf
-otf-cjmb-v Identity-V YuMincho-Demibold.otf
-otf-cjgr-h Identity-H YuGothic-Medium.otf
-otf-cjgr-v Identity-V YuGothic-Medium.otf
-otf-cjgb-h Identity-H YuGothic-Bold.otf
-otf-cjgb-v Identity-V YuGothic-Bold.otf
-otf-cjge-h Identity-H YuGothic-Bold.otf
-otf-cjge-v Identity-V YuGothic-Bold.otf
-otf-cjmgr-h Identity-H YuGothic-Bold.otf
-otf-cjmgr-v Identity-V YuGothic-Bold.otf
+otf-cjml-h Identity-H YuMin-Medium.otf
+otf-cjml-v Identity-V YuMin-Medium.otf
+otf-cjmr-h Identity-H YuMin-Medium.otf
+otf-cjmr-v Identity-V YuMin-Medium.otf
+otf-cjmb-h Identity-H YuMin-Demibold.otf
+otf-cjmb-v Identity-V YuMin-Demibold.otf
+otf-cjgr-h Identity-H YuGo-Medium.otf
+otf-cjgr-v Identity-V YuGo-Medium.otf
+otf-cjgb-h Identity-H YuGo-Bold.otf
+otf-cjgb-v Identity-V YuGo-Bold.otf
+otf-cjge-h Identity-H YuGo-Bold.otf
+otf-cjge-v Identity-V YuGo-Bold.otf
+otf-cjmgr-h Identity-H YuGo-Bold.otf
+otf-cjmgr-v Identity-V YuGo-Bold.otf
% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H YuMincho-Medium.otf
-otf-ujml-v UniJIS-UTF16-V YuMincho-Medium.otf
-otf-ujmr-h UniJIS-UTF16-H YuMincho-Medium.otf
-otf-ujmr-v UniJIS-UTF16-V YuMincho-Medium.otf
-otf-ujmb-h UniJIS-UTF16-H YuMincho-Demibold.otf
-otf-ujmb-v UniJIS-UTF16-V YuMincho-Demibold.otf
-otf-ujgr-h UniJIS-UTF16-H YuGothic-Medium.otf
-otf-ujgr-v UniJIS-UTF16-V YuGothic-Medium.otf
-otf-ujgb-h UniJIS-UTF16-H YuGothic-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V YuGothic-Bold.otf
-otf-ujge-h UniJIS-UTF16-H YuGothic-Bold.otf
-otf-ujge-v UniJIS-UTF16-V YuGothic-Bold.otf
-otf-ujmgr-h UniJIS-UTF16-H YuGothic-Bold.otf
-otf-ujmgr-v UniJIS-UTF16-V YuGothic-Bold.otf
+otf-ujml-h UniJIS-UTF16-H YuMin-Medium.otf
+otf-ujml-v UniJIS-UTF16-V YuMin-Medium.otf
+otf-ujmr-h UniJIS-UTF16-H YuMin-Medium.otf
+otf-ujmr-v UniJIS-UTF16-V YuMin-Medium.otf
+otf-ujmb-h UniJIS-UTF16-H YuMin-Demibold.otf
+otf-ujmb-v UniJIS-UTF16-V YuMin-Demibold.otf
+otf-ujgr-h UniJIS-UTF16-H YuGo-Medium.otf
+otf-ujgr-v UniJIS-UTF16-V YuGo-Medium.otf
+otf-ujgb-h UniJIS-UTF16-H YuGo-Bold.otf
+otf-ujgb-v UniJIS-UTF16-V YuGo-Bold.otf
+otf-ujge-h UniJIS-UTF16-H YuGo-Bold.otf
+otf-ujge-v UniJIS-UTF16-V YuGo-Bold.otf
+otf-ujmgr-h UniJIS-UTF16-H YuGo-Bold.otf
+otf-ujmgr-v UniJIS-UTF16-V YuGo-Bold.otf
% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H YuMincho-Medium.otf
-otf-ujmln-v UniJIS2004-UTF16-V YuMincho-Medium.otf
-otf-ujmrn-h UniJIS2004-UTF16-H YuMincho-Medium.otf
-otf-ujmrn-v UniJIS2004-UTF16-V YuMincho-Medium.otf
-otf-ujmbn-h UniJIS2004-UTF16-H YuMincho-Demibold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V YuMincho-Demibold.otf
-otf-ujgrn-h UniJIS2004-UTF16-H YuGothic-Medium.otf
-otf-ujgrn-v UniJIS2004-UTF16-V YuGothic-Medium.otf
-otf-ujgbn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
-otf-ujgen-h UniJIS2004-UTF16-H YuGothic-Bold.otf
-otf-ujgen-v UniJIS2004-UTF16-V YuGothic-Bold.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
+otf-ujmln-h UniJIS2004-UTF16-H YuMin-Medium.otf
+otf-ujmln-v UniJIS2004-UTF16-V YuMin-Medium.otf
+otf-ujmrn-h UniJIS2004-UTF16-H YuMin-Medium.otf
+otf-ujmrn-v UniJIS2004-UTF16-V YuMin-Medium.otf
+otf-ujmbn-h UniJIS2004-UTF16-H YuMin-Demibold.otf
+otf-ujmbn-v UniJIS2004-UTF16-V YuMin-Demibold.otf
+otf-ujgrn-h UniJIS2004-UTF16-H YuGo-Medium.otf
+otf-ujgrn-v UniJIS2004-UTF16-V YuGo-Medium.otf
+otf-ujgbn-h UniJIS2004-UTF16-H YuGo-Bold.otf
+otf-ujgbn-v UniJIS2004-UTF16-V YuGo-Bold.otf
+otf-ujgen-h UniJIS2004-UTF16-H YuGo-Bold.otf
+otf-ujgen-v UniJIS2004-UTF16-V YuGo-Bold.otf
+otf-ujmgrn-h UniJIS2004-UTF16-H YuGo-Bold.otf
+otf-ujmgrn-v UniJIS2004-UTF16-V YuGo-Bold.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map
index d9c0ecac493..6820e7a3954 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map
@@ -1,4 +1,4 @@
-rml 2004-H YuMincho-Medium.otf
-rmlv 2004-V YuMincho-Medium.otf
-gbm 2004-H YuGothic-Medium.otf
-gbmv 2004-V YuGothic-Medium.otf
+rml 2004-H YuMin-Medium.otf
+rmlv 2004-V YuMin-Medium.otf
+gbm 2004-H YuGo-Medium.otf
+gbmv 2004-V YuGo-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map
index c903ca80f46..1e91e0f0e2a 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map
@@ -1,4 +1,4 @@
-rml H YuMincho-Medium.otf
-rmlv V YuMincho-Medium.otf
-gbm H YuGothic-Medium.otf
-gbmv V YuGothic-Medium.otf
+rml H YuMin-Medium.otf
+rmlv V YuMin-Medium.otf
+gbm H YuGo-Medium.otf
+gbmv V YuGo-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map
index 74652597b59..350e04c772d 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map
@@ -1,10 +1,10 @@
-urml UniJIS2004-UTF16-H YuMincho-Medium.otf
-urmlv UniJIS2004-UTF16-V YuMincho-Medium.otf
-ugbm UniJIS2004-UTF16-H YuGothic-Medium.otf
-ugbmv UniJIS2004-UTF16-V YuGothic-Medium.otf
-uprml-h UniJIS2004-UTF16-H YuMincho-Medium.otf
-uprml-v UniJIS2004-UTF16-V YuMincho-Medium.otf
-upgbm-h UniJIS2004-UTF16-H YuGothic-Medium.otf
-upgbm-v UniJIS2004-UTF16-V YuGothic-Medium.otf
-uprml-hq UniJIS-UCS2-H YuMincho-Medium.otf
-upgbm-hq UniJIS-UCS2-H YuGothic-Medium.otf
+urml UniJIS2004-UTF16-H YuMin-Medium.otf
+urmlv UniJIS2004-UTF16-V YuMin-Medium.otf
+ugbm UniJIS2004-UTF16-H YuGo-Medium.otf
+ugbmv UniJIS2004-UTF16-V YuGo-Medium.otf
+uprml-h UniJIS2004-UTF16-H YuMin-Medium.otf
+uprml-v UniJIS2004-UTF16-V YuMin-Medium.otf
+upgbm-h UniJIS2004-UTF16-H YuGo-Medium.otf
+upgbm-v UniJIS2004-UTF16-V YuGo-Medium.otf
+uprml-hq UniJIS-UCS2-H YuMin-Medium.otf
+upgbm-hq UniJIS-UCS2-H YuGo-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map
index d68e69e1c37..32cea92dd21 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map
@@ -1,10 +1,10 @@
-urml UniJIS-UTF16-H YuMincho-Medium.otf
-urmlv UniJIS-UTF16-V YuMincho-Medium.otf
-ugbm UniJIS-UTF16-H YuGothic-Medium.otf
-ugbmv UniJIS-UTF16-V YuGothic-Medium.otf
-uprml-h UniJIS-UTF16-H YuMincho-Medium.otf
-uprml-v UniJIS-UTF16-V YuMincho-Medium.otf
-upgbm-h UniJIS-UTF16-H YuGothic-Medium.otf
-upgbm-v UniJIS-UTF16-V YuGothic-Medium.otf
-uprml-hq UniJIS-UCS2-H YuMincho-Medium.otf
-upgbm-hq UniJIS-UCS2-H YuGothic-Medium.otf
+urml UniJIS-UTF16-H YuMin-Medium.otf
+urmlv UniJIS-UTF16-V YuMin-Medium.otf
+ugbm UniJIS-UTF16-H YuGo-Medium.otf
+ugbmv UniJIS-UTF16-V YuGo-Medium.otf
+uprml-h UniJIS-UTF16-H YuMin-Medium.otf
+uprml-v UniJIS-UTF16-V YuMin-Medium.otf
+upgbm-h UniJIS-UTF16-H YuGo-Medium.otf
+upgbm-v UniJIS-UTF16-V YuGo-Medium.otf
+uprml-hq UniJIS-UCS2-H YuMin-Medium.otf
+upgbm-hq UniJIS-UCS2-H YuGo-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map
index 0ba5461c2e1..10b1c6a4c9c 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map
@@ -1,32 +1,32 @@
% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H yuminl.ttf
-uphminl-v UniJIS-UTF16-V yuminl.ttf
-uphminr-h UniJIS-UTF16-H yumin.ttf
-uphminr-v UniJIS-UTF16-V yumin.ttf
-uphminb-h UniJIS-UTF16-H yumindb.ttf
-uphminb-v UniJIS-UTF16-V yumindb.ttf
-uphgothr-h UniJIS-UTF16-H yugothic.ttf
-uphgothr-v UniJIS-UTF16-V yugothic.ttf
-uphgothb-h UniJIS-UTF16-H yugothib.ttf
-uphgothb-v UniJIS-UTF16-V yugothib.ttf
-uphgotheb-h UniJIS-UTF16-H yugothib.ttf
-uphgotheb-v UniJIS-UTF16-V yugothib.ttf
-uphmgothr-h UniJIS-UTF16-H yugothib.ttf
-uphmgothr-v UniJIS-UTF16-V yugothib.ttf
+uphminl-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light
+uphminl-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
+uphminr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
+uphminr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
+uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
+uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+uphgothr-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
+uphgothr-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
+uphgothb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+uphgothb-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
+uphgotheb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+uphgotheb-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
+uphmgothr-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+uphmgothr-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H yuminl.ttf
-uphminln-v UniJIS2004-UTF16-V yuminl.ttf
-uphminrn-h UniJIS2004-UTF16-H yumin.ttf
-uphminrn-v UniJIS2004-UTF16-V yumin.ttf
-uphminbn-h UniJIS2004-UTF16-H yumindb.ttf
-uphminbn-v UniJIS2004-UTF16-V yumindb.ttf
-uphgothrn-h UniJIS2004-UTF16-H yugothic.ttf
-uphgothrn-v UniJIS2004-UTF16-V yugothic.ttf
-uphgothbn-h UniJIS2004-UTF16-H yugothib.ttf
-uphgothbn-v UniJIS2004-UTF16-V yugothib.ttf
-uphgothebn-h UniJIS2004-UTF16-H yugothib.ttf
-uphgothebn-v UniJIS2004-UTF16-V yugothib.ttf
-uphmgothrn-h UniJIS2004-UTF16-H yugothib.ttf
-uphmgothrn-v UniJIS2004-UTF16-V yugothib.ttf
+uphminln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light
+uphminln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
+uphminrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
+uphminrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
+uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
+uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+uphgothrn-h UniJIS2004-UTF16-H yugothic.ttf %!PS YuGothic-Regular
+uphgothrn-v UniJIS2004-UTF16-V yugothic.ttf %!PS YuGothic-Regular
+uphgothbn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+uphgothbn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
+uphgothebn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+uphgothebn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
+uphmgothrn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+uphmgothrn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map
index e0b1794cef7..8bf00f2f0ee 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map
@@ -1,80 +1,80 @@
% TEXT, 90JIS
-hminl-h H yuminl.ttf
-hminl-v V yuminl.ttf
-hminr-h H yumin.ttf
-hminr-v V yumin.ttf
-hminb-h H yumindb.ttf
-hminb-v V yumindb.ttf
-hgothr-h H yugothic.ttf
-hgothr-v V yugothic.ttf
-hgothb-h H yugothib.ttf
-hgothb-v V yugothib.ttf
-hgotheb-h H yugothib.ttf
-hgotheb-v V yugothib.ttf
-hmgothr-h H yugothib.ttf
-hmgothr-v V yugothib.ttf
+hminl-h H yuminl.ttf %!PS YuMincho-Light
+hminl-v V yuminl.ttf %!PS YuMincho-Light
+hminr-h H yumin.ttf %!PS YuMincho-Regular
+hminr-v V yumin.ttf %!PS YuMincho-Regular
+hminb-h H yumindb.ttf %!PS YuMincho-DemiBold
+hminb-v V yumindb.ttf %!PS YuMincho-DemiBold
+hgothr-h H yugothic.ttf %!PS YuGothic-Regular
+hgothr-v V yugothic.ttf %!PS YuGothic-Regular
+hgothb-h H yugothib.ttf %!PS YuGothic-Bold
+hgothb-v V yugothib.ttf %!PS YuGothic-Bold
+hgotheb-h H yugothib.ttf %!PS YuGothic-Bold
+hgotheb-v V yugothib.ttf %!PS YuGothic-Bold
+hmgothr-h H yugothib.ttf %!PS YuGothic-Bold
+hmgothr-v V yugothib.ttf %!PS YuGothic-Bold
% TEXT, JIS04
-hminln-h H yuminl.ttf
-hminln-v V yuminl.ttf
-hminrn-h H yumin.ttf
-hminrn-v V yumin.ttf
-hminbn-h H yumindb.ttf
-hminbn-v V yumindb.ttf
-hgothrn-h H yugothic.ttf
-hgothrn-v V yugothic.ttf
-hgothbn-h H yugothib.ttf
-hgothbn-v V yugothib.ttf
-hgothebn-h H yugothib.ttf
-hgothebn-v V yugothib.ttf
-hmgothrn-h H yugothib.ttf
-hmgothrn-v V yugothib.ttf
+hminln-h H yuminl.ttf %!PS YuMincho-Light
+hminln-v V yuminl.ttf %!PS YuMincho-Light
+hminrn-h H yumin.ttf %!PS YuMincho-Regular
+hminrn-v V yumin.ttf %!PS YuMincho-Regular
+hminbn-h H yumindb.ttf %!PS YuMincho-DemiBold
+hminbn-v V yumindb.ttf %!PS YuMincho-DemiBold
+hgothrn-h H yugothic.ttf %!PS YuGothic-Regular
+hgothrn-v V yugothic.ttf %!PS YuGothic-Regular
+hgothbn-h H yugothib.ttf %!PS YuGothic-Bold
+hgothbn-v V yugothib.ttf %!PS YuGothic-Bold
+hgothebn-h H yugothib.ttf %!PS YuGothic-Bold
+hgothebn-v V yugothib.ttf %!PS YuGothic-Bold
+hmgothrn-h H yugothib.ttf %!PS YuGothic-Bold
+hmgothrn-v V yugothib.ttf %!PS YuGothic-Bold
% CID
-otf-cjml-h Identity-H yuminl.ttf/AJ16
-otf-cjml-v Identity-V yuminl.ttf/AJ16
-otf-cjmr-h Identity-H yumin.ttf/AJ16
-otf-cjmr-v Identity-V yumin.ttf/AJ16
-otf-cjmb-h Identity-H yumindb.ttf/AJ16
-otf-cjmb-v Identity-V yumindb.ttf/AJ16
-otf-cjgr-h Identity-H yugothic.ttf/AJ16
-otf-cjgr-v Identity-V yugothic.ttf/AJ16
-otf-cjgb-h Identity-H yugothib.ttf/AJ16
-otf-cjgb-v Identity-V yugothib.ttf/AJ16
-otf-cjge-h Identity-H yugothib.ttf/AJ16
-otf-cjge-v Identity-V yugothib.ttf/AJ16
-otf-cjmgr-h Identity-H yugothib.ttf/AJ16
-otf-cjmgr-v Identity-V yugothib.ttf/AJ16
+otf-cjml-h Identity-H yuminl.ttf/AJ16 %!PS YuMincho-Light
+otf-cjml-v Identity-V yuminl.ttf/AJ16 %!PS YuMincho-Light
+otf-cjmr-h Identity-H yumin.ttf/AJ16 %!PS YuMincho-Regular
+otf-cjmr-v Identity-V yumin.ttf/AJ16 %!PS YuMincho-Regular
+otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
+otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
+otf-cjgr-h Identity-H yugothic.ttf/AJ16 %!PS YuGothic-Regular
+otf-cjgr-v Identity-V yugothic.ttf/AJ16 %!PS YuGothic-Regular
+otf-cjgb-h Identity-H yugothib.ttf/AJ16 %!PS YuGothic-Bold
+otf-cjgb-v Identity-V yugothib.ttf/AJ16 %!PS YuGothic-Bold
+otf-cjge-h Identity-H yugothib.ttf/AJ16 %!PS YuGothic-Bold
+otf-cjge-v Identity-V yugothib.ttf/AJ16 %!PS YuGothic-Bold
+otf-cjmgr-h Identity-H yugothib.ttf/AJ16 %!PS YuGothic-Bold
+otf-cjmgr-v Identity-V yugothib.ttf/AJ16 %!PS YuGothic-Bold
% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H yuminl.ttf
-otf-ujml-v UniJIS-UTF16-V yuminl.ttf
-otf-ujmr-h UniJIS-UTF16-H yumin.ttf
-otf-ujmr-v UniJIS-UTF16-V yumin.ttf
-otf-ujmb-h UniJIS-UTF16-H yumindb.ttf
-otf-ujmb-v UniJIS-UTF16-V yumindb.ttf
-otf-ujgr-h UniJIS-UTF16-H yugothic.ttf
-otf-ujgr-v UniJIS-UTF16-V yugothic.ttf
-otf-ujgb-h UniJIS-UTF16-H yugothib.ttf
-otf-ujgb-v UniJIS-UTF16-V yugothib.ttf
-otf-ujge-h UniJIS-UTF16-H yugothib.ttf
-otf-ujge-v UniJIS-UTF16-V yugothib.ttf
-otf-ujmgr-h UniJIS-UTF16-H yugothib.ttf
-otf-ujmgr-v UniJIS-UTF16-V yugothib.ttf
+otf-ujml-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light
+otf-ujml-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
+otf-ujmr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
+otf-ujmr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
+otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujgr-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
+otf-ujgr-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
+otf-ujgb-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+otf-ujgb-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
+otf-ujge-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+otf-ujge-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
+otf-ujmgr-h UniJIS-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+otf-ujmgr-v UniJIS-UTF16-V yugothib.ttf %!PS YuGothic-Bold
% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H yuminl.ttf
-otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf
-otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf
-otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf
-otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf
-otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf
-otf-ujgrn-h UniJIS2004-UTF16-H yugothic.ttf
-otf-ujgrn-v UniJIS2004-UTF16-V yugothic.ttf
-otf-ujgbn-h UniJIS2004-UTF16-H yugothib.ttf
-otf-ujgbn-v UniJIS2004-UTF16-V yugothib.ttf
-otf-ujgen-h UniJIS2004-UTF16-H yugothib.ttf
-otf-ujgen-v UniJIS2004-UTF16-V yugothib.ttf
-otf-ujmgrn-h UniJIS2004-UTF16-H yugothib.ttf
-otf-ujmgrn-v UniJIS2004-UTF16-V yugothib.ttf
+otf-ujmln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light
+otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
+otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
+otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
+otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujgrn-h UniJIS2004-UTF16-H yugothic.ttf %!PS YuGothic-Regular
+otf-ujgrn-v UniJIS2004-UTF16-V yugothic.ttf %!PS YuGothic-Regular
+otf-ujgbn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+otf-ujgbn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
+otf-ujgen-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+otf-ujgen-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
+otf-ujmgrn-h UniJIS2004-UTF16-H yugothib.ttf %!PS YuGothic-Bold
+otf-ujmgrn-v UniJIS2004-UTF16-V yugothib.ttf %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map
index ad943cc25ef..ee34a0ad1d6 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map
@@ -1,4 +1,4 @@
-rml H yumin.ttf
-rmlv V yumin.ttf
-gbm H yugothic.ttf
-gbmv V yugothic.ttf
+rml H yumin.ttf %!PS YuMincho-Regular
+rmlv V yumin.ttf %!PS YuMincho-Regular
+gbm H yugothic.ttf %!PS YuGothic-Regular
+gbmv V yugothic.ttf %!PS YuGothic-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map
index dc64b49c13f..90b29697efe 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map
@@ -1,10 +1,10 @@
-urml UniJIS-UTF16-H yumin.ttf
-urmlv UniJIS-UTF16-V yumin.ttf
-ugbm UniJIS-UTF16-H yugothic.ttf
-ugbmv UniJIS-UTF16-V yugothic.ttf
-uprml-h UniJIS-UTF16-H yumin.ttf
-uprml-v UniJIS-UTF16-V yumin.ttf
-upgbm-h UniJIS-UTF16-H yugothic.ttf
-upgbm-v UniJIS-UTF16-V yugothic.ttf
-uprml-hq UniJIS-UCS2-H yumin.ttf
-upgbm-hq UniJIS-UCS2-H yugothic.ttf
+urml UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
+urmlv UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
+ugbm UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
+ugbmv UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
+uprml-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
+uprml-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
+upgbm-h UniJIS-UTF16-H yugothic.ttf %!PS YuGothic-Regular
+upgbm-v UniJIS-UTF16-V yugothic.ttf %!PS YuGothic-Regular
+uprml-hq UniJIS-UCS2-H yumin.ttf %!PS YuMincho-Regular
+upgbm-hq UniJIS-UCS2-H yugothic.ttf %!PS YuGothic-Regular
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
index 0b013f74c3e..c255c8c8215 100755
--- a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
+++ b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# kanji-config-updmap: setup Japanese font embedding
-# Version 20140120.0
+# Version 20140301.0
#
# formerly known as updmap-setup-kanji
#
@@ -22,7 +22,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use strict;
my $prg = "kanji-config-updmap";
-my $version = '20140120.0';
+my $version = '20140301.0';
my $updmap_real = "updmap";
my $updmap = $updmap_real;
@@ -74,7 +74,8 @@ my %representatives = (
"ipa" => "ipam.ttf",
"ipaex" => "ipaexm.ttf",
"ms" => "msgothic.ttc",
- "yu" => "yumin.ttf",
+ "yu-win" => "yumin.ttf",
+ "yu-osx" => "YuMin-Medium.otf",
);
my %available;
@@ -112,7 +113,8 @@ sub Usage {
auto: embed one of the following supported font families
automatically:
hiragino, hiragino-pron, morisawa, morisawa-pr6n,
- kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms, yu
+ kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms,
+ yu-osx, yu-win
and fall back to not embedding any font if none of them
is available
nofont: embed no fonts (and rely on system fonts when displaying pdfs)
@@ -240,9 +242,10 @@ sub SetupReplacement {
# if we are in the noEmbed or nothing set case, but one
# of the three fonts hiragino/morisawa/kozuka are present
# then use them
- for my $i (qw/morisawa-pr6n kozuka-pr6n kozuka-pr6
+ for my $i (qw/
+ morisawa-pr6n yu-osx kozuka-pr6n kozuka-pr6
hiragino-pron hiragino
- morisawa kozuka ipaex ipa ms/) {
+ morisawa kozuka yu-win ipaex ipa ms/) {
if ($available{$i}) {
return SetupMapFile($i);
}
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
index 90c5c25778c..75e632e3cd8 100755
--- a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
+++ b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
@@ -2,7 +2,7 @@
#
# kanji-fontmap-creator
# (c) 2012-2014 Norbert Preining
-# Version: 20140120.0
+# Version: 20140301.0
# Licenced under the GPLv2 or any higher version
#
# gui to create map files for updmap(-setup-kanji)
@@ -41,7 +41,7 @@ my $opt_help = 0;
my $opt_version = 0;
my $prg = "kanji-fontmap-creator";
-my $version = "20140120.0";
+my $version = "20140301.0";
#
# global vars configuring operation
diff --git a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
index b21eefd0f88..98b8f28f5fc 100755
--- a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
+++ b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
@@ -1,6 +1,6 @@
#! /usr/bin/env texlua
--- '!' は 'Pro' 等に置換される
+-- '?' は 'Pro' 等に置換される
local foundry = {
['noEmbed'] = {
ml='!Ryumin-Light',
@@ -22,78 +22,108 @@ local foundry = {
},
['yu-win'] = {
noncid = true,
- ml='yuminl.ttf', mr='yumin.ttf', mb='yumindb.ttf',
- gr='yugothic.ttf', gru='yugothic.ttf', gb='yugothib.ttf', ge='yugothib.ttf',
- mgr='yugothib.ttf',
+ ml='yuminl.ttf %!PS YuMincho-Light',
+ mr='yumin.ttf %!PS YuMincho-Regular',
+ mb='yumindb.ttf %!PS YuMincho-DemiBold',
+ gr='yugothic.ttf %!PS YuGothic-Regular',
+ gru='yugothic.ttf %!PS YuGothic-Regular',
+ gb='yugothib.ttf %!PS YuGothic-Bold',
+ ge='yugothib.ttf %!PS YuGothic-Bold',
+ mgr='yugothib.ttf %!PS YuGothic-Bold',
{''},
},
['yu-osx'] = {
noncid = false,
- ml='YuMincho-Medium.otf', mr='YuMincho-Medium.otf',
- mb='YuMincho-Demibold.otf',
- gr='YuGothic-Medium.otf', gru='YuGothic-Medium.otf',
- gb='YuGothic-Bold.otf', ge='YuGothic-Bold.otf',
- mgr='YuGothic-Bold.otf',
+ ml='YuMin-Medium.otf',
+ mr='YuMin-Medium.otf',
+ mb='YuMin-Demibold.otf',
+ gr='YuGo-Medium.otf',
+ gru='YuGo-Medium.otf',
+ gb='YuGo-Bold.otf',
+ ge='YuGo-Bold.otf',
+ mgr='YuGo-Bold.otf',
{''},
},
['ipa'] = {
noncid = true,
- ml='ipam.ttf', mr='ipam.ttf', mb='ipam.ttf',
- gr='ipag.ttf', gru='ipag.ttf', gb='ipag.ttf', ge='ipag.ttf',
- mgr='ipag.ttf',
+ ml='ipam.ttf %!PS IPAMincho',
+ mr='ipam.ttf %!PS IPAMincho',
+ mb='ipam.ttf %!PS IPAMincho',
+ gr='ipag.ttf %!PS IPAGothic',
+ gru='ipag.ttf %!PS IPAGothic',
+ gb='ipag.ttf %!PS IPAGothic',
+ ge='ipag.ttf %!PS IPAGothic',
+ mgr='ipag.ttf %!PS IPAGothic',
{''},
},
['ipaex'] = {
noncid = true,
- ml='ipaexm.ttf', mr='ipaexm.ttf', mb='ipaexm.ttf',
- gr='ipaexg.ttf', gru='ipaexg.ttf', gb='ipaexg.ttf', ge='ipaexg.ttf',
- mgr='ipaexg.ttf',
+ ml='ipaexm.ttf %!PS IPAexMincho',
+ mr='ipaexm.ttf %!PS IPAexMincho',
+ mb='ipaexm.ttf %!PS IPAexMincho',
+ gr='ipaexg.ttf %!PS IPAexGothic',
+ gru='ipaexg.ttf %!PS IPAexGothic',
+ gb='ipaexg.ttf %!PS IPAexGothic',
+ ge='ipaexg.ttf %!PS IPAexGothic',
+ mgr='ipaexg.ttf %!PS IPAexGothic',
{''},
},
['kozuka'] = {
- ml='KozMin!-Light.otf',
- mr='KozMin!-Regular.otf',
- mb='KozMin!-Bold.otf',
- gr='KozGo!-Regular.otf',
- gru='KozGo!-Medium.otf',
- gb='KozGo!-Bold.otf',
- ge='KozGo!-Heavy.otf',
- mgr='KozGo!-Heavy.otf',
+ ml='KozMin?-Light.otf',
+ mr='KozMin?-Regular.otf',
+ mb='KozMin?-Bold.otf',
+ gr='KozGo?-Regular.otf',
+ gru='KozGo?-Medium.otf',
+ gb='KozGo?-Bold.otf',
+ ge='KozGo?-Heavy.otf',
+ mgr='KozGo?-Heavy.otf',
{'4','6','6n'}, -- Pro, Pr6 and Pr6N
},
['morisawa'] = {
- ml='A-OTF-Ryumin!-Light.otf',
- mr='A-OTF-Ryumin!-Light.otf',
- mb='A-OTF-FutoMinA101!-Bold.otf',
- gr='A-OTF-GothicBBB!-Medium.otf',
- gru='A-OTF-GothicBBB!-Medium.otf',
- gb='A-OTF-FutoGoB101!-Bold.otf',
- ge='A-OTF-MidashiGo!-MB31.otf',
- mgr='A-OTF-Jun101!-Light.otf',
- {'4','6n'}, -- Pro and Pr6N
+ ml='A-OTF-Ryumin?-Light.otf %!PS Ryumin?-Light',
+ mr='A-OTF-Ryumin?-Light.otf %!PS Ryumin?-Light',
+ mb='A-OTF-FutoMinA101?-Bold.otf %!PS FutoMinA101?-Bold',
+ gr='A-OTF-GothicBBB?-Medium.otf %!PS GothicBBB?-Medium',
+ gru='A-OTF-GothicBBB?-Medium.otf %!PS GothicBBB?-Medium',
+ gb='A-OTF-FutoGoB101?-Bold.otf %!PS FutoGoB101?-Bold',
+ ge='A-OTF-MidashiGo?-MB31.otf %!PS MidashiGo?-MB31',
+ mgr='A-OTF-Jun101?-Light.otf %!PS Jun101?-Light',
+ {'4'}, -- Pro
+ },
+ ['morisawa-pr6n'] = {
+ ml='A-OTF-Ryumin?-Light.otf %!PS Ryumin?-Light',
+ mr='A-OTF-Ryumin?-Light.otf %!PS Ryumin?-Light',
+ mb='A-OTF-FutoMinA101?-Bold.otf %!PS FutoMinA101?-Bold',
+ gr='A-OTF-GothicBBB?-Medium.otf %!PS GothicBBB?-Medium',
+ gru='A-OTF-GothicBBB?-Medium.otf %!PS GothicBBB?-Medium',
+ gb='A-OTF-FutoGoB101?-Bold.otf %!PS FutoGoB101?-Bold',
+ ge='A-OTF-MidashiGo?-MB31.otf %!PS MidashiGo?-MB31',
+ mgr='A-OTF-ShinMGo?-Light.otf %!PS ShinMGo?-Light',
+ {'6nm'}, -- Pr6N
},
['hiragino'] = {
- ml='HiraMin!-W2.otf',
- mr='HiraMin!-W3.otf',
- mb='HiraMin!-W6.otf',
- gr='HiraKaku!-W3.otf',
- gru='HiraKaku!-W6.otf',
- gb='HiraKaku!-W6.otf',
- ge='HiraKaku!-W8.otf',
- mgr='HiraMaru!-W4.otf',
+ ml='HiraMin?-W2.otf',
+ mr='HiraMin?-W3.otf',
+ mb='HiraMin?-W6.otf',
+ gr='HiraKaku?-W3.otf',
+ gru='HiraKaku?-W6.otf',
+ gb='HiraKaku?-W6.otf',
+ ge='HiraKaku?-W8.otf',
+ mgr='HiraMaru?-W4.otf',
{'X','Xn'}, -- Pro and ProN
},
}
local suffix = {
- -- { '!' 置換, kanjiEmbed 接尾辞 }
- [''] = {'', ''}, -- 非 CID フォント用ダミー
- ['n'] = {'!', ''}, -- 非埋め込みに使用
+ -- { '?' 置換, kanjiEmbed 接尾辞 }
+ [''] = {'', ''}, -- 非 CID フォント用ダミー
+ ['n'] = {'!', ''}, -- 非埋め込みに使用
['4'] = {'Pro', ''},
['6'] = {'Pr6', '-pr6'},
- ['X'] = {'Pro', ''}, -- ヒラギノ基本6書体パック
+ ['X'] = {'Pro', ''}, -- ヒラギノ基本6書体パック
['Xn'] = {'ProN', '-pron'}, -- ヒラギノ基本6書体パック
['6n'] = {'Pr6N','-pr6n'},
+ ['6nm'] = {'Pr6N',''}, -- モリサワ Pr6N
}
-- '#' は 'h', 'v' に置換される
@@ -216,9 +246,13 @@ local function make_one_line(o, fd, s)
return '\n' .. o .. '\n'
else
local fx = foundry[fd]
- local fn = gsub(fx[o[3]], '!', ret_suffix(fd,s,o[3]))
+ local fn = gsub(fx[o[3]], '?', ret_suffix(fd,s,o[3]))
if fx.noncid and string.match(o[2],'Identity') then
- fn = fn .. '/AJ16'
+ if string.match(fn, '%!PS') then
+ fn = gsub(fn, ' %%!PS', '/AJ16 %%!PS')
+ else
+ fn = fn .. '/AJ16'
+ end
end
if string.match(o[1], '#') then -- 'H', 'V' 一括出力
return gsub(o[1], '#', 'h') .. '\t' .. gsub(o[2], '#', 'H') .. '\t' .. fn .. '\n'
@@ -248,17 +282,17 @@ for fd, v1 in pairs(foundry) do
local v2 = gsub([[
% hiraprop
-hiramin-w3-h Identity-H HiraMin!-W3
-hiramin-w6-h Identity-H HiraMin!-W6
-hirakaku-w3-h Identity-H HiraKaku!-W3
-hirakaku-w6-h Identity-H HiraKaku!-W6
-hiramaru-w4-h Identity-H HiraMaru!-W4
-hiramin-w3-v Identity-V HiraMin!-W3
-hiramin-w6-v Identity-V HiraMin!-W6
-hirakaku-w3-v Identity-V HiraKaku!-W3
-hirakaku-w6-v Identity-V HiraKaku!-W6
-hiramaru-w4-v Identity-V HiraMaru!-W4
-]],'!', ret_suffix('hiragino', s, ''))
+hiramin-w3-h Identity-H HiraMin?-W3
+hiramin-w6-h Identity-H HiraMin?-W6
+hirakaku-w3-h Identity-H HiraKaku?-W3
+hirakaku-w6-h Identity-H HiraKaku?-W6
+hiramaru-w4-h Identity-H HiraMaru?-W4
+hiramin-w3-v Identity-V HiraMin?-W3
+hiramin-w6-v Identity-V HiraMin?-W6
+hirakaku-w3-v Identity-V HiraKaku?-W3
+hirakaku-w6-v Identity-V HiraKaku?-W6
+hiramaru-w4-v Identity-V HiraMaru?-W4
+]],'?', ret_suffix('hiragino', s, ''))
f:write(v2)
end
f:close()