X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/da2ff19ce5ba6f5950f155440e7a3386913a216b..cbc1de6f50a19ddb875fab91fcb97ab3c65c402e:/browser.plp

diff --git a/browser.plp b/browser.plp
index c609a57..c890052 100644
--- a/browser.plp
+++ b/browser.plp
@@ -193,11 +193,11 @@ $canihas ||= {
 	} @browsers
 }; # fallback hash based on release semantics
 
-my $usagepct = 1;  # score multiplier for 0..100 result
-# normalise usage percentage to only include shown browsers
-$usagepct = 100.01 / featurescore({  # yes for every possible version
-	map { $_ => { map {$_ => 'y'} map { @{$_} } @{$versions{$_}} } } keys %versions
-});
+# score multiplier for percentage of all browser versions
+my $usagepct = 99.99 / sum(
+	map { $_->{-total} // values %{$_} } values %{$canihas}
+);
+
 $_->{usage} = featurescore($_->{stats}) * $usagepct
 	for values %{ $caniuse->{data} };
 
@@ -232,15 +232,15 @@ print '<thead>', $header;
 # preceding row without any colspan to work around gecko bug
 print "\n<tr>";
 for my $browser (@browsers) {
-	for (@{ $versions{$browser} }) {
+	for my $span (@{ $versions{$browser} }) {
 		my $lastver = first {
 			!defined $caniuse->{agents}->{$browser}->{verrelease}->{$_} # stable
-		} reverse @{$_};
+		} reverse @{$span};
 		printf('<td title="%s"%s>%s',
 			join(' ',
-				sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{@$_}) * $usagepct),
-				'version ' . showversions(@{$_}, undef),
-				$_->[-1] eq $lastver ? () : '(development)',
+				sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{ @{$span} }) * $usagepct),
+				'version ' . showversions(@{$span}, undef),
+				$span->[-1] eq $lastver ? () : '(development)',
 			),
 			!defined $lastver && ' class="ex"',
 			showversions($lastver),
@@ -390,6 +390,10 @@ sub saybrowsercols {
 		);
 		unless (!defined $prev or $prev ~~ $compare) {
 			my @vercover = (map { @{$_} } @span);
+			for ($ver ? @{$ver} : ()) {
+				$data->{$_} eq $data->{$vercover[-1]} or last;
+				push @vercover, $_;  # matches from next span start
+			}
 			my $usage = sum(@{ $canihas->{$browser} }{@vercover});
 
 			# strip #\d note references from support class
@@ -451,9 +455,9 @@ say '</table>';
 
 sub paddedver {
 	# normalised version number comparable as string (cmp)
-	shift =~ /(?:.*-|^)(\d*)(.*)/;
+	$_[0] =~ m/(?:.*-|^)(\d*)(.*)/;
 	# matched (major)(.minor) of last value in range (a-B)
-	return sprintf('%02d', $1 || 99) . $2;
+	return sprintf('%02d', length $1 ? $1 : 99) . $2;
 }
 
 sub showversions {