CTAN sync 202011150302

author: Norbert Preining <norbert@preining.info> 2020-11-15 03:02:26 +0000
committer: Norbert Preining <norbert@preining.info> 2020-11-15 03:02:26 +0000
commit: f23cf64aec54b58502f0f334eab0ea486a317586 (patch)
tree: 19330e378b10eb1c92022d5fd3bc8c4b1e5f729a /language/japanese
parent: 22ba19a8c9224d6e229b882ff226c05967f13ffd (diff)
342 files changed, 982 insertions, 105 deletions
diff --git a/language/japanese/japanese-otf-uptex/00otf-uptex.txt b/language/japanese/japanese-otf-uptex/00otf-uptex.txt
index 43b231ff57..1ed28290bc 100644
--- a/language/japanese/japanese-otf-uptex/00otf-uptex.txt
+++ b/language/japanese/japanese-otf-uptex/00otf-uptex.txt
@@ -1,5 +1,5 @@
 [ Title ]
-japanese-otf-uptex Ver.0.25  2020/02/28
+japanese-otf-uptex Ver.0.26  2020/11/08
 
 
 [ Abstract ]
@@ -84,6 +84,46 @@ proportional kana at deluxe option and \propshape.
 To build tfm files, uppltotf in TeX Live r43143 or TeX Live 2017 or later is required.
 
 
+[ About shrunk file size of virtual fonts ]
+japanese-otf-uptex Ver.0.26 has shrunk file size of some virtual fonts for main text.
+The virtual fonts listed below are smaller in file size than conventional ones.
+  upexp*.vf
+  upbrsg*.vf
+  upruby*.vf
+  upphira*.vf
+These are used by selecting options "expert", "brsg", "ruby", etc. of otf.sty.
+The feature requires new dviware which support fall back of CJK virtual fonts:
+  dvipdfmx (version 20200315 (2020/3/15) or later)
+  dvips    (TeX Live subversion r54794 (2020/4/19) or later)
+Ref. https://github.com/texjporg/tex-jp-build/issues/99
+
+If you do not wish this feature, you can avoid by regenerating virtual fonts
+after removing "-omitfw" option of umkjvf
+in the font generation scripts umakeotf{,_brsg,_jis04,_prop}.
+ $ ./umakeotf
+ $ ./umakeotf_brsg
+ $ ./umakeotf_jis04
+ $ ./umakeotf_prop
+Ref. https://github.com/t-tk/japanese-otf-uptex/issues/3
+
+
+[ About Unicode base multi-weight fonts in \UTF{}, \UTFC{}, \UTFT{}, \UTFK{} ]
+japanese-otf-uptex Ver.0.26 has introduced new virtual fonts for
+\UTF{}, \UTFC{}, \UTFT{}, \UTFK{} macros. They are Unicode base
+(conventionally subfont scheme) and support multi-weight fonts
+(seven sets of family/series for all languages,
+conventionally two sets of family/series for Chinese and Korean).
+The feature also requires new dviware which support fall back of CJK virtual fonts.
+  明朝体・細字　　  \mcfamily\ltseries  ml
+  明朝体・中字　　  \mcfamily\mdseries  mr
+  明朝体・太字　　  \mcfamily\bfseries  mb
+  ゴシック体・中字  \gtfamily\mdseries  gr
+  ゴシック体・太字  \gtfamily\bfseries  gb
+  ゴシック体・極太  \gtfamily\ebseries  ge
+  丸ゴシック体　　  \mgfamily           mgr
+Ref. https://github.com/t-tk/japanese-otf-uptex/issues/4
+
+
 [ Repository ]
 japanese-otf-uptex is maintained on GitHub:
 https://github.com/t-tk/japanese-otf-uptex
@@ -397,3 +437,18 @@ https://github.com/t-tk/japanese-otf-uptex
     Adobe-Japan1-7 cid2code.txt (Version 07/30/2019).
   COPYRIGHT ::
     Update year.
+2020.11.08 Ver0.26
+  sty/otf.sty, sty/mlutf.sty ::
+    Bump version number.
+  umkjvf, umakeotf{,_brsg,_jis04,_prop} ::
+  script/{umkpkana.pl,umkvpkana.pl} ::
+    Shrink file size of some virtual fonts for main text.
+    New option "-omitfw" for umkjvf.
+  sty/otf.sty, sty/mlutf.sty,
+  script/{mktfm_sp.pl,mkutfvf_sp.pl} ::
+    Introduce Unicode base multi-weight virtual fonts
+    for \UTF{}, \UTFC{}, \UTFT{}, \UTFK{}.
+  test/uplatex/{uotftest-utf8.tex,utfmacro-cjk.tex}, test/uplatex/Makefile,
+  test/uplatex/utfmacro-haranoaji.map ::
+    Add a new test for multi-weight \UTF{}, \UTFC{}, \UTFT{}, \UTFK{}.
+
diff --git a/language/japanese/japanese-otf-uptex/README b/language/japanese/japanese-otf-uptex/README
index 216be309a6..d09a7c7320 100644
--- a/language/japanese/japanese-otf-uptex/README
+++ b/language/japanese/japanese-otf-uptex/README
@@ -3,7 +3,7 @@ README
 
 From 00otf-uptex.txt:
 [ Title ]
-japanese-otf-uptex Ver.0.25  2020/02/28
+japanese-otf-uptex Ver.0.26  2020/11/08
 
 
 [ Abstract ]
@@ -22,11 +22,11 @@ Ref. http://opensource.org/licenses/BSD-3-Clause
 The original source has been downloaded from
 	https://github.com/t-tk/japanese-otf-uptex
 as
-	https://github.com/t-tk/japanese-otf-uptex/releases/tag/v0.25
+	https://github.com/t-tk/japanese-otf-uptex/releases/tag/v0.26
 
 After that the scripts run and the generated tfm and vf files included.
 
 Norbert Preining <preining@logic.at>
 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
-2020-02-29
+2020-11-14
 
