japanese-otf (25dec11)

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

5 files changed, 326 insertions, 516 deletions

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 955689bedc4..b19a8c1044d 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,43 +1,29 @@
-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
-
-% 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
+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
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 561d67d36a5..90199c493b5 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,132 +1,88 @@
-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 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
-
-% otf on upTeX, JIS2004
-uphminrn-h     UniJIS2004-UTF16-H     HiraMinProN-W3
-uphminrn-v     UniJIS2004-UTF16-V     HiraMinProN-W3
-
-uphgothrn-h    UniJIS2004-UTF16-H     HiraKakuProN-W3
-uphgothrn-v    UniJIS2004-UTF16-V     HiraKakuProN-W3
-
-uphminbn-h     UniJIS2004-UTF16-H     HiraMinProN-W6
-uphminbn-v     UniJIS2004-UTF16-V     HiraMinProN-W6
-
-uphgothbn-h    UniJIS2004-UTF16-H     HiraKakuProN-W6
-uphgothbn-v    UniJIS2004-UTF16-V     HiraKakuProN-W6
-
-uphgothebn-h   UniJIS2004-UTF16-H     HiraKakuStdN-W8
-uphgothebn-v   UniJIS2004-UTF16-V     HiraKakuStdN-W8
-
-uphmgothrn-h   UniJIS2004-UTF16-H     HiraMaruProN-W4
-uphmgothrn-v   UniJIS2004-UTF16-V     HiraMaruProN-W4
-
-uphminln-h     UniJIS2004-UTF16-H     HiraMinProN-W2
-uphminln-v     UniJIS2004-UTF16-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
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 8341635015a..4bc5e699f3d 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,119 +1,75 @@
-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
+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
 
 %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-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
