formatchar: highlight by unicode range if no digraphs

Marking up digraph properties makes no sense if digraphs are not shown.
Fall back to exposing latin1 and bmp characters instead.

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index ba380356ac7a69debe2060458a36f8117472b132..656252c34b29bdad403cc26e35010870581d2d49 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -6,7 +6,7 @@ use warnings;
 use Data::Dump 'pp';
 use PLP::Functions 'EscapeHTML';
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 our $diinfo = do 'digraphs.inc.pl';
 our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
@@ -83,9 +83,20 @@ sub cell {
 
                ($cell, $title, my $class, $mnem) = $self->glyphs_html($input);
 
-               if (defined $mnem) {
-                       push @class, 'di-d'; # digraph
-                       push @class, 'di-prop' if $class =~ /\bXz\b/; # unofficial
+               if ($self->{digraph}) {
+                       if (defined $mnem) {
+                               push @class, 'di-d'; # digraph
+                               push @class, 'di-prop' if $class =~ /\bXz\b/; # unofficial
+                       }
+               }
+               else {
+                       my $codepoint = ord(substr $input, 0, 1);
+                       if ($codepoint <= 0xFF) {
+                               push @class, 'di-d';  # latin1
+                       }
+                       elsif ($codepoint <= 0xD7FF) {
+                               push @class, 'di-prop';  # bmp
+                       }
                }
 
                if ($input =~ /[ -~]/) {
@@ -100,12 +111,13 @@ sub cell {
                defined $title  ? qq{ title="$title"}  : '',
                @class ? sprintf(' class="%s"', join ' ', @class) : '',
                $html || '',
-               $cell eq '' ? '&nbsp;' : $cell,
-               $self->{digraph} && defined $mnem && length $mnem
+               $cell eq '' ? ('&nbsp;', '') : ($cell,
+                       $self->{digraph} && defined $mnem && length $mnem
                        ? sprintf(' <small class="digraph">%s</small>', EscapeHTML($mnem))
                        : $self->{unicode} + $cell =~ /^[^a-zA-Z]$/ > 0
                                ? sprintf(' <small class="%s">%04X</small>', 'value', ord $cell)
-                               : '',
+                               : ''
+               ),
        );
 }
 

diff --git a/unicode.plp b/unicode.plp
index f506fb59165df582096e3fbced9d105457adf9a6..71499530bf12c15f9e5233d1b31314247012a36f 100644 (file)
--- a/unicode.plp
+++ b/unicode.plp
@@ -28,8 +28,12 @@ i^k or i^vu respectively in <a href="/vi">Vim</a>.
 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;
+}
 if (exists $get{q}) {
-       $glyphs->{unicode}--;
+       $glyphs->{unicode} = -1;
        $glyphs->{digraph}--;
 }
 
@@ -207,8 +211,8 @@ $verbose ? (
 <div class="legend">
        <table class="glyphs"><tr>
        <td class="X di-a">ascii
-       <td class="X di-d">digraph
-       <td class="X di-prop">proposed
+       <td class="X di-d"><:= $glyphs->{digraph} ? 'digraph' : 'latin1' :>
+       <td class="X di-prop"><:= $glyphs->{digraph} ? 'proposed' : 'BMP' :>
        <td class="X di-b">other unicode
        <td class="X di-rare">discouraged
        </table>