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 d3926bca4e09e26576f054a74aa825029a47ac45..8b00318a43850ee2a5ad5567de66f317a71589f2 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -80,12 +80,13 @@ sub cell {
 
                $input =~ s/^\\//;  # escaped char
                ($cell, $title, my $class, $mnem, $entity) = $self->glyphs_html($input);
+               my $codepoint = ord(substr $input, 0, 1);
 
                if ($self->{style} eq 'univer') {
                        if ($input =~ /\p{age=unassigned}/) {
                                # check include for assignments after unicode 6.0 (perl v5.14)
                                state $agemap = do 'unicode-age.inc.pl';
-                               my $version = $agemap->{ord $input};
+                               my $version = $agemap->{$codepoint};
                                push @class, $version ? 'l2' : 'l1';
                        }
                        elsif ($input =~ /^\p{in=1.1}*$/) {
@@ -108,32 +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 {
-                       my $codepoint = ord(substr $input, 0, 1);
                        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
                }
        }}