[Encode] 1.75 Released

Message-Id: <16B7B98D-758C-11D6-AE74-0003939A104C@dan.co.jp>

p4raw-id: //depot/perl@16964

10 files changed, 30 insertions, 13 deletions

diff --git a/ext/Encode/Changes b/ext/Encode/Changes
index 42408e53b0..3658d44aea 100644
--- a/ext/Encode/Changes
+++ b/ext/Encode/Changes
@@ -1,9 +1,17 @@
 # Revision history for Perl extension Encode.
 #
-# $Id: Changes,v 1.74 2002/05/28 18:33:15 dankogai Exp dankogai $
+# $Id: Changes,v 1.75 2002/06/01 18:07:49 dankogai Exp dankogai $
 #
 
-$Revision: 1.74 $ $Date: 2002/05/28 18:33:15 $
+$Revision: 1.75 $ $Date: 2002/06/01 18:07:49 $
+! lib/Encode/Alias.pm t/Alias.t lib/Encode/Supported.pod TW/TW.pm
+  glibc compliance cited by Autrijus.
+  http://www.li18nux.org/docs/html/CodesetAliasTable-V10.html
+! bin/enc2xs bin/piconv
+  Subject: Re: forewarning: usedevel and versiononly
+  Message-Id: <20020529081515.D570.H.M.BRAND@hccnet.nl>
+
+1.74 2002/05/28 18:33:15
 + ucm/null.ucm ucm/ctrl.ucm
 ! Makefile.PL bin/enc2xs lib/Encode/Supported.pod
   "null" and "ascii-ctrl" encodings added upon the request of Autrijus
@@ -671,7 +679,7 @@ $Revision: 1.74 $ $Date: 2002/05/28 18:33:15 $
   Typo fixes and improvements by jhi
   Message-Id: <200204010201.FAA03564@alpha.hut.fi>, et al.
 
-1.11  $Date: 2002/05/28 18:33:15 $
+1.11  $Date: 2002/06/01 18:07:49 $
 + t/encoding.t
 + t/jperl.t
 ! MANIFEST
diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm
index 0f57a031a2..4080238e47 100644
--- a/ext/Encode/Encode.pm
+++ b/ext/Encode/Encode.pm
@@ -1,9 +1,9 @@
 #
-# $Id: Encode.pm,v 1.74 2002/05/28 18:33:54 dankogai Exp dankogai $
+# $Id: Encode.pm,v 1.75 2002/06/01 18:07:42 dankogai Exp $
 #
 package Encode;
 use strict;
