From 44b795fc01b6362156d4be10012d34a22b02bfed Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 5 Mar 2015 04:29:52 +0100
Subject: [PATCH] font: automatic name abbreviation

---
 Makefile         |  6 +++---
 tools/mkfontinfo |  2 +-
 tools/mkttfinfo  | 18 ++++--------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index f674f3f..d062099 100644
--- 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-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/times.inc.pl: tools/mkttfinfo
+ttfsupport/timesnew.inc.pl: tools/mkttfinfo
 	$< 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 $@
diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index 09cc4d2..c6626fa 100755
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -99,7 +99,7 @@ for my $chars (values %{$_}) {
 $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 )],
diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index 1d8e699..370ff97 100755
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-use 5.010;
+use 5.014;
 use strict;
 use warnings;
 
@@ -30,18 +30,6 @@ for ($outfile || ()) {
 	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: $!";
@@ -62,7 +50,9 @@ my %FONTID = (
 			}
 		} $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), ',';
-- 
2.30.0