X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/c2c689e77c561226e525b7e4a76f188878d68c5a..03abf85a7ec9775993766a3fd10cd2876aef0b42:/browser.plp

diff --git a/browser.plp b/browser.plp
index 44c2b22..a135d35 100644
--- a/browser.plp
+++ b/browser.plp
@@ -48,10 +48,10 @@ my %DSTATS = (
 	p => 'plugin required',
 	a => 'partial',
 	y => 'supported',
-	d => 'disabled by default',
+	d => '(disabled by default)',
 	x => sub {
 		join(' ',
-			'requires prefix',
+			'with prefix',
 			map {"-$_-"}
 			($caniuse->{agents}->{$_[0]}->{prefix_exceptions} // {})->{$_[1]}
 			// $caniuse->{agents}->{$_[0]}->{prefix} // (),
@@ -195,7 +195,7 @@ $canihas ||= {
 
 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
+$usagepct = 99.99 / featurescore({  # yes for every possible version
 	map { $_ => { map {$_ => 'y'} map { @{$_} } @{$versions{$_}} } } keys %versions
 });
 $_->{usage} = featurescore($_->{stats}) * $usagepct
@@ -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),
@@ -389,7 +389,12 @@ sub saybrowsercols {
 			|| 'u'                       # unsure
 		);
 		unless (!defined $prev or $prev ~~ $compare) {
-			my $usage = sum(@{ $canihas->{$browser} }{ map { @{$_} } @span });
+			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
 			my @notes;
@@ -397,11 +402,14 @@ sub saybrowsercols {
 				while $prev =~ s/\h \# (\d+) \b//x;
 
 			# prepare version hover details
-			my $title = sprintf('%.1f%% %s', $usage * $usagepct, join(', ',
-				map { ref $_ eq 'CODE' ? $_->($browser, $span[0]->[0]) : $_ }
-				map { $DSTATS{$_} // () }
-				map { split / /, $_ }
-				$prev
+			my $title = sprintf('%.1f%% %s', $usage * $usagepct, join(' ',
+				(map { ref $_ eq 'CODE' ? $_->($browser, $vercover[0]) : $_ }
+				 map { $DSTATS{$_} // () }
+				 map { split / /, $_ }
+				 $prev
+				),
+				'in', $caniuse->{agents}->{$browser}->{abbr},
+				showversions(@vercover, undef),
 			));
 			$title .= "\n$_" for notestotitle(@notes);