X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/8ed454fdd94aae38d04fcd96cab15ef3b86b9cc5..4b28462f6dccd2437a3313b02a2ec678a4bf674b:/Shiar_Sheet/FormatChar.pm?ds=inline
diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index ba38035..656252c 100644
--- 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 '' ? ' ' : $cell,
- $self->{digraph} && defined $mnem && length $mnem
+ $cell eq '' ? (' ', '') : ($cell,
+ $self->{digraph} && defined $mnem && length $mnem
? sprintf(' %s', EscapeHTML($mnem))
: $self->{unicode} + $cell =~ /^[^a-zA-Z]$/ > 0
? sprintf(' %04X', 'value', ord $cell)
- : '',
+ : ''
+ ),
);
}