git.shiar.nl
/
sheet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2f787b5
)
font: support character ranges and unicode matches
author
Mischa POSLAWSKY
<perl@shiar.org>
Mon, 2 Apr 2012 22:34:15 +0000
(
00:34
+0200)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Tue, 10 Apr 2012 01:03:24 +0000
(
03:03
+0200)
font.plp
patch
|
blob
|
history
diff --git
a/font.plp
b/font.plp
index 22479b4763f2b124264b94ae33a5c27f29186e7f..66f6e4a58d209ea4b77576fe308be3ea1792d31c 100644
(file)
--- a/
font.plp
+++ b/
font.plp
@@
-53,32
+53,45
@@
for my $os (@ossel) {
my @chars;
my @chars;
-for ($ENV{PATH_INFO} || $get{q} || ()) {
+my $query = $ENV{PATH_INFO} || $get{q} || 'ipa';
+for ($query) {
s{^/}{};
s{^/}{};
- when ('') {
- next;
+ when (qr{^[a-z]+(?:/|\z)}) {
+ for (split / /) {
+ my ($tablegroup, $tablename) = split m{/}, $_, 2;
+ my @tables = $tablename ? $tables->{$tablegroup}->{$tablename}
+ : sort values %{ $tables->{$tablegroup} };
+ for (@tables) {
+ my $includerows; # ignore rows before body row
+ for (@{$_}) {
+ $includerows ||= m/^[.]/ or next;
+ next if /^[.-]/;
+ next if $_ eq '>' or $_ eq '=';
+ push @chars, $_;
+ }
+ }
+ }
}
}
- when (qr{/}) {
- push @{ $get{'@g'} }, $_;
+ when (qr{[\d,;\s+-]+}) {
+ for (map { split /[^\d-]/ } $_) {
+ my ($charnum, $range) = split /-/, $_;
+ push @chars, chr $_ for $charnum .. ($range // $charnum);
+ }
+ }
+ when (qr{[A-Z]}) {
+ eval {
+ my $match = qr/\A\p{$_}\z/;
+ push @chars, grep { m/$match/ } map { chr $_ }
+ 0..0xD7FF, 0xE000..0xFDCF, 0xFDF0..0xFFFD;
+ } or die "invalid unicode match: $_\n";
}
default {
die "unknown parameter: $_\n";
}
}
}
default {
die "unknown parameter: $_\n";
}
}
-$get{'@g'} //= ['latin/sample'];
-
-for (map { split / / } @{ $get{'@g'} }) {
- my ($tablegroup, $tablename) = split m{/}, $_, 2;
- my $table = $tables->{$tablegroup}->{$tablename};
-
- for (@{$table}) {
- m/^[.]/ .. 1 or next;
- next if /^[.-]/;
- next if $_ eq '>' or $_ eq '=';
- push @chars, $_;
- }
-}
+@chars <= 1500
+ or die sprintf 'too many matches (%d)'."\n", scalar @chars;
# output character list
# output character list
@@
-107,7
+120,7
@@
for my $chr (@chars) {
print "<tr><th>$chr\n";
my $info = $glyphs->glyph_info($codepoint);
my ($class, $name, $mnem, $html, $string) = @$info;
print "<tr><th>$chr\n";
my $info = $glyphs->glyph_info($codepoint);
my ($class, $name, $mnem, $html, $string) = @$info;
- print "<td>$_" for sprintf('%X', $codepoint), EscapeHTML($name);
+ print "<td>$_" for sprintf('%X', $codepoint), EscapeHTML($name
|| '?'
);
printf '<td class="%s">%s', @$_ for (
[$ascii ? 'l0' : defined $mnem ? 'l4' : 'l1', $mnem // ''],
[$ascii ? 'l0' : defined $html ? 'l4' : 'l1', $html // ''],
printf '<td class="%s">%s', @$_ for (
[$ascii ? 'l0' : defined $mnem ? 'l4' : 'l1', $mnem // ''],
[$ascii ? 'l0' : defined $html ? 'l4' : 'l1', $html // ''],