charset: mac preset for all charsets related to MacRoman

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index c3477f124d9d9201d36e3593345602f292e9f590..1f2be559e3e61f18edc858cb2903c05cda91fd1e 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -15,7 +15,7 @@ Html({
        data => [qw'charset-unicode.inc.pl charset-utf8.inc.pl'],
 });
 
-my @tablist = split /[^\w-]+/, $Request || 'default';
+my @tablist = split m{/+}, $Request || 'default';
 
 :>
 <h1>Character encoding</h1>
@@ -39,7 +39,10 @@ sub tabinput {
                                   cp737 cp869 cp866 cp855 cp862 cp864 )],
                aix        => [qw( cp1006 )],
                win        => [qw( cp1252 cp1250 cp1254 cp1257 cp1258 cp1253 cp1251 cp1255 cp1256 cp874 )],
+               mac        => [qw( MacRoman MacRomanian MacRumanian MacCroatian MacCentralEurRoman MacTurkish MacIcelandic MacSami
+                                  MacGreek MacCyrillic MacHebrew MacArabic MacFarsi MacThai )],
 
+               # languages
                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 )],
@@ -52,6 +55,7 @@ sub tabinput {
                thai       => [qw( iso-8859-11 cp874 MacThai )],
                vietnamese => [qw( viscii cp1258 MacVietnamese )],
                symbol     => [qw( symbol dingbats MacDingbats AdobeZdingbat AdobeSymbol )],
+
                # iso-code shorthand
                1 => 'westeur',
                2 => 'centeur',
@@ -89,7 +93,7 @@ sub tabinput {
                        'iso-8859-6'  => ['iso-8859-1' => '160'],
                        'iso-8859-7'  => ['iso-8859-1' => '160'],
                        'iso-8859-8'  => ['iso-8859-1' => '160'],
-                       'iso-8859-9'  => ['iso-8859-1' => '208'],
+                       'iso-8859-9'  => ['iso-8859-1' => '208-223+240'],
                        'iso-8859-10' => ['iso-8859-4' => '160'],
                        'iso-8859-11' => ['iso-8859-1' => '160'],
                        'iso-8859-13' => ['iso-8859-4' => '160'],
@@ -100,14 +104,14 @@ sub tabinput {
 
                        'cp1252'      => ['iso-8859-1' => '128-159'],
                        'cp1250'      => ['iso-8859-2' => '128-191', 'cp1252' => '128'],
-                       'cp1254'      => ['iso-8859-9' => '128-159', 'cp1252' => '128'],
+                       'cp1254'      => ['iso-8859-9' => '128-159', 'cp1252' => '128-159+208'],
                        'cp874'       => ['iso-8859-11' => '128-159', 'cp1252' => '128'], # windows-874 actually cp1162
-                       'cp1257'      => ['iso-8859-13' => '128', 'cp1252' => '128'],
+                       'cp1257'      => ['iso-8859-13' => '128-159+255', 'cp1252' => '128'],
                        'cp1251'      => ['cp1252' => '128'],
                        'cp1253'      => ['cp1252' => '128'],
                        'cp1255'      => ['iso-8859-8' => '128-223', 'cp1252' => '128'],
                        'cp1256'      => ['cp1252' => '128'],
-                       'cp1258'      => ['cp1252' => '128'],
+                       'cp1258'      => ['cp1252' => '128-159+192'],
 
                        'cp850'       => ['cp437' => '144'],
                        'cp860'       => ['cp437' => '128-175'],
@@ -115,25 +119,31 @@ sub tabinput {
                        'cp863'       => ['cp437' => '128-175'],
                        'cp865'       => ['cp437' => '144-175'],
                        'cp852'       => ['cp850' => '128', 'cp437' => '128'],
-                       'cp857'       => ['cp850' => '128-239', 'cp437' => '128'],
+                       'cp857'       => ['cp850' => '128-175+208-239', 'cp437' => '128'],
                        'cp775'       => ['cp850' => '128'],  # partial cp437
-                       'cp866'       => ['cp437' => '128'],
+                       'cp866'       => ['cp437' => '128-175+224'],
                        'cp855'       => ['cp437' => '128'],
                        'cp1006'      => ['cp437' => '128'],
-                       'cp737'       => ['cp437' => '128'],
+                       'cp737'       => ['cp437' => '128-175+224'],
                        'cp869'       => ['cp437' => '128'],
-                       'cp862'       => ['cp437' => '128'],
+                       'cp862'       => ['cp437' => '128-159'],
                        'cp864'       => ['cp437' => '128'],
 
                        'koi8-u'      => ['koi8-r' => 128],
                        'koi8-f'      => ['koi8-u' => 128],
 
-                       'MacRomanian' => ['MacRoman' => '160'],
+                       'MacRomanian' => ['MacRoman' => '160-191+208-223'],
+                       'MacRumanian' => ['MacRomanian' => '160-191+208-223', 'MacRoman' => '160-191+208-223'],
                        'MacCroatian' => ['MacRoman' => '160'],
                        'MacCentralEurRoman' => ['MacRoman' => '128'],
+                       'MacIcelandic'=> ['MacRoman' => '160-175+208-239'], #TODO: gaps at C/E
                        'MacTurkish'  => ['MacRoman' => '208-223'], # F5 is unassigned
+                       'MacSami'     => ['MacIcelandic' => '144', 'MacRoman' => '144'],
+                       'MacGreek'    => ['MacRoman' => '128'],
                        'MacCyrillic' => ['MacRoman' => '128'],
-                       'MacHebrew'   => ['MacRoman' => '128'],
+                       'MacHebrew'   => ['MacRoman' => '128-143+160'], # partial ascii
+                       'MacArabic'   => ['MacRoman' => '128'],
+                       'MacFarsi'    => ['MacArabic' => '176-191', 'MacRoman' => '128'],
                };
 
                my @parents = @{ $INHERIT->{$input} || [] };
@@ -155,9 +165,24 @@ sub tabinput {
                $visible->{$_} //= 0 for $row{parent};
        }
 
-       if (defined $params and $params =~ m/^ (\d+) (-\d+)? /x) {
-               $row{offset} = $1;
-               $endpoint = -$2 if $2;
+       if (defined $params) {
+               $params =~ m{
+                       \A (?<offset> \d+)
+                       (?: (?: [-] (?<stop> \d+) )? (?: [+] (?<restart> \d+) ) )?
+                       (?: [-] (?<endpoint> \d+) )? \z
+               }x or Alert([
+                       "Unknown range parameters for $input",
+                       "<q>$params</q> is not in format start(-stop)(+restart(-end))",
+               ]);
+
+               $row{offset} = $+{offset};
+               $endpoint = $+{endpoint} if $+{endpoint};
+               if (my $restart = $+{restart}) {
+                       my $skip = int(($+{stop} || $row{offset}) / $row{cols});
+                       for ($skip + 1 .. ($restart / $row{cols}) - 1) {
+                               $row{skip}->{ $_ * $row{cols} - $row{offset} }++;
+                       }
+               }
        }
 
        if ($input =~ /^U([0-9a-f]+)(?:-([0-9a-f]+))?/) {
@@ -189,7 +214,7 @@ sub tabinput {
                        $row{endpoint} = 255;
                }
                else {
-                       if ($row{set} eq 'MacHebrew') {
+                       if ($row{set} eq 'MacHebrew' or $row{set} eq 'MacThai') {
                                # array of possibly multiple characters per code point
                                $row{table} = [
                                        map { Encode::decode($row{set}, pack 'C*', $_) } $row{offset} .. $endpoint
@@ -299,6 +324,11 @@ for my $row (@request) {
        }
        print '<tbody>';
        while ($offset < $row->{endpoint}) {
+               if ($row->{skip}->{$offset}) {
+                       $offset += $cols * $colsize;
+                       next;
+               }
+
                print '<tr><th>';
                {
                        if (my $rowmod = $offset % $rowdiv) {