git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keyboard/altgr: ignore partial decomposition as accented flag
[sheet.git]
/
digraphs.plp
diff --git
a/digraphs.plp
b/digraphs.plp
index 44f93e67c719c7e06d69f5eecf25dfd7f0bf7f26..2f57b36147f5063b204f8368a25c02e59a2bd33c 100644
(file)
--- a/
digraphs.plp
+++ b/
digraphs.plp
@@
-5,7
+5,7
@@
my $modename = $mode ? 'X.Org' : 'RFC-1345';
Html({
title => 'digraph cheat sheet',
Html({
title => 'digraph cheat sheet',
- version => '1.
2
',
+ version => '1.
3
',
description => [
"Complete table of digraph characters from $modename.",
],
description => [
"Complete table of digraph characters from $modename.",
],
@@
-14,7
+14,7
@@
Html({
character char glyph table unicode vim xorg x11 x
'],
stylesheet => [qw'light'],
character char glyph table unicode vim xorg x11 x
'],
stylesheet => [qw'light'],
- data => [qw( digraphs.inc.pl )],
+ data => [qw( d
ata/d
igraphs.inc.pl )],
});
:>
});
:>
@@
-38,8
+38,7
@@
say '<p class="aside">Unofficial <span class="u-l2">proposals</span>',
:>
<:
:>
<:
-my $di = do 'digraphs.inc.pl'
- or die "Error loading digraphs data: ", $@ // $!;
+my $di = Data('data/digraphs');
if (exists $get{v}) {
# show characters for inverted mnemonics (vim alternatives)
if (exists $get{v}) {
# show characters for inverted mnemonics (vim alternatives)
@@
-59,12
+58,11
@@
my @columns = !exists $get{split} ? \@chars2 :
([@chars2[0, 1, 3, 4, 6]], [@chars2[2, 5, 7]]);
if ($mode) {
([@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: ", $@ // $!;
+ my $xorg = Data('data/digraphs-xorg');
$_ = [ord $_] for values %{$xorg};
$xorg->{$_}->[2] = # class = compatibility
$di->{$_} ? $di->{$_}->[0] != $xorg->{$_}->[0] ? 'l1' : # conflict
$_ = [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
+ $di->{$_}->[2]
eq 'l4'
? 'l5' : 'l3' : 'l2' # rfc|any|none
for keys %{$xorg};
for my $cp (map {$_->[0]} values %{$xorg}) {
for keys %{$xorg};
for my $cp (map {$_->[0]} values %{$xorg}) {
@@
-118,7
+116,8
@@
for my $c1group (@chars) {
my $glyph = $string || chr $codepoint;
utf8::upgrade($glyph); # prevent latin1 output
my $desc = $mnem . ($name && " ($name)");
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/;
$glyph = EscapeHTML($glyph);
$glyph = "<span>$glyph</span>" if $script =~ /\bZs\b/;