Upgrade to Encode 1.98.

p4raw-id: //depot/perl@20790

14 files changed, 42 insertions, 19 deletions

diff --git a/ext/Encode/AUTHORS b/ext/Encode/AUTHORS
index 9cf8dd469d..391b107970 100644
--- a/ext/Encode/AUTHORS
+++ b/ext/Encode/AUTHORS
@@ -17,6 +17,7 @@ Bjoern Jacke			<debianbugs@j3e.de>
 Chris Nandor                    <pudge@pobox.com>
 Craig A. Berry			<craigberry@mac.com>
 Dan Kogai			<dankogai@dan.co.jp>
+Dave Evans			<dave@rudolf.org.uk>
 Elizabeth Mattijsen             <liz@dijkmat.nl>
 Gerrit P. Haase			<gp@familiehaase.de>
 Graham Barr                     <gbarr@pobox.com>
diff --git a/ext/Encode/Changes b/ext/Encode/Changes
index 5c5cf6f9e0..0ec0702b05 100644
--- a/ext/Encode/Changes
+++ b/ext/Encode/Changes
@@ -1,8 +1,20 @@
 # Revision history for Perl extension Encode.
 #
-# $Id: Changes,v 1.97 2003/07/08 21:52:14 dankogai Exp $
+# $Id: Changes,v 1.98 2003/08/20 11:15:31 dankogai Exp dankogai $
 #
-$Revision: 1.97 $ $Date: 2003/07/08 21:52:14 $
+$Revision: 1.98 $ $Date: 2003/08/20 11:15:31 $
+! lib/Encode/MIME/Header.pm AUTHORS t/mime-header.t
+  Dave Evans has found and corrected a bug in Encode::MIME::Header.
+  Test suite added by Dan Kogai.
+  Message-Id: <3F43440B.7060606@rudolf.org.uk>
+! encoding.pm
+  Typo fixes rolled back in from bleedperl
+! t/at-cn.t t/at-tw.t
+  v-strings, now depreciated in perl 5.8.1, is replaced by sadahiro
+  Message-Id: <20030805002313.9880.BQW10602@nifty.com>
+! bin/enc2xs
+  argv case nit for VMS by Craig
+  Message-ID: <3F2B02DE.10207@mac.com>
 ! t/enc_eucjp.t t/enc_utf8.t AUTHORS
   Encode test fixes for VMS by Peter Prymmer
   Message-ID: <OFBD4A7559.D7CF9517-ON85256D6B.00534853-85256D6B.00538131@factset.com>
diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm
index 248586aeb9..796a462c07 100644
--- a/ext/Encode/Encode.pm
+++ b/ext/Encode/Encode.pm
@@ -1,9 +1,9 @@
 #
-# $Id: Encode.pm,v 1.97 2003/07/08 21:52:14 dankogai Exp $
+# $Id: Encode.pm,v 1.98 2003/08/20 11:16:34 dankogai Exp dankogai $
 #
 package Encode;
 use strict;
