font: update font groups

[sheet.git] / tools / mkfontinfo

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index dc8ddd602425290b9af0ad84ae9d0dc6e0c840ef..84e7a25147bb80a886c3fcf7f42daef6dc2b16ed 100755 (executable)
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -110,17 +110,22 @@ $charlist{fonts} = \@fontlist;
 
 my %osfonts = (
        win95   => [qw( arial.win95 arialuni lucidau verdana.win95 times.win95 cour.win95 )],  # microsoft
 
 my %osfonts = (
        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 )],
+       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} ];
 }
 my %fontnum = map { ($fontlist[$_]->{file} => $_) } 0 .. $#fontlist;
 while (my ($os, $fontids) = each %osfonts) {
        $charlist{os}->{$os} = [ map { $fontnum{$_} // () } @{$fontids} ];
 }

-$charlist{osdefault} = [qw( win95 win8 mac10 oss android )];
+$charlist{osdefault} = [qw( win95 win8 mac109 android oss )];

 
 say "# automatically generated by $0";
 say 'use utf8;';
 
 say "# automatically generated by $0";
 say 'use utf8;';