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.

diff --git a/chars.plp b/chars.plp
index 5b5065e1391ac9a4dce04bd2102d2dbea5022e1a..d02331cb99ceb36d6d75ea44bfe94115e65ac79e 100644 (file)
--- 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 1c29f242c9a5008f2d3c2b5b95ed0185fc55e34f..33909e67ab89d6a8b879964d67f3251fd470f048 100644 (file)
--- 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 5f0c6aa8cd84de36089c58a52f6ccae540a88af4..9d75e0642ef00c89ff585aca2e010e0d96c45e33 100755 (executable)
--- 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";