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: import weur layout from xorg us symbols
[sheet.git]
/
chars.plp
diff --git
a/chars.plp
b/chars.plp
index d4cf06beb480889549f60b1c0164ba89bb8d6abe..91df3b83d817fd0640bc2c407a7b336292a0ec69 100644
(file)
--- a/
chars.plp
+++ b/
chars.plp
@@
-2,12
+2,12
@@
Html({
title => 'character support sheet',
Html({
title => 'character support sheet',
- version => '1.
0
',
+ version => '1.
2
',
keywords => [qw'
unicode glyph char character reference common ipa symbol sign mark table digraph
'],
stylesheet => [qw'light dark mono circus red'],
keywords => [qw'
unicode glyph char character reference common ipa symbol sign mark table digraph
'],
stylesheet => [qw'light dark mono circus red'],
- data => [qw(
unicode-cover.inc.pl ttfsupport
unicode-char.inc.pl )],
+ data => [qw(
data/unicode-cover.inc.pl data/font data/
unicode-char.inc.pl )],
raw => <<'EOT',
<style>
tbody tr:hover th {
raw => <<'EOT',
<style>
tbody tr:hover th {
@@
-22,7
+22,7
@@
EOT
use Shiar_Sheet::FormatChar;
my $glyphs = Shiar_Sheet::FormatChar->new;
use Shiar_Sheet::FormatChar;
my $glyphs = Shiar_Sheet::FormatChar->new;
-my $groupinfo =
do 'unicode-cover.inc.pl' or die $@ || $!
;
+my $groupinfo =
Data('data/unicode-cover')
;
my @ossel = @{ $groupinfo->{osdefault} };
my @fontlist = map { $_->{file} }
my @ossel = @{ $groupinfo->{osdefault} };
my @fontlist = map { $_->{file} }
@@
-30,11
+30,10
@@
my @fontlist = map { $_->{file} }
my %font;
for my $fontid (@fontlist) {
my %font;
for my $fontid (@fontlist) {
- my ($fontmeta, @fontrange) = do "ttfsupport/$fontid.inc.pl";
- $fontmeta or next;
+ my $fontmeta = eval { Data("data/font/$fontid") } or next;
$font{$fontid} = {
(map { (-$_ => $fontmeta->{$_}) } keys %{$fontmeta}),
$font{$fontid} = {
(map { (-$_ => $fontmeta->{$_}) } keys %{$fontmeta}),
- map { (chr $_ => 1) } @
fontrange
+ map { (chr $_ => 1) } @
{ $fontmeta->{cover} }
};
}
};
}
@@
-62,8
+61,7
@@
my $query = eval {
say "<h1>$title</h1>";
if (!$query) {
say "<h1>$title</h1>";
if (!$query) {
- Alert('Unicode group not specified', $@);
- exit;
+ Abort(["Unicode group not found", $@], '404 no matches');
};
for ($parent || 'Unicode range') {
};
for ($parent || 'Unicode range') {
@@
-82,15
+80,16
@@
for ($parent || 'Unicode range') {
my @chars;
for (map { split /[^\d-]/ } $query) {
my @range = split /-/, $_, 2;
my @chars;
for (map { split /[^\d-]/ } $query) {
my @range = split /-/, $_, 2;
- m/^[0-9]+$/ or die "Invalid code point $_ in query $query\n" for @range;
+ m/^[0-9]+$/ or Abort("Invalid code point $_ in query $query", 400)
+ for @range;
push @chars, chr $_ for $range[0] .. ($range[1] // $range[0]);
}
push @chars, chr $_ for $range[0] .. ($range[1] // $range[0]);
}
-@chars or
die "No match for query $query\n"
;
+@chars or
Abort("No match for query $query", '404 no results')
;
-@chars <= 1500 or
die sprintf
(
-
'Too many matches (%d) for query %s'."\n"
,
- scalar @chars, $query,
+@chars <= 1500 or
Abort
(
+
sprintf('Too many matches (%d) for query', scalar @chars)
,
+ '403 not allowed', $query
);
# output character list
);
# output character list