From 81016fe5cca26a3ff511010fa88ee9f569897a5e Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 16 Mar 2015 21:20:39 +0100
Subject: [PATCH] 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.
---
 Makefile         | 6 +++---
 font.plp         | 2 +-
 tools/mkfontinfo | 4 ++--
 tools/mkttfinfo  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f0d20bc..c13afc1 100644
--- 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 65b9685..547b297 100644
--- 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 ed328cf..cdd508d 100755
--- 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 a452389..2523b8f 100755
--- 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} || ();
-- 
2.30.0