-our $VERSION = do { my @r = (q$Revision: 1.74 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.75 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 our $DEBUG = 0;
 use XSLoader ();
 XSLoader::load(__PACKAGE__, $VERSION);
diff --git a/ext/Encode/TW/TW.pm b/ext/Encode/TW/TW.pm
index fb9239b446..a203c29e89 100644
--- a/ext/Encode/TW/TW.pm
+++ b/ext/Encode/TW/TW.pm
@@ -4,7 +4,7 @@ BEGIN {
 	die "Encode::TW not supported on EBCDIC\n";
     }
 }
-our $VERSION = do { my @r = (q$Revision: 1.25 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.26 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 use Encode;
 use XSLoader;
@@ -33,7 +33,9 @@ Encodings supported are as follows.
   --------------------------------------------------------------------
   big5-eten   /\bbig-?5$/i	Big5 encoding (with ETen extensions)
 	      /\bbig5-?et(en)?$/i
+	      /\btca-?big5$/i
   big5-hkscs  /\bbig5-?hk(scs)?$/i
+              /\bhk(scs)?-?big5$/i
                                 Big5 + Cantonese characters in Hong Kong
   MacChineseTrad		Big5 + Apple Vendor Mappings
   cp950		                Code Page 950 
diff --git a/ext/Encode/bin/enc2xs b/ext/Encode/bin/enc2xs
index 7b4c5386fa..7100bab49c 100644
--- a/ext/Encode/bin/enc2xs
+++ b/ext/Encode/bin/enc2xs
@@ -8,7 +8,7 @@ BEGIN {
 use strict;
 use Getopt::Std;
 my @orig_ARGV = @ARGV;
-our $VERSION  = do { my @r = (q$Revision: 1.29 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION  = do { my @r = (q$Revision: 1.30 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 # These may get re-ordered.
 # RAW is a do_now as inserted by &enter
diff --git a/ext/Encode/bin/piconv b/ext/Encode/bin/piconv
index 6aae2a5b22..321828f148 100644
--- a/ext/Encode/bin/piconv
+++ b/ext/Encode/bin/piconv
@@ -1,5 +1,5 @@
 #!./perl
-# $Id: piconv,v 1.24 2002/04/22 02:45:50 dankogai Exp $
+# $Id: piconv,v 1.25 2002/06/01 18:07:49 dankogai Exp dankogai $
 #
 use 5.8.0;
 use strict;
diff --git a/ext/Encode/lib/Encode/Alias.pm b/ext/Encode/lib/Encode/Alias.pm
index 1cc54bf7fa..876f97133e 100644
--- a/ext/Encode/lib/Encode/Alias.pm
+++ b/ext/Encode/lib/Encode/Alias.pm
@@ -1,7 +1,7 @@
 package Encode::Alias;
 use strict;
 use Encode;
-our $VERSION = do { my @r = (q$Revision: 1.31 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.32 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 our $DEBUG = 0;
 
 use base qw(Exporter);
@@ -139,6 +139,7 @@ sub init_aliases
     # ASCII
     define_alias(qr/^(?:US-?)ascii$/i => '"ascii"');
     define_alias('C' => 'ascii');
+    define_alias(qr/\bISO[-_]?646[-_]?US$/i => '"ascii"');
     # Allow variants of iso-8859-1 etc.
     define_alias( qr/\biso[-_]?(\d+)[-_](\d+)$/i => '"iso-$1-$2"' );
 
@@ -176,7 +177,7 @@ sub init_aliases
     # At least AIX has IBM-NNN (surprisingly...) instead of cpNNN.
     # And Microsoft has their own naming (again, surprisingly).
     # And windows-* is registered in IANA! 
-    define_alias( qr/\b(?:ibm|ms|windows)[-_]?(\d\d\d\d?)$/i => '"cp$1"');
+    define_alias( qr/\b(?:cp|ibm|ms|windows)[-_ ]?(\d{2,4})$/i => '"cp$1"');
 
     # Sometimes seen with a leading zero.
     # define_alias( qr/\bcp037\b/i => '"cp37"');
@@ -219,7 +220,9 @@ sub init_aliases
         # for Encode::TW
 	define_alias( qr/\bbig-?5$/i		  => '"big5-eten"' );
 	define_alias( qr/\bbig5-?et(?:en)$/i	  => '"big5-eten"' );
+	define_alias( qr/\btca[-_]?big5$/i	  => '"big5-eten"' );
 	define_alias( qr/\bbig5-?hk(?:scs)?$/i	  => '"big5-hkscs"' );
+	define_alias( qr/\bhk(?:scs)?[-_]?big5$/i  => '"big5-hkscs"' );
     }
     # utf8 is blessed :)
     define_alias( qr/^UTF-8$/i => '"utf8"',);
diff --git a/ext/Encode/lib/Encode/Supported.pod b/ext/Encode/lib/Encode/Supported.pod
index 4061f52829..ec5da49332 100644
--- a/ext/Encode/lib/Encode/Supported.pod
+++ b/ext/Encode/lib/Encode/Supported.pod
@@ -60,7 +60,7 @@ The following encodings are always available.
 
   Canonical     Aliases                      Comments & References
   ----------------------------------------------------------------
-  ascii         US-ascii                                    [ECMA]
+  ascii         US-ascii ISO-646-US                         [ECMA]
   ascii-ctrl			                  Special Encoding
   iso-8859-1    latin1                                       [ISO]
   null				                  Special Encoding
diff --git a/ext/Encode/t/Aliases.t b/ext/Encode/t/Aliases.t
index d743a1d6f8..c270c0e9a0 100644
--- a/ext/Encode/t/Aliases.t
+++ b/ext/Encode/t/Aliases.t
@@ -21,6 +21,7 @@ my $ON_EBCDIC;
 sub init_a2c{
     %a2c = (
 	    'US-ascii' => 'ascii',
+	    'ISO-646-US' => 'ascii',
 	    'UTF-8'    => 'utf8',
 	    'UCS-2'    => 'UCS-2BE',
 	    'UCS2'     => 'UCS-2BE',
@@ -62,7 +63,9 @@ sub init_a2c{
 	    'jis'	    => $ON_EBCDIC ? '' : '7bit-jis',
 	    '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',
 	    #
@@ -84,6 +87,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){
diff --git a/ext/Encode/ucm/ctrl.ucm b/ext/Encode/ucm/ctrl.ucm
index 2137531fb5..b54829658d 100644
--- a/ext/Encode/ucm/ctrl.ucm
+++ b/ext/Encode/ucm/ctrl.ucm
@@ -1,5 +1,5 @@
 #
-# $Id: ctrl.ucm,v 1.1 2002/05/28 18:33:15 dankogai Exp dankogai $
+# $Id: ctrl.ucm,v 1.1 2002/05/28 18:33:15 dankogai Exp $
 #
 <code_set_name>  "ascii-ctrl"
 <mb_cur_min> 1
diff --git a/ext/Encode/ucm/null.ucm b/ext/Encode/ucm/null.ucm
index 9d8a7395e6..4e2abda4ec 100644
--- a/ext/Encode/ucm/null.ucm
+++ b/ext/Encode/ucm/null.ucm
@@ -1,5 +1,5 @@
 #
-# $Id: null.ucm,v 1.1 2002/05/28 18:33:15 dankogai Exp dankogai $
+# $Id: null.ucm,v 1.1 2002/05/28 18:33:15 dankogai Exp $
 #
 <code_set_name>  "null"
 <mb_cur_min> 1