Strip ^iso- from the Encode filenames to be 8.3-friendly,

ditto ^cns.

p4raw-id: //depot/perl@12065

diff --git a/MANIFEST b/MANIFEST
index ed5f26c..809536e 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -176,16 +176,52 @@ ext/Encode/encengine.c    Encode extension
 ext/Encode/encode.h    Encode extension
 ext/Encode/Encode.pm           Encode extension
 ext/Encode/Encode.xs           Encode extension
+ext/Encode/Encode/11643-1.enc  Encoding tables
+ext/Encode/Encode/11643-2.enc  Encoding tables
+ext/Encode/Encode/2022-cn.enc  Encoding tables
+ext/Encode/Encode/2022-jp.enc  Encoding tables
+ext/Encode/Encode/2022-jp1.enc Encoding tables
+ext/Encode/Encode/2022-jp2.enc Encoding tables
+ext/Encode/Encode/2022-kr.enc  Encoding tables
+ext/Encode/Encode/2022.enc     Encoding tables
 ext/Encode/Encode/7bit-greek.enc       Encoding tables
 ext/Encode/Encode/7bit-jis.enc Encoding tables
 ext/Encode/Encode/7bit-kana.enc        Encoding tables
 ext/Encode/Encode/7bit-kr.enc  Encoding tables
 ext/Encode/Encode/7bit-latin1.enc      Encoding tables
+ext/Encode/Encode/8859-1.enc   Encoding tables
+ext/Encode/Encode/8859-1.ucm   Encoding tables
+ext/Encode/Encode/8859-10.enc  Encoding tables
+ext/Encode/Encode/8859-10.ucm  Encoding tables
+ext/Encode/Encode/8859-11.enc  Encoding tables
+ext/Encode/Encode/8859-11.ucm  Encoding tables
+ext/Encode/Encode/8859-13.enc  Encoding tables
+ext/Encode/Encode/8859-13.ucm  Encoding tables
+ext/Encode/Encode/8859-14.enc  Encoding tables
+ext/Encode/Encode/8859-14.ucm  Encoding tables
+ext/Encode/Encode/8859-15.enc  Encoding tables
+ext/Encode/Encode/8859-15.ucm  Encoding tables
+ext/Encode/Encode/8859-16.enc  Encoding tables
+ext/Encode/Encode/8859-16.ucm  Encoding tables
+ext/Encode/Encode/8859-2.enc   Encoding tables
+ext/Encode/Encode/8859-2.ucm   Encoding tables
+ext/Encode/Encode/8859-3.enc   Encoding tables
+ext/Encode/Encode/8859-3.ucm   Encoding tables
+ext/Encode/Encode/8859-4.enc   Encoding tables
+ext/Encode/Encode/8859-4.ucm   Encoding tables
+ext/Encode/Encode/8859-5.enc   Encoding tables
+ext/Encode/Encode/8859-5.ucm   Encoding tables
+ext/Encode/Encode/8859-6.enc   Encoding tables
+ext/Encode/Encode/8859-6.ucm   Encoding tables
+ext/Encode/Encode/8859-7.enc   Encoding tables
+ext/Encode/Encode/8859-7.ucm   Encoding tables
+ext/Encode/Encode/8859-8.enc   Encoding tables
+ext/Encode/Encode/8859-8.ucm   Encoding tables
+ext/Encode/Encode/8859-9.enc   Encoding tables
+ext/Encode/Encode/8859-9.ucm   Encoding tables
 ext/Encode/Encode/ascii.enc    Encoding tables
 ext/Encode/Encode/ascii.ucm    Encoding tables
 ext/Encode/Encode/big5.enc     Encoding tables
-ext/Encode/Encode/cns11643-1.enc       Encoding tables
-ext/Encode/Encode/cns11643-2.enc       Encoding tables
 ext/Encode/Encode/cp1006.enc   Encoding tables
 ext/Encode/Encode/cp1047.enc   Encoding tables
 ext/Encode/Encode/cp1047.ucm   Encoding tables
@@ -235,43 +271,7 @@ ext/Encode/Encode/gb1988.enc       Encoding tables
 ext/Encode/Encode/gb2312.enc   Encoding tables
 ext/Encode/Encode/gsm0338.enc  Encoding tables
 ext/Encode/Encode/HZ.enc       Encoding tables
