summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog52
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/README22
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map32
-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.map92
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map32
-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
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-hiragino-pron.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-hiragino.map20
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map80
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map4
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map10
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl23
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl4
-rwxr-xr-xMaster/texmf-dist/source/jfontmaps/tools/mkmap.lua81
23 files changed, 599 insertions, 53 deletions
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
index 39b079dabbd..1137cb14331 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
@@ -1,10 +1,58 @@
+2015-09-24 Norbert Preining <norbert@preining.info>
+
+ * Release 20150924.0 (HEAD -> master) [c46071c]
+
+2015-09-24 Norbert Preining <norbert@preining.info>
+
+ * kanji-config-updmap: in auto mode check elcapitan and yu-win10, too [bc4702f]
+
+2015-09-22 Norbert Preining <preining@logic.at>
+
+ * Merge pull request #1 from doraTeX/master (origin/master) [50a07a1]
+
+2015-09-22 Yusuke Terada <taylorkgb@gmail.com>
+
+ * Add representatives of El Capitan font maps [8aba0c4]
+
+2015-09-11 Norbert Preining <norbert@preining.info>
+
+ * add link descriptions for elcapitan fonts [8532608]
+
+2015-07-31 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Oops, forgot to update script (gito-h7ks/h7k, h7k) [8eb1df3]
+
+2015-07-31 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Use YuGothic-Regular for hgt/m [93fc110]
+
+2015-07-31 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Updated README [077176d]
+
+2015-07-31 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Add option 'yu-win10' (Yu fonts in Windows 10) [0f01bdf]
+
+2015-07-24 Norbert Preining <norbert@preining.info>
+
+ * start updating README [844bdd1]
+
+2015-07-24 Norbert Preining <norbert@preining.info>
+
+ * update copyright year, fix links [b1740a3]
+
+2015-07-21 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Added option 'hiragino-elcapitan[-pron]' [f8cdc2f]
+
2014-03-01 Norbert Preining <preining@logic.at>
- * Release 20140301.0 (HEAD, master) [d7ef001]
+ * Release 20140301.0 (tag: 20140301.0) [d7ef001]
2014-02-26 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
- * Changed symlink name for yu-osx into YuMin-Medium.otf etc. (origin/master, gito-h7ks/h7k, h7k) [608f753]
+ * Changed symlink name for yu-osx into YuMin-Medium.otf etc. [608f753]
2014-02-26 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/README b/Master/texmf-dist/doc/fonts/jfontmaps/README
index 8a21311156a..f6cba063728 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/README
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/README
@@ -1,7 +1,7 @@
jfontmaps
=========
-Current release: 20140301.0
+Current release: 20150924.0
The files contained in this package contains font maps for dvipdfmx to
make various Japanese fonts available for (u)ptex and related programs
@@ -47,6 +47,15 @@ X ms - MS Mincho and MS Gothic, shipped with Windows
yugothic.ttf
yugothib.ttf
+4 yu-win10 - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
+ bundled with Win 10.
+ yumin.ttf
+ yuminl.ttf
+ yumindb.ttf
+ YuGothR.ttc
+ YuGothM.ttc
+ YuGothB.ttc
+
O yu-osx - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
bundled with OSX 10.9.
YuGo-Bold.otf (<= "Yu Gothic Bold.otf")
@@ -80,6 +89,17 @@ O? hiragino - Hiragino fonts by Dainippon Screen Mfg. Co., Ltd.
O hiragino-pron - see above
same with ProN/StdN instead of Pro/Std
+O hiragino-elcapitan-pron
+O hiragino-elcapitan
+ bundled with Mac OS X 11.10 El Capitan
+ 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")
+
P kozuka - by Adobe Systems, bundled with Adobe's software
KozMinPro-Light.otf
KozMinPro-Regular.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
new file mode 100644
index 00000000000..4d486c05c77
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-hiragino-elcapitan-pron.map
@@ -0,0 +1,92 @@
+
+% TEXT, 90JIS
+hminl-h H HiraMinProN-W2.otf
+hminl-v V HiraMinProN-W2.otf
+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
+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
+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
+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-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-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-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-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-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-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
+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
+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
new file mode 100644
index 00000000000..66aecce7b2f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/otf-up-hiragino-elcapitan-pron.map
@@ -0,0 +1,32 @@
+
+% TEXT, 90JIS
+uphminl-h UniJIS-UTF16-H HiraMinProN-W2.otf
+uphminl-v UniJIS-UTF16-V HiraMinProN-W2.otf
+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
+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
+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
+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
new file mode 100644
index 00000000000..4fca2c0182e
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron-04.map
@@ -0,0 +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
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
new file mode 100644
index 00000000000..df6d8e33cbd
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/ptex-hiragino-elcapitan-pron.map
@@ -0,0 +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
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
new file mode 100644
index 00000000000..7fcc852d988
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron-04.map
@@ -0,0 +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
+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
+uprml-hq UniJIS-UCS2-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+upgbm-hq UniJIS-UCS2-H :1: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
new file mode 100644
index 00000000000..036b932f6e3
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan-pron/uptex-hiragino-elcapitan-pron.map
@@ -0,0 +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
+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
+uprml-hq UniJIS-UCS2-H :0:HiraginoSerif-W3.ttc %!PS HiraMinProN-W3
+upgbm-hq UniJIS-UCS2-H :1: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
new file mode 100644
index 00000000000..4dafd933ff3
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-hiragino-elcapitan.map
@@ -0,0 +1,92 @@
+
+% TEXT, 90JIS
+hminl-h H HiraMinPro-W2.otf
+hminl-v V HiraMinPro-W2.otf
+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
+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
+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
+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-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-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-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-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-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-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
+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
+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
new file mode 100644
index 00000000000..9c4ca605822
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/otf-up-hiragino-elcapitan.map
@@ -0,0 +1,32 @@
+
+% TEXT, 90JIS
+uphminl-h UniJIS-UTF16-H HiraMinPro-W2.otf
+uphminl-v UniJIS-UTF16-V HiraMinPro-W2.otf
+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
+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
+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
+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
new file mode 100644
index 00000000000..c295e15817f
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan-04.map
@@ -0,0 +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
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
new file mode 100644
index 00000000000..86502fcef8b
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/ptex-hiragino-elcapitan.map
@@ -0,0 +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
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
new file mode 100644
index 00000000000..3194d665bc7
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan-04.map
@@ -0,0 +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
+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
+uprml-hq UniJIS-UCS2-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+upgbm-hq UniJIS-UCS2-H :2: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
new file mode 100644
index 00000000000..3667c6dc855
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-elcapitan/uptex-hiragino-elcapitan.map
@@ -0,0 +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
+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
+uprml-hq UniJIS-UCS2-H :1:HiraginoSerif-W3.ttc %!PS HiraMinPro-W3
+upgbm-hq UniJIS-UCS2-H :2:HiraginoSans-W6.ttc %!PS HiraKakuPro-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 29820f5fc4f..fd4602dd324 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
@@ -80,13 +80,13 @@ otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruProN-W4.otf
otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruProN-W4.otf
% hiraprop
-hiramin-w3-h Identity-H HiraMinProN-W3
-hiramin-w6-h Identity-H HiraMinProN-W6
-hirakaku-w3-h Identity-H HiraKakuProN-W3
-hirakaku-w6-h Identity-H HiraKakuProN-W6
-hiramaru-w4-h Identity-H HiraMaruProN-W4
-hiramin-w3-v Identity-V HiraMinProN-W3
-hiramin-w6-v Identity-V HiraMinProN-W6
-hirakaku-w3-v Identity-V HiraKakuProN-W3
-hirakaku-w6-v Identity-V HiraKakuProN-W6
-hiramaru-w4-v Identity-V HiraMaruProN-W4
+hiramin-w3-h Identity-H HiraMinProN-W3.otf
+hiramin-w6-h Identity-H HiraMinProN-W6.otf
+hirakaku-w3-h Identity-H HiraKakuProN-W3.otf
+hirakaku-w6-h Identity-H HiraKakuProN-W6.otf
+hiramaru-w4-h Identity-H HiraMaruProN-W4.otf
+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
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 79b3ae94dc1..03c3b77210e 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
@@ -80,13 +80,13 @@ otf-ujmgrn-h UniJIS2004-UTF16-H HiraMaruPro-W4.otf
otf-ujmgrn-v UniJIS2004-UTF16-V HiraMaruPro-W4.otf
% hiraprop
-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.otf
+hiramin-w6-h Identity-H HiraMinPro-W6.otf
+hirakaku-w3-h Identity-H HiraKakuPro-W3.otf
+hirakaku-w6-h Identity-H HiraKakuPro-W6.otf
+hiramaru-w4-h Identity-H HiraMaruPro-W4.otf
+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
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map
new file mode 100644
index 00000000000..2d1bf333ab7
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-up-yu-win10.map
@@ -0,0 +1,32 @@
+
+% TEXT, 90JIS
+uphminl-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light
+uphminl-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
+uphminr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
+uphminr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
+uphminb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
+uphminb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+uphgothr-h UniJIS-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
+uphgothr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
+uphgothb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+uphgothb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+uphgotheb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+uphgotheb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+uphmgothr-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+uphmgothr-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light
+uphminln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
+uphminrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
+uphminrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
+uphminbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
+uphminbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+uphgothrn-h UniJIS2004-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
+uphgothrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
+uphgothbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+uphgothbn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+uphgothebn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+uphgothebn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+uphmgothrn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+uphmgothrn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map
new file mode 100644
index 00000000000..0d4f3ab7d48
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/otf-yu-win10.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h H yuminl.ttf %!PS YuMincho-Light
+hminl-v V yuminl.ttf %!PS YuMincho-Light
+hminr-h H yumin.ttf %!PS YuMincho-Regular
+hminr-v V yumin.ttf %!PS YuMincho-Regular
+hminb-h H yumindb.ttf %!PS YuMincho-DemiBold
+hminb-v V yumindb.ttf %!PS YuMincho-DemiBold
+hgothr-h H :0:YuGothR.ttc %!PS YuGothic-Regular
+hgothr-v V :0:YuGothR.ttc %!PS YuGothic-Regular
+hgothb-h H :0:YuGothB.ttc %!PS YuGothic-Bold
+hgothb-v V :0:YuGothB.ttc %!PS YuGothic-Bold
+hgotheb-h H :0:YuGothB.ttc %!PS YuGothic-Bold
+hgotheb-v V :0:YuGothB.ttc %!PS YuGothic-Bold
+hmgothr-h H :0:YuGothB.ttc %!PS YuGothic-Bold
+hmgothr-v V :0:YuGothB.ttc %!PS YuGothic-Bold
+
+% TEXT, JIS04
+hminln-h H yuminl.ttf %!PS YuMincho-Light
+hminln-v V yuminl.ttf %!PS YuMincho-Light
+hminrn-h H yumin.ttf %!PS YuMincho-Regular
+hminrn-v V yumin.ttf %!PS YuMincho-Regular
+hminbn-h H yumindb.ttf %!PS YuMincho-DemiBold
+hminbn-v V yumindb.ttf %!PS YuMincho-DemiBold
+hgothrn-h H :0:YuGothR.ttc %!PS YuGothic-Regular
+hgothrn-v V :0:YuGothR.ttc %!PS YuGothic-Regular
+hgothbn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
+hgothbn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
+hgothebn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
+hgothebn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
+hmgothrn-h H :0:YuGothB.ttc %!PS YuGothic-Bold
+hmgothrn-v V :0:YuGothB.ttc %!PS YuGothic-Bold
+
+% CID
+otf-cjml-h Identity-H yuminl.ttf/AJ16 %!PS YuMincho-Light
+otf-cjml-v Identity-V yuminl.ttf/AJ16 %!PS YuMincho-Light
+otf-cjmr-h Identity-H yumin.ttf/AJ16 %!PS YuMincho-Regular
+otf-cjmr-v Identity-V yumin.ttf/AJ16 %!PS YuMincho-Regular
+otf-cjmb-h Identity-H yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
+otf-cjmb-v Identity-V yumindb.ttf/AJ16 %!PS YuMincho-DemiBold
+otf-cjgr-h Identity-H :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular
+otf-cjgr-v Identity-V :0:YuGothR.ttc/AJ16 %!PS YuGothic-Regular
+otf-cjgb-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
+otf-cjgb-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
+otf-cjge-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
+otf-cjge-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
+otf-cjmgr-h Identity-H :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
+otf-cjmgr-v Identity-V :0:YuGothB.ttc/AJ16 %!PS YuGothic-Bold
+
+% Unicode 90JIS
+otf-ujml-h UniJIS-UTF16-H yuminl.ttf %!PS YuMincho-Light
+otf-ujml-v UniJIS-UTF16-V yuminl.ttf %!PS YuMincho-Light
+otf-ujmr-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
+otf-ujmr-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
+otf-ujmb-h UniJIS-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujmb-v UniJIS-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujgr-h UniJIS-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
+otf-ujgr-v UniJIS-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
+otf-ujgb-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujgb-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujge-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujge-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujmgr-h UniJIS-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujmgr-v UniJIS-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+
+% Unicode JIS04
+otf-ujmln-h UniJIS2004-UTF16-H yuminl.ttf %!PS YuMincho-Light
+otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf %!PS YuMincho-Light
+otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf %!PS YuMincho-Regular
+otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf %!PS YuMincho-Regular
+otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf %!PS YuMincho-DemiBold
+otf-ujgrn-h UniJIS2004-UTF16-H :0:YuGothR.ttc %!PS YuGothic-Regular
+otf-ujgrn-v UniJIS2004-UTF16-V :0:YuGothR.ttc %!PS YuGothic-Regular
+otf-ujgbn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujgbn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujgen-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujgen-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujmgrn-h UniJIS2004-UTF16-H :0:YuGothB.ttc %!PS YuGothic-Bold
+otf-ujmgrn-v UniJIS2004-UTF16-V :0:YuGothB.ttc %!PS YuGothic-Bold
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map
new file mode 100644
index 00000000000..6723260b648
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/ptex-yu-win10.map
@@ -0,0 +1,4 @@
+rml H yumin.ttf %!PS YuMincho-Regular
+rmlv V yumin.ttf %!PS YuMincho-Regular
+gbm H :0:YuGothM.ttc %!PS YuGothic-Medium
+gbmv V :0:YuGothM.ttc %!PS YuGothic-Medium
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map
new file mode 100644
index 00000000000..bdf7659b4c6
--- /dev/null
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/yu-win10/uptex-yu-win10.map
@@ -0,0 +1,10 @@
+urml UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
+urmlv UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
+ugbm UniJIS-UTF16-H :0:YuGothM.ttc %!PS YuGothic-Medium
+ugbmv UniJIS-UTF16-V :0:YuGothM.ttc %!PS YuGothic-Medium
+uprml-h UniJIS-UTF16-H yumin.ttf %!PS YuMincho-Regular
+uprml-v UniJIS-UTF16-V yumin.ttf %!PS YuMincho-Regular
+upgbm-h UniJIS-UTF16-H :0:YuGothM.ttc %!PS YuGothic-Medium
+upgbm-v UniJIS-UTF16-V :0:YuGothM.ttc %!PS YuGothic-Medium
+uprml-hq UniJIS-UCS2-H yumin.ttf %!PS YuMincho-Regular
+upgbm-hq UniJIS-UCS2-H :0:YuGothM.ttc %!PS YuGothic-Medium
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
index c255c8c8215..ce1613d82ee 100755
--- a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
+++ b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
@@ -1,20 +1,19 @@
#!/usr/bin/env perl
# kanji-config-updmap: setup Japanese font embedding
-# Version 20140301.0
+# Version 20150924.0
#
# formerly known as updmap-setup-kanji
#
# Copyright 2004-2006 by KOBAYASHI R. Taizo for the shell version (updmap-otf)
-# Copyright 2011-2014 by PREINING Norbert
+# Copyright 2011-2015 by PREINING Norbert
#
# This file is licensed under GPL version 3 or any later version.
# For copyright statements see end of file.
#
# For development see
-# https://git.gitorious.org/tlptexlive/jfontmaps.git
+# https://github.com/norbusan/jfontmaps
#
-# For a changelog see
-# https://gitorious.org/tlptexlive/jfontmaps/blobs/master/ChangeLog
+# For a changelog see the git log
#
$^W = 1;
@@ -22,7 +21,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use strict;
my $prg = "kanji-config-updmap";
-my $version = '20140301.0';
+my $version = '20150924.0';
my $updmap_real = "updmap";
my $updmap = $updmap_real;
@@ -66,6 +65,8 @@ if ($opt_help) {
my %representatives = (
"hiragino" => "HiraMinPro-W3.otf",
"hiragino-pron" => "HiraMinProN-W3.otf",
+ "hiragino-elcapitan" => "HiraginoSerif-W3.ttc",
+ "hiragino-elcapitan-pron" => "HiraginoSerif-W3.ttc",
"morisawa" => "A-OTF-RyuminPro-Light.otf",
"morisawa-pr6n" => "A-OTF-RyuminPr6N-Light.otf",
"kozuka" => "KozMinPro-Regular.otf",
@@ -112,9 +113,10 @@ sub Usage {
map file otf-<family>.map has to be available.
auto: embed one of the following supported font families
automatically:
- hiragino, hiragino-pron, morisawa, morisawa-pr6n,
+ hiragino, hiragino-pron, hiragino-elcapitan,
+ hiragino-elcapitan-pron, morisawa, morisawa-pr6n,
kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms,
- yu-osx, yu-win
+ yu-osx, yu-win, yu-win10
and fall back to not embedding any font if none of them
is available
nofont: embed no fonts (and rely on system fonts when displaying pdfs)
@@ -244,8 +246,9 @@ sub SetupReplacement {
# then use them
for my $i (qw/
morisawa-pr6n yu-osx kozuka-pr6n kozuka-pr6
- hiragino-pron hiragino
- morisawa kozuka yu-win ipaex ipa ms/) {
+ hiragino-pron hiragino-elcapitan-pron hiragino
+ hiragino-elcapitan
+ 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 75e632e3cd8..3f7a58ac69b 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: 20140301.0
+# Version: 20150924.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 = "20140301.0";
+my $version = "20150924.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 98b8f28f5fc..1e1967fca2d 100755
--- a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
+++ b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
@@ -32,6 +32,18 @@ local foundry = {
mgr='yugothib.ttf %!PS YuGothic-Bold',
{''},
},
+ ['yu-win10'] = {
+ 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',
+ ge=':0:YuGothB.ttc %!PS YuGothic-Bold',
+ mgr=':0:YuGothB.ttc %!PS YuGothic-Bold',
+ {''},
+ },
['yu-osx'] = {
noncid = false,
ml='YuMin-Medium.otf',
@@ -112,16 +124,27 @@ local foundry = {
mgr='HiraMaru?-W4.otf',
{'X','Xn'}, -- Pro and ProN
},
+ ['hiragino-elcapitan'] = {
+ 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',
+ mgr='#0+HiraginoSansR-W4.ttc %!PS HiraMaru?-W4',
+ {'X','Xn'}, -- Pro and ProN
+ },
}
local suffix = {
- -- { '?' 置換, kanjiEmbed 接尾辞 }
+ -- { '?' 置換, kanjiEmbed 接尾辞, (ttc index mov)}
[''] = {'', ''}, -- 非 CID フォント用ダミー
['n'] = {'!', ''}, -- 非埋め込みに使用
['4'] = {'Pro', ''},
['6'] = {'Pr6', '-pr6'},
- ['X'] = {'Pro', ''}, -- ヒラギノ基本6書体パック
- ['Xn'] = {'ProN', '-pron'}, -- ヒラギノ基本6書体パック
+ ['X'] = {'Pro', '', '0'}, -- ヒラギノ
+ ['Xn'] = {'ProN', '-pron', '1'}, -- ヒラギノ
['6n'] = {'Pr6N','-pr6n'},
['6nm'] = {'Pr6N',''}, -- モリサワ Pr6N
}
@@ -226,10 +249,17 @@ local maps = {
local jis2004_flag = 'n'
local gsub = string.gsub
+function string.explode(s, sep)
+ local t = {}
+ sep = sep or '\n'
+ string.gsub(s, "([^"..sep.."]*)"..sep, function(c) t[#t+1]=c end)
+ return t
+end
+
local function ret_suffix(fd, s, fa)
if fd=='kozuka' and s=='6' then
return 'ProVI' -- 小塚だけ特別
- elseif fd=='hiragino' then
+ elseif fd:match('hiragino') then
if string.match(s, jis2004_flag) then
return (fa=='ge') and 'StdN' or suffix[s][1]
else
@@ -241,12 +271,23 @@ local function ret_suffix(fd, s, fa)
end
end
+local function replace_index(line, s)
+ local ttc_mov = suffix[s][3]
+ if ttc_mov then
+ local ttc_index, ttc_dir = line:match('#(%d)(.)')
+ if tonumber(ttc_index) then
+ return line:gsub('#..', ':' .. tostring(tonumber(ttc_index)+tonumber(ttc_dir .. ttc_mov)) .. ':')
+ end
+ end
+ return line
+end
+
local function make_one_line(o, fd, s)
if type(o) == 'string' then
return '\n' .. o .. '\n'
else
local fx = foundry[fd]
- local fn = gsub(fx[o[3]], '?', ret_suffix(fd,s,o[3]))
+ local fn = replace_index(gsub(fx[o[3]], '?', ret_suffix(fd,s,o[3])), s)
if fx.noncid and string.match(o[2],'Identity') then
if string.match(fn, '%!PS') then
fn = gsub(fn, ' %%!PS', '/AJ16 %%!PS')
@@ -279,21 +320,25 @@ for fd, v1 in pairs(foundry) do
end
if string.match(mapbase,'otf%-hiragino') then
print(' hiraprop: ' .. mapbase)
- local v2 = gsub([[
+ local v2 = string.explode([[
% hiraprop
-hiramin-w3-h Identity-H HiraMin?-W3
-hiramin-w6-h Identity-H HiraMin?-W6
-hirakaku-w3-h Identity-H HiraKaku?-W3
-hirakaku-w6-h Identity-H HiraKaku?-W6
-hiramaru-w4-h Identity-H HiraMaru?-W4
-hiramin-w3-v Identity-V HiraMin?-W3
-hiramin-w6-v Identity-V HiraMin?-W6
-hirakaku-w3-v Identity-V HiraKaku?-W3
-hirakaku-w6-v Identity-V HiraKaku?-W6
-hiramaru-w4-v Identity-V HiraMaru?-W4
-]],'?', ret_suffix('hiragino', s, ''))
- f:write(v2)
+hiramin-w3-h Identity-H $mr
+hiramin-w6-h Identity-H $mb
+hirakaku-w3-h Identity-H $gr
+hirakaku-w6-h Identity-H $gb
+hiramaru-w4-h Identity-H $mgr
+hiramin-w3-v Identity-V $mr
+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,''))
+ v2[i] = replace_index(v, s)
+ end
+ f:write(table.concat(v2, '\n'))
end
f:close()
end