charset: extend inheritance to generic metadata hashes
[sheet.git] / charset.plp
index b84816ae6d96f4f8db4b9e50f24979d00791cb3b..1b672e93ebfc091575b912728d32d7660d5fe1ca 100644 (file)
@@ -12,7 +12,10 @@ Html({
                reference common overview table
        '],
        stylesheet => [qw'light'],
-       data => [qw'charset-unicode.inc.pl charset-ucplanes.inc.pl charset-utf8.inc.pl'],
+       data => [qw(
+               charset-encoding.inc.pl
+               charset-unicode.inc.pl charset-ucplanes.inc.pl charset-utf8.inc.pl
+       )],
 });
 
 my @tablist = split m{/+}, $Request || 'default';
@@ -73,6 +76,9 @@ use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
 my @request;
 
+my $charsets = do 'charset-encoding.inc.pl'
+       or Alert('Encoding metadata could not be read', $@ || $!);
+
 sub tabinput {
        # generate character table(s)
        my $input = shift or return;
@@ -130,89 +136,8 @@ sub tabinput {
        my $params = $input =~ s/[+](.*)\z// ? $1 : undef;
 
        if (not defined $params) {
-               state $INHERIT = {
-                       'ascii'       => ['' => '00-7F'],
-                       'cp437'       => ['cp850' => 0, 'ascii' => '00-1F+80'], # ascii range overridden later
-                       'gsm0338'     => ['ascii' => '00-7F'],
-                       'dingbats'    => ['' => '20-7F+A0'],
-                       'MacDingbats' => ['dingbats' => '80-9F'],
-                       'AdobeZdingbat'=> ['MacDingbats' => '80-9F'], # should be identical but maps to private use
-                       'symbol'      => ['' => '20-7F+A0'],
-                       'AdobeSymbol' => ['symbol' => '20-7F+A0', '' => '20-7F+A0'], # minor differences, irrelevant except for different '€'
-                       'wingdings'   => ['' => '20'],
-                       'wingdings2'  => ['' => '20'],
-                       'wingdings3'  => ['' => '20'],
-                       'webdings'    => ['' => '20'],
-
-                       'iso-8859-2'  => ['iso-8859-1' => 'A0'],
-                       'iso-8859-3'  => ['iso-8859-1' => 'A0'], #TODO: also apply to iso-8859-9
-                       'iso-8859-4'  => ['iso-8859-2' => 'A0'],
-                       'iso-8859-5'  => ['iso-8859-1' => 'A0'],
-                       'iso-8859-6'  => ['cp1256' => '80', 'iso-8859-1' => 'A0'],
-                       'iso-8859-7'  => ['iso-8859-1' => 'A0'],
-                       'iso-8859-8'  => ['iso-8859-1' => 'A0'],
-                       'iso-8859-9'  => ['iso-8859-1' => 'D0-DF+F0'],
-                       'iso-8859-10' => ['iso-8859-4' => 'A0'],
-                       'iso-8859-11' => ['iso-8859-1' => 'A0'],
-                       'iso-8859-13' => ['iso-8859-4' => 'A0'],
-                       'iso-8859-14' => ['iso-8859-1' => 'A0'],
-                       'iso-8859-15' => ['iso-8859-1' => 'A0-BF'],
-                       'iso-8859-16' => ['iso-8859-2' => 'A0'],
-                       'hp-roman8'   => ['iso-8859-1' => 'A0'],
-
-                       'cp1252'      => ['iso-8859-1' => '80-9F'],
-                       'cp1250'      => ['iso-8859-2' => '80-BF', 'cp1252' => '80'],
-                       'cp1254'      => ['iso-8859-9' => '80-9F', 'cp1252' => '80-9F+D0'],
-                       'cp874'       => ['iso-8859-11' => '80-9F', 'cp1252' => '80'], # windows-874 actually cp1162
-                       'cp1257'      => ['iso-8859-13' => '80-9F+FF', 'cp1252' => '80'],
-                       'cp1251'      => ['cp1252' => '80'],
-                       'cp1253'      => ['cp1252' => '80'],
-                       'cp1255'      => ['iso-8859-8' => '80-DF', 'cp1252' => '80'],
-                       'cp1256'      => ['cp1252' => '80'],
-                       'cp1258'      => ['cp1252' => '80-9F+C0'],
-
-                       'cp850'       => ['cp437' => '90'],
-                       'cp860'       => ['cp437' => '80-AF'],
-                       'cp861'       => ['cp865' => '80-AF'],
-                       'cp863'       => ['cp437' => '80-AF'],
-                       'cp865'       => ['cp437' => '90-AF'],
-                       'cp852'       => ['cp850' => '80', 'cp437' => '80'],
-                       'cp857'       => ['cp850' => '80-AF+D0-EF', 'cp437' => '80'],
-                       'cp775'       => ['cp850' => '80'],  # partial cp437
-                       'cp866'       => ['cp437' => '80-AF+E0'],
-                       'cp855'       => ['cp437' => '80'],
-                       'cp1006'      => ['iso-8859-6' => 'A0', 'cp437' => '80'],
-                       'cp737'       => ['cp437' => '80-AF+E0'],
-                       'cp869'       => ['cp437' => '80'],
-                       'cp862'       => ['cp437' => '80-9F'],
-                       'cp864'       => ['MacArabic' => '80', 'iso-8859-6' => '80', 'cp437' => '80'], #TODO: compare form variants
-
-                       'koi8-u'      => ['koi8-r' => '90-BF'],
-                       'koi8-f'      => ['koi8-u' => '90-BF'],
-
-                       'MacRomanian' => ['MacRoman' => 'A0-BF+D0-DF'],
-                       'MacRumanian' => ['MacRomanian' => 'A0-BF+D0-DF', 'MacRoman' => 'A0-BF+D0-DF'],
-                       'MacCroatian' => ['MacRoman' => 'A0'],
-                       'MacCentralEurRoman' => ['MacRoman' => '80'],
-                       'MacIcelandic'=> ['MacRoman' => 'A0-AF+D0-EF'],
-                       'MacTurkish'  => ['MacRoman' => 'D0-DF'], # F5 is unassigned
-                       'MacSami'     => ['MacIcelandic' => '90-BF+D0-DF+F0', 'MacRoman' => '90'],
-                       'MacGreek'    => ['MacRoman' => '80'],
-                       'MacCyrillic' => ['MacRoman' => '80'],
-                       'MacHebrew'   => ['iso-8859-8' => '80', 'MacRoman' => '80-8F+A0'], # partial ascii
-                       'MacArabic'   => ['iso-8859-6' => '80', 'cp864' => '80', 'MacRoman' => '80'], #TODO: multiple parents
-                       'MacFarsi'    => ['MacArabic' => 'B0-BF', 'MacRoman' => '80'],
-
-                       'cp37'        => ['posix-bc' => '00'],
-                       'posix-bc'    => ['cp1047' => '40'],
-                       'cp500'       => ['cp37' => '40-5F+B0-BF'],
-                       'cp1047'      => ['cp37' => '10-2F+50-5F+A0-BF'],
-                       'cp1026'      => ['cp37' => '40'],
-                       'cp875'       => ['cp37' => '30'],
-
-               };
-
-               my @parents = @{ $INHERIT->{$input} || [] };
+               my $charset = $charsets->{$input} || {};
+               my @parents = @{ $charset->{inherit} || [] };
 
                if (my ($parent, $part) = pairfirst { defined $visible->{$a} } @parents) {
                        $row{parent} = $parent;
@@ -223,7 +148,7 @@ sub tabinput {
                elsif (defined $visible->{ascii}) {
                        $row{parent} = $parents[0];
                        $params = $parents[1] // 80;
-                       $params = 80 if hex $params >= 128;  # ascii offset at most
+                       $params = 80 if hex $params >= 0x80;  # ascii offset at most
                }
                elsif (@parents) {
                        $row{parent} = $parents[0];
@@ -281,14 +206,14 @@ sub tabinput {
        elsif (lc $input eq 'uu') {
                $row{cell} = do 'charset-ucplanes.inc.pl'
                        or Alert('Table data could not be read', $@ || $!);
-               $row{endpoint} ||= 1023;
+               $row{endpoint} ||= 0x3FF;
                $row{set} = 'Unicode planes';
        }
        elsif (lc $input eq 'u') {
                $row{cell} = do 'charset-unicode.inc.pl'
                        or Alert('Table data could not be read', $@ || $!);
 
-               $row{endpoint} ||= 8191;
+               $row{endpoint} ||= 0x1FFF;
                $row{set} = 'Unicode ' . (
                        $row{startpoint} <  0x1000 && $row{endpoint} < 0x1000 ? 'BMP' :
                        $row{startpoint} >= 0x1000 && $row{endpoint} < 0x2000 ? 'SMP' :
@@ -299,11 +224,11 @@ sub tabinput {
                $row{set} = 'UTF-8';
                $row{cell} = do 'charset-utf8.inc.pl'
                        or Alert('Table data could not be read', $@ || $!);
-               $row{endpoint} = 255;
+               $row{endpoint} = 0xFF;
        }
        elsif ($row{set} = Encode::resolve_alias($input)) {
                $row{offset} = delete $row{startpoint};
-               $row{endpoint} ||= 255;
+               $row{endpoint} ||= 0xFF;
                if ($row{set} eq 'MacHebrew' or $row{set} eq 'MacThai') {
                        # array of possibly multiple characters per code point
                        $row{table} = [