X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/c98bda172fec13970df56f9bec501b420c3b51f5..HEAD:/tools/mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index a1cc44d..0b669d4 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -3,19 +3,23 @@ use 5.014;
 use warnings;
 use utf8;
 
-use open OUT => ':utf8', ':std';
+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;
 
 my %cover;
 my $incsuffix = '.inc.pl';
-for my $fontfile (glob 'ttfsupport/*'.$incsuffix) {
+for my $fontfile (glob 'data/font/*'.$incsuffix) {
 	my ($fontid) = basename($fontfile, $incsuffix);
-	my ($fontmeta, @fontrange) = do $fontfile or next;
+	my ($fontmeta, @fontrange) = do "./$fontfile";
+	if (!$fontmeta) {
+		warn "$fontfile: $!";
+		next;
+	}
 	$fontmeta->{file} = $fontid;
 	my $year = substr $fontmeta->{date}, 0, 4;
 	$fontmeta->{description} = join(' ',
@@ -24,12 +28,15 @@ for my $fontfile (glob 'ttfsupport/*'.$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;
 
-my $chartables = do 'unicode-table.inc.pl' or warn $@ || $!;
+$charlist{table}->{abc} = ['A'..'Z', 'a'..'z'];
+
+my $chartables = do './unicode-table.inc.pl' or warn $@ || $!;
 if ($chartables) {
 	while (my ($tablegroup, $grouprow) = each %{$chartables}) {
 		while (my ($tablename, $chars) = each %{$grouprow}) {
@@ -63,13 +70,13 @@ eval {
 } or warn "Could not include count for html entities: $@";
 
 eval {
-	my $agemap = do 'unicode-age.inc.pl'
+	my $agemap = do './data/unicode-age.inc.pl'
 		or warn "Could not include unicode version data: $!";
 
 	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} <= $_)