summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-02 22:14:02 +0000
committerKarl Berry <karl@freefriends.org>2015-10-02 22:14:02 +0000
commit6113d079281880a8e577e7d3b916e51b36ce602c (patch)
treeb370fade99564e691182296a05f106c069002590
parenta25c1cd733b8a055738b75398996e47563d52323 (diff)
jfontmaps (2oct15)
git-svn-id: svn://tug.org/texlive/trunk@38527 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog28
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/README10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map68
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map24
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map68
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map24
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map10
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl4
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl4
-rwxr-xr-xMaster/texmf-dist/source/jfontmaps/tools/mkmap.lua8
17 files changed, 159 insertions, 135 deletions
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
index 1137cb14331..32c234f747d 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
@@ -1,6 +1,30 @@
+2015-10-02 Norbert Preining <norbert@preining.info>
+
+ * Release 20151002.0 (HEAD -> master) [544b1f4]
+
+2015-09-29 Norbert Preining <norbert@preining.info>
+
+ * update mkmap.lua script (origin/master) [aa10c3e]
+
+2015-09-29 Norbert Preining <preining@logic.at>
+
+ * Merge pull request #4 from doraTeX/master [15e8f65]
+
+2015-09-29 doraTeX <taylorkgb@gmail.com>
+
+ * Fix TTC face numbers of HiraginoSans-W{3,6}.ttc [e3791f8]
+
+2015-09-26 Norbert Preining <preining@logic.at>
+
+ * Merge pull request #2 from doraTeX/master [bbe9b80]
+
+2015-09-26 Yusuke Terada <taylorkgb@gmail.com>
+
+ * Fix README [96a5480]
+
2015-09-24 Norbert Preining <norbert@preining.info>
- * Release 20150924.0 (HEAD -> master) [c46071c]
+ * Release 20150924.0 (tag: 20150924.0) [c46071c]
2015-09-24 Norbert Preining <norbert@preining.info>
@@ -8,7 +32,7 @@
2015-09-22 Norbert Preining <preining@logic.at>
- * Merge pull request #1 from doraTeX/master (origin/master) [50a07a1]
+ * Merge pull request #1 from doraTeX/master [50a07a1]
2015-09-22 Yusuke Terada <taylorkgb@gmail.com>
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/README b/Master/texmf-dist/doc/fonts/jfontmaps/README
index f6cba063728..296a50275f1 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/README
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/README
@@ -1,7 +1,7 @@
jfontmaps
=========
-Current release: 20150924.0
+Current release: 20151002.0
The files contained in this package contains font maps for dvipdfmx to
make various Japanese fonts available for (u)ptex and related programs
@@ -91,11 +91,11 @@ O hiragino-pron - see above
O hiragino-elcapitan-pron
O hiragino-elcapitan
- bundled with Mac OS X 11.10 El Capitan
+ bundled with Mac OS X 10.11 El Capitan
HiraginoSansR-W4.ttc (<= "ヒラギノ丸ゴ ProN W4.ttc")
- HiraginoSans-W3.ttc (<= "ヒラギノ角ゴ W3.ttc")
- HiraginoSans-W6.ttc (<= "ヒラギノ角ゴ W6.ttc")
- HiraginoSans-W8.ttc (<= "ヒラギノ角ゴ W8.ttc")
+ HiraginoSans-W3.ttc (<= "ヒラギノ角ゴシック W3.ttc")
+ HiraginoSans-W6.ttc (<= "ヒラギノ角ゴシック W6.ttc")
+ HiraginoSans-W8.ttc (<= "ヒラギノ角ゴシック W8.ttc")
HiraginoSerif-W3.ttc (<= "ヒラギノ明朝 ProN W3.ttc")
HiraginoSerif-W6.ttc (<= "ヒラギノ明朝 ProN W6.ttc")
HiraMinProN-W2.otf (<= "ヒラギノ明朝 ProN W2.otf")
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
index 4d486c05c77..ddd1b32e037 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
@@ -6,12 +6,12 @@ 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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothr-v V :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothb-h H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothb-v V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgotheb-h H :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hgotheb-v V :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
+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
@@ -22,12 +22,12 @@ 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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothrn-v V :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hgothbn-h H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothbn-v V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hgothebn-h H :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-hgothebn-v V :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
+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
@@ -38,12 +38,12 @@ 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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-cjgr-v Identity-V :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-cjgb-h Identity-H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-cjgb-v Identity-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-cjge-h Identity-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-cjge-v Identity-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
+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
@@ -54,12 +54,12 @@ 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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgr-v UniJIS-UTF16-V :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgb-h UniJIS-UTF16-H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgb-v UniJIS-UTF16-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujge-h UniJIS-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujge-v UniJIS-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
+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
@@ -70,23 +70,23 @@ 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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgrn-v UniJIS2004-UTF16-V :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-otf-ujgbn-h UniJIS2004-UTF16-H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgbn-v UniJIS2004-UTF16-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-otf-ujgen-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-otf-ujgen-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
+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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hirakaku-w6-h Identity-H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-hirakaku-w6-v Identity-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-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 \ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
index 66aecce7b2f..8db714869f2 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
@@ -6,12 +6,12 @@ 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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothr-v UniJIS-UTF16-V :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothb-h UniJIS-UTF16-H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothb-v UniJIS-UTF16-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgotheb-h UniJIS-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphgotheb-v UniJIS-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
+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
@@ -22,11 +22,11 @@ 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 :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothrn-v UniJIS2004-UTF16-V :1:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
-uphgothbn-h UniJIS2004-UTF16-H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothbn-v UniJIS2004-UTF16-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-uphgothebn-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
-uphgothebn-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
+uphgothrn-h UniJIS2004-UTF16-H :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
+uphgothrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
+uphgothbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+uphgothbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+uphgothebn-h UniJIS2004-UTF16-H :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
+uphgothebn-v UniJIS2004-UTF16-V :3:HiraginoSans-W8.ttc %!PS HiraKakuStdN-W8
uphmgothrn-h UniJIS2004-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
uphmgothrn-v UniJIS2004-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
index 4fca2c0182e..a27347bf962 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
@@ -1,4 +1,4 @@
rml 2004-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
rmlv 2004-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-gbm 2004-H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-gbmv 2004-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+gbm 2004-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+gbmv 2004-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
index df6d8e33cbd..6556548b7e7 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
@@ -1,4 +1,4 @@
rml H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
rmlv V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
-gbm H :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-gbmv V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+gbm H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+gbmv V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
index 7fcc852d988..057e1097f19 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
@@ -1,10 +1,10 @@
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 :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-ugbmv UniJIS2004-UTF16-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+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 :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-upgbm-v UniJIS2004-UTF16-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+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 :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
index 036b932f6e3..2e21b50da69 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
@@ -1,10 +1,10 @@
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 :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-ugbmv UniJIS-UTF16-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+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 :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-upgbm-v UniJIS-UTF16-V :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+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 :1:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
+upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
index 4dafd933ff3..91b66cf0cc6 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
@@ -6,12 +6,12 @@ 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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothr-v V :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothb-h H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothb-v V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgotheb-h H :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hgotheb-v V :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
+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
@@ -22,12 +22,12 @@ 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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothrn-v V :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hgothbn-h H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothbn-v V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hgothebn-h H :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-hgothebn-v V :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
+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
@@ -38,12 +38,12 @@ 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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-cjgr-v Identity-V :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-cjgb-h Identity-H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-cjgb-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-cjge-h Identity-H :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-cjge-v Identity-V :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
+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
@@ -54,12 +54,12 @@ 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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgr-v UniJIS-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgb-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgb-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujge-h UniJIS-UTF16-H :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujge-v UniJIS-UTF16-V :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
+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
@@ -70,23 +70,23 @@ 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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-otf-ujgbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-otf-ujgen-h UniJIS2004-UTF16-H :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-otf-ujgen-v UniJIS2004-UTF16-V :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
+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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hirakaku-w6-h Identity-H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-hirakaku-w6-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-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 \ No newline at end of file
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
index 9c4ca605822..a72af54dc1d 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
@@ -6,12 +6,12 @@ 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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothr-v UniJIS-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothb-h UniJIS-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothb-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgotheb-h UniJIS-UTF16-H :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphgotheb-v UniJIS-UTF16-V :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
+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
@@ -22,11 +22,11 @@ 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 :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothrn-v UniJIS2004-UTF16-V :2:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
-uphgothbn-h UniJIS2004-UTF16-H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothbn-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-uphgothebn-h UniJIS2004-UTF16-H :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
-uphgothebn-v UniJIS2004-UTF16-V :1:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
+uphgothrn-h UniJIS2004-UTF16-H :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
+uphgothrn-v UniJIS2004-UTF16-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
+uphgothbn-h UniJIS2004-UTF16-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+uphgothbn-v UniJIS2004-UTF16-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+uphgothebn-h UniJIS2004-UTF16-H :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
+uphgothebn-v UniJIS2004-UTF16-V :2:HiraginoSans-W8.ttc %!PS HiraKakuStd-W8
uphmgothrn-h UniJIS2004-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
uphmgothrn-v UniJIS2004-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
index c295e15817f..7ffb1d6e7bb 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
@@ -1,4 +1,4 @@
rml 2004-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
rmlv 2004-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-gbm 2004-H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-gbmv 2004-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+gbm 2004-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+gbmv 2004-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
index 86502fcef8b..05d0f34ee11 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
@@ -1,4 +1,4 @@
rml H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
rmlv V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
-gbm H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-gbmv V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+gbm H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+gbmv V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
index 3194d665bc7..ce0407b9c0b 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
@@ -1,10 +1,10 @@
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 :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-ugbmv UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+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 :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-upgbm-v UniJIS2004-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+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 :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+upgbm-hq UniJIS-UCS2-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
index 3667c6dc855..21af43d0c51 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
@@ -1,10 +1,10 @@
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 :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-ugbmv UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+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 :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-upgbm-v UniJIS-UTF16-V :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+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 :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
+upgbm-hq UniJIS-UCS2-H :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
index ce1613d82ee..47da864bab1 100755
--- a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
+++ b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# kanji-config-updmap: setup Japanese font embedding
-# Version 20150924.0
+# Version 20151002.0
#
# formerly known as updmap-setup-kanji
#
@@ -21,7 +21,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use strict;
my $prg = "kanji-config-updmap";
-my $version = '20150924.0';
+my $version = '20151002.0';
my $updmap_real = "updmap";
my $updmap = $updmap_real;
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
index 3f7a58ac69b..496524eef9e 100755
--- a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
+++ b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
@@ -2,7 +2,7 @@
#
# kanji-fontmap-creator
# (c) 2012-2014 Norbert Preining
-# Version: 20150924.0
+# Version: 20151002.0
# Licenced under the GPLv2 or any higher version
#
# gui to create map files for updmap(-setup-kanji)
@@ -41,7 +41,7 @@ my $opt_help = 0;
my $opt_version = 0;
my $prg = "kanji-fontmap-creator";
-my $version = "20150924.0";
+my $version = "20151002.0";
#
# global vars configuring operation
diff --git a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
index 1e1967fca2d..b95fc4af54d 100755
--- a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
+++ b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
@@ -128,10 +128,10 @@ local foundry = {
ml= 'HiraMin?-W2.otf', -- OSX にはない
mr= '#1-HiraginoSerif-W3.ttc %!PS HiraMin?-W3',
mb= '#1-HiraginoSerif-W6.ttc %!PS HiraMin?-W6',
- gr= '#2-HiraginoSans-W3.ttc %!PS HiraKaku?-W3',
- gru='#2-HiraginoSans-W6.ttc %!PS HiraKaku?-W6',
- gb= '#2-HiraginoSans-W6.ttc %!PS HiraKaku?-W6',
- ge= '#1+HiraginoSans-W8.ttc %!PS HiraKaku?-W8',
+ gr= '#3-HiraginoSans-W3.ttc %!PS HiraKaku?-W3',
+ gru='#3-HiraginoSans-W6.ttc %!PS HiraKaku?-W6',
+ gb= '#3-HiraginoSans-W6.ttc %!PS HiraKaku?-W6',
+ ge= '#2+HiraginoSans-W8.ttc %!PS HiraKaku?-W8',
mgr='#0+HiraginoSansR-W4.ttc %!PS HiraMaru?-W4',
{'X','Xn'}, -- Pro and ProN
},