diff options
Diffstat (limited to 'Master/texmf-dist/source/fonts/japanese-otf-uptex/script')
8 files changed, 71 insertions, 60 deletions
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm index 7215786d262..4c876d09914 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm @@ -196,6 +196,10 @@ sub is_ucs_hankana{ return 0; } +# Reference: +# http://www.unicode.org/Public/UNIDATA/Blocks.txt +# Blocks-9.0.0.txt +# Date: 2016-02-05, 23:48:00 GMT [KW] sub is_ucs_jpn_range{ return 1 if ($dvicode<=0x04FF); # Cyrillic @@ -238,6 +242,9 @@ sub is_ucs_jpn_range{ return 0 if ($dvicode< 0xFF00); return 1 if ($dvicode<=0xFFEF); # Halfwidth and Fullwidth Forms + return 0 if ($dvicode< 0x1B000); + return 1 if ($dvicode<=0x1B0FF); # Kana Supplement + return 0 if ($dvicode< 0x1F100); return 1 if ($dvicode<=0x1F1FF); # Enclosed Alphanumeric Supplement return 1 if ($dvicode<=0x1F2FF); # Enclosed Ideographic Supplement @@ -246,6 +253,7 @@ sub is_ucs_jpn_range{ return 1 if ($dvicode<=0x2A6DF); # CJK Unified Ideographs Extension B return 1 if ($dvicode<=0x2B73F); # CJK Unified Ideographs Extension C return 1 if ($dvicode<=0x2B81F); # CJK Unified Ideographs Extension D + return 1 if ($dvicode<=0x2CEAF); # CJK Unified Ideographs Extension E return 0 if ($dvicode< 0x2F800); return 1 if ($dvicode<=0x2FA1F); # CJK Compatibility Ideographs Supplement diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl index eff5fa69346..b40e7be056f 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl @@ -10,6 +10,7 @@ mkutf32list.pl cid2code.txt > sp_jp_text.tex mkutf32list.pl -style=utf cid2code.txt > sp_jp_utf.tex mkutf32list.pl -style=kchar cid2code.txt > sp_jp_kchar.tex mkutf32list.pl -style=list cid2code.txt > sp_list_j.txt +mkutf32list.pl -allrange cid2code.txt > sp_jp_text.tex =head1 AUTHOR @@ -25,7 +26,7 @@ use strict; use encoding 'utf8'; use feature 'switch'; -our ($style); +our ($style, $allrange); our (@count, %reset_ch, $icollec, $cid2code, $line); our ($col_utf32, @out); our (@cid_max, $collection_n, $collection, $utfmac, $cmap, $source); @@ -50,16 +51,16 @@ if (/((Adobe.*)-\d) Character Collection/) { given($collection) { when (/cns/i) { @cid_max = qw/-1 14098 17407 17600 18845 18964 19087 19155/; $utfmac="UTFT"; $cmap="UniCNS-UTF32"; - $source="cmapresources_cns1-6.tar.z"; } + $source="cmapresources_cns1-6/cid2code.txt"; } when (/gb/i) { @cid_max = qw/-1 7716 9896 22126 22352 29063 30283/; $utfmac="UTFC"; $cmap="UniGB-UTF32"; - $source="cmapresources_gb1-5.tar.z"; } + $source="cmapresources_gb1-5/cid2code.txt"; } when (/kor/i) { @cid_max = qw/-1 9332 18154 18351/; $utfmac="UTFK"; $cmap="UniKS-UTF32"; - $source="cmapresources_korean1-2.tar.z"; } + $source="cmapresources_korea1-2/cid2code.txt"; } default { @cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057/; $utfmac="UTF"; $cmap="UniJIS-UTF32"; - $source="cmapresources_japan1-6.tar.z"; } + $source="cmapresources_japan1-6/cid2code.txt"; } } } @@ -73,7 +74,7 @@ $cid2code % for $collection_n % % Reference: -% http://sourceforge.net/adobe/cmap/home/Home/ +% https://github.com/adobe-type-tools/cmap-resources/ % $source % % A newer CMap may be required for some code points. @@ -105,7 +106,7 @@ foreach (@utf32) { next if ($_ =~ 'v'); tr/a-z/A-Z/; my $ch=hex($_); - next if ($ch < 0x10000); + next if ($ch < 0x10000 && !$allrange); while(!($cid_max[$icollec+1]>=$cid && $cid>$cid_max[$icollec])) { $icollec++; @@ -145,7 +146,9 @@ END { print "," if ($style =~ /list/); } print $out; - if ($i % 10 == 0) { + my ($newline); + $newline = $allrange ? 25 : 10; + if ($i % $newline == 0) { print "%" if ($style =~ /utf/); print "\n" ; } diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt index 4e0bf01c94e..d264cc0eb93 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_c.txt @@ -4,8 +4,8 @@ % for Adobe-GB1-5 % % Reference: -% http://sourceforge.net/adobe/cmap/home/Home/ -% cmapresources_gb1-5.tar.z +% https://github.com/adobe-type-tools/cmap-resources/ +% cmapresources_gb1-5/cid2code.txt % % A newer CMap may be required for some code points. % diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt index 6e20b5c2558..2e3d07287af 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt @@ -1,11 +1,11 @@ % % This file is generated from the data of UniJIS-UTF32 -% in cid2code.txt (Version 02/04/2012) +% in cid2code.txt (Version 08/13/2012) % for Adobe-Japan1-6 % % Reference: -% http://sourceforge.net/adobe/cmap/home/Home/ -% cmapresources_japan1-6.tar.z +% https://github.com/adobe-type-tools/cmap-resources/ +% cmapresources_japan1-6/cid2code.txt % % A newer CMap may be required for some code points. % diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt index ec3e7f2141b..23fb5d99358 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_k.txt @@ -4,8 +4,8 @@ % for Adobe-Korea1-2 % % Reference: -% http://sourceforge.net/adobe/cmap/home/Home/ -% cmapresources_korean1-2.tar.z +% https://github.com/adobe-type-tools/cmap-resources/ +% cmapresources_korea1-2/cid2code.txt % % A newer CMap may be required for some code points. % diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt index b89626fd993..386c00f1072 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_t.txt @@ -1,11 +1,11 @@ % % This file is generated from the data of UniCNS-UTF32 -% in cid2code.txt (Version 10/25/2010) +% in cid2code.txt (Version 12/04/2015) % for Adobe-CNS1-6 % % Reference: -% http://sourceforge.net/adobe/cmap/home/Home/ -% cmapresources_cns1-6.tar.z +% https://github.com/adobe-type-tools/cmap-resources/ +% cmapresources_cns1-6/cid2code.txt % % A newer CMap may be required for some code points. % @@ -93,46 +93,46 @@ 26258,29D98,23D40,20E9D,282E2,20C41,20C96,20E76,22C62,20EA2 21075,22B43,22EB3,20DA7,2688A,20EF9,27FF9,247E0,29D7C,275A3 26048,24618,29EAC,29FDE,272B2,2048E,20EB6,27F2E,2A434,243F2 -29E06,294D0,26335,20D28,20D71,21F0F,21DD1,2176D,28E97,25C21 -20CD4,201F2,2A64A,2837D,2A2B2,24ABB,26E05,2251B,28E39,20F3B -25F1A,27486,267CC,24011,2F922,20547,205DF,23FC5,24942,289E4 -219DB,23CC8,24933,289AA,202A0,26BB3,21305,224ED,26D29,27A84 -23600,24AB1,22513,2037E,20380,20347,2041F,249A4,20487,233B4 -20BFF,220FC,202E5,22530,2058E,23233,21983,205B3,23C99,24AA6 -2372D,26B13,2F829,28ADE,23F80,20954,23FEC,20BE2,21726,216E8 -286AB,2F832,21596,21613,28A9B,25772,20B8F,23FEB,22DA3,20C77 -26B53,20D74,2170D,20EDD,20D4D,289BC,22698,218D7,2403A,24435 -210B4,2328A,28B66,2124F,241A5,26C7E,21416,21454,24363,24BF5 -2123C,2A150,24278,2163E,21692,20D4E,26C81,26D2A,217DC,217FB -217B2,26DA6,21828,216D5,26E45,249A9,26FA1,22554,21911,216B8 -27A0E,20204,21A34,259CC,205A5,21B44,21CA5,26B28,21DF9,21E37 -21EA4,24901,22049,22173,244BC,20CD3,21771,28482,201C1,2F894 -2133A,26888,223D0,22471,26E6E,28A36,25250,21F6A,270F8,22668 -2029E,28A29,227B4,24982,2498F,27A53,2F8A6,26ED2,20656,23FB7 -2285F,28B9D,2995D,22980,228C1,20118,21770,22E0D,249DF,2138E -217FC,22E36,2571D,24A28,24A23,24940,21829,23400,231F7,231F8 -231A4,231A5,20E75,251E6,23231,285F4,231C8,25313,228F7,2439C -24A21,237C2,2F8DB,241CD,290ED,233E6,26DA0,2346F,28ADF,235CD -2363C,28A4A,203C9,23659,2212A,23703,2919C,20923,227CD,23ADB -21958,23B5A,23EFC,2248B,248F1,26B51,23DBC,23DBD,241A4,2490C -24900,23CC9,20D32,231F9,22491,26D25,26DA1,26DEB,2497F,24085 -26E72,26F74,28B21,2F908,23E2F,23F82,2304B,23E30,21497,2403D -29170,24144,24091,24155,24039,23FF0,23FB4,2413F,24156,24157 -24140,261DD,24277,24365,242C1,2445A,24A27,24A22,28BE8,25605 -24974,23044,24823,2882B,28804,20C3A,26A2E,241E2,216E7,24A24 -249B7,2498D,249FB,24A26,2F92F,228AD,28EB2,24A8C,2415F,24A79 -28B8F,28C03,2189E,21988,28ED9,21A4B,28EAC,24F82,24D13,263F5 -26911,2690E,26F9F,2509D,2517D,21E1C,25220,232AC,28964,28968 -216C1,255E0,2760C,2261C,25857,27B39,27126,2910D,20C42,20D15 -2512B,22CC6,20341,24DB8,294E5,280BE,22C38,2815D,269F2,24DEA -20D7C,20FB4,20CD5,20E96,20F64,22CA9,28256,244D3,20D46,29A4D -280E9,24EA7,22CC2,295F4,252C7,297D4,22D44,22BCA,266DA,26716 -279A0,25052,20C43,28B4C,20731,201A9,22D8D,245C8,204FC,26097 -20F4C,22A66,2109D,20D9C,22775,2A601,20E09,22ACF,210C8,239C2 -2829B,25E49,220C7,22CB2,29720,24E3B,27574,22E8B,22208,2A65B -28CCD,20E7A,20C34,27639,22BCE,22C51,210C7,2A632,28CD2,28D99 -28CCA,2775E,2F828,2107B,210D3,212FE,247EF,24EA5,24F5C,28189 - +29E06,294D0,26335,20D28,20D71,21F0F,21DD1,2176D,2B473,28E97 +25C21,20CD4,201F2,2A64A,2837D,2A2B2,24ABB,26E05,2AE67,2251B +28E39,20F3B,25F1A,27486,267CC,24011,2F922,20547,205DF,23FC5 +24942,289E4,219DB,23CC8,24933,289AA,202A0,26BB3,21305,224ED +26D29,27A84,23600,24AB1,22513,2037E,20380,20347,2041F,249A4 +20487,233B4,20BFF,220FC,202E5,22530,2058E,23233,21983,205B3 +23C99,24AA6,2372D,26B13,2F829,28ADE,23F80,20954,23FEC,20BE2 +21726,216E8,286AB,2F832,21596,21613,28A9B,25772,20B8F,23FEB +22DA3,20C77,26B53,20D74,2170D,20EDD,20D4D,289BC,22698,218D7 +2403A,24435,210B4,2328A,28B66,2124F,241A5,26C7E,21416,21454 +24363,24BF5,2123C,2A150,24278,2163E,21692,20D4E,26C81,26D2A +217DC,217FB,217B2,26DA6,21828,216D5,26E45,249A9,26FA1,22554 +21911,216B8,27A0E,20204,21A34,259CC,205A5,21B44,21CA5,26B28 +21DF9,21E37,21EA4,24901,22049,22173,244BC,20CD3,21771,28482 +201C1,2F894,2133A,26888,223D0,22471,26E6E,28A36,25250,21F6A +270F8,22668,2029E,28A29,227B4,24982,2498F,27A53,2F8A6,26ED2 +20656,23FB7,2285F,28B9D,2995D,22980,228C1,20118,21770,22E0D +249DF,2138E,217FC,22E36,2571D,24A28,24A23,24940,21829,23400 +231F7,231F8,231A4,231A5,20E75,251E6,23231,285F4,231C8,25313 +228F7,2439C,24A21,237C2,2F8DB,241CD,290ED,233E6,26DA0,2346F +28ADF,235CD,2363C,28A4A,203C9,23659,2212A,23703,2919C,20923 +227CD,23ADB,21958,23B5A,23EFC,2248B,248F1,26B51,23DBC,23DBD +241A4,2490C,24900,23CC9,20D32,231F9,22491,26D25,26DA1,26DEB +2497F,24085,26E72,26F74,28B21,2F908,23E2F,23F82,2304B,23E30 +21497,2403D,29170,24144,24091,24155,24039,23FF0,23FB4,2413F +24156,24157,24140,261DD,24277,24365,242C1,2445A,24A27,24A22 +28BE8,25605,24974,23044,24823,2882B,28804,20C3A,26A2E,241E2 +216E7,24A24,249B7,2498D,249FB,24A26,2F92F,228AD,28EB2,24A8C +2415F,24A79,28B8F,28C03,2189E,21988,28ED9,21A4B,28EAC,24F82 +24D13,263F5,26911,2690E,26F9F,2509D,2517D,21E1C,25220,232AC +28964,28968,216C1,255E0,2760C,2261C,25857,27B39,27126,2910D +20C42,20D15,2512B,22CC6,20341,24DB8,294E5,280BE,22C38,2815D +269F2,24DEA,20D7C,20FB4,20CD5,2BAB3,20E96,20F64,22CA9,28256 +244D3,20D46,29A4D,280E9,24EA7,22CC2,295F4,252C7,297D4,22D44 +2BCD7,22BCA,2B977,266DA,26716,279A0,25052,20C43,28B4C,20731 +201A9,22D8D,245C8,204FC,26097,20F4C,22A66,2109D,20D9C,22775 +2A601,20E09,22ACF,2C5F8,210C8,239C2,2829B,25E49,220C7,22CB2 +29720,24E3B,2C9A0,27574,22E8B,22208,2A65B,28CCD,20E7A,20C34 +27639,22BCE,22C51,210C7,2A632,28CD2,28D99,28CCA,2775E,2F828 +2107B,210D3,212FE,247EF,24EA5,24F5C,28189,2B42C %Adobe-CNS1-3 2010C,200D1,200CD,200CB,21FE8,200CA,2010E,21BC1,2F878,20086 diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl index 5e0deeb6af0..d4d5249c901 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl @@ -522,7 +522,6 @@ character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 ヴ 15691 9.06 9.34 9.33 9.51 9.66 ヵ 15692 8.11 8.33 8.51 8.8 8.74 ヶ 15693 8.18 8.39 8.63 8.74 8.73 -end 〃 15453 7.69 8.15 8.29 8.62 8.36 〆 15454 8.69 9.03 9.09 9.33 9.15 ヿ 15462 8.09 8.42 8.6 8.83 8.87 @@ -550,3 +549,4 @@ end ヸ 15720 9.41 9.75 9.6 9.7 9.75 ヹ 15721 9.47 9.7 9.65 9.7 9.8 ヺ 15722 8.91 9.32 9.34 9.39 9.73 +end diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl index a46f4fbf04b..4d9ca76507e 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl @@ -524,7 +524,6 @@ character cid min_w3 min_w6 goth_w3 goth_w6 maru_w4 ヴ 16159 9.47 9.62 9.49 9.69 9.63 ヵ 16160 8.73 8.9 8.93 9.11 9 ヶ 16161 8.53 8.64 8.41 8.66 8.69 -end 〃 15980 8.16 8.40 8.74 8.90 8.88 〆 15981 8.94 9.09 8.99 9.14 9.04 ヿ 15983 9.36 9.59 9.59 9.75 9.74 @@ -552,3 +551,4 @@ end ヸ 16188 9.61 9.8 9.73 9.84 9.77 ヹ 16189 8.94 9.28 9.56 9.80 9.88 ヺ 16190 9.54 9.71 9.67 9.82 9.74 +end |