X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/466e0b0bee6b61530b0be73a394df19828bf24f9..33f2daf5edc4b89711060babeaf8d674d8482128:/charset.plp

diff --git a/charset.plp b/charset.plp
index be31655..7891ee3 100644
--- 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) {