X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/0d7d8b502321cdd3d041b756c742a4805b009f8f..HEAD:/tools/mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index 9533025..0b669d4 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -7,7 +7,7 @@ use open OUT => ':encoding(utf-8)', ':std';
 use File::Basename 'basename';
 use Data::Dump 'pp';
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 my @fontlist;
 
@@ -28,7 +28,8 @@ for my $fontfile (glob 'data/font/*'.$incsuffix) {
 		(map { "($_)" } $year || ()),
 	);
 	push @fontlist, $fontmeta;
-	$cover{$fontid} = { map { (chr $_ => 1) } @fontrange };
+	my $fontrange = $fontmeta->{cover};
+	$cover{$fontid} = { map { (chr $_ => 1) } $fontmeta->{cover}->@* };
 }
 
 my %charlist;
@@ -75,7 +76,7 @@ eval {
 	use Unicode::UCD 'charinfo';
 	for my $code (0 .. 256**2*2) {
 		my $charinfo = charinfo($code) or next;
-		next if $charinfo->{category} =~ /^[MC]/;  # ignore Marks and "other" Control chars
+		next if $charinfo->{category} =~ /^[C]/;  # ignore "other" Control chars
 		push @{ $charlist{$_}->{ $charinfo->{$_} } }, chr $code
 			for qw( script category block );
 		push @{ $charlist{version}->{$_} }, (chr $code) x ($agemap->{$code} <= $_)