X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/aeb3c2b89b75f171d481c410690c6207b9d2dc83..18402f44dfbfb0f3ab6f6069e51ac78c7e17707a:/browser.plp

diff --git a/browser.plp b/browser.plp
index 930c435..a100bcb 100644
--- a/browser.plp
+++ b/browser.plp
@@ -1,10 +1,9 @@
 <(common.inc.plp)><:
 use List::Util qw(sum max first);
-no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
 Html({
 	title => 'browser compatibility cheat sheet',
-	version => '1.5',
+	version => '1.6',
 	description => [
 		"Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
 		"comparing support and usage share for all popular browser versions.",
@@ -14,13 +13,12 @@ Html({
 		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 => ['data/browser/support.inc.pl'],
 });
 
 say "<h1>Browser compatibility</h1>\n";
 
-my $caniuse = do 'data/browser/support.inc.pl' or die $@ || $!;
+my $caniuse = Data('data/browser/support');
 
 my %CSTATS = (
 	'n'   => 'l1',
@@ -73,10 +71,7 @@ my %CSTATUS = (
 );
 my %versions;
 while (my ($browser, $row) = each %{ $caniuse->{agents} }) {
-	$versions{$browser} = [
-		sort { paddedver($a) cmp paddedver($b) } grep { defined }
-		@{ $row->{versions} }
-	];
+	$versions{$browser} = [@{ $row->{versions} }];
 }
 
 my $ref = showlink('Can I use', 'https://caniuse.com/');
@@ -87,19 +82,19 @@ say '<p id="intro">Alternate rendition of '.$ref;
 
 my ($canihas, $usage);
 my $minusage = $get{threshold} // 1;
-given ($get{usage} // 'wm') {
-	when (!$_) {
-		# none
-	}
-	when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
+for ($get{usage} // 'wm') {
+	$_ or next;  # none
+	unless (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>.',
 		]);
+		next;
 	}
-	$canihas = do "data/browser/usage-$_.inc.pl" or do {
-		Alert('Browser usage data not found', $@ || $!);
-		break;
+
+	$canihas = eval { Data("data/browser/usage-$_") } or do {
+		Alert('Browser usage data not found', ref $@ ? @{$@} : $@);
+		next;
 	};
 	$usage = $_;
 	my $ref = $canihas->{-title} || 'unknown';
@@ -395,7 +390,7 @@ sub saybrowsercols {
 			// $prev                     # inherit from predecessor
 			|| 'u'                       # unsure
 		);
-		if (defined $prev and not $prev ~~ $compare) {
+		if (defined $prev and not (defined $compare and $prev eq $compare)) {
 			# different columns
 			my @vercover = (map { @{$_} } @span);  # accumulated conforming versions
 			for ($ver ? @{$ver} : ()) {
@@ -470,7 +465,7 @@ sub paddedver {
 	# normalised version number comparable as string (cmp)
 	$_[0] =~ m/(?:.*-|^)(\d*)(.*)/;
 	# matched (major)(.minor) of last value in range (a-B)
-	return sprintf('%02d', length $1 ? $1 : 99) . $2;
+	return sprintf('%03d', length $1 ? $1 : 999) . $2;
 }
 
 sub showversions {