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

diff --git a/digraphs.plp b/digraphs.plp
index 0d57bf0..1522bf4 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -7,22 +7,29 @@ Html({
 		"Complete table of digraph characters from RFC-1345.",
 	],
 	keywords => [qw'
-		digraph compose character char glyph table unicode vim
+		digraph mnemonic compose composition pair
+		character char glyph table unicode vim
 	'],
 	stylesheet => [qw'light'],
+	data => [qw( digraphs.inc.pl )],
 });
 
 :>
 <h1>RFC-1345 Digraphs</h1>
 
-<p>i^k in <a href="/vi">Vim</a>.
-Also see <a href="/unicode">common digraphs</a>.</p>
+<p>Character mnemonics
+following composition key ⎄:
+i^k in <a href="/vi">Vim</a>,
+^u^\ in <a href="/readline">Emacs</a>,
+^a^v in <a href="/screen">Screen</a>.
+Also see <a href="/unicode">common Unicode</a>.</p>
 
-<p class="aside">Unofficial <span class="Xz">proposals</span>
+<p class="aside">Unofficial <span class="u-prop ex">proposals</span>
 are available as <a href="/digraphs.vim">ex commands</a>.</p>
 
 <:
-my $di = do 'digraphs.inc.pl';
+my $di = do 'digraphs.inc.pl'
+	or die "Error loading digraphs data: ", $@ // $!;
 
 my @chars = (
 	[qw{! " % ' ( ) * + , - . /}],
@@ -31,20 +38,35 @@ my @chars = (
 	['a'..'m'], ['n'..'z'],
 );
 my @chars2 = (['_'], @chars);  # trailing character (extended set)
+my @columns = !exists $get{split} ? \@chars2 :
+	([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]);
 
+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'
+		for keys %{$xorg};
+	$chars2[0] = [qw( # ^ _ ` ~ )];
+	@chars = @chars2;
+	$di = $xorg;
+}
+
+for my $colchars (@columns) {
 print '<table class="glyphs dimap"><col>';
-print qq'<colgroup span="$_">' for map {scalar @$_} @chars2;
+print qq'<colgroup span="$_">' for map {scalar @$_} @{$colchars};
 print "</colgroup><col>\n";
 for my $section (qw{thead tfoot}) {
 	print "<$section><tr><th>↳";
-	print '<th>', EscapeHTML($_) for map {@$_} @chars2;
+	print '<th>', EscapeHTML($_) for map {@$_} @{$colchars};
 	print "<th>&nbsp;\n";
 }
 for my $c1group (@chars) {
 	print '<tbody>';
 	for my $c1 (@$c1group) {
 		print '<tr><th>', EscapeHTML($c1);
-		for my $c2 (map {@$_} @chars2) {
+		for my $c2 (map {@$_} @$colchars) {
 			my $mnem = $c1 . $c2;
 			if (not defined $di->{$mnem}) {
 				print '<td>';
@@ -62,7 +84,7 @@ for my $c1group (@chars) {
 			my @class = ('X', grep {$_} $prop, $script);
 
 			$glyph = EscapeHTML($glyph);
-			$glyph = "<span>$glyph</span>" if $prop eq 'Zs';
+			$glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;
 
 			printf "\n".'<td class="%s" title="%s">%s',
 				join(' ', @class), EscapeHTML($desc), $glyph;
@@ -71,13 +93,15 @@ for my $c1group (@chars) {
 	}
 }
 print "</table>\n";
+print '<hr>' if exists $get{split};
+}
 :>
 <div class="legend">
 	<table class="glyphs"><tr>
 	<td class="X Cc">control
-	<td class="X Zs"><span>spacing</span>
-	<td class="X Mn">modifier
-	<td class="X Sk">spacing modifier
+	<td class="X Zs"><span>space</span>
+	<td class="X Mn">combining
+	<td class="X Sk">spacing&nbsp;modifier
 	<td class="X Pf">quote
 	<td class="X Po">punctuation
 	<td class="X So">symbol
@@ -98,7 +122,9 @@ print "</table>\n";
 	<td class="X">unicode
 	<td class="X Xl">latin1
 	<td class="X Xa">ascii
-	<td class="X Xz">proposed
+	<td class="X u-prop">vim extension
+	<td class="X u-prop ex">proposal
+	<td class="X ex">not in vim
 	</table>
 </div>