X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/add39cddddaf48676f1dd0f9158533be2fdd7459..89cc73c8a0ee71ed9e85cbb7fcbf7e9e53fb1713:/digraphs.plp?ds=inline
diff --git a/digraphs.plp b/digraphs.plp
index 4fff67d..9f96c50 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -1,52 +1,40 @@
<(common.inc.plp)><:
-use 5.010; # state
-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.1',
- 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"],
});
-:>
-
<:= $modename :> Digraphs
-
-Character mnemonics following compose key â<:
-say join("\n",
- $mode ? (
- ' in the X Window System (Shift+AltGr by default).',
- 'Differences from RFC-1345 are indicated.',
- ) : (':',
- 'i^k in Vim,',
- '^u^\ in Emacs,',
- '^a^v in Screen.',
- 'Similar but different from X.Org.',
- ),
- 'Also see common Unicode.
',
+%{$di} or Abort(
+ "Requested digraphs $mode
not available",
+ '404 request not found',
);
-say 'Unofficial proposals',
- ' are available as ex commands.' if not $mode;
-:>
-<:
-my $di = do 'digraphs.inc.pl'
- or die "Error loading digraphs data: ", $@ // $!;
+say "
$di->{title} Digraphs
";
+say "$_
" 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 = (
@@ -59,46 +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 ($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 '';
print qq'' for map {scalar @$_} @{$colchars};
-print "\n";
+say '';
for my $section (qw{thead tfoot}) {
print "<$section>â³";
print ' | ', EscapeHTML($_) for map {@$_} @{$colchars};
- print " | \n";
+ say ' | ';
}
for my $c1group (@chars) {
print ' |
';
@@ -106,20 +68,23 @@ for my $c1group (@chars) {
print '', EscapeHTML($c1);
for my $c2 (map {@$_} @$colchars) {
my $mnem = $c1 . $c2;
- if (not defined $di->{$mnem}) {
+ if (not defined $di->{key}->{$mnem}) {
print ' | ';
next;
}
- if (ref $di->{$mnem} ne 'ARRAY') {
+ if (ref $di->{key}->{$mnem} ne 'ARRAY') {
printf ' | ', 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 = "$glyph" if $script =~ /\bZs\b/;
@@ -127,26 +92,15 @@ for my $c1group (@chars) {
printf "\n".' | %s',
join(' ', @class), EscapeHTML($desc), $glyph;
}
- print "\n | ", EscapeHTML($c1), "\n";
+ say "\n | ", EscapeHTML($c1);
}
}
-print " |
---|
\n";
+say '';
print '
' if exists $get{split};
}
-if ($mode) {
:>
-
-
- matching RFC-1345
- | matching proposal
- | unique to Xorg
- | conflict
- | duplicate
- |
-
-<: } else { :>
-
+
<: unless ($cmp) { :>
control
| space
@@ -167,13 +121,11 @@ if ($mode) {
| japanese
| chinese
|
-
-
- full support
- | vim extension
- | proposal
- | not in vim
+<: } :>
+ <:
+ printf qq(\n\t%s), $cmp ? $_ : $di->{flagclass}{$_} // "u-$_", $di->{flag}->{$_}
+ for sort keys %{ $di->{flag} };
+:>
|
-<: }
|