charset: extend inheritance table

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index 16a49e92cd132dbf2220cd37cd404955628b8703..309139e940fa46ec54b39e1a2c039768cfe698a2 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -35,14 +35,17 @@ sub tabinput {
                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 )],
@@ -93,22 +96,43 @@ sub tabinput {
                        '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-'],
+                       'cp874'       => ['iso-8859-11' => '128-159'], # windows-874 actually cp1162
+                       'cp1257'      => ['iso-8859-13' => '128'],
+                       'cp1251'      => ['cp1252' => '128'],
+                       'cp1253'      => ['cp1252' => '128'],
+                       'cp1255'      => ['iso-8859-8' => '128-223', 'cp1252' => '128'],
+                       'cp1256'      => ['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} || [] };
@@ -161,10 +185,18 @@ sub tabinput {
                                or Alert('Table data could not be read', $@ || $!);
                }
                else {
+                       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};
-                       $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 'cp437' and !$row{offset}) {
                                substr($row{table}, 237, 1) = pack 'U*', 0x3D5; # phi sign
@@ -281,7 +313,8 @@ for my $row (@request) {
                                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;