common: bump version to 1.10

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index c609a576113f195a3986c0e5a54ca388e33b7e9d..7e096b0514733bc7f76d22f5921f606438019ce8 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -4,7 +4,7 @@ no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
 Html({
        title => 'browser compatibility cheat sheet',
-       version => '1.4',
+       version => '1.5',
        description => [
                "Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
                "comparing support and usage share for all popular browser versions.",
@@ -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,18 +232,18 @@ 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),
+                       showversions($lastver // $span->[0]),
                );
        }
 }
@@ -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 {