our $VERSION = '1.08';
-our $uc = do 'unicode-char.inc.pl';
+our $uc = do 'data/unicode-char.inc.pl';
sub new {
my ($class) = @_;
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';
}
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 {
}
}
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;
}
}
my @colheads;
while ($digraphs->[0] !~ /^\./) {
my $cell = shift @$digraphs or last;
- push @colheads, sprintf(
- '<%s%s>%s',
+ if ($cell eq '>') {
+ push @colheads, '<tr>';
+ next;
+ }
+ push @colheads, join('',
+ '<',
$cell =~ s/^-// ? 'td' : 'th',
- $cell =~ s/:(.*)// ? qq{ title="$1"} : '',
+ $cell =~ s/:(.*)// && qq{ title="$1"},
+ $cell =~ s/^(>+)// && ' colspan='.(length($1) + 1),
+ '>',
$cell eq '_' ? ' ' : $cell
);
}
}
sub legend {
- my @classes = (
- ["X l5" => 'unicode 1.1'],
- ["X l4" => '20th century'],
- ["X l3" => 'in 6.0 (2010)'],
- ["X l2" => 'recent assignments'],
- ["X l1" => 'proposed'],
- ["ex" => 'irregular'],
+ my $self = shift;
+ my @classes = $self->{style} eq 'univer' ? (
+ [l5 => 'unicode 1.1'],
+ [l4 => '20th century'],
+ [l3 => 'in 6.0 (2010)'],
+ [l2 => 'recent assignments'],
+ [l1 => 'proposed'],
+ [ex => 'irregular'],
+ ) : (
+ [l5 => 'ascii'],
+ [l4 => $self->{style} eq 'di' ? 'digraph' : 'latin1'],
+ [l3 => $self->{style} eq 'di' ? 'proposed' : 'HTML4'],
+ [l2 => 'unicode ≤6.0'],
+ [l1 => 'other unicode'],
+ [ex => 'discouraged'],
);
return (
'<div class="legend"><table class="glyphs"><tr>',
- (map { sprintf '<td class="%s">%s', @{$_} } @classes),
+ (map { sprintf '<td class="X %s">%s', @{$_} } @classes),
'</table></div>',
);
}