<(common.inc.plp)><:
-my $mode = ($Request // '') eq 'xorg' || exists $get{xorg};
-my $modename = $mode ? 'X.Org' : 'RFC-1345';
+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',
+ title => "$mode digraph cheat sheet",
version => '1.3',
- description => [
- "Complete table of digraph characters from $modename.",
+ description => $di->{description} // [
+ "Complete table of digraph characters from",
+ ($di->{title} // $mode) . ".",
],
- keywords => [qw'
+ keywords => [@{ $di->{keywords} // [] }, qw'
digraph mnemonic compose composition pair
- character char glyph table unicode vim xorg x11 x
+ character char glyph table unicode vim
'],
stylesheet => [qw'light'],
- data => [qw( data/digraphs.inc.pl )],
+ data => ["data/$include.json"],
});
-:>
-<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>',
+%{$di} or Abort(
+ "Requested digraphs <q>$mode</q> not available",
+ '404 request not found',
);
-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 = Data('digraphs');
+say "<h1>$di->{title} Digraphs</h1>";
+say "<p>$_</p>" for $di->{intro} // ();
if (exists $get{v}) {
# show characters for inverted mnemonics (vim alternatives)
my @columns = !exists $get{split} ? \@chars2 :
([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]);
-if ($mode) {
- $di = Data('digraphs-xorg');
+if ($mode eq 'xorg') {
+ #TODO determine character usage from declared keys
$chars2[0] = [qw( # ^ _ ` ~ )];
@chars = @chars2;
}
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 {$_} $script);
- push @class, $cmp ? $support : "u-$support" if $support;
+ push @class, $cmp ? $support :
+ $di->{flagclass}->{$support} // "u-$support" if $support;
$glyph = EscapeHTML($glyph);
$glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;
</table>
<: } :>
<table class="glyphs"><tr><:
- printf qq(\n\t<td class="X %s">%s), (!$cmp && 'u-').$_, $di->{flag}->{$_}
+ printf qq(\n\t<td class="X %s">%s), $cmp ? $_ : $di->{flagclass}{$_} // "u-$_", $di->{flag}->{$_}
for sort keys %{ $di->{flag} };
:>
</table>