charset: support input of multiple row skips

Generic parsing of multiple start-end options.

diff --git a/charset.plp b/charset.plp
index 9a9586aed92df41770edd47fcdc61f4d089cb0ec..8996c5866975ad4fcc4ebf3ffc7c38691bd663db 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -183,9 +183,9 @@ sub tabinput {
                        'MacRumanian' => ['MacRomanian' => '160-191+208-223', 'MacRoman' => '160-191+208-223'],
                        'MacCroatian' => ['MacRoman' => '160'],
                        'MacCentralEurRoman' => ['MacRoman' => '128'],
                        '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
+                       'MacIcelandic'=> ['MacRoman' => '160-175+208-239'],

                        'MacTurkish'  => ['MacRoman' => '208-223'], # F5 is unassigned
                        'MacTurkish'  => ['MacRoman' => '208-223'], # F5 is unassigned

-                       'MacSami'     => ['MacIcelandic' => '144', 'MacRoman' => '144'],
+                       'MacSami'     => ['MacIcelandic' => '144-191+208-223+240', 'MacRoman' => '144'],

                        'MacGreek'    => ['MacRoman' => '128'],
                        'MacCyrillic' => ['MacRoman' => '128'],
                        'MacHebrew'   => ['iso-8859-8' => '128', 'MacRoman' => '128-143+160'], # partial ascii
                        'MacGreek'    => ['MacRoman' => '128'],
                        'MacCyrillic' => ['MacRoman' => '128'],
                        'MacHebrew'   => ['iso-8859-8' => '128', 'MacRoman' => '128-143+160'], # partial ascii


@@ -195,7 +195,7 @@ sub tabinput {
                        'cp37'        => ['posix-bc' => '0'],
                        'posix-bc'    => ['cp1047' => '64'],
                        'cp500'       => ['cp37' => '64-95+176-191'],
                        'cp37'        => ['posix-bc' => '0'],
                        'posix-bc'    => ['cp1047' => '64'],
                        'cp500'       => ['cp37' => '64-95+176-191'],

-                       'cp1047'      => ['cp37' => '16-95+160-191'], #TODO: gap at 3/4
+                       'cp1047'      => ['cp37' => '16-47+80-95+160-191'],

                        'cp1026'      => ['cp37' => '64'],
                        'cp875'       => ['cp37' => '48'],
 
                        'cp1026'      => ['cp37' => '64'],
                        'cp875'       => ['cp37' => '48'],
 


@@ -226,23 +226,21 @@ sub tabinput {
                $row{cols} *= 2 if $params =~ s/[+]\z//;
        }
 
                $row{cols} *= 2 if $params =~ s/[+]\z//;
        }
 

-       if (length $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};
-               $row{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} }++;
+       for my $param (split /[+]+/, $params // '') {
+               if ($param =~ m{ \A (?<offset> \d+) (?: [-] (?<endpoint> \d+) )? \z }x) {
+                       if ($row{offset}) {
+                               my $skip = int(($row{endpoint} || $row{offset}) / $row{cols});
+                               for ($skip + 1 .. ($+{offset} / $row{cols}) - 1) {
+                                       $row{skip}->{ $_ * $row{cols} - $row{offset} }++;
+                               }
+                       }
+                       else {
+                               $row{offset} = $+{offset};

                        }
                        }

+                       $row{endpoint} = $+{endpoint};
+               }
+               else {
+                       Alert("Unknown option <q>$param</q> for charset $input");

                }
        }
 
                }
        }