X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/141f0dc206b7f54b29627b91484782643bd08ec6..02b8f6f8e9a2e820a81bfd09254a7875928282b1:/Shiar_Sheet/FormatChar.pm diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm index a806258..78e4a21 100644 --- a/Shiar_Sheet/FormatChar.pm +++ b/Shiar_Sheet/FormatChar.pm @@ -1,47 +1,45 @@ package Shiar_Sheet::FormatChar; +use 5.010; use strict; use warnings; +use utf8; use Data::Dump 'pp'; use PLP::Functions 'EscapeHTML'; -our $VERSION = '1.03'; +our $VERSION = '1.06'; -our $diinfo = do 'digraphs.inc.pl'; -our %di = map { $diinfo->{$_}->[0] => $_ } grep { ref $diinfo->{$_} } - sort { length $a <=> length $b } keys %$diinfo; +our $uc = do 'unicode-char.inc.pl'; sub new { my ($class) = @_; - bless { digraph => 1, unicode => 0 }, $class; + bless { anno => ['di', 0], style => 'di' }, $class; } sub glyph_info { my ($self, $codepoint) = @_; - if (defined (my $mnem = $di{$codepoint})) { - return ($diinfo->{$mnem}, length $mnem == 2 ? $mnem : undef); - } - require Unicode::UCD; - if (my $fullinfo = Unicode::UCD::charinfo($codepoint)) { - return [$codepoint, @$fullinfo{qw/name category script string/}]; - } - return [$codepoint]; + return $uc->{chr $codepoint} || eval { + require Unicode::UCD; + if (my $fullinfo = Unicode::UCD::charinfo($codepoint)) { + return [@$fullinfo{qw/category name - string/}]; + } + } || []; } sub glyph_html { my ($self, $char) = @_; - my ($info, $mnem) = $self->glyph_info(ord $char); - my ($codepoint, $name, $prop, $script, $string) = @$info; + my $codepoint = ord $char; + my $info = $self->glyph_info($codepoint); + my ($class, $name, $mnem, $html, $string) = @$info; my $cell = EscapeHTML($string || $char); my $title = sprintf 'U+%04X%s', $codepoint, $name && " ($name)"; - my @class = ('X', grep {$_} $prop, $script); - $cell = "$cell" if $prop and $prop eq 'Zs'; + $cell = "$cell" if $class =~ /\bZs\b/; $cell = ' ' if $cell eq ''; - return ($cell, EscapeHTML($title), join(' ', @class), $mnem); + return ($cell, EscapeHTML($title), "X $class", $mnem, $html); } sub glyphs_html { @@ -54,7 +52,7 @@ sub glyphs_html { EscapeHTML($_[0]), # cell join(' | ', map { $_->[1] } @chars), # title $chars[0][2], # class - join(' ', grep { defined } map { $_->[3] } @chars), # digraph + join(' ', map { $_->[3] // 'â¦' } @chars), # digraph ); } @@ -65,59 +63,132 @@ sub glyph_cell { sub cell { my ($self, $input, $html) = @_; - my (@class, $title, $cell, $mnem); + my (@class, $title, $cell, $mnem, $entity); if ($input eq '-') { $cell = ''; } elsif ($input eq '=') { - push @class, 'di-invalid'; + push @class, 'u-invalid'; $cell = ''; } - else { + 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); + $input =~ s/^\\//; # escaped char + ($cell, $title, my $class, $mnem, $entity) = $self->glyphs_html($input); + my $codepoint = ord $input; + + 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->{$codepoint}; + push @class, $version ? 'l2' : 'l1'; + } + elsif ($input =~ /^\p{in=1.1}*$/) { + push @class, 'l5'; # first release 1993 + } + elsif ($input =~ /^\p{in=3.0}*$/) { + push @class, 'l4'; # 20th century + } + elsif ($input =~ /^\p{in=4.1}*$/) { + push @class, 'l4'; # over 10 years ago + } + elsif ($input =~ /^\p{in=6.0}*$/) { + push @class, 'l3'; # before 2012 + } + else { + push @class, 'l2'; # more recent + } + next; + } - if ($self->{digraph}) { - if (defined $mnem) { - push @class, 'di-d'; # digraph - push @class, 'di-prop' if $class =~ /\bXz\b/; # unofficial + if ($self->{style} eq 'di') { + if ($mnem =~ /â¦/) { + # incomplete representation, usually partial + } + elsif ($class =~ /\bu-di\b/) { + push @class, ('l4', 'u-di'); # standard digraph + } + elsif ($class =~ /\bu-prop\b/) { + push @class, ('l3', 'u-prop'); # unofficial + } + } + elsif ($self->{style} eq 'html') { + if (defined $entity) { + push @class, ($codepoint <= 0xFF ? 'l4' : 'l3', 'u-html'); } } else { - my $codepoint = ord(substr $input, 0, 1); if ($codepoint <= 0xFF) { - push @class, 'di-d'; # latin1 + push @class, 'l4', 'u-lat1'; # latin1 } elsif ($codepoint <= 0xD7FF) { - push @class, 'di-prop'; # bmp + push @class, 'l3', 'u-bmp'; # bmp } } if ($input =~ /[ -~]/) { - push @class, 'di-a'; # ascii + push @class, 'l5', 'u-ascii'; # ascii + } + elsif ($input =~ /^\p{in=6.0}+$/) { + push @class, 'l2'; # in unicode 6.0 } else { - push @class, 'di-b'; # basic unicode + push @class, 'l1'; # any unicode + } + }} + + my $anno = ''; + if ($cell ne '') { + for (@{ $self->{anno} }) { + if (/html$/) { + if (defined $entity) { + $entity = "&$entity;" if /^&/; + $anno = sprintf(' %s', EscapeHTML($entity)); + last; + } + } + elsif ($_ eq 'xml') { + $anno = sprintf(' %s', + sprintf '#%d', ord($cell) + ); + last; + } + elsif ($_ eq '&xml') { + $anno = sprintf(' %s', + sprintf '&#%d;', ord($cell) + ); + last; + } + elsif ($_ eq 'di') { + if (defined $mnem and length $mnem) { + $anno = sprintf(' %s', EscapeHTML($mnem)); + last; + } + } + else { + if ($_ eq 'hex' or $cell =~ /^[^a-zA-Z]$/) { + $anno = sprintf(' %04X', 'value', ord $cell); + last; + } + } } } - return sprintf('