japanese-otf-uptex (4mar17)

git-svn-id: svn://tug.org/texlive/trunk@43395 c570f23f-e606-0410-a88d-b1316a301751

88 files changed, 1056 insertions, 1380 deletions

diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
index 387393b3dc7..51faf38a42b 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
@@ -1,5 +1,5 @@
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.17  2015/04/10
+otfbeta-uptex (japanese-otf-uptex) Ver.0.18  2017/03/04
 
 
 [ Abstract ]
@@ -15,6 +15,7 @@ umakeotf : script to make vf, tfm
 umakeotf_brsg : script to make vf, tfm for burasage option
 umakeotf_jis04 : script to make vf, tfm for jis2004 option
 umakeotf_prop : script to make vf, tfm for proportional kana
+umakeotf_pre : preparation script for umakeotf*
 umkjvf : mkjvf with unicode support
 
 basepl/ubase-h.pl : unicode version of base-h.pl
@@ -70,10 +71,9 @@ to Adobe standard CMap "UniJIS2004-UTF16-{H,V}".
 [ About proportional kana ]
 otfbeta-uptex (japanese-otf-uptex) Ver.0.14 or later supports
 proportional kana at deluxe option and \propshape with limitation:
-* The following Kana letters are not proportional:
-  〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ  (in UTF-8)
 * Halfwidth katakana letters are not supported:
   ｱｲｳｴｵｶｷｸｹｺ ... (in UTF-8)
+To build tfm files, uppltotf in TeX live r43143 or later is required.
 
 
 [ History ]
@@ -279,4 +279,22 @@ proportional kana at deluxe option and \propshape with limitation:
     Revise.
   COPYRIGHT ::
     Update year.
