summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-08 22:37:12 +0000
committerKarl Berry <karl@freefriends.org>2016-11-08 22:37:12 +0000
commit21c7cbc76da87bbb51df802f72b58b55f25247ac (patch)
tree66b4ff5facc50ad2674a97c77aac34a286fb05a0
parent49125329a8504ac420facfe20462b68bf2859e46 (diff)
jfontmaps (8nov16)
git-svn-id: svn://tug.org/texlive/trunk@42470 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog28
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/README16
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map22
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map22
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map8
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map2
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map2
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map10
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl10
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl4
-rwxr-xr-xMaster/texmf-dist/source/jfontmaps/tools/mkmap.lua121
17 files changed, 286 insertions, 97 deletions
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
index d0ae127334a..db5f1194f66 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
@@ -1,6 +1,30 @@
+2016-11-08 Norbert Preining <norbert@preining.info>
+
+ * Release 20161108.0 (HEAD -> master) [2365720]
+
+2016-10-04 Norbert Preining <preining@logic.at>
+
+ * Merge pull request #5 from doraTeX/toppan (origin/master) [e0e8cdd]
+
+2016-10-04 doraTeX <taylorkgb@gmail.com>
+
+ * Update kanji-config-updmap.pl [6b75c25]
+
+2016-10-04 doraTeX <taylorkgb@gmail.com>
+
+ * Revise README [abc0cb5]
+
+2016-10-04 aminophen <h.y.acetaminophen@gmail.com>
+
+ * hiragino-elcapitan: W2.otf -> W3.ttc; Add toppanbunkyu-sierra [9af223b]
+
+2016-10-04 aminophen <h.y.acetaminophen@gmail.com>
+
+ * mkmap.lua: clean up white spaces [b6d2e3e]
+
2016-09-29 Norbert Preining <norbert@preining.info>
- * Release 20160929.0 (HEAD -> master) [923719e]
+ * Release 20160929.0 (tag: 20160929.0) [923719e]
2016-09-29 Norbert Preining <norbert@preining.info>
@@ -8,7 +32,7 @@
2016-09-29 aminophen <h.y.acetaminophen@gmail.com>
- * README, kanji-config-updmap.pl: add ms-osx (origin/master) [dbeb011]
+ * README, kanji-config-updmap.pl: add ms-osx [dbeb011]
2016-09-29 aminophen <h.y.acetaminophen@gmail.com>
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/README b/Master/texmf-dist/doc/fonts/jfontmaps/README
index 2fb46e177b8..bde0c7d54e4 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/README
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/README
@@ -1,7 +1,7 @@
jfontmaps
=========
-Current release: 20160929.0
+Current release: 20161108.0
The files contained in this package contains font maps for dvipdfmx to
make various Japanese fonts available for (u)ptex and related programs
@@ -62,7 +62,7 @@ X ms-osx - MS Mincho and MS Gothic, shipped with Office for Mac
YuGothB.ttc
O yu-osx - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
- bundled with OSX 10.9.
+ bundled with OSX 10.9 and 10.10.
YuGo-Bold.otf (<= "Yu Gothic Bold.otf")
YuGo-Medium.otf (<= "Yu Gothic Medium.otf")
YuMin-Demibold.otf (<= "Yu Mincho Demibold.otf")
@@ -79,7 +79,7 @@ O yu-osx - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
O? hiragino - Hiragino fonts by Dainippon Screen Mfg. Co., Ltd.
- bundled with Mac OS X 10.5 or later,
+ bundled with Mac OS X 10.5--10.10,
or Japanese word processor Ichitaro 2012 Premium/Super-premium editions
HiraMinPro-W2.otf (<= "ヒラギノ明朝 Pro W2.otf")
HiraMinPro-W3.otf (<= "ヒラギノ明朝 Pro W3.otf")
@@ -96,14 +96,20 @@ O hiragino-pron - see above
O hiragino-elcapitan-pron
O hiragino-elcapitan
- bundled with Mac OS X 10.11 El Capitan
+ bundled with Mac OS X 10.11 El Capitan or later
HiraginoSansR-W4.ttc (<= "ヒラギノ丸ゴ ProN W4.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")
+
+O toppanbunkyu-sierra
+ bundled with macOS 10.12 Sierra
+ ToppanBunkyuMincho-Regular.otf
+ ToppanBunkyuMidashiMincho-ExtraBold.otf
+ ToppanBunkyuGothic.ttc
+ ToppanBunkyuMidashiGothic-ExtraBold.otf
P kozuka - by Adobe Systems, bundled with Adobe's software
KozMinPro-Light.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 ddd1b32e037..bd537f76038 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
@@ -1,7 +1,7 @@
% TEXT, 90JIS
-hminl-h H HiraMinProN-W2.otf
-hminl-v V HiraMinProN-W2.otf
+hminl-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+hminl-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
hminr-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
hminr-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
hminb-h H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
@@ -16,8 +16,8 @@ hmgothr-h H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
hmgothr-v V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
% TEXT, JIS04
-hminln-h H HiraMinProN-W2.otf
-hminln-v V HiraMinProN-W2.otf
+hminln-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+hminln-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
hminrn-h H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
hminrn-v V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
hminbn-h H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
@@ -32,8 +32,8 @@ hmgothrn-h H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
hmgothrn-v V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
% CID
-otf-cjml-h Identity-H HiraMinProN-W2.otf
-otf-cjml-v Identity-V HiraMinProN-W2.otf
+otf-cjml-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+otf-cjml-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-cjmr-h Identity-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-cjmr-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-cjmb-h Identity-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
@@ -48,8 +48,8 @@ otf-cjmgr-h Identity-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
otf-cjmgr-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H HiraMinProN-W2.otf
-otf-ujml-v UniJIS-UTF16-V HiraMinProN-W2.otf
+otf-ujml-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+otf-ujml-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-ujmr-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-ujmr-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-ujmb-h UniJIS-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
@@ -64,8 +64,8 @@ otf-ujmgr-h UniJIS-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
otf-ujmgr-v UniJIS-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H HiraMinProN-W2.otf
-otf-ujmln-v UniJIS2004-UTF16-V HiraMinProN-W2.otf
+otf-ujmln-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+otf-ujmln-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-ujmrn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-ujmrn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
otf-ujmbn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
@@ -89,4 +89,4 @@ hiramin-w3-v Identity-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
hiramin-w6-v Identity-V :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
hirakaku-w3-v Identity-V :2:HiraginoSans-W3.ttc %!PS HiraKakuProN-W3
hirakaku-w6-v Identity-V :2:HiraginoSans-W6.ttc %!PS HiraKakuProN-W6
-hiramaru-w4-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4 \ No newline at end of file
+hiramaru-w4-v Identity-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
index 8db714869f2..50f3ae1653c 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
@@ -1,7 +1,7 @@
% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H HiraMinProN-W2.otf
-uphminl-v UniJIS-UTF16-V HiraMinProN-W2.otf
+uphminl-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+uphminl-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
uphminr-h UniJIS-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
uphminr-v UniJIS-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
uphminb-h UniJIS-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
@@ -16,8 +16,8 @@ uphmgothr-h UniJIS-UTF16-H :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
uphmgothr-v UniJIS-UTF16-V :1:HiraginoSansR-W4.ttc %!PS HiraMaruProN-W4
% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H HiraMinProN-W2.otf
-uphminln-v UniJIS2004-UTF16-V HiraMinProN-W2.otf
+uphminln-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+uphminln-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
uphminrn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
uphminrn-v UniJIS2004-UTF16-V :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
uphminbn-h UniJIS2004-UTF16-H :0:HiraginoSerif-W6.ttc %!PS HiraMinProN-W6
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 91b66cf0cc6..41c5388d9d8 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
@@ -1,7 +1,7 @@
% TEXT, 90JIS
-hminl-h H HiraMinPro-W2.otf
-hminl-v V HiraMinPro-W2.otf
+hminl-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+hminl-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
hminr-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
hminr-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
hminb-h H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
@@ -16,8 +16,8 @@ hmgothr-h H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
hmgothr-v V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
% TEXT, JIS04
-hminln-h H HiraMinPro-W2.otf
-hminln-v V HiraMinPro-W2.otf
+hminln-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+hminln-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
hminrn-h H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
hminrn-v V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
hminbn-h H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
@@ -32,8 +32,8 @@ hmgothrn-h H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
hmgothrn-v V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
% CID
-otf-cjml-h Identity-H HiraMinPro-W2.otf
-otf-cjml-v Identity-V HiraMinPro-W2.otf
+otf-cjml-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+otf-cjml-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-cjmr-h Identity-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-cjmr-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-cjmb-h Identity-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
@@ -48,8 +48,8 @@ otf-cjmgr-h Identity-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
otf-cjmgr-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
% Unicode 90JIS
-otf-ujml-h UniJIS-UTF16-H HiraMinPro-W2.otf
-otf-ujml-v UniJIS-UTF16-V HiraMinPro-W2.otf
+otf-ujml-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+otf-ujml-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-ujmr-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-ujmr-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-ujmb-h UniJIS-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
@@ -64,8 +64,8 @@ otf-ujmgr-h UniJIS-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
otf-ujmgr-v UniJIS-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
% Unicode JIS04
-otf-ujmln-h UniJIS2004-UTF16-H HiraMinPro-W2.otf
-otf-ujmln-v UniJIS2004-UTF16-V HiraMinPro-W2.otf
+otf-ujmln-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+otf-ujmln-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-ujmrn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-ujmrn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
otf-ujmbn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
@@ -89,4 +89,4 @@ hiramin-w3-v Identity-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
hiramin-w6-v Identity-V :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
hirakaku-w3-v Identity-V :3:HiraginoSans-W3.ttc %!PS HiraKakuPro-W3
hirakaku-w6-v Identity-V :3:HiraginoSans-W6.ttc %!PS HiraKakuPro-W6
-hiramaru-w4-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4 \ No newline at end of file
+hiramaru-w4-v Identity-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
index a72af54dc1d..d01b53b4f56 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
@@ -1,7 +1,7 @@
% TEXT, 90JIS
-uphminl-h UniJIS-UTF16-H HiraMinPro-W2.otf
-uphminl-v UniJIS-UTF16-V HiraMinPro-W2.otf
+uphminl-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+uphminl-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
uphminr-h UniJIS-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
uphminr-v UniJIS-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
uphminb-h UniJIS-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
@@ -16,8 +16,8 @@ uphmgothr-h UniJIS-UTF16-H :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
uphmgothr-v UniJIS-UTF16-V :0:HiraginoSansR-W4.ttc %!PS HiraMaruPro-W4
% TEXT, JIS04
-uphminln-h UniJIS2004-UTF16-H HiraMinPro-W2.otf
-uphminln-v UniJIS2004-UTF16-V HiraMinPro-W2.otf
+uphminln-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+uphminln-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
uphminrn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
uphminrn-v UniJIS2004-UTF16-V :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
uphminbn-h UniJIS2004-UTF16-H :1:HiraginoSerif-W6.ttc %!PS HiraMinPro-W6
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
index fd4602dd324..b4b41ac0348 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map
@@ -89,4 +89,4 @@ hiramin-w3-v Identity-V HiraMinProN-W3.otf
hiramin-w6-v Identity-V HiraMinProN-W6.otf
hirakaku-w3-v Identity-V HiraKakuProN-W3.otf
hirakaku-w6-v Identity-V HiraKakuProN-W6.otf
-hiramaru-w4-v Identity-V HiraMaruProN-W4.otf \ No newline at end of file
+hiramaru-w4-v Identity-V HiraMaruProN-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
index 03c3b77210e..8d2effbc1a9 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map
@@ -89,4 +89,4 @@ hiramin-w3-v Identity-V HiraMinPro-W3.otf
hiramin-w6-v Identity-V HiraMinPro-W6.otf
hirakaku-w3-v Identity-V HiraKakuPro-W3.otf
hirakaku-w6-v Identity-V HiraKakuPro-W6.otf
-hiramaru-w4-v Identity-V HiraMaruPro-W4.otf \ No newline at end of file
+hiramaru-w4-v Identity-V HiraMaruPro-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map
new file mode 100644
index 00000000000..341ab36feba
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-toppanbunkyu-sierra.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+hminl-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+hminr-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+hminr-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+hminb-h H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+hminb-v V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+hgothr-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+hgothr-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+hgothb-h H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+hgothb-v V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+hgotheb-h H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+hgotheb-v V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+hmgothr-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+hmgothr-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+
+% TEXT, JIS04
+hminln-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+hminln-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+hminrn-h H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+hminrn-v V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+hminbn-h H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+hminbn-v V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+hgothrn-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+hgothrn-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+hgothbn-h H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+hgothbn-v V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+hgothebn-h H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+hgothebn-v V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+hmgothrn-h H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+hmgothrn-v V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+
+% CID
+otf-cjml-h Identity-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-cjml-v Identity-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-cjmr-h Identity-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-cjmr-v Identity-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-cjmb-h Identity-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+otf-cjmb-v Identity-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+otf-cjgr-h Identity-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-cjgr-v Identity-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-cjgb-h Identity-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+otf-cjgb-v Identity-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+otf-cjge-h Identity-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+otf-cjge-v Identity-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+otf-cjmgr-h Identity-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-cjmgr-v Identity-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+
+% Unicode 90JIS
+otf-ujml-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-ujml-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-ujmr-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-ujmr-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-ujmb-h UniJIS-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+otf-ujmb-v UniJIS-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+otf-ujgr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-ujgr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-ujgb-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+otf-ujgb-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+otf-ujge-h UniJIS-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+otf-ujge-v UniJIS-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+otf-ujmgr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-ujmgr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+
+% Unicode JIS04
+otf-ujmln-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-ujmln-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-ujmrn-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-ujmrn-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+otf-ujmbn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+otf-ujmbn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+otf-ujgrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-ujgrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-ujgbn-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+otf-ujgbn-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+otf-ujgen-h UniJIS2004-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+otf-ujgen-v UniJIS2004-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+otf-ujmgrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+otf-ujmgrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map
new file mode 100644
index 00000000000..660c86b3aa1
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/otf-up-toppanbunkyu-sierra.map
@@ -0,0 +1,32 @@
+
+% TEXT, 90JIS
+uphminl-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uphminl-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uphminr-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uphminr-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uphminb-h UniJIS-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+uphminb-v UniJIS-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+uphgothr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+uphgothr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+uphgothb-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+uphgothb-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+uphgotheb-h UniJIS-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+uphgotheb-v UniJIS-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+uphmgothr-h UniJIS-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+uphmgothr-v UniJIS-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uphminln-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uphminrn-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uphminrn-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uphminbn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+uphminbn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold
+uphgothrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+uphgothrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+uphgothbn-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+uphgothbn-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+uphgothebn-h UniJIS2004-UTF16-H ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+uphgothebn-v UniJIS2004-UTF16-V ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold
+uphmgothrn-h UniJIS2004-UTF16-H :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
+uphmgothrn-v UniJIS2004-UTF16-V :1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map
new file mode 100644
index 00000000000..21df63f4571
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra-04.map
@@ -0,0 +1,4 @@
+rml 2004-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+rmlv 2004-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+gbm 2004-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+gbmv 2004-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map
new file mode 100644
index 00000000000..7f00b869d5c
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/ptex-toppanbunkyu-sierra.map
@@ -0,0 +1,4 @@
+rml H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+rmlv V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+gbm H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+gbmv V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map
new file mode 100644
index 00000000000..3c6cbdc57bc
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra-04.map
@@ -0,0 +1,10 @@
+urml UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+urmlv UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+ugbm UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+ugbmv UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+uprml-h UniJIS2004-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uprml-v UniJIS2004-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+upgbm-h UniJIS2004-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+upgbm-v UniJIS2004-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+uprml-hq UniJIS-UCS2-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+upgbm-hq UniJIS-UCS2-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map
new file mode 100644
index 00000000000..b15c83c6ab9
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/toppanbunkyu-sierra/uptex-toppanbunkyu-sierra.map
@@ -0,0 +1,10 @@
+urml UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+urmlv UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+ugbm UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+ugbmv UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+uprml-h UniJIS-UTF16-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+uprml-v UniJIS-UTF16-V ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+upgbm-h UniJIS-UTF16-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+upgbm-v UniJIS-UTF16-V :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
+uprml-hq UniJIS-UCS2-H ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular
+upgbm-hq UniJIS-UCS2-H :0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
index aca02e562c5..ed4247e3399 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 20160929.0
+# Version 20161108.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 = '20160929.0';
+my $version = '20161108.0';
my $updmap_real = "updmap";
my $updmap = $updmap_real;
@@ -67,6 +67,7 @@ my %representatives = (
"hiragino-pron" => "HiraMinProN-W3.otf",
"hiragino-elcapitan" => "HiraginoSerif-W3.ttc",
"hiragino-elcapitan-pron" => "HiraginoSerif-W3.ttc",
+ "toppanbunkyu-sierra" => "ToppanBunkyuGothic.ttc",
"morisawa" => "A-OTF-RyuminPro-Light.otf",
"morisawa-pr6n" => "A-OTF-RyuminPr6N-Light.otf",
"kozuka" => "KozMinPro-Regular.otf",
@@ -116,7 +117,8 @@ sub Usage {
auto: embed one of the following supported font families
automatically:
hiragino, hiragino-pron, hiragino-elcapitan,
- hiragino-elcapitan-pron, morisawa, morisawa-pr6n,
+ hiragino-elcapitan-pron, toppanbunkyu-sierra,
+ morisawa, morisawa-pr6n,
kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms,
yu-osx, yu-win, yu-win10
and fall back to not embedding any font if none of them
@@ -249,7 +251,7 @@ sub SetupReplacement {
for my $i (qw/
morisawa-pr6n yu-osx kozuka-pr6n kozuka-pr6
hiragino-pron hiragino-elcapitan-pron hiragino
- hiragino-elcapitan
+ hiragino-elcapitan toppanbunkyu-sierra
morisawa kozuka yu-win yu-win10 ipaex ipa ms/) {
if ($available{$i}) {
return SetupMapFile($i);
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
index 48a08124617..6a28bf6d4e6 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: 20160929.0
+# Version: 20161108.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 = "20160929.0";
+my $version = "20161108.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 90e8dc0e752..449ce1e016e 100755
--- a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
+++ b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
@@ -14,80 +14,85 @@ local foundry = {
{'n'},
},
['ms'] = {
- noncid = true,
- ml=':0:msmincho.ttc', mr=':0:msmincho.ttc', mb=':0:msmincho.ttc',
- gr=':0:msgothic.ttc', gru=':0:msgothic.ttc', gb=':0:msgothic.ttc', ge=':0:msgothic.ttc',
+ noncid = true,
+ ml=':0:msmincho.ttc',
+ mr=':0:msmincho.ttc',
+ mb=':0:msmincho.ttc',
+ gr=':0:msgothic.ttc',
+ gru=':0:msgothic.ttc',
+ gb=':0:msgothic.ttc',
+ ge=':0:msgothic.ttc',
mgr=':0:msgothic.ttc',
{''},
},
['ms-osx'] = {
- noncid = true,
- ml='MS-Mincho.ttf',
- mr='MS-Mincho.ttf',
+ noncid = true,
+ ml='MS-Mincho.ttf',
+ mr='MS-Mincho.ttf',
mb='MS-Mincho.ttf',
- gr='MS-Gothic.ttf',
- gru='MS-Gothic.ttf',
- gb='MS-Gothic.ttf',
+ gr='MS-Gothic.ttf',
+ gru='MS-Gothic.ttf',
+ gb='MS-Gothic.ttf',
ge='MS-Gothic.ttf',
mgr='MS-Gothic.ttf',
{''},
},
['yu-win'] = {
- noncid = true,
- ml='yuminl.ttf %!PS YuMincho-Light',
- mr='yumin.ttf %!PS YuMincho-Regular',
+ noncid = true,
+ ml='yuminl.ttf %!PS YuMincho-Light',
+ mr='yumin.ttf %!PS YuMincho-Regular',
mb='yumindb.ttf %!PS YuMincho-DemiBold',
- gr='yugothic.ttf %!PS YuGothic-Regular',
- gru='yugothic.ttf %!PS YuGothic-Regular',
- gb='yugothib.ttf %!PS YuGothic-Bold',
+ gr='yugothic.ttf %!PS YuGothic-Regular',
+ gru='yugothic.ttf %!PS YuGothic-Regular',
+ gb='yugothib.ttf %!PS YuGothic-Bold',
ge='yugothib.ttf %!PS YuGothic-Bold',
mgr='yugothib.ttf %!PS YuGothic-Bold',
- {''},
- },
+ {''},
+ },
['yu-win10'] = {
- noncid = true,
- ml='yuminl.ttf %!PS YuMincho-Light',
- mr='yumin.ttf %!PS YuMincho-Regular',
+ noncid = true,
+ ml='yuminl.ttf %!PS YuMincho-Light',
+ mr='yumin.ttf %!PS YuMincho-Regular',
mb='yumindb.ttf %!PS YuMincho-DemiBold',
- gr=':0:YuGothR.ttc %!PS YuGothic-Regular',
- gru=':0:YuGothM.ttc %!PS YuGothic-Medium',
- gb=':0:YuGothB.ttc %!PS YuGothic-Bold',
+ gr=':0:YuGothR.ttc %!PS YuGothic-Regular',
+ gru=':0:YuGothM.ttc %!PS YuGothic-Medium',
+ gb=':0:YuGothB.ttc %!PS YuGothic-Bold',
ge=':0:YuGothB.ttc %!PS YuGothic-Bold',
mgr=':0:YuGothB.ttc %!PS YuGothic-Bold',
- {''},
- },
+ {''},
+ },
['yu-osx'] = {
- noncid = false,
- ml='YuMin-Medium.otf',
- mr='YuMin-Medium.otf',
- mb='YuMin-Demibold.otf',
- gr='YuGo-Medium.otf',
- gru='YuGo-Medium.otf',
- gb='YuGo-Bold.otf',
- ge='YuGo-Bold.otf',
- mgr='YuGo-Bold.otf',
- {''},
+ noncid = false,
+ ml='YuMin-Medium.otf',
+ mr='YuMin-Medium.otf',
+ mb='YuMin-Demibold.otf',
+ gr='YuGo-Medium.otf',
+ gru='YuGo-Medium.otf',
+ gb='YuGo-Bold.otf',
+ ge='YuGo-Bold.otf',
+ mgr='YuGo-Bold.otf',
+ {''},
},
['ipa'] = {
- noncid = true,
- ml='ipam.ttf %!PS IPAMincho',
- mr='ipam.ttf %!PS IPAMincho',
+ noncid = true,
+ ml='ipam.ttf %!PS IPAMincho',
+ mr='ipam.ttf %!PS IPAMincho',
mb='ipam.ttf %!PS IPAMincho',
- gr='ipag.ttf %!PS IPAGothic',
- gru='ipag.ttf %!PS IPAGothic',
- gb='ipag.ttf %!PS IPAGothic',
+ gr='ipag.ttf %!PS IPAGothic',
+ gru='ipag.ttf %!PS IPAGothic',
+ gb='ipag.ttf %!PS IPAGothic',
ge='ipag.ttf %!PS IPAGothic',
mgr='ipag.ttf %!PS IPAGothic',
{''},
},
['ipaex'] = {
- noncid = true,
- ml='ipaexm.ttf %!PS IPAexMincho',
- mr='ipaexm.ttf %!PS IPAexMincho',
+ noncid = true,
+ ml='ipaexm.ttf %!PS IPAexMincho',
+ mr='ipaexm.ttf %!PS IPAexMincho',
mb='ipaexm.ttf %!PS IPAexMincho',
- gr='ipaexg.ttf %!PS IPAexGothic',
- gru='ipaexg.ttf %!PS IPAexGothic',
- gb='ipaexg.ttf %!PS IPAexGothic',
+ gr='ipaexg.ttf %!PS IPAexGothic',
+ gru='ipaexg.ttf %!PS IPAexGothic',
+ gb='ipaexg.ttf %!PS IPAexGothic',
ge='ipaexg.ttf %!PS IPAexGothic',
mgr='ipaexg.ttf %!PS IPAexGothic',
{''},
@@ -97,7 +102,7 @@ local foundry = {
mr='KozMin?-Regular.otf',
mb='KozMin?-Bold.otf',
gr='KozGo?-Regular.otf',
- gru='KozGo?-Medium.otf',
+ gru='KozGo?-Medium.otf',
gb='KozGo?-Bold.otf',
ge='KozGo?-Heavy.otf',
mgr='KozGo?-Heavy.otf',
@@ -126,7 +131,7 @@ local foundry = {
{'6nm'}, -- Pr6N
},
['hiragino'] = {
- ml='HiraMin?-W2.otf',
+ ml='HiraMin?-W2.otf', -- OSX にはない
mr='HiraMin?-W3.otf',
mb='HiraMin?-W6.otf',
gr='HiraKaku?-W3.otf',
@@ -137,7 +142,7 @@ local foundry = {
{'X','Xn'}, -- Pro and ProN
},
['hiragino-elcapitan'] = {
- ml= 'HiraMin?-W2.otf', -- OSX にはない
+ ml= '#1-HiraginoSerif-W3.ttc %!PS HiraMin?-W3', -- ここは OTC を使おう
mr= '#1-HiraginoSerif-W3.ttc %!PS HiraMin?-W3',
mb= '#1-HiraginoSerif-W6.ttc %!PS HiraMin?-W6',
gr= '#3-HiraginoSans-W3.ttc %!PS HiraKaku?-W3',
@@ -147,6 +152,17 @@ local foundry = {
mgr='#0+HiraginoSansR-W4.ttc %!PS HiraMaru?-W4',
{'X','Xn'}, -- Pro and ProN
},
+ ['toppanbunkyu-sierra'] = {
+ ml= 'ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular',
+ mr= 'ToppanBunkyuMincho-Regular.otf %!PS ToppanBunkyuMinchoPr6N-Regular',
+ mb= 'ToppanBunkyuMidashiMincho-ExtraBold.otf %!PS ToppanBunkyuMidashiMinchoStdN-ExtraBold',
+ gr= ':1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular',
+ gru=':0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB',
+ gb= ':0:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-DB',
+ ge= 'ToppanBunkyuMidashiGothic-ExtraBold.otf %!PS ToppanBunkyuMidashiGothicStdN-ExtraBold',
+ mgr=':1:ToppanBunkyuGothic.ttc %!PS ToppanBunkyuGothicPr6N-Regular',
+ {''},
+ },
}
local suffix = {
@@ -247,7 +263,7 @@ local maps = {
{'uphgothb-#', 'UniJIS-UTF16-#', 'gb'},
{'uphgotheb-#','UniJIS-UTF16-#', 'ge'},
{'uphmgothr-#','UniJIS-UTF16-#', 'mgr'},
- '% TEXT, JIS04',
+ '% TEXT, JIS04',
{'uphminln-#', 'UniJIS2004-UTF16-#', 'ml'},
{'uphminrn-#', 'UniJIS2004-UTF16-#', 'mr'},
{'uphminbn-#', 'UniJIS2004-UTF16-#', 'mb'},
@@ -269,7 +285,7 @@ function string.explode(s, sep)
end
local function ret_suffix(fd, s, fa)
- if fd=='kozuka' and s=='6' then
+ if fd=='kozuka' and s=='6' then
return 'ProVI' -- 小塚だけ特別
elseif fd:match('hiragino') then
if string.match(s, jis2004_flag) then
@@ -345,6 +361,7 @@ hiramin-w6-v Identity-V $mb
hirakaku-w3-v Identity-V $gr
hirakaku-w6-v Identity-V $gb
hiramaru-w4-v Identity-V $mgr
+
]])
for i,v in pairs(v2) do
v = (v:gsub ('$(%w+)', foundry[fd])):gsub('?', ret_suffix(fd,s,''))