sc: never wrap statistics table

[sheet.git] / unicode.plp

diff --git a/unicode.plp b/unicode.plp
index 5b3093d05c781db29e05d3c0219cb4ea90a1fac3..92f9a01b964ac33116cd74dce7f35ced105c4d4a 100644 (file)
--- a/unicode.plp
+++ b/unicode.plp
@@ -11,7 +11,7 @@ Html({
                unicode glyph char character reference common ipa symbol sign mark table digraph
        '],
        stylesheet => [qw'light dark mono circus red'],
-       data => [qw'digraphs.inc.pl unicode.inc.pl'],
+       data => [qw'unicode-table.inc.pl unicode-char.inc.pl'],
 });
 
 :>
@@ -31,53 +31,32 @@ use Shiar_Sheet::FormatChar;
 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}) {
-       $glyphs->{unicode} = -1;
-       $glyphs->{anno} = 0;
+       $glyphs->{anno} = [];
+}
+if (exists $get{html}) {
+       $glyphs->{anno} = ['html', 'xml'];
+       $glyphs->{style} = 'html';
 }
 
 our $verbose = exists $get{v};
 
-my $tables = do 'unicode.inc.pl' or die $@ || $!;
-
-$glyphs->print(map {
-       my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
-       if (/[A-Z]/) {
-               $_;
-       }
-       else {
-               state $group;
-               $group = $1 if s{^([^/]+)/}{};
-               if (s/=(.*)//) {
-                       my @select = split /=/, $1;
-                       my $table = $tables->{$group}->{$_};
-                       my $rowlen;
-                       for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
-                               last if $table->[$rowlen] =~ /\./;
-                       }
-                       my @cells = map { $_*$rowlen .. ($_+1)*$rowlen - 1 } @select;
-                       [ @$table[@cells] ];
-               }
-               else {
-                       $tables->{$group}->{$_};
-               }
-       }
-} qw{
+my @config = qw(
        Popular
                punctuation/quoting
-                       common
-               symbols/binary?symbols/binary=0
-               latin/sample=0=1
-                       sample=2=3
+                       common=-5?common
+               symbols/binary?symbols/binary=-5
+               latin/sample=-1
+                       ?sample=2-
                        ?uncommon
                punctuation/version
                punctuation/marks
+                       spacing
        Symbols
                symbols/currency
-                       cards
+                       cards=-3?cards
                        ?chess
                        signs1
                        communic=0?communic
@@ -85,14 +64,21 @@ $glyphs->print(map {
                        signs2
        Signs
                        solar
-                       zodiac=0?zodiac
-       Key commands
+                       zodiac=0-1=3?zodiac
+       Key_commands
                keys/spacing
                        editing
                        modifier
                        control
                        command
+                       android
+                       ps
                        ?player
+       Mathematics
+               math/size
+                       equal
+                       set
+                       logic
        Arrows
                arrows/single
                        double
@@ -103,7 +89,7 @@ $glyphs->print(map {
                        whitetri
                        ?-large
                        ?-heavy
-       Line drawing
+       Line_drawing
                lines/double
                        doubleh
                        doublev
@@ -129,7 +115,48 @@ $glyphs->print(map {
                        ?hiraderiv
                        ?kata
                        ?kataderiv
-});
+);
+
+splice @config, 4, 2, qw(
+               latin/vowels=-5?latin/vowels
+                        westeuro
+                       ?easteuro
+) if exists $get{html};
+
+$_ and m{/*+(.+)} and @config = split /[ ]/, $1 for $ENV{PATH_INFO}, $get{q};
+
+my $tables = do 'unicode-table.inc.pl' or die $@ || $!;
+
+$glyphs->print(map {
+       my $_ = /(.*)\?(.*)/ ? ($verbose ? $2 : $1) : $_;
+       if (!$_) {
+               ();
+       }
+       elsif (/[A-Z]/) {
+               tr/_/ /;
+               $_;
+       }
+       else {
+               state $group;
+               $group = $1 if s{^([^/]+)/}{};
+               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 @cells = map {
+                               my $end = (s/-(.+)?// ? ($1 // @$table / $rowlen - 1) : $_) + 1;
+                               $_ * $rowlen .. $end * $rowlen - 1;
+                       } @select;
+                       $table = [ @$table[@cells] ];
+               }
+               $table;
+       }
+} @config);
 
 :></div>