formatchar: annotation fallback

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 30aab5ed68d853141c0bd1b844c813eaf34215e6..647280e8b878bca433512dad57c2e9d062bd44df 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -14,7 +14,7 @@ our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
 
 sub new {
        my ($class) = @_;
-       bless { unicode => 0, anno => 'di', style => 'di' }, $class;
+       bless { anno => ['di', 0], style => 'di' }, $class;
 }
 
 sub glyph_info {
@@ -107,17 +107,28 @@ sub cell {
                }
        }
 
+       my $anno = '';
+       for (@{ $self->{anno} }) {
+               if ($_ eq 'di') {
+                       if (defined $mnem and length $mnem) {
+                               $anno = sprintf(' <small class="digraph">%s</small>', EscapeHTML($mnem));
+                               last;
+                       }
+               }
+               else {
+                       if ($_ eq 'hex' or $cell =~ /^[^a-zA-Z]$/) {
+                               $anno = sprintf(' <small class="%s">%04X</small>', 'value', ord $cell);
+                               last;
+                       }
+               }
+       }
+
        return sprintf('<td%s%s%s>%s%s',
                defined $title  ? qq{ title="$title"}  : '',
                @class ? sprintf(' class="%s"', join ' ', @class) : '',
                $html || '',
-               $cell eq '' ? ('&nbsp;', '') : ($cell,
-                       $self->{anno} eq 'di' && 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)
-                               : ''
-               ),
+               $cell eq '' ? '&nbsp;' : $cell,
+               $anno,
        );
 }
 
@@ -164,7 +175,7 @@ sub table {
        }
 
        return sprintf qq{<table class="glyphs%s">\n%s</table>\n},
-               $self->{anno} || $self->{unicode} >= 0 ? ' dilabel' : '',
+               @{ $self->{anno} } ? ' dilabel' : '',
                join '', map {"$_\n"} @rows;
 }
 

diff --git a/unicode.plp b/unicode.plp
index 5b3093d05c781db29e05d3c0219cb4ea90a1fac3..2f9969a3e70dce904b9693e960e70d8f7316b969 100644 (file)
--- a/unicode.plp
+++ b/unicode.plp
@@ -31,12 +31,10 @@ 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} = [];
 }
 
 our $verbose = exists $get{v};