X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/b9b6fef60d3afde9e701373fe4d2c8de81450c3e..8f93eb6627b93ef73026457b041c7210b098ba74:/digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 5e4a334..57d0b0f 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -2,10 +2,11 @@
 
 my $mode = ($Request // '') eq 'xorg' || exists $get{xorg};
 my $modename = $mode ? 'X.Org' : 'RFC-1345';
+my $cmp = exists $get{cmp} ? ($get{cmp} // 1) : !!$Request;
 
 Html({
 	title => 'digraph cheat sheet',
-	version => '1.2',
+	version => '1.3',
 	description => [
 		"Complete table of digraph characters from $modename.",
 	],
@@ -38,14 +39,13 @@ say '<p class="aside">Unofficial <span class="u-l2">proposals</span>',
 :>
 
 <:
-my $di = do 'data/digraphs.inc.pl'
-	or die "Error loading digraphs data: ", $@ // $!;
+my $di = Data('digraphs');
 
 if (exists $get{v}) {
 	# show characters for inverted mnemonics (vim alternatives)
-	$di->{ substr($_, 1, 1) . substr($_, 0, 1) } ||=
-		[ $di->{$_}->[0], '', 'l0 ex', '', $di->{$_}->[4] ]
-		for grep { ref $di->{$_} } keys %{$di};
+	$di->{key}->{ substr($_, 1, 1) . substr($_, 0, 1) } ||= [
+		$di->{key}->{$_}->[0], '', 'l0 ex', '', $di->{key}->{$_}->[4]
+	] for grep { ref $di->{key}->{$_} } keys %{ $di->{key} };
 }
 
 my @chars = (
@@ -59,35 +59,9 @@ 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: ", $@ // $!;
-	$_ = [ord $_] for values %{$xorg};
-	$xorg->{$_}->[2] = # class = compatibility
-		$di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' :  # conflict
-		$di->{$_}->[2] eq 'l4' ? 'l5' : 'l3' : 'l2'  # rfc|any|none
-		for keys %{$xorg};
-
-	for my $cp (map {$_->[0]} values %{$xorg}) {
-		next if (state $seen = {})->{$cp}++;  # List::MoreUtils::uniq
-
-		# find multiple equivalent mnemonics
-		my @equiv = grep {$cp eq $_->[0]}
-			map {$xorg->{$_}} sort keys %{$xorg}; # values ordered by mnem.
-
-		# search for the most compatible match
-		my ($compat) = sort {
-			$equiv[$b]->[2] cmp $equiv[$a]->[2]  # highest level
-			|| $b <=> $a  # fallback to last mnemonic
-		} 0 .. $#equiv;
-
-		# reclassify all but one as level 0 (omitted)
-		splice @equiv, $compat // -1, 1, ();
-		$_->[2] = 'l0 ex' for @equiv;
-	}
-
+	$di = Data('digraphs-xorg');
 	$chars2[0] = [qw( # ^ _ ` ~ )];
 	@chars = @chars2;
-	$di = $xorg;
 }
 
 for my $colchars (@columns) {
@@ -105,21 +79,22 @@ for my $c1group (@chars) {
 		print '<tr><th>', EscapeHTML($c1);
 		for my $c2 (map {@$_} @$colchars) {
 			my $mnem = $c1 . $c2;
-			if (not defined $di->{$mnem}) {
+			if (not defined $di->{key}->{$mnem}) {
 				print '<td>';
 				next;
 			}
-			if (ref $di->{$mnem} ne 'ARRAY') {
+			if (ref $di->{key}->{$mnem} ne 'ARRAY') {
 				printf '<td class="X Xr" title="%s">', EscapeHTML($mnem);
 				next;
 			}
-			my ($codepoint, $name, $support, $script, $string) = @{ $di->{$mnem} };
+			my ($codepoint, $name, $support, $script, $string) =
+				@{ $di->{key}->{$mnem} };
 
 			my $glyph = $string || chr $codepoint;
 			utf8::upgrade($glyph);  # prevent latin1 output
 			my $desc = $mnem . ($name && " ($name)");
 			my @class = ('X', grep {$_} $script);
-			push @class, $mode ? $support : "u-$support" if $support;
+			push @class, $cmp ? $support : "u-$support" if $support;
 
 			$glyph = EscapeHTML($glyph);
 			$glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;
@@ -134,19 +109,8 @@ say '</table>';
 print '<hr>' if exists $get{split};
 }
 
-if ($mode) {
 :>
-<div class="legend">
-	<table class="glyphs"><tr>
-	<td class="X l5">matching RFC-1345
-	<td class="X l3">matching proposal
-	<td class="X l2">unique to Xorg
-	<td class="X l1">conflict
-	<td class="X l0 ex">duplicate
-	</table>
-</div>
-<: } else { :>
-<div class="legend">
+<div class="legend"><: unless ($cmp) { :>
 	<table class="glyphs"><tr>
 	<td class="X Cc">control
 	<td class="X Zs"><span>space</span>
@@ -167,14 +131,11 @@ if ($mode) {
 	<td class="X Hiragana">japanese
 	<td class="X Bopomofo">chinese
 	</table>
-
-	<table class="glyphs"><tr>
-	<td class="X u-l4">full support
-	<td class="X u-l3">vim extension
-	<td class="X u-l3 ex">vim v8.0
-	<td class="X u-l2">proposal
-	<td class="X u-l1">not in vim
+<: } :>
+	<table class="glyphs"><tr><:
+	printf qq(\n\t<td class="X %s">%s), (!$cmp && 'u-').$_, $di->{flag}->{$_}
+		for sort keys %{ $di->{flag} };
+:>
 	</table>
 </div>
 
-<: }