summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/fonts/map/dvipdfmx
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-01-14 06:02:03 +0000
committerNorbert Preining <preining@logic.at>2017-01-14 06:02:03 +0000
commit35cf52d0dbb57459345cacf0250455e015e38829 (patch)
tree8941134af5e807cb592bb59b10fabf09197d0ac2 /Master/texmf-dist/fonts/map/dvipdfmx
parent68082f953b9c1da98b2b9365067d2ef2b0aa3d11 (diff)
remove jfontmaps
git-svn-id: svn://tug.org/texlive/trunk@42945 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/fonts/map/dvipdfmx')
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map10
96 files changed, 0 insertions, 2484 deletions
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
deleted file mode 100644
index bd537f76038..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
+++ /dev/null
@@ -1,92 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminl-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminr-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminr-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminb-h H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hminb-v V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hgothr-h H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothr-v V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothb-h H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothb-v V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgotheb-h H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hgotheb-v V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hmgothr-h H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-hmgothr-v V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% TEXT, JIS04
-hminln-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminln-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminrn-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminrn-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hminbn-h H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hminbn-v V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hgothrn-h H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothrn-v V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothbn-h H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothbn-v V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothebn-h H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hgothebn-v V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hmgothrn-h H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-hmgothrn-v V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% CID
-otf-cjml-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-cjml-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-cjmr-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-cjmr-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-cjmb-h Identity-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-cjmb-v Identity-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-cjgr-h Identity-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-cjgr-v Identity-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-cjgb-h Identity-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-cjgb-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-cjge-h Identity-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-cjge-v Identity-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-cjmgr-h Identity-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-otf-cjmgr-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujml-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmr-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmr-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmb-h UniJIS-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-ujmb-v UniJIS-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-ujgr-h UniJIS-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgr-v UniJIS-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgb-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgb-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujge-h UniJIS-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujge-v UniJIS-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujmgr-h UniJIS-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-otf-ujmgr-v UniJIS-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmln-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmrn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmrn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-otf-ujmbn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-ujmbn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-otf-ujgrn-h UniJIS2004-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgen-h UniJIS2004-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujgen-v UniJIS2004-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujmgrn-h UniJIS2004-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-otf-ujmgrn-v UniJIS2004-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% hiraprop
-hiramin-w3-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hiramin-w6-h Identity-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hirakaku-w3-h Identity-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hirakaku-w6-h Identity-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hiramaru-w4-h Identity-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-hiramin-w3-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-hiramin-w6-v Identity-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-hirakaku-w3-v Identity-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hirakaku-w6-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hiramaru-w4-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
deleted file mode 100644
index 50f3ae1653c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminl-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminr-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminr-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminb-h UniJIS-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-uphminb-v UniJIS-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-uphgothr-h UniJIS-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothr-v UniJIS-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothb-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothb-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgotheb-h UniJIS-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphgotheb-v UniJIS-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphmgothr-h UniJIS-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-uphmgothr-v UniJIS-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminln-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminrn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminrn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uphminbn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-uphminbn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
-uphgothrn-h UniJIS2004-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothebn-h UniJIS2004-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphgothebn-v UniJIS2004-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphmgothrn-h UniJIS2004-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
-uphmgothrn-v UniJIS2004-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
deleted file mode 100644
index a27347bf962..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-rmlv 2004-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-gbm 2004-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-gbmv 2004-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
deleted file mode 100644
index 6556548b7e7..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-rmlv V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-gbm H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-gbmv V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
deleted file mode 100644
index 057e1097f19..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-urmlv UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-ugbm UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-ugbmv UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uprml-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uprml-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-upgbm-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-upgbm-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uprml-hq UniJIS-UCS2-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
deleted file mode 100644
index 2e21b50da69..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-urmlv UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-ugbm UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-ugbmv UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uprml-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-uprml-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-upgbm-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-upgbm-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uprml-hq UniJIS-UCS2-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
deleted file mode 100644
index 41c5388d9d8..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
+++ /dev/null
@@ -1,92 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminl-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminr-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminr-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminb-h H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hminb-v V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hgothr-h H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothr-v V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothb-h H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothb-v V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgotheb-h H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hgotheb-v V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hmgothr-h H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-hmgothr-v V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% TEXT, JIS04
-hminln-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminln-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminrn-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminrn-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hminbn-h H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hminbn-v V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hgothrn-h H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothrn-v V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothbn-h H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothbn-v V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothebn-h H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hgothebn-v V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hmgothrn-h H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-hmgothrn-v V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% CID
-otf-cjml-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-cjml-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-cjmr-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-cjmr-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-cjmb-h Identity-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-cjmb-v Identity-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-cjgr-h Identity-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-cjgr-v Identity-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-cjgb-h Identity-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-cjgb-v Identity-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-cjge-h Identity-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-cjge-v Identity-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-cjmgr-h Identity-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-otf-cjmgr-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujml-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmr-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmr-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmb-h UniJIS-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-ujmb-v UniJIS-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-ujgr-h UniJIS-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgr-v UniJIS-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgb-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgb-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujge-h UniJIS-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujge-v UniJIS-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujmgr-h UniJIS-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-otf-ujmgr-v UniJIS-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmln-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmrn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmrn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-otf-ujmbn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-ujmbn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-otf-ujgrn-h UniJIS2004-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgrn-v UniJIS2004-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgbn-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgbn-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgen-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujgen-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujmgrn-h UniJIS2004-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-otf-ujmgrn-v UniJIS2004-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% hiraprop
-hiramin-w3-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hiramin-w6-h Identity-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hirakaku-w3-h Identity-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hirakaku-w6-h Identity-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hiramaru-w4-h Identity-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-hiramin-w3-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-hiramin-w6-v Identity-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-hirakaku-w3-v Identity-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hirakaku-w6-v Identity-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hiramaru-w4-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
deleted file mode 100644
index d01b53b4f56..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminl-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminr-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminr-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminb-h UniJIS-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-uphminb-v UniJIS-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-uphgothr-h UniJIS-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothr-v UniJIS-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothb-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothb-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgotheb-h UniJIS-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphgotheb-v UniJIS-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphmgothr-h UniJIS-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-uphmgothr-v UniJIS-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminln-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminrn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminrn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uphminbn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-uphminbn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
-uphgothrn-h UniJIS2004-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothrn-v UniJIS2004-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothbn-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothbn-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothebn-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphgothebn-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphmgothrn-h UniJIS2004-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
-uphmgothrn-v UniJIS2004-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
deleted file mode 100644
index 7ffb1d6e7bb..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-rmlv 2004-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-gbm 2004-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-gbmv 2004-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
deleted file mode 100644
index 05d0f34ee11..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-rmlv V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-gbm H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-gbmv V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
deleted file mode 100644
index ce0407b9c0b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-urmlv UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-ugbm UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-ugbmv UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uprml-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uprml-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-upgbm-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-upgbm-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uprml-hq UniJIS-UCS2-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-upgbm-hq UniJIS-UCS2-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
deleted file mode 100644
index 21af43d0c51..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-urmlv UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-ugbm UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-ugbmv UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uprml-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-uprml-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-upgbm-h UniJIS-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-upgbm-v UniJIS-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uprml-hq UniJIS-UCS2-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-upgbm-hq UniJIS-UCS2-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
deleted file mode 100644
index b4b41ac0348..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
+++ /dev/null
@@ -1,92 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H HiraMinProN-W2.otf
-hminl-v V HiraMinProN-W2.otf
-hminr-h H HiraMinProN-W3.otf
-hminr-v V HiraMinProN-W3.otf
-hminb-h H HiraMinProN-W6.otf
-hminb-v V HiraMinProN-W6.otf
-hgothr-h H HiraKakuProN-W3.otf
-hgothr-v V HiraKakuProN-W3.otf
-hgothb-h H HiraKakuProN-W6.otf
-hgothb-v V HiraKakuProN-W6.otf
-hgotheb-h H HiraKakuStdN-W8.otf
-hgotheb-v V HiraKakuStdN-W8.otf
-hmgothr-h H HiraMaruProN-W4.otf
-hmgothr-v V HiraMaruProN-W4.otf
-
-% TEXT, JIS04
-hminln-h H HiraMinProN-W2.otf
-hminln-v V HiraMinProN-W2.otf
-hminrn-h H HiraMinProN-W3.otf
-hminrn-v V HiraMinProN-W3.otf
-hminbn-h H HiraMinProN-W6.otf
-hminbn-v V HiraMinProN-W6.otf
-hgothrn-h H HiraKakuProN-W3.otf
-hgothrn-v V HiraKakuProN-W3.otf
-hgothbn-h H HiraKakuProN-W6.otf
-hgothbn-v V HiraKakuProN-W6.otf
-hgothebn-h H HiraKakuStdN-W8.otf
-hgothebn-v V HiraKakuStdN-W8.otf
-hmgothrn-h H HiraMaruProN-W4.otf
-hmgothrn-v V HiraMaruProN-W4.otf
-
-% CID
-otf-cjml-h Identity-H HiraMinProN-W2.otf
-otf-cjml-v Identity-V HiraMinProN-W2.otf
-otf-cjmr-h Identity-H HiraMinProN-W3.otf
-otf-cjmr-v Identity-V HiraMinProN-W3.otf
-otf-cjmb-h Identity-H HiraMinProN-W6.otf
-otf-cjmb-v Identity-V HiraMinProN-W6.otf
-otf-cjgr-h Identity-H HiraKakuProN-W3.otf
-otf-cjgr-v Identity-V HiraKakuProN-W3.otf
-otf-cjgb-h Identity-H HiraKakuProN-W6.otf
-otf-cjgb-v Identity-V HiraKakuProN-W6.otf
-otf-cjge-h Identity-H HiraKakuStdN-W8.otf
-otf-cjge-v Identity-V HiraKakuStdN-W8.otf
-otf-cjmgr-h Identity-H HiraMaruProN-W4.otf
-otf-cjmgr-v Identity-V HiraMaruProN-W4.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H HiraMinProN-W2.otf
-otf-ujml-v UniJIS-UTF16-V HiraMinProN-W2.otf
-otf-ujmr-h UniJIS-UTF16-H HiraMinProN-W3.otf
-otf-ujmr-v UniJIS-UTF16-V HiraMinProN-W3.otf
-otf-ujmb-h UniJIS-UTF16-H HiraMinProN-W6.otf
-otf-ujmb-v UniJIS-UTF16-V HiraMinProN-W6.otf
-otf-ujgr-h UniJIS-UTF16-H HiraKakuProN-W3.otf
-otf-ujgr-v UniJIS-UTF16-V HiraKakuProN-W3.otf
-otf-ujgb-h UniJIS-UTF16-H HiraKakuProN-W6.otf
-otf-ujgb-v UniJIS-UTF16-V HiraKakuProN-W6.otf
-otf-ujge-h UniJIS-UTF16-H HiraKakuStdN-W8.otf
-otf-ujge-v UniJIS-UTF16-V HiraKakuStdN-W8.otf
-otf-ujmgr-h UniJIS-UTF16-H HiraMaruProN-W4.otf
-otf-ujmgr-v UniJIS-UTF16-V HiraMaruProN-W4.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2.otf
-otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2.otf
-otf-ujmrn-h UniJIS2004-UTF16-H HiraMinProN-W3.otf
-otf-ujmrn-v UniJIS2004-UTF16-V HiraMinProN-W3.otf
-otf-ujmbn-h UniJIS2004-UTF16-H HiraMinProN-W6.otf
-otf-ujmbn-v UniJIS2004-UTF16-V HiraMinProN-W6.otf
-otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuProN-W3.otf
-otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuProN-W3.otf
-otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-otf-ujgen-h UniJIS2004-UTF16-H HiraKakuStdN-W8.otf
-otf-ujgen-v UniJIS2004-UTF16-V HiraKakuStdN-W8.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4.otf
-
-% hiraprop
-hiramin-w3-h Identity-H HiraMinProN-W3.otf
-hiramin-w6-h Identity-H HiraMinProN-W6.otf
-hirakaku-w3-h Identity-H HiraKakuProN-W3.otf
-hirakaku-w6-h Identity-H HiraKakuProN-W6.otf
-hiramaru-w4-h Identity-H HiraMaruProN-W4.otf
-hiramin-w3-v Identity-V HiraMinProN-W3.otf
-hiramin-w6-v Identity-V HiraMinProN-W6.otf
-hirakaku-w3-v Identity-V HiraKakuProN-W3.otf
-hirakaku-w6-v Identity-V HiraKakuProN-W6.otf
-hiramaru-w4-v Identity-V HiraMaruProN-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
deleted file mode 100644
index 7f17033882b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H HiraMinProN-W2.otf
-uphminl-v UniJIS-UTF16-V HiraMinProN-W2.otf
-uphminr-h UniJIS-UTF16-H HiraMinProN-W3.otf
-uphminr-v UniJIS-UTF16-V HiraMinProN-W3.otf
-uphminb-h UniJIS-UTF16-H HiraMinProN-W6.otf
-uphminb-v UniJIS-UTF16-V HiraMinProN-W6.otf
-uphgothr-h UniJIS-UTF16-H HiraKakuProN-W3.otf
-uphgothr-v UniJIS-UTF16-V HiraKakuProN-W3.otf
-uphgothb-h UniJIS-UTF16-H HiraKakuProN-W6.otf
-uphgothb-v UniJIS-UTF16-V HiraKakuProN-W6.otf
-uphgotheb-h UniJIS-UTF16-H HiraKakuStdN-W8.otf
-uphgotheb-v UniJIS-UTF16-V HiraKakuStdN-W8.otf
-uphmgothr-h UniJIS-UTF16-H HiraMaruProN-W4.otf
-uphmgothr-v UniJIS-UTF16-V HiraMaruProN-W4.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H HiraMinProN-W2.otf
-uphminln-v UniJIS2004-UTF16-V HiraMinProN-W2.otf
-uphminrn-h UniJIS2004-UTF16-H HiraMinProN-W3.otf
-uphminrn-v UniJIS2004-UTF16-V HiraMinProN-W3.otf
-uphminbn-h UniJIS2004-UTF16-H HiraMinProN-W6.otf
-uphminbn-v UniJIS2004-UTF16-V HiraMinProN-W6.otf
-uphgothrn-h UniJIS2004-UTF16-H HiraKakuProN-W3.otf
-uphgothrn-v UniJIS2004-UTF16-V HiraKakuProN-W3.otf
-uphgothbn-h UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-uphgothbn-v UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-uphgothebn-h UniJIS2004-UTF16-H HiraKakuStdN-W8.otf
-uphgothebn-v UniJIS2004-UTF16-V HiraKakuStdN-W8.otf
-uphmgothrn-h UniJIS2004-UTF16-H HiraMaruProN-W4.otf
-uphmgothrn-v UniJIS2004-UTF16-V HiraMaruProN-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map
deleted file mode 100644
index 769ad550031..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H HiraMinProN-W3.otf
-rmlv 2004-V HiraMinProN-W3.otf
-gbm 2004-H HiraKakuProN-W6.otf
-gbmv 2004-V HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map
deleted file mode 100644
index 406c4e2dd9d..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/ptex-hiragino-pron.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H HiraMinProN-W3.otf
-rmlv V HiraMinProN-W3.otf
-gbm H HiraKakuProN-W6.otf
-gbmv V HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map
deleted file mode 100644
index 113f1a01b42..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H HiraMinProN-W3.otf
-urmlv UniJIS2004-UTF16-V HiraMinProN-W3.otf
-ugbm UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-ugbmv UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-uprml-h UniJIS2004-UTF16-H HiraMinProN-W3.otf
-uprml-v UniJIS2004-UTF16-V HiraMinProN-W3.otf
-upgbm-h UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-upgbm-v UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-uprml-hq UniJIS-UCS2-H HiraMinProN-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map
deleted file mode 100644
index 061bd5269c3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/uptex-hiragino-pron.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H HiraMinProN-W3.otf
-urmlv UniJIS-UTF16-V HiraMinProN-W3.otf
-ugbm UniJIS-UTF16-H HiraKakuProN-W6.otf
-ugbmv UniJIS-UTF16-V HiraKakuProN-W6.otf
-uprml-h UniJIS-UTF16-H HiraMinProN-W3.otf
-uprml-v UniJIS-UTF16-V HiraMinProN-W3.otf
-upgbm-h UniJIS-UTF16-H HiraKakuProN-W6.otf
-upgbm-v UniJIS-UTF16-V HiraKakuProN-W6.otf
-uprml-hq UniJIS-UCS2-H HiraMinProN-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuProN-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
deleted file mode 100644
index 8d2effbc1a9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
+++ /dev/null
@@ -1,92 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H HiraMinPro-W2.otf
-hminl-v V HiraMinPro-W2.otf
-hminr-h H HiraMinPro-W3.otf
-hminr-v V HiraMinPro-W3.otf
-hminb-h H HiraMinPro-W6.otf
-hminb-v V HiraMinPro-W6.otf
-hgothr-h H HiraKakuPro-W3.otf
-hgothr-v V HiraKakuPro-W3.otf
-hgothb-h H HiraKakuPro-W6.otf
-hgothb-v V HiraKakuPro-W6.otf
-hgotheb-h H HiraKakuStd-W8.otf
-hgotheb-v V HiraKakuStd-W8.otf
-hmgothr-h H HiraMaruPro-W4.otf
-hmgothr-v V HiraMaruPro-W4.otf
-
-% TEXT, JIS04
-hminln-h H HiraMinPro-W2.otf
-hminln-v V HiraMinPro-W2.otf
-hminrn-h H HiraMinPro-W3.otf
-hminrn-v V HiraMinPro-W3.otf
-hminbn-h H HiraMinPro-W6.otf
-hminbn-v V HiraMinPro-W6.otf
-hgothrn-h H HiraKakuPro-W3.otf
-hgothrn-v V HiraKakuPro-W3.otf
-hgothbn-h H HiraKakuPro-W6.otf
-hgothbn-v V HiraKakuPro-W6.otf
-hgothebn-h H HiraKakuStd-W8.otf
-hgothebn-v V HiraKakuStd-W8.otf
-hmgothrn-h H HiraMaruPro-W4.otf
-hmgothrn-v V HiraMaruPro-W4.otf
-
-% CID
-otf-cjml-h Identity-H HiraMinPro-W2.otf
-otf-cjml-v Identity-V HiraMinPro-W2.otf
-otf-cjmr-h Identity-H HiraMinPro-W3.otf
-otf-cjmr-v Identity-V HiraMinPro-W3.otf
-otf-cjmb-h Identity-H HiraMinPro-W6.otf
-otf-cjmb-v Identity-V HiraMinPro-W6.otf
-otf-cjgr-h Identity-H HiraKakuPro-W3.otf
-otf-cjgr-v Identity-V HiraKakuPro-W3.otf
-otf-cjgb-h Identity-H HiraKakuPro-W6.otf
-otf-cjgb-v Identity-V HiraKakuPro-W6.otf
-otf-cjge-h Identity-H HiraKakuStd-W8.otf
-otf-cjge-v Identity-V HiraKakuStd-W8.otf
-otf-cjmgr-h Identity-H HiraMaruPro-W4.otf
-otf-cjmgr-v Identity-V HiraMaruPro-W4.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2.otf
-otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2.otf
-otf-ujmr-h UniJIS-UTF16-H HiraMinPro-W3.otf
-otf-ujmr-v UniJIS-UTF16-V HiraMinPro-W3.otf
-otf-ujmb-h UniJIS-UTF16-H HiraMinPro-W6.otf
-otf-ujmb-v UniJIS-UTF16-V HiraMinPro-W6.otf
-otf-ujgr-h UniJIS-UTF16-H HiraKakuPro-W3.otf
-otf-ujgr-v UniJIS-UTF16-V HiraKakuPro-W3.otf
-otf-ujgb-h UniJIS-UTF16-H HiraKakuPro-W6.otf
-otf-ujgb-v UniJIS-UTF16-V HiraKakuPro-W6.otf
-otf-ujge-h UniJIS-UTF16-H HiraKakuStd-W8.otf
-otf-ujge-v UniJIS-UTF16-V HiraKakuStd-W8.otf
-otf-ujmgr-h UniJIS-UTF16-H HiraMaruPro-W4.otf
-otf-ujmgr-v UniJIS-UTF16-V HiraMaruPro-W4.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H HiraMinPro-W2.otf
-otf-ujmln-v UniJIS2004-UTF16-V HiraMinPro-W2.otf
-otf-ujmrn-h UniJIS2004-UTF16-H HiraMinPro-W3.otf
-otf-ujmrn-v UniJIS2004-UTF16-V HiraMinPro-W3.otf
-otf-ujmbn-h UniJIS2004-UTF16-H HiraMinPro-W6.otf
-otf-ujmbn-v UniJIS2004-UTF16-V HiraMinPro-W6.otf
-otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuPro-W3.otf
-otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuPro-W3.otf
-otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-otf-ujgen-h UniJIS2004-UTF16-H HiraKakuStd-W8.otf
-otf-ujgen-v UniJIS2004-UTF16-V HiraKakuStd-W8.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruPro-W4.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruPro-W4.otf
-
-% hiraprop
-hiramin-w3-h Identity-H HiraMinPro-W3.otf
-hiramin-w6-h Identity-H HiraMinPro-W6.otf
-hirakaku-w3-h Identity-H HiraKakuPro-W3.otf
-hirakaku-w6-h Identity-H HiraKakuPro-W6.otf
-hiramaru-w4-h Identity-H HiraMaruPro-W4.otf
-hiramin-w3-v Identity-V HiraMinPro-W3.otf
-hiramin-w6-v Identity-V HiraMinPro-W6.otf
-hirakaku-w3-v Identity-V HiraKakuPro-W3.otf
-hirakaku-w6-v Identity-V HiraKakuPro-W6.otf
-hiramaru-w4-v Identity-V HiraMaruPro-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
deleted file mode 100644
index 9772ad53659..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H HiraMinPro-W2.otf
-uphminl-v UniJIS-UTF16-V HiraMinPro-W2.otf
-uphminr-h UniJIS-UTF16-H HiraMinPro-W3.otf
-uphminr-v UniJIS-UTF16-V HiraMinPro-W3.otf
-uphminb-h UniJIS-UTF16-H HiraMinPro-W6.otf
-uphminb-v UniJIS-UTF16-V HiraMinPro-W6.otf
-uphgothr-h UniJIS-UTF16-H HiraKakuPro-W3.otf
-uphgothr-v UniJIS-UTF16-V HiraKakuPro-W3.otf
-uphgothb-h UniJIS-UTF16-H HiraKakuPro-W6.otf
-uphgothb-v UniJIS-UTF16-V HiraKakuPro-W6.otf
-uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8.otf
-uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8.otf
-uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4.otf
-uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H HiraMinPro-W2.otf
-uphminln-v UniJIS2004-UTF16-V HiraMinPro-W2.otf
-uphminrn-h UniJIS2004-UTF16-H HiraMinPro-W3.otf
-uphminrn-v UniJIS2004-UTF16-V HiraMinPro-W3.otf
-uphminbn-h UniJIS2004-UTF16-H HiraMinPro-W6.otf
-uphminbn-v UniJIS2004-UTF16-V HiraMinPro-W6.otf
-uphgothrn-h UniJIS2004-UTF16-H HiraKakuPro-W3.otf
-uphgothrn-v UniJIS2004-UTF16-V HiraKakuPro-W3.otf
-uphgothbn-h UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-uphgothbn-v UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-uphgothebn-h UniJIS2004-UTF16-H HiraKakuStd-W8.otf
-uphgothebn-v UniJIS2004-UTF16-V HiraKakuStd-W8.otf
-uphmgothrn-h UniJIS2004-UTF16-H HiraMaruPro-W4.otf
-uphmgothrn-v UniJIS2004-UTF16-V HiraMaruPro-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map
deleted file mode 100644
index c91cedd405e..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H HiraMinPro-W3.otf
-rmlv 2004-V HiraMinPro-W3.otf
-gbm 2004-H HiraKakuPro-W6.otf
-gbmv 2004-V HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map
deleted file mode 100644
index a5421735a80..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/ptex-hiragino.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H HiraMinPro-W3.otf
-rmlv V HiraMinPro-W3.otf
-gbm H HiraKakuPro-W6.otf
-gbmv V HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map
deleted file mode 100644
index ec445a4fc5b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H HiraMinPro-W3.otf
-urmlv UniJIS2004-UTF16-V HiraMinPro-W3.otf
-ugbm UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-ugbmv UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-uprml-h UniJIS2004-UTF16-H HiraMinPro-W3.otf
-uprml-v UniJIS2004-UTF16-V HiraMinPro-W3.otf
-upgbm-h UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-upgbm-v UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-uprml-hq UniJIS-UCS2-H HiraMinPro-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map
deleted file mode 100644
index 2dfac238d72..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/uptex-hiragino.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H HiraMinPro-W3.otf
-urmlv UniJIS-UTF16-V HiraMinPro-W3.otf
-ugbm UniJIS-UTF16-H HiraKakuPro-W6.otf
-ugbmv UniJIS-UTF16-V HiraKakuPro-W6.otf
-uprml-h UniJIS-UTF16-H HiraMinPro-W3.otf
-uprml-v UniJIS-UTF16-V HiraMinPro-W3.otf
-upgbm-h UniJIS-UTF16-H HiraKakuPro-W6.otf
-upgbm-v UniJIS-UTF16-V HiraKakuPro-W6.otf
-uprml-hq UniJIS-UCS2-H HiraMinPro-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuPro-W6.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map
deleted file mode 100644
index 611554f510a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-ipa.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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 %!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 %!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 %!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
deleted file mode 100644
index ef5f32ec81b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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
deleted file mode 100644
index d1ab1809d0c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/ptex-ipa.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 22e92e35cc4..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/uptex-ipa.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 02036bcd1fc..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-ipaex.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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 %!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 %!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 %!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
deleted file mode 100644
index 58fc9294ada..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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
deleted file mode 100644
index 77e7adba347..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/ptex-ipaex.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 3fa3ca510b9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/uptex-ipaex.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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/kozuka-pr6/otf-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map
deleted file mode 100644
index af409f34bc0..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-kozuka-pr6.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H KozMinProVI-Light.otf
-hminl-v V KozMinProVI-Light.otf
-hminr-h H KozMinProVI-Regular.otf
-hminr-v V KozMinProVI-Regular.otf
-hminb-h H KozMinProVI-Bold.otf
-hminb-v V KozMinProVI-Bold.otf
-hgothr-h H KozGoProVI-Regular.otf
-hgothr-v V KozGoProVI-Regular.otf
-hgothb-h H KozGoProVI-Bold.otf
-hgothb-v V KozGoProVI-Bold.otf
-hgotheb-h H KozGoProVI-Heavy.otf
-hgotheb-v V KozGoProVI-Heavy.otf
-hmgothr-h H KozGoProVI-Heavy.otf
-hmgothr-v V KozGoProVI-Heavy.otf
-
-% TEXT, JIS04
-hminln-h H KozMinProVI-Light.otf
-hminln-v V KozMinProVI-Light.otf
-hminrn-h H KozMinProVI-Regular.otf
-hminrn-v V KozMinProVI-Regular.otf
-hminbn-h H KozMinProVI-Bold.otf
-hminbn-v V KozMinProVI-Bold.otf
-hgothrn-h H KozGoProVI-Regular.otf
-hgothrn-v V KozGoProVI-Regular.otf
-hgothbn-h H KozGoProVI-Bold.otf
-hgothbn-v V KozGoProVI-Bold.otf
-hgothebn-h H KozGoProVI-Heavy.otf
-hgothebn-v V KozGoProVI-Heavy.otf
-hmgothrn-h H KozGoProVI-Heavy.otf
-hmgothrn-v V KozGoProVI-Heavy.otf
-
-% CID
-otf-cjml-h Identity-H KozMinProVI-Light.otf
-otf-cjml-v Identity-V KozMinProVI-Light.otf
-otf-cjmr-h Identity-H KozMinProVI-Regular.otf
-otf-cjmr-v Identity-V KozMinProVI-Regular.otf
-otf-cjmb-h Identity-H KozMinProVI-Bold.otf
-otf-cjmb-v Identity-V KozMinProVI-Bold.otf
-otf-cjgr-h Identity-H KozGoProVI-Regular.otf
-otf-cjgr-v Identity-V KozGoProVI-Regular.otf
-otf-cjgb-h Identity-H KozGoProVI-Bold.otf
-otf-cjgb-v Identity-V KozGoProVI-Bold.otf
-otf-cjge-h Identity-H KozGoProVI-Heavy.otf
-otf-cjge-v Identity-V KozGoProVI-Heavy.otf
-otf-cjmgr-h Identity-H KozGoProVI-Heavy.otf
-otf-cjmgr-v Identity-V KozGoProVI-Heavy.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H KozMinProVI-Light.otf
-otf-ujml-v UniJIS-UTF16-V KozMinProVI-Light.otf
-otf-ujmr-h UniJIS-UTF16-H KozMinProVI-Regular.otf
-otf-ujmr-v UniJIS-UTF16-V KozMinProVI-Regular.otf
-otf-ujmb-h UniJIS-UTF16-H KozMinProVI-Bold.otf
-otf-ujmb-v UniJIS-UTF16-V KozMinProVI-Bold.otf
-otf-ujgr-h UniJIS-UTF16-H KozGoProVI-Regular.otf
-otf-ujgr-v UniJIS-UTF16-V KozGoProVI-Regular.otf
-otf-ujgb-h UniJIS-UTF16-H KozGoProVI-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V KozGoProVI-Bold.otf
-otf-ujge-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
-otf-ujge-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-otf-ujmgr-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
-otf-ujmgr-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H KozMinProVI-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V KozMinProVI-Light.otf
-otf-ujmrn-h UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-otf-ujmrn-v UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-otf-ujmbn-h UniJIS2004-UTF16-H KozMinProVI-Bold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V KozMinProVI-Bold.otf
-otf-ujgrn-h UniJIS2004-UTF16-H KozGoProVI-Regular.otf
-otf-ujgrn-v UniJIS2004-UTF16-V KozGoProVI-Regular.otf
-otf-ujgbn-h UniJIS2004-UTF16-H KozGoProVI-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V KozGoProVI-Bold.otf
-otf-ujgen-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-otf-ujgen-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
deleted file mode 100644
index df26e786585..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H KozMinProVI-Light.otf
-uphminl-v UniJIS-UTF16-V KozMinProVI-Light.otf
-uphminr-h UniJIS-UTF16-H KozMinProVI-Regular.otf
-uphminr-v UniJIS-UTF16-V KozMinProVI-Regular.otf
-uphminb-h UniJIS-UTF16-H KozMinProVI-Bold.otf
-uphminb-v UniJIS-UTF16-V KozMinProVI-Bold.otf
-uphgothr-h UniJIS-UTF16-H KozGoProVI-Regular.otf
-uphgothr-v UniJIS-UTF16-V KozGoProVI-Regular.otf
-uphgothb-h UniJIS-UTF16-H KozGoProVI-Bold.otf
-uphgothb-v UniJIS-UTF16-V KozGoProVI-Bold.otf
-uphgotheb-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
-uphgotheb-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-uphmgothr-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
-uphmgothr-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H KozMinProVI-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinProVI-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinProVI-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinProVI-Bold.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoProVI-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoProVI-Regular.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoProVI-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoProVI-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map
deleted file mode 100644
index 419cbacd19f..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H KozMinProVI-Regular.otf
-rmlv 2004-V KozMinProVI-Regular.otf
-gbm 2004-H KozGoProVI-Medium.otf
-gbmv 2004-V KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map
deleted file mode 100644
index b4b281e21e0..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/ptex-kozuka-pr6.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H KozMinProVI-Regular.otf
-rmlv V KozMinProVI-Regular.otf
-gbm H KozGoProVI-Medium.otf
-gbmv V KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map
deleted file mode 100644
index e8f3308d557..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-urmlv UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-ugbm UniJIS2004-UTF16-H KozGoProVI-Medium.otf
-ugbmv UniJIS2004-UTF16-V KozGoProVI-Medium.otf
-uprml-h UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-uprml-v UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-upgbm-h UniJIS2004-UTF16-H KozGoProVI-Medium.otf
-upgbm-v UniJIS2004-UTF16-V KozGoProVI-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinProVI-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map
deleted file mode 100644
index 7521c9900ab..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/uptex-kozuka-pr6.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H KozMinProVI-Regular.otf
-urmlv UniJIS-UTF16-V KozMinProVI-Regular.otf
-ugbm UniJIS-UTF16-H KozGoProVI-Medium.otf
-ugbmv UniJIS-UTF16-V KozGoProVI-Medium.otf
-uprml-h UniJIS-UTF16-H KozMinProVI-Regular.otf
-uprml-v UniJIS-UTF16-V KozMinProVI-Regular.otf
-upgbm-h UniJIS-UTF16-H KozGoProVI-Medium.otf
-upgbm-v UniJIS-UTF16-V KozGoProVI-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinProVI-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoProVI-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map
deleted file mode 100644
index b0ad481ff34..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-kozuka-pr6n.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H KozMinPr6N-Light.otf
-hminl-v V KozMinPr6N-Light.otf
-hminr-h H KozMinPr6N-Regular.otf
-hminr-v V KozMinPr6N-Regular.otf
-hminb-h H KozMinPr6N-Bold.otf
-hminb-v V KozMinPr6N-Bold.otf
-hgothr-h H KozGoPr6N-Regular.otf
-hgothr-v V KozGoPr6N-Regular.otf
-hgothb-h H KozGoPr6N-Bold.otf
-hgothb-v V KozGoPr6N-Bold.otf
-hgotheb-h H KozGoPr6N-Heavy.otf
-hgotheb-v V KozGoPr6N-Heavy.otf
-hmgothr-h H KozGoPr6N-Heavy.otf
-hmgothr-v V KozGoPr6N-Heavy.otf
-
-% TEXT, JIS04
-hminln-h H KozMinPr6N-Light.otf
-hminln-v V KozMinPr6N-Light.otf
-hminrn-h H KozMinPr6N-Regular.otf
-hminrn-v V KozMinPr6N-Regular.otf
-hminbn-h H KozMinPr6N-Bold.otf
-hminbn-v V KozMinPr6N-Bold.otf
-hgothrn-h H KozGoPr6N-Regular.otf
-hgothrn-v V KozGoPr6N-Regular.otf
-hgothbn-h H KozGoPr6N-Bold.otf
-hgothbn-v V KozGoPr6N-Bold.otf
-hgothebn-h H KozGoPr6N-Heavy.otf
-hgothebn-v V KozGoPr6N-Heavy.otf
-hmgothrn-h H KozGoPr6N-Heavy.otf
-hmgothrn-v V KozGoPr6N-Heavy.otf
-
-% CID
-otf-cjml-h Identity-H KozMinPr6N-Light.otf
-otf-cjml-v Identity-V KozMinPr6N-Light.otf
-otf-cjmr-h Identity-H KozMinPr6N-Regular.otf
-otf-cjmr-v Identity-V KozMinPr6N-Regular.otf
-otf-cjmb-h Identity-H KozMinPr6N-Bold.otf
-otf-cjmb-v Identity-V KozMinPr6N-Bold.otf
-otf-cjgr-h Identity-H KozGoPr6N-Regular.otf
-otf-cjgr-v Identity-V KozGoPr6N-Regular.otf
-otf-cjgb-h Identity-H KozGoPr6N-Bold.otf
-otf-cjgb-v Identity-V KozGoPr6N-Bold.otf
-otf-cjge-h Identity-H KozGoPr6N-Heavy.otf
-otf-cjge-v Identity-V KozGoPr6N-Heavy.otf
-otf-cjmgr-h Identity-H KozGoPr6N-Heavy.otf
-otf-cjmgr-v Identity-V KozGoPr6N-Heavy.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H KozMinPr6N-Light.otf
-otf-ujml-v UniJIS-UTF16-V KozMinPr6N-Light.otf
-otf-ujmr-h UniJIS-UTF16-H KozMinPr6N-Regular.otf
-otf-ujmr-v UniJIS-UTF16-V KozMinPr6N-Regular.otf
-otf-ujmb-h UniJIS-UTF16-H KozMinPr6N-Bold.otf
-otf-ujmb-v UniJIS-UTF16-V KozMinPr6N-Bold.otf
-otf-ujgr-h UniJIS-UTF16-H KozGoPr6N-Regular.otf
-otf-ujgr-v UniJIS-UTF16-V KozGoPr6N-Regular.otf
-otf-ujgb-h UniJIS-UTF16-H KozGoPr6N-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V KozGoPr6N-Bold.otf
-otf-ujge-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujge-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-otf-ujmgr-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujmgr-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H KozMinPr6N-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V KozMinPr6N-Light.otf
-otf-ujmrn-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-otf-ujmrn-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-otf-ujmbn-h UniJIS2004-UTF16-H KozMinPr6N-Bold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V KozMinPr6N-Bold.otf
-otf-ujgrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
-otf-ujgrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
-otf-ujgbn-h UniJIS2004-UTF16-H KozGoPr6N-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V KozGoPr6N-Bold.otf
-otf-ujgen-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujgen-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
deleted file mode 100644
index 4d747238928..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H KozMinPr6N-Light.otf
-uphminl-v UniJIS-UTF16-V KozMinPr6N-Light.otf
-uphminr-h UniJIS-UTF16-H KozMinPr6N-Regular.otf
-uphminr-v UniJIS-UTF16-V KozMinPr6N-Regular.otf
-uphminb-h UniJIS-UTF16-H KozMinPr6N-Bold.otf
-uphminb-v UniJIS-UTF16-V KozMinPr6N-Bold.otf
-uphgothr-h UniJIS-UTF16-H KozGoPr6N-Regular.otf
-uphgothr-v UniJIS-UTF16-V KozGoPr6N-Regular.otf
-uphgothb-h UniJIS-UTF16-H KozGoPr6N-Bold.otf
-uphgothb-v UniJIS-UTF16-V KozGoPr6N-Bold.otf
-uphgotheb-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
-uphgotheb-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-uphmgothr-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
-uphmgothr-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H KozMinPr6N-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinPr6N-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinPr6N-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinPr6N-Bold.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoPr6N-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoPr6N-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map
deleted file mode 100644
index ba254ca7c03..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H KozMinPr6N-Regular.otf
-rmlv 2004-V KozMinPr6N-Regular.otf
-gbm 2004-H KozGoPr6N-Medium.otf
-gbmv 2004-V KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map
deleted file mode 100644
index 03272e2b87a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/ptex-kozuka-pr6n.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H KozMinPr6N-Regular.otf
-rmlv V KozMinPr6N-Regular.otf
-gbm H KozGoPr6N-Medium.otf
-gbmv V KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map
deleted file mode 100644
index a5d0e7de04d..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-urmlv UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-ugbm UniJIS2004-UTF16-H KozGoPr6N-Medium.otf
-ugbmv UniJIS2004-UTF16-V KozGoPr6N-Medium.otf
-uprml-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-uprml-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-upgbm-h UniJIS2004-UTF16-H KozGoPr6N-Medium.otf
-upgbm-v UniJIS2004-UTF16-V KozGoPr6N-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinPr6N-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map
deleted file mode 100644
index 7210d879ab5..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/uptex-kozuka-pr6n.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H KozMinPr6N-Regular.otf
-urmlv UniJIS-UTF16-V KozMinPr6N-Regular.otf
-ugbm UniJIS-UTF16-H KozGoPr6N-Medium.otf
-ugbmv UniJIS-UTF16-V KozGoPr6N-Medium.otf
-uprml-h UniJIS-UTF16-H KozMinPr6N-Regular.otf
-uprml-v UniJIS-UTF16-V KozMinPr6N-Regular.otf
-upgbm-h UniJIS-UTF16-H KozGoPr6N-Medium.otf
-upgbm-v UniJIS-UTF16-V KozGoPr6N-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinPr6N-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map
deleted file mode 100644
index 46630111453..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-kozuka.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H KozMinPro-Light.otf
-hminl-v V KozMinPro-Light.otf
-hminr-h H KozMinPro-Regular.otf
-hminr-v V KozMinPro-Regular.otf
-hminb-h H KozMinPro-Bold.otf
-hminb-v V KozMinPro-Bold.otf
-hgothr-h H KozGoPro-Regular.otf
-hgothr-v V KozGoPro-Regular.otf
-hgothb-h H KozGoPro-Bold.otf
-hgothb-v V KozGoPro-Bold.otf
-hgotheb-h H KozGoPro-Heavy.otf
-hgotheb-v V KozGoPro-Heavy.otf
-hmgothr-h H KozGoPro-Heavy.otf
-hmgothr-v V KozGoPro-Heavy.otf
-
-% TEXT, JIS04
-hminln-h H KozMinPro-Light.otf
-hminln-v V KozMinPro-Light.otf
-hminrn-h H KozMinPro-Regular.otf
-hminrn-v V KozMinPro-Regular.otf
-hminbn-h H KozMinPro-Bold.otf
-hminbn-v V KozMinPro-Bold.otf
-hgothrn-h H KozGoPro-Regular.otf
-hgothrn-v V KozGoPro-Regular.otf
-hgothbn-h H KozGoPro-Bold.otf
-hgothbn-v V KozGoPro-Bold.otf
-hgothebn-h H KozGoPro-Heavy.otf
-hgothebn-v V KozGoPro-Heavy.otf
-hmgothrn-h H KozGoPro-Heavy.otf
-hmgothrn-v V KozGoPro-Heavy.otf
-
-% CID
-otf-cjml-h Identity-H KozMinPro-Light.otf
-otf-cjml-v Identity-V KozMinPro-Light.otf
-otf-cjmr-h Identity-H KozMinPro-Regular.otf
-otf-cjmr-v Identity-V KozMinPro-Regular.otf
-otf-cjmb-h Identity-H KozMinPro-Bold.otf
-otf-cjmb-v Identity-V KozMinPro-Bold.otf
-otf-cjgr-h Identity-H KozGoPro-Regular.otf
-otf-cjgr-v Identity-V KozGoPro-Regular.otf
-otf-cjgb-h Identity-H KozGoPro-Bold.otf
-otf-cjgb-v Identity-V KozGoPro-Bold.otf
-otf-cjge-h Identity-H KozGoPro-Heavy.otf
-otf-cjge-v Identity-V KozGoPro-Heavy.otf
-otf-cjmgr-h Identity-H KozGoPro-Heavy.otf
-otf-cjmgr-v Identity-V KozGoPro-Heavy.otf
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H KozMinPro-Light.otf
-otf-ujml-v UniJIS-UTF16-V KozMinPro-Light.otf
-otf-ujmr-h UniJIS-UTF16-H KozMinPro-Regular.otf
-otf-ujmr-v UniJIS-UTF16-V KozMinPro-Regular.otf
-otf-ujmb-h UniJIS-UTF16-H KozMinPro-Bold.otf
-otf-ujmb-v UniJIS-UTF16-V KozMinPro-Bold.otf
-otf-ujgr-h UniJIS-UTF16-H KozGoPro-Regular.otf
-otf-ujgr-v UniJIS-UTF16-V KozGoPro-Regular.otf
-otf-ujgb-h UniJIS-UTF16-H KozGoPro-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V KozGoPro-Bold.otf
-otf-ujge-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-otf-ujge-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-otf-ujmgr-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-otf-ujmgr-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H KozMinPro-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V KozMinPro-Light.otf
-otf-ujmrn-h UniJIS2004-UTF16-H KozMinPro-Regular.otf
-otf-ujmrn-v UniJIS2004-UTF16-V KozMinPro-Regular.otf
-otf-ujmbn-h UniJIS2004-UTF16-H KozMinPro-Bold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V KozMinPro-Bold.otf
-otf-ujgrn-h UniJIS2004-UTF16-H KozGoPro-Regular.otf
-otf-ujgrn-v UniJIS2004-UTF16-V KozGoPro-Regular.otf
-otf-ujgbn-h UniJIS2004-UTF16-H KozGoPro-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V KozGoPro-Bold.otf
-otf-ujgen-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-otf-ujgen-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
-otf-ujmgrn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
deleted file mode 100644
index 02fbed2d9f1..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H KozMinPro-Light.otf
-uphminl-v UniJIS-UTF16-V KozMinPro-Light.otf
-uphminr-h UniJIS-UTF16-H KozMinPro-Regular.otf
-uphminr-v UniJIS-UTF16-V KozMinPro-Regular.otf
-uphminb-h UniJIS-UTF16-H KozMinPro-Bold.otf
-uphminb-v UniJIS-UTF16-V KozMinPro-Bold.otf
-uphgothr-h UniJIS-UTF16-H KozGoPro-Regular.otf
-uphgothr-v UniJIS-UTF16-V KozGoPro-Regular.otf
-uphgothb-h UniJIS-UTF16-H KozGoPro-Bold.otf
-uphgothb-v UniJIS-UTF16-V KozGoPro-Bold.otf
-uphgotheb-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-uphgotheb-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-uphmgothr-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-uphmgothr-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H KozMinPro-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinPro-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinPro-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinPro-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinPro-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinPro-Bold.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoPro-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoPro-Regular.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoPro-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoPro-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map
deleted file mode 100644
index 83c0241abfd..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H KozMinPro-Regular.otf
-rmlv 2004-V KozMinPro-Regular.otf
-gbm 2004-H KozGoPro-Medium.otf
-gbmv 2004-V KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map
deleted file mode 100644
index 8f3158e513a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/ptex-kozuka.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H KozMinPro-Regular.otf
-rmlv V KozMinPro-Regular.otf
-gbm H KozGoPro-Medium.otf
-gbmv V KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map
deleted file mode 100644
index 0b647bf3807..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H KozMinPro-Regular.otf
-urmlv UniJIS2004-UTF16-V KozMinPro-Regular.otf
-ugbm UniJIS2004-UTF16-H KozGoPro-Medium.otf
-ugbmv UniJIS2004-UTF16-V KozGoPro-Medium.otf
-uprml-h UniJIS2004-UTF16-H KozMinPro-Regular.otf
-uprml-v UniJIS2004-UTF16-V KozMinPro-Regular.otf
-upgbm-h UniJIS2004-UTF16-H KozGoPro-Medium.otf
-upgbm-v UniJIS2004-UTF16-V KozGoPro-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinPro-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map
deleted file mode 100644
index fde211af58f..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/uptex-kozuka.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H KozMinPro-Regular.otf
-urmlv UniJIS-UTF16-V KozMinPro-Regular.otf
-ugbm UniJIS-UTF16-H KozGoPro-Medium.otf
-ugbmv UniJIS-UTF16-V KozGoPro-Medium.otf
-uprml-h UniJIS-UTF16-H KozMinPro-Regular.otf
-uprml-v UniJIS-UTF16-V KozMinPro-Regular.otf
-upgbm-h UniJIS-UTF16-H KozGoPro-Medium.otf
-upgbm-v UniJIS-UTF16-V KozGoPro-Medium.otf
-uprml-hq UniJIS-UCS2-H KozMinPro-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map
deleted file mode 100644
index b9693f80c09..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-morisawa-pr6n.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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 %!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 %!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 %!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
deleted file mode 100644
index c1cd7c8e02e..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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
deleted file mode 100644
index 7138d023e08..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index fb7d625d2c3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/ptex-morisawa-pr6n.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 54f10e7272b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index d239a660e3a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/uptex-morisawa-pr6n.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index c8e1fdee340..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-morisawa.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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 %!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 %!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 %!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
deleted file mode 100644
index 34c93e34ad1..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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
deleted file mode 100644
index ae049847591..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index db7516431d2..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/ptex-morisawa.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 5c9c57d84ac..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index fa4d56ddb62..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/uptex-morisawa.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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/ms-osx/otf-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map
deleted file mode 100644
index 098764dd06e..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-ms-osx.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H MS-Mincho.ttf
-hminl-v V MS-Mincho.ttf
-hminr-h H MS-Mincho.ttf
-hminr-v V MS-Mincho.ttf
-hminb-h H MS-Mincho.ttf
-hminb-v V MS-Mincho.ttf
-hgothr-h H MS-Gothic.ttf
-hgothr-v V MS-Gothic.ttf
-hgothb-h H MS-Gothic.ttf
-hgothb-v V MS-Gothic.ttf
-hgotheb-h H MS-Gothic.ttf
-hgotheb-v V MS-Gothic.ttf
-hmgothr-h H MS-Gothic.ttf
-hmgothr-v V MS-Gothic.ttf
-
-% TEXT, JIS04
-hminln-h H MS-Mincho.ttf
-hminln-v V MS-Mincho.ttf
-hminrn-h H MS-Mincho.ttf
-hminrn-v V MS-Mincho.ttf
-hminbn-h H MS-Mincho.ttf
-hminbn-v V MS-Mincho.ttf
-hgothrn-h H MS-Gothic.ttf
-hgothrn-v V MS-Gothic.ttf
-hgothbn-h H MS-Gothic.ttf
-hgothbn-v V MS-Gothic.ttf
-hgothebn-h H MS-Gothic.ttf
-hgothebn-v V MS-Gothic.ttf
-hmgothrn-h H MS-Gothic.ttf
-hmgothrn-v V MS-Gothic.ttf
-
-% CID
-otf-cjml-h Identity-H MS-Mincho.ttf/AJ16
-otf-cjml-v Identity-V MS-Mincho.ttf/AJ16
-otf-cjmr-h Identity-H MS-Mincho.ttf/AJ16
-otf-cjmr-v Identity-V MS-Mincho.ttf/AJ16
-otf-cjmb-h Identity-H MS-Mincho.ttf/AJ16
-otf-cjmb-v Identity-V MS-Mincho.ttf/AJ16
-otf-cjgr-h Identity-H MS-Gothic.ttf/AJ16
-otf-cjgr-v Identity-V MS-Gothic.ttf/AJ16
-otf-cjgb-h Identity-H MS-Gothic.ttf/AJ16
-otf-cjgb-v Identity-V MS-Gothic.ttf/AJ16
-otf-cjge-h Identity-H MS-Gothic.ttf/AJ16
-otf-cjge-v Identity-V MS-Gothic.ttf/AJ16
-otf-cjmgr-h Identity-H MS-Gothic.ttf/AJ16
-otf-cjmgr-v Identity-V MS-Gothic.ttf/AJ16
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H MS-Mincho.ttf
-otf-ujml-v UniJIS-UTF16-V MS-Mincho.ttf
-otf-ujmr-h UniJIS-UTF16-H MS-Mincho.ttf
-otf-ujmr-v UniJIS-UTF16-V MS-Mincho.ttf
-otf-ujmb-h UniJIS-UTF16-H MS-Mincho.ttf
-otf-ujmb-v UniJIS-UTF16-V MS-Mincho.ttf
-otf-ujgr-h UniJIS-UTF16-H MS-Gothic.ttf
-otf-ujgr-v UniJIS-UTF16-V MS-Gothic.ttf
-otf-ujgb-h UniJIS-UTF16-H MS-Gothic.ttf
-otf-ujgb-v UniJIS-UTF16-V MS-Gothic.ttf
-otf-ujge-h UniJIS-UTF16-H MS-Gothic.ttf
-otf-ujge-v UniJIS-UTF16-V MS-Gothic.ttf
-otf-ujmgr-h UniJIS-UTF16-H MS-Gothic.ttf
-otf-ujmgr-v UniJIS-UTF16-V MS-Gothic.ttf
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H MS-Mincho.ttf
-otf-ujmln-v UniJIS2004-UTF16-V MS-Mincho.ttf
-otf-ujmrn-h UniJIS2004-UTF16-H MS-Mincho.ttf
-otf-ujmrn-v UniJIS2004-UTF16-V MS-Mincho.ttf
-otf-ujmbn-h UniJIS2004-UTF16-H MS-Mincho.ttf
-otf-ujmbn-v UniJIS2004-UTF16-V MS-Mincho.ttf
-otf-ujgrn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-otf-ujgrn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-otf-ujgbn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-otf-ujgbn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-otf-ujgen-h UniJIS2004-UTF16-H MS-Gothic.ttf
-otf-ujgen-v UniJIS2004-UTF16-V MS-Gothic.ttf
-otf-ujmgrn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-otf-ujmgrn-v UniJIS2004-UTF16-V MS-Gothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map
deleted file mode 100644
index 179ce994dc3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/otf-up-ms-osx.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H MS-Mincho.ttf
-uphminl-v UniJIS-UTF16-V MS-Mincho.ttf
-uphminr-h UniJIS-UTF16-H MS-Mincho.ttf
-uphminr-v UniJIS-UTF16-V MS-Mincho.ttf
-uphminb-h UniJIS-UTF16-H MS-Mincho.ttf
-uphminb-v UniJIS-UTF16-V MS-Mincho.ttf
-uphgothr-h UniJIS-UTF16-H MS-Gothic.ttf
-uphgothr-v UniJIS-UTF16-V MS-Gothic.ttf
-uphgothb-h UniJIS-UTF16-H MS-Gothic.ttf
-uphgothb-v UniJIS-UTF16-V MS-Gothic.ttf
-uphgotheb-h UniJIS-UTF16-H MS-Gothic.ttf
-uphgotheb-v UniJIS-UTF16-V MS-Gothic.ttf
-uphmgothr-h UniJIS-UTF16-H MS-Gothic.ttf
-uphmgothr-v UniJIS-UTF16-V MS-Gothic.ttf
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H MS-Mincho.ttf
-uphminln-v UniJIS2004-UTF16-V MS-Mincho.ttf
-uphminrn-h UniJIS2004-UTF16-H MS-Mincho.ttf
-uphminrn-v UniJIS2004-UTF16-V MS-Mincho.ttf
-uphminbn-h UniJIS2004-UTF16-H MS-Mincho.ttf
-uphminbn-v UniJIS2004-UTF16-V MS-Mincho.ttf
-uphgothrn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-uphgothrn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-uphgothbn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-uphgothbn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-uphgothebn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-uphgothebn-v UniJIS2004-UTF16-V MS-Gothic.ttf
-uphmgothrn-h UniJIS2004-UTF16-H MS-Gothic.ttf
-uphmgothrn-v UniJIS2004-UTF16-V MS-Gothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map
deleted file mode 100644
index e7d4744dd5b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/ptex-ms-osx.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H MS-Mincho.ttf
-rmlv V MS-Mincho.ttf
-gbm H MS-Gothic.ttf
-gbmv V MS-Gothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map
deleted file mode 100644
index ea081feaad9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms-osx/uptex-ms-osx.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H MS-Mincho.ttf
-urmlv UniJIS-UTF16-V MS-Mincho.ttf
-ugbm UniJIS-UTF16-H MS-Gothic.ttf
-ugbmv UniJIS-UTF16-V MS-Gothic.ttf
-uprml-h UniJIS-UTF16-H MS-Mincho.ttf
-uprml-v UniJIS-UTF16-V MS-Mincho.ttf
-upgbm-h UniJIS-UTF16-H MS-Gothic.ttf
-upgbm-v UniJIS-UTF16-V MS-Gothic.ttf
-uprml-hq UniJIS-UCS2-H MS-Mincho.ttf
-upgbm-hq UniJIS-UCS2-H MS-Gothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map
deleted file mode 100644
index 44ef877e29e..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-ms.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H :0:msmincho.ttc
-hminl-v V :0:msmincho.ttc
-hminr-h H :0:msmincho.ttc
-hminr-v V :0:msmincho.ttc
-hminb-h H :0:msmincho.ttc
-hminb-v V :0:msmincho.ttc
-hgothr-h H :0:msgothic.ttc
-hgothr-v V :0:msgothic.ttc
-hgothb-h H :0:msgothic.ttc
-hgothb-v V :0:msgothic.ttc
-hgotheb-h H :0:msgothic.ttc
-hgotheb-v V :0:msgothic.ttc
-hmgothr-h H :0:msgothic.ttc
-hmgothr-v V :0:msgothic.ttc
-
-% TEXT, JIS04
-hminln-h H :0:msmincho.ttc
-hminln-v V :0:msmincho.ttc
-hminrn-h H :0:msmincho.ttc
-hminrn-v V :0:msmincho.ttc
-hminbn-h H :0:msmincho.ttc
-hminbn-v V :0:msmincho.ttc
-hgothrn-h H :0:msgothic.ttc
-hgothrn-v V :0:msgothic.ttc
-hgothbn-h H :0:msgothic.ttc
-hgothbn-v V :0:msgothic.ttc
-hgothebn-h H :0:msgothic.ttc
-hgothebn-v V :0:msgothic.ttc
-hmgothrn-h H :0:msgothic.ttc
-hmgothrn-v V :0:msgothic.ttc
-
-% CID
-otf-cjml-h Identity-H :0:msmincho.ttc/AJ16
-otf-cjml-v Identity-V :0:msmincho.ttc/AJ16
-otf-cjmr-h Identity-H :0:msmincho.ttc/AJ16
-otf-cjmr-v Identity-V :0:msmincho.ttc/AJ16
-otf-cjmb-h Identity-H :0:msmincho.ttc/AJ16
-otf-cjmb-v Identity-V :0:msmincho.ttc/AJ16
-otf-cjgr-h Identity-H :0:msgothic.ttc/AJ16
-otf-cjgr-v Identity-V :0:msgothic.ttc/AJ16
-otf-cjgb-h Identity-H :0:msgothic.ttc/AJ16
-otf-cjgb-v Identity-V :0:msgothic.ttc/AJ16
-otf-cjge-h Identity-H :0:msgothic.ttc/AJ16
-otf-cjge-v Identity-V :0:msgothic.ttc/AJ16
-otf-cjmgr-h Identity-H :0:msgothic.ttc/AJ16
-otf-cjmgr-v Identity-V :0:msgothic.ttc/AJ16
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H :0:msmincho.ttc
-otf-ujml-v UniJIS-UTF16-V :0:msmincho.ttc
-otf-ujmr-h UniJIS-UTF16-H :0:msmincho.ttc
-otf-ujmr-v UniJIS-UTF16-V :0:msmincho.ttc
-otf-ujmb-h UniJIS-UTF16-H :0:msmincho.ttc
-otf-ujmb-v UniJIS-UTF16-V :0:msmincho.ttc
-otf-ujgr-h UniJIS-UTF16-H :0:msgothic.ttc
-otf-ujgr-v UniJIS-UTF16-V :0:msgothic.ttc
-otf-ujgb-h UniJIS-UTF16-H :0:msgothic.ttc
-otf-ujgb-v UniJIS-UTF16-V :0:msgothic.ttc
-otf-ujge-h UniJIS-UTF16-H :0:msgothic.ttc
-otf-ujge-v UniJIS-UTF16-V :0:msgothic.ttc
-otf-ujmgr-h UniJIS-UTF16-H :0:msgothic.ttc
-otf-ujmgr-v UniJIS-UTF16-V :0:msgothic.ttc
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H :0:msmincho.ttc
-otf-ujmln-v UniJIS2004-UTF16-V :0:msmincho.ttc
-otf-ujmrn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-otf-ujmrn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-otf-ujmbn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-otf-ujmbn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-otf-ujgrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-otf-ujgrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-otf-ujgbn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-otf-ujgbn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-otf-ujgen-h UniJIS2004-UTF16-H :0:msgothic.ttc
-otf-ujgen-v UniJIS2004-UTF16-V :0:msgothic.ttc
-otf-ujmgrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-otf-ujmgrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
deleted file mode 100644
index c4ad8038f9b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H :0:msmincho.ttc
-uphminl-v UniJIS-UTF16-V :0:msmincho.ttc
-uphminr-h UniJIS-UTF16-H :0:msmincho.ttc
-uphminr-v UniJIS-UTF16-V :0:msmincho.ttc
-uphminb-h UniJIS-UTF16-H :0:msmincho.ttc
-uphminb-v UniJIS-UTF16-V :0:msmincho.ttc
-uphgothr-h UniJIS-UTF16-H :0:msgothic.ttc
-uphgothr-v UniJIS-UTF16-V :0:msgothic.ttc
-uphgothb-h UniJIS-UTF16-H :0:msgothic.ttc
-uphgothb-v UniJIS-UTF16-V :0:msgothic.ttc
-uphgotheb-h UniJIS-UTF16-H :0:msgothic.ttc
-uphgotheb-v UniJIS-UTF16-V :0:msgothic.ttc
-uphmgothr-h UniJIS-UTF16-H :0:msgothic.ttc
-uphmgothr-v UniJIS-UTF16-V :0:msgothic.ttc
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminln-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphminrn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminrn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphminbn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminbn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphgothrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphgothbn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothbn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphgothebn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothebn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphmgothrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphmgothrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map
deleted file mode 100644
index 5f38aeeee21..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/ptex-ms.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H :0:msmincho.ttc
-rmlv V :0:msmincho.ttc
-gbm H :0:msgothic.ttc
-gbmv V :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map
deleted file mode 100644
index 56150b88fce..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/uptex-ms.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H :0:msmincho.ttc
-urmlv UniJIS-UTF16-V :0:msmincho.ttc
-ugbm UniJIS-UTF16-H :0:msgothic.ttc
-ugbmv UniJIS-UTF16-V :0:msgothic.ttc
-uprml-h UniJIS-UTF16-H :0:msmincho.ttc
-uprml-v UniJIS-UTF16-V :0:msmincho.ttc
-upgbm-h UniJIS-UTF16-H :0:msgothic.ttc
-upgbm-v UniJIS-UTF16-V :0:msgothic.ttc
-uprml-hq UniJIS-UCS2-H :0:msmincho.ttc
-upgbm-hq UniJIS-UCS2-H :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map
deleted file mode 100644
index 7638546cc51..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-noEmbed.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H !Ryumin-Light
-hminl-v V !Ryumin-Light
-hminr-h H !Ryumin-Light
-hminr-v V !Ryumin-Light
-hminb-h H !Ryumin-Light,Bold
-hminb-v V !Ryumin-Light,Bold
-hgothr-h H !GothicBBB-Medium
-hgothr-v V !GothicBBB-Medium
-hgothb-h H !GothicBBB-Medium,Bold
-hgothb-v V !GothicBBB-Medium,Bold
-hgotheb-h H !GothicBBB-Medium,Bold
-hgotheb-v V !GothicBBB-Medium,Bold
-hmgothr-h H !GothicBBB-Medium
-hmgothr-v V !GothicBBB-Medium
-
-% TEXT, JIS04
-hminln-h H !Ryumin-Light
-hminln-v V !Ryumin-Light
-hminrn-h H !Ryumin-Light
-hminrn-v V !Ryumin-Light
-hminbn-h H !Ryumin-Light,Bold
-hminbn-v V !Ryumin-Light,Bold
-hgothrn-h H !GothicBBB-Medium
-hgothrn-v V !GothicBBB-Medium
-hgothbn-h H !GothicBBB-Medium,Bold
-hgothbn-v V !GothicBBB-Medium,Bold
-hgothebn-h H !GothicBBB-Medium,Bold
-hgothebn-v V !GothicBBB-Medium,Bold
-hmgothrn-h H !GothicBBB-Medium
-hmgothrn-v V !GothicBBB-Medium
-
-% CID
-otf-cjml-h Identity-H !Ryumin-Light
-otf-cjml-v Identity-V !Ryumin-Light
-otf-cjmr-h Identity-H !Ryumin-Light
-otf-cjmr-v Identity-V !Ryumin-Light
-otf-cjmb-h Identity-H !Ryumin-Light,Bold
-otf-cjmb-v Identity-V !Ryumin-Light,Bold
-otf-cjgr-h Identity-H !GothicBBB-Medium
-otf-cjgr-v Identity-V !GothicBBB-Medium
-otf-cjgb-h Identity-H !GothicBBB-Medium,Bold
-otf-cjgb-v Identity-V !GothicBBB-Medium,Bold
-otf-cjge-h Identity-H !GothicBBB-Medium,Bold
-otf-cjge-v Identity-V !GothicBBB-Medium,Bold
-otf-cjmgr-h Identity-H !GothicBBB-Medium
-otf-cjmgr-v Identity-V !GothicBBB-Medium
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H !Ryumin-Light
-otf-ujml-v UniJIS-UTF16-V !Ryumin-Light
-otf-ujmr-h UniJIS-UTF16-H !Ryumin-Light
-otf-ujmr-v UniJIS-UTF16-V !Ryumin-Light
-otf-ujmb-h UniJIS-UTF16-H !Ryumin-Light,Bold
-otf-ujmb-v UniJIS-UTF16-V !Ryumin-Light,Bold
-otf-ujgr-h UniJIS-UTF16-H !GothicBBB-Medium
-otf-ujgr-v UniJIS-UTF16-V !GothicBBB-Medium
-otf-ujgb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-otf-ujgb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-otf-ujge-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-otf-ujge-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-otf-ujmgr-h UniJIS-UTF16-H !GothicBBB-Medium
-otf-ujmgr-v UniJIS-UTF16-V !GothicBBB-Medium
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H !Ryumin-Light
-otf-ujmln-v UniJIS2004-UTF16-V !Ryumin-Light
-otf-ujmrn-h UniJIS2004-UTF16-H !Ryumin-Light
-otf-ujmrn-v UniJIS2004-UTF16-V !Ryumin-Light
-otf-ujmbn-h UniJIS2004-UTF16-H !Ryumin-Light,Bold
-otf-ujmbn-v UniJIS2004-UTF16-V !Ryumin-Light,Bold
-otf-ujgrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-otf-ujgrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-otf-ujgbn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-otf-ujgbn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-otf-ujgen-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-otf-ujgen-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-otf-ujmgrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-otf-ujmgrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
deleted file mode 100644
index dca1153e4a3..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H !Ryumin-Light
-uphminl-v UniJIS-UTF16-V !Ryumin-Light
-uphminr-h UniJIS-UTF16-H !Ryumin-Light
-uphminr-v UniJIS-UTF16-V !Ryumin-Light
-uphminb-h UniJIS-UTF16-H !Ryumin-Light,Bold
-uphminb-v UniJIS-UTF16-V !Ryumin-Light,Bold
-uphgothr-h UniJIS-UTF16-H !GothicBBB-Medium
-uphgothr-v UniJIS-UTF16-V !GothicBBB-Medium
-uphgothb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-uphgothb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-uphgotheb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-uphgotheb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-uphmgothr-h UniJIS-UTF16-H !GothicBBB-Medium
-uphmgothr-v UniJIS-UTF16-V !GothicBBB-Medium
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H !Ryumin-Light
-uphminln-v UniJIS2004-UTF16-V !Ryumin-Light
-uphminrn-h UniJIS2004-UTF16-H !Ryumin-Light
-uphminrn-v UniJIS2004-UTF16-V !Ryumin-Light
-uphminbn-h UniJIS2004-UTF16-H !Ryumin-Light,Bold
-uphminbn-v UniJIS2004-UTF16-V !Ryumin-Light,Bold
-uphgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-uphgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-uphgothbn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-uphgothbn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-uphgothebn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-uphgothebn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-uphmgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-uphmgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map
deleted file mode 100644
index e309b88c893..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H !Ryumin-Light
-rmlv 2004-V !Ryumin-Light
-gbm 2004-H !GothicBBB-Medium
-gbmv 2004-V !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map
deleted file mode 100644
index 8f46d970813..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/ptex-noEmbed.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H !Ryumin-Light
-rmlv V !Ryumin-Light
-gbm H !GothicBBB-Medium
-gbmv V !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map
deleted file mode 100644
index eb3088babc9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H !Ryumin-Light
-urmlv UniJIS2004-UTF16-V !Ryumin-Light
-ugbm UniJIS2004-UTF16-H !GothicBBB-Medium
-ugbmv UniJIS2004-UTF16-V !GothicBBB-Medium
-uprml-h UniJIS2004-UTF16-H !Ryumin-Light
-uprml-v UniJIS2004-UTF16-V !Ryumin-Light
-upgbm-h UniJIS2004-UTF16-H !GothicBBB-Medium
-upgbm-v UniJIS2004-UTF16-V !GothicBBB-Medium
-uprml-hq UniJIS-UCS2-H !Ryumin-Light
-upgbm-hq UniJIS-UCS2-H !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map
deleted file mode 100644
index e2670c1f5cb..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/uptex-noEmbed.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H !Ryumin-Light
-urmlv UniJIS-UTF16-V !Ryumin-Light
-ugbm UniJIS-UTF16-H !GothicBBB-Medium
-ugbmv UniJIS-UTF16-V !GothicBBB-Medium
-uprml-h UniJIS-UTF16-H !Ryumin-Light
-uprml-v UniJIS-UTF16-V !Ryumin-Light
-upgbm-h UniJIS-UTF16-H !GothicBBB-Medium
-upgbm-v UniJIS-UTF16-V !GothicBBB-Medium
-uprml-hq UniJIS-UCS2-H !Ryumin-Light
-upgbm-hq UniJIS-UCS2-H !GothicBBB-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map
deleted file mode 100644
index 341ab36feba..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-hminl-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminl-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminr-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminr-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminb-h H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-hminb-v V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-hgothr-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hgothr-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hgothb-h H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-hgothb-v V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-hgotheb-h H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-hgotheb-v V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-hmgothr-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hmgothr-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% TEXT, JIS04
-hminln-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminln-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminrn-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminrn-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-hminbn-h H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-hminbn-v V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-hgothrn-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hgothrn-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hgothbn-h H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-hgothbn-v V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-hgothebn-h H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-hgothebn-v V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-hmgothrn-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-hmgothrn-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% CID
-otf-cjml-h Identity-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-cjml-v Identity-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-cjmr-h Identity-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-cjmr-v Identity-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-cjmb-h Identity-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-cjmb-v Identity-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-cjgr-h Identity-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-cjgr-v Identity-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-cjgb-h Identity-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-cjgb-v Identity-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-cjge-h Identity-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-cjge-v Identity-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-cjmgr-h Identity-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-cjmgr-v Identity-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujml-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmr-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmr-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmb-h UniJIS-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-ujmb-v UniJIS-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-ujgr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujgr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujgb-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-ujgb-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-ujge-h UniJIS-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-ujge-v UniJIS-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-ujmgr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujmgr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmln-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmrn-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmrn-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-otf-ujmbn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-ujmbn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-otf-ujgrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujgrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujgbn-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-ujgbn-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-otf-ujgen-h UniJIS2004-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-ujgen-v UniJIS2004-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-otf-ujmgrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-otf-ujmgrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map
deleted file mode 100644
index 660c86b3aa1..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminl-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminr-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminr-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminb-h UniJIS-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-uphminb-v UniJIS-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-uphgothr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphgothr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphgothb-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uphgothb-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uphgotheb-h UniJIS-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-uphgotheb-v UniJIS-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-uphmgothr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphmgothr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-
-% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminln-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminrn-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminrn-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uphminbn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-uphminbn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
-uphgothrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphgothrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphgothbn-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uphgothbn-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uphgothebn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-uphgothebn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
-uphmgothrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
-uphmgothrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map
deleted file mode 100644
index 21df63f4571..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml 2004-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-rmlv 2004-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-gbm 2004-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-gbmv 2004-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map
deleted file mode 100644
index 7f00b869d5c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-rmlv V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-gbm H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-gbmv V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map
deleted file mode 100644
index 3c6cbdc57bc..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-urmlv UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-ugbm UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-ugbmv UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uprml-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uprml-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-upgbm-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-upgbm-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uprml-hq UniJIS-UCS2-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-upgbm-hq UniJIS-UCS2-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map
deleted file mode 100644
index b15c83c6ab9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-urmlv UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-ugbm UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-ugbmv UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uprml-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-uprml-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-upgbm-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-upgbm-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
-uprml-hq UniJIS-UCS2-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
-upgbm-hq UniJIS-UCS2-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
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
deleted file mode 100644
index cf65d10471d..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-up-yu-osx.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-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 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
deleted file mode 100644
index 7ab78c040d4..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/otf-yu-osx.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-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 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 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 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 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
deleted file mode 100644
index 6820e7a3954..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx-04.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 1e91e0f0e2a..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/ptex-yu-osx.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 350e04c772d..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx-04.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 32cea92dd21..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-osx/uptex-yu-osx.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 10b1c6a4c9c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-up-yu-win.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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
deleted file mode 100644
index 8bf00f2f0ee..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/otf-yu-win.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-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 %!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 %!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 %!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 %!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
deleted file mode 100644
index ee34a0ad1d6..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/ptex-yu-win.map
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 90b29697efe..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win/uptex-yu-win.map
+++ /dev/null
@@ -1,10 +0,0 @@
-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/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map
deleted file mode 100644
index 2d1bf333ab7..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map
+++ /dev/null
@@ -1,32 +0,0 @@
-
-% TEXT, 90JIS
-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 :0:YuGothR.ttc %!PS YuGothic-Regular
-uphgothr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
-uphgothb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgothb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgotheb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgotheb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-uphmgothr-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphmgothr-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-
-% TEXT, JIS04
-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 :0:YuGothR.ttc %!PS YuGothic-Regular
-uphgothrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
-uphgothbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgothbn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgothebn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphgothebn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-uphmgothrn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-uphmgothrn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map
deleted file mode 100644
index 0d4f3ab7d48..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map
+++ /dev/null
@@ -1,80 +0,0 @@
-
-% TEXT, 90JIS
-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 :0:YuGothR.ttc %!PS YuGothic-Regular
-hgothr-v V :0:YuGothR.ttc %!PS YuGothic-Regular
-hgothb-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hgothb-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-hgotheb-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hgotheb-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-hmgothr-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hmgothr-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-
-% TEXT, JIS04
-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 :0:YuGothR.ttc %!PS YuGothic-Regular
-hgothrn-v V :0:YuGothR.ttc %!PS YuGothic-Regular
-hgothbn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hgothbn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-hgothebn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hgothebn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-hmgothrn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
-hmgothrn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
-
-% CID
-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 :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular
-otf-cjgr-v Identity-V :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular
-otf-cjgb-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjgb-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjge-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjge-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjmgr-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-otf-cjmgr-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
-
-% Unicode 90JIS
-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 :0:YuGothR.ttc %!PS YuGothic-Regular
-otf-ujgr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
-otf-ujgb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujgb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujge-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujge-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujmgr-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujmgr-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-
-% Unicode JIS04
-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 :0:YuGothR.ttc %!PS YuGothic-Regular
-otf-ujgrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
-otf-ujgbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujgbn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujgen-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujgen-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujmgrn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
-otf-ujmgrn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map
deleted file mode 100644
index 6723260b648..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map
+++ /dev/null
@@ -1,4 +0,0 @@
-rml H yumin.ttf %!PS YuMincho-Regular
-rmlv V yumin.ttf %!PS YuMincho-Regular
-gbm H :0:YuGothM.ttc %!PS YuGothic-Medium
-gbmv V :0:YuGothM.ttc %!PS YuGothic-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map
deleted file mode 100644
index bdf7659b4c6..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map
+++ /dev/null
@@ -1,10 +0,0 @@
-urml UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
-urmlv UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
-ugbm UniJIS-UTF16-H :0:YuGothM.ttc %!PS YuGothic-Medium
-ugbmv UniJIS-UTF16-V :0:YuGothM.ttc %!PS YuGothic-Medium
-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 :0:YuGothM.ttc %!PS YuGothic-Medium
-upgbm-v UniJIS-UTF16-V :0:YuGothM.ttc %!PS YuGothic-Medium
-uprml-hq UniJIS-UCS2-H yumin.ttf %!PS YuMincho-Regular
-upgbm-hq UniJIS-UCS2-H :0:YuGothM.ttc %!PS YuGothic-Medium