-for my $fontid (qw(d tnr a dv dvs c2k u)) {
- my ($fontmeta, @fontrange) = do "ttfsupport/$fontid.inc.pl";
- push @fontlist, $fontid;
- $font{$fontid} = {
- -name => $fontmeta->{name},
- map { (chr $_ => 1) } @fontrange
- };
+for my $os (@ossel) {
+ my $osfonts = $oslist{$os};
+ for my $fontid (@{$osfonts}) {
+ push @fontlist, $fontid;
+ my ($fontmeta, @fontrange) = do "ttfsupport/$fontid.inc.pl";
+ $fontmeta or next;
+ $font{$fontid} = {
+ -id => $fontmeta->{id} || $fontid,
+ -name => $fontmeta->{name},
+ map { (chr $_ => 1) } @fontrange
+ };
+ }