From f8ec550b6e3ef741c5fedbf0e3fc2cd192a7392b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 2 Apr 2019 21:04:45 +0000 Subject: japanese-otf-uptex (2apr19) git-svn-id: svn://tug.org/texlive/trunk@50707 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/fonts/japanese-otf-uptex/script/CheckDVICode.pm | 13 ++++++++++--- .../source/fonts/japanese-otf-uptex/script/umkpkana.pl | 4 ++-- .../source/fonts/japanese-otf-uptex/script/umkvpkana.pl | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source/fonts') diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm index 0b42516a873..6e98ae866f2 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm @@ -159,6 +159,10 @@ sub is_dvicode($){ if ($key eq 'open') { return &is_ucs_open; } if ($key eq 'close') { return (!&is_ucs_open); } + # ucs only + if ($key eq 'hira-yori'){ return ($code == 0x309F);} # yori + if ($key eq 'kata-koto'){ return ($code == 0x30FF);} # koto + die "illegal keyname ($key)\n"; } } @@ -182,7 +186,7 @@ sub is_ucs_kigo{ return 1 if ($dvicode>=0x201C && $dvicode<=0x201D); return 1 if ($dvicode>=0x2329 && $dvicode<=0x232A); return 1 if ($dvicode>=0x3001 && $dvicode<=0x301F); - return 1 if ($dvicode>=0x3097 && $dvicode<=0x309F); + return 1 if ($dvicode>=0x3097 && $dvicode<=0x309E); return 1 if ($dvicode>=0x30FB && $dvicode<=0x30FE); return 1 if ($dvicode>=0xFF08 && $dvicode<=0xFF60); @@ -192,6 +196,7 @@ sub is_ucs_kigo{ sub is_ucs_hira{ return 1 if ($dvicode>=0x3041 && $dvicode<=0x3093); return 1 if ($dvicode>=0x3094 && $dvicode<=0x3096); # Vu, small Ka, small Ke +# return 1 if ($dvicode==0x309F); # Yori :: It is omitted because it is not included in "Tuned" in AJ1-6 return 0; } @@ -199,6 +204,7 @@ sub is_ucs_kata{ return 1 if ($dvicode>=0x30A1 && $dvicode<=0x30F6); return 1 if ($dvicode>=0x30F7 && $dvicode<=0x30FA); # Va, Vi, Ve, Vo return 1 if ($dvicode>=0x31F0 && $dvicode<=0x31FF); # small Ku, small Shi, ... , Small Re, Small Ro +# return 1 if ($dvicode==0x30FF); # Koto :: It is omitted because it is not included in "Tuned" in AJ1-6 return 0; } @@ -209,8 +215,8 @@ sub is_ucs_hankana{ # Reference: # http://www.unicode.org/Public/UNIDATA/Blocks.txt -# Blocks-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [KW] +# Blocks-12.0.0.txt +# Date: 2018-07-30, 19:40:00 GMT [KW] sub is_ucs_jpn_range{ return 1 if ($dvicode<=0x04FF); # Cyrillic @@ -256,6 +262,7 @@ sub is_ucs_jpn_range{ return 0 if ($dvicode< 0x1B000); return 1 if ($dvicode<=0x1B0FF); # Kana Supplement return 1 if ($dvicode<=0x1B12F); # Kana Extended-A + return 1 if ($dvicode<=0x1B16F); # Small Kana Extension return 0 if ($dvicode< 0x1F100); return 1 if ($dvicode<=0x1F1FF); # Enclosed Alphanumeric Supplement diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl index 09d0c095a95..4c14fd45593 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl @@ -257,8 +257,8 @@ sub write_char { next unless ($exist_char{sprintf("%X",$ucscode)}); } if (&is_ucs_kigo){&print_kigo_char;} - elsif(&is_ucs_hira){&print_kana_char;} - elsif(&is_ucs_kata){&print_kana_char;} + elsif(&is_ucs_hira || &is_dvicode('hira-yori')){&print_kana_char;} + elsif(&is_ucs_kata || &is_dvicode('kata-koto')){&print_kana_char;} elsif(&is_ucs_hankana && $hk_mode){&print_hankana_char;} else{&print_char;} } diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl index c9f39bffe83..f1ff477518b 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl @@ -232,8 +232,8 @@ sub write_char { next unless ($exist_char{sprintf("%X",$ucscode)}); } if (&is_ucs_kigo){&print_kigo_char;} - elsif(&is_ucs_hira){&print_kana_char;} - elsif(&is_ucs_kata){&print_kana_char;} + elsif(&is_ucs_hira || &is_dvicode('hira-yori')){&print_kana_char;} + elsif(&is_ucs_kata || &is_dvicode('kata-koto')){&print_kana_char;} # elsif(&is_ucs_hankana && $hk_mode){&print_hankana_char;} else{&print_char;} } -- cgit v1.2.3