unicode: logic operators

[sheet.git] / unicode.plp

diff --git a/unicode.plp b/unicode.plp
index d7e5e01544596da7675b0c9cdbdb766736be03fe..5f2c576704d5139dc0f199d5d6dbb1126660bc14 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}) {
-       $glyphs->{digraph} = defined $get{di} ? ! !$get{di} : 1;
-       $glyphs->{unicode} = 1;
+       $glyphs->{anno} = [ (!defined $get{di} || $get{di}) && 'di', 'hex' ];
 }
 if (exists $get{q}) {
-       $glyphs->{unicode} = -1;
-       $glyphs->{digraph}--;
+       $glyphs->{anno} = [];
+}
+if (exists $get{html}) {
+       $glyphs->{anno} = ['html', 'xml'];
 }
 
 our $verbose = exists $get{v};
@@ -58,7 +59,10 @@ $glyphs->print(map {
                        for ($rowlen = 1; $rowlen++; $rowlen <= $#$table) {
                                last if $table->[$rowlen] =~ /\./;
                        }
-                       my @cells = map { $_*$rowlen .. ($_+1)*$rowlen - 1 } @select;
+                       my @cells = map {
+                               my $end = (s/-(.+)?// ? ($1 // @$table / $rowlen - 1) : $_) + 1;
+                               $_ * $rowlen .. $end * $rowlen - 1;
+                       } @select;
                        [ @$table[@cells] ];
                }
                else {
@@ -69,12 +73,16 @@ $glyphs->print(map {
        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
+               math/size
+                       equal
+                       set
+                       logic
        Symbols
                symbols/currency
                        cards
@@ -136,8 +144,8 @@ $glyphs->print(map {
 <div class="legend">
        <table class="glyphs"><tr>
        <td class="X l4">ascii
-       <td class="X l3"><:= $glyphs->{digraph} ? 'digraph' : 'latin1' :>
-       <td class="X l2"><:= $glyphs->{digraph} ? 'proposed' : 'BMP' :>
+       <td class="X l3"><:= $glyphs->{style} eq 'di' ? 'digraph' : 'latin1' :>
+       <td class="X l2"><:= $glyphs->{style} eq 'di' ? 'proposed' : 'BMP' :>
        <td class="X l1">other unicode
        <td class="X ex">discouraged
        </table>