font: more generic rules to parse ttf files

[sheet.git] / tools / mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index 10190437fadb8e78770a388d6d91ffc8fd2ed6c7..12c53a52ed1d3d94b3077fdb4e6de1c965932c60 100755 (executable)
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -109,16 +109,18 @@ for my $chars (values %{$_}) {
 $charlist{fonts} = \@fontlist;
 
 my %osfonts = (
 $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} ];
 }
 );
 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 "# automatically generated by $0";
 say 'use utf8;';