X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/3beb5afe2b512a6210caeb8744bc3f91e29c4e66..4e46e11f48bd75bb78cc5b310166287789efdd53:/browser.plp

diff --git a/browser.plp b/browser.plp
index 2ba6e01..55d5e65 100644
--- a/browser.plp
+++ b/browser.plp
@@ -5,13 +5,13 @@ use List::Util qw(sum max first);
 
 Html({
 	title => 'browser compatibility cheat sheet',
-	version => 'v1.0',
+	version => 'v1.1',
 	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
 	'],
@@ -63,12 +63,13 @@ my %DSTATS = (
 );
 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} }) {
@@ -76,12 +77,12 @@ if (my ($somerow) = values %{ $caniuse->{data} }) {
 		$versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
 	}
 }
-my @browsers = keys %versions;
 
 print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
 
-my ($canihas, $usage, $minusage);
+my ($canihas, $usage);
+my $minusage = $get{threshold} // .7;
 given ($get{usage} // 'wm') {
 	when (!$_) {
 		# none
@@ -101,12 +102,18 @@ given ($get{usage} // 'wm') {
 	$ref .= " $_" for $canihas->{-date} || ();
 	print "\nwith $ref browser usage statistics";
 }
+
+my @browsers;
 if ($usage) { # first() does not work inside given >:(
 	# adapt version usage to actual support data
 	my %engineuse;  # prefix => usage sum
 	for my $browser (keys %versions) {
 		my $row = $canihas->{$browser} // {};
 		my $verlist = $versions{$browser} or next;
+		if ($minusage and sum(values %$row) < $minusage) {
+			delete $versions{$browser};
+			next;
+		}
 		my %supported = map { $_ => 1 } @$verlist;
 
 		# cascade unknown versions
@@ -120,7 +127,7 @@ if ($usage) { # first() does not work inside given >:(
 		}
 
 		# build row list for each version
-		if ($minusage = $get{threshold} // .5) {
+		if ($minusage) {
 			my @vershown;  # $verlist replacement
 			my ($rowusage, @verrow) = (0);  # replacement row tracking
 			for (@$verlist) {
@@ -148,7 +155,7 @@ if ($usage) { # first() does not work inside given >:(
 		$engineuse{ $caniuse->{agents}->{$a}->{prefix} }
 			||
 		$canihas->{$b}->{-total} <=> $canihas->{$a}->{-total}
-	} @browsers;
+	} keys %versions;
 }
 else {
 	# order browser columns by name grouped by engine
@@ -157,7 +164,7 @@ else {
 		$caniuse->{agents}->{$a}->{prefix}
 			||
 		$a cmp $b
-	} @browsers;
+	} keys %versions;
 }
 :>.
 </p>
@@ -192,7 +199,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',
@@ -205,17 +212,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];
@@ -232,9 +238,21 @@ 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