+2017.03.04 Ver0.18
+  umakeotf{,_brsg,_jis04,_prop,_pre} ::
+    Clean up.
+  sty/otf.sty, sty/mlutf.sty ::
+    Increment version number.
+  script/CheckDVICode.pm ::
+    Update reference Unicode Blocks-9.0.0.txt (Date: 2016-02-05, 23:48:00 GMT [KW])
+  script/mkutf32list.pl, script/sp_list_{c,j,k,t}.txt, test/uplatex/sp_{cns,gb,jp}_utf.tex ::
+    Update references: URL of cid2code.txt
+    and Adobe-CNS1-6 cid2code.txt (Version 12/04/2015).
+  script/umk{,v}pkana.pl, test/uplatex/upkanatest1.tex ::
+    Add more proportional kana support:
+      〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ (in UTF-8)
+    Latest uppltotf (TeX Live r43143 or later) is required.
+  patch/*.patch::
+    Remove.
+  COPYRIGHT ::
+    Update year.
 
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
index db4499cbd57..78453ed2020 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/COPYRIGHT
@@ -1,5 +1,5 @@
 Copyright (C) 2003--2010 SAITO Shuzaburo and INOUE Koichi
-Copyright (C) 2007--2015 TANAKA Takuji
+Copyright (C) 2007--2017 TANAKA Takuji
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_cns_utf.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_cns_utf.tex
index 61845d9620f..05b0c7ce1d7 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_cns_utf.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_cns_utf.tex
@@ -1,11 +1,11 @@
 %
 % This file is generated from the data of UniCNS-UTF32
-% in cid2code.txt (Version 10/25/2010)
+% in cid2code.txt (Version 12/04/2015)
 % for Adobe-CNS1-6
 %
 % Reference:
-%   http://sourceforge.net/adobe/cmap/home/Home/
-%   cmapresources_cns1-6.tar.z
+%   https://github.com/adobe-type-tools/cmap-resources/
+%   cmapresources_cns1-6/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %
@@ -93,46 +93,46 @@ Adobe-CNS1-1\\
 \UTFT{26258}\UTFT{29D98}\UTFT{23D40}\UTFT{20E9D}\UTFT{282E2}\UTFT{20C41}\UTFT{20C96}\UTFT{20E76}\UTFT{22C62}\UTFT{20EA2}%
 \UTFT{21075}\UTFT{22B43}\UTFT{22EB3}\UTFT{20DA7}\UTFT{2688A}\UTFT{20EF9}\UTFT{27FF9}\UTFT{247E0}\UTFT{29D7C}\UTFT{275A3}%
 \UTFT{26048}\UTFT{24618}\UTFT{29EAC}\UTFT{29FDE}\UTFT{272B2}\UTFT{2048E}\UTFT{20EB6}\UTFT{27F2E}\UTFT{2A434}\UTFT{243F2}%
-\UTFT{29E06}\UTFT{294D0}\UTFT{26335}\UTFT{20D28}\UTFT{20D71}\UTFT{21F0F}\UTFT{21DD1}\UTFT{2176D}\UTFT{28E97}\UTFT{25C21}%
-\UTFT{20CD4}\UTFT{201F2}\UTFT{2A64A}\UTFT{2837D}\UTFT{2A2B2}\UTFT{24ABB}\UTFT{26E05}\UTFT{2251B}\UTFT{28E39}\UTFT{20F3B}%
-\UTFT{25F1A}\UTFT{27486}\UTFT{267CC}\UTFT{24011}\UTFT{2F922}\UTFT{20547}\UTFT{205DF}\UTFT{23FC5}\UTFT{24942}\UTFT{289E4}%
-\UTFT{219DB}\UTFT{23CC8}\UTFT{24933}\UTFT{289AA}\UTFT{202A0}\UTFT{26BB3}\UTFT{21305}\UTFT{224ED}\UTFT{26D29}\UTFT{27A84}%
-\UTFT{23600}\UTFT{24AB1}\UTFT{22513}\UTFT{2037E}\UTFT{20380}\UTFT{20347}\UTFT{2041F}\UTFT{249A4}\UTFT{20487}\UTFT{233B4}%
-\UTFT{20BFF}\UTFT{220FC}\UTFT{202E5}\UTFT{22530}\UTFT{2058E}\UTFT{23233}\UTFT{21983}\UTFT{205B3}\UTFT{23C99}\UTFT{24AA6}%
-\UTFT{2372D}\UTFT{26B13}\UTFT{2F829}\UTFT{28ADE}\UTFT{23F80}\UTFT{20954}\UTFT{23FEC}\UTFT{20BE2}\UTFT{21726}\UTFT{216E8}%
-\UTFT{286AB}\UTFT{2F832}\UTFT{21596}\UTFT{21613}\UTFT{28A9B}\UTFT{25772}\UTFT{20B8F}\UTFT{23FEB}\UTFT{22DA3}\UTFT{20C77}%
-\UTFT{26B53}\UTFT{20D74}\UTFT{2170D}\UTFT{20EDD}\UTFT{20D4D}\UTFT{289BC}\UTFT{22698}\UTFT{218D7}\UTFT{2403A}\UTFT{24435}%
-\UTFT{210B4}\UTFT{2328A}\UTFT{28B66}\UTFT{2124F}\UTFT{241A5}\UTFT{26C7E}\UTFT{21416}\UTFT{21454}\UTFT{24363}\UTFT{24BF5}%
-\UTFT{2123C}\UTFT{2A150}\UTFT{24278}\UTFT{2163E}\UTFT{21692}\UTFT{20D4E}\UTFT{26C81}\UTFT{26D2A}\UTFT{217DC}\UTFT{217FB}%
-\UTFT{217B2}\UTFT{26DA6}\UTFT{21828}\UTFT{216D5}\UTFT{26E45}\UTFT{249A9}\UTFT{26FA1}\UTFT{22554}\UTFT{21911}\UTFT{216B8}%
-\UTFT{27A0E}\UTFT{20204}\UTFT{21A34}\UTFT{259CC}\UTFT{205A5}\UTFT{21B44}\UTFT{21CA5}\UTFT{26B28}\UTFT{21DF9}\UTFT{21E37}%
-\UTFT{21EA4}\UTFT{24901}\UTFT{22049}\UTFT{22173}\UTFT{244BC}\UTFT{20CD3}\UTFT{21771}\UTFT{28482}\UTFT{201C1}\UTFT{2F894}%
-\UTFT{2133A}\UTFT{26888}\UTFT{223D0}\UTFT{22471}\UTFT{26E6E}\UTFT{28A36}\UTFT{25250}\UTFT{21F6A}\UTFT{270F8}\UTFT{22668}%
-\UTFT{2029E}\UTFT{28A29}\UTFT{227B4}\UTFT{24982}\UTFT{2498F}\UTFT{27A53}\UTFT{2F8A6}\UTFT{26ED2}\UTFT{20656}\UTFT{23FB7}%
-\UTFT{2285F}\UTFT{28B9D}\UTFT{2995D}\UTFT{22980}\UTFT{228C1}\UTFT{20118}\UTFT{21770}\UTFT{22E0D}\UTFT{249DF}\UTFT{2138E}%
-\UTFT{217FC}\UTFT{22E36}\UTFT{2571D}\UTFT{24A28}\UTFT{24A23}\UTFT{24940}\UTFT{21829}\UTFT{23400}\UTFT{231F7}\UTFT{231F8}%
-\UTFT{231A4}\UTFT{231A5}\UTFT{20E75}\UTFT{251E6}\UTFT{23231}\UTFT{285F4}\UTFT{231C8}\UTFT{25313}\UTFT{228F7}\UTFT{2439C}%
-\UTFT{24A21}\UTFT{237C2}\UTFT{2F8DB}\UTFT{241CD}\UTFT{290ED}\UTFT{233E6}\UTFT{26DA0}\UTFT{2346F}\UTFT{28ADF}\UTFT{235CD}%
-\UTFT{2363C}\UTFT{28A4A}\UTFT{203C9}\UTFT{23659}\UTFT{2212A}\UTFT{23703}\UTFT{2919C}\UTFT{20923}\UTFT{227CD}\UTFT{23ADB}%
-\UTFT{21958}\UTFT{23B5A}\UTFT{23EFC}\UTFT{2248B}\UTFT{248F1}\UTFT{26B51}\UTFT{23DBC}\UTFT{23DBD}\UTFT{241A4}\UTFT{2490C}%
-\UTFT{24900}\UTFT{23CC9}\UTFT{20D32}\UTFT{231F9}\UTFT{22491}\UTFT{26D25}\UTFT{26DA1}\UTFT{26DEB}\UTFT{2497F}\UTFT{24085}%
-\UTFT{26E72}\UTFT{26F74}\UTFT{28B21}\UTFT{2F908}\UTFT{23E2F}\UTFT{23F82}\UTFT{2304B}\UTFT{23E30}\UTFT{21497}\UTFT{2403D}%
-\UTFT{29170}\UTFT{24144}\UTFT{24091}\UTFT{24155}\UTFT{24039}\UTFT{23FF0}\UTFT{23FB4}\UTFT{2413F}\UTFT{24156}\UTFT{24157}%
-\UTFT{24140}\UTFT{261DD}\UTFT{24277}\UTFT{24365}\UTFT{242C1}\UTFT{2445A}\UTFT{24A27}\UTFT{24A22}\UTFT{28BE8}\UTFT{25605}%
-\UTFT{24974}\UTFT{23044}\UTFT{24823}\UTFT{2882B}\UTFT{28804}\UTFT{20C3A}\UTFT{26A2E}\UTFT{241E2}\UTFT{216E7}\UTFT{24A24}%
-\UTFT{249B7}\UTFT{2498D}\UTFT{249FB}\UTFT{24A26}\UTFT{2F92F}\UTFT{228AD}\UTFT{28EB2}\UTFT{24A8C}\UTFT{2415F}\UTFT{24A79}%
-\UTFT{28B8F}\UTFT{28C03}\UTFT{2189E}\UTFT{21988}\UTFT{28ED9}\UTFT{21A4B}\UTFT{28EAC}\UTFT{24F82}\UTFT{24D13}\UTFT{263F5}%
-\UTFT{26911}\UTFT{2690E}\UTFT{26F9F}\UTFT{2509D}\UTFT{2517D}\UTFT{21E1C}\UTFT{25220}\UTFT{232AC}\UTFT{28964}\UTFT{28968}%
-\UTFT{216C1}\UTFT{255E0}\UTFT{2760C}\UTFT{2261C}\UTFT{25857}\UTFT{27B39}\UTFT{27126}\UTFT{2910D}\UTFT{20C42}\UTFT{20D15}%
-\UTFT{2512B}\UTFT{22CC6}\UTFT{20341}\UTFT{24DB8}\UTFT{294E5}\UTFT{280BE}\UTFT{22C38}\UTFT{2815D}\UTFT{269F2}\UTFT{24DEA}%
-\UTFT{20D7C}\UTFT{20FB4}\UTFT{20CD5}\UTFT{20E96}\UTFT{20F64}\UTFT{22CA9}\UTFT{28256}\UTFT{244D3}\UTFT{20D46}\UTFT{29A4D}%
-\UTFT{280E9}\UTFT{24EA7}\UTFT{22CC2}\UTFT{295F4}\UTFT{252C7}\UTFT{297D4}\UTFT{22D44}\UTFT{22BCA}\UTFT{266DA}\UTFT{26716}%
-\UTFT{279A0}\UTFT{25052}\UTFT{20C43}\UTFT{28B4C}\UTFT{20731}\UTFT{201A9}\UTFT{22D8D}\UTFT{245C8}\UTFT{204FC}\UTFT{26097}%
-\UTFT{20F4C}\UTFT{22A66}\UTFT{2109D}\UTFT{20D9C}\UTFT{22775}\UTFT{2A601}\UTFT{20E09}\UTFT{22ACF}\UTFT{210C8}\UTFT{239C2}%
-\UTFT{2829B}\UTFT{25E49}\UTFT{220C7}\UTFT{22CB2}\UTFT{29720}\UTFT{24E3B}\UTFT{27574}\UTFT{22E8B}\UTFT{22208}\UTFT{2A65B}%
-\UTFT{28CCD}\UTFT{20E7A}\UTFT{20C34}\UTFT{27639}\UTFT{22BCE}\UTFT{22C51}\UTFT{210C7}\UTFT{2A632}\UTFT{28CD2}\UTFT{28D99}%
-\UTFT{28CCA}\UTFT{2775E}\UTFT{2F828}\UTFT{2107B}\UTFT{210D3}\UTFT{212FE}\UTFT{247EF}\UTFT{24EA5}\UTFT{24F5C}\UTFT{28189}%
-
+\UTFT{29E06}\UTFT{294D0}\UTFT{26335}\UTFT{20D28}\UTFT{20D71}\UTFT{21F0F}\UTFT{21DD1}\UTFT{2176D}\UTFT{2B473}\UTFT{28E97}%
+\UTFT{25C21}\UTFT{20CD4}\UTFT{201F2}\UTFT{2A64A}\UTFT{2837D}\UTFT{2A2B2}\UTFT{24ABB}\UTFT{26E05}\UTFT{2AE67}\UTFT{2251B}%
+\UTFT{28E39}\UTFT{20F3B}\UTFT{25F1A}\UTFT{27486}\UTFT{267CC}\UTFT{24011}\UTFT{2F922}\UTFT{20547}\UTFT{205DF}\UTFT{23FC5}%
+\UTFT{24942}\UTFT{289E4}\UTFT{219DB}\UTFT{23CC8}\UTFT{24933}\UTFT{289AA}\UTFT{202A0}\UTFT{26BB3}\UTFT{21305}\UTFT{224ED}%
+\UTFT{26D29}\UTFT{27A84}\UTFT{23600}\UTFT{24AB1}\UTFT{22513}\UTFT{2037E}\UTFT{20380}\UTFT{20347}\UTFT{2041F}\UTFT{249A4}%
+\UTFT{20487}\UTFT{233B4}\UTFT{20BFF}\UTFT{220FC}\UTFT{202E5}\UTFT{22530}\UTFT{2058E}\UTFT{23233}\UTFT{21983}\UTFT{205B3}%
+\UTFT{23C99}\UTFT{24AA6}\UTFT{2372D}\UTFT{26B13}\UTFT{2F829}\UTFT{28ADE}\UTFT{23F80}\UTFT{20954}\UTFT{23FEC}\UTFT{20BE2}%
+\UTFT{21726}\UTFT{216E8}\UTFT{286AB}\UTFT{2F832}\UTFT{21596}\UTFT{21613}\UTFT{28A9B}\UTFT{25772}\UTFT{20B8F}\UTFT{23FEB}%
+\UTFT{22DA3}\UTFT{20C77}\UTFT{26B53}\UTFT{20D74}\UTFT{2170D}\UTFT{20EDD}\UTFT{20D4D}\UTFT{289BC}\UTFT{22698}\UTFT{218D7}%
+\UTFT{2403A}\UTFT{24435}\UTFT{210B4}\UTFT{2328A}\UTFT{28B66}\UTFT{2124F}\UTFT{241A5}\UTFT{26C7E}\UTFT{21416}\UTFT{21454}%
+\UTFT{24363}\UTFT{24BF5}\UTFT{2123C}\UTFT{2A150}\UTFT{24278}\UTFT{2163E}\UTFT{21692}\UTFT{20D4E}\UTFT{26C81}\UTFT{26D2A}%
+\UTFT{217DC}\UTFT{217FB}\UTFT{217B2}\UTFT{26DA6}\UTFT{21828}\UTFT{216D5}\UTFT{26E45}\UTFT{249A9}\UTFT{26FA1}\UTFT{22554}%
+\UTFT{21911}\UTFT{216B8}\UTFT{27A0E}\UTFT{20204}\UTFT{21A34}\UTFT{259CC}\UTFT{205A5}\UTFT{21B44}\UTFT{21CA5}\UTFT{26B28}%
+\UTFT{21DF9}\UTFT{21E37}\UTFT{21EA4}\UTFT{24901}\UTFT{22049}\UTFT{22173}\UTFT{244BC}\UTFT{20CD3}\UTFT{21771}\UTFT{28482}%
+\UTFT{201C1}\UTFT{2F894}\UTFT{2133A}\UTFT{26888}\UTFT{223D0}\UTFT{22471}\UTFT{26E6E}\UTFT{28A36}\UTFT{25250}\UTFT{21F6A}%
+\UTFT{270F8}\UTFT{22668}\UTFT{2029E}\UTFT{28A29}\UTFT{227B4}\UTFT{24982}\UTFT{2498F}\UTFT{27A53}\UTFT{2F8A6}\UTFT{26ED2}%
+\UTFT{20656}\UTFT{23FB7}\UTFT{2285F}\UTFT{28B9D}\UTFT{2995D}\UTFT{22980}\UTFT{228C1}\UTFT{20118}\UTFT{21770}\UTFT{22E0D}%
+\UTFT{249DF}\UTFT{2138E}\UTFT{217FC}\UTFT{22E36}\UTFT{2571D}\UTFT{24A28}\UTFT{24A23}\UTFT{24940}\UTFT{21829}\UTFT{23400}%
+\UTFT{231F7}\UTFT{231F8}\UTFT{231A4}\UTFT{231A5}\UTFT{20E75}\UTFT{251E6}\UTFT{23231}\UTFT{285F4}\UTFT{231C8}\UTFT{25313}%
+\UTFT{228F7}\UTFT{2439C}\UTFT{24A21}\UTFT{237C2}\UTFT{2F8DB}\UTFT{241CD}\UTFT{290ED}\UTFT{233E6}\UTFT{26DA0}\UTFT{2346F}%
+\UTFT{28ADF}\UTFT{235CD}\UTFT{2363C}\UTFT{28A4A}\UTFT{203C9}\UTFT{23659}\UTFT{2212A}\UTFT{23703}\UTFT{2919C}\UTFT{20923}%
+\UTFT{227CD}\UTFT{23ADB}\UTFT{21958}\UTFT{23B5A}\UTFT{23EFC}\UTFT{2248B}\UTFT{248F1}\UTFT{26B51}\UTFT{23DBC}\UTFT{23DBD}%
+\UTFT{241A4}\UTFT{2490C}\UTFT{24900}\UTFT{23CC9}\UTFT{20D32}\UTFT{231F9}\UTFT{22491}\UTFT{26D25}\UTFT{26DA1}\UTFT{26DEB}%
+\UTFT{2497F}\UTFT{24085}\UTFT{26E72}\UTFT{26F74}\UTFT{28B21}\UTFT{2F908}\UTFT{23E2F}\UTFT{23F82}\UTFT{2304B}\UTFT{23E30}%
+\UTFT{21497}\UTFT{2403D}\UTFT{29170}\UTFT{24144}\UTFT{24091}\UTFT{24155}\UTFT{24039}\UTFT{23FF0}\UTFT{23FB4}\UTFT{2413F}%
+\UTFT{24156}\UTFT{24157}\UTFT{24140}\UTFT{261DD}\UTFT{24277}\UTFT{24365}\UTFT{242C1}\UTFT{2445A}\UTFT{24A27}\UTFT{24A22}%
+\UTFT{28BE8}\UTFT{25605}\UTFT{24974}\UTFT{23044}\UTFT{24823}\UTFT{2882B}\UTFT{28804}\UTFT{20C3A}\UTFT{26A2E}\UTFT{241E2}%
+\UTFT{216E7}\UTFT{24A24}\UTFT{249B7}\UTFT{2498D}\UTFT{249FB}\UTFT{24A26}\UTFT{2F92F}\UTFT{228AD}\UTFT{28EB2}\UTFT{24A8C}%
+\UTFT{2415F}\UTFT{24A79}\UTFT{28B8F}\UTFT{28C03}\UTFT{2189E}\UTFT{21988}\UTFT{28ED9}\UTFT{21A4B}\UTFT{28EAC}\UTFT{24F82}%
+\UTFT{24D13}\UTFT{263F5}\UTFT{26911}\UTFT{2690E}\UTFT{26F9F}\UTFT{2509D}\UTFT{2517D}\UTFT{21E1C}\UTFT{25220}\UTFT{232AC}%
+\UTFT{28964}\UTFT{28968}\UTFT{216C1}\UTFT{255E0}\UTFT{2760C}\UTFT{2261C}\UTFT{25857}\UTFT{27B39}\UTFT{27126}\UTFT{2910D}%
+\UTFT{20C42}\UTFT{20D15}\UTFT{2512B}\UTFT{22CC6}\UTFT{20341}\UTFT{24DB8}\UTFT{294E5}\UTFT{280BE}\UTFT{22C38}\UTFT{2815D}%
+\UTFT{269F2}\UTFT{24DEA}\UTFT{20D7C}\UTFT{20FB4}\UTFT{20CD5}\UTFT{2BAB3}\UTFT{20E96}\UTFT{20F64}\UTFT{22CA9}\UTFT{28256}%
+\UTFT{244D3}\UTFT{20D46}\UTFT{29A4D}\UTFT{280E9}\UTFT{24EA7}\UTFT{22CC2}\UTFT{295F4}\UTFT{252C7}\UTFT{297D4}\UTFT{22D44}%
+\UTFT{2BCD7}\UTFT{22BCA}\UTFT{2B977}\UTFT{266DA}\UTFT{26716}\UTFT{279A0}\UTFT{25052}\UTFT{20C43}\UTFT{28B4C}\UTFT{20731}%
+\UTFT{201A9}\UTFT{22D8D}\UTFT{245C8}\UTFT{204FC}\UTFT{26097}\UTFT{20F4C}\UTFT{22A66}\UTFT{2109D}\UTFT{20D9C}\UTFT{22775}%
+\UTFT{2A601}\UTFT{20E09}\UTFT{22ACF}\UTFT{2C5F8}\UTFT{210C8}\UTFT{239C2}\UTFT{2829B}\UTFT{25E49}\UTFT{220C7}\UTFT{22CB2}%
+\UTFT{29720}\UTFT{24E3B}\UTFT{2C9A0}\UTFT{27574}\UTFT{22E8B}\UTFT{22208}\UTFT{2A65B}\UTFT{28CCD}\UTFT{20E7A}\UTFT{20C34}%
+\UTFT{27639}\UTFT{22BCE}\UTFT{22C51}\UTFT{210C7}\UTFT{2A632}\UTFT{28CD2}\UTFT{28D99}\UTFT{28CCA}\UTFT{2775E}\UTFT{2F828}%
+\UTFT{2107B}\UTFT{210D3}\UTFT{212FE}\UTFT{247EF}\UTFT{24EA5}\UTFT{24F5C}\UTFT{28189}\UTFT{2B42C}
 
 Adobe-CNS1-3\\
 \UTFT{2010C}\UTFT{200D1}\UTFT{200CD}\UTFT{200CB}\UTFT{21FE8}\UTFT{200CA}\UTFT{2010E}\UTFT{21BC1}\UTFT{2F878}\UTFT{20086}%
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_gb_utf.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_gb_utf.tex
index c9f9e548754..cf975383bee 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_gb_utf.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_gb_utf.tex
@@ -4,8 +4,8 @@
 % for Adobe-GB1-5
 %
 % Reference:
-%   http://sourceforge.net/adobe/cmap/home/Home/
-%   cmapresources_gb1-5.tar.z
+%   https://github.com/adobe-type-tools/cmap-resources/
+%   cmapresources_gb1-5/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex
index 4c3806f7d8e..c7c88425b72 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/sp_jp_utf.tex
@@ -1,11 +1,11 @@
 %
 % This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 02/04/2012)
+% in cid2code.txt (Version 08/13/2012)
 % for Adobe-Japan1-6
 %
 % Reference:
-%   http://sourceforge.net/adobe/cmap/home/Home/
-%   cmapresources_japan1-6.tar.z
+%   https://github.com/adobe-type-tools/cmap-resources/
+%   cmapresources_japan1-6/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
index 79ed58fed6f..1a1289a6109 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
@@ -55,7 +55,7 @@
 }
 
 \ifuptexmode
-以下はProportionalではありません。
+otfbeta-uptex (japanese-otf-uptex) Ver.0.18でProportional仮名を拡張しました。
 
 {\propshape
 \noindent 〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-h.ovp
index 2c666b99321..0ad655bf24d 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-h.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.927000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF0)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.882000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF1)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.855000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF2)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.964000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D67)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.960000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D68)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.965000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D69)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.934000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D6A)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.802000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D56)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.843000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D57)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.830000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D58)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.766000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D59)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.804000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5A)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.861000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5B)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.815000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5C)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.809000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5D)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.878000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5E)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.886000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5F)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.839000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D61)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.832000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D62)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.790000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D63)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.872000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D64)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.818000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D65)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.867000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D66)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-v.ovp
index a986ff21c7c..8361587978e 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw3-v.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.928000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC4)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.861000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC5)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.892000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC6)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.944000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3B)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.973000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3C)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.956000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3D)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.967000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3E)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.878000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2A)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.825000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2B)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.857000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2C)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.881000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2D)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.864000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2E)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.829000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2F)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.876000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F30)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.852000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F31)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.732000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F32)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.883000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F33)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.866000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F35)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.884000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F36)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.899000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F37)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.871000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F38)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.841000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F39)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.871000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3A)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-h.ovp
index caac2ce0ab8..0d5c3eccce8 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-h.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.947000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF0)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.906000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF1)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.878000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF2)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.960000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D67)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.970000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D68)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.970000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D69)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.939000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D6A)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.834000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D56)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.867000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D57)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.859000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D58)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.790000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D59)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.835000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5A)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.884000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5B)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.843000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5C)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.830000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5D)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.894000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5E)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.909000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5F)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.861000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D61)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.854000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D62)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.813000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D63)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.890000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D64)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.841000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D65)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.893000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D66)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-v.ovp
index fa117bb9823..22476ca586a 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphirakakuw6-v.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.950000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC4)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.880000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC5)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.913000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC6)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.978000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3B)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.984000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3C)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.980000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3D)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.982000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3E)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.894000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2A)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.846000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2B)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.880000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2C)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.903000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2D)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.894000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2E)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.856000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2F)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.900000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F30)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.875000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F31)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.765000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F32)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.904000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F33)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.890000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F35)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.909000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F36)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.923000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F37)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.897000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F38)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.866000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F39)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.898000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3A)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-h.ovp
index 9b458cfb787..5a48fd3e168 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-h.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.944000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF0)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.895000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF1)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.873000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF2)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.981000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D67)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.975000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D68)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.980000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D69)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.973000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D6A)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.843000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D56)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.866000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D57)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.855000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D58)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.816000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D59)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.838000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5A)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.863000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5B)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.841000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5C)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.839000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5D)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.883000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5E)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.897000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5F)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.862000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D61)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.855000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D62)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.831000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D63)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.881000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D64)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.855000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D65)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.898000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D66)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-v.ovp
index 564d1744627..0c999d86791 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiramaruw4-v.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.950000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC4)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.885000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC5)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.911000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC6)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.975000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3B)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.977000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3C)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.988000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3D)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.974000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3E)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.892000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2A)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.851000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2B)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.877000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2C)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.874000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2D)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.893000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2E)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.858000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2F)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.890000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F30)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.881000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F31)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.781000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F32)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.896000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F33)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.881000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F35)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.909000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F36)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.914000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F37)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.889000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F38)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.859000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F39)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.904000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3A)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-h.ovp
index a2df5882d66..4f729a75376 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-h.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.873000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF0)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.875000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF1)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.836000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF2)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.920000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D67)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.941000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D68)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.947000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D69)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.891000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D6A)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.768000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D56)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.839000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D57)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.800000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D58)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.702000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D59)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.765000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5A)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.860000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5B)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.783000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5C)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.761000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5D)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.881000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5E)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.827000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5F)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.792000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D61)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.780000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D62)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.739000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D63)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.859000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D64)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.806000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D65)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.813000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D66)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-v.ovp
index f80fddd0d91..681bdc9ca11 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw3-v.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.963000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC4)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.841000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC5)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.890000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC6)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.942000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3B)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.961000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3C)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.894000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3D)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.954000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3E)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.865000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2A)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.786000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2B)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.822000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2C)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.901000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2D)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.851000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2E)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.714000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2F)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.829000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F30)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.842000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F31)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.679000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F32)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.857000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F33)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.834000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F35)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.880000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F36)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.913000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F37)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.802000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F38)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.789000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F39)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.811000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3A)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-h.ovp
index 392da5f0db4..75a3e4ce5b9 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-h.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.906000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF0)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.902000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF1)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.864000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3CF2)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.951000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D67)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.975000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D68)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.970000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D69)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.932000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D6A)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.803000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D56)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.858000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D57)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.819000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D58)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.729000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D59)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.789000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5A)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.879000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5B)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.802000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5C)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.794000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5D)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.910000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5E)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.853000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D5F)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.813000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D61)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.809000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D62)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.766000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D63)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.879000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D64)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.832000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D65)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.844000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3D66)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-v.ovp
index 611c72946c1..f2134d507c1 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/upphiraminw6-v.ovp
@@ -28645,21 +28645,24 @@
       )
    )
 (CHARACTER H 3094
-   (CHARWD R 1.000000)
+   (CHARWD R 0.972000)
    (MAP
-      (SETCHAR H 3094)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC4)
       )
    )
 (CHARACTER H 3095
-   (CHARWD R 1.000000)
+   (CHARWD R 0.860000)
    (MAP
-      (SETCHAR H 3095)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC5)
       )
    )
 (CHARACTER H 3096
-   (CHARWD R 1.000000)
+   (CHARWD R 0.903000)
    (MAP
-      (SETCHAR H 3096)
+      (SELECTFONT D 2)
+      (SETCHAR H 3EC6)
       )
    )
 (CHARACTER H 3097
@@ -29327,27 +29330,31 @@
       )
    )
 (CHARACTER H 30F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.966000)
    (MAP
-      (SETCHAR H 30F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3B)
       )
    )
 (CHARACTER H 30F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.980000)
    (MAP
-      (SETCHAR H 30F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3C)
       )
    )
 (CHARACTER H 30F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.928000)
    (MAP
-      (SETCHAR H 30F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3D)
       )
    )
 (CHARACTER H 30FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.971000)
    (MAP
-      (SETCHAR H 30FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3E)
       )
    )
 (CHARACTER H 30FB
@@ -29481,99 +29488,115 @@
       )
    )
 (CHARACTER H 31F0
-   (CHARWD R 1.000000)
+   (CHARWD R 0.867000)
    (MAP
-      (SETCHAR H 31F0)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2A)
       )
    )
 (CHARACTER H 31F1
-   (CHARWD R 1.000000)
+   (CHARWD R 0.808000)
    (MAP
-      (SETCHAR H 31F1)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2B)
       )
    )
 (CHARACTER H 31F2
-   (CHARWD R 1.000000)
+   (CHARWD R 0.840000)
    (MAP
-      (SETCHAR H 31F2)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2C)
       )
    )
 (CHARACTER H 31F3
-   (CHARWD R 1.000000)
+   (CHARWD R 0.906000)
    (MAP
-      (SETCHAR H 31F3)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2D)
       )
    )
 (CHARACTER H 31F4
-   (CHARWD R 1.000000)
+   (CHARWD R 0.865000)
    (MAP
-      (SETCHAR H 31F4)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2E)
       )
    )
 (CHARACTER H 31F5
-   (CHARWD R 1.000000)
+   (CHARWD R 0.731000)
    (MAP
-      (SETCHAR H 31F5)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F2F)
       )
    )
 (CHARACTER H 31F6
-   (CHARWD R 1.000000)
+   (CHARWD R 0.852000)
    (MAP
-      (SETCHAR H 31F6)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F30)
       )
    )
 (CHARACTER H 31F7
-   (CHARWD R 1.000000)
+   (CHARWD R 0.850000)
    (MAP
-      (SETCHAR H 31F7)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F31)
       )
    )
 (CHARACTER H 31F8
-   (CHARWD R 1.000000)
+   (CHARWD R 0.701000)
    (MAP
-      (SETCHAR H 31F8)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F32)
       )
    )
 (CHARACTER H 31F9
-   (CHARWD R 1.000000)
+   (CHARWD R 0.877000)
    (MAP
-      (SETCHAR H 31F9)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F33)
       )
    )
 (CHARACTER H 31FA
-   (CHARWD R 1.000000)
+   (CHARWD R 0.862000)
    (MAP
-      (SETCHAR H 31FA)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F35)
       )
    )
 (CHARACTER H 31FB
-   (CHARWD R 1.000000)
+   (CHARWD R 0.886000)
    (MAP
-      (SETCHAR H 31FB)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F36)
       )
    )
 (CHARACTER H 31FC
-   (CHARWD R 1.000000)
+   (CHARWD R 0.922000)
    (MAP
-      (SETCHAR H 31FC)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F37)
       )
    )
 (CHARACTER H 31FD
-   (CHARWD R 1.000000)
+   (CHARWD R 0.830000)
    (MAP
-      (SETCHAR H 31FD)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F38)
       )
    )
 (CHARACTER H 31FE
-   (CHARWD R 1.000000)
+   (CHARWD R 0.808000)
    (MAP
-      (SETCHAR H 31FE)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F39)
       )
    )
 (CHARACTER H 31FF
-   (CHARWD R 1.000000)
+   (CHARWD R 0.824000)
    (MAP
-      (SETCHAR H 31FF)
+      (SELECTFONT D 2)
+      (SETCHAR H 3F3A)
       )
    )
 (CHARACTER H 3200
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgru-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgru-h.ovp
index 390c406412b..95602bc6847 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgru-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgru-h.ovp
@@ -166,3 +166,6 @@
 (CHARACTER H 676F (CHARWD R 1.0) (MAP 
       (SELECTFONT D 1)
       (SETCHAR H 2ADFF)))
+(CHARACTER H 6957 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2AE67)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgru-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgru-v.ovp
index 9d42536d342..82a45c8c6d3 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgru-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgru-v.ovp
@@ -166,3 +166,6 @@
 (CHARACTER H 676F (CHARWD R 1.0) (MAP 
       (SELECTFONT D 1)
       (SETCHAR H 2ADFF)))
+(CHARACTER H 6957 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2AE67)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgrv-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgrv-h.ovp
index c52370a16cd..60be86809ff 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgrv-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgrv-h.ovp
@@ -8,6 +8,18 @@
    (FONTAT R 1.0)
    (FONTDSIZE R 10.000000)
    )
+(MAPFONT D 1
+   (FONTNAME otf-utgr-h)
+   (FONTCHECKSUM O 0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.000000)
+   )
+(CHARACTER H 405C (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B42C)))
+(CHARACTER H 4163 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B473)))
 (CHARACTER H 4D36 (CHARWD R 1.0) (MAP 
       (SETCHAR H 2B746)))
 (CHARACTER H 4D41 (CHARWD R 1.0) (MAP 
@@ -58,3 +70,12 @@
       (SETCHAR H 2B817)))
 (CHARACTER H 504A (CHARWD R 1.0) (MAP 
       (SETCHAR H 2B81A)))
+(CHARACTER H 5567 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B977)))
+(CHARACTER H 5A63 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2BAB3)))
+(CHARACTER H 6347 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2BCD7)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgrv-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgrv-v.ovp
index 94568b22049..98f1b0ef2ba 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgrv-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfgrv-v.ovp
@@ -8,6 +8,18 @@
    (FONTAT R 1.0)
    (FONTDSIZE R 10.000000)
    )
+(MAPFONT D 1
+   (FONTNAME otf-utgr-v)
+   (FONTCHECKSUM O 0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.000000)
+   )
+(CHARACTER H 405C (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B42C)))
+(CHARACTER H 4163 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B473)))
 (CHARACTER H 4D36 (CHARWD R 1.0) (MAP 
       (SETCHAR H 2B746)))
 (CHARACTER H 4D41 (CHARWD R 1.0) (MAP 
@@ -58,3 +70,12 @@
       (SETCHAR H 2B817)))
 (CHARACTER H 504A (CHARWD R 1.0) (MAP 
       (SETCHAR H 2B81A)))
+(CHARACTER H 5567 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B977)))
+(CHARACTER H 5A63 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2BAB3)))
+(CHARACTER H 6347 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2BCD7)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmru-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmru-h.ovp
index 051aad1e191..6cad364b8dc 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmru-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmru-h.ovp
@@ -166,3 +166,6 @@
 (CHARACTER H 676F (CHARWD R 1.0) (MAP 
       (SELECTFONT D 1)
       (SETCHAR H 2ADFF)))
+(CHARACTER H 6957 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2AE67)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmru-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmru-v.ovp
index a7d698f24e7..62ad10d7de5 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmru-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmru-v.ovp
@@ -166,3 +166,6 @@
 (CHARACTER H 676F (CHARWD R 1.0) (MAP 
       (SELECTFONT D 1)
       (SETCHAR H 2ADFF)))
+(CHARACTER H 6957 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2AE67)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmrv-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmrv-h.ovp
index 52f7672a6b5..3e3f08ec7f9 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmrv-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmrv-h.ovp
@@ -8,6 +8,18 @@
    (FONTAT R 1.0)
    (FONTDSIZE R 10.000000)
    )
+(MAPFONT D 1
+   (FONTNAME otf-utmr-h)
+   (FONTCHECKSUM O 0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.000000)
+   )
+(CHARACTER H 405C (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B42C)))
+(CHARACTER H 4163 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B473)))
 (CHARACTER H 4D36 (CHARWD R 1.0) (MAP 
       (SETCHAR H 2B746)))
 (CHARACTER H 4D41 (CHARWD R 1.0) (MAP 
@@ -58,3 +70,12 @@
       (SETCHAR H 2B817)))
 (CHARACTER H 504A (CHARWD R 1.0) (MAP 
       (SETCHAR H 2B81A)))
+(CHARACTER H 5567 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B977)))
+(CHARACTER H 5A63 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2BAB3)))
+(CHARACTER H 6347 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2BCD7)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmrv-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmrv-v.ovp
index 43fae47f810..a7eab7c4cf2 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmrv-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utfmrv-v.ovp
@@ -8,6 +8,18 @@
    (FONTAT R 1.0)
    (FONTDSIZE R 10.000000)
    )
+(MAPFONT D 1
+   (FONTNAME otf-utmr-v)
+   (FONTCHECKSUM O 0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.000000)
+   )
+(CHARACTER H 405C (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B42C)))
+(CHARACTER H 4163 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B473)))
 (CHARACTER H 4D36 (CHARWD R 1.0) (MAP 
       (SETCHAR H 2B746)))
 (CHARACTER H 4D41 (CHARWD R 1.0) (MAP 
@@ -58,3 +70,12 @@
       (SETCHAR H 2B817)))
 (CHARACTER H 504A (CHARWD R 1.0) (MAP 
       (SETCHAR H 2B81A)))
+(CHARACTER H 5567 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2B977)))
+(CHARACTER H 5A63 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2BAB3)))
+(CHARACTER H 6347 (CHARWD R 1.0) (MAP 
+      (SELECTFONT D 1)
+      (SETCHAR H 2BCD7)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgru-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgru-h.ovp
index 275c0bd7a60..0cacc061736 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgru-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgru-h.ovp
@@ -94,3 +94,5 @@
       (SETCHAR H 2A6A9)))
 (CHARACTER H 676F (CHARWD R 1.0) (MAP 
       (SETCHAR H 2ADFF)))
+(CHARACTER H 6957 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2AE67)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgru-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgru-v.ovp
index b5d1379f077..524738f494a 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgru-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgru-v.ovp
@@ -94,3 +94,5 @@
       (SETCHAR H 2A6A9)))
 (CHARACTER H 676F (CHARWD R 1.0) (MAP 
       (SETCHAR H 2ADFF)))
+(CHARACTER H 6957 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2AE67)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgrv-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgrv-h.ovp
new file mode 100644
index 00000000000..54900f8617a
--- /dev/null
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgrv-h.ovp
@@ -0,0 +1,20 @@
+(VTITLE JVF for UTF16)
+(OFMLEVEL D 0)
+(DESIGNSIZE R 10.000000)
+(CHECKSUM O 0)
+(MAPFONT D 0
+   (FONTNAME otf-utgr-h)
+   (FONTCHECKSUM O 0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.000000)
+   )
+(CHARACTER H 405C (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B42C)))
+(CHARACTER H 4163 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B473)))
+(CHARACTER H 5567 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B977)))
+(CHARACTER H 5A63 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2BAB3)))
+(CHARACTER H 6347 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2BCD7)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgrv-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgrv-v.ovp
new file mode 100644
index 00000000000..a2afb57b337
--- /dev/null
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftgrv-v.ovp
@@ -0,0 +1,20 @@
+(VTITLE JVF for UTF16)
+(OFMLEVEL D 0)
+(DESIGNSIZE R 10.000000)
+(CHECKSUM O 0)
+(MAPFONT D 0
+   (FONTNAME otf-utgr-v)
+   (FONTCHECKSUM O 0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.000000)
+   )
+(CHARACTER H 405C (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B42C)))
+(CHARACTER H 4163 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B473)))
+(CHARACTER H 5567 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B977)))
+(CHARACTER H 5A63 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2BAB3)))
+(CHARACTER H 6347 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2BCD7)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmru-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmru-h.ovp
index cd7ff77224c..dd72924e752 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmru-h.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmru-h.ovp
@@ -94,3 +94,5 @@
       (SETCHAR H 2A6A9)))
 (CHARACTER H 676F (CHARWD R 1.0) (MAP 
       (SETCHAR H 2ADFF)))
+(CHARACTER H 6957 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2AE67)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmru-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmru-v.ovp
index 27c711eb845..b2be4020d86 100644
--- a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmru-v.ovp
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmru-v.ovp
@@ -94,3 +94,5 @@
       (SETCHAR H 2A6A9)))
 (CHARACTER H 676F (CHARWD R 1.0) (MAP 
       (SETCHAR H 2ADFF)))
+(CHARACTER H 6957 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2AE67)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmrv-h.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmrv-h.ovp
new file mode 100644
index 00000000000..617635d279f
--- /dev/null
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmrv-h.ovp
@@ -0,0 +1,20 @@
+(VTITLE JVF for UTF16)
+(OFMLEVEL D 0)
+(DESIGNSIZE R 10.000000)
+(CHECKSUM O 0)
+(MAPFONT D 0
+   (FONTNAME otf-utmr-h)
+   (FONTCHECKSUM O 0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.000000)
+   )
+(CHARACTER H 405C (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B42C)))
+(CHARACTER H 4163 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B473)))
+(CHARACTER H 5567 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B977)))
+(CHARACTER H 5A63 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2BAB3)))
+(CHARACTER H 6347 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2BCD7)))
diff --git a/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmrv-v.ovp b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmrv-v.ovp
new file mode 100644
index 00000000000..1817fe5d8a3
--- /dev/null
+++ b/Master/texmf-dist/fonts/ovp/public/japanese-otf-uptex/utftmrv-v.ovp
@@ -0,0 +1,20 @@
+(VTITLE JVF for UTF16)
+(OFMLEVEL D 0)
+(DESIGNSIZE R 10.000000)
+(CHECKSUM O 0)
+(MAPFONT D 0
+   (FONTNAME otf-utmr-v)
+   (FONTCHECKSUM O 0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.000000)
+   )
+(CHARACTER H 405C (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B42C)))
+(CHARACTER H 4163 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B473)))
+(CHARACTER H 5567 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2B977)))
+(CHARACTER H 5A63 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2BAB3)))
+(CHARACTER H 6347 (CHARWD R 1.0) (MAP 
+      (SETCHAR H 2BCD7)))
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-h.tfm
index 3dfbae3b6e5..0c80cd28044 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-v.tfm
index d8a764a0a06..6cc7c5cbb64 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw3-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-h.tfm
index f335ca3105f..5ec63df52fd 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-v.tfm
index c693671e77f..18494e92087 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphirakakuw6-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-h.tfm
index 485544bb7a4..8b26bcdb5ab 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-v.tfm
index 255b23d94e7..cc289448681 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiramaruw4-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-h.tfm
index 2be17bbbe00..6382df065c0 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-v.tfm
index cf12cbc311b..4bef9224fd5 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw3-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-h.tfm
index 42218d00bb9..6cb6adea519 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-v.tfm
index dda59048929..a51dccaa73d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upphiraminw6-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftgrv-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftgrv-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftgrv-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftgrv-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftgrv-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftgrv-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftmrv-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftmrv-h.tfm
new file mode 100644
index 00000000000..29cb2cd42d7
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftmrv-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftmrv-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftmrv-v.tfm
new file mode 100644
index 00000000000..00f00ca892c
--- /dev/null
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/utftmrv-v.tfm
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-h.vf
index 1fb49c52398..27c4da43ee9 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-v.vf
index 81ad8a2766c..751e88b5530 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw3-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-h.vf
index 59f4a26d218..5b4e071c17b 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-v.vf
index 63f168649c3..9eb5d3a1163 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphirakakuw6-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-h.vf
index b922209907f..9df941d498c 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-v.vf
index 001bca3df8d..566f55b0f40 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiramaruw4-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw3-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw3-h.vf
index b6ddb6603ea..df36df8366e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw3-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw3-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw3-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw3-v.vf
index 010d02f4559..8541eaeeff0 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw3-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw3-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw6-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw6-h.vf
index 2c39db0f80e..23430c04d83 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw6-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw6-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw6-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw6-v.vf
index 378d990287a..3a478e6e470 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw6-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/upphiraminw6-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgru-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgru-h.vf
index 47d4ddfa52e..47d34383523 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgru-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgru-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgru-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgru-v.vf
index 70f63b7216e..22793470c5f 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgru-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgru-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgrv-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgrv-h.vf
index d73615333be..fbda381b54d 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgrv-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgrv-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgrv-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgrv-v.vf
index a2237aafb42..955e6936b7c 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgrv-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfgrv-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmru-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmru-h.vf
index 3f0e582625b..0d13c5daeee 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmru-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmru-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmru-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmru-v.vf
index 843d23e3b58..e6ad6260bee 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmru-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmru-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmrv-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmrv-h.vf
index 51de2fe52e7..288ae7bb12e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmrv-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmrv-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmrv-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmrv-v.vf
index d4a05dcfe25..385502dfa0e 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmrv-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utfmrv-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgru-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgru-h.vf
index bdf96654dd0..83ce3bfab93 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgru-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgru-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgru-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgru-v.vf
index 91a94c36fc5..ec2968b0c31 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgru-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgru-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgrv-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgrv-h.vf
new file mode 100644
index 00000000000..5bb5596c2d8
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgrv-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgrv-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgrv-v.vf
new file mode 100644
index 00000000000..b133bb5fd45
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftgrv-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmru-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmru-h.vf
index 987c9ad4269..f64009294ad 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmru-h.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmru-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmru-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmru-v.vf
index 517c90635bc..f294e326dd5 100644
--- a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmru-v.vf
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmru-v.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmrv-h.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmrv-h.vf
new file mode 100644
index 00000000000..eed779dfb74
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmrv-h.vf
diff --git a/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmrv-v.vf b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmrv-v.vf
new file mode 100644
index 00000000000..a3770883968
--- /dev/null
+++ b/Master/texmf-dist/fonts/vf/public/japanese-otf-uptex/utftmrv-v.vf
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.17.patch b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.17.patch
deleted file mode 100644
index 352c600729b..00000000000
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.17.patch
+++ /dev/null
@@ -1,775 +0,0 @@
-diff -urN otfbeta-1.7b6/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino.map(for udvips)
---- otfbeta-1.7b6/fontmap/hiragino.map(for udvips)	2010-03-27 09:38:48.000000000 +0900
-+++ otfbeta/fontmap/hiragino.map(for udvips)	2013-06-02 16:55:51.000000000 +0900
-@@ -4,6 +4,8 @@
- otf-cjmr-v 	HiraMinPro-W3-Identity-V
- hminr-h HiraMinPro-W3-H
- hminr-v HiraMinPro-W3-V
-+uphminr-h	HiraMinPro-W3-UniJIS-UTF16-H
-+uphminr-v	HiraMinPro-W3-UniJIS-UTF16-V
- 
- otf-ujgr-h	HiraKakuPro-W3-UniJIS-UTF16-H
- otf-ujgr-v	HiraKakuPro-W3-UniJIS-UTF16-V
-@@ -11,6 +13,8 @@
- otf-cjgr-v 	HiraKakuPro-W3-Identity-V
- hgothr-h HiraKakuPro-W3-H
- hgothr-v HiraKakuPro-W3-V
-+uphgothr-h	HiraKakuPro-W3-UniJIS-UTF16-H
-+uphgothr-v	HiraKakuPro-W3-UniJIS-UTF16-V
- 
- otf-ujmb-h	HiraMinPro-W6-UniJIS-UTF16-H
- otf-ujmb-v	HiraMinPro-W6-UniJIS-UTF16-V
-@@ -18,6 +22,8 @@
- otf-cjmb-v 	HiraMinPro-W6-Identity-V
- hminb-h HiraMinPro-W6-H
- hminb-v HiraMinPro-W6-V
-+uphminb-h	HiraMinPro-W6-UniJIS-UTF16-H
-+uphminb-v	HiraMinPro-W6-UniJIS-UTF16-V
- 
- otf-cjgb-h 	HiraKakuPro-W6-Identity-H
- otf-cjgb-v 	HiraKakuPro-W6-Identity-V
-@@ -25,9 +31,13 @@
- otf-ujgb-v	HiraKakuPro-W6-UniJIS-UTF16-V
- hgothb-h HiraKakuPro-W6-H
- hgothb-v HiraKakuPro-W6-V
-+uphgothb-h	HiraKakuPro-W6-UniJIS-UTF16-H
-+uphgothb-v	HiraKakuPro-W6-UniJIS-UTF16-V
- 
- hgotheb-h HiraKakuStd-W8-H
- hgotheb-v HiraKakuStd-W8-V
-+uphgotheb-h HiraKakuStd-W8-UniJIS-UTF16-H
-+uphgotheb-v HiraKakuStd-W8-UniJIS-UTF16-V
- 
- otf-ujmgr-h	HiraMaruPro-W4-UniJIS-UTF16-H
- otf-ujmgr-v	HiraMaruPro-W4-UniJIS-UTF16-V
-@@ -35,6 +45,8 @@
- otf-cjmgr-v 	HiraMaruPro-W4-Identity-V
- hmgothr-h HiraMaruPro-W4-H
- hmgothr-v HiraMaruPro-W4-V
-+uphmgothr-h	HiraMaruPro-W4-UniJIS-UTF16-H
-+uphmgothr-v	HiraMaruPro-W4-UniJIS-UTF16-V
- 
- otf-ujml-h	HiraMinPro-W2-UniJIS-UTF16-H
- otf-ujml-v	HiraMinPro-W2-UniJIS-UTF16-V
-@@ -42,6 +54,8 @@
- otf-cjml-v 	HiraMinPro-W2-Identity-V
- hminl-h HiraMinPro-W2-H
- hminl-v HiraMinPro-W2-V
-+uphminl-h	HiraMinPro-W2-UniJIS-UTF16-H
-+uphminl-v	HiraMinPro-W2-UniJIS-UTF16-V
- 
- hiramin-w3-h HiraMinPro-W3-Identity-H
- hiramin-w6-h HiraMinPro-W6-Identity-H
-@@ -59,28 +73,40 @@
- otf-ujmrn-v    HiraMinProN-W3-UniJIS2004-UTF16-V
- hminrn-h    HiraMinProN-W3-H
- hminrn-v    HiraMinProN-W3-V
-+uphminrn-h     HiraMinPro-W3-UniJIS2004-UTF16-H
-+uphminrn-v     HiraMinPro-W3-UniJIS2004-UTF16-V
- 
- otf-ujgrn-h    HiraKakuProN-W3-UniJIS2004-UTF16-H
- otf-ujgrn-v    HiraKakuProN-W3-UniJIS2004-UTF16-V
- hgothrn-h    HiraKakuProN-W3-H
- hgothrn-v    HiraKakuProN-W3-V
-+uphgothrn-h    HiraKakuProN-W3-UniJIS2004-UTF16-H
-+uphgothrn-v    HiraKakuProN-W3-UniJIS2004-UTF16-V
- 
- otf-ujmbn-h    HiraMinProN-W6-UniJIS2004-UTF16-H
- otf-ujmbn-v    HiraMinProN-W6-UniJIS2004-UTF16-V
- hminbn-h    HiraMinProN-W6-H
- hminbn-v    HiraMinProN-W6-V
-+uphminbn-h     HiraMinProN-W6-UniJIS2004-UTF16-H
-+uphminbn-v     HiraMinProN-W6-UniJIS2004-UTF16-V
- 
- otf-ujgbn-h    HiraKakuProN-W6-UniJIS2004-UTF16-H
- otf-ujgbn-v    HiraKakuProN-W6-UniJIS2004-UTF16-V
- hgothbn-h    HiraKakuProN-W6-H
- hgothbn-v    HiraKakuProN-W6-V
-+uphgothbn-h    HiraKakuProN-W6-UniJIS2004-UTF16-H
-+uphgothbn-v    HiraKakuProN-W6-UniJIS2004-UTF16-V
- 
- otf-ujmgrn-h    HiraMaruProN-W4-UniJIS2004-UTF16-H
- otf-ujmgrn-v    HiraMaruProN-W4-UniJIS2004-UTF16-V
- hmgothrn-h    HiraMaruProN-W4-H
- hmgothrn-v    HiraMaruProN-W4-V
-+uphmgothrn-h    HiraMaruProN-W4-UniJIS2004-UTF16-H
-+uphmgothrn-v    HiraMaruProN-W4-UniJIS2004-UTF16-V
- 
- otf-ujmln-h    HiraMinProN-W2-UniJIS2004-UTF16-H
- otf-ujmln-v    HiraMinProN-W2-UniJIS2004-UTF16-V
- hminln-h    HiraMinProN-W2-H
- hminln-v    HiraMinProN-W2-V
-+uphminln-h     HiraMinProN-W2-UniJIS2004-UTF16-H
-+uphminln-v     HiraMinProN-W2-UniJIS2004-UTF16-V
-diff -urN otfbeta-1.7b6/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hiraginox.map(for dvipdfmx)
---- otfbeta-1.7b6/fontmap/hiraginox.map(for dvipdfmx)	2010-03-27 09:39:08.000000000 +0900
-+++ otfbeta/fontmap/hiraginox.map(for dvipdfmx)	2013-06-02 16:55:51.000000000 +0900
-@@ -4,6 +4,8 @@
- otf-cjmr-v       Identity-V  HiraMinPro-W3
- hminr-h   H HiraMinPro-W3
- hminr-v V HiraMinPro-W3
-+uphminr-h      UniJIS-UTF16-H        HiraMinPro-W3
-+uphminr-v      UniJIS-UTF16-V        HiraMinPro-W3
- 
- otf-ujgr-h    UniJIS-UTF16-H       HiraKakuPro-W3
- otf-ujgr-v    UniJIS-UTF16-V       HiraKakuPro-W3
-@@ -11,6 +13,8 @@
- otf-cjgr-v     Identity-V HiraKakuPro-W3
- hgothr-h   H HiraKakuPro-W3
- hgothr-v V HiraKakuPro-W3
-+uphgothr-h    UniJIS-UTF16-H       HiraKakuPro-W3
-+uphgothr-v    UniJIS-UTF16-V       HiraKakuPro-W3
- 
- otf-ujmb-h      UniJIS-UTF16-H    HiraMinPro-W6
- otf-ujmb-v      UniJIS-UTF16-V    HiraMinPro-W6
-@@ -18,6 +22,8 @@
- otf-cjmb-v  Identity-V HiraMinPro-W6
- hminb-h   H HiraMinPro-W6
- hminb-v V HiraMinPro-W6
-+uphminb-h      UniJIS-UTF16-H    HiraMinPro-W6
-+uphminb-v      UniJIS-UTF16-V    HiraMinPro-W6
- 
- otf-ujgb-h    UniJIS-UTF16-H    HiraKakuPro-W6
- otf-ujgb-v    UniJIS-UTF16-V    HiraKakuPro-W6
-@@ -25,9 +31,13 @@
- otf-cjgb-v  Identity-V HiraKakuPro-W6
- hgothb-h   H HiraKakuPro-W6
- hgothb-v V HiraKakuPro-W6
-+uphgothb-h    UniJIS-UTF16-H    HiraKakuPro-W6
-+uphgothb-v    UniJIS-UTF16-V    HiraKakuPro-W6
- 
- hgotheb-h H HiraKakuStd-W8
- hgotheb-v V HiraKakuStd-W8
-+uphgotheb-h UniJIS-UTF16-H HiraKakuStd-W8
-+uphgotheb-v UniJIS-UTF16-V HiraKakuStd-W8
- 
- otf-ujmgr-h    UniJIS-UTF16-H       HiraMaruPro-W4
- otf-ujmgr-v    UniJIS-UTF16-V       HiraMaruPro-W4
-@@ -35,6 +45,8 @@
- otf-cjmgr-v     Identity-V HiraMaruPro-W4
- hmgothr-h    H HiraMaruPro-W4
- hmgothr-v  V HiraMaruPro-W4
-+uphmgothr-h    UniJIS-UTF16-H       HiraMaruPro-W4
-+uphmgothr-v    UniJIS-UTF16-V       HiraMaruPro-W4
- 
- otf-ujml-h      UniJIS-UTF16-H        HiraMinPro-W2
- otf-ujml-v      UniJIS-UTF16-V        HiraMinPro-W2
-@@ -42,6 +54,8 @@
- otf-cjml-v       Identity-V  HiraMinPro-W2
- hminl-h   H HiraMinPro-W2
- hminl-v V HiraMinPro-W2
-+uphminl-h      UniJIS-UTF16-H        HiraMinPro-W2
-+uphminl-v      UniJIS-UTF16-V        HiraMinPro-W2
- 
- hiramin-w3-h Identity-H HiraMinPro-W3
- hiramin-w6-h Identity-H HiraMinPro-W6
-@@ -59,28 +73,40 @@
- otf-ujmrn-v      UniJIS2004-UTF16-V        HiraMinProN-W3
- hminrn-h   H HiraMinProN-W3
- hminrn-v V HiraMinProN-W3
-+uphminrn-h       UniJIS2004-UTF16-H        HiraMinProN-W3
-+uphminrn-v       UniJIS2004-UTF16-V        HiraMinProN-W3
- 
- otf-ujgrn-h    UniJIS2004-UTF16-H       HiraKakuProN-W3
- otf-ujgrn-v    UniJIS2004-UTF16-V       HiraKakuProN-W3
- hgothrn-h   H HiraKakuProN-W3
- hgothrn-v V HiraKakuProN-W3
-+uphgothrn-h    UniJIS2004-UTF16-H       HiraKakuProN-W3
-+uphgothrn-v    UniJIS2004-UTF16-V       HiraKakuProN-W3
- 
- otf-ujmbn-h      UniJIS2004-UTF16-H    HiraMinProN-W6
- otf-ujmbn-v      UniJIS2004-UTF16-V    HiraMinProN-W6
- hminbn-h   H HiraMinProN-W6
- hminbn-v V HiraMinProN-W6
-+uphminbn-h       UniJIS2004-UTF16-H    HiraMinProN-W6
-+uphminbn-v       UniJIS2004-UTF16-V    HiraMinProN-W6
- 
- otf-ujgbn-h    UniJIS2004-UTF16-H    HiraKakuProN-W6
- otf-ujgbn-v    UniJIS2004-UTF16-V    HiraKakuProN-W6
- hgothbn-h   H HiraKakuProN-W6
- hgothbn-v V HiraKakuProN-W6
-+uphgothbn-h    UniJIS2004-UTF16-H    HiraKakuProN-W6
-+uphgothbn-v    UniJIS2004-UTF16-V    HiraKakuProN-W6
- 
- otf-ujmgrn-h    UniJIS2004-UTF16-H       HiraMaruProN-W4
- otf-ujmgrn-v    UniJIS2004-UTF16-V       HiraMaruProN-W4
- hmgothrn-h    H HiraMaruProN-W4
- hmgothrn-v  V HiraMaruProN-W4
-+uphmgothrn-h    UniJIS2004-UTF16-H       HiraMaruProN-W4
-+uphmgothrn-v    UniJIS2004-UTF16-V       HiraMaruProN-W4
- 
- otf-ujmln-h      UniJIS2004-UTF16-H        HiraMinProN-W2
- otf-ujmln-v      UniJIS2004-UTF16-V        HiraMinProN-W2
- hminln-h   H HiraMinProN-W2
- hminln-v V HiraMinProN-W2
-+uphminln-h       UniJIS2004-UTF16-H        HiraMinProN-W2
-+uphminln-v       UniJIS2004-UTF16-V        HiraMinProN-W2
-diff -urN otfbeta-1.7b6/fontmap/kozuka.map otfbeta/fontmap/kozuka.map
---- otfbeta-1.7b6/fontmap/kozuka.map	2004-12-23 23:56:18.000000000 +0900
-+++ otfbeta/fontmap/kozuka.map	2012-01-01 16:52:24.000000000 +0900
-@@ -4,6 +4,8 @@
- otf-cjmr-v      KozMinPro-Regular-Acro-Identity-V
- hminr-h         KozMinPro-Regular-Acro-H
- hminr-v         KozMinPro-Regular-Acro-V
-+uphminr-h       KozMinPro-Regular-Acro-UniJIS-UTF16-H
-+uphminr-v       KozMinPro-Regular-Acro-UniJIS-UTF16-V
- 
- otf-ujgr-h      KozGoStd-Regular-UniJIS-UTF16-H
- otf-ujgr-v      KozGoStd-Regular-UniJIS-UTF16-V
-@@ -11,6 +13,8 @@
- otf-cjgr-v      KozGoStd-Regular-Identity-V
- hgothr-h        KozGoStd-Regular-H
- hgothr-v        KozGoStd-Regular-V
-+uphgothr-h      KozGoStd-Regular-UniJIS-UTF16-H
-+uphgothr-v      KozGoStd-Regular-UniJIS-UTF16-V
- 
- otf-ujmb-h      KozMinStd-Bold-UniJIS-UTF16-H
- otf-ujmb-v      KozMinStd-Bold-UniJIS-UTF16-V
-@@ -18,6 +22,8 @@
- otf-cjmb-v      KozMinStd-Bold-Identity-V
- hminb-h         KozMinStd-Bold-H
- hminb-v         KozMinStd-Bold-V
-+uphminb-h       KozMinStd-Bold-UniJIS-UTF16-H
-+uphminb-v       KozMinStd-Bold-UniJIS-UTF16-V
- 
- otf-cjgb-h      KozGoStd-Bold-Identity-H
- otf-cjgb-v      KozGoStd-Bold-Identity-V
-@@ -25,6 +31,8 @@
- otf-ujgb-v      KozGoStd-Bold-UniJIS-UTF16-V
- hgothb-h        KozGoStd-Bold-H
- hgothb-v        KozGoStd-Bold-V
-+uphgothb-h      KozGoStd-Bold-UniJIS-UTF16-H
-+uphgothb-v      KozGoStd-Bold-UniJIS-UTF16-V
- 
- otf-ujmgr-h     KozGoStd-Heavy-UniJIS-UTF16-H
- otf-ujmgr-v     KozGoStd-Heavy-UniJIS-UTF16-V
-@@ -32,6 +40,8 @@
- otf-cjmgr-v     KozGoStd-Heavy-Identity-V
- hmgothr-h       KozGoStd-Heavy-H
- hmgothr-v       KozGoStd-Heavy-V
-+uphmgothr-h     KozGoStd-Heavy-UniJIS-UTF16-H
-+uphmgothr-v     KozGoStd-Heavy-UniJIS-UTF16-V
- 
- %
- %for Adobe Reader 7
-diff -urN otfbeta-1.7b6/fontmap/kozukax.map otfbeta/fontmap/kozukax.map
---- otfbeta-1.7b6/fontmap/kozukax.map	2004-12-23 23:54:40.000000000 +0900
-+++ otfbeta/fontmap/kozukax.map	2012-01-01 16:52:55.000000000 +0900
-@@ -4,6 +4,8 @@
- otf-cjmr-v    Identity-V KozMinPro-Regular-Acro.otf
- hminr-h       H KozMinPro-Regular-Acro.otf
- hminr-v       V KozMinPro-Regular-Acro.otf
-+uphminr-h     UniJIS-UTF16-H KozMinPro-Regular-Acro.otf
-+uphminr-v     UniJIS-UTF16-V KozMinPro-Regular-Acro.otf
- 
- otf-ujgr-h    UniJIS-UTF16-H KozGoStd-Regular.otf
- otf-ujgr-v    UniJIS-UTF16-V KozGoStd-Regular.otf
-@@ -11,6 +13,8 @@
- otf-cjgr-v    Identity-V KozGoStd-Regular.otf
- hgothr-h      H KozGoStd-Regular.otf
- hgothr-v      V KozGoStd-Regular.otf
-+uphgothr-h    UniJIS-UTF16-H KozGoStd-Regular.otf
-+uphgothr-v    UniJIS-UTF16-V KozGoStd-Regular.otf
- 
- otf-ujmb-h    UniJIS-UTF16-H KozMinStd-Bold.otf
- otf-ujmb-v    UniJIS-UTF16-V KozMinStd-Bold.otf
-@@ -18,6 +22,8 @@
- otf-cjmb-v    Identity-V KozMinStd-Bold.otf
- hminb-h       H KozMinStd-Bold.otf
- hminb-v       V KozMinStd-Bold.otf
-+uphminb-h     UniJIS-UTF16-H KozMinStd-Bold.otf
-+uphminb-v     UniJIS-UTF16-V KozMinStd-Bold.otf
- 
- otf-cjgb-h    Identity-H KozGoStd-Bold.otf
- otf-cjgb-v    Identity-V KozGoStd-Bold.otf
-@@ -25,6 +31,8 @@
- otf-ujgb-v    UniJIS-UTF16-V KozGoStd-Bold.otf
- hgothb-h      H KozGoStd-Bold.otf
- hgothb-v      V KozGoStd-Bold.otf
-+uphgothb-h    UniJIS-UTF16-H KozGoStd-Bold.otf
-+uphgothb-v    UniJIS-UTF16-V KozGoStd-Bold.otf
- 
- otf-ujmgr-h   UniJIS-UTF16-H KozGoStd-Heavy.otf
- otf-ujmgr-v   UniJIS-UTF16-V KozGoStd-Heavy.otf
-@@ -32,6 +40,8 @@
- otf-cjmgr-v   Identity-V KozGoStd-Heavy.otf
- hmgothr-h     H KozGoStd-Heavy.otf
- hmgothr-v     V KozGoStd-Heavy.otf
-+uphmgothr-h   UniJIS-UTF16-H KozGoStd-Heavy.otf
-+uphmgothr-v   UniJIS-UTF16-V KozGoStd-Heavy.otf
- 
- 
- %
-diff -urN otfbeta-1.7b6/fontmap/morisawa.map(for udvips) otfbeta/fontmap/morisawa.map(for udvips)
---- otfbeta-1.7b6/fontmap/morisawa.map(for udvips)	2003-12-16 23:43:02.000000000 +0900
-+++ otfbeta/fontmap/morisawa.map(for udvips)	2012-01-01 16:47:01.000000000 +0900
-@@ -4,6 +4,8 @@
- otf-cjmr-v 	RyuminPro-Light-Identity-V
- hminr-h RyuminPro-Light-H
- hminr-v RyuminPro-Light-V
-+uphminr-h	RyuminPro-Light-UniJIS-UTF16-H
-+uphminr-v	RyuminPro-Light-UniJIS-UTF16-V
- 
- otf-ujgr-h	GothicBBBPro-Medium-UniJIS-UTF16-H
- otf-ujgr-v	GothicBBBPro-Medium-UniJIS-UTF16-V
-@@ -11,6 +13,8 @@
- otf-cjgr-v 	GothicBBBPro-Medium-Identity-V
- hgothr-h GothicBBBPro-Medium-H
- hgothr-v GothicBBBPro-Medium-V
-+uphgothr-h	GothicBBBPro-Medium-UniJIS-UTF16-H
-+uphgothr-v	GothicBBBPro-Medium-UniJIS-UTF16-V
- 
- otf-ujmb-h	FutoMinA101Pro-Bold-UniJIS-UTF16-H
- otf-ujmb-v	FutoMinA101Pro-Bold-UniJIS-UTF16-V
-@@ -18,6 +22,8 @@
- otf-cjmb-v 	FutoMinA101Pro-Bold-Identity-V
- hminb-h FutoMinA101Pro-Bold-H
- hminb-v FutoMinA101Pro-Bold-V
-+uphminb-h	FutoMinA101Pro-Bold-UniJIS-UTF16-H
-+uphminb-v	FutoMinA101Pro-Bold-UniJIS-UTF16-V
- 
- otf-cjgb-h 	FutoGoB101Pro-Bold-Identity-H
- otf-cjgb-v 	FutoGoB101Pro-Bold-Identity-V
-@@ -25,6 +31,8 @@
- otf-ujgb-v	FutoGoB101Pro-Bold-UniJIS-UTF16-V
- hgothb-h FutoGoB101Pro-Bold-H
- hgothb-v FutoGoB101Pro-Bold-V
-+uphgothb-h	FutoGoB101Pro-Bold-UniJIS-UTF16-H
-+uphgothb-v	FutoGoB101Pro-Bold-UniJIS-UTF16-V
- 
- otf-ujmgr-h	Jun101Pro-Light-UniJIS-UTF16-H
- otf-ujmgr-v	Jun101Pro-Light-UniJIS-UTF16-V
-@@ -32,3 +40,5 @@
- otf-cjmgr-v 	Jun101Pro-Light-Identity-V
- hmgothr-h Jun101Pro-Light-H
- hmgothr-v Jun101Pro-Light-V
-+uphmgothr-h	Jun101Pro-Light-UniJIS-UTF16-H
-+uphmgothr-v	Jun101Pro-Light-UniJIS-UTF16-V
-diff -urN otfbeta-1.7b6/fontmap/morisawax.map(for dvipdfmx) otfbeta/fontmap/morisawax.map(for dvipdfmx)
---- otfbeta-1.7b6/fontmap/morisawax.map(for dvipdfmx)	2004-08-17 21:35:30.000000000 +0900
-+++ otfbeta/fontmap/morisawax.map(for dvipdfmx)	2012-01-01 16:47:01.000000000 +0900
-@@ -4,6 +4,8 @@
- otf-cjmr-v    Identity-V    A-OTF-RyuminPro-Light.otf
- hminr-h    H    A-OTF-RyuminPro-Light.otf
- hminr-v    V    A-OTF-RyuminPro-Light.otf
-+uphminr-h    UniJIS-UTF16-H    A-OTF-RyuminPro-Light.otf
-+uphminr-v    UniJIS-UTF16-V    A-OTF-RyuminPro-Light.otf
- 
- otf-ujgr-h    UniJIS-UTF16-H    A-OTF-GothicBBBPro-Medium.otf
- otf-ujgr-v    UniJIS-UTF16-V    A-OTF-GothicBBBPro-Medium.otf
-@@ -11,6 +13,8 @@
- otf-cjgr-v    Identity-V    A-OTF-GothicBBBPro-Medium.otf
- hgothr-h    H    A-OTF-GothicBBBPro-Medium.otf
- hgothr-v    V    A-OTF-GothicBBBPro-Medium.otf
-+uphgothr-h    UniJIS-UTF16-H    A-OTF-GothicBBBPro-Medium.otf
-+uphgothr-v    UniJIS-UTF16-V    A-OTF-GothicBBBPro-Medium.otf
- 
- otf-ujmb-h    UniJIS-UTF16-H    A-OTF-FutoMinA101Pro-Bold.otf
- otf-ujmb-v    UniJIS-UTF16-V    A-OTF-FutoMinA101Pro-Bold.otf
-@@ -18,6 +22,8 @@
- otf-cjmb-v    Identity-V    A-OTF-FutoMinA101Pro-Bold.otf
- hminb-h    H    A-OTF-FutoMinA101Pro-Bold.otf
- hminb-v    V    A-OTF-FutoMinA101Pro-Bold.otf
-+uphminb-h    UniJIS-UTF16-H    A-OTF-FutoMinA101Pro-Bold.otf
-+uphminb-v    UniJIS-UTF16-V    A-OTF-FutoMinA101Pro-Bold.otf
- 
- otf-ujgb-h    UniJIS-UTF16-H    A-OTF-FutoGoB101Pro-Bold.otf
- otf-ujgb-v    UniJIS-UTF16-V    A-OTF-FutoGoB101Pro-Bold.otf
-@@ -25,6 +31,8 @@
- otf-cjgb-v    Identity-V    A-OTF-FutoGoB101Pro-Bold.otf
- hgothb-h    H    A-OTF-FutoGoB101Pro-Bold.otf
- hgothb-v    V    A-OTF-FutoGoB101Pro-Bold.otf
-+uphgothb-h    UniJIS-UTF16-H    A-OTF-FutoGoB101Pro-Bold.otf
-+uphgothb-v    UniJIS-UTF16-V    A-OTF-FutoGoB101Pro-Bold.otf
- 
- otf-ujmgr-h    UniJIS-UTF16-H    A-OTF-Jun101Pro-Light.otf
- otf-ujmgr-v    UniJIS-UTF16-V    A-OTF-Jun101Pro-Light.otf
-@@ -32,3 +40,5 @@
- otf-cjmgr-v    Identity-V    A-OTF-Jun101Pro-Light.otf
- hmgothr-h    H    A-OTF-Jun101Pro-Light.otf
- hmgothr-v    V    A-OTF-Jun101Pro-Light.otf
-+uphmgothr-h    UniJIS-UTF16-H    A-OTF-Jun101Pro-Light.otf
-+uphmgothr-v    UniJIS-UTF16-V    A-OTF-Jun101Pro-Light.otf
-diff -urN otfbeta-1.7b6/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt
---- otfbeta-1.7b6/fontmap/vfontmap.txt	2003-11-10 19:23:12.000000000 +0900
-+++ otfbeta/fontmap/vfontmap.txt	2012-01-01 16:47:01.000000000 +0900
-@@ -20,6 +20,8 @@
- otf-cjmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan
- hminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
- hminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
-+uphminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode
-+uphminr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf unicode
- 
- otf-ujgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode
- otf-ujgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode
-@@ -27,6 +29,8 @@
- otf-cjgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf adobejapan
- hgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf
- hgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf
-+uphgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode
-+uphgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W3.otf unicode
- 
- otf-ujmb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode
- otf-ujmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode
-@@ -34,6 +38,8 @@
- otf-cjmb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf adobejapan
- hminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
- hminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
-+uphminb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode
-+uphminb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf unicode
- 
- otf-ujgb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode
- otf-ujgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode
-@@ -41,6 +47,8 @@
- otf-cjgb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf adobejapan
- hgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
- hgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
-+uphgothb-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode
-+uphgothb-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf unicode
- 
- otf-ujmgr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode
- otf-ujmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode
-@@ -48,6 +56,8 @@
- otf-cjmgr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf adobejapan
- hmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
- hmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
-+uphmgothr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode
-+uphmgothr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf unicode
- 
- otf-ukmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode
- otf-ukmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode
-diff -urN otfbeta-1.7b6/sty/mlutf.sty otfbeta/sty/mlutf.sty
---- otfbeta-1.7b6/sty/mlutf.sty	2010-03-22 14:50:54.000000000 +0900
-+++ otfbeta/sty/mlutf.sty	2015-04-10 21:28:25.000000000 +0900
-@@ -1,5 +1,5 @@
- \NeedsTeXFormat{pLaTeX2e}
--\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau]
-+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.17 ttk]
- %force catcode of \" be 12
- \count@\catcode`\"
- \catcode`\"=12
-@@ -27,10 +27,10 @@
- %end of changing catcode of \"
- \gdef\Redefine@MLUTF{%
- 	\@ifpackageloaded{hyperref}{%
--		\def\hyper@UTFC##1{\ifHy@pdfstring\0x##1\else\csname UTFC \endcsname{##1}\fi}
--		\def\hyper@UTFK##1{\ifHy@pdfstring\0x##1\else\csname UTFK \endcsname{##1}\fi}
--		\def\hyper@UTFT##1{\ifHy@pdfstring\0x##1\else\csname UTFT \endcsname{##1}\fi}
--		\def\hyper@UTFM##1{\ifHy@pdfstring\0x##1\else\csname UTFM \endcsname{##1}\fi}
-+		\def\hyper@UTFC##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFC \endcsname{##1}\fi}
-+		\def\hyper@UTFK##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFK \endcsname{##1}\fi}
-+		\def\hyper@UTFT##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFT \endcsname{##1}\fi}
-+		\def\hyper@UTFM##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTFM \endcsname{##1}\fi}
- 		\def\UTFC{\protect\hyper@UTFC}
- 		\def\UTFK{\protect\hyper@UTFK}
- 		\def\UTFT{\protect\hyper@UTFT}
-@@ -45,14 +45,14 @@
- \Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
- \DeclareKanjiFamily{\otf@JYn}{utfc}{}
- \DeclareKanjiFamily{\otf@JTn}{utfc}{}
--\Declare@FontShape{utfc}{m}{0123456789abcdef}{utfcmr}
--\Declare@FontShape{utfc}{bx}{0123456789abcdef}{utfcgr}
-+\Declare@FontShape{utfc}{m}{0123456789abcdefjklmnopqrstuvz}{utfcmr}
-+\Declare@FontShape{utfc}{bx}{0123456789abcdefjklmnopqrstuvz}{utfcgr}
- \DeclareKanjiFamily{\otf@JYn}{utft}{}
- \DeclareKanjiFamily{\otf@JTn}{utft}{}
--\Declare@FontShape{utft}{m}{0123456789abcdef}{utftmr}
--\Declare@FontShape{utft}{bx}{0123456789abcdef}{utftgr}
-+\Declare@FontShape{utft}{m}{0123456789abcdefjklmnopqrstuvz}{utftmr}
-+\Declare@FontShape{utft}{bx}{0123456789abcdefjklmnopqrstuvz}{utftgr}
- \DeclareKanjiFamily{\otf@JYn}{utf}{}
- \DeclareKanjiFamily{\otf@JTn}{utf}{}
--\Declare@FontShape{utf}{m}{0123456789abcdef}{utfmr}
--\Declare@FontShape{utf}{bx}{0123456789abcdef}{utfgr}
-+\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvz}{utfmr}
-+\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvz}{utfgr}
- \endinput
-diff -urN otfbeta-1.7b6/sty/otf.sty otfbeta/sty/otf.sty
---- otfbeta-1.7b6/sty/otf.sty	2013-11-17 09:30:36.000000000 +0900
-+++ otfbeta/sty/otf.sty	2015-04-10 21:29:57.000000000 +0900
-@@ -1,5 +1,5 @@
- \NeedsTeXFormat{pLaTeX2e}
--\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau]
-+\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau, u0.17 ttk]
- \RequirePackage{keyval}
- %for processing options 
- \newif\if@kana \@kanafalse
-@@ -66,9 +66,142 @@
- 	}
- \fi
- \gdef\Redefine@UTF{\@ifpackageloaded{hyperref}{%
--	\def\hyper@UTF##1{\ifHy@pdfstring\0x##1\else\csname UTF \endcsname{##1}\fi}
-+	\def\hyper@UTF##1{\ifHy@pdfstring\hyper@UTF@{##1}\else\csname UTF \endcsname{##1}\fi}
- 	\def\UTF{\protect\hyper@UTF}}{}
- }
-+% support surrogate pair in \hyper@UTF@{} by ZR-san
-+\def\otf@end{\otf@end@}
-+\def\otf@mark{\otf@mark@}
-+\def\otf@triexpandafter{%
-+	\expandafter\expandafter\expandafter
-+}
-+\begingroup \catcode`\|=0
-+\gdef\otf@cond#1|fi{%
-+	#1\expandafter\@firstoftwo
-+	|else \expandafter\@secondoftwo
-+	|fi
-+}
-+\endgroup
-+\def\otf@next#1#2#3#4#5{%
-+	\@namedef{otf@qh/#1#2}{#3}%
-+	\@namedef{otf@hq/#3}{#1#2}%
-+	\@namedef{otf@lhq/#4#5}{#1#2}%
-+}
-+\@for\otf@x:={%
-+	00001,01102,02203,03304,10405,11506,12607,13708,%
-+	20809,2190A,22A0B,23B0C,30C0D,31D0E,32E0F,33F10}\do{%
-+	\expandafter\otf@next\otf@x
-+}
-+\def\otf@next#1{%
-+	\lowercase{\def\otf@y{#1}}%
-+	\@namedef{otf@hd/#1}{#1}%
-+	\@namedef{otf@hd/\otf@y}{#1}%
-+}
-+\@tfor\otf@x:=0123456789ABCDEF\do{%
-+	\expandafter\otf@next\otf@x
-+}
-+\def\hyper@UTF@#1{%
-+	\expandafter\otf@hy@utf@pre@a#1\relax{}\otf@mark\otf@end
-+}
-+\def\otf@hy@utf@pre@a{%
-+	\expandafter\otf@hy@utf@pre@b\romannumeral-`>%
-+}
-+\def\otf@hy@utf@pre@b#1#{%
-+	\otf@cond \ifx\otf@end#1\otf@end \fi{%
-+		\otf@hy@utf@bombout
-+	}{%
-+		\otf@hy@utf@pre@c#1%
-+	}%
-+}
-+\def\otf@hy@utf@pre@c#1{%
-+	\otf@cond \ifx#1\relax \fi{%
-+		\otf@hy@utf@pre@end
-+	}{%
-+		\otf@triexpandafter\otf@hy@utf@pre@d
-+		\csname otf@hd/\string#1\endcsname
-+	}%
-+}
-+\def\otf@hy@utf@pre@d#1{%
-+	\otf@cond \ifx#1\relax \fi{%
-+		\otf@hy@utf@bombout
-+	}{%
-+		\otf@hy@utf@pre@e#1%
-+	}%
-+}
-+\def\otf@hy@utf@pre@e#1#2\otf@mark#3\otf@end{%
-+	\otf@cond \if 0#1\fi{%
-+		\otf@cond \ifx\otf@end#3\otf@end \fi{%
-+			\otf@hy@utf@pre@f{#2}{#3}%
-+		}{%
-+			\otf@hy@utf@pre@f{#2}{#3#1}%
-+		}%
-+	}{%
-+		\otf@hy@utf@pre@f{#2}{#3#1}%
-+	}%
-+}
-+\def\otf@hy@utf@pre@f#1#2{%
-+	\otf@hy@utf@pre@a#1\otf@mark#2\otf@end
-+}
-+\def\otf@hy@utf@pre@end#1\otf@mark#2\otf@end{%
-+	\otf@cond \ifx\otf@end#1\otf@end \fi{%
-+		\otf@hy@utf@sw{#2}%
-+	}{%
-+		\otf@hy@utf@error
-+	}%
-+}
-+\def\otf@hy@utf@bombout#1\otf@end{%
-+	\otf@hy@utf@error
-+}
-+
-+\def\otf@hy@utf@sw#1{%
-+	\otf@cond \ifnum"0#1>"10FFFF \fi{%
-+		\otf@hy@utf@error
-+	}{%
-+		\otf@hy@utf@sw@a{#1}%
-+	}%
-+}
-+\def\otf@hy@utf@sw@a#1{%
-+	\otf@cond \ifnum"0#1>"FFFF \fi{%
-+		\otf@hy@utf@big#1"000000\otf@end
-+	}{%
-+		\otf@hy@utf@small#1"0000\otf@end
-+	}%
-+}
-+\def\otf@hy@utf@small#1#2#3#4#5#6\otf@end{%
-+	\otf@hy@utf@small@a#1#2#3#4#5\otf@end
-+}
-+\def\otf@hy@utf@small@a#1"#2\otf@end{%
-+	\otf@hy@utf@unit{#2#1}%
-+}
-+\def\otf@hy@utf@big#1#2#3#4#5#6#7#8\otf@end{%
-+	\otf@hy@utf@big@a#1#2#3#4#5#6#7\otf@end
-+}
-+\def\otf@hy@utf@big@a#1"#2\otf@end{%
-+	\otf@hy@utf@big@b#2#1\otf@end
-+}
-+\def\otf@hy@utf@big@b#1#2#3#4{%
-+	\otf@triexpandafter\otf@hy@utf@big@c
-+	\csname otf@lhq/#1#2\otf@triexpandafter\endcsname
-+	\csname otf@hq/#3\otf@triexpandafter\endcsname
-+	\csname otf@hq/#4\endcsname
-+}
-+\def\otf@hy@utf@big@c#1#2#3#4#5#6{%
-+	\otf@triexpandafter\otf@hy@utf@big@d
-+	\csname otf@qh/2#1\otf@triexpandafter\endcsname
-+	\csname otf@qh/#2#3\otf@triexpandafter\endcsname
-+	\csname otf@qh/#4#5\otf@triexpandafter\endcsname
-+	\csname otf@qh/3#6\endcsname
-+}
-+\def\otf@hy@utf@big@d#1#2#3#4#5\otf@end{%
-+	\otf@hy@utf@unit{D#1#2#3}%
-+	\otf@hy@utf@unit{D#4#5}%
-+}
-+\def\otf@hy@utf@error{%
-+	\otf@hy@utf@unit{FFFD}%
-+}
-+\def\otf@hy@utf@unit#1{%
-+	\0x#1%
-+}
- \AtBeginDocument{\Redefine@UTF}
- %internal macros
- %macros by iNOUE Koich!
-@@ -76,7 +209,9 @@
- \newcommand\put@character{%
- 	\@tempcntb=\@tempcnta
- 	\divide\@tempcntb by "1000
--	\kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi}%
-+	\kanjishape{\ifcase\@tempcntb0\or1\or2\or3\or4\or5\or6\or7\or8\or9\or a\or b\or c\or d\or e\or f\or
-+	   \or  \or  \or  \or  \or  \or  \or  \or  \or  \or  \or g\or  \or h\or i\or j\or
-+	  k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or u\or v\or w\or x\or y\or z\fi}%
- 	\selectfont%
- 	\multiply\@tempcntb by "1000
- 	\advance\@tempcnta by -\@tempcntb
-@@ -110,6 +245,11 @@
- 	\if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi
- \fi
- %definitions of alt-normal font family
-+\@ifundefined{if@enablejfam}{%
-+	\let\if@jfam@used\iffalse
-+}{%
-+	\let\if@jfam@used\if@enablejfam
-+}
- \if@replace
- 	\DeclareErrorKanjiFont{\otf@JYn}{hmc}{m}{n}{10}
- 	\DeclareKanjiSubstitution{\otf@JYn}{hmc}{m}{n}
-@@ -134,19 +274,16 @@
- 		\DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmr}{bx}{}
- 	\fi
- 	\@ifpackageloaded{jisx0213}{\relax}{\def\mcdefault{hmc}\def\gtdefault{hgt}}
--	\@ifundefined{if@enablejfam}{%if disablejfam option is not available, do nothing.
--	}{%
--		\if@enablejfam
--			\if@compatibility\else
--				\DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n}
--				\DeclareSymbolFontAlphabet{\mathmc}{mincho}
--				\SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n}
--				\DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n}
--				\SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n}
--				\jfam\symmincho
--			\fi
-+	\if@jfam@used
-+		\if@compatibility\else
-+			\DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n}
-+			\DeclareSymbolFontAlphabet{\mathmc}{mincho}
-+			\SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n}
-+			\DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n}
-+			\SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n}
-+			\jfam\symmincho
- 		\fi
--	}
-+	\fi
- \fi
- \if@kana
- 	\DeclareKanjiFamily{\otf@JYn}{ruby}{}
-@@ -208,13 +345,13 @@
- 		\if@bold
- 			\DeclareFontShape{\otf@JYn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-h}{}
- 			\DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothb\nlck@sfx@-v}{}
--			\DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb\nlck@sfx@-h}{}
--			\DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb\nlck@sfx@-v}{}
-+			\DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-h}{}
-+			\DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothb-v}{}
- 		\else
- 			\DeclareFontShape{\otf@JYn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-h}{}
- 			\DeclareFontShape{\otf@JTn}{hgt}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgothr\nlck@sfx@-v}{}
--			\DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr\nlck@sfx@-h}{}
--			\DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr\nlck@sfx@-v}{}
-+			\DeclareFontShape{\otf@JYn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-h}{}
-+			\DeclareFontShape{\otf@JTn}{ruby}{bx}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubygothr-v}{}
- 		\fi
- 	\else
- 		\if@bold
-@@ -264,6 +401,8 @@
- 		\DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{}
- 		\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{}
- 		\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{}
-+		\DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-h}{}
-+		\DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{}
- 		\DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{}
- 		\DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{}
- 	\else
-@@ -272,8 +411,8 @@
- 		\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{}
- 		\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{}
- 	\fi
--	\DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-h}{}
--	\DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb-v}{}
-+	\DeclareFontShape{\otf@JYn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-h}{}
-+	\DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlgotheb\nlck@sfx@-v}{}
- 	\DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{}
- 	\DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{}
- 	\DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{}
-@@ -290,34 +429,36 @@
- \DeclareKanjiFamily{\otf@JTn}{utfj}{}
- \DeclareKanjiFamily{\otf@JYn}{cidj}{}
- \DeclareKanjiFamily{\otf@JTn}{cidj}{}
--\Declare@FontShape{utfj}{m}{0123456789abcdef}{utfjmr\nlck@sfx@}
-+\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmr\nlck@sfx@}
- \Declare@FontShape{cidj}{m}{012345}{cidjmr}
- %definition of other utf/cid fonts
- \if@deluxe
--	\Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjmb\nlck@sfx@}
-+	\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjmb\nlck@sfx@}
- 	\Declare@FontShape{cidj}{bx}{012345}{cidjmb}
- 	\DeclareKanjiFamily{\otf@JYn}{utfjg}{}
- 	\DeclareKanjiFamily{\otf@JTn}{utfjg}{}
- 	\DeclareKanjiFamily{\otf@JYn}{cidjg}{}
- 	\DeclareKanjiFamily{\otf@JTn}{cidjg}{}
--	\Declare@FontShape{utfjg}{m}{0123456789abcdef}{utfjgr\nlck@sfx@}
-+	\Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@}
- 	\Declare@FontShape{cidjg}{m}{012345}{cidjgr}
--	\Declare@FontShape{utfjg}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@}
-+	\Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@}
- 	\Declare@FontShape{cidjg}{bx}{012345}{cidjgb}
-+	\Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvz}{utfjge\nlck@sfx@}
-+	\Declare@FontShape{cidjg}{eb}{012345}{cidjge}
- 	\DeclareKanjiFamily{\otf@JYn}{utfjmg}{}
- 	\DeclareKanjiFamily{\otf@JTn}{utfjmg}{}
- 	\DeclareKanjiFamily{\otf@JYn}{cidjmg}{}
- 	\DeclareKanjiFamily{\otf@JTn}{cidjmg}{}
--	\Declare@FontShape{utfjmg}{m}{0123456789abcdef}{utfjmgr\nlck@sfx@}
-+	\Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvz}{utfjmgr\nlck@sfx@}
- 	\Declare@FontShape{cidjmg}{m}{012345}{cidjmgr}
--	\Declare@FontShape{utfj}{l}{0123456789abcdef}{utfjml\nlck@sfx@}
-+	\Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvz}{utfjml\nlck@sfx@}
- 	\Declare@FontShape{cidj}{l}{012345}{cidjml}
- \else
- 	\if@bold
--		\Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgb\nlck@sfx@}
-+		\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgb\nlck@sfx@}
- 		\Declare@FontShape{cidj}{bx}{012345}{cidjgb}
- 	\else
--		\Declare@FontShape{utfj}{bx}{0123456789abcdef}{utfjgr\nlck@sfx@}
-+		\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvz}{utfjgr\nlck@sfx@}
- 		\Declare@FontShape{cidj}{bx}{012345}{cidjgr}
- 	\fi
- \fi
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm
index 7215786d262..4c876d09914 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm
@@ -196,6 +196,10 @@ sub is_ucs_hankana{
 	return 0;
 }
 
+# Reference:
+#   http://www.unicode.org/Public/UNIDATA/Blocks.txt
+#     Blocks-9.0.0.txt
+#     Date: 2016-02-05, 23:48:00 GMT [KW]
 sub is_ucs_jpn_range{
 	return 1 if ($dvicode<=0x04FF); # Cyrillic
 
@@ -238,6 +242,9 @@ 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 1 if ($dvicode<=0x1B0FF); # Kana Supplement
+
 	return 0 if ($dvicode< 0x1F100);
 	return 1 if ($dvicode<=0x1F1FF); # Enclosed Alphanumeric Supplement
 	return 1 if ($dvicode<=0x1F2FF); # Enclosed Ideographic Supplement
@@ -246,6 +253,7 @@ sub is_ucs_jpn_range{
 	return 1 if ($dvicode<=0x2A6DF); # CJK Unified Ideographs Extension B
 	return 1 if ($dvicode<=0x2B73F); # CJK Unified Ideographs Extension C
 	return 1 if ($dvicode<=0x2B81F); # CJK Unified Ideographs Extension D
+	return 1 if ($dvicode<=0x2CEAF); # CJK Unified Ideographs Extension E
 
 	return 0 if ($dvicode< 0x2F800);
 	return 1 if ($dvicode<=0x2FA1F); # CJK Compatibility Ideographs Supplement
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
index eff5fa69346..b40e7be056f 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
@@ -10,6 +10,7 @@ mkutf32list.pl cid2code.txt > sp_jp_text.tex
 mkutf32list.pl -style=utf cid2code.txt > sp_jp_utf.tex
 mkutf32list.pl -style=kchar cid2code.txt > sp_jp_kchar.tex
 mkutf32list.pl -style=list cid2code.txt > sp_list_j.txt
+mkutf32list.pl -allrange cid2code.txt > sp_jp_text.tex
 
 =head1 AUTHOR
 
@@ -25,7 +26,7 @@ use strict;
 use encoding 'utf8';
 use feature 'switch';
 
-our ($style);
+our ($style, $allrange);
 our (@count, %reset_ch, $icollec, $cid2code, $line);
 our ($col_utf32, @out);
 our (@cid_max, $collection_n, $collection, $utfmac, $cmap, $source);
@@ -50,16 +51,16 @@ if (/((Adobe.*)-\d) Character Collection/) {
     given($collection) {
 	when (/cns/i) { @cid_max = qw/-1 14098 17407 17600 18845 18964 19087 19155/;
 			$utfmac="UTFT"; $cmap="UniCNS-UTF32";
-			$source="cmapresources_cns1-6.tar.z"; }
+			$source="cmapresources_cns1-6/cid2code.txt"; }
 	when (/gb/i)  { @cid_max = qw/-1 7716 9896 22126 22352 29063 30283/;
 			$utfmac="UTFC"; $cmap="UniGB-UTF32";
-			$source="cmapresources_gb1-5.tar.z"; }
+			$source="cmapresources_gb1-5/cid2code.txt"; }
 	when (/kor/i) { @cid_max = qw/-1 9332 18154 18351/;
 			$utfmac="UTFK"; $cmap="UniKS-UTF32";
-			$source="cmapresources_korean1-2.tar.z"; }
+			$source="cmapresources_korea1-2/cid2code.txt"; }
 	default       { @cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057/;
 			$utfmac="UTF";  $cmap="UniJIS-UTF32";
-			$source="cmapresources_japan1-6.tar.z"; }
+			$source="cmapresources_japan1-6/cid2code.txt"; }
     }
 }
 
@@ -73,7 +74,7 @@ $cid2code
 % for $collection_n
 %
 % Reference:
-%   http://sourceforge.net/adobe/cmap/home/Home/
+%   https://github.com/adobe-type-tools/cmap-resources/
 %   $source
 %
 % A newer CMap may be required for some code points.
@@ -105,7 +106,7 @@ foreach (@utf32) {
     next if ($_ =~ 'v');
     tr/a-z/A-Z/;
     my $ch=hex($_);
-    next if ($ch < 0x10000);
+    next if ($ch < 0x10000 && !$allrange);
 
     while(!($cid_max[$icollec+1]>=$cid && $cid>$cid_max[$icollec])) {
 	$icollec++;
@@ -145,7 +146,9 @@ END {
 	    print "," if ($style =~ /list/);
 	}
 	print $out;
-	if ($i % 10 == 0) {
+	my ($newline);
+	$newline = $allrange ? 25 : 10;
+	if ($i % $newline == 0) {
 	    print "%" if ($style =~ /utf/);
 	    print "\n" ;
 	}
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt
index 4e0bf01c94e..d264cc0eb93 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt
@@ -4,8 +4,8 @@
 % for Adobe-GB1-5
 %
 % Reference:
-%   http://sourceforge.net/adobe/cmap/home/Home/
-%   cmapresources_gb1-5.tar.z
+%   https://github.com/adobe-type-tools/cmap-resources/
+%   cmapresources_gb1-5/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt
index 6e20b5c2558..2e3d07287af 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt
@@ -1,11 +1,11 @@
 %
 % This file is generated from the data of UniJIS-UTF32
-% in cid2code.txt (Version 02/04/2012)
+% in cid2code.txt (Version 08/13/2012)
 % for Adobe-Japan1-6
 %
 % Reference:
-%   http://sourceforge.net/adobe/cmap/home/Home/
-%   cmapresources_japan1-6.tar.z
+%   https://github.com/adobe-type-tools/cmap-resources/
+%   cmapresources_japan1-6/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt
index ec3e7f2141b..23fb5d99358 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt
@@ -4,8 +4,8 @@
 % for Adobe-Korea1-2
 %
 % Reference:
-%   http://sourceforge.net/adobe/cmap/home/Home/
-%   cmapresources_korean1-2.tar.z
+%   https://github.com/adobe-type-tools/cmap-resources/
+%   cmapresources_korea1-2/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt
index b89626fd993..386c00f1072 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt
@@ -1,11 +1,11 @@
 %
 % This file is generated from the data of UniCNS-UTF32
-% in cid2code.txt (Version 10/25/2010)
+% in cid2code.txt (Version 12/04/2015)
 % for Adobe-CNS1-6
 %
 % Reference:
-%   http://sourceforge.net/adobe/cmap/home/Home/
-%   cmapresources_cns1-6.tar.z
+%   https://github.com/adobe-type-tools/cmap-resources/
+%   cmapresources_cns1-6/cid2code.txt
 %
 % A newer CMap may be required for some code points.
 %
@@ -93,46 +93,46 @@
 26258,29D98,23D40,20E9D,282E2,20C41,20C96,20E76,22C62,20EA2
 21075,22B43,22EB3,20DA7,2688A,20EF9,27FF9,247E0,29D7C,275A3
 26048,24618,29EAC,29FDE,272B2,2048E,20EB6,27F2E,2A434,243F2
-29E06,294D0,26335,20D28,20D71,21F0F,21DD1,2176D,28E97,25C21
-20CD4,201F2,2A64A,2837D,2A2B2,24ABB,26E05,2251B,28E39,20F3B
-25F1A,27486,267CC,24011,2F922,20547,205DF,23FC5,24942,289E4
-219DB,23CC8,24933,289AA,202A0,26BB3,21305,224ED,26D29,27A84
-23600,24AB1,22513,2037E,20380,20347,2041F,249A4,20487,233B4
-20BFF,220FC,202E5,22530,2058E,23233,21983,205B3,23C99,24AA6
-2372D,26B13,2F829,28ADE,23F80,20954,23FEC,20BE2,21726,216E8
-286AB,2F832,21596,21613,28A9B,25772,20B8F,23FEB,22DA3,20C77
-26B53,20D74,2170D,20EDD,20D4D,289BC,22698,218D7,2403A,24435
-210B4,2328A,28B66,2124F,241A5,26C7E,21416,21454,24363,24BF5
-2123C,2A150,24278,2163E,21692,20D4E,26C81,26D2A,217DC,217FB
-217B2,26DA6,21828,216D5,26E45,249A9,26FA1,22554,21911,216B8
-27A0E,20204,21A34,259CC,205A5,21B44,21CA5,26B28,21DF9,21E37
-21EA4,24901,22049,22173,244BC,20CD3,21771,28482,201C1,2F894
-2133A,26888,223D0,22471,26E6E,28A36,25250,21F6A,270F8,22668
-2029E,28A29,227B4,24982,2498F,27A53,2F8A6,26ED2,20656,23FB7
-2285F,28B9D,2995D,22980,228C1,20118,21770,22E0D,249DF,2138E
-217FC,22E36,2571D,24A28,24A23,24940,21829,23400,231F7,231F8
-231A4,231A5,20E75,251E6,23231,285F4,231C8,25313,228F7,2439C
-24A21,237C2,2F8DB,241CD,290ED,233E6,26DA0,2346F,28ADF,235CD
-2363C,28A4A,203C9,23659,2212A,23703,2919C,20923,227CD,23ADB
-21958,23B5A,23EFC,2248B,248F1,26B51,23DBC,23DBD,241A4,2490C
-24900,23CC9,20D32,231F9,22491,26D25,26DA1,26DEB,2497F,24085
-26E72,26F74,28B21,2F908,23E2F,23F82,2304B,23E30,21497,2403D
-29170,24144,24091,24155,24039,23FF0,23FB4,2413F,24156,24157
-24140,261DD,24277,24365,242C1,2445A,24A27,24A22,28BE8,25605
-24974,23044,24823,2882B,28804,20C3A,26A2E,241E2,216E7,24A24
-249B7,2498D,249FB,24A26,2F92F,228AD,28EB2,24A8C,2415F,24A79
-28B8F,28C03,2189E,21988,28ED9,21A4B,28EAC,24F82,24D13,263F5
-26911,2690E,26F9F,2509D,2517D,21E1C,25220,232AC,28964,28968
-216C1,255E0,2760C,2261C,25857,27B39,27126,2910D,20C42,20D15
-2512B,22CC6,20341,24DB8,294E5,280BE,22C38,2815D,269F2,24DEA
-20D7C,20FB4,20CD5,20E96,20F64,22CA9,28256,244D3,20D46,29A4D
-280E9,24EA7,22CC2,295F4,252C7,297D4,22D44,22BCA,266DA,26716
-279A0,25052,20C43,28B4C,20731,201A9,22D8D,245C8,204FC,26097
-20F4C,22A66,2109D,20D9C,22775,2A601,20E09,22ACF,210C8,239C2
-2829B,25E49,220C7,22CB2,29720,24E3B,27574,22E8B,22208,2A65B
-28CCD,20E7A,20C34,27639,22BCE,22C51,210C7,2A632,28CD2,28D99
-28CCA,2775E,2F828,2107B,210D3,212FE,247EF,24EA5,24F5C,28189
-
+29E06,294D0,26335,20D28,20D71,21F0F,21DD1,2176D,2B473,28E97
+25C21,20CD4,201F2,2A64A,2837D,2A2B2,24ABB,26E05,2AE67,2251B
+28E39,20F3B,25F1A,27486,267CC,24011,2F922,20547,205DF,23FC5
+24942,289E4,219DB,23CC8,24933,289AA,202A0,26BB3,21305,224ED
+26D29,27A84,23600,24AB1,22513,2037E,20380,20347,2041F,249A4
+20487,233B4,20BFF,220FC,202E5,22530,2058E,23233,21983,205B3
+23C99,24AA6,2372D,26B13,2F829,28ADE,23F80,20954,23FEC,20BE2
+21726,216E8,286AB,2F832,21596,21613,28A9B,25772,20B8F,23FEB
+22DA3,20C77,26B53,20D74,2170D,20EDD,20D4D,289BC,22698,218D7
+2403A,24435,210B4,2328A,28B66,2124F,241A5,26C7E,21416,21454
+24363,24BF5,2123C,2A150,24278,2163E,21692,20D4E,26C81,26D2A
+217DC,217FB,217B2,26DA6,21828,216D5,26E45,249A9,26FA1,22554
+21911,216B8,27A0E,20204,21A34,259CC,205A5,21B44,21CA5,26B28
+21DF9,21E37,21EA4,24901,22049,22173,244BC,20CD3,21771,28482
+201C1,2F894,2133A,26888,223D0,22471,26E6E,28A36,25250,21F6A
+270F8,22668,2029E,28A29,227B4,24982,2498F,27A53,2F8A6,26ED2
+20656,23FB7,2285F,28B9D,2995D,22980,228C1,20118,21770,22E0D
+249DF,2138E,217FC,22E36,2571D,24A28,24A23,24940,21829,23400
+231F7,231F8,231A4,231A5,20E75,251E6,23231,285F4,231C8,25313
+228F7,2439C,24A21,237C2,2F8DB,241CD,290ED,233E6,26DA0,2346F
+28ADF,235CD,2363C,28A4A,203C9,23659,2212A,23703,2919C,20923
+227CD,23ADB,21958,23B5A,23EFC,2248B,248F1,26B51,23DBC,23DBD
+241A4,2490C,24900,23CC9,20D32,231F9,22491,26D25,26DA1,26DEB
+2497F,24085,26E72,26F74,28B21,2F908,23E2F,23F82,2304B,23E30
+21497,2403D,29170,24144,24091,24155,24039,23FF0,23FB4,2413F
+24156,24157,24140,261DD,24277,24365,242C1,2445A,24A27,24A22
+28BE8,25605,24974,23044,24823,2882B,28804,20C3A,26A2E,241E2
+216E7,24A24,249B7,2498D,249FB,24A26,2F92F,228AD,28EB2,24A8C
+2415F,24A79,28B8F,28C03,2189E,21988,28ED9,21A4B,28EAC,24F82
+24D13,263F5,26911,2690E,26F9F,2509D,2517D,21E1C,25220,232AC
+28964,28968,216C1,255E0,2760C,2261C,25857,27B39,27126,2910D
+20C42,20D15,2512B,22CC6,20341,24DB8,294E5,280BE,22C38,2815D
+269F2,24DEA,20D7C,20FB4,20CD5,2BAB3,20E96,20F64,22CA9,28256
+244D3,20D46,29A4D,280E9,24EA7,22CC2,295F4,252C7,297D4,22D44
+2BCD7,22BCA,2B977,266DA,26716,279A0,25052,20C43,28B4C,20731
+201A9,22D8D,245C8,204FC,26097,20F4C,22A66,2109D,20D9C,22775
+2A601,20E09,22ACF,2C5F8,210C8,239C2,2829B,25E49,220C7,22CB2
+29720,24E3B,2C9A0,27574,22E8B,22208,2A65B,28CCD,20E7A,20C34
+27639,22BCE,22C51,210C7,2A632,28CD2,28D99,28CCA,2775E,2F828
+2107B,210D3,212FE,247EF,24EA5,24F5C,28189,2B42C
 
 %Adobe-CNS1-3
 2010C,200D1,200CD,200CB,21FE8,200CA,2010E,21BC1,2F878,20086
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl
index 5e0deeb6af0..d4d5249c901 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl
@@ -522,7 +522,6 @@ character  cid  min_w3  min_w6  goth_w3  goth_w6  maru_w4
 ヴ  15691  9.06  9.34  9.33  9.51  9.66
 ヵ  15692  8.11  8.33  8.51  8.8  8.74
 ヶ  15693  8.18  8.39  8.63  8.74  8.73
-end
 〃  15453  7.69  8.15  8.29  8.62  8.36
 〆  15454  8.69  9.03  9.09  9.33  9.15
 ヿ  15462  8.09  8.42  8.6  8.83  8.87
@@ -550,3 +549,4 @@ end
 ヸ  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
+end
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
index a46f4fbf04b..4d9ca76507e 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
@@ -524,7 +524,6 @@ character  cid  min_w3  min_w6  goth_w3  goth_w6  maru_w4
 ヴ  16159  9.47  9.62  9.49  9.69  9.63
 ヵ  16160  8.73  8.9  8.93  9.11  9
 ヶ  16161  8.53  8.64  8.41  8.66  8.69
-end
 〃  15980  8.16  8.40  8.74  8.90  8.88
 〆  15981  8.94  9.09  8.99  9.14  9.04
 ヿ  15983  9.36  9.59  9.59  9.75  9.74 
@@ -552,3 +551,4 @@ end
 ヸ  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
+end
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
index 941fdd1ec2c..9674fb2c02c 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
@@ -4,9 +4,8 @@
 # This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
 #
 
-#OVP2OVF='omfonts -ovp2ovf'
-OVP2OVF='wovp2ovf'
-export OVP2OVF
+# setting for ovp2ovf & uppltotf
+. ./umakeotf_pre
 
 if test ! -d tfm; then
 mkdir tfm
@@ -18,8 +17,8 @@ for series in nml exp ruby
 do
 for face in minr gothr minb gothb mgothr
 do
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}-v.tfm
+$UPPLTOTF -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}-h.tfm
+$UPPLTOTF -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}-v.tfm
 done
 done
 #for extra fonts
@@ -27,8 +26,8 @@ for series in nml exp ruby
 do
 for face in gotheb minl
 do
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}-v.tfm
+$UPPLTOTF -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}-h.tfm
+$UPPLTOTF -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}-v.tfm
 done
 done
 
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
index 6bf76009f40..f2c878285cc 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
@@ -4,9 +4,8 @@
 # This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
 #
 
-#OVP2OVF='omfonts -ovp2ovf'
-OVP2OVF='wovp2ovf'
-export OVP2OVF
+# setting for ovp2ovf & uppltotf
+. ./umakeotf_pre
 
 if test ! -d tfm; then
 mkdir tfm
@@ -18,8 +17,8 @@ for series in nml exp
 do
 for face in minr gothr minb gothb mgothr
 do
-uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}-h.tfm
-uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}-v.tfm
+$UPPLTOTF -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}-h.tfm
+$UPPLTOTF -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}-v.tfm
 done
 done
 #extra fonts
@@ -27,8 +26,8 @@ for series in nml exp
 do
 for face in gotheb minl
 do
-uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}-h.tfm
-uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}-v.tfm
+$UPPLTOTF -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}-h.tfm
+$UPPLTOTF -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}-v.tfm
 done
 done
 
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_jis04 b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_jis04
index d1570913100..6001bf2c622 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_jis04
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_jis04
@@ -4,9 +4,8 @@
 # This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
 #
 
-#OVP2OVF='omfonts -ovp2ovf'
-OVP2OVF='wovp2ovf'
-export OVP2OVF
+# setting for ovp2ovf & uppltotf
+. ./umakeotf_pre
 
 if test ! -d tfm; then
 mkdir tfm
@@ -18,8 +17,8 @@ for series in nml exp
 do
 for face in minr gothr minb gothb mgothr
 do
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}n-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}n-v.tfm
+$UPPLTOTF -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}n-h.tfm
+$UPPLTOTF -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}n-v.tfm
 done
 done
 #for extra fonts
@@ -27,8 +26,8 @@ for series in nml exp
 do
 for face in gotheb minl
 do
-uppltotf -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}n-h.tfm
-uppltotf -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}n-v.tfm
+$UPPLTOTF -kanji=uptex basepl/ubase-h.pl tfm/up${series}${face}n-h.tfm
+$UPPLTOTF -kanji=uptex basepl/ubase-v.pl tfm/up${series}${face}n-v.tfm
 done
 done
 
@@ -38,8 +37,8 @@ for series in nml exp
 do
 for face in minr gothr minb gothb mgothr
 do
-uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}n-h.tfm
-uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}n-v.tfm
+$UPPLTOTF -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}n-h.tfm
+$UPPLTOTF -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}n-v.tfm
 done
 done
 #for extra fonts
@@ -47,8 +46,8 @@ for series in nml exp
 do
 for face in gotheb minl
 do
-uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}n-h.tfm
-uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}n-v.tfm
+$UPPLTOTF -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsg${series}${face}n-h.tfm
+$UPPLTOTF -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsg${series}${face}n-v.tfm
 done
 done
 
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_pre b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_pre
new file mode 100644
index 00000000000..1336cc21828
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_pre
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+#
+# This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
+#
+
+# setting for ovp2ovf & uppltotf
+#OVP2OVF='omfonts -ovp2ovf'
+OVP2OVF=ovp2ovf
+export OVP2OVF
+UPPLTOTF=uppltotf
+
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop
index e688603ed55..a524d44ebdf 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop
@@ -4,9 +4,8 @@
 # This script is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
 #
 
-#OVP2OVF='omfonts -ovp2ovf'
-OVP2OVF='wovp2ovf'
-#OVP2OVF=ovp2ovf
+# setting for ovp2ovf & uppltotf
+. ./umakeotf_pre
 
 if test ! -d tfm; then
 mkdir tfm
@@ -24,8 +23,8 @@ perl -s script/umkvpkana.pl -sp=1
 
 for face in minw3 minw6 kakuw3 kakuw6 maruw4
 do
-uppltotf -kanji=uptex pl/upphira${face}-h.pl tfm/upphira${face}-h.tfm
-uppltotf -kanji=uptex pl/upphira${face}-v.pl tfm/upphira${face}-v.tfm
+$UPPLTOTF -kanji=uptex pl/upphira${face}-h.pl tfm/upphira${face}-h.tfm
+$UPPLTOTF -kanji=uptex pl/upphira${face}-v.pl tfm/upphira${face}-v.tfm
 done
 
 for face in minw3 minw6 kakuw3 kakuw6 maruw4
diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
index 801131f2100..d978aa57f63 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.17 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.18 ttk]
 %force catcode of \" be 12
 \count@\catcode`\"
 \catcode`\"=12
diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
index 153e828ee4a..fe81bf40f45 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau, u0.17 ttk]
+\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau, u0.18 ttk]
 \RequirePackage{keyval}
 %for processing options 
 \newif\if@kana \@kanafalse