countries: move flag images into data/, ignore

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index 322fa36d42d31b206302b1070c5a7a79e37bf3cd..04599d01b14377465b285b8b0df3b645e17e08c9 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -5,23 +5,23 @@ use List::Util qw(sum max first);
 
 Html({
        title => 'browser compatibility cheat sheet',
-       version => 'v1.0',
+       version => 'v1.1',
        description => [
                "Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
                "comparing support and usage share for all popular browser versions.",
        ],
        keywords => [qw'
-               web browser support compatibility usage available feature
+               web browser support compatibility usage matrix available feature
                html html5 css css3 svg javascript js dom mobile
                ie internet explorer firefox chrome safari webkit opera
        '],
        stylesheet => [qw'circus dark mono red light'],
-       data => ['browser-support.inc.pl'],
+       data => ['data/browser/support.inc.pl'],
 });
 
 say "<h1>Browser compatibility</h1>\n";
 
-my $caniuse = do 'browser-support.inc.pl' or die $! || $@;
+my $caniuse = do 'data/browser/support.inc.pl' or die $! || $@;
 $_->{verrelease} = {
        # mark last three (future) versions as unreleased, ensure current isn't
        map {
@@ -63,12 +63,13 @@ my %DSTATS = (
 );
 my %CSTATUS = (
        unoff => 'l1', # unofficial
-       wd    => 'l3', # draft
-       cr    => 'l4', # candidate
-       pr    => 'l4', # proposed
+       wd    => 'l2', # draft
+       cr    => 'l3', # candidate
+       pr    => 'l3', # proposed
        rec   => 'l5', # recommendation
-       other => 'l2', # non-w3
-       ietf  => 'l5', # standard
+       ls    => 'l4', # whatwg
+       ietf  => 'l0', # standard
+       other => 'l0', # non-w3
 );
 my %versions;
 if (my ($somerow) = values %{ $caniuse->{data} }) {
@@ -81,16 +82,16 @@ print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
 
 my ($canihas, $usage);
-my $minusage = $get{threshold} // .5;
+my $minusage = $get{threshold} // .7;
 given ($get{usage} // 'wm') {
        when (!$_) {
                # none
        }
-       when (!/^[a-z][\w-]+$/) {
+       when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
                printf "<p>Invalid browser usage data request: <em>%s</em>",
                        'identifier must be alphanumeric name or <q>0</q>';
        }
-       $canihas = do "browser-usage-$_.inc.pl" or do {
+       $canihas = do "data/browser/usage-$_.inc.pl" or do {
                printf "<p>Browser usage data not found: <em>%s</em>", $! || $@;
                break;
        };
@@ -158,6 +159,7 @@ if ($usage) { # first() does not work inside given >:(
 }
 else {
        # order browser columns by name grouped by engine
+       @{$_} = map { [$_] } @{$_} for values %versions;
        @browsers = sort {
                $caniuse->{agents}->{$b}->{prefix} cmp
                $caniuse->{agents}->{$a}->{prefix}
@@ -198,7 +200,7 @@ say '</colgroup><col>';
 
 my $header = join('',
        '<tr>',
-       '<th colspan="3">feature',
+       '<th colspan="3" rowspan="2">feature',
        (map {
                my $name = $caniuse->{agents}->{$_}->{browser};
                sprintf('<th colspan="%d" class="%s" title="%s">%s',
@@ -211,17 +213,16 @@ my $header = join('',
                                $name,
                        ),
                        do {
-                               length $name < 3 + @{ $versions{$_} }*2 ? $name
+                               length $name <= (3 * @{ $versions{$_} }) ? $name
                                        : $caniuse->{agents}->{$_}->{abbr};
                        },
                )
        } @browsers),
-       '<th>%',
+       '<th rowspan="2">%',
 );
 print '<thead>', $header;
 # preceding row without any colspan to work around gecko bug
 print "\n<tr>";
-print '<td>' x 3;
 for my $browser (@browsers) {
        for (@{ $versions{$browser} }) {
                my $lastver = $_->[-1];
@@ -238,7 +239,6 @@ for my $browser (@browsers) {
                );
        }
 }
-print '<td>' x 1;
 say '</thead>';
 say '<tfoot>', $header;
 {
@@ -251,9 +251,7 @@ say '<tfoot>', $header;
        }
 
        print "\n", '<tr class="cat">';
-       print '<td>' x 3;
        printf '<th colspan="%d">%s', $familycount{$_}, $_ for @families;
-       print '<td>';
 }
 say '</tfoot>';