summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-22 23:05:00 +0000
committerKarl Berry <karl@freefriends.org>2013-11-22 23:05:00 +0000
commitc50741873ba695ded131eba618db95962a0e5f27 (patch)
treeaefb78f55df8a0eeab065db6ee84529e36251fbc /Master
parenta29b710836fa3c0b010456c25471186ef2f97548 (diff)
jfontmaps (per akira)
git-svn-id: svn://tug.org/texlive/trunk@32211 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog72
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/README63
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/examples/series-compare.tex21
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-up-yu-osx.map32
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-yu-osx.map80
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx-04.map4
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx.map4
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx-04.map10
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx.map10
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-up-yu-win.map32
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-yu-win.map80
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-win/ptex-yu-win.map4
-rw-r--r--Master/texmf-dist/doc/fonts/jfontmaps/yu-win/uptex-yu-win.map10
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map32
-rw-r--r--Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map32
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl7
-rwxr-xr-xMaster/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl4
-rwxr-xr-xMaster/texmf-dist/source/jfontmaps/tools/mkmap.lua32
27 files changed, 617 insertions, 200 deletions
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
index 555fe4c3af8..066f8dd5590 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/ChangeLog
@@ -1,6 +1,70 @@
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * Release 20131120.0 (HEAD, master) [5289b6d]
+
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * update README file for current status of yu fonts [76bf41b]
+
+2013-11-20 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Regenerated map files by tools/mkmap.lua. (gito-h7ks/h7k, h7k) [542c445]
+
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * update README file for renaming (origin/master) [3814a07]
+
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * update also otf-up-yu-osx [78b56f2]
+
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * Merge branch 'h7k' [76f9df3]
+
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * activate JISX 0213:2004 for otf-up-* generation [c3bdbd6]
+
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * add another example comparing the series [1451685]
+
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * update otf-up-yu for JISX 0213:2004 [c5c7872]
+
+2013-11-20 Norbert Preining <preining@logic.at>
+
+ * update map files for JISX 0213:2004 from Kakuto Akira via TL svn [4fa1342]
+
+2013-10-28 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Renamed 'yu' -> 'yu-win', and added 'yu-osx'. [dbccf2c]
+
+2013-10-28 Norbert Preining <preining@logic.at>
+
+ * add some docs on origin of the fonts [4ab0483]
+
+2013-10-28 Norbert Preining <preining@logic.at>
+
+ * support and document yu fonts [0fd3f12]
+
+2013-10-28 Norbert Preining <preining@logic.at>
+
+ * Merge branch 'h7k' of git://gitorious.org/~h7k/tlptexlive/h7ks-jfontmaps into h7k [b96703f]
+
+2013-10-26 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * 游明朝/游ゴシック don't fully cover AJ1-6, so '-pr6n' is dropped. [4fc4e7a]
+
+2013-10-25 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * Added 游明朝/游ゴシック setting (not confirmed) [62db77e]
+
2013-04-18 Norbert Preining <preining@logic.at>
- * Release 20130418.0 (HEAD, master) [c9405ae]
+ * Release 20130418.0 (tag: 20130418.0) [c9405ae]
2013-04-18 Norbert Preining <preining@logic.at>
@@ -16,7 +80,7 @@
2013-04-18 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
- * Forgot to add kozuka-pr6. (gito-h7ks/h7k, h7k) [fcd3b9f]
+ * Forgot to add kozuka-pr6. [fcd3b9f]
2013-04-18 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
@@ -24,7 +88,7 @@
2013-04-10 Norbert Preining <preining@logic.at>
- * Release 20130410.0 (20130410.0, origin/master) [92ba691]
+ * Release 20130410.0 (tag: 20130410.0) [92ba691]
2013-04-10 Norbert Preining <preining@logic.at>
@@ -140,7 +204,7 @@
2013-03-26 Norbert Preining <preining@logic.at>
- * initial checking of state as in svn (tl2012-state) [1023d76]
+ * initial checking of state as in svn (tag: tl2012-state) [1023d76]
2012-06-19 Norbert Preining <preining@logic.at>
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/README b/Master/texmf-dist/doc/fonts/jfontmaps/README
index 14e72674695..a1149e0eb57 100644
--- a/Master/texmf-dist/doc/fonts/jfontmaps/README
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/README
@@ -1,7 +1,7 @@
jfontmaps
=========
-Current release: 20130418.0
+Current release: 20131120.0
The files contained in this package contains font maps for dvipdfmx to
make various Japanese fonts available for (u)ptex and related programs
@@ -22,38 +22,65 @@ map files for dvipdfmx. You have to obtain the fonts separately.
For ipa and ipaex the respective fonts a shipped in TeX Live
and are available for free.
+If in the following tables some fonts are marked with
+ '(<= "...")
+it means that the fonts are originally named as in given within
+the parenthesis, but need to be renamed to the name given first.
+
O: kanjiVariant '-04' is supported.
P: We have '-04' maps, but fonts lack some glyphs
X: We don't have '-04' maps.
4: no -04 maps, but all glyphs have automatically JIS2004
-O noEmbed
+O noEmbed - no embedding is done at all, fonts are selected by the viewer
(no font needed for dvipdfmx)
-X ms
+X ms - MS Mincho and MS Gothic, shipped with Windows
msmincho.ttc
msgothic.ttc
-4 ipa
+O? yu-win - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
+ bundled with Win 8.1.
+ yumin.ttf
+ yuminl.ttf
+ yumindb.ttf
+ yugothic.ttf
+ yugothib.ttf
+
+O? yu-osx - Yu Mincho and Yu Gothic fonts by Jiyu-koubou LTD.,
+ bundled with OSX 10.9.
+ YuGothic-Bold.otf (<= "Yu Gothic Bold.otf")
+ YuGothic-Medium.otf (<= "Yu Gothic Medium.otf")
+ YuMincho-Demibold.otf (<= "Yu Mincho Demibold.otf")
+ YuMincho-Medium.otf (<= "Yu Mincho Medium.otf")
+
+
+4 ipa - IPA fonts from Information-technology Promotion Agency
ipam.ttf
ipag.ttf
-4 ipaex
+4 ipaex - IPAex fonts from Information-technology Promotion Agency
ipaexm.ttf
ipaexg.ttf
-O? hiragino
- HiraMinPro-W2.otf
- HiraMinPro-W3.otf
- HiraMinPro-W6.otf
- HiraKakuPro-W6.otf
- HiraKakuStd-W8.otf
- HiraMaruPro-W4.otf
-O hiragino-pron
+O? hiragino - Hiragino fonts by Dainippon Screen Mfg. Co., Ltd.
+ bundled with Mac OS X 10.5 or later,
+ or Japanese word processor Ichitaro 2012 Premium/Super-premium editions
+ HiraMinPro-W2.otf (<= "ヒラギノ明朝 Pro W2.otf")
+ HiraMinPro-W3.otf (<= "ヒラギノ明朝 Pro W3.otf")
+ HiraMinPro-W6.otf (<= "ヒラギノ明朝 Pro W6.otf")
+ HiraKakuPro-W3.otf (<= "ヒラギノ角ゴ Pro W3.otf")
+ HiraKakuPro-W6.otf (<= "ヒラギノ角ゴ Pro W6.otf")
+ HiraKakuStd-W8.otf (<= "ヒラギノ角ゴ Std W8.otf")
+ HiraMaruPro-W4.otf (<= "ヒラギノ丸ゴ Pro W4.otf")
+
+ If you use Mac OSX, you must create symlink
+
+O hiragino-pron - see above
same with ProN/StdN instead of Pro/Std
-P kozuka
+P kozuka - by Adobe Systems, bundled with Adobe's software
KozMinPro-Light.otf
KozMinPro-Regular.otf
KozMinPro-Bold.otf
@@ -62,13 +89,13 @@ P kozuka
KozGoPro-Bold.otf
KozGoPro-Heavy.otf
-O kozuka-pr6n
+O kozuka-pr6n - see above
same with Pr6N instead of Pro
-O kozuka-pr6
+O kozuka-pr6 - see above
same with ProVI instead of Pro
-P morisawa
+P morisawa - by Morisawa Inc.
A-OTF-FutoGoB101Pro-Bold.otf
A-OTF-FutoMinA101Pro-Bold.otf
A-OTF-GothicBBBPro-Medium.otf
@@ -76,7 +103,7 @@ P morisawa
A-OTF-MidashiGoPro-MB31.otf
A-OTF-RyuminPro-Light.otf
-O morisawa-pr6n
+O morisawa-pr6n - see above
same with Pr6N instead of Pro
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/examples/series-compare.tex b/Master/texmf-dist/doc/fonts/jfontmaps/examples/series-compare.tex
new file mode 100644
index 00000000000..2a69e161da2
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/examples/series-compare.tex
@@ -0,0 +1,21 @@
+\ifdefined\ucs
+ \documentclass[uplatex]{jsarticle}
+ \usepackage[uplatex,deluxe]{otf}
+\else
+ \documentclass{jsarticle}
+ \usepackage[deluxe]{otf}
+\fi
+\begin{document}
+\def\R{\par\noindent%
+ \vbox{\LARGE\hsize=20zw\noindent\kanjiskip=0pt
+ 逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄}}
+
+\kanjifamily{hmc}\kanjiseries{l}\selectfont \R(明朝,細)
+\kanjifamily{hmc}\kanjiseries{m}\selectfont \R(明朝,中)
+\kanjifamily{hmc}\kanjiseries{bx}\selectfont \R(明朝,太)
+\kanjifamily{hgt}\kanjiseries{m}\selectfont \R(ゴチ,中)
+\kanjifamily{hgt}\kanjiseries{bx}\selectfont \R(ゴチ,太)
+\kanjifamily{hgt}\kanjiseries{eb}\selectfont \R(ゴチ,極太)
+\kanjifamily{mg}\kanjiseries{m}\selectfont \R(丸ゴ)
+
+\end{document}
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-up-yu-osx.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-up-yu-osx.map
new file mode 100644
index 00000000000..3f9870ca639
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-up-yu-osx.map
@@ -0,0 +1,32 @@
+
+% TEXT, 90JIS
+uphminl-h UniJIS-UTF16-H YuMincho-Medium.otf
+uphminl-v UniJIS-UTF16-V YuMincho-Medium.otf
+uphminr-h UniJIS-UTF16-H YuMincho-Medium.otf
+uphminr-v UniJIS-UTF16-V YuMincho-Medium.otf
+uphminb-h UniJIS-UTF16-H YuMincho-Demibold.otf
+uphminb-v UniJIS-UTF16-V YuMincho-Demibold.otf
+uphgothr-h UniJIS-UTF16-H YuGothic-Medium.otf
+uphgothr-v UniJIS-UTF16-V YuGothic-Medium.otf
+uphgothb-h UniJIS-UTF16-H YuGothic-Bold.otf
+uphgothb-v UniJIS-UTF16-V YuGothic-Bold.otf
+uphgotheb-h UniJIS-UTF16-H YuGothic-Bold.otf
+uphgotheb-v UniJIS-UTF16-V YuGothic-Bold.otf
+uphmgothr-h UniJIS-UTF16-H YuGothic-Bold.otf
+uphmgothr-v UniJIS-UTF16-V YuGothic-Bold.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H YuMincho-Medium.otf
+uphminln-v UniJIS2004-UTF16-V YuMincho-Medium.otf
+uphminrn-h UniJIS2004-UTF16-H YuMincho-Medium.otf
+uphminrn-v UniJIS2004-UTF16-V YuMincho-Medium.otf
+uphminbn-h UniJIS2004-UTF16-H YuMincho-Demibold.otf
+uphminbn-v UniJIS2004-UTF16-V YuMincho-Demibold.otf
+uphgothrn-h UniJIS2004-UTF16-H YuGothic-Medium.otf
+uphgothrn-v UniJIS2004-UTF16-V YuGothic-Medium.otf
+uphgothbn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
+uphgothbn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
+uphgothebn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
+uphgothebn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
+uphmgothrn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
+uphmgothrn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-yu-osx.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-yu-osx.map
new file mode 100644
index 00000000000..5026302c739
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/otf-yu-osx.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h H YuMincho-Medium.otf
+hminl-v V YuMincho-Medium.otf
+hminr-h H YuMincho-Medium.otf
+hminr-v V YuMincho-Medium.otf
+hminb-h H YuMincho-Demibold.otf
+hminb-v V YuMincho-Demibold.otf
+hgothr-h H YuGothic-Medium.otf
+hgothr-v V YuGothic-Medium.otf
+hgothb-h H YuGothic-Bold.otf
+hgothb-v V YuGothic-Bold.otf
+hgotheb-h H YuGothic-Bold.otf
+hgotheb-v V YuGothic-Bold.otf
+hmgothr-h H YuGothic-Bold.otf
+hmgothr-v V YuGothic-Bold.otf
+
+% TEXT, JIS04
+hminln-h H YuMincho-Medium.otf
+hminln-v V YuMincho-Medium.otf
+hminrn-h H YuMincho-Medium.otf
+hminrn-v V YuMincho-Medium.otf
+hminbn-h H YuMincho-Demibold.otf
+hminbn-v V YuMincho-Demibold.otf
+hgothrn-h H YuGothic-Medium.otf
+hgothrn-v V YuGothic-Medium.otf
+hgothbn-h H YuGothic-Bold.otf
+hgothbn-v V YuGothic-Bold.otf
+hgothebn-h H YuGothic-Bold.otf
+hgothebn-v V YuGothic-Bold.otf
+hmgothrn-h H YuGothic-Bold.otf
+hmgothrn-v V YuGothic-Bold.otf
+
+% CID
+otf-cjml-h Identity-H YuMincho-Medium.otf
+otf-cjml-v Identity-V YuMincho-Medium.otf
+otf-cjmr-h Identity-H YuMincho-Medium.otf
+otf-cjmr-v Identity-V YuMincho-Medium.otf
+otf-cjmb-h Identity-H YuMincho-Demibold.otf
+otf-cjmb-v Identity-V YuMincho-Demibold.otf
+otf-cjgr-h Identity-H YuGothic-Medium.otf
+otf-cjgr-v Identity-V YuGothic-Medium.otf
+otf-cjgb-h Identity-H YuGothic-Bold.otf
+otf-cjgb-v Identity-V YuGothic-Bold.otf
+otf-cjge-h Identity-H YuGothic-Bold.otf
+otf-cjge-v Identity-V YuGothic-Bold.otf
+otf-cjmgr-h Identity-H YuGothic-Bold.otf
+otf-cjmgr-v Identity-V YuGothic-Bold.otf
+
+% Unicode 90JIS
+otf-ujml-h UniJIS-UTF16-H YuMincho-Medium.otf
+otf-ujml-v UniJIS-UTF16-V YuMincho-Medium.otf
+otf-ujmr-h UniJIS-UTF16-H YuMincho-Medium.otf
+otf-ujmr-v UniJIS-UTF16-V YuMincho-Medium.otf
+otf-ujmb-h UniJIS-UTF16-H YuMincho-Demibold.otf
+otf-ujmb-v UniJIS-UTF16-V YuMincho-Demibold.otf
+otf-ujgr-h UniJIS-UTF16-H YuGothic-Medium.otf
+otf-ujgr-v UniJIS-UTF16-V YuGothic-Medium.otf
+otf-ujgb-h UniJIS-UTF16-H YuGothic-Bold.otf
+otf-ujgb-v UniJIS-UTF16-V YuGothic-Bold.otf
+otf-ujge-h UniJIS-UTF16-H YuGothic-Bold.otf
+otf-ujge-v UniJIS-UTF16-V YuGothic-Bold.otf
+otf-ujmgr-h UniJIS-UTF16-H YuGothic-Bold.otf
+otf-ujmgr-v UniJIS-UTF16-V YuGothic-Bold.otf
+
+% Unicode JIS04
+otf-ujmln-h UniJIS2004-UTF16-H YuMincho-Medium.otf
+otf-ujmln-v UniJIS2004-UTF16-V YuMincho-Medium.otf
+otf-ujmrn-h UniJIS2004-UTF16-H YuMincho-Medium.otf
+otf-ujmrn-v UniJIS2004-UTF16-V YuMincho-Medium.otf
+otf-ujmbn-h UniJIS2004-UTF16-H YuMincho-Demibold.otf
+otf-ujmbn-v UniJIS2004-UTF16-V YuMincho-Demibold.otf
+otf-ujgrn-h UniJIS2004-UTF16-H YuGothic-Medium.otf
+otf-ujgrn-v UniJIS2004-UTF16-V YuGothic-Medium.otf
+otf-ujgbn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
+otf-ujgbn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
+otf-ujgen-h UniJIS2004-UTF16-H YuGothic-Bold.otf
+otf-ujgen-v UniJIS2004-UTF16-V YuGothic-Bold.otf
+otf-ujmgrn-h UniJIS2004-UTF16-H YuGothic-Bold.otf
+otf-ujmgrn-v UniJIS2004-UTF16-V YuGothic-Bold.otf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx-04.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx-04.map
new file mode 100644
index 00000000000..d9c0ecac493
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx-04.map
@@ -0,0 +1,4 @@
+rml 2004-H YuMincho-Medium.otf
+rmlv 2004-V YuMincho-Medium.otf
+gbm 2004-H YuGothic-Medium.otf
+gbmv 2004-V YuGothic-Medium.otf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx.map
new file mode 100644
index 00000000000..c903ca80f46
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/ptex-yu-osx.map
@@ -0,0 +1,4 @@
+rml H YuMincho-Medium.otf
+rmlv V YuMincho-Medium.otf
+gbm H YuGothic-Medium.otf
+gbmv V YuGothic-Medium.otf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx-04.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx-04.map
new file mode 100644
index 00000000000..74652597b59
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx-04.map
@@ -0,0 +1,10 @@
+urml UniJIS2004-UTF16-H YuMincho-Medium.otf
+urmlv UniJIS2004-UTF16-V YuMincho-Medium.otf
+ugbm UniJIS2004-UTF16-H YuGothic-Medium.otf
+ugbmv UniJIS2004-UTF16-V YuGothic-Medium.otf
+uprml-h UniJIS2004-UTF16-H YuMincho-Medium.otf
+uprml-v UniJIS2004-UTF16-V YuMincho-Medium.otf
+upgbm-h UniJIS2004-UTF16-H YuGothic-Medium.otf
+upgbm-v UniJIS2004-UTF16-V YuGothic-Medium.otf
+uprml-hq UniJIS-UCS2-H YuMincho-Medium.otf
+upgbm-hq UniJIS-UCS2-H YuGothic-Medium.otf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx.map
new file mode 100644
index 00000000000..d68e69e1c37
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-osx/uptex-yu-osx.map
@@ -0,0 +1,10 @@
+urml UniJIS-UTF16-H YuMincho-Medium.otf
+urmlv UniJIS-UTF16-V YuMincho-Medium.otf
+ugbm UniJIS-UTF16-H YuGothic-Medium.otf
+ugbmv UniJIS-UTF16-V YuGothic-Medium.otf
+uprml-h UniJIS-UTF16-H YuMincho-Medium.otf
+uprml-v UniJIS-UTF16-V YuMincho-Medium.otf
+upgbm-h UniJIS-UTF16-H YuGothic-Medium.otf
+upgbm-v UniJIS-UTF16-V YuGothic-Medium.otf
+uprml-hq UniJIS-UCS2-H YuMincho-Medium.otf
+upgbm-hq UniJIS-UCS2-H YuGothic-Medium.otf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-up-yu-win.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-up-yu-win.map
new file mode 100644
index 00000000000..0ba5461c2e1
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-up-yu-win.map
@@ -0,0 +1,32 @@
+
+% TEXT, 90JIS
+uphminl-h UniJIS-UTF16-H yuminl.ttf
+uphminl-v UniJIS-UTF16-V yuminl.ttf
+uphminr-h UniJIS-UTF16-H yumin.ttf
+uphminr-v UniJIS-UTF16-V yumin.ttf
+uphminb-h UniJIS-UTF16-H yumindb.ttf
+uphminb-v UniJIS-UTF16-V yumindb.ttf
+uphgothr-h UniJIS-UTF16-H yugothic.ttf
+uphgothr-v UniJIS-UTF16-V yugothic.ttf
+uphgothb-h UniJIS-UTF16-H yugothib.ttf
+uphgothb-v UniJIS-UTF16-V yugothib.ttf
+uphgotheb-h UniJIS-UTF16-H yugothib.ttf
+uphgotheb-v UniJIS-UTF16-V yugothib.ttf
+uphmgothr-h UniJIS-UTF16-H yugothib.ttf
+uphmgothr-v UniJIS-UTF16-V yugothib.ttf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H yuminl.ttf
+uphminln-v UniJIS2004-UTF16-V yuminl.ttf
+uphminrn-h UniJIS2004-UTF16-H yumin.ttf
+uphminrn-v UniJIS2004-UTF16-V yumin.ttf
+uphminbn-h UniJIS2004-UTF16-H yumindb.ttf
+uphminbn-v UniJIS2004-UTF16-V yumindb.ttf
+uphgothrn-h UniJIS2004-UTF16-H yugothic.ttf
+uphgothrn-v UniJIS2004-UTF16-V yugothic.ttf
+uphgothbn-h UniJIS2004-UTF16-H yugothib.ttf
+uphgothbn-v UniJIS2004-UTF16-V yugothib.ttf
+uphgothebn-h UniJIS2004-UTF16-H yugothib.ttf
+uphgothebn-v UniJIS2004-UTF16-V yugothib.ttf
+uphmgothrn-h UniJIS2004-UTF16-H yugothib.ttf
+uphmgothrn-v UniJIS2004-UTF16-V yugothib.ttf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-yu-win.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-yu-win.map
new file mode 100644
index 00000000000..e0b1794cef7
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/otf-yu-win.map
@@ -0,0 +1,80 @@
+
+% TEXT, 90JIS
+hminl-h H yuminl.ttf
+hminl-v V yuminl.ttf
+hminr-h H yumin.ttf
+hminr-v V yumin.ttf
+hminb-h H yumindb.ttf
+hminb-v V yumindb.ttf
+hgothr-h H yugothic.ttf
+hgothr-v V yugothic.ttf
+hgothb-h H yugothib.ttf
+hgothb-v V yugothib.ttf
+hgotheb-h H yugothib.ttf
+hgotheb-v V yugothib.ttf
+hmgothr-h H yugothib.ttf
+hmgothr-v V yugothib.ttf
+
+% TEXT, JIS04
+hminln-h H yuminl.ttf
+hminln-v V yuminl.ttf
+hminrn-h H yumin.ttf
+hminrn-v V yumin.ttf
+hminbn-h H yumindb.ttf
+hminbn-v V yumindb.ttf
+hgothrn-h H yugothic.ttf
+hgothrn-v V yugothic.ttf
+hgothbn-h H yugothib.ttf
+hgothbn-v V yugothib.ttf
+hgothebn-h H yugothib.ttf
+hgothebn-v V yugothib.ttf
+hmgothrn-h H yugothib.ttf
+hmgothrn-v V yugothib.ttf
+
+% CID
+otf-cjml-h Identity-H yuminl.ttf/AJ16
+otf-cjml-v Identity-V yuminl.ttf/AJ16
+otf-cjmr-h Identity-H yumin.ttf/AJ16
+otf-cjmr-v Identity-V yumin.ttf/AJ16
+otf-cjmb-h Identity-H yumindb.ttf/AJ16
+otf-cjmb-v Identity-V yumindb.ttf/AJ16
+otf-cjgr-h Identity-H yugothic.ttf/AJ16
+otf-cjgr-v Identity-V yugothic.ttf/AJ16
+otf-cjgb-h Identity-H yugothib.ttf/AJ16
+otf-cjgb-v Identity-V yugothib.ttf/AJ16
+otf-cjge-h Identity-H yugothib.ttf/AJ16
+otf-cjge-v Identity-V yugothib.ttf/AJ16
+otf-cjmgr-h Identity-H yugothib.ttf/AJ16
+otf-cjmgr-v Identity-V yugothib.ttf/AJ16
+
+% Unicode 90JIS
+otf-ujml-h UniJIS-UTF16-H yuminl.ttf
+otf-ujml-v UniJIS-UTF16-V yuminl.ttf
+otf-ujmr-h UniJIS-UTF16-H yumin.ttf
+otf-ujmr-v UniJIS-UTF16-V yumin.ttf
+otf-ujmb-h UniJIS-UTF16-H yumindb.ttf
+otf-ujmb-v UniJIS-UTF16-V yumindb.ttf
+otf-ujgr-h UniJIS-UTF16-H yugothic.ttf
+otf-ujgr-v UniJIS-UTF16-V yugothic.ttf
+otf-ujgb-h UniJIS-UTF16-H yugothib.ttf
+otf-ujgb-v UniJIS-UTF16-V yugothib.ttf
+otf-ujge-h UniJIS-UTF16-H yugothib.ttf
+otf-ujge-v UniJIS-UTF16-V yugothib.ttf
+otf-ujmgr-h UniJIS-UTF16-H yugothib.ttf
+otf-ujmgr-v UniJIS-UTF16-V yugothib.ttf
+
+% Unicode JIS04
+otf-ujmln-h UniJIS2004-UTF16-H yuminl.ttf
+otf-ujmln-v UniJIS2004-UTF16-V yuminl.ttf
+otf-ujmrn-h UniJIS2004-UTF16-H yumin.ttf
+otf-ujmrn-v UniJIS2004-UTF16-V yumin.ttf
+otf-ujmbn-h UniJIS2004-UTF16-H yumindb.ttf
+otf-ujmbn-v UniJIS2004-UTF16-V yumindb.ttf
+otf-ujgrn-h UniJIS2004-UTF16-H yugothic.ttf
+otf-ujgrn-v UniJIS2004-UTF16-V yugothic.ttf
+otf-ujgbn-h UniJIS2004-UTF16-H yugothib.ttf
+otf-ujgbn-v UniJIS2004-UTF16-V yugothib.ttf
+otf-ujgen-h UniJIS2004-UTF16-H yugothib.ttf
+otf-ujgen-v UniJIS2004-UTF16-V yugothib.ttf
+otf-ujmgrn-h UniJIS2004-UTF16-H yugothib.ttf
+otf-ujmgrn-v UniJIS2004-UTF16-V yugothib.ttf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/ptex-yu-win.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/ptex-yu-win.map
new file mode 100644
index 00000000000..ad943cc25ef
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/ptex-yu-win.map
@@ -0,0 +1,4 @@
+rml H yumin.ttf
+rmlv V yumin.ttf
+gbm H yugothic.ttf
+gbmv V yugothic.ttf
diff --git a/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/uptex-yu-win.map b/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/uptex-yu-win.map
new file mode 100644
index 00000000000..dc64b49c13f
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/jfontmaps/yu-win/uptex-yu-win.map
@@ -0,0 +1,10 @@
+urml UniJIS-UTF16-H yumin.ttf
+urmlv UniJIS-UTF16-V yumin.ttf
+ugbm UniJIS-UTF16-H yugothic.ttf
+ugbmv UniJIS-UTF16-V yugothic.ttf
+uprml-h UniJIS-UTF16-H yumin.ttf
+uprml-v UniJIS-UTF16-V yumin.ttf
+upgbm-h UniJIS-UTF16-H yugothic.ttf
+upgbm-v UniJIS-UTF16-V yugothic.ttf
+uprml-hq UniJIS-UCS2-H yumin.ttf
+upgbm-hq UniJIS-UCS2-H yugothic.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
index 2555f5555ff..7f17033882b 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino-pron/otf-up-hiragino-pron.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H HiraMinProN-W2.otf
uphminl-v UniJIS-UTF16-V HiraMinProN-W2.otf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H HiraKakuStdN-W8.otf
uphgotheb-v UniJIS-UTF16-V HiraKakuStdN-W8.otf
uphmgothr-h UniJIS-UTF16-H HiraMaruProN-W4.otf
uphmgothr-v UniJIS-UTF16-V HiraMaruProN-W4.otf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H HiraMinProN-W2.otf
-uphminln-v UniJIS2004-UTF16-V HiraMinProN-W2.otf
-uphminrn-h UniJIS2004-UTF16-H HiraMinProN-W3.otf
-uphminrn-v UniJIS2004-UTF16-V HiraMinProN-W3.otf
-uphgothrn-h UniJIS2004-UTF16-H HiraKakuProN-W3.otf
-uphgothrn-v UniJIS2004-UTF16-V HiraKakuProN-W3.otf
-uphminbn-h UniJIS2004-UTF16-H HiraMinProN-W6.otf
-uphminbn-v UniJIS2004-UTF16-V HiraMinProN-W6.otf
-uphgothbn-h UniJIS2004-UTF16-H HiraKakuProN-W6.otf
-uphgothbn-v UniJIS2004-UTF16-V HiraKakuProN-W6.otf
-uphgothebn-h UniJIS2004-UTF16-H HiraKakuStdN-W8.otf
-uphgothebn-v UniJIS2004-UTF16-V HiraKakuStdN-W8.otf
-uphmgothrn-h UniJIS2004-UTF16-H HiraMaruProN-W4.otf
-uphmgothrn-v UniJIS2004-UTF16-V HiraMaruProN-W4.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H HiraMinProN-W2.otf
+uphminln-v UniJIS2004-UTF16-V HiraMinProN-W2.otf
+uphminrn-h UniJIS2004-UTF16-H HiraMinProN-W3.otf
+uphminrn-v UniJIS2004-UTF16-V HiraMinProN-W3.otf
+uphminbn-h UniJIS2004-UTF16-H HiraMinProN-W6.otf
+uphminbn-v UniJIS2004-UTF16-V HiraMinProN-W6.otf
+uphgothrn-h UniJIS2004-UTF16-H HiraKakuProN-W3.otf
+uphgothrn-v UniJIS2004-UTF16-V HiraKakuProN-W3.otf
+uphgothbn-h UniJIS2004-UTF16-H HiraKakuProN-W6.otf
+uphgothbn-v UniJIS2004-UTF16-V HiraKakuProN-W6.otf
+uphgothebn-h UniJIS2004-UTF16-H HiraKakuStdN-W8.otf
+uphgothebn-v UniJIS2004-UTF16-V HiraKakuStdN-W8.otf
+uphmgothrn-h UniJIS2004-UTF16-H HiraMaruProN-W4.otf
+uphmgothrn-v UniJIS2004-UTF16-V HiraMaruProN-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
index 0ff5315c00b..9772ad53659 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/hiragino/otf-up-hiragino.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H HiraMinPro-W2.otf
uphminl-v UniJIS-UTF16-V HiraMinPro-W2.otf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8.otf
uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8.otf
uphmgothr-h UniJIS-UTF16-H HiraMaruPro-W4.otf
uphmgothr-v UniJIS-UTF16-V HiraMaruPro-W4.otf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H HiraMinPro-W2.otf
-uphminln-v UniJIS2004-UTF16-V HiraMinPro-W2.otf
-uphminrn-h UniJIS2004-UTF16-H HiraMinPro-W3.otf
-uphminrn-v UniJIS2004-UTF16-V HiraMinPro-W3.otf
-uphgothrn-h UniJIS2004-UTF16-H HiraKakuPro-W3.otf
-uphgothrn-v UniJIS2004-UTF16-V HiraKakuPro-W3.otf
-uphminbn-h UniJIS2004-UTF16-H HiraMinPro-W6.otf
-uphminbn-v UniJIS2004-UTF16-V HiraMinPro-W6.otf
-uphgothbn-h UniJIS2004-UTF16-H HiraKakuPro-W6.otf
-uphgothbn-v UniJIS2004-UTF16-V HiraKakuPro-W6.otf
-uphgothebn-h UniJIS2004-UTF16-H HiraKakuStd-W8.otf
-uphgothebn-v UniJIS2004-UTF16-V HiraKakuStd-W8.otf
-uphmgothrn-h UniJIS2004-UTF16-H HiraMaruPro-W4.otf
-uphmgothrn-v UniJIS2004-UTF16-V HiraMaruPro-W4.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H HiraMinPro-W2.otf
+uphminln-v UniJIS2004-UTF16-V HiraMinPro-W2.otf
+uphminrn-h UniJIS2004-UTF16-H HiraMinPro-W3.otf
+uphminrn-v UniJIS2004-UTF16-V HiraMinPro-W3.otf
+uphminbn-h UniJIS2004-UTF16-H HiraMinPro-W6.otf
+uphminbn-v UniJIS2004-UTF16-V HiraMinPro-W6.otf
+uphgothrn-h UniJIS2004-UTF16-H HiraKakuPro-W3.otf
+uphgothrn-v UniJIS2004-UTF16-V HiraKakuPro-W3.otf
+uphgothbn-h UniJIS2004-UTF16-H HiraKakuPro-W6.otf
+uphgothbn-v UniJIS2004-UTF16-V HiraKakuPro-W6.otf
+uphgothebn-h UniJIS2004-UTF16-H HiraKakuStd-W8.otf
+uphgothebn-v UniJIS2004-UTF16-V HiraKakuStd-W8.otf
+uphmgothrn-h UniJIS2004-UTF16-H HiraMaruPro-W4.otf
+uphmgothrn-v UniJIS2004-UTF16-V HiraMaruPro-W4.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map
index 83d34f8b757..42ccf257a22 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipa/otf-up-ipa.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H ipam.ttf
uphminl-v UniJIS-UTF16-V ipam.ttf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H ipag.ttf
uphgotheb-v UniJIS-UTF16-V ipag.ttf
uphmgothr-h UniJIS-UTF16-H ipag.ttf
uphmgothr-v UniJIS-UTF16-V ipag.ttf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H ipam.ttf
-uphminln-v UniJIS2004-UTF16-V ipam.ttf
-uphminrn-h UniJIS2004-UTF16-H ipam.ttf
-uphminrn-v UniJIS2004-UTF16-V ipam.ttf
-uphgothrn-h UniJIS2004-UTF16-H ipag.ttf
-uphgothrn-v UniJIS2004-UTF16-V ipag.ttf
-uphminbn-h UniJIS2004-UTF16-H ipam.ttf
-uphminbn-v UniJIS2004-UTF16-V ipam.ttf
-uphgothbn-h UniJIS2004-UTF16-H ipag.ttf
-uphgothbn-v UniJIS2004-UTF16-V ipag.ttf
-uphgothebn-h UniJIS2004-UTF16-H ipag.ttf
-uphgothebn-v UniJIS2004-UTF16-V ipag.ttf
-uphmgothrn-h UniJIS2004-UTF16-H ipag.ttf
-uphmgothrn-v UniJIS2004-UTF16-V ipag.ttf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H ipam.ttf
+uphminln-v UniJIS2004-UTF16-V ipam.ttf
+uphminrn-h UniJIS2004-UTF16-H ipam.ttf
+uphminrn-v UniJIS2004-UTF16-V ipam.ttf
+uphminbn-h UniJIS2004-UTF16-H ipam.ttf
+uphminbn-v UniJIS2004-UTF16-V ipam.ttf
+uphgothrn-h UniJIS2004-UTF16-H ipag.ttf
+uphgothrn-v UniJIS2004-UTF16-V ipag.ttf
+uphgothbn-h UniJIS2004-UTF16-H ipag.ttf
+uphgothbn-v UniJIS2004-UTF16-V ipag.ttf
+uphgothebn-h UniJIS2004-UTF16-H ipag.ttf
+uphgothebn-v UniJIS2004-UTF16-V ipag.ttf
+uphmgothrn-h UniJIS2004-UTF16-H ipag.ttf
+uphmgothrn-v UniJIS2004-UTF16-V ipag.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map
index 2e0add8c76d..8844c8c0613 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ipaex/otf-up-ipaex.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H ipaexm.ttf
uphminl-v UniJIS-UTF16-V ipaexm.ttf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H ipaexg.ttf
uphgotheb-v UniJIS-UTF16-V ipaexg.ttf
uphmgothr-h UniJIS-UTF16-H ipaexg.ttf
uphmgothr-v UniJIS-UTF16-V ipaexg.ttf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H ipaexm.ttf
-uphminln-v UniJIS2004-UTF16-V ipaexm.ttf
-uphminrn-h UniJIS2004-UTF16-H ipaexm.ttf
-uphminrn-v UniJIS2004-UTF16-V ipaexm.ttf
-uphgothrn-h UniJIS2004-UTF16-H ipaexg.ttf
-uphgothrn-v UniJIS2004-UTF16-V ipaexg.ttf
-uphminbn-h UniJIS2004-UTF16-H ipaexm.ttf
-uphminbn-v UniJIS2004-UTF16-V ipaexm.ttf
-uphgothbn-h UniJIS2004-UTF16-H ipaexg.ttf
-uphgothbn-v UniJIS2004-UTF16-V ipaexg.ttf
-uphgothebn-h UniJIS2004-UTF16-H ipaexg.ttf
-uphgothebn-v UniJIS2004-UTF16-V ipaexg.ttf
-uphmgothrn-h UniJIS2004-UTF16-H ipaexg.ttf
-uphmgothrn-v UniJIS2004-UTF16-V ipaexg.ttf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H ipaexm.ttf
+uphminln-v UniJIS2004-UTF16-V ipaexm.ttf
+uphminrn-h UniJIS2004-UTF16-H ipaexm.ttf
+uphminrn-v UniJIS2004-UTF16-V ipaexm.ttf
+uphminbn-h UniJIS2004-UTF16-H ipaexm.ttf
+uphminbn-v UniJIS2004-UTF16-V ipaexm.ttf
+uphgothrn-h UniJIS2004-UTF16-H ipaexg.ttf
+uphgothrn-v UniJIS2004-UTF16-V ipaexg.ttf
+uphgothbn-h UniJIS2004-UTF16-H ipaexg.ttf
+uphgothbn-v UniJIS2004-UTF16-V ipaexg.ttf
+uphgothebn-h UniJIS2004-UTF16-H ipaexg.ttf
+uphgothebn-v UniJIS2004-UTF16-V ipaexg.ttf
+uphmgothrn-h UniJIS2004-UTF16-H ipaexg.ttf
+uphmgothrn-v UniJIS2004-UTF16-V ipaexg.ttf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
index c24f299b223..df26e786585 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6/otf-up-kozuka-pr6.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H KozMinProVI-Light.otf
uphminl-v UniJIS-UTF16-V KozMinProVI-Light.otf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
uphgotheb-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
uphmgothr-h UniJIS-UTF16-H KozGoProVI-Heavy.otf
uphmgothr-v UniJIS-UTF16-V KozGoProVI-Heavy.otf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H KozMinProVI-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinProVI-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinProVI-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinProVI-Regular.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoProVI-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoProVI-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinProVI-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinProVI-Bold.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoProVI-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoProVI-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoProVI-Regular.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoProVI-Regular.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H KozMinProVI-Light.otf
+uphminln-v UniJIS2004-UTF16-V KozMinProVI-Light.otf
+uphminrn-h UniJIS2004-UTF16-H KozMinProVI-Regular.otf
+uphminrn-v UniJIS2004-UTF16-V KozMinProVI-Regular.otf
+uphminbn-h UniJIS2004-UTF16-H KozMinProVI-Bold.otf
+uphminbn-v UniJIS2004-UTF16-V KozMinProVI-Bold.otf
+uphgothrn-h UniJIS2004-UTF16-H KozGoProVI-Regular.otf
+uphgothrn-v UniJIS2004-UTF16-V KozGoProVI-Regular.otf
+uphgothbn-h UniJIS2004-UTF16-H KozGoProVI-Bold.otf
+uphgothbn-v UniJIS2004-UTF16-V KozGoProVI-Bold.otf
+uphgothebn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
+uphgothebn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
+uphmgothrn-h UniJIS2004-UTF16-H KozGoProVI-Heavy.otf
+uphmgothrn-v UniJIS2004-UTF16-V KozGoProVI-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
index 6752385ae78..4d747238928 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka-pr6n/otf-up-kozuka-pr6n.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H KozMinPr6N-Light.otf
uphminl-v UniJIS-UTF16-V KozMinPr6N-Light.otf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
uphgotheb-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
uphmgothr-h UniJIS-UTF16-H KozGoPr6N-Heavy.otf
uphmgothr-v UniJIS-UTF16-V KozGoPr6N-Heavy.otf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H KozMinPr6N-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinPr6N-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinPr6N-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinPr6N-Bold.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoPr6N-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoPr6N-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H KozMinPr6N-Light.otf
+uphminln-v UniJIS2004-UTF16-V KozMinPr6N-Light.otf
+uphminrn-h UniJIS2004-UTF16-H KozMinPr6N-Regular.otf
+uphminrn-v UniJIS2004-UTF16-V KozMinPr6N-Regular.otf
+uphminbn-h UniJIS2004-UTF16-H KozMinPr6N-Bold.otf
+uphminbn-v UniJIS2004-UTF16-V KozMinPr6N-Bold.otf
+uphgothrn-h UniJIS2004-UTF16-H KozGoPr6N-Regular.otf
+uphgothrn-v UniJIS2004-UTF16-V KozGoPr6N-Regular.otf
+uphgothbn-h UniJIS2004-UTF16-H KozGoPr6N-Bold.otf
+uphgothbn-v UniJIS2004-UTF16-V KozGoPr6N-Bold.otf
+uphgothebn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
+uphgothebn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
+uphmgothrn-h UniJIS2004-UTF16-H KozGoPr6N-Heavy.otf
+uphmgothrn-v UniJIS2004-UTF16-V KozGoPr6N-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
index b37471edca0..02fbed2d9f1 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/kozuka/otf-up-kozuka.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H KozMinPro-Light.otf
uphminl-v UniJIS-UTF16-V KozMinPro-Light.otf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H KozGoPro-Heavy.otf
uphgotheb-v UniJIS-UTF16-V KozGoPro-Heavy.otf
uphmgothr-h UniJIS-UTF16-H KozGoPro-Heavy.otf
uphmgothr-v UniJIS-UTF16-V KozGoPro-Heavy.otf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H KozMinPro-Light.otf
-uphminln-v UniJIS2004-UTF16-V KozMinPro-Light.otf
-uphminrn-h UniJIS2004-UTF16-H KozMinPro-Regular.otf
-uphminrn-v UniJIS2004-UTF16-V KozMinPro-Regular.otf
-uphgothrn-h UniJIS2004-UTF16-H KozGoPro-Regular.otf
-uphgothrn-v UniJIS2004-UTF16-V KozGoPro-Regular.otf
-uphminbn-h UniJIS2004-UTF16-H KozMinPro-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V KozMinPro-Bold.otf
-uphgothbn-h UniJIS2004-UTF16-H KozGoPro-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V KozGoPro-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
-uphgothebn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
-uphmgothrn-h UniJIS2004-UTF16-H KozGoPro-Regular.otf
-uphmgothrn-v UniJIS2004-UTF16-V KozGoPro-Regular.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H KozMinPro-Light.otf
+uphminln-v UniJIS2004-UTF16-V KozMinPro-Light.otf
+uphminrn-h UniJIS2004-UTF16-H KozMinPro-Regular.otf
+uphminrn-v UniJIS2004-UTF16-V KozMinPro-Regular.otf
+uphminbn-h UniJIS2004-UTF16-H KozMinPro-Bold.otf
+uphminbn-v UniJIS2004-UTF16-V KozMinPro-Bold.otf
+uphgothrn-h UniJIS2004-UTF16-H KozGoPro-Regular.otf
+uphgothrn-v UniJIS2004-UTF16-V KozGoPro-Regular.otf
+uphgothbn-h UniJIS2004-UTF16-H KozGoPro-Bold.otf
+uphgothbn-v UniJIS2004-UTF16-V KozGoPro-Bold.otf
+uphgothebn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
+uphgothebn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
+uphmgothrn-h UniJIS2004-UTF16-H KozGoPro-Heavy.otf
+uphmgothrn-v UniJIS2004-UTF16-V KozGoPro-Heavy.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
index 078145178b7..30070641592 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa-pr6n/otf-up-morisawa-pr6n.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H A-OTF-RyuminPr6N-Light.otf
uphminl-v UniJIS-UTF16-V A-OTF-RyuminPr6N-Light.otf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf
uphgotheb-v UniJIS-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf
uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pr6N-Light.otf
uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pr6N-Light.otf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
-uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
-uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
-uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
-uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
-uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
-uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf
-uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf
-uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf
-uphmgothrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pr6N-Light.otf
-uphmgothrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pr6N-Light.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
+uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
+uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPr6N-Light.otf
+uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPr6N-Light.otf
+uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pr6N-Bold.otf
+uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pr6N-Bold.otf
+uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPr6N-Medium.otf
+uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPr6N-Medium.otf
+uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pr6N-Bold.otf
+uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pr6N-Bold.otf
+uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPr6N-MB31.otf
+uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPr6N-MB31.otf
+uphmgothrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pr6N-Light.otf
+uphmgothrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pr6N-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
index 8f14d77aa27..fa2b7cf96f7 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/morisawa/otf-up-morisawa.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H A-OTF-RyuminPro-Light.otf
uphminl-v UniJIS-UTF16-V A-OTF-RyuminPro-Light.otf
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H A-OTF-MidashiGoPro-MB31.otf
uphgotheb-v UniJIS-UTF16-V A-OTF-MidashiGoPro-MB31.otf
uphmgothr-h UniJIS-UTF16-H A-OTF-Jun101Pro-Light.otf
uphmgothr-v UniJIS-UTF16-V A-OTF-Jun101Pro-Light.otf
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf
-uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf
-uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf
-uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf
-uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf
-uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf
-uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf
-uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf
-uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf
-uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf
-uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPro-MB31.otf
-uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPro-MB31.otf
-uphmgothrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pro-Light.otf
-uphmgothrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pro-Light.otf
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf
+uphminln-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf
+uphminrn-h UniJIS2004-UTF16-H A-OTF-RyuminPro-Light.otf
+uphminrn-v UniJIS2004-UTF16-V A-OTF-RyuminPro-Light.otf
+uphminbn-h UniJIS2004-UTF16-H A-OTF-FutoMinA101Pro-Bold.otf
+uphminbn-v UniJIS2004-UTF16-V A-OTF-FutoMinA101Pro-Bold.otf
+uphgothrn-h UniJIS2004-UTF16-H A-OTF-GothicBBBPro-Medium.otf
+uphgothrn-v UniJIS2004-UTF16-V A-OTF-GothicBBBPro-Medium.otf
+uphgothbn-h UniJIS2004-UTF16-H A-OTF-FutoGoB101Pro-Bold.otf
+uphgothbn-v UniJIS2004-UTF16-V A-OTF-FutoGoB101Pro-Bold.otf
+uphgothebn-h UniJIS2004-UTF16-H A-OTF-MidashiGoPro-MB31.otf
+uphgothebn-v UniJIS2004-UTF16-V A-OTF-MidashiGoPro-MB31.otf
+uphmgothrn-h UniJIS2004-UTF16-H A-OTF-Jun101Pro-Light.otf
+uphmgothrn-v UniJIS2004-UTF16-V A-OTF-Jun101Pro-Light.otf
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
index 5a8122e8039..c4ad8038f9b 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/ms/otf-up-ms.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H :0:msmincho.ttc
uphminl-v UniJIS-UTF16-V :0:msmincho.ttc
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H :0:msgothic.ttc
uphgotheb-v UniJIS-UTF16-V :0:msgothic.ttc
uphmgothr-h UniJIS-UTF16-H :0:msgothic.ttc
uphmgothr-v UniJIS-UTF16-V :0:msgothic.ttc
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminln-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphminrn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminrn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphminbn-h UniJIS2004-UTF16-H :0:msmincho.ttc
-uphminbn-v UniJIS2004-UTF16-V :0:msmincho.ttc
-uphgothrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphgothbn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothbn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphgothebn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphgothebn-v UniJIS2004-UTF16-V :0:msgothic.ttc
-uphmgothrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
-uphmgothrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H :0:msmincho.ttc
+uphminln-v UniJIS2004-UTF16-V :0:msmincho.ttc
+uphminrn-h UniJIS2004-UTF16-H :0:msmincho.ttc
+uphminrn-v UniJIS2004-UTF16-V :0:msmincho.ttc
+uphminbn-h UniJIS2004-UTF16-H :0:msmincho.ttc
+uphminbn-v UniJIS2004-UTF16-V :0:msmincho.ttc
+uphgothrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
+uphgothrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
+uphgothbn-h UniJIS2004-UTF16-H :0:msgothic.ttc
+uphgothbn-v UniJIS2004-UTF16-V :0:msgothic.ttc
+uphgothebn-h UniJIS2004-UTF16-H :0:msgothic.ttc
+uphgothebn-v UniJIS2004-UTF16-V :0:msgothic.ttc
+uphmgothrn-h UniJIS2004-UTF16-H :0:msgothic.ttc
+uphmgothrn-v UniJIS2004-UTF16-V :0:msgothic.ttc
diff --git a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
index 43d1bc52d03..dca1153e4a3 100644
--- a/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
+++ b/Master/texmf-dist/fonts/map/dvipdfmx/jfontmaps/noEmbed/otf-up-noEmbed.map
@@ -1,3 +1,4 @@
+
% TEXT, 90JIS
uphminl-h UniJIS-UTF16-H !Ryumin-Light
uphminl-v UniJIS-UTF16-V !Ryumin-Light
@@ -13,18 +14,19 @@ uphgotheb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold
uphgotheb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold
uphmgothr-h UniJIS-UTF16-H !GothicBBB-Medium
uphmgothr-v UniJIS-UTF16-V !GothicBBB-Medium
-% JISX 0213:2004
-uphminln-h UniJIS2004-UTF16-H !Ryumin-Light
-uphminln-v UniJIS2004-UTF16-V !Ryumin-Light
-uphminrn-h UniJIS2004-UTF16-H !Ryumin-Light
-uphminrn-v UniJIS2004-UTF16-V !Ryumin-Light
-uphgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-uphgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-uphminbn-h UniJIS2004-UTF16-H !Ryumin-Light
-uphminbn-v UniJIS2004-UTF16-V !Ryumin-Light
-uphgothbn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-uphgothbn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-uphgothebn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-uphgothebn-v UniJIS2004-UTF16-V !GothicBBB-Medium
-uphmgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
-uphmgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
+
+% TEXT, JIS04
+uphminln-h UniJIS2004-UTF16-H !Ryumin-Light
+uphminln-v UniJIS2004-UTF16-V !Ryumin-Light
+uphminrn-h UniJIS2004-UTF16-H !Ryumin-Light
+uphminrn-v UniJIS2004-UTF16-V !Ryumin-Light
+uphminbn-h UniJIS2004-UTF16-H !Ryumin-Light,Bold
+uphminbn-v UniJIS2004-UTF16-V !Ryumin-Light,Bold
+uphgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
+uphgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
+uphgothbn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
+uphgothbn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
+uphgothebn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold
+uphgothebn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold
+uphmgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium
+uphmgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-config-updmap.pl
index 3866e830354..642eed9ad9e 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 20130418.0
+# Version 20131120.0
#
# formerly known as updmap-setup-kanji
#
@@ -22,7 +22,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use strict;
my $prg = "kanji-config-updmap";
-my $version = "20130418.0";
+my $version = "20131120.0";
my $updmap_real = "updmap";
my $updmap = $updmap_real;
@@ -68,6 +68,7 @@ my %representatives = (
"ipa" => "ipam.ttf",
"ipaex" => "ipaexm.ttf",
"ms" => "msgothic.ttc",
+ "yu" => "yumin.ttf",
);
my %available;
@@ -105,7 +106,7 @@ sub Usage {
auto: embed one of the following supported font families
automatically:
hiragino, hiragino-pron, morisawa, morisawa-pr6n,
- kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms
+ kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms, yu
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)
diff --git a/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl b/Master/texmf-dist/scripts/jfontmaps/kanji-fontmap-creator.pl
index 04088fe297d..c95923bc796 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-2013 Norbert Preining
-# Version: 20130418.0
+# Version: 20131120.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 = "20130418.0";
+my $version = "20131120.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 eed45704de6..b21eefd0f88 100755
--- a/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
+++ b/Master/texmf-dist/source/jfontmaps/tools/mkmap.lua
@@ -20,6 +20,22 @@ local foundry = {
mgr=':0:msgothic.ttc',
{''},
},
+ ['yu-win'] = {
+ noncid = true,
+ ml='yuminl.ttf', mr='yumin.ttf', mb='yumindb.ttf',
+ gr='yugothic.ttf', gru='yugothic.ttf', gb='yugothib.ttf', ge='yugothib.ttf',
+ mgr='yugothib.ttf',
+ {''},
+ },
+ ['yu-osx'] = {
+ noncid = false,
+ ml='YuMincho-Medium.otf', mr='YuMincho-Medium.otf',
+ mb='YuMincho-Demibold.otf',
+ gr='YuGothic-Medium.otf', gru='YuGothic-Medium.otf',
+ gb='YuGothic-Bold.otf', ge='YuGothic-Bold.otf',
+ mgr='YuGothic-Bold.otf',
+ {''},
+ },
['ipa'] = {
noncid = true,
ml='ipam.ttf', mr='ipam.ttf', mb='ipam.ttf',
@@ -166,14 +182,14 @@ local maps = {
{'uphgothb-#', 'UniJIS-UTF16-#', 'gb'},
{'uphgotheb-#','UniJIS-UTF16-#', 'ge'},
{'uphmgothr-#','UniJIS-UTF16-#', 'mgr'},
- --'% TEXT, JIS04 (not yet)',
- --{'uphminln-#', 'UniJIS2004-UTF16-#', 'ml'},
- --{'uphminrn-#', 'UniJIS2004-UTF16-#', 'mr'},
- --{'uphminbn-#', 'UniJIS2004-UTF16-#', 'mb'},
- --{'uphgothrn-#', 'UniJIS2004-UTF16-#', 'gr'},
- --{'uphgothbn-#', 'UniJIS2004-UTF16-#', 'gb'},
- --{'uphgothebn-#','UniJIS2004-UTF16-#', 'ge'},
- --{'uphmgothrn-#','UniJIS2004-UTF16-#', 'mgr'},
+ '% TEXT, JIS04',
+ {'uphminln-#', 'UniJIS2004-UTF16-#', 'ml'},
+ {'uphminrn-#', 'UniJIS2004-UTF16-#', 'mr'},
+ {'uphminbn-#', 'UniJIS2004-UTF16-#', 'mb'},
+ {'uphgothrn-#', 'UniJIS2004-UTF16-#', 'gr'},
+ {'uphgothbn-#', 'UniJIS2004-UTF16-#', 'gb'},
+ {'uphgothebn-#','UniJIS2004-UTF16-#', 'ge'},
+ {'uphmgothrn-#','UniJIS2004-UTF16-#', 'mgr'},
},
}