From 133d545855aad08d7b6124698f796f8f558eac44 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 9 Dec 2018 22:38:56 +0000 Subject: japanese-otf-uptex (9dec18) git-svn-id: svn://tug.org/texlive/trunk@49361 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/fonts/japanese-otf-uptex/script/CheckDVICode.pm | 3 +-- .../texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl | 4 +++- .../source/fonts/japanese-otf-uptex/script/mkutf32list.pl | 6 +++--- .../texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl | 4 +++- .../texmf-dist/source/fonts/japanese-otf-uptex/script/sp_list_j.txt | 6 +++--- 5 files changed, 13 insertions(+), 10 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 a3fea2a3ea8..0b42516a873 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 @@ -182,7 +182,6 @@ 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>=0x3090 && $dvicode<=0x3093); return 1 if ($dvicode>=0x3097 && $dvicode<=0x309F); return 1 if ($dvicode>=0x30FB && $dvicode<=0x30FE); return 1 if ($dvicode>=0xFF08 && $dvicode<=0xFF60); @@ -191,7 +190,7 @@ sub is_ucs_kigo{ } sub is_ucs_hira{ - return 1 if ($dvicode>=0x3041 && $dvicode<=0x308F); + return 1 if ($dvicode>=0x3041 && $dvicode<=0x3093); return 1 if ($dvicode>=0x3094 && $dvicode<=0x3096); # Vu, small Ka, small Ke return 0; } 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 1245eff7f8e..99485c83ef1 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 @@ -14,7 +14,9 @@ This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). =cut -use script::MakeSPList; +use FindBin; +use lib "$FindBin::Bin"; +use MakeSPList; $multi=3; @tex_tfm_h=(0x00, 0x0B, 0x00, 0x01, 0x00, 0x2B, 0x00, 0x12, 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, 0x0E, 0x54, 0x45, 0x58, 0x20, 0x4B, 0x41, 0x4E, 0x4A, 0x49, 0x20, 0x54, 0x45, 0x58, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4F, 0x54, 0x46, 0x20, 0x4B, 0x41, 0x4E, 0x4A, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 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, 0x01, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x33, 0x33, 0x00, 0x02, 0x00, 0x00); 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 b71dc60947f..377659d3983 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 @@ -24,7 +24,7 @@ This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). =cut use strict; -use encoding 'utf8'; +binmode(STDOUT, ":utf8"); our ($style, $allrange); our (@count, %reset_ch, $icollec, $cid2code, $line); @@ -62,9 +62,9 @@ if ($.<8 && /((Adobe-(?:Japan|CNS|GB|Korea).*)-\d)\s/) { $utfmac="UTFK"; $cmap="UniKS-UTF32"; $source="Adobe-Korea1-2/cid2code.txt"; } else { - @cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057/; + @cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057 23059/; $utfmac="UTF"; $cmap="UniJIS-UTF32"; - $source="Adobe-Japan1-6/cid2code.txt"; } + $source="Adobe-Japan1-7/cid2code.txt"; } } next if (/^#/); 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 ad9bc2b1d8b..8392b7b686e 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 @@ -16,7 +16,9 @@ This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex). =cut -use script::MakeSPList; +use FindBin; +use lib "$FindBin::Bin"; +use MakeSPList; if (!defined($ovp2ovf)) { ## check option '-ovp2ovf=????' $ovp2ovf = defined($ENV{'OVP2OVF'}) ? $ENV{'OVP2OVF'} : 'ovp2ovf'; 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 25d1fa856e4..a6ab70c1942 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 10/24/2017) -% for Adobe-Japan1-6 +% in cid2code.txt (Version 07/30/2018) +% for Adobe-Japan1-7 % % Reference: % https://github.com/adobe-type-tools/cmap-resources/ -% Adobe-Japan1-6/cid2code.txt +% Adobe-Japan1-7/cid2code.txt % % A newer CMap may be required for some code points. % -- cgit v1.2.3