X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/0c4ca53d0803c3d9db0a06b57f650e65c3327467..9cabbcb99510ce7c9256d085d1c9de6c0b5fc8ce:/Shiar_Sheet/FormatChar.pm diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm index 185e0af..647280e 100644 --- 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 { anno => ['di', 0], 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 @@ -107,17 +107,28 @@ sub cell { } } + my $anno = ''; + for (@{ $self->{anno} }) { + if ($_ eq 'di') { + if (defined $mnem and length $mnem) { + $anno = sprintf(' %s', EscapeHTML($mnem)); + last; + } + } + else { + if ($_ eq 'hex' or $cell =~ /^[^a-zA-Z]$/) { + $anno = sprintf(' %04X', 'value', ord $cell); + last; + } + } + } + return sprintf('