digraphs: expand intro, with links to (and from) screen and emacs

[sheet.git] / digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 3073f9a4d1b0487539b3dbb187b1e788e22747ca..1522bf4516986ef866cf58240504cf230e982475 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -7,7 +7,8 @@ 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 )],
@@ -16,14 +17,19 @@ Html({
 :>
 <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="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{! " % ' ( ) * + , - . /}],
@@ -35,6 +41,18 @@ 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 @$_} @{$colchars};
@@ -66,7 +84,7 @@ for my $c1group (@chars) {
                        my @class = ('X', grep {$_} $prop, $script);
 
                        $glyph = EscapeHTML($glyph);
-                       $glyph = "<span>$glyph</span>" if $prop =~ /\bZs\b/;
+                       $glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;
 
                        printf "\n".'<td class="%s" title="%s">%s',
                                join(' ', @class), EscapeHTML($desc), $glyph;
@@ -81,9 +99,9 @@ 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