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

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index 85fa914..84e7a25 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -65,7 +65,7 @@ eval {
 
 eval {
 	use Unicode::UCD 'charinfo';
-	for my $code (0 .. 256**2) {
+	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
@@ -109,20 +109,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 )],
+	win95   => [qw( arial.win95 arialuni lucidau verdana.win95 times.win95 cour.win95 )],  # 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( win95 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__