X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/8ed454fdd94aae38d04fcd96cab15ef3b86b9cc5..dfd6cdd6706322d9d9e54e2a89b3a867ec23ed59:/Shiar_Sheet/FormatChar.pm diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm index ba38035..185e0af 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.01'; +our $VERSION = '1.04'; our $diinfo = do 'digraphs.inc.pl'; our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} } @@ -71,28 +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 (defined $mnem) { - push @class, 'di-d'; # digraph - push @class, 'di-prop' if $class =~ /\bXz\b/; # unofficial + if ($self->{digraph}) { + if (defined $mnem) { + push @class, $class =~ /\bXz\b/ ? ('l2', 'u-prop') # unofficial + : ('l3', 'u-di'); # standard digraph + } + } + else { + my $codepoint = ord(substr $input, 0, 1); + if ($codepoint <= 0xFF) { + push @class, 'l3', 'u-lat1'; # latin1 + } + elsif ($codepoint <= 0xD7FF) { + push @class, 'l2', 'u-bmp'; # bmp + } } if ($input =~ /[ -~]/) { - push @class, 'di-a'; # ascii + push @class, 'l4', 'u-ascii'; # ascii } else { - push @class, 'di-b'; # basic unicode + push @class, 'l1'; # basic unicode } } @@ -100,12 +111,13 @@ sub cell { defined $title ? qq{ title="$title"} : '', @class ? sprintf(' class="%s"', join ' ', @class) : '', $html || '', - $cell eq '' ? ' ' : $cell, - $self->{digraph} && defined $mnem && length $mnem + $cell eq '' ? (' ', '') : ($cell, + $self->{digraph} && defined $mnem && length $mnem ? sprintf(' %s', EscapeHTML($mnem)) : $self->{unicode} + $cell =~ /^[^a-zA-Z]$/ > 0 ? sprintf(' %04X', 'value', ord $cell) - : '', + : '' + ), ); } @@ -130,7 +142,7 @@ sub table { for my $cell (@$digraphs) { if ($cell =~ s/^\.//) { # dot indicates start of a new row - push @rows, ''; + push @rows, '