X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/290c85c0f46c87ae95eeece911bdd3f57ba51dfd..bac74b5934f22cc3d0e971d26fe0275f7f5db7b3:/font.plp

diff --git a/font.plp b/font.plp
index a93835c..fd55017 100644
--- a/font.plp
+++ b/font.plp
@@ -1,9 +1,10 @@
 <(common.inc.plp)><:
-use 5.014;
+
+my $font = $ENV{PATH_INFO} =~ s{^/}{}r;
 
 Html({
-	title => 'character support sheet',
-	version => 'v1.1',
+	title => 'font coverage '.($font ? "for $font" : 'sheet'),
+	version => '1.2',
 	keywords => [qw(
 		unicode font glyph char character support overview cover coverage
 		script block symbol sign mark reference table
@@ -12,7 +13,7 @@ Html({
 	data => [qw( unicode-cover.inc.pl )],
 });
 
-if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
+if ($font) {
 	my ($fontmeta, @cover) = do "ttfsupport/$font.inc.pl";
 	$fontmeta or die "Unknown font $font\n";
 
@@ -31,7 +32,7 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
 
 	say "<h1>Font coverage</h1>";
 	say "<h2>$_</h2>" for EscapeHTML($fontmeta->{name});
-	printf("<p>Version <strong%s>%s</strong> released %s contains %d glyphs.</p>\n",
+	printf("<p>Version <strong%s>%s</strong> released %s contains %d glyphs.",
 		!!$_->[2] && qq( title="revision $_->[2]"),
 		$_->[1], $_->[0],
 		scalar @cover,
@@ -41,9 +42,22 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
 		EscapeHTML($fontmeta->{version}),
 		$fontmeta->{revision},
 	];
-	printf "<p>%s</p>\n", join('<br>', map { $_ ? EscapeHTML($_) : () }
-		$fontmeta->{copyright}, $fontmeta->{license},
-	);
+	for ($fontmeta->{os}) {
+		say '<br>';
+		print ucfirst join(' ',
+			"distributed",
+			(map { "by $_" } $fontmeta->{oscorp} || "various sources"),
+			(map { "with <em>$_</em>" } $_ || ()),
+			('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',
+			),
+		);
+		print '.';
+	}
+	say '</p>';
+	say "<p>$_</p>" for EscapeHTML($fontmeta->{copyright}) || ();
 
 	require Shiar_Sheet::FormatChar;
 	my $glyphs = Shiar_Sheet::FormatChar->new;
@@ -56,6 +70,10 @@ if (my $font = $ENV{PATH_INFO} =~ s{^/}{}r) {
 	.glyphs tbody th[!colspan] { text-align: right }
 	.glyphs tbody td { font-family: "$fontmeta->{name}" }
 	.glyphs tbody td:nth-child(18) { border-left-width: 2px }
+	\@font-face {
+		font-family: "$fontmeta->{name}";
+		src: url(/data/font/$font.ttf);
+	}
 </style>
 EOT
 	say '<table class="glyphs big">';
@@ -160,15 +178,18 @@ if (my $group = $get{q}) {
 
 # output character list
 
-print '<table class=mapped>';
+print '<table class="mapped cover">';
 print '<col><col>';
 print "<colgroup span=$_>"
 	for map { scalar @{ $cover->{os}->{$_} } } @ossel;
 
 print '<thead><tr>';
 print '<th colspan=2>';
-printf '<td colspan=%d>%s fonts', scalar @{ $cover->{os}->{$_} }, $_
-	for @ossel;
+for my $os (@ossel) {
+	my $osfonts = $cover->{os}->{$os};
+	my $osfont = $cover->{fonts}->[ $osfonts->[0] ]; # first font
+	printf '<td colspan=%d>%s', scalar @{$osfonts}, $osfont->{os} || ''
+}
 
 print '<tr>';
 print '<th colspan=2>';
@@ -205,7 +226,7 @@ for (@rows) {
 
 		my $rel = $count / $row->{count};
 		my $class = $rel < .5 ? 2 : $rel < .9 ? 3 : 4;
-		printf '<td class="%s">%d%%', "l$class", $rel*100;
+		printf '<td class="%s">%d', "l$class", $rel*10;
 	}
 	say '</tr>';
 }