ptex-fontmaps (6mar18)

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

20 files changed, 16 insertions, 444 deletions

diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
deleted file mode 100644
index bd537f76038..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
deleted file mode 100644
index 50f3ae1653c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
deleted file mode 100644
index a27347bf962..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
deleted file mode 100644
index 6556548b7e7..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
deleted file mode 100644
index 057e1097f19..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
deleted file mode 100644
index 2e21b50da69..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
deleted file mode 100644
index 41c5388d9d8..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
deleted file mode 100644
index d01b53b4f56..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
deleted file mode 100644
index 7ffb1d6e7bb..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
deleted file mode 100644
index 05d0f34ee11..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
deleted file mode 100644
index ce0407b9c0b..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
deleted file mode 100644
index 21af43d0c51..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map
new file mode 100644
index 00000000000..2a914b44445
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/otf-sc-ms-osx.map
@@ -0,0 +1,12 @@
+
+% CID
+otf-ccmr-h	Identity-H	simsun.ttf/AG14 %!PS SimSun
+otf-ccmr-v	Identity-V	simsun.ttf/AG14 %!PS SimSun
+otf-ccgr-h	Identity-H	simhei.ttf/AG14 %!PS SimHei
+otf-ccgr-v	Identity-V	simhei.ttf/AG14 %!PS SimHei
+
+% Unicode
+otf-ucmr-h	UniGB-UCS2-H	simsun.ttf %!PS SimSun
+otf-ucmr-v	UniGB-UCS2-V	simsun.ttf %!PS SimSun
+otf-ucgr-h	UniGB-UCS2-H	simhei.ttf %!PS SimHei
+otf-ucgr-v	UniGB-UCS2-V	simhei.ttf %!PS SimHei
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map
new file mode 100644
index 00000000000..b601122716e
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/ms-osx/uptex-sc-ms-osx.map
@@ -0,0 +1,4 @@
+upstsl-h	UniGB-UTF16-H	simsun.ttf %!PS SimSun
+upstsl-v	UniGB-UTF16-V	simsun.ttf %!PS SimSun
+upstht-h	UniGB-UTF16-H	simhei.ttf %!PS SimHei
+upstht-v	UniGB-UTF16-V	simhei.ttf %!PS SimHei
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map
deleted file mode 100644
index 341ab36feba..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map
deleted file mode 100644
index 660c86b3aa1..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map
deleted file mode 100644
index 21df63f4571..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map
deleted file mode 100644
index 7f00b869d5c..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map
deleted file mode 100644
index 3c6cbdc57bc..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map
deleted file mode 100644
index b15c83c6ab9..00000000000
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex-fontmaps/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