us => [qw( cp437 cp863 AdobeStandardEncoding gsm0338 )],
ebcdic => [qw( cp37 cp500 cp875 cp1026 cp1047 posix-bc )],
iso => [map {"iso-8859-$_"} 1 .. 11, 13 .. 16],
- dos => [qw( cp437 cp863 cp850 cp860 cp852 cp855 cp866 cp864 cp1006 cp737 cp869 cp862 cp862 cp857 cp865 cp861 cp874 cp775 )],
+ dos => [qw( cp437 cp865 cp861 cp860 cp863 cp850 cp857 cp852 cp775
+ cp737 cp869 cp866 cp855 cp862 cp864 )],
+ aix => [qw( cp1006 )],
+ win => [qw( cp1252 cp1250 cp1254 cp1257 cp1258 cp1253 cp1251 cp1255 cp1256 cp874 )],
westeur => [qw( iso-8859-1 iso-8859-15 cp1252 iso-8859-14 cp850 hp-roman8 nextstep MacRoman )],
centeur => [qw( iso-8859-2 iso-8859-16 cp1250 cp852 MacRomanian MacCroatian MacCentralEurRoman )], # MacRumanian only for DB
turkish => [qw( iso-8859-9 iso-8859-3 cp1254 cp857 MacTurkish )],
baltic => [qw( iso-8859-4 iso-8859-13 cp1257 cp775 )],
nordic => [qw( iso-8859-10 cp865 cp861 MacIcelandic MacSami )],
- cyrillic => [qw( koi8-f koi8-r koi8-u iso-8859-5 cp1251 MacCyrillic cp855 cp866 )], # MacUkrainian is broken
+ cyrillic => [qw( koi8-r koi8-u koi8-f iso-8859-5 cp1251 MacCyrillic cp866 cp855 )], # MacUkrainian is broken
arabic => [qw( iso-8859-6 cp1006 cp864 cp1256 MacArabic )], # MacFarsi same as MacArabic?
greek => [qw( iso-8859-7 cp1253 MacGreek cp737 cp869 )],
hebrew => [qw( iso-8859-8 cp1255 MacHebrew cp862 )],
'iso-8859-14' => ['iso-8859-1' => '160'],
'iso-8859-15' => ['iso-8859-1' => '160-191'],
'iso-8859-16' => ['iso-8859-2' => '160'],
+ 'hp-roman8' => ['iso-8859-1' => '160'],
'cp1252' => ['iso-8859-1' => '128-159'],
- 'cp1250' => ['iso-8859-2' => '128-191'],
- 'cp1254' => ['iso-8859-9' => '128-159'],
- 'cp1257' => ['iso-8859-13' => '128-'],
+ 'cp1250' => ['iso-8859-2' => '128-191', 'cp1252' => '128'],
+ 'cp1254' => ['iso-8859-9' => '128-159', 'cp1252' => '128'],
+ 'cp874' => ['iso-8859-11' => '128-159', 'cp1252' => '128'], # windows-874 actually cp1162
+ 'cp1257' => ['iso-8859-13' => '128', 'cp1252' => '128'],
+ 'cp1251' => ['cp1252' => '128'],
+ 'cp1253' => ['cp1252' => '128'],
+ 'cp1255' => ['iso-8859-8' => '128-223', 'cp1252' => '128'],
+ 'cp1256' => ['cp1252' => '128'],
+ 'cp1258' => ['cp1252' => '128'],
'cp850' => ['cp437' => '144'],
- 'cp865' => ['cp437' => '144-176'],
+ 'cp860' => ['cp437' => '128-175'],
+ 'cp861' => ['cp865' => '128-175'],
+ 'cp863' => ['cp437' => '128-175'],
+ 'cp865' => ['cp437' => '144-175'],
'cp852' => ['cp850' => '128', 'cp437' => '128'],
'cp857' => ['cp850' => '128-239', 'cp437' => '128'],
'cp775' => ['cp850' => '128'], # partial cp437
+ 'cp866' => ['cp437' => '128'],
+ 'cp855' => ['cp437' => '128'],
+ 'cp1006' => ['cp437' => '128'],
+ 'cp737' => ['cp437' => '128'],
+ 'cp869' => ['cp437' => '128'],
+ 'cp862' => ['cp437' => '128'],
+ 'cp864' => ['cp437' => '128'],
+
+ 'koi8-u' => ['koi8-r' => 128],
+ 'koi8-f' => ['koi8-u' => 128],
'MacRomanian' => ['MacRoman' => '160'],
'MacCroatian' => ['MacRoman' => '160'],
'MacCentralEurRoman' => ['MacRoman' => '128'],
'MacTurkish' => ['MacRoman' => '208-223'], # F5 is unassigned
+ 'MacCyrillic' => ['MacRoman' => '128'],
+ 'MacHebrew' => ['MacRoman' => '128'],
};
my @parents = @{ $INHERIT->{$input} || [] };
- if (my ($parent, $part) = pairfirst { $visible->{$a} } @parents) {
+ if (my ($parent, $part) = pairfirst { defined $visible->{$a} } @parents) {
$row{parent} = $parent;
$params = $part;
+ $params = 128 unless $visible->{$parent}
+ or ($input eq 'MacCroatian' and defined $visible->{MacRomanian});
}
- elsif ($visible->{ascii}) {
- $row{parent} = $parents[0] || 'ascii';
+ elsif (defined $visible->{ascii}) {
+ $row{parent} = $parents[0];
$params = $parents[1] || 128;
$params = 128 if $params >= 128; # ascii offset at most
}
elsif (@parents) {
$row{parent} = $parents[0];
}
+ $visible->{$_} //= 0 for $row{parent};
}
if (defined $params and $params =~ m/^ (\d+) (-\d+)? /x) {
my $end = $2 ? hex($2) << 4 : $start + 240;
$row{table} = join '', map { chr } $start .. $end+15;
utf8::upgrade($row{table}); # prevent latin1 output
+ $row{len} = length $row{table};
$row{set} = sprintf 'Unicode block U+%02Xxx', $start >> 8;
}
elsif ($input eq 'U') {
- $row{table} = ' ' x 1024;
+ $row{len} = 1024;
$row{set} = 'Unicode planes';
$row{cell} = do 'charset-ucplanes.inc.pl'
or Alert('Table data could not be read', $@ || $!);
}
elsif ($row{set} = Encode::resolve_alias($input)) {
if ($row{set} eq 'Internal') {
- $row{table} = ' ' x ($endpoint < 255 ? 640 : 8192);
+ $row{len} = $endpoint < 255 ? 640 : 8192;
$row{set} = 'Unicode BMP';
$row{cell} = do 'charset-unicode.inc.pl'
or Alert('Table data could not be read', $@ || $!);
}
elsif ($row{set} eq 'utf-8-strict') {
- $row{table} = undef;
+ $row{len} = 256;
$row{set} = 'UTF-8';
$row{cell} = do 'charset-utf8.inc.pl'
or Alert('Table data could not be read', $@ || $!);
}
else {
- $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
- # (~16x faster than decoding in loop;
- # substr strings is twice as fast as splitting to an array)
+ if ($row{set} eq 'MacHebrew') {
+ # array of possibly multiple characters per code point
+ $row{table} = [
+ map { Encode::decode($row{set}, pack 'C*', $_) } $row{offset} .. $endpoint
+ ];
+ }
+ else {
+ # ~16x faster than decoding in loop;
+ # substr strings is twice as fast as splitting to an array
+ $row{table} = Encode::decode($row{set}, pack 'C*', $row{offset} .. $endpoint);
+ }
+ $row{len} = $endpoint - $row{offset};
if ($row{set} eq 'cp437' and !$row{offset}) {
substr($row{table}, 237, 1) = pack 'U*', 0x3D5; # phi sign
my $rowdiv = 16 ** $coldigits; # row divide for column digits
$rowdiv = 1 if $rowdiv != $cols * $colsize; # divide only if all columns are matched
my $offset = 0;
- my $endpoint = $offset + (length($row->{table}) || 256) * $colsize;
+ my $endpoint = $offset + $row->{len} * $colsize;
printf '<div class="section"><table class="glyphs%s">', !$row->{cell} && ' charmap';
my $title = $row->{set};
next;
}
- my $glyph = substr $row->{table}, $offset, 1;
+ my $glyph = ref $row->{table} eq 'ARRAY' ? $row->{table}->[$offset] :
+ substr $row->{table}, $offset, 1;
if ($glyph eq $NOCHAR) {
print '<td>';
next;
}
+ if (exists $get{compare}) {
+ state $visible = {};
+ my $cp = $offset + $row->{offset};
+ printf '<td class="%s" title="%3$s">%2$s',
+ $cp == ord $glyph ? 'l4' :
+ $row->{parent} && $glyph eq
+ Encode::decode($row->{parent}, pack 'C', $cp) ? 'l3' :
+ $visible->{$glyph} ? 'l2' :
+ 'l1',
+ $glyphs->glyph_html($glyph);
+ $visible->{$glyph}++;
+ next;
+ }
+
print "\n".$glyphs->glyph_cell($glyph);
}
continue {
<hr>
<div class="legend">
- <table class="glyphs"><tr>
+ <table class="glyphs"><tr><: if (exists $get{compare}) { :>
+ <td class="X l4">unicode
+ <td class="X l3">inherited
+ <td class="X l2">existing
+ <td class="X l1">original
+ <td class="">unassigned
+<: } else { :>
<td class="X Cc">control
<td class="X Zs"><span>whitespace</span>
<td class="X Mn">diacritic<table class="glyphs"><tr>
<td class="X Xd">deprecated
<td class="">unassigned
<td class="X Xi">invalid
- </table>
+<: } :> </table>
</div>