From 39abcad88c47cc5971cc5f2e9f7696d432316038 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 14 Feb 2015 19:56:15 +0100
Subject: [PATCH] font: drop droid in favour of roboto and noto

Android v4.0 replaced default font (though with mostly identical coverage).
Meanwhile Droid was further developed as Noto striving for greater Unicode
coverage.
---
 chars.plp              |  2 +-
 font.plp               |  2 +-
 tools/convert-allfonts | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/chars.plp b/chars.plp
index 5b5065e..d02331c 100644
--- a/chars.plp
+++ b/chars.plp
@@ -17,7 +17,7 @@ my $glyphs = Shiar_Sheet::FormatChar->new;
 my %oslist = (
 	win95   => [qw( arial ariuni verdana times )],  # microsoft
 	mac10   => [qw( lucida garamond )],  # apple
-	android => [qw( droidsans )],  # google
+	android => [qw( roboto noto )],  # google
 	oss     => [qw( dvsans c2k unifont )],
 );
 my @ossel = qw( win95 mac10 oss android );
diff --git a/font.plp b/font.plp
index 1c29f24..33909e6 100644
--- a/font.plp
+++ b/font.plp
@@ -29,7 +29,7 @@ my $glyphs = Shiar_Sheet::FormatChar->new;
 my %oslist = (
 	win95   => [qw( arial ariuni verdana times courier )],  # microsoft
 	mac10   => [qw( lucida garamond )],  # apple
-	android => [qw( droidsans )],  # google
+	android => [qw( roboto noto )],  # google
 	oss     => [qw( dvsans c2k unifont )],
 );
 my @ossel = qw( win95 mac10 oss android );
diff --git a/tools/convert-allfonts b/tools/convert-allfonts
index 5f0c6aa..9d75e06 100755
--- a/tools/convert-allfonts
+++ b/tools/convert-allfonts
@@ -56,7 +56,7 @@ if (my $dvpath = '/usr/share/fonts/truetype/ttf-dejavu') {
 
 if (my $gdpath = '/usr/share/fonts/truetype/droid') {
 	if (my $src = first { -e } map { glob "$_/DroidSans.ttf" } $gdpath, @ttfpath) {
-		system $convbin, $src, "$outdir/droidsans.inc.pl";
+		system $convbin, $src, "$outdir/droid.inc.pl";
 	}
 	if (my $src = first { -e } map { glob "$_/DroidSerif.ttf" } $gdpath, @ttfpath) {
 		system $convbin, $src, "$outdir/droidserif.inc.pl";
@@ -66,6 +66,21 @@ if (my $gdpath = '/usr/share/fonts/truetype/droid') {
 	}
 }
 
+if (my $grpath = '/usr/share/fonts/truetype/roboto') {
+	if (my $src = first { -e } map { glob "$_/Roboto-Regular.ttf" } $grpath, @ttfpath) {
+		system $convbin, $src, "$outdir/roboto.inc.pl";
+	}
+}
+
+if (my $gnpath = '/usr/share/fonts/truetype/noto') {
+	if (my $src = first { -e } map { glob "$_/NotoSans-Regular.ttf" } $gnpath, @ttfpath) {
+		system $convbin, $src, "$outdir/noto.inc.pl";
+	}
+	if (my $src = first { -e } map { glob "$_/NotoSerif-Regular.ttf" } $gnpath, @ttfpath) {
+		system $convbin, $src, "$outdir/noto.inc.pl";
+	}
+}
+
 {
 	if (my $src = first { -e } map { glob "$_/code2000.ttf" } @ttfpath) {
 		system $convbin, $src, "$outdir/c2k.inc.pl";
-- 
2.30.0