charset: case-insensitive preset lookup

diff --git a/charset-encoding.inc.pl b/charset-encoding.inc.pl
index 15b303d31bad97e37142d9991c2224201043acf8..fc6b4b1138882b0b51c50dabc9e84caa077bfcad 100644 (file)
--- a/charset-encoding.inc.pl
+++ b/charset-encoding.inc.pl
@@ -48,10 +48,10 @@ use warnings;
        'cp437'        => {inherit => ['cp850' => 0, 'ascii' => '00-1F+80']}, # ascii range overridden later
        'gsm0338'      => {inherit => ['ascii' => '00-7F']},
        'dingbats'     => {inherit => ['' => '20-7F+A0']},
-       'MacDingbats'  => {inherit => ['dingbats' => '80-9F']},
-       'AdobeZdingbat'=> {inherit => ['MacDingbats' => '80-9F']}, # should be identical but maps to private use
+       'macdingbats'  => {inherit => ['dingbats' => '80-9F']},
+       'adobezdingbat'=> {inherit => ['MacDingbats' => '80-9F']}, # should be identical but maps to private use
        'symbol'       => {inherit => ['' => '20-7F+A0']},
-       'AdobeSymbol'  => {inherit => ['symbol' => '20-7F+A0', '' => '20-7F+A0']}, # minor differences, irrelevant except for different '€'
+       'adobesymbol'  => {inherit => ['symbol' => '20-7F+A0', '' => '20-7F+A0']}, # minor differences, irrelevant except for different '€'
        'wingdings'    => {inherit => ['' => '20']},
        'wingdings2'   => {inherit => ['' => '20']},
        'wingdings3'   => {inherit => ['' => '20']},
@@ -103,18 +103,18 @@ use warnings;
        'koi8-u'       => {inherit => ['koi8-r' => '90-BF']},
        'koi8-f'       => {inherit => ['koi8-u' => '90-BF']},
 
-       'MacRomanian'  => {inherit => ['MacRoman' => 'A0-BF+D0-DF']},
-       'MacRumanian'  => {inherit => ['MacRomanian' => 'A0-BF+D0-DF', 'MacRoman' => 'A0-BF+D0-DF']},
-       'MacCroatian'  => {inherit => ['MacRoman' => 'A0']},
-       'MacCentralEurRoman' => {inherit => ['MacRoman' => '80']},
-       'MacIcelandic' => {inherit => ['MacRoman' => 'A0-AF+D0-EF']},
-       'MacTurkish'   => {inherit => ['MacRoman' => 'D0-DF']}, # F5 is unassigned
-       'MacSami'      => {inherit => ['MacIcelandic' => '90-BF+D0-DF+F0', 'MacRoman' => '90']},
-       'MacGreek'     => {inherit => ['MacRoman' => '80']},
-       'MacCyrillic'  => {inherit => ['MacRoman' => '80']},
-       'MacHebrew'    => {inherit => ['iso-8859-8' => '80', 'MacRoman' => '80-8F+A0']}, # partial ascii
-       'MacArabic'    => {inherit => ['iso-8859-6' => '80', 'cp864' => '80', 'MacRoman' => '80']}, #TODO: multiple parents
-       'MacFarsi'     => {inherit => ['MacArabic' => 'B0-BF', 'MacRoman' => '80']},
+       'macromanian'  => {inherit => ['MacRoman' => 'A0-BF+D0-DF']},
+       'macrumanian'  => {inherit => ['MacRomanian' => 'A0-BF+D0-DF', 'MacRoman' => 'A0-BF+D0-DF']},
+       'maccroatian'  => {inherit => ['MacRoman' => 'A0']},
+       'maccentraleurroman' => {inherit => ['MacRoman' => '80']},
+       'macicelandic' => {inherit => ['MacRoman' => 'A0-AF+D0-EF']},
+       'macturkish'   => {inherit => ['MacRoman' => 'D0-DF']}, # F5 is unassigned
+       'macsami'      => {inherit => ['MacIcelandic' => '90-BF+D0-DF+F0', 'MacRoman' => '90']},
+       'macgreek'     => {inherit => ['MacRoman' => '80']},
+       'maccyrillic'  => {inherit => ['MacRoman' => '80']},
+       'machebrew'    => {inherit => ['iso-8859-8' => '80', 'MacRoman' => '80-8F+A0']}, # partial ascii
+       'macarabic'    => {inherit => ['iso-8859-6' => '80', 'cp864' => '80', 'MacRoman' => '80']}, #TODO: multiple parents
+       'macfarsi'     => {inherit => ['MacArabic' => 'B0-BF', 'MacRoman' => '80']},
 
        'cp37'         => {inherit => ['posix-bc' => '00']},
        'posix-bc'     => {inherit => ['cp1047' => '40']},

diff --git a/charset.plp b/charset.plp
index 49ee3eba48dafc17365a6216e7253d0c1f1755bc..4f60765cd7c94d346dae6f013891ee39509cb95e 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -84,7 +84,7 @@ sub tabinput {
        # generate character table(s)
        my $input = shift or return;
        my $params = $input =~ s/[+](.*)\z// ? $1 : undef;
-       my $charset = $charsets->{$input} || {};
+       my $charset = $charsets->{lc $input} || {};
 
        if (ref $charset ne 'HASH') {
                $params and Alert("Parameters ignored for $input",