index: release v1.18 with only altgr index linked

[sheet.git] / digraphs.plp

diff --git a/digraphs.plp b/digraphs.plp
index b40eac0915cefd19f0176e4bbed836f7f4da169d..9f96c502b0ebd820116105b89adbd96f39e01543 100644 (file)
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -1,30 +1,41 @@
 <(common.inc.plp)><:
 
+my $mode = $Request || 'vim';
+my $include = 'digraphs' . ($mode ne 'vim' && "-$mode");
+my $cmp = exists $get{cmp} ? ($get{cmp} // 1) : !!$Request;
+
+my $di = eval { Data($include) } || {};
+warn "error in $include: ", @{$@} if ref $@;
+
 Html({
-       title => 'digraph cheat sheet',
-       version => 'v1.0',
-       description => [
-               "Complete table of digraph characters from RFC-1345.",
+       title => "$mode digraph cheat sheet",
+       version => '1.4',
+       description => $di->{description} // [
+               "Complete table of digraph characters from",
+               ($di->{title} // $mode) . ".",
        ],
-       keywords => [qw'
-               digraph compose character char glyph table unicode vim
+       keywords => [@{ $di->{keywords} // [] }, qw'
+               digraph mnemonic compose composition pair
+               character char glyph table unicode vim
        '],
        stylesheet => [qw'light'],
-       data => [qw( digraphs.inc.pl )],
+       data => ["data/$include.json"],
 });
 
-:>
-<h1>RFC-1345 Digraphs</h1>
-
-<p>i^k in <a href="/vi">Vim</a>.
-Also see <a href="/unicode">common digraphs</a>.</p>
+%{$di} or Abort(
+       "Requested digraphs <q>$mode</q> not available",
+       '404 request not found',
+);
 
-<p class="aside">Unofficial <span class="u-prop ex">proposals</span>
-are available as <a href="/digraphs.vim">ex commands</a>.</p>
+say "<h1>$di->{title} Digraphs</h1>";
+say "<p>$_</p>" for $di->{intro} // ();
 
-<:
-my $di = do 'digraphs.inc.pl'
-       or die "Error loading digraphs data: ", $@ // $!;
+if (exists $get{v}) {
+       # show characters for inverted mnemonics (vim alternatives)
+       $di->{key}->{ substr($_, 1, 1) . substr($_, 0, 1) } ||= [
+               $di->{key}->{$_}->[0], '', 'l0 ex', '', $di->{key}->{$_}->[4]
+       ] for grep { ref $di->{key}->{$_} } keys %{ $di->{key} };
+}
 
 my @chars = (
        [qw{! " % ' ( ) * + , - . /}],
@@ -36,26 +47,20 @@ 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};
+if ($mode eq 'xorg') {
+       #TODO determine character usage from declared keys
        $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};
-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>';
@@ -63,20 +68,23 @@ for my $c1group (@chars) {
                print '<tr><th>', EscapeHTML($c1);
                for my $c2 (map {@$_} @$colchars) {
                        my $mnem = $c1 . $c2;
-                       if (not defined $di->{$mnem}) {
+                       if (not defined $di->{key}->{$mnem}) {
                                print '<td>';
                                next;
                        }
-                       if (ref $di->{$mnem} ne 'ARRAY') {
+                       if (ref $di->{key}->{$mnem} ne 'ARRAY') {
                                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->{key}->{$mnem} };
 
-                       my $glyph = $string || chr $codepoint;
+                       my $glyph = $string || !!$codepoint && 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, $cmp ? $support :
+                               $di->{flagclass}->{$support} // "u-$support" if $support;
 
                        $glyph = EscapeHTML($glyph);
                        $glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;
@@ -84,14 +92,15 @@ 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};
 }
+
 :>
-<div class="legend">
+<div class="legend"><: unless ($cmp) { :>
        <table class="glyphs"><tr>
        <td class="X Cc">control
        <td class="X Zs"><span>space</span>
@@ -112,14 +121,11 @@ print '<hr>' if exists $get{split};
        <td class="X Hiragana">japanese
        <td class="X Bopomofo">chinese
        </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
+<: } :>
+       <table class="glyphs"><tr><:
+       printf qq(\n\t<td class="X %s">%s), $cmp ? $_ : $di->{flagclass}{$_} // "u-$_", $di->{flag}->{$_}
+               for sort keys %{ $di->{flag} };
+:>
        </table>
 </div>