X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/7ee7a878e0b44cd8306fb0ff35ddbcee216bd7d9..29b407ddf91b653e6e8380f73e221628a392376f:/browser.plp

diff --git a/browser.plp b/browser.plp
index d8ebf86..0d4d4e7 100644
--- a/browser.plp
+++ b/browser.plp
@@ -1,11 +1,10 @@
 <(common.inc.plp)><:
-use 5.010;
-use utf8;
 use List::Util qw(sum max first);
+no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
 Html({
 	title => 'browser compatibility cheat sheet',
-	version => 'v1.2',
+	version => '1.4',
 	description => [
 		"Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
 		"comparing support and usage share for all popular browser versions.",
@@ -21,7 +20,7 @@ Html({
 
 say "<h1>Browser compatibility</h1>\n";
 
-my $caniuse = do 'data/browser/support.inc.pl' or die $! || $@;
+my $caniuse = do 'data/browser/support.inc.pl' or die $@ || $!;
 $_->{verrelease} = {
 	# mark last three (future) versions as unreleased, ensure current isn't
 	map {
@@ -57,7 +56,9 @@ my %DSTATS = (
 	x => sub {
 		join(' ',
 			'requires prefix',
-			(map "-$_-", $caniuse->{agents}->{$_[0]}->{prefix} // ()),
+			map {"-$_-"}
+			($caniuse->{agents}->{$_[0]}->{prefix_exceptions} // {})->{$_[1]}
+			// $caniuse->{agents}->{$_[0]}->{prefix} // (),
 		);
 	},
 );
@@ -66,6 +67,7 @@ my %PSTATS = (  # score percentage
 	a => .5, 'a x' => .5, 'a d' => .1,
 	j => .2, 'p j' => .2, 'n d' => .2, 'n x d' => .2,
 	p => .2, 'p p' => .2, 'p d' => .1,
+	n => 0,   u => 0,
 );
 my %CSTATUS = (
 	unoff => 'l1', # unofficial
@@ -94,11 +96,13 @@ given ($get{usage} // 'wm') {
 		# none
 	}
 	when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
-		printf "<p>Invalid browser usage data request: <em>%s</em>",
-			'identifier must be alphanumeric name or <q>0</q>';
+		Alert([
+			'Invalid browser usage data request',
+			'Identifier must be alphanumeric name or <q>0</q>.',
+		]);
 	}
 	$canihas = do "data/browser/usage-$_.inc.pl" or do {
-		printf "<p>Browser usage data not found: <em>%s</em>", $! || $@;
+		Alert('Browser usage data not found', $@ || $!);
 		break;
 	};
 	$usage = $_;
@@ -268,8 +272,9 @@ sub featurescore {
 		if ($canihas) {
 			while (my ($browser, $versions) = each %$row) {
 				ref $versions eq 'HASH' or next;
-				while (my ($version, $_) = each %$versions) {
-					$rank += ($canihas->{$browser}->{$version} || .001) * $PSTATS{$_};
+				while (my ($version, $status) = each %$versions) {
+					$status =~ s/\h\#\d+//g;
+					$rank += ($canihas->{$browser}->{$version} || .001) * $PSTATS{$status};
 				}
 			}
 			return $rank;
@@ -296,6 +301,7 @@ sub featurescore {
 sub formatnotes {
 	my @html = @_;
 	for (@html) {
+		s/\r\n?/\n/g;  # windows returns
 		s/\h* $//gmx;  # trailing whitespace
 		s/(?<= [^.\n]) $/./gmx;  # consistently end each line by a period
 		Entity($_);
@@ -333,7 +339,7 @@ sub saytitlecol {
 		say '</p>';
 	}
 	printf 'Resources: %s.', join(', ', map {
-		sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), $_->{title}
+		sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), EscapeHTML($_->{title})
 	} @$_) for grep { @$_ } $row->{links} // ();
 	printf '<br>Parent feature: %s.', join(', ', map {
 		sprintf '<a href="%s">%s</a>', EscapeHTML("#$_"), $caniuse->{data}->{$_}->{title}
@@ -385,7 +391,7 @@ sub saybrowsercols {
 
 			# prepare version hover details
 			my $title = sprintf('%.1f%% %s', $usage * $usagepct, join(', ',
-				map { ref $_ eq 'CODE' ? $_->($browser) : $_ }
+				map { ref $_ eq 'CODE' ? $_->($browser, $span[0]->[0]) : $_ }
 				map { $DSTATS{$_} // () }
 				map { split / /, $_ }
 				$prev