unicode: group spaces and dashes

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index 7eaa669386c0fe63430e66d92b948795d4ac63b6..da50b2d496bc8ed938a0ca8ec8d08cbe4e323c09 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -68,8 +68,7 @@ if (my ($somerow) = values %{ $caniuse->{data} }) {
                $versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
        }
 }
-my @browsers = grep { $versions{$_} }
-       qw(trident gecko webkit_saf ios_saf webkit_chr android presto op_mob op_mini);
+my @browsers = keys %versions;
 
 print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
@@ -79,7 +78,7 @@ given ($get{usage} // 'wm') {
        when (!$_) {
                # none
        }
-       when (!/^\w+$/) {
+       when (!/^[a-z][\w-]+$/) {
                printf "<p>Invalid browser usage data request: <em>%s</em>",
                        'identifier must be alphanumeric name or <q>0</q>';
        }
@@ -94,11 +93,14 @@ given ($get{usage} // 'wm') {
        $ref .= " $_" for $canihas->{-date} || ();
        print "\nwith $ref browser usage statistics";
 }
-if ($usage) {
-       # first() does not work inside given >:(
+if ($usage) { # first() does not work inside given >:(
+       # adapt version usage to actual support data
+       my %engineuse;  # prefix => usage sum
        while (my ($browser, $row) = each %$canihas) {
                my $verlist = $versions{$browser} or next;
                my %supported = map { $_ => 1 } @$verlist;
+
+               # cascade unknown versions
                $row->{$_} //= undef for @$verlist;  # ensure stable keys during iteration
                while (my ($version, $usage) = each %$row) {
                        next if defined $supported{$version};
@@ -107,7 +109,28 @@ if ($usage) {
                        $row->{$next} += $usage;
                        $row->{$version} = 0;  # balance browser total
                }
+
+               # reusable aggregates (grouped by prefix (engine) and browser)
+               $engineuse{ $caniuse->{agents}->{$browser}->{prefix} } +=
+               $row->{-total} = sum(values %$row);
        }
+
+       # order browser columns by usage grouped by engine
+       @browsers = sort {
+               $engineuse{ $caniuse->{agents}->{$b}->{prefix} } <=>
+               $engineuse{ $caniuse->{agents}->{$a}->{prefix} }
+                       ||
+               $canihas->{$b}->{-total} <=> $canihas->{$a}->{-total}
+       } @browsers;
+}
+else {
+       # order browser columns by name grouped by engine
+       @browsers = sort {
+               $caniuse->{agents}->{$b}->{prefix} cmp
+               $caniuse->{agents}->{$a}->{prefix}
+                       ||
+               $a cmp $b
+       } @browsers;
 }
 :>.
 </p>
@@ -131,7 +154,7 @@ my $usagemax = (max(map { ref $_ eq 'HASH' && sum(values %$_) } values %$canihas
 
 my $usagepct = 1;  # score multiplier for 0..100 result
 # normalise usage percentage to only include shown browsers
-$usagepct = 100 / featurescore({  # yes for every possible version
+$usagepct = 100.01 / featurescore({  # yes for every possible version
        map { $_ => { map {$_ => 'y'} @{$versions{$_}} } } keys %versions
 });
 
@@ -151,7 +174,7 @@ my $header = join('',
                                $_, @{ $caniuse->{agents}->{$_} }{'prefix', 'type'},
                        ),
                        join(' ',
-                               sprintf('%.1f%%', sum(values %{ $canihas->{$_} }) * $usagepct),
+                               sprintf('%.1f%%', $canihas->{$_}->{-total} * $usagepct),
                                $name,
                        ),
                        do {
@@ -265,12 +288,19 @@ sub saystatuscol {
 sub saybrowsercols {
        my ($id, $browser) = @_;
        my $data = $caniuse->{data}->{$id}->{stats}->{$browser};
+       if (ref $data eq 'ARRAY') {
+               # special case for unsupported
+               my $release = $caniuse->{agents}->{$browser}->{verrelease};
+               $data = {
+                       map { $_ => defined $release->{$_} ? 'u' : 'n' } keys %$release
+               };
+       }
 
        my ($prev, @span);
        for my $ver (@{ $versions{$browser} }, undef) {
                my $compare = (
                        !defined $ver ? undef :      # last column if nameless
-                       ref $data ne 'HASH' ? 'u' :  # unsupported if no support hash
+                       ref $data ne 'HASH' ? '' :   # unclassified if no support hash
                        $data->{$ver} // $prev       # known or inherit from predecessor
                        // (grep { defined } @{$data}{ @{ $versions{$browser} } })[0]
                           ~~ 'n' && 'n'             # first known version is unsupported