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

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index c6626fa..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,16 +13,24 @@ 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;
+	my $year = substr $fontmeta->{date}, 0, 4;
+	$fontmeta->{description} = join(' ',
+		(map { "version $_" } $fontmeta->{version} || ()),
+		$fontmeta->{version} && $fontmeta->{version} =~ /\Q$year/ ? () :
+		(map { "($_)" } $year || ()),
+	);
 	push @fontlist, $fontmeta;
 	$cover{$fontid} = { map { (chr $_ => 1) } @fontrange };
 }
 
 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}) {
@@ -35,6 +42,7 @@ if ($chartables) {
 				next if /^[.-]/;
 				next if $_ eq '>' or $_ eq '=';
 				s/^\\//;  # escape
+				length $_ == 1 or next;  # multiple characters lost in query
 				push @{ $charlist{table}->{"$tablegroup/$tablename"} }, $_;
 				push @{ $charlist{table}->{$tablegroup} }, $_;
 			}
@@ -56,13 +64,21 @@ eval {
 	1;
 } or warn "Could not include count for html entities: $@";
 
-use Unicode::UCD 'charinfo';
-for my $code (0 .. 256**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 );
-}
+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: $@";
 
 for (values %charlist) {
 for my $chars (values %{$_}) {
@@ -99,20 +115,29 @@ for my $chars (values %{$_}) {
 $charlist{fonts} = \@fontlist;
 
 my %osfonts = (
-	win95   => [qw( arial arialuni lucidau verdana timesnew couriernew )],  # microsoft
-	mac10   => [qw( helvetica lucida times garamond palatino )],  # apple
-	android => [qw( roboto noto )],  # google
-	oss     => [qw( dvsans c2k unifont opensans )],
+	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
+	oss     => [qw( dvsans freesans code2000 unifont )],
 );
+if (0) {
+	# copy rows to derive older os versions (same list with different trailing number)
+	s/8$/7/ for @{ $osfonts{  win7} = [@{ $osfonts{  win8} }] };
+	s/9$/7/ for @{ $osfonts{mac107} = [@{ $osfonts{mac109} }] };
+}
+
 my %fontnum = map { ($fontlist[$_]->{file} => $_) } 0 .. $#fontlist;
 while (my ($os, $fontids) = each %osfonts) {
 	$charlist{os}->{$os} = [ map { $fontnum{$_} // () } @{$fontids} ];
 }
-$charlist{osdefault} = [qw( win95 mac10 oss android )];
+$charlist{osdefault} = [qw( win2k win8 mac109 android oss )];
 
 say "# automatically generated by $0";
 say 'use utf8;';
-say '+'.pp(\%charlist);
+say '+', pp(\%charlist) =~ s{
+	( \[ \s* \d [^]]* ) ,\s* (?= \] )  # arrays of numbers, excluding trailing comma
+}{ $1 =~ s/\s+//gr }msxgre;  # strip whitespace
 
 __END__