-ext/Encode/Encode/iso2022-cn.enc       Encoding tables
-ext/Encode/Encode/iso2022-jp.enc       Encoding tables
-ext/Encode/Encode/iso2022-jp1.enc      Encoding tables
-ext/Encode/Encode/iso2022-jp2.enc      Encoding tables
-ext/Encode/Encode/iso2022-kr.enc       Encoding tables
-ext/Encode/Encode/iso2022.enc  Encoding tables
-ext/Encode/Encode/iso8859-1.enc        Encoding tables
-ext/Encode/Encode/iso8859-1.ucm        Encoding tables
-ext/Encode/Encode/iso8859-10.enc       Encoding tables
-ext/Encode/Encode/iso8859-10.ucm       Encoding tables
-ext/Encode/Encode/iso8859-11.enc       Encoding tables
-ext/Encode/Encode/iso8859-11.ucm       Encoding tables
-ext/Encode/Encode/iso8859-13.enc       Encoding tables
-ext/Encode/Encode/iso8859-13.ucm       Encoding tables
-ext/Encode/Encode/iso8859-14.enc       Encoding tables
-ext/Encode/Encode/iso8859-14.ucm       Encoding tables
-ext/Encode/Encode/iso8859-15.enc       Encoding tables
-ext/Encode/Encode/iso8859-15.ucm       Encoding tables
-ext/Encode/Encode/iso8859-16.enc       Encoding tables
-ext/Encode/Encode/iso8859-16.ucm       Encoding tables
-ext/Encode/Encode/iso8859-2.enc        Encoding tables
-ext/Encode/Encode/iso8859-2.ucm        Encoding tables
-ext/Encode/Encode/iso8859-3.enc        Encoding tables
-ext/Encode/Encode/iso8859-3.ucm        Encoding tables
-ext/Encode/Encode/iso8859-4.enc        Encoding tables
-ext/Encode/Encode/iso8859-4.ucm        Encoding tables
-ext/Encode/Encode/iso8859-5.enc        Encoding tables
-ext/Encode/Encode/iso8859-5.ucm        Encoding tables
-ext/Encode/Encode/iso8859-6.enc        Encoding tables
-ext/Encode/Encode/iso8859-6.ucm        Encoding tables
-ext/Encode/Encode/iso8859-7.enc        Encoding tables
-ext/Encode/Encode/iso8859-7.ucm        Encoding tables
-ext/Encode/Encode/iso8859-8.enc        Encoding tables
-ext/Encode/Encode/iso8859-8.ucm        Encoding tables
-ext/Encode/Encode/iso8859-9.enc        Encoding tables
-ext/Encode/Encode/iso8859-9.ucm        Encoding tables
-ext/Encode/Encode/isoir-197.enc        Encoding tables
+ext/Encode/Encode/ir-197.enc   Encoding tables
 ext/Encode/Encode/jis0201.enc  Encoding tables
 ext/Encode/Encode/jis0208.enc  Encoding tables
 ext/Encode/Encode/jis0212.enc  Encoding tables
@@ -304,10 +304,10 @@ ext/Encode/Encode/roman8.ucm      Encoding tables
 ext/Encode/Encode/shiftjis.enc Encoding tables
 ext/Encode/Encode/symbol.enc   Encoding tables
 ext/Encode/Encode/symbol.ucm   Encoding tables
-ext/Encode/Encode/viscii.enc   Encoding tables
-ext/Encode/Encode/viscii.ucm   Encoding tables
 ext/Encode/Encode/Tcl.pm       Handler for .enc encodings
 ext/Encode/Encode/Tcl.t        See if Encode::Tcl works
+ext/Encode/Encode/viscii.enc   Encoding tables
+ext/Encode/Encode/viscii.ucm   Encoding tables
 ext/Encode/Makefile.PL Encode extension
 ext/Encode/Todo                Encode extension
 ext/Errno/ChangeLog    Errno perl module change log

diff --git a/ext/Encode/Encode/cns11643-1.enc b/ext/Encode/Encode/11643-1.enc
similarity index 100%
rename from ext/Encode/Encode/cns11643-1.enc
rename to ext/Encode/Encode/11643-1.enc

diff --git a/ext/Encode/Encode/cns11643-2.enc b/ext/Encode/Encode/11643-2.enc
similarity index 100%
rename from ext/Encode/Encode/cns11643-2.enc
rename to ext/Encode/Encode/11643-2.enc

