From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 5 Mar 2001 19:10:36 +0000 (+0000)
Subject: The mapping of ISO Latin X to ISO 8859-Y is tricky.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d6089a2a0016c05dba49a9ca61fd0ca32d97246b;p=p5sagit%2Fp5-mst-13.2.git

The mapping of ISO Latin X to ISO 8859-Y is tricky.

p4raw-id: //depot/perl@9045
---

diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm
index e1996e8..296ddc3 100644
--- a/ext/Encode/Encode.pm
+++ b/ext/Encode/Encode.pm
@@ -96,9 +96,24 @@ sub define_alias
   }
 }
 
-define_alias( qr/^iso\W?(\d+)\W(\d+)$/i => '"iso-$1-$2"' );
-define_alias( qr/^(?:iso\W?)?(?:8859|latin)\W(\d+)$/i => '"iso-8859-$1"' );
-define_alias( qr/^(\S+)\s+(.*)$/i => '"$1-$2"' );
+my %isolatin2num =
+	(
+	1 =>  1,
+	2 =>  2,
+	3 =>  3,
+	4 =>  4,
+	5 =>  9,
+	6 => 10,
+	7 => 13,
+	8 => 14,
+	9 => 15,
+       10 => 16,
+	);
+
+define_alias( qr/^iso[-_]?(\d+)[-_](\d+)$/i => '"iso-$1-$2"' );
+define_alias( qr/^(?:iso[-_]?)?latin[-_]?(\d+)$/i =>
+              '"iso-8859-$isolatin2num{$1}"' );
+define_alias( qr/^(\S+)[\s_]+(.*)$/i => '"$1-$2"' );
 #define_alias( sub { return /^iso-(\d+-\d+)$/i  ? "iso$1" : '' } );
 define_alias( 'ascii' => 'US-ascii');
 define_alias( 'ibm-1047' => 'cp1047');