X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/108d13f833e9daeff4ea1552e2e1bee1e0ed8c22..00ffc9287b5766ce0c5ff89e1096200a1bc355be:/digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 44f93e6..5e4a334 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -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,7 +38,7 @@ say '<p class="aside">Unofficial <span class="u-l2">proposals</span>',
 :>
 
 <:
-my $di = do 'digraphs.inc.pl'
+my $di = do 'data/digraphs.inc.pl'
 	or die "Error loading digraphs data: ", $@ // $!;
 
 if (exists $get{v}) {
@@ -64,7 +64,7 @@ if ($mode) {
 	$_ = [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 +118,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/;