X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/b22f63ba31441200ca915c64445d5a87d146c327..d5673328262606bd06f36fd41f0ec866977db7b2:/digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 950c1b2..2f57b36 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -1,11 +1,11 @@
 <(common.inc.plp)><:
 
-my $mode = ($ENV{PATH_INFO} // '') eq '/xorg' || exists $get{xorg};
+my $mode = ($Request // '') eq 'xorg' || exists $get{xorg};
 my $modename = $mode ? 'X.Org' : 'RFC-1345';
 
 Html({
 	title => 'digraph cheat sheet',
-	version => '1.2',
+	version => '1.3',
 	description => [
 		"Complete table of digraph characters from $modename.",
 	],
@@ -14,7 +14,7 @@ Html({
 		character char glyph table unicode vim xorg x11 x
 	'],
 	stylesheet => [qw'light'],
-	data => [qw( digraphs.inc.pl )],
+	data => [qw( data/digraphs.inc.pl )],
 });
 
 :>
@@ -38,8 +38,7 @@ say '<p class="aside">Unofficial <span class="u-l2">proposals</span>',
 :>
 
 <:
-my $di = do 'digraphs.inc.pl'
-	or die "Error loading digraphs data: ", $@ // $!;
+my $di = Data('data/digraphs');
 
 if (exists $get{v}) {
 	# show characters for inverted mnemonics (vim alternatives)
@@ -59,12 +58,11 @@ my @columns = !exists $get{split} ? \@chars2 :
 	([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]);
 
 if ($mode) {
-	my $xorg = do 'data/digraphs-xorg.inc.pl'
-		or die "Error loading Xorg data: ", $@ // $!;
+	my $xorg = Data('data/digraphs-xorg');
 	$_ = [ord $_] for values %{$xorg};
 	$xorg->{$_}->[2] = # class = compatibility
 		$di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' :  # conflict
-		$di->{$_}->[2] =~ /\bu-di\b/ ? 'l5' : 'l3' : 'l2'  # rfc|any|none
+		$di->{$_}->[2] eq 'l4' ? 'l5' : 'l3' : 'l2'  # rfc|any|none
 		for keys %{$xorg};
 
 	for my $cp (map {$_->[0]} values %{$xorg}) {
@@ -118,7 +116,8 @@ for my $c1group (@chars) {
 			my $glyph = $string || chr $codepoint;
 			utf8::upgrade($glyph);  # prevent latin1 output
 			my $desc = $mnem . ($name && " ($name)");
-			my @class = ('X', grep {$_} $support && "u-$support", $script);
+			my @class = ('X', grep {$_} $script);
+			push @class, $mode ? $support : "u-$support" if $support;
 
 			$glyph = EscapeHTML($glyph);
 			$glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;