-our $VERSION = do { my @r = (q$Revision: 1.97 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.98 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 sub DEBUG () { 0 }
 use XSLoader ();
 XSLoader::load(__PACKAGE__, $VERSION);
diff --git a/ext/Encode/META.yml b/ext/Encode/META.yml
index 2e50ff624c..07327cecab 100644
--- a/ext/Encode/META.yml
+++ b/ext/Encode/META.yml
@@ -1,9 +1,10 @@
+# http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Encode
-version:      1.97
+version:      1.98
 version_from: Encode.pm
 installdirs:  perl
 requires:
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.12
+generated_by: ExtUtils::MakeMaker version 6.16
diff --git a/ext/Encode/bin/enc2xs b/ext/Encode/bin/enc2xs
index aff29e1c08..61171d196a 100644
--- a/ext/Encode/bin/enc2xs
+++ b/ext/Encode/bin/enc2xs
@@ -9,7 +9,7 @@ use strict;
 use warnings;
 use Getopt::Std;
 my @orig_ARGV = @ARGV;
-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 };
 
 # These may get re-ordered.
 # RAW is a do_now as inserted by &enter
diff --git a/ext/Encode/encoding.pm b/ext/Encode/encoding.pm
index a42c126e76..f203cb3d7e 100644
--- a/ext/Encode/encoding.pm
+++ b/ext/Encode/encoding.pm
@@ -1,6 +1,6 @@
-# $Id: encoding.pm,v 1.46 2003/07/08 21:52:14 dankogai Exp $
+# $Id: encoding.pm,v 1.47 2003/08/20 11:15:31 dankogai Exp dankogai $
 package encoding;
-our $VERSION = do { my @r = (q$Revision: 1.46 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.47 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 use Encode;
 use strict;
diff --git a/ext/Encode/lib/Encode/Alias.pm b/ext/Encode/lib/Encode/Alias.pm
index 49ae79ec6e..e06dce5c6a 100644
--- a/ext/Encode/lib/Encode/Alias.pm
+++ b/ext/Encode/lib/Encode/Alias.pm
@@ -2,7 +2,7 @@ package Encode::Alias;
 use strict;
 no warnings 'redefine';
 use Encode;
-our $VERSION = do { my @r = (q$Revision: 1.37 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.38 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 sub DEBUG () { 0 }
 
 use base qw(Exporter);
diff --git a/ext/Encode/lib/Encode/MIME/Header.pm b/ext/Encode/lib/Encode/MIME/Header.pm
index 447951b17e..71f9512b6d 100644
--- a/ext/Encode/lib/Encode/MIME/Header.pm
+++ b/ext/Encode/lib/Encode/MIME/Header.pm
@@ -1,7 +1,7 @@
 package Encode::MIME::Header;
 use strict;
 # use warnings;
-our $VERSION = do { my @r = (q$Revision: 1.8 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 1.9 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 use Encode qw(find_encoding encode_utf8 decode_utf8);
 use MIME::Base64;
 use Carp;
@@ -145,7 +145,7 @@ sub _encode{
     $llen *= $enc eq 'B' ? 3.0/4.0 : 1.0/3.0;
     my @result = ();
     my $chunk = '';
-    while(my $chr = substr($str, 0, 1, '')){
+    while(length(my $chr = substr($str, 0, 1, ''))){
 	use bytes ();
 	if (bytes::length($chunk) + bytes::length($chr) > $llen){
 	    push @result, SINGLE->{$enc}($chunk);
diff --git a/ext/Encode/t/enc_eucjp.t b/ext/Encode/t/enc_eucjp.t
index 3afeb5d5f5..bbe87cfee4 100644
--- a/ext/Encode/t/enc_eucjp.t
+++ b/ext/Encode/t/enc_eucjp.t
@@ -1,4 +1,4 @@
-# $Id: enc_eucjp.t,v 1.4 2003/04/24 17:43:16 dankogai Exp $
+# $Id: enc_eucjp.t,v 1.5 2003/08/20 11:15:31 dankogai Exp dankogai $
 # This is the twin of enc_utf8.t .
 
 BEGIN {
diff --git a/ext/Encode/t/enc_utf8.t b/ext/Encode/t/enc_utf8.t
index e12e35de1a..0fc1bd948d 100644
--- a/ext/Encode/t/enc_utf8.t
+++ b/ext/Encode/t/enc_utf8.t
@@ -1,4 +1,4 @@
-# $Id: enc_utf8.t,v 1.3 2003/02/20 14:42:34 dankogai Exp $
+# $Id: enc_utf8.t,v 1.4 2003/08/20 11:15:31 dankogai Exp dankogai $
 # This is the twin of enc_eucjp.t .
 
 BEGIN {
diff --git a/ext/Encode/t/mime-header.t b/ext/Encode/t/mime-header.t
index 81d6ec8dc0..06021b8a09 100644
--- a/ext/Encode/t/mime-header.t
+++ b/ext/Encode/t/mime-header.t
@@ -1,5 +1,5 @@
 #
-# $Id: mime-header.t,v 1.7 2003/05/10 18:13:59 dankogai Exp $
+# $Id: mime-header.t,v 1.8 2003/08/20 11:15:31 dankogai Exp dankogai $
 # This script is written in utf8
 #
 BEGIN {
@@ -23,7 +23,7 @@ no utf8;
 
 use strict;
 #use Test::More qw(no_plan);
-use Test::More tests => 9;
+use Test::More tests => 10;
 use_ok("Encode::MIME::Header");
 
 my $eheader =<<'EOS';
@@ -97,4 +97,13 @@ $bheader = "What is =?UTF-8?B?PT9VVEYtOD9CP3c0UndabVZzPz0=?= ?";
 $qheader = "What is =?UTF-8?Q?=3D=3FUTF=2D8=3FB=3Fw4RwZmVs=3F=3D?= ?";
 is(Encode::encode('MIME-B', $dheader), $bheader, "Double decode B");
 is(Encode::encode('MIME-Q', $dheader), $qheader, "Double decode Q");
+{
+    # From: Dave Evans <dave@rudolf.org.uk>
+    # Subject: Bug in Encode::MIME::Header
+    # Message-Id: <3F43440B.7060606@rudolf.org.uk>
+    use charnames ":full";
+    my $pound_1024 = "\N{POUND SIGN}1024";
+    is(Encode::encode('MIME-Q' => $pound_1024), '=?UTF-8?Q?=C2=A31024?=',
+       'pound 1024');
+}
 __END__;
diff --git a/ext/Encode/ucm/macArabic.ucm b/ext/Encode/ucm/macArabic.ucm
index 5ac3a2b7e1..f0a854c715 100644
--- a/ext/Encode/ucm/macArabic.ucm
+++ b/ext/Encode/ucm/macArabic.ucm
@@ -1,5 +1,5 @@
 #
-# $Id: macArabic.ucm,v 1.20 2002/04/04 19:50:54 dankogai Exp $
+# $Id: macArabic.ucm,v 1.21 2003/08/20 11:15:31 dankogai Exp dankogai $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ARABIC.TXT
diff --git a/ext/Encode/ucm/macFarsi.ucm b/ext/Encode/ucm/macFarsi.ucm
index 46da8f42ba..a2918b2cd9 100644
--- a/ext/Encode/ucm/macFarsi.ucm
+++ b/ext/Encode/ucm/macFarsi.ucm
@@ -1,5 +1,5 @@
 #
-# $Id: macFarsi.ucm,v 1.20 2002/04/04 19:50:54 dankogai Exp $
+# $Id: macFarsi.ucm,v 1.21 2003/08/20 11:15:31 dankogai Exp dankogai $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/FARSI.TXT
diff --git a/ext/Encode/ucm/macHebrew.ucm b/ext/Encode/ucm/macHebrew.ucm
index 77e24d84ee..d32a07a2de 100644
--- a/ext/Encode/ucm/macHebrew.ucm
+++ b/ext/Encode/ucm/macHebrew.ucm
@@ -1,5 +1,5 @@
 #
-# $Id: macHebrew.ucm,v 1.20 2002/04/04 19:50:54 dankogai Exp $
+# $Id: macHebrew.ucm,v 1.21 2003/08/20 11:15:31 dankogai Exp dankogai $
 #
 # Original table can be obtained at
 # http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/HEBREW.TXT