Upgrade to Encode 1.68.

p4raw-id: //depot/perl@16369

diff --git a/ext/Encode/AUTHORS b/ext/Encode/AUTHORS
index 8610012..a61622c 100644 (file)
--- a/ext/Encode/AUTHORS
+++ b/ext/Encode/AUTHORS
@@ -15,8 +15,10 @@ Autrijus Tang                        <autrijus@autrijus.org>
 Benjamin Goldberg               <goldbb2@earthlink.net>
 Craig A. Berry                 <craigberry@mac.com>
 Dan Kogai                      <dankogai@dan.co.jp>
+Elizabeth Mattijsen             <liz@dijkmat.nl>
 Gerrit P. Haase                        <gp@familiehaase.de>
 Gurusamy Sarathy               <gsar@activestate.com>
+H.Merijn Brand                  <h.m.brand@hccnet.nl>
 Jarkko Hietaniemi              <jhi@iki.fi>
 Jungshik Shin                   <jshin@mailaps.org>
 Laszlo Molnar                  <ml1050@freemail.hu>

diff --git a/ext/Encode/Changes b/ext/Encode/Changes
index a4279ef..966a53e 100644 (file)
--- a/ext/Encode/Changes
+++ b/ext/Encode/Changes
@@ -1,9 +1,18 @@
 # Revision history for Perl extension Encode.
 #
-# $Id: Changes,v 1.67 2002/05/02 07:33:09 dankogai Exp $
+# $Id: Changes,v 1.68 2002/05/03 12:20:13 dankogai Exp $
 #
 
-$Revision: 1.67 $ $Date: 2002/05/02 07:33:09 $
+$Revision: 1.68 $ $Date: 2002/05/03 12:20:13 $
+! lib/Encode/Alias.pm lib/Encode/Supported.pod t/Alias.t AUTHORS
+  UCS-4 added to aliases of UTF-32 by Elizabeth Mattijsen.  Alias.t
+  and Supported.pod modified to reflect the change.  Elizabeth added
+  to Authors.  And H.M. is also added for forwarding her patch among
+  other contributions (I was rather surprised to find his name was not
+  there yet!) 
+   Message-Id: <20020503114901.D639.H.M.BRAND@hccnet.nl>
+
+1.67 2002/05/02 07:33:09
 ! Encode.xs
   Error message now consistent w/ perlqq (\N{U+} -> \x{})
   done in perl@16308 but Philip linted me further.  Now the error
@@ -574,7 +583,7 @@ $Revision: 1.67 $ $Date: 2002/05/02 07:33:09 $
   Typo fixes and improvements by jhi
   Message-Id: <200204010201.FAA03564@alpha.hut.fi>, et al.
 
-1.11  $Date: 2002/05/02 07:33:09 $
+1.11  $Date: 2002/05/03 12:20:13 $
 + t/encoding.t
 + t/jperl.t
 ! MANIFEST

diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm
index 9686494..ccb0ade 100644 (file)
--- a/ext/Encode/Encode.pm
+++ b/ext/Encode/Encode.pm
@@ -1,9 +1,9 @@
 #
-# $Id: Encode.pm,v 1.67 2002/05/02 07:33:34 dankogai Exp $
+# $Id: Encode.pm,v 1.68 2002/05/03 12:20:31 dankogai Exp $
 #
 package Encode;
 use strict;
-our $VERSION = do { my @r = (q$Revision: 1.67 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.68 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 our $DEBUG = 0;
 use XSLoader ();
 XSLoader::load(__PACKAGE__, $VERSION);

diff --git a/ext/Encode/lib/Encode/Alias.pm b/ext/Encode/lib/Encode/Alias.pm
index e19b734..a6172ed 100644 (file)
--- 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.30 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.31 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 our $DEBUG = 0;
 
 use base qw(Exporter);
@@ -130,6 +130,7 @@ sub init_aliases
     # UTF/UCS stuff
     define_alias( qr/^UCS-?2-?LE$/i    => '"UCS-2LE"' );
     define_alias( qr/^UCS-?2-?(BE)?$/i => '"UCS-2BE"',
+                  qr/^UCS-?4-?(BE|LE)?$/i => 'uc("UTF-32$1")',
                  qr/^iso-10646-1$/i   => '"UCS-2BE"' );
     define_alias( qr/^UTF(16|32)-?BE$/i => '"UTF-$1BE"',
                  qr/^UTF(16|32)-?LE$/i => '"UTF-$1LE"',

diff --git a/ext/Encode/lib/Encode/Supported.pod b/ext/Encode/lib/Encode/Supported.pod
index 8cdcec1..f7b66fa 100644 (file)
--- a/ext/Encode/lib/Encode/Supported.pod
+++ b/ext/Encode/lib/Encode/Supported.pod
@@ -77,7 +77,7 @@ Encode::Unicode, which will be autoloaded on demand.
   UTF-16BE                                                    [UC]
   UTF-16LE                                                    [UC]
   UTF-32                                                      [UC]
-  UTF-32BE                                                    [UC]
+  UTF-32BE     UCS-4                                         [UC]
   UTF-32LE                                                    [UC]
   ----------------------------------------------------------------
 

diff --git a/ext/Encode/t/Aliases.t b/ext/Encode/t/Aliases.t
index 0ded894..d743a1d 100644 (file)
--- a/ext/Encode/t/Aliases.t
+++ b/ext/Encode/t/Aliases.t
@@ -33,6 +33,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',