X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f9f30ee618bf309a9d4e4565adb73dfedd1ef203..4af2c4c329f1a501831734ce6e7e867bf1d26b9d:/Shiar_Sheet/FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index a806258..c123506 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.03';
+our $VERSION = '1.04';
 
 our $diinfo = do 'digraphs.inc.pl';
 our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} }
@@ -71,39 +71,39 @@ sub cell {
 		$cell = '';
 	}
 	elsif ($input eq '=') {
-		push @class, 'di-invalid';
+		push @class, 'u-invalid';
 		$cell = '';
 	}
 	else {
 		push @class, 'X';
 
 		if ($input =~ s/^-//) {
-			push @class, 'di-rare'; # discouraged
+			push @class, 'ex'; # discouraged
 		}
 
 		($cell, $title, my $class, $mnem) = $self->glyphs_html($input);
 
 		if ($self->{digraph}) {
 			if (defined $mnem) {
-				push @class, 'di-d'; # digraph
-				push @class, 'di-prop' if $class =~ /\bXz\b/; # unofficial
+				push @class, $class =~ /\bXz\b/ ? ('l2', 'u-prop') # unofficial
+					: ('l4', 'u-di'); # standard digraph
 			}
 		}
 		else {
 			my $codepoint = ord(substr $input, 0, 1);
 			if ($codepoint <= 0xFF) {
-				push @class, 'di-d';  # latin1
+				push @class, 'l4', 'u-lat1';  # latin1
 			}
 			elsif ($codepoint <= 0xD7FF) {
-				push @class, 'di-prop';  # bmp
+				push @class, 'l2', 'u-bmp';  # bmp
 			}
 		}
 
 		if ($input =~ /[ -~]/) {
-			push @class, 'di-a'; # ascii
+			push @class, 'l5', 'u-ascii'; # ascii
 		}
 		else {
-			push @class, 'di-b'; # basic unicode
+			push @class, 'l0'; # basic unicode
 		}
 	}