Assorted 2.15 fixes.

[p5sagit/p5-mst-13.2.git] / ext / Encode / t / Aliases.t

diff --git a/ext/Encode/t/Aliases.t b/ext/Encode/t/Aliases.t
index 8f9d3e3..2fce73e 100644 (file)
--- a/ext/Encode/t/Aliases.t
+++ b/ext/Encode/t/Aliases.t
@@ -21,7 +21,8 @@ my $ON_EBCDIC;
 sub init_a2c{
     %a2c = (
            'US-ascii' => 'ascii',
-           'UTF-8'    => 'utf8',
+           'ISO-646-US' => 'ascii',
+           'UTF-8'    => 'utf-8-strict',
            'UCS-2'    => 'UCS-2BE',
            'UCS2'     => 'UCS-2BE',
            'iso-10646-1' => 'UCS-2BE',
@@ -33,6 +34,8 @@ sub init_a2c{
            'utf32-be'  => 'UTF-32BE',
            'utf16-le'  => 'UTF-16LE',
            'utf32-le'  => 'UTF-32LE',
+           'UCS4-BE'   => 'UTF-32BE',
+           'UCS-4-LE'  => 'UTF-32LE',
            'cyrillic' => 'iso-8859-5',
            'arabic'   => 'iso-8859-6',
            'greek'    => 'iso-8859-7',
@@ -48,6 +51,8 @@ sub init_a2c{
            'WinArabic'     => 'cp1256',
            'WinBaltic'     => 'cp1257',
            'WinVietnamese' => 'cp1258',
+           'koi8r'         => 'koi8-r',
+           'koi8u'         => 'koi8-u',
            'ja_JP.euc'     => $ON_EBCDIC ? '' : 'euc-jp',
            'x-euc-jp'      => $ON_EBCDIC ? '' : 'euc-jp',
            'zh_CN.euc'     => $ON_EBCDIC ? '' : 'euc-cn',
@@ -58,9 +63,11 @@ sub init_a2c{
            'Shift_JIS'     => $ON_EBCDIC ? '' : 'shiftjis',
            'x-sjis'        => $ON_EBCDIC ? '' : 'shiftjis',
            'jis'           => $ON_EBCDIC ? '' : '7bit-jis',
-           'big-5'         => $ON_EBCDIC ? '' : 'big5',
-           'zh_TW.Big5'    => $ON_EBCDIC ? '' : 'big5',
+           'big-5'         => $ON_EBCDIC ? '' : 'big5-eten',
+           'zh_TW.Big5'    => $ON_EBCDIC ? '' : 'big5-eten',
+           'tca-big5'      => $ON_EBCDIC ? '' : 'big5-eten',
            'big5-hk'       => $ON_EBCDIC ? '' : 'big5-hkscs',
+           'hkscs-big5'    => $ON_EBCDIC ? '' : 'big5-hkscs',
            'GB_2312-80'    => $ON_EBCDIC ? '' : 'euc-cn',
            'KS_C_5601-1987'    => $ON_EBCDIC ? '' : 'cp949',
            #
@@ -82,6 +89,7 @@ sub init_a2c{
        my $v = $Encode::Alias::Winlatin2cp{$k};
        $a2c{"Win" . ucfirst($k)} = "cp" . $v;
        $a2c{"IBM-$v"} = $a2c{"MS-$v"} = "cp" . $v;
+       $a2c{"cp-" . $v} = "cp" . $v;
     }
     my @a2c = keys %a2c;
     for my $k (@a2c){