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

diff --git a/digraphs.plp b/digraphs.plp
index 72af1be..aca0766 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -1,32 +1,42 @@
 <(common.inc.plp)><:
 use 5.010;  # state
 
+my $mode = ($ENV{PATH_INFO} // '') eq '/xorg' || exists $get{xorg};
+my $modename = $mode ? 'X.Org' : 'RFC-1345';
+
 Html({
 	title => 'digraph cheat sheet',
-	version => 'v1.0',
+	version => '1.2',
 	description => [
-		"Complete table of digraph characters from RFC-1345.",
+		"Complete table of digraph characters from $modename.",
 	],
 	keywords => [qw'
 		digraph mnemonic compose composition pair
-		character char glyph table unicode vim
+		character char glyph table unicode vim xorg x11 x
 	'],
 	stylesheet => [qw'light'],
 	data => [qw( digraphs.inc.pl )],
 });
 
 :>
-<h1>RFC-1345 Digraphs</h1>
-
-<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="u-prop ex">proposals</span>
-are available as <a href="/digraphs.vim">ex commands</a>.</p>
+<h1><:= $modename :> Digraphs</h1>
+
+<p>Character mnemonics following compose key ⎄<:
+say join("\n",
+	$mode ? (
+		' in the X Window System (Shift+AltGr by default).',
+		'Differences from <a href="/digraphs">RFC-1345</a> are indicated.',
+	) : (':',
+		'i^k in <a href="/vi">Vim</a>,',
+		'^u^\ in <a href="/readline">Emacs</a>,',
+		'^a^v in <a href="/screen">Screen</a>.',
+		'Similar but different from <a href="/digraphs/xorg">X.Org</a>.',
+	),
+	'Also see <a href="/unicode">common Unicode</a>.</p>',
+);
+say '<p class="aside">Unofficial <span class="u-l2">proposals</span>',
+	' are available as <a href="/digraphs.vim">ex commands</a>.' if not $mode;
+:>
 
 <:
 my $di = do 'digraphs.inc.pl'
@@ -35,7 +45,7 @@ my $di = do 'digraphs.inc.pl'
 if (exists $get{v}) {
 	# show characters for inverted mnemonics (vim alternatives)
 	$di->{ substr($_, 1, 1) . substr($_, 0, 1) } ||=
-		[$di->{$_}->[0], '', 'l0 ex']
+		[ $di->{$_}->[0], '', 'l0 ex', '', $di->{$_}->[4] ]
 		for grep { ref $di->{$_} } keys %{$di};
 }
 
@@ -49,7 +59,7 @@ 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}) {
+if ($mode) {
 	my $xorg = do 'data/digraphs-xorg.inc.pl'
 		or die "Error loading Xorg data: ", $@ // $!;
 	$_ = [ord $_] for values %{$xorg};
@@ -104,12 +114,12 @@ for my $c1group (@chars) {
 				printf '<td class="X Xr" title="%s">', EscapeHTML($mnem);
 				next;
 			}
-			my ($codepoint, $name, $prop, $script, $string) = @{ $di->{$mnem} };
+			my ($codepoint, $name, $support, $script, $string) = @{ $di->{$mnem} };
 
 			my $glyph = $string || chr $codepoint;
 			utf8::upgrade($glyph);  # prevent latin1 output
 			my $desc = $mnem . ($name && " ($name)");
-			my @class = ('X', grep {$_} $prop, $script);
+			my @class = ('X', grep {$_} $support && "u-$support", $script);
 
 			$glyph = EscapeHTML($glyph);
 			$glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;
@@ -124,7 +134,7 @@ print "</table>\n";
 print '<hr>' if exists $get{split};
 }
 
-if (exists $get{xorg}) {
+if ($mode) {
 :>
 <div class="legend">
 	<table class="glyphs"><tr>
@@ -159,12 +169,11 @@ if (exists $get{xorg}) {
 	</table>
 
 	<table class="glyphs"><tr>
-	<td class="X">unicode
-	<td class="X Xl">latin1
-	<td class="X Xa">ascii
-	<td class="X u-prop">vim extension
-	<td class="X u-prop ex">proposal
-	<td class="X ex">not in vim
+	<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>
 </div>