X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/a748ed6eb94a8cb8b7cf09ef9f87104e8f371f82..c2c689e77c561226e525b7e4a76f188878d68c5a:/Shiar_Sheet/FormatChar.pm?ds=sidebyside diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm index 839144f..c0a4cb0 100644 --- a/Shiar_Sheet/FormatChar.pm +++ b/Shiar_Sheet/FormatChar.pm @@ -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(' %04X', 'value', ord $cell); + if ($_ eq 'hex' or $input =~ /^[^a-zA-Z]$/) { + $anno = sprintf(' %04X', 'value', ord $input); last; } } @@ -248,10 +248,16 @@ sub table { my @colheads; while ($digraphs->[0] !~ /^\./) { my $cell = shift @$digraphs or last; - push @colheads, sprintf( - '<%s%s>%s', + if ($cell eq '>') { + push @colheads, '