<(common.inc.plp)><:
-use 5.010; # state
-my $mode = ($ENV{PATH_INFO} // '') eq '/xorg' || exists $get{xorg};
+my $mode = ($Request // '') eq 'xorg' || exists $get{xorg};
my $modename = $mode ? 'X.Org' : 'RFC-1345';
Html({
title => 'digraph cheat sheet',
- version => '1.1',
+ version => '1.3',
description => [
"Complete table of digraph characters from $modename.",
],
character char glyph table unicode vim xorg x11 x
'],
stylesheet => [qw'light'],
- data => [qw( digraphs.inc.pl )],
+ data => [qw( data/digraphs.inc.pl )],
});
:>
:>
<:
-my $di = do 'digraphs.inc.pl'
- or die "Error loading digraphs data: ", $@ // $!;
+my $di = Data('digraphs');
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 = (
([@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};
+ my $xorg = Data('digraphs-xorg');
+ $_->[3] = undef for values %{$xorg}; # reset alias classes
$xorg->{$_}->[2] = # class = compatibility
- $di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' : # conflict
- $di->{$_}->[2] =~ /\bu-di\b/ ? 'l5' : 'l3' : 'l2' # rfc|any|none
+ !$di->{key}->{$_} ? 'l2' : # free
+ $di->{key}->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' : # conflict
+ $di->{key}->{$_}->[2] eq 'l4' ? 'l5' : # rfc
+ 'l3' # any
for keys %{$xorg};
for my $cp (map {$_->[0]} values %{$xorg}) {
$chars2[0] = [qw( # ^ _ ` ~ )];
@chars = @chars2;
- $di = $xorg;
+ $di->{key} = $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> \n";
+ say '<th> ';
}
for my $c1group (@chars) {
print '<tbody>';
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;
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, $mode ? $support : "u-$support" if $support;
$glyph = EscapeHTML($glyph);
$glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;
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};
}
<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-l2">proposal
- <td class="X u-l1">not in vim
+ <table class="glyphs"><tr><:
+ print qq(\n\t<td class="X u-$_">$di->{flag}->{$_})
+ for sort keys %{ $di->{flag} };
+:>
</table>
</div>