From owner-svn-src-user@FreeBSD.ORG  Mon Aug  3 21:39:04 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 AD1AE106566B;
	Mon,  3 Aug 2009 21:39:04 +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 9A4FD8FC1A;
	Mon,  3 Aug 2009 21:39:04 +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 n73Ld4cs098055;
	Mon, 3 Aug 2009 21:39:04 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n73Ld46a098054;
	Mon, 3 Aug 2009 21:39:04 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908032139.n73Ld46a098054@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 3 Aug 2009 21:39:04 +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: r196059 - 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: Mon, 03 Aug 2009 21:39:04 -0000

Author: edwin
Date: Mon Aug  3 21:39:04 2009
New Revision: 196059
URL: http://svn.freebsd.org/changeset/base/196059

Log:
  - Add FreeBSD specific data (alternative month)
  - Temporary disable all translations to while redoing "iconv" routines.
  - Reformat to fit on 80 columns.

Modified:
  user/edwin/locale/tools/charmaps.xml

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Mon Aug  3 20:26:55 2009	(r196058)
+++ user/edwin/locale/tools/charmaps.xml	Mon Aug  3 21:39:04 2009	(r196059)
@@ -178,163 +178,172 @@
 
 <translations>
 	<!-- These don't have a special Euro sign so just use Eu for it -->
-	<translation encoding="ISO8859-1" cldr="EURO_SIGN" string="Eu" />
-	<translation encoding="ISO8859-2" cldr="EURO_SIGN" string="Eu" />
+	<translation encoding="ISO8859-1" cldr="EURO SIGN" string="Eu" />
+	<translation encoding="ISO8859-2" cldr="EURO SIGN" string="Eu" />
+
+	<!-- Minus and dashes -->
+	<translation encoding="ISO8859-1 ISO8859-4 ISO8859-13 ISO8859-15"
+	    cldr="MINUS SIGN" unicode="HYPHEN-MINUS" />
+	<translation encoding="ISO8859-2"
+	    cldr="EN DASH" unicode="HYPHEN-MINUS" />
+
+	<translation encoding="ISO8859-2"
+	    cldr="CYRILLIC SMALL LETTER DE" string="d" />
+
+</translations>
+
+<translationssss>
 
 	<!-- These don't have a special Kow sign so just use KRW for it -->
-	<translation encoding="CP949" cldr="WON_SIGN" hex="5C" />
-	<translation encoding="eucKR" cldr="WON_SIGN" hex="5C" />
+	<translation encoding="CP949" cldr="WON SIGN" hex="5C" />
+	<translation encoding="eucKR" cldr="WON SIGN" hex="5C" />
 
 	<!-- Minus and dashes -->
-	<translation encoding="ISO8859-1" cldr="MINUS_SIGN" string="-" />
-	<translation encoding="ISO8859-4" cldr="MINUS_SIGN" string="-" />
-	<translation encoding="ISO8859-13" cldr="MINUS_SIGN" string="-" />
-	<translation encoding="ISO8859-15" cldr="MINUS_SIGN" string="-" />
-	<translation encoding="ISO8859-2" cldr="EN_DASH" string="-" />
+	<translation encoding="ISO8859-2" cldr="EN DASH" string="-" />
 
 	<!-- Copied from the original FreeBSD src/share/monetdef -->
-	<translation encoding="CP1251" cldr="HRYVNIA_SIGN" hex="E3F0ED" />
-	<translation encoding="ISO8859-5" cldr="HRYVNIA_SIGN" hex="D3E0DD" />
-	<translation encoding="KOI8-U" cldr="HRYVNIA_SIGN" hex="C7D2CE" />
+	<translation encoding="CP1251" cldr="HRYVNIA SIGN" hex="E3F0ED" />
+	<translation encoding="ISO8859-5" cldr="HRYVNIA SIGN" hex="D3E0DD" />
+	<translation encoding="KOI8-U" cldr="HRYVNIA SIGN" hex="C7D2CE" />
 
 	<!-- Copied from the original FreeBSD src/share/timedef -->
 	<translation encoding="KOI8-R"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="EC" />
 	<translation encoding="KOI8-R"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" hex="E2" />
+	    cldr="CYRILLIC SMALL LETTER TE" hex="E2" />
 	<translation encoding="KOI8-R"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="E9" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="E9" />
 
 	<translation encoding="KOI8-U"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="D8" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="D8" />
 	<translation encoding="KOI8-U"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="CA" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="CA" />
 	<translation encoding="KOI8-U"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" hex="C4" />
+	    cldr="CYRILLIC SMALL LETTER DE" hex="C4" />
 
 	<translation encoding="ISO8859-2"
-	    cldr="LATIN_SMALL_LETTER_N_WITH_ACUTE" hex="F1" />
+	    cldr="LATIN SMALL LETTER N WITH ACUTE" hex="F1" />
 	<translation encoding="ISO8859-2"
-	    cldr="LATIN_SMALL_LETTER_I_WITH_ACUTE" hex="ED" />
+	    cldr="LATIN SMALL LETTER I WITH ACUTE" hex="ED" />
 	<translation encoding="ISO8859-2" cldr="k" string="k" />
 
 	<translation encoding="ISO8859-4" cldr="s" string="s" />
 	<translation encoding="ISO8859-4"
-	    cldr="LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE" hex="EC" />
+	    cldr="LATIN SMALL LETTER E WITH DOT ABOVE" hex="EC" />
 
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="EC" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="D9" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="D9" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" hex="D4" />
+	    cldr="CYRILLIC SMALL LETTER DE" hex="D4" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_YERU" hex="EB" />
+	    cldr="CYRILLIC SMALL LETTER YERU" hex="EB" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" hex="DA" />
+	    cldr="CYRILLIC SMALL LETTER KA" hex="DA" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" hex="E2" />
+	    cldr="CYRILLIC SMALL LETTER TE" hex="E2" />
 
 	<translation encoding="ISO8859-7"
-	    cldr="GREEK_SMALL_LETTER_FINAL_SIGMA" hex="F2" />
+	    cldr="GREEK SMALL LETTER FINAL SIGMA" hex="F2" />
 
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_YERU" hex="FB" />
+	    cldr="CYRILLIC SMALL LETTER YERU" hex="FB" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" hex="EA" />
+	    cldr="CYRILLIC SMALL LETTER KA" hex="EA" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" hex="E2" />
+	    cldr="CYRILLIC SMALL LETTER TE" hex="E2" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="FC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="FC" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="E9" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="E9" />
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" hex="E4" />
+	    cldr="CYRILLIC SMALL LETTER DE" hex="E4" />
 
 	<translation encoding="CP1131"
-	    cldr="CYRILLIC_SMALL_LETTER_YERU" hex="EB" />
+	    cldr="CYRILLIC SMALL LETTER YERU" hex="EB" />
 	<translation encoding="CP1131"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" hex="AA" />
+	    cldr="CYRILLIC SMALL LETTER KA" hex="AA" />
 	<translation encoding="CP1131"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" hex="A4" />
+	    cldr="CYRILLIC SMALL LETTER DE" hex="A4" />
 	<translation encoding="CP1131"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="EC" />
 
 	<translation encoding="CP866"
-	    cldr="CYRILLIC_SMALL_LETTER_SOFT_SIGN" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER SOFT SIGN" hex="EC" />
 	<translation encoding="CP866"
-	    cldr="CYRILLIC_SMALL_LETTER_SHORT_I" hex="A9" />
+	    cldr="CYRILLIC SMALL LETTER SHORT I" hex="A9" />
 	<translation encoding="CP866"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" hex="E2" />
+	    cldr="CYRILLIC SMALL LETTER TE" hex="E2" />
 
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_A" hex="E0" />
+	    cldr="CYRILLIC SMALL LETTER A" hex="E0" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_EM" hex="EC" />
+	    cldr="CYRILLIC SMALL LETTER EM" hex="EC" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_EN" hex="ED" />
+	    cldr="CYRILLIC SMALL LETTER EN" hex="ED" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_ER" hex="F0" />
+	    cldr="CYRILLIC SMALL LETTER ER" hex="F0" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_IE" hex="E5" />
+	    cldr="CYRILLIC SMALL LETTER IE" hex="E5" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" hex="EA" />
+	    cldr="CYRILLIC SMALL LETTER KA" hex="EA" />
 	<translation encoding="PT154"
-	    cldr="CYRILLIC_SMALL_LETTER_ZE" hex="E7" />
+	    cldr="CYRILLIC SMALL LETTER ZE" hex="E7" />
 
 	<!-- Spaces from XX -->
-	<!-- translation encoding="US-ASCII" cldr="NO-BREAK_SPACE" string="XX" / -->
+	<!-- translation encoding="US-ASCII" cldr="NO-BREAK SPACE" string="XX" / -->
 
 	<!-- Value found in http://en.wikipedia.org/wiki/Pound_sign -->
-	<translation encoding="US-ASCII" cldr="POUND_SIGN" hex="A3" />
+	<translation encoding="US-ASCII" cldr="POUND SIGN" hex="A3" />
 
 	<!-- Values found in http://en.wikipedia.org/wiki/Ya_(Cyrillic) -->
 	<translation encoding="CP1251"
-	    cldr="CYRILLIC_SMALL_LETTER_YA" hex="FF" />
+	    cldr="CYRILLIC SMALL LETTER YA" hex="FF" />
 	<translation encoding="ISO8859-5"
-	    cldr="CYRILLIC_SMALL_LETTER_YA" hex="EF" />
+	    cldr="CYRILLIC SMALL LETTER YA" hex="EF" />
 	<translation encoding="KOI8-U"
-	    cldr="CYRILLIC_SMALL_LETTER_YA" hex="D1" />
+	    cldr="CYRILLIC SMALL LETTER YA" hex="D1" />
 
 	<!-- Values found in
 		http://en.wikipedia.org/wiki/Cyrillic_characters_in_Unicode
 	 -->
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_CAPITAL_LETTER_A" string="A" />
+	    cldr="CYRILLIC CAPITAL LETTER A" string="A" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_A" string="a" />
+	    cldr="CYRILLIC SMALL LETTER A" string="a" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_KA" string="k" />
+	    cldr="CYRILLIC SMALL LETTER KA" string="k" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_O" string="o" />
+	    cldr="CYRILLIC SMALL LETTER O" string="o" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_CAPITAL_LETTER_DE" string="D" />
+	    cldr="CYRILLIC CAPITAL LETTER DE" string="D" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_DE" string="d" />
+	    cldr="CYRILLIC SMALL LETTER DE" string="d" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_CAPITAL_LETTER_IE" string="E" />
+	    cldr="CYRILLIC CAPITAL LETTER IE" string="E" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_IE" string="e" />
+	    cldr="CYRILLIC SMALL LETTER IE" string="e" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_CAPITAL_LETTER_EN" string="N" />
+	    cldr="CYRILLIC CAPITAL LETTER EN" string="N" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_EN" string="n" />
+	    cldr="CYRILLIC SMALL LETTER EN" string="n" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_BE" string="b" />
+	    cldr="CYRILLIC SMALL LETTER BE" string="b" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_ER" string="r" />
+	    cldr="CYRILLIC SMALL LETTER ER" string="r" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_JE" string="j" />
+	    cldr="CYRILLIC SMALL LETTER JE" string="j" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_EL" string="l" />
+	    cldr="CYRILLIC SMALL LETTER EL" string="l" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_GHE" string="g" />
+	    cldr="CYRILLIC SMALL LETTER GHE" string="g" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_PE" string="p" />
+	    cldr="CYRILLIC SMALL LETTER PE" string="p" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_TE" string="t" />
+	    cldr="CYRILLIC SMALL LETTER TE" string="t" />
 	<translation encoding="ISO8859-2"
-	    cldr="CYRILLIC_SMALL_LETTER_VE" string="v" />
+	    cldr="CYRILLIC SMALL LETTER VE" string="v" />
 
 	<!-- Not sure why these ones aren't known by libiconv -->
 	<translation encoding="ISO8859-2" cldr="a" string="a" />
@@ -348,10 +357,10 @@
 	<translation encoding="ISO8859-5" cldr="k" string="k" />
 
 	<!-- Just a . ? -->
-	<translation encoding="ISO8859-2" cldr="FULL_STOP" string="." />
-	<translation encoding="ARMSCII-8" cldr="ONE_DOT_LEADER" string="." />
+	<translation encoding="ISO8859-2" cldr="FULL STOP" string="." />
+	<translation encoding="ARMSCII-8" cldr="ONE DOT LEADER" string="." />
 
-</translations>
+</translationssss>
 
 <alternativemonths>
 	<!-- Months which are different in dates ("21 december 1980") and in
@@ -362,66 +371,66 @@
 	  -->
 	<language name="be" countries="BY">
 		<![CDATA[
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_ZE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_YU><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_YERU>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_KA>";
-		"<CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_KA>";
-		"<CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_CHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_ZHE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_CHE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_KA>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_DE>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ZHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>"
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER ZE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER YU><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER YERU>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER KA>";
+		"<CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER KA>";
+		"<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER CHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER CHE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER KA>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER DE>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>"
 		]]>
 	</language>
 	<language name="cs" countries="CZ">
 		<![CDATA[
 		"<l><e><d><e><n>";
-		"<LATIN_SMALL_LETTER_U_WITH_ACUTE><n><o><r>";
-		"<b><LATIN_SMALL_LETTER_R_WITH_CARON><e><z><e><n>";
+		"<LATIN SMALL LETTER U WITH ACUTE><n><o><r>";
+		"<b><LATIN SMALL LETTER R WITH CARON><e><z><e><n>";
 		"<d><u><b><e><n>";
-		"<k><v><LATIN_SMALL_LETTER_E_WITH_CARON><t><e><n>";
-		"<LATIN_SMALL_LETTER_C_WITH_CARON><e><r><v><e><n>";
-		"<LATIN_SMALL_LETTER_C_WITH_CARON><e><r><v><e><n><e><c>";
+		"<k><v><LATIN SMALL LETTER E WITH CARON><t><e><n>";
+		"<LATIN SMALL LETTER C WITH CARON><e><r><v><e><n>";
+		"<LATIN SMALL LETTER C WITH CARON><e><r><v><e><n><e><c>";
 		"<s><r><p><e><n>";
-		"<z><LATIN_SMALL_LETTER_A_WITH_ACUTE><LATIN_SMALL_LETTER_R_WITH_CARON><LATIN_SMALL_LETTER_I_WITH_ACUTE>";
-		"<LATIN_SMALL_LETTER_R_WITH_CARON><LATIN_SMALL_LETTER_I_WITH_ACUTE><j><e><n>";
+		"<z><LATIN SMALL LETTER A WITH ACUTE><LATIN SMALL LETTER R WITH CARON><LATIN SMALL LETTER I WITH ACUTE>";
+		"<LATIN SMALL LETTER R WITH CARON><LATIN SMALL LETTER I WITH ACUTE><j><e><n>";
 		"<l><i><s><t><o><p><a><d>";
 		"<p><r><o><s><i><n><e><c>"
 		]]>
 	</language>
 	<language name="el" countries="GR">
 		<![CDATA[
-		"<GREEK_CAPITAL_LETTER_IOTA><GREEK_SMALL_LETTER_ALPHA><GREEK_SMALL_LETTER_NU><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON><GREEK_SMALL_LETTER_ALPHA_WITH_TONOS><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_PHI><GREEK_SMALL_LETTER_EPSILON><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON><GREEK_SMALL_LETTER_ALPHA_WITH_TONOS><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_MU><GREEK_SMALL_LETTER_ALPHA_WITH_TONOS><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_TAU><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_ALPHA><GREEK_SMALL_LETTER_PI><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA_WITH_TONOS><GREEK_SMALL_LETTER_LAMDA><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_MU><GREEK_SMALL_LETTER_ALPHA_WITH_TONOS><GREEK_SMALL_LETTER_IOTA_WITH_DIALYTIKA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON_WITH_TONOS><GREEK_SMALL_LETTER_NU><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON_WITH_TONOS><GREEK_SMALL_LETTER_LAMDA><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_ALPHA><GREEK_SMALL_LETTER_UPSILON_WITH_TONOS><GREEK_SMALL_LETTER_GAMMA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_UPSILON><GREEK_SMALL_LETTER_SIGMA><GREEK_SMALL_LETTER_TAU><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_SIGMA><GREEK_SMALL_LETTER_EPSILON><GREEK_SMALL_LETTER_PI><GREEK_SMALL_LETTER_TAU><GREEK_SMALL_LETTER_EPSILON_WITH_TONOS><GREEK_SMALL_LETTER_MU><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_OMICRON><GREEK_SMALL_LETTER_KAPPA><GREEK_SMALL_LETTER_TAU><GREEK_SMALL_LETTER_OMEGA_WITH_TONOS><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_NU><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_EPSILON_WITH_TONOS><GREEK_SMALL_LETTER_MU><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>";
-		"<GREEK_CAPITAL_LETTER_DELTA><GREEK_SMALL_LETTER_EPSILON><GREEK_SMALL_LETTER_KAPPA><GREEK_SMALL_LETTER_EPSILON_WITH_TONOS><GREEK_SMALL_LETTER_MU><GREEK_SMALL_LETTER_BETA><GREEK_SMALL_LETTER_RHO><GREEK_SMALL_LETTER_IOTA><GREEK_SMALL_LETTER_OMICRON><GREEK_SMALL_LETTER_FINAL_SIGMA>"
+		"<GREEK CAPITAL LETTER IOTA><GREEK SMALL LETTER ALPHA><GREEK SMALL LETTER NU><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON><GREEK SMALL LETTER ALPHA WITH TONOS><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER PHI><GREEK SMALL LETTER EPSILON><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON><GREEK SMALL LETTER ALPHA WITH TONOS><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER MU><GREEK SMALL LETTER ALPHA WITH TONOS><GREEK SMALL LETTER RHO><GREEK SMALL LETTER TAU><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER ALPHA><GREEK SMALL LETTER PI><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA WITH TONOS><GREEK SMALL LETTER LAMDA><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER MU><GREEK SMALL LETTER ALPHA WITH TONOS><GREEK SMALL LETTER IOTA WITH DIALYTIKA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON WITH TONOS><GREEK SMALL LETTER NU><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON WITH TONOS><GREEK SMALL LETTER LAMDA><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER ALPHA><GREEK SMALL LETTER UPSILON WITH TONOS><GREEK SMALL LETTER GAMMA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER UPSILON><GREEK SMALL LETTER SIGMA><GREEK SMALL LETTER TAU><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER SIGMA><GREEK SMALL LETTER EPSILON><GREEK SMALL LETTER PI><GREEK SMALL LETTER TAU><GREEK SMALL LETTER EPSILON WITH TONOS><GREEK SMALL LETTER MU><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER OMICRON><GREEK SMALL LETTER KAPPA><GREEK SMALL LETTER TAU><GREEK SMALL LETTER OMEGA WITH TONOS><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER NU><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER EPSILON WITH TONOS><GREEK SMALL LETTER MU><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>";
+		"<GREEK CAPITAL LETTER DELTA><GREEK SMALL LETTER EPSILON><GREEK SMALL LETTER KAPPA><GREEK SMALL LETTER EPSILON WITH TONOS><GREEK SMALL LETTER MU><GREEK SMALL LETTER BETA><GREEK SMALL LETTER RHO><GREEK SMALL LETTER IOTA><GREEK SMALL LETTER OMICRON><GREEK SMALL LETTER FINAL SIGMA>"
 		]]>
 	</language>
 	<language name="kk" countries="KZ">
 		<![CDATA[
-		"<CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN>";
-		"<CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_ZE>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_SCHWA><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_EM>";
-		"<CYRILLIC_SMALL_LETTER_SHA><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_IE>";
-		"<CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_ZE>";
-		"<CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_YERU><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_SHORT_I><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_KA>";
-		"<CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ZE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN>";
-		"<CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_SHA><CYRILLIC_SMALL_LETTER_A>";
-		"<CYRILLIC_SMALL_LETTER_ZHE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_KA_WITH_DESCENDER><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN>"
+		"<CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN>";
+		"<CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER ZE>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER SCHWA><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER EM>";
+		"<CYRILLIC SMALL LETTER SHA><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER IE>";
+		"<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER ZE>";
+		"<CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER YERU><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER SHORT I><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER KA>";
+		"<CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ZE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN>";
+		"<CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER SHA><CYRILLIC SMALL LETTER A>";
+		"<CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER KA WITH DESCENDER><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN>"
 		]]>
 	</language>
 	<language name="lt" countries="LT">
@@ -430,11 +439,11 @@
 		"<v><a><s><a><r><i><s>";
 		"<k><o><v><a><s>";
 		"<b><a><l><a><n><d><i><s>";
-		"<g><e><g><u><LATIN_SMALL_LETTER_Z_WITH_CARON><LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE>";
-		"<b><i><r><LATIN_SMALL_LETTER_Z_WITH_CARON><e><l><i><s>";
+		"<g><e><g><u><LATIN SMALL LETTER Z WITH CARON><LATIN SMALL LETTER E WITH DOT ABOVE>";
+		"<b><i><r><LATIN SMALL LETTER Z WITH CARON><e><l><i><s>";
 		"<l><i><e><p><a>";
-		"<r><u><g><p><j><LATIN_SMALL_LETTER_U_WITH_MACRON><t><i><s>";
-		"<r><u><g><s><LATIN_SMALL_LETTER_E_WITH_DOT_ABOVE><j><i><s>";
+		"<r><u><g><p><j><LATIN SMALL LETTER U WITH MACRON><t><i><s>";
+		"<r><u><g><s><LATIN SMALL LETTER E WITH DOT ABOVE><j><i><s>";
 		"<s><p><a><l><i><s>";
 		"<l><a><p><k><r><i><t><i><s>";
 		"<g><r><u><o><d><i><s>"
@@ -442,66 +451,66 @@
 	</language>
 	<language name="mn" countries="MN">
 		<![CDATA[
-		"<CYRILLIC_CAPITAL_LETTER_EN><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_HA><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_IO><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_GHE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_DE><CYRILLIC_SMALL_LETTER_BARRED_O><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_BARRED_O><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_TE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_ZE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_DE><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_EN><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_SHORT_I><CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_IE><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN><space><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_STRAIGHT_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_E><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>";
-		"<CYRILLIC_CAPITAL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EN><space><CYRILLIC_SMALL_LETTER_HA><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_IO><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><space><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER>"
+		"<CYRILLIC CAPITAL LETTER EN><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER HA><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER IO><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER GHE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER DE><CYRILLIC SMALL LETTER BARRED O><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER BARRED O><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER TE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER ZE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER DE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER EN><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER SHORT I><CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER IE><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN><space><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER STRAIGHT U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER E><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>";
+		"<CYRILLIC CAPITAL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EN><space><CYRILLIC SMALL LETTER HA><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER IO><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><space><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER>"
 		]]>
 	</language>
 	<language name="pl" countries="PL">
 		<![CDATA[
-		"<s><t><y><c><z><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>";
+		"<s><t><y><c><z><e><LATIN SMALL LETTER N WITH ACUTE>";
 		"<l><u><t><y>";
 		"<m><a><r><z><e><c>";
-		"<k><w><i><e><c><i><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>";
+		"<k><w><i><e><c><i><e><LATIN SMALL LETTER N WITH ACUTE>";
 		"<m><a><j>";
 		"<c><z><e><r><w><i><e><c>";
 		"<l><i><p><i><e><c>";
-		"<s><i><e><r><p><i><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>";
-		"<w><r><z><e><s><i><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>";
-		"<p><a><LATIN_SMALL_LETTER_Z_WITH_ACUTE><d><z><i><e><r><n><i><k>";
+		"<s><i><e><r><p><i><e><LATIN SMALL LETTER N WITH ACUTE>";
+		"<w><r><z><e><s><i><e><LATIN SMALL LETTER N WITH ACUTE>";
+		"<p><a><LATIN SMALL LETTER Z WITH ACUTE><d><z><i><e><r><n><i><k>";
 		"<l><i><s><t><o><p><a><d>";
-		"<g><r><u><d><z><i><e><LATIN_SMALL_LETTER_N_WITH_ACUTE>"
+		"<g><r><u><d><z><i><e><LATIN SMALL LETTER N WITH ACUTE>"
 		]]>
 	</language>
 	<language name="ru" countries="RU">
 		<![CDATA[
-		"<CYRILLIC_SMALL_LETTER_YA><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EF><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_TE>";
-		"<CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EM><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_SHORT_I>";
-		"<CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_YU><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_YU><CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_YA><CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_YA><CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_YA><CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_SOFT_SIGN>"
+		"<CYRILLIC SMALL LETTER YA><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EF><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER TE>";
+		"<CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EM><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER SHORT I>";
+		"<CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER YU><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER YU><CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER YA><CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER YA><CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER YA><CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER SOFT SIGN>"
 		]]>
 	</language>
 	<language name="uk" countries="UA">
 		<![CDATA[
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_CHE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_YU><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_SHORT_I>";
-		"<CYRILLIC_SMALL_LETTER_BE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ZE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_KA><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_BYELORUSSIAN-UKRAINIAN_I><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_CHE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_ZHE><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_VE><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>";
-		"<CYRILLIC_SMALL_LETTER_EL><CYRILLIC_SMALL_LETTER_I><CYRILLIC_SMALL_LETTER_ES><CYRILLIC_SMALL_LETTER_TE><CYRILLIC_SMALL_LETTER_O><CYRILLIC_SMALL_LETTER_PE><CYRILLIC_SMALL_LETTER_A><CYRILLIC_SMALL_LETTER_DE>";
-		"<CYRILLIC_SMALL_LETTER_GHE><CYRILLIC_SMALL_LETTER_ER><CYRILLIC_SMALL_LETTER_U><CYRILLIC_SMALL_LETTER_DE><CYRILLIC_SMALL_LETTER_IE><CYRILLIC_SMALL_LETTER_EN><CYRILLIC_SMALL_LETTER_SOFT_SIGN>"
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER CHE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER YU><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER SHORT I>";
+		"<CYRILLIC SMALL LETTER BE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ZE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER KA><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER CHE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER ZHE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER VE><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>";
+		"<CYRILLIC SMALL LETTER EL><CYRILLIC SMALL LETTER I><CYRILLIC SMALL LETTER ES><CYRILLIC SMALL LETTER TE><CYRILLIC SMALL LETTER O><CYRILLIC SMALL LETTER PE><CYRILLIC SMALL LETTER A><CYRILLIC SMALL LETTER DE>";
+		"<CYRILLIC SMALL LETTER GHE><CYRILLIC SMALL LETTER ER><CYRILLIC SMALL LETTER U><CYRILLIC SMALL LETTER DE><CYRILLIC SMALL LETTER IE><CYRILLIC SMALL LETTER EN><CYRILLIC SMALL LETTER SOFT SIGN>"
 		]]>
 	</language>
 

From owner-svn-src-user@FreeBSD.ORG  Mon Aug  3 21:41:30 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 602D0106564A;
	Mon,  3 Aug 2009 21:41:30 +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 4E03F8FC0C;
	Mon,  3 Aug 2009 21:41:30 +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 n73LfUgI098153;
	Mon, 3 Aug 2009 21:41:30 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n73LfUUa098150;
	Mon, 3 Aug 2009 21:41:30 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908032141.n73LfUUa098150@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Mon, 3 Aug 2009 21:41:30 +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: r196060 - in 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: Mon, 03 Aug 2009 21:41:30 -0000

Author: edwin
Date: Mon Aug  3 21:41:30 2009
New Revision: 196060
URL: http://svn.freebsd.org/changeset/base/196060

Log:
  Instead of using Text::Iconv, use private conversion routines based
  on the unicode.org UNIDATA and CLDR data.

Added:
  user/edwin/locale/Makefile
Modified:
  user/edwin/locale/tools/charmaps.pm
  user/edwin/locale/tools/cldr2def.pl

Added: user/edwin/locale/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/Makefile	Mon Aug  3 21:41:30 2009	(r196060)
@@ -0,0 +1,41 @@
+#
+# $FreeBSD$
+#
+
+UNICODEDIR?=	/home/edwin/unicode/
+CLDRVERSION?=	1.7.0
+CLDRDIR?=	${UNICODEDIR}/cldr/${CLDRVERSION}/
+UNIDATAVERSION?=5.1.0
+UNIDATADIR?=	${UNICODEDIR}/UNIDATA/${UNIDATAVERSION}/
+
+XMLDIR?=	/home/edwin/svn/edwin/locale/tools/
+XMLFILE?=	charmaps.xml
+
+TYPES?=		monetdef numericdef msgdef timedef
+
+all:
+.for t in ${TYPES}
+	test -d ${t} || mkdir ${t}
+	make build-${t}
+.endfor
+	@echo ""
+	@find . -name *failed
+
+install:
+.for t in ${TYPES}
+	cd ${t} && make
+	cd ${t} && sudo DESTDIR=/home/edwin/locale/new make install
+.endfor
+
+.for t in ${TYPES}
+build-${t}:
+	test -d ${t} || mkdir ${t}
+	perl -I tools tools/cldr2def.pl ${CLDRDIR} ${UNIDATADIR} ${XMLDIR} ${XMLDIR}/${XMLFILE} ${t} ${LC}
+.endfor
+
+clean:
+.for t in ${TYPES}
+	-rm ${t}/*
+	-rmdir ${t}
+.endfor
+

Modified: user/edwin/locale/tools/charmaps.pm
==============================================================================
--- user/edwin/locale/tools/charmaps.pm	Mon Aug  3 21:39:04 2009	(r196059)
+++ user/edwin/locale/tools/charmaps.pm	Mon Aug  3 21:41:30 2009	(r196060)
@@ -64,6 +64,7 @@ sub h_start {
 			if (defined $encoding) {
 				foreach my $e (split(" ", $encoding)) {
 					$d{L}{$name}{$f}{data}{$c}{$e} = undef;
+					$d{E}{$e} = 0;	# not read
 				}
 			}
 			$d{L}{$name}{$f}{data}{$c}{"UTF-8"} = undef;
@@ -74,19 +75,25 @@ sub h_start {
 	if ($index == 2
 	 && $data{element}{1} eq "translations"
 	 && $element eq "translation") {
-		if (defined $attrs{hex}) {
-			my $k = "<" . $attrs{cldr} . ">";
-			my $hs = $attrs{hex};
-			$d{T}{$attrs{encoding}}{$k} = "";
-			while ($hs ne "") {
-				$d{T}{$attrs{encoding}}{$k} .=
-					chr(hex(substr($hs, 0, 2)));
-				$hs = substr($hs, 2);
+		foreach my $e (split(" ", $attrs{encoding})) {
+			if (defined $attrs{hex}) {
+				my $k = $attrs{cldr};
+				my $hs = $attrs{hex};
+				$d{T}{$e}{$k}{hex} = $hs;
+			}
+			if (defined $attrs{string}) {
+				my $s = "";
+				for (my $i = 0; $i < length($attrs{string}); $i++) {
+					$s .= sprintf("%02x",
+					    ord(substr($attrs{string}, $i, 1)));
+				}
+				$d{T}{$e}{$attrs{cldr}}{hex} = $s;
+			}
+			if (defined $attrs{unicode}) {
+				my $k = $attrs{cldr};
+				my $uc = $attrs{unicode};
+				$d{T}{$e}{$k}{unicode} = $uc;
 			}
-		}
-		if (defined $attrs{string}) {
-			$d{T}{$attrs{encoding}}{"<" . $attrs{cldr} . ">"} =
-			    $attrs{string};
 		}
 		return;
 	}
@@ -115,7 +122,8 @@ sub h_end {
 			foreach my $c (split(/,/, $data{fields}{countries})) {
 				my $m = $data{fields}{text};
 
-				$m =~ s/[\t ]//g;
+				$m =~ s/^[\t ]//g;
+				$m =~ s/[\t ]$//g;
 				$d{AM}{$data{fields}{name}}{$c} = $m;
 			}
 			$data{fields} = ();

Modified: user/edwin/locale/tools/cldr2def.pl
==============================================================================
--- user/edwin/locale/tools/cldr2def.pl	Mon Aug  3 21:39:04 2009	(r196059)
+++ user/edwin/locale/tools/cldr2def.pl	Mon Aug  3 21:41:30 2009	(r196060)
@@ -6,19 +6,20 @@
 
 use strict;
 use XML::Parser;
-use Text::Iconv;
 use Tie::IxHash;
 use Data::Dumper;
 use Digest::SHA qw(sha1_hex);
 require "charmaps.pm";
 
 if ($#ARGV < 2) {
-	print "Usage: $0 <cldrdir> <charmaps> <type> [la_CC]\n";
+	print "Usage: $0 <cldrdir> <unidatadir> <xmldirs> <charmaps> <type> [la_CC]\n";
 	exit(1);
 }
 
 my $DEFENCODING = "UTF-8";
-my $DIR = shift(@ARGV);
+my $CLDRDIR = shift(@ARGV);
+my $UNIDATADIR = shift(@ARGV);
+my $XMLDIR = shift(@ARGV);
 my $CHARMAPS = shift(@ARGV);
 my $TYPE = shift(@ARGV);
 my $doonly = shift(@ARGV);
@@ -26,15 +27,20 @@ my @filter = ();
 
 my %convertors = ();
 
+my %ucd = ();
 my %values = ();
 my %hashtable = ();
 my %languages = ();
 my %translations = ();
+my %encodings = ();
 my %alternativemonths = ();
 get_languages();
 
-my %cm = ();
-get_utf8map();
+my %utf8map = ();
+my %utf8aliases = ();
+get_unidata($UNIDATADIR);
+get_utf8map("$CLDRDIR/posix/$DEFENCODING.cm");
+get_encodings("$XMLDIR/charmaps");
 
 my %keys = ();
 tie(%keys, "Tie::IxHash");
@@ -50,7 +56,7 @@ my %FILESNAMES = (
 my %callback = (
 	mdorder => \&callback_mdorder,
 	altmon => \&callback_altmon,
-	data => (),
+	data => undef,
 );
 
 my %DESC = (
@@ -189,27 +195,83 @@ sub callback_altmon {
 
 ############################
 
+sub get_unidata {
+	my $directory = shift;
+
+	open(FIN, "$directory/UnicodeData.txt");
+	my @lines = <FIN>;
+	chomp(@lines);
+	close(FIN);
+
+	foreach my $l (@lines) {
+		my @a = split(/;/, $l);
+
+		$ucd{code2name}{"$a[0]"} = $a[1];	# Unicode name
+		$ucd{name2code}{"$a[1]"} = $a[0];	# Unicode code
+	}
+}
+
 sub get_utf8map {
-	open(FIN, "$DIR/posix/$DEFENCODING.cm");
+	my $file = shift;
+
+	open(FIN, $file);
 	my @lines = <FIN>;
 	close(FIN);
 	chomp(@lines);
+
+	my $prev_k = undef;
+	my $prev_v = "";
 	my $incharmap = 0;
 	foreach my $l (@lines) {
 		$l =~ s/\r//;
 		next if ($l =~ /^\#/);
 		next if ($l eq "");
+
 		if ($l eq "CHARMAP") {
 			$incharmap = 1;
 			next;
 		}
+
 		next if (!$incharmap);
 		last if ($l eq "END CHARMAP");
-		$l =~ /^([^\s]+)\s+(.*)/;
+
+		$l =~ /^<([^\s]+)>\s+(.*)/;
 		my $k = $1;
 		my $v = $2;
-		$v =~ s/\\x//g;
-		$cm{$k} = $v;
+		$k =~ s/_/ /g;		# unicode char string
+		$v =~ s/\\x//g;		# UTF-8 char code
+		$utf8map{$k} = $v;
+
+		$utf8aliases{$k} = $prev_k if ($prev_v eq $v);
+
+		$prev_v = $v;
+		$prev_k = $k;
+	}
+}
+
+sub get_encodings {
+	my $dir = shift;
+	foreach my $e (sort(keys(%encodings))) {
+		if (!open(FIN, "$dir/$e.TXT")) {
+			print "Cannot open charmap for $e\n";
+			next;
+
+		}
+		$encodings{$e} = 1;
+		my @lines = <FIN>;
+		close(FIN);
+		chomp(@lines);
+		foreach my $l (@lines) {
+			$l =~ s/\r//;
+			next if ($l =~ /^\#/);
+			next if ($l eq "");
+
+			my @a = split(" ", $l);
+			next if ($#a < 1);
+			$a[0] =~ s/^0[xX]//;	# local char code
+			$a[1] =~ s/^0[xX]//;	# unicode char code
+			$convertors{$e}{uc($a[1])} = uc($a[0]);
+		}
 	}
 }
 
@@ -218,6 +280,7 @@ sub get_languages {
 	%languages = %{$data{L}}; 
 	%translations = %{$data{T}}; 
 	%alternativemonths = %{$data{AM}}; 
+	%encodings = %{$data{E}}; 
 
 	return if (!defined $doonly);
 
@@ -248,14 +311,15 @@ sub get_fields {
 		$file = $l . "_";
 		$file .= $f . "_" if ($f ne "x");
 		$file .= $c;
-		if (!open(FIN, "$DIR/posix/$file.$DEFENCODING.src")) {
+		if (!open(FIN, "$CLDRDIR/posix/$file.$DEFENCODING.src")) {
 			if (!defined $languages{$l}{$f}{fallback}) {
 				print STDERR
 				    "Cannot open $file.$DEFENCODING.src\n";
 				next;
 			}
 			$file = $languages{$l}{$f}{fallback};
-			if (!open(FIN, "$DIR/posix/$file.$DEFENCODING.src")) {
+			if (!open(FIN,
+			    "$CLDRDIR/posix/$file.$DEFENCODING.src")) {
 				print STDERR
 				    "Cannot open fallback " .
 				    "$file.$DEFENCODING.src\n";
@@ -283,6 +347,12 @@ sub get_fields {
 
 				$continue = ($line =~ /\/$/);
 				$line =~ s/\/$// if ($continue);
+
+				while ($line =~ /_/) {
+					$line =~
+					    s/\<([^>_]+)_([^>]+)\>/<$1 $2>/;
+				}
+				die "_ in data - $line" if ($line =~ /_/);
 				$values{$l}{$c}{$k} .= $line;
 
 				last if (!$continue);
@@ -294,15 +364,57 @@ sub get_fields {
 }
 
 sub decodecldr {
+	my $e = shift;
 	my $s = shift;
-	my $v = $cm{$s};
+
+	my $v = undef;
+
+	if ($e eq "UTF-8") {
+		#
+		# Conversion to UTF-8 can be done from the Unicode name to
+		# the UTF-8 character code.
+		#
+		$v = $utf8map{$s};
+		die "Cannot convert $s in $e (charmap)" if (!defined $v);
+	} else {
+		#
+		# Conversion to these encodings can be done from the Unicode
+		# name to Unicode code to the encodings code.
+		#
+		my $ucc = undef;
+		$ucc = $ucd{name2code}{$s} if (defined $ucd{name2code}{$s});
+		$ucc = $ucd{name2code}{$utf8aliases{$s}}
+			if (!defined $ucc
+			 && $utf8aliases{$s}
+			 && defined $ucd{name2code}{$utf8aliases{$s}});
+
+		die "Cannot convert $s in $e (ucd string)" if (!defined $ucc);
+		$v = $convertors{$e}{$ucc};
+
+		$v = $translations{$e}{$s}{hex}
+			if (!defined $v && defined $translations{$e}{$s}{hex});
+
+		if (!defined $v && defined $translations{$e}{$s}{unicode}) {
+			my $ucn = $translations{$e}{$s}{unicode};
+			$ucc = $ucd{name2code}{$ucn}
+				if (defined $ucd{name2code}{$ucn});
+			$ucc = $ucd{name2code}{$utf8aliases{$ucn}}
+				if (!defined $ucc
+				 && defined $ucd{name2code}{$utf8aliases{$ucn}});
+			$v = $convertors{$e}{$ucc};
+		}
+
+		die "Cannot convert $s in $e (charmap)" if (!defined $v);
+	}
 
 	return pack("C", hex($v)) if (length($v) == 2);
 	return pack("CC", hex(substr($v, 0, 2)), hex(substr($v, 2, 2)))
 		if (length($v) == 4);
 	return pack("CCC", hex(substr($v, 0, 2)), hex(substr($v, 2, 2)),
 	    hex(substr($v, 4, 2))) if (length($v) == 6);
+	print STDERR "Cannot convert $e $s\n";
 	return "length = " . length($v);
+
 }
 
 sub translate {
@@ -331,13 +443,9 @@ sub print_fields {
 			$file .= "_" . $c;
 			print "Writing to $file in $enc\n";
 
-			eval {
-				$convertors{$enc} =
-				    Text::Iconv->new($DEFENCODING, $enc);
-			} if (!defined $convertors{$enc});
-			if (!defined $convertors{$enc}) {
-				print "Failed! Cannot convert between " .
-				    "$DEFENCODING and $enc.\n";
+			if ($enc ne $DEFENCODING &&
+			    !defined $convertors{$enc}) {
+				print "Failed! Cannot convert to $enc.\n";
 				next;
 			};
 
@@ -398,23 +506,24 @@ EOF
 					$v =~ s/^"//;
 					$v =~ s/"$//;
 					my $cm = "";
-					while ($v =~ /^(.*?)(<.*?>)(.*)/) {
+					while ($v =~ /^(.*?)<(.*?)>(.*)/) {
+						my $p1 = $1;
 						$cm = $2;
-						$v = $1 . decodecldr($2) . $3;
-					}
-					my $fv =
-					    $convertors{$enc}->convert("$v");
-					$fv = translate($enc, $cm)
-						if (!defined $fv);
-					if (!defined $fv) {
-						print STDERR 
-						    "Could not convert $k " .
-						    "($cm) from $DEFENCODING " .
-						    "to $enc\n";
-						$okay = 0;
-						next;
+						my $p3 = $3;
+
+						my $rv = decodecldr($enc, $cm);
+#						$rv = translate($enc, $cm)
+#							if (!defined $rv);
+						if (!defined $rv) {
+							print STDERR 
+"Could not convert $k ($cm) from $DEFENCODING to $enc\n";
+							$okay = 0;
+							next;
+						}
+
+						$v = $p1 . $rv . $p3;
 					}
-					$output .= "$fv\n";
+					$output .= "$v\n";
 					next;
 				}
 				if ($f eq "as") {
@@ -422,26 +531,27 @@ EOF
 						$v =~ s/^"//;
 						$v =~ s/"$//;
 						my $cm = "";
-						while ($v =~ /^(.*?)(<.*?>)(.*)/) {
+						while ($v =~ /^(.*?)<(.*?)>(.*)/) {
+							my $p1 = $1;
 							$cm = $2;
-							$v = $1 .
-							    decodecldr($2) . $3;
-						}
-						my $fv =
-						    $convertors{$enc}->convert("$v");
-						$fv = translate($enc, $cm)
-							if (!defined $fv);
-						if (!defined $fv) {
-							print STDERR
-							    "Could not " .
-							    "convert $k ($cm)" .
-							    " from " .
-							    "$DEFENCODING to " .
-							    "$enc\n";
-							$okay = 0;
-							next;
+							my $p3 = $3;
+
+							my $rv =
+							    decodecldr($enc,
+								$cm);
+#							$rv = translate($enc,
+#							    $cm)
+#							    if (!defined $rv);
+							if (!defined $rv) {
+								print STDERR 
+"Could not convert $k ($cm) from $DEFENCODING to $enc\n";
+								$okay = 0;
+								next;
+							}
+
+							$v = $1 . $rv . $3;
 						}
-						$output .= "$fv\n";
+						$output .= "$v\n";
 					}
 					next;
 				}

From owner-svn-src-user@FreeBSD.ORG  Tue Aug  4 22:13:59 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 AF2BA1065670;
	Tue,  4 Aug 2009 22:13:59 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9DACE8FC18;
	Tue,  4 Aug 2009 22:13:59 +0000 (UTC)
	(envelope-from kmacy@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 n74MDxjT032180;
	Tue, 4 Aug 2009 22:13:59 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n74MDxtm032179;
	Tue, 4 Aug 2009 22:13:59 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908042213.n74MDxtm032179@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 4 Aug 2009 22:13:59 +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: r196063 - in user/kmacy/releng_7_2_fcs/sys: kern sys
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: Tue, 04 Aug 2009 22:14:00 -0000

Author: kmacy
Date: Tue Aug  4 22:13:58 2009
New Revision: 196063
URL: http://svn.freebsd.org/changeset/base/196063

Log:
  integrate lockf fixes from -STABLE

Modified:
  user/kmacy/releng_7_2_fcs/sys/kern/kern_lockf.c
  user/kmacy/releng_7_2_fcs/sys/sys/lockf.h

Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_lockf.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/kern_lockf.c	Tue Aug  4 18:22:58 2009	(r196062)
+++ user/kmacy/releng_7_2_fcs/sys/kern/kern_lockf.c	Tue Aug  4 22:13:58 2009	(r196063)
@@ -106,7 +106,7 @@ static int	 lf_owner_matches(struct lock
     int);
 static struct lockf_entry *
 		 lf_alloc_lock(struct lock_owner *);
-static void	 lf_free_lock(struct lockf_entry *);
+static int	 lf_free_lock(struct lockf_entry *);
 static int	 lf_clearlock(struct lockf *, struct lockf_entry *);
 static int	 lf_overlaps(struct lockf_entry *, struct lockf_entry *);
 static int	 lf_blocks(struct lockf_entry *, struct lockf_entry *);
@@ -347,9 +347,13 @@ lf_alloc_lock(struct lock_owner *lo)
 	return (lf);
 }
 
-static void
+static int
 lf_free_lock(struct lockf_entry *lock)
 {
+
+	KASSERT(lock->lf_refs > 0, ("lockf_entry negative ref count %p", lock));
+	if (--lock->lf_refs > 0)
+		return (0);
 	/*
 	 * Adjust the lock_owner reference count and
 	 * reclaim the entry if this is the last lock
@@ -394,6 +398,7 @@ lf_free_lock(struct lockf_entry *lock)
 		printf("Freed lock %p\n", lock);
 #endif
 	free(lock, M_LOCKF);
+	return (1);
 }
 
 /*
@@ -540,6 +545,7 @@ lf_advlockasync(struct vop_advlockasync_
 	 * the lf_lock_owners_lock tax twice.
 	 */
 	lock = lf_alloc_lock(NULL);
+	lock->lf_refs = 1;
 	lock->lf_start = start;
 	lock->lf_end = end;
 	lock->lf_owner = lo;
@@ -633,7 +639,23 @@ lf_advlockasync(struct vop_advlockasync_
 	}
 
 	sx_xlock(&state->ls_lock);
-	switch(ap->a_op) {
+	/*
+	 * Recheck the doomed vnode after state->ls_lock is
+	 * locked. lf_purgelocks() requires that no new threads add
+	 * pending locks when vnode is marked by VI_DOOMED flag.
+	 */
+	VI_LOCK(vp);
+	if (vp->v_iflag & VI_DOOMED) {
+		state->ls_threads--;
+		wakeup(state);
+		VI_UNLOCK(vp);
+		sx_xunlock(&state->ls_lock);
+		lf_free_lock(lock);
+		return (ENOENT);
+	}
+	VI_UNLOCK(vp);
+
+	switch (ap->a_op) {
 	case F_SETLK:
 		error = lf_setlock(state, lock, vp, ap->a_cookiep);
 		break;
@@ -755,8 +777,11 @@ lf_purgelocks(struct vnode *vp, struct l
 	 * the remaining locks.
 	 */
 	VI_LOCK(vp);
+	KASSERT(vp->v_iflag & VI_DOOMED,
+	    ("lf_purgelocks: vp %p has not vgone yet", vp));
 	state = *statep;
 	if (state) {
+		*statep = NULL;
 		state->ls_threads++;
 		VI_UNLOCK(vp);
 
@@ -789,7 +814,6 @@ lf_purgelocks(struct vnode *vp, struct l
 		VI_LOCK(vp);
 		while (state->ls_threads > 1)
 			msleep(state, VI_MTX(vp), 0, "purgelocks", 0);
-		*statep = 0;
 		VI_UNLOCK(vp);
 
 		/*
@@ -798,7 +822,9 @@ lf_purgelocks(struct vnode *vp, struct l
 		 * above). We don't need to bother locking since we
 		 * are the last thread using this state structure.
 		 */
-		LIST_FOREACH_SAFE(lock, &state->ls_pending, lf_link, nlock) {
+		KASSERT(LIST_EMPTY(&state->ls_pending),
+		    ("lock pending for %p", state));
+		LIST_FOREACH_SAFE(lock, &state->ls_active, lf_link, nlock) {
 			LIST_REMOVE(lock, lf_link);
 			lf_free_lock(lock);
 		}
@@ -1342,7 +1368,6 @@ static int
 lf_setlock(struct lockf *state, struct lockf_entry *lock, struct vnode *vp,
     void **cookiep)
 {
-	struct lockf_entry *block;
 	static char lockstr[] = "lockf";
 	int priority, error;
 
@@ -1362,7 +1387,7 @@ lf_setlock(struct lockf *state, struct l
 	/*
 	 * Scan lock list for this file looking for locks that would block us.
 	 */
-	while ((block = lf_getblock(state, lock))) {
+	if (lf_getblock(state, lock)) {
 		/*
 		 * Free the structure and return if nonblocking.
 		 */
@@ -1431,7 +1456,13 @@ lf_setlock(struct lockf *state, struct l
 			goto out;
 		}
 
+		lock->lf_refs++;
 		error = sx_sleep(lock, &state->ls_lock, priority, lockstr, 0);
+		if (lf_free_lock(lock)) {
+			error = EINTR;
+			goto out;
+		}
+
 		/*
 		 * We may have been awakened by a signal and/or by a
 		 * debugger continuing us (in which cases we must
@@ -1793,6 +1824,7 @@ lf_split(struct lockf *state, struct loc
 	 */
 	splitlock = lf_alloc_lock(lock1->lf_owner);
 	memcpy(splitlock, lock1, sizeof *splitlock);
+	splitlock->lf_refs = 1;
 	if (splitlock->lf_flags & F_REMOTE)
 		vref(splitlock->lf_vnode);
 
@@ -1905,9 +1937,14 @@ lf_iteratelocks_vnode(struct vnode *vp, 
 	 * make sure it doesn't go away before we are finished.
 	 */
 	STAILQ_INIT(&locks);
+	VI_LOCK(vp);
 	ls = vp->v_lockf;
-	if (!ls)
+	if (!ls) {
+		VI_UNLOCK(vp);
 		return (0);
+	}
+	ls->ls_threads++;
+	VI_UNLOCK(vp);
 
 	sx_xlock(&ls->ls_lock);
 	LIST_FOREACH(lf, &ls->ls_active, lf_link) {
@@ -1928,6 +1965,10 @@ lf_iteratelocks_vnode(struct vnode *vp, 
 		STAILQ_INSERT_TAIL(&locks, ldesc, link);
 	}
 	sx_xunlock(&ls->ls_lock);
+	VI_LOCK(vp);
+	ls->ls_threads--;
+	wakeup(ls);
+	VI_UNLOCK(vp);
 
 	/*
 	 * Call the iterator function for each lock in turn. If the

Modified: user/kmacy/releng_7_2_fcs/sys/sys/lockf.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/sys/lockf.h	Tue Aug  4 18:22:58 2009	(r196062)
+++ user/kmacy/releng_7_2_fcs/sys/sys/lockf.h	Tue Aug  4 22:13:58 2009	(r196063)
@@ -80,6 +80,7 @@ struct lockf_entry {
 	LIST_ENTRY(lockf_entry) lf_link;  /* (s) Linkage for lock lists */
 	struct lockf_edge_list lf_outedges; /* (s) list of out-edges */
 	struct lockf_edge_list lf_inedges; /* (s) list of out-edges */
+	int	lf_refs;	    /* (s) ref count */
 };
 LIST_HEAD(lockf_entry_list, lockf_entry);
 

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});

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 07:43:30 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 0AA881065677;
	Wed,  5 Aug 2009 07:43:30 +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 EDC768FC20;
	Wed,  5 Aug 2009 07:43:29 +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 n757hTJM047590;
	Wed, 5 Aug 2009 07:43:29 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n757hTX1047588;
	Wed, 5 Aug 2009 07:43:29 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908050743.n757hTX1047588@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 07:43:29 +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: r196065 - user/edwin/locale
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:43:30 -0000

Author: edwin
Date: Wed Aug  5 07:43:29 2009
New Revision: 196065
URL: http://svn.freebsd.org/changeset/base/196065

Log:
  Use version 1.7.1 of the CLDR and version 5.2.0 of the Unicode Database

Modified:
  user/edwin/locale/Makefile

Modified: user/edwin/locale/Makefile
==============================================================================
--- user/edwin/locale/Makefile	Wed Aug  5 07:41:52 2009	(r196064)
+++ user/edwin/locale/Makefile	Wed Aug  5 07:43:29 2009	(r196065)
@@ -3,9 +3,9 @@
 #
 
 UNICODEDIR?=	/home/edwin/unicode/
-CLDRVERSION?=	1.7.0
+CLDRVERSION?=	1.7.1
 CLDRDIR?=	${UNICODEDIR}/cldr/${CLDRVERSION}/
-UNIDATAVERSION?=5.1.0
+UNIDATAVERSION?=5.2.0
 UNIDATADIR?=	${UNICODEDIR}/UNIDATA/${UNIDATAVERSION}/
 
 XMLDIR?=	/home/edwin/svn/edwin/locale/tools/

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 07:43:46 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 5A0A2106568D;
	Wed,  5 Aug 2009 07:43:44 +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 64ADB8FC23;
	Wed,  5 Aug 2009 07:43:44 +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 n757hi5g047631;
	Wed, 5 Aug 2009 07:43:44 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n757hixN047629;
	Wed, 5 Aug 2009 07:43:44 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908050743.n757hixN047629@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 07:43:44 +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: r196066 - 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:43:47 -0000

Author: edwin
Date: Wed Aug  5 07:43:44 2009
New Revision: 196066
URL: http://svn.freebsd.org/changeset/base/196066

Log:
  do a lot of Cyrillic to latin conversions for iso8859-2

Modified:
  user/edwin/locale/tools/charmaps.xml

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Wed Aug  5 07:43:29 2009	(r196065)
+++ user/edwin/locale/tools/charmaps.xml	Wed Aug  5 07:43:44 2009	(r196066)
@@ -187,22 +187,207 @@
 	<translation encoding="ISO8859-2"
 	    cldr="EN DASH" unicode="HYPHEN-MINUS" />
 
-	<translation encoding="ISO8859-2"
+	<!-- Got these from http://www.decodeunicode.org/en/u+0400.
+	     Where possible use the international or ISO translation!
+	-->
+	<translation encoding="ISO8859-2" ucc="0408"
+	    cldr="CYRILLIC CAPITAL LETTER JE"
+	    unicode="LATIN CAPITAL LETTER J" />
+	<translation encoding="ISO8859-2" ucc="0458"
+	    cldr="CYRILLIC SMALL LETTER JE" unicode="LATIN SMALL LETTER J" />
+	<translation encoding="ISO8859-2" ucc="0409"
+	    cldr="CYRILLIC CAPITAL LETTER LJE" string="lj" />
+	<translation encoding="ISO8859-2" ucc="0459"
+	    cldr="CYRILLIC SMALL LETTER LJE" string="lj" />
+	<translation encoding="ISO8859-2" ucc="0410"
+	    cldr="CYRILLIC CAPITAL LETTER A" unicode="LATIN CAPITAL LETTER A" />
+	<translation encoding="ISO8859-2" ucc="0430"
+	    cldr="CYRILLIC SMALL LETTER A" unicode="LATIN SMALL LETTER A" />
+	<translation encoding="ISO8859-2" ucc="0411"
+	    cldr="CYRILLIC CAPITAL LETTER BE"
+	    unicode="LATIN CAPITAL LETTER B" />
+	<translation encoding="ISO8859-2" ucc="0431"
+	    cldr="CYRILLIC SMALL LETTER BE" unicode="LATIN SMALL LETTER B" />
+	<translation encoding="ISO8859-2" ucc="0412"
+	    cldr="CYRILLIC CAPITAL LETTER VE"
+	    unicode="LATIN CAPITAL LETTER B" />
+	<translation encoding="ISO8859-2" ucc="0432"
+	    cldr="CYRILLIC SMALL LETTER VE" unicode="LATIN SMALL LETTER B" />
+	<translation encoding="ISO8859-2" ucc="0413"
+	    cldr="CYRILLIC CAPITAL LETTER GHE"
+	    unicode="LATIN CAPITAL LETTER G" />
+	<translation encoding="ISO8859-2" ucc="0433"
+	    cldr="CYRILLIC SMALL LETTER GHE" unicode="LATIN SMALL LETTER G" />
+	<translation encoding="ISO8859-2" ucc="0414"
+	    cldr="CYRILLIC CAPITAL LETTER DE" string="D" />
+	<translation encoding="ISO8859-2" ucc="0434"
 	    cldr="CYRILLIC SMALL LETTER DE" string="d" />
+	<translation encoding="ISO8859-2" ucc="0415"
+	    cldr="CYRILLIC CAPITAL LETTER IE"
+	    unicode="LATIN CAPITAL LETTER E" />
+	<translation encoding="ISO8859-2" ucc="0435"
+	    cldr="CYRILLIC SMALL LETTER IE" unicode="LATIN SMALL LETTER E" />
+	<translation encoding="ISO8859-2" ucc="0416"
+	    cldr="CYRILLIC CAPITAL LETTER ZHE" string="ZH" />
+	<translation encoding="ISO8859-2" ucc="0436"
+	    cldr="CYRILLIC SMALL LETTER ZHE" string="zh" />
+	<translation encoding="ISO8859-2" ucc="0417"
+	    cldr="CYRILLIC CAPITAL LETTER ZE" string="z" />
+	<translation encoding="ISO8859-2" ucc="0437"
+	    cldr="CYRILLIC SMALL LETTER ZE" string="z" />
+	<translation encoding="ISO8859-2" ucc="0418"
+	    cldr="CYRILLIC CAPITAL LETTER I" unicode="LATIN CAPITAL LETTER J" />
+	<translation encoding="ISO8859-2" ucc="0438"
+	    cldr="CYRILLIC SMALL LETTER I" unicode="LATIN CAPITAL LETTER J" />
+	<translation encoding="ISO8859-2" ucc="0419"
+	    cldr="CYRILLIC CAPITAL LETTER I" unicode="LATIN SMALL LETTER J" />
+	<translation encoding="ISO8859-2" ucc="0439"
+	    cldr="CYRILLIC SMALL LETTER I" unicode="LATIN SMALL LETTER J" />
+	<translation encoding="ISO8859-2" ucc="041A"
+	    cldr="CYRILLIC CAPITAL LETTER KA"
+	    unicode="LATIN CAPITAL LETTER K" />
+	<translation encoding="ISO8859-2" ucc="043A"
+	    cldr="CYRILLIC SMALL LETTER KA" unicode="LATIN SMALL LETTER K" />
+	<translation encoding="ISO8859-2" ucc="041B"
+	    cldr="CYRILLIC CAPITAL LETTER EL"
+	    unicode="LATIN CAPITAL LETTER L" />
+	<translation encoding="ISO8859-2" ucc="043B"
+	    cldr="CYRILLIC SMALL LETTER EL" unicode="LATIN SMALL LETTER L" />
+	<translation encoding="ISO8859-2" ucc="041C"
+	    cldr="CYRILLIC CAPITAL LETTER EM"
+	    unicode="LATIN CAPITAL LETTER M" />
+	<translation encoding="ISO8859-2" ucc="043C"
+	    cldr="CYRILLIC SMALL LETTER EM" unicode="LATIN SMALL LETTER M" />
+	<translation encoding="ISO8859-2" ucc="041D"
+	    cldr="CYRILLIC CAPITAL LETTER EN"
+	    unicode="LATIN CAPITAL LETTER H" />
+	<translation encoding="ISO8859-2" ucc="043D"
+	    cldr="CYRILLIC SMALL LETTER EN" unicode="LATIN SMALL LETTER H" />
+	<translation encoding="ISO8859-2" ucc="041E"
+	    cldr="CYRILLIC CAPITAL LETTER O" unicode="LATIN CAPITAL LETTER O" />
+	<translation encoding="ISO8859-2" ucc="043E"
+	    cldr="CYRILLIC SMALL LETTER O" unicode="LATIN SMALL LETTER O" />
+	<translation encoding="ISO8859-2" ucc="041F"
+	    cldr="CYRILLIC CAPITAL LETTER PE"
+	    unicode="LATIN CAPITAL LETTER P" />
+	<translation encoding="ISO8859-2" ucc="043F"
+	    cldr="CYRILLIC SMALL LETTER PE" unicode="LATIN SMALL LETTER P" />
+	<translation encoding="ISO8859-2" ucc="0420"
+	    cldr="CYRILLIC CAPITAL LETTER ER"
+	    unicode="LATIN CAPITAL LETTER R" />
+	<translation encoding="ISO8859-2" ucc="0440"
+	    cldr="CYRILLIC SMALL LETTER ER" unicode="LATIN SMALL LETTER R" />
+	<translation encoding="ISO8859-2" ucc="0421"
+	    cldr="CYRILLIC CAPITAL LETTER ES"
+	    unicode="LATIN CAPITAL LETTER C" />
+	<translation encoding="ISO8859-2" ucc="0441"
+	    cldr="CYRILLIC SMALL LETTER ES" unicode="LATIN SMALL LETTER C" />
+	<translation encoding="ISO8859-2" ucc="0422"
+	    cldr="CYRILLIC CAPITAL LETTER TE"
+	    unicode="LATIN CAPITAL LETTER T" />
+	<translation encoding="ISO8859-2" ucc="0442"
+	    cldr="CYRILLIC SMALL LETTER TE" unicode="LATIN SMALL LETTER T" />
+	<translation encoding="ISO8859-2" ucc="0423"
+	    cldr="CYRILLIC CAPITAL LETTER U" unicode="LATIN CAPITAL LETTER U" />
+	<translation encoding="ISO8859-2" ucc="0443"
+	    cldr="CYRILLIC SMALL LETTER U" unicode="LATIN SMALL LETTER U" />
+	<translation encoding="ISO8859-2" ucc="0424"
+	    cldr="CYRILLIC CAPITAL LETTER EF"
+	    unicode="LATIN CAPITAL LETTER F" />
+	<translation encoding="ISO8859-2" ucc="0444"
+	    cldr="CYRILLIC SMALL LETTER EF" unicode="LATIN SMALL LETTER F" />
+	<translation encoding="ISO8859-2" ucc="0425"
+	    cldr="CYRILLIC CAPITAL LETTER HA"
+	    unicode="LATIN CAPITAL LETTER H" />
+	<translation encoding="ISO8859-2" ucc="0445"
+	    cldr="CYRILLIC SMALL LETTER HA" unicode="LATIN SMALL LETTER H" />
+	<translation encoding="ISO8859-2" ucc="0426"
+	    cldr="CYRILLIC CAPITAL LETTER TSE"
+	    unicode="LATIN CAPITAL LETTER C" />
+	<translation encoding="ISO8859-2" ucc="0446"
+	    cldr="CYRILLIC SMALL LETTER TSE" unicode="LATIN SMALL LETTER C" />
+	<translation encoding="ISO8859-2" ucc="0427"
+	    cldr="CYRILLIC CAPITAL LETTER CHE"
+	    unicode="LATIN CAPITAL LETTER C WITH CARON" />
+	<translation encoding="ISO8859-2" ucc="0447"
+	    cldr="CYRILLIC SMALL LETTER CHE"
+	    unicode="LATIN SMALL LETTER C WITH CARON" />
+	<translation encoding="ISO8859-2" ucc="0428"
+	    cldr="CYRILLIC CAPITAL LETTER SHA"
+	    unicode="LATIN CAPITAL LETTER S WITH CARON" />
+	<translation encoding="ISO8859-2" ucc="0448"
+	    cldr="CYRILLIC SMALL LETTER SHA"
+	    unicode="LATIN SMALL LETTER S WITH CARON" />
+	<translation encoding="ISO8859-2" ucc="0429"
+	    cldr="CYRILLIC CAPITAL LETTER SHCHA"
+	    unicode="LATIN CAPITAL LETTER S WITH CIRCUMFLEX" />
+	<translation encoding="ISO8859-2" ucc="0449"
+	    cldr="CYRILLIC SMALL LETTER SHCHA"
+	    unicode="LATIN SMALL LETTER S WITH CIRCUMFLEX" />
+	<translation encoding="ISO8859-2" ucc="042A"
+	    cldr="?CYRILLIC CAPITAL LETTER HARD SIGN" unicode="?" />
+	<translation encoding="ISO8859-2" ucc="044A"
+	    cldr="?CYRILLIC SMALL LETTER HARD SIGN" unicode="?" />
+	<translation encoding="ISO8859-2" ucc="042B"
+	    cldr="?CYRILLIC CAPITAL LETTER YERU" unicode="?" />
+	<translation encoding="ISO8859-2" ucc="044B"
+	    cldr="?CYRILLIC SMALL LETTER YERU" unicode="?" />
+	<translation encoding="ISO8859-2" ucc="042C"
+	    cldr="?CYRILLIC CAPITAL LETTER SOFT SIGN" unicode="?" />
+	<translation encoding="ISO8859-2" ucc="044C"
+	    cldr="?CYRILLIC SMALL LETTER SOFT SIGN" unicode="?" />
+	<translation encoding="ISO8859-2" ucc="042D"
+	    cldr="CYRILLIC CAPITAL LETTER E"
+	    unicode="LATIN CAPITAL LETTER E WITH GRAVE" />
+	<translation encoding="ISO8859-2" ucc="044D"
+	    cldr="CYRILLIC SMALL LETTER E"
+	    unicode="LATIN SMALL LETTER E WITH GRAVE" />
+	<translation encoding="ISO8859-2" ucc="042E"
+	    cldr="?CYRILLIC CAPITAL LETTER YU" unicode="?" />
+	<translation encoding="ISO8859-2" ucc="044E"
+	    cldr="?CYRILLIC SMALL LETTER YU" unicode="?" />
+	<translation encoding="ISO8859-2" ucc="042F"
+	    cldr="CYRILLIC CAPITAL LETTER YA"
+	    unicode="LATIN CAPITAL LETTER A WITH CIRCUMFLEX" />
+	<translation encoding="ISO8859-2" ucc="044F"
+	    cldr="CYRILLIC SMALL LETTER YA"
+	    unicode="LATIN SMALL LETTER A WITH CIRCUMFLEX" />
 
-</translations>
+	<translation encoding="ISO8859-2"
+	    cldr="LATIN SMALL LETTER T WITH COMMA BELOW"
+	    unicode="LATIN SMALL LETTER T" />
 
-<translationssss>
+	<translation encoding="ISO8859-5"
+	    cldr="MODIFIER LETTER APOSTROPHE" unicode="APOSTROPHE" />
+	<translation encoding="ISO8859-5"
+	    cldr="LATIN SMALL LETTER C WITH CARON"
+	    unicode="LATIN SMALL LETTER C" />
+
+	<translation encoding="KOI8-U"
+	    cldr="MODIFIER LETTER APOSTROPHE" unicode="APOSTROPHE" />
+
+	<translation encoding="CP1251"
+	    cldr="MODIFIER LETTER APOSTROPHE" unicode="APOSTROPHE" />
+
+	<!-- Copied from the original FreeBSD src/share/monetdef -->
+	<translation encoding="CP1251" cldr="HRYVNIA SIGN" hex="E3F0ED" />
+	<translation encoding="ISO8859-5" cldr="HRYVNIA SIGN" hex="D3E0DD" />
+	<translation encoding="KOI8-U" cldr="HRYVNIA SIGN" hex="C7D2CE" />
 
 	<!-- These don't have a special Kow sign so just use KRW for it -->
 	<translation encoding="CP949" cldr="WON SIGN" hex="5C" />
 	<translation encoding="eucKR" cldr="WON SIGN" hex="5C" />
 
+	<!-- Copied from the original FreeBSD src/share/timedef -->
+
+</translations>
+
+<oldtranslations>
+
 	<!-- Minus and dashes -->
 	<translation encoding="ISO8859-2" cldr="EN DASH" string="-" />
 
 	<!-- Copied from the original FreeBSD src/share/monetdef -->
-	<translation encoding="CP1251" cldr="HRYVNIA SIGN" hex="E3F0ED" />
 	<translation encoding="ISO8859-5" cldr="HRYVNIA SIGN" hex="D3E0DD" />
 	<translation encoding="KOI8-U" cldr="HRYVNIA SIGN" hex="C7D2CE" />
 
@@ -360,7 +545,7 @@
 	<translation encoding="ISO8859-2" cldr="FULL STOP" string="." />
 	<translation encoding="ARMSCII-8" cldr="ONE DOT LEADER" string="." />
 
-</translationssss>
+</oldtranslations>
 
 <alternativemonths>
 	<!-- Months which are different in dates ("21 december 1980") and in

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 07:44:31 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 439F4106564A;
	Wed,  5 Aug 2009 07:44:31 +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 3260B8FC0C;
	Wed,  5 Aug 2009 07:44:31 +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 n757iVgt047702;
	Wed, 5 Aug 2009 07:44:31 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n757iVWv047701;
	Wed, 5 Aug 2009 07:44:31 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908050744.n757iVWv047701@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 07:44:31 +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: r196067 - 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:44:31 -0000

Author: edwin
Date: Wed Aug  5 07:44:30 2009
New Revision: 196067
URL: http://svn.freebsd.org/changeset/base/196067

Log:
  show what a certain unicode name can be

Added:
  user/edwin/locale/tools/whatis.pl   (contents, props changed)

Added: user/edwin/locale/tools/whatis.pl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/whatis.pl	Wed Aug  5 07:44:30 2009	(r196067)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+UNIDATA=/home/edwin/unicode/UNIDATA/5.2.0/UnicodeData.txt
+CHARMAPS=/home/edwin/svn/edwin/locale/tools/charmaps
+UTF8=~/unicode/cldr/1.7.1/posix/UTF-8.cm
+
+if [ -z "$1" ]; then
+	echo "Usage: $0 <unicode string>"
+	exit
+fi
+
+UCS=$*
+UCS_=$(echo $* | sed -e 's/ /./g')
+echo UCS: ${UCS}
+
+echo UTF-8.cm:
+grep "${UCS_}" ${UTF8} | sed -e 's/   */	/g'
+
+echo UNIDATA:
+grep "${UCS_}" ${UNIDATA}
+L=$(grep "${UCS_}" ${UNIDATA})
+
+echo UCC:
+grep "${UCS_}" ${UNIDATA} | awk -F\; '{ print $1 }'
+
+
+echo CHARMAPS:
+grep ${UCS_} ${CHARMAPS}/* | sed -e "s|${CHARMAPS}/||g"
+grep ${UCC} ${CHARMAPS}/* | sed -e "s|${CHARMAPS}/||g"

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 07:45:43 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 33C02106566B;
	Wed,  5 Aug 2009 07:45:43 +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 0963A8FC16;
	Wed,  5 Aug 2009 07:45:43 +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 n757jgWN047770;
	Wed, 5 Aug 2009 07:45:42 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n757jgTF047769;
	Wed, 5 Aug 2009 07:45:42 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908050745.n757jgTF047769@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 07:45:42 +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: r196068 - user/edwin/locale/tools/charmaps
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:45:43 -0000

Author: edwin
Date: Wed Aug  5 07:45:42 2009
New Revision: 196068
URL: http://svn.freebsd.org/changeset/base/196068

Log:
  Where all charactermaps are stored

Added:
  user/edwin/locale/tools/charmaps/

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 07:47:29 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 2DD94106566C;
	Wed,  5 Aug 2009 07:47:29 +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 1B7998FC0C;
	Wed,  5 Aug 2009 07:47:29 +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 n757lTxT047840;
	Wed, 5 Aug 2009 07:47:29 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n757lTqi047837;
	Wed, 5 Aug 2009 07:47:29 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908050747.n757lTqi047837@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 07:47:29 +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: r196069 - user/edwin/locale/tools/charmaps
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:47:29 -0000

Author: edwin
Date: Wed Aug  5 07:47:28 2009
New Revision: 196069
URL: http://svn.freebsd.org/changeset/base/196069

Log:
  Used charactermaps (*.TXT)
  
  ... and their origins (charmaps.txt)

Added:
  user/edwin/locale/tools/charmaps/BIG5.TXT
  user/edwin/locale/tools/charmaps/CP1131.TXT
  user/edwin/locale/tools/charmaps/CP1251.TXT
  user/edwin/locale/tools/charmaps/CP866.TXT
  user/edwin/locale/tools/charmaps/CP949.TXT
  user/edwin/locale/tools/charmaps/ISO8859-1.TXT
  user/edwin/locale/tools/charmaps/ISO8859-13.TXT
  user/edwin/locale/tools/charmaps/ISO8859-15.TXT
  user/edwin/locale/tools/charmaps/ISO8859-2.TXT
  user/edwin/locale/tools/charmaps/ISO8859-4.TXT
  user/edwin/locale/tools/charmaps/ISO8859-5.TXT
  user/edwin/locale/tools/charmaps/ISO8859-7.TXT
  user/edwin/locale/tools/charmaps/ISO8859-9.TXT
  user/edwin/locale/tools/charmaps/KOI8-R.TXT
  user/edwin/locale/tools/charmaps/KOI8-U.TXT
  user/edwin/locale/tools/charmaps/charmaps.txt

Added: user/edwin/locale/tools/charmaps/BIG5.TXT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/charmaps/BIG5.TXT	Wed Aug  5 07:47:28 2009	(r196069)
@@ -0,0 +1,13804 @@
+#
+#	Name:             BIG5 to Unicode table (complete)
+#	Unicode version:  1.1
+#	Table version:    0.0d3
+#	Table format:     Format A
+#	Date:             11 February 1994
+#
+#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on magnetic media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Recipient is granted the right to make copies in any form for
+#	internal distribution and to freely use the information supplied
+#	in the creation of products supporting Unicode.  Unicode, Inc.
+#	specifically excludes the right to re-distribute this file directly
+#	to third parties or other organizations whether for profit or not.
+#
+#	General notes:
+#
+#
+# This table contains one set of mappings from BIG5 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses.  For more information on the mappings between various code
+# pages incorporating the repertoire of BIG5 and Unicode, consult the
+# VENDORS mapping data.  Normative information on the mapping between
+# BIG5 and Unicode may be found in the Unihan.txt file in the
+# latest Unicode Character Database.
+#
+# If you have carefully considered the fact that the mappings in
+# this table are only one possible set of mappings between BIG5 and
+# Unicode and have no normative status, but still feel that you
+# have located an error in the table that requires fixing, you may
+# report any such error to errata@unicode.org.
+#
+#	WARNING!  It is currently impossible to provide round-trip compatibility
+#		between BIG5 and Unicode.  
+#
+#	A number of characters are not currently mapped because
+#		of conflicts with other mappings.  They are as follows:
+#
+#       BIG5        Description                    Comments
+#
+#       0xA15A      SPACING UNDERSCORE             duplicates A1C4
+#       0xA1C3      SPACING HEAVY OVERSCORE        not in Unicode
+#       0xA1C5      SPACING HEAVY UNDERSCORE       not in Unicode
+#       0xA1FE      LT DIAG UP RIGHT TO LOW LEFT   duplicates A2AC
+#       0xA240      LT DIAG UP LEFT TO LOW RIGHT   duplicates A2AD
+#       0xA2CC      HANGZHOU NUMERAL TEN           conflicts with A451 mapping
+#       0xA2CE      HANGZHOU NUMERAL THIRTY        conflicts with A4CA mapping
+#
+#	We currently map all of these characters to U+FFFD REPLACEMENT CHARACTER.
+#		It is also possible to map these characters to their duplicates, or to
+#		the user zone.  
+#	
+#	Notes:
+#
+#	1. In addition to the above, there is some uncertainty about the
+#       mappings in the range C6A1 - C8FE, and F9DD - F9FE.  The ETEN
+#	version of BIG5 organizes the former range differently, and adds
+#	additional characters in the latter range.  The correct mappings
+#	these ranges need to be determined.
+#
+#	2.  There is an uncertainty in the mapping of the Big Five character
+#	0xA3BC.  This character occurs within the Big Five block of tone marks
+#	for bopomofo and is intended to be the tone mark for the first tone in
+#	Mandarin Chinese.  We have selected the mapping U+02C9 MODIFIER LETTER
+#	MACRON (Mandarin Chinese first tone) to reflect this semantic.  
+#	However, because bopomofo uses the absense of a tone mark to indicate
+#	the first Mandarin tone, most implementations of Big Five represent
+#	this character with a blank space, and so a mapping such as U+2003 EM
+#	SPACE might be preferred.  
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the BIG5 code (in hex as 0xXXXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3  is the Unicode name (follows a comment sign, '#')
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point.  Including all these
+#			names in this file increases its size substantially
+#			and needlessly.  The token "<CJK>" is used for the
+#			name of these characters.  If necessary, it can be
+#			expanded algorithmically by a parser or editor.
+#
+#	The entries are in BIG5 order
+#
+#
+0xA140	0x3000	# IDEOGRAPHIC SPACE
+0xA141	0xFF0C	# FULLWIDTH COMMA
+0xA142	0x3001	# IDEOGRAPHIC COMMA
+0xA143	0x3002	# IDEOGRAPHIC FULL STOP
+0xA144	0xFF0E	# FULLWIDTH FULL STOP
+0xA145	0x2022	# BULLET
+0xA146	0xFF1B	# FULLWIDTH SEMICOLON
+0xA147	0xFF1A	# FULLWIDTH COLON
+0xA148	0xFF1F	# FULLWIDTH QUESTION MARK
+0xA149	0xFF01	# FULLWIDTH EXCLAMATION MARK
+0xA14A	0xFE30	# PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
+0xA14B	0x2026	# HORIZONTAL ELLIPSIS
+0xA14C	0x2025	# TWO DOT LEADER
+0xA14D	0xFE50	# SMALL COMMA
+0xA14E	0xFF64	# HALFWIDTH IDEOGRAPHIC COMMA
+0xA14F	0xFE52	# SMALL FULL STOP
+0xA150	0x00B7	# MIDDLE DOT
+0xA151	0xFE54	# SMALL SEMICOLON
+0xA152	0xFE55	# SMALL COLON
+0xA153	0xFE56	# SMALL QUESTION MARK
+0xA154	0xFE57	# SMALL EXCLAMATION MARK
+0xA155	0xFF5C	# FULLWIDTH VERTICAL BAR
+0xA156	0x2013	# EN DASH
+0xA157	0xFE31	# PRESENTATION FORM FOR VERTICAL EM DASH
+0xA158	0x2014	# EM DASH
+0xA159	0xFE33	# PRESENTATION FORM FOR VERTICAL LOW LINE
+0xA15A	0xFFFD	# *** NO MAPPING ***
+0xA15B	0xFE34	# PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
+0xA15C	0xFE4F	# WAVY LOW LINE
+0xA15D	0xFF08	# FULLWIDTH LEFT PARENTHESIS
+0xA15E	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
+0xA15F	0xFE35	# PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS
+0xA160	0xFE36	# PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
+0xA161	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
+0xA162	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
+0xA163	0xFE37	# PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET
+0xA164	0xFE38	# PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
+0xA165	0x3014	# LEFT TORTOISE SHELL BRACKET
+0xA166	0x3015	# RIGHT TORTOISE SHELL BRACKET
+0xA167	0xFE39	# PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET
+0xA168	0xFE3A	# PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
+0xA169	0x3010	# LEFT BLACK LENTICULAR BRACKET
+0xA16A	0x3011	# RIGHT BLACK LENTICULAR BRACKET
+0xA16B	0xFE3B	# PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET
+0xA16C	0xFE3C	# PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET
+0xA16D	0x300A	# LEFT DOUBLE ANGLE BRACKET
+0xA16E	0x300B	# RIGHT DOUBLE ANGLE BRACKET
+0xA16F	0xFE3D	# PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET
+0xA170	0xFE3E	# PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET
+0xA171	0x3008	# LEFT ANGLE BRACKET
+0xA172	0x3009	# RIGHT ANGLE BRACKET
+0xA173	0xFE3F	# PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET
+0xA174	0xFE40	# PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET
+0xA175	0x300C	# LEFT CORNER BRACKET
+0xA176	0x300D	# RIGHT CORNER BRACKET
+0xA177	0xFE41	# PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET
+0xA178	0xFE42	# PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET
+0xA179	0x300E	# LEFT WHITE CORNER BRACKET
+0xA17A	0x300F	# RIGHT WHITE CORNER BRACKET
+0xA17B	0xFE43	# PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET
+0xA17C	0xFE44	# PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET
+0xA17D	0xFE59	# SMALL LEFT PARENTHESIS
+0xA17E	0xFE5A	# SMALL RIGHT PARENTHESIS
+0xA1A1	0xFE5B	# SMALL LEFT CURLY BRACKET
+0xA1A2	0xFE5C	# SMALL RIGHT CURLY BRACKET
+0xA1A3	0xFE5D	# SMALL LEFT TORTOISE SHELL BRACKET
+0xA1A4	0xFE5E	# SMALL RIGHT TORTOISE SHELL BRACKET
+0xA1A5	0x2018	# LEFT SINGLE QUOTATION MARK
+0xA1A6	0x2019	# RIGHT SINGLE QUOTATION MARK
+0xA1A7	0x201C	# LEFT DOUBLE QUOTATION MARK
+0xA1A8	0x201D	# RIGHT DOUBLE QUOTATION MARK
+0xA1A9	0x301D	# REVERSED DOUBLE PRIME QUOTATION MARK
+0xA1AA	0x301E	# DOUBLE PRIME QUOTATION MARK
+0xA1AB	0x2035	# REVERSED PRIME
+0xA1AC	0x2032	# PRIME
+0xA1AD	0xFF03	# FULLWIDTH NUMBER SIGN
+0xA1AE	0xFF06	# FULLWIDTH AMPERSAND
+0xA1AF	0xFF0A	# FULLWIDTH ASTERISK
+0xA1B0	0x203B	# REFERENCE MARK
+0xA1B1	0x00A7	# SECTION SIGN
+0xA1B2	0x3003	# DITTO MARK
+0xA1B3	0x25CB	# WHITE CIRCLE
+0xA1B4	0x25CF	# BLACK CIRCLE
+0xA1B5	0x25B3	# WHITE UP-POINTING TRIANGLE
+0xA1B6	0x25B2	# BLACK UP-POINTING TRIANGLE
+0xA1B7	0x25CE	# BULLSEYE
+0xA1B8	0x2606	# WHITE STAR
+0xA1B9	0x2605	# BLACK STAR
+0xA1BA	0x25C7	# WHITE DIAMOND
+0xA1BB	0x25C6	# BLACK DIAMOND
+0xA1BC	0x25A1	# WHITE SQUARE
+0xA1BD	0x25A0	# BLACK SQUARE
+0xA1BE	0x25BD	# WHITE DOWN-POINTING TRIANGLE
+0xA1BF	0x25BC	# BLACK DOWN-POINTING TRIANGLE
+0xA1C0	0x32A3	# CIRCLED IDEOGRAPH CORRECT
+0xA1C1	0x2105	# CARE OF
+0xA1C2	0x203E	# OVERLINE
+0xA1C3	0xFFFD	# *** NO MAPPING ***
+0xA1C4	0xFF3F	# FULLWIDTH LOW LINE
+0xA1C5	0xFFFD	# *** NO MAPPING ***
+0xA1C6	0xFE49	# DASHED OVERLINE
+0xA1C7	0xFE4A	# CENTRELINE OVERLINE
+0xA1C8	0xFE4D	# DASHED LOW LINE
+0xA1C9	0xFE4E	# CENTRELINE LOW LINE
+0xA1CA	0xFE4B	# WAVY OVERLINE
+0xA1CB	0xFE4C	# DOUBLE WAVY OVERLINE
+0xA1CC	0xFE5F	# SMALL NUMBER SIGN
+0xA1CD	0xFE60	# SMALL AMPERSAND
+0xA1CE	0xFE61	# SMALL ASTERISK
+0xA1CF	0xFF0B	# FULLWIDTH PLUS SIGN
+0xA1D0	0xFF0D	# FULLWIDTH HYPHEN-MINUS
+0xA1D1	0x00D7	# MULTIPLICATION SIGN
+0xA1D2	0x00F7	# DIVISION SIGN
+0xA1D3	0x00B1	# PLUS-MINUS SIGN
+0xA1D4	0x221A	# SQUARE ROOT
+0xA1D5	0xFF1C	# FULLWIDTH LESS-THAN SIGN
+0xA1D6	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
+0xA1D7	0xFF1D	# FULLWIDTH EQUALS SIGN
+0xA1D8	0x2266	# LESS THAN OVER EQUAL TO
+0xA1D9	0x2267	# GREATER THAN OVER EQUAL TO
+0xA1DA	0x2260	# NOT EQUAL TO
+0xA1DB	0x221E	# INFINITY
+0xA1DC	0x2252	# APPROXIMATELY EQUAL TO OR THE IMAGE OF
+0xA1DD	0x2261	# IDENTICAL TO
+0xA1DE	0xFE62	# SMALL PLUS SIGN
+0xA1DF	0xFE63	# SMALL HYPHEN-MINUS
+0xA1E0	0xFE64	# SMALL LESS-THAN SIGN
+0xA1E1	0xFE65	# SMALL GREATER-THAN SIGN
+0xA1E2	0xFE66	# SMALL EQUALS SIGN
+0xA1E3	0x223C	# TILDE OPERATOR
+0xA1E4	0x2229	# INTERSECTION
+0xA1E5	0x222A	# UNION
+0xA1E6	0x22A5	# UP TACK
+0xA1E7	0x2220	# ANGLE
+0xA1E8	0x221F	# RIGHT ANGLE
+0xA1E9	0x22BF	# RIGHT TRIANGLE
+0xA1EA	0x33D2	# SQUARE LOG
+0xA1EB	0x33D1	# SQUARE LN
+0xA1EC	0x222B	# INTEGRAL
+0xA1ED	0x222E	# CONTOUR INTEGRAL
+0xA1EE	0x2235	# BECAUSE
+0xA1EF	0x2234	# THEREFORE
+0xA1F0	0x2640	# FEMALE SIGN
+0xA1F1	0x2642	# MALE SIGN
+0xA1F2	0x2641	# EARTH
+0xA1F3	0x2609	# SUN
+0xA1F4	0x2191	# UPWARDS ARROW
+0xA1F5	0x2193	# DOWNWARDS ARROW
+0xA1F6	0x2190	# LEFTWARDS ARROW
+0xA1F7	0x2192	# RIGHTWARDS ARROW
+0xA1F8	0x2196	# NORTH WEST ARROW
+0xA1F9	0x2197	# NORTH EAST ARROW
+0xA1FA	0x2199	# SOUTH WEST ARROW
+0xA1FB	0x2198	# SOUTH EAST ARROW
+0xA1FC	0x2225	# PARALLEL TO
+0xA1FD	0x2223	# DIVIDES
+0xA1FE	0xFFFD	# *** NO MAPPING ***
+0xA240	0xFFFD	# *** NO MAPPING ***
+0xA241	0xFF0F	# FULLWIDTH SOLIDUS
+0xA242	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
+0xA243	0xFF04	# FULLWIDTH DOLLAR SIGN
+0xA244	0x00A5	# YEN SIGN
+0xA245	0x3012	# POSTAL MARK
+0xA246	0x00A2	# CENT SIGN
+0xA247	0x00A3	# POUND SIGN
+0xA248	0xFF05	# FULLWIDTH PERCENT SIGN
+0xA249	0xFF20	# FULLWIDTH COMMERCIAL AT
+0xA24A	0x2103	# DEGREE CELSIUS
+0xA24B	0x2109	# DEGREE FAHRENHEIT
+0xA24C	0xFE69	# SMALL DOLLAR SIGN
+0xA24D	0xFE6A	# SMALL PERCENT SIGN
+0xA24E	0xFE6B	# SMALL COMMERCIAL AT
+0xA24F	0x33D5	# SQUARE MIL
+0xA250	0x339C	# SQUARE MM
+0xA251	0x339D	# SQUARE CM
+0xA252	0x339E	# SQUARE KM
+0xA253	0x33CE	# SQUARE KM CAPITAL
+0xA254	0x33A1	# SQUARE M SQUARED
+0xA255	0x338E	# SQUARE MG
+0xA256	0x338F	# SQUARE KG
+0xA257	0x33C4	# SQUARE CC
+0xA258	0x00B0	# DEGREE SIGN
+0xA259	0x5159	# <CJK>
+0xA25A	0x515B	# <CJK>
+0xA25B	0x515E	# <CJK>
+0xA25C	0x515D	# <CJK>
+0xA25D	0x5161	# <CJK>
+0xA25E	0x5163	# <CJK>
+0xA25F	0x55E7	# <CJK>
+0xA260	0x74E9	# <CJK>
+0xA261	0x7CCE	# <CJK>
+0xA262	0x2581	# LOWER ONE EIGHTH BLOCK
+0xA263	0x2582	# LOWER ONE QUARTER BLOCK
+0xA264	0x2583	# LOWER THREE EIGHTHS BLOCK
+0xA265	0x2584	# LOWER HALF BLOCK
+0xA266	0x2585	# LOWER FIVE EIGHTHS BLOCK
+0xA267	0x2586	# LOWER THREE QUARTERS BLOCK
+0xA268	0x2587	# LOWER SEVEN EIGHTHS BLOCK
+0xA269	0x2588	# FULL BLOCK
+0xA26A	0x258F	# LEFT ONE EIGHTH BLOCK
+0xA26B	0x258E	# LEFT ONE QUARTER BLOCK
+0xA26C	0x258D	# LEFT THREE EIGHTHS BLOCK
+0xA26D	0x258C	# LEFT HALF BLOCK
+0xA26E	0x258B	# LEFT FIVE EIGHTHS BLOCK
+0xA26F	0x258A	# LEFT THREE QUARTERS BLOCK
+0xA270	0x2589	# LEFT SEVEN EIGHTHS BLOCK
+0xA271	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+0xA272	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
+0xA273	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+0xA274	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
+0xA275	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+0xA276	0x2594	# UPPER ONE EIGHTH BLOCK
+0xA277	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
+0xA278	0x2502	# BOX DRAWINGS LIGHT VERTICAL
+0xA279	0x2595	# RIGHT ONE EIGHTH BLOCK
+0xA27A	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
+0xA27B	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
+0xA27C	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
+0xA27D	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
+0xA27E	0x256D	# BOX DRAWINGS LIGHT ARC DOWN AND RIGHT
+0xA2A1	0x256E	# BOX DRAWINGS LIGHT ARC DOWN AND LEFT
+0xA2A2	0x2570	# BOX DRAWINGS LIGHT ARC UP AND RIGHT
+0xA2A3	0x256F	# BOX DRAWINGS LIGHT ARC UP AND LEFT
+0xA2A4	0x2550	# BOX DRAWINGS DOUBLE HORIZONTAL
+0xA2A5	0x255E	# BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+0xA2A6	0x256A	# BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+0xA2A7	0x2561	# BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+0xA2A8	0x25E2	# BLACK LOWER RIGHT TRIANGLE
+0xA2A9	0x25E3	# BLACK LOWER LEFT TRIANGLE
+0xA2AA	0x25E5	# BLACK UPPER RIGHT TRIANGLE
+0xA2AB	0x25E4	# BLACK UPPER LEFT TRIANGLE
+0xA2AC	0x2571	# BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
+0xA2AD	0x2572	# BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
+0xA2AE	0x2573	# BOX DRAWINGS LIGHT DIAGONAL CROSS
+0xA2AF	0xFF10	# FULLWIDTH DIGIT ZERO
+0xA2B0	0xFF11	# FULLWIDTH DIGIT ONE
+0xA2B1	0xFF12	# FULLWIDTH DIGIT TWO
+0xA2B2	0xFF13	# FULLWIDTH DIGIT THREE
+0xA2B3	0xFF14	# FULLWIDTH DIGIT FOUR
+0xA2B4	0xFF15	# FULLWIDTH DIGIT FIVE
+0xA2B5	0xFF16	# FULLWIDTH DIGIT SIX
+0xA2B6	0xFF17	# FULLWIDTH DIGIT SEVEN
+0xA2B7	0xFF18	# FULLWIDTH DIGIT EIGHT
+0xA2B8	0xFF19	# FULLWIDTH DIGIT NINE
+0xA2B9	0x2160	# ROMAN NUMERAL ONE
+0xA2BA	0x2161	# ROMAN NUMERAL TWO
+0xA2BB	0x2162	# ROMAN NUMERAL THREE
+0xA2BC	0x2163	# ROMAN NUMERAL FOUR
+0xA2BD	0x2164	# ROMAN NUMERAL FIVE
+0xA2BE	0x2165	# ROMAN NUMERAL SIX
+0xA2BF	0x2166	# ROMAN NUMERAL SEVEN
+0xA2C0	0x2167	# ROMAN NUMERAL EIGHT
+0xA2C1	0x2168	# ROMAN NUMERAL NINE
+0xA2C2	0x2169	# ROMAN NUMERAL TEN
+0xA2C3	0x3021	# HANGZHOU NUMERAL ONE
+0xA2C4	0x3022	# HANGZHOU NUMERAL TWO
+0xA2C5	0x3023	# HANGZHOU NUMERAL THREE
+0xA2C6	0x3024	# HANGZHOU NUMERAL FOUR
+0xA2C7	0x3025	# HANGZHOU NUMERAL FIVE
+0xA2C8	0x3026	# HANGZHOU NUMERAL SIX
+0xA2C9	0x3027	# HANGZHOU NUMERAL SEVEN
+0xA2CA	0x3028	# HANGZHOU NUMERAL EIGHT
+0xA2CB	0x3029	# HANGZHOU NUMERAL NINE
+0xA2CC	0xFFFD	# *** NO MAPPING ***
+0xA2CD	0x5344	# <CJK>
+0xA2CE	0xFFFD	# *** NO MAPPING ***
+0xA2CF	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
+0xA2D0	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
+0xA2D1	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
+0xA2D2	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
+0xA2D3	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
+0xA2D4	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
+0xA2D5	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
+0xA2D6	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
+0xA2D7	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
+0xA2D8	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
+0xA2D9	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
+0xA2DA	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
+0xA2DB	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
+0xA2DC	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
+0xA2DD	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
+0xA2DE	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
+0xA2DF	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
+0xA2E0	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
+0xA2E1	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
+0xA2E2	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
+0xA2E3	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
+0xA2E4	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
+0xA2E5	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
+0xA2E6	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
+0xA2E7	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
+0xA2E8	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
+0xA2E9	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
+0xA2EA	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
+0xA2EB	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
+0xA2EC	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
+0xA2ED	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
+0xA2EE	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
+0xA2EF	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
+0xA2F0	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
+0xA2F1	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
+0xA2F2	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
+0xA2F3	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
+0xA2F4	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
+0xA2F5	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
+0xA2F6	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
+0xA2F7	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
+0xA2F8	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
+0xA2F9	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
+0xA2FA	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
+0xA2FB	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
+0xA2FC	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
+0xA2FD	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
+0xA2FE	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
+0xA340	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
+0xA341	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
+0xA342	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
+0xA343	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
+0xA344	0x0391	# GREEK CAPITAL LETTER ALPHA
+0xA345	0x0392	# GREEK CAPITAL LETTER BETA
+0xA346	0x0393	# GREEK CAPITAL LETTER GAMMA
+0xA347	0x0394	# GREEK CAPITAL LETTER DELTA
+0xA348	0x0395	# GREEK CAPITAL LETTER EPSILON
+0xA349	0x0396	# GREEK CAPITAL LETTER ZETA
+0xA34A	0x0397	# GREEK CAPITAL LETTER ETA
+0xA34B	0x0398	# GREEK CAPITAL LETTER THETA
+0xA34C	0x0399	# GREEK CAPITAL LETTER IOTA
+0xA34D	0x039A	# GREEK CAPITAL LETTER KAPPA
+0xA34E	0x039B	# GREEK CAPITAL LETTER LAMDA
+0xA34F	0x039C	# GREEK CAPITAL LETTER MU
+0xA350	0x039D	# GREEK CAPITAL LETTER NU
+0xA351	0x039E	# GREEK CAPITAL LETTER XI
+0xA352	0x039F	# GREEK CAPITAL LETTER OMICRON
+0xA353	0x03A0	# GREEK CAPITAL LETTER PI
+0xA354	0x03A1	# GREEK CAPITAL LETTER RHO
+0xA355	0x03A3	# GREEK CAPITAL LETTER SIGMA
+0xA356	0x03A4	# GREEK CAPITAL LETTER TAU
+0xA357	0x03A5	# GREEK CAPITAL LETTER UPSILON
+0xA358	0x03A6	# GREEK CAPITAL LETTER PHI
+0xA359	0x03A7	# GREEK CAPITAL LETTER CHI
+0xA35A	0x03A8	# GREEK CAPITAL LETTER PSI
+0xA35B	0x03A9	# GREEK CAPITAL LETTER OMEGA
+0xA35C	0x03B1	# GREEK SMALL LETTER ALPHA
+0xA35D	0x03B2	# GREEK SMALL LETTER BETA
+0xA35E	0x03B3	# GREEK SMALL LETTER GAMMA
+0xA35F	0x03B4	# GREEK SMALL LETTER DELTA
+0xA360	0x03B5	# GREEK SMALL LETTER EPSILON
+0xA361	0x03B6	# GREEK SMALL LETTER ZETA
+0xA362	0x03B7	# GREEK SMALL LETTER ETA
+0xA363	0x03B8	# GREEK SMALL LETTER THETA
+0xA364	0x03B9	# GREEK SMALL LETTER IOTA
+0xA365	0x03BA	# GREEK SMALL LETTER KAPPA
+0xA366	0x03BB	# GREEK SMALL LETTER LAMDA
+0xA367	0x03BC	# GREEK SMALL LETTER MU
+0xA368	0x03BD	# GREEK SMALL LETTER NU
+0xA369	0x03BE	# GREEK SMALL LETTER XI
+0xA36A	0x03BF	# GREEK SMALL LETTER OMICRON
+0xA36B	0x03C0	# GREEK SMALL LETTER PI
+0xA36C	0x03C1	# GREEK SMALL LETTER RHO
+0xA36D	0x03C3	# GREEK SMALL LETTER SIGMA
+0xA36E	0x03C4	# GREEK SMALL LETTER TAU
+0xA36F	0x03C5	# GREEK SMALL LETTER UPSILON
+0xA370	0x03C6	# GREEK SMALL LETTER PHI
+0xA371	0x03C7	# GREEK SMALL LETTER CHI
+0xA372	0x03C8	# GREEK SMALL LETTER PSI
+0xA373	0x03C9	# GREEK SMALL LETTER OMEGA
+0xA374	0x3105	# BOPOMOFO LETTER B
+0xA375	0x3106	# BOPOMOFO LETTER P
+0xA376	0x3107	# BOPOMOFO LETTER M
+0xA377	0x3108	# BOPOMOFO LETTER F
+0xA378	0x3109	# BOPOMOFO LETTER D
+0xA379	0x310A	# BOPOMOFO LETTER T
+0xA37A	0x310B	# BOPOMOFO LETTER N
+0xA37B	0x310C	# BOPOMOFO LETTER L
+0xA37C	0x310D	# BOPOMOFO LETTER G
+0xA37D	0x310E	# BOPOMOFO LETTER K
+0xA37E	0x310F	# BOPOMOFO LETTER H
+0xA3A1	0x3110	# BOPOMOFO LETTER J
+0xA3A2	0x3111	# BOPOMOFO LETTER Q
+0xA3A3	0x3112	# BOPOMOFO LETTER X
+0xA3A4	0x3113	# BOPOMOFO LETTER ZH
+0xA3A5	0x3114	# BOPOMOFO LETTER CH
+0xA3A6	0x3115	# BOPOMOFO LETTER SH
+0xA3A7	0x3116	# BOPOMOFO LETTER R
+0xA3A8	0x3117	# BOPOMOFO LETTER Z
+0xA3A9	0x3118	# BOPOMOFO LETTER C
+0xA3AA	0x3119	# BOPOMOFO LETTER S
+0xA3AB	0x311A	# BOPOMOFO LETTER A
+0xA3AC	0x311B	# BOPOMOFO LETTER O
+0xA3AD	0x311C	# BOPOMOFO LETTER E
+0xA3AE	0x311D	# BOPOMOFO LETTER EH
+0xA3AF	0x311E	# BOPOMOFO LETTER AI
+0xA3B0	0x311F	# BOPOMOFO LETTER EI
+0xA3B1	0x3120	# BOPOMOFO LETTER AU
+0xA3B2	0x3121	# BOPOMOFO LETTER OU
+0xA3B3	0x3122	# BOPOMOFO LETTER AN
+0xA3B4	0x3123	# BOPOMOFO LETTER EN
+0xA3B5	0x3124	# BOPOMOFO LETTER ANG
+0xA3B6	0x3125	# BOPOMOFO LETTER ENG
+0xA3B7	0x3126	# BOPOMOFO LETTER ER
+0xA3B8	0x3127	# BOPOMOFO LETTER I
+0xA3B9	0x3128	# BOPOMOFO LETTER U
+0xA3BA	0x3129	# BOPOMOFO LETTER IU
+0xA3BB	0x02D9	# DOT ABOVE (Mandarin Chinese light tone)
+0xA3BC	0x02C9	# MODIFIER LETTER MACRON (Mandarin Chinese first tone)
+0xA3BD	0x02CA	# MODIFIER LETTER ACUTE ACCENT (Mandarin Chinese second tone)
+0xA3BE	0x02C7	# CARON (Mandarin Chinese third tone)
+0xA3BF	0x02CB	# MODIFIER LETTER GRAVE ACCENT (Mandarin Chinese fourth tone)
+0xA440	0x4E00	# <CJK>
+0xA441	0x4E59	# <CJK>
+0xA442	0x4E01	# <CJK>
+0xA443	0x4E03	# <CJK>
+0xA444	0x4E43	# <CJK>
+0xA445	0x4E5D	# <CJK>
+0xA446	0x4E86	# <CJK>
+0xA447	0x4E8C	# <CJK>
+0xA448	0x4EBA	# <CJK>
+0xA449	0x513F	# <CJK>
+0xA44A	0x5165	# <CJK>
+0xA44B	0x516B	# <CJK>
+0xA44C	0x51E0	# <CJK>
+0xA44D	0x5200	# <CJK>
+0xA44E	0x5201	# <CJK>
+0xA44F	0x529B	# <CJK>
+0xA450	0x5315	# <CJK>
+0xA451	0x5341	# <CJK>
+0xA452	0x535C	# <CJK>
+0xA453	0x53C8	# <CJK>
+0xA454	0x4E09	# <CJK>
+0xA455	0x4E0B	# <CJK>
+0xA456	0x4E08	# <CJK>
+0xA457	0x4E0A	# <CJK>
+0xA458	0x4E2B	# <CJK>
+0xA459	0x4E38	# <CJK>
+0xA45A	0x51E1	# <CJK>
+0xA45B	0x4E45	# <CJK>
+0xA45C	0x4E48	# <CJK>
+0xA45D	0x4E5F	# <CJK>
+0xA45E	0x4E5E	# <CJK>
+0xA45F	0x4E8E	# <CJK>
+0xA460	0x4EA1	# <CJK>
+0xA461	0x5140	# <CJK>
+0xA462	0x5203	# <CJK>
+0xA463	0x52FA	# <CJK>
+0xA464	0x5343	# <CJK>
+0xA465	0x53C9	# <CJK>
+0xA466	0x53E3	# <CJK>
+0xA467	0x571F	# <CJK>
+0xA468	0x58EB	# <CJK>
+0xA469	0x5915	# <CJK>
+0xA46A	0x5927	# <CJK>
+0xA46B	0x5973	# <CJK>
+0xA46C	0x5B50	# <CJK>
+0xA46D	0x5B51	# <CJK>
+0xA46E	0x5B53	# <CJK>
+0xA46F	0x5BF8	# <CJK>
+0xA470	0x5C0F	# <CJK>
+0xA471	0x5C22	# <CJK>
+0xA472	0x5C38	# <CJK>
+0xA473	0x5C71	# <CJK>
+0xA474	0x5DDD	# <CJK>
+0xA475	0x5DE5	# <CJK>
+0xA476	0x5DF1	# <CJK>
+0xA477	0x5DF2	# <CJK>
+0xA478	0x5DF3	# <CJK>
+0xA479	0x5DFE	# <CJK>
+0xA47A	0x5E72	# <CJK>
+0xA47B	0x5EFE	# <CJK>
+0xA47C	0x5F0B	# <CJK>
+0xA47D	0x5F13	# <CJK>
+0xA47E	0x624D	# <CJK>
+0xA4A1	0x4E11	# <CJK>
+0xA4A2	0x4E10	# <CJK>
+0xA4A3	0x4E0D	# <CJK>
+0xA4A4	0x4E2D	# <CJK>
+0xA4A5	0x4E30	# <CJK>
+0xA4A6	0x4E39	# <CJK>
+0xA4A7	0x4E4B	# <CJK>
+0xA4A8	0x5C39	# <CJK>
+0xA4A9	0x4E88	# <CJK>
+0xA4AA	0x4E91	# <CJK>
+0xA4AB	0x4E95	# <CJK>
+0xA4AC	0x4E92	# <CJK>
+0xA4AD	0x4E94	# <CJK>
+0xA4AE	0x4EA2	# <CJK>
+0xA4AF	0x4EC1	# <CJK>
+0xA4B0	0x4EC0	# <CJK>
+0xA4B1	0x4EC3	# <CJK>
+0xA4B2	0x4EC6	# <CJK>
+0xA4B3	0x4EC7	# <CJK>
+0xA4B4	0x4ECD	# <CJK>
+0xA4B5	0x4ECA	# <CJK>
+0xA4B6	0x4ECB	# <CJK>
+0xA4B7	0x4EC4	# <CJK>
+0xA4B8	0x5143	# <CJK>
+0xA4B9	0x5141	# <CJK>
+0xA4BA	0x5167	# <CJK>
+0xA4BB	0x516D	# <CJK>
+0xA4BC	0x516E	# <CJK>
+0xA4BD	0x516C	# <CJK>
+0xA4BE	0x5197	# <CJK>
+0xA4BF	0x51F6	# <CJK>
+0xA4C0	0x5206	# <CJK>
+0xA4C1	0x5207	# <CJK>
+0xA4C2	0x5208	# <CJK>
+0xA4C3	0x52FB	# <CJK>
+0xA4C4	0x52FE	# <CJK>
+0xA4C5	0x52FF	# <CJK>
+0xA4C6	0x5316	# <CJK>
+0xA4C7	0x5339	# <CJK>
+0xA4C8	0x5348	# <CJK>
+0xA4C9	0x5347	# <CJK>
+0xA4CA	0x5345	# <CJK>
+0xA4CB	0x535E	# <CJK>
+0xA4CC	0x5384	# <CJK>
+0xA4CD	0x53CB	# <CJK>
+0xA4CE	0x53CA	# <CJK>
+0xA4CF	0x53CD	# <CJK>
+0xA4D0	0x58EC	# <CJK>
+0xA4D1	0x5929	# <CJK>
+0xA4D2	0x592B	# <CJK>
+0xA4D3	0x592A	# <CJK>
+0xA4D4	0x592D	# <CJK>
+0xA4D5	0x5B54	# <CJK>
+0xA4D6	0x5C11	# <CJK>
+0xA4D7	0x5C24	# <CJK>
+0xA4D8	0x5C3A	# <CJK>
+0xA4D9	0x5C6F	# <CJK>
+0xA4DA	0x5DF4	# <CJK>
+0xA4DB	0x5E7B	# <CJK>
+0xA4DC	0x5EFF	# <CJK>
+0xA4DD	0x5F14	# <CJK>
+0xA4DE	0x5F15	# <CJK>
+0xA4DF	0x5FC3	# <CJK>
+0xA4E0	0x6208	# <CJK>
+0xA4E1	0x6236	# <CJK>
+0xA4E2	0x624B	# <CJK>
+0xA4E3	0x624E	# <CJK>
+0xA4E4	0x652F	# <CJK>
+0xA4E5	0x6587	# <CJK>
+0xA4E6	0x6597	# <CJK>
+0xA4E7	0x65A4	# <CJK>
+0xA4E8	0x65B9	# <CJK>
+0xA4E9	0x65E5	# <CJK>
+0xA4EA	0x66F0	# <CJK>
+0xA4EB	0x6708	# <CJK>
+0xA4EC	0x6728	# <CJK>
+0xA4ED	0x6B20	# <CJK>
+0xA4EE	0x6B62	# <CJK>
+0xA4EF	0x6B79	# <CJK>
+0xA4F0	0x6BCB	# <CJK>
+0xA4F1	0x6BD4	# <CJK>
+0xA4F2	0x6BDB	# <CJK>
+0xA4F3	0x6C0F	# <CJK>
+0xA4F4	0x6C34	# <CJK>
+0xA4F5	0x706B	# <CJK>
+0xA4F6	0x722A	# <CJK>
+0xA4F7	0x7236	# <CJK>
+0xA4F8	0x723B	# <CJK>
+0xA4F9	0x7247	# <CJK>
+0xA4FA	0x7259	# <CJK>
+0xA4FB	0x725B	# <CJK>
+0xA4FC	0x72AC	# <CJK>
+0xA4FD	0x738B	# <CJK>
+0xA4FE	0x4E19	# <CJK>
+0xA540	0x4E16	# <CJK>
+0xA541	0x4E15	# <CJK>
+0xA542	0x4E14	# <CJK>
+0xA543	0x4E18	# <CJK>
+0xA544	0x4E3B	# <CJK>
+0xA545	0x4E4D	# <CJK>
+0xA546	0x4E4F	# <CJK>
+0xA547	0x4E4E	# <CJK>
+0xA548	0x4EE5	# <CJK>
+0xA549	0x4ED8	# <CJK>
+0xA54A	0x4ED4	# <CJK>
+0xA54B	0x4ED5	# <CJK>
+0xA54C	0x4ED6	# <CJK>
+0xA54D	0x4ED7	# <CJK>
+0xA54E	0x4EE3	# <CJK>
+0xA54F	0x4EE4	# <CJK>
+0xA550	0x4ED9	# <CJK>
+0xA551	0x4EDE	# <CJK>
+0xA552	0x5145	# <CJK>
+0xA553	0x5144	# <CJK>
+0xA554	0x5189	# <CJK>
+0xA555	0x518A	# <CJK>
+0xA556	0x51AC	# <CJK>
+0xA557	0x51F9	# <CJK>
+0xA558	0x51FA	# <CJK>
+0xA559	0x51F8	# <CJK>
+0xA55A	0x520A	# <CJK>
+0xA55B	0x52A0	# <CJK>
+0xA55C	0x529F	# <CJK>
+0xA55D	0x5305	# <CJK>
+0xA55E	0x5306	# <CJK>
+0xA55F	0x5317	# <CJK>
+0xA560	0x531D	# <CJK>
+0xA561	0x4EDF	# <CJK>
+0xA562	0x534A	# <CJK>
+0xA563	0x5349	# <CJK>
+0xA564	0x5361	# <CJK>
+0xA565	0x5360	# <CJK>
+0xA566	0x536F	# <CJK>
+0xA567	0x536E	# <CJK>
+0xA568	0x53BB	# <CJK>
+0xA569	0x53EF	# <CJK>
+0xA56A	0x53E4	# <CJK>
+0xA56B	0x53F3	# <CJK>
+0xA56C	0x53EC	# <CJK>
+0xA56D	0x53EE	# <CJK>
+0xA56E	0x53E9	# <CJK>
+0xA56F	0x53E8	# <CJK>
+0xA570	0x53FC	# <CJK>
+0xA571	0x53F8	# <CJK>
+0xA572	0x53F5	# <CJK>
+0xA573	0x53EB	# <CJK>
+0xA574	0x53E6	# <CJK>
+0xA575	0x53EA	# <CJK>
+0xA576	0x53F2	# <CJK>
+0xA577	0x53F1	# <CJK>
+0xA578	0x53F0	# <CJK>
+0xA579	0x53E5	# <CJK>
+0xA57A	0x53ED	# <CJK>
+0xA57B	0x53FB	# <CJK>
+0xA57C	0x56DB	# <CJK>
+0xA57D	0x56DA	# <CJK>
+0xA57E	0x5916	# <CJK>
+0xA5A1	0x592E	# <CJK>
+0xA5A2	0x5931	# <CJK>
+0xA5A3	0x5974	# <CJK>
+0xA5A4	0x5976	# <CJK>
+0xA5A5	0x5B55	# <CJK>
+0xA5A6	0x5B83	# <CJK>
+0xA5A7	0x5C3C	# <CJK>
+0xA5A8	0x5DE8	# <CJK>
+0xA5A9	0x5DE7	# <CJK>
+0xA5AA	0x5DE6	# <CJK>
+0xA5AB	0x5E02	# <CJK>
+0xA5AC	0x5E03	# <CJK>
+0xA5AD	0x5E73	# <CJK>
+0xA5AE	0x5E7C	# <CJK>
+0xA5AF	0x5F01	# <CJK>
+0xA5B0	0x5F18	# <CJK>
+0xA5B1	0x5F17	# <CJK>
+0xA5B2	0x5FC5	# <CJK>
+0xA5B3	0x620A	# <CJK>
+0xA5B4	0x6253	# <CJK>
+0xA5B5	0x6254	# <CJK>
+0xA5B6	0x6252	# <CJK>
+0xA5B7	0x6251	# <CJK>
+0xA5B8	0x65A5	# <CJK>
+0xA5B9	0x65E6	# <CJK>
+0xA5BA	0x672E	# <CJK>
+0xA5BB	0x672C	# <CJK>
+0xA5BC	0x672A	# <CJK>
+0xA5BD	0x672B	# <CJK>
+0xA5BE	0x672D	# <CJK>
+0xA5BF	0x6B63	# <CJK>
+0xA5C0	0x6BCD	# <CJK>
+0xA5C1	0x6C11	# <CJK>
+0xA5C2	0x6C10	# <CJK>
+0xA5C3	0x6C38	# <CJK>
+0xA5C4	0x6C41	# <CJK>
+0xA5C5	0x6C40	# <CJK>
+0xA5C6	0x6C3E	# <CJK>
+0xA5C7	0x72AF	# <CJK>
+0xA5C8	0x7384	# <CJK>
+0xA5C9	0x7389	# <CJK>
+0xA5CA	0x74DC	# <CJK>
+0xA5CB	0x74E6	# <CJK>
+0xA5CC	0x7518	# <CJK>
+0xA5CD	0x751F	# <CJK>
+0xA5CE	0x7528	# <CJK>
+0xA5CF	0x7529	# <CJK>
+0xA5D0	0x7530	# <CJK>
+0xA5D1	0x7531	# <CJK>
+0xA5D2	0x7532	# <CJK>
+0xA5D3	0x7533	# <CJK>
+0xA5D4	0x758B	# <CJK>
+0xA5D5	0x767D	# <CJK>
+0xA5D6	0x76AE	# <CJK>
+0xA5D7	0x76BF	# <CJK>
+0xA5D8	0x76EE	# <CJK>
+0xA5D9	0x77DB	# <CJK>
+0xA5DA	0x77E2	# <CJK>
+0xA5DB	0x77F3	# <CJK>
+0xA5DC	0x793A	# <CJK>
+0xA5DD	0x79BE	# <CJK>
+0xA5DE	0x7A74	# <CJK>
+0xA5DF	0x7ACB	# <CJK>
+0xA5E0	0x4E1E	# <CJK>
+0xA5E1	0x4E1F	# <CJK>
+0xA5E2	0x4E52	# <CJK>
+0xA5E3	0x4E53	# <CJK>
+0xA5E4	0x4E69	# <CJK>
+0xA5E5	0x4E99	# <CJK>
+0xA5E6	0x4EA4	# <CJK>
+0xA5E7	0x4EA6	# <CJK>
+0xA5E8	0x4EA5	# <CJK>
+0xA5E9	0x4EFF	# <CJK>
+0xA5EA	0x4F09	# <CJK>
+0xA5EB	0x4F19	# <CJK>
+0xA5EC	0x4F0A	# <CJK>
+0xA5ED	0x4F15	# <CJK>
+0xA5EE	0x4F0D	# <CJK>
+0xA5EF	0x4F10	# <CJK>
+0xA5F0	0x4F11	# <CJK>
+0xA5F1	0x4F0F	# <CJK>
+0xA5F2	0x4EF2	# <CJK>
+0xA5F3	0x4EF6	# <CJK>
+0xA5F4	0x4EFB	# <CJK>
+0xA5F5	0x4EF0	# <CJK>
+0xA5F6	0x4EF3	# <CJK>
+0xA5F7	0x4EFD	# <CJK>
+0xA5F8	0x4F01	# <CJK>
+0xA5F9	0x4F0B	# <CJK>
+0xA5FA	0x5149	# <CJK>
+0xA5FB	0x5147	# <CJK>
+0xA5FC	0x5146	# <CJK>
+0xA5FD	0x5148	# <CJK>
+0xA5FE	0x5168	# <CJK>
+0xA640	0x5171	# <CJK>
+0xA641	0x518D	# <CJK>
+0xA642	0x51B0	# <CJK>
+0xA643	0x5217	# <CJK>
+0xA644	0x5211	# <CJK>
+0xA645	0x5212	# <CJK>
+0xA646	0x520E	# <CJK>
+0xA647	0x5216	# <CJK>
+0xA648	0x52A3	# <CJK>
+0xA649	0x5308	# <CJK>
+0xA64A	0x5321	# <CJK>
+0xA64B	0x5320	# <CJK>
+0xA64C	0x5370	# <CJK>
+0xA64D	0x5371	# <CJK>
+0xA64E	0x5409	# <CJK>
+0xA64F	0x540F	# <CJK>
+0xA650	0x540C	# <CJK>
+0xA651	0x540A	# <CJK>
+0xA652	0x5410	# <CJK>
+0xA653	0x5401	# <CJK>
+0xA654	0x540B	# <CJK>
+0xA655	0x5404	# <CJK>
+0xA656	0x5411	# <CJK>
+0xA657	0x540D	# <CJK>
+0xA658	0x5408	# <CJK>
+0xA659	0x5403	# <CJK>
+0xA65A	0x540E	# <CJK>
+0xA65B	0x5406	# <CJK>
+0xA65C	0x5412	# <CJK>
+0xA65D	0x56E0	# <CJK>
+0xA65E	0x56DE	# <CJK>
+0xA65F	0x56DD	# <CJK>
+0xA660	0x5733	# <CJK>
+0xA661	0x5730	# <CJK>
+0xA662	0x5728	# <CJK>
+0xA663	0x572D	# <CJK>
+0xA664	0x572C	# <CJK>
+0xA665	0x572F	# <CJK>
+0xA666	0x5729	# <CJK>
+0xA667	0x5919	# <CJK>
+0xA668	0x591A	# <CJK>
+0xA669	0x5937	# <CJK>
+0xA66A	0x5938	# <CJK>
+0xA66B	0x5984	# <CJK>
+0xA66C	0x5978	# <CJK>
+0xA66D	0x5983	# <CJK>
+0xA66E	0x597D	# <CJK>
+0xA66F	0x5979	# <CJK>
+0xA670	0x5982	# <CJK>
+0xA671	0x5981	# <CJK>
+0xA672	0x5B57	# <CJK>
+0xA673	0x5B58	# <CJK>
+0xA674	0x5B87	# <CJK>
+0xA675	0x5B88	# <CJK>
+0xA676	0x5B85	# <CJK>
+0xA677	0x5B89	# <CJK>
+0xA678	0x5BFA	# <CJK>
+0xA679	0x5C16	# <CJK>
+0xA67A	0x5C79	# <CJK>
+0xA67B	0x5DDE	# <CJK>
+0xA67C	0x5E06	# <CJK>
+0xA67D	0x5E76	# <CJK>
+0xA67E	0x5E74	# <CJK>
+0xA6A1	0x5F0F	# <CJK>
+0xA6A2	0x5F1B	# <CJK>
+0xA6A3	0x5FD9	# <CJK>
+0xA6A4	0x5FD6	# <CJK>
+0xA6A5	0x620E	# <CJK>
+0xA6A6	0x620C	# <CJK>
+0xA6A7	0x620D	# <CJK>
+0xA6A8	0x6210	# <CJK>
+0xA6A9	0x6263	# <CJK>
+0xA6AA	0x625B	# <CJK>
+0xA6AB	0x6258	# <CJK>
+0xA6AC	0x6536	# <CJK>
+0xA6AD	0x65E9	# <CJK>
+0xA6AE	0x65E8	# <CJK>
+0xA6AF	0x65EC	# <CJK>
+0xA6B0	0x65ED	# <CJK>
+0xA6B1	0x66F2	# <CJK>
+0xA6B2	0x66F3	# <CJK>
+0xA6B3	0x6709	# <CJK>
+0xA6B4	0x673D	# <CJK>
+0xA6B5	0x6734	# <CJK>
+0xA6B6	0x6731	# <CJK>
+0xA6B7	0x6735	# <CJK>
+0xA6B8	0x6B21	# <CJK>
+0xA6B9	0x6B64	# <CJK>
+0xA6BA	0x6B7B	# <CJK>
+0xA6BB	0x6C16	# <CJK>
+0xA6BC	0x6C5D	# <CJK>
+0xA6BD	0x6C57	# <CJK>
+0xA6BE	0x6C59	# <CJK>
+0xA6BF	0x6C5F	# <CJK>
+0xA6C0	0x6C60	# <CJK>
+0xA6C1	0x6C50	# <CJK>
+0xA6C2	0x6C55	# <CJK>
+0xA6C3	0x6C61	# <CJK>
+0xA6C4	0x6C5B	# <CJK>
+0xA6C5	0x6C4D	# <CJK>
+0xA6C6	0x6C4E	# <CJK>
+0xA6C7	0x7070	# <CJK>
+0xA6C8	0x725F	# <CJK>
+0xA6C9	0x725D	# <CJK>
+0xA6CA	0x767E	# <CJK>
+0xA6CB	0x7AF9	# <CJK>
+0xA6CC	0x7C73	# <CJK>
+0xA6CD	0x7CF8	# <CJK>
+0xA6CE	0x7F36	# <CJK>
+0xA6CF	0x7F8A	# <CJK>
+0xA6D0	0x7FBD	# <CJK>
+0xA6D1	0x8001	# <CJK>
+0xA6D2	0x8003	# <CJK>
+0xA6D3	0x800C	# <CJK>
+0xA6D4	0x8012	# <CJK>
+0xA6D5	0x8033	# <CJK>
+0xA6D6	0x807F	# <CJK>
+0xA6D7	0x8089	# <CJK>
+0xA6D8	0x808B	# <CJK>
+0xA6D9	0x808C	# <CJK>
+0xA6DA	0x81E3	# <CJK>
+0xA6DB	0x81EA	# <CJK>
+0xA6DC	0x81F3	# <CJK>
+0xA6DD	0x81FC	# <CJK>
+0xA6DE	0x820C	# <CJK>
+0xA6DF	0x821B	# <CJK>
+0xA6E0	0x821F	# <CJK>
+0xA6E1	0x826E	# <CJK>
+0xA6E2	0x8272	# <CJK>
+0xA6E3	0x827E	# <CJK>
+0xA6E4	0x866B	# <CJK>
+0xA6E5	0x8840	# <CJK>
+0xA6E6	0x884C	# <CJK>
+0xA6E7	0x8863	# <CJK>
+0xA6E8	0x897F	# <CJK>
+0xA6E9	0x9621	# <CJK>
+0xA6EA	0x4E32	# <CJK>
+0xA6EB	0x4EA8	# <CJK>
+0xA6EC	0x4F4D	# <CJK>
+0xA6ED	0x4F4F	# <CJK>
+0xA6EE	0x4F47	# <CJK>
+0xA6EF	0x4F57	# <CJK>
+0xA6F0	0x4F5E	# <CJK>
+0xA6F1	0x4F34	# <CJK>
+0xA6F2	0x4F5B	# <CJK>
+0xA6F3	0x4F55	# <CJK>
+0xA6F4	0x4F30	# <CJK>
+0xA6F5	0x4F50	# <CJK>
+0xA6F6	0x4F51	# <CJK>
+0xA6F7	0x4F3D	# <CJK>
+0xA6F8	0x4F3A	# <CJK>
+0xA6F9	0x4F38	# <CJK>
+0xA6FA	0x4F43	# <CJK>
+0xA6FB	0x4F54	# <CJK>
+0xA6FC	0x4F3C	# <CJK>
+0xA6FD	0x4F46	# <CJK>
+0xA6FE	0x4F63	# <CJK>
+0xA740	0x4F5C	# <CJK>
+0xA741	0x4F60	# <CJK>
+0xA742	0x4F2F	# <CJK>
+0xA743	0x4F4E	# <CJK>
+0xA744	0x4F36	# <CJK>
+0xA745	0x4F59	# <CJK>
+0xA746	0x4F5D	# <CJK>
+0xA747	0x4F48	# <CJK>
+0xA748	0x4F5A	# <CJK>
+0xA749	0x514C	# <CJK>
+0xA74A	0x514B	# <CJK>
+0xA74B	0x514D	# <CJK>
+0xA74C	0x5175	# <CJK>
+0xA74D	0x51B6	# <CJK>
+0xA74E	0x51B7	# <CJK>
+0xA74F	0x5225	# <CJK>
+0xA750	0x5224	# <CJK>
+0xA751	0x5229	# <CJK>
+0xA752	0x522A	# <CJK>
+0xA753	0x5228	# <CJK>
+0xA754	0x52AB	# <CJK>
+0xA755	0x52A9	# <CJK>
+0xA756	0x52AA	# <CJK>
+0xA757	0x52AC	# <CJK>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 11:59:56 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 5CFD6106566B;
	Wed,  5 Aug 2009 11:59:56 +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 4AC1B8FC13;
	Wed,  5 Aug 2009 11:59:56 +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 n75Bxu3x067564;
	Wed, 5 Aug 2009 11:59:56 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75Bxu4r067558;
	Wed, 5 Aug 2009 11:59:56 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908051159.n75Bxu4r067558@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 11:59:56 +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: r196070 - in user/edwin/locale/tools: . charmaps
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 11:59:56 -0000

Author: edwin
Date: Wed Aug  5 11:59:56 2009
New Revision: 196070
URL: http://svn.freebsd.org/changeset/base/196070

Log:
  Add support for GB2312 charmaps.

Added:
  user/edwin/locale/tools/charmaps/GB2312.TXT
Modified:
  user/edwin/locale/tools/charmaps.pm
  user/edwin/locale/tools/charmaps.xml
  user/edwin/locale/tools/cldr2def.pl

Modified: user/edwin/locale/tools/charmaps.pm
==============================================================================
--- user/edwin/locale/tools/charmaps.pm	Wed Aug  5 07:47:28 2009	(r196069)
+++ user/edwin/locale/tools/charmaps.pm	Wed Aug  5 11:59:56 2009	(r196070)
@@ -94,6 +94,11 @@ sub h_start {
 				my $uc = $attrs{unicode};
 				$d{T}{$e}{$k}{unicode} = $uc;
 			}
+			if (defined $attrs{ucc}) {
+				my $k = $attrs{cldr};
+				my $uc = $attrs{ucc};
+				$d{T}{$e}{$k}{ucc} = $uc;
+			}
 		}
 		return;
 	}

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Wed Aug  5 07:47:28 2009	(r196069)
+++ user/edwin/locale/tools/charmaps.xml	Wed Aug  5 11:59:56 2009	(r196070)
@@ -380,6 +380,87 @@
 
 	<!-- Copied from the original FreeBSD src/share/timedef -->
 
+
+	<translation encoding="GB2312" cldr="C"
+	    unicode="FULLWIDTH LATIN CAPITAL LETTER C" />
+	<translation encoding="GB2312" cldr="N"
+	    unicode="FULLWIDTH LATIN CAPITAL LETTER N" />
+	<translation encoding="GB2312" cldr="Y"
+	    unicode="FULLWIDTH LATIN CAPITAL LETTER Y" />
+	<translation encoding="GB2312" cldr="one"
+	    unicode="FULLWIDTH DIGIT ONE" />
+	<translation encoding="GB2312" cldr="two"
+	    unicode="FULLWIDTH DIGIT TWO" />
+	<translation encoding="GB2312" cldr="three"
+	    unicode="FULLWIDTH DIGIT THREE" />
+	<translation encoding="GB2312" cldr="four"
+	    unicode="FULLWIDTH DIGIT FOUR" />
+	<translation encoding="GB2312" cldr="five"
+	    unicode="FULLWIDTH DIGIT FIVE" />
+	<translation encoding="GB2312" cldr="six"
+	    unicode="FULLWIDTH DIGIT SIX" />
+	<translation encoding="GB2312" cldr="seven"
+	    unicode="FULLWIDTH DIGIT SEVEN" />
+	<translation encoding="GB2312" cldr="eight"
+	    unicode="FULLWIDTH DIGIT EIGHT" />
+	<translation encoding="GB2312" cldr="nine"
+	    unicode="FULLWIDTH DIGIT NINE" />
+	<translation encoding="GB2312" cldr="zero"
+	    unicode="FULLWIDTH DIGIT ZERO" />
+	<translation encoding="GB2312" cldr="space"
+	    unicode="IDEOGRAPHIC SPACE" />
+	<translation encoding="GB2312" cldr="FULL STOP"
+	    unicode="FULLWIDTH FULL STOP" />
+	<translation encoding="GB2312" cldr="COMMA"
+	    unicode="FULLWIDTH COMMA" />
+	<translation encoding="GB2312" cldr="HYPHEN-MINUS"
+	    unicode="FULLWIDTH HYPHEN-MINUS" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-4E00" ucc="4E00" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-4E09" ucc="4E09" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-4E0A" ucc="4E0A" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-4E0B" ucc="4E0B" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-4E8C" ucc="4E8C" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-4E94" ucc="4E94" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-516D" ucc="516D" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-5206" ucc="5206" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-5348" ucc="5348" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-5426" ucc="5426" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-5468" ucc="5468" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-56DB" ucc="56DB" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-5B9A" ucc="5B9A" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-5E74" ucc="5E74" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-65E5" ucc="65E5" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-65F6" ucc="65F6" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-661F" ucc="661F" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-662F" ucc="662F" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-6708" ucc="6708" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-671F" ucc="671F" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-786E" ucc="786E" />
+	<translation encoding="GB2312"
+	    cldr="CJK UNIFIED IDEOGRAPH-79D2" ucc="79D2" />
+
+
 </translations>
 
 <oldtranslations>

Added: user/edwin/locale/tools/charmaps/GB2312.TXT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/charmaps/GB2312.TXT	Wed Aug  5 11:59:56 2009	(r196070)
@@ -0,0 +1,7510 @@
+#
+#	Name:             GB2312-80 to Unicode table (complete, hex format)
+#	Unicode version:  3.0
+#	Table version:    1.0
+#	Table format:     Format A
+#	Date:             1999 October 8
+#	Author:           Ken Whistler <kenw@sybase.com>
+#       Original authors: Glenn Adams, John H. Jenkin <jenkins@apple.com>
+#
+#	Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+#
+#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+#	No claims are made as to fitness for any particular purpose.  No
+#	warranties of any kind are expressed or implied.  The recipient
+#	agrees to determine applicability of information provided.  If this
+#	file has been provided on optical media by Unicode, Inc., the sole
+#	remedy for any claim will be exchange of defective media within 90
+#	days of receipt.
+#
+#	Unicode, Inc. hereby grants the right to freely use the information
+#	supplied in this file in the creation of products supporting the
+#	Unicode Standard, and to make copies of this file in any form for
+#	internal or external distribution as long as this notice remains
+#	attached.
+#
+#	General notes:
+#
+#	This table contains the datathe Unicode Consortium currently has on how
+#       GB2312-80 characters map into Unicode.
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the GB2312 code (in hex as 0xXXXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#					The official names for Unicode characters U+4E00
+#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#					where XXXX is the code point.  Including all these
+#					names in this file increases its size substantially
+#					and needlessly.  The token "<CJK>" is used for the
+#					name of these characters.  If necessary, it can be
+#					expanded algorithmically by a parser or editor.
+#
+#	The entries are in GB2312 order
+#
+#	The following algorithms can be used to change the hex form
+#		of GB2312 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#		To change hex to kuten form, first subtract 0x2020.  Then
+#			the high and low bytes correspond to the ku and ten of
+#			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
+#			0x777E -> 0x575E -> 8794
+#
+#	Version history
+#	1.0 version updates 0.0d2 version by correcting mapping for 0x212C
+#             from U+2225 to U+2016.
+#
+#	Updated versions of this file may be found in:
+#		<ftp://ftp.unicode.org/Public/MAPPINGS/>
+#
+#	Any comments or problems, contact <errata@unicode.orgm>
+#	Please note that <errata@unicode.org> is an archival address;
+#	notices will be checked, but do not expect an immediate response.
+#
+#
+0x2121	0x3000	# IDEOGRAPHIC SPACE
+0x2122	0x3001	# IDEOGRAPHIC COMMA
+0x2123	0x3002	# IDEOGRAPHIC FULL STOP
+0x2124	0x30FB	# KATAKANA MIDDLE DOT
+0x2125	0x02C9	# MODIFIER LETTER MACRON (Mandarin Chinese first tone)
+0x2126	0x02C7	# CARON (Mandarin Chinese third tone)
+0x2127	0x00A8	# DIAERESIS
+0x2128	0x3003	# DITTO MARK
+0x2129	0x3005	# IDEOGRAPHIC ITERATION MARK
+0x212A	0x2015	# HORIZONTAL BAR
+0x212B	0xFF5E	# FULLWIDTH TILDE
+0x212C	0x2016	# DOUBLE VERTICAL LINE
+0x212D	0x2026	# HORIZONTAL ELLIPSIS
+0x212E	0x2018	# LEFT SINGLE QUOTATION MARK
+0x212F	0x2019	# RIGHT SINGLE QUOTATION MARK
+0x2130	0x201C	# LEFT DOUBLE QUOTATION MARK
+0x2131	0x201D	# RIGHT DOUBLE QUOTATION MARK
+0x2132	0x3014	# LEFT TORTOISE SHELL BRACKET
+0x2133	0x3015	# RIGHT TORTOISE SHELL BRACKET
+0x2134	0x3008	# LEFT ANGLE BRACKET
+0x2135	0x3009	# RIGHT ANGLE BRACKET
+0x2136	0x300A	# LEFT DOUBLE ANGLE BRACKET
+0x2137	0x300B	# RIGHT DOUBLE ANGLE BRACKET
+0x2138	0x300C	# LEFT CORNER BRACKET
+0x2139	0x300D	# RIGHT CORNER BRACKET
+0x213A	0x300E	# LEFT WHITE CORNER BRACKET
+0x213B	0x300F	# RIGHT WHITE CORNER BRACKET
+0x213C	0x3016	# LEFT WHITE LENTICULAR BRACKET
+0x213D	0x3017	# RIGHT WHITE LENTICULAR BRACKET
+0x213E	0x3010	# LEFT BLACK LENTICULAR BRACKET
+0x213F	0x3011	# RIGHT BLACK LENTICULAR BRACKET
+0x2140	0x00B1	# PLUS-MINUS SIGN
+0x2141	0x00D7	# MULTIPLICATION SIGN
+0x2142	0x00F7	# DIVISION SIGN
+0x2143	0x2236	# RATIO
+0x2144	0x2227	# LOGICAL AND
+0x2145	0x2228	# LOGICAL OR
+0x2146	0x2211	# N-ARY SUMMATION
+0x2147	0x220F	# N-ARY PRODUCT
+0x2148	0x222A	# UNION
+0x2149	0x2229	# INTERSECTION
+0x214A	0x2208	# ELEMENT OF
+0x214B	0x2237	# PROPORTION
+0x214C	0x221A	# SQUARE ROOT
+0x214D	0x22A5	# UP TACK
+0x214E	0x2225	# PARALLEL TO
+0x214F	0x2220	# ANGLE
+0x2150	0x2312	# ARC
+0x2151	0x2299	# CIRCLED DOT OPERATOR
+0x2152	0x222B	# INTEGRAL
+0x2153	0x222E	# CONTOUR INTEGRAL
+0x2154	0x2261	# IDENTICAL TO
+0x2155	0x224C	# ALL EQUAL TO
+0x2156	0x2248	# ALMOST EQUAL TO
+0x2157	0x223D	# REVERSED TILDE
+0x2158	0x221D	# PROPORTIONAL TO
+0x2159	0x2260	# NOT EQUAL TO
+0x215A	0x226E	# NOT LESS-THAN
+0x215B	0x226F	# NOT GREATER-THAN
+0x215C	0x2264	# LESS-THAN OR EQUAL TO
+0x215D	0x2265	# GREATER-THAN OR EQUAL TO
+0x215E	0x221E	# INFINITY
+0x215F	0x2235	# BECAUSE
+0x2160	0x2234	# THEREFORE
+0x2161	0x2642	# MALE SIGN
+0x2162	0x2640	# FEMALE SIGN
+0x2163	0x00B0	# DEGREE SIGN
+0x2164	0x2032	# PRIME
+0x2165	0x2033	# DOUBLE PRIME
+0x2166	0x2103	# DEGREE CELSIUS
+0x2167	0xFF04	# FULLWIDTH DOLLAR SIGN
+0x2168	0x00A4	# CURRENCY SIGN
+0x2169	0xFFE0	# FULLWIDTH CENT SIGN
+0x216A	0xFFE1	# FULLWIDTH POUND SIGN
+0x216B	0x2030	# PER MILLE SIGN
+0x216C	0x00A7	# SECTION SIGN
+0x216D	0x2116	# NUMERO SIGN
+0x216E	0x2606	# WHITE STAR
+0x216F	0x2605	# BLACK STAR
+0x2170	0x25CB	# WHITE CIRCLE
+0x2171	0x25CF	# BLACK CIRCLE
+0x2172	0x25CE	# BULLSEYE
+0x2173	0x25C7	# WHITE DIAMOND
+0x2174	0x25C6	# BLACK DIAMOND
+0x2175	0x25A1	# WHITE SQUARE
+0x2176	0x25A0	# BLACK SQUARE
+0x2177	0x25B3	# WHITE UP-POINTING TRIANGLE
+0x2178	0x25B2	# BLACK UP-POINTING TRIANGLE
+0x2179	0x203B	# REFERENCE MARK
+0x217A	0x2192	# RIGHTWARDS ARROW
+0x217B	0x2190	# LEFTWARDS ARROW
+0x217C	0x2191	# UPWARDS ARROW
+0x217D	0x2193	# DOWNWARDS ARROW
+0x217E	0x3013	# GETA MARK
+0x2231	0x2488	# DIGIT ONE FULL STOP
+0x2232	0x2489	# DIGIT TWO FULL STOP
+0x2233	0x248A	# DIGIT THREE FULL STOP
+0x2234	0x248B	# DIGIT FOUR FULL STOP
+0x2235	0x248C	# DIGIT FIVE FULL STOP
+0x2236	0x248D	# DIGIT SIX FULL STOP
+0x2237	0x248E	# DIGIT SEVEN FULL STOP
+0x2238	0x248F	# DIGIT EIGHT FULL STOP
+0x2239	0x2490	# DIGIT NINE FULL STOP
+0x223A	0x2491	# NUMBER TEN FULL STOP
+0x223B	0x2492	# NUMBER ELEVEN FULL STOP
+0x223C	0x2493	# NUMBER TWELVE FULL STOP
+0x223D	0x2494	# NUMBER THIRTEEN FULL STOP
+0x223E	0x2495	# NUMBER FOURTEEN FULL STOP
+0x223F	0x2496	# NUMBER FIFTEEN FULL STOP
+0x2240	0x2497	# NUMBER SIXTEEN FULL STOP
+0x2241	0x2498	# NUMBER SEVENTEEN FULL STOP
+0x2242	0x2499	# NUMBER EIGHTEEN FULL STOP
+0x2243	0x249A	# NUMBER NINETEEN FULL STOP
+0x2244	0x249B	# NUMBER TWENTY FULL STOP
+0x2245	0x2474	# PARENTHESIZED DIGIT ONE
+0x2246	0x2475	# PARENTHESIZED DIGIT TWO
+0x2247	0x2476	# PARENTHESIZED DIGIT THREE
+0x2248	0x2477	# PARENTHESIZED DIGIT FOUR
+0x2249	0x2478	# PARENTHESIZED DIGIT FIVE
+0x224A	0x2479	# PARENTHESIZED DIGIT SIX
+0x224B	0x247A	# PARENTHESIZED DIGIT SEVEN
+0x224C	0x247B	# PARENTHESIZED DIGIT EIGHT
+0x224D	0x247C	# PARENTHESIZED DIGIT NINE
+0x224E	0x247D	# PARENTHESIZED NUMBER TEN
+0x224F	0x247E	# PARENTHESIZED NUMBER ELEVEN
+0x2250	0x247F	# PARENTHESIZED NUMBER TWELVE
+0x2251	0x2480	# PARENTHESIZED NUMBER THIRTEEN
+0x2252	0x2481	# PARENTHESIZED NUMBER FOURTEEN
+0x2253	0x2482	# PARENTHESIZED NUMBER FIFTEEN
+0x2254	0x2483	# PARENTHESIZED NUMBER SIXTEEN
+0x2255	0x2484	# PARENTHESIZED NUMBER SEVENTEEN
+0x2256	0x2485	# PARENTHESIZED NUMBER EIGHTEEN
+0x2257	0x2486	# PARENTHESIZED NUMBER NINETEEN
+0x2258	0x2487	# PARENTHESIZED NUMBER TWENTY
+0x2259	0x2460	# CIRCLED DIGIT ONE
+0x225A	0x2461	# CIRCLED DIGIT TWO
+0x225B	0x2462	# CIRCLED DIGIT THREE
+0x225C	0x2463	# CIRCLED DIGIT FOUR
+0x225D	0x2464	# CIRCLED DIGIT FIVE
+0x225E	0x2465	# CIRCLED DIGIT SIX
+0x225F	0x2466	# CIRCLED DIGIT SEVEN
+0x2260	0x2467	# CIRCLED DIGIT EIGHT
+0x2261	0x2468	# CIRCLED DIGIT NINE
+0x2262	0x2469	# CIRCLED NUMBER TEN
+0x2265	0x3220	# PARENTHESIZED IDEOGRAPH ONE
+0x2266	0x3221	# PARENTHESIZED IDEOGRAPH TWO
+0x2267	0x3222	# PARENTHESIZED IDEOGRAPH THREE
+0x2268	0x3223	# PARENTHESIZED IDEOGRAPH FOUR
+0x2269	0x3224	# PARENTHESIZED IDEOGRAPH FIVE
+0x226A	0x3225	# PARENTHESIZED IDEOGRAPH SIX
+0x226B	0x3226	# PARENTHESIZED IDEOGRAPH SEVEN
+0x226C	0x3227	# PARENTHESIZED IDEOGRAPH EIGHT
+0x226D	0x3228	# PARENTHESIZED IDEOGRAPH NINE
+0x226E	0x3229	# PARENTHESIZED IDEOGRAPH TEN
+0x2271	0x2160	# ROMAN NUMERAL ONE
+0x2272	0x2161	# ROMAN NUMERAL TWO
+0x2273	0x2162	# ROMAN NUMERAL THREE
+0x2274	0x2163	# ROMAN NUMERAL FOUR
+0x2275	0x2164	# ROMAN NUMERAL FIVE
+0x2276	0x2165	# ROMAN NUMERAL SIX
+0x2277	0x2166	# ROMAN NUMERAL SEVEN
+0x2278	0x2167	# ROMAN NUMERAL EIGHT
+0x2279	0x2168	# ROMAN NUMERAL NINE
+0x227A	0x2169	# ROMAN NUMERAL TEN
+0x227B	0x216A	# ROMAN NUMERAL ELEVEN
+0x227C	0x216B	# ROMAN NUMERAL TWELVE
+0x2321	0xFF01	# FULLWIDTH EXCLAMATION MARK
+0x2322	0xFF02	# FULLWIDTH QUOTATION MARK
+0x2323	0xFF03	# FULLWIDTH NUMBER SIGN
+0x2324	0xFFE5	# FULLWIDTH YEN SIGN
+0x2325	0xFF05	# FULLWIDTH PERCENT SIGN
+0x2326	0xFF06	# FULLWIDTH AMPERSAND
+0x2327	0xFF07	# FULLWIDTH APOSTROPHE
+0x2328	0xFF08	# FULLWIDTH LEFT PARENTHESIS
+0x2329	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
+0x232A	0xFF0A	# FULLWIDTH ASTERISK
+0x232B	0xFF0B	# FULLWIDTH PLUS SIGN
+0x232C	0xFF0C	# FULLWIDTH COMMA
+0x232D	0xFF0D	# FULLWIDTH HYPHEN-MINUS
+0x232E	0xFF0E	# FULLWIDTH FULL STOP
+0x232F	0xFF0F	# FULLWIDTH SOLIDUS
+0x2330	0xFF10	# FULLWIDTH DIGIT ZERO
+0x2331	0xFF11	# FULLWIDTH DIGIT ONE
+0x2332	0xFF12	# FULLWIDTH DIGIT TWO
+0x2333	0xFF13	# FULLWIDTH DIGIT THREE
+0x2334	0xFF14	# FULLWIDTH DIGIT FOUR
+0x2335	0xFF15	# FULLWIDTH DIGIT FIVE
+0x2336	0xFF16	# FULLWIDTH DIGIT SIX
+0x2337	0xFF17	# FULLWIDTH DIGIT SEVEN
+0x2338	0xFF18	# FULLWIDTH DIGIT EIGHT
+0x2339	0xFF19	# FULLWIDTH DIGIT NINE
+0x233A	0xFF1A	# FULLWIDTH COLON
+0x233B	0xFF1B	# FULLWIDTH SEMICOLON
+0x233C	0xFF1C	# FULLWIDTH LESS-THAN SIGN
+0x233D	0xFF1D	# FULLWIDTH EQUALS SIGN
+0x233E	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
+0x233F	0xFF1F	# FULLWIDTH QUESTION MARK
+0x2340	0xFF20	# FULLWIDTH COMMERCIAL AT
+0x2341	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
+0x2342	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
+0x2343	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
+0x2344	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
+0x2345	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
+0x2346	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
+0x2347	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
+0x2348	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
+0x2349	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
+0x234A	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
+0x234B	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
+0x234C	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
+0x234D	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
+0x234E	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
+0x234F	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
+0x2350	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
+0x2351	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
+0x2352	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
+0x2353	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
+0x2354	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
+0x2355	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
+0x2356	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
+0x2357	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
+0x2358	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
+0x2359	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
+0x235A	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
+0x235B	0xFF3B	# FULLWIDTH LEFT SQUARE BRACKET
+0x235C	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
+0x235D	0xFF3D	# FULLWIDTH RIGHT SQUARE BRACKET
+0x235E	0xFF3E	# FULLWIDTH CIRCUMFLEX ACCENT
+0x235F	0xFF3F	# FULLWIDTH LOW LINE
+0x2360	0xFF40	# FULLWIDTH GRAVE ACCENT
+0x2361	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
+0x2362	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
+0x2363	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
+0x2364	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
+0x2365	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
+0x2366	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
+0x2367	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
+0x2368	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
+0x2369	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
+0x236A	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
+0x236B	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
+0x236C	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
+0x236D	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
+0x236E	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
+0x236F	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
+0x2370	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
+0x2371	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
+0x2372	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
+0x2373	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
+0x2374	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
+0x2375	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
+0x2376	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
+0x2377	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
+0x2378	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
+0x2379	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
+0x237A	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
+0x237B	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
+0x237C	0xFF5C	# FULLWIDTH VERTICAL LINE
+0x237D	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
+0x237E	0xFFE3	# FULLWIDTH MACRON
+0x2421	0x3041	# HIRAGANA LETTER SMALL A
+0x2422	0x3042	# HIRAGANA LETTER A
+0x2423	0x3043	# HIRAGANA LETTER SMALL I
+0x2424	0x3044	# HIRAGANA LETTER I
+0x2425	0x3045	# HIRAGANA LETTER SMALL U
+0x2426	0x3046	# HIRAGANA LETTER U
+0x2427	0x3047	# HIRAGANA LETTER SMALL E
+0x2428	0x3048	# HIRAGANA LETTER E
+0x2429	0x3049	# HIRAGANA LETTER SMALL O
+0x242A	0x304A	# HIRAGANA LETTER O
+0x242B	0x304B	# HIRAGANA LETTER KA
+0x242C	0x304C	# HIRAGANA LETTER GA
+0x242D	0x304D	# HIRAGANA LETTER KI
+0x242E	0x304E	# HIRAGANA LETTER GI
+0x242F	0x304F	# HIRAGANA LETTER KU
+0x2430	0x3050	# HIRAGANA LETTER GU
+0x2431	0x3051	# HIRAGANA LETTER KE
+0x2432	0x3052	# HIRAGANA LETTER GE
+0x2433	0x3053	# HIRAGANA LETTER KO
+0x2434	0x3054	# HIRAGANA LETTER GO
+0x2435	0x3055	# HIRAGANA LETTER SA
+0x2436	0x3056	# HIRAGANA LETTER ZA
+0x2437	0x3057	# HIRAGANA LETTER SI
+0x2438	0x3058	# HIRAGANA LETTER ZI
+0x2439	0x3059	# HIRAGANA LETTER SU
+0x243A	0x305A	# HIRAGANA LETTER ZU
+0x243B	0x305B	# HIRAGANA LETTER SE
+0x243C	0x305C	# HIRAGANA LETTER ZE
+0x243D	0x305D	# HIRAGANA LETTER SO
+0x243E	0x305E	# HIRAGANA LETTER ZO
+0x243F	0x305F	# HIRAGANA LETTER TA
+0x2440	0x3060	# HIRAGANA LETTER DA
+0x2441	0x3061	# HIRAGANA LETTER TI
+0x2442	0x3062	# HIRAGANA LETTER DI
+0x2443	0x3063	# HIRAGANA LETTER SMALL TU
+0x2444	0x3064	# HIRAGANA LETTER TU
+0x2445	0x3065	# HIRAGANA LETTER DU
+0x2446	0x3066	# HIRAGANA LETTER TE
+0x2447	0x3067	# HIRAGANA LETTER DE
+0x2448	0x3068	# HIRAGANA LETTER TO
+0x2449	0x3069	# HIRAGANA LETTER DO
+0x244A	0x306A	# HIRAGANA LETTER NA
+0x244B	0x306B	# HIRAGANA LETTER NI
+0x244C	0x306C	# HIRAGANA LETTER NU
+0x244D	0x306D	# HIRAGANA LETTER NE
+0x244E	0x306E	# HIRAGANA LETTER NO
+0x244F	0x306F	# HIRAGANA LETTER HA
+0x2450	0x3070	# HIRAGANA LETTER BA
+0x2451	0x3071	# HIRAGANA LETTER PA
+0x2452	0x3072	# HIRAGANA LETTER HI
+0x2453	0x3073	# HIRAGANA LETTER BI
+0x2454	0x3074	# HIRAGANA LETTER PI
+0x2455	0x3075	# HIRAGANA LETTER HU
+0x2456	0x3076	# HIRAGANA LETTER BU
+0x2457	0x3077	# HIRAGANA LETTER PU
+0x2458	0x3078	# HIRAGANA LETTER HE
+0x2459	0x3079	# HIRAGANA LETTER BE
+0x245A	0x307A	# HIRAGANA LETTER PE
+0x245B	0x307B	# HIRAGANA LETTER HO
+0x245C	0x307C	# HIRAGANA LETTER BO
+0x245D	0x307D	# HIRAGANA LETTER PO
+0x245E	0x307E	# HIRAGANA LETTER MA
+0x245F	0x307F	# HIRAGANA LETTER MI
+0x2460	0x3080	# HIRAGANA LETTER MU
+0x2461	0x3081	# HIRAGANA LETTER ME
+0x2462	0x3082	# HIRAGANA LETTER MO
+0x2463	0x3083	# HIRAGANA LETTER SMALL YA
+0x2464	0x3084	# HIRAGANA LETTER YA
+0x2465	0x3085	# HIRAGANA LETTER SMALL YU
+0x2466	0x3086	# HIRAGANA LETTER YU
+0x2467	0x3087	# HIRAGANA LETTER SMALL YO
+0x2468	0x3088	# HIRAGANA LETTER YO
+0x2469	0x3089	# HIRAGANA LETTER RA
+0x246A	0x308A	# HIRAGANA LETTER RI
+0x246B	0x308B	# HIRAGANA LETTER RU
+0x246C	0x308C	# HIRAGANA LETTER RE
+0x246D	0x308D	# HIRAGANA LETTER RO
+0x246E	0x308E	# HIRAGANA LETTER SMALL WA
+0x246F	0x308F	# HIRAGANA LETTER WA
+0x2470	0x3090	# HIRAGANA LETTER WI
+0x2471	0x3091	# HIRAGANA LETTER WE
+0x2472	0x3092	# HIRAGANA LETTER WO
+0x2473	0x3093	# HIRAGANA LETTER N
+0x2521	0x30A1	# KATAKANA LETTER SMALL A
+0x2522	0x30A2	# KATAKANA LETTER A
+0x2523	0x30A3	# KATAKANA LETTER SMALL I
+0x2524	0x30A4	# KATAKANA LETTER I
+0x2525	0x30A5	# KATAKANA LETTER SMALL U
+0x2526	0x30A6	# KATAKANA LETTER U
+0x2527	0x30A7	# KATAKANA LETTER SMALL E
+0x2528	0x30A8	# KATAKANA LETTER E
+0x2529	0x30A9	# KATAKANA LETTER SMALL O
+0x252A	0x30AA	# KATAKANA LETTER O
+0x252B	0x30AB	# KATAKANA LETTER KA
+0x252C	0x30AC	# KATAKANA LETTER GA
+0x252D	0x30AD	# KATAKANA LETTER KI
+0x252E	0x30AE	# KATAKANA LETTER GI
+0x252F	0x30AF	# KATAKANA LETTER KU
+0x2530	0x30B0	# KATAKANA LETTER GU
+0x2531	0x30B1	# KATAKANA LETTER KE
+0x2532	0x30B2	# KATAKANA LETTER GE
+0x2533	0x30B3	# KATAKANA LETTER KO
+0x2534	0x30B4	# KATAKANA LETTER GO
+0x2535	0x30B5	# KATAKANA LETTER SA
+0x2536	0x30B6	# KATAKANA LETTER ZA
+0x2537	0x30B7	# KATAKANA LETTER SI
+0x2538	0x30B8	# KATAKANA LETTER ZI
+0x2539	0x30B9	# KATAKANA LETTER SU
+0x253A	0x30BA	# KATAKANA LETTER ZU
+0x253B	0x30BB	# KATAKANA LETTER SE
+0x253C	0x30BC	# KATAKANA LETTER ZE
+0x253D	0x30BD	# KATAKANA LETTER SO
+0x253E	0x30BE	# KATAKANA LETTER ZO
+0x253F	0x30BF	# KATAKANA LETTER TA
+0x2540	0x30C0	# KATAKANA LETTER DA
+0x2541	0x30C1	# KATAKANA LETTER TI
+0x2542	0x30C2	# KATAKANA LETTER DI
+0x2543	0x30C3	# KATAKANA LETTER SMALL TU
+0x2544	0x30C4	# KATAKANA LETTER TU
+0x2545	0x30C5	# KATAKANA LETTER DU
+0x2546	0x30C6	# KATAKANA LETTER TE
+0x2547	0x30C7	# KATAKANA LETTER DE
+0x2548	0x30C8	# KATAKANA LETTER TO
+0x2549	0x30C9	# KATAKANA LETTER DO
+0x254A	0x30CA	# KATAKANA LETTER NA
+0x254B	0x30CB	# KATAKANA LETTER NI
+0x254C	0x30CC	# KATAKANA LETTER NU
+0x254D	0x30CD	# KATAKANA LETTER NE
+0x254E	0x30CE	# KATAKANA LETTER NO
+0x254F	0x30CF	# KATAKANA LETTER HA
+0x2550	0x30D0	# KATAKANA LETTER BA
+0x2551	0x30D1	# KATAKANA LETTER PA
+0x2552	0x30D2	# KATAKANA LETTER HI
+0x2553	0x30D3	# KATAKANA LETTER BI
+0x2554	0x30D4	# KATAKANA LETTER PI
+0x2555	0x30D5	# KATAKANA LETTER HU
+0x2556	0x30D6	# KATAKANA LETTER BU
+0x2557	0x30D7	# KATAKANA LETTER PU
+0x2558	0x30D8	# KATAKANA LETTER HE
+0x2559	0x30D9	# KATAKANA LETTER BE
+0x255A	0x30DA	# KATAKANA LETTER PE
+0x255B	0x30DB	# KATAKANA LETTER HO
+0x255C	0x30DC	# KATAKANA LETTER BO
+0x255D	0x30DD	# KATAKANA LETTER PO
+0x255E	0x30DE	# KATAKANA LETTER MA
+0x255F	0x30DF	# KATAKANA LETTER MI
+0x2560	0x30E0	# KATAKANA LETTER MU
+0x2561	0x30E1	# KATAKANA LETTER ME
+0x2562	0x30E2	# KATAKANA LETTER MO
+0x2563	0x30E3	# KATAKANA LETTER SMALL YA
+0x2564	0x30E4	# KATAKANA LETTER YA
+0x2565	0x30E5	# KATAKANA LETTER SMALL YU
+0x2566	0x30E6	# KATAKANA LETTER YU
+0x2567	0x30E7	# KATAKANA LETTER SMALL YO
+0x2568	0x30E8	# KATAKANA LETTER YO
+0x2569	0x30E9	# KATAKANA LETTER RA
+0x256A	0x30EA	# KATAKANA LETTER RI
+0x256B	0x30EB	# KATAKANA LETTER RU
+0x256C	0x30EC	# KATAKANA LETTER RE
+0x256D	0x30ED	# KATAKANA LETTER RO
+0x256E	0x30EE	# KATAKANA LETTER SMALL WA
+0x256F	0x30EF	# KATAKANA LETTER WA
+0x2570	0x30F0	# KATAKANA LETTER WI
+0x2571	0x30F1	# KATAKANA LETTER WE
+0x2572	0x30F2	# KATAKANA LETTER WO
+0x2573	0x30F3	# KATAKANA LETTER N
+0x2574	0x30F4	# KATAKANA LETTER VU
+0x2575	0x30F5	# KATAKANA LETTER SMALL KA
+0x2576	0x30F6	# KATAKANA LETTER SMALL KE
+0x2621	0x0391	# GREEK CAPITAL LETTER ALPHA
+0x2622	0x0392	# GREEK CAPITAL LETTER BETA
+0x2623	0x0393	# GREEK CAPITAL LETTER GAMMA
+0x2624	0x0394	# GREEK CAPITAL LETTER DELTA
+0x2625	0x0395	# GREEK CAPITAL LETTER EPSILON
+0x2626	0x0396	# GREEK CAPITAL LETTER ZETA
+0x2627	0x0397	# GREEK CAPITAL LETTER ETA
+0x2628	0x0398	# GREEK CAPITAL LETTER THETA
+0x2629	0x0399	# GREEK CAPITAL LETTER IOTA
+0x262A	0x039A	# GREEK CAPITAL LETTER KAPPA
+0x262B	0x039B	# GREEK CAPITAL LETTER LAMDA
+0x262C	0x039C	# GREEK CAPITAL LETTER MU
+0x262D	0x039D	# GREEK CAPITAL LETTER NU
+0x262E	0x039E	# GREEK CAPITAL LETTER XI
+0x262F	0x039F	# GREEK CAPITAL LETTER OMICRON
+0x2630	0x03A0	# GREEK CAPITAL LETTER PI
+0x2631	0x03A1	# GREEK CAPITAL LETTER RHO
+0x2632	0x03A3	# GREEK CAPITAL LETTER SIGMA
+0x2633	0x03A4	# GREEK CAPITAL LETTER TAU
+0x2634	0x03A5	# GREEK CAPITAL LETTER UPSILON
+0x2635	0x03A6	# GREEK CAPITAL LETTER PHI
+0x2636	0x03A7	# GREEK CAPITAL LETTER CHI
+0x2637	0x03A8	# GREEK CAPITAL LETTER PSI
+0x2638	0x03A9	# GREEK CAPITAL LETTER OMEGA
+0x2641	0x03B1	# GREEK SMALL LETTER ALPHA
+0x2642	0x03B2	# GREEK SMALL LETTER BETA
+0x2643	0x03B3	# GREEK SMALL LETTER GAMMA
+0x2644	0x03B4	# GREEK SMALL LETTER DELTA
+0x2645	0x03B5	# GREEK SMALL LETTER EPSILON
+0x2646	0x03B6	# GREEK SMALL LETTER ZETA
+0x2647	0x03B7	# GREEK SMALL LETTER ETA
+0x2648	0x03B8	# GREEK SMALL LETTER THETA
+0x2649	0x03B9	# GREEK SMALL LETTER IOTA
+0x264A	0x03BA	# GREEK SMALL LETTER KAPPA
+0x264B	0x03BB	# GREEK SMALL LETTER LAMDA
+0x264C	0x03BC	# GREEK SMALL LETTER MU
+0x264D	0x03BD	# GREEK SMALL LETTER NU
+0x264E	0x03BE	# GREEK SMALL LETTER XI
+0x264F	0x03BF	# GREEK SMALL LETTER OMICRON
+0x2650	0x03C0	# GREEK SMALL LETTER PI
+0x2651	0x03C1	# GREEK SMALL LETTER RHO
+0x2652	0x03C3	# GREEK SMALL LETTER SIGMA
+0x2653	0x03C4	# GREEK SMALL LETTER TAU
+0x2654	0x03C5	# GREEK SMALL LETTER UPSILON
+0x2655	0x03C6	# GREEK SMALL LETTER PHI
+0x2656	0x03C7	# GREEK SMALL LETTER CHI
+0x2657	0x03C8	# GREEK SMALL LETTER PSI
+0x2658	0x03C9	# GREEK SMALL LETTER OMEGA
+0x2721	0x0410	# CYRILLIC CAPITAL LETTER A
+0x2722	0x0411	# CYRILLIC CAPITAL LETTER BE
+0x2723	0x0412	# CYRILLIC CAPITAL LETTER VE
+0x2724	0x0413	# CYRILLIC CAPITAL LETTER GHE
+0x2725	0x0414	# CYRILLIC CAPITAL LETTER DE
+0x2726	0x0415	# CYRILLIC CAPITAL LETTER IE
+0x2727	0x0401	# CYRILLIC CAPITAL LETTER IO
+0x2728	0x0416	# CYRILLIC CAPITAL LETTER ZHE
+0x2729	0x0417	# CYRILLIC CAPITAL LETTER ZE
+0x272A	0x0418	# CYRILLIC CAPITAL LETTER I
+0x272B	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
+0x272C	0x041A	# CYRILLIC CAPITAL LETTER KA
+0x272D	0x041B	# CYRILLIC CAPITAL LETTER EL
+0x272E	0x041C	# CYRILLIC CAPITAL LETTER EM
+0x272F	0x041D	# CYRILLIC CAPITAL LETTER EN
+0x2730	0x041E	# CYRILLIC CAPITAL LETTER O
+0x2731	0x041F	# CYRILLIC CAPITAL LETTER PE
+0x2732	0x0420	# CYRILLIC CAPITAL LETTER ER
+0x2733	0x0421	# CYRILLIC CAPITAL LETTER ES
+0x2734	0x0422	# CYRILLIC CAPITAL LETTER TE
+0x2735	0x0423	# CYRILLIC CAPITAL LETTER U
+0x2736	0x0424	# CYRILLIC CAPITAL LETTER EF
+0x2737	0x0425	# CYRILLIC CAPITAL LETTER HA
+0x2738	0x0426	# CYRILLIC CAPITAL LETTER TSE
+0x2739	0x0427	# CYRILLIC CAPITAL LETTER CHE
+0x273A	0x0428	# CYRILLIC CAPITAL LETTER SHA
+0x273B	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
+0x273C	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
+0x273D	0x042B	# CYRILLIC CAPITAL LETTER YERU
+0x273E	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
+0x273F	0x042D	# CYRILLIC CAPITAL LETTER E
+0x2740	0x042E	# CYRILLIC CAPITAL LETTER YU
+0x2741	0x042F	# CYRILLIC CAPITAL LETTER YA
+0x2751	0x0430	# CYRILLIC SMALL LETTER A
+0x2752	0x0431	# CYRILLIC SMALL LETTER BE
+0x2753	0x0432	# CYRILLIC SMALL LETTER VE
+0x2754	0x0433	# CYRILLIC SMALL LETTER GHE
+0x2755	0x0434	# CYRILLIC SMALL LETTER DE
+0x2756	0x0435	# CYRILLIC SMALL LETTER IE
+0x2757	0x0451	# CYRILLIC SMALL LETTER IO
+0x2758	0x0436	# CYRILLIC SMALL LETTER ZHE
+0x2759	0x0437	# CYRILLIC SMALL LETTER ZE
+0x275A	0x0438	# CYRILLIC SMALL LETTER I
+0x275B	0x0439	# CYRILLIC SMALL LETTER SHORT I
+0x275C	0x043A	# CYRILLIC SMALL LETTER KA
+0x275D	0x043B	# CYRILLIC SMALL LETTER EL
+0x275E	0x043C	# CYRILLIC SMALL LETTER EM
+0x275F	0x043D	# CYRILLIC SMALL LETTER EN
+0x2760	0x043E	# CYRILLIC SMALL LETTER O
+0x2761	0x043F	# CYRILLIC SMALL LETTER PE
+0x2762	0x0440	# CYRILLIC SMALL LETTER ER
+0x2763	0x0441	# CYRILLIC SMALL LETTER ES
+0x2764	0x0442	# CYRILLIC SMALL LETTER TE
+0x2765	0x0443	# CYRILLIC SMALL LETTER U
+0x2766	0x0444	# CYRILLIC SMALL LETTER EF
+0x2767	0x0445	# CYRILLIC SMALL LETTER HA
+0x2768	0x0446	# CYRILLIC SMALL LETTER TSE
+0x2769	0x0447	# CYRILLIC SMALL LETTER CHE
+0x276A	0x0448	# CYRILLIC SMALL LETTER SHA
+0x276B	0x0449	# CYRILLIC SMALL LETTER SHCHA
+0x276C	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
+0x276D	0x044B	# CYRILLIC SMALL LETTER YERU
+0x276E	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
+0x276F	0x044D	# CYRILLIC SMALL LETTER E
+0x2770	0x044E	# CYRILLIC SMALL LETTER YU
+0x2771	0x044F	# CYRILLIC SMALL LETTER YA
+0x2821	0x0101	# LATIN SMALL LETTER A WITH MACRON
+0x2822	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
+0x2823	0x01CE	# LATIN SMALL LETTER A WITH CARON
+0x2824	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
+0x2825	0x0113	# LATIN SMALL LETTER E WITH MACRON
+0x2826	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
+0x2827	0x011B	# LATIN SMALL LETTER E WITH CARON
+0x2828	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
+0x2829	0x012B	# LATIN SMALL LETTER I WITH MACRON
+0x282A	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
+0x282B	0x01D0	# LATIN SMALL LETTER I WITH CARON
+0x282C	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
+0x282D	0x014D	# LATIN SMALL LETTER O WITH MACRON
+0x282E	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
+0x282F	0x01D2	# LATIN SMALL LETTER O WITH CARON
+0x2830	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
+0x2831	0x016B	# LATIN SMALL LETTER U WITH MACRON
+0x2832	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
+0x2833	0x01D4	# LATIN SMALL LETTER U WITH CARON
+0x2834	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
+0x2835	0x01D6	# LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
+0x2836	0x01D8	# LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
+0x2837	0x01DA	# LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+0x2838	0x01DC	# LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
+0x2839	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
+0x283A	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
+0x2845	0x3105	# BOPOMOFO LETTER B
+0x2846	0x3106	# BOPOMOFO LETTER P
+0x2847	0x3107	# BOPOMOFO LETTER M
+0x2848	0x3108	# BOPOMOFO LETTER F
+0x2849	0x3109	# BOPOMOFO LETTER D
+0x284A	0x310A	# BOPOMOFO LETTER T
+0x284B	0x310B	# BOPOMOFO LETTER N
+0x284C	0x310C	# BOPOMOFO LETTER L
+0x284D	0x310D	# BOPOMOFO LETTER G
+0x284E	0x310E	# BOPOMOFO LETTER K
+0x284F	0x310F	# BOPOMOFO LETTER H
+0x2850	0x3110	# BOPOMOFO LETTER J
+0x2851	0x3111	# BOPOMOFO LETTER Q
+0x2852	0x3112	# BOPOMOFO LETTER X
+0x2853	0x3113	# BOPOMOFO LETTER ZH
+0x2854	0x3114	# BOPOMOFO LETTER CH
+0x2855	0x3115	# BOPOMOFO LETTER SH
+0x2856	0x3116	# BOPOMOFO LETTER R
+0x2857	0x3117	# BOPOMOFO LETTER Z
+0x2858	0x3118	# BOPOMOFO LETTER C
+0x2859	0x3119	# BOPOMOFO LETTER S
+0x285A	0x311A	# BOPOMOFO LETTER A
+0x285B	0x311B	# BOPOMOFO LETTER O
+0x285C	0x311C	# BOPOMOFO LETTER E
+0x285D	0x311D	# BOPOMOFO LETTER EH
+0x285E	0x311E	# BOPOMOFO LETTER AI
+0x285F	0x311F	# BOPOMOFO LETTER EI
+0x2860	0x3120	# BOPOMOFO LETTER AU
+0x2861	0x3121	# BOPOMOFO LETTER OU
+0x2862	0x3122	# BOPOMOFO LETTER AN
+0x2863	0x3123	# BOPOMOFO LETTER EN
+0x2864	0x3124	# BOPOMOFO LETTER ANG
+0x2865	0x3125	# BOPOMOFO LETTER ENG
+0x2866	0x3126	# BOPOMOFO LETTER ER
+0x2867	0x3127	# BOPOMOFO LETTER I
+0x2868	0x3128	# BOPOMOFO LETTER U
+0x2869	0x3129	# BOPOMOFO LETTER IU
+0x2924	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
+0x2925	0x2501	# BOX DRAWINGS HEAVY HORIZONTAL
+0x2926	0x2502	# BOX DRAWINGS LIGHT VERTICAL
+0x2927	0x2503	# BOX DRAWINGS HEAVY VERTICAL
+0x2928	0x2504	# BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL
+0x2929	0x2505	# BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL
+0x292A	0x2506	# BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL
+0x292B	0x2507	# BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL
+0x292C	0x2508	# BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL
+0x292D	0x2509	# BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL
+0x292E	0x250A	# BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL
+0x292F	0x250B	# BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL
+0x2930	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
+0x2931	0x250D	# BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
+0x2932	0x250E	# BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
+0x2933	0x250F	# BOX DRAWINGS HEAVY DOWN AND RIGHT
+0x2934	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
+0x2935	0x2511	# BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
+0x2936	0x2512	# BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
+0x2937	0x2513	# BOX DRAWINGS HEAVY DOWN AND LEFT
+0x2938	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
+0x2939	0x2515	# BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
+0x293A	0x2516	# BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
+0x293B	0x2517	# BOX DRAWINGS HEAVY UP AND RIGHT
+0x293C	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
+0x293D	0x2519	# BOX DRAWINGS UP LIGHT AND LEFT HEAVY
+0x293E	0x251A	# BOX DRAWINGS UP HEAVY AND LEFT LIGHT
+0x293F	0x251B	# BOX DRAWINGS HEAVY UP AND LEFT
+0x2940	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+0x2941	0x251D	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
+0x2942	0x251E	# BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT
+0x2943	0x251F	# BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT
+0x2944	0x2520	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
+0x2945	0x2521	# BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY
+0x2946	0x2522	# BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY
+0x2947	0x2523	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT
+0x2948	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
+0x2949	0x2525	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
+0x294A	0x2526	# BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT
+0x294B	0x2527	# BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT
+0x294C	0x2528	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
+0x294D	0x2529	# BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
+0x294E	0x252A	# BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
+0x294F	0x252B	# BOX DRAWINGS HEAVY VERTICAL AND LEFT
+0x2950	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+0x2951	0x252D	# BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
+0x2952	0x252E	# BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
+0x2953	0x252F	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
+0x2954	0x2530	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
+0x2955	0x2531	# BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY
+0x2956	0x2532	# BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY
+0x2957	0x2533	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
+0x2958	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
+0x2959	0x2535	# BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT
+0x295A	0x2536	# BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT
+0x295B	0x2537	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
+0x295C	0x2538	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
+0x295D	0x2539	# BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY
+0x295E	0x253A	# BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY
+0x295F	0x253B	# BOX DRAWINGS HEAVY UP AND HORIZONTAL
+0x2960	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+0x2961	0x253D	# BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT
+0x2962	0x253E	# BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT
+0x2963	0x253F	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
+0x2964	0x2540	# BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT
+0x2965	0x2541	# BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT
+0x2966	0x2542	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
+0x2967	0x2543	# BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT
+0x2968	0x2544	# BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT
+0x2969	0x2545	# BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT
+0x296A	0x2546	# BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT
+0x296B	0x2547	# BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY
+0x296C	0x2548	# BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY
+0x296D	0x2549	# BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY
+0x296E	0x254A	# BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY
+0x296F	0x254B	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
+0x3021	0x554A	# <CJK>
+0x3022	0x963F	# <CJK>
+0x3023	0x57C3	# <CJK>
+0x3024	0x6328	# <CJK>
+0x3025	0x54CE	# <CJK>
+0x3026	0x5509	# <CJK>
+0x3027	0x54C0	# <CJK>
+0x3028	0x7691	# <CJK>
+0x3029	0x764C	# <CJK>
+0x302A	0x853C	# <CJK>
+0x302B	0x77EE	# <CJK>
+0x302C	0x827E	# <CJK>
+0x302D	0x788D	# <CJK>
+0x302E	0x7231	# <CJK>
+0x302F	0x9698	# <CJK>
+0x3030	0x978D	# <CJK>
+0x3031	0x6C28	# <CJK>
+0x3032	0x5B89	# <CJK>
+0x3033	0x4FFA	# <CJK>
+0x3034	0x6309	# <CJK>
+0x3035	0x6697	# <CJK>
+0x3036	0x5CB8	# <CJK>
+0x3037	0x80FA	# <CJK>
+0x3038	0x6848	# <CJK>
+0x3039	0x80AE	# <CJK>
+0x303A	0x6602	# <CJK>
+0x303B	0x76CE	# <CJK>
+0x303C	0x51F9	# <CJK>
+0x303D	0x6556	# <CJK>
+0x303E	0x71AC	# <CJK>
+0x303F	0x7FF1	# <CJK>
+0x3040	0x8884	# <CJK>
+0x3041	0x50B2	# <CJK>
+0x3042	0x5965	# <CJK>
+0x3043	0x61CA	# <CJK>
+0x3044	0x6FB3	# <CJK>
+0x3045	0x82AD	# <CJK>
+0x3046	0x634C	# <CJK>
+0x3047	0x6252	# <CJK>
+0x3048	0x53ED	# <CJK>
+0x3049	0x5427	# <CJK>
+0x304A	0x7B06	# <CJK>
+0x304B	0x516B	# <CJK>
+0x304C	0x75A4	# <CJK>
+0x304D	0x5DF4	# <CJK>
+0x304E	0x62D4	# <CJK>
+0x304F	0x8DCB	# <CJK>
+0x3050	0x9776	# <CJK>
+0x3051	0x628A	# <CJK>
+0x3052	0x8019	# <CJK>
+0x3053	0x575D	# <CJK>
+0x3054	0x9738	# <CJK>
+0x3055	0x7F62	# <CJK>
+0x3056	0x7238	# <CJK>
+0x3057	0x767D	# <CJK>
+0x3058	0x67CF	# <CJK>
+0x3059	0x767E	# <CJK>
+0x305A	0x6446	# <CJK>
+0x305B	0x4F70	# <CJK>
+0x305C	0x8D25	# <CJK>
+0x305D	0x62DC	# <CJK>
+0x305E	0x7A17	# <CJK>
+0x305F	0x6591	# <CJK>
+0x3060	0x73ED	# <CJK>
+0x3061	0x642C	# <CJK>
+0x3062	0x6273	# <CJK>
+0x3063	0x822C	# <CJK>
+0x3064	0x9881	# <CJK>
+0x3065	0x677F	# <CJK>
+0x3066	0x7248	# <CJK>
+0x3067	0x626E	# <CJK>
+0x3068	0x62CC	# <CJK>
+0x3069	0x4F34	# <CJK>
+0x306A	0x74E3	# <CJK>
+0x306B	0x534A	# <CJK>
+0x306C	0x529E	# <CJK>
+0x306D	0x7ECA	# <CJK>
+0x306E	0x90A6	# <CJK>
+0x306F	0x5E2E	# <CJK>
+0x3070	0x6886	# <CJK>
+0x3071	0x699C	# <CJK>
+0x3072	0x8180	# <CJK>
+0x3073	0x7ED1	# <CJK>
+0x3074	0x68D2	# <CJK>
+0x3075	0x78C5	# <CJK>
+0x3076	0x868C	# <CJK>
+0x3077	0x9551	# <CJK>
+0x3078	0x508D	# <CJK>
+0x3079	0x8C24	# <CJK>
+0x307A	0x82DE	# <CJK>
+0x307B	0x80DE	# <CJK>
+0x307C	0x5305	# <CJK>
+0x307D	0x8912	# <CJK>
+0x307E	0x5265	# <CJK>
+0x3121	0x8584	# <CJK>
+0x3122	0x96F9	# <CJK>
+0x3123	0x4FDD	# <CJK>
+0x3124	0x5821	# <CJK>
+0x3125	0x9971	# <CJK>
+0x3126	0x5B9D	# <CJK>
+0x3127	0x62B1	# <CJK>
+0x3128	0x62A5	# <CJK>
+0x3129	0x66B4	# <CJK>
+0x312A	0x8C79	# <CJK>
+0x312B	0x9C8D	# <CJK>
+0x312C	0x7206	# <CJK>
+0x312D	0x676F	# <CJK>
+0x312E	0x7891	# <CJK>
+0x312F	0x60B2	# <CJK>
+0x3130	0x5351	# <CJK>
+0x3131	0x5317	# <CJK>
+0x3132	0x8F88	# <CJK>
+0x3133	0x80CC	# <CJK>
+0x3134	0x8D1D	# <CJK>
+0x3135	0x94A1	# <CJK>
+0x3136	0x500D	# <CJK>
+0x3137	0x72C8	# <CJK>
+0x3138	0x5907	# <CJK>
+0x3139	0x60EB	# <CJK>
+0x313A	0x7119	# <CJK>
+0x313B	0x88AB	# <CJK>
+0x313C	0x5954	# <CJK>
+0x313D	0x82EF	# <CJK>
+0x313E	0x672C	# <CJK>
+0x313F	0x7B28	# <CJK>
+0x3140	0x5D29	# <CJK>
+0x3141	0x7EF7	# <CJK>
+0x3142	0x752D	# <CJK>
+0x3143	0x6CF5	# <CJK>
+0x3144	0x8E66	# <CJK>
+0x3145	0x8FF8	# <CJK>
+0x3146	0x903C	# <CJK>
+0x3147	0x9F3B	# <CJK>
+0x3148	0x6BD4	# <CJK>
+0x3149	0x9119	# <CJK>
+0x314A	0x7B14	# <CJK>
+0x314B	0x5F7C	# <CJK>
+0x314C	0x78A7	# <CJK>
+0x314D	0x84D6	# <CJK>
+0x314E	0x853D	# <CJK>
+0x314F	0x6BD5	# <CJK>
+0x3150	0x6BD9	# <CJK>
+0x3151	0x6BD6	# <CJK>
+0x3152	0x5E01	# <CJK>
+0x3153	0x5E87	# <CJK>
+0x3154	0x75F9	# <CJK>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 12:07:02 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 7C05B106568E;
	Wed,  5 Aug 2009 12:07:02 +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 698348FC20;
	Wed,  5 Aug 2009 12:07:02 +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 n75C72t6068031;
	Wed, 5 Aug 2009 12:07:02 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75C72XA068030;
	Wed, 5 Aug 2009 12:07:02 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908051207.n75C72XA068030@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 12:07:02 +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: r196071 - user/edwin/locale/tools/charmaps
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 12:07:03 -0000

Author: edwin
Date: Wed Aug  5 12:07:02 2009
New Revision: 196071
URL: http://svn.freebsd.org/changeset/base/196071

Log:
  Add PT154, obtained from IANA.

Added:
  user/edwin/locale/tools/charmaps/PT154.TXT

Added: user/edwin/locale/tools/charmaps/PT154.TXT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/charmaps/PT154.TXT	Wed Aug  5 12:07:02 2009	(r196071)
@@ -0,0 +1,291 @@
+
+Charset name:
+PTCP154
+
+Charset aliases:
+csPTCP154
+PT154
+CP154
+Cyrillic-Asian
+
+Suitability for use in MIME text:
+Yes
+
+ISO 10646 equivalency table:
+#    Format: Three tab-separated columns
+#        Column #1 is the Paratype CP154 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in Paratype CP154 order
+#
+0x00  0x0000     #       NULL
+0x01  0x0001     #       START OF HEADING
+0x02  0x0002     #       START OF TEXT
+0x03  0x0003     #       END OF TEXT
+0x04  0x0004     #       END OF TRANSMISSION
+0x05  0x0005     #       ENQUIRY
+0x06  0x0006     #       ACKNOWLEDGE
+0x07  0x0007     #       BELL
+0x08  0x0008     #       BACKSPACE
+0x09  0x0009     #       HORIZONTAL TABULATION
+0x0A  0x000A     #       LINE FEED
+0x0B  0x000B     #       VERTICAL TABULATION
+0x0C  0x000C     #       FORM FEED
+0x0D  0x000D     #       CARRIAGE RETURN
+0x0E  0x000E     #       SHIFT OUT
+0x0F  0x000F     #       SHIFT IN
+0x10  0x0010     #       DATA LINK ESCAPE
+0x11  0x0011     #       DEVICE CONTROL ONE
+0x12  0x0012     #       DEVICE CONTROL TWO
+0x13  0x0013     #       DEVICE CONTROL THREE
+0x14  0x0014     #       DEVICE CONTROL FOUR
+0x15  0x0015     #       NEGATIVE ACKNOWLEDGE
+0x16  0x0016     #       SYNCHRONOUS IDLE
+0x17  0x0017     #       END OF TRANSMISSION BLOCK
+0x18  0x0018     #       CANCEL
+0x19  0x0019     #       END OF MEDIUM
+0x1A  0x001A     #       SUBSTITUTE
+0x1B  0x001B     #       ESCAPE
+0x1C  0x001C     #       FILE SEPARATOR
+0x1D  0x001D     #       GROUP SEPARATOR
+0x1E  0x001E     #       RECORD SEPARATOR
+0x1F  0x001F     #       UNIT SEPARATOR
+0x20  0x0020     #       SPACE
+0x21  0x0021     #       EXCLAMATION MARK
+0x22  0x0022     #       QUOTATION MARK
+0x23  0x0023     #       NUMBER SIGN
+0x24  0x0024     #       DOLLAR SIGN
+0x25  0x0025     #       PERCENT SIGN
+0x26  0x0026     #       AMPERSAND
+0x27  0x0027     #       APOSTROPHE
+0x28  0x0028     #       LEFT PARENTHESIS
+0x29  0x0029     #       RIGHT PARENTHESIS
+0x2a  0x002A     #       ASTERISK
+0x2b  0x002B     #       PLUS SIGN
+0x2c  0x002C     #       COMMA
+0x2d  0x002D     #       HYPHEN-MINUS
+0x2e  0x002E     #       FULL STOP
+0x2f  0x002F     #       SOLIDUS
+0x30  0x0030     #       DIGIT ZERO
+0x31  0x0031     #       DIGIT ONE
+0x32  0x0032     #       DIGIT TWO
+0x33  0x0033     #       DIGIT THREE
+0x34  0x0034     #       DIGIT FOUR
+0x35  0x0035     #       DIGIT FIVE
+0x36  0x0036     #       DIGIT SIX
+0x37  0x0037     #       DIGIT SEVEN
+0x38  0x0038     #       DIGIT EIGHT
+0x39  0x0039     #       DIGIT NINE
+0x3a  0x003A     #       COLON
+0x3b  0x003B     #       SEMICOLON
+0x3c  0x003C     #       LESS-THAN SIGN
+0x3d  0x003D     #       EQUALS SIGN
+0x3e  0x003E     #       GREATER-THAN SIGN
+0x3f  0x003F     #       QUESTION MARK
+0x40  0x0040     #       COMMERCIAL AT
+0x41  0x0041     #       LATIN CAPITAL LETTER A
+0x42  0x0042     #       LATIN CAPITAL LETTER B
+0x43  0x0043     #       LATIN CAPITAL LETTER C
+0x44  0x0044     #       LATIN CAPITAL LETTER D
+0x45  0x0045     #       LATIN CAPITAL LETTER E
+0x46  0x0046     #       LATIN CAPITAL LETTER F
+0x47  0x0047     #       LATIN CAPITAL LETTER G
+0x48  0x0048     #       LATIN CAPITAL LETTER H
+0x49  0x0049     #       LATIN CAPITAL LETTER I
+0x4a  0x004A     #       LATIN CAPITAL LETTER J
+0x4b  0x004B     #       LATIN CAPITAL LETTER K
+0x4c  0x004C     #       LATIN CAPITAL LETTER L
+0x4d  0x004D     #       LATIN CAPITAL LETTER M
+0x4e  0x004E     #       LATIN CAPITAL LETTER N
+0x4f  0x004F     #       LATIN CAPITAL LETTER O
+0x50  0x0050     #       LATIN CAPITAL LETTER P
+0x51  0x0051     #       LATIN CAPITAL LETTER Q
+0x52  0x0052     #       LATIN CAPITAL LETTER R
+0x53  0x0053     #       LATIN CAPITAL LETTER S
+0x54  0x0054     #       LATIN CAPITAL LETTER T
+0x55  0x0055     #       LATIN CAPITAL LETTER U
+0x56  0x0056     #       LATIN CAPITAL LETTER V
+0x57  0x0057     #       LATIN CAPITAL LETTER W
+0x58  0x0058     #       LATIN CAPITAL LETTER X
+0x59  0x0059     #       LATIN CAPITAL LETTER Y
+0x5a  0x005A     #       LATIN CAPITAL LETTER Z
+0x5b  0x005B     #       LEFT SQUARE BRACKET
+0x5c  0x005C     #       REVERSE SOLIDUS
+0x5d  0x005D     #       RIGHT SQUARE BRACKET
+0x5e  0x005E     #       CIRCUMFLEX ACCENT
+0x5f  0x005F     #       LOW LINE
+0x60  0x0060     #       GRAVE ACCENT
+0x61  0x0061     #       LATIN SMALL LETTER A
+0x62  0x0062     #       LATIN SMALL LETTER B
+0x63  0x0063     #       LATIN SMALL LETTER C
+0x64  0x0064     #       LATIN SMALL LETTER D
+0x65  0x0065     #       LATIN SMALL LETTER E
+0x66  0x0066     #       LATIN SMALL LETTER F
+0x67  0x0067     #       LATIN SMALL LETTER G
+0x68  0x0068     #       LATIN SMALL LETTER H
+0x69  0x0069     #       LATIN SMALL LETTER I
+0x6a  0x006A     #       LATIN SMALL LETTER J
+0x6b  0x006B     #       LATIN SMALL LETTER K
+0x6c  0x006C     #       LATIN SMALL LETTER L
+0x6d  0x006D     #       LATIN SMALL LETTER M
+0x6e  0x006E     #       LATIN SMALL LETTER N
+0x6f  0x006F     #       LATIN SMALL LETTER O
+0x70  0x0070     #       LATIN SMALL LETTER P
+0x71  0x0071     #       LATIN SMALL LETTER Q
+0x72  0x0072     #       LATIN SMALL LETTER R
+0x73  0x0073     #       LATIN SMALL LETTER S
+0x74  0x0074     #       LATIN SMALL LETTER T
+0x75  0x0075     #       LATIN SMALL LETTER U
+0x76  0x0076     #       LATIN SMALL LETTER V
+0x77  0x0077     #       LATIN SMALL LETTER W
+0x78  0x0078     #       LATIN SMALL LETTER X
+0x79  0x0079     #       LATIN SMALL LETTER Y
+0x7a  0x007A     #       LATIN SMALL LETTER Z
+0x7b  0x007B     #       LEFT CURLY BRACKET
+0x7c  0x007C     #       VERTICAL LINE
+0x7d  0x007D     #       RIGHT CURLY BRACKET
+0x7e  0x007E     #       TILDE
+0x7f  0x007F     #       DELETE (DEL)
+0x80  0x0496     #       CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+0x81  0x0492     #       CYRILLIC CAPITAL LETTER GHE WITH STROKE
+0x82  0x04EE     #       CYRILLIC CAPITAL LETTER U WITH MACRON
+0x83  0x0493     #       CYRILLIC SMALL LETTER GHE WITH STROKE
+0x84  0x201E     #       DOUBLE LOW-9 QUOTATION MARK
+0x85  0x2026     #       HORIZONTAL ELLIPSIS
+0x86  0x04B6     #       CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+0x87  0x04AE     #       CYRILLIC CAPITAL LETTER STRAIGHT U
+0x88  0x04B2     #       CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+0x89  0x04AF     #       CYRILLIC SMALL LETTER STRAIGHT U
+0x8a  0x04A0     #       CYRILLIC CAPITAL LETTER BASHKIR KA
+0x8b  0x04E2     #       CYRILLIC CAPITAL LETTER I WITH MACRON
+0x8c  0x04A2     #       CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+0x8d  0x049A     #       CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+0x8e  0x04BA     #       CYRILLIC CAPITAL LETTER SHHA
+0x8f  0x04B8     #       CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+0x90  0x0497     #       CYRILLIC SMALL LETTER ZHE WITH DESCENDER
+0x91  0x2018     #       LEFT SINGLE QUOTATION MARK
+0x92  0x2019     #       RIGHT SINGLE QUOTATION MARK
+0x93  0x201C     #       LEFT DOUBLE QUOTATION MARK
+0x94  0x201D     #       RIGHT DOUBLE QUOTATION MARK
+0x95  0x2022     #       BULLET
+0x96  0x2013     #       EN DASH
+0x97  0x2014     #       EM DASH
+0x98  0x04B3     #       CYRILLIC SMALL LETTER HA WITH DESCENDER
+0x99  0x04B7     #       CYRILLIC SMALL LETTER CHE WITH DESCENDER
+0x9a  0x04A1     #       CYRILLIC SMALL LETTER BASHKIR KA
+0x9b  0x04E3     #       CYRILLIC SMALL LETTER I WITH MACRON
+0x9c  0x04A3     #       CYRILLIC SMALL LETTER EN WITH DESCENDER
+0x9d  0x049B     #       CYRILLIC SMALL LETTER KA WITH DESCENDER
+0x9e  0x04BB     #       CYRILLIC SMALL LETTER SHHA
+0x9f  0x04B9     #       CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
+0xa0  0x00A0     #       NO-BREAK SPACE
+0xa1  0x040E     #       CYRILLIC CAPITAL LETTER SHORT U (Byelorussian)
+0xa2  0x045E     #       CYRILLIC SMALL LETTER SHORT U (Byelorussian)
+0xa3  0x0408     #       CYRILLIC CAPITAL LETTER JE
+0xa4  0x04E8     #       CYRILLIC CAPITAL LETTER BARRED O
+0xa5  0x0498     #       CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+0xa6  0x04B0     #       CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+0xa7  0x00A7     #       SECTION SIGN
+0xa8  0x0401     #       CYRILLIC CAPITAL LETTER IO
+0xa9  0x00A9     #       COPYRIGHT SIGN
+0xaa  0x04D8     #       CYRILLIC CAPITAL LETTER SCHWA
+0xab  0x00AB     #       LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xac  0x00AC     #       NOT SIGN
+0xad  0x04EF     #       CYRILLIC SMALL LETTER U WITH MACRON
+0xae  0x00AE     #       REGISTERED SIGN
+0xaf  0x049C     #       CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+0xb0  0x00B0     #       DEGREE SIGN
+0xb1  0x04B1     #       CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+0xb2  0x0406     #       CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0xb3  0x0456     #       CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+0xb4  0x0499     #       CYRILLIC SMALL LETTER ZE WITH DESCENDER
+0xb5  0x04E9     #       CYRILLIC SMALL LETTER BARRED O
+0xb6  0x00B6     #       PILCROW SIGN
+0xb7  0x00B7     #       MIDDLE DOT
+0xb8  0x0451     #       CYRILLIC SMALL LETTER IO
+0xb9  0x2116     #       NUMERO SIGN
+0xba  0x04D9     #       CYRILLIC SMALL LETTER SCHWA
+0xbb  0x00BB     #       RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xbc  0x0458     #       CYRILLIC SMALL LETTER JE
+0xbd  0x04AA     #       CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+0xbe  0x04AB     #       CYRILLIC SMALL LETTER ES WITH DESCENDER
+0xbf  0x049D     #       CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
+0xc0  0x0410     #       CYRILLIC CAPITAL LETTER A
+0xc1  0x0411     #       CYRILLIC CAPITAL LETTER BE
+0xc2  0x0412     #       CYRILLIC CAPITAL LETTER VE
+0xc3  0x0413     #       CYRILLIC CAPITAL LETTER GHE
+0xc4  0x0414     #       CYRILLIC CAPITAL LETTER DE
+0xc5  0x0415     #       CYRILLIC CAPITAL LETTER IE
+0xc6  0x0416     #       CYRILLIC CAPITAL LETTER ZHE
+0xc7  0x0417     #       CYRILLIC CAPITAL LETTER ZE
+0xc8  0x0418     #       CYRILLIC CAPITAL LETTER I
+0xc9  0x0419     #       CYRILLIC CAPITAL LETTER SHORT I
+0xca  0x041A     #       CYRILLIC CAPITAL LETTER KA
+0xcb  0x041B     #       CYRILLIC CAPITAL LETTER EL
+0xcc  0x041C     #       CYRILLIC CAPITAL LETTER EM
+0xcd  0x041D     #       CYRILLIC CAPITAL LETTER EN
+0xce  0x041E     #       CYRILLIC CAPITAL LETTER O
+0xcf  0x041F     #       CYRILLIC CAPITAL LETTER PE
+0xd0  0x0420     #       CYRILLIC CAPITAL LETTER ER
+0xd1  0x0421     #       CYRILLIC CAPITAL LETTER ES
+0xd2  0x0422     #       CYRILLIC CAPITAL LETTER TE
+0xd3  0x0423     #       CYRILLIC CAPITAL LETTER U
+0xd4  0x0424     #       CYRILLIC CAPITAL LETTER EF
+0xd5  0x0425     #       CYRILLIC CAPITAL LETTER HA
+0xd6  0x0426     #       CYRILLIC CAPITAL LETTER TSE
+0xd7  0x0427     #       CYRILLIC CAPITAL LETTER CHE
+0xd8  0x0428     #       CYRILLIC CAPITAL LETTER SHA
+0xd9  0x0429     #       CYRILLIC CAPITAL LETTER SHCHA
+0xda  0x042A     #       CYRILLIC CAPITAL LETTER HARD SIGN
+0xdb  0x042B     #       CYRILLIC CAPITAL LETTER YERU
+0xdc  0x042C     #       CYRILLIC CAPITAL LETTER SOFT SIGN
+0xdd  0x042D     #       CYRILLIC CAPITAL LETTER E
+0xde  0x042E     #       CYRILLIC CAPITAL LETTER YU
+0xdf  0x042F     #       CYRILLIC CAPITAL LETTER YA
+0xe0  0x0430     #       CYRILLIC SMALL LETTER A
+0xe1  0x0431     #       CYRILLIC SMALL LETTER BE
+0xe2  0x0432     #       CYRILLIC SMALL LETTER VE
+0xe3  0x0433     #       CYRILLIC SMALL LETTER GHE
+0xe4  0x0434     #       CYRILLIC SMALL LETTER DE
+0xe5  0x0435     #       CYRILLIC SMALL LETTER IE
+0xe6  0x0436     #       CYRILLIC SMALL LETTER ZHE
+0xe7  0x0437     #       CYRILLIC SMALL LETTER ZE
+0xe8  0x0438     #       CYRILLIC SMALL LETTER I
+0xe9  0x0439     #       CYRILLIC SMALL LETTER SHORT I
+0xea  0x043A     #       CYRILLIC SMALL LETTER KA
+0xeb  0x043B     #       CYRILLIC SMALL LETTER EL
+0xec  0x043C     #       CYRILLIC SMALL LETTER EM
+0xed  0x043D     #       CYRILLIC SMALL LETTER EN
+0xee  0x043E     #       CYRILLIC SMALL LETTER O
+0xef  0x043F     #       CYRILLIC SMALL LETTER PE
+0xf0  0x0440     #       CYRILLIC SMALL LETTER ER
+0xf1  0x0441     #       CYRILLIC SMALL LETTER ES
+0xf2  0x0442     #       CYRILLIC SMALL LETTER TE
+0xf3  0x0443     #       CYRILLIC SMALL LETTER U
+0xf4  0x0444     #       CYRILLIC SMALL LETTER EF
+0xf5  0x0445     #       CYRILLIC SMALL LETTER HA
+0xf6  0x0446     #       CYRILLIC SMALL LETTER TSE
+0xf7  0x0447     #       CYRILLIC SMALL LETTER CHE
+0xf8  0x0448     #       CYRILLIC SMALL LETTER SHA
+0xf9  0x0449     #       CYRILLIC SMALL LETTER SHCHA
+0xfa  0x044A     #       CYRILLIC SMALL LETTER HARD SIGN
+0xfb  0x044B     #       CYRILLIC SMALL LETTER YERU
+0xfc  0x044C     #       CYRILLIC SMALL LETTER SOFT SIGN
+0xfd  0x044D     #       CYRILLIC SMALL LETTER E
+0xfe  0x044E     #       CYRILLIC SMALL LETTER YU
+0xff  0x044F     #       CYRILLIC SMALL LETTER YA
+
+
+Additional information:
+This charset based on CP1251 with added asian cyrillic symbols.
+
+Person & email address to contact for further information:
+Alexander Uskov
+InternetDataCenter of KazakhTelecom.
+e-mail: auskov&idc.kz
+
+Intended usage:
+COMMON
+
+(record created 2002-09-27)
\ No newline at end of file

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 12:19:43 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 B6BF6106566B;
	Wed,  5 Aug 2009 12:19:43 +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 A58488FC0C;
	Wed,  5 Aug 2009 12:19:43 +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 n75CJhb8068751;
	Wed, 5 Aug 2009 12:19:43 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75CJhEc068747;
	Wed, 5 Aug 2009 12:19:43 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908051219.n75CJhEc068747@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 12:19:43 +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: r196072 - in user/edwin/locale/tools: . charmaps
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 12:19:44 -0000

Author: edwin
Date: Wed Aug  5 12:19:43 2009
New Revision: 196072
URL: http://svn.freebsd.org/changeset/base/196072

Log:
  Add support for the ARMSCII-8 character map.

Added:
  user/edwin/locale/tools/charmaps/ARMSCII-8.TXT
Modified:
  user/edwin/locale/tools/charmaps.xml
  user/edwin/locale/tools/charmaps/charmaps.txt

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Wed Aug  5 12:07:02 2009	(r196071)
+++ user/edwin/locale/tools/charmaps.xml	Wed Aug  5 12:19:43 2009	(r196072)
@@ -460,6 +460,8 @@
 	<translation encoding="GB2312"
 	    cldr="CJK UNIFIED IDEOGRAPH-79D2" ucc="79D2" />
 
+	<translation encoding="ARMSCII-8"
+	    cldr="ONE DOT LEADER" string="FULL STOP" />
 
 </translations>
 
@@ -624,7 +626,6 @@
 
 	<!-- Just a . ? -->
 	<translation encoding="ISO8859-2" cldr="FULL STOP" string="." />
-	<translation encoding="ARMSCII-8" cldr="ONE DOT LEADER" string="." />
 
 </oldtranslations>
 

Added: user/edwin/locale/tools/charmaps/ARMSCII-8.TXT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/charmaps/ARMSCII-8.TXT	Wed Aug  5 12:19:43 2009	(r196072)
@@ -0,0 +1,256 @@
+0x00	0x0000
+0x01	0x0001
+0x02	0x0002
+0x03	0x0003
+0x04	0x0004
+0x05	0x0005
+0x06	0x0006
+0x07	0x0007
+0x08	0x0008
+0x09	0x0009
+0x0A	0x000A
+0x0B	0x000B
+0x0C	0x000C
+0x0D	0x000D
+0x0E	0x000E
+0x0F	0x000F
+0x10	0x0010
+0x11	0x0011
+0x12	0x0012
+0x13	0x0013
+0x14	0x0014
+0x15	0x0015
+0x16	0x0016
+0x17	0x0017
+0x18	0x0018
+0x19	0x0019
+0x1A	0x001A
+0x1B	0x001B
+0x1C	0x001C
+0x1D	0x001D
+0x1E	0x001E
+0x1F	0x001F
+0x20	0x0020
+0x21	0x0021
+0x22	0x0022
+0x23	0x0023
+0x24	0x0024
+0x25	0x0025
+0x26	0x0026
+0x27	0x0027
+0x28	0x0028
+0x29	0x0029
+0x2A	0x002A
+0x2B	0x002B
+0x2C	0x002C
+0x2D	0x002D
+0x2E	0x002E
+0x2F	0x002F
+0x30	0x0030
+0x31	0x0031
+0x32	0x0032
+0x33	0x0033
+0x34	0x0034
+0x35	0x0035
+0x36	0x0036
+0x37	0x0037
+0x38	0x0038
+0x39	0x0039
+0x3A	0x003A
+0x3B	0x003B
+0x3C	0x003C
+0x3D	0x003D
+0x3E	0x003E
+0x3F	0x003F
+0x40	0x0040
+0x41	0x0041
+0x42	0x0042
+0x43	0x0043
+0x44	0x0044
+0x45	0x0045
+0x46	0x0046
+0x47	0x0047
+0x48	0x0048
+0x49	0x0049
+0x4A	0x004A
+0x4B	0x004B
+0x4C	0x004C
+0x4D	0x004D
+0x4E	0x004E
+0x4F	0x004F
+0x50	0x0050
+0x51	0x0051
+0x52	0x0052
+0x53	0x0053
+0x54	0x0054
+0x55	0x0055
+0x56	0x0056
+0x57	0x0057
+0x58	0x0058
+0x59	0x0059
+0x5A	0x005A
+0x5B	0x005B
+0x5C	0x005C
+0x5D	0x005D
+0x5E	0x005E
+0x5F	0x005F
+0x60	0x0060
+0x61	0x0061
+0x62	0x0062
+0x63	0x0063
+0x64	0x0064
+0x65	0x0065
+0x66	0x0066
+0x67	0x0067
+0x68	0x0068
+0x69	0x0069
+0x6A	0x006A
+0x6B	0x006B
+0x6C	0x006C
+0x6D	0x006D
+0x6E	0x006E
+0x6F	0x006F
+0x70	0x0070
+0x71	0x0071
+0x72	0x0072
+0x73	0x0073
+0x74	0x0074
+0x75	0x0075
+0x76	0x0076
+0x77	0x0077
+0x78	0x0078
+0x79	0x0079
+0x7A	0x007A
+0x7B	0x007B
+0x7C	0x007C
+0x7D	0x007D
+0x7E	0x007E
+0x7F	0x007F
+0x80	0x0080
+0x81	0x0081
+0x82	0x0082
+0x83	0x0083
+0x84	0x0084
+0x85	0x0085
+0x86	0x0086
+0x87	0x0087
+0x88	0x0088
+0x89	0x0089
+0x8A	0x008A
+0x8B	0x008B
+0x8C	0x008C
+0x8D	0x008D
+0x8E	0x008E
+0x8F	0x008F
+0x90	0x0090
+0x91	0x0091
+0x92	0x0092
+0x93	0x0093
+0x94	0x0094
+0x95	0x0095
+0x96	0x0096
+0x97	0x0097
+0x98	0x0098
+0x99	0x0099
+0x9A	0x009A
+0x9B	0x009B
+0x9C	0x009C
+0x9D	0x009D
+0x9E	0x009E
+0x9F	0x009F
+0xA0	0x00A0
+0xA1	0x2741
+0xA2	0x00A7
+0xA3	0x0589
+0xA4	0x0029
+0xA5	0x0028
+0xA6	0x00BB
+0xA7	0x00AB
+0xA8	0x2014
+0xA9	0x002E
+0xAA	0x055D
+0xAB	0x002C
+0xAC	0x002D
+0xAD	0x055F
+0xAE	0x2026
+0xAF	0x055C
+0xB0	0x055B
+0xB1	0x055E
+0xB2	0x0531
+0xB3	0x0561
+0xB4	0x0532
+0xB5	0x0562
+0xB6	0x0533
+0xB7	0x0563
+0xB8	0x0534
+0xB9	0x0564
+0xBA	0x0535
+0xBB	0x0565
+0xBC	0x0536
+0xBD	0x0566
+0xBE	0x0537
+0xBF	0x0567
+0xC0	0x0538
+0xC1	0x0568
+0xC2	0x0539
+0xC3	0x0569
+0xC4	0x053A
+0xC5	0x056A
+0xC6	0x053B
+0xC7	0x056B
+0xC8	0x053C
+0xC9	0x056C
+0xCA	0x053D
+0xCB	0x056D
+0xCC	0x053E
+0xCD	0x056E
+0xCE	0x053F
+0xCF	0x056F
+0xD0	0x0540
+0xD1	0x0570
+0xD2	0x0541
+0xD3	0x0571
+0xD4	0x0542
+0xD5	0x0572
+0xD6	0x0543
+0xD7	0x0573
+0xD8	0x0544
+0xD9	0x0574
+0xDA	0x0545
+0xDB	0x0575
+0xDC	0x0546
+0xDD	0x0576
+0xDE	0x0547
+0xDF	0x0577
+0xE0	0x0548
+0xE1	0x0578
+0xE2	0x0549
+0xE3	0x0579
+0xE4	0x054A
+0xE5	0x057A
+0xE6	0x054B
+0xE7	0x057B
+0xE8	0x054C
+0xE9	0x057C
+0xEA	0x054D
+0xEB	0x057D
+0xEC	0x054E
+0xED	0x057E
+0xEE	0x054F
+0xEF	0x057F
+0xF0	0x0550
+0xF1	0x0580
+0xF2	0x0551
+0xF3	0x0581
+0xF4	0x0552
+0xF5	0x0582
+0xF6	0x0553
+0xF7	0x0583
+0xF8	0x0554
+0xF9	0x0584
+0xFA	0x0555
+0xFB	0x0585
+0xFC	0x0556
+0xFD	0x0586
+0xFE	0x2019
+0xFF	0x0027

Modified: user/edwin/locale/tools/charmaps/charmaps.txt
==============================================================================
--- user/edwin/locale/tools/charmaps/charmaps.txt	Wed Aug  5 12:07:02 2009	(r196071)
+++ user/edwin/locale/tools/charmaps/charmaps.txt	Wed Aug  5 12:19:43 2009	(r196072)
@@ -4,7 +4,7 @@ unicode.org:	http://unicode.org/Public/M
 IANA:		http://www.iana.org/assignments/charset-reg/
 haible.de:	http://haible.de/bruno/charsets/conversion-tables/
 
-	ARMSCII-8	haible.de: Armenian.html
++	ARMSCII-8	haible.de: Armenian.html
 *	Big5		unicodeorg: OBSOLETE/EASTASIA/OTHER
 ?	Big5HKSCS	haible.de: BIG5-HKSCS.html / 
 ?	CP1131		haible.de: CP1131.html / aix-4.3.2/IBM-1131.TXT

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 12:40:21 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 EF1351065687;
	Wed,  5 Aug 2009 12:40:21 +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 DBF118FC0C;
	Wed,  5 Aug 2009 12:40:21 +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 n75CeLs4069877;
	Wed, 5 Aug 2009 12:40:21 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75CeL5C069873;
	Wed, 5 Aug 2009 12:40:21 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908051240.n75CeL5C069873@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 12:40:21 +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: r196073 - in user/edwin/locale/tools: . charmaps
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 12:40:22 -0000

Author: edwin
Date: Wed Aug  5 12:40:21 2009
New Revision: 196073
URL: http://svn.freebsd.org/changeset/base/196073

Log:
  Add the ISCII-DEV character map

Added:
  user/edwin/locale/tools/charmaps/ISCII-DEV.TXT
Modified:
  user/edwin/locale/tools/charmaps.xml
  user/edwin/locale/tools/charmaps/charmaps.txt

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Wed Aug  5 12:19:43 2009	(r196072)
+++ user/edwin/locale/tools/charmaps.xml	Wed Aug  5 12:40:21 2009	(r196073)
@@ -1,4 +1,4 @@
-<!-- $FreeBSD -->
+<!-- $FreeBSD$ -->
 <data>
 <languages>
 	<!-- Attributes known:

Added: user/edwin/locale/tools/charmaps/ISCII-DEV.TXT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/charmaps/ISCII-DEV.TXT	Wed Aug  5 12:40:21 2009	(r196073)
@@ -0,0 +1,447 @@
+#=======================================================================
+#   File name:  DEVANAGA.TXT
+#
+#   Contents:   Map (external version) from Mac OS Devanagari
+#               encoding to Unicode 2.1 and later.
+#
+#   Copyright:  (c) 1995-2002, 2005 by Apple Computer, Inc., all rights
+#               reserved.
+#
+#   Contact:    charsets@apple.com
+#
+#   Changes:
+#
+#       c02  2005-Apr-05    Update header comments; add section on
+#                           roundtrip considerations. Matches internal
+#                           xml <c1.1> and Text Encoding Converter 2.0.
+#      b3,c1 2002-Dec-19    Update URLs. Matches internal utom<b1>.
+#       b02  1999-Sep-22    Update contact e-mail address. Matches
+#                           internal utom<b1>, ufrm<b1>, and Text
+#                           Encoding Converter version 1.5.
+#       n04  1998-Feb-05    First version; matches internal utom<n9>,
+#                           ufrm<n15>.
+#
+# Standard header:
+# ----------------
+#
+#   Apple, the Apple logo, and Macintosh are trademarks of Apple
+#   Computer, Inc., registered in the United States and other countries.
+#   Unicode is a trademark of Unicode Inc. For the sake of brevity,
+#   throughout this document, "Macintosh" can be used to refer to
+#   Macintosh computers and "Unicode" can be used to refer to the
+#   Unicode standard.
+#
+#   Apple Computer, Inc. ("Apple") makes no warranty or representation,
+#   either express or implied, with respect to this document and the
+#   included data, its quality, accuracy, or fitness for a particular
+#   purpose. In no event will Apple be liable for direct, indirect,
+#   special, incidental, or consequential damages resulting from any
+#   defect or inaccuracy in this document or the included data.
+#
+#   These mapping tables and character lists are subject to change.
+#   The latest tables should be available from the following:
+#
+#   <http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/>
+#
+#   For general information about Mac OS encodings and these mapping
+#   tables, see the file "README.TXT".
+#
+# Format:
+# -------
+#
+#   Three tab-separated columns;
+#   '#' begins a comment which continues to the end of the line.
+#     Column #1 is the Mac OS Devanagari code or code sequence
+#       (in hex as 0xNN or 0xNN+0xNN)
+#     Column #2 is the corresponding Unicode or Unicode sequence
+#       (in hex as 0xNNNN or 0xNNNN+0xNNNN).
+#     Column #3 is a comment containing the Unicode name or sequence
+#       of names. In some cases an additional comment follows the
+#       Unicode name(s).
+#
+#   The entries are in two sections. The first section is for pairs of
+#   Mac OS Devanagari code points that must be mapped in a special way.
+#   The second section maps individual code points.
+#
+#   Within each section, the entries are in Mac OS Devanagari code order.
+#
+#   Control character mappings are not shown in this table, following
+#   the conventions of the standard UTC mapping tables. However, the
+#   Mac OS Devanagari character set uses the standard control characters
+#   at 0x00-0x1F and 0x7F.
+#
+# Notes on Mac OS Devanagari:
+# ---------------------------
+#
+#   This is a legacy Mac OS encoding; in the Mac OS X Carbon and Cocoa
+#   environments, it is only supported via transcoding to and from
+#   Unicode.
+#
+#   Mac OS Devanagari is based on IS 13194:1991 (ISCII-91), with the
+#   addition of several punctuation and symbol characters. However,
+#   Mac OS Devanagari does not support the ATR (attribute) mechanism of
+#   ISCII-91.
+#
+# 1. ISCII-91 features in Mac OS Devanagari include:
+#
+#  a) Overloading of nukta
+#
+#     In addition to using the nukta (0xE9) like a combining dot below,
+#     nukta is overloaded to function as a general character modifier.
+#     In this role, certain code points followed by 0xE9 are treated as
+#     a two-byte code point representing a character which may be
+#     rather different than the characters represented by either of
+#     the code points alone. For example, the character DEVANAGARI OM
+#     (U+0950) is represented in ISCII-91 as candrabindu + nukta.
+#
+#  b) Explicit halant and soft halant
+#
+#     A double halant (0xE8 + 0xE8) constitutes an "explicit halant",
+#     which will always appear as a halant instead of causing formation
+#     of a ligature or half-form consonant.
+#
+#     Halant followed by nukta (0xE8 + 0xE9) constitutes a "soft
+#     halant", which prevents formation of a ligature and instead
+#     retains the half-form of the first consonant.
+#
+#  c) Invisible consonant
+#
+#     The byte 0xD9 (called INV in ISCII-91) is an invisible consonant:
+#     It behaves like a consonant but has no visible appearance. It is
+#     intended to be used (often in combination with halant) to display
+#     dependent forms in isolation, such as the RA forms or consonant
+#     half-forms.
+#
+#  d) Extensions for Vedic, etc.
+#
+#     The byte 0xF0 (called EXT in ISCII-91) followed by any byte in
+#     the range 0xA1-0xEE constitutes a two-byte code point which can
+#     be used to represent additional characters for Vedic (or other
+#     extensions); 0xF0 followed by any other byte value constitutes
+#     malformed text. Mac OS Devanagari supports this mechanism, but
+#     does not currently map any of these two-byte code points to
+#     anything.
+#
+# 2. Mac OS Devanagari additions
+#
+#   Mac OS Devanagari adds characters using the code points
+#   0x80-0x8A and 0x90-0x91 (the latter are some Devanagari additions
+#   from Unicode).
+#
+# 3. Unused code points
+#
+#   The following code points are currently unused, and are not shown
+#   here: 0x8B-0x8F, 0x92-0xA0, 0xEB-0xEF, 0xFB-0xFF. In addition,
+#   0xF0 is not shown here, but it has a special function as described
+#   above.
+#
+# Unicode mapping issues and notes:
+# ---------------------------------
+#
+# 1. Mapping the byte pairs
+#
+#   If one of the following byte values is encountered when mapping
+#   Mac OS Devanagari text - 0xA1, 0xA6, 0xA7, 0xAA, 0xDB, 0xDC, 0xDF,
+#   0xE8, or 0xEA - then the next byte (if there is one) should be
+#   examined. If the next byte is 0xE9 - or also 0xE8, if the first
+#   byte was 0xE8 - then the byte pair should be mapped using the
+#   first section of the mapping table below. Otherwise, each byte
+#   should be mapped using the second section of the mapping table
+#   below.
+#
+#   - The Unicode Standard, Version 2.0, specifies how explicit
+#     halant and soft halant should be represented in Unicode;
+#     these mappings are used below.
+#
+#   If the byte value 0xF0 is encountered when mapping Mac OS
+#   Devanagari text, then the next byte should be examined. If there
+#   is no next byte (e.g. 0xF0 at end of buffer), the mapping
+#   process should indicate incomplete character. If there is a next
+#   byte but it is not in the range 0xA1-0xEE, the mapping process
+#   should indicate malformed text. Otherwise, the mapping process
+#   should treat the byte pair as a valid two-byte code point with no
+#   mapping (e.g. map it to QUESTION MARK, REPLACEMENT CHARACTER,
+#   etc.).
+#
+# 2. Mapping the invisible consonant
+#
+#   It has been suggested that INV in ISCII-91 should map to ZERO
+#   WIDTH NON-JOINER in Unicode. However, this causes problems with
+#   roundtrip fidelity: The ISCII-91 sequences 0xE8+0xE8 and 0xE8+0xD9
+#   would map to the same sequence of Unicode characters. We have
+#   instead mapped INV to LEFT-TO-RIGHT MARK, which avoids these
+#   problems.
+#
+# 3. Additional loose mappings from Unicode
+#
+#   These are not preserved in roundtrip mappings.
+#
+#   U+0958  0xB3+0xE9  # DEVANAGARI LETTER QA
+#   U+0959  0xB4+0xE9  # DEVANAGARI LETTER KHHA
+#   U+095A  0xB5+0xE9  # DEVANAGARI LETTER GHHA
+#   U+095B  0xBA+0xE9  # DEVANAGARI LETTER ZA
+#   U+095C  0xBF+0xE9  # DEVANAGARI LETTER DDDHA
+#   U+095D  0xC0+0xE9  # DEVANAGARI LETTER RHA
+#   U+095E  0xC9+0xE9  # DEVANAGARI LETTER FA
+#
+# 4. Roundtrip considerations when mapping to decomposed Unicode
+#
+#   Both ISCII-91 (hence Mac OS Devanagari) and Unicode provide multiple
+#   ways of representing certain Devanagari consonants. For example,
+#   DEVANAGARI LETTER NNNA can be represented in Unicode as the single
+#   character 0x0929 or as the sequence 0x0928 0x093C; similarly, this
+#   consonant can be represented in Mac OS Devanagari as 0xC7 or as the
+#   sequence 0xC6 0xE9. This leads to some roundtrip problems. First
+#   note that we have the following mappings without such problems:
+#
+#   ISCII/  standard                  decomposition of  reverse mapping
+#   Mac OS  Unicode mapping           standard mapping  of decomposition
+#   ------  -----------------------   ----------------  ----------------
+#   0xC6    0x0928  ... LETTER NA     0x0928 (same)     0xC6
+#   0xCD    0x092F  ... LETTER YA     0x092F (same)     0xCD
+#   0xCF    0x0930  ... LETTER RA     0x0930 (same)     0xCF
+#   0xD2    0x0933  ... LETTER LLA    0x0933 (same)     0xD2
+#   0xE9    0x093C  ... SIGN NUKTA    0x093C (same)     0xE9
+#
+#   However, those mappings above cause roundtrip problems for the
+#   the following mappings if they are decomposed:
+#
+#   ISCII/  standard                  decomposition of  reverse mapping
+#   Mac OS  Unicode mapping           standard mapping  of decomposition
+#   ------  -----------------------   ----------------  ----------------
+#   0xC7    0x0929  ... LETTER NNNA   0x0928 0x093C     0xC6 0xE9
+#   0xCE    0x095F  ... LETTER YYA    0x092F 0x093C     0xCD 0xE9
+#   0xD0    0x0931  ... LETTER RRA    0x0930 0x093C     0xCF 0xE9
+#   0xD3    0x0934  ... LETTER LLLA   0x0933 0x093C     0xD2 0xE9
+#
+#   One solution is to use a grouping transcoding hint with the four
+#   decompositions above to mark the decomposed sequence for special
+#   treatment in transcoding. This yields the following mappings to
+#   decomposed Unicode:
+#
+#   ISCII/                     decomposed
+#   Mac OS                     Unicode mapping
+#   ------                     ----------------
+#   0xC7                       0xF860 0x0928 0x093C
+#   0xCE                       0xF860 0x092F 0x093C
+#   0xD0                       0xF860 0x0930 0x093C
+#   0xD3                       0xF860 0x0933 0x093C
+#
+# Details of mapping changes in each version:
+# -------------------------------------------
+#
+##################
+
+# Section 1: Map the following byte pairs as indicated:
+# (ZWNJ means ZERO WIDTH NON-JOINER, ZWJ means ZERO WIDTH JOINER)
+# (Also see note about 0xF0 in comments above)
+
+0xA1+0xE9	0x0950	# DEVANAGARI OM
+0xA6+0xE9	0x090C	# DEVANAGARI LETTER VOCALIC L
+0xA7+0xE9	0x0961	# DEVANAGARI LETTER VOCALIC LL
+0xAA+0xE9	0x0960	# DEVANAGARI LETTER VOCALIC RR
+0xDB+0xE9	0x0962	# DEVANAGARI VOWEL SIGN VOCALIC L
+0xDC+0xE9	0x0963	# DEVANAGARI VOWEL SIGN VOCALIC LL
+0xDF+0xE9	0x0944	# DEVANAGARI VOWEL SIGN VOCALIC RR
+0xE8+0xE8	0x094D+0x200C	# DEVANAGARI SIGN VIRAMA + ZWNJ # explicit halant
+0xE8+0xE9	0x094D+0x200D	# DEVANAGARI SIGN VIRAMA + ZWJ # soft halant
+0xEA+0xE9	0x093D	# DEVANAGARI SIGN AVAGRAHA
+
+# Section 2: Map the remaining bytes as follows:
+
+0x20	0x0020	# SPACE
+0x21	0x0021	# EXCLAMATION MARK
+0x22	0x0022	# QUOTATION MARK
+0x23	0x0023	# NUMBER SIGN
+0x24	0x0024	# DOLLAR SIGN
+0x25	0x0025	# PERCENT SIGN
+0x26	0x0026	# AMPERSAND
+0x27	0x0027	# APOSTROPHE
+0x28	0x0028	# LEFT PARENTHESIS
+0x29	0x0029	# RIGHT PARENTHESIS
+0x2A	0x002A	# ASTERISK
+0x2B	0x002B	# PLUS SIGN
+0x2C	0x002C	# COMMA
+0x2D	0x002D	# HYPHEN-MINUS
+0x2E	0x002E	# FULL STOP
+0x2F	0x002F	# SOLIDUS
+0x30	0x0030	# DIGIT ZERO
+0x31	0x0031	# DIGIT ONE
+0x32	0x0032	# DIGIT TWO
+0x33	0x0033	# DIGIT THREE
+0x34	0x0034	# DIGIT FOUR
+0x35	0x0035	# DIGIT FIVE
+0x36	0x0036	# DIGIT SIX
+0x37	0x0037	# DIGIT SEVEN
+0x38	0x0038	# DIGIT EIGHT
+0x39	0x0039	# DIGIT NINE
+0x3A	0x003A	# COLON
+0x3B	0x003B	# SEMICOLON
+0x3C	0x003C	# LESS-THAN SIGN
+0x3D	0x003D	# EQUALS SIGN
+0x3E	0x003E	# GREATER-THAN SIGN
+0x3F	0x003F	# QUESTION MARK
+0x40	0x0040	# COMMERCIAL AT
+0x41	0x0041	# LATIN CAPITAL LETTER A
+0x42	0x0042	# LATIN CAPITAL LETTER B
+0x43	0x0043	# LATIN CAPITAL LETTER C
+0x44	0x0044	# LATIN CAPITAL LETTER D
+0x45	0x0045	# LATIN CAPITAL LETTER E
+0x46	0x0046	# LATIN CAPITAL LETTER F
+0x47	0x0047	# LATIN CAPITAL LETTER G
+0x48	0x0048	# LATIN CAPITAL LETTER H
+0x49	0x0049	# LATIN CAPITAL LETTER I
+0x4A	0x004A	# LATIN CAPITAL LETTER J
+0x4B	0x004B	# LATIN CAPITAL LETTER K
+0x4C	0x004C	# LATIN CAPITAL LETTER L
+0x4D	0x004D	# LATIN CAPITAL LETTER M
+0x4E	0x004E	# LATIN CAPITAL LETTER N
+0x4F	0x004F	# LATIN CAPITAL LETTER O
+0x50	0x0050	# LATIN CAPITAL LETTER P
+0x51	0x0051	# LATIN CAPITAL LETTER Q
+0x52	0x0052	# LATIN CAPITAL LETTER R
+0x53	0x0053	# LATIN CAPITAL LETTER S
+0x54	0x0054	# LATIN CAPITAL LETTER T
+0x55	0x0055	# LATIN CAPITAL LETTER U
+0x56	0x0056	# LATIN CAPITAL LETTER V
+0x57	0x0057	# LATIN CAPITAL LETTER W
+0x58	0x0058	# LATIN CAPITAL LETTER X
+0x59	0x0059	# LATIN CAPITAL LETTER Y
+0x5A	0x005A	# LATIN CAPITAL LETTER Z
+0x5B	0x005B	# LEFT SQUARE BRACKET
+0x5C	0x005C	# REVERSE SOLIDUS
+0x5D	0x005D	# RIGHT SQUARE BRACKET
+0x5E	0x005E	# CIRCUMFLEX ACCENT
+0x5F	0x005F	# LOW LINE
+0x60	0x0060	# GRAVE ACCENT
+0x61	0x0061	# LATIN SMALL LETTER A
+0x62	0x0062	# LATIN SMALL LETTER B
+0x63	0x0063	# LATIN SMALL LETTER C
+0x64	0x0064	# LATIN SMALL LETTER D
+0x65	0x0065	# LATIN SMALL LETTER E
+0x66	0x0066	# LATIN SMALL LETTER F
+0x67	0x0067	# LATIN SMALL LETTER G
+0x68	0x0068	# LATIN SMALL LETTER H
+0x69	0x0069	# LATIN SMALL LETTER I
+0x6A	0x006A	# LATIN SMALL LETTER J
+0x6B	0x006B	# LATIN SMALL LETTER K
+0x6C	0x006C	# LATIN SMALL LETTER L
+0x6D	0x006D	# LATIN SMALL LETTER M
+0x6E	0x006E	# LATIN SMALL LETTER N
+0x6F	0x006F	# LATIN SMALL LETTER O
+0x70	0x0070	# LATIN SMALL LETTER P
+0x71	0x0071	# LATIN SMALL LETTER Q
+0x72	0x0072	# LATIN SMALL LETTER R
+0x73	0x0073	# LATIN SMALL LETTER S
+0x74	0x0074	# LATIN SMALL LETTER T
+0x75	0x0075	# LATIN SMALL LETTER U
+0x76	0x0076	# LATIN SMALL LETTER V
+0x77	0x0077	# LATIN SMALL LETTER W
+0x78	0x0078	# LATIN SMALL LETTER X
+0x79	0x0079	# LATIN SMALL LETTER Y
+0x7A	0x007A	# LATIN SMALL LETTER Z
+0x7B	0x007B	# LEFT CURLY BRACKET
+0x7C	0x007C	# VERTICAL LINE
+0x7D	0x007D	# RIGHT CURLY BRACKET
+0x7E	0x007E	# TILDE
+#
+0x80	0x00D7	# MULTIPLICATION SIGN
+0x81	0x2212	# MINUS SIGN
+0x82	0x2013	# EN DASH
+0x83	0x2014	# EM DASH
+0x84	0x2018	# LEFT SINGLE QUOTATION MARK
+0x85	0x2019	# RIGHT SINGLE QUOTATION MARK
+0x86	0x2026	# HORIZONTAL ELLIPSIS
+0x87	0x2022	# BULLET
+0x88	0x00A9	# COPYRIGHT SIGN
+0x89	0x00AE	# REGISTERED SIGN
+0x8A	0x2122	# TRADE MARK SIGN
+#
+0x90	0x0965	# DEVANAGARI DOUBLE DANDA
+0x91	0x0970	# DEVANAGARI ABBREVIATION SIGN
+#
+0xA1	0x0901	# DEVANAGARI SIGN CANDRABINDU
+0xA2	0x0902	# DEVANAGARI SIGN ANUSVARA
+0xA3	0x0903	# DEVANAGARI SIGN VISARGA
+0xA4	0x0905	# DEVANAGARI LETTER A
+0xA5	0x0906	# DEVANAGARI LETTER AA
+0xA6	0x0907	# DEVANAGARI LETTER I
+0xA7	0x0908	# DEVANAGARI LETTER II
+0xA8	0x0909	# DEVANAGARI LETTER U
+0xA9	0x090A	# DEVANAGARI LETTER UU
+0xAA	0x090B	# DEVANAGARI LETTER VOCALIC R
+0xAB	0x090E	# DEVANAGARI LETTER SHORT E
+0xAC	0x090F	# DEVANAGARI LETTER E
+0xAD	0x0910	# DEVANAGARI LETTER AI
+0xAE	0x090D	# DEVANAGARI LETTER CANDRA E
+0xAF	0x0912	# DEVANAGARI LETTER SHORT O
+0xB0	0x0913	# DEVANAGARI LETTER O
+0xB1	0x0914	# DEVANAGARI LETTER AU
+0xB2	0x0911	# DEVANAGARI LETTER CANDRA O
+0xB3	0x0915	# DEVANAGARI LETTER KA
+0xB4	0x0916	# DEVANAGARI LETTER KHA
+0xB5	0x0917	# DEVANAGARI LETTER GA
+0xB6	0x0918	# DEVANAGARI LETTER GHA
+0xB7	0x0919	# DEVANAGARI LETTER NGA
+0xB8	0x091A	# DEVANAGARI LETTER CA
+0xB9	0x091B	# DEVANAGARI LETTER CHA
+0xBA	0x091C	# DEVANAGARI LETTER JA
+0xBB	0x091D	# DEVANAGARI LETTER JHA
+0xBC	0x091E	# DEVANAGARI LETTER NYA
+0xBD	0x091F	# DEVANAGARI LETTER TTA
+0xBE	0x0920	# DEVANAGARI LETTER TTHA
+0xBF	0x0921	# DEVANAGARI LETTER DDA
+0xC0	0x0922	# DEVANAGARI LETTER DDHA
+0xC1	0x0923	# DEVANAGARI LETTER NNA
+0xC2	0x0924	# DEVANAGARI LETTER TA
+0xC3	0x0925	# DEVANAGARI LETTER THA
+0xC4	0x0926	# DEVANAGARI LETTER DA
+0xC5	0x0927	# DEVANAGARI LETTER DHA
+0xC6	0x0928	# DEVANAGARI LETTER NA
+0xC7	0x0929	# DEVANAGARI LETTER NNNA
+0xC8	0x092A	# DEVANAGARI LETTER PA
+0xC9	0x092B	# DEVANAGARI LETTER PHA
+0xCA	0x092C	# DEVANAGARI LETTER BA
+0xCB	0x092D	# DEVANAGARI LETTER BHA
+0xCC	0x092E	# DEVANAGARI LETTER MA
+0xCD	0x092F	# DEVANAGARI LETTER YA
+0xCE	0x095F	# DEVANAGARI LETTER YYA
+0xCF	0x0930	# DEVANAGARI LETTER RA
+0xD0	0x0931	# DEVANAGARI LETTER RRA
+0xD1	0x0932	# DEVANAGARI LETTER LA
+0xD2	0x0933	# DEVANAGARI LETTER LLA
+0xD3	0x0934	# DEVANAGARI LETTER LLLA
+0xD4	0x0935	# DEVANAGARI LETTER VA
+0xD5	0x0936	# DEVANAGARI LETTER SHA
+0xD6	0x0937	# DEVANAGARI LETTER SSA
+0xD7	0x0938	# DEVANAGARI LETTER SA
+0xD8	0x0939	# DEVANAGARI LETTER HA
+0xD9	0x200E	# LEFT-TO-RIGHT MARK # invisible consonant
+0xDA	0x093E	# DEVANAGARI VOWEL SIGN AA
+0xDB	0x093F	# DEVANAGARI VOWEL SIGN I
+0xDC	0x0940	# DEVANAGARI VOWEL SIGN II
+0xDD	0x0941	# DEVANAGARI VOWEL SIGN U
+0xDE	0x0942	# DEVANAGARI VOWEL SIGN UU
+0xDF	0x0943	# DEVANAGARI VOWEL SIGN VOCALIC R
+0xE0	0x0946	# DEVANAGARI VOWEL SIGN SHORT E
+0xE1	0x0947	# DEVANAGARI VOWEL SIGN E
+0xE2	0x0948	# DEVANAGARI VOWEL SIGN AI
+0xE3	0x0945	# DEVANAGARI VOWEL SIGN CANDRA E
+0xE4	0x094A	# DEVANAGARI VOWEL SIGN SHORT O
+0xE5	0x094B	# DEVANAGARI VOWEL SIGN O
+0xE6	0x094C	# DEVANAGARI VOWEL SIGN AU
+0xE7	0x0949	# DEVANAGARI VOWEL SIGN CANDRA O
+0xE8	0x094D	# DEVANAGARI SIGN VIRAMA # halant
+0xE9	0x093C	# DEVANAGARI SIGN NUKTA
+0xEA	0x0964	# DEVANAGARI DANDA
+#
+0xF1	0x0966	# DEVANAGARI DIGIT ZERO
+0xF2	0x0967	# DEVANAGARI DIGIT ONE
+0xF3	0x0968	# DEVANAGARI DIGIT TWO
+0xF4	0x0969	# DEVANAGARI DIGIT THREE
+0xF5	0x096A	# DEVANAGARI DIGIT FOUR
+0xF6	0x096B	# DEVANAGARI DIGIT FIVE
+0xF7	0x096C	# DEVANAGARI DIGIT SIX
+0xF8	0x096D	# DEVANAGARI DIGIT SEVEN
+0xF9	0x096E	# DEVANAGARI DIGIT EIGHT
+0xFA	0x096F	# DEVANAGARI DIGIT NINE

Modified: user/edwin/locale/tools/charmaps/charmaps.txt
==============================================================================
--- user/edwin/locale/tools/charmaps/charmaps.txt	Wed Aug  5 12:19:43 2009	(r196072)
+++ user/edwin/locale/tools/charmaps/charmaps.txt	Wed Aug  5 12:40:21 2009	(r196073)
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 Sources:
 
 unicode.org:	http://unicode.org/Public/MAPPINGS
@@ -14,7 +16,7 @@ haible.de:	http://haible.de/bruno/charse
 ?	GB18030		haible.de: GB18030.html
 +	GB2312		haible.de: GB2312.html / unicode.org-mappings/EASTASIA/GB/GB2312.TXT
 	GBK
-	ISCII-DEV	haible.de: Indic.html
++	ISCII-DEV	unicode.org: VENDORS/APPLE/DEVANAGA i/ haible.de: Indic.html
 +	ISO8859-1	unicode.org: ISO8859/
 +	ISO8859-2	unicode.org: ISO8859/
 +	ISO8859-4	unicode.org: ISO8859/

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 12:56:18 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 5C786106564A;
	Wed,  5 Aug 2009 12:56:18 +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 4B4698FC13;
	Wed,  5 Aug 2009 12:56:18 +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 n75CuIOA070773;
	Wed, 5 Aug 2009 12:56:18 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75CuIIJ070769;
	Wed, 5 Aug 2009 12:56:18 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908051256.n75CuIIJ070769@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 12:56:18 +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: r196074 - in user/edwin/locale/tools: . charmaps
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 12:56:19 -0000

Author: edwin
Date: Wed Aug  5 12:56:18 2009
New Revision: 196074
URL: http://svn.freebsd.org/changeset/base/196074

Log:
  Add US-ASCII charactermap

Added:
  user/edwin/locale/tools/charmaps/US-ASCII.TXT
Modified:
  user/edwin/locale/tools/charmaps.xml
  user/edwin/locale/tools/charmaps/charmaps.txt

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Wed Aug  5 12:40:21 2009	(r196073)
+++ user/edwin/locale/tools/charmaps.xml	Wed Aug  5 12:56:18 2009	(r196074)
@@ -463,6 +463,10 @@
 	<translation encoding="ARMSCII-8"
 	    cldr="ONE DOT LEADER" string="FULL STOP" />
 
+	<translation encoding="US-ASCII" cldr="POUND SIGN" string="GBP" />
+	<translation encoding="US-ASCII"
+	    cldr="NO-BREAK SPACE" unicode="SPACE" />
+
 </translations>
 
 <oldtranslations>

Added: user/edwin/locale/tools/charmaps/US-ASCII.TXT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/charmaps/US-ASCII.TXT	Wed Aug  5 12:56:18 2009	(r196074)
@@ -0,0 +1,135 @@
+#
+#	Format:  Three tab-separated columns
+#		 Column #1 is the US-ASCII code (in hex as 0xXX)
+#		 Column #2 is the Unicode (in hex as 0xXXXX)
+#		 Column #3 the Unicode name (follows a comment sign, '#')
+#
+#
+0x00	0x0000	#	NULL
+0x01	0x0001	#	START OF HEADING
+0x02	0x0002	#	START OF TEXT
+0x03	0x0003	#	END OF TEXT
+0x04	0x0004	#	END OF TRANSMISSION
+0x05	0x0005	#	ENQUIRY
+0x06	0x0006	#	ACKNOWLEDGE
+0x07	0x0007	#	BELL
+0x08	0x0008	#	BACKSPACE
+0x09	0x0009	#	HORIZONTAL TABULATION
+0x0A	0x000A	#	LINE FEED
+0x0B	0x000B	#	VERTICAL TABULATION
+0x0C	0x000C	#	FORM FEED
+0x0D	0x000D	#	CARRIAGE RETURN
+0x0E	0x000E	#	SHIFT OUT
+0x0F	0x000F	#	SHIFT IN
+0x10	0x0010	#	DATA LINK ESCAPE
+0x11	0x0011	#	DEVICE CONTROL ONE
+0x12	0x0012	#	DEVICE CONTROL TWO
+0x13	0x0013	#	DEVICE CONTROL THREE
+0x14	0x0014	#	DEVICE CONTROL FOUR
+0x15	0x0015	#	NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#	SYNCHRONOUS IDLE
+0x17	0x0017	#	END OF TRANSMISSION BLOCK
+0x18	0x0018	#	CANCEL
+0x19	0x0019	#	END OF MEDIUM
+0x1A	0x001A	#	SUBSTITUTE
+0x1B	0x001B	#	ESCAPE
+0x1C	0x001C	#	FILE SEPARATOR
+0x1D	0x001D	#	GROUP SEPARATOR
+0x1E	0x001E	#	RECORD SEPARATOR
+0x1F	0x001F	#	UNIT SEPARATOR
+0x20	0x0020	#	SPACE
+0x21	0x0021	#	EXCLAMATION MARK
+0x22	0x0022	#	QUOTATION MARK
+0x23	0x0023	#	NUMBER SIGN
+0x24	0x0024	#	DOLLAR SIGN
+0x25	0x0025	#	PERCENT SIGN
+0x26	0x0026	#	AMPERSAND
+0x27	0x0027	#	APOSTROPHE
+0x28	0x0028	#	LEFT PARENTHESIS
+0x29	0x0029	#	RIGHT PARENTHESIS
+0x2A	0x002A	#	ASTERISK
+0x2B	0x002B	#	PLUS SIGN
+0x2C	0x002C	#	COMMA
+0x2D	0x002D	#	HYPHEN-MINUS
+0x2E	0x002E	#	FULL STOP
+0x2F	0x002F	#	SOLIDUS
+0x30	0x0030	#	DIGIT ZERO
+0x31	0x0031	#	DIGIT ONE
+0x32	0x0032	#	DIGIT TWO
+0x33	0x0033	#	DIGIT THREE
+0x34	0x0034	#	DIGIT FOUR
+0x35	0x0035	#	DIGIT FIVE
+0x36	0x0036	#	DIGIT SIX
+0x37	0x0037	#	DIGIT SEVEN
+0x38	0x0038	#	DIGIT EIGHT
+0x39	0x0039	#	DIGIT NINE
+0x3A	0x003A	#	COLON
+0x3B	0x003B	#	SEMICOLON
+0x3C	0x003C	#	LESS-THAN SIGN
+0x3D	0x003D	#	EQUALS SIGN
+0x3E	0x003E	#	GREATER-THAN SIGN
+0x3F	0x003F	#	QUESTION MARK
+0x40	0x0040	#	COMMERCIAL AT
+0x41	0x0041	#	LATIN CAPITAL LETTER A
+0x42	0x0042	#	LATIN CAPITAL LETTER B
+0x43	0x0043	#	LATIN CAPITAL LETTER C
+0x44	0x0044	#	LATIN CAPITAL LETTER D
+0x45	0x0045	#	LATIN CAPITAL LETTER E
+0x46	0x0046	#	LATIN CAPITAL LETTER F
+0x47	0x0047	#	LATIN CAPITAL LETTER G
+0x48	0x0048	#	LATIN CAPITAL LETTER H
+0x49	0x0049	#	LATIN CAPITAL LETTER I
+0x4A	0x004A	#	LATIN CAPITAL LETTER J
+0x4B	0x004B	#	LATIN CAPITAL LETTER K
+0x4C	0x004C	#	LATIN CAPITAL LETTER L
+0x4D	0x004D	#	LATIN CAPITAL LETTER M
+0x4E	0x004E	#	LATIN CAPITAL LETTER N
+0x4F	0x004F	#	LATIN CAPITAL LETTER O
+0x50	0x0050	#	LATIN CAPITAL LETTER P
+0x51	0x0051	#	LATIN CAPITAL LETTER Q
+0x52	0x0052	#	LATIN CAPITAL LETTER R
+0x53	0x0053	#	LATIN CAPITAL LETTER S
+0x54	0x0054	#	LATIN CAPITAL LETTER T
+0x55	0x0055	#	LATIN CAPITAL LETTER U
+0x56	0x0056	#	LATIN CAPITAL LETTER V
+0x57	0x0057	#	LATIN CAPITAL LETTER W
+0x58	0x0058	#	LATIN CAPITAL LETTER X
+0x59	0x0059	#	LATIN CAPITAL LETTER Y
+0x5A	0x005A	#	LATIN CAPITAL LETTER Z
+0x5B	0x005B	#	LEFT SQUARE BRACKET
+0x5C	0x005C	#	REVERSE SOLIDUS
+0x5D	0x005D	#	RIGHT SQUARE BRACKET
+0x5E	0x005E	#	CIRCUMFLEX ACCENT
+0x5F	0x005F	#	LOW LINE
+0x60	0x0060	#	GRAVE ACCENT
+0x61	0x0061	#	LATIN SMALL LETTER A
+0x62	0x0062	#	LATIN SMALL LETTER B
+0x63	0x0063	#	LATIN SMALL LETTER C
+0x64	0x0064	#	LATIN SMALL LETTER D
+0x65	0x0065	#	LATIN SMALL LETTER E
+0x66	0x0066	#	LATIN SMALL LETTER F
+0x67	0x0067	#	LATIN SMALL LETTER G
+0x68	0x0068	#	LATIN SMALL LETTER H
+0x69	0x0069	#	LATIN SMALL LETTER I
+0x6A	0x006A	#	LATIN SMALL LETTER J
+0x6B	0x006B	#	LATIN SMALL LETTER K
+0x6C	0x006C	#	LATIN SMALL LETTER L
+0x6D	0x006D	#	LATIN SMALL LETTER M
+0x6E	0x006E	#	LATIN SMALL LETTER N
+0x6F	0x006F	#	LATIN SMALL LETTER O
+0x70	0x0070	#	LATIN SMALL LETTER P
+0x71	0x0071	#	LATIN SMALL LETTER Q
+0x72	0x0072	#	LATIN SMALL LETTER R
+0x73	0x0073	#	LATIN SMALL LETTER S
+0x74	0x0074	#	LATIN SMALL LETTER T
+0x75	0x0075	#	LATIN SMALL LETTER U
+0x76	0x0076	#	LATIN SMALL LETTER V
+0x77	0x0077	#	LATIN SMALL LETTER W
+0x78	0x0078	#	LATIN SMALL LETTER X
+0x79	0x0079	#	LATIN SMALL LETTER Y
+0x7A	0x007A	#	LATIN SMALL LETTER Z
+0x7B	0x007B	#	LEFT CURLY BRACKET
+0x7C	0x007C	#	VERTICAL LINE
+0x7D	0x007D	#	RIGHT CURLY BRACKET
+0x7E	0x007E	#	TILDE
+0x7F	0x007F	#	DELETE

Modified: user/edwin/locale/tools/charmaps/charmaps.txt
==============================================================================
--- user/edwin/locale/tools/charmaps/charmaps.txt	Wed Aug  5 12:40:21 2009	(r196073)
+++ user/edwin/locale/tools/charmaps/charmaps.txt	Wed Aug  5 12:56:18 2009	(r196074)
@@ -29,7 +29,7 @@ haible.de:	http://haible.de/bruno/charse
 +	KOI8-U		unicode.org: VENDORS/MISC
 +	PT154		IANA: PTCP154
 	SJIS		haible.de: Shift_JIS.html
-	US-ASCII
++	US-ASCII	From ISO8859-1.TXT
 	eucCN		haible.de: GB2312.html / unicode.org-mappings/EASTASIA/GB/GB2312.TXT
 ?	eucJP		haible.de: EUC-JP.html
 ?	eucKR		haible.de: EUC-KR.html

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 21:34:26 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 D06221065675;
	Wed,  5 Aug 2009 21:34:26 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A70CE8FC1D;
	Wed,  5 Aug 2009 21:34:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n75LYQxm002645;
	Wed, 5 Aug 2009 21:34:26 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75LYQfK002644;
	Wed, 5 Aug 2009 21:34:26 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908052134.n75LYQfK002644@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 5 Aug 2009 21:34:26 +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: r196075 - user/kmacy/head_zfs_merge/head
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 21:34:27 -0000

Author: kmacy
Date: Wed Aug  5 21:34:26 2009
New Revision: 196075
URL: http://svn.freebsd.org/changeset/base/196075

Log:
  create branch for merging zfs performance improvements to HEAD

Added:
  user/kmacy/head_zfs_merge/head/   (props changed)
     - copied from r196074, head/

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 21:58:40 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 2E69F106566B;
	Wed,  5 Aug 2009 21:58:40 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 03AF38FC0C;
	Wed,  5 Aug 2009 21:58:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n75LwdSC059865;
	Wed, 5 Aug 2009 21:58:39 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75LwdMC059862;
	Wed, 5 Aug 2009 21:58:39 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908052158.n75LwdMC059862@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 5 Aug 2009 21:58:39 +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: r196076 - in user/kmacy/head_zfs_merge/sys:
	cddl/contrib/opensolaris/uts/common/fs/zfs modules/zfs
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 21:58:40 -0000

Author: kmacy
Date: Wed Aug  5 21:58:39 2009
New Revision: 196076
URL: http://svn.freebsd.org/changeset/base/196076

Log:
  enable UMA for buffer allocation

Modified:
  user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/kmacy/head_zfs_merge/sys/modules/zfs/Makefile

Modified: user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Wed Aug  5 21:34:26 2009	(r196075)
+++ user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Wed Aug  5 21:58:39 2009	(r196076)
@@ -91,13 +91,9 @@ zio_init(void)
 #ifdef ZIO_USE_UMA
 	size_t c;
 #endif
-#if 0
-	vmem_t *data_alloc_arena = NULL;
+	zio_cache = kmem_cache_create("zio_cache", sizeof (zio_t), 0,
+	    NULL, NULL, NULL, NULL, NULL, 0);
 
-#ifdef _KERNEL
-	data_alloc_arena = zio_alloc_arena;
-#endif
-#endif
 	zio_cache = kmem_cache_create("zio_cache", sizeof (zio_t), 0,
 	    NULL, NULL, NULL, NULL, NULL, 0);
 
@@ -132,7 +128,7 @@ zio_init(void)
 
 			(void) sprintf(name, "zio_data_buf_%lu", (ulong_t)size);
 			zio_data_buf_cache[c] = kmem_cache_create(name, size,
-			    align, NULL, NULL, NULL, NULL, data_alloc_arena,
+			    align, NULL, NULL, NULL, NULL, NULL,
 			    KMC_NODEBUG);
 		}
 	}
@@ -422,7 +418,6 @@ zio_create(zio_t *pio, spa_t *spa, uint6
 	ASSERT3U(size, <=, SPA_MAXBLOCKSIZE);
 	ASSERT(P2PHASE(size, SPA_MINBLOCKSIZE) == 0);
 	ASSERT(P2PHASE(offset, SPA_MINBLOCKSIZE) == 0);
-
 	ASSERT(!vd || spa_config_held(spa, SCL_STATE_ALL, RW_READER));
 	ASSERT(!bp || !(flags & ZIO_FLAG_CONFIG_WRITER));
 	ASSERT(vd || stage == ZIO_STAGE_OPEN);

Modified: user/kmacy/head_zfs_merge/sys/modules/zfs/Makefile
==============================================================================
--- user/kmacy/head_zfs_merge/sys/modules/zfs/Makefile	Wed Aug  5 21:34:26 2009	(r196075)
+++ user/kmacy/head_zfs_merge/sys/modules/zfs/Makefile	Wed Aug  5 21:58:39 2009	(r196076)
@@ -63,8 +63,8 @@ ZFS_SRCS=	${ZFS_OBJS:C/.o$/.c/}
 SRCS+=	${ZFS_SRCS}
 SRCS+=	vdev_geom.c
 
-# Use UMA for ZIO allocation. This is not stable.
-#CFLAGS+=-DZIO_USE_UMA
+# Use UMA for ZIO allocation. 
+CFLAGS+=-DZIO_USE_UMA
 
 # Use FreeBSD's namecache.
 CFLAGS+=-DFREEBSD_NAMECACHE

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 22:22:50 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 EB26F1065676;
	Wed,  5 Aug 2009 22:22:50 +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 970538FC23;
	Wed,  5 Aug 2009 22:22:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n75MMo9F026474;
	Wed, 5 Aug 2009 22:22:50 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75MMog0026470;
	Wed, 5 Aug 2009 22:22:50 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908052222.n75MMog0026470@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 5 Aug 2009 22:22:50 +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: r196077 - in user/edwin/locale/tools: . charmaps
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 22:22:51 -0000

Author: edwin
Date: Wed Aug  5 22:22:50 2009
New Revision: 196077
URL: http://svn.freebsd.org/changeset/base/196077

Log:
  Add support for the eucCN charactermap

Added:
  user/edwin/locale/tools/changeoffset.pl   (contents, props changed)
  user/edwin/locale/tools/charmaps/eucCN.TXT
Modified:
  user/edwin/locale/tools/charmaps.xml

Added: user/edwin/locale/tools/changeoffset.pl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/changeoffset.pl	Wed Aug  5 22:22:50 2009	(r196077)
@@ -0,0 +1,30 @@
+#!/usr/bin/perl -w
+
+if ($#ARGV != 2) {
+	print STDERR "Usage: $0 <charmap in> <charmap out> <offset>\n";
+	print STDERR "offset should be in hex and can be prefixed with a -.\n";
+	exit;
+}
+
+$fin = $ARGV[0];
+$fout = $ARGV[1];
+$offset = hex($ARGV[2]);
+
+open(FIN, "$fin.TXT") or die "Cannot open $fin.TXT for reading";
+open(FOUT, ">$fout.TXT");
+
+foreach my $l (<FIN>) {
+	my @a = split(" ", $l);
+
+	if ($a[0] =~ /^0x[0-9a-fA-F]+$/) {
+		my $c = length($a[0]);
+		my $h = hex($a[0]) + $offset;
+
+		$l = sprintf("0x%*X%s", $c - 2, $h, substr($l, $c));
+	}
+
+	print FOUT $l;
+}
+
+close(FOUT);
+close(FIN);

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Wed Aug  5 21:58:39 2009	(r196076)
+++ user/edwin/locale/tools/charmaps.xml	Wed Aug  5 22:22:50 2009	(r196077)
@@ -381,83 +381,83 @@
 	<!-- Copied from the original FreeBSD src/share/timedef -->
 
 
-	<translation encoding="GB2312" cldr="C"
+	<translation encoding="GB2312 eucCN" cldr="C"
 	    unicode="FULLWIDTH LATIN CAPITAL LETTER C" />
-	<translation encoding="GB2312" cldr="N"
+	<translation encoding="GB2312 eucCN" cldr="N"
 	    unicode="FULLWIDTH LATIN CAPITAL LETTER N" />
-	<translation encoding="GB2312" cldr="Y"
+	<translation encoding="GB2312 eucCN" cldr="Y"
 	    unicode="FULLWIDTH LATIN CAPITAL LETTER Y" />
-	<translation encoding="GB2312" cldr="one"
+	<translation encoding="GB2312 eucCN" cldr="one"
 	    unicode="FULLWIDTH DIGIT ONE" />
-	<translation encoding="GB2312" cldr="two"
+	<translation encoding="GB2312 eucCN" cldr="two"
 	    unicode="FULLWIDTH DIGIT TWO" />
-	<translation encoding="GB2312" cldr="three"
+	<translation encoding="GB2312 eucCN" cldr="three"
 	    unicode="FULLWIDTH DIGIT THREE" />
-	<translation encoding="GB2312" cldr="four"
+	<translation encoding="GB2312 eucCN" cldr="four"
 	    unicode="FULLWIDTH DIGIT FOUR" />
-	<translation encoding="GB2312" cldr="five"
+	<translation encoding="GB2312 eucCN" cldr="five"
 	    unicode="FULLWIDTH DIGIT FIVE" />
-	<translation encoding="GB2312" cldr="six"
+	<translation encoding="GB2312 eucCN" cldr="six"
 	    unicode="FULLWIDTH DIGIT SIX" />
-	<translation encoding="GB2312" cldr="seven"
+	<translation encoding="GB2312 eucCN" cldr="seven"
 	    unicode="FULLWIDTH DIGIT SEVEN" />
-	<translation encoding="GB2312" cldr="eight"
+	<translation encoding="GB2312 eucCN" cldr="eight"
 	    unicode="FULLWIDTH DIGIT EIGHT" />
-	<translation encoding="GB2312" cldr="nine"
+	<translation encoding="GB2312 eucCN" cldr="nine"
 	    unicode="FULLWIDTH DIGIT NINE" />
-	<translation encoding="GB2312" cldr="zero"
+	<translation encoding="GB2312 eucCN" cldr="zero"
 	    unicode="FULLWIDTH DIGIT ZERO" />
-	<translation encoding="GB2312" cldr="space"
+	<translation encoding="GB2312 eucCN" cldr="space"
 	    unicode="IDEOGRAPHIC SPACE" />
-	<translation encoding="GB2312" cldr="FULL STOP"
+	<translation encoding="GB2312 eucCN" cldr="FULL STOP"
 	    unicode="FULLWIDTH FULL STOP" />
-	<translation encoding="GB2312" cldr="COMMA"
+	<translation encoding="GB2312 eucCN" cldr="COMMA"
 	    unicode="FULLWIDTH COMMA" />
-	<translation encoding="GB2312" cldr="HYPHEN-MINUS"
+	<translation encoding="GB2312 eucCN" cldr="HYPHEN-MINUS"
 	    unicode="FULLWIDTH HYPHEN-MINUS" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E00" ucc="4E00" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E09" ucc="4E09" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E0A" ucc="4E0A" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E0B" ucc="4E0B" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E8C" ucc="4E8C" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E94" ucc="4E94" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-516D" ucc="516D" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5206" ucc="5206" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5348" ucc="5348" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5426" ucc="5426" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5468" ucc="5468" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-56DB" ucc="56DB" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5B9A" ucc="5B9A" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5E74" ucc="5E74" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-65E5" ucc="65E5" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-65F6" ucc="65F6" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-661F" ucc="661F" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-662F" ucc="662F" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-6708" ucc="6708" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-671F" ucc="671F" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-786E" ucc="786E" />
-	<translation encoding="GB2312"
+	<translation encoding="GB2312 eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-79D2" ucc="79D2" />
 
 	<translation encoding="ARMSCII-8"

Added: user/edwin/locale/tools/charmaps/eucCN.TXT
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/charmaps/eucCN.TXT	Wed Aug  5 22:22:50 2009	(r196077)
@@ -0,0 +1,7456 @@
+#
+#	Name:             eucCN-80 to Unicode table (complete, hex format)
+#	Based on the GB2312.TXT
+#
+#	General notes:
+#
+#	The following algorithms can be used to change the hex form
+#		of GB2312 to other standard forms:
+#
+#		To change hex to EUC form, add 0x8080
+#
+0xA1A1	0x3000	# IDEOGRAPHIC SPACE
+0xA1A2	0x3001	# IDEOGRAPHIC COMMA
+0xA1A3	0x3002	# IDEOGRAPHIC FULL STOP
+0xA1A4	0x30FB	# KATAKANA MIDDLE DOT
+0xA1A5	0x02C9	# MODIFIER LETTER MACRON (Mandarin Chinese first tone)
+0xA1A6	0x02C7	# CARON (Mandarin Chinese third tone)
+0xA1A7	0x00A8	# DIAERESIS
+0xA1A8	0x3003	# DITTO MARK
+0xA1A9	0x3005	# IDEOGRAPHIC ITERATION MARK
+0xA1AA	0x2015	# HORIZONTAL BAR
+0xA1AB	0xFF5E	# FULLWIDTH TILDE
+0xA1AC	0x2016	# DOUBLE VERTICAL LINE
+0xA1AD	0x2026	# HORIZONTAL ELLIPSIS
+0xA1AE	0x2018	# LEFT SINGLE QUOTATION MARK
+0xA1AF	0x2019	# RIGHT SINGLE QUOTATION MARK
+0xA1B0	0x201C	# LEFT DOUBLE QUOTATION MARK
+0xA1B1	0x201D	# RIGHT DOUBLE QUOTATION MARK
+0xA1B2	0x3014	# LEFT TORTOISE SHELL BRACKET
+0xA1B3	0x3015	# RIGHT TORTOISE SHELL BRACKET
+0xA1B4	0x3008	# LEFT ANGLE BRACKET
+0xA1B5	0x3009	# RIGHT ANGLE BRACKET
+0xA1B6	0x300A	# LEFT DOUBLE ANGLE BRACKET
+0xA1B7	0x300B	# RIGHT DOUBLE ANGLE BRACKET
+0xA1B8	0x300C	# LEFT CORNER BRACKET
+0xA1B9	0x300D	# RIGHT CORNER BRACKET
+0xA1BA	0x300E	# LEFT WHITE CORNER BRACKET
+0xA1BB	0x300F	# RIGHT WHITE CORNER BRACKET
+0xA1BC	0x3016	# LEFT WHITE LENTICULAR BRACKET
+0xA1BD	0x3017	# RIGHT WHITE LENTICULAR BRACKET
+0xA1BE	0x3010	# LEFT BLACK LENTICULAR BRACKET
+0xA1BF	0x3011	# RIGHT BLACK LENTICULAR BRACKET
+0xA1C0	0x00B1	# PLUS-MINUS SIGN
+0xA1C1	0x00D7	# MULTIPLICATION SIGN
+0xA1C2	0x00F7	# DIVISION SIGN
+0xA1C3	0x2236	# RATIO
+0xA1C4	0x2227	# LOGICAL AND
+0xA1C5	0x2228	# LOGICAL OR
+0xA1C6	0x2211	# N-ARY SUMMATION
+0xA1C7	0x220F	# N-ARY PRODUCT
+0xA1C8	0x222A	# UNION
+0xA1C9	0x2229	# INTERSECTION
+0xA1CA	0x2208	# ELEMENT OF
+0xA1CB	0x2237	# PROPORTION
+0xA1CC	0x221A	# SQUARE ROOT
+0xA1CD	0x22A5	# UP TACK
+0xA1CE	0x2225	# PARALLEL TO
+0xA1CF	0x2220	# ANGLE
+0xA1D0	0x2312	# ARC
+0xA1D1	0x2299	# CIRCLED DOT OPERATOR
+0xA1D2	0x222B	# INTEGRAL
+0xA1D3	0x222E	# CONTOUR INTEGRAL
+0xA1D4	0x2261	# IDENTICAL TO
+0xA1D5	0x224C	# ALL EQUAL TO
+0xA1D6	0x2248	# ALMOST EQUAL TO
+0xA1D7	0x223D	# REVERSED TILDE
+0xA1D8	0x221D	# PROPORTIONAL TO
+0xA1D9	0x2260	# NOT EQUAL TO
+0xA1DA	0x226E	# NOT LESS-THAN
+0xA1DB	0x226F	# NOT GREATER-THAN
+0xA1DC	0x2264	# LESS-THAN OR EQUAL TO
+0xA1DD	0x2265	# GREATER-THAN OR EQUAL TO
+0xA1DE	0x221E	# INFINITY
+0xA1DF	0x2235	# BECAUSE
+0xA1E0	0x2234	# THEREFORE
+0xA1E1	0x2642	# MALE SIGN
+0xA1E2	0x2640	# FEMALE SIGN
+0xA1E3	0x00B0	# DEGREE SIGN
+0xA1E4	0x2032	# PRIME
+0xA1E5	0x2033	# DOUBLE PRIME
+0xA1E6	0x2103	# DEGREE CELSIUS
+0xA1E7	0xFF04	# FULLWIDTH DOLLAR SIGN
+0xA1E8	0x00A4	# CURRENCY SIGN
+0xA1E9	0xFFE0	# FULLWIDTH CENT SIGN
+0xA1EA	0xFFE1	# FULLWIDTH POUND SIGN
+0xA1EB	0x2030	# PER MILLE SIGN
+0xA1EC	0x00A7	# SECTION SIGN
+0xA1ED	0x2116	# NUMERO SIGN
+0xA1EE	0x2606	# WHITE STAR
+0xA1EF	0x2605	# BLACK STAR
+0xA1F0	0x25CB	# WHITE CIRCLE
+0xA1F1	0x25CF	# BLACK CIRCLE
+0xA1F2	0x25CE	# BULLSEYE
+0xA1F3	0x25C7	# WHITE DIAMOND
+0xA1F4	0x25C6	# BLACK DIAMOND
+0xA1F5	0x25A1	# WHITE SQUARE
+0xA1F6	0x25A0	# BLACK SQUARE
+0xA1F7	0x25B3	# WHITE UP-POINTING TRIANGLE
+0xA1F8	0x25B2	# BLACK UP-POINTING TRIANGLE
+0xA1F9	0x203B	# REFERENCE MARK
+0xA1FA	0x2192	# RIGHTWARDS ARROW
+0xA1FB	0x2190	# LEFTWARDS ARROW
+0xA1FC	0x2191	# UPWARDS ARROW
+0xA1FD	0x2193	# DOWNWARDS ARROW
+0xA1FE	0x3013	# GETA MARK
+0xA2B1	0x2488	# DIGIT ONE FULL STOP
+0xA2B2	0x2489	# DIGIT TWO FULL STOP
+0xA2B3	0x248A	# DIGIT THREE FULL STOP
+0xA2B4	0x248B	# DIGIT FOUR FULL STOP
+0xA2B5	0x248C	# DIGIT FIVE FULL STOP
+0xA2B6	0x248D	# DIGIT SIX FULL STOP
+0xA2B7	0x248E	# DIGIT SEVEN FULL STOP
+0xA2B8	0x248F	# DIGIT EIGHT FULL STOP
+0xA2B9	0x2490	# DIGIT NINE FULL STOP
+0xA2BA	0x2491	# NUMBER TEN FULL STOP
+0xA2BB	0x2492	# NUMBER ELEVEN FULL STOP
+0xA2BC	0x2493	# NUMBER TWELVE FULL STOP
+0xA2BD	0x2494	# NUMBER THIRTEEN FULL STOP
+0xA2BE	0x2495	# NUMBER FOURTEEN FULL STOP
+0xA2BF	0x2496	# NUMBER FIFTEEN FULL STOP
+0xA2C0	0x2497	# NUMBER SIXTEEN FULL STOP
+0xA2C1	0x2498	# NUMBER SEVENTEEN FULL STOP
+0xA2C2	0x2499	# NUMBER EIGHTEEN FULL STOP
+0xA2C3	0x249A	# NUMBER NINETEEN FULL STOP
+0xA2C4	0x249B	# NUMBER TWENTY FULL STOP
+0xA2C5	0x2474	# PARENTHESIZED DIGIT ONE
+0xA2C6	0x2475	# PARENTHESIZED DIGIT TWO
+0xA2C7	0x2476	# PARENTHESIZED DIGIT THREE
+0xA2C8	0x2477	# PARENTHESIZED DIGIT FOUR
+0xA2C9	0x2478	# PARENTHESIZED DIGIT FIVE
+0xA2CA	0x2479	# PARENTHESIZED DIGIT SIX
+0xA2CB	0x247A	# PARENTHESIZED DIGIT SEVEN
+0xA2CC	0x247B	# PARENTHESIZED DIGIT EIGHT
+0xA2CD	0x247C	# PARENTHESIZED DIGIT NINE
+0xA2CE	0x247D	# PARENTHESIZED NUMBER TEN
+0xA2CF	0x247E	# PARENTHESIZED NUMBER ELEVEN
+0xA2D0	0x247F	# PARENTHESIZED NUMBER TWELVE
+0xA2D1	0x2480	# PARENTHESIZED NUMBER THIRTEEN
+0xA2D2	0x2481	# PARENTHESIZED NUMBER FOURTEEN
+0xA2D3	0x2482	# PARENTHESIZED NUMBER FIFTEEN
+0xA2D4	0x2483	# PARENTHESIZED NUMBER SIXTEEN
+0xA2D5	0x2484	# PARENTHESIZED NUMBER SEVENTEEN
+0xA2D6	0x2485	# PARENTHESIZED NUMBER EIGHTEEN
+0xA2D7	0x2486	# PARENTHESIZED NUMBER NINETEEN
+0xA2D8	0x2487	# PARENTHESIZED NUMBER TWENTY
+0xA2D9	0x2460	# CIRCLED DIGIT ONE
+0xA2DA	0x2461	# CIRCLED DIGIT TWO
+0xA2DB	0x2462	# CIRCLED DIGIT THREE
+0xA2DC	0x2463	# CIRCLED DIGIT FOUR
+0xA2DD	0x2464	# CIRCLED DIGIT FIVE
+0xA2DE	0x2465	# CIRCLED DIGIT SIX
+0xA2DF	0x2466	# CIRCLED DIGIT SEVEN
+0xA2E0	0x2467	# CIRCLED DIGIT EIGHT
+0xA2E1	0x2468	# CIRCLED DIGIT NINE
+0xA2E2	0x2469	# CIRCLED NUMBER TEN
+0xA2E5	0x3220	# PARENTHESIZED IDEOGRAPH ONE
+0xA2E6	0x3221	# PARENTHESIZED IDEOGRAPH TWO
+0xA2E7	0x3222	# PARENTHESIZED IDEOGRAPH THREE
+0xA2E8	0x3223	# PARENTHESIZED IDEOGRAPH FOUR
+0xA2E9	0x3224	# PARENTHESIZED IDEOGRAPH FIVE
+0xA2EA	0x3225	# PARENTHESIZED IDEOGRAPH SIX
+0xA2EB	0x3226	# PARENTHESIZED IDEOGRAPH SEVEN
+0xA2EC	0x3227	# PARENTHESIZED IDEOGRAPH EIGHT
+0xA2ED	0x3228	# PARENTHESIZED IDEOGRAPH NINE
+0xA2EE	0x3229	# PARENTHESIZED IDEOGRAPH TEN
+0xA2F1	0x2160	# ROMAN NUMERAL ONE
+0xA2F2	0x2161	# ROMAN NUMERAL TWO
+0xA2F3	0x2162	# ROMAN NUMERAL THREE
+0xA2F4	0x2163	# ROMAN NUMERAL FOUR
+0xA2F5	0x2164	# ROMAN NUMERAL FIVE
+0xA2F6	0x2165	# ROMAN NUMERAL SIX
+0xA2F7	0x2166	# ROMAN NUMERAL SEVEN
+0xA2F8	0x2167	# ROMAN NUMERAL EIGHT
+0xA2F9	0x2168	# ROMAN NUMERAL NINE
+0xA2FA	0x2169	# ROMAN NUMERAL TEN
+0xA2FB	0x216A	# ROMAN NUMERAL ELEVEN
+0xA2FC	0x216B	# ROMAN NUMERAL TWELVE
+0xA3A1	0xFF01	# FULLWIDTH EXCLAMATION MARK
+0xA3A2	0xFF02	# FULLWIDTH QUOTATION MARK
+0xA3A3	0xFF03	# FULLWIDTH NUMBER SIGN
+0xA3A4	0xFFE5	# FULLWIDTH YEN SIGN
+0xA3A5	0xFF05	# FULLWIDTH PERCENT SIGN
+0xA3A6	0xFF06	# FULLWIDTH AMPERSAND
+0xA3A7	0xFF07	# FULLWIDTH APOSTROPHE
+0xA3A8	0xFF08	# FULLWIDTH LEFT PARENTHESIS
+0xA3A9	0xFF09	# FULLWIDTH RIGHT PARENTHESIS
+0xA3AA	0xFF0A	# FULLWIDTH ASTERISK
+0xA3AB	0xFF0B	# FULLWIDTH PLUS SIGN
+0xA3AC	0xFF0C	# FULLWIDTH COMMA
+0xA3AD	0xFF0D	# FULLWIDTH HYPHEN-MINUS
+0xA3AE	0xFF0E	# FULLWIDTH FULL STOP
+0xA3AF	0xFF0F	# FULLWIDTH SOLIDUS
+0xA3B0	0xFF10	# FULLWIDTH DIGIT ZERO
+0xA3B1	0xFF11	# FULLWIDTH DIGIT ONE
+0xA3B2	0xFF12	# FULLWIDTH DIGIT TWO
+0xA3B3	0xFF13	# FULLWIDTH DIGIT THREE
+0xA3B4	0xFF14	# FULLWIDTH DIGIT FOUR
+0xA3B5	0xFF15	# FULLWIDTH DIGIT FIVE
+0xA3B6	0xFF16	# FULLWIDTH DIGIT SIX
+0xA3B7	0xFF17	# FULLWIDTH DIGIT SEVEN
+0xA3B8	0xFF18	# FULLWIDTH DIGIT EIGHT
+0xA3B9	0xFF19	# FULLWIDTH DIGIT NINE
+0xA3BA	0xFF1A	# FULLWIDTH COLON
+0xA3BB	0xFF1B	# FULLWIDTH SEMICOLON
+0xA3BC	0xFF1C	# FULLWIDTH LESS-THAN SIGN
+0xA3BD	0xFF1D	# FULLWIDTH EQUALS SIGN
+0xA3BE	0xFF1E	# FULLWIDTH GREATER-THAN SIGN
+0xA3BF	0xFF1F	# FULLWIDTH QUESTION MARK
+0xA3C0	0xFF20	# FULLWIDTH COMMERCIAL AT
+0xA3C1	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
+0xA3C2	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
+0xA3C3	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
+0xA3C4	0xFF24	# FULLWIDTH LATIN CAPITAL LETTER D
+0xA3C5	0xFF25	# FULLWIDTH LATIN CAPITAL LETTER E
+0xA3C6	0xFF26	# FULLWIDTH LATIN CAPITAL LETTER F
+0xA3C7	0xFF27	# FULLWIDTH LATIN CAPITAL LETTER G
+0xA3C8	0xFF28	# FULLWIDTH LATIN CAPITAL LETTER H
+0xA3C9	0xFF29	# FULLWIDTH LATIN CAPITAL LETTER I
+0xA3CA	0xFF2A	# FULLWIDTH LATIN CAPITAL LETTER J
+0xA3CB	0xFF2B	# FULLWIDTH LATIN CAPITAL LETTER K
+0xA3CC	0xFF2C	# FULLWIDTH LATIN CAPITAL LETTER L
+0xA3CD	0xFF2D	# FULLWIDTH LATIN CAPITAL LETTER M
+0xA3CE	0xFF2E	# FULLWIDTH LATIN CAPITAL LETTER N
+0xA3CF	0xFF2F	# FULLWIDTH LATIN CAPITAL LETTER O
+0xA3D0	0xFF30	# FULLWIDTH LATIN CAPITAL LETTER P
+0xA3D1	0xFF31	# FULLWIDTH LATIN CAPITAL LETTER Q
+0xA3D2	0xFF32	# FULLWIDTH LATIN CAPITAL LETTER R
+0xA3D3	0xFF33	# FULLWIDTH LATIN CAPITAL LETTER S
+0xA3D4	0xFF34	# FULLWIDTH LATIN CAPITAL LETTER T
+0xA3D5	0xFF35	# FULLWIDTH LATIN CAPITAL LETTER U
+0xA3D6	0xFF36	# FULLWIDTH LATIN CAPITAL LETTER V
+0xA3D7	0xFF37	# FULLWIDTH LATIN CAPITAL LETTER W
+0xA3D8	0xFF38	# FULLWIDTH LATIN CAPITAL LETTER X
+0xA3D9	0xFF39	# FULLWIDTH LATIN CAPITAL LETTER Y
+0xA3DA	0xFF3A	# FULLWIDTH LATIN CAPITAL LETTER Z
+0xA3DB	0xFF3B	# FULLWIDTH LEFT SQUARE BRACKET
+0xA3DC	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
+0xA3DD	0xFF3D	# FULLWIDTH RIGHT SQUARE BRACKET
+0xA3DE	0xFF3E	# FULLWIDTH CIRCUMFLEX ACCENT
+0xA3DF	0xFF3F	# FULLWIDTH LOW LINE
+0xA3E0	0xFF40	# FULLWIDTH GRAVE ACCENT
+0xA3E1	0xFF41	# FULLWIDTH LATIN SMALL LETTER A
+0xA3E2	0xFF42	# FULLWIDTH LATIN SMALL LETTER B
+0xA3E3	0xFF43	# FULLWIDTH LATIN SMALL LETTER C
+0xA3E4	0xFF44	# FULLWIDTH LATIN SMALL LETTER D
+0xA3E5	0xFF45	# FULLWIDTH LATIN SMALL LETTER E
+0xA3E6	0xFF46	# FULLWIDTH LATIN SMALL LETTER F
+0xA3E7	0xFF47	# FULLWIDTH LATIN SMALL LETTER G
+0xA3E8	0xFF48	# FULLWIDTH LATIN SMALL LETTER H
+0xA3E9	0xFF49	# FULLWIDTH LATIN SMALL LETTER I
+0xA3EA	0xFF4A	# FULLWIDTH LATIN SMALL LETTER J
+0xA3EB	0xFF4B	# FULLWIDTH LATIN SMALL LETTER K
+0xA3EC	0xFF4C	# FULLWIDTH LATIN SMALL LETTER L
+0xA3ED	0xFF4D	# FULLWIDTH LATIN SMALL LETTER M
+0xA3EE	0xFF4E	# FULLWIDTH LATIN SMALL LETTER N
+0xA3EF	0xFF4F	# FULLWIDTH LATIN SMALL LETTER O
+0xA3F0	0xFF50	# FULLWIDTH LATIN SMALL LETTER P
+0xA3F1	0xFF51	# FULLWIDTH LATIN SMALL LETTER Q
+0xA3F2	0xFF52	# FULLWIDTH LATIN SMALL LETTER R
+0xA3F3	0xFF53	# FULLWIDTH LATIN SMALL LETTER S
+0xA3F4	0xFF54	# FULLWIDTH LATIN SMALL LETTER T
+0xA3F5	0xFF55	# FULLWIDTH LATIN SMALL LETTER U
+0xA3F6	0xFF56	# FULLWIDTH LATIN SMALL LETTER V
+0xA3F7	0xFF57	# FULLWIDTH LATIN SMALL LETTER W
+0xA3F8	0xFF58	# FULLWIDTH LATIN SMALL LETTER X
+0xA3F9	0xFF59	# FULLWIDTH LATIN SMALL LETTER Y
+0xA3FA	0xFF5A	# FULLWIDTH LATIN SMALL LETTER Z
+0xA3FB	0xFF5B	# FULLWIDTH LEFT CURLY BRACKET
+0xA3FC	0xFF5C	# FULLWIDTH VERTICAL LINE
+0xA3FD	0xFF5D	# FULLWIDTH RIGHT CURLY BRACKET
+0xA3FE	0xFFE3	# FULLWIDTH MACRON
+0xA4A1	0x3041	# HIRAGANA LETTER SMALL A
+0xA4A2	0x3042	# HIRAGANA LETTER A
+0xA4A3	0x3043	# HIRAGANA LETTER SMALL I
+0xA4A4	0x3044	# HIRAGANA LETTER I
+0xA4A5	0x3045	# HIRAGANA LETTER SMALL U
+0xA4A6	0x3046	# HIRAGANA LETTER U
+0xA4A7	0x3047	# HIRAGANA LETTER SMALL E
+0xA4A8	0x3048	# HIRAGANA LETTER E
+0xA4A9	0x3049	# HIRAGANA LETTER SMALL O
+0xA4AA	0x304A	# HIRAGANA LETTER O
+0xA4AB	0x304B	# HIRAGANA LETTER KA
+0xA4AC	0x304C	# HIRAGANA LETTER GA
+0xA4AD	0x304D	# HIRAGANA LETTER KI
+0xA4AE	0x304E	# HIRAGANA LETTER GI
+0xA4AF	0x304F	# HIRAGANA LETTER KU
+0xA4B0	0x3050	# HIRAGANA LETTER GU
+0xA4B1	0x3051	# HIRAGANA LETTER KE
+0xA4B2	0x3052	# HIRAGANA LETTER GE
+0xA4B3	0x3053	# HIRAGANA LETTER KO
+0xA4B4	0x3054	# HIRAGANA LETTER GO
+0xA4B5	0x3055	# HIRAGANA LETTER SA
+0xA4B6	0x3056	# HIRAGANA LETTER ZA
+0xA4B7	0x3057	# HIRAGANA LETTER SI
+0xA4B8	0x3058	# HIRAGANA LETTER ZI
+0xA4B9	0x3059	# HIRAGANA LETTER SU
+0xA4BA	0x305A	# HIRAGANA LETTER ZU
+0xA4BB	0x305B	# HIRAGANA LETTER SE
+0xA4BC	0x305C	# HIRAGANA LETTER ZE
+0xA4BD	0x305D	# HIRAGANA LETTER SO
+0xA4BE	0x305E	# HIRAGANA LETTER ZO
+0xA4BF	0x305F	# HIRAGANA LETTER TA
+0xA4C0	0x3060	# HIRAGANA LETTER DA
+0xA4C1	0x3061	# HIRAGANA LETTER TI
+0xA4C2	0x3062	# HIRAGANA LETTER DI
+0xA4C3	0x3063	# HIRAGANA LETTER SMALL TU
+0xA4C4	0x3064	# HIRAGANA LETTER TU
+0xA4C5	0x3065	# HIRAGANA LETTER DU
+0xA4C6	0x3066	# HIRAGANA LETTER TE
+0xA4C7	0x3067	# HIRAGANA LETTER DE
+0xA4C8	0x3068	# HIRAGANA LETTER TO
+0xA4C9	0x3069	# HIRAGANA LETTER DO
+0xA4CA	0x306A	# HIRAGANA LETTER NA
+0xA4CB	0x306B	# HIRAGANA LETTER NI
+0xA4CC	0x306C	# HIRAGANA LETTER NU
+0xA4CD	0x306D	# HIRAGANA LETTER NE
+0xA4CE	0x306E	# HIRAGANA LETTER NO
+0xA4CF	0x306F	# HIRAGANA LETTER HA
+0xA4D0	0x3070	# HIRAGANA LETTER BA
+0xA4D1	0x3071	# HIRAGANA LETTER PA
+0xA4D2	0x3072	# HIRAGANA LETTER HI
+0xA4D3	0x3073	# HIRAGANA LETTER BI
+0xA4D4	0x3074	# HIRAGANA LETTER PI
+0xA4D5	0x3075	# HIRAGANA LETTER HU
+0xA4D6	0x3076	# HIRAGANA LETTER BU
+0xA4D7	0x3077	# HIRAGANA LETTER PU
+0xA4D8	0x3078	# HIRAGANA LETTER HE
+0xA4D9	0x3079	# HIRAGANA LETTER BE
+0xA4DA	0x307A	# HIRAGANA LETTER PE
+0xA4DB	0x307B	# HIRAGANA LETTER HO
+0xA4DC	0x307C	# HIRAGANA LETTER BO
+0xA4DD	0x307D	# HIRAGANA LETTER PO
+0xA4DE	0x307E	# HIRAGANA LETTER MA
+0xA4DF	0x307F	# HIRAGANA LETTER MI
+0xA4E0	0x3080	# HIRAGANA LETTER MU
+0xA4E1	0x3081	# HIRAGANA LETTER ME
+0xA4E2	0x3082	# HIRAGANA LETTER MO
+0xA4E3	0x3083	# HIRAGANA LETTER SMALL YA
+0xA4E4	0x3084	# HIRAGANA LETTER YA
+0xA4E5	0x3085	# HIRAGANA LETTER SMALL YU
+0xA4E6	0x3086	# HIRAGANA LETTER YU
+0xA4E7	0x3087	# HIRAGANA LETTER SMALL YO
+0xA4E8	0x3088	# HIRAGANA LETTER YO
+0xA4E9	0x3089	# HIRAGANA LETTER RA
+0xA4EA	0x308A	# HIRAGANA LETTER RI
+0xA4EB	0x308B	# HIRAGANA LETTER RU
+0xA4EC	0x308C	# HIRAGANA LETTER RE
+0xA4ED	0x308D	# HIRAGANA LETTER RO
+0xA4EE	0x308E	# HIRAGANA LETTER SMALL WA
+0xA4EF	0x308F	# HIRAGANA LETTER WA
+0xA4F0	0x3090	# HIRAGANA LETTER WI
+0xA4F1	0x3091	# HIRAGANA LETTER WE
+0xA4F2	0x3092	# HIRAGANA LETTER WO
+0xA4F3	0x3093	# HIRAGANA LETTER N
+0xA5A1	0x30A1	# KATAKANA LETTER SMALL A
+0xA5A2	0x30A2	# KATAKANA LETTER A
+0xA5A3	0x30A3	# KATAKANA LETTER SMALL I
+0xA5A4	0x30A4	# KATAKANA LETTER I
+0xA5A5	0x30A5	# KATAKANA LETTER SMALL U
+0xA5A6	0x30A6	# KATAKANA LETTER U
+0xA5A7	0x30A7	# KATAKANA LETTER SMALL E
+0xA5A8	0x30A8	# KATAKANA LETTER E
+0xA5A9	0x30A9	# KATAKANA LETTER SMALL O
+0xA5AA	0x30AA	# KATAKANA LETTER O
+0xA5AB	0x30AB	# KATAKANA LETTER KA
+0xA5AC	0x30AC	# KATAKANA LETTER GA
+0xA5AD	0x30AD	# KATAKANA LETTER KI
+0xA5AE	0x30AE	# KATAKANA LETTER GI
+0xA5AF	0x30AF	# KATAKANA LETTER KU
+0xA5B0	0x30B0	# KATAKANA LETTER GU
+0xA5B1	0x30B1	# KATAKANA LETTER KE
+0xA5B2	0x30B2	# KATAKANA LETTER GE
+0xA5B3	0x30B3	# KATAKANA LETTER KO
+0xA5B4	0x30B4	# KATAKANA LETTER GO
+0xA5B5	0x30B5	# KATAKANA LETTER SA
+0xA5B6	0x30B6	# KATAKANA LETTER ZA
+0xA5B7	0x30B7	# KATAKANA LETTER SI
+0xA5B8	0x30B8	# KATAKANA LETTER ZI
+0xA5B9	0x30B9	# KATAKANA LETTER SU
+0xA5BA	0x30BA	# KATAKANA LETTER ZU
+0xA5BB	0x30BB	# KATAKANA LETTER SE
+0xA5BC	0x30BC	# KATAKANA LETTER ZE
+0xA5BD	0x30BD	# KATAKANA LETTER SO
+0xA5BE	0x30BE	# KATAKANA LETTER ZO
+0xA5BF	0x30BF	# KATAKANA LETTER TA
+0xA5C0	0x30C0	# KATAKANA LETTER DA
+0xA5C1	0x30C1	# KATAKANA LETTER TI
+0xA5C2	0x30C2	# KATAKANA LETTER DI
+0xA5C3	0x30C3	# KATAKANA LETTER SMALL TU
+0xA5C4	0x30C4	# KATAKANA LETTER TU
+0xA5C5	0x30C5	# KATAKANA LETTER DU
+0xA5C6	0x30C6	# KATAKANA LETTER TE
+0xA5C7	0x30C7	# KATAKANA LETTER DE
+0xA5C8	0x30C8	# KATAKANA LETTER TO
+0xA5C9	0x30C9	# KATAKANA LETTER DO
+0xA5CA	0x30CA	# KATAKANA LETTER NA
+0xA5CB	0x30CB	# KATAKANA LETTER NI
+0xA5CC	0x30CC	# KATAKANA LETTER NU
+0xA5CD	0x30CD	# KATAKANA LETTER NE
+0xA5CE	0x30CE	# KATAKANA LETTER NO
+0xA5CF	0x30CF	# KATAKANA LETTER HA
+0xA5D0	0x30D0	# KATAKANA LETTER BA
+0xA5D1	0x30D1	# KATAKANA LETTER PA
+0xA5D2	0x30D2	# KATAKANA LETTER HI
+0xA5D3	0x30D3	# KATAKANA LETTER BI
+0xA5D4	0x30D4	# KATAKANA LETTER PI
+0xA5D5	0x30D5	# KATAKANA LETTER HU
+0xA5D6	0x30D6	# KATAKANA LETTER BU
+0xA5D7	0x30D7	# KATAKANA LETTER PU
+0xA5D8	0x30D8	# KATAKANA LETTER HE
+0xA5D9	0x30D9	# KATAKANA LETTER BE
+0xA5DA	0x30DA	# KATAKANA LETTER PE
+0xA5DB	0x30DB	# KATAKANA LETTER HO
+0xA5DC	0x30DC	# KATAKANA LETTER BO
+0xA5DD	0x30DD	# KATAKANA LETTER PO
+0xA5DE	0x30DE	# KATAKANA LETTER MA
+0xA5DF	0x30DF	# KATAKANA LETTER MI
+0xA5E0	0x30E0	# KATAKANA LETTER MU
+0xA5E1	0x30E1	# KATAKANA LETTER ME
+0xA5E2	0x30E2	# KATAKANA LETTER MO
+0xA5E3	0x30E3	# KATAKANA LETTER SMALL YA
+0xA5E4	0x30E4	# KATAKANA LETTER YA
+0xA5E5	0x30E5	# KATAKANA LETTER SMALL YU
+0xA5E6	0x30E6	# KATAKANA LETTER YU
+0xA5E7	0x30E7	# KATAKANA LETTER SMALL YO
+0xA5E8	0x30E8	# KATAKANA LETTER YO
+0xA5E9	0x30E9	# KATAKANA LETTER RA
+0xA5EA	0x30EA	# KATAKANA LETTER RI
+0xA5EB	0x30EB	# KATAKANA LETTER RU
+0xA5EC	0x30EC	# KATAKANA LETTER RE
+0xA5ED	0x30ED	# KATAKANA LETTER RO
+0xA5EE	0x30EE	# KATAKANA LETTER SMALL WA
+0xA5EF	0x30EF	# KATAKANA LETTER WA
+0xA5F0	0x30F0	# KATAKANA LETTER WI
+0xA5F1	0x30F1	# KATAKANA LETTER WE
+0xA5F2	0x30F2	# KATAKANA LETTER WO
+0xA5F3	0x30F3	# KATAKANA LETTER N
+0xA5F4	0x30F4	# KATAKANA LETTER VU
+0xA5F5	0x30F5	# KATAKANA LETTER SMALL KA
+0xA5F6	0x30F6	# KATAKANA LETTER SMALL KE
+0xA6A1	0x0391	# GREEK CAPITAL LETTER ALPHA
+0xA6A2	0x0392	# GREEK CAPITAL LETTER BETA
+0xA6A3	0x0393	# GREEK CAPITAL LETTER GAMMA
+0xA6A4	0x0394	# GREEK CAPITAL LETTER DELTA
+0xA6A5	0x0395	# GREEK CAPITAL LETTER EPSILON
+0xA6A6	0x0396	# GREEK CAPITAL LETTER ZETA
+0xA6A7	0x0397	# GREEK CAPITAL LETTER ETA
+0xA6A8	0x0398	# GREEK CAPITAL LETTER THETA
+0xA6A9	0x0399	# GREEK CAPITAL LETTER IOTA
+0xA6AA	0x039A	# GREEK CAPITAL LETTER KAPPA
+0xA6AB	0x039B	# GREEK CAPITAL LETTER LAMDA
+0xA6AC	0x039C	# GREEK CAPITAL LETTER MU
+0xA6AD	0x039D	# GREEK CAPITAL LETTER NU
+0xA6AE	0x039E	# GREEK CAPITAL LETTER XI
+0xA6AF	0x039F	# GREEK CAPITAL LETTER OMICRON
+0xA6B0	0x03A0	# GREEK CAPITAL LETTER PI
+0xA6B1	0x03A1	# GREEK CAPITAL LETTER RHO
+0xA6B2	0x03A3	# GREEK CAPITAL LETTER SIGMA
+0xA6B3	0x03A4	# GREEK CAPITAL LETTER TAU
+0xA6B4	0x03A5	# GREEK CAPITAL LETTER UPSILON
+0xA6B5	0x03A6	# GREEK CAPITAL LETTER PHI
+0xA6B6	0x03A7	# GREEK CAPITAL LETTER CHI
+0xA6B7	0x03A8	# GREEK CAPITAL LETTER PSI
+0xA6B8	0x03A9	# GREEK CAPITAL LETTER OMEGA
+0xA6C1	0x03B1	# GREEK SMALL LETTER ALPHA
+0xA6C2	0x03B2	# GREEK SMALL LETTER BETA
+0xA6C3	0x03B3	# GREEK SMALL LETTER GAMMA
+0xA6C4	0x03B4	# GREEK SMALL LETTER DELTA
+0xA6C5	0x03B5	# GREEK SMALL LETTER EPSILON
+0xA6C6	0x03B6	# GREEK SMALL LETTER ZETA
+0xA6C7	0x03B7	# GREEK SMALL LETTER ETA
+0xA6C8	0x03B8	# GREEK SMALL LETTER THETA
+0xA6C9	0x03B9	# GREEK SMALL LETTER IOTA
+0xA6CA	0x03BA	# GREEK SMALL LETTER KAPPA
+0xA6CB	0x03BB	# GREEK SMALL LETTER LAMDA
+0xA6CC	0x03BC	# GREEK SMALL LETTER MU
+0xA6CD	0x03BD	# GREEK SMALL LETTER NU
+0xA6CE	0x03BE	# GREEK SMALL LETTER XI
+0xA6CF	0x03BF	# GREEK SMALL LETTER OMICRON
+0xA6D0	0x03C0	# GREEK SMALL LETTER PI
+0xA6D1	0x03C1	# GREEK SMALL LETTER RHO
+0xA6D2	0x03C3	# GREEK SMALL LETTER SIGMA
+0xA6D3	0x03C4	# GREEK SMALL LETTER TAU
+0xA6D4	0x03C5	# GREEK SMALL LETTER UPSILON
+0xA6D5	0x03C6	# GREEK SMALL LETTER PHI
+0xA6D6	0x03C7	# GREEK SMALL LETTER CHI
+0xA6D7	0x03C8	# GREEK SMALL LETTER PSI
+0xA6D8	0x03C9	# GREEK SMALL LETTER OMEGA
+0xA7A1	0x0410	# CYRILLIC CAPITAL LETTER A
+0xA7A2	0x0411	# CYRILLIC CAPITAL LETTER BE
+0xA7A3	0x0412	# CYRILLIC CAPITAL LETTER VE
+0xA7A4	0x0413	# CYRILLIC CAPITAL LETTER GHE
+0xA7A5	0x0414	# CYRILLIC CAPITAL LETTER DE
+0xA7A6	0x0415	# CYRILLIC CAPITAL LETTER IE
+0xA7A7	0x0401	# CYRILLIC CAPITAL LETTER IO
+0xA7A8	0x0416	# CYRILLIC CAPITAL LETTER ZHE
+0xA7A9	0x0417	# CYRILLIC CAPITAL LETTER ZE
+0xA7AA	0x0418	# CYRILLIC CAPITAL LETTER I
+0xA7AB	0x0419	# CYRILLIC CAPITAL LETTER SHORT I
+0xA7AC	0x041A	# CYRILLIC CAPITAL LETTER KA
+0xA7AD	0x041B	# CYRILLIC CAPITAL LETTER EL
+0xA7AE	0x041C	# CYRILLIC CAPITAL LETTER EM
+0xA7AF	0x041D	# CYRILLIC CAPITAL LETTER EN
+0xA7B0	0x041E	# CYRILLIC CAPITAL LETTER O
+0xA7B1	0x041F	# CYRILLIC CAPITAL LETTER PE
+0xA7B2	0x0420	# CYRILLIC CAPITAL LETTER ER
+0xA7B3	0x0421	# CYRILLIC CAPITAL LETTER ES
+0xA7B4	0x0422	# CYRILLIC CAPITAL LETTER TE
+0xA7B5	0x0423	# CYRILLIC CAPITAL LETTER U
+0xA7B6	0x0424	# CYRILLIC CAPITAL LETTER EF
+0xA7B7	0x0425	# CYRILLIC CAPITAL LETTER HA
+0xA7B8	0x0426	# CYRILLIC CAPITAL LETTER TSE
+0xA7B9	0x0427	# CYRILLIC CAPITAL LETTER CHE
+0xA7BA	0x0428	# CYRILLIC CAPITAL LETTER SHA
+0xA7BB	0x0429	# CYRILLIC CAPITAL LETTER SHCHA
+0xA7BC	0x042A	# CYRILLIC CAPITAL LETTER HARD SIGN
+0xA7BD	0x042B	# CYRILLIC CAPITAL LETTER YERU
+0xA7BE	0x042C	# CYRILLIC CAPITAL LETTER SOFT SIGN
+0xA7BF	0x042D	# CYRILLIC CAPITAL LETTER E
+0xA7C0	0x042E	# CYRILLIC CAPITAL LETTER YU
+0xA7C1	0x042F	# CYRILLIC CAPITAL LETTER YA
+0xA7D1	0x0430	# CYRILLIC SMALL LETTER A
+0xA7D2	0x0431	# CYRILLIC SMALL LETTER BE
+0xA7D3	0x0432	# CYRILLIC SMALL LETTER VE
+0xA7D4	0x0433	# CYRILLIC SMALL LETTER GHE
+0xA7D5	0x0434	# CYRILLIC SMALL LETTER DE
+0xA7D6	0x0435	# CYRILLIC SMALL LETTER IE
+0xA7D7	0x0451	# CYRILLIC SMALL LETTER IO
+0xA7D8	0x0436	# CYRILLIC SMALL LETTER ZHE
+0xA7D9	0x0437	# CYRILLIC SMALL LETTER ZE
+0xA7DA	0x0438	# CYRILLIC SMALL LETTER I
+0xA7DB	0x0439	# CYRILLIC SMALL LETTER SHORT I
+0xA7DC	0x043A	# CYRILLIC SMALL LETTER KA
+0xA7DD	0x043B	# CYRILLIC SMALL LETTER EL
+0xA7DE	0x043C	# CYRILLIC SMALL LETTER EM
+0xA7DF	0x043D	# CYRILLIC SMALL LETTER EN
+0xA7E0	0x043E	# CYRILLIC SMALL LETTER O
+0xA7E1	0x043F	# CYRILLIC SMALL LETTER PE
+0xA7E2	0x0440	# CYRILLIC SMALL LETTER ER
+0xA7E3	0x0441	# CYRILLIC SMALL LETTER ES
+0xA7E4	0x0442	# CYRILLIC SMALL LETTER TE
+0xA7E5	0x0443	# CYRILLIC SMALL LETTER U
+0xA7E6	0x0444	# CYRILLIC SMALL LETTER EF
+0xA7E7	0x0445	# CYRILLIC SMALL LETTER HA
+0xA7E8	0x0446	# CYRILLIC SMALL LETTER TSE
+0xA7E9	0x0447	# CYRILLIC SMALL LETTER CHE
+0xA7EA	0x0448	# CYRILLIC SMALL LETTER SHA
+0xA7EB	0x0449	# CYRILLIC SMALL LETTER SHCHA
+0xA7EC	0x044A	# CYRILLIC SMALL LETTER HARD SIGN
+0xA7ED	0x044B	# CYRILLIC SMALL LETTER YERU
+0xA7EE	0x044C	# CYRILLIC SMALL LETTER SOFT SIGN
+0xA7EF	0x044D	# CYRILLIC SMALL LETTER E
+0xA7F0	0x044E	# CYRILLIC SMALL LETTER YU
+0xA7F1	0x044F	# CYRILLIC SMALL LETTER YA
+0xA8A1	0x0101	# LATIN SMALL LETTER A WITH MACRON
+0xA8A2	0x00E1	# LATIN SMALL LETTER A WITH ACUTE
+0xA8A3	0x01CE	# LATIN SMALL LETTER A WITH CARON
+0xA8A4	0x00E0	# LATIN SMALL LETTER A WITH GRAVE
+0xA8A5	0x0113	# LATIN SMALL LETTER E WITH MACRON
+0xA8A6	0x00E9	# LATIN SMALL LETTER E WITH ACUTE
+0xA8A7	0x011B	# LATIN SMALL LETTER E WITH CARON
+0xA8A8	0x00E8	# LATIN SMALL LETTER E WITH GRAVE
+0xA8A9	0x012B	# LATIN SMALL LETTER I WITH MACRON
+0xA8AA	0x00ED	# LATIN SMALL LETTER I WITH ACUTE
+0xA8AB	0x01D0	# LATIN SMALL LETTER I WITH CARON
+0xA8AC	0x00EC	# LATIN SMALL LETTER I WITH GRAVE
+0xA8AD	0x014D	# LATIN SMALL LETTER O WITH MACRON
+0xA8AE	0x00F3	# LATIN SMALL LETTER O WITH ACUTE
+0xA8AF	0x01D2	# LATIN SMALL LETTER O WITH CARON
+0xA8B0	0x00F2	# LATIN SMALL LETTER O WITH GRAVE
+0xA8B1	0x016B	# LATIN SMALL LETTER U WITH MACRON
+0xA8B2	0x00FA	# LATIN SMALL LETTER U WITH ACUTE
+0xA8B3	0x01D4	# LATIN SMALL LETTER U WITH CARON
+0xA8B4	0x00F9	# LATIN SMALL LETTER U WITH GRAVE
+0xA8B5	0x01D6	# LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
+0xA8B6	0x01D8	# LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
+0xA8B7	0x01DA	# LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+0xA8B8	0x01DC	# LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
+0xA8B9	0x00FC	# LATIN SMALL LETTER U WITH DIAERESIS
+0xA8BA	0x00EA	# LATIN SMALL LETTER E WITH CIRCUMFLEX
+0xA8C5	0x3105	# BOPOMOFO LETTER B
+0xA8C6	0x3106	# BOPOMOFO LETTER P
+0xA8C7	0x3107	# BOPOMOFO LETTER M
+0xA8C8	0x3108	# BOPOMOFO LETTER F
+0xA8C9	0x3109	# BOPOMOFO LETTER D
+0xA8CA	0x310A	# BOPOMOFO LETTER T
+0xA8CB	0x310B	# BOPOMOFO LETTER N
+0xA8CC	0x310C	# BOPOMOFO LETTER L
+0xA8CD	0x310D	# BOPOMOFO LETTER G
+0xA8CE	0x310E	# BOPOMOFO LETTER K
+0xA8CF	0x310F	# BOPOMOFO LETTER H
+0xA8D0	0x3110	# BOPOMOFO LETTER J
+0xA8D1	0x3111	# BOPOMOFO LETTER Q
+0xA8D2	0x3112	# BOPOMOFO LETTER X
+0xA8D3	0x3113	# BOPOMOFO LETTER ZH
+0xA8D4	0x3114	# BOPOMOFO LETTER CH
+0xA8D5	0x3115	# BOPOMOFO LETTER SH
+0xA8D6	0x3116	# BOPOMOFO LETTER R
+0xA8D7	0x3117	# BOPOMOFO LETTER Z
+0xA8D8	0x3118	# BOPOMOFO LETTER C
+0xA8D9	0x3119	# BOPOMOFO LETTER S
+0xA8DA	0x311A	# BOPOMOFO LETTER A
+0xA8DB	0x311B	# BOPOMOFO LETTER O
+0xA8DC	0x311C	# BOPOMOFO LETTER E
+0xA8DD	0x311D	# BOPOMOFO LETTER EH
+0xA8DE	0x311E	# BOPOMOFO LETTER AI
+0xA8DF	0x311F	# BOPOMOFO LETTER EI
+0xA8E0	0x3120	# BOPOMOFO LETTER AU
+0xA8E1	0x3121	# BOPOMOFO LETTER OU
+0xA8E2	0x3122	# BOPOMOFO LETTER AN
+0xA8E3	0x3123	# BOPOMOFO LETTER EN
+0xA8E4	0x3124	# BOPOMOFO LETTER ANG
+0xA8E5	0x3125	# BOPOMOFO LETTER ENG
+0xA8E6	0x3126	# BOPOMOFO LETTER ER
+0xA8E7	0x3127	# BOPOMOFO LETTER I
+0xA8E8	0x3128	# BOPOMOFO LETTER U
+0xA8E9	0x3129	# BOPOMOFO LETTER IU
+0xA9A4	0x2500	# BOX DRAWINGS LIGHT HORIZONTAL
+0xA9A5	0x2501	# BOX DRAWINGS HEAVY HORIZONTAL
+0xA9A6	0x2502	# BOX DRAWINGS LIGHT VERTICAL
+0xA9A7	0x2503	# BOX DRAWINGS HEAVY VERTICAL
+0xA9A8	0x2504	# BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL
+0xA9A9	0x2505	# BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL
+0xA9AA	0x2506	# BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL
+0xA9AB	0x2507	# BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL
+0xA9AC	0x2508	# BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL
+0xA9AD	0x2509	# BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL
+0xA9AE	0x250A	# BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL
+0xA9AF	0x250B	# BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL
+0xA9B0	0x250C	# BOX DRAWINGS LIGHT DOWN AND RIGHT
+0xA9B1	0x250D	# BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY
+0xA9B2	0x250E	# BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT
+0xA9B3	0x250F	# BOX DRAWINGS HEAVY DOWN AND RIGHT
+0xA9B4	0x2510	# BOX DRAWINGS LIGHT DOWN AND LEFT
+0xA9B5	0x2511	# BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY
+0xA9B6	0x2512	# BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT
+0xA9B7	0x2513	# BOX DRAWINGS HEAVY DOWN AND LEFT
+0xA9B8	0x2514	# BOX DRAWINGS LIGHT UP AND RIGHT
+0xA9B9	0x2515	# BOX DRAWINGS UP LIGHT AND RIGHT HEAVY
+0xA9BA	0x2516	# BOX DRAWINGS UP HEAVY AND RIGHT LIGHT
+0xA9BB	0x2517	# BOX DRAWINGS HEAVY UP AND RIGHT
+0xA9BC	0x2518	# BOX DRAWINGS LIGHT UP AND LEFT
+0xA9BD	0x2519	# BOX DRAWINGS UP LIGHT AND LEFT HEAVY
+0xA9BE	0x251A	# BOX DRAWINGS UP HEAVY AND LEFT LIGHT
+0xA9BF	0x251B	# BOX DRAWINGS HEAVY UP AND LEFT
+0xA9C0	0x251C	# BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+0xA9C1	0x251D	# BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
+0xA9C2	0x251E	# BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT
+0xA9C3	0x251F	# BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT
+0xA9C4	0x2520	# BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT
+0xA9C5	0x2521	# BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY
+0xA9C6	0x2522	# BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY
+0xA9C7	0x2523	# BOX DRAWINGS HEAVY VERTICAL AND RIGHT
+0xA9C8	0x2524	# BOX DRAWINGS LIGHT VERTICAL AND LEFT
+0xA9C9	0x2525	# BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
+0xA9CA	0x2526	# BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT
+0xA9CB	0x2527	# BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT
+0xA9CC	0x2528	# BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT
+0xA9CD	0x2529	# BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY
+0xA9CE	0x252A	# BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY
+0xA9CF	0x252B	# BOX DRAWINGS HEAVY VERTICAL AND LEFT
+0xA9D0	0x252C	# BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+0xA9D1	0x252D	# BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT
+0xA9D2	0x252E	# BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT
+0xA9D3	0x252F	# BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY
+0xA9D4	0x2530	# BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT
+0xA9D5	0x2531	# BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY
+0xA9D6	0x2532	# BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY
+0xA9D7	0x2533	# BOX DRAWINGS HEAVY DOWN AND HORIZONTAL
+0xA9D8	0x2534	# BOX DRAWINGS LIGHT UP AND HORIZONTAL
+0xA9D9	0x2535	# BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT
+0xA9DA	0x2536	# BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT
+0xA9DB	0x2537	# BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY
+0xA9DC	0x2538	# BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT
+0xA9DD	0x2539	# BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY
+0xA9DE	0x253A	# BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY
+0xA9DF	0x253B	# BOX DRAWINGS HEAVY UP AND HORIZONTAL
+0xA9E0	0x253C	# BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+0xA9E1	0x253D	# BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT
+0xA9E2	0x253E	# BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT
+0xA9E3	0x253F	# BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
+0xA9E4	0x2540	# BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT
+0xA9E5	0x2541	# BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT
+0xA9E6	0x2542	# BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT
+0xA9E7	0x2543	# BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT
+0xA9E8	0x2544	# BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT
+0xA9E9	0x2545	# BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT
+0xA9EA	0x2546	# BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT
+0xA9EB	0x2547	# BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY
+0xA9EC	0x2548	# BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY
+0xA9ED	0x2549	# BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY
+0xA9EE	0x254A	# BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY
+0xA9EF	0x254B	# BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL
+0xB0A1	0x554A	# <CJK>
+0xB0A2	0x963F	# <CJK>
+0xB0A3	0x57C3	# <CJK>
+0xB0A4	0x6328	# <CJK>
+0xB0A5	0x54CE	# <CJK>
+0xB0A6	0x5509	# <CJK>
+0xB0A7	0x54C0	# <CJK>
+0xB0A8	0x7691	# <CJK>
+0xB0A9	0x764C	# <CJK>
+0xB0AA	0x853C	# <CJK>
+0xB0AB	0x77EE	# <CJK>
+0xB0AC	0x827E	# <CJK>
+0xB0AD	0x788D	# <CJK>
+0xB0AE	0x7231	# <CJK>
+0xB0AF	0x9698	# <CJK>
+0xB0B0	0x978D	# <CJK>
+0xB0B1	0x6C28	# <CJK>
+0xB0B2	0x5B89	# <CJK>
+0xB0B3	0x4FFA	# <CJK>
+0xB0B4	0x6309	# <CJK>
+0xB0B5	0x6697	# <CJK>
+0xB0B6	0x5CB8	# <CJK>
+0xB0B7	0x80FA	# <CJK>
+0xB0B8	0x6848	# <CJK>
+0xB0B9	0x80AE	# <CJK>
+0xB0BA	0x6602	# <CJK>
+0xB0BB	0x76CE	# <CJK>
+0xB0BC	0x51F9	# <CJK>
+0xB0BD	0x6556	# <CJK>
+0xB0BE	0x71AC	# <CJK>
+0xB0BF	0x7FF1	# <CJK>
+0xB0C0	0x8884	# <CJK>
+0xB0C1	0x50B2	# <CJK>
+0xB0C2	0x5965	# <CJK>
+0xB0C3	0x61CA	# <CJK>
+0xB0C4	0x6FB3	# <CJK>
+0xB0C5	0x82AD	# <CJK>
+0xB0C6	0x634C	# <CJK>
+0xB0C7	0x6252	# <CJK>
+0xB0C8	0x53ED	# <CJK>
+0xB0C9	0x5427	# <CJK>
+0xB0CA	0x7B06	# <CJK>
+0xB0CB	0x516B	# <CJK>
+0xB0CC	0x75A4	# <CJK>
+0xB0CD	0x5DF4	# <CJK>
+0xB0CE	0x62D4	# <CJK>
+0xB0CF	0x8DCB	# <CJK>
+0xB0D0	0x9776	# <CJK>
+0xB0D1	0x628A	# <CJK>
+0xB0D2	0x8019	# <CJK>
+0xB0D3	0x575D	# <CJK>
+0xB0D4	0x9738	# <CJK>
+0xB0D5	0x7F62	# <CJK>
+0xB0D6	0x7238	# <CJK>
+0xB0D7	0x767D	# <CJK>
+0xB0D8	0x67CF	# <CJK>
+0xB0D9	0x767E	# <CJK>
+0xB0DA	0x6446	# <CJK>
+0xB0DB	0x4F70	# <CJK>
+0xB0DC	0x8D25	# <CJK>
+0xB0DD	0x62DC	# <CJK>
+0xB0DE	0x7A17	# <CJK>
+0xB0DF	0x6591	# <CJK>
+0xB0E0	0x73ED	# <CJK>
+0xB0E1	0x642C	# <CJK>
+0xB0E2	0x6273	# <CJK>
+0xB0E3	0x822C	# <CJK>
+0xB0E4	0x9881	# <CJK>
+0xB0E5	0x677F	# <CJK>
+0xB0E6	0x7248	# <CJK>
+0xB0E7	0x626E	# <CJK>
+0xB0E8	0x62CC	# <CJK>
+0xB0E9	0x4F34	# <CJK>
+0xB0EA	0x74E3	# <CJK>
+0xB0EB	0x534A	# <CJK>
+0xB0EC	0x529E	# <CJK>
+0xB0ED	0x7ECA	# <CJK>
+0xB0EE	0x90A6	# <CJK>
+0xB0EF	0x5E2E	# <CJK>
+0xB0F0	0x6886	# <CJK>
+0xB0F1	0x699C	# <CJK>
+0xB0F2	0x8180	# <CJK>
+0xB0F3	0x7ED1	# <CJK>
+0xB0F4	0x68D2	# <CJK>
+0xB0F5	0x78C5	# <CJK>
+0xB0F6	0x868C	# <CJK>
+0xB0F7	0x9551	# <CJK>
+0xB0F8	0x508D	# <CJK>
+0xB0F9	0x8C24	# <CJK>
+0xB0FA	0x82DE	# <CJK>
+0xB0FB	0x80DE	# <CJK>
+0xB0FC	0x5305	# <CJK>
+0xB0FD	0x8912	# <CJK>
+0xB0FE	0x5265	# <CJK>
+0xB1A1	0x8584	# <CJK>
+0xB1A2	0x96F9	# <CJK>
+0xB1A3	0x4FDD	# <CJK>
+0xB1A4	0x5821	# <CJK>
+0xB1A5	0x9971	# <CJK>
+0xB1A6	0x5B9D	# <CJK>
+0xB1A7	0x62B1	# <CJK>
+0xB1A8	0x62A5	# <CJK>
+0xB1A9	0x66B4	# <CJK>
+0xB1AA	0x8C79	# <CJK>
+0xB1AB	0x9C8D	# <CJK>
+0xB1AC	0x7206	# <CJK>
+0xB1AD	0x676F	# <CJK>
+0xB1AE	0x7891	# <CJK>
+0xB1AF	0x60B2	# <CJK>
+0xB1B0	0x5351	# <CJK>
+0xB1B1	0x5317	# <CJK>
+0xB1B2	0x8F88	# <CJK>
+0xB1B3	0x80CC	# <CJK>
+0xB1B4	0x8D1D	# <CJK>
+0xB1B5	0x94A1	# <CJK>
+0xB1B6	0x500D	# <CJK>
+0xB1B7	0x72C8	# <CJK>
+0xB1B8	0x5907	# <CJK>
+0xB1B9	0x60EB	# <CJK>
+0xB1BA	0x7119	# <CJK>
+0xB1BB	0x88AB	# <CJK>
+0xB1BC	0x5954	# <CJK>
+0xB1BD	0x82EF	# <CJK>
+0xB1BE	0x672C	# <CJK>
+0xB1BF	0x7B28	# <CJK>
+0xB1C0	0x5D29	# <CJK>
+0xB1C1	0x7EF7	# <CJK>
+0xB1C2	0x752D	# <CJK>
+0xB1C3	0x6CF5	# <CJK>
+0xB1C4	0x8E66	# <CJK>
+0xB1C5	0x8FF8	# <CJK>
+0xB1C6	0x903C	# <CJK>
+0xB1C7	0x9F3B	# <CJK>
+0xB1C8	0x6BD4	# <CJK>
+0xB1C9	0x9119	# <CJK>
+0xB1CA	0x7B14	# <CJK>
+0xB1CB	0x5F7C	# <CJK>
+0xB1CC	0x78A7	# <CJK>
+0xB1CD	0x84D6	# <CJK>
+0xB1CE	0x853D	# <CJK>
+0xB1CF	0x6BD5	# <CJK>
+0xB1D0	0x6BD9	# <CJK>
+0xB1D1	0x6BD6	# <CJK>
+0xB1D2	0x5E01	# <CJK>
+0xB1D3	0x5E87	# <CJK>
+0xB1D4	0x75F9	# <CJK>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-user@FreeBSD.ORG  Wed Aug  5 23:05:11 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 EFA181065670;
	Wed,  5 Aug 2009 23:05:11 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C54448FC14;
	Wed,  5 Aug 2009 23:05:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n75N5BbQ029564;
	Wed, 5 Aug 2009 23:05:11 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n75N5BY3029561;
	Wed, 5 Aug 2009 23:05:11 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200908052305.n75N5BY3029561@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 5 Aug 2009 23:05:11 +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: r196078 -
	user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
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 23:05:12 -0000

Author: kmacy
Date: Wed Aug  5 23:05:11 2009
New Revision: 196078
URL: http://svn.freebsd.org/changeset/base/196078

Log:
  fix a mis-merge by svn and move a warning causing extern out of a function

Modified:
  user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c

Modified: user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Aug  5 22:22:50 2009	(r196077)
+++ user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Wed Aug  5 23:05:11 2009	(r196078)
@@ -186,6 +186,11 @@ SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_min,
 SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RDTUN,
     &zfs_mdcomp_disable, 0, "Disable metadata compression");
 
+#ifdef ZIO_USE_UMA
+extern kmem_cache_t	*zio_buf_cache[];
+extern kmem_cache_t	*zio_data_buf_cache[];
+#endif
+
 /*
  * Note that buffers can be in one of 6 states:
  *	ARC_anon	- anonymous (discussed below)
@@ -1893,8 +1898,6 @@ arc_kmem_reap_now(arc_reclaim_strategy_t
 	size_t			i;
 	kmem_cache_t		*prev_cache = NULL;
 	kmem_cache_t		*prev_data_cache = NULL;
-	extern kmem_cache_t	*zio_buf_cache[];
-	extern kmem_cache_t	*zio_data_buf_cache[];
 #endif
 
 #ifdef _KERNEL

Modified: user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Wed Aug  5 22:22:50 2009	(r196077)
+++ user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Wed Aug  5 23:05:11 2009	(r196078)
@@ -94,9 +94,6 @@ zio_init(void)
 	zio_cache = kmem_cache_create("zio_cache", sizeof (zio_t), 0,
 	    NULL, NULL, NULL, NULL, NULL, 0);
 
-	zio_cache = kmem_cache_create("zio_cache", sizeof (zio_t), 0,
-	    NULL, NULL, NULL, NULL, NULL, 0);
-
 #ifdef ZIO_USE_UMA
 	/*
 	 * For small buffers, we want a cache for each multiple of

From owner-svn-src-user@FreeBSD.ORG  Thu Aug  6 09:04:21 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 4C7BD1065672;
	Thu,  6 Aug 2009 09:04:20 +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 3C8478FC0A;
	Thu,  6 Aug 2009 09:04:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7694Kd2049150;
	Thu, 6 Aug 2009 09:04:20 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7694KW0049148;
	Thu, 6 Aug 2009 09:04:20 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908060904.n7694KW0049148@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 6 Aug 2009 09:04:19 +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: r196080 - 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: Thu, 06 Aug 2009 09:04:21 -0000

Author: edwin
Date: Thu Aug  6 09:04:19 2009
New Revision: 196080
URL: http://svn.freebsd.org/changeset/base/196080

Log:
  Be able to link (old/obsolete/duplicate) encodings

Modified:
  user/edwin/locale/tools/charmaps.pm
  user/edwin/locale/tools/charmaps.xml
  user/edwin/locale/tools/cldr2def.pl

Modified: user/edwin/locale/tools/charmaps.pm
==============================================================================
--- user/edwin/locale/tools/charmaps.pm	Thu Aug  6 08:55:54 2009	(r196079)
+++ user/edwin/locale/tools/charmaps.pm	Thu Aug  6 09:04:19 2009	(r196080)
@@ -52,11 +52,13 @@ sub h_start {
 		my $encoding = $attrs{encoding};
 		my $family = $attrs{family};
 		my $f = defined $attrs{family} ? $attrs{family} : "x";
-		my $link = $attrs{link};
+		my $nc_link = $attrs{namecountry_link};
+		my $e_link = $attrs{encoding_link};
 		my $fallback = $attrs{fallback};
 
 		$d{L}{$name}{$f}{fallback} = $fallback;
-		$d{L}{$name}{$f}{link} = $link;
+		$d{L}{$name}{$f}{e_link} = $e_link;
+		$d{L}{$name}{$f}{nc_link} = $nc_link;
 		$d{L}{$name}{$f}{family} = $family;
 		$d{L}{$name}{$f}{encoding} = $encoding;
 		$d{L}{$name}{$f}{countries} = $countries;

Modified: user/edwin/locale/tools/charmaps.xml
==============================================================================
--- user/edwin/locale/tools/charmaps.xml	Thu Aug  6 08:55:54 2009	(r196079)
+++ user/edwin/locale/tools/charmaps.xml	Thu Aug  6 09:04:19 2009	(r196080)
@@ -6,8 +6,10 @@
 		encoding = encodings to be done - seperated by space
 		countries = countries to create - seperated by space
 		family = which font family - only one
-		link = only with family, create this original file too - \
-			only one
+		countryname_link = only with family, link this original file \
+			too - only one
+		encoding_link = link this original encoding too - seperated \
+			by space
 		fallback = read this file if name_countries doesn't exist - \
 			only one
 
@@ -91,16 +93,17 @@
 		encoding="ISO8859-1 ISO8859-15"
 		countries="CH IT" />
 	<language name="ja"
-		link="jp_JP"
+		namecountry_link="jp_JP"
 		encoding="SJIS eucJP"
 		countries="JP" />
 	<language name="kk"
 		family="Cyrl"
-		link="kk_KZ"
+		namecountry_link="kk_KZ"
 		encoding="PT154"
 		countries="KZ" />
 	<language name="ko"
-		encoding="CP949 eucKR"
+		encoding="eucKR"
+		encoding_link="eucKR:CP949"
 		countries="KR" />
 	<language name="la"
 		encoding="ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-15 US-ASCII"
@@ -110,10 +113,10 @@
 		countries="LT" />
 	<language name="mn"
 		family="Cyrl"
-		link="mn_MN"
+		namecountry_link="mn_MN"
 		countries="MN" />
 	<language name="nb"
-		link="no_NO"
+		namecountry_link="no_NO"
 		encoding="ISO8859-1 ISO8859-15"
 		countries="NO" />
 	<language name="nl"
@@ -142,12 +145,12 @@
 		countries="SI" />
 	<language name="sr"
 		family="Latn"
-		link="sr_YU"
+		namecountry_link="sr_YU"
 		encoding="ISO8859-2"
 		countries="RS" />
 	<language name="sr"
 		family="Cyrl"
-		link="sr_YU"
+		namecountry_link="sr_YU"
 		encoding="ISO8859-5"
 		countries="RS" />
 	<language name="sv"
@@ -161,17 +164,17 @@
 		countries="UA" />
 	<language name="zh"
 		family="Hans"
-		link="zh_CN"
+		namecountry_link="zh_CN"
 		encoding="GB18030 GB2312 GBK eucCN"
 		countries="CN" />
 	<language name="zh"
 		family="Hant"
-		link="zh_HK"
+		namecountry_link="zh_HK"
 		encoding="Big5HKSCS"
 		countries="HK" />
 	<language name="zh"
 		family="Hant"
-		link="zh_TW"
+		namecountry_link="zh_TW"
 		encoding="Big5"
 		countries="TW" />
 </languages>

Modified: user/edwin/locale/tools/cldr2def.pl
==============================================================================
--- user/edwin/locale/tools/cldr2def.pl	Thu Aug  6 08:55:54 2009	(r196079)
+++ user/edwin/locale/tools/cldr2def.pl	Thu Aug  6 09:04:19 2009	(r196080)
@@ -642,15 +642,23 @@ EOF
 			print FOUT "LOCALES+=\t$file.$e\n";
 		}
 
-		if (defined $languages{$l}{$f}{link}) {
+		if (defined $languages{$l}{$f}{nc_link}) {
 			foreach my $e (sort keys(%{$languages{$l}{$f}{data}{$c}})) {
 				my $file = $l . "_";
 				$file .= $f . "_" if ($f ne "x");
 				$file .= $c;
-				print FOUT "SAME+=\t\t$file.$e:$languages{$l}{$f}{link}.$e\t# legacy\n";
-				
+				print FOUT "SAME+=\t\t$file.$e:$languages{$l}{$f}{nc_link}.$e\t# legacy (lang/country change)\n";
+			}
+		}
+
+		if (defined $languages{$l}{$f}{e_link}) {
+			foreach my $el (split(" ", $languages{$l}{$f}{e_link})) {
+				my @a = split(/:/, $el);
+				my $file = $l . "_";
+				$file .= $f . "_" if ($f ne "x");
+				$file .= $c;
+				print FOUT "SAME+=\t\t$file.$a[0]:$file.$a[1]\t# legacy (same charset)\n";
 			}
-			
 		}
 
 	}

From owner-svn-src-user@FreeBSD.ORG  Thu Aug  6 09:06:13 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 CE2F4106564A;
	Thu,  6 Aug 2009 09:06:13 +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 BDABB8FC16;
	Thu,  6 Aug 2009 09:06:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7696DSg049250;
	Thu, 6 Aug 2009 09:06:13 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7696DMk049248;
	Thu, 6 Aug 2009 09:06:13 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908060906.n7696DMk049248@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 6 Aug 2009 09:06:13 +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: r196081 - user/edwin/locale/tools/charmaps
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: Thu, 06 Aug 2009 09:06:14 -0000

Author: edwin
Date: Thu Aug  6 09:06:13 2009
New Revision: 196081
URL: http://svn.freebsd.org/changeset/base/196081

Log:
  Rename.

Added:
  user/edwin/locale/tools/charmaps/eucKR.TXT
     - copied unchanged from r196080, user/edwin/locale/tools/charmaps/CP949.TXT
Deleted:
  user/edwin/locale/tools/charmaps/CP949.TXT

Copied: user/edwin/locale/tools/charmaps/eucKR.TXT (from r196080, user/edwin/locale/tools/charmaps/CP949.TXT)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/edwin/locale/tools/charmaps/eucKR.TXT	Thu Aug  6 09:06:13 2009	(r196081, copy of r196080, user/edwin/locale/tools/charmaps/CP949.TXT)
@@ -0,0 +1,17322 @@
+#
+#    Name:     cp949 to Unicode table
+#    Unicode version: 2.0
+#    Table version: 2.01
+#    Table format:  Format A
+#    Date:          1/7/2000
+#
+#    Contact:       Shawn.Steele@microsoft.com
+#
+#    General notes: none
+#
+#    Format: Three tab-separated columns
+#        Column #1 is the cp949 code (in hex)
+#        Column #2 is the Unicode (in hex as 0xXXXX)
+#        Column #3 is the Unicode name (follows a comment sign, '#')
+#
+#    The entries are in cp949 order
+#
+0x00	0x0000	#NULL
+0x01	0x0001	#START OF HEADING
+0x02	0x0002	#START OF TEXT
+0x03	0x0003	#END OF TEXT
+0x04	0x0004	#END OF TRANSMISSION
+0x05	0x0005	#ENQUIRY
+0x06	0x0006	#ACKNOWLEDGE
+0x07	0x0007	#BELL
+0x08	0x0008	#BACKSPACE
+0x09	0x0009	#HORIZONTAL TABULATION
+0x0A	0x000A	#LINE FEED
+0x0B	0x000B	#VERTICAL TABULATION
+0x0C	0x000C	#FORM FEED
+0x0D	0x000D	#CARRIAGE RETURN
+0x0E	0x000E	#SHIFT OUT
+0x0F	0x000F	#SHIFT IN
+0x10	0x0010	#DATA LINK ESCAPE
+0x11	0x0011	#DEVICE CONTROL ONE
+0x12	0x0012	#DEVICE CONTROL TWO
+0x13	0x0013	#DEVICE CONTROL THREE
+0x14	0x0014	#DEVICE CONTROL FOUR
+0x15	0x0015	#NEGATIVE ACKNOWLEDGE
+0x16	0x0016	#SYNCHRONOUS IDLE
+0x17	0x0017	#END OF TRANSMISSION BLOCK
+0x18	0x0018	#CANCEL
+0x19	0x0019	#END OF MEDIUM
+0x1A	0x001A	#SUBSTITUTE
+0x1B	0x001B	#ESCAPE
+0x1C	0x001C	#FILE SEPARATOR
+0x1D	0x001D	#GROUP SEPARATOR
+0x1E	0x001E	#RECORD SEPARATOR
+0x1F	0x001F	#UNIT SEPARATOR
+0x20	0x0020	#SPACE
+0x21	0x0021	#EXCLAMATION MARK
+0x22	0x0022	#QUOTATION MARK
+0x23	0x0023	#NUMBER SIGN
+0x24	0x0024	#DOLLAR SIGN
+0x25	0x0025	#PERCENT SIGN
+0x26	0x0026	#AMPERSAND
+0x27	0x0027	#APOSTROPHE
+0x28	0x0028	#LEFT PARENTHESIS
+0x29	0x0029	#RIGHT PARENTHESIS
+0x2A	0x002A	#ASTERISK
+0x2B	0x002B	#PLUS SIGN
+0x2C	0x002C	#COMMA
+0x2D	0x002D	#HYPHEN-MINUS
+0x2E	0x002E	#FULL STOP
+0x2F	0x002F	#SOLIDUS
+0x30	0x0030	#DIGIT ZERO
+0x31	0x0031	#DIGIT ONE
+0x32	0x0032	#DIGIT TWO
+0x33	0x0033	#DIGIT THREE
+0x34	0x0034	#DIGIT FOUR
+0x35	0x0035	#DIGIT FIVE
+0x36	0x0036	#DIGIT SIX
+0x37	0x0037	#DIGIT SEVEN
+0x38	0x0038	#DIGIT EIGHT
+0x39	0x0039	#DIGIT NINE
+0x3A	0x003A	#COLON
+0x3B	0x003B	#SEMICOLON
+0x3C	0x003C	#LESS-THAN SIGN
+0x3D	0x003D	#EQUALS SIGN
+0x3E	0x003E	#GREATER-THAN SIGN
+0x3F	0x003F	#QUESTION MARK
+0x40	0x0040	#COMMERCIAL AT
+0x41	0x0041	#LATIN CAPITAL LETTER A
+0x42	0x0042	#LATIN CAPITAL LETTER B
+0x43	0x0043	#LATIN CAPITAL LETTER C
+0x44	0x0044	#LATIN CAPITAL LETTER D
+0x45	0x0045	#LATIN CAPITAL LETTER E
+0x46	0x0046	#LATIN CAPITAL LETTER F
+0x47	0x0047	#LATIN CAPITAL LETTER G
+0x48	0x0048	#LATIN CAPITAL LETTER H
+0x49	0x0049	#LATIN CAPITAL LETTER I
+0x4A	0x004A	#LATIN CAPITAL LETTER J
+0x4B	0x004B	#LATIN CAPITAL LETTER K
+0x4C	0x004C	#LATIN CAPITAL LETTER L
+0x4D	0x004D	#LATIN CAPITAL LETTER M
+0x4E	0x004E	#LATIN CAPITAL LETTER N
+0x4F	0x004F	#LATIN CAPITAL LETTER O
+0x50	0x0050	#LATIN CAPITAL LETTER P
+0x51	0x0051	#LATIN CAPITAL LETTER Q
+0x52	0x0052	#LATIN CAPITAL LETTER R
+0x53	0x0053	#LATIN CAPITAL LETTER S
+0x54	0x0054	#LATIN CAPITAL LETTER T
+0x55	0x0055	#LATIN CAPITAL LETTER U
+0x56	0x0056	#LATIN CAPITAL LETTER V
+0x57	0x0057	#LATIN CAPITAL LETTER W
+0x58	0x0058	#LATIN CAPITAL LETTER X
+0x59	0x0059	#LATIN CAPITAL LETTER Y
+0x5A	0x005A	#LATIN CAPITAL LETTER Z
+0x5B	0x005B	#LEFT SQUARE BRACKET
+0x5C	0x005C	#REVERSE SOLIDUS
+0x5D	0x005D	#RIGHT SQUARE BRACKET
+0x5E	0x005E	#CIRCUMFLEX ACCENT
+0x5F	0x005F	#LOW LINE
+0x60	0x0060	#GRAVE ACCENT
+0x61	0x0061	#LATIN SMALL LETTER A
+0x62	0x0062	#LATIN SMALL LETTER B
+0x63	0x0063	#LATIN SMALL LETTER C
+0x64	0x0064	#LATIN SMALL LETTER D
+0x65	0x0065	#LATIN SMALL LETTER E
+0x66	0x0066	#LATIN SMALL LETTER F
+0x67	0x0067	#LATIN SMALL LETTER G
+0x68	0x0068	#LATIN SMALL LETTER H
+0x69	0x0069	#LATIN SMALL LETTER I
+0x6A	0x006A	#LATIN SMALL LETTER J
+0x6B	0x006B	#LATIN SMALL LETTER K
+0x6C	0x006C	#LATIN SMALL LETTER L
+0x6D	0x006D	#LATIN SMALL LETTER M
+0x6E	0x006E	#LATIN SMALL LETTER N
+0x6F	0x006F	#LATIN SMALL LETTER O
+0x70	0x0070	#LATIN SMALL LETTER P
+0x71	0x0071	#LATIN SMALL LETTER Q
+0x72	0x0072	#LATIN SMALL LETTER R
+0x73	0x0073	#LATIN SMALL LETTER S
+0x74	0x0074	#LATIN SMALL LETTER T
+0x75	0x0075	#LATIN SMALL LETTER U
+0x76	0x0076	#LATIN SMALL LETTER V
+0x77	0x0077	#LATIN SMALL LETTER W
+0x78	0x0078	#LATIN SMALL LETTER X
+0x79	0x0079	#LATIN SMALL LETTER Y
+0x7A	0x007A	#LATIN SMALL LETTER Z
+0x7B	0x007B	#LEFT CURLY BRACKET
+0x7C	0x007C	#VERTICAL LINE
+0x7D	0x007D	#RIGHT CURLY BRACKET
+0x7E	0x007E	#TILDE
+0x7F	0x007F	#DELETE
+0x80	      	#UNDEFINED
+0x81	      	#DBCS LEAD BYTE
+0x82	      	#DBCS LEAD BYTE
+0x83	      	#DBCS LEAD BYTE
+0x84	      	#DBCS LEAD BYTE
+0x85	      	#DBCS LEAD BYTE
+0x86	      	#DBCS LEAD BYTE
+0x87	      	#DBCS LEAD BYTE
+0x88	      	#DBCS LEAD BYTE
+0x89	      	#DBCS LEAD BYTE
+0x8A	      	#DBCS LEAD BYTE
+0x8B	      	#DBCS LEAD BYTE
+0x8C	      	#DBCS LEAD BYTE
+0x8D	      	#DBCS LEAD BYTE
+0x8E	      	#DBCS LEAD BYTE
+0x8F	      	#DBCS LEAD BYTE
+0x90	      	#DBCS LEAD BYTE
+0x91	      	#DBCS LEAD BYTE
+0x92	      	#DBCS LEAD BYTE
+0x93	      	#DBCS LEAD BYTE
+0x94	      	#DBCS LEAD BYTE
+0x95	      	#DBCS LEAD BYTE
+0x96	      	#DBCS LEAD BYTE
+0x97	      	#DBCS LEAD BYTE
+0x98	      	#DBCS LEAD BYTE
+0x99	      	#DBCS LEAD BYTE
+0x9A	      	#DBCS LEAD BYTE
+0x9B	      	#DBCS LEAD BYTE
+0x9C	      	#DBCS LEAD BYTE
+0x9D	      	#DBCS LEAD BYTE
+0x9E	      	#DBCS LEAD BYTE
+0x9F	      	#DBCS LEAD BYTE
+0xA0	      	#DBCS LEAD BYTE
+0xA1	      	#DBCS LEAD BYTE
+0xA2	      	#DBCS LEAD BYTE
+0xA3	      	#DBCS LEAD BYTE
+0xA4	      	#DBCS LEAD BYTE
+0xA5	      	#DBCS LEAD BYTE
+0xA6	      	#DBCS LEAD BYTE
+0xA7	      	#DBCS LEAD BYTE
+0xA8	      	#DBCS LEAD BYTE
+0xA9	      	#DBCS LEAD BYTE
+0xAA	      	#DBCS LEAD BYTE
+0xAB	      	#DBCS LEAD BYTE
+0xAC	      	#DBCS LEAD BYTE
+0xAD	      	#DBCS LEAD BYTE
+0xAE	      	#DBCS LEAD BYTE
+0xAF	      	#DBCS LEAD BYTE
+0xB0	      	#DBCS LEAD BYTE
+0xB1	      	#DBCS LEAD BYTE
+0xB2	      	#DBCS LEAD BYTE
+0xB3	      	#DBCS LEAD BYTE
+0xB4	      	#DBCS LEAD BYTE
+0xB5	      	#DBCS LEAD BYTE
+0xB6	      	#DBCS LEAD BYTE
+0xB7	      	#DBCS LEAD BYTE
+0xB8	      	#DBCS LEAD BYTE
+0xB9	      	#DBCS LEAD BYTE
+0xBA	      	#DBCS LEAD BYTE
+0xBB	      	#DBCS LEAD BYTE
+0xBC	      	#DBCS LEAD BYTE
+0xBD	      	#DBCS LEAD BYTE
+0xBE	      	#DBCS LEAD BYTE
+0xBF	      	#DBCS LEAD BYTE
+0xC0	      	#DBCS LEAD BYTE
+0xC1	      	#DBCS LEAD BYTE
+0xC2	      	#DBCS LEAD BYTE
+0xC3	      	#DBCS LEAD BYTE
+0xC4	      	#DBCS LEAD BYTE
+0xC5	      	#DBCS LEAD BYTE
+0xC6	      	#DBCS LEAD BYTE
+0xC7	      	#DBCS LEAD BYTE
+0xC8	      	#DBCS LEAD BYTE
+0xC9	      	#DBCS LEAD BYTE
+0xCA	      	#DBCS LEAD BYTE
+0xCB	      	#DBCS LEAD BYTE
+0xCC	      	#DBCS LEAD BYTE
+0xCD	      	#DBCS LEAD BYTE
+0xCE	      	#DBCS LEAD BYTE
+0xCF	      	#DBCS LEAD BYTE
+0xD0	      	#DBCS LEAD BYTE
+0xD1	      	#DBCS LEAD BYTE
+0xD2	      	#DBCS LEAD BYTE
+0xD3	      	#DBCS LEAD BYTE
+0xD4	      	#DBCS LEAD BYTE
+0xD5	      	#DBCS LEAD BYTE
+0xD6	      	#DBCS LEAD BYTE
+0xD7	      	#DBCS LEAD BYTE
+0xD8	      	#DBCS LEAD BYTE
+0xD9	      	#DBCS LEAD BYTE
+0xDA	      	#DBCS LEAD BYTE
+0xDB	      	#DBCS LEAD BYTE
+0xDC	      	#DBCS LEAD BYTE
+0xDD	      	#DBCS LEAD BYTE
+0xDE	      	#DBCS LEAD BYTE
+0xDF	      	#DBCS LEAD BYTE
+0xE0	      	#DBCS LEAD BYTE
+0xE1	      	#DBCS LEAD BYTE
+0xE2	      	#DBCS LEAD BYTE
+0xE3	      	#DBCS LEAD BYTE
+0xE4	      	#DBCS LEAD BYTE
+0xE5	      	#DBCS LEAD BYTE
+0xE6	      	#DBCS LEAD BYTE
+0xE7	      	#DBCS LEAD BYTE
+0xE8	      	#DBCS LEAD BYTE
+0xE9	      	#DBCS LEAD BYTE
+0xEA	      	#DBCS LEAD BYTE
+0xEB	      	#DBCS LEAD BYTE
+0xEC	      	#DBCS LEAD BYTE
+0xED	      	#DBCS LEAD BYTE
+0xEE	      	#DBCS LEAD BYTE
+0xEF	      	#DBCS LEAD BYTE
+0xF0	      	#DBCS LEAD BYTE
+0xF1	      	#DBCS LEAD BYTE
+0xF2	      	#DBCS LEAD BYTE
+0xF3	      	#DBCS LEAD BYTE
+0xF4	      	#DBCS LEAD BYTE
+0xF5	      	#DBCS LEAD BYTE
+0xF6	      	#DBCS LEAD BYTE
+0xF7	      	#DBCS LEAD BYTE
+0xF8	      	#DBCS LEAD BYTE
+0xF9	      	#DBCS LEAD BYTE
+0xFA	      	#DBCS LEAD BYTE
+0xFB	      	#DBCS LEAD BYTE
+0xFC	      	#DBCS LEAD BYTE
+0xFD	      	#DBCS LEAD BYTE
+0xFE	      	#DBCS LEAD BYTE
+0xFF	      	#UNDEFINED
+0x8141	0xAC02	#HANGUL SYLLABLE KIYEOK A SSANGKIYEOK
+0x8142	0xAC03	#HANGUL SYLLABLE KIYEOK A KIYEOKSIOS
+0x8143	0xAC05	#HANGUL SYLLABLE KIYEOK A NIEUNCIEUC
+0x8144	0xAC06	#HANGUL SYLLABLE KIYEOK A NIEUNHIEUH
+0x8145	0xAC0B	#HANGUL SYLLABLE KIYEOK A RIEULPIEUP
+0x8146	0xAC0C	#HANGUL SYLLABLE KIYEOK A RIEULSIOS
+0x8147	0xAC0D	#HANGUL SYLLABLE KIYEOK A RIEULTHIEUTH
+0x8148	0xAC0E	#HANGUL SYLLABLE KIYEOK A RIEULPHIEUPH
+0x8149	0xAC0F	#HANGUL SYLLABLE KIYEOK A RIEULHIEUH
+0x814A	0xAC18	#HANGUL SYLLABLE KIYEOK A KHIEUKH
+0x814B	0xAC1E	#HANGUL SYLLABLE KIYEOK AE SSANGKIYEOK
+0x814C	0xAC1F	#HANGUL SYLLABLE KIYEOK AE KIYEOKSIOS
+0x814D	0xAC21	#HANGUL SYLLABLE KIYEOK AE NIEUNCIEUC
+0x814E	0xAC22	#HANGUL SYLLABLE KIYEOK AE NIEUNHIEUH
+0x814F	0xAC23	#HANGUL SYLLABLE KIYEOK AE TIKEUT
+0x8150	0xAC25	#HANGUL SYLLABLE KIYEOK AE RIEULKIYEOK
+0x8151	0xAC26	#HANGUL SYLLABLE KIYEOK AE RIEULMIEUM
+0x8152	0xAC27	#HANGUL SYLLABLE KIYEOK AE RIEULPIEUP
+0x8153	0xAC28	#HANGUL SYLLABLE KIYEOK AE RIEULSIOS
+0x8154	0xAC29	#HANGUL SYLLABLE KIYEOK AE RIEULTHIEUTH
+0x8155	0xAC2A	#HANGUL SYLLABLE KIYEOK AE RIEULPHIEUPH
+0x8156	0xAC2B	#HANGUL SYLLABLE KIYEOK AE RIEULHIEUH
+0x8157	0xAC2E	#HANGUL SYLLABLE KIYEOK AE PIEUPSIOS
+0x8158	0xAC32	#HANGUL SYLLABLE KIYEOK AE CIEUC
+0x8159	0xAC33	#HANGUL SYLLABLE KIYEOK AE CHIEUCH
+0x815A	0xAC34	#HANGUL SYLLABLE KIYEOK AE KHIEUKH
+0x8161	0xAC35	#HANGUL SYLLABLE KIYEOK AE THIEUTH
+0x8162	0xAC36	#HANGUL SYLLABLE KIYEOK AE PHIEUPH
+0x8163	0xAC37	#HANGUL SYLLABLE KIYEOK AE HIEUH
+0x8164	0xAC3A	#HANGUL SYLLABLE KIYEOK YA SSANGKIYEOK
+0x8165	0xAC3B	#HANGUL SYLLABLE KIYEOK YA KIYEOKSIOS
+0x8166	0xAC3D	#HANGUL SYLLABLE KIYEOK YA NIEUNCIEUC
+0x8167	0xAC3E	#HANGUL SYLLABLE KIYEOK YA NIEUNHIEUH
+0x8168	0xAC3F	#HANGUL SYLLABLE KIYEOK YA TIKEUT
+0x8169	0xAC41	#HANGUL SYLLABLE KIYEOK YA RIEULKIYEOK
+0x816A	0xAC42	#HANGUL SYLLABLE KIYEOK YA RIEULMIEUM
+0x816B	0xAC43	#HANGUL SYLLABLE KIYEOK YA RIEULPIEUP
+0x816C	0xAC44	#HANGUL SYLLABLE KIYEOK YA RIEULSIOS
+0x816D	0xAC45	#HANGUL SYLLABLE KIYEOK YA RIEULTHIEUTH
+0x816E	0xAC46	#HANGUL SYLLABLE KIYEOK YA RIEULPHIEUPH
+0x816F	0xAC47	#HANGUL SYLLABLE KIYEOK YA RIEULHIEUH
+0x8170	0xAC48	#HANGUL SYLLABLE KIYEOK YA MIEUM
+0x8171	0xAC49	#HANGUL SYLLABLE KIYEOK YA PIEUP
+0x8172	0xAC4A	#HANGUL SYLLABLE KIYEOK YA PIEUPSIOS
+0x8173	0xAC4C	#HANGUL SYLLABLE KIYEOK YA SSANGSIOS
+0x8174	0xAC4E	#HANGUL SYLLABLE KIYEOK YA CIEUC
+0x8175	0xAC4F	#HANGUL SYLLABLE KIYEOK YA CHIEUCH
+0x8176	0xAC50	#HANGUL SYLLABLE KIYEOK YA KHIEUKH
+0x8177	0xAC51	#HANGUL SYLLABLE KIYEOK YA THIEUTH
+0x8178	0xAC52	#HANGUL SYLLABLE KIYEOK YA PHIEUPH
+0x8179	0xAC53	#HANGUL SYLLABLE KIYEOK YA HIEUH
+0x817A	0xAC55	#HANGUL SYLLABLE KIYEOK YAE KIYEOK
+0x8181	0xAC56	#HANGUL SYLLABLE KIYEOK YAE SSANGKIYEOK
+0x8182	0xAC57	#HANGUL SYLLABLE KIYEOK YAE KIYEOKSIOS
+0x8183	0xAC59	#HANGUL SYLLABLE KIYEOK YAE NIEUNCIEUC
+0x8184	0xAC5A	#HANGUL SYLLABLE KIYEOK YAE NIEUNHIEUH
+0x8185	0xAC5B	#HANGUL SYLLABLE KIYEOK YAE TIKEUT
+0x8186	0xAC5D	#HANGUL SYLLABLE KIYEOK YAE RIEULKIYEOK
+0x8187	0xAC5E	#HANGUL SYLLABLE KIYEOK YAE RIEULMIEUM
+0x8188	0xAC5F	#HANGUL SYLLABLE KIYEOK YAE RIEULPIEUP
+0x8189	0xAC60	#HANGUL SYLLABLE KIYEOK YAE RIEULSIOS
+0x818A	0xAC61	#HANGUL SYLLABLE KIYEOK YAE RIEULTHIEUTH
+0x818B	0xAC62	#HANGUL SYLLABLE KIYEOK YAE RIEULPHIEUPH
+0x818C	0xAC63	#HANGUL SYLLABLE KIYEOK YAE RIEULHIEUH
+0x818D	0xAC64	#HANGUL SYLLABLE KIYEOK YAE MIEUM
+0x818E	0xAC65	#HANGUL SYLLABLE KIYEOK YAE PIEUP
+0x818F	0xAC66	#HANGUL SYLLABLE KIYEOK YAE PIEUPSIOS
+0x8190	0xAC67	#HANGUL SYLLABLE KIYEOK YAE SIOS
+0x8191	0xAC68	#HANGUL SYLLABLE KIYEOK YAE SSANGSIOS
+0x8192	0xAC69	#HANGUL SYLLABLE KIYEOK YAE IEUNG
+0x8193	0xAC6A	#HANGUL SYLLABLE KIYEOK YAE CIEUC
+0x8194	0xAC6B	#HANGUL SYLLABLE KIYEOK YAE CHIEUCH
+0x8195	0xAC6C	#HANGUL SYLLABLE KIYEOK YAE KHIEUKH
+0x8196	0xAC6D	#HANGUL SYLLABLE KIYEOK YAE THIEUTH
+0x8197	0xAC6E	#HANGUL SYLLABLE KIYEOK YAE PHIEUPH
+0x8198	0xAC6F	#HANGUL SYLLABLE KIYEOK YAE HIEUH
+0x8199	0xAC72	#HANGUL SYLLABLE KIYEOK EO SSANGKIYEOK
+0x819A	0xAC73	#HANGUL SYLLABLE KIYEOK EO KIYEOKSIOS
+0x819B	0xAC75	#HANGUL SYLLABLE KIYEOK EO NIEUNCIEUC
+0x819C	0xAC76	#HANGUL SYLLABLE KIYEOK EO NIEUNHIEUH
+0x819D	0xAC79	#HANGUL SYLLABLE KIYEOK EO RIEULKIYEOK
+0x819E	0xAC7B	#HANGUL SYLLABLE KIYEOK EO RIEULPIEUP
+0x819F	0xAC7C	#HANGUL SYLLABLE KIYEOK EO RIEULSIOS
+0x81A0	0xAC7D	#HANGUL SYLLABLE KIYEOK EO RIEULTHIEUTH
+0x81A1	0xAC7E	#HANGUL SYLLABLE KIYEOK EO RIEULPHIEUPH
+0x81A2	0xAC7F	#HANGUL SYLLABLE KIYEOK EO RIEULHIEUH
+0x81A3	0xAC82	#HANGUL SYLLABLE KIYEOK EO PIEUPSIOS
+0x81A4	0xAC87	#HANGUL SYLLABLE KIYEOK EO CHIEUCH
+0x81A5	0xAC88	#HANGUL SYLLABLE KIYEOK EO KHIEUKH
+0x81A6	0xAC8D	#HANGUL SYLLABLE KIYEOK E KIYEOK
+0x81A7	0xAC8E	#HANGUL SYLLABLE KIYEOK E SSANGKIYEOK
+0x81A8	0xAC8F	#HANGUL SYLLABLE KIYEOK E KIYEOKSIOS
+0x81A9	0xAC91	#HANGUL SYLLABLE KIYEOK E NIEUNCIEUC
+0x81AA	0xAC92	#HANGUL SYLLABLE KIYEOK E NIEUNHIEUH
+0x81AB	0xAC93	#HANGUL SYLLABLE KIYEOK E TIKEUT
+0x81AC	0xAC95	#HANGUL SYLLABLE KIYEOK E RIEULKIYEOK
+0x81AD	0xAC96	#HANGUL SYLLABLE KIYEOK E RIEULMIEUM
+0x81AE	0xAC97	#HANGUL SYLLABLE KIYEOK E RIEULPIEUP
+0x81AF	0xAC98	#HANGUL SYLLABLE KIYEOK E RIEULSIOS
+0x81B0	0xAC99	#HANGUL SYLLABLE KIYEOK E RIEULTHIEUTH
+0x81B1	0xAC9A	#HANGUL SYLLABLE KIYEOK E RIEULPHIEUPH
+0x81B2	0xAC9B	#HANGUL SYLLABLE KIYEOK E RIEULHIEUH
+0x81B3	0xAC9E	#HANGUL SYLLABLE KIYEOK E PIEUPSIOS
+0x81B4	0xACA2	#HANGUL SYLLABLE KIYEOK E CIEUC
+0x81B5	0xACA3	#HANGUL SYLLABLE KIYEOK E CHIEUCH
+0x81B6	0xACA4	#HANGUL SYLLABLE KIYEOK E KHIEUKH
+0x81B7	0xACA5	#HANGUL SYLLABLE KIYEOK E THIEUTH
+0x81B8	0xACA6	#HANGUL SYLLABLE KIYEOK E PHIEUPH
+0x81B9	0xACA7	#HANGUL SYLLABLE KIYEOK E HIEUH
+0x81BA	0xACAB	#HANGUL SYLLABLE KIYEOK YEO KIYEOKSIOS
+0x81BB	0xACAD	#HANGUL SYLLABLE KIYEOK YEO NIEUNCIEUC
+0x81BC	0xACAE	#HANGUL SYLLABLE KIYEOK YEO NIEUNHIEUH
+0x81BD	0xACB1	#HANGUL SYLLABLE KIYEOK YEO RIEULKIYEOK
+0x81BE	0xACB2	#HANGUL SYLLABLE KIYEOK YEO RIEULMIEUM
+0x81BF	0xACB3	#HANGUL SYLLABLE KIYEOK YEO RIEULPIEUP
+0x81C0	0xACB4	#HANGUL SYLLABLE KIYEOK YEO RIEULSIOS
+0x81C1	0xACB5	#HANGUL SYLLABLE KIYEOK YEO RIEULTHIEUTH
+0x81C2	0xACB6	#HANGUL SYLLABLE KIYEOK YEO RIEULPHIEUPH
+0x81C3	0xACB7	#HANGUL SYLLABLE KIYEOK YEO RIEULHIEUH
+0x81C4	0xACBA	#HANGUL SYLLABLE KIYEOK YEO PIEUPSIOS
+0x81C5	0xACBE	#HANGUL SYLLABLE KIYEOK YEO CIEUC
+0x81C6	0xACBF	#HANGUL SYLLABLE KIYEOK YEO CHIEUCH
+0x81C7	0xACC0	#HANGUL SYLLABLE KIYEOK YEO KHIEUKH
+0x81C8	0xACC2	#HANGUL SYLLABLE KIYEOK YEO PHIEUPH
+0x81C9	0xACC3	#HANGUL SYLLABLE KIYEOK YEO HIEUH
+0x81CA	0xACC5	#HANGUL SYLLABLE KIYEOK YE KIYEOK
+0x81CB	0xACC6	#HANGUL SYLLABLE KIYEOK YE SSANGKIYEOK
+0x81CC	0xACC7	#HANGUL SYLLABLE KIYEOK YE KIYEOKSIOS
+0x81CD	0xACC9	#HANGUL SYLLABLE KIYEOK YE NIEUNCIEUC
+0x81CE	0xACCA	#HANGUL SYLLABLE KIYEOK YE NIEUNHIEUH
+0x81CF	0xACCB	#HANGUL SYLLABLE KIYEOK YE TIKEUT
+0x81D0	0xACCD	#HANGUL SYLLABLE KIYEOK YE RIEULKIYEOK
+0x81D1	0xACCE	#HANGUL SYLLABLE KIYEOK YE RIEULMIEUM
+0x81D2	0xACCF	#HANGUL SYLLABLE KIYEOK YE RIEULPIEUP
+0x81D3	0xACD0	#HANGUL SYLLABLE KIYEOK YE RIEULSIOS
+0x81D4	0xACD1	#HANGUL SYLLABLE KIYEOK YE RIEULTHIEUTH
+0x81D5	0xACD2	#HANGUL SYLLABLE KIYEOK YE RIEULPHIEUPH
+0x81D6	0xACD3	#HANGUL SYLLABLE KIYEOK YE RIEULHIEUH
+0x81D7	0xACD4	#HANGUL SYLLABLE KIYEOK YE MIEUM
+0x81D8	0xACD6	#HANGUL SYLLABLE KIYEOK YE PIEUPSIOS
+0x81D9	0xACD8	#HANGUL SYLLABLE KIYEOK YE SSANGSIOS
+0x81DA	0xACD9	#HANGUL SYLLABLE KIYEOK YE IEUNG
+0x81DB	0xACDA	#HANGUL SYLLABLE KIYEOK YE CIEUC
+0x81DC	0xACDB	#HANGUL SYLLABLE KIYEOK YE CHIEUCH
+0x81DD	0xACDC	#HANGUL SYLLABLE KIYEOK YE KHIEUKH
+0x81DE	0xACDD	#HANGUL SYLLABLE KIYEOK YE THIEUTH
+0x81DF	0xACDE	#HANGUL SYLLABLE KIYEOK YE PHIEUPH
+0x81E0	0xACDF	#HANGUL SYLLABLE KIYEOK YE HIEUH
+0x81E1	0xACE2	#HANGUL SYLLABLE KIYEOK O SSANGKIYEOK
+0x81E2	0xACE3	#HANGUL SYLLABLE KIYEOK O KIYEOKSIOS
+0x81E3	0xACE5	#HANGUL SYLLABLE KIYEOK O NIEUNCIEUC
+0x81E4	0xACE6	#HANGUL SYLLABLE KIYEOK O NIEUNHIEUH
+0x81E5	0xACE9	#HANGUL SYLLABLE KIYEOK O RIEULKIYEOK
+0x81E6	0xACEB	#HANGUL SYLLABLE KIYEOK O RIEULPIEUP
+0x81E7	0xACED	#HANGUL SYLLABLE KIYEOK O RIEULTHIEUTH
+0x81E8	0xACEE	#HANGUL SYLLABLE KIYEOK O RIEULPHIEUPH
+0x81E9	0xACF2	#HANGUL SYLLABLE KIYEOK O PIEUPSIOS
+0x81EA	0xACF4	#HANGUL SYLLABLE KIYEOK O SSANGSIOS
+0x81EB	0xACF7	#HANGUL SYLLABLE KIYEOK O CHIEUCH
+0x81EC	0xACF8	#HANGUL SYLLABLE KIYEOK O KHIEUKH
+0x81ED	0xACF9	#HANGUL SYLLABLE KIYEOK O THIEUTH
+0x81EE	0xACFA	#HANGUL SYLLABLE KIYEOK O PHIEUPH
+0x81EF	0xACFB	#HANGUL SYLLABLE KIYEOK O HIEUH
+0x81F0	0xACFE	#HANGUL SYLLABLE KIYEOK WA SSANGKIYEOK
+0x81F1	0xACFF	#HANGUL SYLLABLE KIYEOK WA KIYEOKSIOS
+0x81F2	0xAD01	#HANGUL SYLLABLE KIYEOK WA NIEUNCIEUC
+0x81F3	0xAD02	#HANGUL SYLLABLE KIYEOK WA NIEUNHIEUH
+0x81F4	0xAD03	#HANGUL SYLLABLE KIYEOK WA TIKEUT
+0x81F5	0xAD05	#HANGUL SYLLABLE KIYEOK WA RIEULKIYEOK
+0x81F6	0xAD07	#HANGUL SYLLABLE KIYEOK WA RIEULPIEUP
+0x81F7	0xAD08	#HANGUL SYLLABLE KIYEOK WA RIEULSIOS
+0x81F8	0xAD09	#HANGUL SYLLABLE KIYEOK WA RIEULTHIEUTH
+0x81F9	0xAD0A	#HANGUL SYLLABLE KIYEOK WA RIEULPHIEUPH
+0x81FA	0xAD0B	#HANGUL SYLLABLE KIYEOK WA RIEULHIEUH
+0x81FB	0xAD0E	#HANGUL SYLLABLE KIYEOK WA PIEUPSIOS
+0x81FC	0xAD10	#HANGUL SYLLABLE KIYEOK WA SSANGSIOS
+0x81FD	0xAD12	#HANGUL SYLLABLE KIYEOK WA CIEUC
+0x81FE	0xAD13	#HANGUL SYLLABLE KIYEOK WA CHIEUCH
+0x8241	0xAD14	#HANGUL SYLLABLE KIYEOK WA KHIEUKH
+0x8242	0xAD15	#HANGUL SYLLABLE KIYEOK WA THIEUTH
+0x8243	0xAD16	#HANGUL SYLLABLE KIYEOK WA PHIEUPH
+0x8244	0xAD17	#HANGUL SYLLABLE KIYEOK WA HIEUH
+0x8245	0xAD19	#HANGUL SYLLABLE KIYEOK WAE KIYEOK
+0x8246	0xAD1A	#HANGUL SYLLABLE KIYEOK WAE SSANGKIYEOK
+0x8247	0xAD1B	#HANGUL SYLLABLE KIYEOK WAE KIYEOKSIOS
+0x8248	0xAD1D	#HANGUL SYLLABLE KIYEOK WAE NIEUNCIEUC
+0x8249	0xAD1E	#HANGUL SYLLABLE KIYEOK WAE NIEUNHIEUH
+0x824A	0xAD1F	#HANGUL SYLLABLE KIYEOK WAE TIKEUT
+0x824B	0xAD21	#HANGUL SYLLABLE KIYEOK WAE RIEULKIYEOK
+0x824C	0xAD22	#HANGUL SYLLABLE KIYEOK WAE RIEULMIEUM
+0x824D	0xAD23	#HANGUL SYLLABLE KIYEOK WAE RIEULPIEUP
+0x824E	0xAD24	#HANGUL SYLLABLE KIYEOK WAE RIEULSIOS
+0x824F	0xAD25	#HANGUL SYLLABLE KIYEOK WAE RIEULTHIEUTH
+0x8250	0xAD26	#HANGUL SYLLABLE KIYEOK WAE RIEULPHIEUPH
+0x8251	0xAD27	#HANGUL SYLLABLE KIYEOK WAE RIEULHIEUH
+0x8252	0xAD28	#HANGUL SYLLABLE KIYEOK WAE MIEUM
+0x8253	0xAD2A	#HANGUL SYLLABLE KIYEOK WAE PIEUPSIOS
+0x8254	0xAD2B	#HANGUL SYLLABLE KIYEOK WAE SIOS
+0x8255	0xAD2E	#HANGUL SYLLABLE KIYEOK WAE CIEUC
+0x8256	0xAD2F	#HANGUL SYLLABLE KIYEOK WAE CHIEUCH
+0x8257	0xAD30	#HANGUL SYLLABLE KIYEOK WAE KHIEUKH
+0x8258	0xAD31	#HANGUL SYLLABLE KIYEOK WAE THIEUTH
+0x8259	0xAD32	#HANGUL SYLLABLE KIYEOK WAE PHIEUPH
+0x825A	0xAD33	#HANGUL SYLLABLE KIYEOK WAE HIEUH
+0x8261	0xAD36	#HANGUL SYLLABLE KIYEOK OE SSANGKIYEOK
+0x8262	0xAD37	#HANGUL SYLLABLE KIYEOK OE KIYEOKSIOS
+0x8263	0xAD39	#HANGUL SYLLABLE KIYEOK OE NIEUNCIEUC
+0x8264	0xAD3A	#HANGUL SYLLABLE KIYEOK OE NIEUNHIEUH
+0x8265	0xAD3B	#HANGUL SYLLABLE KIYEOK OE TIKEUT
+0x8266	0xAD3D	#HANGUL SYLLABLE KIYEOK OE RIEULKIYEOK
+0x8267	0xAD3E	#HANGUL SYLLABLE KIYEOK OE RIEULMIEUM
+0x8268	0xAD3F	#HANGUL SYLLABLE KIYEOK OE RIEULPIEUP
+0x8269	0xAD40	#HANGUL SYLLABLE KIYEOK OE RIEULSIOS
+0x826A	0xAD41	#HANGUL SYLLABLE KIYEOK OE RIEULTHIEUTH
+0x826B	0xAD42	#HANGUL SYLLABLE KIYEOK OE RIEULPHIEUPH
+0x826C	0xAD43	#HANGUL SYLLABLE KIYEOK OE RIEULHIEUH
+0x826D	0xAD46	#HANGUL SYLLABLE KIYEOK OE PIEUPSIOS
+0x826E	0xAD48	#HANGUL SYLLABLE KIYEOK OE SSANGSIOS
+0x826F	0xAD4A	#HANGUL SYLLABLE KIYEOK OE CIEUC
+0x8270	0xAD4B	#HANGUL SYLLABLE KIYEOK OE CHIEUCH
+0x8271	0xAD4C	#HANGUL SYLLABLE KIYEOK OE KHIEUKH
+0x8272	0xAD4D	#HANGUL SYLLABLE KIYEOK OE THIEUTH
+0x8273	0xAD4E	#HANGUL SYLLABLE KIYEOK OE PHIEUPH
+0x8274	0xAD4F	#HANGUL SYLLABLE KIYEOK OE HIEUH
+0x8275	0xAD51	#HANGUL SYLLABLE KIYEOK YO KIYEOK
+0x8276	0xAD52	#HANGUL SYLLABLE KIYEOK YO SSANGKIYEOK
+0x8277	0xAD53	#HANGUL SYLLABLE KIYEOK YO KIYEOKSIOS
+0x8278	0xAD55	#HANGUL SYLLABLE KIYEOK YO NIEUNCIEUC
+0x8279	0xAD56	#HANGUL SYLLABLE KIYEOK YO NIEUNHIEUH
+0x827A	0xAD57	#HANGUL SYLLABLE KIYEOK YO TIKEUT
+0x8281	0xAD59	#HANGUL SYLLABLE KIYEOK YO RIEULKIYEOK
+0x8282	0xAD5A	#HANGUL SYLLABLE KIYEOK YO RIEULMIEUM
+0x8283	0xAD5B	#HANGUL SYLLABLE KIYEOK YO RIEULPIEUP
+0x8284	0xAD5C	#HANGUL SYLLABLE KIYEOK YO RIEULSIOS
+0x8285	0xAD5D	#HANGUL SYLLABLE KIYEOK YO RIEULTHIEUTH
+0x8286	0xAD5E	#HANGUL SYLLABLE KIYEOK YO RIEULPHIEUPH
+0x8287	0xAD5F	#HANGUL SYLLABLE KIYEOK YO RIEULHIEUH
+0x8288	0xAD60	#HANGUL SYLLABLE KIYEOK YO MIEUM
+0x8289	0xAD62	#HANGUL SYLLABLE KIYEOK YO PIEUPSIOS
+0x828A	0xAD64	#HANGUL SYLLABLE KIYEOK YO SSANGSIOS
+0x828B	0xAD65	#HANGUL SYLLABLE KIYEOK YO IEUNG
+0x828C	0xAD66	#HANGUL SYLLABLE KIYEOK YO CIEUC
+0x828D	0xAD67	#HANGUL SYLLABLE KIYEOK YO CHIEUCH
+0x828E	0xAD68	#HANGUL SYLLABLE KIYEOK YO KHIEUKH
+0x828F	0xAD69	#HANGUL SYLLABLE KIYEOK YO THIEUTH
+0x8290	0xAD6A	#HANGUL SYLLABLE KIYEOK YO PHIEUPH
+0x8291	0xAD6B	#HANGUL SYLLABLE KIYEOK YO HIEUH
+0x8292	0xAD6E	#HANGUL SYLLABLE KIYEOK U SSANGKIYEOK
+0x8293	0xAD6F	#HANGUL SYLLABLE KIYEOK U KIYEOKSIOS
+0x8294	0xAD71	#HANGUL SYLLABLE KIYEOK U NIEUNCIEUC
+0x8295	0xAD72	#HANGUL SYLLABLE KIYEOK U NIEUNHIEUH
+0x8296	0xAD77	#HANGUL SYLLABLE KIYEOK U RIEULPIEUP
+0x8297	0xAD78	#HANGUL SYLLABLE KIYEOK U RIEULSIOS
+0x8298	0xAD79	#HANGUL SYLLABLE KIYEOK U RIEULTHIEUTH
+0x8299	0xAD7A	#HANGUL SYLLABLE KIYEOK U RIEULPHIEUPH
+0x829A	0xAD7E	#HANGUL SYLLABLE KIYEOK U PIEUPSIOS
+0x829B	0xAD80	#HANGUL SYLLABLE KIYEOK U SSANGSIOS
+0x829C	0xAD83	#HANGUL SYLLABLE KIYEOK U CHIEUCH
+0x829D	0xAD84	#HANGUL SYLLABLE KIYEOK U KHIEUKH
+0x829E	0xAD85	#HANGUL SYLLABLE KIYEOK U THIEUTH
+0x829F	0xAD86	#HANGUL SYLLABLE KIYEOK U PHIEUPH
+0x82A0	0xAD87	#HANGUL SYLLABLE KIYEOK U HIEUH
+0x82A1	0xAD8A	#HANGUL SYLLABLE KIYEOK WEO SSANGKIYEOK
+0x82A2	0xAD8B	#HANGUL SYLLABLE KIYEOK WEO KIYEOKSIOS
+0x82A3	0xAD8D	#HANGUL SYLLABLE KIYEOK WEO NIEUNCIEUC
+0x82A4	0xAD8E	#HANGUL SYLLABLE KIYEOK WEO NIEUNHIEUH
+0x82A5	0xAD8F	#HANGUL SYLLABLE KIYEOK WEO TIKEUT
+0x82A6	0xAD91	#HANGUL SYLLABLE KIYEOK WEO RIEULKIYEOK
+0x82A7	0xAD92	#HANGUL SYLLABLE KIYEOK WEO RIEULMIEUM
+0x82A8	0xAD93	#HANGUL SYLLABLE KIYEOK WEO RIEULPIEUP
+0x82A9	0xAD94	#HANGUL SYLLABLE KIYEOK WEO RIEULSIOS
+0x82AA	0xAD95	#HANGUL SYLLABLE KIYEOK WEO RIEULTHIEUTH
+0x82AB	0xAD96	#HANGUL SYLLABLE KIYEOK WEO RIEULPHIEUPH
+0x82AC	0xAD97	#HANGUL SYLLABLE KIYEOK WEO RIEULHIEUH
+0x82AD	0xAD98	#HANGUL SYLLABLE KIYEOK WEO MIEUM
+0x82AE	0xAD99	#HANGUL SYLLABLE KIYEOK WEO PIEUP
+0x82AF	0xAD9A	#HANGUL SYLLABLE KIYEOK WEO PIEUPSIOS
+0x82B0	0xAD9B	#HANGUL SYLLABLE KIYEOK WEO SIOS
+0x82B1	0xAD9E	#HANGUL SYLLABLE KIYEOK WEO CIEUC
+0x82B2	0xAD9F	#HANGUL SYLLABLE KIYEOK WEO CHIEUCH
+0x82B3	0xADA0	#HANGUL SYLLABLE KIYEOK WEO KHIEUKH
+0x82B4	0xADA1	#HANGUL SYLLABLE KIYEOK WEO THIEUTH
+0x82B5	0xADA2	#HANGUL SYLLABLE KIYEOK WEO PHIEUPH
+0x82B6	0xADA3	#HANGUL SYLLABLE KIYEOK WEO HIEUH
+0x82B7	0xADA5	#HANGUL SYLLABLE KIYEOK WE KIYEOK
+0x82B8	0xADA6	#HANGUL SYLLABLE KIYEOK WE SSANGKIYEOK
+0x82B9	0xADA7	#HANGUL SYLLABLE KIYEOK WE KIYEOKSIOS
+0x82BA	0xADA8	#HANGUL SYLLABLE KIYEOK WE NIEUN
+0x82BB	0xADA9	#HANGUL SYLLABLE KIYEOK WE NIEUNCIEUC
+0x82BC	0xADAA	#HANGUL SYLLABLE KIYEOK WE NIEUNHIEUH
+0x82BD	0xADAB	#HANGUL SYLLABLE KIYEOK WE TIKEUT
+0x82BE	0xADAC	#HANGUL SYLLABLE KIYEOK WE RIEUL
+0x82BF	0xADAD	#HANGUL SYLLABLE KIYEOK WE RIEULKIYEOK
+0x82C0	0xADAE	#HANGUL SYLLABLE KIYEOK WE RIEULMIEUM
+0x82C1	0xADAF	#HANGUL SYLLABLE KIYEOK WE RIEULPIEUP
+0x82C2	0xADB0	#HANGUL SYLLABLE KIYEOK WE RIEULSIOS
+0x82C3	0xADB1	#HANGUL SYLLABLE KIYEOK WE RIEULTHIEUTH
+0x82C4	0xADB2	#HANGUL SYLLABLE KIYEOK WE RIEULPHIEUPH
+0x82C5	0xADB3	#HANGUL SYLLABLE KIYEOK WE RIEULHIEUH
+0x82C6	0xADB4	#HANGUL SYLLABLE KIYEOK WE MIEUM
+0x82C7	0xADB5	#HANGUL SYLLABLE KIYEOK WE PIEUP
+0x82C8	0xADB6	#HANGUL SYLLABLE KIYEOK WE PIEUPSIOS
+0x82C9	0xADB8	#HANGUL SYLLABLE KIYEOK WE SSANGSIOS
+0x82CA	0xADB9	#HANGUL SYLLABLE KIYEOK WE IEUNG
+0x82CB	0xADBA	#HANGUL SYLLABLE KIYEOK WE CIEUC
+0x82CC	0xADBB	#HANGUL SYLLABLE KIYEOK WE CHIEUCH
+0x82CD	0xADBC	#HANGUL SYLLABLE KIYEOK WE KHIEUKH
+0x82CE	0xADBD	#HANGUL SYLLABLE KIYEOK WE THIEUTH
+0x82CF	0xADBE	#HANGUL SYLLABLE KIYEOK WE PHIEUPH
+0x82D0	0xADBF	#HANGUL SYLLABLE KIYEOK WE HIEUH
+0x82D1	0xADC2	#HANGUL SYLLABLE KIYEOK WI SSANGKIYEOK
+0x82D2	0xADC3	#HANGUL SYLLABLE KIYEOK WI KIYEOKSIOS
+0x82D3	0xADC5	#HANGUL SYLLABLE KIYEOK WI NIEUNCIEUC
+0x82D4	0xADC6	#HANGUL SYLLABLE KIYEOK WI NIEUNHIEUH
+0x82D5	0xADC7	#HANGUL SYLLABLE KIYEOK WI TIKEUT
+0x82D6	0xADC9	#HANGUL SYLLABLE KIYEOK WI RIEULKIYEOK
+0x82D7	0xADCA	#HANGUL SYLLABLE KIYEOK WI RIEULMIEUM
+0x82D8	0xADCB	#HANGUL SYLLABLE KIYEOK WI RIEULPIEUP
+0x82D9	0xADCC	#HANGUL SYLLABLE KIYEOK WI RIEULSIOS
+0x82DA	0xADCD	#HANGUL SYLLABLE KIYEOK WI RIEULTHIEUTH
+0x82DB	0xADCE	#HANGUL SYLLABLE KIYEOK WI RIEULPHIEUPH
+0x82DC	0xADCF	#HANGUL SYLLABLE KIYEOK WI RIEULHIEUH
+0x82DD	0xADD2	#HANGUL SYLLABLE KIYEOK WI PIEUPSIOS
+0x82DE	0xADD4	#HANGUL SYLLABLE KIYEOK WI SSANGSIOS
+0x82DF	0xADD5	#HANGUL SYLLABLE KIYEOK WI IEUNG
+0x82E0	0xADD6	#HANGUL SYLLABLE KIYEOK WI CIEUC
+0x82E1	0xADD7	#HANGUL SYLLABLE KIYEOK WI CHIEUCH
+0x82E2	0xADD8	#HANGUL SYLLABLE KIYEOK WI KHIEUKH
+0x82E3	0xADD9	#HANGUL SYLLABLE KIYEOK WI THIEUTH
+0x82E4	0xADDA	#HANGUL SYLLABLE KIYEOK WI PHIEUPH
+0x82E5	0xADDB	#HANGUL SYLLABLE KIYEOK WI HIEUH
+0x82E6	0xADDD	#HANGUL SYLLABLE KIYEOK YU KIYEOK
+0x82E7	0xADDE	#HANGUL SYLLABLE KIYEOK YU SSANGKIYEOK
+0x82E8	0xADDF	#HANGUL SYLLABLE KIYEOK YU KIYEOKSIOS
+0x82E9	0xADE1	#HANGUL SYLLABLE KIYEOK YU NIEUNCIEUC
+0x82EA	0xADE2	#HANGUL SYLLABLE KIYEOK YU NIEUNHIEUH
+0x82EB	0xADE3	#HANGUL SYLLABLE KIYEOK YU TIKEUT
+0x82EC	0xADE5	#HANGUL SYLLABLE KIYEOK YU RIEULKIYEOK
+0x82ED	0xADE6	#HANGUL SYLLABLE KIYEOK YU RIEULMIEUM
+0x82EE	0xADE7	#HANGUL SYLLABLE KIYEOK YU RIEULPIEUP
+0x82EF	0xADE8	#HANGUL SYLLABLE KIYEOK YU RIEULSIOS
+0x82F0	0xADE9	#HANGUL SYLLABLE KIYEOK YU RIEULTHIEUTH
+0x82F1	0xADEA	#HANGUL SYLLABLE KIYEOK YU RIEULPHIEUPH
+0x82F2	0xADEB	#HANGUL SYLLABLE KIYEOK YU RIEULHIEUH
+0x82F3	0xADEC	#HANGUL SYLLABLE KIYEOK YU MIEUM
+0x82F4	0xADED	#HANGUL SYLLABLE KIYEOK YU PIEUP
+0x82F5	0xADEE	#HANGUL SYLLABLE KIYEOK YU PIEUPSIOS
+0x82F6	0xADEF	#HANGUL SYLLABLE KIYEOK YU SIOS
+0x82F7	0xADF0	#HANGUL SYLLABLE KIYEOK YU SSANGSIOS
+0x82F8	0xADF1	#HANGUL SYLLABLE KIYEOK YU IEUNG
+0x82F9	0xADF2	#HANGUL SYLLABLE KIYEOK YU CIEUC
+0x82FA	0xADF3	#HANGUL SYLLABLE KIYEOK YU CHIEUCH
+0x82FB	0xADF4	#HANGUL SYLLABLE KIYEOK YU KHIEUKH
+0x82FC	0xADF5	#HANGUL SYLLABLE KIYEOK YU THIEUTH
+0x82FD	0xADF6	#HANGUL SYLLABLE KIYEOK YU PHIEUPH
+0x82FE	0xADF7	#HANGUL SYLLABLE KIYEOK YU HIEUH
+0x8341	0xADFA	#HANGUL SYLLABLE KIYEOK EU SSANGKIYEOK
+0x8342	0xADFB	#HANGUL SYLLABLE KIYEOK EU KIYEOKSIOS
+0x8343	0xADFD	#HANGUL SYLLABLE KIYEOK EU NIEUNCIEUC
+0x8344	0xADFE	#HANGUL SYLLABLE KIYEOK EU NIEUNHIEUH
+0x8345	0xAE02	#HANGUL SYLLABLE KIYEOK EU RIEULMIEUM
+0x8346	0xAE03	#HANGUL SYLLABLE KIYEOK EU RIEULPIEUP
+0x8347	0xAE04	#HANGUL SYLLABLE KIYEOK EU RIEULSIOS
+0x8348	0xAE05	#HANGUL SYLLABLE KIYEOK EU RIEULTHIEUTH
+0x8349	0xAE06	#HANGUL SYLLABLE KIYEOK EU RIEULPHIEUPH
+0x834A	0xAE07	#HANGUL SYLLABLE KIYEOK EU RIEULHIEUH
+0x834B	0xAE0A	#HANGUL SYLLABLE KIYEOK EU PIEUPSIOS
+0x834C	0xAE0C	#HANGUL SYLLABLE KIYEOK EU SSANGSIOS
+0x834D	0xAE0E	#HANGUL SYLLABLE KIYEOK EU CIEUC
+0x834E	0xAE0F	#HANGUL SYLLABLE KIYEOK EU CHIEUCH
+0x834F	0xAE10	#HANGUL SYLLABLE KIYEOK EU KHIEUKH
+0x8350	0xAE11	#HANGUL SYLLABLE KIYEOK EU THIEUTH
+0x8351	0xAE12	#HANGUL SYLLABLE KIYEOK EU PHIEUPH
+0x8352	0xAE13	#HANGUL SYLLABLE KIYEOK EU HIEUH
+0x8353	0xAE15	#HANGUL SYLLABLE KIYEOK YI KIYEOK
+0x8354	0xAE16	#HANGUL SYLLABLE KIYEOK YI SSANGKIYEOK
+0x8355	0xAE17	#HANGUL SYLLABLE KIYEOK YI KIYEOKSIOS
+0x8356	0xAE18	#HANGUL SYLLABLE KIYEOK YI NIEUN
+0x8357	0xAE19	#HANGUL SYLLABLE KIYEOK YI NIEUNCIEUC
+0x8358	0xAE1A	#HANGUL SYLLABLE KIYEOK YI NIEUNHIEUH
+0x8359	0xAE1B	#HANGUL SYLLABLE KIYEOK YI TIKEUT
+0x835A	0xAE1C	#HANGUL SYLLABLE KIYEOK YI RIEUL
+0x8361	0xAE1D	#HANGUL SYLLABLE KIYEOK YI RIEULKIYEOK
+0x8362	0xAE1E	#HANGUL SYLLABLE KIYEOK YI RIEULMIEUM
+0x8363	0xAE1F	#HANGUL SYLLABLE KIYEOK YI RIEULPIEUP
+0x8364	0xAE20	#HANGUL SYLLABLE KIYEOK YI RIEULSIOS
+0x8365	0xAE21	#HANGUL SYLLABLE KIYEOK YI RIEULTHIEUTH
+0x8366	0xAE22	#HANGUL SYLLABLE KIYEOK YI RIEULPHIEUPH
+0x8367	0xAE23	#HANGUL SYLLABLE KIYEOK YI RIEULHIEUH
+0x8368	0xAE24	#HANGUL SYLLABLE KIYEOK YI MIEUM
+0x8369	0xAE25	#HANGUL SYLLABLE KIYEOK YI PIEUP
+0x836A	0xAE26	#HANGUL SYLLABLE KIYEOK YI PIEUPSIOS
+0x836B	0xAE27	#HANGUL SYLLABLE KIYEOK YI SIOS
+0x836C	0xAE28	#HANGUL SYLLABLE KIYEOK YI SSANGSIOS
+0x836D	0xAE29	#HANGUL SYLLABLE KIYEOK YI IEUNG
+0x836E	0xAE2A	#HANGUL SYLLABLE KIYEOK YI CIEUC
+0x836F	0xAE2B	#HANGUL SYLLABLE KIYEOK YI CHIEUCH
+0x8370	0xAE2C	#HANGUL SYLLABLE KIYEOK YI KHIEUKH
+0x8371	0xAE2D	#HANGUL SYLLABLE KIYEOK YI THIEUTH
+0x8372	0xAE2E	#HANGUL SYLLABLE KIYEOK YI PHIEUPH
+0x8373	0xAE2F	#HANGUL SYLLABLE KIYEOK YI HIEUH
+0x8374	0xAE32	#HANGUL SYLLABLE KIYEOK I SSANGKIYEOK
+0x8375	0xAE33	#HANGUL SYLLABLE KIYEOK I KIYEOKSIOS
+0x8376	0xAE35	#HANGUL SYLLABLE KIYEOK I NIEUNCIEUC
+0x8377	0xAE36	#HANGUL SYLLABLE KIYEOK I NIEUNHIEUH
+0x8378	0xAE39	#HANGUL SYLLABLE KIYEOK I RIEULKIYEOK
+0x8379	0xAE3B	#HANGUL SYLLABLE KIYEOK I RIEULPIEUP
+0x837A	0xAE3C	#HANGUL SYLLABLE KIYEOK I RIEULSIOS
+0x8381	0xAE3D	#HANGUL SYLLABLE KIYEOK I RIEULTHIEUTH
+0x8382	0xAE3E	#HANGUL SYLLABLE KIYEOK I RIEULPHIEUPH
+0x8383	0xAE3F	#HANGUL SYLLABLE KIYEOK I RIEULHIEUH
+0x8384	0xAE42	#HANGUL SYLLABLE KIYEOK I PIEUPSIOS
+0x8385	0xAE44	#HANGUL SYLLABLE KIYEOK I SSANGSIOS
+0x8386	0xAE47	#HANGUL SYLLABLE KIYEOK I CHIEUCH
+0x8387	0xAE48	#HANGUL SYLLABLE KIYEOK I KHIEUKH
+0x8388	0xAE49	#HANGUL SYLLABLE KIYEOK I THIEUTH
+0x8389	0xAE4B	#HANGUL SYLLABLE KIYEOK I HIEUH
+0x838A	0xAE4F	#HANGUL SYLLABLE SSANGKIYEOK A KIYEOKSIOS
+0x838B	0xAE51	#HANGUL SYLLABLE SSANGKIYEOK A NIEUNCIEUC
+0x838C	0xAE52	#HANGUL SYLLABLE SSANGKIYEOK A NIEUNHIEUH
+0x838D	0xAE53	#HANGUL SYLLABLE SSANGKIYEOK A TIKEUT
+0x838E	0xAE55	#HANGUL SYLLABLE SSANGKIYEOK A RIEULKIYEOK
+0x838F	0xAE57	#HANGUL SYLLABLE SSANGKIYEOK A RIEULPIEUP
+0x8390	0xAE58	#HANGUL SYLLABLE SSANGKIYEOK A RIEULSIOS
+0x8391	0xAE59	#HANGUL SYLLABLE SSANGKIYEOK A RIEULTHIEUTH
+0x8392	0xAE5A	#HANGUL SYLLABLE SSANGKIYEOK A RIEULPHIEUPH
+0x8393	0xAE5B	#HANGUL SYLLABLE SSANGKIYEOK A RIEULHIEUH
+0x8394	0xAE5E	#HANGUL SYLLABLE SSANGKIYEOK A PIEUPSIOS
+0x8395	0xAE62	#HANGUL SYLLABLE SSANGKIYEOK A CIEUC
+0x8396	0xAE63	#HANGUL SYLLABLE SSANGKIYEOK A CHIEUCH
+0x8397	0xAE64	#HANGUL SYLLABLE SSANGKIYEOK A KHIEUKH
+0x8398	0xAE66	#HANGUL SYLLABLE SSANGKIYEOK A PHIEUPH
+0x8399	0xAE67	#HANGUL SYLLABLE SSANGKIYEOK A HIEUH
+0x839A	0xAE6A	#HANGUL SYLLABLE SSANGKIYEOK AE SSANGKIYEOK
+0x839B	0xAE6B	#HANGUL SYLLABLE SSANGKIYEOK AE KIYEOKSIOS
+0x839C	0xAE6D	#HANGUL SYLLABLE SSANGKIYEOK AE NIEUNCIEUC
+0x839D	0xAE6E	#HANGUL SYLLABLE SSANGKIYEOK AE NIEUNHIEUH
+0x839E	0xAE6F	#HANGUL SYLLABLE SSANGKIYEOK AE TIKEUT
+0x839F	0xAE71	#HANGUL SYLLABLE SSANGKIYEOK AE RIEULKIYEOK
+0x83A0	0xAE72	#HANGUL SYLLABLE SSANGKIYEOK AE RIEULMIEUM
+0x83A1	0xAE73	#HANGUL SYLLABLE SSANGKIYEOK AE RIEULPIEUP
+0x83A2	0xAE74	#HANGUL SYLLABLE SSANGKIYEOK AE RIEULSIOS
+0x83A3	0xAE75	#HANGUL SYLLABLE SSANGKIYEOK AE RIEULTHIEUTH
+0x83A4	0xAE76	#HANGUL SYLLABLE SSANGKIYEOK AE RIEULPHIEUPH
+0x83A5	0xAE77	#HANGUL SYLLABLE SSANGKIYEOK AE RIEULHIEUH
+0x83A6	0xAE7A	#HANGUL SYLLABLE SSANGKIYEOK AE PIEUPSIOS
+0x83A7	0xAE7E	#HANGUL SYLLABLE SSANGKIYEOK AE CIEUC
+0x83A8	0xAE7F	#HANGUL SYLLABLE SSANGKIYEOK AE CHIEUCH
+0x83A9	0xAE80	#HANGUL SYLLABLE SSANGKIYEOK AE KHIEUKH
+0x83AA	0xAE81	#HANGUL SYLLABLE SSANGKIYEOK AE THIEUTH
+0x83AB	0xAE82	#HANGUL SYLLABLE SSANGKIYEOK AE PHIEUPH
+0x83AC	0xAE83	#HANGUL SYLLABLE SSANGKIYEOK AE HIEUH
+0x83AD	0xAE86	#HANGUL SYLLABLE SSANGKIYEOK YA SSANGKIYEOK
+0x83AE	0xAE87	#HANGUL SYLLABLE SSANGKIYEOK YA KIYEOKSIOS
+0x83AF	0xAE88	#HANGUL SYLLABLE SSANGKIYEOK YA NIEUN
+0x83B0	0xAE89	#HANGUL SYLLABLE SSANGKIYEOK YA NIEUNCIEUC
+0x83B1	0xAE8A	#HANGUL SYLLABLE SSANGKIYEOK YA NIEUNHIEUH
+0x83B2	0xAE8B	#HANGUL SYLLABLE SSANGKIYEOK YA TIKEUT
+0x83B3	0xAE8D	#HANGUL SYLLABLE SSANGKIYEOK YA RIEULKIYEOK
+0x83B4	0xAE8E	#HANGUL SYLLABLE SSANGKIYEOK YA RIEULMIEUM
+0x83B5	0xAE8F	#HANGUL SYLLABLE SSANGKIYEOK YA RIEULPIEUP
+0x83B6	0xAE90	#HANGUL SYLLABLE SSANGKIYEOK YA RIEULSIOS
+0x83B7	0xAE91	#HANGUL SYLLABLE SSANGKIYEOK YA RIEULTHIEUTH
+0x83B8	0xAE92	#HANGUL SYLLABLE SSANGKIYEOK YA RIEULPHIEUPH
+0x83B9	0xAE93	#HANGUL SYLLABLE SSANGKIYEOK YA RIEULHIEUH
+0x83BA	0xAE94	#HANGUL SYLLABLE SSANGKIYEOK YA MIEUM
+0x83BB	0xAE95	#HANGUL SYLLABLE SSANGKIYEOK YA PIEUP
+0x83BC	0xAE96	#HANGUL SYLLABLE SSANGKIYEOK YA PIEUPSIOS
+0x83BD	0xAE97	#HANGUL SYLLABLE SSANGKIYEOK YA SIOS
+0x83BE	0xAE98	#HANGUL SYLLABLE SSANGKIYEOK YA SSANGSIOS
+0x83BF	0xAE99	#HANGUL SYLLABLE SSANGKIYEOK YA IEUNG
+0x83C0	0xAE9A	#HANGUL SYLLABLE SSANGKIYEOK YA CIEUC
+0x83C1	0xAE9B	#HANGUL SYLLABLE SSANGKIYEOK YA CHIEUCH
+0x83C2	0xAE9C	#HANGUL SYLLABLE SSANGKIYEOK YA KHIEUKH
+0x83C3	0xAE9D	#HANGUL SYLLABLE SSANGKIYEOK YA THIEUTH
+0x83C4	0xAE9E	#HANGUL SYLLABLE SSANGKIYEOK YA PHIEUPH
+0x83C5	0xAE9F	#HANGUL SYLLABLE SSANGKIYEOK YA HIEUH
+0x83C6	0xAEA0	#HANGUL SYLLABLE SSANGKIYEOK YAE
+0x83C7	0xAEA1	#HANGUL SYLLABLE SSANGKIYEOK YAE KIYEOK
+0x83C8	0xAEA2	#HANGUL SYLLABLE SSANGKIYEOK YAE SSANGKIYEOK
+0x83C9	0xAEA3	#HANGUL SYLLABLE SSANGKIYEOK YAE KIYEOKSIOS
+0x83CA	0xAEA4	#HANGUL SYLLABLE SSANGKIYEOK YAE NIEUN
+0x83CB	0xAEA5	#HANGUL SYLLABLE SSANGKIYEOK YAE NIEUNCIEUC
+0x83CC	0xAEA6	#HANGUL SYLLABLE SSANGKIYEOK YAE NIEUNHIEUH
+0x83CD	0xAEA7	#HANGUL SYLLABLE SSANGKIYEOK YAE TIKEUT
+0x83CE	0xAEA8	#HANGUL SYLLABLE SSANGKIYEOK YAE RIEUL
+0x83CF	0xAEA9	#HANGUL SYLLABLE SSANGKIYEOK YAE RIEULKIYEOK
+0x83D0	0xAEAA	#HANGUL SYLLABLE SSANGKIYEOK YAE RIEULMIEUM
+0x83D1	0xAEAB	#HANGUL SYLLABLE SSANGKIYEOK YAE RIEULPIEUP
+0x83D2	0xAEAC	#HANGUL SYLLABLE SSANGKIYEOK YAE RIEULSIOS
+0x83D3	0xAEAD	#HANGUL SYLLABLE SSANGKIYEOK YAE RIEULTHIEUTH
+0x83D4	0xAEAE	#HANGUL SYLLABLE SSANGKIYEOK YAE RIEULPHIEUPH
+0x83D5	0xAEAF	#HANGUL SYLLABLE SSANGKIYEOK YAE RIEULHIEUH
+0x83D6	0xAEB0	#HANGUL SYLLABLE SSANGKIYEOK YAE MIEUM
+0x83D7	0xAEB1	#HANGUL SYLLABLE SSANGKIYEOK YAE PIEUP
+0x83D8	0xAEB2	#HANGUL SYLLABLE SSANGKIYEOK YAE PIEUPSIOS
+0x83D9	0xAEB3	#HANGUL SYLLABLE SSANGKIYEOK YAE SIOS
+0x83DA	0xAEB4	#HANGUL SYLLABLE SSANGKIYEOK YAE SSANGSIOS
+0x83DB	0xAEB5	#HANGUL SYLLABLE SSANGKIYEOK YAE IEUNG
+0x83DC	0xAEB6	#HANGUL SYLLABLE SSANGKIYEOK YAE CIEUC
+0x83DD	0xAEB7	#HANGUL SYLLABLE SSANGKIYEOK YAE CHIEUCH
+0x83DE	0xAEB8	#HANGUL SYLLABLE SSANGKIYEOK YAE KHIEUKH
+0x83DF	0xAEB9	#HANGUL SYLLABLE SSANGKIYEOK YAE THIEUTH
+0x83E0	0xAEBA	#HANGUL SYLLABLE SSANGKIYEOK YAE PHIEUPH
+0x83E1	0xAEBB	#HANGUL SYLLABLE SSANGKIYEOK YAE HIEUH
+0x83E2	0xAEBF	#HANGUL SYLLABLE SSANGKIYEOK EO KIYEOKSIOS
+0x83E3	0xAEC1	#HANGUL SYLLABLE SSANGKIYEOK EO NIEUNCIEUC
+0x83E4	0xAEC2	#HANGUL SYLLABLE SSANGKIYEOK EO NIEUNHIEUH
+0x83E5	0xAEC3	#HANGUL SYLLABLE SSANGKIYEOK EO TIKEUT
+0x83E6	0xAEC5	#HANGUL SYLLABLE SSANGKIYEOK EO RIEULKIYEOK
+0x83E7	0xAEC6	#HANGUL SYLLABLE SSANGKIYEOK EO RIEULMIEUM
+0x83E8	0xAEC7	#HANGUL SYLLABLE SSANGKIYEOK EO RIEULPIEUP
+0x83E9	0xAEC8	#HANGUL SYLLABLE SSANGKIYEOK EO RIEULSIOS
+0x83EA	0xAEC9	#HANGUL SYLLABLE SSANGKIYEOK EO RIEULTHIEUTH
+0x83EB	0xAECA	#HANGUL SYLLABLE SSANGKIYEOK EO RIEULPHIEUPH
+0x83EC	0xAECB	#HANGUL SYLLABLE SSANGKIYEOK EO RIEULHIEUH
+0x83ED	0xAECE	#HANGUL SYLLABLE SSANGKIYEOK EO PIEUPSIOS
+0x83EE	0xAED2	#HANGUL SYLLABLE SSANGKIYEOK EO CIEUC
+0x83EF	0xAED3	#HANGUL SYLLABLE SSANGKIYEOK EO CHIEUCH
+0x83F0	0xAED4	#HANGUL SYLLABLE SSANGKIYEOK EO KHIEUKH
+0x83F1	0xAED5	#HANGUL SYLLABLE SSANGKIYEOK EO THIEUTH
+0x83F2	0xAED6	#HANGUL SYLLABLE SSANGKIYEOK EO PHIEUPH
+0x83F3	0xAED7	#HANGUL SYLLABLE SSANGKIYEOK EO HIEUH
+0x83F4	0xAEDA	#HANGUL SYLLABLE SSANGKIYEOK E SSANGKIYEOK
+0x83F5	0xAEDB	#HANGUL SYLLABLE SSANGKIYEOK E KIYEOKSIOS
+0x83F6	0xAEDD	#HANGUL SYLLABLE SSANGKIYEOK E NIEUNCIEUC
+0x83F7	0xAEDE	#HANGUL SYLLABLE SSANGKIYEOK E NIEUNHIEUH
+0x83F8	0xAEDF	#HANGUL SYLLABLE SSANGKIYEOK E TIKEUT
+0x83F9	0xAEE0	#HANGUL SYLLABLE SSANGKIYEOK E RIEUL
+0x83FA	0xAEE1	#HANGUL SYLLABLE SSANGKIYEOK E RIEULKIYEOK
+0x83FB	0xAEE2	#HANGUL SYLLABLE SSANGKIYEOK E RIEULMIEUM
+0x83FC	0xAEE3	#HANGUL SYLLABLE SSANGKIYEOK E RIEULPIEUP
+0x83FD	0xAEE4	#HANGUL SYLLABLE SSANGKIYEOK E RIEULSIOS
+0x83FE	0xAEE5	#HANGUL SYLLABLE SSANGKIYEOK E RIEULTHIEUTH
+0x8441	0xAEE6	#HANGUL SYLLABLE SSANGKIYEOK E RIEULPHIEUPH
+0x8442	0xAEE7	#HANGUL SYLLABLE SSANGKIYEOK E RIEULHIEUH
+0x8443	0xAEE9	#HANGUL SYLLABLE SSANGKIYEOK E PIEUP
+0x8444	0xAEEA	#HANGUL SYLLABLE SSANGKIYEOK E PIEUPSIOS
+0x8445	0xAEEC	#HANGUL SYLLABLE SSANGKIYEOK E SSANGSIOS
+0x8446	0xAEEE	#HANGUL SYLLABLE SSANGKIYEOK E CIEUC
+0x8447	0xAEEF	#HANGUL SYLLABLE SSANGKIYEOK E CHIEUCH
+0x8448	0xAEF0	#HANGUL SYLLABLE SSANGKIYEOK E KHIEUKH
+0x8449	0xAEF1	#HANGUL SYLLABLE SSANGKIYEOK E THIEUTH
+0x844A	0xAEF2	#HANGUL SYLLABLE SSANGKIYEOK E PHIEUPH
+0x844B	0xAEF3	#HANGUL SYLLABLE SSANGKIYEOK E HIEUH
+0x844C	0xAEF5	#HANGUL SYLLABLE SSANGKIYEOK YEO KIYEOK
+0x844D	0xAEF6	#HANGUL SYLLABLE SSANGKIYEOK YEO SSANGKIYEOK
+0x844E	0xAEF7	#HANGUL SYLLABLE SSANGKIYEOK YEO KIYEOKSIOS
+0x844F	0xAEF9	#HANGUL SYLLABLE SSANGKIYEOK YEO NIEUNCIEUC
+0x8450	0xAEFA	#HANGUL SYLLABLE SSANGKIYEOK YEO NIEUNHIEUH
+0x8451	0xAEFB	#HANGUL SYLLABLE SSANGKIYEOK YEO TIKEUT
+0x8452	0xAEFD	#HANGUL SYLLABLE SSANGKIYEOK YEO RIEULKIYEOK
+0x8453	0xAEFE	#HANGUL SYLLABLE SSANGKIYEOK YEO RIEULMIEUM
+0x8454	0xAEFF	#HANGUL SYLLABLE SSANGKIYEOK YEO RIEULPIEUP
+0x8455	0xAF00	#HANGUL SYLLABLE SSANGKIYEOK YEO RIEULSIOS
+0x8456	0xAF01	#HANGUL SYLLABLE SSANGKIYEOK YEO RIEULTHIEUTH
+0x8457	0xAF02	#HANGUL SYLLABLE SSANGKIYEOK YEO RIEULPHIEUPH
+0x8458	0xAF03	#HANGUL SYLLABLE SSANGKIYEOK YEO RIEULHIEUH
+0x8459	0xAF04	#HANGUL SYLLABLE SSANGKIYEOK YEO MIEUM
+0x845A	0xAF05	#HANGUL SYLLABLE SSANGKIYEOK YEO PIEUP
+0x8461	0xAF06	#HANGUL SYLLABLE SSANGKIYEOK YEO PIEUPSIOS
+0x8462	0xAF09	#HANGUL SYLLABLE SSANGKIYEOK YEO IEUNG
+0x8463	0xAF0A	#HANGUL SYLLABLE SSANGKIYEOK YEO CIEUC
+0x8464	0xAF0B	#HANGUL SYLLABLE SSANGKIYEOK YEO CHIEUCH
+0x8465	0xAF0C	#HANGUL SYLLABLE SSANGKIYEOK YEO KHIEUKH
+0x8466	0xAF0E	#HANGUL SYLLABLE SSANGKIYEOK YEO PHIEUPH
+0x8467	0xAF0F	#HANGUL SYLLABLE SSANGKIYEOK YEO HIEUH
+0x8468	0xAF11	#HANGUL SYLLABLE SSANGKIYEOK YE KIYEOK
+0x8469	0xAF12	#HANGUL SYLLABLE SSANGKIYEOK YE SSANGKIYEOK
+0x846A	0xAF13	#HANGUL SYLLABLE SSANGKIYEOK YE KIYEOKSIOS
+0x846B	0xAF14	#HANGUL SYLLABLE SSANGKIYEOK YE NIEUN
+0x846C	0xAF15	#HANGUL SYLLABLE SSANGKIYEOK YE NIEUNCIEUC
+0x846D	0xAF16	#HANGUL SYLLABLE SSANGKIYEOK YE NIEUNHIEUH
+0x846E	0xAF17	#HANGUL SYLLABLE SSANGKIYEOK YE TIKEUT
+0x846F	0xAF18	#HANGUL SYLLABLE SSANGKIYEOK YE RIEUL
+0x8470	0xAF19	#HANGUL SYLLABLE SSANGKIYEOK YE RIEULKIYEOK
+0x8471	0xAF1A	#HANGUL SYLLABLE SSANGKIYEOK YE RIEULMIEUM
+0x8472	0xAF1B	#HANGUL SYLLABLE SSANGKIYEOK YE RIEULPIEUP
+0x8473	0xAF1C	#HANGUL SYLLABLE SSANGKIYEOK YE RIEULSIOS
+0x8474	0xAF1D	#HANGUL SYLLABLE SSANGKIYEOK YE RIEULTHIEUTH
+0x8475	0xAF1E	#HANGUL SYLLABLE SSANGKIYEOK YE RIEULPHIEUPH
+0x8476	0xAF1F	#HANGUL SYLLABLE SSANGKIYEOK YE RIEULHIEUH
+0x8477	0xAF20	#HANGUL SYLLABLE SSANGKIYEOK YE MIEUM
+0x8478	0xAF21	#HANGUL SYLLABLE SSANGKIYEOK YE PIEUP
+0x8479	0xAF22	#HANGUL SYLLABLE SSANGKIYEOK YE PIEUPSIOS
+0x847A	0xAF23	#HANGUL SYLLABLE SSANGKIYEOK YE SIOS
+0x8481	0xAF24	#HANGUL SYLLABLE SSANGKIYEOK YE SSANGSIOS
+0x8482	0xAF25	#HANGUL SYLLABLE SSANGKIYEOK YE IEUNG
+0x8483	0xAF26	#HANGUL SYLLABLE SSANGKIYEOK YE CIEUC
+0x8484	0xAF27	#HANGUL SYLLABLE SSANGKIYEOK YE CHIEUCH
+0x8485	0xAF28	#HANGUL SYLLABLE SSANGKIYEOK YE KHIEUKH
+0x8486	0xAF29	#HANGUL SYLLABLE SSANGKIYEOK YE THIEUTH
+0x8487	0xAF2A	#HANGUL SYLLABLE SSANGKIYEOK YE PHIEUPH
+0x8488	0xAF2B	#HANGUL SYLLABLE SSANGKIYEOK YE HIEUH
+0x8489	0xAF2E	#HANGUL SYLLABLE SSANGKIYEOK O SSANGKIYEOK
+0x848A	0xAF2F	#HANGUL SYLLABLE SSANGKIYEOK O KIYEOKSIOS
+0x848B	0xAF31	#HANGUL SYLLABLE SSANGKIYEOK O NIEUNCIEUC
+0x848C	0xAF33	#HANGUL SYLLABLE SSANGKIYEOK O TIKEUT
+0x848D	0xAF35	#HANGUL SYLLABLE SSANGKIYEOK O RIEULKIYEOK
+0x848E	0xAF36	#HANGUL SYLLABLE SSANGKIYEOK O RIEULMIEUM
+0x848F	0xAF37	#HANGUL SYLLABLE SSANGKIYEOK O RIEULPIEUP
+0x8490	0xAF38	#HANGUL SYLLABLE SSANGKIYEOK O RIEULSIOS
+0x8491	0xAF39	#HANGUL SYLLABLE SSANGKIYEOK O RIEULTHIEUTH
+0x8492	0xAF3A	#HANGUL SYLLABLE SSANGKIYEOK O RIEULPHIEUPH
+0x8493	0xAF3B	#HANGUL SYLLABLE SSANGKIYEOK O RIEULHIEUH
+0x8494	0xAF3E	#HANGUL SYLLABLE SSANGKIYEOK O PIEUPSIOS
+0x8495	0xAF40	#HANGUL SYLLABLE SSANGKIYEOK O SSANGSIOS
+0x8496	0xAF44	#HANGUL SYLLABLE SSANGKIYEOK O KHIEUKH
+0x8497	0xAF45	#HANGUL SYLLABLE SSANGKIYEOK O THIEUTH
+0x8498	0xAF46	#HANGUL SYLLABLE SSANGKIYEOK O PHIEUPH
+0x8499	0xAF47	#HANGUL SYLLABLE SSANGKIYEOK O HIEUH
+0x849A	0xAF4A	#HANGUL SYLLABLE SSANGKIYEOK WA SSANGKIYEOK
+0x849B	0xAF4B	#HANGUL SYLLABLE SSANGKIYEOK WA KIYEOKSIOS
+0x849C	0xAF4C	#HANGUL SYLLABLE SSANGKIYEOK WA NIEUN
+0x849D	0xAF4D	#HANGUL SYLLABLE SSANGKIYEOK WA NIEUNCIEUC
+0x849E	0xAF4E	#HANGUL SYLLABLE SSANGKIYEOK WA NIEUNHIEUH
+0x849F	0xAF4F	#HANGUL SYLLABLE SSANGKIYEOK WA TIKEUT
+0x84A0	0xAF51	#HANGUL SYLLABLE SSANGKIYEOK WA RIEULKIYEOK
+0x84A1	0xAF52	#HANGUL SYLLABLE SSANGKIYEOK WA RIEULMIEUM
+0x84A2	0xAF53	#HANGUL SYLLABLE SSANGKIYEOK WA RIEULPIEUP
+0x84A3	0xAF54	#HANGUL SYLLABLE SSANGKIYEOK WA RIEULSIOS
+0x84A4	0xAF55	#HANGUL SYLLABLE SSANGKIYEOK WA RIEULTHIEUTH
+0x84A5	0xAF56	#HANGUL SYLLABLE SSANGKIYEOK WA RIEULPHIEUPH
+0x84A6	0xAF57	#HANGUL SYLLABLE SSANGKIYEOK WA RIEULHIEUH
+0x84A7	0xAF58	#HANGUL SYLLABLE SSANGKIYEOK WA MIEUM
+0x84A8	0xAF59	#HANGUL SYLLABLE SSANGKIYEOK WA PIEUP
+0x84A9	0xAF5A	#HANGUL SYLLABLE SSANGKIYEOK WA PIEUPSIOS
+0x84AA	0xAF5B	#HANGUL SYLLABLE SSANGKIYEOK WA SIOS
+0x84AB	0xAF5E	#HANGUL SYLLABLE SSANGKIYEOK WA CIEUC
+0x84AC	0xAF5F	#HANGUL SYLLABLE SSANGKIYEOK WA CHIEUCH
+0x84AD	0xAF60	#HANGUL SYLLABLE SSANGKIYEOK WA KHIEUKH
+0x84AE	0xAF61	#HANGUL SYLLABLE SSANGKIYEOK WA THIEUTH
+0x84AF	0xAF62	#HANGUL SYLLABLE SSANGKIYEOK WA PHIEUPH
+0x84B0	0xAF63	#HANGUL SYLLABLE SSANGKIYEOK WA HIEUH
+0x84B1	0xAF66	#HANGUL SYLLABLE SSANGKIYEOK WAE SSANGKIYEOK
+0x84B2	0xAF67	#HANGUL SYLLABLE SSANGKIYEOK WAE KIYEOKSIOS
+0x84B3	0xAF68	#HANGUL SYLLABLE SSANGKIYEOK WAE NIEUN
+0x84B4	0xAF69	#HANGUL SYLLABLE SSANGKIYEOK WAE NIEUNCIEUC
+0x84B5	0xAF6A	#HANGUL SYLLABLE SSANGKIYEOK WAE NIEUNHIEUH
+0x84B6	0xAF6B	#HANGUL SYLLABLE SSANGKIYEOK WAE TIKEUT
+0x84B7	0xAF6C	#HANGUL SYLLABLE SSANGKIYEOK WAE RIEUL
+0x84B8	0xAF6D	#HANGUL SYLLABLE SSANGKIYEOK WAE RIEULKIYEOK
+0x84B9	0xAF6E	#HANGUL SYLLABLE SSANGKIYEOK WAE RIEULMIEUM
+0x84BA	0xAF6F	#HANGUL SYLLABLE SSANGKIYEOK WAE RIEULPIEUP
+0x84BB	0xAF70	#HANGUL SYLLABLE SSANGKIYEOK WAE RIEULSIOS
+0x84BC	0xAF71	#HANGUL SYLLABLE SSANGKIYEOK WAE RIEULTHIEUTH
+0x84BD	0xAF72	#HANGUL SYLLABLE SSANGKIYEOK WAE RIEULPHIEUPH
+0x84BE	0xAF73	#HANGUL SYLLABLE SSANGKIYEOK WAE RIEULHIEUH
+0x84BF	0xAF74	#HANGUL SYLLABLE SSANGKIYEOK WAE MIEUM
+0x84C0	0xAF75	#HANGUL SYLLABLE SSANGKIYEOK WAE PIEUP
+0x84C1	0xAF76	#HANGUL SYLLABLE SSANGKIYEOK WAE PIEUPSIOS
+0x84C2	0xAF77	#HANGUL SYLLABLE SSANGKIYEOK WAE SIOS
+0x84C3	0xAF78	#HANGUL SYLLABLE SSANGKIYEOK WAE SSANGSIOS
+0x84C4	0xAF7A	#HANGUL SYLLABLE SSANGKIYEOK WAE CIEUC
+0x84C5	0xAF7B	#HANGUL SYLLABLE SSANGKIYEOK WAE CHIEUCH
+0x84C6	0xAF7C	#HANGUL SYLLABLE SSANGKIYEOK WAE KHIEUKH
+0x84C7	0xAF7D	#HANGUL SYLLABLE SSANGKIYEOK WAE THIEUTH
+0x84C8	0xAF7E	#HANGUL SYLLABLE SSANGKIYEOK WAE PHIEUPH
+0x84C9	0xAF7F	#HANGUL SYLLABLE SSANGKIYEOK WAE HIEUH
+0x84CA	0xAF81	#HANGUL SYLLABLE SSANGKIYEOK OE KIYEOK
+0x84CB	0xAF82	#HANGUL SYLLABLE SSANGKIYEOK OE SSANGKIYEOK
+0x84CC	0xAF83	#HANGUL SYLLABLE SSANGKIYEOK OE KIYEOKSIOS
+0x84CD	0xAF85	#HANGUL SYLLABLE SSANGKIYEOK OE NIEUNCIEUC
+0x84CE	0xAF86	#HANGUL SYLLABLE SSANGKIYEOK OE NIEUNHIEUH
+0x84CF	0xAF87	#HANGUL SYLLABLE SSANGKIYEOK OE TIKEUT
+0x84D0	0xAF89	#HANGUL SYLLABLE SSANGKIYEOK OE RIEULKIYEOK
+0x84D1	0xAF8A	#HANGUL SYLLABLE SSANGKIYEOK OE RIEULMIEUM
+0x84D2	0xAF8B	#HANGUL SYLLABLE SSANGKIYEOK OE RIEULPIEUP
+0x84D3	0xAF8C	#HANGUL SYLLABLE SSANGKIYEOK OE RIEULSIOS
+0x84D4	0xAF8D	#HANGUL SYLLABLE SSANGKIYEOK OE RIEULTHIEUTH
+0x84D5	0xAF8E	#HANGUL SYLLABLE SSANGKIYEOK OE RIEULPHIEUPH
+0x84D6	0xAF8F	#HANGUL SYLLABLE SSANGKIYEOK OE RIEULHIEUH
+0x84D7	0xAF92	#HANGUL SYLLABLE SSANGKIYEOK OE PIEUPSIOS
+0x84D8	0xAF93	#HANGUL SYLLABLE SSANGKIYEOK OE SIOS
+0x84D9	0xAF94	#HANGUL SYLLABLE SSANGKIYEOK OE SSANGSIOS
+0x84DA	0xAF96	#HANGUL SYLLABLE SSANGKIYEOK OE CIEUC
+0x84DB	0xAF97	#HANGUL SYLLABLE SSANGKIYEOK OE CHIEUCH
+0x84DC	0xAF98	#HANGUL SYLLABLE SSANGKIYEOK OE KHIEUKH
+0x84DD	0xAF99	#HANGUL SYLLABLE SSANGKIYEOK OE THIEUTH
+0x84DE	0xAF9A	#HANGUL SYLLABLE SSANGKIYEOK OE PHIEUPH
+0x84DF	0xAF9B	#HANGUL SYLLABLE SSANGKIYEOK OE HIEUH
+0x84E0	0xAF9D	#HANGUL SYLLABLE SSANGKIYEOK YO KIYEOK
+0x84E1	0xAF9E	#HANGUL SYLLABLE SSANGKIYEOK YO SSANGKIYEOK
+0x84E2	0xAF9F	#HANGUL SYLLABLE SSANGKIYEOK YO KIYEOKSIOS
+0x84E3	0xAFA0	#HANGUL SYLLABLE SSANGKIYEOK YO NIEUN
+0x84E4	0xAFA1	#HANGUL SYLLABLE SSANGKIYEOK YO NIEUNCIEUC
+0x84E5	0xAFA2	#HANGUL SYLLABLE SSANGKIYEOK YO NIEUNHIEUH
+0x84E6	0xAFA3	#HANGUL SYLLABLE SSANGKIYEOK YO TIKEUT
+0x84E7	0xAFA4	#HANGUL SYLLABLE SSANGKIYEOK YO RIEUL
+0x84E8	0xAFA5	#HANGUL SYLLABLE SSANGKIYEOK YO RIEULKIYEOK
+0x84E9	0xAFA6	#HANGUL SYLLABLE SSANGKIYEOK YO RIEULMIEUM
+0x84EA	0xAFA7	#HANGUL SYLLABLE SSANGKIYEOK YO RIEULPIEUP
+0x84EB	0xAFA8	#HANGUL SYLLABLE SSANGKIYEOK YO RIEULSIOS
+0x84EC	0xAFA9	#HANGUL SYLLABLE SSANGKIYEOK YO RIEULTHIEUTH
+0x84ED	0xAFAA	#HANGUL SYLLABLE SSANGKIYEOK YO RIEULPHIEUPH
+0x84EE	0xAFAB	#HANGUL SYLLABLE SSANGKIYEOK YO RIEULHIEUH
+0x84EF	0xAFAC	#HANGUL SYLLABLE SSANGKIYEOK YO MIEUM
+0x84F0	0xAFAD	#HANGUL SYLLABLE SSANGKIYEOK YO PIEUP
+0x84F1	0xAFAE	#HANGUL SYLLABLE SSANGKIYEOK YO PIEUPSIOS
+0x84F2	0xAFAF	#HANGUL SYLLABLE SSANGKIYEOK YO SIOS
+0x84F3	0xAFB0	#HANGUL SYLLABLE SSANGKIYEOK YO SSANGSIOS
+0x84F4	0xAFB1	#HANGUL SYLLABLE SSANGKIYEOK YO IEUNG
+0x84F5	0xAFB2	#HANGUL SYLLABLE SSANGKIYEOK YO CIEUC
+0x84F6	0xAFB3	#HANGUL SYLLABLE SSANGKIYEOK YO CHIEUCH
+0x84F7	0xAFB4	#HANGUL SYLLABLE SSANGKIYEOK YO KHIEUKH
+0x84F8	0xAFB5	#HANGUL SYLLABLE SSANGKIYEOK YO THIEUTH
+0x84F9	0xAFB6	#HANGUL SYLLABLE SSANGKIYEOK YO PHIEUPH
+0x84FA	0xAFB7	#HANGUL SYLLABLE SSANGKIYEOK YO HIEUH
+0x84FB	0xAFBA	#HANGUL SYLLABLE SSANGKIYEOK U SSANGKIYEOK
+0x84FC	0xAFBB	#HANGUL SYLLABLE SSANGKIYEOK U KIYEOKSIOS
+0x84FD	0xAFBD	#HANGUL SYLLABLE SSANGKIYEOK U NIEUNCIEUC
+0x84FE	0xAFBE	#HANGUL SYLLABLE SSANGKIYEOK U NIEUNHIEUH
+0x8541	0xAFBF	#HANGUL SYLLABLE SSANGKIYEOK U TIKEUT
+0x8542	0xAFC1	#HANGUL SYLLABLE SSANGKIYEOK U RIEULKIYEOK
+0x8543	0xAFC2	#HANGUL SYLLABLE SSANGKIYEOK U RIEULMIEUM
+0x8544	0xAFC3	#HANGUL SYLLABLE SSANGKIYEOK U RIEULPIEUP
+0x8545	0xAFC4	#HANGUL SYLLABLE SSANGKIYEOK U RIEULSIOS
+0x8546	0xAFC5	#HANGUL SYLLABLE SSANGKIYEOK U RIEULTHIEUTH
+0x8547	0xAFC6	#HANGUL SYLLABLE SSANGKIYEOK U RIEULPHIEUPH
+0x8548	0xAFCA	#HANGUL SYLLABLE SSANGKIYEOK U PIEUPSIOS
+0x8549	0xAFCC	#HANGUL SYLLABLE SSANGKIYEOK U SSANGSIOS
+0x854A	0xAFCF	#HANGUL SYLLABLE SSANGKIYEOK U CHIEUCH
+0x854B	0xAFD0	#HANGUL SYLLABLE SSANGKIYEOK U KHIEUKH

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-user@FreeBSD.ORG  Thu Aug  6 09:07:07 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 C1BF21065680;
	Thu,  6 Aug 2009 09:07:07 +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 B1E028FC14;
	Thu,  6 Aug 2009 09:07:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n76977jH049324;
	Thu, 6 Aug 2009 09:07:07 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n76977IO049322;
	Thu, 6 Aug 2009 09:07:07 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200908060907.n76977IO049322@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 6 Aug 2009 09:07:07 +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: r196082 - user/edwin/locale/tools/charmaps
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: Thu, 06 Aug 2009 09:07:08 -0000

Author: edwin
Date: Thu Aug  6 09:07:07 2009
New Revision: 196082
URL: http://svn.freebsd.org/changeset/base/196082

Log:
  add eucKR

Modified:
  user/edwin/locale/tools/charmaps/charmaps.txt

Modified: user/edwin/locale/tools/charmaps/charmaps.txt
==============================================================================
--- user/edwin/locale/tools/charmaps/charmaps.txt	Thu Aug  6 09:06:13 2009	(r196081)
+++ user/edwin/locale/tools/charmaps/charmaps.txt	Thu Aug  6 09:07:07 2009	(r196082)
@@ -7,9 +7,9 @@ IANA:		http://www.iana.org/assignments/c
 haible.de:	http://haible.de/bruno/charsets/conversion-tables/
 
 +	ARMSCII-8	haible.de: Armenian.html
-*	Big5		unicodeorg: OBSOLETE/EASTASIA/OTHER
++	Big5		unicodeorg: OBSOLETE/EASTASIA/OTHER
 ?	Big5HKSCS	haible.de: BIG5-HKSCS.html / 
-?	CP1131		haible.de: CP1131.html / aix-4.3.2/IBM-1131.TXT
++	CP1131		haible.de: CP1131.html / aix-4.3.2/IBM-1131.TXT
 +	CP1251		unicode.org: VENDORS/MICSFT/WINDOWS
 +	CP866		unicode.org: VENDORS/MICSFT/PC
 +	CP949		unicode.org: VENDORS/MICSFT/WINDOWS