diff options
| author | Dan Kogai <dankogai@dan.co.jp> | 2002-06-02 12:19:19 +0900 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-06-01 17:25:31 +0000 |
| commit | 2d06ad02462e88e5857e4083d9f0c8fa1f69f916 (patch) | |
| tree | 0903836371a73994cc52d7f61c3892ddbbd2bada /ext/Encode/lib | |
| parent | 1a73aa442b6abb49649033f945cf86321b419144 (diff) | |
| download | perl-2d06ad02462e88e5857e4083d9f0c8fa1f69f916.tar.gz | |
[Encode] 1.75 Released
Message-Id: <16B7B98D-758C-11D6-AE74-0003939A104C@dan.co.jp>
p4raw-id: //depot/perl@16964
Diffstat (limited to 'ext/Encode/lib')
| -rw-r--r-- | ext/Encode/lib/Encode/Alias.pm | 7 | ||||
| -rw-r--r-- | ext/Encode/lib/Encode/Supported.pod | 2 |
2 files changed, 6 insertions, 3 deletions
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 |