-
-% otf on upTeX, JIS2004
-uphminrn-h    UniJIS2004-UTF16-H      KozMinPr6N-Regular.otf
-uphminrn-v    UniJIS2004-UTF16-V      KozMinPr6N-Regular.otf
-
-uphgothrn-h   UniJIS2004-UTF16-H      KozGoPr6N-Regular.otf
-uphgothrn-v   UniJIS2004-UTF16-V      KozGoPr6N-Regular.otf
-
-uphminbn-h    UniJIS2004-UTF16-H      KozMinPr6N-Bold.otf
-uphminbn-v    UniJIS2004-UTF16-V      KozMinPr6N-Bold.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-Medium.otf
-uphmgothrn-v  UniJIS2004-UTF16-V      KozGoPr6N-Medium.otf
-
-uphminln-h    UniJIS2004-UTF16-H      KozMinPr6N-Light.otf
-uphminln-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
+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
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 fb7d4754880..862cccbf276 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,119 +1,75 @@
-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 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
-
-% otf on upTeX, JIS2004
-uphminrn-h     UniJIS2004-UTF16-H     A-OTF-RyuminPr6N-Light.otf
-uphminrn-v     UniJIS2004-UTF16-V     A-OTF-RyuminPr6N-Light.otf
-
-uphgothrn-h    UniJIS2004-UTF16-H     A-OTF-GothicBBBPr6N-Medium.otf
-uphgothrn-v    UniJIS2004-UTF16-V     A-OTF-GothicBBBPr6N-Medium.otf
-
-uphminbn-h     UniJIS2004-UTF16-H     A-OTF-FutoMinA101Pr6N-Bold.otf
-uphminbn-v     UniJIS2004-UTF16-V     A-OTF-FutoMinA101Pr6N-Bold.otf
-
-uphgothbn-h    UniJIS2004-UTF16-H     A-OTF-FutoGoB101Pr6N-Bold.otf
-uphgothbn-v    UniJIS2004-UTF16-V     A-OTF-FutoGoB101Pr6N-Bold.otf
-
-uphgothebn-h   UniJIS2004-UTF16-H     A-OTF-MidashiGoPr6N-MB31.otf
-uphgothebn-v   UniJIS2004-UTF16-V     A-OTF-MidashiGoPr6N-MB31.otf
-
-uphmgothrn-h   UniJIS2004-UTF16-H     A-OTF-Jun101Pr6N-Light.otf
-uphmgothrn-v   UniJIS2004-UTF16-V     A-OTF-Jun101Pr6N-Light.otf
-
-uphminln-h     UniJIS2004-UTF16-H     A-OTF-RyuminPr6N-Light.otf
-uphminln-v     UniJIS2004-UTF16-V     A-OTF-RyuminPr6N-Light.otf
+otf-ujmrn-h      UniJIS2004-UTF16-H        A-OTF-RyuminPr6N-Light.otf
+otf-ujmrn-v      UniJIS2004-UTF16-V        A-OTF-RyuminPr6N-Light.otf
+hminrn-h   H A-OTF-RyuminPr6N-Light.otf
+hminrn-v V A-OTF-RyuminPr6N-Light.otf
+
+otf-ujgrn-h    UniJIS2004-UTF16-H       A-OTF-GothicBBBPr6N-Medium.otf
+otf-ujgrn-v    UniJIS2004-UTF16-V       A-OTF-GothicBBBPr6N-Medium.otf
+hgothrn-h   H A-OTF-GothicBBBPr6N-Medium.otf
+hgothrn-v V A-OTF-GothicBBBPr6N-Medium.otf
+
+otf-ujmbn-h      UniJIS2004-UTF16-H    A-OTF-FutoMinA101Pr6N-Bold.otf
+otf-ujmbn-v      UniJIS2004-UTF16-V    A-OTF-FutoMinA101Pr6N-Bold.otf
+hminbn-h   H A-OTF-FutoMinA101Pr6N-Bold.otf
+hminbn-v V A-OTF-FutoMinA101Pr6N-Bold.otf
+
+otf-ujgbn-h    UniJIS2004-UTF16-H    A-OTF-FutoGoB101Pr6N-Bold.otf
+otf-ujgbn-v    UniJIS2004-UTF16-V    A-OTF-FutoGoB101Pr6N-Bold.otf
+hgothbn-h   H A-OTF-FutoGoB101Pr6N-Bold.otf
+hgothbn-v V A-OTF-FutoGoB101Pr6N-Bold.otf
+
+otf-ujmgrn-h    UniJIS2004-UTF16-H       A-OTF-Jun101Pr6N-Light.otf
+otf-ujmgrn-v    UniJIS2004-UTF16-V       A-OTF-Jun101Pr6N-Light.otf
+hmgothrn-h    H A-OTF-Jun101Pr6N-Light.otf
+hmgothrn-v  V A-OTF-Jun101Pr6N-Light.otf
+
+otf-ujmln-h      UniJIS2004-UTF16-H        A-OTF-RyuminPr6N-Light.otf
+otf-ujmln-v      UniJIS2004-UTF16-V        A-OTF-RyuminPr6N-Light.otf
+hminln-h   H A-OTF-RyuminPr6N-Light.otf
+hminln-v V A-OTF-RyuminPr6N-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/japanese-otf/otf-noEmbed.map
index 3174e0e098d..e7fd1dbeba4 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,119 +1,75 @@
-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 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
-
-% otf on upTeX, JIS2004
-uphminrn-h     UniJIS2004-UTF16-H     !Ryumin-Light
-uphminrn-v     UniJIS2004-UTF16-V     !Ryumin-Light
-
-uphgothrn-h    UniJIS2004-UTF16-H     !GothicBBB-Medium
-uphgothrn-v    UniJIS2004-UTF16-V     !GothicBBB-Medium
-
-uphminbn-h     UniJIS2004-UTF16-H     !Ryumin-Light,Bold
-uphminbn-v     UniJIS2004-UTF16-V     !Ryumin-Light,Bold
-
-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
-
-uphminln-h     UniJIS2004-UTF16-H     !Ryumin-Light
-uphminln-v     UniJIS2004-UTF16-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