git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
word/wijzer: answers below image in vertical orientation
[sheet.git]
/
digraphs.plp
diff --git
a/digraphs.plp
b/digraphs.plp
index e66ec8f87cadfb5d2af978188bb9252a099d1acf..7106c7f6da3ad411472fdb0798b98b2f9f7a8ab1 100644
(file)
--- a/
digraphs.plp
+++ b/
digraphs.plp
@@
-1,12
+1,11
@@
<(common.inc.plp)><:
<(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',
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.",
],
description => [
"Complete table of digraph characters from $modename.",
],
@@
-15,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 )],
});
:>
});
:>
@@
-39,8
+38,8
@@
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 = do 'd
ata/d
igraphs.inc.pl'
+ or
Abort("Error loading digraphs data", 501, $@ // $!)
;
if (exists $get{v}) {
# show characters for inverted mnemonics (vim alternatives)
if (exists $get{v}) {
# show characters for inverted mnemonics (vim alternatives)
@@
-61,11
+60,11
@@
my @columns = !exists $get{split} ? \@chars2 :
if ($mode) {
my $xorg = do 'data/digraphs-xorg.inc.pl'
if ($mode) {
my $xorg = do 'data/digraphs-xorg.inc.pl'
- or
die "Error loading Xorg data: ", $@ // $!
;
+ or
Abort("Error loading Xorg data", 501, $@ // $!)
;
$_ = [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}) {
@@
-94,11
+93,11
@@
if ($mode) {
for my $colchars (@columns) {
print '<table class="glyphs dimap"><col>';
print qq'<colgroup span="$_">' for map {scalar @$_} @{$colchars};
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};
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>';
}
for my $c1group (@chars) {
print '<tbody>';
@@
-119,7
+118,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/;
@@
-127,10
+127,10
@@
for my $c1group (@chars) {
printf "\n".'<td class="%s" title="%s">%s',
join(' ', @class), EscapeHTML($desc), $glyph;
}
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};
}
print '<hr>' if exists $get{split};
}