X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/cb45c5967530d4c2207f1c1f5d19553ec7c0de7a..2b719dc0950d9e160458490cb1c69b7cd37d240d:/tools/mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index 84e7a25..b27b779 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -1,6 +1,5 @@
 #!/usr/bin/env perl
-use 5.010;
-use strict;
+use 5.014;
 use warnings;
 use utf8;
 
@@ -14,7 +13,7 @@ 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;
 	$fontmeta->{file} = $fontid;
@@ -30,6 +29,8 @@ for my $fontfile (glob 'ttfsupport/*'.$incsuffix) {
 
 my %charlist;
 
+$charlist{table}->{abc} = ['A'..'Z', 'a'..'z'];
+
 my $chartables = do 'unicode-table.inc.pl' or warn $@ || $!;
 if ($chartables) {
 	while (my ($tablegroup, $grouprow) = each %{$chartables}) {
@@ -64,12 +65,17 @@ eval {
 } or warn "Could not include count for html entities: $@";
 
 eval {
+	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
 		push @{ $charlist{$_}->{ $charinfo->{$_} } }, chr $code
 			for qw( script category block );
+		push @{ $charlist{version}->{$_} }, (chr $code) x ($agemap->{$code} <= $_)
+			for 11, 30, 63;
 	}
 	1;
 } or warn "Could not include unicode groups: $@";
@@ -109,7 +115,7 @@ for my $chars (values %{$_}) {
 $charlist{fonts} = \@fontlist;
 
 my %osfonts = (
-	win95   => [qw( arial.win95 arialuni lucidau verdana.win95 times.win95 cour.win95 )],  # microsoft
+	win2k   => [qw( arial.win2k arialuni lucidau verdana.win2k times.win2k cour.win2k )],  # microsoft
 	win8    => [map {"$_.win8"} qw( arial verdana times georgia pala cour )],
 	mac109  => [map {"$_.mac109"} qw( helv lucida times pala )],  # apple
 	android => [qw( roboto droidmono notosans )],  # google
@@ -125,12 +131,12 @@ my %fontnum = map { ($fontlist[$_]->{file} => $_) } 0 .. $#fontlist;
 while (my ($os, $fontids) = each %osfonts) {
 	$charlist{os}->{$os} = [ map { $fontnum{$_} // () } @{$fontids} ];
 }
-$charlist{osdefault} = [qw( win95 win8 mac109 android oss )];
+$charlist{osdefault} = [qw( win2k win8 mac109 android oss )];
 
 say "# automatically generated by $0";
 say 'use utf8;';
 say '+', pp(\%charlist) =~ s{
-	( \[ \s* \d [^]]* ) ,\s*  # arrays of numbers, excluding trailing comma
+	( \[ \s* \d [^]]* ) ,\s* (?= \] )  # arrays of numbers, excluding trailing comma
 }{ $1 =~ s/\s+//gr }msxgre;  # strip whitespace
 
 __END__