unicode: prepend unicode 6.0 support level

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 35f60765c7c394022482159c694629272b13fb2c..8b00318a43850ee2a5ad5567de66f317a71589f2 100644 (file)
--- 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
                }
        }}