charset: encode wingdings2 font

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index be3165542f036d94abf8e9979bfd494e48425444..7891ee3915c7d8bb2e7d409897d18b9384f1e935 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -105,7 +105,7 @@ sub tabinput {
                hebrew     => [qw( iso-8859-8 cp1255 MacHebrew cp862  U59-5F )],
                thai       => [qw( iso-8859-11 cp874 MacThai )],
                vietnamese => [qw( viscii cp1258 MacVietnamese )],
-               symbols    => [qw( symbol dingbats MacDingbats wingdings webdings )],
+               symbols    => [qw( symbol dingbats MacDingbats wingdings wingdings2 webdings )],
 
                # iso-code shorthand
                1 => 'westeur',
@@ -139,6 +139,7 @@ sub tabinput {
                        'symbol'      => ['' => '32-127+160'],
                        'AdobeSymbol' => ['symbol' => '32-127+160', '' => '32-127+160'], # minor differences, irrelevant except for different '€'
                        'wingdings'   => ['' => '32'],
+                       'wingdings2'  => ['' => '32'],
                        'webdings'    => ['' => '32'],
 
                        'iso-8859-2'  => ['iso-8859-1' => '160'],
@@ -254,8 +255,8 @@ sub tabinput {
                }
        }
 
-       if ($input =~ m{ \A (?:wing|web)dings \z }ix) {
-               require "Encode/\u$input.pm";
+       if ($input =~ m{ \A (?:wing|web)dings \d* \z }ix) {
+               eval "require Encode::\u$input";
        }
 
        if ($input =~ m{ \A u ([0-9a-f]+) (?:-([0-9a-f]+))? \z }ix) {