X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e6123313e3d9fe59ae9334aa4324b42d62f6a0d8..2a99bcdadec88d7483903e2c8420ad3e78fcb805:/browser.plp

diff --git a/browser.plp b/browser.plp
index bd6d8ab..0d4d4e7 100644
--- a/browser.plp
+++ b/browser.plp
@@ -1,27 +1,26 @@
 <(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.0',
+	version => '1.4',
 	description => [
 		"Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
 		"comparing support and usage share for all popular browser versions.",
 	],
 	keywords => [qw'
-		web browser support compatibility usage available feature
+		web browser support compatibility usage matrix available feature
 		html html5 css css3 svg javascript js dom mobile
 		ie internet explorer firefox chrome safari webkit opera
 	'],
 	stylesheet => [qw'circus dark mono red light'],
-	data => ['browser-support.inc.pl'],
+	data => ['data/browser/support.inc.pl'],
 });
 
 say "<h1>Browser compatibility</h1>\n";
 
-my $caniuse = do '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,18 +56,28 @@ my %DSTATS = (
 	x => sub {
 		join(' ',
 			'requires prefix',
-			(map "-$_-", $caniuse->{agents}->{$_[0]}->{prefix} // ()),
+			map {"-$_-"}
+			($caniuse->{agents}->{$_[0]}->{prefix_exceptions} // {})->{$_[1]}
+			// $caniuse->{agents}->{$_[0]}->{prefix} // (),
 		);
 	},
 );
+my %PSTATS = (  # score percentage
+	y => 1,  'y x' => .9,
+	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
-	wd    => 'l3', # draft
-	cr    => 'l4', # candidate
-	pr    => 'l4', # proposed
+	wd    => 'l2', # draft
+	cr    => 'l3', # candidate
+	pr    => 'l3', # proposed
 	rec   => 'l5', # recommendation
-	other => 'l2', # non-w3
-	ietf  => 'l5', # standard
+	ls    => 'l4', # whatwg
+	ietf  => 'l0', # standard
+	other => 'l0', # non-w3
 );
 my %versions;
 if (my ($somerow) = values %{ $caniuse->{data} }) {
@@ -81,17 +90,19 @@ print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
 
 my ($canihas, $usage);
-my $minusage = $get{threshold} // .5;
+my $minusage = $get{threshold} // .7;
 given ($get{usage} // 'wm') {
 	when (!$_) {
 		# none
 	}
-	when (!/^[a-z][\w-]+$/) {
-		printf "<p>Invalid browser usage data request: <em>%s</em>",
-			'identifier must be alphanumeric name or <q>0</q>';
+	when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
+		Alert([
+			'Invalid browser usage data request',
+			'Identifier must be alphanumeric name or <q>0</q>.',
+		]);
 	}
-	$canihas = do "browser-usage-$_.inc.pl" or do {
-		printf "<p>Browser usage data not found: <em>%s</em>", $! || $@;
+	$canihas = do "data/browser/usage-$_.inc.pl" or do {
+		Alert('Browser usage data not found', $@ || $!);
 		break;
 	};
 	$usage = $_;
@@ -158,6 +169,7 @@ if ($usage) { # first() does not work inside given >:(
 }
 else {
 	# order browser columns by name grouped by engine
+	@{$_} = map { [$_] } @{$_} for values %versions;
 	@browsers = sort {
 		$caniuse->{agents}->{$b}->{prefix} cmp
 		$caniuse->{agents}->{$a}->{prefix}
@@ -198,7 +210,7 @@ say '</colgroup><col>';
 
 my $header = join('',
 	'<tr>',
-	'<th colspan="3">feature',
+	'<th colspan="3" rowspan="2">feature',
 	(map {
 		my $name = $caniuse->{agents}->{$_}->{browser};
 		sprintf('<th colspan="%d" class="%s" title="%s">%s',
@@ -211,17 +223,16 @@ my $header = join('',
 				$name,
 			),
 			do {
-				length $name < 3 + @{ $versions{$_} }*2 ? $name
+				length $name <= (3 * @{ $versions{$_} }) ? $name
 					: $caniuse->{agents}->{$_}->{abbr};
 			},
 		)
 	} @browsers),
-	'<th>%',
+	'<th rowspan="2">%',
 );
 print '<thead>', $header;
 # preceding row without any colspan to work around gecko bug
 print "\n<tr>";
-print '<td>' x 3;
 for my $browser (@browsers) {
 	for (@{ $versions{$browser} }) {
 		my $lastver = $_->[-1];
@@ -238,20 +249,32 @@ for my $browser (@browsers) {
 		);
 	}
 }
-print '<td>' x 1;
 say '</thead>';
-say '<tfoot>', $header, '</tfoot>';
+say '<tfoot>', $header;
+{
+	# prefix indicates browser family; count adjacent families
+	my (@families, %familycount);
+	for my $browser (@browsers) {
+		my $family = $caniuse->{agents}->{$browser}->{prefix};
+		push @families, $family unless $familycount{$family};
+		$familycount{$family} += @{ $versions{$browser} };
+	}
+
+	print "\n", '<tr class="cat">';
+	printf '<th colspan="%d">%s', $familycount{$_}, $_ for @families;
+}
+say '</tfoot>';
 
 sub featurescore {
 	# relative amount of support for given feature
-	state $statspts = { y=>1, 'y x'=>1, a=>.5, 'a x'=>.5, j=>.2, 'p j'=>.2, 'p p'=>.2, p=>.1 };
 	my $rank = 0;
 	if (my $row = shift) {
 		if ($canihas) {
 			while (my ($browser, $versions) = each %$row) {
 				ref $versions eq 'HASH' or next;
-				while (my ($version, $_) = each %$versions) {
-					$rank += ($canihas->{$browser}->{$version} || .001) * $statspts->{$_};
+				while (my ($version, $status) = each %$versions) {
+					$status =~ s/\h\#\d+//g;
+					$rank += ($canihas->{$browser}->{$version} || .001) * $PSTATS{$status};
 				}
 			}
 			return $rank;
@@ -269,12 +292,25 @@ sub featurescore {
 				}
 				splice @vers, -1, 0, @future;  # move ahead to decrease precedence
 			}
-			$rank += $statspts->{$_} * 2**($div--) for reverse @vers;
+			$rank += $PSTATS{$_} * 2**($div--) for reverse @vers;
 		}
 	}
 	return $rank;
 }
 
+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($_);
+		s{  ` ([^`]*)  ` }{<code>$1</code>}gx;
+		s{ \[ ([^]]*) \] \( ([^)]*) \) }{<a href="$2">$1</a>}gx;
+	}
+	return @html;
+}
+
 sub saytitlecol {
 	my ($id) = @_;
 	my $row = $caniuse->{data}->{$id};
@@ -295,11 +331,15 @@ sub saytitlecol {
 		);
 	} $row->{title};
 	print '<div class=aside>';
-	s/\.?$/./, print "<p>$_</p>" for map { ref $_ ? @$_ : $_ || () }
-		Entity($row->{description}),
-		map { s/\s*\n/\n<br>/g; $_ } $row->{notes};
+	print "<p>$_</p>"
+		for formatnotes($row->{description}, $row->{notes} || ());
+	if (my %notes = %{ $row->{notes_by_num} }) {
+		say '<p>Browser-specific notes:';
+		say "<br>#$_: ", formatnotes($notes{$_}) for sort keys %notes;
+		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}
@@ -351,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