X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/61b25c1967cc0ebd45e88802fcfb8c4f81363981..8f93eb6627b93ef73026457b041c7210b098ba74:/digraphs.plp
diff --git a/digraphs.plp b/digraphs.plp
index 4ee4d1f..57d0b0f 100644
--- a/digraphs.plp
+++ b/digraphs.plp
@@ -2,6 +2,7 @@
my $mode = ($Request // '') eq 'xorg' || exists $get{xorg};
my $modename = $mode ? 'X.Org' : 'RFC-1345';
+my $cmp = exists $get{cmp} ? ($get{cmp} // 1) : !!$Request;
Html({
title => 'digraph cheat sheet',
@@ -58,36 +59,9 @@ my @columns = !exists $get{split} ? \@chars2 :
([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]);
if ($mode) {
- my $xorg = Data('data/digraphs-xorg');
- $_ = [ord $_] for values %{$xorg};
- $xorg->{$_}->[2] = # class = compatibility
- !$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}) {
- 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;
- }
-
+ $di = Data('digraphs-xorg');
$chars2[0] = [qw( # ^ _ ` ~ )];
@chars = @chars2;
- $di->{key} = $xorg;
}
for my $colchars (@columns) {
@@ -120,7 +94,7 @@ for my $c1group (@chars) {
utf8::upgrade($glyph); # prevent latin1 output
my $desc = $mnem . ($name && " ($name)");
my @class = ('X', grep {$_} $script);
- push @class, $mode ? $support : "u-$support" if $support;
+ push @class, $cmp ? $support : "u-$support" if $support;
$glyph = EscapeHTML($glyph);
$glyph = "$glyph" if $script =~ /\bZs\b/;
@@ -135,19 +109,8 @@ say '';
print '
' if exists $get{split};
}
-if ($mode) {
:>
-
-
- matching RFC-1345
- | matching proposal
- | unique to Xorg
- | conflict
- | duplicate
- |
-
-<: } else { :>
-
+
<: unless ($cmp) { :>
control
| space
@@ -168,12 +131,11 @@ if ($mode) {
| japanese
| chinese
|
-
+<: } :>
<:
- print qq(\n\t$di->{flag}->{$_})
+ printf qq(\n\t | %s), (!$cmp && 'u-').$_, $di->{flag}->{$_}
for sort keys %{ $di->{flag} };
:>
|
-<: }