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

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index c6626fa..12c53a5 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -18,6 +18,12 @@ for my $fontfile (glob 'ttfsupport/*'.$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 };
 }
@@ -35,6 +41,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 +63,16 @@ 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 {
+	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 );
+	}
+	1;
+} or warn "Could not include unicode groups: $@";
 
 for (values %charlist) {
 for my $chars (values %{$_}) {
@@ -99,16 +109,18 @@ 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 )],
+	win95   => [qw( arial.win95 arialuni lucidau verdana.win95 times.win95 cour.win95 )],  # microsoft
+	win7    => [qw( arial.win7 verdana.win7 times.win7 cour.win7 )],
+	win8    => [qw( arial.win8 verdana.win8 times.win8 cour.win8 )],
+	mac10   => [qw( helvetica.mac10 lucida.mac10 times.mac10 garamond.mac10 palatino.mac10 lucida.mac10 )],  # apple
+	android => [qw( roboto notosans )],  # google
+	oss     => [qw( dvsans code2000 unifont opensans )],
 );
 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( win95 win8 mac10 oss android )];
 
 say "# automatically generated by $0";
 say 'use utf8;';