font: automatic name abbreviation

diff --git a/Makefile b/Makefile
index f674f3f98974057a65425ad218f2760921a5848b..d06209976a6c7ca0155e7f91a06d75f66c34b6ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,14 +41,14 @@ ttfsupport: tools/mkttfinfo
 
 ttfsupport/all: ttfsupport/all-ms ttfsupport/all-apple ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/unifont.inc.pl ttfsupport/c2k.inc.pl
 
 
 ttfsupport/all: ttfsupport/all-ms ttfsupport/all-apple ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/unifont.inc.pl ttfsupport/c2k.inc.pl
 

-ttfsupport/all-ms: ttfsupport/verdana.inc.pl ttfsupport/times.inc.pl ttfsupport/arial.inc.pl ttfsupport/courier.inc.pl ttfsupport/comic.inc.pl ttfsupport/georgia.inc.pl ttfsupport/arialuni.inc.pl
+ttfsupport/all-ms: ttfsupport/verdana.inc.pl ttfsupport/timesnew.inc.pl ttfsupport/arial.inc.pl ttfsupport/couriernew.inc.pl ttfsupport/comic.inc.pl ttfsupport/georgia.inc.pl ttfsupport/arialuni.inc.pl

 ttfsupport/verdana.inc.pl: tools/mkttfinfo
        $< Verdana.ttf $@
 ttfsupport/verdana.inc.pl: tools/mkttfinfo
        $< Verdana.ttf $@

-ttfsupport/times.inc.pl: tools/mkttfinfo
+ttfsupport/timesnew.inc.pl: tools/mkttfinfo

        $< Times_New_Roman.ttf $@
 ttfsupport/arial.inc.pl: tools/mkttfinfo
        $< Arial.ttf $@
        $< Times_New_Roman.ttf $@
 ttfsupport/arial.inc.pl: tools/mkttfinfo
        $< Arial.ttf $@

-ttfsupport/courier.inc.pl: tools/mkttfinfo
+ttfsupport/couriernew.inc.pl: tools/mkttfinfo

        $< Courier_New.ttf $@
 ttfsupport/comic.inc.pl: tools/mkttfinfo
        $< Comic_Sans_MS.ttf $@
        $< Courier_New.ttf $@
 ttfsupport/comic.inc.pl: tools/mkttfinfo
        $< Comic_Sans_MS.ttf $@

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index 09cc4d24e1839139d5cb43e801143972c8bd0cdb..c6626fa397bbb32e0e74e8b5d963355cf0a6efbd 100755 (executable)
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -99,7 +99,7 @@ for my $chars (values %{$_}) {
 $charlist{fonts} = \@fontlist;
 
 my %osfonts = (
 $charlist{fonts} = \@fontlist;
 
 my %osfonts = (

-       win95   => [qw( arial arialuni lucidau verdana times courier )],  # microsoft
+       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 )],
        mac10   => [qw( helvetica lucida times garamond palatino )],  # apple
        android => [qw( roboto noto )],  # google
        oss     => [qw( dvsans c2k unifont opensans )],

diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index 1d8e69906269d95af82fb6844798c4b126f9d06d..370ff97289204ecb7a8cc28f7324913d05f0781c 100755 (executable)
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
 #!/usr/bin/env perl

-use 5.010;
+use 5.014;

 use strict;
 use warnings;
 
 use strict;
 use warnings;
 


@@ -30,18 +30,6 @@ for ($outfile || ()) {
        select $output;
 }
 
        select $output;
 }
 

-my %FONTID = (
-       'Times New Roman' => 'times',
-       'DejaVu Sans'     => 'dv ss',
-       'DejaVu Serif'    => 'dv serif',
-       'DejaVu Sans Mono'=> 'dv mono',
-       'Code2000'        => 'c2k',
-       'GNU Unifont'     => 'guf',
-       'Droid Sans'      => 'droid',
-       'Droid Serif'     => 'droid serif',
-       'Droid Sans Mono' => 'droid mono',
-);
-

 {
        my $ttf = Font::TTF::Font->open($ttfuri)
                or die "Cannot open truetype in $ttfuri: $!";
 {
        my $ttf = Font::TTF::Font->open($ttfuri)
                or die "Cannot open truetype in $ttfuri: $!";


@@ -62,7 +50,9 @@ my %FONTID = (
                        }
                } $ttf->{head}->getdate),
        );
                        }
                } $ttf->{head}->getdate),
        );

-       $meta{abbr} = $FONTID{ $meta{name} } // lc $ttfname;
+       $meta{abbr} = lc join '', $meta{name} =~ s/ MS$//r =~ m{
+               (?!Sans) (?<! [0-9]) ([[:upper:]0-9])
+       }gx;

 
        say "# automatically generated by $0";
        say '+', pp(\%meta), ',';
 
        say "# automatically generated by $0";
        say '+', pp(\%meta), ',';