summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2011-11-20 12:47:56 +0000
committerNorbert Preining <preining@logic.at>2011-11-20 12:47:56 +0000
commit196a1bee502b09c56c2d49f5e25b779ba791cc11 (patch)
tree0b991e99947bb282f53ba5f961268f5fbe140433 /Master/texmf-dist
parent5755541e81c50bb2db5fe184582d23cc8de2b8c1 (diff)
map updates from Akira
git-svn-id: svn://tug.org/texlive/trunk@24627 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipa.map168
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipaex.map168
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipa.map29
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipaex.map29
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-cktx.map62
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-hiragino.map188
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-kozuka.map168
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-morisawa.map168
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-noEmbed.map168
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino-04.map29
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino.map29
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka-04.map29
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka.map29
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa-04.map29
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa.map29
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map29
16 files changed, 744 insertions, 607 deletions
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipa.map
index a0609234335..7b01c8d50b9 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipa.map
@@ -1,75 +1,97 @@
-otf-ujmr-h UniJIS-UTF16-H ipam.ttf
-otf-ujmr-v UniJIS-UTF16-V ipam.ttf
-otf-cjmr-h Identity-H ipam.ttf/AJ16
-otf-cjmr-v Identity-V ipam.ttf/AJ16
-hminr-h H ipam.ttf
-hminr-v V ipam.ttf
-
-otf-ujgr-h UniJIS-UTF16-H ipag.ttf
-otf-ujgr-v UniJIS-UTF16-V ipag.ttf
-otf-cjgr-h Identity-H ipag.ttf/AJ16
-otf-cjgr-v Identity-V ipag.ttf/AJ16
-hgothr-h H ipag.ttf
-hgothr-v V ipag.ttf
-
-otf-ujmb-h UniJIS-UTF16-H ipam.ttf
-otf-ujmb-v UniJIS-UTF16-V ipam.ttf
-otf-cjmb-h Identity-H ipam.ttf/AJ16
-otf-cjmb-v Identity-V ipam.ttf/AJ16
-hminb-h H ipam.ttf
-hminb-v V ipam.ttf
-
-otf-ujgb-h UniJIS-UTF16-H ipag.ttf
-otf-ujgb-v UniJIS-UTF16-V ipag.ttf
-otf-cjgb-h Identity-H ipag.ttf/AJ16
-otf-cjgb-v Identity-V ipag.ttf/AJ16
-hgothb-h H ipag.ttf
-hgothb-v V ipag.ttf
-
-hgotheb-h H ipag.ttf
-hgotheb-v V ipag.ttf
-
-otf-ujmgr-h UniJIS-UTF16-H ipag.ttf
-otf-ujmgr-v UniJIS-UTF16-V ipag.ttf
-otf-cjmgr-h Identity-H ipag.ttf/AJ16
-otf-cjmgr-v Identity-V ipag.ttf/AJ16
-hmgothr-h H ipag.ttf
-hmgothr-v V ipag.ttf
-
-otf-ujml-h UniJIS-UTF16-H ipam.ttf
-otf-ujml-v UniJIS-UTF16-V ipam.ttf
-otf-cjml-h Identity-H ipam.ttf/AJ16
-otf-cjml-v Identity-V ipam.ttf/AJ16
-hminl-h H ipam.ttf
-hminl-v V ipam.ttf
+otf-ujmr-h UniJIS-UTF16-H ipam.ttf
+otf-ujmr-v UniJIS-UTF16-V ipam.ttf
+otf-cjmr-h Identity-H ipam.ttf/AJ16
+otf-cjmr-v Identity-V ipam.ttf/AJ16
+hminr-h H ipam.ttf
+hminr-v V ipam.ttf
+
+otf-ujgr-h UniJIS-UTF16-H ipag.ttf
+otf-ujgr-v UniJIS-UTF16-V ipag.ttf
+otf-cjgr-h Identity-H ipag.ttf/AJ16
+otf-cjgr-v Identity-V ipag.ttf/AJ16
+hgothr-h H ipag.ttf
+hgothr-v V ipag.ttf
+
+otf-ujmb-h UniJIS-UTF16-H ipam.ttf
+otf-ujmb-v UniJIS-UTF16-V ipam.ttf
+otf-cjmb-h Identity-H ipam.ttf/AJ16
+otf-cjmb-v Identity-V ipam.ttf/AJ16
+hminb-h H ipam.ttf
+hminb-v V ipam.ttf
+
+otf-ujgb-h UniJIS-UTF16-H ipag.ttf
+otf-ujgb-v UniJIS-UTF16-V ipag.ttf
+otf-cjgb-h Identity-H ipag.ttf/AJ16
+otf-cjgb-v Identity-V ipag.ttf/AJ16
+hgothb-h H ipag.ttf
+hgothb-v V ipag.ttf
+
+hgotheb-h H ipag.ttf
+hgotheb-v V ipag.ttf
+
+otf-ujmgr-h UniJIS-UTF16-H ipag.ttf
+otf-ujmgr-v UniJIS-UTF16-V ipag.ttf
+otf-cjmgr-h Identity-H ipag.ttf/AJ16
+otf-cjmgr-v Identity-V ipag.ttf/AJ16
+hmgothr-h H ipag.ttf
+hmgothr-v V ipag.ttf
+
+otf-ujml-h UniJIS-UTF16-H ipam.ttf
+otf-ujml-v UniJIS-UTF16-V ipam.ttf
+otf-cjml-h Identity-H ipam.ttf/AJ16
+otf-cjml-v Identity-V ipam.ttf/AJ16
+hminl-h H ipam.ttf
+hminl-v V ipam.ttf
%for JIS X 0213:2004
-otf-ujmrn-h UniJIS2004-UTF16-H ipam.ttf
-otf-ujmrn-v UniJIS2004-UTF16-V ipam.ttf
-hminrn-h H ipam.ttf
-hminrn-v V ipam.ttf
-
-otf-ujgrn-h UniJIS2004-UTF16-H ipag.ttf
-otf-ujgrn-v UniJIS2004-UTF16-V ipag.ttf
-hgothrn-h H ipag.ttf
-hgothrn-v V ipag.ttf
-
-otf-ujmbn-h UniJIS2004-UTF16-H ipam.ttf
-otf-ujmbn-v UniJIS2004-UTF16-V ipam.ttf
-hminbn-h H ipam.ttf
-hminbn-v V ipam.ttf
-
-otf-ujgbn-h UniJIS2004-UTF16-H ipag.ttf
-otf-ujgbn-v UniJIS2004-UTF16-V ipag.ttf
-hgothbn-h H ipag.ttf
-hgothbn-v V ipag.ttf
-
-otf-ujmgrn-h UniJIS2004-UTF16-H ipag.ttf
-otf-ujmgrn-v UniJIS2004-UTF16-V ipag.ttf
-hmgothrn-h H ipag.ttf
-hmgothrn-v V ipag.ttf
-
-otf-ujmln-h UniJIS2004-UTF16-H ipam.ttf
-otf-ujmln-v UniJIS2004-UTF16-V ipam.ttf
-hminln-h H ipam.ttf
-hminln-v V ipam.ttf
+otf-ujmrn-h UniJIS2004-UTF16-H ipam.ttf
+otf-ujmrn-v UniJIS2004-UTF16-V ipam.ttf
+hminrn-h H ipam.ttf
+hminrn-v V ipam.ttf
+
+otf-ujgrn-h UniJIS2004-UTF16-H ipag.ttf
+otf-ujgrn-v UniJIS2004-UTF16-V ipag.ttf
+hgothrn-h H ipag.ttf
+hgothrn-v V ipag.ttf
+
+otf-ujmbn-h UniJIS2004-UTF16-H ipam.ttf
+otf-ujmbn-v UniJIS2004-UTF16-V ipam.ttf
+hminbn-h H ipam.ttf
+hminbn-v V ipam.ttf
+
+otf-ujgbn-h UniJIS2004-UTF16-H ipag.ttf
+otf-ujgbn-v UniJIS2004-UTF16-V ipag.ttf
+hgothbn-h H ipag.ttf
+hgothbn-v V ipag.ttf
+
+otf-ujmgrn-h UniJIS2004-UTF16-H ipag.ttf
+otf-ujmgrn-v UniJIS2004-UTF16-V ipag.ttf
+hmgothrn-h H ipag.ttf
+hmgothrn-v V ipag.ttf
+
+otf-ujmln-h UniJIS2004-UTF16-H ipam.ttf
+otf-ujmln-v UniJIS2004-UTF16-V ipam.ttf
+hminln-h H ipam.ttf
+hminln-v V ipam.ttf
+
+% otf on upTeX
+uphminr-h UniJIS-UTF16-H ipam.ttf
+uphminr-v UniJIS-UTF16-V ipam.ttf
+
+uphgothr-h UniJIS-UTF16-H ipag.ttf
+uphgothr-v UniJIS-UTF16-V ipag.ttf
+
+uphminb-h UniJIS-UTF16-H ipam.ttf
+uphminb-v UniJIS-UTF16-V ipam.ttf
+
+uphgothb-h UniJIS-UTF16-H ipag.ttf
+uphgothb-v UniJIS-UTF16-V ipag.ttf
+
+uphgotheb-h UniJIS-UTF16-H ipag.ttf
+uphgotheb-v UniJIS-UTF16-V ipag.ttf
+
+uphmgothr-h UniJIS-UTF16-H ipag.ttf
+uphmgothr-v UniJIS-UTF16-V ipag.ttf
+
+uphminl-h UniJIS-UTF16-H ipam.ttf
+uphminl-v UniJIS-UTF16-V ipam.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipaex.map
index 1af4f6e0e4e..040998a8426 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipaex.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/otf-ipaex.map
@@ -1,75 +1,97 @@
-otf-ujmr-h UniJIS-UTF16-H ipaexm.ttf
-otf-ujmr-v UniJIS-UTF16-V ipaexm.ttf
-otf-cjmr-h Identity-H ipaexm.ttf/AJ16
-otf-cjmr-v Identity-V ipaexm.ttf/AJ16
-hminr-h H ipaexm.ttf
-hminr-v V ipaexm.ttf
-
-otf-ujgr-h UniJIS-UTF16-H ipaexg.ttf
-otf-ujgr-v UniJIS-UTF16-V ipaexg.ttf
-otf-cjgr-h Identity-H ipaexg.ttf/AJ16
-otf-cjgr-v Identity-V ipaexg.ttf/AJ16
-hgothr-h H ipaexg.ttf
-hgothr-v V ipaexg.ttf
-
-otf-ujmb-h UniJIS-UTF16-H ipaexm.ttf
-otf-ujmb-v UniJIS-UTF16-V ipaexm.ttf
-otf-cjmb-h Identity-H ipaexm.ttf/AJ16
-otf-cjmb-v Identity-V ipaexm.ttf/AJ16
-hminb-h H ipaexm.ttf
-hminb-v V ipaexm.ttf
-
-otf-ujgb-h UniJIS-UTF16-H ipaexg.ttf
-otf-ujgb-v UniJIS-UTF16-V ipaexg.ttf
-otf-cjgb-h Identity-H ipaexg.ttf/AJ16
-otf-cjgb-v Identity-V ipaexg.ttf/AJ16
-hgothb-h H ipaexg.ttf
-hgothb-v V ipaexg.ttf
-
-hgotheb-h H ipaexg.ttf
-hgotheb-v V ipaexg.ttf
-
-otf-ujmgr-h UniJIS-UTF16-H ipaexg.ttf
-otf-ujmgr-v UniJIS-UTF16-V ipaexg.ttf
-otf-cjmgr-h Identity-H ipaexg.ttf/AJ16
-otf-cjmgr-v Identity-V ipaexg.ttf/AJ16
-hmgothr-h H ipaexg.ttf
-hmgothr-v V ipaexg.ttf
-
-otf-ujml-h UniJIS-UTF16-H ipaexm.ttf
-otf-ujml-v UniJIS-UTF16-V ipaexm.ttf
-otf-cjml-h Identity-H ipaexm.ttf/AJ16
-otf-cjml-v Identity-V ipaexm.ttf/AJ16
-hminl-h H ipaexm.ttf
-hminl-v V ipaexm.ttf
+otf-ujmr-h UniJIS-UTF16-H ipaexm.ttf
+otf-ujmr-v UniJIS-UTF16-V ipaexm.ttf
+otf-cjmr-h Identity-H ipaexm.ttf/AJ16
+otf-cjmr-v Identity-V ipaexm.ttf/AJ16
+hminr-h H ipaexm.ttf
+hminr-v V ipaexm.ttf
+
+otf-ujgr-h UniJIS-UTF16-H ipaexg.ttf
+otf-ujgr-v UniJIS-UTF16-V ipaexg.ttf
+otf-cjgr-h Identity-H ipaexg.ttf/AJ16
+otf-cjgr-v Identity-V ipaexg.ttf/AJ16
+hgothr-h H ipaexg.ttf
+hgothr-v V ipaexg.ttf
+
+otf-ujmb-h UniJIS-UTF16-H ipaexm.ttf
+otf-ujmb-v UniJIS-UTF16-V ipaexm.ttf
+otf-cjmb-h Identity-H ipaexm.ttf/AJ16
+otf-cjmb-v Identity-V ipaexm.ttf/AJ16
+hminb-h H ipaexm.ttf
+hminb-v V ipaexm.ttf
+
+otf-ujgb-h UniJIS-UTF16-H ipaexg.ttf
+otf-ujgb-v UniJIS-UTF16-V ipaexg.ttf
+otf-cjgb-h Identity-H ipaexg.ttf/AJ16
+otf-cjgb-v Identity-V ipaexg.ttf/AJ16
+hgothb-h H ipaexg.ttf
+hgothb-v V ipaexg.ttf
+
+hgotheb-h H ipaexg.ttf
+hgotheb-v V ipaexg.ttf
+
+otf-ujmgr-h UniJIS-UTF16-H ipaexg.ttf
+otf-ujmgr-v UniJIS-UTF16-V ipaexg.ttf
+otf-cjmgr-h Identity-H ipaexg.ttf/AJ16
+otf-cjmgr-v Identity-V ipaexg.ttf/AJ16
+hmgothr-h H ipaexg.ttf
+hmgothr-v V ipaexg.ttf
+
+otf-ujml-h UniJIS-UTF16-H ipaexm.ttf
+otf-ujml-v UniJIS-UTF16-V ipaexm.ttf
+otf-cjml-h Identity-H ipaexm.ttf/AJ16
+otf-cjml-v Identity-V ipaexm.ttf/AJ16
+hminl-h H ipaexm.ttf
+hminl-v V ipaexm.ttf
%for JIS X 0213:2004
-otf-ujmrn-h UniJIS2004-UTF16-H ipaexm.ttf
-otf-ujmrn-v UniJIS2004-UTF16-V ipaexm.ttf
-hminrn-h H ipaexm.ttf
-hminrn-v V ipaexm.ttf
-
-otf-ujgrn-h UniJIS2004-UTF16-H ipaexg.ttf
-otf-ujgrn-v UniJIS2004-UTF16-V ipaexg.ttf
-hgothrn-h H ipaexg.ttf
-hgothrn-v V ipaexg.ttf
-
-otf-ujmbn-h UniJIS2004-UTF16-H ipaexm.ttf
-otf-ujmbn-v UniJIS2004-UTF16-V ipaexm.ttf
-hminbn-h H ipaexm.ttf
-hminbn-v V ipaexm.ttf
-
-otf-ujgbn-h UniJIS2004-UTF16-H ipaexg.ttf
-otf-ujgbn-v UniJIS2004-UTF16-V ipaexg.ttf
-hgothbn-h H ipaexg.ttf
-hgothbn-v V ipaexg.ttf
-
-otf-ujmgrn-h UniJIS2004-UTF16-H ipaexg.ttf
-otf-ujmgrn-v UniJIS2004-UTF16-V ipaexg.ttf
-hmgothrn-h H ipaexg.ttf
-hmgothrn-v V ipaexg.ttf
-
-otf-ujmln-h UniJIS2004-UTF16-H ipaexm.ttf
-otf-ujmln-v UniJIS2004-UTF16-V ipaexm.ttf
-hminln-h H ipaexm.ttf
-hminln-v V ipaexm.ttf
+otf-ujmrn-h UniJIS2004-UTF16-H ipaexm.ttf
+otf-ujmrn-v UniJIS2004-UTF16-V ipaexm.ttf
+hminrn-h H ipaexm.ttf
+hminrn-v V ipaexm.ttf
+
+otf-ujgrn-h UniJIS2004-UTF16-H ipaexg.ttf
+otf-ujgrn-v UniJIS2004-UTF16-V ipaexg.ttf
+hgothrn-h H ipaexg.ttf
+hgothrn-v V ipaexg.ttf
+
+otf-ujmbn-h UniJIS2004-UTF16-H ipaexm.ttf
+otf-ujmbn-v UniJIS2004-UTF16-V ipaexm.ttf
+hminbn-h H ipaexm.ttf
+hminbn-v V ipaexm.ttf
+
+otf-ujgbn-h UniJIS2004-UTF16-H ipaexg.ttf
+otf-ujgbn-v UniJIS2004-UTF16-V ipaexg.ttf
+hgothbn-h H ipaexg.ttf
+hgothbn-v V ipaexg.ttf
+
+otf-ujmgrn-h UniJIS2004-UTF16-H ipaexg.ttf
+otf-ujmgrn-v UniJIS2004-UTF16-V ipaexg.ttf
+hmgothrn-h H ipaexg.ttf
+hmgothrn-v V ipaexg.ttf
+
+otf-ujmln-h UniJIS2004-UTF16-H ipaexm.ttf
+otf-ujmln-v UniJIS2004-UTF16-V ipaexm.ttf
+hminln-h H ipaexm.ttf
+hminln-v V ipaexm.ttf
+
+% otf on upTeX
+uphminr-h UniJIS-UTF16-H ipaexm.ttf
+uphminr-v UniJIS-UTF16-V ipaexm.ttf
+
+uphgothr-h UniJIS-UTF16-H ipaexg.ttf
+uphgothr-v UniJIS-UTF16-V ipaexg.ttf
+
+uphminb-h UniJIS-UTF16-H ipaexm.ttf
+uphminb-v UniJIS-UTF16-V ipaexm.ttf
+
+uphgothb-h UniJIS-UTF16-H ipaexg.ttf
+uphgothb-v UniJIS-UTF16-V ipaexg.ttf
+
+uphgotheb-h UniJIS-UTF16-H ipaexg.ttf
+uphgotheb-v UniJIS-UTF16-V ipaexg.ttf
+
+uphmgothr-h UniJIS-UTF16-H ipaexg.ttf
+uphmgothr-v UniJIS-UTF16-V ipaexg.ttf
+
+uphminl-h UniJIS-UTF16-H ipaexm.ttf
+uphminl-v UniJIS-UTF16-V ipaexm.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipa.map
index 8bf8326bed6..aca5ee8133b 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipa.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H ipam.ttf
-rmlv V ipam.ttf
-gbm H ipag.ttf
-gbmv V ipag.ttf
+rml H ipam.ttf
+rmlv V ipam.ttf
+gbm H ipag.ttf
+gbmv V ipag.ttf
%%
%% upTeX
%%
-urml UniJIS-UTF16-H ipam.ttf
-urmlv UniJIS-UTF16-V ipam.ttf
-ugbm UniJIS-UTF16-H ipag.ttf
-ugbmv UniJIS-UTF16-V ipag.ttf
-
-uprml-h UniJIS-UTF16-H ipam.ttf
-uprml-v UniJIS-UTF16-V ipam.ttf
-upgbm-h UniJIS-UTF16-H ipag.ttf
-upgbm-v UniJIS-UTF16-V ipag.ttf
-uprml-hq UniJIS-UCS2-H ipam.ttf
-upgbm-hq UniJIS-UCS2-H ipag.ttf
+urml UniJIS-UTF16-H ipam.ttf
+urmlv UniJIS-UTF16-V ipam.ttf
+ugbm UniJIS-UTF16-H ipag.ttf
+ugbmv UniJIS-UTF16-V ipag.ttf
+uprml-h UniJIS-UTF16-H ipam.ttf
+uprml-v UniJIS-UTF16-V ipam.ttf
+upgbm-h UniJIS-UTF16-H ipag.ttf
+upgbm-v UniJIS-UTF16-V ipag.ttf
+uprml-hq UniJIS-UCS2-H ipam.ttf
+upgbm-hq UniJIS-UCS2-H ipag.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipaex.map
index 3da25ef09b6..5d43c5f7943 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipaex.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ipaex/ptex-ipaex.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H ipaexm.ttf
-rmlv V ipaexm.ttf
-gbm H ipaexg.ttf
-gbmv V ipaexg.ttf
+rml H ipaexm.ttf
+rmlv V ipaexm.ttf
+gbm H ipaexg.ttf
+gbmv V ipaexg.ttf
%%
%% upTeX
%%
-urml UniJIS-UTF16-H ipaexm.ttf
-urmlv UniJIS-UTF16-V ipaexm.ttf
-ugbm UniJIS-UTF16-H ipaexg.ttf
-ugbmv UniJIS-UTF16-V ipaexg.ttf
-
-uprml-h UniJIS-UTF16-H ipaexm.ttf
-uprml-v UniJIS-UTF16-V ipaexm.ttf
-upgbm-h UniJIS-UTF16-H ipaexg.ttf
-upgbm-v UniJIS-UTF16-V ipaexg.ttf
-uprml-hq UniJIS-UCS2-H ipaexm.ttf
-upgbm-hq UniJIS-UCS2-H ipaexg.ttf
+urml UniJIS-UTF16-H ipaexm.ttf
+urmlv UniJIS-UTF16-V ipaexm.ttf
+ugbm UniJIS-UTF16-H ipaexg.ttf
+ugbmv UniJIS-UTF16-V ipaexg.ttf
+uprml-h UniJIS-UTF16-H ipaexm.ttf
+uprml-v UniJIS-UTF16-V ipaexm.ttf
+upgbm-h UniJIS-UTF16-H ipaexg.ttf
+upgbm-v UniJIS-UTF16-V ipaexg.ttf
+uprml-hq UniJIS-UCS2-H ipaexm.ttf
+upgbm-hq UniJIS-UCS2-H ipaexg.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-cktx.map b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-cktx.map
index b19a8c1044d..955689bedc4 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-cktx.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-cktx.map
@@ -1,29 +1,43 @@
-otf-ukmr-h UniKS-UCS2-H HYSMyeongJoStd-Medium
-otf-ukmr-v UniKS-UCS2-V HYSMyeongJoStd-Medium
-otf-ukgr-h UniKS-UCS2-H HYGoThic-Medium
-otf-ukgr-v UniKS-UCS2-V HYGoThic-Medium
+otf-ukmr-h UniKS-UCS2-H HYSMyeongJoStd-Medium
+otf-ukmr-v UniKS-UCS2-V HYSMyeongJoStd-Medium
+otf-ukgr-h UniKS-UCS2-H HYGoThic-Medium
+otf-ukgr-v UniKS-UCS2-V HYGoThic-Medium
-otf-ucmr-h UniGB-UCS2-H STSongStd-Light
-otf-ucmr-v UniGB-UCS2-V STSongStd-Light
-otf-ucgr-h UniGB-UCS2-H STHeiti-Regular
-otf-ucgr-v UniGB-UCS2-V STHeiti-Regular
+otf-ucmr-h UniGB-UCS2-H STSongStd-Light
+otf-ucmr-v UniGB-UCS2-V STSongStd-Light
+otf-ucgr-h UniGB-UCS2-H STHeiti-Regular
+otf-ucgr-v UniGB-UCS2-V STHeiti-Regular
-otf-utmr-h UniCNS-UCS2-H MSungStd-Light
-otf-utmr-v UniCNS-UCS2-V MSungStd-Light
-otf-utgr-h UniCNS-UCS2-H MHei-Medium
-otf-utgr-v UniCNS-UCS2-V MHei-Medium
+otf-utmr-h UniCNS-UCS2-H MSungStd-Light
+otf-utmr-v UniCNS-UCS2-V MSungStd-Light
+otf-utgr-h UniCNS-UCS2-H MHei-Medium
+otf-utgr-v UniCNS-UCS2-V MHei-Medium
-otf-ckmr-h Identity-H HYSMyeongJoStd-Medium
-otf-ckmr-v Identity-V HYSMyeongJoStd-Medium
-otf-ckgr-h Identity-H HYGoThic-Medium
-otf-ckgr-v Identity-V HYGoThic-Medium
+otf-ckmr-h Identity-H HYSMyeongJoStd-Medium
+otf-ckmr-v Identity-V HYSMyeongJoStd-Medium
+otf-ckgr-h Identity-H HYGoThic-Medium
+otf-ckgr-v Identity-V HYGoThic-Medium
-otf-ccmr-h Identity-H STSongStd-Light
-otf-ccmr-v Identity-V STSongStd-Light
-otf-ccgr-h Identity-H STHeiti-Regular
-otf-ccgr-v Identity-V STHeiti-Regular
+otf-ccmr-h Identity-H STSongStd-Light
+otf-ccmr-v Identity-V STSongStd-Light
+otf-ccgr-h Identity-H STHeiti-Regular
+otf-ccgr-v Identity-V STHeiti-Regular
-otf-ctmr-h Identity-H MSungStd-Light
-otf-ctmr-v Identity-V MSungStd-Light
-otf-ctgr-h Identity-H MHei-Medium
-otf-ctgr-v Identity-V MHei-Medium
+otf-ctmr-h Identity-H MSungStd-Light
+otf-ctmr-v Identity-V MSungStd-Light
+otf-ctgr-h Identity-H MHei-Medium
+otf-ctgr-v Identity-V MHei-Medium
+
+% upTeX
+upstsl-h UniGB-UTF16-H STSong-Light
+upstsl-v UniGB-UTF16-V STSong-Light
+upstht-h UniGB-UTF16-H STHeiti-Regular
+upstht-v UniGB-UTF16-V STHeiti-Regular
+upmsl-h UniCNS-UTF16-H MSung-Light
+upmsl-v UniCNS-UTF16-V MSung-Light
+upmhm-h UniCNS-UTF16-H MHei-Medium
+upmhm-v UniCNS-UTF16-V MHei-Medium
+uphysmjm-h UniKS-UTF16-H HYSMyeongJo-Medium
+uphysmjm-v UniKS-UTF16-V HYSMyeongJo-Medium
+uphygt-h UniKS-UTF16-H HYGoThic-Medium
+uphygt-v UniKS-UTF16-V HYGoThic-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-hiragino.map
index 90199c493b5..da8b6879e9a 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-hiragino.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-hiragino.map
@@ -1,88 +1,110 @@
-otf-ujmr-h UniJIS-UTF16-H HiraMinPro-W3
-otf-ujmr-v UniJIS-UTF16-V HiraMinPro-W3
-otf-cjmr-h Identity-H HiraMinPro-W3
-otf-cjmr-v Identity-V HiraMinPro-W3
-hminr-h H HiraMinPro-W3
-hminr-v V HiraMinPro-W3
-
-otf-ujgr-h UniJIS-UTF16-H HiraKakuPro-W3
-otf-ujgr-v UniJIS-UTF16-V HiraKakuPro-W3
-otf-cjgr-h Identity-H HiraKakuPro-W3
-otf-cjgr-v Identity-V HiraKakuPro-W3
-hgothr-h H HiraKakuPro-W3
-hgothr-v V HiraKakuPro-W3
-
-otf-ujmb-h UniJIS-UTF16-H HiraMinPro-W6
-otf-ujmb-v UniJIS-UTF16-V HiraMinPro-W6
-otf-cjmb-h Identity-H HiraMinPro-W6
-otf-cjmb-v Identity-V HiraMinPro-W6
-hminb-h H HiraMinPro-W6
-hminb-v V HiraMinPro-W6
-
-otf-ujgb-h UniJIS-UTF16-H HiraKakuPro-W6
-otf-ujgb-v UniJIS-UTF16-V HiraKakuPro-W6
-otf-cjgb-h Identity-H HiraKakuPro-W6
-otf-cjgb-v Identity-V HiraKakuPro-W6
-hgothb-h H HiraKakuPro-W6
-hgothb-v V HiraKakuPro-W6
-
-hgotheb-h H HiraKakuStd-W8
-hgotheb-v V HiraKakuStd-W8
-
-otf-ujmgr-h UniJIS-UTF16-H HiraMaruPro-W4
-otf-ujmgr-v UniJIS-UTF16-V HiraMaruPro-W4
-otf-cjmgr-h Identity-H HiraMaruPro-W4
-otf-cjmgr-v Identity-V HiraMaruPro-W4
-hmgothr-h H HiraMaruPro-W4
-hmgothr-v V HiraMaruPro-W4
-
-otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2
-otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2
-otf-cjml-h Identity-H HiraMinPro-W2
-otf-cjml-v Identity-V HiraMinPro-W2
-hminl-h H HiraMinPro-W2
-hminl-v V HiraMinPro-W2
+otf-ujmr-h UniJIS-UTF16-H HiraMinPro-W3
+otf-ujmr-v UniJIS-UTF16-V HiraMinPro-W3
+otf-cjmr-h Identity-H HiraMinPro-W3
+otf-cjmr-v Identity-V HiraMinPro-W3
+hminr-h H HiraMinPro-W3
+hminr-v V HiraMinPro-W3
+
+otf-ujgr-h UniJIS-UTF16-H HiraKakuPro-W3
+otf-ujgr-v UniJIS-UTF16-V HiraKakuPro-W3
+otf-cjgr-h Identity-H HiraKakuPro-W3
+otf-cjgr-v Identity-V HiraKakuPro-W3
+hgothr-h H HiraKakuPro-W3
+hgothr-v V HiraKakuPro-W3
+
+otf-ujmb-h UniJIS-UTF16-H HiraMinPro-W6
+otf-ujmb-v UniJIS-UTF16-V HiraMinPro-W6
+otf-cjmb-h Identity-H HiraMinPro-W6
+otf-cjmb-v Identity-V HiraMinPro-W6
+hminb-h H HiraMinPro-W6
+hminb-v V HiraMinPro-W6
+
+otf-ujgb-h UniJIS-UTF16-H HiraKakuPro-W6
+otf-ujgb-v UniJIS-UTF16-V HiraKakuPro-W6
+otf-cjgb-h Identity-H HiraKakuPro-W6
+otf-cjgb-v Identity-V HiraKakuPro-W6
+hgothb-h H HiraKakuPro-W6
+hgothb-v V HiraKakuPro-W6
+
+hgotheb-h H HiraKakuStd-W8
+hgotheb-v V HiraKakuStd-W8
+
+otf-ujmgr-h UniJIS-UTF16-H HiraMaruPro-W4
+otf-ujmgr-v UniJIS-UTF16-V HiraMaruPro-W4
+otf-cjmgr-h Identity-H HiraMaruPro-W4
+otf-cjmgr-v Identity-V HiraMaruPro-W4
+hmgothr-h H HiraMaruPro-W4
+hmgothr-v V HiraMaruPro-W4
+
+otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2
+otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2
+otf-cjml-h Identity-H HiraMinPro-W2
+otf-cjml-v Identity-V HiraMinPro-W2
+hminl-h H HiraMinPro-W2
+hminl-v V HiraMinPro-W2
% for 1-byte part of Hiragino OpenType fonts
% this part doesn't exist in other otf-*.map
-hiramin-w3-h Identity-H HiraMinPro-W3
-hiramin-w6-h Identity-H HiraMinPro-W6
-hirakaku-w3-h Identity-H HiraKakuPro-W3
-hirakaku-w6-h Identity-H HiraKakuPro-W6
-hiramaru-w4-h Identity-H HiraMaruPro-W4
-hiramin-w3-v Identity-V HiraMinPro-W3
-hiramin-w6-v Identity-V HiraMinPro-W6
-hirakaku-w3-v Identity-V HiraKakuPro-W3
-hirakaku-w6-v Identity-V HiraKakuPro-W6
-hiramaru-w4-v Identity-V HiraMaruPro-W4
+hiramin-w3-h Identity-H HiraMinPro-W3
+hiramin-w6-h Identity-H HiraMinPro-W6
+hirakaku-w3-h Identity-H HiraKakuPro-W3
+hirakaku-w6-h Identity-H HiraKakuPro-W6
+hiramaru-w4-h Identity-H HiraMaruPro-W4
+hiramin-w3-v Identity-V HiraMinPro-W3
+hiramin-w6-v Identity-V HiraMinPro-W6
+hirakaku-w3-v Identity-V HiraKakuPro-W3
+hirakaku-w6-v Identity-V HiraKakuPro-W6
+hiramaru-w4-v Identity-V HiraMaruPro-W4
%for JIS X 0213:2004
-otf-ujmrn-h UniJIS2004-UTF16-H HiraMinProN-W3
-otf-ujmrn-v UniJIS2004-UTF16-V HiraMinProN-W3
-hminrn-h H HiraMinProN-W3
-hminrn-v V HiraMinProN-W3
-
-otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuProN-W3
-otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuProN-W3
-hgothrn-h H HiraKakuProN-W3
-hgothrn-v V HiraKakuProN-W3
-
-otf-ujmbn-h UniJIS2004-UTF16-H HiraMinProN-W6
-otf-ujmbn-v UniJIS2004-UTF16-V HiraMinProN-W6
-hminbn-h H HiraMinProN-W6
-hminbn-v V HiraMinProN-W6
-
-otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuProN-W6
-otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuProN-W6
-hgothbn-h H HiraKakuProN-W6
-hgothbn-v V HiraKakuProN-W6
-
-otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4
-otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4
-hmgothrn-h H HiraMaruProN-W4
-hmgothrn-v V HiraMaruProN-W4
-
-otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2
-otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2
-hminln-h H HiraMinProN-W2
-hminln-v V HiraMinProN-W2
+otf-ujmrn-h UniJIS2004-UTF16-H HiraMinProN-W3
+otf-ujmrn-v UniJIS2004-UTF16-V HiraMinProN-W3
+hminrn-h H HiraMinProN-W3
+hminrn-v V HiraMinProN-W3
+
+otf-ujgrn-h UniJIS2004-UTF16-H HiraKakuProN-W3
+otf-ujgrn-v UniJIS2004-UTF16-V HiraKakuProN-W3
+hgothrn-h H HiraKakuProN-W3
+hgothrn-v V HiraKakuProN-W3
+
+otf-ujmbn-h UniJIS2004-UTF16-H HiraMinProN-W6
+otf-ujmbn-v UniJIS2004-UTF16-V HiraMinProN-W6
+hminbn-h H HiraMinProN-W6
+hminbn-v V HiraMinProN-W6
+
+otf-ujgbn-h UniJIS2004-UTF16-H HiraKakuProN-W6
+otf-ujgbn-v UniJIS2004-UTF16-V HiraKakuProN-W6
+hgothbn-h H HiraKakuProN-W6
+hgothbn-v V HiraKakuProN-W6
+
+otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4
+otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4
+hmgothrn-h H HiraMaruProN-W4
+hmgothrn-v V HiraMaruProN-W4
+
+otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2
+otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2
+hminln-h H HiraMinProN-W2
+hminln-v V HiraMinProN-W2
+
+% otf on upTeX
+uphminr-h UniJIS-UTF16-H HiraMinPro-W3
+uphminr-v UniJIS-UTF16-V HiraMinPro-W3
+
+uphgothr-h UniJIS-UTF16-H HiraKakuPro-W3
+uphgothr-v UniJIS-UTF16-V HiraKakuPro-W3
+
+uphminb-h UniJIS-UTF16-H HiraMinPro-W6
+uphminb-v UniJIS-UTF16-V HiraMinPro-W6
+
+uphgothb-h UniJIS-UTF16-H HiraKakuPro-W6
+uphgothb-v UniJIS-UTF16-V HiraKakuPro-W6
+
+uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8
+uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8
+
+uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4
+uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4
+
+uphminl-h UniJIS-UTF16-H HiraMinPro-W2
+uphminl-v UniJIS-UTF16-V HiraMinPro-W2
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-kozuka.map
index 4bc5e699f3d..84c54a9cd8c 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-kozuka.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-kozuka.map
@@ -1,75 +1,97 @@
-otf-ujmr-h UniJIS-UTF16-H KozMinPro-Regular.otf
-otf-ujmr-v UniJIS-UTF16-V KozMinPro-Regular.otf
-otf-cjmr-h Identity-H KozMinPro-Regular.otf
-otf-cjmr-v Identity-V KozMinPro-Regular.otf
-hminr-h H KozMinPro-Regular.otf
-hminr-v V KozMinPro-Regular.otf
-
-otf-ujgr-h UniJIS-UTF16-H KozGoPro-Regular.otf
-otf-ujgr-v UniJIS-UTF16-V KozGoPro-Regular.otf
-otf-cjgr-h Identity-H KozGoPro-Regular.otf
-otf-cjgr-v Identity-V KozGoPro-Regular.otf
-hgothr-h H KozGoPro-Regular.otf
-hgothr-v V KozGoPro-Regular.otf
-
-otf-ujmb-h UniJIS-UTF16-H KozMinPro-Bold.otf
-otf-ujmb-v UniJIS-UTF16-V KozMinPro-Bold.otf
-otf-cjmb-h Identity-H KozMinPro-Bold.otf
-otf-cjmb-v Identity-V KozMinPro-Bold.otf
-hminb-h H KozMinPro-Bold.otf
-hminb-v V KozMinPro-Bold.otf
-
-otf-ujgb-h UniJIS-UTF16-H KozGoPro-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V KozGoPro-Bold.otf
-otf-cjgb-h Identity-H KozGoPro-Bold.otf
-otf-cjgb-v Identity-V KozGoPro-Bold.otf
-hgothb-h H KozGoPro-Bold.otf
-hgothb-v V KozGoPro-Bold.otf
-
-hgotheb-h H KozGoPro-Heavy.otf
-hgotheb-v V KozGoPro-Heavy.otf
-
-otf-ujmgr-h UniJIS-UTF16-H KozGoPro-Heavy.otf
-otf-ujmgr-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-otf-cjmgr-h Identity-H KozGoPro-Heavy.otf
-otf-cjmgr-v Identity-V KozGoPro-Heavy.otf
-hmgothr-h H KozGoPro-Heavy.otf
-hmgothr-v V KozGoPro-Heavy.otf
-
-otf-ujml-h UniJIS-UTF16-H KozGoPro-Light.otf
-otf-ujml-v UniJIS-UTF16-V KozGoPro-Light.otf
-otf-cjml-h Identity-H KozGoPro-Light.otf
-otf-cjml-v Identity-V KozGoPro-Light.otf
-hminl-h H KozGoPro-Light.otf
-hminl-v V KozGoPro-Light.otf
+otf-ujmr-h UniJIS-UTF16-H KozMinPro-Regular.otf
+otf-ujmr-v UniJIS-UTF16-V KozMinPro-Regular.otf
+otf-cjmr-h Identity-H KozMinPro-Regular.otf
+otf-cjmr-v Identity-V KozMinPro-Regular.otf
+hminr-h H KozMinPro-Regular.otf
+hminr-v V KozMinPro-Regular.otf
+
+otf-ujgr-h UniJIS-UTF16-H KozGoPro-Regular.otf
+otf-ujgr-v UniJIS-UTF16-V KozGoPro-Regular.otf
+otf-cjgr-h Identity-H KozGoPro-Regular.otf
+otf-cjgr-v Identity-V KozGoPro-Regular.otf
+hgothr-h H KozGoPro-Regular.otf
+hgothr-v V KozGoPro-Regular.otf
+
+otf-ujmb-h UniJIS-UTF16-H KozMinPro-Bold.otf
+otf-ujmb-v UniJIS-UTF16-V KozMinPro-Bold.otf
+otf-cjmb-h Identity-H KozMinPro-Bold.otf
+otf-cjmb-v Identity-V KozMinPro-Bold.otf
+hminb-h H KozMinPro-Bold.otf
+hminb-v V KozMinPro-Bold.otf
+
+otf-ujgb-h UniJIS-UTF16-H KozGoPro-Bold.otf
+otf-ujgb-v UniJIS-UTF16-V KozGoPro-Bold.otf
+otf-cjgb-h Identity-H KozGoPro-Bold.otf
+otf-cjgb-v Identity-V KozGoPro-Bold.otf
+hgothb-h H KozGoPro-Bold.otf
+hgothb-v V KozGoPro-Bold.otf
+
+hgotheb-h H KozGoPro-Heavy.otf
+hgotheb-v V KozGoPro-Heavy.otf
+
+otf-ujmgr-h UniJIS-UTF16-H KozGoPro-Medium.otf
+otf-ujmgr-v UniJIS-UTF16-V KozGoPro-Medium.otf
+otf-cjmgr-h Identity-H KozGoPro-Medium.otf
+otf-cjmgr-v Identity-V KozGoPro-Medium.otf
+hmgothr-h H KozGoPro-Medium.otf
+hmgothr-v V KozGoPro-Medium.otf
+
+otf-ujml-h UniJIS-UTF16-H KozMinPro-Light.otf
+otf-ujml-v UniJIS-UTF16-V KozMinPro-Light.otf
+otf-cjml-h Identity-H KozMinPro-Light.otf
+otf-cjml-v Identity-V KozMinPro-Light.otf
+hminl-h H KozMinPro-Light.otf
+hminl-v V KozMinPro-Light.otf
%for JIS X 0213:2004
-otf-ujmrn-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-otf-ujmrn-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-hminrn-h H KozMinPr6N-Regular.otf
-hminrn-v V KozMinPr6N-Regular.otf
-
-otf-ujgrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
-otf-ujgrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
-hgothrn-h H KozGoPr6N-Regular.otf
-hgothrn-v V KozGoPr6N-Regular.otf
-
-otf-ujmbn-h UniJIS2004-UTF16-H KozMinPr6N-Bold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V KozMinPr6N-Bold.otf
-hminbn-h H KozMinPr6N-Bold.otf
-hminbn-v V KozMinPr6N-Bold.otf
-
-otf-ujgbn-h UniJIS2004-UTF16-H KozGoPr6N-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V KozGoPr6N-Bold.otf
-hgothbn-h H KozGoPr6N-Bold.otf
-hgothbn-v V KozGoPr6N-Bold.otf
-
-otf-ujmgrn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
-hmgothrn-h H KozGoPr6N-Heavy.otf
-hmgothrn-v V KozGoPr6N-Heavy.otf
-
-otf-ujmln-h UniJIS2004-UTF16-H KozGoPro-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V KozGoPro-Light.otf
-hminln-h H KozGoPro-Light.otf
-hminln-v V KozGoPro-Light.otf
+otf-ujmrn-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
+otf-ujmrn-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
+hminrn-h H KozMinPr6N-Regular.otf
+hminrn-v V KozMinPr6N-Regular.otf
+
+otf-ujgrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
+otf-ujgrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
+hgothrn-h H KozGoPr6N-Regular.otf
+hgothrn-v V KozGoPr6N-Regular.otf
+
+otf-ujmbn-h UniJIS2004-UTF16-H KozMinPr6N-Bold.otf
+otf-ujmbn-v UniJIS2004-UTF16-V KozMinPr6N-Bold.otf
+hminbn-h H KozMinPr6N-Bold.otf
+hminbn-v V KozMinPr6N-Bold.otf
+
+otf-ujgbn-h UniJIS2004-UTF16-H KozGoPr6N-Bold.otf
+otf-ujgbn-v UniJIS2004-UTF16-V KozGoPr6N-Bold.otf
+hgothbn-h H KozGoPr6N-Bold.otf
+hgothbn-v V KozGoPr6N-Bold.otf
+
+otf-ujmgrn-h UniJIS2004-UTF16-H KozGoPr6N-Medium.otf
+otf-ujmgrn-v UniJIS2004-UTF16-V KozGoPr6N-Medium.otf
+hmgothrn-h H KozGoPr6N-Medium.otf
+hmgothrn-v V KozGoPr6N-Medium.otf
+
+otf-ujmln-h UniJIS2004-UTF16-H KozMinPr6N-Light.otf
+otf-ujmln-v UniJIS2004-UTF16-V KozMinPr6N-Light.otf
+hminln-h H KozMinPr6N-Light.otf
+hminln-v V KozMinPr6N-Light.otf
+
+% otf on upTeX
+uphminr-h UniJIS-UTF16-H KozMinPro-Regular.otf
+uphminr-v UniJIS-UTF16-V KozMinPro-Regular.otf
+
+uphgothr-h UniJIS-UTF16-H KozGoPro-Regular.otf
+uphgothr-v UniJIS-UTF16-V KozGoPro-Regular.otf
+
+uphminb-h UniJIS-UTF16-H KozMinPro-Bold.otf
+uphminb-v UniJIS-UTF16-V KozMinPro-Bold.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-Medium.otf
+uphmgothr-v UniJIS-UTF16-V KozGoPro-Medium.otf
+
+uphminl-h UniJIS-UTF16-H KozMinPro-Light.otf
+uphminl-v UniJIS-UTF16-V KozMinPro-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-morisawa.map
index 862cccbf276..e57e1ce13db 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-morisawa.map
@@ -1,75 +1,97 @@
-otf-ujmr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
-otf-ujmr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
-otf-cjmr-h Identity-H A-OTF-RyuminPro-Light.otf
-otf-cjmr-v Identity-V A-OTF-RyuminPro-Light.otf
-hminr-h H A-OTF-RyuminPro-Light.otf
-hminr-v V A-OTF-RyuminPro-Light.otf
-
-otf-ujgr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf
-otf-ujgr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf
-otf-cjgr-h Identity-H A-OTF-GothicBBBPro-Medium.otf
-otf-cjgr-v Identity-V A-OTF-GothicBBBPro-Medium.otf
-hgothr-h H A-OTF-GothicBBBPro-Medium.otf
-hgothr-v V A-OTF-GothicBBBPro-Medium.otf
-
-otf-ujmb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf
-otf-ujmb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf
-otf-cjmb-h Identity-H A-OTF-FutoMinA101Pro-Bold.otf
-otf-cjmb-v Identity-V A-OTF-FutoMinA101Pro-Bold.otf
-hminb-h H A-OTF-FutoMinA101Pro-Bold.otf
-hminb-v V A-OTF-FutoMinA101Pro-Bold.otf
-
-otf-ujgb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf
-otf-ujgb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf
-otf-cjgb-h Identity-H A-OTF-FutoGoB101Pro-Bold.otf
-otf-cjgb-v Identity-V A-OTF-FutoGoB101Pro-Bold.otf
-hgothb-h H A-OTF-FutoGoB101Pro-Bold.otf
-hgothb-v V A-OTF-FutoGoB101Pro-Bold.otf
-
-hgotheb-h H A-OTF-MidashiGoPro-MB31.otf
-hgotheb-v V A-OTF-MidashiGoPro-MB31.otf
-
-otf-ujmgr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf
-otf-ujmgr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf
-otf-cjmgr-h Identity-H A-OTF-Jun101Pro-Light.otf
-otf-cjmgr-v Identity-V A-OTF-Jun101Pro-Light.otf
-hmgothr-h H A-OTF-Jun101Pro-Light.otf
-hmgothr-v V A-OTF-Jun101Pro-Light.otf
-
-otf-ujml-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
-otf-ujml-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
-otf-cjml-h Identity-H A-OTF-RyuminPro-Light.otf
-otf-cjml-v Identity-V A-OTF-RyuminPro-Light.otf
-hminl-h H A-OTF-RyuminPro-Light.otf
-hminl-v V A-OTF-RyuminPro-Light.otf
+otf-ujmr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
+otf-ujmr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
+otf-cjmr-h Identity-H A-OTF-RyuminPro-Light.otf
+otf-cjmr-v Identity-V A-OTF-RyuminPro-Light.otf
+hminr-h H A-OTF-RyuminPro-Light.otf
+hminr-v V A-OTF-RyuminPro-Light.otf
+
+otf-ujgr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf
+otf-ujgr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf
+otf-cjgr-h Identity-H A-OTF-GothicBBBPro-Medium.otf
+otf-cjgr-v Identity-V A-OTF-GothicBBBPro-Medium.otf
+hgothr-h H A-OTF-GothicBBBPro-Medium.otf
+hgothr-v V A-OTF-GothicBBBPro-Medium.otf
+
+otf-ujmb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf
+otf-ujmb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf
+otf-cjmb-h Identity-H A-OTF-FutoMinA101Pro-Bold.otf
+otf-cjmb-v Identity-V A-OTF-FutoMinA101Pro-Bold.otf
+hminb-h H A-OTF-FutoMinA101Pro-Bold.otf
+hminb-v V A-OTF-FutoMinA101Pro-Bold.otf
+
+otf-ujgb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf
+otf-ujgb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf
+otf-cjgb-h Identity-H A-OTF-FutoGoB101Pro-Bold.otf
+otf-cjgb-v Identity-V A-OTF-FutoGoB101Pro-Bold.otf
+hgothb-h H A-OTF-FutoGoB101Pro-Bold.otf
+hgothb-v V A-OTF-FutoGoB101Pro-Bold.otf
+
+hgotheb-h H A-OTF-MidashiGoPro-MB31.otf
+hgotheb-v V A-OTF-MidashiGoPro-MB31.otf
+
+otf-ujmgr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf
+otf-ujmgr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf
+otf-cjmgr-h Identity-H A-OTF-Jun101Pro-Light.otf
+otf-cjmgr-v Identity-V A-OTF-Jun101Pro-Light.otf
+hmgothr-h H A-OTF-Jun101Pro-Light.otf
+hmgothr-v V A-OTF-Jun101Pro-Light.otf
+
+otf-ujml-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
+otf-ujml-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
+otf-cjml-h Identity-H A-OTF-RyuminPro-Light.otf
+otf-cjml-v Identity-V A-OTF-RyuminPro-Light.otf
+hminl-h H A-OTF-RyuminPro-Light.otf
+hminl-v V A-OTF-RyuminPro-Light.otf
%for JIS X 0213:2004
-otf-ujmrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
-otf-ujmrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
-hminrn-h H A-OTF-RyuminPr6N-Light.otf
-hminrn-v V A-OTF-RyuminPr6N-Light.otf
-
-otf-ujgrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
-otf-ujgrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
-hgothrn-h H A-OTF-GothicBBBPr6N-Medium.otf
-hgothrn-v V A-OTF-GothicBBBPr6N-Medium.otf
-
-otf-ujmbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf
-otf-ujmbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf
-hminbn-h H A-OTF-FutoMinA101Pr6N-Bold.otf
-hminbn-v V A-OTF-FutoMinA101Pr6N-Bold.otf
-
-otf-ujgbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf
-otf-ujgbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf
-hgothbn-h H A-OTF-FutoGoB101Pr6N-Bold.otf
-hgothbn-v V A-OTF-FutoGoB101Pr6N-Bold.otf
-
-otf-ujmgrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pr6N-Light.otf
-otf-ujmgrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pr6N-Light.otf
-hmgothrn-h H A-OTF-Jun101Pr6N-Light.otf
-hmgothrn-v V A-OTF-Jun101Pr6N-Light.otf
-
-otf-ujmln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
-otf-ujmln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
-hminln-h H A-OTF-RyuminPr6N-Light.otf
-hminln-v V A-OTF-RyuminPr6N-Light.otf
+otf-ujmrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
+otf-ujmrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
+hminrn-h H A-OTF-RyuminPr6N-Light.otf
+hminrn-v V A-OTF-RyuminPr6N-Light.otf
+
+otf-ujgrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
+otf-ujgrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
+hgothrn-h H A-OTF-GothicBBBPr6N-Medium.otf
+hgothrn-v V A-OTF-GothicBBBPr6N-Medium.otf
+
+otf-ujmbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf
+otf-ujmbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf
+hminbn-h H A-OTF-FutoMinA101Pr6N-Bold.otf
+hminbn-v V A-OTF-FutoMinA101Pr6N-Bold.otf
+
+otf-ujgbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf
+otf-ujgbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf
+hgothbn-h H A-OTF-FutoGoB101Pr6N-Bold.otf
+hgothbn-v V A-OTF-FutoGoB101Pr6N-Bold.otf
+
+otf-ujmgrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pr6N-Light.otf
+otf-ujmgrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pr6N-Light.otf
+hmgothrn-h H A-OTF-Jun101Pr6N-Light.otf
+hmgothrn-v V A-OTF-Jun101Pr6N-Light.otf
+
+otf-ujmln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
+otf-ujmln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
+hminln-h H A-OTF-RyuminPr6N-Light.otf
+hminln-v V A-OTF-RyuminPr6N-Light.otf
+
+% otf on upTeX
+uphminr-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
+uphminr-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
+
+uphgothr-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf
+uphgothr-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf
+
+uphminb-h UniJIS-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf
+uphminb-v UniJIS-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf
+
+uphgothb-h UniJIS-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf
+uphgothb-v UniJIS-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf
+
+uphgotheb-h UniJIS-UTF16-H A-OTF-MidashiGoPro-MB31.otf
+uphgotheb-v UniJIS-UTF16-V A-OTF-MidashiGoPro-MB31.otf
+
+uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf
+uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf
+
+uphminl-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
+uphminl-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-noEmbed.map
index e7fd1dbeba4..c97f8466d09 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-noEmbed.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-noEmbed.map
@@ -1,75 +1,97 @@
-otf-ujmr-h UniJIS-UTF16-H !Ryumin-Light
-otf-ujmr-v UniJIS-UTF16-V !Ryumin-Light
-otf-cjmr-h Identity-H !Ryumin-Light
-otf-cjmr-v Identity-V !Ryumin-Light
-hminr-h H !Ryumin-Light
-hminr-v V !Ryumin-Light
-
-otf-ujgr-h UniJIS-UTF16-H !GothicBBB-Medium
-otf-ujgr-v UniJIS-UTF16-V !GothicBBB-Medium
-otf-cjgr-h Identity-H !GothicBBB-Medium
-otf-cjgr-v Identity-V !GothicBBB-Medium
-hgothr-h H !GothicBBB-Medium
-hgothr-v V !GothicBBB-Medium
-
-otf-ujmb-h UniJIS-UTF16-H !Ryumin-Light,Bold
-otf-ujmb-v UniJIS-UTF16-V !Ryumin-Light,Bold
-otf-cjmb-h Identity-H !Ryumin-Light,Bold
-otf-cjmb-v Identity-V !Ryumin-Light,Bold
-hminb-h H !Ryumin-Light,Bold
-hminb-v V !Ryumin-Light,Bold
-
-otf-ujgb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
-otf-ujgb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
-otf-cjgb-h Identity-H !GothicBBB-Medium,Bold
-otf-cjgb-v Identity-V !GothicBBB-Medium,Bold
-hgothb-h H !GothicBBB-Medium,Bold
-hgothb-v V !GothicBBB-Medium,Bold
-
-hgotheb-h H !GothicBBB-Medium,Bold
-hgotheb-v V !GothicBBB-Medium,Bold
-
-otf-ujmgr-h UniJIS-UTF16-H !GothicBBB-Medium
-otf-ujmgr-v UniJIS-UTF16-V !GothicBBB-Medium
-otf-cjmgr-h Identity-H !GothicBBB-Medium
-otf-cjmgr-v Identity-V !GothicBBB-Medium
-hmgothr-h H !GothicBBB-Medium
-hmgothr-v V !GothicBBB-Medium
-
-otf-ujml-h UniJIS-UTF16-H !Ryumin-Light
-otf-ujml-v UniJIS-UTF16-V !Ryumin-Light
-otf-cjml-h Identity-H !Ryumin-Light
-otf-cjml-v Identity-V !Ryumin-Light
-hminl-h H !Ryumin-Light
-hminl-v V !Ryumin-Light
+otf-ujmr-h UniJIS-UTF16-H !Ryumin-Light
+otf-ujmr-v UniJIS-UTF16-V !Ryumin-Light
+otf-cjmr-h Identity-H !Ryumin-Light
+otf-cjmr-v Identity-V !Ryumin-Light
+hminr-h H !Ryumin-Light
+hminr-v V !Ryumin-Light
+
+otf-ujgr-h UniJIS-UTF16-H !GothicBBB-Medium
+otf-ujgr-v UniJIS-UTF16-V !GothicBBB-Medium
+otf-cjgr-h Identity-H !GothicBBB-Medium
+otf-cjgr-v Identity-V !GothicBBB-Medium
+hgothr-h H !GothicBBB-Medium
+hgothr-v V !GothicBBB-Medium
+
+otf-ujmb-h UniJIS-UTF16-H !Ryumin-Light,Bold
+otf-ujmb-v UniJIS-UTF16-V !Ryumin-Light,Bold
+otf-cjmb-h Identity-H !Ryumin-Light,Bold
+otf-cjmb-v Identity-V !Ryumin-Light,Bold
+hminb-h H !Ryumin-Light,Bold
+hminb-v V !Ryumin-Light,Bold
+
+otf-ujgb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
+otf-ujgb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
+otf-cjgb-h Identity-H !GothicBBB-Medium,Bold
+otf-cjgb-v Identity-V !GothicBBB-Medium,Bold
+hgothb-h H !GothicBBB-Medium,Bold
+hgothb-v V !GothicBBB-Medium,Bold
+
+hgotheb-h H !GothicBBB-Medium,Bold
+hgotheb-v V !GothicBBB-Medium,Bold
+
+otf-ujmgr-h UniJIS-UTF16-H !GothicBBB-Medium
+otf-ujmgr-v UniJIS-UTF16-V !GothicBBB-Medium
+otf-cjmgr-h Identity-H !GothicBBB-Medium
+otf-cjmgr-v Identity-V !GothicBBB-Medium
+hmgothr-h H !GothicBBB-Medium
+hmgothr-v V !GothicBBB-Medium
+
+otf-ujml-h UniJIS-UTF16-H !Ryumin-Light
+otf-ujml-v UniJIS-UTF16-V !Ryumin-Light
+otf-cjml-h Identity-H !Ryumin-Light
+otf-cjml-v Identity-V !Ryumin-Light
+hminl-h H !Ryumin-Light
+hminl-v V !Ryumin-Light
%for JIS X 0213:2004
-otf-ujmrn-h UniJIS2004-UTF16-H !Ryumin-Light
-otf-ujmrn-v UniJIS2004-UTF16-V !Ryumin-Light
-hminrn-h H !Ryumin-Light
-hminrn-v V !Ryumin-Light
-
-otf-ujgrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-otf-ujgrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-hgothrn-h H !GothicBBB-Medium
-hgothrn-v V !GothicBBB-Medium
-
-otf-ujmbn-h UniJIS2004-UTF16-H !Ryumin-Light,Bold
-otf-ujmbn-v UniJIS2004-UTF16-V !Ryumin-Light,Bold
-hminbn-h H !Ryumin-Light,Bold
-hminbn-v V !Ryumin-Light,Bold
-
-otf-ujgbn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
-otf-ujgbn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
-hgothbn-h H !GothicBBB-Medium,Bold
-hgothbn-v V !GothicBBB-Medium,Bold
-
-otf-ujmgrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-otf-ujmgrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-hmgothrn-h H !GothicBBB-Medium
-hmgothrn-v V !GothicBBB-Medium
-
-otf-ujmln-h UniJIS2004-UTF16-H !Ryumin-Light
-otf-ujmln-v UniJIS2004-UTF16-V !Ryumin-Light
-hminln-h H !Ryumin-Light
-hminln-v V !Ryumin-Light
+otf-ujmrn-h UniJIS2004-UTF16-H !Ryumin-Light
+otf-ujmrn-v UniJIS2004-UTF16-V !Ryumin-Light
+hminrn-h H !Ryumin-Light
+hminrn-v V !Ryumin-Light
+
+otf-ujgrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
+otf-ujgrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
+hgothrn-h H !GothicBBB-Medium
+hgothrn-v V !GothicBBB-Medium
+
+otf-ujmbn-h UniJIS2004-UTF16-H !Ryumin-Light,Bold
+otf-ujmbn-v UniJIS2004-UTF16-V !Ryumin-Light,Bold
+hminbn-h H !Ryumin-Light,Bold
+hminbn-v V !Ryumin-Light,Bold
+
+otf-ujgbn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
+otf-ujgbn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
+hgothbn-h H !GothicBBB-Medium,Bold
+hgothbn-v V !GothicBBB-Medium,Bold
+
+otf-ujmgrn-h UniJIS2004-UTF16-H GothicBBB-Medium
+otf-ujmgrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
+hmgothrn-h H !GothicBBB-Medium
+hmgothrn-v V !GothicBBB-Medium
+
+otf-ujmln-h UniJIS2004-UTF16-H !Ryumin-Light
+otf-ujmln-v UniJIS2004-UTF16-V !Ryumin-Light
+hminln-h H !Ryumin-Light
+hminln-v V !Ryumin-Light
+
+% otf on upTeX
+uphminr-h UniJIS-UTF16-H !Ryumin-Light
+uphminr-v UniJIS-UTF16-V !Ryumin-Light
+
+uphgothr-h UniJIS-UTF16-H !GothicBBB-Medium
+uphgothr-v UniJIS-UTF16-V !GothicBBB-Medium
+
+uphminb-h UniJIS-UTF16-H !Ryumin-Light,Bold
+uphminb-v UniJIS-UTF16-V !Ryumin-Light,Bold
+
+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
+
+uphminl-h UniJIS-UTF16-H !Ryumin-Light
+uphminl-v UniJIS-UTF16-V !Ryumin-Light
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino-04.map
index a6bcb719e86..c38cc390af2 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino-04.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H HiraMinProN-W3.otf
-rmlv V HiraMinProN-W3.otf
-gbm H HiraKakuProN-W3.otf
-gbmv V HiraKakuProN-W3.otf
+rml H HiraMinProN-W3.otf
+rmlv V HiraMinProN-W3.otf
+gbm H HiraKakuProN-W3.otf
+gbmv V HiraKakuProN-W3.otf
%%
%% upTeX
%%
-urml UniJIS-UTF16-H HiraMinProN-W3.otf
-urmlv UniJIS-UTF16-V HiraMinProN-W3.otf
-ugbm UniJIS-UTF16-H HiraKakuProN-W3.otf
-ugbmv UniJIS-UTF16-V HiraKakuProN-W3.otf
-
-uprml-h UniJIS-UTF16-H HiraMinProN-W3.otf
-uprml-v UniJIS-UTF16-V HiraMinProN-W3.otf
-upgbm-h UniJIS-UTF16-H HiraKakuProN-W3.otf
-upgbm-v UniJIS-UTF16-V HiraKakuProN-W3.otf
-uprml-hq UniJIS-UCS2-H HiraMinProN-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuProN-W3.otf
+urml UniJIS-UTF16-H HiraMinProN-W3.otf
+urmlv UniJIS-UTF16-V HiraMinProN-W3.otf
+ugbm UniJIS-UTF16-H HiraKakuProN-W3.otf
+ugbmv UniJIS-UTF16-V HiraKakuProN-W3.otf
+uprml-h UniJIS-UTF16-H HiraMinProN-W3.otf
+uprml-v UniJIS-UTF16-V HiraMinProN-W3.otf
+upgbm-h UniJIS-UTF16-H HiraKakuProN-W3.otf
+upgbm-v UniJIS-UTF16-V HiraKakuProN-W3.otf
+uprml-hq UniJIS-UCS2-H HiraMinProN-W3.otf
+upgbm-hq UniJIS-UCS2-H HiraKakuProN-W3.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino.map
index f00b089a50d..0894e64f8e2 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-hiragino.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H HiraMinPro-W3.otf
-rmlv V HiraMinPro-W3.otf
-gbm H HiraKakuPro-W3.otf
-gbmv V HiraKakuPro-W3.otf
+rml H HiraMinPro-W3.otf
+rmlv V HiraMinPro-W3.otf
+gbm H HiraKakuPro-W3.otf
+gbmv V HiraKakuPro-W3.otf
%%
%% upTeX
%%
-urml UniJIS-UTF16-H HiraMinPro-W3.otf
-urmlv UniJIS-UTF16-V HiraMinPro-W3.otf
-ugbm UniJIS-UTF16-H HiraKakuPro-W3.otf
-ugbmv UniJIS-UTF16-V HiraKakuPro-W3.otf
-
-uprml-h UniJIS-UTF16-H HiraMinPro-W3.otf
-uprml-v UniJIS-UTF16-V HiraMinPro-W3.otf
-upgbm-h UniJIS-UTF16-H HiraKakuPro-W3.otf
-upgbm-v UniJIS-UTF16-V HiraKakuPro-W3.otf
-uprml-hq UniJIS-UCS2-H HiraMinPro-W3.otf
-upgbm-hq UniJIS-UCS2-H HiraKakuPro-W3.otf
+urml UniJIS-UTF16-H HiraMinPro-W3.otf
+urmlv UniJIS-UTF16-V HiraMinPro-W3.otf
+ugbm UniJIS-UTF16-H HiraKakuPro-W3.otf
+ugbmv UniJIS-UTF16-V HiraKakuPro-W3.otf
+uprml-h UniJIS-UTF16-H HiraMinPro-W3.otf
+uprml-v UniJIS-UTF16-V HiraMinPro-W3.otf
+upgbm-h UniJIS-UTF16-H HiraKakuPro-W3.otf
+upgbm-v UniJIS-UTF16-V HiraKakuPro-W3.otf
+uprml-hq UniJIS-UCS2-H HiraMinPro-W3.otf
+upgbm-hq UniJIS-UCS2-H HiraKakuPro-W3.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka-04.map
index 091caee4272..7db310b792c 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka-04.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H KozMinPr6N-Regular.otf
-rmlv V KozMinPr6N-Regular.otf
-gbm H KozGoPr6N-Regular.otf
-gbmv V KozGoPr6N-Regular.otf
+rml H KozMinPr6N-Regular.otf
+rmlv V KozMinPr6N-Regular.otf
+gbm H KozGoPr6N-Regular.otf
+gbmv V KozGoPr6N-Regular.otf
%%
%% upTeX
%%
-urml UniJIS-UTF16-H KozMinPr6N-Regular.otf
-urmlv UniJIS-UTF16-V KozMinPr6N-Regular.otf
-ugbm UniJIS-UTF16-H KozGoPr6N-Regular.otf
-ugbmv UniJIS-UTF16-V KozGoPr6N-Regular.otf
-
-uprml-h UniJIS-UTF16-H KozMinPr6N-Regular.otf
-uprml-v UniJIS-UTF16-V KozMinPr6N-Regular.otf
-upgbm-h UniJIS-UTF16-H KozGoPr6N-Regular.otf
-upgbm-v UniJIS-UTF16-V KozGoPr6N-Regular.otf
-uprml-hq UniJIS-UCS2-H KozMinPr6N-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPr6N-Regular.otf
+urml UniJIS-UTF16-H KozMinPr6N-Regular.otf
+urmlv UniJIS-UTF16-V KozMinPr6N-Regular.otf
+ugbm UniJIS-UTF16-H KozGoPr6N-Regular.otf
+ugbmv UniJIS-UTF16-V KozGoPr6N-Regular.otf
+uprml-h UniJIS-UTF16-H KozMinPr6N-Regular.otf
+uprml-v UniJIS-UTF16-V KozMinPr6N-Regular.otf
+upgbm-h UniJIS-UTF16-H KozGoPr6N-Regular.otf
+upgbm-v UniJIS-UTF16-V KozGoPr6N-Regular.otf
+uprml-hq UniJIS-UCS2-H KozMinPr6N-Regular.otf
+upgbm-hq UniJIS-UCS2-H KozGoPr6N-Regular.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka.map
index 83f2f854749..d72e5b94599 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-kozuka.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H KozMinPro-Regular.otf
-rmlv V KozMinPro-Regular.otf
-gbm H KozGoPro-Regular.otf
-gbmv V KozGoPro-Regular.otf
+rml H KozMinPro-Regular.otf
+rmlv V KozMinPro-Regular.otf
+gbm H KozGoPro-Regular.otf
+gbmv V KozGoPro-Regular.otf
%%
%% upTeX
%%
-urml UniJIS-UTF16-H KozMinPro-Regular.otf
-urmlv UniJIS-UTF16-V KozMinPro-Regular.otf
-ugbm UniJIS-UTF16-H KozGoPro-Regular.otf
-ugbmv UniJIS-UTF16-V KozGoPro-Regular.otf
-
-uprml-h UniJIS-UTF16-H KozMinPro-Regular.otf
-uprml-v UniJIS-UTF16-V KozMinPro-Regular.otf
-upgbm-h UniJIS-UTF16-H KozGoPro-Regular.otf
-upgbm-v UniJIS-UTF16-V KozGoPro-Regular.otf
-uprml-hq UniJIS-UCS2-H KozMinPro-Regular.otf
-upgbm-hq UniJIS-UCS2-H KozGoPro-Regular.otf
+urml UniJIS-UTF16-H KozMinPro-Regular.otf
+urmlv UniJIS-UTF16-V KozMinPro-Regular.otf
+ugbm UniJIS-UTF16-H KozGoPro-Regular.otf
+ugbmv UniJIS-UTF16-V KozGoPro-Regular.otf
+uprml-h UniJIS-UTF16-H KozMinPro-Regular.otf
+uprml-v UniJIS-UTF16-V KozMinPro-Regular.otf
+upgbm-h UniJIS-UTF16-H KozGoPro-Regular.otf
+upgbm-v UniJIS-UTF16-V KozGoPro-Regular.otf
+uprml-hq UniJIS-UCS2-H KozMinPro-Regular.otf
+upgbm-hq UniJIS-UCS2-H KozGoPro-Regular.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa-04.map
index 9a7f5a48c56..2d312fbc025 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa-04.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H A-OTF-RyuminPr6N-Light.otf
-rmlv V A-OTF-RyuminPr6N-Light.otf
-gbm H A-OTF-GothicBBBPr6N-Medium.otf
-gbmv V A-OTF-GothicBBBPr6N-Medium.otf
+rml H A-OTF-RyuminPr6N-Light.otf
+rmlv V A-OTF-RyuminPr6N-Light.otf
+gbm H A-OTF-GothicBBBPr6N-Medium.otf
+gbmv V A-OTF-GothicBBBPr6N-Medium.otf
%%
%% upTeX
%%
-urml UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf
-urmlv UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf
-ugbm UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
-ugbmv UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
-
-uprml-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf
-uprml-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf
-upgbm-h UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
-upgbm-v UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
-uprml-hq UniJIS-UCS2-H A-OTF-RyuminPr6N-Light.otf
-upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPr6N-Medium.otf
+urml UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf
+urmlv UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf
+ugbm UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
+ugbmv UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
+uprml-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf
+uprml-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf
+upgbm-h UniJIS-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
+upgbm-v UniJIS-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
+uprml-hq UniJIS-UCS2-H A-OTF-RyuminPr6N-Light.otf
+upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPr6N-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa.map
index d10ae50e7bb..d11e20d4d0e 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-morisawa.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H A-OTF-RyuminPro-Light.otf
-rmlv V A-OTF-RyuminPro-Light.otf
-gbm H A-OTF-GothicBBBPro-Medium.otf
-gbmv V A-OTF-GothicBBBPro-Medium.otf
+rml H A-OTF-RyuminPro-Light.otf
+rmlv V A-OTF-RyuminPro-Light.otf
+gbm H A-OTF-GothicBBBPro-Medium.otf
+gbmv V A-OTF-GothicBBBPro-Medium.otf
%%
%% upTeX
%%
-urml UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
-urmlv UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
-ugbm UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf
-ugbmv UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf
-
-uprml-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
-uprml-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
-upgbm-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf
-upgbm-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf
-uprml-hq UniJIS-UCS2-H A-OTF-RyuminPro-Light.otf
-upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPro-Medium.otf
+urml UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
+urmlv UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
+ugbm UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf
+ugbmv UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf
+uprml-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
+uprml-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
+upgbm-h UniJIS-UTF16-H A-OTF-GothicBBBPro-Medium.otf
+upgbm-v UniJIS-UTF16-V A-OTF-GothicBBBPro-Medium.otf
+uprml-hq UniJIS-UCS2-H A-OTF-RyuminPro-Light.otf
+upgbm-hq UniJIS-UCS2-H A-OTF-GothicBBBPro-Medium.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map
index c39a91bc574..e406834fbf3 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map
@@ -2,24 +2,23 @@
%% ASCII pTeX
%%
-rml H !Ryumin-Light
-rmlv V !Ryumin-Light
-gbm H !GothicBBB-Medium
-gbmv V !GothicBBB-Medium
+rml H !Ryumin-Light
+rmlv V !Ryumin-Light
+gbm H !GothicBBB-Medium
+gbmv V !GothicBBB-Medium
%%
%% upTeX
%%
-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
+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