browser: name loop variable of version header cells

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index a101d741e4fb2071e0499b9cd65b9c85601cae90..5c3f769dcbc34ef88343d8845b9212d1c3d44059 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -39,23 +39,19 @@ my %CSTATS = (
        'y x' => 'l5 ex',
        'a'   => 'l3',
        'a x' => 'l3 ex',
-       'p j' => 'l2',
-       'j'   => 'l2',
        'p'   => 'l2',
-       'p p' => 'l2',
        'u'   => 'l0',
 );
 my %DSTATS = (
        u => 'unknown',
        n => 'unsupported',
        p => 'plugin required',
-       j => 'javascript 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} // (),
@@ -64,10 +60,10 @@ my %DSTATS = (
 );
 my %PSTATS = (  # score percentage
        y => 1,  'y x' => .9,
-       a => .5, 'a x' => .5, 'a d' => .1,
-       j => .2, 'p j' => .2, 'n d' => .2, 'n x d' => .2,
-       p => .2, 'p p' => .2, 'p d' => .1,
-       n => 0,   u => 0,
+       a => .5, 'a x' => .5, 'a d' => .2,
+       p => .2, 'p d' => .1,
+       n => 0,  'n d' => .2, 'n x d' => .2,
+       u => 0,
 );
 my %CSTATUS = (
        unoff => 'l1', # unofficial
@@ -236,17 +232,17 @@ print '<thead>', $header;
 # preceding row without any colspan to work around gecko bug
 print "\n<tr>";
 for my $browser (@browsers) {
-       for (@{ $versions{$browser} }) {
-               my $lastver = $_->[-1];
-               my $release = $caniuse->{agents}->{$browser}->{verrelease}->{$lastver};
-               my $future = defined $release;
+       for my $span (@{ $versions{$browser} }) {
+               my $lastver = first {
+                       !defined $caniuse->{agents}->{$browser}->{verrelease}->{$_} # stable
+               } reverse @{$span};
                printf('<td title="%s"%s>%s',
                        join(' ',
-                               sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{@$_}) * $usagepct),
-                               $future ? 'development' : (),
-                               'version ' . join(', ', @{$_}),
+                               sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{ @{$span} }) * $usagepct),
+                               'version ' . showversions(@{$span}, undef),
+                               $span->[-1] eq $lastver ? () : '(development)',
                        ),
-                       $future && ' class="ex"',
+                       !defined $lastver && ' class="ex"',
                        showversions($lastver),
                );
        }
@@ -393,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;
@@ -401,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);
 
@@ -419,7 +423,7 @@ sub saybrowsercols {
                                ),
                                scalar @span,
                                $title,
-                               showversions($span[0]->[0], @span > 1 ? ($span[-1]->[-1]) : ()),
+                               showversions($span[0]->[0], @span > 1 ? $span[-1]->[-1] : ()),
                        );
                        undef $prev;
                        @span = ();
@@ -457,13 +461,10 @@ sub paddedver {
 }
 
 sub showversions {
-       my @span = ($_[0], @_>1 ? $_[-1] : ());
-       s/-.*// for $span[0];
-       for (@span) {
-               s/^\./0./;
-               s/x$/.*/;
-               s/.*-//;
-       }
+       # title to describe minumum version and optional maximum for multiple cells
+       my @span = (map { split /-/ } grep { defined } @_);
+       return $span[0] =~ s/\.0\z//r if @_ <= 1;
+       splice @span, 1, -1;
        return join('‒', @span);
 }