diff --git a/language/japanese/japanese-otf-uptex/script/mktfm_sp.pl b/language/japanese/japanese-otf-uptex/script/mktfm_sp.pl
index 99485c83ef..90f464d13a 100755
--- a/language/japanese/japanese-otf-uptex/script/mktfm_sp.pl
+++ b/language/japanese/japanese-otf-uptex/script/mktfm_sp.pl
@@ -24,6 +24,61 @@ $multi=3;
 @dvips_tfm_h=(0x00, 0x0B, 0x00, 0x01, 0x00, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x14, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xEB, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
 @dvips_tfm_v=(0x00, 0x09, 0x00, 0x01, 0x00, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
 
+@tex_tfm_ucs_h=map{ hex($_) } qw/
+	00 0b 00 40 00 6c 00 12 00 00 00 01 00 03 00 02
+	00 02 00 01 00 00 00 00 00 00 00 09 00 00 00 00
+	00 a0 00 00 0e 54 45 58 20 4b 41 4e 4a 49 20 54
+	45 58 54 00 00 00 00 00 00 00 00 00 00 00 00 00
+	00 00 00 00 00 00 00 00 00 00 00 00 09 4f 54 46
+	20 4b 41 4e 4a 49 00 00 00 00 00 00 00 00 00 00
+	80 00 00 00 00 00 00 00 ff 61 00 01 ff 62 00 01
+	ff 63 00 01 ff 64 00 01 ff 65 00 01 ff 66 00 01
+	ff 67 00 01 ff 68 00 01 ff 69 00 01 ff 6a 00 01
+	ff 6b 00 01 ff 6c 00 01 ff 6d 00 01 ff 6e 00 01
+	ff 6f 00 01 ff 70 00 01 ff 71 00 01 ff 72 00 01
+	ff 73 00 01 ff 74 00 01 ff 75 00 01 ff 76 00 01
+	ff 77 00 01 ff 78 00 01 ff 79 00 01 ff 7a 00 01
+	ff 7b 00 01 ff 7c 00 01 ff 7d 00 01 ff 7e 00 01
+	ff 7f 00 01 ff 80 00 01 ff 81 00 01 ff 82 00 01
+	ff 83 00 01 ff 84 00 01 ff 85 00 01 ff 86 00 01
+	ff 87 00 01 ff 88 00 01 ff 89 00 01 ff 8a 00 01
+	ff 8b 00 01 ff 8c 00 01 ff 8d 00 01 ff 8e 00 01
+	ff 8f 00 01 ff 90 00 01 ff 91 00 01 ff 92 00 01
+	ff 93 00 01 ff 94 00 01 ff 95 00 01 ff 96 00 01
+	ff 97 00 01 ff 98 00 01 ff 99 00 01 ff 9a 00 01
+	ff 9b 00 01 ff 9c 00 01 ff 9d 00 01 ff 9e 00 01
+	ff 9f 00 01 02 11 00 00 01 11 00 00 00 00 00 00
+	00 08 00 00 00 10 00 00 00 00 00 00 00 0e 14 7b
+	00 00 00 00 00 01 eb 85 00 00 00 00 00 00 00 00
+	00 00 00 00 00 01 99 9a 00 00 00 00 00 10 00 00
+	00 10 00 00 00 04 00 00 00 03 33 33 00 02 00 00
+/;
+@dvips_tfm_ucs_h=map{ hex($_) } qw/
+	00 0b 00 40 00 5c 00 02 00 00 00 01 00 03 00 02
+	00 02 00 01 00 00 00 00 00 00 00 09 00 00 00 00
+	00 a0 00 00 00 00 00 00 ff 61 00 01 ff 62 00 01
+	ff 63 00 01 ff 64 00 01 ff 65 00 01 ff 66 00 01
+	ff 67 00 01 ff 68 00 01 ff 69 00 01 ff 6a 00 01
+	ff 6b 00 01 ff 6c 00 01 ff 6d 00 01 ff 6e 00 01
+	ff 6f 00 01 ff 70 00 01 ff 71 00 01 ff 72 00 01
+	ff 73 00 01 ff 74 00 01 ff 75 00 01 ff 76 00 01
+	ff 77 00 01 ff 78 00 01 ff 79 00 01 ff 7a 00 01
+	ff 7b 00 01 ff 7c 00 01 ff 7d 00 01 ff 7e 00 01
+	ff 7f 00 01 ff 80 00 01 ff 81 00 01 ff 82 00 01
+	ff 83 00 01 ff 84 00 01 ff 85 00 01 ff 86 00 01
+	ff 87 00 01 ff 88 00 01 ff 89 00 01 ff 8a 00 01
+	ff 8b 00 01 ff 8c 00 01 ff 8d 00 01 ff 8e 00 01
+	ff 8f 00 01 ff 90 00 01 ff 91 00 01 ff 92 00 01
+	ff 93 00 01 ff 94 00 01 ff 95 00 01 ff 96 00 01
+	ff 97 00 01 ff 98 00 01 ff 99 00 01 ff 9a 00 01
+	ff 9b 00 01 ff 9c 00 01 ff 9d 00 01 ff 9e 00 01
+	ff 9f 00 01 02 11 00 00 01 11 00 00 00 00 00 00
+	00 08 00 00 00 10 00 00 00 00 00 00 00 0e 14 7b
+	00 00 00 00 00 01 eb 85 00 00 00 00 00 00 00 00
+	00 00 00 00 00 00 00 00 00 00 00 00 00 10 00 00
+	00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+/;
+
 opendir(TFM, "tfm") || mkdir("tfm",0755) || die "cannot mkdir tfm";
 
 my @face = qw/mr gr mb gb mgr ml ge/;
@@ -40,7 +95,16 @@ my %font_id = qw/1b g      1d h 1e i 1f j
 &make_unified_utf_tfm;
 
 sub make_utf_tfm {
-	foreach $lang ($lang[0]){ #language
+	foreach $lang ($lang[0]){ #language, japanase
+		foreach $newjis ('', 'n') {
+		foreach $face (@face){ #face
+			$face0 = $face.$newjis;
+			foreach $dir (@dir){ #direction
+				&make_dvipstfm_body($face0, $dir, $lang) if ($dir=='h');
+				&make_ucs_tfm_body($face0, $dir, $lang);
+			}
+		}
+		}
 		foreach $face (@face){ #face
 			foreach $dir (@dir){ #direction
 				&maketfm_body($face, $dir, $lang);
@@ -49,7 +113,13 @@ sub make_utf_tfm {
 	}
 }
 sub make_multi_utf_tfm {
-	foreach $lang (@lang[1..$multi]){ #language
+	foreach $lang (@lang[1..$multi]){ #language, t c k
+		foreach $face (@face){ #face
+			foreach $dir (@dir){ #direction
+				&make_dvipstfm_body($face, $dir, $lang);
+				&make_ucs_tfm_body($face, $dir, $lang);
+			}
+		}
 		foreach $face (@face[0..1]){ #face
 			foreach $dir (@dir){ #direction
 				&maketfm_body($face, $dir, $lang);
@@ -85,7 +155,7 @@ sub maketfm_body {
 	foreach $first_hex (0x1b, 0x1d .. 0x2f) { # U+1Cxxx : not defined yet
 		next if (!$exist_head[$first_hex]);
 
-		$id = $font_id{sprintf("%x", $first_hex)};
+		$id = $font_id{sprintf("%02x", $first_hex)};
 		$filename= (@ln>1) ? "utf$face$id-$dir" : "utf$lang$face$id-$dir";
 		open(TEXTFM,">tfm/$filename.tfm") || die "Can't make \'tfm/$filename.tfm\'!\n";
 		binmode(TEXTFM);
@@ -97,3 +167,54 @@ sub maketfm_body {
 		close(TEXTFM);
 	}
 }
+
+sub make_ucs_tfm_body {
+	my ($face, $dir, $lang)=@_;
+
+	{
+		$id = '-';
+		$filename="utf$lang$face$id-$dir";
+		open(TEXTFM,">tfm/$filename.tfm") || die "Can't make \'tfm/$filename.tfm\'!\n";
+		binmode(TEXTFM);
+		if ($dir eq 'h') {
+			if ($lang eq 'j') {
+				@tex_tfm = @tex_tfm_ucs_h;
+			} else {
+				@tex_tfm = @tex_tfm_h;
+			}
+			foreach $binary(@tex_tfm  ) {$_ = pack("C", $binary);print TEXTFM "$_";}
+		}elsif ($dir eq 'v'){
+			foreach $binary(@tex_tfm_v) {$_ = pack("C", $binary);print TEXTFM "$_";}
+		}
+		close(TEXTFM);
+	}
+}
+
+sub make_dvipstfm_body {
+	my ($face, $dir, $lang)=@_;
+=comment
+		## mktfm.pl does similar procedure.
+		$varfilename="otf-u$lang$face-$dir";
+		open(DVIPSTFM,">tfm/$varfilename.tfm") || die "Can't make \'tfm/$varfilename.tfm\'!\n";
+		if ($i==0) {
+			foreach $binary(@dvips_tfm_h) {$_ = pack("C", $binary);print DVIPSTFM "$_";}
+		}elsif ($i==1){
+			foreach $binary(@dvips_tfm_v) {$_ = pack("C", $binary);print DVIPSTFM "$_";}
+		}
+		close(DVIPSTFM);
+=cut
+		$varfilename= "otf-u$lang$face-$dir";
+		open(DVIPSTFM,">tfm/$varfilename.tfm") || die "Can't make \'tfm/$varfilename.tfm\'!\n";
+		binmode(DVIPSTFM);
+		if ($dir eq 'h') {
+			if ($lang eq 'j') {
+				@dvips_tfm = @dvips_tfm_ucs_h;
+			} else {
+				@dvips_tfm = @dvips_tfm_h;
+			}
+			foreach $binary(@dvips_tfm  ) {$_ = pack("C", $binary);print DVIPSTFM "$_";}
+		}elsif ($dir eq 'v'){
+			foreach $binary(@dvips_tfm_v) {$_ = pack("C", $binary);print DVIPSTFM "$_";}
+		}
+		close(DVIPSTFM);
+}
diff --git a/language/japanese/japanese-otf-uptex/script/mkutfvf_sp.pl b/language/japanese/japanese-otf-uptex/script/mkutfvf_sp.pl
index 8392b7b686..97ea89f2af 100755
--- a/language/japanese/japanese-otf-uptex/script/mkutfvf_sp.pl
+++ b/language/japanese/japanese-otf-uptex/script/mkutfvf_sp.pl
@@ -43,7 +43,15 @@ my %font_id = qw/1b g      1d h 1e i 1f j
 &makeunivf;
 
 sub makejvf {
-	foreach $lang ($lang[0]){ #language
+	foreach $lang ($lang[0]){ #language, japanase
+		foreach $newjis ('', 'n') {
+		foreach $face (@face){ #face
+			$face0 = $face.$newjis;
+			foreach $dir (@dir){ #direction
+				&make_ucs_vf_body($face0, $dir, $lang);
+			}
+		}
+		}
 		foreach $face (@face){ #face
 			foreach $dir (@dir){ #direction
 				&makevf_body($face, $dir, $lang);
@@ -52,7 +60,12 @@ sub makejvf {
 	}
 }
 sub makemlvf {
-	foreach $lang (@lang[1..$multi]){ #language
+	foreach $lang (@lang[1..$multi]){ #language, t c k
+		foreach $face (@face){ #face
+			foreach $dir (@dir){ #direction
+				&make_ucs_vf_body($face, $dir, $lang);
+			}
+		}
 		foreach $face (@face[0..1]){ #face
 			foreach $dir (@dir){ #direction
 				&makevf_body($face, $dir, $lang);
@@ -75,8 +88,8 @@ sub makevf_body {
     foreach $first_hex (0x1b, 0x1d .. 0x2f) { # U+1Cxxx : not defined yet
 	next if (!$exist_head[$first_hex]);
 
-	$HEX = sprintf("%X", $first_hex);
-	$id = $font_id{sprintf("%x", $first_hex)};
+	$HEX = sprintf("%02X", $first_hex);
+	$id = $font_id{sprintf("%02x", $first_hex)};
 	warn "now processing (face:$face, dir:$dir, lang:$lang, first_hex:$HEX, ID:$id) ...\n";
 	$filename="utf$lang$face$id-$dir";
 	open(OUT, ">ovp/$filename.ovp")||die "$!";
@@ -100,8 +113,8 @@ sub make_uni_vf_body {
     foreach $first_hex (0x1b, 0x1d .. 0x2f) { # U+1Cxxx : not defined yet
 	next if (!$exist_head[$first_hex]);
 
-	$HEX = sprintf("%X", $first_hex);
-	$id = $font_id{sprintf("%x", $first_hex)};
+	$HEX = sprintf("%02X", $first_hex);
+	$id = $font_id{sprintf("%02x", $first_hex)};
 	warn "now processing (face:$face, dir:$dir, lang:MULTI, first_hex:$HEX, ID:$id) ...\n";
 	$filename="utf$face$id-$dir";
 	open(OUT, ">ovp/$filename.ovp")||die "$!";
@@ -120,6 +133,26 @@ sub make_uni_vf_body {
     }
 }
 
+sub make_ucs_vf_body {
+    my ($face, $dir, $lang)=@_;
+
+    {
+	$id = '-';
+	warn "now processing (face:$face, dir:$dir, lang:$lang, ucs vf, ID:$id) ...\n";
+	$filename="utf$lang$face$id-$dir";
+	open(OUT, ">ovp/$filename.ovp")||die "$!";
+	&fonthead;
+	print OUT "(MAPFONT D 0\n   (FONTNAME otf-u$lang$face-$dir)\n";
+	&fontfoot;
+	&writechar_ucs($dir) if ($lang eq 'j');
+	close(OUT);
+	unless ($debug){
+		system("$ovp2ovf ovp/$filename.ovp vf/$filename.vf vf/$filename.ofm");
+		unlink "vf/$filename.ofm";
+	}
+    }
+}
+
 sub fonthead {
 print OUT <<END_OF_DATA;
 (VTITLE JVF for UTF16)
@@ -164,3 +197,13 @@ sub writechar {
 		}
 	}
 }
+
+sub writechar_ucs {
+	my ($dir) = @_;
+	my $wd = $dir eq 'h' ? '0.5' : '1.0';
+	foreach $uni (0xFF61 .. 0xFF9F){
+		my $uniX = sprintf("%X", $uni);
+		print OUT "(CHARACTER H $uniX (CHARWD R $wd) (MAP \n";
+		print OUT "      (SETCHAR H $uniX)))\n";
+	}
+}
diff --git a/language/japanese/japanese-otf-uptex/script/umkpkana.pl b/language/japanese/japanese-otf-uptex/script/umkpkana.pl
index 4c14fd4559..2620888454 100755
--- a/language/japanese/japanese-otf-uptex/script/umkpkana.pl
+++ b/language/japanese/japanese-otf-uptex/script/umkpkana.pl
@@ -265,6 +265,7 @@ sub write_char {
     }
 }
 sub print_char{
+	return if ($omitfw);
 	printf OVP "(CHARACTER H %X\n", $dvicode;
 	printf OVP "   (CHARWD R %f)\n", $font_at;
 	print  OVP "   (MAP\n";
diff --git a/language/japanese/japanese-otf-uptex/script/umkvpkana.pl b/language/japanese/japanese-otf-uptex/script/umkvpkana.pl
index f1ff477518..da4d0d7d8a 100755
--- a/language/japanese/japanese-otf-uptex/script/umkvpkana.pl
+++ b/language/japanese/japanese-otf-uptex/script/umkvpkana.pl
@@ -240,6 +240,7 @@ sub write_char {
     }
 }
 sub print_char{
+	return if ($omitfw);
 	printf OVP "(CHARACTER H %X\n", $dvicode;
 	printf OVP "   (CHARWD R %f)\n", $font_at;
 	print  OVP "   (MAP\n";
diff --git a/language/japanese/japanese-otf-uptex/sty/mlutf.sty b/language/japanese/japanese-otf-uptex/sty/mlutf.sty
index cf6a7e7b03..79d0a61c91 100644
--- a/language/japanese/japanese-otf-uptex/sty/mlutf.sty
+++ b/language/japanese/japanese-otf-uptex/sty/mlutf.sty
@@ -1,23 +1,65 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.25 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.26 ttk]
 %force catcode of \" be 12
 \count@\catcode`\"
 \catcode`\"=12
-\DeclareRobustCommand{\UTFK}[1]{\begingroup%
-	\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
-	\kanjifamily{utfk}\uppercase{\set@character="#1}%
-	\endgroup%
-}
-\DeclareRobustCommand{\UTFC}[1]{\begingroup%
-	\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
-	\kanjifamily{utfc}\uppercase{\set@character="#1}%
-	\endgroup%
-}
-\DeclareRobustCommand{\UTFT}[1]{\begingroup%
-	\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
-	\kanjifamily{utft}\uppercase{\set@character="#1}%
-	\endgroup%
-}
+\if@otf@uplatex
+\if@deluxe
+	\DeclareRobustCommand{\UTFK}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+		\ifx\k@family\reserved@a \kanjifamily{utfkg}\else\ifx\k@family\reserved@b
+			\kanjifamily{utfkmg}\else\kanjifamily{utfk}\fi\fi%
+		\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFC}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+		\ifx\k@family\reserved@a \kanjifamily{utfcg}\else\ifx\k@family\reserved@b
+			\kanjifamily{utfcmg}\else\kanjifamily{utfc}\fi\fi%
+		\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFT}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
+		\ifx\k@family\reserved@a \kanjifamily{utftg}\else\ifx\k@family\reserved@b
+			\kanjifamily{utftmg}\else\kanjifamily{utft}\fi\fi%
+		\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+\else
+	\DeclareRobustCommand{\UTFK}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utfk}\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFC}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utfc}\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFT}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utft}\uppercase{\set@character@="#1}%
+		\endgroup%
+	}
+\fi
+\else% for pLaTeX
+	\DeclareRobustCommand{\UTFK}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utfk}\uppercase{\set@character="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFC}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utfc}\uppercase{\set@character="#1}%
+		\endgroup%
+	}
+	\DeclareRobustCommand{\UTFT}[1]{\begingroup%
+		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
+		\kanjifamily{utft}\uppercase{\set@character="#1}%
+		\endgroup%
+	}
+\fi
 \DeclareRobustCommand{\UTFM}[1]{\begingroup%
 	\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
 	\kanjifamily{utf}\uppercase{\set@character="#1}%
@@ -41,16 +83,64 @@
 
 \DeclareKanjiFamily{\otf@JYn}{utfk}{}
 \DeclareKanjiFamily{\otf@JTn}{utfk}{}
-\Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr}
-\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
 \DeclareKanjiFamily{\otf@JYn}{utfc}{}
 \DeclareKanjiFamily{\otf@JTn}{utfc}{}
-\Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr}
-\Declare@FontShape{utfc}{bx}{0123456789abcdefklmo}{utfcgr}
 \DeclareKanjiFamily{\otf@JYn}{utft}{}
 \DeclareKanjiFamily{\otf@JTn}{utft}{}
-\Declare@FontShape{utft}{m}{0123456789abcdefklmnopqrstuvwxz}{utftmr}
-\Declare@FontShape{utft}{bx}{0123456789abcdefklmnopqrstuvwxz}{utftgr}
+\if@otf@uplatex
+	\Declare@FontShape{utfk}{m}{-}{utfkmr}
+	\Declare@FontShape{utfc}{m}{-}{utfcmr}
+	\Declare@FontShape{utft}{m}{-}{utftmr}
+	\if@deluxe
+		\Declare@FontShape{utfk}{bx}{-}{utfkmb}
+		\DeclareKanjiFamily{\otf@JYn}{utfkg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utfkg}{}
+		\Declare@FontShape{utfkg}{m}{-}{utfkgr}
+		\Declare@FontShape{utfkg}{bx}{-}{utfkgb}
+		\Declare@FontShape{utfkg}{eb}{-}{utfkge}
+		\DeclareKanjiFamily{\otf@JYn}{utfkmg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utfkmg}{}
+		\Declare@FontShape{utfkmg}{m}{-}{utfkmgr}
+		\Declare@FontShape{utfk}{l}{-}{utfkml}
+		\Declare@FontShape{utfc}{bx}{-}{utfcmb}
+		\DeclareKanjiFamily{\otf@JYn}{utfcg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utfcg}{}
+		\Declare@FontShape{utfcg}{m}{-}{utfcgr}
+		\Declare@FontShape{utfcg}{bx}{-}{utfcgb}
+		\Declare@FontShape{utfcg}{eb}{-}{utfcge}
+		\DeclareKanjiFamily{\otf@JYn}{utfcmg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utfcmg}{}
+		\Declare@FontShape{utfcmg}{m}{-}{utfcmgr}
+		\Declare@FontShape{utfc}{l}{-}{utfcml}
+		\Declare@FontShape{utft}{bx}{-}{utftmb}
+		\DeclareKanjiFamily{\otf@JYn}{utftg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utftg}{}
+		\Declare@FontShape{utftg}{m}{-}{utftgr}
+		\Declare@FontShape{utftg}{bx}{-}{utftgb}
+		\Declare@FontShape{utftg}{eb}{-}{utftge}
+		\DeclareKanjiFamily{\otf@JYn}{utftmg}{}
+		\DeclareKanjiFamily{\otf@JTn}{utftmg}{}
+		\Declare@FontShape{utftmg}{m}{-}{utftmgr}
+		\Declare@FontShape{utft}{l}{-}{utftml}
+	\else
+		\if@bold
+			\Declare@FontShape{utfk}{bx}{-}{utfkgb}
+			\Declare@FontShape{utfc}{bx}{-}{utfcgb}
+			\Declare@FontShape{utft}{bx}{-}{utftgb}
+		\else
+			\Declare@FontShape{utfk}{bx}{-}{utfkgr}
+			\Declare@FontShape{utfc}{bx}{-}{utfcgr}
+			\Declare@FontShape{utft}{bx}{-}{utftgr}
+		\fi
+	\fi
+\else
+	\Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr}
+	\Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr}
+	\Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr}
+	\Declare@FontShape{utfc}{bx}{0123456789abcdefklmo}{utfcgr}
+	\Declare@FontShape{utft}{m}{0123456789abcdefklmnopqrstuvwxz}{utftmr}
+	\Declare@FontShape{utft}{bx}{0123456789abcdefklmnopqrstuvwxz}{utftgr}
+\fi
 \DeclareKanjiFamily{\otf@JYn}{utf}{}
 \DeclareKanjiFamily{\otf@JTn}{utf}{}
 \Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvwxyz}{utfmr}
diff --git a/language/japanese/japanese-otf-uptex/sty/otf.sty b/language/japanese/japanese-otf-uptex/sty/otf.sty
index b92d403718..13f2911b91 100644
--- a/language/japanese/japanese-otf-uptex/sty/otf.sty
+++ b/language/japanese/japanese-otf-uptex/sty/otf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau, u0.25 ttk]
+\ProvidesPackage{otf}[2019/04/01 v1.7b8 psitau, u0.26 ttk]
 \RequirePackage{keyval}
 %for processing options 
 \newif\if@kana \@kanafalse
@@ -75,7 +75,8 @@
 		\edef\reserved@a{\gtdefault}\edef\reserved@b{\mgdefault}%
 		\ifx\k@family\reserved@a \kanjifamily{utfjg}\else\ifx\k@family\reserved@b
 			\kanjifamily{utfjmg}\else\kanjifamily{utfj}\fi\fi%
-		\uppercase{\set@character="#1}%
+%		\uppercase{\set@character="#1}% (1) pLaTeX, upLaTeXともに\UTF{}に従来のsubfontを使う
+		\uppercase{\if@otf@uplatex\set@character@\else\set@character\fi="#1}% (2) upLaTeXでは\UTF{}に新vfを使う
 		\endgroup%
 	}
 	\DeclareRobustCommand{\CID}[1]{\begingroup%
@@ -88,7 +89,9 @@
 \else
 	\DeclareRobustCommand{\UTF}[1]{\begingroup%
 		\edef\reserved@a{\gtdefault}\ifx\k@family\reserved@a \kanjiseries{bx}\fi%
-		\kanjifamily{utfj}\uppercase{\set@character="#1}%
+		\kanjifamily{utfj}%
+%		\uppercase{\set@character="#1}% (1) pLaTeX, upLaTeXともに\UTF{}に従来のsubfontを使う
+		\uppercase{\if@otf@uplatex\set@character@\else\set@character\fi="#1}% (2) upLaTeXでは\UTF{}に新vfを使う
 		\endgroup%
 	}
 	\DeclareRobustCommand{\CID}[1]{\begingroup%
@@ -253,12 +256,17 @@
 	\advance\@tempcnta by \@tempcntb
 	\if@otf@uplatex
 		\advance\@tempcnta by "113030
-		\char\@tempcnta%
+		\kchar\@tempcnta%
 	\else
 		\advance\@tempcnta by "3030
 		\char\jis\@tempcnta%
 	\fi
 }
+\newcommand\set@character@{\afterassignment\put@character@\@tempcnta}
+\newcommand\put@character@{%
+	\kanjishape{-}\selectfont%
+	\kchar\@tempcnta%
+}
 \catcode`\"=\count@
 %end of changing catcode of \"
 \def\Declare@FontShape#1#2#3#4{%
@@ -464,36 +472,36 @@
 \DeclareKanjiFamily{\otf@JTn}{utfj}{}
 \DeclareKanjiFamily{\otf@JYn}{cidj}{}
 \DeclareKanjiFamily{\otf@JTn}{cidj}{}
-\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvxyz}{utfjmr\nlck@sfx@}
+\Declare@FontShape{utfj}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmr\nlck@sfx@}
 \Declare@FontShape{cidj}{m}{012345}{cidjmr}
 %definition of other utf/cid fonts
 \if@deluxe
-	\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjmb\nlck@sfx@}
+	\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{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}{0123456789abcdefjklmnopqrstuvxyz}{utfjgr\nlck@sfx@}
+	\Declare@FontShape{utfjg}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@}
 	\Declare@FontShape{cidjg}{m}{012345}{cidjgr}
-	\Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgb\nlck@sfx@}
+	\Declare@FontShape{utfjg}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@}
 	\Declare@FontShape{cidjg}{bx}{012345}{cidjgb}
-	\Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvxyz}{utfjge\nlck@sfx@}
+	\Declare@FontShape{utfjg}{eb}{0123456789abcdefjklmnopqrstuvxyz-}{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}{0123456789abcdefjklmnopqrstuvxyz}{utfjmgr\nlck@sfx@}
+	\Declare@FontShape{utfjmg}{m}{0123456789abcdefjklmnopqrstuvxyz-}{utfjmgr\nlck@sfx@}
 	\Declare@FontShape{cidjmg}{m}{012345}{cidjmgr}
-	\Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvxyz}{utfjml\nlck@sfx@}
+	\Declare@FontShape{utfj}{l}{0123456789abcdefjklmnopqrstuvxyz-}{utfjml\nlck@sfx@}
 	\Declare@FontShape{cidj}{l}{012345}{cidjml}
 \else
 	\if@bold
-		\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgb\nlck@sfx@}
+		\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgb\nlck@sfx@}
 		\Declare@FontShape{cidj}{bx}{012345}{cidjgb}
 	\else
-		\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz}{utfjgr\nlck@sfx@}
+		\Declare@FontShape{utfj}{bx}{0123456789abcdefjklmnopqrstuvxyz-}{utfjgr\nlck@sfx@}
 		\Declare@FontShape{cidj}{bx}{012345}{cidjgr}
 	\fi
 \fi
diff --git a/language/japanese/japanese-otf-uptex/test/uplatex/Makefile b/language/japanese/japanese-otf-uptex/test/uplatex/Makefile
index 78974e127f..eaaaf9b1a6 100644
--- a/language/japanese/japanese-otf-uptex/test/uplatex/Makefile
+++ b/language/japanese/japanese-otf-uptex/test/uplatex/Makefile
@@ -3,10 +3,10 @@ PTEX = ptex
 UPLATEX = uplatex
 PLATEX = platex -kanji=utf8
 DVIPS = dvips
-DVIPDFMX = dvipdfmx
+DVIPDFMX = dvipdfmx -v
 PDVITYPE = pdvitype
 
-all: otf sp art bsrg jis04 scale prop punct exclam
+all: otf sp art brsg jis04 scale prop punct exclam
 
 otf: uplatex-otf platex-otf
 sp: uplatex-sp platex-sp
@@ -16,6 +16,7 @@ jis04: uplatex-jis04 platex-jis04
 scale: uplatex-scale platex-scale
 prop: uplatex-prop platex-prop
 exclam: uplatex-exclam platex-exclam
+utfmacro: uplatex-utfmacro platex-utfmacro
 
 uplatex-otf:
 	for opt in default deluxe expert bold noreplace; do \
@@ -101,10 +102,10 @@ uplatex-jis04:
 	for jis in 00 04; do \
 		$(UPLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{ujarticle}\input" upjis2004.tex ; \
 		mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-h-uplatex.dvi ; \
-		$(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-h-uplatex.dvi ; \
+		$(DVIPDFMX) -f utfmacro-haranoaji.map upjis2004-$$opt-$$brsg-$$jis-h-uplatex.dvi ; \
 		$(UPLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{utarticle}\input" upjis2004.tex ; \
 		mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-v-uplatex.dvi ; \
-		$(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-v-uplatex.dvi ; \
+		$(DVIPDFMX) -f utfmacro-haranoaji.map upjis2004-$$opt-$$brsg-$$jis-v-uplatex.dvi ; \
 	done \
 	done \
 	done
@@ -115,10 +116,10 @@ platex-jis04:
 	for jis in 00 04; do \
 		$(PLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{jarticle}\input" upjis2004.tex ; \
 		mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-h-platex.dvi ; \
-		$(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-h-platex.dvi ; \
+		$(DVIPDFMX) -f utfmacro-haranoaji.map upjis2004-$$opt-$$brsg-$$jis-h-platex.dvi ; \
 		$(PLATEX) "\def\option{$$opt}\def\burasage{$$brsg}\def\jisvar{$$jis}\def\class{tarticle}\input" upjis2004.tex ; \
 		mv upjis2004.dvi upjis2004-$$opt-$$brsg-$$jis-v-platex.dvi ; \
-		$(DVIPDFMX) upjis2004-$$opt-$$brsg-$$jis-v-platex.dvi ; \
+		$(DVIPDFMX) -f utfmacro-haranoaji.map upjis2004-$$opt-$$brsg-$$jis-v-platex.dvi ; \
 	done \
 	done \
 	done
@@ -188,5 +189,25 @@ platex-exclam:
 		$(DVIPDFMX) exclam-$$opt-platex.dvi ; \
 	done
 
+uplatex-utfmacro:
+	for opt in default deluxe bold; do \
+		$(UPLATEX) "\def\option{$$opt}\def\class{ujarticle}\input" utfmacro-cjk.tex ; \
+		mv utfmacro-cjk.dvi utfmacro-cjk-$$opt-h-uplatex.dvi ; \
+		$(DVIPDFMX) -f utfmacro-haranoaji.map utfmacro-cjk-$$opt-h-uplatex.dvi ; \
+		$(UPLATEX) "\def\option{$$opt}\def\class{utarticle}\input" utfmacro-cjk.tex ; \
+		mv utfmacro-cjk.dvi utfmacro-cjk-$$opt-v-uplatex.dvi ; \
+		$(DVIPDFMX) -l -f utfmacro-haranoaji.map utfmacro-cjk-$$opt-v-uplatex.dvi ; \
+	done
+
+platex-utfmacro:
+	for opt in default deluxe bold; do \
+		$(PLATEX) "\def\option{$$opt}\def\class{jarticle}\input" utfmacro-cjk.tex ; \
+		mv utfmacro-cjk.dvi utfmacro-cjk-$$opt-h-platex.dvi ; \
+		$(DVIPDFMX) -f utfmacro-haranoaji.map utfmacro-cjk-$$opt-h-platex.dvi ; \
+		$(PLATEX) "\def\option{$$opt}\def\class{tarticle}\input" utfmacro-cjk.tex ; \
+		mv utfmacro-cjk.dvi utfmacro-cjk-$$opt-v-platex.dvi ; \
+		$(DVIPDFMX) -l -f utfmacro-haranoaji.map utfmacro-cjk-$$opt-v-platex.dvi ; \
+	done
+
 clean:
 	rm -f *.aux *.log *.dvi *.pdf
diff --git a/language/japanese/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex b/language/japanese/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex
index b7c8a5f5f5..45f57f8390 100644
--- a/language/japanese/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex
+++ b/language/japanese/japanese-otf-uptex/test/uplatex/uotftest-utf8.tex
@@ -103,6 +103,15 @@ mg/m & {\mgfamily ひらかな} & {\mgfamily 漢字} & {\mgfamily\UTF{9DD7}} & {
 
 ｱｲｳｴｵ\raisebox\baseshift{\frame{ｱ}\frame{ｲ}\frame{ｳ}\frame{ｴ}\frame{ｵ}}
 
+% \UTF{}はまだ半角片仮名に対応していない。
+UTF:\UTF{FF71}\UTF{FF72}\UTF{FF73}\UTF{FF74}\UTF{FF75}%
+\raisebox\baseshift{\frame{\UTF{FF71}}\frame{\UTF{FF72}}\frame{\UTF{FF73}}\frame{\UTF{FF74}}\frame{\UTF{FF75}}}
+
+UTF:%
+\UTF{FF61}\UTF{FF62}\UTF{FF63}\UTF{FF64}\UTF{FF65}\UTF{FF66}\UTF{FF67}\UTF{FF68}\UTF{FF69}\UTF{FF6A}\UTF{FF6B}\UTF{FF6C}\UTF{FF6D}\UTF{FF6E}\UTF{FF6F},%
+\UTF{FF70}\UTF{FF71}\UTF{FF72}\UTF{FF73}\UTF{FF74}\UTF{FF75}\UTF{FF76}\UTF{FF77}\UTF{FF78}\UTF{FF79}\UTF{FF7A}\UTF{FF7B}\UTF{FF7C}\UTF{FF7D}\UTF{FF7E}\UTF{FF7F},%
+\UTF{FF80}\UTF{FF81}\UTF{FF82}\UTF{FF83}\UTF{FF84}\UTF{FF85}\UTF{FF86}\UTF{FF87}\UTF{FF88}\UTF{FF89}\UTF{FF8A}\UTF{FF8B}\UTF{FF8C}\UTF{FF8D}\UTF{FF8E}\UTF{FF8F},%
+\UTF{FF90}\UTF{FF91}\UTF{FF92}\UTF{FF93}\UTF{FF94}\UTF{FF95}\UTF{FF96}\UTF{FF97}\UTF{FF98}\UTF{FF99}\UTF{FF9A}\UTF{FF9B}\UTF{FF9C}\UTF{FF9D}\UTF{FF9E}\UTF{FF9F}
 
 \clearpage
 [mc/m]
diff --git a/language/japanese/japanese-otf-uptex/test/uplatex/utfmacro-cjk.tex b/language/japanese/japanese-otf-uptex/test/uplatex/utfmacro-cjk.tex
new file mode 100644
index 0000000000..0a48aec4a8
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/test/uplatex/utfmacro-cjk.tex
@@ -0,0 +1,344 @@
+% -*- coding: utf-8 -*-
+\newif\ifuptexmode\uptexmodefalse
+\ifnum\jis"2121="3000 \uptexmodetrue\fi
+
+\makeatletter
+
+\def\@opt@{multi}
+\def\@default{default}
+\def\@jarticle{jarticle}
+\def\@tarticle{tarticle}
+\def\@utarticle{utarticle}
+\def\@landscape@{}
+
+\ifx\option\@undefined
+ \def\option{default}
+\fi
+\ifx\option\@default
+\else
+ \edef\@opt@{\option,\@opt@}
+\fi
+
+\ifx\class\@undefined
+ \ifuptexmode
+  \def\class{ujarticle}
+ \else
+  \def\class{jarticle}
+ \fi
+\fi
+
+\def\baseshift{-.12zh}
+\ifx\class\@tarticle\def\baseshift{-.5zh}\def\@landscape@{,landscape}\fi
+\ifx\class\@utarticle\def\baseshift{-.5zh}\def\@landscape@{,landscape}\fi
+
+\ifuptexmode
+ \edef\@opt@{uplatex,\@opt@}
+\fi
+%\documentclass[a4paper,titlepage,draft]{\class}
+%\documentclass[a4paper,titlepage,draft,landscape]{\class}
+\documentclass[a4paper,titlepage,draft\@landscape@]{\class}
+
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[\@opt@]{otf}
+
+\newif\ifdeluxemode\deluxemodefalse
+\if@deluxe\deluxemodetrue\fi
+
+\makeatother
+
+
+\textheight250mm
+\topmargin-15mm
+\begin{document}
+\parindent0mm
+クラス：\texttt{\class}\\
+オプション：\texttt{\option}
+
+\section{\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} こんにちは Einenschönen Tag}
+
+\begin{tabular}{cccc}
+日本 & 簡体字 & 繁體字 & 朝鮮\\\hline
+\UTF{9aa8}\UTF{6d77}\UTF{76f4}\UTF{8ff0} &
+\UTFC{9aa8}\UTFC{6d77}\UTFC{76f4}\UTFC{8ff0} &
+\UTFT{9aa8}\UTFT{6d77}\UTFT{76f4}\UTFT{8ff0} &
+\UTFK{9aa8}\UTFK{6d77}\UTFK{76f4}\UTFK{8ff0}
+\end{tabular}
+
+% Adobe-Japan, Adobe-GB, Adobe-CNS, Adobe-KoreaでU+007F..00FFかつfullwidthとなっているもの。
+\begin{tabular}{rl}
+J &
+\UTF{00a7}\UTF{00a8}\UTF{00b0}\UTF{00b1}\UTF{00b4}\UTF{00b6}\UTF{00d7}\UTF{00f7}\\
+C &
+\UTFC{00a4}\UTFC{00a7}\UTFC{00a8}\UTFC{00b0}\UTFC{00b1}\UTFC{00b7}\UTFC{00d7}\UTFC{00e0}\UTFC{00e1}\UTFC{00e8}\UTFC{00e9}\UTFC{00ea}\UTFC{00ec}\UTFC{00ed}\UTFC{00f2}\UTFC{00f3}\UTFC{00f7}\UTFC{00f9}\UTFC{00fa}\UTFC{00fc}\\
+T &
+\UTFT{00a5}\UTFT{00a7}\UTFT{00a8}\UTFT{00ac}\UTFT{00af}\UTFT{00b0}\UTFT{00b1}\UTFT{00b7}\UTFT{00c0}\UTFT{00c1}\UTFT{00c8}\UTFT{00c9}\UTFT{00ca}\UTFT{00d2}\UTFT{00d3}\UTFT{00d7}\UTFT{00e0}\UTFT{00e1}\UTFT{00e8}\UTFT{00e9}\UTFT{00ea}\UTFT{00ec}\UTFT{00ed}\UTFT{00f2}\UTFT{00f3}\UTFT{00f7}\UTFT{00f8}\UTFT{00f9}\UTFT{00fa}\UTFT{00fc}\\
+K &
+\UTFK{00a1}\UTFK{00a4}\UTFK{00a7}\UTFK{00a8}\UTFK{00aa}\UTFK{00ab}\UTFK{00b0}\UTFK{00b1}\UTFK{00b4}\UTFK{00b6}\UTFK{00b7}\UTFK{00b8}\UTFK{00b9}\UTFK{00ba}\UTFK{00bb}\UTFK{00bc}\UTFK{00bd}\UTFK{00be}\UTFK{00bf}\UTFK{00c6}\UTFK{00d0}\UTFK{00d7}\UTFK{00d8}\UTFK{00de}\UTFK{00df}\UTFK{00e6}\UTFK{00f0}\UTFK{00f7}\UTFK{00f8}\UTFK{00fe}
+\end{tabular}
+
+\subsection{\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} こんにちは Einenschönen Tag}
+
+\ifdeluxemode
+{\mcfamily\ltseries
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+\fi% \ifdeluxemode
+{\mcfamily
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+{\mcfamily\bfseries
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+{\gtfamily
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+{\gtfamily\bfseries
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+\ifdeluxemode
+{\gtfamily\ebseries
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+{\mgfamily
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+\fi% \ifdeluxemode
+
+\subsubsection{\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} こんにちは Einenschönen Tag}
+
+{\footnotesize
+\ifdeluxemode
+{\mcfamily\ltseries
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+\fi% \ifdeluxemode
+{\mcfamily
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+{\mcfamily\bfseries
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+{\gtfamily
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+{\gtfamily\bfseries
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+\ifdeluxemode
+{\gtfamily\ebseries
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+{\mgfamily
+\UTFC{4F60}\UTFC{597D} \UTFT{60A8}\UTFT{597D} \UTFK{C548}\UTFK{B155} %你好 您好 안녕
+こんにちは Einenschönen Tag\\
+}%
+\fi% \ifdeluxemode
+}
+
+\section{penalty}
+\edef\bs{$\backslash$\kern0em}
+
+\fbox{\parbox{4.7zw}{君の名は。}}~UTF8
+
+\fbox{\parbox{4.7zw}{君の名は\char\kuten"0103}}~\bs char\bs kuten
+
+\fbox{\parbox{4.7zw}{君の名は\UTF{3002}}}~\bs UTF\{\}
+
+\ifuptexmode
+\fbox{\parbox{4.7zw}{君の名は\kchar"3002}}~\bs kchar
+\fi
+
+
+\fbox{\parbox{4.7zw}{君の名は．}}~UTF8
+
+\fbox{\parbox{4.7zw}{君の名は\char\kuten"0105}}~\bs char\bs kuten
+
+\fbox{\parbox{4.7zw}{君の名は\UTF{FF0E}}}~\bs UTF\{\}
+
+\ifuptexmode
+\fbox{\parbox{4.7zw}{君の名は\kchar"FF0E}}~\bs kchar
+\fi
+
+
+\clearpage
+[mc/m]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+\fi
+
+“回”、‘回’。“回”，‘回’．
+
+日本：\UTF{9aa8}\UTF{6d77}\UTF{76f4}\UTF{8ff0}~~簡体字：\UTFC{9aa8}\UTFC{6d77}\UTFC{76f4}\UTFC{8ff0}~~繁體字：\UTFT{9aa8}\UTFT{6d77}\UTFT{76f4}\UTFT{8ff0}~~朝鮮：\UTFK{9aa8}\UTFK{6d77}\UTFK{76f4}\UTFK{8ff0}\\
+\UTFC{4F60}\UTFC{597D}~~%你好
+\UTFT{4F60}\UTFT{597D}~~%你好
+\UTFK{C548}\UTFK{B155}%안녕
+
+{\bfseries%
+[mc/bx]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+\fi
+
+“回”、‘回’。“回”，‘回’．
+
+日本：\UTF{9aa8}\UTF{6d77}\UTF{76f4}\UTF{8ff0}~~簡体字：\UTFC{9aa8}\UTFC{6d77}\UTFC{76f4}\UTFC{8ff0}~~繁體字：\UTFT{9aa8}\UTFT{6d77}\UTFT{76f4}\UTFT{8ff0}~~朝鮮：\UTFK{9aa8}\UTFK{6d77}\UTFK{76f4}\UTFK{8ff0}\\
+\UTFC{4F60}\UTFC{597D}~~%你好
+\UTFT{4F60}\UTFT{597D}~~%你好
+\UTFK{C548}\UTFK{B155}%안녕
+}
+
+
+\ifdeluxemode
+{\ltseries%
+[mc/l]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+\fi
+
+“回”、‘回’。“回”，‘回’．
+
+日本：\UTF{9aa8}\UTF{6d77}\UTF{76f4}\UTF{8ff0}~~簡体字：\UTFC{9aa8}\UTFC{6d77}\UTFC{76f4}\UTFC{8ff0}~~繁體字：\UTFT{9aa8}\UTFT{6d77}\UTFT{76f4}\UTFT{8ff0}~~朝鮮：\UTFK{9aa8}\UTFK{6d77}\UTFK{76f4}\UTFK{8ff0}\\
+\UTFC{4F60}\UTFC{597D}~~%你好
+\UTFT{4F60}\UTFT{597D}~~%你好
+\UTFK{C548}\UTFK{B155}%안녕
+}
+\fi% \ifdeluxemode
+
+{\gtfamily
+[gt/m]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+\fi
+
+“回”、‘回’。“回”，‘回’．
+
+日本：\UTF{9aa8}\UTF{6d77}\UTF{76f4}\UTF{8ff0}~~簡体字：\UTFC{9aa8}\UTFC{6d77}\UTFC{76f4}\UTFC{8ff0}~~繁體字：\UTFT{9aa8}\UTFT{6d77}\UTFT{76f4}\UTFT{8ff0}~~朝鮮：\UTFK{9aa8}\UTFK{6d77}\UTFK{76f4}\UTFK{8ff0}\\
+\UTFC{4F60}\UTFC{597D}~~%你好
+\UTFT{4F60}\UTFT{597D}~~%你好
+\UTFK{C548}\UTFK{B155}%안녕
+}
+
+{\gtfamily\bfseries%
+[gt/bx]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+\fi
+
+“回”、‘回’。“回”，‘回’．
+
+日本：\UTF{9aa8}\UTF{6d77}\UTF{76f4}\UTF{8ff0}~~簡体字：\UTFC{9aa8}\UTFC{6d77}\UTFC{76f4}\UTFC{8ff0}~~繁體字：\UTFT{9aa8}\UTFT{6d77}\UTFT{76f4}\UTFT{8ff0}~~朝鮮：\UTFK{9aa8}\UTFK{6d77}\UTFK{76f4}\UTFK{8ff0}\\
+\UTFC{4F60}\UTFC{597D}~~%你好
+\UTFT{4F60}\UTFT{597D}~~%你好
+\UTFK{C548}\UTFK{B155}%안녕
+}
+
+\ifdeluxemode
+{\gtfamily\ebseries%
+[gt/eb]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+\fi
+
+“回”、‘回’。“回”，‘回’．
+
+日本：\UTF{9aa8}\UTF{6d77}\UTF{76f4}\UTF{8ff0}~~簡体字：\UTFC{9aa8}\UTFC{6d77}\UTFC{76f4}\UTFC{8ff0}~~繁體字：\UTFT{9aa8}\UTFT{6d77}\UTFT{76f4}\UTFT{8ff0}~~朝鮮：\UTFK{9aa8}\UTFK{6d77}\UTFK{76f4}\UTFK{8ff0}\\
+\UTFC{4F60}\UTFC{597D}~~%你好
+\UTFT{4F60}\UTFT{597D}~~%你好
+\UTFK{C548}\UTFK{B155}%안녕
+}
+
+{\mgfamily
+[mg/m]
+
+ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのは
+ばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをんヽヾゝゞー
+\ifuptexmode
+ゔゕゖ
+\fi
+
+ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハ
+バパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ
+\ifuptexmode
+ヷヸヹヺㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ
+\fi
+
+“回”、‘回’。“回”，‘回’．
+
+日本：\UTF{9aa8}\UTF{6d77}\UTF{76f4}\UTF{8ff0}~~簡体字：\UTFC{9aa8}\UTFC{6d77}\UTFC{76f4}\UTFC{8ff0}~~繁體字：\UTFT{9aa8}\UTFT{6d77}\UTFT{76f4}\UTFT{8ff0}~~朝鮮：\UTFK{9aa8}\UTFK{6d77}\UTFK{76f4}\UTFK{8ff0}\\
+\UTFC{4F60}\UTFC{597D}~~%你好
+\UTFT{4F60}\UTFT{597D}~~%你好
+\UTFK{C548}\UTFK{B155}%안녕
+}
+\fi% \ifdeluxemode
+
+
+\end{document}
+
diff --git a/language/japanese/japanese-otf-uptex/test/uplatex/utfmacro-haranoaji.map b/language/japanese/japanese-otf-uptex/test/uplatex/utfmacro-haranoaji.map
new file mode 100644
index 0000000000..cdf3886424
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/test/uplatex/utfmacro-haranoaji.map
@@ -0,0 +1,175 @@
+hminr-h H HaranoAjiMincho-Regular.otf
+hminb-h H HaranoAjiMincho-Bold.otf
+hminl-h H HaranoAjiMincho-Light.otf
+hgothr-h H HaranoAjiGothic-Regular.otf
+hgothb-h H HaranoAjiGothic-Medium.otf
+hgotheb-h H HaranoAjiGothic-Bold.otf
+hmgothr-h H HaranoAjiGothic-Heavy.otf
+hminr-v V HaranoAjiMincho-Regular.otf
+hminb-v V HaranoAjiMincho-Bold.otf
+hminl-v V HaranoAjiMincho-Light.otf
+hgothr-v V HaranoAjiGothic-Regular.otf
+hgothb-v V HaranoAjiGothic-Medium.otf
+hgotheb-v V HaranoAjiGothic-Bold.otf
+hmgothr-v V HaranoAjiGothic-Heavy.otf
+
+hminrn-h H HaranoAjiMincho-Regular.otf
+hminbn-h H HaranoAjiMincho-Bold.otf
+hminln-h H HaranoAjiMincho-Light.otf
+hgothrn-h H HaranoAjiGothic-Regular.otf
+hgothbn-h H HaranoAjiGothic-Medium.otf
+hgothebn-h H HaranoAjiGothic-Bold.otf
+hmgothrn-h H HaranoAjiGothic-Heavy.otf
+hminrn-v V HaranoAjiMincho-Regular.otf
+hminbn-v V HaranoAjiMincho-Bold.otf
+hminln-v V HaranoAjiMincho-Light.otf
+hgothrn-v V HaranoAjiGothic-Regular.otf
+hgothbn-v V HaranoAjiGothic-Medium.otf
+hgothebn-v V HaranoAjiGothic-Bold.otf
+hmgothrn-v V HaranoAjiGothic-Heavy.otf
+
+uphminr-h UniJISup-UTF16-H HaranoAjiMincho-Regular.otf
+uphminb-h UniJISup-UTF16-H HaranoAjiMincho-Bold.otf
+uphminl-h UniJISup-UTF16-H HaranoAjiMincho-Light.otf
+uphgothr-h UniJISup-UTF16-H HaranoAjiGothic-Regular.otf
+uphgothb-h UniJISup-UTF16-H HaranoAjiGothic-Medium.otf
+uphgotheb-h UniJISup-UTF16-H HaranoAjiGothic-Bold.otf
+uphmgothr-h UniJISup-UTF16-H HaranoAjiGothic-Heavy.otf
+uphminr-v UniJISup-UTF16-V HaranoAjiMincho-Regular.otf
+uphminb-v UniJISup-UTF16-V HaranoAjiMincho-Bold.otf
+uphminl-v UniJISup-UTF16-V HaranoAjiMincho-Light.otf
+uphgothr-v UniJISup-UTF16-V HaranoAjiGothic-Regular.otf
+uphgothb-v UniJISup-UTF16-V HaranoAjiGothic-Medium.otf
+uphgotheb-v UniJISup-UTF16-V HaranoAjiGothic-Bold.otf
+uphmgothr-v UniJISup-UTF16-V HaranoAjiGothic-Heavy.otf
+
+uphminrn-h UniJIS2004up-UTF16-H HaranoAjiMincho-Regular.otf
+uphminbn-h UniJIS2004up-UTF16-H HaranoAjiMincho-Bold.otf
+uphminln-h UniJIS2004up-UTF16-H HaranoAjiMincho-Light.otf
+uphgothrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Regular.otf
+uphgothbn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Medium.otf
+uphgothebn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Bold.otf
+uphmgothrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Heavy.otf
+uphminrn-v UniJIS2004up-UTF16-V HaranoAjiMincho-Regular.otf
+uphminbn-v UniJIS2004up-UTF16-V HaranoAjiMincho-Bold.otf
+uphminln-v UniJIS2004up-UTF16-V HaranoAjiMincho-Light.otf
+uphgothrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Regular.otf
+uphgothbn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Medium.otf
+uphgothebn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Bold.otf
+uphmgothrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Heavy.otf
+
+otf-ujmr-h UniJISup-UTF16-H HaranoAjiMincho-Regular.otf
+otf-ujmb-h UniJISup-UTF16-H HaranoAjiMincho-Bold.otf
+otf-ujml-h UniJISup-UTF16-H HaranoAjiMincho-Light.otf
+otf-ujgr-h UniJISup-UTF16-H HaranoAjiGothic-Regular.otf
+otf-ujgb-h UniJISup-UTF16-H HaranoAjiGothic-Medium.otf
+otf-ujge-h UniJISup-UTF16-H HaranoAjiGothic-Bold.otf
+otf-ujmgr-h UniJISup-UTF16-H HaranoAjiGothic-Heavy.otf
+
+otf-ujmrn-h UniJIS2004up-UTF16-H HaranoAjiMincho-Regular.otf
+otf-ujmbn-h UniJIS2004up-UTF16-H HaranoAjiMincho-Bold.otf
+otf-ujmln-h UniJIS2004up-UTF16-H HaranoAjiMincho-Light.otf
+otf-ujgrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Regular.otf
+otf-ujgbn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Medium.otf
+otf-ujgen-h UniJIS2004up-UTF16-H HaranoAjiGothic-Bold.otf
+otf-ujmgrn-h UniJIS2004up-UTF16-H HaranoAjiGothic-Heavy.otf
+
+otf-ucmr-h UniGB-UTF16-H HaranoAjiMinchoCN-Regular.otf
+otf-ucmb-h UniGB-UTF16-H HaranoAjiMinchoCN-Bold.otf
+otf-ucml-h UniGB-UTF16-H HaranoAjiMinchoCN-Light.otf
+otf-ucgr-h UniGB-UTF16-H HaranoAjiGothicCN-Regular.otf
+otf-ucgb-h UniGB-UTF16-H HaranoAjiGothicCN-Medium.otf
+otf-ucge-h UniGB-UTF16-H HaranoAjiGothicCN-Bold.otf
+otf-ucmgr-h UniGB-UTF16-H HaranoAjiGothicCN-Heavy.otf
+
+otf-utmr-h UniCNS-UTF16-H HaranoAjiMinchoTW-Regular.otf
+otf-utmb-h UniCNS-UTF16-H HaranoAjiMinchoTW-Bold.otf
+otf-utml-h UniCNS-UTF16-H HaranoAjiMinchoTW-Light.otf
+otf-utgr-h UniCNS-UTF16-H HaranoAjiGothicTW-Regular.otf
+otf-utgb-h UniCNS-UTF16-H HaranoAjiGothicTW-Medium.otf
+otf-utge-h UniCNS-UTF16-H HaranoAjiGothicTW-Bold.otf
+otf-utmgr-h UniCNS-UTF16-H HaranoAjiGothicTW-Heavy.otf
+
+otf-ukmr-h UniKS-UTF16-H HaranoAjiMinchoK1-Regular.otf
+otf-ukmb-h UniKS-UTF16-H HaranoAjiMinchoK1-Bold.otf
+otf-ukml-h UniKS-UTF16-H HaranoAjiMinchoK1-Light.otf
+otf-ukgr-h UniKS-UTF16-H HaranoAjiGothicK1-Regular.otf
+otf-ukgb-h UniKS-UTF16-H HaranoAjiGothicK1-Medium.otf
+otf-ukge-h UniKS-UTF16-H HaranoAjiGothicK1-Bold.otf
+otf-ukmgr-h UniKS-UTF16-H HaranoAjiGothicK1-Heavy.otf
+
+otf-ujmr-v UniJISup-UTF16-V HaranoAjiMincho-Regular.otf
+otf-ujmb-v UniJISup-UTF16-V HaranoAjiMincho-Bold.otf
+otf-ujml-v UniJISup-UTF16-V HaranoAjiMincho-Light.otf
+otf-ujgr-v UniJISup-UTF16-V HaranoAjiGothic-Regular.otf
+otf-ujgb-v UniJISup-UTF16-V HaranoAjiGothic-Medium.otf
+otf-ujge-v UniJISup-UTF16-V HaranoAjiGothic-Bold.otf
+otf-ujmgr-v UniJISup-UTF16-V HaranoAjiGothic-Heavy.otf
+
+otf-ujmrn-v UniJIS2004up-UTF16-V HaranoAjiMincho-Regular.otf
+otf-ujmbn-v UniJIS2004up-UTF16-V HaranoAjiMincho-Bold.otf
+otf-ujmln-v UniJIS2004up-UTF16-V HaranoAjiMincho-Light.otf
+otf-ujgrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Regular.otf
+otf-ujgbn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Medium.otf
+otf-ujgen-v UniJIS2004up-UTF16-V HaranoAjiGothic-Bold.otf
+otf-ujmgrn-v UniJIS2004up-UTF16-V HaranoAjiGothic-Heavy.otf
+
+otf-ucmr-v UniGB-UTF16-V HaranoAjiMinchoCN-Regular.otf
+otf-ucmb-v UniGB-UTF16-V HaranoAjiMinchoCN-Bold.otf
+otf-ucml-v UniGB-UTF16-V HaranoAjiMinchoCN-Light.otf
+otf-ucgr-v UniGB-UTF16-V HaranoAjiGothicCN-Regular.otf
+otf-ucgb-v UniGB-UTF16-V HaranoAjiGothicCN-Medium.otf
+otf-ucge-v UniGB-UTF16-V HaranoAjiGothicCN-Bold.otf
+otf-ucmgr-v UniGB-UTF16-V HaranoAjiGothicCN-Heavy.otf
+
+otf-utmr-v UniCNS-UTF16-V HaranoAjiMinchoTW-Regular.otf
+otf-utmb-v UniCNS-UTF16-V HaranoAjiMinchoTW-Bold.otf
+otf-utml-v UniCNS-UTF16-V HaranoAjiMinchoTW-Light.otf
+otf-utgr-v UniCNS-UTF16-V HaranoAjiGothicTW-Regular.otf
+otf-utgb-v UniCNS-UTF16-V HaranoAjiGothicTW-Medium.otf
+otf-utge-v UniCNS-UTF16-V HaranoAjiGothicTW-Bold.otf
+otf-utmgr-v UniCNS-UTF16-V HaranoAjiGothicTW-Heavy.otf
+
+otf-ukmr-v UniKS-UTF16-V HaranoAjiMinchoK1-Regular.otf
+otf-ukmb-v UniKS-UTF16-V HaranoAjiMinchoK1-Bold.otf
+otf-ukml-v UniKS-UTF16-V HaranoAjiMinchoK1-Light.otf
+otf-ukgr-v UniKS-UTF16-V HaranoAjiGothicK1-Regular.otf
+otf-ukgb-v UniKS-UTF16-V HaranoAjiGothicK1-Medium.otf
+otf-ukge-v UniKS-UTF16-V HaranoAjiGothicK1-Bold.otf
+otf-ukmgr-v UniKS-UTF16-V HaranoAjiGothicK1-Heavy.otf
+
+otf-cjmr-h Identity-H HaranoAjiMincho-Regular.otf
+otf-cjmb-h Identity-H HaranoAjiMincho-Bold.otf
+otf-cjml-h Identity-H HaranoAjiMincho-Light.otf
+otf-cjgr-h Identity-H HaranoAjiGothic-Regular.otf
+otf-cjgb-h Identity-H HaranoAjiGothic-Medium.otf
+otf-cjge-h Identity-H HaranoAjiGothic-Bold.otf
+otf-cjmgr-h Identity-H HaranoAjiGothic-Heavy.otf
+
+otf-ccmr-h Identity-H HaranoAjiMinchoCN-Regular.otf
+otf-ccgr-h Identity-H HaranoAjiGothicCN-Regular.otf
+
+otf-ctmr-h Identity-H HaranoAjiMinchoTW-Regular.otf
+otf-ctgr-h Identity-H HaranoAjiGothicTW-Regular.otf
+
+otf-ckmr-h Identity-H HaranoAjiMinchoK1-Regular.otf
+otf-ckgr-h Identity-H HaranoAjiGothicK1-Regular.otf
+
+otf-cjmr-v Identity-V HaranoAjiMincho-Regular.otf
+otf-cjmb-v Identity-V HaranoAjiMincho-Bold.otf
+otf-cjml-v Identity-V HaranoAjiMincho-Light.otf
+otf-cjgr-v Identity-V HaranoAjiGothic-Regular.otf
+otf-cjgb-v Identity-V HaranoAjiGothic-Medium.otf
+otf-cjge-v Identity-V HaranoAjiGothic-Bold.otf
+otf-cjmgr-v Identity-V HaranoAjiGothic-Heavy.otf
+
+otf-ccmr-v Identity-V HaranoAjiMinchoCN-Regular.otf
+otf-ccgr-v Identity-V HaranoAjiGothicCN-Regular.otf
+
+otf-ctmr-v Identity-V HaranoAjiMinchoTW-Regular.otf
+otf-ctgr-v Identity-V HaranoAjiGothicTW-Regular.otf
+
+otf-ckmr-v Identity-V HaranoAjiMinchoK1-Regular.otf
+otf-ckgr-v Identity-V HaranoAjiGothicK1-Regular.otf
+
+
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucgb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucgb-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucgb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucgb-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucgb-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucgb-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucge-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucge-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucge-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucge-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucge-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucge-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucgr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucgr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucgr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucgr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucgr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucgr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucmb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucmb-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucmb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucmb-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucmb-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucmb-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucmgr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucmgr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucmgr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucmgr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucmgr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucmgr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucml-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucml-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucml-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucml-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucml-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucml-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucmr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucmr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucmr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ucmr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ucmr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ucmr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgb-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgb-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgb-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgb-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgbn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgbn-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgbn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgbn-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgbn-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgbn-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujge-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujge-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujge-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujge-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujge-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujge-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgen-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgen-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgen-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgen-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgen-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgen-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgr-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgrn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgrn-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgrn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujgrn-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujgrn-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujgrn-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmb-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmb-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmb-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmb-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmbn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmbn-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmbn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmbn-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmbn-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmbn-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmgr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmgr-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmgr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmgr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmgr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmgr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmgrn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmgrn-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmgrn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmgrn-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmgrn-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmgrn-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujml-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujml-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujml-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujml-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujml-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujml-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmln-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmln-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmln-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmln-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmln-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmln-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmr-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmrn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmrn-h.tfm
new file mode 100644
index 0000000000..9928cda112
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmrn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ujmrn-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ujmrn-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ujmrn-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukgb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukgb-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukgb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukgb-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukgb-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukgb-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukge-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukge-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukge-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukge-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukge-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukge-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukgr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukgr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukgr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukgr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukgr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukgr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukmb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukmb-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukmb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukmb-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukmb-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukmb-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukmgr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukmgr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukmgr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukmgr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukmgr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukmgr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukml-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukml-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukml-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukml-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukml-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukml-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukmr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukmr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukmr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-ukmr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-ukmr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-ukmr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utgb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utgb-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utgb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utgb-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utgb-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utgb-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utge-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utge-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utge-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utge-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utge-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utge-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utgr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utgr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utgr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utgr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utgr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utgr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utmb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utmb-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utmb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utmb-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utmb-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utmb-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utmgr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utmgr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utmgr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utmgr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utmgr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utmgr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utml-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utml-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utml-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utml-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utml-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utml-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utmr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utmr-h.tfm
new file mode 100644
index 0000000000..1db09ae81c
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utmr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/otf-utmr-v.tfm b/language/japanese/japanese-otf-uptex/tfm/otf-utmr-v.tfm
new file mode 100644
index 0000000000..dddd977640
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/otf-utmr-v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphgothb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphgothb-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphgothb-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphgothb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphgothbn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphgothbn-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphgothbn-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphgothbn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphgotheb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphgotheb-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphgotheb-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphgotheb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphgothebn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphgothebn-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphgothebn-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphgothebn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphgothr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphgothr-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphgothr-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphgothr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphgothrn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphgothrn-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphgothrn-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphgothrn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphmgothr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphmgothr-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphmgothr-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphmgothr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphmgothrn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphmgothrn-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphmgothrn-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphmgothrn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphminb-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphminb-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphminb-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphminb-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphminbn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphminbn-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphminbn-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphminbn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphminl-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphminl-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphminl-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphminl-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphminln-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphminln-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphminln-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphminln-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphminr-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphminr-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphminr-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphminr-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/uphminrn-h.tfm b/language/japanese/japanese-otf-uptex/tfm/uphminrn-h.tfm
index be90188003..9928cda112 100644
--- a/language/japanese/japanese-otf-uptex/tfm/uphminrn-h.tfm
+++ b/language/japanese/japanese-otf-uptex/tfm/uphminrn-h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcgb--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcgb--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcgb--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcgb--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcgb--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcgb--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcge--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcge--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcge--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcge--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcge--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcge--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcgr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcgr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcgr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcgr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcgr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcgr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcmb--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcmb--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcmb--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcmb--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcmb--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcmb--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcmgr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcmgr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcmgr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcmgr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcmgr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcmgr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcml--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcml--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcml--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcml--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcml--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcml--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcmr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcmr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcmr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfcmr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfcmr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfcmr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgb--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgb--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgb--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgb--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgb--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgb--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgbn--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgbn--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgbn--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgbn--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgbn--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgbn--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjge--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjge--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjge--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjge--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjge--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjge--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgen--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgen--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgen--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgen--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgen--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgen--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgr--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgrn--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgrn--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgrn--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjgrn--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjgrn--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjgrn--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmb--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmb--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmb--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmb--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmb--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmb--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmbn--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmbn--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmbn--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmbn--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmbn--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmbn--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmgr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmgr--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmgr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmgr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmgr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmgr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmgrn--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmgrn--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmgrn--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmgrn--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmgrn--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmgrn--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjml--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjml--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjml--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjml--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjml--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjml--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmln--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmln--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmln--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmln--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmln--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmln--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmr--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmrn--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmrn--h.tfm
new file mode 100644
index 0000000000..02a1875879
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmrn--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfjmrn--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfjmrn--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfjmrn--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkgb--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkgb--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkgb--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkgb--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkgb--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkgb--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkge--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkge--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkge--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkge--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkge--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkge--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkgr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkgr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkgr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkgr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkgr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkgr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkmb--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkmb--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkmb--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkmb--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkmb--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkmb--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkmgr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkmgr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkmgr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkmgr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkmgr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkmgr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkml--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkml--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkml--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkml--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkml--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkml--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkmr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkmr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkmr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utfkmr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utfkmr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utfkmr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftgb--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utftgb--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftgb--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftgb--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utftgb--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftgb--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftge--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utftge--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftge--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftge--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utftge--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftge--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftgr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utftgr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftgr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftgr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utftgr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftgr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftmb--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utftmb--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftmb--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftmb--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utftmb--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftmb--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftmgr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utftmgr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftmgr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftmgr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utftmgr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftmgr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftml--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utftml--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftml--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftml--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utftml--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftml--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftmr--h.tfm b/language/japanese/japanese-otf-uptex/tfm/utftmr--h.tfm
new file mode 100644
index 0000000000..29cb2cd42d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftmr--h.tfm
diff --git a/language/japanese/japanese-otf-uptex/tfm/utftmr--v.tfm b/language/japanese/japanese-otf-uptex/tfm/utftmr--v.tfm
new file mode 100644
index 0000000000..00f00ca892
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/tfm/utftmr--v.tfm
diff --git a/language/japanese/japanese-otf-uptex/umakeotf b/language/japanese/japanese-otf-uptex/umakeotf
index 5acab5eb18..bcdd544a70 100755
--- a/language/japanese/japanese-otf-uptex/umakeotf
+++ b/language/japanese/japanese-otf-uptex/umakeotf
@@ -48,18 +48,18 @@ done
 echo "making alt. kana ..."
 for face in minr gothr minb gothb mgothr
 do
-./umkjvf -ucs -sp 1 -cq     -expert upexp${face}-h  uph${face}-h cidj${face}
-./umkjvf -ucs -sp 1 -cm -cp -expert upexp${face}-v  uph${face}-v cidj${face}
-./umkjvf -ucs -sp 1 -cq     -ruby   upruby${face}-h uph${face}-h cidj${face}
-./umkjvf -ucs -sp 1 -cm -cp -ruby   upruby${face}-v uph${face}-v cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cq     -expert upexp${face}-h  uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cm -cp -expert upexp${face}-v  uph${face}-v cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cq     -ruby   upruby${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cm -cp -ruby   upruby${face}-v uph${face}-v cidj${face}
 done
 #extra fonts
 for face in gotheb minl
 do
-./umkjvf -ucs -sp 1 -cq     -expert upexp${face}-h  uph${face}-h cidj${face}
-./umkjvf -ucs -sp 1 -cm -cp -expert upexp${face}-v  uph${face}-v cidj${face}
-./umkjvf -ucs -sp 1 -cq     -ruby   upruby${face}-h uph${face}-h cidj${face}
-./umkjvf -ucs -sp 1 -cm -cp -ruby   upruby${face}-v uph${face}-v cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cq     -expert upexp${face}-h  uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cm -cp -expert upexp${face}-v  uph${face}-v cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cq     -ruby   upruby${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cm -cp -ruby   upruby${face}-v uph${face}-v cidj${face}
 done
 
 
diff --git a/language/japanese/japanese-otf-uptex/umakeotf_brsg b/language/japanese/japanese-otf-uptex/umakeotf_brsg
index f2c878285c..2296dc7929 100755
--- a/language/japanese/japanese-otf-uptex/umakeotf_brsg
+++ b/language/japanese/japanese-otf-uptex/umakeotf_brsg
@@ -35,25 +35,25 @@ done
 echo "making vf for burasage ..."
 for face in minr gothr minb gothb mgothr
 do
-./umkjvf -ucs -sp 1 -sage -cq     upbrsgnml${face}-h uph${face}-h
-./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnml${face}-v uph${face}-v
+./umkjvf -ucs -sp 1 -sage -omitfw -cq     upbrsgnml${face}-h uph${face}-h
+./umkjvf -ucs -sp 1 -sage -omitfw -cm -cp upbrsgnml${face}-v uph${face}-v
 done
 #extra fonts
 for face in gotheb minl
 do
-./umkjvf -ucs -sp 1 -sage -cq     upbrsgnml${face}-h uph${face}-h
-./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnml${face}-v uph${face}-v
+./umkjvf -ucs -sp 1 -sage -omitfw -cq     upbrsgnml${face}-h uph${face}-h
+./umkjvf -ucs -sp 1 -sage -omitfw -cm -cp upbrsgnml${face}-v uph${face}-v
 done
 for face in minr gothr minb gothb mgothr
 do
-./umkjvf -ucs -sp 1 -sage -cq     -expert upbrsgexp${face}-h uph${face}-h cidj${face}
-./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexp${face}-v uph${face}-v cidj${face}
+./umkjvf -ucs -sp 1 -sage -omitfw -cq     -expert upbrsgexp${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -sage -omitfw -cm -cp -expert upbrsgexp${face}-v uph${face}-v cidj${face}
 done
 #extra fonts
 for face in gotheb minl
 do
-./umkjvf -ucs -sp 1 -sage -cq     -expert upbrsgexp${face}-h uph${face}-h cidj${face}
-./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexp${face}-v uph${face}-v cidj${face}
+./umkjvf -ucs -sp 1 -sage -omitfw -cq     -expert upbrsgexp${face}-h uph${face}-h cidj${face}
+./umkjvf -ucs -sp 1 -sage -omitfw -cm -cp -expert upbrsgexp${face}-v uph${face}-v cidj${face}
 done
 
 
diff --git a/language/japanese/japanese-otf-uptex/umakeotf_jis04 b/language/japanese/japanese-otf-uptex/umakeotf_jis04
index 6001bf2c62..f02e69fd63 100755
--- a/language/japanese/japanese-otf-uptex/umakeotf_jis04
+++ b/language/japanese/japanese-otf-uptex/umakeotf_jis04
@@ -67,40 +67,40 @@ done
 
 for face in minr gothr minb gothb mgothr
 do
-./umkjvf -ucs -sp 1 -cq     -expert upexp${face}n-h  uph${face}n-h cidj${face}
-./umkjvf -ucs -sp 1 -cm -cp -expert upexp${face}n-v  uph${face}n-v cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cq     -expert upexp${face}n-h  uph${face}n-h cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cm -cp -expert upexp${face}n-v  uph${face}n-v cidj${face}
 done
 #extra fonts
 for face in gotheb minl
 do
-./umkjvf -ucs -sp 1 -cq     -expert upexp${face}n-h  uph${face}n-h cidj${face}
-./umkjvf -ucs -sp 1 -cm -cp -expert upexp${face}n-v  uph${face}n-v cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cq     -expert upexp${face}n-h  uph${face}n-h cidj${face}
+./umkjvf -ucs -sp 1 -omitfw -cm -cp -expert upexp${face}n-v  uph${face}n-v cidj${face}
 done
 
 
 echo "making vf for burasage & jis2004 ..."
 for face in minr gothr minb gothb mgothr
 do
-./umkjvf -ucs -sp 1 -sage -cq     upbrsgnml${face}n-h uph${face}n-h
-./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnml${face}n-v uph${face}n-v
+./umkjvf -ucs -sp 1 -sage -omitfw -cq     upbrsgnml${face}n-h uph${face}n-h
+./umkjvf -ucs -sp 1 -sage -omitfw -cm -cp upbrsgnml${face}n-v uph${face}n-v
 done
 #extra fonts
 for face in gotheb minl
 do
-./umkjvf -ucs -sp 1 -sage -cq     upbrsgnml${face}n-h uph${face}n-h
-./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnml${face}n-v uph${face}n-v
+./umkjvf -ucs -sp 1 -sage -omitfw -cq     upbrsgnml${face}n-h uph${face}n-h
+./umkjvf -ucs -sp 1 -sage -omitfw -cm -cp upbrsgnml${face}n-v uph${face}n-v
 done
 
 for face in minr gothr minb gothb mgothr
 do
-./umkjvf -ucs -sp 1 -sage -cq     -expert upbrsgexp${face}n-h uph${face}n-h cidj${face}
-./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexp${face}n-v uph${face}n-v cidj${face}
+./umkjvf -ucs -sp 1 -sage -omitfw -cq     -expert upbrsgexp${face}n-h uph${face}n-h cidj${face}
+./umkjvf -ucs -sp 1 -sage -omitfw -cm -cp -expert upbrsgexp${face}n-v uph${face}n-v cidj${face}
 done
 #extra fonts
 for face in gotheb minl
 do
-./umkjvf -ucs -sp 1 -sage -cq     -expert upbrsgexp${face}n-h uph${face}n-h cidj${face}
-./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexp${face}n-v uph${face}n-v cidj${face}
+./umkjvf -ucs -sp 1 -sage -omitfw -cq     -expert upbrsgexp${face}n-h uph${face}n-h cidj${face}
+./umkjvf -ucs -sp 1 -sage -omitfw -cm -cp -expert upbrsgexp${face}n-v uph${face}n-v cidj${face}
 done
 
 
diff --git a/language/japanese/japanese-otf-uptex/umakeotf_prop b/language/japanese/japanese-otf-uptex/umakeotf_prop
index 378429ed44..13b27d5152 100755
--- a/language/japanese/japanese-otf-uptex/umakeotf_prop
+++ b/language/japanese/japanese-otf-uptex/umakeotf_prop
@@ -18,8 +18,8 @@ mkdir ovp
 fi
 
 echo "making proportional kana tfm/vf ..."
-perl -s script/umkpkana.pl -sp=1 -hk
-perl -s script/umkvpkana.pl -sp=1
+perl -s script/umkpkana.pl -omitfw -hk
+perl -s script/umkvpkana.pl -omitfw
 
 for face in minw3 minw6 kakuw3 kakuw6 maruw4
 do
diff --git a/language/japanese/japanese-otf-uptex/umkjvf b/language/japanese/japanese-otf-uptex/umkjvf
index 39973e0999..f90f4a5a0a 100755
--- a/language/japanese/japanese-otf-uptex/umkjvf
+++ b/language/japanese/japanese-otf-uptex/umkjvf
@@ -41,13 +41,9 @@ sub initialize_constant{
 	@yoko_tfm_binary=(0x00, 0x0B, 0x00, 0x01, 0x00, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x14, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xEB, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
 	@tate_tfm_binary=(0x00, 0x09, 0x00, 0x01, 0x00, 0x1B, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
 	@yoko_ucs_tfm_binary=map{ hex($_) } qw/
-		00 0b 00 40 00 6c 00 12 00 00 00 01 00 03 00 02
+		00 0b 00 40 00 5c 00 02 00 00 00 01 00 03 00 02
 		00 02 00 01 00 00 00 00 00 00 00 09 00 00 00 00
-		00 a0 00 00 0b 55 4e 53 50 45 43 49 46 49 45 44
-		00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-		00 00 00 00 00 00 00 00 00 00 00 00 0b 55 4e 53
-		50 45 43 49 46 49 45 44 00 00 00 00 00 00 00 00
-		80 00 00 00 00 00 00 00 ff 61 00 01 ff 62 00 01
+		00 a0 00 00 00 00 00 00 ff 61 00 01 ff 62 00 01
 		ff 63 00 01 ff 64 00 01 ff 65 00 01 ff 66 00 01
 		ff 67 00 01 ff 68 00 01 ff 69 00 01 ff 6a 00 01
 		ff 6b 00 01 ff 6c 00 01 ff 6d 00 01 ff 6e 00 01
@@ -98,41 +94,44 @@ JIS     UCS
 }
 sub proc_arg {
 	if ($#ARGV == -1) {&print_help;}
-	GetOptions(\@ARGV, ['^-b', \$baseline_shift, 1], ['^-m', \$minute_option, 0], ['^-cm', \$cid_minute, 0], ['^-cq', \$cid_quote, 0], ['^-cp', \$comma_period, 0], ['^-chk', \$cid_hankana, 0], ['^-SJIS', \$sjis, 0], ['^-scale', \$scale, 1], ['^-notfm', \$without_tfm, 1], ['^-expert', \$expert, 0], ['^-ruby', \$ruby, 0], ['^-sage', \$burasage, 0], ['^-jp04', \$jis2004, 0], ['^-ucs', \$ucs, 0], ['^-sp', \$sp, 1], ['^-ovp2ovf', \$ovp2ovf_command, 1], ['^-h(e|el|elp)?', \$help, 0], ['^-dbg', \$debug_mode, 0], ['^-(.+)', \$unknown, 0]);
+	GetOptions(\@ARGV, ['^-b', \$baseline_shift, 1], ['^-m', \$minute_option, 0], ['^-cm', \$cid_minute, 0], ['^-cq', \$cid_quote, 0], ['^-cp', \$comma_period, 0], ['^-chk', \$cid_hankana, 0], ['^-SJIS', \$sjis, 0], ['^-scale', \$scale, 1], ['^-notfm', \$without_tfm, 1], ['^-expert', \$expert, 0], ['^-ruby', \$ruby, 0], ['^-sage', \$burasage, 0], ['^-jp04', \$jis2004, 0], ['^-ucs', \$ucs, 0], ['^-omitfw', \$omitfw, 0], ['^-sp', \$sp, 1], ['^-ovp2ovf', \$ovp2ovf_command, 1], ['^-h(e|el|elp)?', \$help, 0], ['^-dbg', \$debug_mode, 0], ['^-(.+)', \$unknown, 0]);
 	if ($unknown == 1){
-		print "mkjvf: Unknown options!\n";
+		print "umkjvf: Unknown options!\n";
 		&print_help;
 	}
 	if ($help == 1){&print_help;}
 	if (($expert == 0) && ($ruby == 0)){
 		if ($#ARGV <= 0) {
-			print "mkjvf: Need two to three file arguments.\n";
+			print "umkjvf: Need two to three file arguments.\n";
 			&print_help;
 		}
 	} elsif (($expert != 0) && ($ruby != 0)){
-			print "mkjvf: You can't use \"-ruby\" and \"-expert\" at same time.\n";
+			print "umkjvf: You can't use \"-ruby\" and \"-expert\" at same time.\n";
 			&print_help;
 	} elsif (($scale != 0) && ($ruby != 0)){
-			print "mkjvf: You can't use \"-ruby\" and \"-scale\" at same time.\n";
+			print "umkjvf: You can't use \"-ruby\" and \"-scale\" at same time.\n";
 			&print_help;
 	} elsif (($jis2004 != 0) && ($ruby != 0)){
-			print "mkjvf: You can't use \"-ruby\" and \"-jp04\" at same time.\n";
+			print "umkjvf: You can't use \"-ruby\" and \"-jp04\" at same time.\n";
 			&print_help;
 	} elsif (($jis2004 != 0) && ($sjis != 0)){
-			print "mkjvf: You can't use \"-sjis\" and \"-jp04\" at same time.\n";
+			print "umkjvf: You can't use \"-sjis\" and \"-jp04\" at same time.\n";
 			&print_help;
 	} elsif (($jis2004 != 0) && ($ucs != 0)){
-			print "mkjvf: You can't use \"-ucs\" and \"-jp04\" at same time.\n";
+			print "umkjvf: You can't use \"-ucs\" and \"-jp04\" at same time.\n";
+			&print_help;
+	} elsif (($omitfw != 0) && ($baseline_shift != 0)){
+			print "umkjvf: You can't use \"-b\" and \"-omitfw\" at same time.\n";
 			&print_help;
 	} else {
 		if ($#ARGV <= 1) {
-			print "mkjvf: Need three file arguments for this option.\n";
+			print "umkjvf: Need three file arguments for this option.\n";
 			&print_help;
 		}
 		$alt_kana_true=1;
 	}
 	if ($scale < 0 || $scale >= 1){
-		print "mkjvf: Invalid Scale!!\n";
+		print "umkjvf: Invalid Scale!!\n";
 		&print_help;
 	}
 	if ($scale == 0){$scale = 1;}
@@ -458,6 +457,7 @@ sub print_help {
 	print "   -burasage       make the width of kutoh-ten zero for burasage\n";
 	print "   -jp04           make a font mapped JIS X 0213:2004 glyphs\n";
 	print "   -ucs            make ucs mapped vf (umkjvf extention)\n";
+	print "   -omitfw         omit entries in vf for characters with default metric (umkjvf extention)\n";
 	print "   -sp <0--2>      include supplemental plane (umkjvf extention)\n";
 	print "   -SJIS           make shift jis mapped vf (experimental)\n";
 	print "   -scale <0--1>   make kokana vf\n";
@@ -712,26 +712,35 @@ sub print_kigo_char{
 	print  OVP "   )\n";
 }
 sub print_char{
-	printf OVP "(CHARACTER H %X\n", $dvicode;
-	printf OVP "   (CHARWD R %f)\n", $font_at;
-	print  OVP "   (MAP\n";
+	$fontmap = 0;
 	if (($jis2004 == 1) && (0x3029 <= $jiscode && $jiscode <= 0x726D)){
 		if (exists $kaisei_jikei{$jiscode}){
 			$cid = $kaisei_jikei{$jiscode};
-			$fontmap = int($cid/4096)+3;
-			printf OVP "      (SELECTFONT D %d)\n", $fontmap;
+			$fontmap = int($cid/4096)+3; ## $fontmap>=3
 			$upper = int(($cid%4096)/64)+16;
 			$lower = (($cid%4096)%64)+16;
 #			printf STDOUT "%d, %d\n",$upper,$lower;
 			$char_code = $upper*256+$lower+0x2020;
 		}
 	}
+	if ($omitfw && $baseline_shift==0 && !$fontmap) {
+		return if ($dvicode==$char_code);
+	}
+	printf OVP "(CHARACTER H %X\n", $dvicode;
+	printf OVP "   (CHARWD R %f)\n", $font_at;
+	print  OVP "   (MAP\n";
+	if ($fontmap) {
+		printf OVP "      (SELECTFONT D %d)\n", $fontmap;
+	}
 	&baseline_shift;
 	printf OVP "      (SETCHAR H %X)\n",$char_code;
 	print  OVP "      )\n";
 	print  OVP "   )\n";
 }
 sub print_kana_char{
+	if ($omitfw && $baseline_shift==0 && $scale==1 && $kana_font eq "") {
+		return if ($dvicode==$char_code);
+	}
 	printf OVP "(CHARACTER H %X\n", $dvicode;
 	printf OVP "   (CHARWD R %f)\n", $font_at;
 	print  OVP "   (MAP\n";
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothb-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothb-h.vf
index 9acb943587..8995843b3d 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothb-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothb-v.vf
index 011540f487..3a62ae9a4d 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothbn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothbn-h.vf
index a2b3406d16..894fac8889 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothbn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothbn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothbn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothbn-v.vf
index f104f8db60..7ee87ff11a 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothbn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothbn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgotheb-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgotheb-h.vf
index 49a2b902ec..bf9be0a01f 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgotheb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgotheb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgotheb-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgotheb-v.vf
index acf3b1c1c9..dc7dc36032 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgotheb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgotheb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothebn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothebn-h.vf
index 79522e0f25..beea53f470 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothebn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothebn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothebn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothebn-v.vf
index 546fd4a5f8..f390c3db7d 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothebn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothebn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothr-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothr-h.vf
index 77a2474d24..111b3eb99f 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothr-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothr-v.vf
index f48d2645ad..b9e590ac53 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothrn-h.vf
index 8e45de7209..056e9daf8e 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothrn-v.vf
index a22eb04188..7bcdd86ca5 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpgothrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothr-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothr-h.vf
index 2601b339e2..16a7a60dee 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothr-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothr-v.vf
index d25aac42f3..9efb8f69dc 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothrn-h.vf
index 605d5a3f3e..02cdb7bf9c 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothrn-v.vf
index ce09215824..90e938fa79 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpmgothrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminb-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminb-h.vf
index 0f10b50fae..b0edcb1473 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminb-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminb-v.vf
index 575ded81cc..98e5c838c5 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminbn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminbn-h.vf
index 9c3785d9d8..aed6596e72 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminbn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminbn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminbn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminbn-v.vf
index 2b80537a09..4a6cf39f2b 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminbn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminbn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminl-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminl-h.vf
index 50247f5470..2801803629 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminl-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminl-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminl-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminl-v.vf
index f8cda080ab..a6b2d511d4 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminl-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminl-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminln-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminln-h.vf
index 5ad25fe26d..a13eecd29a 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminln-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminln-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminln-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminln-v.vf
index 2d6a6fb160..3a1850cd6e 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminln-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminln-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminr-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminr-h.vf
index a3d297231f..6c0f3af64f 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminr-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminr-v.vf
index 309b213eb5..7ee0f520c5 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminrn-h.vf
index 785fae8410..cfb159fcce 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminrn-v.vf
index 3ac947a412..5a41ee7162 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgexpminrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgexpminrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothb-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothb-h.vf
index abd03bfa8c..6f212aac81 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothb-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothb-v.vf
index 00a8c060ab..60bac18153 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothbn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothbn-h.vf
index 6973bb5542..ff0aae0830 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothbn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothbn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothbn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothbn-v.vf
index f7ca0d4d9b..667267a7b4 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothbn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothbn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgotheb-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgotheb-h.vf
index f058aef801..a999f91c98 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgotheb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgotheb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgotheb-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgotheb-v.vf
index 1c2b0be0a9..576ec8fdd0 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgotheb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgotheb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothebn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothebn-h.vf
index 158f329e5a..b6adc4e23f 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothebn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothebn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothebn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothebn-v.vf
index 531622eca2..1bc32e9178 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothebn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothebn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothr-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothr-h.vf
index 0670f43683..9b2cc219bc 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothr-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothr-v.vf
index 5b6269704d..7b92d19dcb 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothrn-h.vf
index 6703dc1aef..e1d32fd59f 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothrn-v.vf
index d9640ebe63..6084f913dd 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlgothrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothr-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothr-h.vf
index 410f38f8d3..de9cd9f7d3 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothr-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothr-v.vf
index 809c8dd3e2..fe445220c1 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothrn-h.vf
index 1386dc3988..14a25ff2a6 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothrn-v.vf
index 1fa9ecf0a5..feea2d6849 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlmgothrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminb-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminb-h.vf
index 7eb630cfc5..dc7eb9319f 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminb-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminb-v.vf
index cd61226dc2..3b0a737a39 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminbn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminbn-h.vf
index af1a0043ce..51d2fab7c2 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminbn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminbn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminbn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminbn-v.vf
index b9a9e4c7fc..0978b178f8 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminbn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminbn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminl-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminl-h.vf
index 1a148bf050..e63b7a9f0b 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminl-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminl-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminl-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminl-v.vf
index 075a94aabf..b9b097f937 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminl-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminl-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminln-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminln-h.vf
index 79ecb65676..953dfb3176 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminln-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminln-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminln-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminln-v.vf
index f60a147c7b..5f531896dc 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminln-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminln-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminr-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminr-h.vf
index e9e5d67659..f66f1cb7ef 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminr-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminr-v.vf
index 3cbc15decf..ff10fc6cbf 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminrn-h.vf
index 7e852897e1..1465f238ff 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminrn-v.vf
index 5441e62baa..f3d4b191e6 100644
--- a/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upbrsgnmlminrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothb-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothb-h.vf
index aa6d896bb3..0ac0212df2 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothb-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothb-v.vf
index fe7c1f4533..fc0f0f0bc4 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothbn-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothbn-h.vf
index 97d88e0c66..cc6598608d 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothbn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothbn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothbn-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothbn-v.vf
index 2e12822952..fb1c975772 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothbn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothbn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgotheb-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpgotheb-h.vf
index c5b429d7a4..fca53d7197 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgotheb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgotheb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgotheb-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpgotheb-v.vf
index 6b09ded11a..b9d20f6ed5 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgotheb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgotheb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothebn-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothebn-h.vf
index 4d8ea91f71..18304945b4 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothebn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothebn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothebn-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothebn-v.vf
index a7da2d8589..5e63410631 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothebn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothebn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothr-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothr-h.vf
index 7c54f2a656..87800e0a86 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothr-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothr-v.vf
index c65012f864..d903d20b81 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothrn-h.vf
index b67025af59..afb4dc1356 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpgothrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpgothrn-v.vf
index 823d9a3d71..58b0297566 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpgothrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpgothrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpmgothr-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpmgothr-h.vf
index f99ec667fb..9766958a9e 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpmgothr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpmgothr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpmgothr-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpmgothr-v.vf
index 1715516fda..3ab44b2fd9 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpmgothr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpmgothr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpmgothrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpmgothrn-h.vf
index 03c79ed3fb..4c27e900b5 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpmgothrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpmgothrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpmgothrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpmgothrn-v.vf
index cc017c3da1..2d68a70368 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpmgothrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpmgothrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminb-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpminb-h.vf
index 2f2b6ba07f..dee6fe7304 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminb-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpminb-v.vf
index 12e3dfc4e6..f75b4cdb2e 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminbn-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpminbn-h.vf
index ec31dabd77..2d5cde2154 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminbn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminbn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminbn-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpminbn-v.vf
index 19b3db7c7d..6afb336afb 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminbn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminbn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminl-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpminl-h.vf
index 4323703caf..cec1093175 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminl-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminl-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminl-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpminl-v.vf
index 8b1b1ba38f..71e8081aa3 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminl-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminl-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminln-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpminln-h.vf
index e6ebb66b05..03db7b2307 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminln-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminln-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminln-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpminln-v.vf
index 1db691e689..b413419bbf 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminln-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminln-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminr-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpminr-h.vf
index b956ae7073..87bcd4f10c 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminr-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpminr-v.vf
index 1245e31889..413ae22939 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminrn-h.vf b/language/japanese/japanese-otf-uptex/vf/upexpminrn-h.vf
index 18c95052c2..149fef2bf9 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminrn-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminrn-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/upexpminrn-v.vf b/language/japanese/japanese-otf-uptex/vf/upexpminrn-v.vf
index fb455a11a5..68e4c2dbc6 100644
--- a/language/japanese/japanese-otf-uptex/vf/upexpminrn-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/upexpminrn-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubygothb-h.vf b/language/japanese/japanese-otf-uptex/vf/uprubygothb-h.vf
index ea0eb96afa..65423f155f 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubygothb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubygothb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubygothb-v.vf b/language/japanese/japanese-otf-uptex/vf/uprubygothb-v.vf
index b92b253316..5d92fbda1d 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubygothb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubygothb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubygotheb-h.vf b/language/japanese/japanese-otf-uptex/vf/uprubygotheb-h.vf
index 0c0deb3465..ed7c860694 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubygotheb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubygotheb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubygotheb-v.vf b/language/japanese/japanese-otf-uptex/vf/uprubygotheb-v.vf
index 46207c67bf..574b09daae 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubygotheb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubygotheb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubygothr-h.vf b/language/japanese/japanese-otf-uptex/vf/uprubygothr-h.vf
index 3f20ccd428..844de9ad22 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubygothr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubygothr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubygothr-v.vf b/language/japanese/japanese-otf-uptex/vf/uprubygothr-v.vf
index 2ab799b317..aa2bf7a74a 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubygothr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubygothr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubymgothr-h.vf b/language/japanese/japanese-otf-uptex/vf/uprubymgothr-h.vf
index 7e2bd9027f..71fe042ae9 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubymgothr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubymgothr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubymgothr-v.vf b/language/japanese/japanese-otf-uptex/vf/uprubymgothr-v.vf
index bfc4edf805..f8d1aa4b5e 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubymgothr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubymgothr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubyminb-h.vf b/language/japanese/japanese-otf-uptex/vf/uprubyminb-h.vf
index 82e6a4bda4..e5f403e442 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubyminb-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubyminb-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubyminb-v.vf b/language/japanese/japanese-otf-uptex/vf/uprubyminb-v.vf
index 5ce32fcf18..3d927c801c 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubyminb-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubyminb-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubyminl-h.vf b/language/japanese/japanese-otf-uptex/vf/uprubyminl-h.vf
index fe4478d868..837e5bd6a7 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubyminl-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubyminl-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubyminl-v.vf b/language/japanese/japanese-otf-uptex/vf/uprubyminl-v.vf
index b33e0c9cc4..5b689e5340 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubyminl-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubyminl-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubyminr-h.vf b/language/japanese/japanese-otf-uptex/vf/uprubyminr-h.vf
index 10e9cb6541..4fcb83b59a 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubyminr-h.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubyminr-h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/uprubyminr-v.vf b/language/japanese/japanese-otf-uptex/vf/uprubyminr-v.vf
index be216feb04..21e6eaaa3b 100644
--- a/language/japanese/japanese-otf-uptex/vf/uprubyminr-v.vf
+++ b/language/japanese/japanese-otf-uptex/vf/uprubyminr-v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcgb--h.vf b/language/japanese/japanese-otf-uptex/vf/utfcgb--h.vf
new file mode 100644
index 0000000000..6d0e67da17
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcgb--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcgb--v.vf b/language/japanese/japanese-otf-uptex/vf/utfcgb--v.vf
new file mode 100644
index 0000000000..f71348c5c8
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcgb--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcge--h.vf b/language/japanese/japanese-otf-uptex/vf/utfcge--h.vf
new file mode 100644
index 0000000000..b48456c2d2
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcge--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcge--v.vf b/language/japanese/japanese-otf-uptex/vf/utfcge--v.vf
new file mode 100644
index 0000000000..fb5f9349d1
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcge--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcgr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfcgr--h.vf
new file mode 100644
index 0000000000..dce7db6588
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcgr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcgr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfcgr--v.vf
new file mode 100644
index 0000000000..e9b8828cd2
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcgr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcmb--h.vf b/language/japanese/japanese-otf-uptex/vf/utfcmb--h.vf
new file mode 100644
index 0000000000..c0a788ebe9
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcmb--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcmb--v.vf b/language/japanese/japanese-otf-uptex/vf/utfcmb--v.vf
new file mode 100644
index 0000000000..a5407754bd
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcmb--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcmgr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfcmgr--h.vf
new file mode 100644
index 0000000000..3c66d20d5a
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcmgr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcmgr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfcmgr--v.vf
new file mode 100644
index 0000000000..86c4f84715
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcmgr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcml--h.vf b/language/japanese/japanese-otf-uptex/vf/utfcml--h.vf
new file mode 100644
index 0000000000..eb54b57b7e
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcml--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcml--v.vf b/language/japanese/japanese-otf-uptex/vf/utfcml--v.vf
new file mode 100644
index 0000000000..541eff5cd2
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcml--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcmr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfcmr--h.vf
new file mode 100644
index 0000000000..6ca78a2856
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcmr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfcmr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfcmr--v.vf
new file mode 100644
index 0000000000..f502aa8ea1
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfcmr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgb--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjgb--h.vf
new file mode 100644
index 0000000000..1943aae2d0
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgb--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgb--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjgb--v.vf
new file mode 100644
index 0000000000..1c989aa660
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgb--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgbn--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjgbn--h.vf
new file mode 100644
index 0000000000..b5c6d4554a
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgbn--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgbn--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjgbn--v.vf
new file mode 100644
index 0000000000..9f8d3f6429
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgbn--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjge--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjge--h.vf
new file mode 100644
index 0000000000..cdfdc0cef7
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjge--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjge--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjge--v.vf
new file mode 100644
index 0000000000..7873c20ada
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjge--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgen--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjgen--h.vf
new file mode 100644
index 0000000000..15d502f6ce
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgen--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgen--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjgen--v.vf
new file mode 100644
index 0000000000..b3b5811b47
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgen--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjgr--h.vf
new file mode 100644
index 0000000000..fc58632573
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjgr--v.vf
new file mode 100644
index 0000000000..df73998c33
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgrn--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjgrn--h.vf
new file mode 100644
index 0000000000..1f22ed4cb6
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgrn--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjgrn--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjgrn--v.vf
new file mode 100644
index 0000000000..ae275252c8
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjgrn--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmb--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjmb--h.vf
new file mode 100644
index 0000000000..677c8476c4
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmb--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmb--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjmb--v.vf
new file mode 100644
index 0000000000..f48c66b6a3
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmb--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmbn--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjmbn--h.vf
new file mode 100644
index 0000000000..e6ec6a405b
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmbn--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmbn--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjmbn--v.vf
new file mode 100644
index 0000000000..d710e53b4f
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmbn--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmgr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjmgr--h.vf
new file mode 100644
index 0000000000..b2a91c67b8
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmgr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmgr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjmgr--v.vf
new file mode 100644
index 0000000000..1ef8c80004
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmgr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmgrn--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjmgrn--h.vf
new file mode 100644
index 0000000000..fee2e19958
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmgrn--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmgrn--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjmgrn--v.vf
new file mode 100644
index 0000000000..c239153f02
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmgrn--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjml--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjml--h.vf
new file mode 100644
index 0000000000..0fad335333
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjml--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjml--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjml--v.vf
new file mode 100644
index 0000000000..1a5063ba19
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjml--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmln--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjmln--h.vf
new file mode 100644
index 0000000000..d4eaea06bf
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmln--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmln--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjmln--v.vf
new file mode 100644
index 0000000000..d9bae4ed64
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmln--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjmr--h.vf
new file mode 100644
index 0000000000..6f5d83a62d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjmr--v.vf
new file mode 100644
index 0000000000..b85870afd8
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmrn--h.vf b/language/japanese/japanese-otf-uptex/vf/utfjmrn--h.vf
new file mode 100644
index 0000000000..957d711eea
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmrn--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfjmrn--v.vf b/language/japanese/japanese-otf-uptex/vf/utfjmrn--v.vf
new file mode 100644
index 0000000000..d3f3c8fe24
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfjmrn--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkgb--h.vf b/language/japanese/japanese-otf-uptex/vf/utfkgb--h.vf
new file mode 100644
index 0000000000..eac8e75bcd
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkgb--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkgb--v.vf b/language/japanese/japanese-otf-uptex/vf/utfkgb--v.vf
new file mode 100644
index 0000000000..0499187196
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkgb--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkge--h.vf b/language/japanese/japanese-otf-uptex/vf/utfkge--h.vf
new file mode 100644
index 0000000000..61e77a3294
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkge--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkge--v.vf b/language/japanese/japanese-otf-uptex/vf/utfkge--v.vf
new file mode 100644
index 0000000000..838d7ee661
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkge--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkgr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfkgr--h.vf
new file mode 100644
index 0000000000..7c555d5e38
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkgr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkgr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfkgr--v.vf
new file mode 100644
index 0000000000..d8fea7ddbe
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkgr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkmb--h.vf b/language/japanese/japanese-otf-uptex/vf/utfkmb--h.vf
new file mode 100644
index 0000000000..8ae6763ff6
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkmb--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkmb--v.vf b/language/japanese/japanese-otf-uptex/vf/utfkmb--v.vf
new file mode 100644
index 0000000000..2061d50400
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkmb--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkmgr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfkmgr--h.vf
new file mode 100644
index 0000000000..47b65affb6
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkmgr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkmgr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfkmgr--v.vf
new file mode 100644
index 0000000000..9e52cc8147
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkmgr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkml--h.vf b/language/japanese/japanese-otf-uptex/vf/utfkml--h.vf
new file mode 100644
index 0000000000..ffa1df649e
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkml--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkml--v.vf b/language/japanese/japanese-otf-uptex/vf/utfkml--v.vf
new file mode 100644
index 0000000000..e265a66c48
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkml--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkmr--h.vf b/language/japanese/japanese-otf-uptex/vf/utfkmr--h.vf
new file mode 100644
index 0000000000..070a790343
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkmr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utfkmr--v.vf b/language/japanese/japanese-otf-uptex/vf/utfkmr--v.vf
new file mode 100644
index 0000000000..ef6d2622c4
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utfkmr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftgb--h.vf b/language/japanese/japanese-otf-uptex/vf/utftgb--h.vf
new file mode 100644
index 0000000000..61329bcd7d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftgb--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftgb--v.vf b/language/japanese/japanese-otf-uptex/vf/utftgb--v.vf
new file mode 100644
index 0000000000..c68cb6f418
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftgb--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftge--h.vf b/language/japanese/japanese-otf-uptex/vf/utftge--h.vf
new file mode 100644
index 0000000000..efd7b63513
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftge--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftge--v.vf b/language/japanese/japanese-otf-uptex/vf/utftge--v.vf
new file mode 100644
index 0000000000..6a2884f2fc
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftge--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftgr--h.vf b/language/japanese/japanese-otf-uptex/vf/utftgr--h.vf
new file mode 100644
index 0000000000..95cafa50fc
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftgr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftgr--v.vf b/language/japanese/japanese-otf-uptex/vf/utftgr--v.vf
new file mode 100644
index 0000000000..826f4368a5
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftgr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftmb--h.vf b/language/japanese/japanese-otf-uptex/vf/utftmb--h.vf
new file mode 100644
index 0000000000..d58c576cee
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftmb--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftmb--v.vf b/language/japanese/japanese-otf-uptex/vf/utftmb--v.vf
new file mode 100644
index 0000000000..cb017e70a9
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftmb--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftmgr--h.vf b/language/japanese/japanese-otf-uptex/vf/utftmgr--h.vf
new file mode 100644
index 0000000000..7597c4e64e
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftmgr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftmgr--v.vf b/language/japanese/japanese-otf-uptex/vf/utftmgr--v.vf
new file mode 100644
index 0000000000..4712815585
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftmgr--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftml--h.vf b/language/japanese/japanese-otf-uptex/vf/utftml--h.vf
new file mode 100644
index 0000000000..5b863f6f1d
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftml--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftml--v.vf b/language/japanese/japanese-otf-uptex/vf/utftml--v.vf
new file mode 100644
index 0000000000..72feb85f92
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftml--v.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftmr--h.vf b/language/japanese/japanese-otf-uptex/vf/utftmr--h.vf
new file mode 100644
index 0000000000..3b7556ce17
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftmr--h.vf
diff --git a/language/japanese/japanese-otf-uptex/vf/utftmr--v.vf b/language/japanese/japanese-otf-uptex/vf/utftmr--v.vf
new file mode 100644
index 0000000000..6973c29fc8
--- /dev/null
+++ b/language/japanese/japanese-otf-uptex/vf/utftmr--v.vf
diff --git a/language/japanese/japanese-otf/makeotf b/language/japanese/japanese-otf/makeotf
index 7b134c9fd4..7b134c9fd4 100755..100644
--- a/language/japanese/japanese-otf/makeotf
+++ b/language/japanese/japanese-otf/makeotf
diff --git a/language/japanese/japanese-otf/mkjvf b/language/japanese/japanese-otf/mkjvf
index 35c3b44393..35c3b44393 100755..100644
--- a/language/japanese/japanese-otf/mkjvf
+++ b/language/japanese/japanese-otf/mkjvf
diff --git a/language/japanese/japanese-otf/script/otf-hangul.rb b/language/japanese/japanese-otf/script/otf-hangul.rb
index 57a1a11a58..57a1a11a58 100755..100644
--- a/language/japanese/japanese-otf/script/otf-hangul.rb
+++ b/language/japanese/japanese-otf/script/otf-hangul.rb
author	Norbert Preining <norbert@preining.info>	2020-11-15 03:02:26 +0000
committer	Norbert Preining <norbert@preining.info>	2020-11-15 03:02:26 +0000
commit	f23cf64aec54b58502f0f334eab0ea486a317586 (patch)
tree	19330e378b10eb1c92022d5fd3bc8c4b1e5f729a /language/japanese
parent	22ba19a8c9224d6e229b882ff226c05967f13ffd (diff)