unicode: secondary ipa header with place categories

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index 48bd6e587f4e100279101c6e81a036506552b7d7..a78e0ecab8f37c178bfa300ecc6b9a58b7473879 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -1,12 +1,10 @@
 <(common.inc.plp)><:
-use 5.010;
-use utf8;
 use List::Util qw(sum max first);
 no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
 Html({
        title => 'browser compatibility cheat sheet',
-       version => 'v1.2',
+       version => '1.4',
        description => [
                "Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
                "comparing support and usage share for all popular browser versions.",
@@ -69,6 +67,7 @@ my %PSTATS = (  # score percentage
        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,
 );
 my %CSTATUS = (
        unoff => 'l1', # unofficial
@@ -97,16 +96,18 @@ given ($get{usage} // 'wm') {
                # none
        }
        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>';
+               Alert([
+                       'Invalid browser usage data request',
+                       'Identifier must be alphanumeric name or <q>0</q>.',
+               ]);
        }
        $canihas = do "data/browser/usage-$_.inc.pl" or do {
-               printf "<p>Browser usage data not found: <em>%s</em>", $@ || $!;
+               Alert('Browser usage data not found', $@ || $!);
                break;
        };
        $usage = $_;
        my $ref = $canihas->{-title} || 'unknown';
-       $ref = sprintf '<a href="%s">%s</a>', $_, $ref
+       $ref = showlink($ref, $_)
                for $canihas->{-site} || $canihas->{-source} || ();
        $ref .= " $_" for $canihas->{-date} || ();
        print "\nwith $ref browser usage statistics";
@@ -272,6 +273,7 @@ sub featurescore {
                        while (my ($browser, $versions) = each %$row) {
                                ref $versions eq 'HASH' or next;
                                while (my ($version, $status) = each %$versions) {
+                                       $status =~ s/\h\#\d+//g;
                                        $rank += ($canihas->{$browser}->{$version} || .001) * $PSTATS{$status};
                                }
                        }
@@ -299,6 +301,7 @@ sub featurescore {
 sub formatnotes {
        my @html = @_;
        for (@html) {
+               s/\r\n?/\n/g;  # windows returns
                s/\h* $//gmx;  # trailing whitespace
                s/(?<= [^.\n]) $/./gmx;  # consistently end each line by a period
                Entity($_);
@@ -336,10 +339,10 @@ sub saytitlecol {
                say '</p>';
        }
        printf 'Resources: %s.', join(', ', map {
-               sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), $_->{title}
+               showlink($_->{title}, $_->{url})
        } @$_) for grep { @$_ } $row->{links} // ();
        printf '<br>Parent feature: %s.', join(', ', map {
-               sprintf '<a href="%s">%s</a>', EscapeHTML("#$_"), $caniuse->{data}->{$_}->{title}
+               showlink($caniuse->{data}->{$_}->{title}, "#$_")
        } $_) for $row->{parent} || ();
        print '</div>';
 }
@@ -350,7 +353,7 @@ sub saystatuscol {
 
        for ($row->{status}) {
                my $cell = $_ // '-';
-               $cell = sprintf '<a href="%s">%s</a>', $_, $cell for $row->{spec} // ();
+               $cell = showlink($cell, $_) for $row->{spec} // ();
                printf '<td title="%s" class="l %s">%s',
                        $caniuse->{statuses}->{$_}, $CSTATUS{$_} // '', $cell;
        }