index: bump version to 1.6

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index e65395ea1cba69b0c20a047ade609b17756be26e..8a5fba88bcc86b6e2585c238ec7f97d443073dac 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.2',
        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 {
@@ -61,6 +61,12 @@ 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,
+);
 my %CSTATUS = (
        unoff => 'l1', # unofficial
        wd    => 'l2', # draft
@@ -82,16 +88,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;
        };
@@ -159,6 +165,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}
@@ -199,7 +206,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',
@@ -212,17 +219,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];
@@ -239,7 +245,6 @@ for my $browser (@browsers) {
                );
        }
 }
-print '<td>' x 1;
 say '</thead>';
 say '<tfoot>', $header;
 {
@@ -252,22 +257,19 @@ say '<tfoot>', $header;
        }
 
        print "\n", '<tr class="cat">';
-       print '<td>' x 3;
        printf '<th colspan="%d">%s', $familycount{$_}, $_ for @families;
-       print '<td>';
 }
 say '</tfoot>';
 
 sub featurescore {
        # relative amount of support for given feature
-       state $statspts = { y=>1, 'y x'=>1, a=>.5, 'a x'=>.5, j=>.2, 'p j'=>.2, 'p p'=>.2, p=>.1 };
        my $rank = 0;
        if (my $row = shift) {
                if ($canihas) {
                        while (my ($browser, $versions) = each %$row) {
                                ref $versions eq 'HASH' or next;
                                while (my ($version, $_) = each %$versions) {
-                                       $rank += ($canihas->{$browser}->{$version} || .001) * $statspts->{$_};
+                                       $rank += ($canihas->{$browser}->{$version} || .001) * $PSTATS{$_};
                                }
                        }
                        return $rank;
@@ -285,12 +287,24 @@ sub featurescore {
                                }
                                splice @vers, -1, 0, @future;  # move ahead to decrease precedence
                        }
-                       $rank += $statspts->{$_} * 2**($div--) for reverse @vers;
+                       $rank += $PSTATS{$_} * 2**($div--) for reverse @vers;
                }
        }
        return $rank;
 }
 
+sub formatnotes {
+       my @html = @_;
+       for (@html) {
+               s/\h* $//gmx;  # trailing whitespace
+               s/(?<= [^.\n]) $/./gmx;  # consistently end each line by a period
+               Entity($_);
+               s{  ` ([^`]*)  ` }{<code>$1</code>}gx;
+               s{ \[ ([^]]*) \] \( ([^)]*) \) }{<a href="$2">$1</a>}gx;
+       }
+       return @html;
+}
+
 sub saytitlecol {
        my ($id) = @_;
        my $row = $caniuse->{data}->{$id};
@@ -311,9 +325,8 @@ sub saytitlecol {
                );
        } $row->{title};
        print '<div class=aside>';
-       s/\.?$/./, print "<p>$_</p>" for map { ref $_ ? @$_ : $_ || () }
-               Entity($row->{description}),
-               map { s/\s*\n/\n<br>/g; $_ } $row->{notes};
+       print "<p>$_</p>"
+               for formatnotes($row->{description}, $row->{notes} || ());
        printf 'Resources: %s.', join(', ', map {
                sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), $_->{title}
        } @$_) for grep { @$_ } $row->{links} // ();