summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-23 21:32:39 +0000
committerKarl Berry <karl@freefriends.org>2023-02-23 21:32:39 +0000
commit7e2eed42b674c097c9672d1b543f259476cebe9d (patch)
treee94df160e9cdeded38f7668dd54b0f8af9544dd1 /Master
parentb2c100d2ba92e126ad3b2f5315259b97b1c608b6 (diff)
japanese-otf (23feb23) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66102 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT4
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/README4
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/00otf-uptex.txt24
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/Makefile95
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_text.tex32
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_utf.tex32
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/uotftest-utf8.tex40
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/upkanatest1.tex2
-rw-r--r--Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map144
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfgrg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfgrg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgbg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgbg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgeg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgeg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgrg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgrg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmbg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmbg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmgrg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmgrg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmlg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmlg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmrg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmrg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfmrg-h.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/japanese-otf/utfmrg-v.tfmbin0 -> 172 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-h.vfbin6716 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-h.vfbin6716 -> 6752 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-v.vfbin5736 -> 5768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-h.vfbin6716 -> 6752 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-v.vfbin5736 -> 5768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-h.vfbin6716 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-h.vfbin6716 -> 6752 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-v.vfbin5736 -> 5768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-h.vfbin6716 -> 6752 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-v.vfbin5736 -> 5768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-h.vfbin651088 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-v.vfbin651112 -> 651144 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-h.vfbin651088 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-v.vfbin651112 -> 651148 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-h.vfbin651088 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-v.vfbin651112 -> 651148 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-h.vfbin651088 -> 651124 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-v.vfbin651112 -> 651148 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-h.vfbin651088 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-v.vfbin651112 -> 651144 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-h.vfbin651088 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-v.vfbin651112 -> 651148 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-h.vfbin651088 -> 651124 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-v.vfbin651116 -> 651148 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-h.vfbin651088 -> 651124 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-v.vfbin651116 -> 651148 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-h.vfbin651084 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-v.vfbin651112 -> 651144 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-h.vfbin651088 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-v.vfbin651112 -> 651144 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-h.vfbin651084 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-v.vfbin651112 -> 651144 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-h.vfbin651088 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-v.vfbin651112 -> 651144 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-h.vfbin651084 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-v.vfbin651112 -> 651144 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-h.vfbin651088 -> 651120 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-v.vfbin651112 -> 651144 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-v.vfbin5732 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-h.vfbin6712 -> 6748 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-h.vfbin6716 -> 6752 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-v.vfbin5736 -> 5768 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-h.vfbin6712 -> 6744 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-v.vfbin5728 -> 5764 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgbg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgbg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgeg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgeg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgrg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgrg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmbg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmbg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmgrg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmgrg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmlg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmlg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmrg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmrg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrg-h.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrg-v.vfbin0 -> 88 bytes
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm17
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm4
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl2
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl2
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl2
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt32
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl13
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl13
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/umakeotf2
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/umakeotf_brsg2
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/umakeotf_jis042
-rw-r--r--Master/texmf-dist/source/fonts/japanese-otf/umakeotf_pre2
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/umakeotf_prop6
-rwxr-xr-xMaster/texmf-dist/source/fonts/japanese-otf/umkjvf11
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty2
-rw-r--r--Master/texmf-dist/tex/platex/japanese-otf/otf.sty27
159 files changed, 406 insertions, 110 deletions
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT b/Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT
index c4c8fb7048f..aa57e578d4f 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2003--2019 SAITO Shuzaburo and INOUE Koichi
-Copyright (C) 2007--2022 TANAKA Takuji
-Copyright (C) 2017--2022 Japanese TeX Development Community
+Copyright (C) 2007--2023 TANAKA Takuji
+Copyright (C) 2017--2023 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/README b/Master/texmf-dist/doc/fonts/japanese-otf/README
index be383b2747f..1d6034b23df 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.27 (2022/02/16)
+ - currently japanese-otf-uptex Ver.0.28 (2023/02/23)
- 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
-20220305.0
+20230223.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 036cfbe3cdc..d81e7f80ecd 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.27 2022/02/16
+japanese-otf-uptex Ver.0.28 2022/02/23
[ Abstract ]
@@ -480,4 +480,26 @@ https://github.com/t-tk/japanese-otf-uptex
Add new tests for CK multi-weight plain texts.
COPYRIGHT ::
Update year.
+2023.02.23 Ver0.28
+ sty/otf.sty, sty/mlutf.sty ::
+ Bump version number.
+ Set option autodetect-engine default.
+ Add a new option platex to check if engine is platex.
+ umkjvf, umakeotf{,_brsg,_jis04,_pre,_prop},
+ script/{CheckDVICode,MakeSPList}.pm,
+ script/{mktfm_sp,mkutf32list,mkutfvf_sp,umk{,v}pkana}.pl ::
+ Update header comments.
+ script/CheckDVICode.pm, script/sp_list_j.txt,
+ test/uplatex/sp_jp_{utf,text}.tex ::
+ Update references:
+ Unicode Blocks-15.0.0.txt (Date: 2022-01-28, 20:58:00 GMT [KW])
+ Adobe-Japan1-7 cid2code.txt (Version 05/18/2022).
+ script/{CheckDVICode,MakeSPList}.pm, script/umk{,v}pkana}.pl,
+ umkjvf, umakeotf_prop ::
+ Support Kana Letter Small Ko defined by Unicode 15.0.
+ test/uplatex/Makefile, test/uplatex/utfmacro-kozuka.map,
+ test/uplatex/{uotftest-utf8,upkanatest1}.tex ::
+ Add new tests for Small Kana Extension & Adobe fonts.
+ COPYRIGHT ::
+ Update year.
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/Makefile b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/Makefile
index bb5ba6d3f67..d3337fb3fe3 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/Makefile
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/Makefile
@@ -6,6 +6,53 @@ DVIPS = dvips
DVIPDFMX = dvipdfmx -v
PDVITYPE = pdvitype
+JPOTF = ../../..
+MYFONTDIR = /please/set/personal/fontdir
+
+export TEXINPUTS := .;${JPOTF}/japanese-otf-uptex/sty/;${JPOTF}/japanese-otf/sty/;$$TEXMF/tex/{platex,latex,generic,}//
+export VFFONTS := .;${JPOTF}//vf/;$$TEXMF/fonts/vf//
+export TFMFONTS := .;${JPOTF}//tfm/;{$$TEXMF/fonts,$$VARTEXFONTS}/tfm//
+export OFMFONTS := .;${JPOTF}//ofm/;{$$TEXMF/fonts,$$VARTEXFONTS}/{ofm,tfm}//
+export OPENTYPEFONTS := .;${MYFONTDIR}//;$$TEXMF/fonts/{opentype,truetype}//;$$OSFONTDIR//
+
+which-otf:
+ kpsewhich otf.sty
+
+which-exp-vf:
+ kpsewhich -format vf upexpminr-h.vf
+
+which-exp-tfm:
+ kpsewhich -format tfm upexpminr-h.tfm
+
+which-cmr-tfm:
+ kpsewhich -format tfm cmr10.tfm
+
+which-cjmr-tfm:
+ kpsewhich -format tfm otf-cjmr-h.tfm
+
+which-cjmr-ofm:
+ kpsewhich -format ofm otf-cjmr-h.ofm
+
+which-hara-otf:
+ kpsewhich -format "opentype fonts" HaranoAjiMincho-Regular.otf
+ kpsewhich -format "opentype fonts" HaranoAjiGothic-Medium.otf
+
+which-hara-ck-otf:
+ kpsewhich -format "opentype fonts" HaranoAjiMinchoCN-Regular.otf
+ kpsewhich -format "opentype fonts" HaranoAjiGothicCN-Medium.otf
+ kpsewhich -format "opentype fonts" HaranoAjiMinchoTW-Regular.otf
+ kpsewhich -format "opentype fonts" HaranoAjiGothicTW-Medium.otf
+ kpsewhich -format "opentype fonts" HaranoAjiMinchoK1-Regular.otf
+ kpsewhich -format "opentype fonts" HaranoAjiGothicK1-Medium.otf
+
+which-koz-otf:
+ kpsewhich -format "opentype fonts" KozMinPr6N-Regular.otf
+ kpsewhich -format "opentype fonts" KozGoPr6N-Medium.otf
+ kpsewhich -format "opentype fonts" AdobeSongStd-Light.otf
+ kpsewhich -format "opentype fonts" AdobeMingStd-Light.otf
+ kpsewhich -format "opentype fonts" AdobeMyungjoStd-Medium.otf
+
+
all: otf sp art brsg jis04 scale prop punct exclam dir
otf: uplatex-otf platex-otf
@@ -39,6 +86,30 @@ platex-otf:
$(DVIPDFMX) uotftest-$$opt-v-platex.dvi ; \
done
+uplatex-otf-haranoaji: uplatex-otf
+ for opt in deluxe expert; do \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$opt-h-hara-uplatex.pdf uotftest-$$opt-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$opt-v-hara-uplatex.pdf uotftest-$$opt-v-uplatex.dvi ; \
+ done
+
+uplatex-otf-kozuka: uplatex-otf
+ for opt in deluxe expert; do \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$opt-h-koz-uplatex.pdf uotftest-$$opt-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$opt-v-koz-uplatex.pdf uotftest-$$opt-v-uplatex.dvi ; \
+ done
+
+platex-otf-haranoaji: platex-otf
+ for opt in deluxe expert; do \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$opt-h-hara-platex.pdf uotftest-$$opt-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotftest-$$opt-v-hara-platex.pdf uotftest-$$opt-v-platex.dvi ; \
+ done
+
+platex-otf-kozuka: platex-otf
+ for opt in deluxe expert; do \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$opt-h-koz-platex.pdf uotftest-$$opt-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotftest-$$opt-v-koz-platex.pdf uotftest-$$opt-v-platex.dvi ; \
+ done
+
uplatex-sp:
for opt in default deluxe expert bold noreplace; do \
$(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" uotf-sp-utf8.tex ; \
@@ -59,6 +130,30 @@ platex-sp:
$(DVIPDFMX) uotf-sp-$$opt-v-platex.dvi ; \
done
+uplatex-sp-haranoaji: uplatex-sp
+ for opt in deluxe expert; do \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-sp-$$opt-h-hara-uplatex.pdf uotf-sp-$$opt-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-sp-$$opt-v-hara-uplatex.pdf uotf-sp-$$opt-v-uplatex.dvi ; \
+ done
+
+uplatex-sp-kozuka: uplatex-sp
+ for opt in deluxe expert; do \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-h-koz-uplatex.pdf uotf-sp-$$opt-h-uplatex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-v-koz-uplatex.pdf uotf-sp-$$opt-v-uplatex.dvi ; \
+ done
+
+platex-sp-haranoaji: platex-sp
+ for opt in deluxe expert; do \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-sp-$$opt-h-hara-platex.pdf uotf-sp-$$opt-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-haranoaji.map -o uotf-sp-$$opt-v-hara-platex.pdf uotf-sp-$$opt-v-platex.dvi ; \
+ done
+
+platex-sp-kozuka: platex-sp
+ for opt in deluxe expert; do \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-h-koz-platex.pdf uotf-sp-$$opt-h-platex.dvi ; \
+ $(DVIPDFMX) -f utfmacro-kozuka.map -o uotf-sp-$$opt-v-koz-platex.pdf uotf-sp-$$opt-v-platex.dvi ; \
+ done
+
uplatex-article:
for opt in noreplace; do \
$(UPLATEX) "\def\option{$$opt}\def\class{article}\input" uotftest-utf8.tex ; \
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_text.tex b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_text.tex
index 24203b59b91..5fc7ae1d8c5 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_text.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_text.tex
@@ -1,6 +1,6 @@
%
% This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 07/30/2019)
+% in cid2code.txt (Version 05/18/2022)
% for Adobe-Japan1-7
%
% Reference:
@@ -26,15 +26,15 @@ Adobe-Japan1-4\\
🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷
🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹
🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃
-🆄🆅🆆🆇🆈🆉🞜眞𠤎𦥑
-𫟘沿芽槪割𦈢𠮷𩵋卿𫞎
-憲𠩤浩𫝆𫝷滋𠮟勺爵周
-将𭕄𠀋城𩙿真𠆢𮕩𫝑成
-𧾷𣳾炭𥫗彫潮𡈽冬𤴔姬
-𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃
-拔𦦙𣏌杞𪧦𫞽絣𮉸𠔿𦉪
-𠂰𮛪𨦇𨸗𫠚𤋮桒𣲾𠘑嶲
-你𣘺𣏾𢘉
+🆄🆅🆆🆇🆈🆉🞜𛄲𛅕眞
+𠤎𦥑𫟘沿芽槪割𦈢𠮷𩵋
+卿𫞎憲𠩤浩𫝆𫝷滋𠮟勺
+爵周将𭕄𠀋城𩙿真𠆢𮕩
+𫝑成𧾷𣳾炭𥫗彫潮𡈽冬
+𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄
+卉寃拔𦦙𣏌杞𪧦𫞽絣𮉸
+𠔿𦉪𠂰𮛪𨦇𨸗𫠚𤋮桒𣲾
+𠘑嶲你𣘺𣏾𢘉
Adobe-Japan1-5\\
𡌛𡑮𡢽𡚴𡸴𣇄𣗄𣜿𣝣𤟱
@@ -65,11 +65,11 @@ Adobe-Japan1-5\\
𨯯𨴐𨵱𨷻𨸟𨸶𨺉𨻫𨼲𨿸
𩊠𩊱𩒐𩗏𩛰𩜙𩝐𩣆𩩲𩷛
𩸕𩺊𩹉𩻄𩻩𩻛𩿎𩿗𪀯𪀚
-𪃹𪂂𢈘𪎌𪐷𪗱𪘂𪚲𠃵𤸄
-𤿲𧵳再善形慈栟軔𪊲𠅘
-𠖱𠛬𫝓𠵘𫝚𫝜𥧌𫝶𢹂𫝼
-𠟈𢿫𧦴𫞂𫞋𣟱𫞔𤁋𫞬𫞯
-𫟉𫟏𫟒𦲞𧰼𫟰𫝥𫠍𫠗𦍌
-𩸽𪘚
+𪃹𪂂𢈘𪎌𪐷𪗱𪘂𪚲𱍐𠃵
+𤸄𤿲𧵳再善形慈栟軔𪊲
+𠅘𠖱𠛬𫝓𠵘𫝚𫝜𥧌𫝶𢹂
+𫝼𠟈𢿫𧦴𫞂𫞋𣟱𫞔𤁋𫞬
+𫞯𫟉𫟏𫟒𦲞𧰼𫟰𫝥𫠍𫠗
+𦍌𩸽𪘚
% end
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_utf.tex b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_utf.tex
index 3f9a1e6fcbb..7570f6686a3 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_utf.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/sp_jp_utf.tex
@@ -1,6 +1,6 @@
%
% This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 07/30/2019)
+% in cid2code.txt (Version 05/18/2022)
% for Adobe-Japan1-7
%
% Reference:
@@ -26,15 +26,15 @@ Adobe-Japan1-4\\
\UTF{1F142}\UTF{1F143}\UTF{1F144}\UTF{1F145}\UTF{1F146}\UTF{1F147}\UTF{1F148}\UTF{1F149}\UTF{1F202}\UTF{1F237}%
\UTF{1F170}\UTF{1F171}\UTF{1F172}\UTF{1F173}\UTF{1F174}\UTF{1F175}\UTF{1F176}\UTF{1F177}\UTF{1F178}\UTF{1F179}%
\UTF{1F17A}\UTF{1F17B}\UTF{1F17C}\UTF{1F17D}\UTF{1F17E}\UTF{1F17F}\UTF{1F180}\UTF{1F181}\UTF{1F182}\UTF{1F183}%
-\UTF{1F184}\UTF{1F185}\UTF{1F186}\UTF{1F187}\UTF{1F188}\UTF{1F189}\UTF{1F79C}\UTF{2F945}\UTF{2090E}\UTF{26951}%
-\UTF{2B7D8}\UTF{2F8FC}\UTF{2F995}\UTF{2F8EA}\UTF{2F822}\UTF{26222}\UTF{20BB7}\UTF{29D4B}\UTF{2F833}\UTF{2B78E}%
-\UTF{2F8AC}\UTF{20A64}\UTF{2F903}\UTF{2B746}\UTF{2B777}\UTF{2F90B}\UTF{20B9F}\UTF{2F828}\UTF{2F921}\UTF{2F83F}%
-\UTF{2F873}\UTF{2D544}\UTF{2000B}\UTF{2F852}\UTF{2967F}\UTF{2F947}\UTF{201A2}\UTF{2E569}\UTF{2B751}\UTF{2F8B2}%
-\UTF{27FB7}\UTF{23CFE}\UTF{2F91A}\UTF{25AD7}\UTF{2F89A}\UTF{2F90F}\UTF{2123D}\UTF{2F81A}\UTF{24D14}\UTF{2F862}%
-\UTF{2B789}\UTF{2F9D0}\UTF{2F9DF}\UTF{2567F}\UTF{266B0}\UTF{20628}\UTF{2008A}\UTF{20984}\UTF{2F82C}\UTF{2F86D}%
-\UTF{2F8B6}\UTF{26999}\UTF{233CC}\UTF{2F8DB}\UTF{2A9E6}\UTF{2B7BD}\UTF{2F96C}\UTF{2E278}\UTF{2053F}\UTF{2626A}%
-\UTF{200B0}\UTF{2E6EA}\UTF{28987}\UTF{28E17}\UTF{2B81A}\UTF{242EE}\UTF{2F8E1}\UTF{23CBE}\UTF{20611}\UTF{2F9F4}%
-\UTF{2F804}\UTF{2363A}\UTF{233FE}\UTF{22609}
+\UTF{1F184}\UTF{1F185}\UTF{1F186}\UTF{1F187}\UTF{1F188}\UTF{1F189}\UTF{1F79C}\UTF{1B132}\UTF{1B155}\UTF{2F945}%
+\UTF{2090E}\UTF{26951}\UTF{2B7D8}\UTF{2F8FC}\UTF{2F995}\UTF{2F8EA}\UTF{2F822}\UTF{26222}\UTF{20BB7}\UTF{29D4B}%
+\UTF{2F833}\UTF{2B78E}\UTF{2F8AC}\UTF{20A64}\UTF{2F903}\UTF{2B746}\UTF{2B777}\UTF{2F90B}\UTF{20B9F}\UTF{2F828}%
+\UTF{2F921}\UTF{2F83F}\UTF{2F873}\UTF{2D544}\UTF{2000B}\UTF{2F852}\UTF{2967F}\UTF{2F947}\UTF{201A2}\UTF{2E569}%
+\UTF{2B751}\UTF{2F8B2}\UTF{27FB7}\UTF{23CFE}\UTF{2F91A}\UTF{25AD7}\UTF{2F89A}\UTF{2F90F}\UTF{2123D}\UTF{2F81A}%
+\UTF{24D14}\UTF{2F862}\UTF{2B789}\UTF{2F9D0}\UTF{2F9DF}\UTF{2567F}\UTF{266B0}\UTF{20628}\UTF{2008A}\UTF{20984}%
+\UTF{2F82C}\UTF{2F86D}\UTF{2F8B6}\UTF{26999}\UTF{233CC}\UTF{2F8DB}\UTF{2A9E6}\UTF{2B7BD}\UTF{2F96C}\UTF{2E278}%
+\UTF{2053F}\UTF{2626A}\UTF{200B0}\UTF{2E6EA}\UTF{28987}\UTF{28E17}\UTF{2B81A}\UTF{242EE}\UTF{2F8E1}\UTF{23CBE}%
+\UTF{20611}\UTF{2F9F4}\UTF{2F804}\UTF{2363A}\UTF{233FE}\UTF{22609}
Adobe-Japan1-5\\
\UTF{2131B}\UTF{2146E}\UTF{218BD}\UTF{216B4}\UTF{21E34}\UTF{231C4}\UTF{235C4}\UTF{2373F}\UTF{23763}\UTF{247F1}%
@@ -65,11 +65,11 @@ Adobe-Japan1-5\\
\UTF{28BEF}\UTF{28D10}\UTF{28D71}\UTF{28DFB}\UTF{28E1F}\UTF{28E36}\UTF{28E89}\UTF{28EEB}\UTF{28F32}\UTF{28FF8}%
\UTF{292A0}\UTF{292B1}\UTF{29490}\UTF{295CF}\UTF{296F0}\UTF{29719}\UTF{29750}\UTF{298C6}\UTF{29A72}\UTF{29DDB}%
\UTF{29E15}\UTF{29E8A}\UTF{29E49}\UTF{29EC4}\UTF{29EE9}\UTF{29EDB}\UTF{29FCE}\UTF{29FD7}\UTF{2A02F}\UTF{2A01A}%
-\UTF{2A0F9}\UTF{2A082}\UTF{22218}\UTF{2A38C}\UTF{2A437}\UTF{2A5F1}\UTF{2A602}\UTF{2A6B2}\UTF{200F5}\UTF{24E04}%
-\UTF{24FF2}\UTF{27D73}\UTF{2F815}\UTF{2F846}\UTF{2F899}\UTF{2F8A6}\UTF{2F8E5}\UTF{2F9DE}\UTF{2A2B2}\UTF{20158}%
-\UTF{205B1}\UTF{206EC}\UTF{2B753}\UTF{20D58}\UTF{2B75A}\UTF{2B75C}\UTF{259CC}\UTF{2B776}\UTF{22E42}\UTF{2B77C}%
-\UTF{207C8}\UTF{22FEB}\UTF{279B4}\UTF{2B782}\UTF{2B78B}\UTF{237F1}\UTF{2B794}\UTF{2404B}\UTF{2B7AC}\UTF{2B7AF}%
-\UTF{2B7C9}\UTF{2B7CF}\UTF{2B7D2}\UTF{26C9E}\UTF{27C3C}\UTF{2B7F0}\UTF{2B765}\UTF{2B80D}\UTF{2B817}\UTF{2634C}%
-\UTF{29E3D}\UTF{2A61A}
+\UTF{2A0F9}\UTF{2A082}\UTF{22218}\UTF{2A38C}\UTF{2A437}\UTF{2A5F1}\UTF{2A602}\UTF{2A6B2}\UTF{31350}\UTF{200F5}%
+\UTF{24E04}\UTF{24FF2}\UTF{27D73}\UTF{2F815}\UTF{2F846}\UTF{2F899}\UTF{2F8A6}\UTF{2F8E5}\UTF{2F9DE}\UTF{2A2B2}%
+\UTF{20158}\UTF{205B1}\UTF{206EC}\UTF{2B753}\UTF{20D58}\UTF{2B75A}\UTF{2B75C}\UTF{259CC}\UTF{2B776}\UTF{22E42}%
+\UTF{2B77C}\UTF{207C8}\UTF{22FEB}\UTF{279B4}\UTF{2B782}\UTF{2B78B}\UTF{237F1}\UTF{2B794}\UTF{2404B}\UTF{2B7AC}%
+\UTF{2B7AF}\UTF{2B7C9}\UTF{2B7CF}\UTF{2B7D2}\UTF{26C9E}\UTF{27C3C}\UTF{2B7F0}\UTF{2B765}\UTF{2B80D}\UTF{2B817}%
+\UTF{2634C}\UTF{29E3D}\UTF{2A61A}
% 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 2b112b08348..e8fdc9965ed 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
@@ -133,13 +133,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -150,13 +150,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -168,13 +168,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -185,13 +185,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -203,13 +203,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -221,7 +221,7 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fbox{\hbox{\tate\Huge ㇰ}}
@@ -232,7 +232,7 @@ UTFM:%
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -243,13 +243,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -261,13 +261,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -282,13 +282,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
@@ -300,13 +300,13 @@ UTFM:%
ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
\ifuptexmode
-ゔゕゖ
+ゔゕゖ𛄲
\fi
ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
\ifuptexmode
-ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ𛅕
\fi
“回”、‘回’。“回”,‘回’.
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/upkanatest1.tex b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/upkanatest1.tex
index 087bcbcece4..0f0d8d18d88 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/upkanatest1.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/upkanatest1.tex
@@ -58,7 +58,7 @@
otfbeta-uptex (japanese-otf-uptex) Ver.0.18でProportional仮名を、
Ver.0.21で半角片仮名を拡張しました。
-\long\def\testA{〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
+\long\def\testA{〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ𛄲𛅕
𨳝櫛𥡴𨻶杓巽屠兔冕冤𡨚𤏐爨🄀
🄐🄑🄒🄓🄔🄕🄖🄗🄘🄙🄚🄛🄜🄝🄞🄟🄠🄡🄢🄣
🄤🄥🄦🄧🄨🄩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map
new file mode 100644
index 00000000000..06050a030c3
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/doc/test/uplatex/utfmacro-kozuka.map
@@ -0,0 +1,144 @@
+rml H KozMinPr6N-Regular.otf
+rmlv V KozMinPr6N-Regular.otf
+
+uprml-h UniJISup-UTF16-H KozMinPr6N-Regular.otf
+uprml-v UniJISup-UTF16-V KozMinPr6N-Regular.otf
+
+hminr-h H KozMinPr6N-Regular.otf
+hminb-h H KozMinPr6N-Regular.otf
+hminl-h H KozMinPr6N-Regular.otf
+hgothr-h H KozGoPr6N-Medium.otf
+hgothb-h H KozGoPr6N-Medium.otf
+hgotheb-h H KozGoPr6N-Medium.otf
+hmgothr-h H KozGoPr6N-Medium.otf
+hminr-v V KozMinPr6N-Regular.otf
+hminb-v V KozMinPr6N-Regular.otf
+hminl-v V KozMinPr6N-Regular.otf
+hgothr-v V KozGoPr6N-Medium.otf
+hgothb-v V KozGoPr6N-Medium.otf
+hgotheb-v V KozGoPr6N-Medium.otf
+hmgothr-v V KozGoPr6N-Medium.otf
+
+hminrn-h H KozMinPr6N-Regular.otf
+hminbn-h H KozMinPr6N-Regular.otf
+hminln-h H KozMinPr6N-Regular.otf
+hgothrn-h H KozGoPr6N-Medium.otf
+hgothbn-h H KozGoPr6N-Medium.otf
+hgothebn-h H KozGoPr6N-Medium.otf
+hmgothrn-h H KozGoPr6N-Medium.otf
+hminrn-v V KozMinPr6N-Regular.otf
+hminbn-v V KozMinPr6N-Regular.otf
+hminln-v V KozMinPr6N-Regular.otf
+hgothrn-v V KozGoPr6N-Medium.otf
+hgothbn-v V KozGoPr6N-Medium.otf
+hgothebn-v V KozGoPr6N-Medium.otf
+hmgothrn-v V KozGoPr6N-Medium.otf
+
+uphminr-h UniJISup-UTF16-H KozMinPr6N-Regular.otf
+uphminb-h UniJISup-UTF16-H KozMinPr6N-Regular.otf
+uphminl-h UniJISup-UTF16-H KozMinPr6N-Regular.otf
+uphgothr-h UniJISup-UTF16-H KozGoPr6N-Medium.otf
+uphgothb-h UniJISup-UTF16-H KozGoPr6N-Medium.otf
+uphgotheb-h UniJISup-UTF16-H KozGoPr6N-Medium.otf
+uphmgothr-h UniJISup-UTF16-H KozGoPr6N-Medium.otf
+uphminr-v UniJISup-UTF16-V KozMinPr6N-Regular.otf
+uphminb-v UniJISup-UTF16-V KozMinPr6N-Regular.otf
+uphminl-v UniJISup-UTF16-V KozMinPr6N-Regular.otf
+uphgothr-v UniJISup-UTF16-V KozGoPr6N-Medium.otf
+uphgothb-v UniJISup-UTF16-V KozGoPr6N-Medium.otf
+uphgotheb-v UniJISup-UTF16-V KozGoPr6N-Medium.otf
+uphmgothr-v UniJISup-UTF16-V KozGoPr6N-Medium.otf
+
+uphminrn-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf
+uphminbn-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf
+uphminln-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf
+uphgothrn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf
+uphgothbn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf
+uphgothebn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf
+uphmgothrn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf
+uphminrn-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf
+uphminbn-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf
+uphminln-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf
+uphgothrn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf
+uphgothbn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf
+uphgothebn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf
+uphmgothrn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf
+
+otf-ujmr-h UniJISup-UTF16-H KozMinPr6N-Regular.otf
+otf-ujmb-h UniJISup-UTF16-H KozMinPr6N-Regular.otf
+otf-ujml-h UniJISup-UTF16-H KozMinPr6N-Regular.otf
+otf-ujgr-h UniJISup-UTF16-H KozGoPr6N-Medium.otf
+otf-ujgb-h UniJISup-UTF16-H KozGoPr6N-Medium.otf
+otf-ujge-h UniJISup-UTF16-H KozGoPr6N-Medium.otf
+otf-ujmgr-h UniJISup-UTF16-H KozGoPr6N-Medium.otf
+
+otf-ujmrn-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf
+otf-ujmbn-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf
+otf-ujmln-h UniJIS2004up-UTF16-H KozMinPr6N-Regular.otf
+otf-ujgrn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf
+otf-ujgbn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf
+otf-ujgen-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf
+otf-ujmgrn-h UniJIS2004up-UTF16-H KozGoPr6N-Medium.otf
+
+otf-ujmr-v UniJISup-UTF16-V KozMinPr6N-Regular.otf
+otf-ujmb-v UniJISup-UTF16-V KozMinPr6N-Regular.otf
+otf-ujml-v UniJISup-UTF16-V KozMinPr6N-Regular.otf
+otf-ujgr-v UniJISup-UTF16-V KozGoPr6N-Medium.otf
+otf-ujgb-v UniJISup-UTF16-V KozGoPr6N-Medium.otf
+otf-ujge-v UniJISup-UTF16-V KozGoPr6N-Medium.otf
+otf-ujmgr-v UniJISup-UTF16-V KozGoPr6N-Medium.otf
+
+otf-ujmrn-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf
+otf-ujmbn-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf
+otf-ujmln-v UniJIS2004up-UTF16-V KozMinPr6N-Regular.otf
+otf-ujgrn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf
+otf-ujgbn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf
+otf-ujgen-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf
+otf-ujmgrn-v UniJIS2004up-UTF16-V KozGoPr6N-Medium.otf
+
+otf-cjmr-h Identity-H KozMinPr6N-Regular.otf
+otf-cjmb-h Identity-H KozMinPr6N-Regular.otf
+otf-cjml-h Identity-H KozMinPr6N-Regular.otf
+otf-cjgr-h Identity-H KozGoPr6N-Medium.otf
+otf-cjgb-h Identity-H KozGoPr6N-Medium.otf
+otf-cjge-h Identity-H KozGoPr6N-Medium.otf
+otf-cjmgr-h Identity-H KozGoPr6N-Medium.otf
+
+otf-cjmr-v Identity-V KozMinPr6N-Regular.otf
+otf-cjmb-v Identity-V KozMinPr6N-Regular.otf
+otf-cjml-v Identity-V KozMinPr6N-Regular.otf
+otf-cjgr-v Identity-V KozGoPr6N-Medium.otf
+otf-cjgb-v Identity-V KozGoPr6N-Medium.otf
+otf-cjge-v Identity-V KozGoPr6N-Medium.otf
+otf-cjmgr-v Identity-V KozGoPr6N-Medium.otf
+
+
+otf-ucmr-h UniGB-UTF16-H AdobeSongStd-Light.otf
+otf-ucmr-v UniGB-UTF16-V AdobeSongStd-Light.otf
+otf-ucgr-h UniGB-UTF16-H AdobeHeitiStd-Regular.otf
+otf-ucgr-v UniGB-UTF16-V AdobeHeitiStd-Regular.otf
+
+otf-utmr-h UniCNS-UTF16-H AdobeMingStd-Light.otf
+otf-utmr-v UniCNS-UTF16-V AdobeMingStd-Light.otf
+otf-utgr-h UniCNS-UTF16-H AdobeFanHeitiStd-Bold.otf
+otf-utgr-v UniCNS-UTF16-V AdobeFanHeitiStd-Bold.otf
+
+otf-ukmr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+otf-ukmr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+otf-ukgr-h UniKS-UTF16-H AdobeMyungjoStd-Medium.otf
+otf-ukgr-v UniKS-UTF16-V AdobeMyungjoStd-Medium.otf
+
+otf-ccmr-h Identity-H AdobeSongStd-Light.otf
+otf-ccmr-v Identity-V AdobeSongStd-Light.otf
+otf-ccgr-h Identity-H AdobeHeitiStd-Regular.otf
+otf-ccgr-v Identity-V AdobeHeitiStd-Regular.otf
+
+otf-ctmr-h Identity-H AdobeMingStd-Light.otf
+otf-ctmr-v Identity-V AdobeMingStd-Light.otf
+otf-ctgr-h Identity-H AdobeFanHeitiStd-Bold.otf
+otf-ctgr-v Identity-V AdobeFanHeitiStd-Bold.otf
+
+otf-ckmr-h Identity-H AdobeMyungjoStd-Medium.otf
+otf-ckmr-v Identity-V AdobeMyungjoStd-Medium.otf
+otf-ckgr-h Identity-H AdobeMyungjoStd-Medium.otf
+otf-ckgr-v Identity-V AdobeMyungjoStd-Medium.otf
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfgrg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfgrg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfgrg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfgrg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfgrg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfgrg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgbg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgbg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgbg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgbg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgbg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgbg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgeg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgeg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgeg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgeg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgeg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgeg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgrg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgrg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgrg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgrg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgrg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjgrg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmbg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmbg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmbg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmbg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmbg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmbg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmgrg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmgrg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmgrg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmgrg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmgrg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmgrg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmlg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmlg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmlg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmlg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmlg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmlg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmrg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmrg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmrg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmrg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmrg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfjmrg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfmrg-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfmrg-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfmrg-h.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfmrg-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfmrg-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf/utfmrg-v.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-h.vf
index 8995843b3dc..b8607babbd2 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-v.vf
index 3a62ae9a4d0..49cabeef6b5 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-h.vf
index 894fac8889f..6333c506e58 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-v.vf
index 7ee87ff11a2..54951b67dab 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothbn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-h.vf
index bf9be0a01f5..6831b29c23b 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-v.vf
index dc7dc360327..089c1968428 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgotheb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-h.vf
index beea53f4705..f1a09d9e38d 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-v.vf
index f390c3db7d9..ed0278ebf8b 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothebn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-h.vf
index 111b3eb99fd..19439560264 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-v.vf
index b9e590ac534..3be74db00e3 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-h.vf
index 056e9daf8ef..3b6697f872d 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-v.vf
index 7bcdd86ca5c..415cb9d3499 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpgothrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-h.vf
index 16a7a60dee0..2520ca77aed 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-v.vf
index 9efb8f69dc6..53c00470ff1 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-h.vf
index 02cdb7bf9ce..8344ed97eaf 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-v.vf
index 90e938fa79d..e49e90a70ec 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpmgothrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-h.vf
index b0edcb1473a..d863022e386 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-v.vf
index 98e5c838c5f..3f607ce1d07 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-h.vf
index aed6596e727..1c3e9caaab8 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-v.vf
index 4a6cf39f2b4..0b10c2ae52f 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminbn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-h.vf
index 2801803629e..c60a79151f2 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-v.vf
index a6b2d511d4a..7eecba150b4 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminl-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-h.vf
index a13eecd29ac..04ffd96fc82 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-v.vf
index 3a1850cd6ee..f2bde5f99ca 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminln-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-h.vf
index 6c0f3af64fe..1c878a72a51 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-v.vf
index 7ee0f520c5c..ddf9e7ccc87 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-h.vf
index cfb159fcce7..245154b65a0 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-v.vf
index 5a41ee7162d..8c2cecd4c43 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upbrsgexpminrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-h.vf
index 0ac0212df2b..bcadcb3c08f 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-v.vf
index fc0f0f0bc49..62b791e07d2 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-h.vf
index cc6598608d3..73cca22e888 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-v.vf
index fb1c975772b..b750fc94e20 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothbn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-h.vf
index fca53d7197e..f0425ac226a 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-v.vf
index b9d20f6ed5a..f890e98bc49 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgotheb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-h.vf
index 18304945b4a..be753c23594 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-v.vf
index 5e634106310..f54677d6011 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothebn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-h.vf
index 87800e0a864..8d9645966cb 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-v.vf
index d903d20b81e..f443b97884d 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-h.vf
index afb4dc13563..c965fcaed4a 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-v.vf
index 58b02975662..e0abcd0a967 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpgothrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-h.vf
index 9766958a9eb..ae90f6f7cca 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-v.vf
index 3ab44b2fd99..daa44c4509b 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-h.vf
index 4c27e900b53..d309f59b2e5 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-v.vf
index 2d68a703689..a392c382172 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpmgothrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-h.vf
index dee6fe7304a..e065232c5c1 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-v.vf
index f75b4cdb2e0..7c70f1c1973 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-h.vf
index 2d5cde21544..38189152459 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-v.vf
index 6afb336afb1..e23c0a8dc4d 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminbn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-h.vf
index cec1093175e..a1c61cc9bd7 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-v.vf
index 71e8081aa38..2eb98966ece 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminl-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-h.vf
index 03db7b23071..38b7fa9529f 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-v.vf
index b413419bbfd..8c973afb099 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminln-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-h.vf
index 87bcd4f10c9..cab1c7f7b54 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-v.vf
index 413ae22939a..8c6181546de 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-h.vf
index 149fef2bf9f..95b1faf3bb6 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-v.vf
index 68e4c2dbc66..6b6351a8112 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upexpminrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-h.vf
index a5781acd0f2..140e5f94471 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-v.vf
index ba2b280bec9..e508fa680f2 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-h.vf
index 0084a014810..9a28081bf37 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-v.vf
index 98ce4bd20a0..890106e9d83 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothbn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-h.vf
index 59d14920fde..7f2fa296446 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-v.vf
index 45159fc6053..6bce3f7318a 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgotheb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-h.vf
index 89ad1d0d8de..2a6d09a4af6 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-v.vf
index faebc355aa1..f66830bef7d 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothebn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-h.vf
index 3ff7fb00db9..4be6f677ccb 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-v.vf
index 70570b48160..0044e2a02eb 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-h.vf
index 4f1868d5b57..a0a2ac271c5 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-v.vf
index 90874681ca0..d79ed7dead1 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlgothrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-h.vf
index 4ac9b03745d..d31637e0dbc 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-v.vf
index ce6e080a896..001cd316807 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-h.vf
index c4b111b6f98..ab7675ebf90 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-v.vf
index 1921de3f877..68939d0e39f 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlmgothrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-h.vf
index b393789b182..bd85684f748 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-v.vf
index bab92c97781..9003a8aa221 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-h.vf
index e97d138fa9f..d00af2baf89 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-v.vf
index 2f9bf3f4aad..5e6ddcfe053 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminbn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-h.vf
index 9c9e014075c..bfb9401431b 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-v.vf
index b6523316e67..571a7e26eaf 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminl-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-h.vf
index 55374728d7b..87f9d72a924 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-v.vf
index cdf4b64eb82..2eaee8e4e3a 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminln-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-h.vf
index 9c36f040b7d..4f7837c20eb 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-v.vf
index f5322eb1b1c..1a1f8f18bfd 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-h.vf
index c7989f92f71..4a84bd574d1 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-v.vf
index 08778a48d48..ef0eed71511 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/upnmlminrn-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-h.vf
index 65423f155fa..d0dcf2e6232 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-v.vf
index 5d92fbda1d1..6b1a3f1ba0e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-h.vf
index ed7c8606941..43bf92f912e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-v.vf
index 574b09daae2..f48736b485e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygotheb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-h.vf
index 844de9ad220..e63d1440176 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-v.vf
index aa2bf7a74a0..789cd4acec1 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubygothr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-h.vf
index 71fe042ae98..892c88a9729 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-v.vf
index f8d1aa4b5eb..5b0da0cf19e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubymgothr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-h.vf
index e5f403e442e..c697a7e8011 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-v.vf
index 3d927c801cf..4c4810e945a 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminb-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-h.vf
index 837e5bd6a7b..ad053697feb 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-v.vf
index 5b689e53404..73b0cf162f5 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminl-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-h.vf
index 4fcb83b59ae..5c310d49591 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-v.vf
index 21e6eaaa3be..b4992b61444 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/uprubyminr-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrg-h.vf
new file mode 100644
index 00000000000..762285ed63e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrg-v.vf
new file mode 100644
index 00000000000..eb6ca6a5479
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfgrg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgbg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgbg-h.vf
new file mode 100644
index 00000000000..e289aa7d163
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgbg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgbg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgbg-v.vf
new file mode 100644
index 00000000000..c564ba401fa
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgbg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgeg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgeg-h.vf
new file mode 100644
index 00000000000..96507a6d49d
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgeg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgeg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgeg-v.vf
new file mode 100644
index 00000000000..ff729a02544
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgeg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgrg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgrg-h.vf
new file mode 100644
index 00000000000..762285ed63e
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgrg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgrg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgrg-v.vf
new file mode 100644
index 00000000000..eb6ca6a5479
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjgrg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmbg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmbg-h.vf
new file mode 100644
index 00000000000..9ea4b04476b
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmbg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmbg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmbg-v.vf
new file mode 100644
index 00000000000..09c161ff580
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmbg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmgrg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmgrg-h.vf
new file mode 100644
index 00000000000..6165c1352c4
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmgrg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmgrg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmgrg-v.vf
new file mode 100644
index 00000000000..dcd596486c2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmgrg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmlg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmlg-h.vf
new file mode 100644
index 00000000000..c6806239d91
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmlg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmlg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmlg-v.vf
new file mode 100644
index 00000000000..57cbbab4d63
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmlg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmrg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmrg-h.vf
new file mode 100644
index 00000000000..e5d4a5f9ed2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmrg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmrg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmrg-v.vf
new file mode 100644
index 00000000000..23046c13d08
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfjmrg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrg-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrg-h.vf
new file mode 100644
index 00000000000..e5d4a5f9ed2
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrg-h.vf
Binary files differ
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrg-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrg-v.vf
new file mode 100644
index 00000000000..23046c13d08
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf/utfmrg-v.vf
Binary files differ
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm b/Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm
index 3af7198b944..2ff357b65d1 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm
@@ -12,7 +12,7 @@ CheckDVICode.pm
=head1 NOTE
-This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+This software is a part of japanese-otf-uptex.
=cut
@@ -94,6 +94,7 @@ sub is_dvicode($){
if ($key eq 'hira-Vu') { return ($code == 0x3094);} # large JIS X 0213
if ($key eq 'hira-ka') { return ($code == 0x3095);} # small JIS X 0213
if ($key eq 'hira-ke') { return ($code == 0x3096);} # small JIS X 0213
+ if ($key eq 'hira-ko') { return ($code == 0x1B132);}# small Unicode 15.0
if ($key eq 'kata-a') { return ($code == 0x30A1);} # small
if ($key eq 'kata-i') { return ($code == 0x30A3);} # :
if ($key eq 'kata-u') { return ($code == 0x30A5);} # :
@@ -106,6 +107,7 @@ sub is_dvicode($){
if ($key eq 'kata-wa') { return ($code == 0x30EE);} # :
if ($key eq 'kata-ka') { return ($code == 0x30F5);} # :
if ($key eq 'kata-ke') { return ($code == 0x30F6);} # small
+ if ($key eq 'kata-ko') { return ($code == 0x1B155);}# small Unicode 15.0
if ($key eq 'kata-Va') { return ($code == 0x30F7);} # large JIS X 0213
if ($key eq 'kata-Vi') { return ($code == 0x30F8);} # : JIS X 0213
if ($key eq 'kata-Ve') { return ($code == 0x30F9);} # : JIS X 0213
@@ -197,6 +199,7 @@ sub is_ucs_hira{
return 1 if ($dvicode>=0x3041 && $dvicode<=0x3093);
return 1 if ($dvicode>=0x3094 && $dvicode<=0x3096); # Vu, small Ka, small Ke
# return 1 if ($dvicode==0x309F); # Yori :: It is omitted because it is not included in "Tuned" in AJ1-6
+ return 1 if ($dvicode==0x1B132); # small Ko Unicode 15.0
return 0;
}
@@ -205,6 +208,7 @@ sub is_ucs_kata{
return 1 if ($dvicode>=0x30F7 && $dvicode<=0x30FA); # Va, Vi, Ve, Vo
return 1 if ($dvicode>=0x31F0 && $dvicode<=0x31FF); # small Ku, small Shi, ... , Small Re, Small Ro
# return 1 if ($dvicode==0x30FF); # Koto :: It is omitted because it is not included in "Tuned" in AJ1-6
+ return 1 if ($dvicode==0x1B155); # small Ko Unicode 15.0
return 0;
}
@@ -215,8 +219,8 @@ sub is_ucs_hankana{
# Reference:
# http://www.unicode.org/Public/UNIDATA/Blocks.txt
-# Blocks-12.0.0.txt
-# Date: 2018-07-30, 19:40:00 GMT [KW]
+# Blocks-15.0.0.txt
+# Date: 2022-01-28, 20:58:00 GMT [KW]
sub is_ucs_jpn_range{
return 1 if ($dvicode<=0x04FF); # Cyrillic
@@ -259,7 +263,8 @@ sub is_ucs_jpn_range{
return 0 if ($dvicode< 0xFF00);
return 1 if ($dvicode<=0xFFEF); # Halfwidth and Fullwidth Forms
- return 0 if ($dvicode< 0x1B000);
+ return 0 if ($dvicode< 0x1AFF0);
+ return 1 if ($dvicode<=0x1AFFF); # Kana Extended-B
return 1 if ($dvicode<=0x1B0FF); # Kana Supplement
return 1 if ($dvicode<=0x1B12F); # Kana Extended-A
return 1 if ($dvicode<=0x1B16F); # Small Kana Extension
@@ -281,6 +286,10 @@ sub is_ucs_jpn_range{
return 0 if ($dvicode< 0x2F800);
return 1 if ($dvicode<=0x2FA1F); # CJK Compatibility Ideographs Supplement
+ return 0 if ($dvicode< 0x30000);
+ return 1 if ($dvicode<=0x3134F); # CJK Unified Ideographs Extension G
+ return 1 if ($dvicode<=0x323AF); # CJK Unified Ideographs Extension H
+
return 0;
}
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm b/Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm
index 8dc9ce0e3a8..29e79a3792b 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm
@@ -12,13 +12,13 @@ MakeSPList.pm
=head1 NOTE
-This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+This software is a part of japanese-otf-uptex.
=cut
our ($r_exist_head, $r_exist_char);
-my $num = '[12][0-9A-F]{4}';
+my $num = '[123][0-9A-F]{4}';
sub make_sp_char_list(@) {
my (@lang)=@_;
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl
index 90f464d13ad..d14bd5866d6 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl
@@ -10,7 +10,7 @@ script/mktfm_sp.pl
=head1 NOTE
-This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+This software is a part of japanese-otf-uptex.
=cut
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 377659d3983..2a052520749 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl
@@ -19,7 +19,7 @@ Takuji Tanaka
=head1 NOTE
-This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+This software is a part of japanese-otf-uptex.
=cut
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl
index 97ea89f2af1..cf6379f957a 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl
@@ -12,7 +12,7 @@ script/mkutfvf_sp.pl -ovp2ovf='wovp2ovf'
=head1 NOTE
-This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+This software is a part of japanese-otf-uptex.
=cut
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt b/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt
index 2092c5767a7..ad1db442398 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt
@@ -1,6 +1,6 @@
%
% This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 07/30/2019)
+% in cid2code.txt (Version 05/18/2022)
% for Adobe-Japan1-7
%
% Reference:
@@ -26,15 +26,15 @@
1F142,1F143,1F144,1F145,1F146,1F147,1F148,1F149,1F202,1F237
1F170,1F171,1F172,1F173,1F174,1F175,1F176,1F177,1F178,1F179
1F17A,1F17B,1F17C,1F17D,1F17E,1F17F,1F180,1F181,1F182,1F183
-1F184,1F185,1F186,1F187,1F188,1F189,1F79C,2F945,2090E,26951
-2B7D8,2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B,2F833,2B78E
-2F8AC,20A64,2F903,2B746,2B777,2F90B,20B9F,2F828,2F921,2F83F
-2F873,2D544,2000B,2F852,2967F,2F947,201A2,2E569,2B751,2F8B2
-27FB7,23CFE,2F91A,25AD7,2F89A,2F90F,2123D,2F81A,24D14,2F862
-2B789,2F9D0,2F9DF,2567F,266B0,20628,2008A,20984,2F82C,2F86D
-2F8B6,26999,233CC,2F8DB,2A9E6,2B7BD,2F96C,2E278,2053F,2626A
-200B0,2E6EA,28987,28E17,2B81A,242EE,2F8E1,23CBE,20611,2F9F4
-2F804,2363A,233FE,22609
+1F184,1F185,1F186,1F187,1F188,1F189,1F79C,1B132,1B155,2F945
+2090E,26951,2B7D8,2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B
+2F833,2B78E,2F8AC,20A64,2F903,2B746,2B777,2F90B,20B9F,2F828
+2F921,2F83F,2F873,2D544,2000B,2F852,2967F,2F947,201A2,2E569
+2B751,2F8B2,27FB7,23CFE,2F91A,25AD7,2F89A,2F90F,2123D,2F81A
+24D14,2F862,2B789,2F9D0,2F9DF,2567F,266B0,20628,2008A,20984
+2F82C,2F86D,2F8B6,26999,233CC,2F8DB,2A9E6,2B7BD,2F96C,2E278
+2053F,2626A,200B0,2E6EA,28987,28E17,2B81A,242EE,2F8E1,23CBE
+20611,2F9F4,2F804,2363A,233FE,22609
%Adobe-Japan1-5
2131B,2146E,218BD,216B4,21E34,231C4,235C4,2373F,23763,247F1
@@ -65,11 +65,11 @@
28BEF,28D10,28D71,28DFB,28E1F,28E36,28E89,28EEB,28F32,28FF8
292A0,292B1,29490,295CF,296F0,29719,29750,298C6,29A72,29DDB
29E15,29E8A,29E49,29EC4,29EE9,29EDB,29FCE,29FD7,2A02F,2A01A
-2A0F9,2A082,22218,2A38C,2A437,2A5F1,2A602,2A6B2,200F5,24E04
-24FF2,27D73,2F815,2F846,2F899,2F8A6,2F8E5,2F9DE,2A2B2,20158
-205B1,206EC,2B753,20D58,2B75A,2B75C,259CC,2B776,22E42,2B77C
-207C8,22FEB,279B4,2B782,2B78B,237F1,2B794,2404B,2B7AC,2B7AF
-2B7C9,2B7CF,2B7D2,26C9E,27C3C,2B7F0,2B765,2B80D,2B817,2634C
-29E3D,2A61A
+2A0F9,2A082,22218,2A38C,2A437,2A5F1,2A602,2A6B2,31350,200F5
+24E04,24FF2,27D73,2F815,2F846,2F899,2F8A6,2F8E5,2F9DE,2A2B2
+20158,205B1,206EC,2B753,20D58,2B75A,2B75C,259CC,2B776,22E42
+2B77C,207C8,22FEB,279B4,2B782,2B78B,237F1,2B794,2404B,2B7AC
+2B7AF,2B7C9,2B7CF,2B7D2,26C9E,27C3C,2B7F0,2B765,2B80D,2B817
+2634C,29E3D,2A61A
% end
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl
index 26208884540..c72e56fc64a 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl
@@ -2,7 +2,7 @@
=head1 NOTE
-This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+This software is a part of japanese-otf-uptex.
=cut
@@ -373,7 +373,7 @@ sub print_type_prop{
sub get_charwidth{
my ($i,$dvicode)=@_;
- my ($char,$u,$l);
+ my ($char,$t,$u,$l);
if (!$ucs) {
if ($dvicode>=0x2474 && $dvicode<=0x2476) {
@@ -384,10 +384,11 @@ sub get_charwidth{
$char = pack("C*",$u,$l);
Encode::from_to($char,'euc-jp','utf-8');
} else {
+ $t = ($dvicode >>16) & 0xFF;
$u = ($dvicode >> 8) & 0xFF;
$l = $dvicode & 0xFF;
- $char = pack("C*",$u,$l);
- Encode::from_to($char,'utf-16be','utf-8');
+ $char = pack("C*",0x00,$t,$u,$l);
+ Encode::from_to($char,'utf-32','utf-8');
}
if (!exists($charwidth[$i]{$char})) {
return 0;
@@ -397,7 +398,7 @@ sub get_charwidth{
__DATA__
-character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4
+character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 comment
ヽ 15449 7.11 7.54 7.19 7.49 7.45
ヾ 15450 7.68 7.95 7.69 8 8.15
ゝ 15451 7.17 7.43 7.23 7.53 7.63
@@ -599,4 +600,6 @@ character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4
ヸ 15720 9.41 9.75 9.6 9.7 9.75
ヹ 15721 9.47 9.7 9.65 9.7 9.8
ヺ 15722 8.91 9.32 9.34 9.39 9.73
+𛄲 15723 7.53 7.76 7.9 8.18 8.33 U+1B132 小書き「こ」
+𛅕 15724 8.04 8.35 8.4 8.65 8.65 U+1B155 小書き「コ」
end
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl
index da4d0d7d8a8..60e17126622 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl
@@ -2,7 +2,7 @@
=head1 NOTE
-This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+This software is a part of japanese-otf-uptex.
=cut
@@ -340,7 +340,7 @@ sub print_type_prop{
sub get_charwidth{
my ($i,$dvicode)=@_;
- my ($char,$u,$l);
+ my ($char,$t,$u,$l);
if (!$ucs) {
if ($dvicode>=0x2474 && $dvicode<=0x2476) {
@@ -351,10 +351,11 @@ sub get_charwidth{
$char = pack("C*",$u,$l);
Encode::from_to($char,'euc-jp','utf-8');
} else {
+ $t = ($dvicode >>16) & 0xFF;
$u = ($dvicode >> 8) & 0xFF;
$l = $dvicode & 0xFF;
- $char = pack("C*",$u,$l);
- Encode::from_to($char,'utf-16be','utf-8');
+ $char = pack("C*",0x00,$t,$u,$l);
+ Encode::from_to($char,'utf-32','utf-8');
}
if (!exists($charwidth[$i]{$char})) {
return 0;
@@ -364,7 +365,7 @@ sub get_charwidth{
__DATA__
-character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4
+character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 comment
ヽ 15976 7.17 7.46 7.92 8.27 8.13
ヾ 15977 8.34 8.44 8.46 8.62 8.5
ゝ 15978 7.77 7.98 8.44 8.69 8.62
@@ -566,4 +567,6 @@ character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4
ヸ 16188 9.61 9.8 9.73 9.84 9.77
ヹ 16189 8.94 9.28 9.56 9.80 9.88
ヺ 16190 9.54 9.71 9.67 9.82 9.74
+𛄲 16191 8.72 8.88 8.83 9.13 9.04 U+1B132 小書き「こ」
+𛅕 16192 8 8.23 8.65 8.95 8.91 U+1B155 小書き「コ」
end
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf
index 5749e6fcb7a..d675f106d20 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+# This script is a part of japanese-otf-uptex.
#
# setting for ovp2ovf & uppltotf
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_brsg b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_brsg
index 2296dc79293..d4d6fabffb3 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_brsg
+++ b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_brsg
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+# This script is a part of japanese-otf-uptex.
#
# setting for ovp2ovf & uppltotf
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_jis04 b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_jis04
index f02e69fd63c..13b7fdc102e 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_jis04
+++ b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_jis04
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+# This script is a part of japanese-otf-uptex.
#
# setting for ovp2ovf & uppltotf
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_pre b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_pre
index 1336cc21828..c9bcb8b5d4e 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_pre
+++ b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_pre
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+# This script is a part of japanese-otf-uptex.
#
# setting for ovp2ovf & uppltotf
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_prop b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_prop
index 13b27d5152b..b83a6e07420 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_prop
+++ b/Master/texmf-dist/source/fonts/japanese-otf/umakeotf_prop
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+# This script is a part of japanese-otf-uptex.
#
# setting for ovp2ovf & uppltotf
@@ -18,8 +18,8 @@ mkdir ovp
fi
echo "making proportional kana tfm/vf ..."
-perl -s script/umkpkana.pl -omitfw -hk
-perl -s script/umkvpkana.pl -omitfw
+perl -s script/umkpkana.pl -omitfw -sp -hk
+perl -s script/umkvpkana.pl -omitfw -sp
for face in minw3 minw6 kakuw3 kakuw6 maruw4
do
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/umkjvf b/Master/texmf-dist/source/fonts/japanese-otf/umkjvf
index f90f4a5a0aa..229d70e3049 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/umkjvf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/umkjvf
@@ -775,6 +775,8 @@ sub print_ruby_hira_char{
if (&is_dvicode('hira-Vu')){$ruby_hira_code=0x3744;}
if (&is_dvicode('hira-ka')){$ruby_hira_code=0x363A;}
if (&is_dvicode('hira-ke')){$ruby_hira_code=0x3641;}
+ if (&is_dvicode('hira-ko')){$ruby_hira_code=0x3130;
+ $ruby_font_map=3;} # Unicode 15.0
$ruby_hira_code_orig=$ruby_hira_code;
if ($direction eq "t"){&fix_ruby_hira_code;}
printf OVP "(CHARACTER H %X\n", $dvicode;
@@ -800,6 +802,7 @@ sub print_ruby_kata_char{
$ruby_font_map=3;} # JIS X 0213
if (&is_dvicode('kata-ku')){$ruby_kata_code_orig=$ruby_kata_code=0x305B;} # JIS X 0213
if (&is_dvicode('kata-mu')){$ruby_kata_code_orig=$ruby_kata_code=0x3066;} # JIS X 0213
+ if (&is_dvicode('kata-ko')){$ruby_kata_code_orig=$ruby_kata_code=0x3131;} # Unicode 15.0
if ($direction eq "t"){&fix_ruby_kata_code;}
printf OVP "(CHARACTER H %X\n", $dvicode;
printf OVP " (CHARWD R %f)\n",$font_at;
@@ -819,6 +822,7 @@ sub exp_hira_h_char{
if (&is_dvicode('hira-Vu')){$exp_hira_code_h=0x3139;$exp_font_map=3;} # JIS X 0213
if (&is_dvicode('hira-ka')){$exp_hira_code_h=0x6f6d;$exp_font_map=2;} # JIS X 0213
if (&is_dvicode('hira-ke')){$exp_hira_code_h=0x3034;$exp_font_map=3;} # JIS X 0213
+ if (&is_dvicode('hira-ko')){$exp_hira_code_h=0x3037;$exp_font_map=3;} # Unicode 15.0
printf OVP "(CHARACTER H %X\n", $dvicode;
printf OVP " (CHARWD R %f)\n",$font_at;
print OVP " (MAP\n";
@@ -838,6 +842,7 @@ sub exp_hira_h_char{
sub exp_kata_h_char{
if (&is_dvicode('kata-ka')){$exp_kata_code_h=0x3147;}
if (&is_dvicode('kata-ke')){$exp_kata_code_h=0x314e;}
+ if (&is_dvicode('kata-ko')){$exp_kata_code_h=0x3151;} # Unicode 15.0
if (&is_dvicode('kata-Va')){$exp_kata_code_h=0x3254;} # JIS X 0213
if (&is_dvicode('kata-ku')){$exp_kata_code_h=0x6f5d;} # JIS X 0213
if (&is_dvicode('kata-mu')){$exp_kata_code_h=0x6f68;} # JIS X 0213
@@ -860,6 +865,7 @@ sub exp_hira_v_char{
if (&is_dvicode('hira-Vu')){$exp_hira_code_v=0x3430;$exp_font_map=2;} # JIS X 0213
if (&is_dvicode('hira-ka')){$exp_hira_code_v=0x3264;$exp_font_map=2;} # JIS X 0213
if (&is_dvicode('hira-ke')){$exp_hira_code_v=0x326b;$exp_font_map=2;} # JIS X 0213
+ if (&is_dvicode('hira-ko')){$exp_hira_code_v=0x326e;$exp_font_map=2;} # Unicode 15.0
printf OVP "(CHARACTER H %X\n", $dvicode;
printf OVP " (CHARWD R %f)\n",$font_at;
print OVP " (MAP\n";
@@ -881,6 +887,7 @@ sub exp_kata_v_char{
if (&is_dvicode('kata-Va')){$exp_kata_code_v=0x354b;} # JIS X 0213
if (&is_dvicode('kata-ku')){$exp_kata_code_v=0x303b;$exp_font_map=3;} # JIS X 0213
if (&is_dvicode('kata-mu')){$exp_kata_code_v=0x3046;} # JIS X 0213
+ if (&is_dvicode('kata-ko')){$exp_kata_code_v=0x3448;$exp_font_map=2;} # Unicode 15.0
printf OVP "(CHARACTER H %X\n", $dvicode;
printf OVP " (CHARWD R %f)\n",$font_at;
print OVP " (MAP\n";
@@ -909,6 +916,7 @@ sub fix_ruby_hira_code{
if (&is_dvicode('hira-wa' )){$ruby_hira_code=0x3750;}#wa
if (&is_dvicode('hira-ka' )){$ruby_hira_code=0x374a;} # JIS X 0213
if (&is_dvicode('hira-ke' )){$ruby_hira_code=0x374b;} # JIS X 0213
+ if (&is_dvicode('hira-ko' )){$ruby_hira_code=0x3143;} # Unicode 15.0
}
sub fix_ruby_kata_code{
if (&is_dvicode('kata-a' )){$ruby_kata_code=0x3867;}#a
@@ -922,8 +930,9 @@ sub fix_ruby_kata_code{
if (&is_dvicode('kata-yo' )){$ruby_kata_code=0x3931;}#yo
if (&is_dvicode('kata-wa' )){$ruby_kata_code=0x3932;}#wa
if (&is_dvicode('kata-ka' )){$ruby_kata_code=0x386c;}#ka
- if (&is_dvicode('kata-ke' )){$ruby_kata_code=0x386d;}#ke
+ if (&is_dvicode('kata-ke' )){$ruby_kata_code=0x386d;}#ke
if (&is_dvicode('kata-ku..ro')){$ruby_kata_code+=215;} # JIS X 0213
+ if (&is_dvicode('kata-ko' )){$ruby_kata_code=0x3144;} # Unicode 15.0
}
sub get_shift_jiscode{
$c1=$ku+32;
diff --git a/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf/mlutf.sty
index 78a6b2353db..28538d0d285 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.27 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.28 ttk]
%force catcode of \" be 12
\count@\catcode`\"
\catcode`\"=12
diff --git a/Master/texmf-dist/tex/platex/japanese-otf/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf/otf.sty
index e302cea8868..27ceb01d0d7 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf/otf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf/otf.sty
@@ -1,7 +1,7 @@
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2022/03/05 TeX JP org, v1.7b8 psitau, u0.27 ttk]
+\ProvidesPackage{otf}[2023/02/23 TeX JP org, v1.7b8 psitau, u0.28 ttk]
\RequirePackage{keyval}
-%for processing options
+%for processing options
\newif\if@kana \@kanafalse
\newif\if@macro \@macrotrue
\newif\if@deluxe \@deluxefalse
@@ -10,7 +10,6 @@
\newif\if@burasage \@burasagefalse
\newif\if@newglyph \@newglyphfalse
\newif\if@otf@uplatex \@otf@uplatexfalse
-\newif\if@otf@autodetect \@otf@autodetectfalse
\newif\if@otf@scale \@otf@scalefalse
\newif\if@jsclasses \@jsclassesfalse
@@ -22,8 +21,10 @@
\DeclareOption{deluxe}{\@boldfalse\@replacetrue\@deluxetrue}
\DeclareOption{multi}{\AtEndOfPackage{\RequirePackage{mlutf}\RequirePackage{mlcid}}}
\DeclareOption{burasage}{\@burasagetrue}
-\DeclareOption{uplatex}{\@otf@uplatextrue}
-\DeclareOption{autodetect-engine}{\@otf@autodetecttrue}
+\let\@otf@engine@given=*
+\DeclareOption{platex}{\let\@otf@engine@given=p\@otf@uplatexfalse}
+\DeclareOption{uplatex}{\let\@otf@engine@given=u\@otf@uplatextrue}
+\DeclareOption{autodetect-engine}{\let\@otf@engine@given=*}
\DeclareOption{jis2004}{\@newglyphtrue}
\DeclareOption*{\otfpkg@setkey}
\def\otfpkg@setkey{\expandafter\otfpkg@setkey@a\expandafter{\CurrentOption}}
@@ -40,23 +41,33 @@
% Autodetect engine
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000 %upTeX
- \if@otf@autodetect
+ \ifx *\@otf@engine@given
\PackageInfo{otf}{Autodetected engine: upLaTeX}
\@otf@uplatextrue
\fi
+ \ifx p\@otf@engine@given
+ \PackageError{otf}
+ {Option 'platex' is specified but you are running upLaTeX.}
+ {\@ehc}
+ \fi
\if@otf@uplatex\else
\PackageError{otf}
{You are running upLaTeX.\MessageBreak
- Please use pLaTeX instead, or add 'uplatex' to\MessageBreak
+ Please use pLaTeX instead, or remove 'platex' from\MessageBreak
the package option list}
{\@ehc}
\@otf@uplatextrue
\fi
\else %pTeX
- \if@otf@autodetect
+ \ifx *\@otf@engine@given
\PackageInfo{otf}{Autodetected engine: pLaTeX}
\@otf@uplatexfalse
\fi
+ \ifx u\@otf@engine@given
+ \PackageError{otf}
+ {Option 'uplatex' is specified but you are running pLaTeX.}
+ {\@ehc}
+ \fi
\if@otf@uplatex
\PackageError{otf}
{You are running pLaTeX.\MessageBreak