formatchar: separate anno and style options

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 185e0af713889ae2984b3cd531825422a4b37f9a..30aab5ed68d853141c0bd1b844c813eaf34215e6 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 { digraph => 1, unicode => 0 }, $class;
+       bless { unicode => 0, anno => 'di', style => 'di' }, $class;
 }
 
 sub glyph_info {
@@ -83,7 +83,7 @@ sub cell {
 
                ($cell, $title, my $class, $mnem) = $self->glyphs_html($input);
 
-               if ($self->{digraph}) {
+               if ($self->{style} = 'di') {
                        if (defined $mnem) {
                                push @class, $class =~ /\bXz\b/ ? ('l2', 'u-prop') # unofficial
                                        : ('l3', 'u-di'); # standard digraph
@@ -112,7 +112,7 @@ sub cell {
                @class ? sprintf(' class="%s"', join ' ', @class) : '',
                $html || '',
                $cell eq '' ? (' ', '') : ($cell,
-                       $self->{digraph} && defined $mnem && length $mnem
+                       $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)
@@ -164,7 +164,7 @@ sub table {
        }
 
        return sprintf qq{<table class="glyphs%s">\n%s</table>\n},
-               $self->{digraph} || $self->{unicode} >= 0 ? ' dilabel' : '',
+               $self->{anno} || $self->{unicode} >= 0 ? ' dilabel' : '',
                join '', map {"$_\n"} @rows;
 }