X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/5f4bdebe887e0d75a9db49bd98631e8df78b015d..500f0b6c97ed53188ddc5b90aa1d25202a821d3a:/tools/mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index 1019043..dc8ddd6 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -109,20 +109,24 @@ 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;';
-say '+'.pp(\%charlist);
+say '+', pp(\%charlist) =~ s{
+	( \[ \s* \d [^]]* ) ,\s*  # arrays of numbers, excluding trailing comma
+}{ $1 =~ s/\s+//gr }msxgre;  # strip whitespace
 
 __END__