X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/28ac2dea2dcafa09f6d7246c8703225fb96efeea..d78fc84f0565d86f4f98ca65fb45da4a20ad3e74:/Shiar_Sheet/FormatChar.pm?ds=inline
diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index ef0445d..c0a4cb0 100644
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -8,7 +8,7 @@ use utf8;
use Data::Dump 'pp';
use PLP::Functions 'EscapeHTML';
-our $VERSION = '1.07';
+our $VERSION = '1.08';
our $uc = do 'unicode-char.inc.pl';
@@ -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;
}
}
@@ -183,7 +183,7 @@ sub cell {
return sprintf('<%s>%s%s',
join(' ', 'td',
- defined $title ? qq{ title="$title"} : (),
+ defined $title ? qq{title="$title"} : (),
@class ? sprintf('class="%s"', join ' ', @class) : (),
$html || (),
),
@@ -192,33 +192,20 @@ sub cell {
);
}
-sub table {
- my ($self, $digraphs) = @_;
-
- my @rows;
-
- my @colheads;
- while ($digraphs->[0] !~ /^\./) {
- my $cell = shift @$digraphs or last;
- push @colheads, sprintf(
- '<%s%s>%s',
- $cell =~ s/^-// ? 'td' : 'th',
- $cell =~ s/:(.*)// ? qq{ title="$1"} : '',
- $cell eq '_' ? ' ' : $cell
- );
- }
- push @rows, sprintf '%s
%s', @{$_} } @classes), + ' |