X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/a8e253aa1f8e235a4793e0a3c06442ddc3db3117..8b237b43167a2443b69b6c0a3aec13c926782fc1:/browser.plp

diff --git a/browser.plp b/browser.plp
index 7355aa7..8a5fba8 100644
--- a/browser.plp
+++ b/browser.plp
@@ -5,7 +5,7 @@ use List::Util qw(sum max first);
 
 Html({
 	title => 'browser compatibility cheat sheet',
-	version => 'v1.1',
+	version => 'v1.2',
 	description => [
 		"Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
 		"comparing support and usage share for all popular browser versions.",
@@ -16,12 +16,12 @@ Html({
 		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
@@ -87,11 +93,11 @@ 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;
 	};
@@ -257,14 +263,13 @@ 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;
@@ -282,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};
@@ -308,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} // ();