diff options
author | Karl Berry <karl@freefriends.org> | 2018-02-11 22:41:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-02-11 22:41:46 +0000 |
commit | 4b2209e5473b671c06eee20488258739a67796ec (patch) | |
tree | 5471eba1505a78bf4a25f782bf5aa66890e73e81 /Master/texmf-dist/source/fonts | |
parent | ff84279ea895ba7f1be6c8e233b23c168889099f (diff) |
japanese-otf-uptex (11feb18)
git-svn-id: svn://tug.org/texlive/trunk@46597 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/fonts')
16 files changed, 163 insertions, 140 deletions
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl index 50f3311d3ab..448ef34b3c4 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl @@ -78,6 +78,7 @@ ) (CHARSINTYPE O 3 ・ : ; + U00B7 ) (CHARSINTYPE O 4 。 . diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl index 4686d526feb..fb3ff4e03df 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl @@ -68,6 +68,7 @@ ) (CHARSINTYPE O 3 ・ : ; + U00B7 ) (CHARSINTYPE O 4 。 . diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl index f365ce89922..ccf7e2c5419 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl @@ -93,6 +93,7 @@ ) (CHARSINTYPE O 3 ・ : ; + U00B7 ) (CHARSINTYPE O 4 。 . diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl index 61336e5eed1..4b162156da2 100644 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl @@ -83,6 +83,7 @@ ) (CHARSINTYPE O 3 ・ : ; + U00B7 ) (CHARSINTYPE O 4 。 . 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 4c876d09914..5e8bdcbccaa 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 @@ -130,7 +130,8 @@ sub is_dvicode($){ if ($key eq 'burasage') { return ($code == 0x3001 || $code == 0x3002 || $code == 0xFF0C || $code == 0xFF0E);} - if ($key eq 'nakaten' ) { return ($code == 0x30FB);} + if ($key eq 'nakaten' ) { return + ($code == 0x30FB || $code == 0x00B7);} if ($key eq 'colon' ) { return ($code == 0xFF1A);} if ($key eq 'semicolon') { return ($code == 0xFF1B);} if ($key eq 'quote') { return @@ -167,6 +168,7 @@ sub is_ucs_open{ } sub is_ucs_kigo{ + return 1 if ($dvicode==0x00B7); return 1 if ($dvicode>=0x2018 && $dvicode<=0x2019); return 1 if ($dvicode>=0x201C && $dvicode<=0x201D); return 1 if ($dvicode>=0x3001 && $dvicode<=0x301F); @@ -198,8 +200,8 @@ sub is_ucs_hankana{ # Reference: # http://www.unicode.org/Public/UNIDATA/Blocks.txt -# Blocks-9.0.0.txt -# Date: 2016-02-05, 23:48:00 GMT [KW] +# Blocks-10.0.0.txt +# Date: 2017-04-12, 17:30:00 GMT [KW] sub is_ucs_jpn_range{ return 1 if ($dvicode<=0x04FF); # Cyrillic @@ -244,6 +246,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 0 if ($dvicode< 0x1F100); return 1 if ($dvicode<=0x1F1FF); # Enclosed Alphanumeric Supplement @@ -254,6 +257,7 @@ sub is_ucs_jpn_range{ 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 1 if ($dvicode<=0x2EBEF); # CJK Unified Ideographs Extension F 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/mktfm_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl index f9f6026d83b..1245eff7f8e 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl @@ -80,7 +80,7 @@ sub maketfm_body { my $lang = join ',', @ln; my @exist_head=@{$MakeSPList::r_exist_head->{$lang}}; - foreach $first_hex (0x1b, 0x1d .. 0x2b, 0x2f) { # U+1Cxxx, U+2[CDE]xxx : not defined yet + foreach $first_hex (0x1b, 0x1d .. 0x2f) { # U+1Cxxx : not defined yet next if (!$exist_head[$first_hex]); $id = $font_id{sprintf("%x", $first_hex)}; 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 b40e7be056f..82b60bbcb51 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 -style=list-wo-collec cid2code.txt > sp_list_ja.txt mkutf32list.pl -allrange cid2code.txt > sp_jp_text.tex =head1 AUTHOR @@ -45,22 +46,23 @@ if (/cid2code/) { $cid2code=$_; $cid2code=~s/^#/%/; } -if (/((Adobe.*)-\d) Character Collection/) { + +if ($.<8 & /((Adobe-(?:Japan|CNS|GB|Korea).*)-\d)\s/) { $collection_n=$1; $collection=$2; given($collection) { - when (/cns/i) { @cid_max = qw/-1 14098 17407 17600 18845 18964 19087 19155/; + when (/cns/i) { @cid_max = qw/-1 14098 17407 17600 18845 18964 19087 19155 19178/; $utfmac="UTFT"; $cmap="UniCNS-UTF32"; - $source="cmapresources_cns1-6/cid2code.txt"; } + $source="Adobe-CNS1-7/cid2code.txt"; } when (/gb/i) { @cid_max = qw/-1 7716 9896 22126 22352 29063 30283/; $utfmac="UTFC"; $cmap="UniGB-UTF32"; - $source="cmapresources_gb1-5/cid2code.txt"; } + $source="Adobe-GB1-5/cid2code.txt"; } when (/kor/i) { @cid_max = qw/-1 9332 18154 18351/; $utfmac="UTFK"; $cmap="UniKS-UTF32"; - $source="cmapresources_korea1-2/cid2code.txt"; } + $source="Adobe-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/cid2code.txt"; } + $source="Adobe-Japan1-6/cid2code.txt"; } } } @@ -125,8 +127,11 @@ foreach (@utf32) { END { my ($i, $out, $ch); + if ($style eq "list-wo-collec") { @out = sort(@out); } + foreach $ch (@out) { - if (defined($reset_ch{$ch})) { + if ($style eq "list-wo-collec") {} + elsif (defined($reset_ch{$ch})) { $i=0; print "\n\n"; print "%" if ($style =~ /list/); @@ -142,12 +147,12 @@ END { when (/list/) { $out=sprintf "%X", $ch; } default { $out=chr($ch); } } - if ($i % 10 != 1) { + my ($newline); + $newline = $allrange ? 25 : 10; + if ($i % $newline != 1) { print "," if ($style =~ /list/); } print $out; - 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/mkutfvf_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl index e574eb56325..ad9bc2b1d8b 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl @@ -70,7 +70,7 @@ sub makevf_body { my ($face, $dir, $lang)=@_; my @exist_head=@{$MakeSPList::r_exist_head->{$lang}}; - foreach $first_hex (0x1b, 0x1d .. 0x2b, 0x2f) { # U+1Cxxx, U+2[CDE]xxx : not defined yet + foreach $first_hex (0x1b, 0x1d .. 0x2f) { # U+1Cxxx : not defined yet next if (!$exist_head[$first_hex]); $HEX = sprintf("%X", $first_hex); @@ -95,7 +95,7 @@ sub make_uni_vf_body { my $lang = join ',', @ln; my @exist_head=@{$MakeSPList::r_exist_head->{$lang}}; - foreach $first_hex (0x1b, 0x1d .. 0x2b, 0x2f) { # U+1Cxxx, U+2[CDE]xxx : not defined yet + foreach $first_hex (0x1b, 0x1d .. 0x2f) { # U+1Cxxx : not defined yet next if (!$exist_head[$first_hex]); $HEX = sprintf("%X", $first_hex); 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 d264cc0eb93..a4699d6ea82 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 @@ -1,11 +1,11 @@ % % This file is generated from the data of UniGB-UTF32 -% in cid2code.txt (Version 10/29/2010) +% in cid2code.txt (Version 12/05/2017) % for Adobe-GB1-5 % % Reference: % https://github.com/adobe-type-tools/cmap-resources/ -% cmapresources_gb1-5/cid2code.txt +% Adobe-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 2e3d07287af..25d1fa856e4 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 08/13/2012) +% in cid2code.txt (Version 10/24/2017) % for Adobe-Japan1-6 % % Reference: % https://github.com/adobe-type-tools/cmap-resources/ -% cmapresources_japan1-6/cid2code.txt +% Adobe-Japan1-6/cid2code.txt % % A newer CMap may be required for some code points. % @@ -29,11 +29,12 @@ 1F184,1F185,1F186,1F187,1F188,1F189,2F945,2090E,26951,2B7D8 2F8FC,2F995,2F8EA,2F822,26222,20BB7,29D4B,2F833,2B78E,2F8AC 20A64,2F903,2B746,2B777,2F90B,20B9F,2F828,2F921,2F83F,2F873 -2000B,2F852,2967F,2F947,201A2,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,2053F,2626A,200B0,28987,28E17,2B81A -242EE,2F8E1,23CBE,20611,2F9F4,2F804,2363A,233FE,22609 +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 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 23fb5d99358..6af3e290ff3 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 @@ -5,7 +5,7 @@ % % Reference: % https://github.com/adobe-type-tools/cmap-resources/ -% cmapresources_korea1-2/cid2code.txt +% Adobe-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 386c00f1072..084eac51871 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 12/04/2015) -% for Adobe-CNS1-6 +% in cid2code.txt (Version 10/24/2017) +% for Adobe-CNS1-7 % % Reference: % https://github.com/adobe-type-tools/cmap-resources/ -% cmapresources_cns1-6/cid2code.txt +% Adobe-CNS1-7/cid2code.txt % % A newer CMap may be required for some code points. % @@ -22,117 +22,118 @@ 26498,2148A,2185E,24A65,24A95,26A52,23D7E,214FD,2F98F,249A7 23530,21773,23DF8,2F994,20E16,217B4,2317D,2355A,23E8B,26DA3 26B05,26B97,235CE,26DA5,26ED4,26E42,25BE4,26B96,26E77,26E43 -25C91,25CC0,28625,2863B,27088,21582,270CD,2F9B2,218A2,2739A -2A0F8,22C27,275E0,23DB9,275E4,2770F,28A25,27924,27ABD,27A59 -27B3A,27B38,25430,25565,24A7A,216DF,27D54,27D8F,2F9D4,27D53 -27D98,27DBD,21910,2F9D7,28002,21014,2498A,281BC,2710C,28365 -28412,2A29F,20A50,289DE,2853D,23DBB,23262,22325,26ED7,2853C -27ABE,2856C,2860B,28713,286E6,28933,21E89,255B9,28AC6,23C9B -28B0C,255DB,20D31,28AE1,28BEB,28AE2,28AE5,28BEC,28C39,28BFF -286D8,2127C,23E2E,26ED5,28AE0,26CB8,20274,26410,290AF,290E5 -24AD1,21915,2330A,24AE9,291D5,291EB,230B7,230BC,2546C,29433 -2941D,2797A,27175,20630,2415C,25706,26D27,216D3,24A29,29857 -29905,25725,290B1,29BD5,29B05,28600,2307D,29D3E,21863,29E68 -29FB7,2A192,2A1AB,2A0E1,2A123,2A1DF,2A134,2A193,2A220,2193B -2A233,2A0B9,2A2B4,24364,28C2B,26DA2,2FA1B,2908B,24975,249BB -249F8,24348,24A51,28BDA,218FA,2897E,28E36,28A44,2896C,244B9 -24473,243F8,217EF,218BE,23599,21885,2542F,217F8,216FB,21839 -21774,218D1,25F4B,216C0,24A25,213FE,212A8,213C6,214B6,236A6 -24994,27165,23E31,2555C,23EFB,27052,236EE,2999D,26F26,21922 -2373F,240E1,2408B,2410F,26C21,266B1,20FDF,20BA8,20E0D,28B13 -24436,20465,25651,201AB,203CB,2030A,20414,202C0,28EB3,20275 -2020C,24A0E,23E8A,23595,23E39,23EBF,21884,23E89,205E0,204A3 -20492,20491,28A9C,2070E,20873,2438C,20C20,249AC,210E4,20E1D -24ABC,2408D,240C9,20345,20BC6,28A46,216FA,2176F,21710,25946 -219F3,21861,24295,25E83,28BD7,20413,21303,289FB,21996,2197C -23AEE,21903,21904,218A0,216FE,28A47,21DBA,23472,289A8,21927 -217AB,2173B,275FD,22860,2262B,225AF,225BE,29088,26F73,2003E -20046,2261B,22C9B,22D07,246D4,2914D,24665,22B6A,22B22,23450 -298EA,22E78,249E3,22D67,22CA1,2308E,232AD,24989,232AB,232E0 -218D9,2943F,23289,231B3,25584,28B22,2558F,216FC,2555B,25425 -23103,2182A,23234,2320F,23182,242C9,26D24,27870,21DEB,232D2 -232E1,25872,2383A,237BC,237A2,233FE,2462A,237D5,24487,21912 -23FC0,23C9A,28BEA,28ACB,2801E,289DC,23F7F,2403C,2431A,24276 -2478F,24725,24AA4,205EB,23EF8,2365F,24A4A,24917,25FE1,24ADF -28C23,23F35,26DEA,24CD9,24D06,2A5C6,28ACC,249AB,2498E,24A4E -249C5,248F3,28AE3,21864,25221,251E7,23232,24697,23781,248F0 -24ABA,24AC7,24A96,261AE,25581,27741,256E3,23EFA,216E6,20D4C -2498C,20299,23DBA,2176E,201D4,20C0D,226F5,25AAF,25A9C,2025B -25BC6,25BB3,25EBC,25EA6,249F9,217B0,26261,2615C,27B48,25E82 -26B75,20916,2004E,235CF,26412,263F8,2082C,25AE9,25D43,25E0E -2343F,249F7,265AD,265A0,27127,26CD1,267B4,26A42,26A51,26DA7 -2721B,21840,218A1,218D8,2F9BC,23D8F,27422,25683,27785,27784 -28BF5,28BD9,28B9C,289F9,29448,24284,21845,27DDC,24C09,22321 -217DA,2492F,28A4B,28AFC,28C1D,28C3B,28D34,248FF,24A42,243EA -23225,28EE7,28E66,28E65,249ED,24A78,23FEE,290B0,29093,257DF -28989,28C26,28B2F,263BE,2421B,20F26,28BC5,24AB2,294DA,295D7 -28B50,24A67,28B64,28A45,27B06,28B65,258C8,298F1,29948,21302 -249B8,214E8,2271F,23DB8,22781,2296B,29E2D,2A1F5,2A0FE,24104 -2A1B4,2A0ED,2A0F3,2992F,26E12,26FDF,26B82,26DA4,26E84,26DF0 -26E00,237D7,26064,2359C,23640,249DE,202BF,2555D,21757,231C9 -24941,241B5,241AC,26C40,24F97,217B5,28A49,24488,289FC,218D6 -20F1D,26CC0,21413,242FA,22C26,243C1,23DB7,26741,2615B,260A4 -249B9,2498B,289FA,28B63,2189F,24AB3,24A3E,24A94,217D9,24A66 -203A7,21424,249E5,24916,24976,204FE,28ACE,28A16,28BE7,255D5 -28A82,24943,20CFF,2061A,20BEB,20CB8,217FA,216C2,24A50,21852 -28AC0,249AD,218BF,21883,27484,23D5B,28A81,21862,20AB4,2139C -28218,290E4,27E4F,23FED,23E2D,203F5,28C1C,26BC0,21452,24362 -24A71,22FE3,212B0,223BD,21398,234E5,27BF4,236DF,28A83,237D6 -233FA,24C9F,236AD,26CB7,26D26,26D51,26C82,26FDE,2173A,26C80 -27053,217DB,217B3,21905,241FC,2173C,242A5,24293,23EF9,27736 -2445B,242CA,24259,289E1,26D28,244CE,27E4D,243BD,24256,21304 -243E9,2F825,23300,27AF4,256F6,27B18,27A79,249BA,20346,27657 -25FE2,275FE,2209A,28A9A,2403B,24A45,205CA,20611,21EA8,23CFF -285E8,299C9,221C3,28B4E,20C78,20779,23F4A,24AA7,26B52,27632 -2493F,233CC,28948,21D90,27C12,24F9A,26BF7,2191C,249F6,23FEF -2271B,257E1,2F8CD,2F806,24521,24934,26CBD,26411,290C0,20A11 -26469,20021,23519,2258D,2217A,249D0,20EF8,22926,28473,217B1 -24A2A,21820,29CAD,298A4,2160A,2372F,280E8,213C5,291A8,270AF -289AB,2417A,2A2DF,28318,26E07,2816F,269B5,213ED,2322F,28C30 -28949,24988,24AA5,23F81,21FA1,295E9,2789D,28024,27A3E,23CB7 -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,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 +25C91,25CC0,28625,2863B,27088,21582,270CD,270F0,2F9B2,218A2 +2739A,2A0F8,22C27,275E0,23DB9,275E4,2770F,28A25,27924,27ABD +27A59,27B3A,27B38,25430,25565,24A7A,216DF,27D54,27D8F,2F9D4 +27D53,27D98,27DBD,21910,2F9D7,28002,21014,2498A,281BC,2710C +28365,28412,2A29F,20A50,289DE,2853D,23DBB,23262,22325,26ED7 +2853C,27ABE,2856C,2860B,28713,286E6,28933,21E89,255B9,28AC6 +23C9B,28B0C,255DB,20D31,28AE1,28BEB,28AE2,28AE5,28BEC,28C39 +28BFF,286D8,2127C,23E2E,26ED5,28AE0,26CB8,20274,26410,290AF +290E5,24AD1,21915,2330A,24AE9,291D5,291EB,230B7,230BC,2546C +29433,2941D,2797A,27175,20630,2415C,25706,26D27,216D3,24A29 +29857,29905,25725,290B1,29BD5,29B05,28600,2307D,29D3E,21863 +29E68,29FB7,2A192,2A1AB,2A0E1,2A123,2A1DF,2A134,2A193,2A220 +2193B,2A233,2A0B9,2A2B4,24364,2A3ED,28C2B,26DA2,2FA1B,2908B +24975,249BB,249F8,24348,24A51,28BDA,218FA,2897E,28E36,28A44 +2896C,244B9,24473,243F8,217EF,218BE,23599,21885,2542F,217F8 +216FB,21839,21774,218D1,25F4B,216C0,24A25,213FE,212A8,213C6 +214B6,236A6,24994,27165,23E31,2555C,23EFB,27052,236EE,2999D +26F26,21922,2373F,240E1,2408B,2410F,26C21,266B1,20FDF,20BA8 +20E0D,28B13,24436,20465,25651,201AB,203CB,2030A,20414,202C0 +28EB3,20275,2020C,24A0E,23E8A,23595,23E39,23EBF,21884,23E89 +205E0,204A3,20492,20491,28A9C,2070E,20873,2438C,20C20,249AC +210E4,20E1D,24ABC,2408D,240C9,20345,20BC6,28A46,216FA,2176F +21710,25946,219F3,21861,24295,25E83,28BD7,20413,21303,289FB +21996,2197C,23AEE,21903,21904,218A0,216FE,28A47,21DBA,23472 +289A8,21927,217AB,2173B,275FD,22860,2262B,225AF,225BE,29088 +26F73,2003E,20046,2261B,22C9B,22D07,246D4,2914D,24665,22B6A +22B22,23450,298EA,22E78,249E3,22D67,22CA1,2308E,232AD,24989 +232AB,232E0,218D9,2943F,23289,231B3,25584,28B22,2558F,216FC +2555B,25425,23103,2182A,23234,2320F,23182,242C9,26D24,27870 +21DEB,232D2,232E1,25872,2383A,237BC,237A2,233FE,2462A,237D5 +24487,21912,23FC0,23C9A,28BEA,28ACB,2801E,289DC,23F7F,2403C +2431A,24276,2478F,24725,24AA4,205EB,23EF8,2365F,24A4A,24917 +25FE1,24ADF,28C23,23F35,26DEA,24CD9,24D06,2A5C6,28ACC,249AB +2498E,24A4E,249C5,248F3,28AE3,21864,25221,251E7,23232,24697 +23781,248F0,24ABA,24AC7,24A96,261AE,25581,27741,256E3,23EFA +216E6,20D4C,2498C,20299,23DBA,2176E,201D4,20C0D,226F5,25AAF +25A9C,2025B,25BC6,25BB3,25EBC,25EA6,249F9,217B0,26261,2615C +27B48,25E82,26B75,20916,2004E,235CF,26412,263F8,2082C,25AE9 +25D43,25E0E,2343F,249F7,265AD,265A0,27127,26CD1,267B4,26A42 +26A51,26DA7,2721B,21840,218A1,218D8,2F9BC,23D8F,27422,25683 +27785,27784,28BF5,28BD9,28B9C,289F9,29448,24284,21845,27DDC +24C09,22321,217DA,2492F,28A4B,28AFC,28C1D,28C3B,28D34,248FF +24A42,243EA,23225,28EE7,28E66,28E65,249ED,24A78,23FEE,290B0 +29093,257DF,28989,28C26,28B2F,263BE,2421B,20F26,28BC5,24AB2 +294DA,295D7,28B50,24A67,28B64,28A45,27B06,28B65,258C8,298F1 +29948,21302,249B8,214E8,2271F,23DB8,22781,2296B,29E2D,2A1F5 +2A0FE,24104,2A1B4,2A0ED,2A0F3,2992F,26E12,26FDF,26B82,26DA4 +26E84,26DF0,26E00,237D7,26064,2359C,23640,249DE,202BF,2555D +21757,231C9,24941,241B5,241AC,26C40,24F97,217B5,28A49,24488 +289FC,218D6,20F1D,26CC0,21413,242FA,22C26,243C1,23DB7,26741 +2615B,260A4,249B9,2498B,289FA,28B63,2189F,24AB3,24A3E,24A94 +217D9,24A66,203A7,21424,249E5,24916,24976,204FE,28ACE,28A16 +28BE7,255D5,28A82,24943,20CFF,2061A,20BEB,20CB8,217FA,216C2 +24A50,21852,28AC0,249AD,218BF,21883,27484,23D5B,28A81,21862 +20AB4,2139C,28218,290E4,27E4F,23FED,23E2D,203F5,28C1C,26BC0 +21452,24362,24A71,22FE3,212B0,223BD,21398,234E5,27BF4,236DF +28A83,237D6,233FA,24C9F,236AD,26CB7,26D26,26D51,26C82,26FDE +2173A,26C80,27053,217DB,217B3,21905,241FC,2173C,242A5,24293 +23EF9,27736,2445B,242CA,24259,289E1,26D28,244CE,27E4D,243BD +24256,21304,243E9,2F825,23300,27AF4,256F6,27B18,27A79,249BA +20346,27657,25FE2,275FE,2209A,28A9A,2403B,24A45,205CA,20611 +21EA8,23CFF,285E8,299C9,221C3,28B4E,20C78,20779,23F4A,24AA7 +26B52,27632,2493F,233CC,28948,21D90,27C12,24F9A,26BF7,2191C +249F6,23FEF,2271B,257E1,2F8CD,2F806,24521,24934,26CBD,26411 +290C0,20A11,26469,20021,23519,2258D,2217A,249D0,20EF8,22926 +28473,217B1,24A2A,21820,29CAD,298A4,2160A,2372F,280E8,213C5 +291A8,270AF,289AB,2417A,2A2DF,28318,26E07,2816F,269B5,213ED +2322F,28C30,28949,24988,24AA5,23F81,21FA1,295E9,2789D,28024 +27A3E,23CB7,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 +2B473,28E97,25C21,20CD4,201F2,2A64A,2837D,2A2B2,24ABB,26E05 +2AE67,2251B,2DF3C,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 d4d5249c901..444f007b4dd 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 @@ -150,6 +150,7 @@ sub glue_kern{ print JPL " )\n"; } sub chars_in_type_jis{ + my ($type3add) = $ucs ? "U00B7" : ""; my ($type5) = $ucs ? "— ― … ‥" : "— … ‥"; print JPL <<END_OF_DATA; (CHARSINTYPE O 1 @@ -160,6 +161,7 @@ print JPL <<END_OF_DATA; ) (CHARSINTYPE O 3 ・ : ; + $type3add ) (CHARSINTYPE O 4 。 . 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 4d9ca76507e..9d460314d1b 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 @@ -152,6 +152,7 @@ sub glue_kern{ print JPL " )\n"; } sub chars_in_type_jis{ + my ($type3add) = $ucs ? "U00B7" : ""; my ($type5) = $ucs ? "— ― … ‥" : "— … ‥"; print JPL <<END_OF_DATA; (CHARSINTYPE O 1 @@ -162,6 +163,7 @@ print JPL <<END_OF_DATA; ) (CHARSINTYPE O 3 ・ : ; + $type3add ) (CHARSINTYPE O 4 。 . diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf index 9674fb2c02c..5acab5eb181 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf @@ -75,3 +75,4 @@ mkdir vf fi mv *.vf vf/ mv *.tfm tfm/ +rm -rf ovp diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop index a524d44ebdf..5088696713d 100755 --- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop +++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop @@ -33,3 +33,6 @@ $OVP2OVF ovp/upphira${face}-h.ovp vf/upphira${face}-h.vf vf/upphira${face}-h.ofm $OVP2OVF ovp/upphira${face}-v.ovp vf/upphira${face}-v.vf vf/upphira${face}-v.ofm done +rm vf/*.ofm +rm -rf ovp +rm -rf pl |