X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/70e3b473d744176d9692900114c8beefc0527150..bc26e655d48aa244c44d5500962324a42b69e97c:/Shiar_Sheet/FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 35f6076..8b00318 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -109,31 +109,34 @@ sub cell {
 
 		if ($self->{style} eq 'di') {
 			if ($class =~ /\bu-di\b/) {
-				push @class, ('l3', 'u-di'); # standard digraph
+				push @class, ('l4', 'u-di'); # standard digraph
 			}
 			elsif ($class =~ /\bu-prop\b/) {
-				push @class, ('l2', 'u-prop'); # unofficial
+				push @class, ('l3', 'u-prop'); # unofficial
 			}
 		}
 		elsif ($self->{style} eq 'html') {
 			if (defined $entity) {
-				push @class, ('l3', 'u-html');
+				push @class, ($codepoint <= 0xFF ? 'l4' : 'l3', 'u-html');
 			}
 		}
 		else {
 			if ($codepoint <= 0xFF) {
-				push @class, 'l3', 'u-lat1';  # latin1
+				push @class, 'l4', 'u-lat1';  # latin1
 			}
 			elsif ($codepoint <= 0xD7FF) {
-				push @class, 'l2', 'u-bmp';  # bmp
+				push @class, 'l3', 'u-bmp';  # bmp
 			}
 		}
 
 		if ($input =~ /[ -~]/) {
-			push @class, 'l4', 'u-ascii'; # ascii
+			push @class, 'l5', 'u-ascii'; # ascii
+		}
+		elsif ($input =~ /^\p{in=6.0}+$/) {
+			push @class, 'l2'; # in unicode 6.0
 		}
 		else {
-			push @class, 'l1'; # basic unicode
+			push @class, 'l1'; # any unicode
 		}
 	}}