X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/5eb5ea37fdc8a195430cf7b198aacb30057b87a8..e9cb855977ddc299c5ef1d74ce260e4ad4e21a08:/Shiar_Sheet/FormatChar.pm?ds=sidebyside

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 '' ? '&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)
-				: '',
+				: ''
+		),
 	);
 }