diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2015-03-14 11:36:15 +0000 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2015-03-14 11:36:15 +0000 |
| commit | e455391f6bfb5b4f1211cedb87955a9a94390ab1 (patch) | |
| tree | 98d81aa514eb7196ba412e2cd476b58e6e7a6139 /cpan/Encode | |
| parent | 89a8cc38d127d16c439eaf29deee39e313953d44 (diff) | |
| download | perl-e455391f6bfb5b4f1211cedb87955a9a94390ab1.tar.gz | |
Upgrade Encode from version 2.70 to 2.72
This incorporates all current blead customizations.
Diffstat (limited to 'cpan/Encode')
| -rw-r--r-- | cpan/Encode/Encode.pm | 4 | ||||
| -rw-r--r-- | cpan/Encode/Makefile.PL | 2 | ||||
| -rw-r--r-- | cpan/Encode/encoding.pm | 4 | ||||
| -rw-r--r-- | cpan/Encode/lib/Encode/Alias.pm | 6 | ||||
| -rw-r--r-- | cpan/Encode/t/Aliases.t | 2 |
5 files changed, 12 insertions, 6 deletions
diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm index 7a9135c671..3bb10970de 100644 --- a/cpan/Encode/Encode.pm +++ b/cpan/Encode/Encode.pm @@ -1,10 +1,10 @@ # -# $Id: Encode.pm,v 2.70 2015/02/05 10:52:16 dankogai Exp $ +# $Id: Encode.pm,v 2.72 2015/03/14 02:43:24 dankogai Exp $ # package Encode; use strict; use warnings; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.70 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.72 $ =~ /(\d+)/g; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); diff --git a/cpan/Encode/Makefile.PL b/cpan/Encode/Makefile.PL index 8193de3f10..7da9329a0f 100644 --- a/cpan/Encode/Makefile.PL +++ b/cpan/Encode/Makefile.PL @@ -1,5 +1,5 @@ # -# $Id: Makefile.PL,v 2.13 2015/02/05 10:53:00 dankogai Exp dankogai $ +# $Id: Makefile.PL,v 2.13 2015/02/05 10:53:00 dankogai Exp $ # use 5.007003; use strict; diff --git a/cpan/Encode/encoding.pm b/cpan/Encode/encoding.pm index 167c2fb11c..fde410dc89 100644 --- a/cpan/Encode/encoding.pm +++ b/cpan/Encode/encoding.pm @@ -1,6 +1,6 @@ -# $Id: encoding.pm,v 2.13 2013/04/26 18:30:46 dankogai Exp $ +# $Id: encoding.pm,v 2.14 2015/03/14 02:44:39 dankogai Exp dankogai $ package encoding; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.13 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.14 $ =~ /(\d+)/g; use Encode; use strict; diff --git a/cpan/Encode/lib/Encode/Alias.pm b/cpan/Encode/lib/Encode/Alias.pm index 28d3cad34d..c0945be7c8 100644 --- a/cpan/Encode/lib/Encode/Alias.pm +++ b/cpan/Encode/lib/Encode/Alias.pm @@ -2,7 +2,7 @@ package Encode::Alias; use strict; use warnings; no warnings 'redefine'; -our $VERSION = do { my @r = ( q$Revision: 2.18 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +our $VERSION = do { my @r = ( q$Revision: 2.19 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; use Exporter 'import'; @@ -256,6 +256,10 @@ sub init_aliases { define_alias( qr/\bhk(?:scs)?[-_]?big5$/i => '"big5-hkscs"' ); } + # https://github.com/dankogai/p5-encode/issues/37 + define_alias(qr/cp65000/i => '"UTF-7"'); + define_alias(qr/cp65001/i => '"utf-8-strict"'); + # utf8 is blessed :) define_alias( qr/\bUTF-8$/i => '"utf-8-strict"' ); diff --git a/cpan/Encode/t/Aliases.t b/cpan/Encode/t/Aliases.t index d7a72d2761..2fc14cc114 100644 --- a/cpan/Encode/t/Aliases.t +++ b/cpan/Encode/t/Aliases.t @@ -81,6 +81,8 @@ sub init_a2c{ 'jis0208-raw' => $ON_EBCDIC ? '' : 'jis0208-raw', 'jis0212-raw' => $ON_EBCDIC ? '' : 'jis0212-raw', 'ksc5601-raw' => $ON_EBCDIC ? '' : 'ksc5601-raw', + 'cp65000' => 'UTF-7', + 'cp65001' => 'utf-8-strict', ); for my $i (1..11,13..16){ |