font: rename ms core fonts to more appropriate win2k

The project started in 1996, but the final release was in 2002 and is mostly
equivalent to the versions released with Windows 2000.

diff --git a/Makefile b/Makefile
index f0d20bc301d32557da7e1a4716256e5fcf529bf5..c13afc16e0f8feb0ed7c7788f5f47241bfb60107 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ ttfsupport/%.inc.pl: tools/mkttfinfo data/font/%.ttf
 .SECONDARY:
 data/font/%.ttf:
        find /usr/share/fonts/truetype/ ~/.fonts/ -iname "$(@F)" | head -1 | xargs -i ln -sf {} $@
-data/font/%.win95.ttf:
+data/font/%.win2k.ttf:
        find /usr/share/fonts/truetype/msttcorefonts/ -iname "$(*F).ttf" | head -1 | xargs -i ln -sf {} $@
 data/font/dv%.ttf:
        find /usr/share/fonts/truetype/dejavu/ -iname "DejaVu*$(*F).ttf" | head -1 | xargs -i ln -sf {} $@
@@ -60,8 +60,8 @@ ttfsupport: tools/mkttfinfo
        $(MAKE) ttfsupport/all
        touch $@
 
-ttfsupport/all: ttfsupport/all-win95 ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/all-other
-ttfsupport/all-win95: ttfsupport/verdana.win95.inc.pl ttfsupport/times.win95.inc.pl ttfsupport/arial.win95.inc.pl ttfsupport/cour.win95.inc.pl ttfsupport/comic.win95.inc.pl ttfsupport/georgia.win95.inc.pl ttfsupport/arialuni.inc.pl
+ttfsupport/all: ttfsupport/all-win2k ttfsupport/all-dejavu ttfsupport/all-google ttfsupport/all-other
+ttfsupport/all-win2k: ttfsupport/verdana.win2k.inc.pl ttfsupport/times.win2k.inc.pl ttfsupport/arial.win2k.inc.pl ttfsupport/cour.win2k.inc.pl ttfsupport/comic.win2k.inc.pl ttfsupport/georgia.win2k.inc.pl ttfsupport/arialuni.inc.pl
 ttfsupport/all-dejavu: ttfsupport/dvsans.inc.pl ttfsupport/dvserif.inc.pl ttfsupport/dvmono.inc.pl
 ttfsupport/all-google: ttfsupport/droidsans.inc.pl ttfsupport/droidserif.inc.pl ttfsupport/droidmono.inc.pl ttfsupport/roboto.inc.pl ttfsupport/notosans.inc.pl ttfsupport/notoserif.inc.pl
 ttfsupport/all-other: ttfsupport/unifont.inc.pl ttfsupport/code2000.inc.pl ttfsupport/freesans.inc.pl ttfsupport/freeserif.inc.pl

diff --git a/font.plp b/font.plp
index 65b9685394c16d653b30b6d4f0250084a35c53aa..547b297d31c10661f0743fca941c4ea2632ccf32 100644 (file)
--- a/font.plp
+++ b/font.plp
@@ -47,7 +47,7 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
                        "distributed",
                        (map { "by $_" } $fontmeta->{oscorp} || "various sources"),
                        (map { "with <em>$_</em>" } $_ || ()),
-                       ("and published as freeware") x ($_ eq 'Windows 95'),
+                       ('and published as freeware "Core Web font"') x ($_ eq 'Windows 2000'),
                        (map { "under a $_ license" }
                                map { $fontmeta->{license} ? qq(<a href="$fontmeta->{license}">$_</a>) : $_ }
                                $_ && $_ ne 'Android' ? 'proprietary' : 'free',

diff --git a/tools/mkfontinfo b/tools/mkfontinfo
index ed328cf8ea2c0c417fce1f987d25932b44371342..cdd508d3cd5a5cf300474d9ac73a8aba85282809 100755 (executable)
--- a/tools/mkfontinfo
+++ b/tools/mkfontinfo
@@ -114,7 +114,7 @@ for my $chars (values %{$_}) {
 $charlist{fonts} = \@fontlist;
 
 my %osfonts = (
-       win95   => [qw( arial.win95 arialuni lucidau verdana.win95 times.win95 cour.win95 )],  # microsoft
+       win2k   => [qw( arial.win2k arialuni lucidau verdana.win2k times.win2k cour.win2k )],  # microsoft
        win8    => [map {"$_.win8"} qw( arial verdana times georgia pala cour )],
        mac109  => [map {"$_.mac109"} qw( helv lucida times pala )],  # apple
        android => [qw( roboto droidmono notosans )],  # google
@@ -130,7 +130,7 @@ my %fontnum = map { ($fontlist[$_]->{file} => $_) } 0 .. $#fontlist;
 while (my ($os, $fontids) = each %osfonts) {
        $charlist{os}->{$os} = [ map { $fontnum{$_} // () } @{$fontids} ];
 }
-$charlist{osdefault} = [qw( win95 win8 mac109 android oss )];
+$charlist{osdefault} = [qw( win2k win8 mac109 android oss )];
 
 say "# automatically generated by $0";
 say 'use utf8;';

diff --git a/tools/mkttfinfo b/tools/mkttfinfo
index a452389280037aa882dc0e66aa0b6094278cdb21..2523b8f9f0c5531a5df7746ba4bafdf0987ea0e1 100755 (executable)
--- a/tools/mkttfinfo
+++ b/tools/mkttfinfo
@@ -63,12 +63,12 @@ for ($outfile || ()) {
        }gx;
        $meta{os} = $_ for "@ttfext[0 .. $#ttfext-1]" || (
                $meta{copyright} =~ /\bGoogle\b/ ? "Android" :
-               $ttfname eq 'arialuni' ? 'win95' :
+               $ttfname eq 'arialuni' ? 'win2k' :
                ()
        );
        $meta{oscorp} = (
                s/^mac10/OS X 10./ ? 'Apple' :
-               s/^win/Windows / ? 'Microsoft' :
+               s/^win(.+)/'Windows '.($1 eq '2k' ? 2000 : $1)/e ? 'Microsoft' :
                m/^Android/ ? 'Google' :
                undef
        ) for $meta{os} || ();