X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/5c98b043102c601569bd7c05861c084c316d528c..f00c1e5c4de7325c9d5d851a61355fe8638cca95:/digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 1522bf4..4c45044 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -1,8 +1,9 @@
 <(common.inc.plp)><:
+use 5.010;  # state
 
 Html({
 	title => 'digraph cheat sheet',
-	version => 'v1.0',
+	version => 'v1.1',
 	description => [
 		"Complete table of digraph characters from RFC-1345.",
 	],
@@ -31,6 +32,13 @@ are available as <a href="/digraphs.vim">ex commands</a>.</p>
 my $di = do 'digraphs.inc.pl'
 	or die "Error loading digraphs data: ", $@ // $!;
 
+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};
+}
+
 my @chars = (
 	[qw{! " % ' ( ) * + , - . /}],
 	['0'..'9'], [qw{: ; < = > ?}],
@@ -45,9 +53,29 @@ if (exists $get{xorg}) {
 	my $xorg = do 'data/digraphs-xorg.inc.pl'
 		or die "Error loading Xorg data: ", $@ // $!;
 	$_ = [ord $_] for values %{$xorg};
-	$xorg->{$_}->[2] =  # class = same as rfc | any other spec | xorg only
-		$di->{$_} ? $di->{$_}->[2] =~ /\bu-di\b/ ? 'l5' : 'l3' : 'l1'
+	$xorg->{$_}->[2] = # class = compatibility
+		$di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' :  # conflict
+		$di->{$_}->[2] =~ /\bu-di\b/ ? '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;
+	}
+
 	$chars2[0] = [qw( # ^ _ ` ~ )];
 	@chars = @chars2;
 	$di = $xorg;
@@ -95,7 +123,19 @@ for my $c1group (@chars) {
 print "</table>\n";
 print '<hr>' if exists $get{split};
 }
+
+if (exists $get{xorg}) {
 :>
+<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">
 	<table class="glyphs"><tr>
 	<td class="X Cc">control
@@ -128,3 +168,4 @@ print '<hr>' if exists $get{split};
 	</table>
 </div>
 
+<: }