From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 07:41:52 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBEF6106566B;
	Wed,  5 Aug 2009 07:41:52 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DA8078FC17;
	Wed,  5 Aug 2009 07:41:52 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n757fq6H047523;
	Wed, 5 Aug 2009 07:41:52 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n757fqZu047522;
	Wed, 5 Aug 2009 07:41:52 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908050741.n757fqZu047522@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 07:41:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196064 - user/edwin/locale/tools
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Aug 2009 07:41:53 -0000

Author: edwin
Date: Wed Aug  5 07:41:52 2009
New Revision: 196064
URL: http://svn.freebsd.org/changeset/base/196064

Log:
  be able to convert from Unicode name to characterset hex

Modified:
  user/edwin/locale/tools/cldr2def.pl

Modified: user/edwin/locale/tools/cldr2def.pl
==============================================================================
--- user/edwin/locale/tools/cldr2def.pl	Tue Aug  4 22:13:58 2009	(r196063)
+++ user/edwin/locale/tools/cldr2def.pl	Wed Aug  5 07:41:52 2009	(r196064)
@@ -388,8 +388,15 @@ sub decodecldr {
 			 && $utf8aliases{$s}
 			 && defined $ucd{name2code}{$utf8aliases{$s}});
 
+		if (!defined $ucc) {
+			if (defined $translations{$e}{$s}{hex}) {
+				$v = $translations{$e}{$s}{hex};
+				$ucc = 0;
+			}
+		}
+
 		die "Cannot convert $s in $e (ucd string)" if (!defined $ucc);
-		$v = $convertors{$e}{$ucc};
+		$v = $convertors{$e}{$ucc} if (!defined $v);
 
 		$v = $translations{$e}{$s}{hex}
 			if (!defined $v && defined $translations{$e}{$s}{hex});