diff --git a/ext/Encode/Encode/iso2022-cn.enc b/ext/Encode/Encode/2022-cn.enc
similarity index 100%
rename from ext/Encode/Encode/iso2022-cn.enc
rename to ext/Encode/Encode/2022-cn.enc

diff --git a/ext/Encode/Encode/iso2022-jp.enc b/ext/Encode/Encode/2022-jp.enc
similarity index 100%
rename from ext/Encode/Encode/iso2022-jp.enc
rename to ext/Encode/Encode/2022-jp.enc

diff --git a/ext/Encode/Encode/iso2022-jp1.enc b/ext/Encode/Encode/2022-jp1.enc
similarity index 100%
rename from ext/Encode/Encode/iso2022-jp1.enc
rename to ext/Encode/Encode/2022-jp1.enc

diff --git a/ext/Encode/Encode/iso2022-jp2.enc b/ext/Encode/Encode/2022-jp2.enc
similarity index 100%
rename from ext/Encode/Encode/iso2022-jp2.enc
rename to ext/Encode/Encode/2022-jp2.enc

diff --git a/ext/Encode/Encode/iso2022-kr.enc b/ext/Encode/Encode/2022-kr.enc
similarity index 100%
rename from ext/Encode/Encode/iso2022-kr.enc
rename to ext/Encode/Encode/2022-kr.enc

diff --git a/ext/Encode/Encode/iso2022.enc b/ext/Encode/Encode/2022.enc
similarity index 100%
rename from ext/Encode/Encode/iso2022.enc
rename to ext/Encode/Encode/2022.enc

diff --git a/ext/Encode/Encode/iso8859-1.enc b/ext/Encode/Encode/8859-1.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-1.enc
rename to ext/Encode/Encode/8859-1.enc

diff --git a/ext/Encode/Encode/iso8859-1.ucm b/ext/Encode/Encode/8859-1.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-1.ucm
rename to ext/Encode/Encode/8859-1.ucm

diff --git a/ext/Encode/Encode/iso8859-10.enc b/ext/Encode/Encode/8859-10.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-10.enc
rename to ext/Encode/Encode/8859-10.enc

diff --git a/ext/Encode/Encode/iso8859-10.ucm b/ext/Encode/Encode/8859-10.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-10.ucm
rename to ext/Encode/Encode/8859-10.ucm

diff --git a/ext/Encode/Encode/iso8859-11.enc b/ext/Encode/Encode/8859-11.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-11.enc
rename to ext/Encode/Encode/8859-11.enc

diff --git a/ext/Encode/Encode/iso8859-11.ucm b/ext/Encode/Encode/8859-11.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-11.ucm
rename to ext/Encode/Encode/8859-11.ucm

diff --git a/ext/Encode/Encode/iso8859-13.enc b/ext/Encode/Encode/8859-13.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-13.enc
rename to ext/Encode/Encode/8859-13.enc

diff --git a/ext/Encode/Encode/iso8859-13.ucm b/ext/Encode/Encode/8859-13.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-13.ucm
rename to ext/Encode/Encode/8859-13.ucm

diff --git a/ext/Encode/Encode/iso8859-14.enc b/ext/Encode/Encode/8859-14.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-14.enc
rename to ext/Encode/Encode/8859-14.enc

diff --git a/ext/Encode/Encode/iso8859-14.ucm b/ext/Encode/Encode/8859-14.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-14.ucm
rename to ext/Encode/Encode/8859-14.ucm

diff --git a/ext/Encode/Encode/iso8859-15.enc b/ext/Encode/Encode/8859-15.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-15.enc
rename to ext/Encode/Encode/8859-15.enc

diff --git a/ext/Encode/Encode/iso8859-15.ucm b/ext/Encode/Encode/8859-15.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-15.ucm
rename to ext/Encode/Encode/8859-15.ucm

diff --git a/ext/Encode/Encode/iso8859-16.enc b/ext/Encode/Encode/8859-16.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-16.enc
rename to ext/Encode/Encode/8859-16.enc

diff --git a/ext/Encode/Encode/iso8859-16.ucm b/ext/Encode/Encode/8859-16.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-16.ucm
rename to ext/Encode/Encode/8859-16.ucm

diff --git a/ext/Encode/Encode/iso8859-2.enc b/ext/Encode/Encode/8859-2.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-2.enc
rename to ext/Encode/Encode/8859-2.enc

diff --git a/ext/Encode/Encode/iso8859-2.ucm b/ext/Encode/Encode/8859-2.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-2.ucm
rename to ext/Encode/Encode/8859-2.ucm

