summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/ChangeLog.md11
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/README4
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/00otf-uptex.txt17
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_gb_utf.tex28
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/uotftest-utf8.tex83
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrn-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrn-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrp-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrp-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrq-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrq-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrr-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrr-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrs-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrs-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrt-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrt-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgru-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgru-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrv-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrv-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrw-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrw-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrn-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrn-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrp-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrp-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrq-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrq-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrr-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrr-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrs-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrs-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrt-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrt-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmru-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmru-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrv-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrv-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrw-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrw-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--h.vfbin2140 -> 2140 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--v.vfbin2680 -> 2680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--h.vfbin2140 -> 2140 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--v.vfbin2680 -> 2680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--h.vfbin2140 -> 2140 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--v.vfbin2680 -> 2680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--h.vfbin2140 -> 2140 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--v.vfbin2680 -> 2680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--h.vfbin2140 -> 2140 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--v.vfbin2680 -> 2680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--h.vfbin2140 -> 2140 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--v.vfbin2680 -> 2680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--h.vfbin2140 -> 2140 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--v.vfbin2680 -> 2680 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-h.vfbin136 -> 188 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-v.vfbin136 -> 188 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-h.vfbin68 -> 104 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-v.vfbin68 -> 104 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrn-h.vfbin0 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrn-v.vfbin0 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-h.vfbin68 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-v.vfbin68 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrp-h.vfbin0 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrp-v.vfbin0 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrq-h.vfbin0 -> 156 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrq-v.vfbin0 -> 156 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrr-h.vfbin0 -> 68 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrr-v.vfbin0 -> 68 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrs-h.vfbin0 -> 224 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrs-v.vfbin0 -> 224 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrt-h.vfbin0 -> 104 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrt-v.vfbin0 -> 104 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgru-h.vfbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgru-v.vfbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrv-h.vfbin0 -> 1004 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrv-v.vfbin0 -> 1004 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrw-h.vfbin0 -> 1700 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrw-v.vfbin0 -> 1700 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-h.vfbin136 -> 188 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-v.vfbin136 -> 188 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-h.vfbin68 -> 104 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-v.vfbin68 -> 104 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrn-h.vfbin0 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrn-v.vfbin0 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-h.vfbin68 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-v.vfbin68 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrp-h.vfbin0 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrp-v.vfbin0 -> 120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrq-h.vfbin0 -> 156 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrq-v.vfbin0 -> 156 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrr-h.vfbin0 -> 68 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrr-v.vfbin0 -> 68 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrs-h.vfbin0 -> 224 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrs-v.vfbin0 -> 224 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrt-h.vfbin0 -> 104 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrt-v.vfbin0 -> 104 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmru-h.vfbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmru-v.vfbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrv-h.vfbin0 -> 1004 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrv-v.vfbin0 -> 1004 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrw-h.vfbin0 -> 1700 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrw-v.vfbin0 -> 1700 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-h.vfbin4696 -> 4760 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-v.vfbin4696 -> 4760 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-h.vfbin4740 -> 4784 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-v.vfbin4740 -> 4784 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-h.vfbin3972 -> 4072 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-v.vfbin3972 -> 4072 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-h.vfbin4896 -> 4976 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-v.vfbin4896 -> 4976 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-h.vfbin2756 -> 2816 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-v.vfbin2756 -> 2816 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-h.vfbin3700 -> 3796 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-v.vfbin3700 -> 3796 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-h.vfbin4140 -> 4348 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-v.vfbin4140 -> 4348 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-h.vfbin1964 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-v.vfbin1964 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-h.vfbin1092 -> 1244 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-v.vfbin1092 -> 1244 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-h.vfbin592 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-v.vfbin592 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-h.vfbin88 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-v.vfbin88 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-h.vfbin4696 -> 4760 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-v.vfbin4696 -> 4760 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-h.vfbin4740 -> 4784 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-v.vfbin4740 -> 4784 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-h.vfbin3972 -> 4072 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-v.vfbin3972 -> 4072 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-h.vfbin4896 -> 4976 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-v.vfbin4896 -> 4976 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-h.vfbin2756 -> 2816 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-v.vfbin2756 -> 2816 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-h.vfbin3700 -> 3796 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-v.vfbin3700 -> 3796 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-h.vfbin4140 -> 4348 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-v.vfbin4140 -> 4348 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-h.vfbin1964 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-v.vfbin1964 -> 2044 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-h.vfbin1092 -> 1244 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-v.vfbin1092 -> 1244 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-h.vfbin592 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-v.vfbin592 -> 1628 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-h.vfbin88 -> 1860 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-v.vfbin88 -> 1860 bytes
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor-slim.cnf2
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor.cnf2
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch-slim.cnf2
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch.cnf4
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch-slim.cnf2
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch.cnf2
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl4
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_c.txt28
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/script/umkcidtfm.pl2
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/script/umkcidvf.pl4
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty2
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty8
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf/otf.sty5
160 files changed, 169 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/ChangeLog.md b/Master/texmf-dist/doc/fonts/japanese-otf/ChangeLog.md
index 37aaa951f37..61d84452bd8 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/ChangeLog.md
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/ChangeLog.md
@@ -1,3 +1,14 @@
+# 2023-10-09 japanese-otf
+
+Based on japanese-otf-uptex Ver.0.30.
+
+japanese-otf-uptex:
+* Fix issue related to ruby of extra bold.
+* Fix issue related to insertion of penalty before \CID{}
+* Update reference Unicode Blocks-15.1.0.txt, Adobe-GB1-6 cid2code.txt (Version 09/21/2023).
+
+
+
# 2023-06-25 japanese-otf
Based on japanese-otf-uptex Ver.0.29.
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/README b/Master/texmf-dist/doc/fonts/japanese-otf/README
index da75f418047..ad589883f76 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/README
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/README
@@ -14,7 +14,7 @@ consists of following packages:
- author: Tanaka Takuji
- upstream: http://www.t-lab.opal.ne.jp/tex/uptex_en.html
https://github.com/t-tk/japanese-otf-uptex
- - currently japanese-otf-uptex Ver.0.29 (2023/06/25)
+ - currently japanese-otf-uptex Ver.0.30 (2023/10/08)
- readme by the author: 00otf-uptex.txt
In addition, several patches were applied to support extended
@@ -29,4 +29,4 @@ The contents of this package is under the license given in the
COPYRIGHT file, which is the 3-clause BSD license.
Japanese TeX Development Community
-20230625.0
+20231009.0
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/doc/00otf-uptex.txt b/Master/texmf-dist/doc/fonts/japanese-otf/doc/00otf-uptex.txt
index 70c2f0a21a2..4ba509fbde2 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/doc/00otf-uptex.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/doc/00otf-uptex.txt
@@ -1,5 +1,5 @@
[ Title ]
-japanese-otf-uptex Ver.0.29 2023/06/25
+japanese-otf-uptex Ver.0.30 2023/10/08
[ Abstract ]
@@ -529,4 +529,19 @@ https://github.com/t-tk/japanese-otf-uptex
test/uplatex/uotf-cid-{h,v}.tex,
test/uplatex/cid_{jp,gb,cns,ks}_{h,v}.tex ::
Add a new test for multi-weight \CID{}, \CIDC{}, \CIDT{}, \CIDK{}.
+2023.10.08 Ver0.30
+ sty/otf.sty, sty/mlutf.sty, sty/mlcid.sty ::
+ Bump version number.
+ sty/otf.sty ::
+ Fix issue related to ruby of extra bold. ## Thank 流橋 利樹 san.
+ Ref. https://okumuralab.org/tex/mod/forum/discuss.php?d=3068#p22269
+ Fix issue related to insertion of penalty before \CID{} ## Thank @aminophen san.
+ Ref. https://github.com/t-tk/japanese-otf-uptex/issues/8#issuecomment-1741634553
+ basepl/mjvf-upnm{kor,sch,tch}{,-slim}.cnf, script/sp_list_c.txt,
+ script/mkutf32list.pl, script/umkcid{tfm,vf}.pl, test/uplatex/sp_gb_utf.tex ::
+ Update references:
+ Unicode Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT)
+ Adobe-GB1-6 cid2code.txt (Version 09/21/2023).
+ test/uplatex/uotftest-utf8.tex ::
+ Add tests for ruby with okumacro.sty and pxrubrica.sty .
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_gb_utf.tex b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_gb_utf.tex
index f03fc4c969a..fa95e15162c 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_gb_utf.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_gb_utf.tex
@@ -1,11 +1,11 @@
%
% This file is generated from the data of UniGB-UTF32
-% in cid2code.txt (Version 12/05/2017)
-% for Adobe-GB1-5
+% in cid2code.txt (Version 09/21/2023)
+% for Adobe-GB1-6
%
% Reference:
% https://github.com/adobe-type-tools/cmap-resources/
-% Adobe-GB1-5/cid2code.txt
+% Adobe-GB1-6/cid2code.txt
%
% A newer CMap may be required for some code points.
%
@@ -14,4 +14,26 @@
Adobe-GB1-2\\
\UTFC{20087}\UTFC{20089}\UTFC{200CC}\UTFC{215D7}\UTFC{2298F}\UTFC{20509}\UTFC{2099D}\UTFC{241FE}
+Adobe-GB1-6\\
+\UTFC{20164}\UTFC{20676}\UTFC{20CD0}\UTFC{2139A}\UTFC{21413}\UTFC{235CB}\UTFC{23C97}\UTFC{23C98}\UTFC{23E23}\UTFC{249DB}%
+\UTFC{24A7D}\UTFC{24AC9}\UTFC{25532}\UTFC{25562}\UTFC{255A8}\UTFC{25ED7}\UTFC{26221}\UTFC{2648D}\UTFC{26676}\UTFC{2677C}%
+\UTFC{26B5C}\UTFC{26C21}\UTFC{27FF9}\UTFC{28408}\UTFC{28678}\UTFC{28695}\UTFC{287E0}\UTFC{28B49}\UTFC{28C47}\UTFC{28C4F}%
+\UTFC{28C51}\UTFC{28C54}\UTFC{28E99}\UTFC{29F7E}\UTFC{29F83}\UTFC{29F8C}\UTFC{2A7DD}\UTFC{2A8FB}\UTFC{2A917}\UTFC{2AA30}%
+\UTFC{2AA36}\UTFC{2AA58}\UTFC{2AFA2}\UTFC{2B127}\UTFC{2B128}\UTFC{2B137}\UTFC{2B138}\UTFC{2B1ED}\UTFC{2B300}\UTFC{2B363}%
+\UTFC{2B36F}\UTFC{2B372}\UTFC{2B37D}\UTFC{2B404}\UTFC{2B410}\UTFC{2B413}\UTFC{2B461}\UTFC{2B4E7}\UTFC{2B4EF}\UTFC{2B4F6}%
+\UTFC{2B4F9}\UTFC{2B50D}\UTFC{2B50E}\UTFC{2B536}\UTFC{2B5AE}\UTFC{2B5AF}\UTFC{2B5B3}\UTFC{2B5E7}\UTFC{2B5F4}\UTFC{2B61C}%
+\UTFC{2B61D}\UTFC{2B626}\UTFC{2B627}\UTFC{2B628}\UTFC{2B62A}\UTFC{2B62C}\UTFC{2B695}\UTFC{2B696}\UTFC{2B6AD}\UTFC{2B6ED}%
+\UTFC{2B7A9}\UTFC{2B7C5}\UTFC{2B7E6}\UTFC{2B7F9}\UTFC{2B7FC}\UTFC{2B806}\UTFC{2B80A}\UTFC{2B81C}\UTFC{2B8B8}\UTFC{2BAC7}%
+\UTFC{2BB5F}\UTFC{2BB62}\UTFC{2BB7C}\UTFC{2BB83}\UTFC{2BC1B}\UTFC{2BD77}\UTFC{2BD87}\UTFC{2BDF7}\UTFC{2BE29}\UTFC{2C029}%
+\UTFC{2C02A}\UTFC{2C0A9}\UTFC{2C0CA}\UTFC{2C1D5}\UTFC{2C1D9}\UTFC{2C1F9}\UTFC{2C27C}\UTFC{2C288}\UTFC{2C2A4}\UTFC{2C317}%
+\UTFC{2C35B}\UTFC{2C361}\UTFC{2C364}\UTFC{2C488}\UTFC{2C494}\UTFC{2C497}\UTFC{2C542}\UTFC{2C613}\UTFC{2C618}\UTFC{2C621}%
+\UTFC{2C629}\UTFC{2C62B}\UTFC{2C62C}\UTFC{2C62D}\UTFC{2C62F}\UTFC{2C642}\UTFC{2C64A}\UTFC{2C64B}\UTFC{2C72C}\UTFC{2C72F}%
+\UTFC{2C79F}\UTFC{2C7C1}\UTFC{2C7FD}\UTFC{2C8D9}\UTFC{2C8DE}\UTFC{2C8E1}\UTFC{2C8F3}\UTFC{2C907}\UTFC{2C90A}\UTFC{2C91D}%
+\UTFC{2CA02}\UTFC{2CA0E}\UTFC{2CA7D}\UTFC{2CAA9}\UTFC{2CB29}\UTFC{2CB2D}\UTFC{2CB2E}\UTFC{2CB31}\UTFC{2CB38}\UTFC{2CB39}%
+\UTFC{2CB3B}\UTFC{2CB3F}\UTFC{2CB41}\UTFC{2CB4A}\UTFC{2CB4E}\UTFC{2CB5A}\UTFC{2CB5B}\UTFC{2CB64}\UTFC{2CB69}\UTFC{2CB6C}%
+\UTFC{2CB6F}\UTFC{2CB73}\UTFC{2CB76}\UTFC{2CB78}\UTFC{2CB7C}\UTFC{2CBB1}\UTFC{2CBBF}\UTFC{2CBC0}\UTFC{2CBCE}\UTFC{2CC56}%
+\UTFC{2CC5F}\UTFC{2CCF5}\UTFC{2CCF6}\UTFC{2CCFD}\UTFC{2CCFF}\UTFC{2CD02}\UTFC{2CD03}\UTFC{2CD0A}\UTFC{2CD8B}\UTFC{2CD8D}%
+\UTFC{2CD8F}\UTFC{2CD90}\UTFC{2CD9F}\UTFC{2CDA0}\UTFC{2CDA8}\UTFC{2CDAD}\UTFC{2CDAE}\UTFC{2CDD5}\UTFC{2CE18}\UTFC{2CE1A}%
+\UTFC{2CE23}\UTFC{2CE26}\UTFC{2CE2A}\UTFC{2CE7C}\UTFC{2CE88}\UTFC{2CE93}
+
% end
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/uotftest-utf8.tex b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/uotftest-utf8.tex
index eec37f62d5c..cb42089f9a1 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/uotftest-utf8.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/uotftest-utf8.tex
@@ -1,5 +1,6 @@
% -*- coding: utf-8 -*-
\newif\ifuptexmode\uptexmodefalse
+\newif\iftatemode\tatemodefalse
\ifnum\jis"2121="3000 \uptexmodetrue\fi
\makeatletter
@@ -32,8 +33,8 @@
\fi
\def\baseshift{-.12zh}
-\ifx\class\@tarticle\def\baseshift{-.5zh}\fi
-\ifx\class\@utarticle\def\baseshift{-.5zh}\fi
+\ifx\class\@tarticle\def\baseshift{-.5zh}\tatemodetrue\fi
+\ifx\class\@utarticle\def\baseshift{-.5zh}\tatemodetrue\fi
\ifuptexmode
\edef\@opt@{uplatex,\@opt@}
@@ -44,12 +45,20 @@
\usepackage[\@opt@]{otf}
%
-% furikana.sty があれば読み込む
\newread\@istheresuchafile
-\openin\@istheresuchafile furikana.sty
+%
+% okumacro.sty があれば読み込む
+\openin\@istheresuchafile okumacro.sty
\ifeof\@istheresuchafile\relax
\else\closein\@istheresuchafile\relax
-\usepackage{furikana}% found
+\usepackage{okumacro}% found
+\fi
+%
+% pxrubrica.sty があれば読み込む
+\openin\@istheresuchafile pxrubrica.sty
+\ifeof\@istheresuchafile\relax
+\else\closein\@istheresuchafile\relax
+\usepackage{pxrubrica}% found
\fi
\makeatother
@@ -66,9 +75,20 @@
\ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi
\ifx\mgfamily\@undefined\let\mgfamily=\relax\fi
\makeatother
+
+\iftatemode
+\textwidth250mm
+\oddsidemargin0mm
+\evensidemargin0mm
+\textheight168mm
+\topmargin-15mm
+\else
\textwidth160mm
\oddsidemargin0mm
\evensidemargin0mm
+\textheight250mm
+\topmargin-15mm
+\fi
\begin{document}
\section{見出し}
@@ -100,18 +120,53 @@ mg/m & {\mgfamily ひらかな} & {\mgfamily 漢字} & {\mgfamily\UTF{9DD7}} & {
日本:\UTF{8FF0} 簡体字:\UTFC{8FF0} 繁體字:\UTFT{8FF0} 朝鮮:\UTFK{8FF0}
-% with furikana.sty
-\makeatletter
-\ifx\kana\@undefined
-\else
-\kana{漢字}{振りかな}{\bfseries \kana{漢字}{振りかな}}%
-{\gtfamily\kana{漢字}{振りかな}\bfseries \kana{漢字}{振りかな}}
-{\mgfamily\kana{漢字}{振りかな}}
-\kana{\UTF{9DD7}}{かな}\kana{鴎}{かな}
+% with okumacro.sty
+\ifx\ruby\@undefined\else
+\vspace{\baselineskip}
+\ruby{漢字}{振りかな}~%
+{\bfseries\ruby{漢字}{振りかな}}~%
+\ifdeluxe
+ {\ltseries\ruby{漢字}{振りかな}}~%
+\fi
+{\gtfamily\ruby{漢字}{振りかな}~%
+ \bfseries\ruby{漢字}{振りかな}~%
+\ifdeluxe
+ \ebseries\ruby{漢字}{振りかな}~%
+\fi
+}%
+{\mgfamily\ruby{漢字}{振りかな}}
+
+\bgroup
+\ruby{\UTFK{c548}}{アン}\ruby{\UTFK{b155}}{ニョン}\ruby{\UTFK{d558}}{ハ}\ruby{\UTFK{c138}}{セ}\ruby{\UTFK{c694}}{ヨ}~%
+\gtfamily\ruby{\UTFK{c548}}{アン}\ruby{\UTFK{b155}}{ニョン}\ruby{\UTFK{d558}}{ハ}\ruby{\UTFK{c138}}{セ}\ruby{\UTFK{c694}}{ヨ}
+\egroup
+\fi
+
+
+% with pxrubrica.sty
+\makeatletter
+\ifx\jruby\@undefined\else
+\vspace{\baselineskip}
+\jruby[g]{漢字}{振りかな}~%
+{\bfseries\jruby[g]{漢字}{振りかな}}~%
+\ifdeluxe
+ {\ltseries\jruby[g]{漢字}{振りかな}}~%
+\fi
+{\gtfamily\jruby[g]{漢字}{振りかな}~%
+ \bfseries\jruby[g]{漢字}{振りかな}~%
+\ifdeluxe
+ \ebseries\jruby[g]{漢字}{振りかな}~%
+\fi
+}%
+{\mgfamily\jruby[g]{漢字}{振りかな}}
-\Kana[3]{\UTFK{c548},\UTFK{b155},\UTFK{d558},\UTFK{c138},\UTFK{c694}}{アン,ニョン,ハ,セ,ヨ}
+\bgroup
+ \jruby[m]{{\UTFK{c548}}{\UTFK{b155}}{\UTFK{d558}}{\UTFK{c138}}{\UTFK{c694}}}{アン|ニョン|ハ|セ|ヨ}~%
+ \gtfamily\jruby[m]{{\UTFK{c548}}{\UTFK{b155}}{\UTFK{d558}}{\UTFK{c138}}{\UTFK{c694}}}{アン|ニョン|ハ|セ|ヨ}
+\egroup
\fi
+
\makeatother
\vspace{\baselineskip}
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrn-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrn-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrn-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrn-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrp-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrp-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrp-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrp-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrp-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrp-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrq-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrq-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrq-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrq-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrq-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrq-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrr-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrr-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrr-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrr-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrs-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrs-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrs-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrs-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrs-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrs-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrt-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrt-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrt-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrt-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrt-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrt-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgru-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgru-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgru-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgru-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgru-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgru-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrv-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrv-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrv-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrv-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrv-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrv-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrw-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrw-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrw-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrw-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrw-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcgrw-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrn-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrn-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrn-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrn-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrp-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrp-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrp-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrp-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrp-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrp-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrq-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrq-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrq-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrq-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrq-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrq-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrr-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrr-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrr-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrr-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrs-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrs-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrs-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrs-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrs-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrs-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrt-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrt-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrt-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrt-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrt-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrt-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmru-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmru-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmru-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmru-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmru-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmru-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrv-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrv-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrv-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrv-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrv-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrv-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrw-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrw-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrw-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrw-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrw-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfcmrw-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--h.vf
index 92a25eb7a03..2788167cf25 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--v.vf
index 692fe41fd9a..7e83f36f9f7 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgb--v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--h.vf
index e5442bb2cb2..9450a17c1fc 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--v.vf
index f662d182b70..c629a2c24e3 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcge--v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--h.vf
index c78ea3f3061..bf6579ad33a 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--v.vf
index 243fded67c1..0d1b6e5c481 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcgr--v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--h.vf
index 1eddf2c77ab..adf9692fb12 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--v.vf
index 13e9ca7851b..8b69939af44 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmb--v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--h.vf
index 189ba2befbe..001975e3810 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--v.vf
index 6117ee43233..2a48c45ace4 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmgr--v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--h.vf
index 060175d773f..c26f51bebfe 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--v.vf
index 23a6ffb1aad..55b6aff5c81 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcml--v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--h.vf
index bc78829bf91..2e06bb26be4 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--v.vf
index f84172b1546..1e64cf74a67 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/cidcmr--v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-h.vf
index 8ae56ae5e3e..d3e47bc7441 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-v.vf
index afb7e687588..13b09684f81 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrk-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-h.vf
index 6caf8f83358..74d793b72e9 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-v.vf
index fd799e8546c..589332b8caa 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrl-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrn-h.vf
new file mode 100644
index 00000000000..e8b5adce6eb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrn-v.vf
new file mode 100644
index 00000000000..9ca29b15bad
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-h.vf
index 07eab72c95c..52c2ff56515 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-v.vf
index d443cc0d85d..a83dfa03ea7 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgro-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrp-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrp-h.vf
new file mode 100644
index 00000000000..6ffbc9c9343
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrp-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrp-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrp-v.vf
new file mode 100644
index 00000000000..34d3246fa80
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrp-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrq-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrq-h.vf
new file mode 100644
index 00000000000..7ac6fd7e1f6
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrq-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrq-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrq-v.vf
new file mode 100644
index 00000000000..75546b223dc
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrq-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrr-h.vf
new file mode 100644
index 00000000000..939e3e25740
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrr-v.vf
new file mode 100644
index 00000000000..70b0e22b7a9
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrs-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrs-h.vf
new file mode 100644
index 00000000000..f4e55b46d45
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrs-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrs-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrs-v.vf
new file mode 100644
index 00000000000..daa8039a956
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrs-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrt-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrt-h.vf
new file mode 100644
index 00000000000..80dd2dcd8ad
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrt-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrt-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrt-v.vf
new file mode 100644
index 00000000000..0885500447b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrt-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgru-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgru-h.vf
new file mode 100644
index 00000000000..01e1ed0f620
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgru-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgru-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgru-v.vf
new file mode 100644
index 00000000000..d0c64ed8f33
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgru-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrv-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrv-h.vf
new file mode 100644
index 00000000000..fc784f39f76
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrv-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrv-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrv-v.vf
new file mode 100644
index 00000000000..6a2d2c1e8ac
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrv-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrw-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrw-h.vf
new file mode 100644
index 00000000000..824a39636fb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrw-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrw-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrw-v.vf
new file mode 100644
index 00000000000..d76d2aec4d4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcgrw-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-h.vf
index 2a394e68953..c157a495e0a 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-v.vf
index 4752755ac9e..acb57f1a266 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrk-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-h.vf
index 5c46f29124f..1f0ed78ee3e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-v.vf
index 0d2e7d40263..2367d32662a 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrl-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrn-h.vf
new file mode 100644
index 00000000000..9d9ca3f357f
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrn-v.vf
new file mode 100644
index 00000000000..79b3c74b326
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-h.vf
index 589b67627bc..6ffd96998d4 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-v.vf
index b87e58b9e1a..21c3695d86f 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmro-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrp-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrp-h.vf
new file mode 100644
index 00000000000..fadf6952c92
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrp-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrp-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrp-v.vf
new file mode 100644
index 00000000000..6adb90ed63a
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrp-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrq-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrq-h.vf
new file mode 100644
index 00000000000..c692c756bcb
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrq-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrq-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrq-v.vf
new file mode 100644
index 00000000000..44e0e5afdf7
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrq-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrr-h.vf
new file mode 100644
index 00000000000..c86a13f2cb8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrr-v.vf
new file mode 100644
index 00000000000..9ec4aa8f8f4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrs-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrs-h.vf
new file mode 100644
index 00000000000..8a8d47bc9ce
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrs-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrs-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrs-v.vf
new file mode 100644
index 00000000000..e0464b5ef56
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrs-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrt-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrt-h.vf
new file mode 100644
index 00000000000..02f1ba7da54
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrt-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrt-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrt-v.vf
new file mode 100644
index 00000000000..a77b5b14853
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrt-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmru-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmru-h.vf
new file mode 100644
index 00000000000..783646157ea
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmru-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmru-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmru-v.vf
new file mode 100644
index 00000000000..300ea24c245
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmru-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrv-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrv-h.vf
new file mode 100644
index 00000000000..f5ec4558c6b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrv-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrv-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrv-v.vf
new file mode 100644
index 00000000000..c2d02df2e94
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrv-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrw-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrw-h.vf
new file mode 100644
index 00000000000..a41744bbd53
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrw-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrw-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrw-v.vf
new file mode 100644
index 00000000000..3147d8236e2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfcmrw-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-h.vf
index af719a07728..3e2ef14d669 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-v.vf
index c3daed745bc..c1d93626822 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrk-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-h.vf
index 0a96b35a2aa..84777d96489 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-v.vf
index 9794421c7d6..80b7dc70985 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrl-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-h.vf
index 5668e5c4c14..b1aa80835ae 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-v.vf
index 22ed269a080..a52d44d9d17 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-h.vf
index 7d74e4954c1..d6c065c93b6 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-v.vf
index f1198712ed4..b4ecb9180bc 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgro-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-h.vf
index cb21e8e0197..02039edf979 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-v.vf
index 86d783811c5..6c799ca27ba 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrp-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-h.vf
index 20481206d39..b7b767c9372 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-v.vf
index 6775cc42089..142a21b5df4 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrq-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-h.vf
index 3edb7faeac3..3be72de1acb 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-v.vf
index 4f8e4aa71eb..059d28dbe0d 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrs-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-h.vf
index 8e30ea85392..794061697de 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-v.vf
index f18e4d2eeed..a14fe50b11f 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrt-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-h.vf
index 7d80de26654..751c38cb877 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-v.vf
index 108f1ba5c58..b5a28eb266e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgru-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-h.vf
index fbda381b54d..ba9d6aaf33f 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-v.vf
index 955e6936b7c..d13fa8fcc62 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrv-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-h.vf
index 3d7f69b8b33..fcf85ae1328 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-v.vf
index d6ac632a4d8..01a97fca023 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrw-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-h.vf
index 7b2a2935c8d..718310f27e0 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-v.vf
index dfb85d1ac72..5b1601473e8 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrk-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-h.vf
index 75cceec250a..a49ad6af733 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-v.vf
index f518cef397a..c205e212b06 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrl-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-h.vf
index 6fb29d9cc55..b55054491bf 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-v.vf
index 0a832b421fd..5e18cfc8e94 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-h.vf
index 67b5aa4d9bd..cedbea65266 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-v.vf
index 9bb466dcf6f..958707b13fb 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmro-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-h.vf
index 5c730d75b03..2732dd28b27 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-v.vf
index 1fafb3eff7c..01b4c5f4e96 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrp-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-h.vf
index cee3d0c7e2a..e434800cf06 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-v.vf
index aba15b1aea2..83bdb672b7d 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrq-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-h.vf
index b136918ae4d..2f9945494ad 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-v.vf
index d6ab67cfe8b..cb69a13eda5 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrs-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-h.vf
index c65e3ec576e..16f95294859 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-v.vf
index c60a162e825..dee64734126 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrt-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-h.vf
index 50cfb26565f..770f63f0c56 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-v.vf
index f3fbe2eefbb..c1ca33a7c2c 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmru-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-h.vf
index 288ae7bb12e..eef69bf69a2 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-v.vf
index 385502dfa0e..e9b2f6617b1 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrv-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-h.vf
index 1b3039506be..aebef482979 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-v.vf
index e5756dc04c9..d5bad6afd22 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrw-v.vf
Binary files differ
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor-slim.cnf b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor-slim.cnf
index d4b6fdc34e7..dcb317ce571 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor-slim.cnf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor-slim.cnf
@@ -1,5 +1,5 @@
% makejvf settings for upnmkor* in japanese-otf-uptex
-% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW])
+% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT)
CHARSET %
+ 0080..00FF,% Latin-1 Supplement
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor.cnf b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor.cnf
index dc747b460d8..574a679b69b 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor.cnf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmkor.cnf
@@ -1,5 +1,5 @@
% makejvf settings for upnmkor* in japanese-otf-uptex
-% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW])
+% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT)
% and Adobe-Korea1-2/cid2code.txt (Version 01/31/2012)
CHARSET %
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch-slim.cnf b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch-slim.cnf
index afa0f8ed60d..e2e7b661a6b 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch-slim.cnf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch-slim.cnf
@@ -1,5 +1,5 @@
% makejvf settings for upnmtch* in japanese-otf-uptex
-% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW])
+% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT)
CHARSET %
+ 0080..00FF,% Latin-1 Supplement
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch.cnf b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch.cnf
index 96d02b25496..7e7a11c290d 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch.cnf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmsch.cnf
@@ -1,6 +1,6 @@
% makejvf settings for upnmtch* in japanese-otf-uptex
-% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW])
-% and Adobe-GB1-5/cid2code.txt (Version 12/05/2017)
+% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT)
+% and Adobe-GB1-5/cid2code.txt (Version 09/21/2023)
CHARSET %
+ 0000..007F,% Basic Latin
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch-slim.cnf b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch-slim.cnf
index afa0f8ed60d..e2e7b661a6b 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch-slim.cnf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch-slim.cnf
@@ -1,5 +1,5 @@
% makejvf settings for upnmtch* in japanese-otf-uptex
-% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW])
+% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT)
CHARSET %
+ 0080..00FF,% Latin-1 Supplement
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch.cnf b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch.cnf
index f2e900aec65..f74b1a77034 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch.cnf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/basepl/mjvf-upnmtch.cnf
@@ -1,5 +1,5 @@
% makejvf settings for upnmtch* in japanese-otf-uptex
-% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW])
+% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT)
% and Adobe-CNS1-7/cid2code.txt (Version 10/24/2017)
CHARSET %
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl
index 2a052520749..903b6f0c652 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl
@@ -54,9 +54,9 @@ if ($.<8 && /((Adobe-(?:Japan|CNS|GB|Korea).*)-\d)\s/) {
$utfmac="UTFT"; $cmap="UniCNS-UTF32";
$source="Adobe-CNS1-7/cid2code.txt"; }
elsif ($collection =~ /gb/i) {
- @cid_max = qw/-1 7716 9896 22126 22352 29063 30283/;
+ @cid_max = qw/-1 7716 9896 22126 22352 29063 30283 30571/;
$utfmac="UTFC"; $cmap="UniGB-UTF32";
- $source="Adobe-GB1-5/cid2code.txt"; }
+ $source="Adobe-GB1-6/cid2code.txt"; }
elsif ($collection =~ /kor/i) {
@cid_max = qw/-1 9332 18154 18351/;
$utfmac="UTFK"; $cmap="UniKS-UTF32";
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_c.txt b/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_c.txt
index a4699d6ea82..818ff8a17bb 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_c.txt
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_c.txt
@@ -1,11 +1,11 @@
%
% This file is generated from the data of UniGB-UTF32
-% in cid2code.txt (Version 12/05/2017)
-% for Adobe-GB1-5
+% in cid2code.txt (Version 09/21/2023)
+% for Adobe-GB1-6
%
% Reference:
% https://github.com/adobe-type-tools/cmap-resources/
-% Adobe-GB1-5/cid2code.txt
+% Adobe-GB1-6/cid2code.txt
%
% A newer CMap may be required for some code points.
%
@@ -14,4 +14,26 @@
%Adobe-GB1-2
20087,20089,200CC,215D7,2298F,20509,2099D,241FE
+%Adobe-GB1-6
+20164,20676,20CD0,2139A,21413,235CB,23C97,23C98,23E23,249DB
+24A7D,24AC9,25532,25562,255A8,25ED7,26221,2648D,26676,2677C
+26B5C,26C21,27FF9,28408,28678,28695,287E0,28B49,28C47,28C4F
+28C51,28C54,28E99,29F7E,29F83,29F8C,2A7DD,2A8FB,2A917,2AA30
+2AA36,2AA58,2AFA2,2B127,2B128,2B137,2B138,2B1ED,2B300,2B363
+2B36F,2B372,2B37D,2B404,2B410,2B413,2B461,2B4E7,2B4EF,2B4F6
+2B4F9,2B50D,2B50E,2B536,2B5AE,2B5AF,2B5B3,2B5E7,2B5F4,2B61C
+2B61D,2B626,2B627,2B628,2B62A,2B62C,2B695,2B696,2B6AD,2B6ED
+2B7A9,2B7C5,2B7E6,2B7F9,2B7FC,2B806,2B80A,2B81C,2B8B8,2BAC7
+2BB5F,2BB62,2BB7C,2BB83,2BC1B,2BD77,2BD87,2BDF7,2BE29,2C029
+2C02A,2C0A9,2C0CA,2C1D5,2C1D9,2C1F9,2C27C,2C288,2C2A4,2C317
+2C35B,2C361,2C364,2C488,2C494,2C497,2C542,2C613,2C618,2C621
+2C629,2C62B,2C62C,2C62D,2C62F,2C642,2C64A,2C64B,2C72C,2C72F
+2C79F,2C7C1,2C7FD,2C8D9,2C8DE,2C8E1,2C8F3,2C907,2C90A,2C91D
+2CA02,2CA0E,2CA7D,2CAA9,2CB29,2CB2D,2CB2E,2CB31,2CB38,2CB39
+2CB3B,2CB3F,2CB41,2CB4A,2CB4E,2CB5A,2CB5B,2CB64,2CB69,2CB6C
+2CB6F,2CB73,2CB76,2CB78,2CB7C,2CBB1,2CBBF,2CBC0,2CBCE,2CC56
+2CC5F,2CCF5,2CCF6,2CCFD,2CCFF,2CD02,2CD03,2CD0A,2CD8B,2CD8D
+2CD8F,2CD90,2CD9F,2CDA0,2CDA8,2CDAD,2CDAE,2CDD5,2CE18,2CE1A
+2CE23,2CE26,2CE2A,2CE7C,2CE88,2CE93
+
% end
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/umkcidtfm.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/umkcidtfm.pl
index 6f830a329ca..aa8e7b10c89 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/umkcidtfm.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/umkcidtfm.pl
@@ -160,7 +160,7 @@ sub writechar {
@type_1ov3 = (13274 .. 13294);
}
}
- if ($lang eq "c") { # Adobe-GB1-5
+ if ($lang eq "c") { # Adobe-GB1-6
if ($dir eq "h") {
@type_1ov2 = (814 .. 939, 7716, 22355 .. 22357);
}
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/umkcidvf.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/umkcidvf.pl
index 9cc6e11e1da..72ca79cecc5 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/umkcidvf.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/umkcidvf.pl
@@ -20,7 +20,7 @@ opendir(OVP, "ovp") || mkdir("ovp",0755) || die "cannot mkdir ovp";
opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf";
my %adobe_name = (
'j' => 'Adobe-Japan1-7',
- 'c' => 'Adobe-GB1-5',
+ 'c' => 'Adobe-GB1-6',
'k' => 'Adobe-Korea1-2',
't' => 'Adobe-CNS1-7'
);
@@ -103,7 +103,7 @@ sub writechar_cid {
}
}
}
- if ($lang eq "c") { # Adobe-GB1-5
+ if ($lang eq "c") { # Adobe-GB1-6
if ($dir eq "h") {
if (($cidcode >= 814 && $cidcode <= 939)
|| $cidcode == 7716
diff --git a/Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty b/Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty
index aa2b9f32260..1974e732489 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf/mlcid.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlcid}[2004/04/17 v1.0.2 psitau, u0.29 ttk]
+\ProvidesPackage{mlcid}[2004/04/17 v1.0.2 psitau, u0.30 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
diff --git a/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty
index e777a9c3981..1b3d7b60311 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.29 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.30 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
@@ -136,13 +136,13 @@
\else
\if@deluxe
\Declare@FontShape{utfk}{l}{0123456789abcdef}{utfkmr}
- \Declare@FontShape{utfc}{l}{0123456789abcdefklmo}{utfcmr}
+ \Declare@FontShape{utfc}{l}{0123456789abcdefklmnopqrstuvw}{utfcmr}
\Declare@FontShape{utft}{l}{0123456789abcdefklmnopqrstuvwxz}{utftmr}
\fi
\Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr}
\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
- \Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr}
- \Declare@FontShape{utfc}{bx}{0123456789abcdefklmo}{utfcgr}
+ \Declare@FontShape{utfc}{m}{0123456789abcdefklmnopqrstuvw}{utfcmr}
+ \Declare@FontShape{utfc}{bx}{0123456789abcdefklmnopqrstuvw}{utfcgr}
\Declare@FontShape{utft}{m}{0123456789abcdefklmnopqrstuvwxz}{utftmr}
\Declare@FontShape{utft}{bx}{0123456789abcdefklmnopqrstuvwxz}{utftgr}
\fi
diff --git a/Master/texmf-dist/tex/platex/japanese-otf/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf/otf.sty
index 39a2beaa900..45f645ae0eb 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf/otf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf/otf.sty
@@ -1,5 +1,5 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2023/06/25 TeX JP org, v1.7b8 psitau, u0.29 ttk]
+\ProvidesPackage{otf}[2023/10/09 TeX JP org, v1.7b8 psitau, u0.30 ttk]
\RequirePackage{keyval}
%for processing options
\newif\if@kana \@kanafalse
@@ -287,6 +287,7 @@
\newcommand\set@character@{\afterassignment\put@character@\@tempcnta}
\newcommand\put@character@{%
\otf@kanjishape{-}\selectfont%
+ \advance\@tempcnta by "110000
\kchar\@tempcnta%
}
\catcode`\"=\count@
@@ -470,6 +471,8 @@
\DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{}
\DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minl-h}{}
\DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minl-v}{}
+ \DeclareFontShape{\otf@JYn}{rubyg}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gotheb-h}{}
+ \DeclareFontShape{\otf@JTn}{rubyg}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gotheb-v}{}
\else
\DeclareFontShape{\otf@JYn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlmgothr\nlck@sfx@-h}{}
\DeclareFontShape{\otf@JTn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlmgothr\nlck@sfx@-v}{}