keyboard/altgr: unicode description in unshifted title

[sheet.git] / Shiar_Sheet / FormatChar.pm

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index 9a002762fff0583acbd5f0984361dd5f97a8940e..72d2e3dcadd0bc76072d004bd6562ead297fd288 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -10,7 +10,7 @@ use PLP::Functions 'EscapeHTML';
 
 our $VERSION = '1.08';
 
-our $uc = do 'unicode-char.inc.pl';
+our $uc = do 'data/unicode-char.inc.pl';
 
 sub new {
        my ($class) = @_;
@@ -34,7 +34,7 @@ sub glyph_html {
        my ($class, $name, $mnem, $entity, $string) = @$info;
 
        my $cell = EscapeHTML($string || $char);
-       my $title = sprintf 'U+%04X%s', $codepoint, !!$name && " ($name)";
+       my $title = sprintf 'U+%04X%s', $codepoint, !!$name && " $name";
 
        $cell = "<span>$cell</span>" if $class and $class =~ /\bZs\b/;
        $cell = '&nbsp;' if $cell eq '';
@@ -86,7 +86,7 @@ sub cell {
                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';
+                               state $agemap = do 'data/unicode-age.inc.pl';
                                my $version = $agemap->{$codepoint};
                                push @class, $version ? 'l2' : 'l1';
                        }
@@ -136,7 +136,7 @@ sub cell {
                if ($input =~ /[ -~]/) {
                        push @class, 'l5', 'u-ascii'; # ascii
                }
-               elsif ($input =~ /^\p{in=6.0}+$/) {
+               elsif ($input =~ /^\p{in=6.0}+$/ and $input !~ /\p{Co}/) {
                        push @class, 'l2'; # in unicode 6.0
                }
                else {
@@ -173,8 +173,8 @@ sub cell {
                                }
                        }
                        else {
-                               if ($_ eq 'hex' or $cell =~ /^[^a-zA-Z]$/) {
-                                       $anno = sprintf(' <small class="%s">%04X</small>', 'value', ord $cell);
+                               if ($_ eq 'hex' or $input =~ /^[^a-zA-Z]$/) {
+                                       $anno = sprintf(' <small class="%s">%04X</small>', 'value', ord $input);
                                        last;
                                }
                        }
@@ -248,11 +248,15 @@ sub table {
        my @colheads;
        while ($digraphs->[0] !~ /^\./) {
                my $cell = shift @$digraphs or last;
+               if ($cell eq '>') {
+                       push @colheads, '<tr>';
+                       next;
+               }
                push @colheads, join('',
                        '<',
                        $cell =~ s/^-// ? 'td' : 'th',
                        $cell =~ s/:(.*)// && qq{ title="$1"},
-                       $cell =~ s/^>// && ' colspan=2',
+                       $cell =~ s/^(>+)// && ' colspan='.(length($1) + 1),
                        '>',
                        $cell eq '_' ? '&nbsp;' : $cell
                );