diff --git a/ext/Encode/Encode/iso8859-3.enc b/ext/Encode/Encode/8859-3.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-3.enc
rename to ext/Encode/Encode/8859-3.enc

diff --git a/ext/Encode/Encode/iso8859-3.ucm b/ext/Encode/Encode/8859-3.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-3.ucm
rename to ext/Encode/Encode/8859-3.ucm

diff --git a/ext/Encode/Encode/iso8859-4.enc b/ext/Encode/Encode/8859-4.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-4.enc
rename to ext/Encode/Encode/8859-4.enc

diff --git a/ext/Encode/Encode/iso8859-4.ucm b/ext/Encode/Encode/8859-4.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-4.ucm
rename to ext/Encode/Encode/8859-4.ucm

diff --git a/ext/Encode/Encode/iso8859-5.enc b/ext/Encode/Encode/8859-5.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-5.enc
rename to ext/Encode/Encode/8859-5.enc

diff --git a/ext/Encode/Encode/iso8859-5.ucm b/ext/Encode/Encode/8859-5.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-5.ucm
rename to ext/Encode/Encode/8859-5.ucm

diff --git a/ext/Encode/Encode/iso8859-6.enc b/ext/Encode/Encode/8859-6.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-6.enc
rename to ext/Encode/Encode/8859-6.enc

diff --git a/ext/Encode/Encode/iso8859-6.ucm b/ext/Encode/Encode/8859-6.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-6.ucm
rename to ext/Encode/Encode/8859-6.ucm

diff --git a/ext/Encode/Encode/iso8859-7.enc b/ext/Encode/Encode/8859-7.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-7.enc
rename to ext/Encode/Encode/8859-7.enc

diff --git a/ext/Encode/Encode/iso8859-7.ucm b/ext/Encode/Encode/8859-7.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-7.ucm
rename to ext/Encode/Encode/8859-7.ucm

diff --git a/ext/Encode/Encode/iso8859-8.enc b/ext/Encode/Encode/8859-8.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-8.enc
rename to ext/Encode/Encode/8859-8.enc

diff --git a/ext/Encode/Encode/iso8859-8.ucm b/ext/Encode/Encode/8859-8.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-8.ucm
rename to ext/Encode/Encode/8859-8.ucm

diff --git a/ext/Encode/Encode/iso8859-9.enc b/ext/Encode/Encode/8859-9.enc
similarity index 100%
rename from ext/Encode/Encode/iso8859-9.enc
rename to ext/Encode/Encode/8859-9.enc

diff --git a/ext/Encode/Encode/iso8859-9.ucm b/ext/Encode/Encode/8859-9.ucm
similarity index 100%
rename from ext/Encode/Encode/iso8859-9.ucm
rename to ext/Encode/Encode/8859-9.ucm

diff --git a/ext/Encode/Encode/Tcl.t b/ext/Encode/Encode/Tcl.t
index 0762e8e..7e01ca6 100644 (file)
--- a/ext/Encode/Encode/Tcl.t
+++ b/ext/Encode/Encode/Tcl.t
@@ -42,7 +42,7 @@ my %ideodigit = ( # cjk ideograph 'one' to 'ten'
 my @ideodigit = qw(one two three four five six seven eight nine ten);
 
 my $jis = '7bit-jis';
-my $kr  = 'iso2022-kr';
+my $kr  = '2022-kr';
 my %esc_str;
 
 $esc_str{$jis} = {qw(

diff --git a/ext/Encode/Encode/isoir-197.enc b/ext/Encode/Encode/ir-197.enc
similarity index 100%
rename from ext/Encode/Encode/isoir-197.enc
rename to ext/Encode/Encode/ir-197.enc

diff --git a/ext/Encode/Makefile.PL b/ext/Encode/Makefile.PL
index 97254ac..30d9ffc 100644 (file)
--- a/ext/Encode/Makefile.PL
+++ b/ext/Encode/Makefile.PL
@@ -8,7 +8,7 @@ my %tables = (iso8859 => ['ascii.ucm', 'cp1250.ucm', 'koi8-r.ucm' ],
 opendir(ENC,'Encode');
 while (defined(my $file = readdir(ENC)))
  {
-  if ($file =~ /iso8859.*\.ucm/)
+  if ($file =~ /8859.*\.ucm/)
    {
     push(@{$tables{iso8859}},$file);
    }