git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unicode: various table selection fixes and improvements
[sheet.git]
/
unicode.plp
diff --git
a/unicode.plp
b/unicode.plp
index 5b3093d05c781db29e05d3c0219cb4ea90a1fac3..475a8871093405c240b86c6ff9066a89a44ee999 100644
(file)
--- a/
unicode.plp
+++ b/
unicode.plp
@@
-31,12
+31,13
@@
use Shiar_Sheet::FormatChar;
my $glyphs = Shiar_Sheet::FormatChar->new;
if (exists $get{di}) {
my $glyphs = Shiar_Sheet::FormatChar->new;
if (exists $get{di}) {
- $glyphs->{anno} = (!defined $get{di} || $get{di}) && 'di';
- $glyphs->{unicode} = 1;
+ $glyphs->{anno} = [ (!defined $get{di} || $get{di}) && 'di', 'hex' ];
}
if (exists $get{q}) {
}
if (exists $get{q}) {
- $glyphs->{unicode} = -1;
- $glyphs->{anno} = 0;
+ $glyphs->{anno} = [];
+}
+if (exists $get{html}) {
+ $glyphs->{anno} = ['html', 'xml'];
}
our $verbose = exists $get{v};
}
our $verbose = exists $get{v};
@@
-45,33
+46,40
@@
my $tables = do 'unicode.inc.pl' or die $@ || $!;
$glyphs->print(map {
my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
$glyphs->print(map {
my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
- if (/[A-Z]/) {
+ if (!$_) {
+ ();
+ }
+ elsif (/[A-Z]/) {
+ tr/_/ /;
$_;
}
else {
state $group;
$group = $1 if s{^([^/]+)/}{};
$_;
}
else {
state $group;
$group = $1 if s{^([^/]+)/}{};
- if (s/=(.*)//) {
- my @select = split /=/, $1;
- my $table = $tables->{$group}->{$_};
+ my @select = s/=(.*)// ? split(/=/, $1) : ();
+ my $table = $tables->{$group}->{$_}
+ or die "Unknown table specified: $group/$_";
+
+ if (@select) {
my $rowlen;
for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
last if $table->[$rowlen] =~ /\./;
}
my $rowlen;
for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
last if $table->[$rowlen] =~ /\./;
}
- my @cells = map {
$_*$rowlen .. ($_+1)*$rowlen - 1 } @select;
-
[ @$table[@cells] ]
;
- }
- else {
- $table
s->{$group}->{$_}
;
+ my @cells = map {
+
my $end = (s/-(.+)?// ? ($1 // @$table / $rowlen - 1) : $_) + 1
;
+ $_ * $rowlen .. $end * $rowlen - 1;
+ } @select;
+ $table
= [ @$table[@cells] ]
;
}
}
+ $table;
}
} qw{
Popular
punctuation/quoting
common
}
} qw{
Popular
punctuation/quoting
common
- symbols/binary?symbols/binary=
0
- latin/sample=
0=
1
- sample=2
=
3
+ symbols/binary?symbols/binary=
-5
+ latin/sample=
-
1
+ sample=2
-
3
?uncommon
punctuation/version
punctuation/marks
?uncommon
punctuation/version
punctuation/marks
@@
-86,13
+94,18
@@
$glyphs->print(map {
Signs
solar
zodiac=0?zodiac
Signs
solar
zodiac=0?zodiac
- Key
commands
+ Key
_
commands
keys/spacing
editing
modifier
control
command
?player
keys/spacing
editing
modifier
control
command
?player
+ Mathematics
+ math/size
+ equal
+ set
+ logic
Arrows
arrows/single
double
Arrows
arrows/single
double
@@
-103,7
+116,7
@@
$glyphs->print(map {
whitetri
?-large
?-heavy
whitetri
?-large
?-heavy
- Line
drawing
+ Line
_
drawing
lines/double
doubleh
doublev
lines/double
doubleh
doublev