X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/01d61f72fed7ac041786ea69d1b080f45a4c49d1..d22e7febda8720bc38069f7061adb43b98143c48:/digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index aca0766..af71630 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -1,12 +1,11 @@
 <(common.inc.plp)><:
-use 5.010;  # state
 
-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.",
 	],
@@ -15,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 )],
 });
 
 :>
@@ -39,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}) {
@@ -65,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}) {
@@ -94,11 +93,11 @@ if ($mode) {
 for my $colchars (@columns) {
 print '<table class="glyphs dimap"><col>';
 print qq'<colgroup span="$_">' for map {scalar @$_} @{$colchars};
-print "</colgroup><col>\n";
+say '</colgroup><col>';
 for my $section (qw{thead tfoot}) {
 	print "<$section><tr><th>↳";
 	print '<th>', EscapeHTML($_) for map {@$_} @{$colchars};
-	print "<th>&nbsp;\n";
+	say '<th>&nbsp;';
 }
 for my $c1group (@chars) {
 	print '<tbody>';
@@ -119,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/;
@@ -127,10 +127,10 @@ for my $c1group (@chars) {
 			printf "\n".'<td class="%s" title="%s">%s',
 				join(' ', @class), EscapeHTML($desc), $glyph;
 		}
-		print "\n<th>", EscapeHTML($c1), "\n";
+		say "\n<th>", EscapeHTML($c1);
 	}
 }
-print "</table>\n";
+say '</table>';
 print '<hr>' if exists $get{split};
 }