diff options
Diffstat (limited to 'Master/texmf-dist/source/fonts/japanese-otf/script')
8 files changed, 50 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm b/Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm index 3af7198b944..2ff357b65d1 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm +++ b/Master/texmf-dist/source/fonts/japanese-otf/script/CheckDVICode.pm @@ -12,7 +12,7 @@ CheckDVICode.pm =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut @@ -94,6 +94,7 @@ sub is_dvicode($){ if ($key eq 'hira-Vu') { return ($code == 0x3094);} # large JIS X 0213 if ($key eq 'hira-ka') { return ($code == 0x3095);} # small JIS X 0213 if ($key eq 'hira-ke') { return ($code == 0x3096);} # small JIS X 0213 + if ($key eq 'hira-ko') { return ($code == 0x1B132);}# small Unicode 15.0 if ($key eq 'kata-a') { return ($code == 0x30A1);} # small if ($key eq 'kata-i') { return ($code == 0x30A3);} # : if ($key eq 'kata-u') { return ($code == 0x30A5);} # : @@ -106,6 +107,7 @@ sub is_dvicode($){ if ($key eq 'kata-wa') { return ($code == 0x30EE);} # : if ($key eq 'kata-ka') { return ($code == 0x30F5);} # : if ($key eq 'kata-ke') { return ($code == 0x30F6);} # small + if ($key eq 'kata-ko') { return ($code == 0x1B155);}# small Unicode 15.0 if ($key eq 'kata-Va') { return ($code == 0x30F7);} # large JIS X 0213 if ($key eq 'kata-Vi') { return ($code == 0x30F8);} # : JIS X 0213 if ($key eq 'kata-Ve') { return ($code == 0x30F9);} # : JIS X 0213 @@ -197,6 +199,7 @@ sub is_ucs_hira{ return 1 if ($dvicode>=0x3041 && $dvicode<=0x3093); return 1 if ($dvicode>=0x3094 && $dvicode<=0x3096); # Vu, small Ka, small Ke # return 1 if ($dvicode==0x309F); # Yori :: It is omitted because it is not included in "Tuned" in AJ1-6 + return 1 if ($dvicode==0x1B132); # small Ko Unicode 15.0 return 0; } @@ -205,6 +208,7 @@ sub is_ucs_kata{ return 1 if ($dvicode>=0x30F7 && $dvicode<=0x30FA); # Va, Vi, Ve, Vo return 1 if ($dvicode>=0x31F0 && $dvicode<=0x31FF); # small Ku, small Shi, ... , Small Re, Small Ro # return 1 if ($dvicode==0x30FF); # Koto :: It is omitted because it is not included in "Tuned" in AJ1-6 + return 1 if ($dvicode==0x1B155); # small Ko Unicode 15.0 return 0; } @@ -215,8 +219,8 @@ sub is_ucs_hankana{ # Reference: # http://www.unicode.org/Public/UNIDATA/Blocks.txt -# Blocks-12.0.0.txt -# Date: 2018-07-30, 19:40:00 GMT [KW] +# Blocks-15.0.0.txt +# Date: 2022-01-28, 20:58:00 GMT [KW] sub is_ucs_jpn_range{ return 1 if ($dvicode<=0x04FF); # Cyrillic @@ -259,7 +263,8 @@ sub is_ucs_jpn_range{ return 0 if ($dvicode< 0xFF00); return 1 if ($dvicode<=0xFFEF); # Halfwidth and Fullwidth Forms - return 0 if ($dvicode< 0x1B000); + return 0 if ($dvicode< 0x1AFF0); + return 1 if ($dvicode<=0x1AFFF); # Kana Extended-B return 1 if ($dvicode<=0x1B0FF); # Kana Supplement return 1 if ($dvicode<=0x1B12F); # Kana Extended-A return 1 if ($dvicode<=0x1B16F); # Small Kana Extension @@ -281,6 +286,10 @@ sub is_ucs_jpn_range{ return 0 if ($dvicode< 0x2F800); return 1 if ($dvicode<=0x2FA1F); # CJK Compatibility Ideographs Supplement + return 0 if ($dvicode< 0x30000); + return 1 if ($dvicode<=0x3134F); # CJK Unified Ideographs Extension G + return 1 if ($dvicode<=0x323AF); # CJK Unified Ideographs Extension H + return 0; } diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm b/Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm index 8dc9ce0e3a8..29e79a3792b 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm +++ b/Master/texmf-dist/source/fonts/japanese-otf/script/MakeSPList.pm @@ -12,13 +12,13 @@ MakeSPList.pm =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut our ($r_exist_head, $r_exist_char); -my $num = '[12][0-9A-F]{4}'; +my $num = '[123][0-9A-F]{4}'; sub make_sp_char_list(@) { my (@lang)=@_; diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl index 90f464d13ad..d14bd5866d6 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl @@ -10,7 +10,7 @@ script/mktfm_sp.pl =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl index 377659d3983..2a052520749 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl @@ -19,7 +19,7 @@ Takuji Tanaka =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl index 97ea89f2af1..cf6379f957a 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl @@ -12,7 +12,7 @@ script/mkutfvf_sp.pl -ovp2ovf='wovp2ovf' =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt b/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt index 2092c5767a7..ad1db442398 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt +++ b/Master/texmf-dist/source/fonts/japanese-otf/script/sp_list_j.txt @@ -1,6 +1,6 @@ % % This file is generated from the data of UniJIS-UTF32 -% in cid2code.txt (Version 07/30/2019) +% in cid2code.txt (Version 05/18/2022) % for Adobe-Japan1-7 % % Reference: @@ -26,15 +26,15 @@ 1F142,1F143,1F144,1F145,1F146,1F147,1F148,1F149,1F202,1F237 1F170,1F171,1F172,1F173,1F174,1F175,1F176,1F177,1F178,1F179 1F17A,1F17B,1F17C,1F17D,1F17E,1F17F,1F180,1F181,1F182,1F183 -1F184,1F185,1F186,1F187,1F188,1F189,1F79C,2F945,2090E,26951 -2B7D8,2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B,2F833,2B78E -2F8AC,20A64,2F903,2B746,2B777,2F90B,20B9F,2F828,2F921,2F83F -2F873,2D544,2000B,2F852,2967F,2F947,201A2,2E569,2B751,2F8B2 -27FB7,23CFE,2F91A,25AD7,2F89A,2F90F,2123D,2F81A,24D14,2F862 -2B789,2F9D0,2F9DF,2567F,266B0,20628,2008A,20984,2F82C,2F86D -2F8B6,26999,233CC,2F8DB,2A9E6,2B7BD,2F96C,2E278,2053F,2626A -200B0,2E6EA,28987,28E17,2B81A,242EE,2F8E1,23CBE,20611,2F9F4 -2F804,2363A,233FE,22609 +1F184,1F185,1F186,1F187,1F188,1F189,1F79C,1B132,1B155,2F945 +2090E,26951,2B7D8,2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B +2F833,2B78E,2F8AC,20A64,2F903,2B746,2B777,2F90B,20B9F,2F828 +2F921,2F83F,2F873,2D544,2000B,2F852,2967F,2F947,201A2,2E569 +2B751,2F8B2,27FB7,23CFE,2F91A,25AD7,2F89A,2F90F,2123D,2F81A +24D14,2F862,2B789,2F9D0,2F9DF,2567F,266B0,20628,2008A,20984 +2F82C,2F86D,2F8B6,26999,233CC,2F8DB,2A9E6,2B7BD,2F96C,2E278 +2053F,2626A,200B0,2E6EA,28987,28E17,2B81A,242EE,2F8E1,23CBE +20611,2F9F4,2F804,2363A,233FE,22609 %Adobe-Japan1-5 2131B,2146E,218BD,216B4,21E34,231C4,235C4,2373F,23763,247F1 @@ -65,11 +65,11 @@ 28BEF,28D10,28D71,28DFB,28E1F,28E36,28E89,28EEB,28F32,28FF8 292A0,292B1,29490,295CF,296F0,29719,29750,298C6,29A72,29DDB 29E15,29E8A,29E49,29EC4,29EE9,29EDB,29FCE,29FD7,2A02F,2A01A -2A0F9,2A082,22218,2A38C,2A437,2A5F1,2A602,2A6B2,200F5,24E04 -24FF2,27D73,2F815,2F846,2F899,2F8A6,2F8E5,2F9DE,2A2B2,20158 -205B1,206EC,2B753,20D58,2B75A,2B75C,259CC,2B776,22E42,2B77C -207C8,22FEB,279B4,2B782,2B78B,237F1,2B794,2404B,2B7AC,2B7AF -2B7C9,2B7CF,2B7D2,26C9E,27C3C,2B7F0,2B765,2B80D,2B817,2634C -29E3D,2A61A +2A0F9,2A082,22218,2A38C,2A437,2A5F1,2A602,2A6B2,31350,200F5 +24E04,24FF2,27D73,2F815,2F846,2F899,2F8A6,2F8E5,2F9DE,2A2B2 +20158,205B1,206EC,2B753,20D58,2B75A,2B75C,259CC,2B776,22E42 +2B77C,207C8,22FEB,279B4,2B782,2B78B,237F1,2B794,2404B,2B7AC +2B7AF,2B7C9,2B7CF,2B7D2,26C9E,27C3C,2B7F0,2B765,2B80D,2B817 +2634C,29E3D,2A61A % end diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl index 26208884540..c72e56fc64a 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl @@ -2,7 +2,7 @@ =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut @@ -373,7 +373,7 @@ sub print_type_prop{ sub get_charwidth{ my ($i,$dvicode)=@_; - my ($char,$u,$l); + my ($char,$t,$u,$l); if (!$ucs) { if ($dvicode>=0x2474 && $dvicode<=0x2476) { @@ -384,10 +384,11 @@ sub get_charwidth{ $char = pack("C*",$u,$l); Encode::from_to($char,'euc-jp','utf-8'); } else { + $t = ($dvicode >>16) & 0xFF; $u = ($dvicode >> 8) & 0xFF; $l = $dvicode & 0xFF; - $char = pack("C*",$u,$l); - Encode::from_to($char,'utf-16be','utf-8'); + $char = pack("C*",0x00,$t,$u,$l); + Encode::from_to($char,'utf-32','utf-8'); } if (!exists($charwidth[$i]{$char})) { return 0; @@ -397,7 +398,7 @@ sub get_charwidth{ __DATA__ -character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 +character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 comment ヽ 15449 7.11 7.54 7.19 7.49 7.45 ヾ 15450 7.68 7.95 7.69 8 8.15 ゝ 15451 7.17 7.43 7.23 7.53 7.63 @@ -599,4 +600,6 @@ character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 ヸ 15720 9.41 9.75 9.6 9.7 9.75 ヹ 15721 9.47 9.7 9.65 9.7 9.8 ヺ 15722 8.91 9.32 9.34 9.39 9.73 +𛄲 15723 7.53 7.76 7.9 8.18 8.33 U+1B132 小書き「こ」 +𛅕 15724 8.04 8.35 8.4 8.65 8.65 U+1B155 小書き「コ」 end diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl index da4d0d7d8a8..60e17126622 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl @@ -2,7 +2,7 @@ =head1 NOTE -This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). +This software is a part of japanese-otf-uptex. =cut @@ -340,7 +340,7 @@ sub print_type_prop{ sub get_charwidth{ my ($i,$dvicode)=@_; - my ($char,$u,$l); + my ($char,$t,$u,$l); if (!$ucs) { if ($dvicode>=0x2474 && $dvicode<=0x2476) { @@ -351,10 +351,11 @@ sub get_charwidth{ $char = pack("C*",$u,$l); Encode::from_to($char,'euc-jp','utf-8'); } else { + $t = ($dvicode >>16) & 0xFF; $u = ($dvicode >> 8) & 0xFF; $l = $dvicode & 0xFF; - $char = pack("C*",$u,$l); - Encode::from_to($char,'utf-16be','utf-8'); + $char = pack("C*",0x00,$t,$u,$l); + Encode::from_to($char,'utf-32','utf-8'); } if (!exists($charwidth[$i]{$char})) { return 0; @@ -364,7 +365,7 @@ sub get_charwidth{ __DATA__ -character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 +character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 comment ヽ 15976 7.17 7.46 7.92 8.27 8.13 ヾ 15977 8.34 8.44 8.46 8.62 8.5 ゝ 15978 7.77 7.98 8.44 8.69 8.62 @@ -566,4 +567,6 @@ character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 ヸ 16188 9.61 9.8 9.73 9.84 9.77 ヹ 16189 8.94 9.28 9.56 9.80 9.88 ヺ 16190 9.54 9.71 9.67 9.82 9.74 +𛄲 16191 8.72 8.88 8.83 9.13 9.04 U+1B132 小書き「こ」 +𛅕 16192 8 8.23 8.65 8.95 8.91 U+1B155 小書き「コ」 end |