<(common.inc.plp)><:
-my $mode = ($ENV{PATH_INFO} // '') 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',
- version => '1.2',
- description => [
- "Complete table of digraph characters from $modename.",
+ title => "$mode digraph cheat sheet",
+ version => '1.4',
+ 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( 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 = do 'digraphs.inc.pl'
- or die "Error loading digraphs data: ", $@ // $!;
+say "<h1>$di->{title} Digraphs</h1>";
+say "<p>$_</p>" for $di->{intro} // ();
if (exists $get{v}) {
# show characters for inverted mnemonics (vim alternatives)
- $di->{ substr($_, 1, 1) . substr($_, 0, 1) } ||=
- [ $di->{$_}->[0], '', 'l0 ex', '', $di->{$_}->[4] ]
- for grep { ref $di->{$_} } keys %{$di};
+ $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 = (
my @columns = !exists $get{split} ? \@chars2 :
([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]);
-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
- for keys %{$xorg};
-
- for my $cp (map {$_->[0]} values %{$xorg}) {
- next if (state $seen = {})->{$cp}++; # List::MoreUtils::uniq
-
- # find multiple equivalent mnemonics
- my @equiv = grep {$cp eq $_->[0]}
- map {$xorg->{$_}} sort keys %{$xorg}; # values ordered by mnem.
-
- # search for the most compatible match
- my ($compat) = sort {
- $equiv[$b]->[2] cmp $equiv[$a]->[2] # highest level
- || $b <=> $a # fallback to last mnemonic
- } 0 .. $#equiv;
-
- # reclassify all but one as level 0 (omitted)
- splice @equiv, $compat // -1, 1, ();
- $_->[2] = 'l0 ex' for @equiv;
- }
-
+if ($mode eq 'xorg') {
+ #TODO determine character usage from declared keys
$chars2[0] = [qw( # ^ _ ` ~ )];
@chars = @chars2;
- $di = $xorg;
}
for my $colchars (@columns) {
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, $support, $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 {$_} $support && "u-$support", $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/;
print '<hr>' if exists $get{split};
}
-if ($mode) {
:>
-<div class="legend">
- <table class="glyphs"><tr>
- <td class="X l5">matching RFC-1345
- <td class="X l3">matching proposal
- <td class="X l2">unique to Xorg
- <td class="X l1">conflict
- <td class="X l0 ex">duplicate
- </table>
-</div>
-<: } else { :>
-<div class="legend">
+<div class="legend"><: unless ($cmp) { :>
<table class="glyphs"><tr>
<td class="X Cc">control
<td class="X Zs"><span>space</span>
<td class="X Hiragana">japanese
<td class="X Bopomofo">chinese
</table>
-
- <table class="glyphs"><tr>
- <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 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>
-<: }
git.shiar.nl / sheet.git / blobdiff