common: bump version to 1.11

[sheet.git] / digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index 4c45044c97f122ba8c0e3feeb3ba078c42aecb1a..af71630b795cbebc7be5825d9449bb54c0fdd129 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -1,35 +1,44 @@
 <(common.inc.plp)><:
-use 5.010;  # state
+
+my $mode = ($Request // '') eq 'xorg' || exists $get{xorg};
+my $modename = $mode ? 'X.Org' : 'RFC-1345';
 
 Html({
        title => 'digraph cheat sheet',
-       version => 'v1.1',
+       version => '1.3',
        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 )],
+       data => [qw( data/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'
+my $di = do 'data/digraphs.inc.pl'
        or die "Error loading digraphs data: ", $@ // $!;
 
 if (exists $get{v}) {
@@ -49,13 +58,13 @@ 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};
        $xorg->{$_}->[2] = # class = compatibility
                $di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' :  # conflict
-               $di->{$_}->[2] =~ /\bu-di\b/ ? 'l5' : 'l3' : 'l2'  # rfc|any|none
+               $di->{$_}->[2] eq 'l4' ? 'l5' : 'l3' : 'l2'  # rfc|any|none
                for keys %{$xorg};
 
        for my $cp (map {$_->[0]} values %{$xorg}) {
@@ -84,11 +93,11 @@ if (exists $get{xorg}) {
 for my $colchars (@columns) {
 print '<table class="glyphs dimap"><col>';
 print qq'<colgroup span="$_">' for map {scalar @$_} @{$colchars};
-print "</colgroup><col>\n";
+say '</colgroup><col>';
 for my $section (qw{thead tfoot}) {
        print "<$section><tr><th>↳";
        print '<th>', EscapeHTML($_) for map {@$_} @{$colchars};
-       print "<th>&nbsp;\n";
+       say '<th>&nbsp;';
 }
 for my $c1group (@chars) {
        print '<tbody>';
@@ -104,12 +113,13 @@ 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 {$_} $script);
+                       push @class, $mode ? $support : "u-$support" if $support;
 
                        $glyph = EscapeHTML($glyph);
                        $glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;
@@ -117,14 +127,14 @@ for my $c1group (@chars) {
                        printf "\n".'<td class="%s" title="%s">%s',
                                join(' ', @class), EscapeHTML($desc), $glyph;
                }
-               print "\n<th>", EscapeHTML($c1), "\n";
+               say "\n<th>", EscapeHTML($c1);
        }
 }
-print "</table>\n";
+say '</table>';
 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>