Missed test changes and a bit of debugging code that should

[p5sagit/p5-mst-13.2.git] / ext / Encode / CN / CN.pm

diff --git a/ext/Encode/CN/CN.pm b/ext/Encode/CN/CN.pm
index 198eeb5..be5a830 100644 (file)
--- a/ext/Encode/CN/CN.pm
+++ b/ext/Encode/CN/CN.pm
@@ -1,23 +1,30 @@
 package Encode::CN;
-our $VERSION = do { my @r = (q$Revision: 0.93 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+BEGIN {
+    if (ord("A") == 193) {
+       die "Encode::CN not supported on EBCDIC\n";
+    }
+}
+our $VERSION = do { my @r = (q$Revision: 2.0 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 use Encode;
-use Encode::CN::HZ;
 use XSLoader;
-XSLoader::load('Encode::CN',$VERSION);
+XSLoader::load(__PACKAGE__,$VERSION);
+
+# Relocated from Encode.pm
 
-Encode::define_alias( qr/euc.*cn$/i     => '"euc-cn"' );
-Encode::define_alias( qr/cn.*euc/i      => '"euc-cn"' );
+use Encode::CN::HZ;
+# use Encode::CN::2022_CN;
 
 1;
 __END__
+
 =head1 NAME
 
 Encode::CN - China-based Chinese Encodings
 
 =head1 SYNOPSIS
 
-    use Encode 'encode'; 
+    use Encode qw/encode decode/; 
     $euc_cn = encode("euc-cn", $utf8);   # loads Encode::CN implicitly
     $utf8   = decode("euc-cn", $euc_cn); # ditto
 
@@ -28,15 +35,18 @@ Encodings supported are as follows.
 
   Canonical   Alias            Description
   --------------------------------------------------------------------
-  euc-cn      /euc.*cn$/i      EUC (Extended Unix Character)
-             /cn.*euc$/i
-  gb2312                       The raw (low-bit) GB2312 character map
-  gb12345                      Traditional chinese counterpart to 
+  euc-cn      /\beuc.*cn$/i    EUC (Extended Unix Character)
+             /\bcn.*euc$/i
+              /\bGB[-_ ]?2312(?:\D.*$|$)/i (see below)
+  gb2312-raw                   The raw (low-bit) GB2312 character map
+  gb12345-raw                  Traditional chinese counterpart to 
                                GB2312 (raw)
   iso-ir-165                   GB2312 + GB6345 + GB8565 + additions
+  MacChineseSimp                GB2312 + Apple Additions
   cp936                                Code Page 936, also known as GBK 
                                (Extended GuoBiao)
   hz                           7-bit escaped GB2312 encoding
+  --------------------------------------------------------------------
 
 To find how to use this module in detail, see L<Encode>.
 
@@ -48,12 +58,16 @@ also contains extra Taiwan-based encodings.
 
 =head1 BUGS
 
-ASCII part (0x00-0x7f) is preserved for all encodings, even though it
-conflicts with mappings by the Unicode Consortium.  See
+When you see C<charset=gb2312> on mails and web pages, they really
+mean C<euc-cn> encodings.  To fix that, C<gb2312> is aliased to C<euc-cn>.
+Use C<gb2312-raw> when you really mean it.
+
+The ASCII region (0x00-0x7f) is preserved for all encodings, even though
+this conflicts with mappings by the Unicode Consortium.  See
 
-F<http://www.debian.or.jp/~kubota/unicode-symbols.html.en>
+L<http://www.debian.or.jp/~kubota/unicode-symbols.html.en>
 
-to find why it is implemented that way.
+to find out why it is implemented that way.
 
 =head1 SEE ALSO