You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/07/27 09:15:15 UTC

svn commit: r1366298 [7/8] - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/eclipse/ dev-tools/maven/ lucene/ lucene/analysis/common/ lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/ lucene/analysis/common/src/java/org...

Copied: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.jflex (from r1366269, lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.jflex?p2=lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.jflex&p1=lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex&r1=1366269&r2=1366298&rev=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.jflex Fri Jul 27 07:15:13 2012
@@ -1,4 +1,4 @@
-package org.apache.lucene.analysis.standard;
+package org.apache.lucene.analysis.standard.std36;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,38 +17,27 @@ package org.apache.lucene.analysis.stand
  * limitations under the License.
  */
 
+import org.apache.lucene.analysis.standard.StandardTokenizerInterface;
+import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 
 /**
- * This class implements Word Break rules from the Unicode Text Segmentation 
- * algorithm, as specified in 
- * <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a> 
- * URLs and email addresses are also tokenized according to the relevant RFCs.
- * <p/>
- * Tokens produced are of the following types:
- * <ul>
- *   <li>&lt;ALPHANUM&gt;: A sequence of alphabetic and numeric characters</li>
- *   <li>&lt;NUM&gt;: A number</li>
- *   <li>&lt;URL&gt;: A URL</li>
- *   <li>&lt;EMAIL&gt;: An email address</li>
- *   <li>&lt;SOUTHEAST_ASIAN&gt;: A sequence of characters from South and Southeast
- *       Asian languages, including Thai, Lao, Myanmar, and Khmer</li>
- *   <li>&lt;IDEOGRAPHIC&gt;: A single CJKV ideographic character</li>
- *   <li>&lt;HIRAGANA&gt;: A single hiragana character</li>
- * </ul>
+ * This class implements UAX29URLEmailTokenizer using Unicode 6.0.0.
+ * @deprecated This class is only for exact backwards compatibility
  */
+@Deprecated
 %%
 
 %unicode 6.0
 %integer
 %final
 %public
-%class UAX29URLEmailTokenizerImpl
+%class UAX29URLEmailTokenizerImpl36
 %implements StandardTokenizerInterface
 %function getNextToken
 %char
 
-%include src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro
+%include src/java/org/apache/lucene/analysis/standard/std36/SUPPLEMENTARY.jflex-macro
 ALetter = ([\p{WB:ALetter}] | {ALetterSupp})
 Format =  ([\p{WB:Format}] | {FormatSupp})
 Numeric = ([\p{WB:Numeric}] | {NumericSupp})
@@ -88,7 +77,7 @@ HiraganaEx = {Hiragana} ({Format} | {Ext
 //     RFC-5321: Simple Mail Transfer Protocol
 //     RFC-5322: Internet Message Format
 
-%include src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
+%include src/java/org/apache/lucene/analysis/standard/std36/ASCIITLD.jflex-macro
 
 DomainLabel = [A-Za-z0-9] ([-A-Za-z0-9]* [A-Za-z0-9])?
 DomainNameStrict = {DomainLabel} ("." {DomainLabel})* {ASCIITLD}

Copied: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/package.html (from r1366269, lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package.html)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/package.html?p2=lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/package.html&p1=lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package.html&r1=1366269&r2=1366298&rev=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package.html (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/package.html Fri Jul 27 07:15:13 2012
@@ -15,55 +15,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
+<html><head></head>
 <body>
-<p>
-Fast, general-purpose grammar-based tokenizers.
-</p>
-<p>The <code>org.apache.lucene.analysis.standard</code> package contains three
-    fast grammar-based tokenizers constructed with JFlex:</p>
-<ul>
-    <li>{@link org.apache.lucene.analysis.standard.StandardTokenizer}:
-        as of Lucene 3.1, implements the Word Break rules from the Unicode Text 
-        Segmentation algorithm, as specified in 
-        <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>.
-        Unlike <code>UAX29URLEmailTokenizer</code>, URLs and email addresses are
-        <b>not</b> tokenized as single tokens, but are instead split up into 
-        tokens according to the UAX#29 word break rules.
-        <br/>
-        {@link org.apache.lucene.analysis.standard.StandardAnalyzer StandardAnalyzer} includes
-        {@link org.apache.lucene.analysis.standard.StandardTokenizer StandardTokenizer},
-        {@link org.apache.lucene.analysis.standard.StandardFilter StandardFilter}, 
-        {@link org.apache.lucene.analysis.core.LowerCaseFilter LowerCaseFilter}
-        and {@link org.apache.lucene.analysis.core.StopFilter StopFilter}.
-        When the <code>Version</code> specified in the constructor is lower than 
-        3.1, the {@link org.apache.lucene.analysis.standard.ClassicTokenizer ClassicTokenizer}
-        implementation is invoked.</li>
-    <li>{@link org.apache.lucene.analysis.standard.ClassicTokenizer ClassicTokenizer}:
-        this class was formerly (prior to Lucene 3.1) named 
-        <code>StandardTokenizer</code>.  (Its tokenization rules are not
-        based on the Unicode Text Segmentation algorithm.)
-        {@link org.apache.lucene.analysis.standard.ClassicAnalyzer ClassicAnalyzer} includes
-        {@link org.apache.lucene.analysis.standard.ClassicTokenizer ClassicTokenizer},
-        {@link org.apache.lucene.analysis.standard.StandardFilter StandardFilter}, 
-        {@link org.apache.lucene.analysis.core.LowerCaseFilter LowerCaseFilter}
-        and {@link org.apache.lucene.analysis.core.StopFilter StopFilter}.
-    </li>
-    <li>{@link org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer UAX29URLEmailTokenizer}:
-        implements the Word Break rules from the Unicode Text Segmentation
-        algorithm, as specified in 
-        <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>.
-        URLs and email addresses are also tokenized according to the relevant RFCs.
-        <br/>
-        {@link org.apache.lucene.analysis.standard.UAX29URLEmailAnalyzer UAX29URLEmailAnalyzer} includes
-        {@link org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer UAX29URLEmailTokenizer},
-        {@link org.apache.lucene.analysis.standard.StandardFilter StandardFilter},
-        {@link org.apache.lucene.analysis.core.LowerCaseFilter LowerCaseFilter}
-        and {@link org.apache.lucene.analysis.core.StopFilter StopFilter}.
-    </li>
-</ul>
+Backwards-compatible implementation to match {@link org.apache.lucene.util.Version#LUCENE_36}
 </body>
 </html>

Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java Fri Jul 27 07:15:13 2012
@@ -202,7 +202,7 @@ public class TestStandardAnalyzer extend
   }
   
   public void testUnicodeWordBreaks() throws Exception {
-    WordBreakTestUnicode_6_0_0 wordBreakTest = new WordBreakTestUnicode_6_0_0();
+    WordBreakTestUnicode_6_1_0 wordBreakTest = new WordBreakTestUnicode_6_1_0();
     wordBreakTest.test(a);
   }
   

Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java Fri Jul 27 07:15:13 2012
@@ -424,7 +424,7 @@ public class TestUAX29URLEmailTokenizer 
   }
 
   public void testUnicodeWordBreaks() throws Exception {
-    WordBreakTestUnicode_6_0_0 wordBreakTest = new WordBreakTestUnicode_6_0_0();
+    WordBreakTestUnicode_6_1_0 wordBreakTest = new WordBreakTestUnicode_6_1_0();
     wordBreakTest.test(a);
   }
   

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/build.xml?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/build.xml Fri Jul 27 07:15:13 2012
@@ -26,7 +26,7 @@
   <import file="../analysis-module-build.xml"/>
 
   <path id="icujar">
-     <pathelement location="lib/icu4j-4.8.1.1.jar"/>
+     <pathelement location="lib/icu4j-49.1.jar"/>
   </path>
 
   <path id="classpath">
@@ -37,19 +37,32 @@
 
   <target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
 
-  <property name="gennorm2.src.dir" value="src/data/utr30"/>
-  <property name="gennorm2.src.files" 
-  	value="nfkc.txt nfkc_cf.txt BasicFoldings.txt DiacriticFolding.txt DingbatFolding.txt HanRadicalFolding.txt NativeDigitFolding.txt"/>
+  <property name="utr30.data.dir" location="src/data/utr30"/>
+  <target name="gen-utr30-data-files" depends="compile-tools">
+    <java
+        classname="org.apache.lucene.analysis.icu.GenerateUTR30DataFiles"
+        dir="${utr30.data.dir}"
+        fork="true"
+        failonerror="true">
+      <classpath>
+        <path refid="icujar"/>
+        <pathelement location="${build.dir}/classes/tools"/>
+      </classpath>
+    </java>
+  </target>
+
+  <property name="gennorm2.src.files"
+  	value="nfc.txt nfkc.txt nfkc_cf.txt BasicFoldings.txt DiacriticFolding.txt DingbatFolding.txt HanRadicalFolding.txt NativeDigitFolding.txt"/>
   <property name="gennorm2.tmp" value="${build.dir}/gennorm2/utr30.tmp"/>
   <property name="gennorm2.dst" value="src/resources/org/apache/lucene/analysis/icu/utr30.nrm"/>
-  <target name="gennorm2">
+  <target name="gennorm2" depends="gen-utr30-data-files">
     <echo>Note that the gennorm2 and icupkg tools must be on your PATH. These tools
 are part of the ICU4C package. See http://site.icu-project.org/ </echo>
     <mkdir dir="${build.dir}/gennorm2"/>
     <exec executable="gennorm2" failonerror="true">
       <arg value="-v"/>
       <arg value="-s"/>
-      <arg value="${gennorm2.src.dir}"/>
+      <arg value="${utr30.data.dir}"/>
       <arg line="${gennorm2.src.files}"/>
       <arg value="-o"/>
       <arg value="${gennorm2.tmp}"/>

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml Fri Jul 27 07:15:13 2012
@@ -19,7 +19,7 @@
 <ivy-module version="2.0">
     <info organisation="org.apache.lucene" module="analyzers-icu"/>
     <dependencies>
-      <dependency org="com.ibm.icu" name="icu4j" rev="4.8.1.1" transitive="false"/>
+      <dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>
 </ivy-module>

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt Fri Jul 27 07:15:13 2012
@@ -2,7 +2,7 @@ ICU License - ICU 1.8.1 and later
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1995-2008 International Business Machines Corporation and others
+Copyright (c) 1995-2012 International Business Machines Corporation and others
 
 All rights reserved.
 

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-NOTICE.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-NOTICE.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-NOTICE.txt Fri Jul 27 07:15:13 2012
@@ -1,3 +1,3 @@
-ICU4J, (under modules/analysis/icu) is licensed under an MIT style license
-(modules/analysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt) and Copyright (c) 1995-2011
+ICU4J, (under lucene/analysis/icu) is licensed under an MIT style license
+(modules/analysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt) and Copyright (c) 1995-2012
 International Business Machines Corporation and others
\ No newline at end of file

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt Fri Jul 27 07:15:13 2012
@@ -20,67 +20,96 @@
 
 ### Custom Normalization mappings for UTR#30 
 ### (http://www.unicode.org/reports/tr30/tr30-4.html)
-###
-### Created from Unicode 5.2 UCD
-###
+
+#### WARNING ####
+#### Rule: lines direct content generation.
+#### All non-comments will be REMOVED when this file's contents
+#### are generated by 'ant gen-utr30-data-files'.
+#### Use "# Rule: verbatim" to keep non-comments up until
+#### the next "# Rule:" line.
+#### WARNING ####
 
 ## Accent removal
 # See DiacriticFolding.txt
+
 ## Case Folding (done by cf)
+
 ## Canonical Duplicates Folding (done by cd)
+
 ## Dashes folding
-# [[:Dash:][:Pd:]]-2053(swung dash) > U+002D
+# Rule: [[[[:Dash:][:Pd:]]-[\u2053\uFE31\uFE32]] - [\u002D]] > 002D
 058A>002D
 05BE>002D
 1400>002D
 1806>002D
 2010..2015>002D
+207B>002D
+208B>002D
+2212>002D
 2E17>002D
 2E1A>002D
+2E3A..2E3B>002D
 301C>002D
 3030>002D
 30A0>002D
-#2053>002D
-2212>002D
-# FE31,FE32,FE58,FE63,FF0D done by kd
+FE58>002D
+FE63>002D
+FF0D>002D
 
 ## Greek letterforms folding (done by kd)
+
 ## Hebrew alternates folding (done by kd)
+
 ## Jamo folding (done by kd)
+
 ## Math symbol folding (done by kd)
+
 ## Native digit folding
 # See NativeDigitFolding.txt
+
 ## Nobreak folding (done by kd)
-## Overline Folding
-FE49..FE4C>203E
+
+## Overline Folding (done by kd)
+
 ## Positional forms folding (done by kd)
+
 ## Small forms folding (done by kd)
+
 ## Space Folding
-# [:Zs:] > U+0020
+# Rule: [[:Zs:] - [:Changes_When_NFKC_Casefolded=Yes:] - [\u0020]] > 0020
 1680>0020
 180E>0020
-# 00A0, 2000..200A,202F,205F,3000 done by kd
+
 ## Spacing Accents folding (done by kd)
+
 ## Subscript folding (done by kd)
+
 ## Symbol folding (done by kd)
+
 ## Underline Folding
+# Rule: verbatim
 2017>005E
 FE4D..FE4F>005E
+
 ## Diacritic Folding
-#
+# See DiacriticFolding.txt
 
 ## Vertical forms folding (done by kd)
+
 ## Han Radical Folding
 # See HanRadicalFolding.txt
+
 ## Letter Form Folding (done by kd)
 ## Superscript folding
 # Additions to kd:
+# Rule: verbatim
 02C0>0294
 02C1>0295
 06E5>0648
 06E6>064A
 ## Suzhou Numeral Folding
 # Additions to kd:
+# Rule: verbatim
 3021>4E00
 3022>4E8C
 3023>4E09
@@ -92,6 +121,7 @@ FE4D..FE4F>005E
 3029>4E5D
 ## Width Folding (done by kd)
 # Punctuation Folding
+# Rule: verbatim
 00AB>0022
 00BB>0022
 201C..201E>0022

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt Fri Jul 27 07:15:13 2012
@@ -24,41 +24,45 @@
 ### Created from Unicode 5.2 UCD
 ###
 
-# Removes diacritics, as defined by [:Diacritic:]
-# These may or may not be combining marks
+#### WARNING ####
+#### Rule: lines direct content generation.
+#### All non-comments will be REMOVED when this file's contents
+#### are generated by 'ant gen-utr30-data-files'.
+#### Use "# Rule: verbatim" to keep non-comments up until
+#### the next "# Rule:" line.
+#### WARNING ####
+
+## Remove diacritics
+# Rule: [:Diacritic:] >
 005E>
 0060>
-00B7>
-02B9..02D7>
-02DE>
-02DF>
-02E5..033F>
-0342>
-0346..034E>
+00A8>
+00AF>
+00B4>
+00B7..00B8>
+02B0..034E>
 0350..0357>
 035D..0362>
-0375>
+0374..0375>
+037A>
+0384..0385>
 0483..0487>
 0559>
 0591..05A1>
 05A3..05BD>
 05BF>
-05C1>
-05C2>
+05C1..05C2>
 05C4>
 064B..0652>
-0657>
-0658>
-06DF>
-06E0>
-06E5>
-06E6>
+0657..0658>
+06DF..06E0>
+06E5..06E6>
 06EA..06EC>
 0730..074A>
 07A6..07B0>
 07EB..07F5>
-0818>
-0819>
+0818..0819>
+08E4..08FE>
 093C>
 094D>
 0951..0954>
@@ -80,24 +84,19 @@
 0E47..0E4C>
 0E4E>
 0EC8..0ECC>
-0F18>
-0F19>
+0F18..0F19>
 0F35>
 0F37>
 0F39>
-0F3E>
-0F3F>
+0F3E..0F3F>
 0F82..0F84>
-0F86>
-0F87>
+0F86..0F87>
 0FC6>
 1037>
-1039>
-103A>
+1039..103A>
 1087..108D>
 108F>
-109A>
-109B>
+109A..109B>
 17C9..17D3>
 17DD>
 1939..193B>
@@ -106,31 +105,33 @@
 1B34>
 1B44>
 1B6B..1B73>
-1BAA>
-1C36>
-1C37>
+1BAA..1BAB>
+1C36..1C37>
 1C78..1C7D>
 1CD0..1CE8>
 1CED>
-1D2F>
-1D3B>
-1D4E>
+1CF4>
+1D2C..1D6A>
 1DC4..1DCF>
 1DFD..1DFF>
+1FBD>
+1FBF..1FC1>
+1FCD..1FCF>
+1FDD..1FDF>
+1FED..1FEF>
+1FFD..1FFE>
 2CEF..2CF1>
 2E2F>
 302A..302F>
-3099>
-309A>
+3099..309C>
 30FC>
 A66F>
-A67C>
-A67D>
+A67C..A67D>
 A67F>
-A6F0>
-A6F1>
+A6F0..A6F1>
 A717..A721>
 A788>
+A7F8..A7F9>
 A8C4>
 A8E0..A8F1>
 A92B..A92E>
@@ -139,12 +140,20 @@ A9B3>
 A9C0>
 AA7B>
 AABF..AAC2>
-ABEC>
-ABED>
+AAF6>
+ABEC..ABED>
 FB1E>
 FE20..FE26>
-110B9>
-110BA>
+FF3E>
+FF40>
+FF70>
+FF9E..FF9F>
+FFE3>
+110B9..110BA>
+11133..11134>
+111C0>
+116B6..116B7>
+16F8F..16F9F>
 1D167..1D169>
 1D16D..1D172>
 1D17B..1D182>
@@ -153,6 +162,7 @@ FE20..FE26>
 
 # Latin script "composed" that do not further decompose, so decompose here
 # These are from AsciiFoldingFilter
+# Rule: verbatim
 00E6>0061 0065
 00F0>0064
 00F8>006F
@@ -491,6 +501,7 @@ A7FF>004D
 
 # Cyrillic script "composed" that do not further decompose, so decompose here
 # These are from UTR#30 DiacriticFolding.txt
+# Rule: verbatim
 
 047D>0461
 048B>0439
@@ -520,6 +531,7 @@ A7FF>004D
 04CE>043C
 
 # Additional signs and diacritic, from examination of [:Mark:]&[:Lm:]
+# Rule: verbatim
 0358..035C>
 05A2>
 05C5>
@@ -555,6 +567,7 @@ A802>
 1D242..1D244>
 
 # Additional Arabic/Hebrew decompositions
+# Rule: verbatim
 05F3>0027
 05F4>0022
 0629>0647

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DingbatFolding.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DingbatFolding.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DingbatFolding.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DingbatFolding.txt Fri Jul 27 07:15:13 2012
@@ -24,8 +24,17 @@
 ### Created from Unicode 5.2 UCD
 ###
 
+#### WARNING ####
+#### Rule: lines direct content generation.
+#### All non-comments will be REMOVED when this file's contents
+#### are generated by 'ant gen-utr30-data-files'.
+#### Use "# Rule: verbatim" to keep non-comments up until
+#### the next "# Rule:" line.
+#### WARNING ####
+
 # Folds dingbats and other adorned forms
 # Generated from ASCIIFoldingFilter
+# Rule: verbatim
 24EB>0031 0031
 24EC>0031 0032
 24ED>0031 0033

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/HanRadicalFolding.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/HanRadicalFolding.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/HanRadicalFolding.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/HanRadicalFolding.txt Fri Jul 27 07:15:13 2012
@@ -24,6 +24,16 @@
 ### Created from UTR#30 HanRadicalFolding.txt
 ###
 
+#### WARNING ####
+#### Rule: lines direct content generation.
+#### All non-comments will be REMOVED when this file's contents
+#### are generated by 'ant gen-utr30-data-files'.
+#### Use "# Rule: verbatim" to keep non-comments up until
+#### the next "# Rule:" line.
+#### WARNING ####
+
+# Rule: verbatim
+
 # CJK Radicals
 2E81>5382
 2E82>4E5B

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt Fri Jul 27 07:15:13 2012
@@ -1,7 +1,7 @@
-# Copyright 2001-2010 Unicode, Inc.
-# 
+# Copyright 2001-2012 Unicode, Inc.
+#
 # Disclaimer
-# 
+#
 # This source code is provided as is by Unicode, Inc. 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
@@ -9,463 +9,485 @@
 # purchased on magnetic or optical media from Unicode, Inc., the
 # sole remedy for any claim will be exchange of defective media
 # within 90 days of receipt.
-# 
+#
 # Limitations on Rights to Redistribute This Code
-# 
+#
 # 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.
 
-### Custom Normalization mappings for UTR#30 
+### Custom Normalization mappings for UTR#30
 ### (http://www.unicode.org/reports/tr30/tr30-4.html)
-###
-### Created from Unicode 5.2 UCD
-###
+
+#### WARNING ####
+#### Rule: lines direct content generation.
+#### All non-comments will be REMOVED when this file's contents
+#### are generated by 'ant gen-utr30-data-files'.
+#### Use "# Rule: verbatim" to keep non-comments up until
+#### the next "# Rule:" line.
+#### WARNING ####
 
 ## Native digit folding
-# [:Nd:] > Ascii digit equivalent
-# Arabic-Indic
-0660>0030
-0661>0031
-0662>0032
-0663>0033
-0664>0034
-0665>0035
-0666>0036
-0667>0037
-0668>0038
-0669>0039
-# Eastern Arabic-Indic
-06F0>0030
-06F1>0031
-06F2>0032
-06F3>0033
-06F4>0034
-06F5>0035
-06F6>0036
-06F7>0037
-06F8>0038
-06F9>0039
-# NKo
-07C0>0030
-07C1>0031
-07C2>0032
-07C3>0033
-07C4>0034
-07C5>0035
-07C6>0036
-07C7>0037
-07C8>0038
-07C9>0039
-# Devanagari
-0966>0030
-0967>0031
-0968>0032
-0969>0033
-096A>0034
-096B>0035
-096C>0036
-096D>0037
-096E>0038
-096F>0039
-# Bengali
-09E6>0030
-09E7>0031
-09E8>0032
-09E9>0033
-09EA>0034
-09EB>0035
-09EC>0036
-09ED>0037
-09EE>0038
-09EF>0039
-# Gurmukhi
-0A66>0030
-0A67>0031
-0A68>0032
-0A69>0033
-0A6A>0034
-0A6B>0035
-0A6C>0036
-0A6D>0037
-0A6E>0038
-0A6F>0039
-# Gujarati
-0AE6>0030
-0AE7>0031
-0AE8>0032
-0AE9>0033
-0AEA>0034
-0AEB>0035
-0AEC>0036
-0AED>0037
-0AEE>0038
-0AEF>0039
-# Oriya
-0B66>0030
-0B67>0031
-0B68>0032
-0B69>0033
-0B6A>0034
-0B6B>0035
-0B6C>0036
-0B6D>0037
-0B6E>0038
-0B6F>0039
-# Tamil
-0BE6>0030
-0BE7>0031
-0BE8>0032
-0BE9>0033
-0BEA>0034
-0BEB>0035
-0BEC>0036
-0BED>0037
-0BEE>0038
-0BEF>0039
-# Telugu
-0C66>0030
-0C67>0031
-0C68>0032
-0C69>0033
-0C6A>0034
-0C6B>0035
-0C6C>0036
-0C6D>0037
-0C6E>0038
-0C6F>0039
-# Kannada
-0CE6>0030
-0CE7>0031
-0CE8>0032
-0CE9>0033
-0CEA>0034
-0CEB>0035
-0CEC>0036
-0CED>0037
-0CEE>0038
-0CEF>0039
-# Malayalam
-0D66>0030
-0D67>0031
-0D68>0032
-0D69>0033
-0D6A>0034
-0D6B>0035
-0D6C>0036
-0D6D>0037
-0D6E>0038
-0D6F>0039
-# Thai
-0E50>0030
-0E51>0031
-0E52>0032
-0E53>0033
-0E54>0034
-0E55>0035
-0E56>0036
-0E57>0037
-0E58>0038
-0E59>0039
-# Lao
-0ED0>0030
-0ED1>0031
-0ED2>0032
-0ED3>0033
-0ED4>0034
-0ED5>0035
-0ED6>0036
-0ED7>0037
-0ED8>0038
-0ED9>0039
-# Tibetan
-0F20>0030
-0F21>0031
-0F22>0032
-0F23>0033
-0F24>0034
-0F25>0035
-0F26>0036
-0F27>0037
-0F28>0038
-0F29>0039
-# Myanmar
-1040>0030
-1041>0031
-1042>0032
-1043>0033
-1044>0034
-1045>0035
-1046>0036
-1047>0037
-1048>0038
-1049>0039
-# Myanmar Shan
-1090>0030
-1091>0031
-1092>0032
-1093>0033
-1094>0034
-1095>0035
-1096>0036
-1097>0037
-1098>0038
-1099>0039
-# Khmer
-17E0>0030
-17E1>0031
-17E2>0032
-17E3>0033
-17E4>0034
-17E5>0035
-17E6>0036
-17E7>0037
-17E8>0038
-17E9>0039
-# Mongolian
-1810>0030
-1811>0031
-1812>0032
-1813>0033
-1814>0034
-1815>0035
-1816>0036
-1817>0037
-1818>0038
-1819>0039
-# Limbu
-1946>0030
-1947>0031
-1948>0032
-1949>0033
-194A>0034
-194B>0035
-194C>0036
-194D>0037
-194E>0038
-194F>0039
-# New Tai Lue
-19D0>0030
-19D1>0031
-19D2>0032
-19D3>0033
-19D4>0034
-19D5>0035
-19D6>0036
-19D7>0037
-19D8>0038
-19D9>0039
-# New Tai Lue Tham Digit One
-19DA>0031
-# Tai Tham Hora
-1A80>0030
-1A81>0031
-1A82>0032
-1A83>0033
-1A84>0034
-1A85>0035
-1A86>0036
-1A87>0037
-1A88>0038
-1A89>0039
-# Tai Tham Tham
-1A90>0030
-1A91>0031
-1A92>0032
-1A93>0033
-1A94>0034
-1A95>0035
-1A96>0036
-1A97>0037
-1A98>0038
-1A99>0039
-# Balinese
-1B50>0030
-1B51>0031
-1B52>0032
-1B53>0033
-1B54>0034
-1B55>0035
-1B56>0036
-1B57>0037
-1B58>0038
-1B59>0039
-# Sundanese
-1BB0>0030
-1BB1>0031
-1BB2>0032
-1BB3>0033
-1BB4>0034
-1BB5>0035
-1BB6>0036
-1BB7>0037
-1BB8>0038
-1BB9>0039
-# Lepcha
-1C40>0030
-1C41>0031
-1C42>0032
-1C43>0033
-1C44>0034
-1C45>0035
-1C46>0036
-1C47>0037
-1C48>0038
-1C49>0039
-# Ol Chiki
-1C50>0030
-1C51>0031
-1C52>0032
-1C53>0033
-1C54>0034
-1C55>0035
-1C56>0036
-1C57>0037
-1C58>0038
-1C59>0039
-# Vai
-A620>0030
-A621>0031
-A622>0032
-A623>0033
-A624>0034
-A625>0035
-A626>0036
-A627>0037
-A628>0038
-A629>0039
-# Saurashtra
-A8D0>0030
-A8D1>0031
-A8D2>0032
-A8D3>0033
-A8D4>0034
-A8D5>0035
-A8D6>0036
-A8D7>0037
-A8D8>0038
-A8D9>0039
-# Kayah Li
-A900>0030
-A901>0031
-A902>0032
-A903>0033
-A904>0034
-A905>0035
-A906>0036
-A907>0037
-A908>0038
-A909>0039
-# Javanese
-A9D0>0030
-A9D1>0031
-A9D2>0032
-A9D3>0033
-A9D4>0034
-A9D5>0035
-A9D6>0036
-A9D7>0037
-A9D8>0038
-A9D9>0039
-# Cham
-AA50>0030
-AA51>0031
-AA52>0032
-AA53>0033
-AA54>0034
-AA55>0035
-AA56>0036
-AA57>0037
-AA58>0038
-AA59>0039
-# Meetei Mayek
-ABF0>0030
-ABF1>0031
-ABF2>0032
-ABF3>0033
-ABF4>0034
-ABF5>0035
-ABF6>0036
-ABF7>0037
-ABF8>0038
-ABF9>0039
-# Halfwidth and Fullwidth Forms (done by kd)
-# Osmanya
-104A0>0030
-104A1>0031
-104A2>0032
-104A3>0033
-104A4>0034
-104A5>0035
-104A6>0036
-104A7>0037
-104A8>0038
-104A9>0039
-# Brahmi
-11066>0030
-11067>0031
-11068>0032
-11069>0033
-1106A>0034
-1106B>0035
-1106C>0036
-1106D>0037
-1106E>0038
-1106F>0039
-# Mathematical Alphanumeric Symbols - Bold digits
-1D7CE>0030
-1D7CF>0031
-1D7D0>0032
-1D7D1>0033
-1D7D2>0034
-1D7D3>0035
-1D7D4>0036
-1D7D5>0037
-1D7D6>0038
-1D7D7>0039
-# Mathematical Alphanumeric Symbols - Double-struck digits
-1D7D8>0030
-1D7D9>0031
-1D7DA>0032
-1D7DB>0033
-1D7DC>0034
-1D7DD>0035
-1D7DE>0036
-1D7DF>0037
-1D7E0>0038
-1D7E1>0039
-# Mathematical Alphanumeric Symbols - Sans-serif digits
-1D7E2>0030
-1D7E3>0031
-1D7E4>0032
-1D7E5>0033
-1D7E6>0034
-1D7E7>0035
-1D7E8>0036
-1D7E9>0037
-1D7EA>0038
-1D7EB>0039
-# Mathematical Alphanumeric Symbols - Sans-serif bold digits
-1D7EC>0030
-1D7ED>0031
-1D7EE>0032
-1D7EF>0033
-1D7F0>0034
-1D7F1>0035
-1D7F2>0036
-1D7F3>0037
-1D7F4>0038
-1D7F5>0039
-# Mathematical Alphanumeric Symbols - Monospace digits
-1D7F6>0030
-1D7F7>0031
-1D7F8>0032
-1D7F9>0033
-1D7FA>0034
-1D7FB>0035
-1D7FC>0036
-1D7FD>0037
-1D7FE>0038
-1D7FF>0039
+# Rule: [[[:Numeric_Type=Digit:][:Nd:]] - [[:Changes_When_NFKC_Casefolded=Yes:][:Block=Superscripts_And_Subscripts:][\u00B2\u00B3\u00B9][\u0030-\u0039]]] > Numeric_Value
+0660>0030   # ARABIC-INDIC DIGIT ZERO
+0661>0031   # ARABIC-INDIC DIGIT ONE
+0662>0032   # ARABIC-INDIC DIGIT TWO
+0663>0033   # ARABIC-INDIC DIGIT THREE
+0664>0034   # ARABIC-INDIC DIGIT FOUR
+0665>0035   # ARABIC-INDIC DIGIT FIVE
+0666>0036   # ARABIC-INDIC DIGIT SIX
+0667>0037   # ARABIC-INDIC DIGIT SEVEN
+0668>0038   # ARABIC-INDIC DIGIT EIGHT
+0669>0039   # ARABIC-INDIC DIGIT NINE
+06F0>0030   # EXTENDED ARABIC-INDIC DIGIT ZERO
+06F1>0031   # EXTENDED ARABIC-INDIC DIGIT ONE
+06F2>0032   # EXTENDED ARABIC-INDIC DIGIT TWO
+06F3>0033   # EXTENDED ARABIC-INDIC DIGIT THREE
+06F4>0034   # EXTENDED ARABIC-INDIC DIGIT FOUR
+06F5>0035   # EXTENDED ARABIC-INDIC DIGIT FIVE
+06F6>0036   # EXTENDED ARABIC-INDIC DIGIT SIX
+06F7>0037   # EXTENDED ARABIC-INDIC DIGIT SEVEN
+06F8>0038   # EXTENDED ARABIC-INDIC DIGIT EIGHT
+06F9>0039   # EXTENDED ARABIC-INDIC DIGIT NINE
+07C0>0030   # NKO DIGIT ZERO
+07C1>0031   # NKO DIGIT ONE
+07C2>0032   # NKO DIGIT TWO
+07C3>0033   # NKO DIGIT THREE
+07C4>0034   # NKO DIGIT FOUR
+07C5>0035   # NKO DIGIT FIVE
+07C6>0036   # NKO DIGIT SIX
+07C7>0037   # NKO DIGIT SEVEN
+07C8>0038   # NKO DIGIT EIGHT
+07C9>0039   # NKO DIGIT NINE
+0966>0030   # DEVANAGARI DIGIT ZERO
+0967>0031   # DEVANAGARI DIGIT ONE
+0968>0032   # DEVANAGARI DIGIT TWO
+0969>0033   # DEVANAGARI DIGIT THREE
+096A>0034   # DEVANAGARI DIGIT FOUR
+096B>0035   # DEVANAGARI DIGIT FIVE
+096C>0036   # DEVANAGARI DIGIT SIX
+096D>0037   # DEVANAGARI DIGIT SEVEN
+096E>0038   # DEVANAGARI DIGIT EIGHT
+096F>0039   # DEVANAGARI DIGIT NINE
+09E6>0030   # BENGALI DIGIT ZERO
+09E7>0031   # BENGALI DIGIT ONE
+09E8>0032   # BENGALI DIGIT TWO
+09E9>0033   # BENGALI DIGIT THREE
+09EA>0034   # BENGALI DIGIT FOUR
+09EB>0035   # BENGALI DIGIT FIVE
+09EC>0036   # BENGALI DIGIT SIX
+09ED>0037   # BENGALI DIGIT SEVEN
+09EE>0038   # BENGALI DIGIT EIGHT
+09EF>0039   # BENGALI DIGIT NINE
+0A66>0030   # GURMUKHI DIGIT ZERO
+0A67>0031   # GURMUKHI DIGIT ONE
+0A68>0032   # GURMUKHI DIGIT TWO
+0A69>0033   # GURMUKHI DIGIT THREE
+0A6A>0034   # GURMUKHI DIGIT FOUR
+0A6B>0035   # GURMUKHI DIGIT FIVE
+0A6C>0036   # GURMUKHI DIGIT SIX
+0A6D>0037   # GURMUKHI DIGIT SEVEN
+0A6E>0038   # GURMUKHI DIGIT EIGHT
+0A6F>0039   # GURMUKHI DIGIT NINE
+0AE6>0030   # GUJARATI DIGIT ZERO
+0AE7>0031   # GUJARATI DIGIT ONE
+0AE8>0032   # GUJARATI DIGIT TWO
+0AE9>0033   # GUJARATI DIGIT THREE
+0AEA>0034   # GUJARATI DIGIT FOUR
+0AEB>0035   # GUJARATI DIGIT FIVE
+0AEC>0036   # GUJARATI DIGIT SIX
+0AED>0037   # GUJARATI DIGIT SEVEN
+0AEE>0038   # GUJARATI DIGIT EIGHT
+0AEF>0039   # GUJARATI DIGIT NINE
+0B66>0030   # ORIYA DIGIT ZERO
+0B67>0031   # ORIYA DIGIT ONE
+0B68>0032   # ORIYA DIGIT TWO
+0B69>0033   # ORIYA DIGIT THREE
+0B6A>0034   # ORIYA DIGIT FOUR
+0B6B>0035   # ORIYA DIGIT FIVE
+0B6C>0036   # ORIYA DIGIT SIX
+0B6D>0037   # ORIYA DIGIT SEVEN
+0B6E>0038   # ORIYA DIGIT EIGHT
+0B6F>0039   # ORIYA DIGIT NINE
+0BE6>0030   # TAMIL DIGIT ZERO
+0BE7>0031   # TAMIL DIGIT ONE
+0BE8>0032   # TAMIL DIGIT TWO
+0BE9>0033   # TAMIL DIGIT THREE
+0BEA>0034   # TAMIL DIGIT FOUR
+0BEB>0035   # TAMIL DIGIT FIVE
+0BEC>0036   # TAMIL DIGIT SIX
+0BED>0037   # TAMIL DIGIT SEVEN
+0BEE>0038   # TAMIL DIGIT EIGHT
+0BEF>0039   # TAMIL DIGIT NINE
+0C66>0030   # TELUGU DIGIT ZERO
+0C67>0031   # TELUGU DIGIT ONE
+0C68>0032   # TELUGU DIGIT TWO
+0C69>0033   # TELUGU DIGIT THREE
+0C6A>0034   # TELUGU DIGIT FOUR
+0C6B>0035   # TELUGU DIGIT FIVE
+0C6C>0036   # TELUGU DIGIT SIX
+0C6D>0037   # TELUGU DIGIT SEVEN
+0C6E>0038   # TELUGU DIGIT EIGHT
+0C6F>0039   # TELUGU DIGIT NINE
+0CE6>0030   # KANNADA DIGIT ZERO
+0CE7>0031   # KANNADA DIGIT ONE
+0CE8>0032   # KANNADA DIGIT TWO
+0CE9>0033   # KANNADA DIGIT THREE
+0CEA>0034   # KANNADA DIGIT FOUR
+0CEB>0035   # KANNADA DIGIT FIVE
+0CEC>0036   # KANNADA DIGIT SIX
+0CED>0037   # KANNADA DIGIT SEVEN
+0CEE>0038   # KANNADA DIGIT EIGHT
+0CEF>0039   # KANNADA DIGIT NINE
+0D66>0030   # MALAYALAM DIGIT ZERO
+0D67>0031   # MALAYALAM DIGIT ONE
+0D68>0032   # MALAYALAM DIGIT TWO
+0D69>0033   # MALAYALAM DIGIT THREE
+0D6A>0034   # MALAYALAM DIGIT FOUR
+0D6B>0035   # MALAYALAM DIGIT FIVE
+0D6C>0036   # MALAYALAM DIGIT SIX
+0D6D>0037   # MALAYALAM DIGIT SEVEN
+0D6E>0038   # MALAYALAM DIGIT EIGHT
+0D6F>0039   # MALAYALAM DIGIT NINE
+0E50>0030   # THAI DIGIT ZERO
+0E51>0031   # THAI DIGIT ONE
+0E52>0032   # THAI DIGIT TWO
+0E53>0033   # THAI DIGIT THREE
+0E54>0034   # THAI DIGIT FOUR
+0E55>0035   # THAI DIGIT FIVE
+0E56>0036   # THAI DIGIT SIX
+0E57>0037   # THAI DIGIT SEVEN
+0E58>0038   # THAI DIGIT EIGHT
+0E59>0039   # THAI DIGIT NINE
+0ED0>0030   # LAO DIGIT ZERO
+0ED1>0031   # LAO DIGIT ONE
+0ED2>0032   # LAO DIGIT TWO
+0ED3>0033   # LAO DIGIT THREE
+0ED4>0034   # LAO DIGIT FOUR
+0ED5>0035   # LAO DIGIT FIVE
+0ED6>0036   # LAO DIGIT SIX
+0ED7>0037   # LAO DIGIT SEVEN
+0ED8>0038   # LAO DIGIT EIGHT
+0ED9>0039   # LAO DIGIT NINE
+0F20>0030   # TIBETAN DIGIT ZERO
+0F21>0031   # TIBETAN DIGIT ONE
+0F22>0032   # TIBETAN DIGIT TWO
+0F23>0033   # TIBETAN DIGIT THREE
+0F24>0034   # TIBETAN DIGIT FOUR
+0F25>0035   # TIBETAN DIGIT FIVE
+0F26>0036   # TIBETAN DIGIT SIX
+0F27>0037   # TIBETAN DIGIT SEVEN
+0F28>0038   # TIBETAN DIGIT EIGHT
+0F29>0039   # TIBETAN DIGIT NINE
+1040>0030   # MYANMAR DIGIT ZERO
+1041>0031   # MYANMAR DIGIT ONE
+1042>0032   # MYANMAR DIGIT TWO
+1043>0033   # MYANMAR DIGIT THREE
+1044>0034   # MYANMAR DIGIT FOUR
+1045>0035   # MYANMAR DIGIT FIVE
+1046>0036   # MYANMAR DIGIT SIX
+1047>0037   # MYANMAR DIGIT SEVEN
+1048>0038   # MYANMAR DIGIT EIGHT
+1049>0039   # MYANMAR DIGIT NINE
+1090>0030   # MYANMAR SHAN DIGIT ZERO
+1091>0031   # MYANMAR SHAN DIGIT ONE
+1092>0032   # MYANMAR SHAN DIGIT TWO
+1093>0033   # MYANMAR SHAN DIGIT THREE
+1094>0034   # MYANMAR SHAN DIGIT FOUR
+1095>0035   # MYANMAR SHAN DIGIT FIVE
+1096>0036   # MYANMAR SHAN DIGIT SIX
+1097>0037   # MYANMAR SHAN DIGIT SEVEN
+1098>0038   # MYANMAR SHAN DIGIT EIGHT
+1099>0039   # MYANMAR SHAN DIGIT NINE
+1369>0031   # ETHIOPIC DIGIT ONE
+136A>0032   # ETHIOPIC DIGIT TWO
+136B>0033   # ETHIOPIC DIGIT THREE
+136C>0034   # ETHIOPIC DIGIT FOUR
+136D>0035   # ETHIOPIC DIGIT FIVE
+136E>0036   # ETHIOPIC DIGIT SIX
+136F>0037   # ETHIOPIC DIGIT SEVEN
+1370>0038   # ETHIOPIC DIGIT EIGHT
+1371>0039   # ETHIOPIC DIGIT NINE
+17E0>0030   # KHMER DIGIT ZERO
+17E1>0031   # KHMER DIGIT ONE
+17E2>0032   # KHMER DIGIT TWO
+17E3>0033   # KHMER DIGIT THREE
+17E4>0034   # KHMER DIGIT FOUR
+17E5>0035   # KHMER DIGIT FIVE
+17E6>0036   # KHMER DIGIT SIX
+17E7>0037   # KHMER DIGIT SEVEN
+17E8>0038   # KHMER DIGIT EIGHT
+17E9>0039   # KHMER DIGIT NINE
+1810>0030   # MONGOLIAN DIGIT ZERO
+1811>0031   # MONGOLIAN DIGIT ONE
+1812>0032   # MONGOLIAN DIGIT TWO
+1813>0033   # MONGOLIAN DIGIT THREE
+1814>0034   # MONGOLIAN DIGIT FOUR
+1815>0035   # MONGOLIAN DIGIT FIVE
+1816>0036   # MONGOLIAN DIGIT SIX
+1817>0037   # MONGOLIAN DIGIT SEVEN
+1818>0038   # MONGOLIAN DIGIT EIGHT
+1819>0039   # MONGOLIAN DIGIT NINE
+1946>0030   # LIMBU DIGIT ZERO
+1947>0031   # LIMBU DIGIT ONE
+1948>0032   # LIMBU DIGIT TWO
+1949>0033   # LIMBU DIGIT THREE
+194A>0034   # LIMBU DIGIT FOUR
+194B>0035   # LIMBU DIGIT FIVE
+194C>0036   # LIMBU DIGIT SIX
+194D>0037   # LIMBU DIGIT SEVEN
+194E>0038   # LIMBU DIGIT EIGHT
+194F>0039   # LIMBU DIGIT NINE
+19D0>0030   # NEW TAI LUE DIGIT ZERO
+19D1>0031   # NEW TAI LUE DIGIT ONE
+19D2>0032   # NEW TAI LUE DIGIT TWO
+19D3>0033   # NEW TAI LUE DIGIT THREE
+19D4>0034   # NEW TAI LUE DIGIT FOUR
+19D5>0035   # NEW TAI LUE DIGIT FIVE
+19D6>0036   # NEW TAI LUE DIGIT SIX
+19D7>0037   # NEW TAI LUE DIGIT SEVEN
+19D8>0038   # NEW TAI LUE DIGIT EIGHT
+19D9>0039   # NEW TAI LUE DIGIT NINE
+19DA>0031   # NEW TAI LUE THAM DIGIT ONE
+1A80>0030   # TAI THAM HORA DIGIT ZERO
+1A81>0031   # TAI THAM HORA DIGIT ONE
+1A82>0032   # TAI THAM HORA DIGIT TWO
+1A83>0033   # TAI THAM HORA DIGIT THREE
+1A84>0034   # TAI THAM HORA DIGIT FOUR
+1A85>0035   # TAI THAM HORA DIGIT FIVE
+1A86>0036   # TAI THAM HORA DIGIT SIX
+1A87>0037   # TAI THAM HORA DIGIT SEVEN
+1A88>0038   # TAI THAM HORA DIGIT EIGHT
+1A89>0039   # TAI THAM HORA DIGIT NINE
+1A90>0030   # TAI THAM THAM DIGIT ZERO
+1A91>0031   # TAI THAM THAM DIGIT ONE
+1A92>0032   # TAI THAM THAM DIGIT TWO
+1A93>0033   # TAI THAM THAM DIGIT THREE
+1A94>0034   # TAI THAM THAM DIGIT FOUR
+1A95>0035   # TAI THAM THAM DIGIT FIVE
+1A96>0036   # TAI THAM THAM DIGIT SIX
+1A97>0037   # TAI THAM THAM DIGIT SEVEN
+1A98>0038   # TAI THAM THAM DIGIT EIGHT
+1A99>0039   # TAI THAM THAM DIGIT NINE
+1B50>0030   # BALINESE DIGIT ZERO
+1B51>0031   # BALINESE DIGIT ONE
+1B52>0032   # BALINESE DIGIT TWO
+1B53>0033   # BALINESE DIGIT THREE
+1B54>0034   # BALINESE DIGIT FOUR
+1B55>0035   # BALINESE DIGIT FIVE
+1B56>0036   # BALINESE DIGIT SIX
+1B57>0037   # BALINESE DIGIT SEVEN
+1B58>0038   # BALINESE DIGIT EIGHT
+1B59>0039   # BALINESE DIGIT NINE
+1BB0>0030   # SUNDANESE DIGIT ZERO
+1BB1>0031   # SUNDANESE DIGIT ONE
+1BB2>0032   # SUNDANESE DIGIT TWO
+1BB3>0033   # SUNDANESE DIGIT THREE
+1BB4>0034   # SUNDANESE DIGIT FOUR
+1BB5>0035   # SUNDANESE DIGIT FIVE
+1BB6>0036   # SUNDANESE DIGIT SIX
+1BB7>0037   # SUNDANESE DIGIT SEVEN
+1BB8>0038   # SUNDANESE DIGIT EIGHT
+1BB9>0039   # SUNDANESE DIGIT NINE
+1C40>0030   # LEPCHA DIGIT ZERO
+1C41>0031   # LEPCHA DIGIT ONE
+1C42>0032   # LEPCHA DIGIT TWO
+1C43>0033   # LEPCHA DIGIT THREE
+1C44>0034   # LEPCHA DIGIT FOUR
+1C45>0035   # LEPCHA DIGIT FIVE
+1C46>0036   # LEPCHA DIGIT SIX
+1C47>0037   # LEPCHA DIGIT SEVEN
+1C48>0038   # LEPCHA DIGIT EIGHT
+1C49>0039   # LEPCHA DIGIT NINE
+1C50>0030   # OL CHIKI DIGIT ZERO
+1C51>0031   # OL CHIKI DIGIT ONE
+1C52>0032   # OL CHIKI DIGIT TWO
+1C53>0033   # OL CHIKI DIGIT THREE
+1C54>0034   # OL CHIKI DIGIT FOUR
+1C55>0035   # OL CHIKI DIGIT FIVE
+1C56>0036   # OL CHIKI DIGIT SIX
+1C57>0037   # OL CHIKI DIGIT SEVEN
+1C58>0038   # OL CHIKI DIGIT EIGHT
+1C59>0039   # OL CHIKI DIGIT NINE
+24F5>0031   # DOUBLE CIRCLED DIGIT ONE
+24F6>0032   # DOUBLE CIRCLED DIGIT TWO
+24F7>0033   # DOUBLE CIRCLED DIGIT THREE
+24F8>0034   # DOUBLE CIRCLED DIGIT FOUR
+24F9>0035   # DOUBLE CIRCLED DIGIT FIVE
+24FA>0036   # DOUBLE CIRCLED DIGIT SIX
+24FB>0037   # DOUBLE CIRCLED DIGIT SEVEN
+24FC>0038   # DOUBLE CIRCLED DIGIT EIGHT
+24FD>0039   # DOUBLE CIRCLED DIGIT NINE
+24FF>0030   # NEGATIVE CIRCLED DIGIT ZERO
+2776>0031   # DINGBAT NEGATIVE CIRCLED DIGIT ONE
+2777>0032   # DINGBAT NEGATIVE CIRCLED DIGIT TWO
+2778>0033   # DINGBAT NEGATIVE CIRCLED DIGIT THREE
+2779>0034   # DINGBAT NEGATIVE CIRCLED DIGIT FOUR
+277A>0035   # DINGBAT NEGATIVE CIRCLED DIGIT FIVE
+277B>0036   # DINGBAT NEGATIVE CIRCLED DIGIT SIX
+277C>0037   # DINGBAT NEGATIVE CIRCLED DIGIT SEVEN
+277D>0038   # DINGBAT NEGATIVE CIRCLED DIGIT EIGHT
+277E>0039   # DINGBAT NEGATIVE CIRCLED DIGIT NINE
+2780>0031   # DINGBAT CIRCLED SANS-SERIF DIGIT ONE
+2781>0032   # DINGBAT CIRCLED SANS-SERIF DIGIT TWO
+2782>0033   # DINGBAT CIRCLED SANS-SERIF DIGIT THREE
+2783>0034   # DINGBAT CIRCLED SANS-SERIF DIGIT FOUR
+2784>0035   # DINGBAT CIRCLED SANS-SERIF DIGIT FIVE
+2785>0036   # DINGBAT CIRCLED SANS-SERIF DIGIT SIX
+2786>0037   # DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN
+2787>0038   # DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT
+2788>0039   # DINGBAT CIRCLED SANS-SERIF DIGIT NINE
+278A>0031   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE
+278B>0032   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO
+278C>0033   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE
+278D>0034   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR
+278E>0035   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE
+278F>0036   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX
+2790>0037   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN
+2791>0038   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT
+2792>0039   # DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE
+A620>0030   # VAI DIGIT ZERO
+A621>0031   # VAI DIGIT ONE
+A622>0032   # VAI DIGIT TWO
+A623>0033   # VAI DIGIT THREE
+A624>0034   # VAI DIGIT FOUR
+A625>0035   # VAI DIGIT FIVE
+A626>0036   # VAI DIGIT SIX
+A627>0037   # VAI DIGIT SEVEN
+A628>0038   # VAI DIGIT EIGHT
+A629>0039   # VAI DIGIT NINE
+A8D0>0030   # SAURASHTRA DIGIT ZERO
+A8D1>0031   # SAURASHTRA DIGIT ONE
+A8D2>0032   # SAURASHTRA DIGIT TWO
+A8D3>0033   # SAURASHTRA DIGIT THREE
+A8D4>0034   # SAURASHTRA DIGIT FOUR
+A8D5>0035   # SAURASHTRA DIGIT FIVE
+A8D6>0036   # SAURASHTRA DIGIT SIX
+A8D7>0037   # SAURASHTRA DIGIT SEVEN
+A8D8>0038   # SAURASHTRA DIGIT EIGHT
+A8D9>0039   # SAURASHTRA DIGIT NINE
+A900>0030   # KAYAH LI DIGIT ZERO
+A901>0031   # KAYAH LI DIGIT ONE
+A902>0032   # KAYAH LI DIGIT TWO
+A903>0033   # KAYAH LI DIGIT THREE
+A904>0034   # KAYAH LI DIGIT FOUR
+A905>0035   # KAYAH LI DIGIT FIVE
+A906>0036   # KAYAH LI DIGIT SIX
+A907>0037   # KAYAH LI DIGIT SEVEN
+A908>0038   # KAYAH LI DIGIT EIGHT
+A909>0039   # KAYAH LI DIGIT NINE
+A9D0>0030   # JAVANESE DIGIT ZERO
+A9D1>0031   # JAVANESE DIGIT ONE
+A9D2>0032   # JAVANESE DIGIT TWO
+A9D3>0033   # JAVANESE DIGIT THREE
+A9D4>0034   # JAVANESE DIGIT FOUR
+A9D5>0035   # JAVANESE DIGIT FIVE
+A9D6>0036   # JAVANESE DIGIT SIX
+A9D7>0037   # JAVANESE DIGIT SEVEN
+A9D8>0038   # JAVANESE DIGIT EIGHT
+A9D9>0039   # JAVANESE DIGIT NINE
+AA50>0030   # CHAM DIGIT ZERO
+AA51>0031   # CHAM DIGIT ONE
+AA52>0032   # CHAM DIGIT TWO
+AA53>0033   # CHAM DIGIT THREE
+AA54>0034   # CHAM DIGIT FOUR
+AA55>0035   # CHAM DIGIT FIVE
+AA56>0036   # CHAM DIGIT SIX
+AA57>0037   # CHAM DIGIT SEVEN
+AA58>0038   # CHAM DIGIT EIGHT
+AA59>0039   # CHAM DIGIT NINE
+ABF0>0030   # MEETEI MAYEK DIGIT ZERO
+ABF1>0031   # MEETEI MAYEK DIGIT ONE
+ABF2>0032   # MEETEI MAYEK DIGIT TWO
+ABF3>0033   # MEETEI MAYEK DIGIT THREE
+ABF4>0034   # MEETEI MAYEK DIGIT FOUR
+ABF5>0035   # MEETEI MAYEK DIGIT FIVE
+ABF6>0036   # MEETEI MAYEK DIGIT SIX
+ABF7>0037   # MEETEI MAYEK DIGIT SEVEN
+ABF8>0038   # MEETEI MAYEK DIGIT EIGHT
+ABF9>0039   # MEETEI MAYEK DIGIT NINE
+104A0>0030   # OSMANYA DIGIT ZERO
+104A1>0031   # OSMANYA DIGIT ONE
+104A2>0032   # OSMANYA DIGIT TWO
+104A3>0033   # OSMANYA DIGIT THREE
+104A4>0034   # OSMANYA DIGIT FOUR
+104A5>0035   # OSMANYA DIGIT FIVE
+104A6>0036   # OSMANYA DIGIT SIX
+104A7>0037   # OSMANYA DIGIT SEVEN
+104A8>0038   # OSMANYA DIGIT EIGHT
+104A9>0039   # OSMANYA DIGIT NINE
+10A40>0031   # KHAROSHTHI DIGIT ONE
+10A41>0032   # KHAROSHTHI DIGIT TWO
+10A42>0033   # KHAROSHTHI DIGIT THREE
+10A43>0034   # KHAROSHTHI DIGIT FOUR
+10E60>0031   # RUMI DIGIT ONE
+10E61>0032   # RUMI DIGIT TWO
+10E62>0033   # RUMI DIGIT THREE
+10E63>0034   # RUMI DIGIT FOUR
+10E64>0035   # RUMI DIGIT FIVE
+10E65>0036   # RUMI DIGIT SIX
+10E66>0037   # RUMI DIGIT SEVEN
+10E67>0038   # RUMI DIGIT EIGHT
+10E68>0039   # RUMI DIGIT NINE
+11052>0031   # BRAHMI NUMBER ONE
+11053>0032   # BRAHMI NUMBER TWO
+11054>0033   # BRAHMI NUMBER THREE
+11055>0034   # BRAHMI NUMBER FOUR
+11056>0035   # BRAHMI NUMBER FIVE
+11057>0036   # BRAHMI NUMBER SIX
+11058>0037   # BRAHMI NUMBER SEVEN
+11059>0038   # BRAHMI NUMBER EIGHT
+1105A>0039   # BRAHMI NUMBER NINE
+11066>0030   # BRAHMI DIGIT ZERO
+11067>0031   # BRAHMI DIGIT ONE
+11068>0032   # BRAHMI DIGIT TWO
+11069>0033   # BRAHMI DIGIT THREE
+1106A>0034   # BRAHMI DIGIT FOUR
+1106B>0035   # BRAHMI DIGIT FIVE
+1106C>0036   # BRAHMI DIGIT SIX
+1106D>0037   # BRAHMI DIGIT SEVEN
+1106E>0038   # BRAHMI DIGIT EIGHT
+1106F>0039   # BRAHMI DIGIT NINE
+110F0>0030   # SORA SOMPENG DIGIT ZERO
+110F1>0031   # SORA SOMPENG DIGIT ONE
+110F2>0032   # SORA SOMPENG DIGIT TWO
+110F3>0033   # SORA SOMPENG DIGIT THREE
+110F4>0034   # SORA SOMPENG DIGIT FOUR
+110F5>0035   # SORA SOMPENG DIGIT FIVE
+110F6>0036   # SORA SOMPENG DIGIT SIX
+110F7>0037   # SORA SOMPENG DIGIT SEVEN
+110F8>0038   # SORA SOMPENG DIGIT EIGHT
+110F9>0039   # SORA SOMPENG DIGIT NINE
+11136>0030   # CHAKMA DIGIT ZERO
+11137>0031   # CHAKMA DIGIT ONE
+11138>0032   # CHAKMA DIGIT TWO
+11139>0033   # CHAKMA DIGIT THREE
+1113A>0034   # CHAKMA DIGIT FOUR
+1113B>0035   # CHAKMA DIGIT FIVE
+1113C>0036   # CHAKMA DIGIT SIX
+1113D>0037   # CHAKMA DIGIT SEVEN
+1113E>0038   # CHAKMA DIGIT EIGHT
+1113F>0039   # CHAKMA DIGIT NINE
+111D0>0030   # SHARADA DIGIT ZERO
+111D1>0031   # SHARADA DIGIT ONE
+111D2>0032   # SHARADA DIGIT TWO
+111D3>0033   # SHARADA DIGIT THREE
+111D4>0034   # SHARADA DIGIT FOUR
+111D5>0035   # SHARADA DIGIT FIVE
+111D6>0036   # SHARADA DIGIT SIX
+111D7>0037   # SHARADA DIGIT SEVEN
+111D8>0038   # SHARADA DIGIT EIGHT
+111D9>0039   # SHARADA DIGIT NINE
+116C0>0030   # TAKRI DIGIT ZERO
+116C1>0031   # TAKRI DIGIT ONE
+116C2>0032   # TAKRI DIGIT TWO
+116C3>0033   # TAKRI DIGIT THREE
+116C4>0034   # TAKRI DIGIT FOUR
+116C5>0035   # TAKRI DIGIT FIVE
+116C6>0036   # TAKRI DIGIT SIX
+116C7>0037   # TAKRI DIGIT SEVEN
+116C8>0038   # TAKRI DIGIT EIGHT
+116C9>0039   # TAKRI DIGIT NINE
+

Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/nfkc.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/nfkc.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/nfkc.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/nfkc.txt Fri Jul 27 07:15:13 2012
@@ -1,306 +1,18 @@
-# Copyright (C) 1999-2010, International Business Machines
+# Copyright (C) 1999-2012, International Business Machines
 # Corporation and others.  All Rights Reserved.
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy 
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights 
-# to use, copy, modify, merge, publish, distribute, and/or sell copies of the 
-# Software, and to permit persons to whom the Software is furnished to do so, 
-# provided that the above copyright notice(s) and this permission notice appear 
-# in all copies of the Software and that both the above copyright notice(s) and
-# this permission notice appear in supporting documentation.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 
-# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE 
-# LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR 
-# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER 
-# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT 
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# 
-# Except as contained in this notice, the name of a copyright holder shall not 
-# be used in advertising or otherwise to promote the sale, use or other 
-# dealings in this Software without prior written authorization of the 
-# copyright holder.
-#
 # file name: nfkc.txt
 #
-# machine-generated on: 2010-07-23
-#
-# Round-trip mappings (=) containing [:Diacritic:] (see DiacriticFolding.txt)
-# were changed to one-way decompositions, as their non-starters now decompose.
+# machine-generated by ICU preparseucd.py
 #
+# Data for Unicode NFKC normalization.
+# This file contains only compatibility decomposition mappings,
+# plus those canonical decompositions that change from NFC round-trip mappings
+# to NFKC one-way mappings.
+# Use this file as the second gennorm2 input file after nfc.txt.
 
-# Canonical_Combining_Class (ccc) values
-0300..0314:230
-0315:232
-0316..0319:220
-031A:232
-031B:216
-031C..0320:220
-0321..0322:202
-0323..0326:220
-0327..0328:202
-0329..0333:220
-0334..0338:1
-0339..033C:220
-033D..0344:230
-0345:240
-0346:230
-0347..0349:220
-034A..034C:230
-034D..034E:220
-0350..0352:230
-0353..0356:220
-0357:230
-0358:232
-0359..035A:220
-035B:230
-035C:233
-035D..035E:234
-035F:233
-0360..0361:234
-0362:233
-0363..036F:230
-0483..0487:230
-0591:220
-0592..0595:230
-0596:220
-0597..0599:230
-059A:222
-059B:220
-059C..05A1:230
-05A2..05A7:220
-05A8..05A9:230
-05AA:220
-05AB..05AC:230
-05AD:222
-05AE:228
-05AF:230
-05B0:10
-05B1:11
-05B2:12
-05B3:13
-05B4:14
-05B5:15
-05B6:16
-05B7:17
-05B8:18
-05B9..05BA:19
-05BB:20
-05BC:21
-05BD:22
-05BF:23
-05C1:24
-05C2:25
-05C4:230
-05C5:220
-05C7:18
-0610..0617:230
-0618:30
-0619:31
-061A:32
-064B:27
-064C:28
-064D:29
-064E:30
-064F:31
-0650:32
-0651:33
-0652:34
-0653..0654:230
-0655..0656:220
-0657..065B:230
-065C:220
-065D..065E:230
-065F:220
-0670:35
-06D6..06DC:230
-06DF..06E2:230
-06E3:220
-06E4:230
-06E7..06E8:230
-06EA:220
-06EB..06EC:230
-06ED:220
-0711:36
-0730:230
-0731:220
-0732..0733:230
-0734:220
-0735..0736:230
-0737..0739:220
-073A:230
-073B..073C:220
-073D:230
-073E:220
-073F..0741:230
-0742:220
-0743:230
-0744:220
-0745:230
-0746:220
-0747:230
-0748:220
-0749..074A:230
-07EB..07F1:230
-07F2:220
-07F3:230
-0816..0819:230
-081B..0823:230
-0825..0827:230
-0829..082D:230
-0859..085B:220
-093C:7
-094D:9
-0951:230
-0952:220
-0953..0954:230
-09BC:7
-09CD:9
-0A3C:7
-0A4D:9
-0ABC:7
-0ACD:9
-0B3C:7
-0B4D:9
-0BCD:9
-0C4D:9
-0C55:84
-0C56:91
-0CBC:7
-0CCD:9
-0D4D:9
-0DCA:9
-0E38..0E39:103
-0E3A:9
-0E48..0E4B:107
-0EB8..0EB9:118
-0EC8..0ECB:122
-0F18..0F19:220
-0F35:220
-0F37:220
-0F39:216
-0F71:129
-0F72:130
-0F74:132
-0F7A..0F7D:130
-0F80:130
-0F82..0F83:230
-0F84:9
-0F86..0F87:230
-0FC6:220
-1037:7
-1039..103A:9
-108D:220
-135D..135F:230
-1714:9
-1734:9
-17D2:9
-17DD:230
-18A9:228
-1939:222
-193A:230
-193B:220
-1A17:230
-1A18:220
-1A60:9
-1A75..1A7C:230
-1A7F:220
-1B34:7
-1B44:9
-1B6B:230
-1B6C:220
-1B6D..1B73:230
-1BAA:9
-1BE6:7
-1BF2..1BF3:9
-1C37:7
-1CD0..1CD2:230
-1CD4:1
-1CD5..1CD9:220
-1CDA..1CDB:230
-1CDC..1CDF:220
-1CE0:230
-1CE2..1CE8:1
-1CED:220
-1DC0..1DC1:230
-1DC2:220
-1DC3..1DC9:230
-1DCA:220
-1DCB..1DCC:230
-1DCD:234
-1DCE:214
-1DCF:220
-1DD0:202
-1DD1..1DE6:230
-1DFC:233
-1DFD:220
-1DFE:230
-1DFF:220
-20D0..20D1:230
-20D2..20D3:1
-20D4..20D7:230
-20D8..20DA:1
-20DB..20DC:230
-20E1:230
-20E5..20E6:1
-20E7:230
-20E8:220
-20E9:230
-20EA..20EB:1
-20EC..20EF:220
-20F0:230
-2CEF..2CF1:230
-2D7F:9
-2DE0..2DFF:230
-302A:218
-302B:228
-302C:232
-302D:222
-302E..302F:224
-3099..309A:8
-A66F:230
-A67C..A67D:230
-A6F0..A6F1:230
-A806:9
-A8C4:9
-A8E0..A8F1:230
-A92B..A92D:220
-A953:9
-A9B3:7
-A9C0:9
-AAB0:230
-AAB2..AAB3:230
-AAB4:220
-AAB7..AAB8:230
-AABE..AABF:230
-AAC1:230
-ABED:9
-FB1E:26
-FE20..FE26:230
-101FD:220
-10A0D:220
-10A0F:230
-10A38:230
-10A39:1
-10A3A:220
-10A3F:9
-11046:9
-110B9:9
-110BA:7
-1D165..1D166:216
-1D167..1D169:1
-1D16D:226
-1D16E..1D172:216
-1D17B..1D182:220
-1D185..1D189:230
-1D18A..1D18B:220
-1D1AA..1D1AD:230
-1D242..1D244:230
+* Unicode 6.1.0
 
-# Canonical and compatibility decomposition mappings
 00A0>0020
 00A8>0020 0308
 00AA>0061
@@ -315,177 +27,12 @@ FE20..FE26:230
 00BC>0031 2044 0034
 00BD>0031 2044 0032
 00BE>0033 2044 0034
-00C0>0041 0300
-00C1>0041 0301
-00C2>0041 0302
-00C3>0041 0303
-00C4>0041 0308
-00C5>0041 030A
-00C7>0043 0327
-00C8>0045 0300
-00C9>0045 0301
-00CA>0045 0302
-00CB>0045 0308
-00CC>0049 0300
-00CD>0049 0301
-00CE>0049 0302
-00CF>0049 0308
-00D1>004E 0303
-00D2>004F 0300
-00D3>004F 0301
-00D4>004F 0302
-00D5>004F 0303
-00D6>004F 0308
-00D9>0055 0300
-00DA>0055 0301
-00DB>0055 0302
-00DC>0055 0308
-00DD>0059 0301
-00E0>0061 0300
-00E1>0061 0301
-00E2>0061 0302
-00E3>0061 0303
-00E4>0061 0308
-00E5>0061 030A
-00E7>0063 0327
-00E8>0065 0300
-00E9>0065 0301
-00EA>0065 0302
-00EB>0065 0308
-00EC>0069 0300
-00ED>0069 0301
-00EE>0069 0302
-00EF>0069 0308
-00F1>006E 0303
-00F2>006F 0300
-00F3>006F 0301
-00F4>006F 0302
-00F5>006F 0303
-00F6>006F 0308
-00F9>0075 0300
-00FA>0075 0301
-00FB>0075 0302
-00FC>0075 0308
-00FD>0079 0301
-00FF>0079 0308
-0100>0041 0304
-0101>0061 0304
-0102>0041 0306
-0103>0061 0306
-0104>0041 0328
-0105>0061 0328
-0106>0043 0301
-0107>0063 0301
-0108>0043 0302
-0109>0063 0302
-010A>0043 0307
-010B>0063 0307
-010C>0043 030C
-010D>0063 030C
-010E>0044 030C
-010F>0064 030C
-0112>0045 0304
-0113>0065 0304
-0114>0045 0306
-0115>0065 0306
-0116>0045 0307
-0117>0065 0307
-0118>0045 0328
-0119>0065 0328
-011A>0045 030C
-011B>0065 030C
-011C>0047 0302
-011D>0067 0302
-011E>0047 0306
-011F>0067 0306
-0120>0047 0307
-0121>0067 0307
-0122>0047 0327
-0123>0067 0327
-0124>0048 0302
-0125>0068 0302
-0128>0049 0303
-0129>0069 0303
-012A>0049 0304
-012B>0069 0304
-012C>0049 0306
-012D>0069 0306
-012E>0049 0328
-012F>0069 0328
-0130>0049 0307
 0132>0049 004A
 0133>0069 006A
-0134>004A 0302
-0135>006A 0302
-0136>004B 0327
-0137>006B 0327
-0139>004C 0301
-013A>006C 0301
-013B>004C 0327
-013C>006C 0327
-013D>004C 030C
-013E>006C 030C
 013F>004C 00B7
 0140>006C 00B7
-0143>004E 0301
-0144>006E 0301
-0145>004E 0327
-0146>006E 0327
-0147>004E 030C
-0148>006E 030C
 0149>02BC 006E
-014C>004F 0304
-014D>006F 0304
-014E>004F 0306
-014F>006F 0306
-0150>004F 030B
-0151>006F 030B
-0154>0052 0301
-0155>0072 0301
-0156>0052 0327
-0157>0072 0327
-0158>0052 030C
-0159>0072 030C
-015A>0053 0301
-015B>0073 0301
-015C>0053 0302
-015D>0073 0302
-015E>0053 0327
-015F>0073 0327
-0160>0053 030C
-0161>0073 030C
-0162>0054 0327
-0163>0074 0327
-0164>0054 030C
-0165>0074 030C
-0168>0055 0303
-0169>0075 0303
-016A>0055 0304
-016B>0075 0304
-016C>0055 0306
-016D>0075 0306
-016E>0055 030A
-016F>0075 030A
-0170>0055 030B
-0171>0075 030B
-0172>0055 0328
-0173>0075 0328
-0174>0057 0302
-0175>0077 0302
-0176>0059 0302
-0177>0079 0302
-0178>0059 0308
-0179>005A 0301
-017A>007A 0301
-017B>005A 0307
-017C>007A 0307
-017D>005A 030C
-017E>007A 030C
 017F>0073
-01A0>004F 031B
-01A1>006F 031B
-01AF>0055 031B
-01B0>0075 031B
 01C4>0044 017D
 01C5>0044 017E
 01C6>0064 017E
@@ -495,96 +42,9 @@ FE20..FE26:230
 01CA>004E 004A
 01CB>004E 006A
 01CC>006E 006A
-01CD>0041 030C
-01CE>0061 030C
-01CF>0049 030C
-01D0>0069 030C
-01D1>004F 030C
-01D2>006F 030C
-01D3>0055 030C
-01D4>0075 030C
-01D5>00DC 0304
-01D6>00FC 0304
-01D7>00DC 0301
-01D8>00FC 0301
-01D9>00DC 030C
-01DA>00FC 030C
-01DB>00DC 0300
-01DC>00FC 0300
-01DE>00C4 0304
-01DF>00E4 0304
-01E0>0226 0304
-01E1>0227 0304
-01E2>00C6 0304
-01E3>00E6 0304
-01E6>0047 030C
-01E7>0067 030C
-01E8>004B 030C
-01E9>006B 030C
-01EA>004F 0328
-01EB>006F 0328
-01EC>01EA 0304
-01ED>01EB 0304
-01EE>01B7 030C
-01EF>0292 030C
-01F0>006A 030C
 01F1>0044 005A
 01F2>0044 007A
 01F3>0064 007A
-01F4>0047 0301
-01F5>0067 0301
-01F8>004E 0300
-01F9>006E 0300
-01FA>00C5 0301
-01FB>00E5 0301
-01FC>00C6 0301
-01FD>00E6 0301
-01FE>00D8 0301
-01FF>00F8 0301
-0200>0041 030F
-0201>0061 030F
-0202>0041 0311
-0203>0061 0311
-0204>0045 030F
-0205>0065 030F
-0206>0045 0311
-0207>0065 0311
-0208>0049 030F
-0209>0069 030F
-020A>0049 0311
-020B>0069 0311
-020C>004F 030F
-020D>006F 030F
-020E>004F 0311
-020F>006F 0311
-0210>0052 030F
-0211>0072 030F
-0212>0052 0311
-0213>0072 0311
-0214>0055 030F
-0215>0075 030F
-0216>0055 0311
-0217>0075 0311
-0218>0053 0326
-0219>0073 0326
-021A>0054 0326
-021B>0074 0326
-021E>0048 030C
-021F>0068 030C
-0226>0041 0307
-0227>0061 0307
-0228>0045 0327
-0229>0065 0327
-022A>00D6 0304
-022B>00F6 0304
-022C>00D5 0304
-022D>00F5 0304
-022E>004F 0307
-022F>006F 0307
-0230>022E 0304
-0231>022F 0304
-0232>0059 0304
-0233>0079 0304
 02B0>0068
 02B1>0266
 02B2>006A
@@ -605,41 +65,14 @@ FE20..FE26:230
 02E2>0073
 02E3>0078
 02E4>0295
-0340>0300
-0341>0301
-0343>0313
-0344>0308 0301
-0374>02B9
 037A>0020 0345
-037E>003B
 0384>0020 0301
-0385>00A8 0301
-0386>0391 0301
-0387>00B7
-0388>0395 0301
-0389>0397 0301
-038A>0399 0301
-038C>039F 0301
-038E>03A5 0301
-038F>03A9 0301
-0390>03CA 0301
-03AA>0399 0308
-03AB>03A5 0308
-03AC>03B1 0301
-03AD>03B5 0301
-03AE>03B7 0301
-03AF>03B9 0301
-03B0>03CB 0301
-03CA>03B9 0308
-03CB>03C5 0308
-03CC>03BF 0301
-03CD>03C5 0301
-03CE>03C9 0301
+0385>00A8 0301  # NFC round-trip, NFKC one-way
 03D0>03B2
 03D1>03B8
 03D2>03A5
-03D3>03D2 0301
-03D4>03D2 0308
+03D3>03D2 0301  # NFC round-trip, NFKC one-way
+03D4>03D2 0308  # NFC round-trip, NFKC one-way
 03D5>03C6
 03D6>03C0
 03F0>03BA
@@ -648,152 +81,19 @@ FE20..FE26:230
 03F4>0398
 03F5>03B5
 03F9>03A3
-0400>0415 0300
-0401>0415 0308
-0403>0413 0301
-0407>0406 0308
-040C>041A 0301
-040D>0418 0300
-040E>0423 0306
-0419>0418 0306
-0439>0438 0306
-0450>0435 0300
-0451>0435 0308
-0453>0433 0301
-0457>0456 0308
-045C>043A 0301
-045D>0438 0300
-045E>0443 0306
-0476>0474 030F
-0477>0475 030F
-04C1>0416 0306
-04C2>0436 0306
-04D0>0410 0306
-04D1>0430 0306
-04D2>0410 0308
-04D3>0430 0308
-04D6>0415 0306
-04D7>0435 0306
-04DA>04D8 0308
-04DB>04D9 0308
-04DC>0416 0308
-04DD>0436 0308
-04DE>0417 0308
-04DF>0437 0308
-04E2>0418 0304
-04E3>0438 0304
-04E4>0418 0308
-04E5>0438 0308
-04E6>041E 0308
-04E7>043E 0308
-04EA>04E8 0308
-04EB>04E9 0308
-04EC>042D 0308
-04ED>044D 0308
-04EE>0423 0304
-04EF>0443 0304
-04F0>0423 0308
-04F1>0443 0308
-04F2>0423 030B
-04F3>0443 030B
-04F4>0427 0308
-04F5>0447 0308
-04F8>042B 0308
-04F9>044B 0308
 0587>0565 0582
-0622>0627 0653
-0623>0627 0654
-0624>0648 0654
-0625>0627 0655
-0626>064A 0654
 0675>0627 0674
 0676>0648 0674
 0677>06C7 0674
 0678>064A 0674
-06C0>06D5 0654
-06C2>06C1 0654
-06D3>06D2 0654
-0929>0928 093C
-0931>0930 093C
-0934>0933 093C
-0958>0915 093C
-0959>0916 093C
-095A>0917 093C
-095B>091C 093C
-095C>0921 093C
-095D>0922 093C
-095E>092B 093C
-095F>092F 093C
-09CB=09C7 09BE
-09CC=09C7 09D7
-09DC>09A1 09BC
-09DD>09A2 09BC
-09DF>09AF 09BC
-0A33>0A32 0A3C
-0A36>0A38 0A3C
-0A59>0A16 0A3C
-0A5A>0A17 0A3C
-0A5B>0A1C 0A3C
-0A5E>0A2B 0A3C
-0B48=0B47 0B56
-0B4B=0B47 0B3E
-0B4C=0B47 0B57
-0B5C>0B21 0B3C
-0B5D>0B22 0B3C
-0B94=0B92 0BD7
-0BCA=0BC6 0BBE
-0BCB=0BC7 0BBE
-0BCC=0BC6 0BD7
-0C48=0C46 0C56
-0CC0=0CBF 0CD5
-0CC7=0CC6 0CD5
-0CC8=0CC6 0CD6
-0CCA=0CC6 0CC2
-0CCB=0CCA 0CD5
-0D4A=0D46 0D3E
-0D4B=0D47 0D3E
-0D4C=0D46 0D57
-0DDA>0DD9 0DCA
-0DDC=0DD9 0DCF
-0DDD>0DDC 0DCA
-0DDE=0DD9 0DDF
 0E33>0E4D 0E32
 0EB3>0ECD 0EB2
 0EDC>0EAB 0E99
 0EDD>0EAB 0EA1
 0F0C>0F0B
-0F43>0F42 0FB7
-0F4D>0F4C 0FB7
-0F52>0F51 0FB7
-0F57>0F56 0FB7
-0F5C>0F5B 0FB7
-0F69>0F40 0FB5
-0F73>0F71 0F72
-0F75>0F71 0F74
-0F76>0FB2 0F80
 0F77>0FB2 0F81
-0F78>0FB3 0F80
 0F79>0FB3 0F81
-0F81>0F71 0F80
-0F93>0F92 0FB7
-0F9D>0F9C 0FB7
-0FA2>0FA1 0FB7
-0FA7>0FA6 0FB7
-0FAC>0FAB 0FB7
-0FB9>0F90 0FB5
-1026=1025 102E
 10FC>10DC
-1B06=1B05 1B35
-1B08=1B07 1B35
-1B0A=1B09 1B35
-1B0C=1B0B 1B35
-1B0E=1B0D 1B35
-1B12=1B11 1B35
-1B3B=1B3A 1B35
-1B3D=1B3C 1B35
-1B40=1B3E 1B35
-1B41=1B3F 1B35
-1B43=1B42 1B35
 1D2C>0041
 1D2D>00C6
 1D2E>0042
@@ -892,487 +192,20 @@ FE20..FE26:230
 1DBD>0291
 1DBE>0292
 1DBF>03B8
-1E00>0041 0325
-1E01>0061 0325
-1E02>0042 0307
-1E03>0062 0307
-1E04>0042 0323
-1E05>0062 0323
-1E06>0042 0331
-1E07>0062 0331
-1E08>00C7 0301
-1E09>00E7 0301
-1E0A>0044 0307
-1E0B>0064 0307
-1E0C>0044 0323
-1E0D>0064 0323
-1E0E>0044 0331
-1E0F>0064 0331
-1E10>0044 0327
-1E11>0064 0327
-1E12>0044 032D
-1E13>0064 032D
-1E14>0112 0300
-1E15>0113 0300
-1E16>0112 0301
-1E17>0113 0301
-1E18>0045 032D
-1E19>0065 032D
-1E1A>0045 0330
-1E1B>0065 0330
-1E1C>0228 0306
-1E1D>0229 0306
-1E1E>0046 0307
-1E1F>0066 0307
-1E20>0047 0304
-1E21>0067 0304
-1E22>0048 0307
-1E23>0068 0307
-1E24>0048 0323
-1E25>0068 0323
-1E26>0048 0308
-1E27>0068 0308
-1E28>0048 0327
-1E29>0068 0327
-1E2A>0048 032E
-1E2B>0068 032E
-1E2C>0049 0330
-1E2D>0069 0330
-1E2E>00CF 0301
-1E2F>00EF 0301
-1E30>004B 0301
-1E31>006B 0301
-1E32>004B 0323
-1E33>006B 0323
-1E34>004B 0331
-1E35>006B 0331
-1E36>004C 0323
-1E37>006C 0323
-1E38>1E36 0304
-1E39>1E37 0304
-1E3A>004C 0331
-1E3B>006C 0331
-1E3C>004C 032D
-1E3D>006C 032D
-1E3E>004D 0301
-1E3F>006D 0301
-1E40>004D 0307
-1E41>006D 0307
-1E42>004D 0323
-1E43>006D 0323
-1E44>004E 0307
-1E45>006E 0307
-1E46>004E 0323
-1E47>006E 0323
-1E48>004E 0331
-1E49>006E 0331
-1E4A>004E 032D
-1E4B>006E 032D
-1E4C>00D5 0301
-1E4D>00F5 0301
-1E4E>00D5 0308
-1E4F>00F5 0308
-1E50>014C 0300
-1E51>014D 0300
-1E52>014C 0301
-1E53>014D 0301
-1E54>0050 0301
-1E55>0070 0301
-1E56>0050 0307
-1E57>0070 0307
-1E58>0052 0307
-1E59>0072 0307
-1E5A>0052 0323
-1E5B>0072 0323
-1E5C>1E5A 0304
-1E5D>1E5B 0304
-1E5E>0052 0331
-1E5F>0072 0331
-1E60>0053 0307
-1E61>0073 0307
-1E62>0053 0323
-1E63>0073 0323
-1E64>015A 0307
-1E65>015B 0307
-1E66>0160 0307
-1E67>0161 0307
-1E68>1E62 0307
-1E69>1E63 0307
-1E6A>0054 0307
-1E6B>0074 0307
-1E6C>0054 0323
-1E6D>0074 0323
-1E6E>0054 0331
-1E6F>0074 0331
-1E70>0054 032D
-1E71>0074 032D
-1E72>0055 0324
-1E73>0075 0324
-1E74>0055 0330
-1E75>0075 0330
-1E76>0055 032D
-1E77>0075 032D
-1E78>0168 0301
-1E79>0169 0301
-1E7A>016A 0308
-1E7B>016B 0308
-1E7C>0056 0303
-1E7D>0076 0303
-1E7E>0056 0323
-1E7F>0076 0323
-1E80>0057 0300
-1E81>0077 0300
-1E82>0057 0301
-1E83>0077 0301
-1E84>0057 0308
-1E85>0077 0308
-1E86>0057 0307
-1E87>0077 0307
-1E88>0057 0323
-1E89>0077 0323
-1E8A>0058 0307
-1E8B>0078 0307
-1E8C>0058 0308
-1E8D>0078 0308
-1E8E>0059 0307
-1E8F>0079 0307
-1E90>005A 0302
-1E91>007A 0302
-1E92>005A 0323
-1E93>007A 0323
-1E94>005A 0331
-1E95>007A 0331
-1E96>0068 0331
-1E97>0074 0308
-1E98>0077 030A
-1E99>0079 030A
 1E9A>0061 02BE
-1E9B>017F 0307
-1EA0>0041 0323
-1EA1>0061 0323
-1EA2>0041 0309
-1EA3>0061 0309
-1EA4>00C2 0301
-1EA5>00E2 0301
-1EA6>00C2 0300
-1EA7>00E2 0300
-1EA8>00C2 0309
-1EA9>00E2 0309
-1EAA>00C2 0303
-1EAB>00E2 0303
-1EAC>1EA0 0302
-1EAD>1EA1 0302
-1EAE>0102 0301
-1EAF>0103 0301
-1EB0>0102 0300
-1EB1>0103 0300
-1EB2>0102 0309
-1EB3>0103 0309
-1EB4>0102 0303
-1EB5>0103 0303
-1EB6>1EA0 0306
-1EB7>1EA1 0306
-1EB8>0045 0323
-1EB9>0065 0323
-1EBA>0045 0309
-1EBB>0065 0309
-1EBC>0045 0303
-1EBD>0065 0303
-1EBE>00CA 0301
-1EBF>00EA 0301
-1EC0>00CA 0300
-1EC1>00EA 0300
-1EC2>00CA 0309
-1EC3>00EA 0309
-1EC4>00CA 0303
-1EC5>00EA 0303
-1EC6>1EB8 0302
-1EC7>1EB9 0302
-1EC8>0049 0309
-1EC9>0069 0309
-1ECA>0049 0323
-1ECB>0069 0323
-1ECC>004F 0323
-1ECD>006F 0323
-1ECE>004F 0309
-1ECF>006F 0309
-1ED0>00D4 0301
-1ED1>00F4 0301
-1ED2>00D4 0300
-1ED3>00F4 0300
-1ED4>00D4 0309
-1ED5>00F4 0309
-1ED6>00D4 0303
-1ED7>00F4 0303
-1ED8>1ECC 0302
-1ED9>1ECD 0302
-1EDA>01A0 0301
-1EDB>01A1 0301
-1EDC>01A0 0300
-1EDD>01A1 0300
-1EDE>01A0 0309
-1EDF>01A1 0309
-1EE0>01A0 0303
-1EE1>01A1 0303
-1EE2>01A0 0323
-1EE3>01A1 0323
-1EE4>0055 0323
-1EE5>0075 0323
-1EE6>0055 0309
-1EE7>0075 0309
-1EE8>01AF 0301
-1EE9>01B0 0301
-1EEA>01AF 0300
-1EEB>01B0 0300
-1EEC>01AF 0309
-1EED>01B0 0309
-1EEE>01AF 0303
-1EEF>01B0 0303
-1EF0>01AF 0323
-1EF1>01B0 0323
-1EF2>0059 0300
-1EF3>0079 0300
-1EF4>0059 0323
-1EF5>0079 0323
-1EF6>0059 0309
-1EF7>0079 0309
-1EF8>0059 0303
-1EF9>0079 0303
-1F00>03B1 0313
-1F01>03B1 0314
-1F02>1F00 0300
-1F03>1F01 0300
-1F04>1F00 0301
-1F05>1F01 0301
-1F06>1F00 0342
-1F07>1F01 0342
-1F08>0391 0313
-1F09>0391 0314
-1F0A>1F08 0300
-1F0B>1F09 0300
-1F0C>1F08 0301
-1F0D>1F09 0301
-1F0E>1F08 0342
-1F0F>1F09 0342
-1F10>03B5 0313
-1F11>03B5 0314
-1F12>1F10 0300
-1F13>1F11 0300
-1F14>1F10 0301
-1F15>1F11 0301
-1F18>0395 0313
-1F19>0395 0314
-1F1A>1F18 0300
-1F1B>1F19 0300
-1F1C>1F18 0301
-1F1D>1F19 0301
-1F20>03B7 0313
-1F21>03B7 0314
-1F22>1F20 0300
-1F23>1F21 0300
-1F24>1F20 0301
-1F25>1F21 0301
-1F26>1F20 0342
-1F27>1F21 0342
-1F28>0397 0313
-1F29>0397 0314
-1F2A>1F28 0300
-1F2B>1F29 0300
-1F2C>1F28 0301
-1F2D>1F29 0301
-1F2E>1F28 0342
-1F2F>1F29 0342
-1F30>03B9 0313
-1F31>03B9 0314
-1F32>1F30 0300
-1F33>1F31 0300
-1F34>1F30 0301
-1F35>1F31 0301
-1F36>1F30 0342
-1F37>1F31 0342
-1F38>0399 0313
-1F39>0399 0314
-1F3A>1F38 0300
-1F3B>1F39 0300
-1F3C>1F38 0301
-1F3D>1F39 0301
-1F3E>1F38 0342
-1F3F>1F39 0342
-1F40>03BF 0313
-1F41>03BF 0314
-1F42>1F40 0300
-1F43>1F41 0300
-1F44>1F40 0301
-1F45>1F41 0301
-1F48>039F 0313
-1F49>039F 0314
-1F4A>1F48 0300
-1F4B>1F49 0300
-1F4C>1F48 0301
-1F4D>1F49 0301
-1F50>03C5 0313
-1F51>03C5 0314
-1F52>1F50 0300
-1F53>1F51 0300
-1F54>1F50 0301
-1F55>1F51 0301
-1F56>1F50 0342
-1F57>1F51 0342
-1F59>03A5 0314
-1F5B>1F59 0300
-1F5D>1F59 0301
-1F5F>1F59 0342
-1F60>03C9 0313
-1F61>03C9 0314
-1F62>1F60 0300
-1F63>1F61 0300
-1F64>1F60 0301
-1F65>1F61 0301
-1F66>1F60 0342
-1F67>1F61 0342
-1F68>03A9 0313
-1F69>03A9 0314
-1F6A>1F68 0300
-1F6B>1F69 0300
-1F6C>1F68 0301
-1F6D>1F69 0301
-1F6E>1F68 0342
-1F6F>1F69 0342
-1F70>03B1 0300
-1F71>03AC
-1F72>03B5 0300
-1F73>03AD
-1F74>03B7 0300
-1F75>03AE
-1F76>03B9 0300
-1F77>03AF
-1F78>03BF 0300
-1F79>03CC
-1F7A>03C5 0300
-1F7B>03CD
-1F7C>03C9 0300
-1F7D>03CE
-1F80=1F00 0345
-1F81=1F01 0345
-1F82=1F02 0345
-1F83=1F03 0345
-1F84=1F04 0345
-1F85=1F05 0345
-1F86=1F06 0345
-1F87=1F07 0345
-1F88=1F08 0345
-1F89=1F09 0345
-1F8A=1F0A 0345
-1F8B=1F0B 0345
-1F8C=1F0C 0345
-1F8D=1F0D 0345
-1F8E=1F0E 0345
-1F8F=1F0F 0345
-1F90=1F20 0345
-1F91=1F21 0345
-1F92=1F22 0345
-1F93=1F23 0345
-1F94=1F24 0345
-1F95=1F25 0345
-1F96=1F26 0345
-1F97=1F27 0345
-1F98=1F28 0345
-1F99=1F29 0345
-1F9A=1F2A 0345
-1F9B=1F2B 0345
-1F9C=1F2C 0345
-1F9D=1F2D 0345
-1F9E=1F2E 0345
-1F9F=1F2F 0345
-1FA0=1F60 0345
-1FA1=1F61 0345
-1FA2=1F62 0345
-1FA3=1F63 0345
-1FA4=1F64 0345
-1FA5=1F65 0345
-1FA6=1F66 0345
-1FA7=1F67 0345
-1FA8=1F68 0345
-1FA9=1F69 0345
-1FAA=1F6A 0345
-1FAB=1F6B 0345
-1FAC=1F6C 0345
-1FAD=1F6D 0345
-1FAE=1F6E 0345
-1FAF=1F6F 0345
-1FB0>03B1 0306
-1FB1>03B1 0304
-1FB2=1F70 0345
-1FB3=03B1 0345
-1FB4=03AC 0345
-1FB6>03B1 0342
-1FB7=1FB6 0345
-1FB8>0391 0306
-1FB9>0391 0304
-1FBA>0391 0300
-1FBB>0386
-1FBC=0391 0345
+1E9B>017F 0307  # NFC round-trip, NFKC one-way
 1FBD>0020 0313
-1FBE>03B9
 1FBF>0020 0313
 1FC0>0020 0342
-1FC1>00A8 0342
-1FC2=1F74 0345
-1FC3=03B7 0345
-1FC4=03AE 0345
-1FC6>03B7 0342
-1FC7=1FC6 0345
-1FC8>0395 0300
-1FC9>0388
-1FCA>0397 0300
-1FCB>0389
-1FCC=0397 0345
-1FCD>1FBF 0300
-1FCE>1FBF 0301
-1FCF>1FBF 0342
-1FD0>03B9 0306
-1FD1>03B9 0304
-1FD2>03CA 0300
-1FD3>0390
-1FD6>03B9 0342
-1FD7>03CA 0342
-1FD8>0399 0306
-1FD9>0399 0304
-1FDA>0399 0300
-1FDB>038A
-1FDD>1FFE 0300
-1FDE>1FFE 0301
-1FDF>1FFE 0342
-1FE0>03C5 0306
-1FE1>03C5 0304
-1FE2>03CB 0300
-1FE3>03B0
-1FE4>03C1 0313
-1FE5>03C1 0314
-1FE6>03C5 0342
-1FE7>03CB 0342
-1FE8>03A5 0306
-1FE9>03A5 0304
-1FEA>03A5 0300
-1FEB>038E
-1FEC>03A1 0314
-1FED>00A8 0300
-1FEE>0385
-1FEF>0060
-1FF2=1F7C 0345
-1FF3=03C9 0345
-1FF4=03CE 0345
-1FF6>03C9 0342
-1FF7=1FF6 0345
-1FF8>039F 0300
-1FF9>038C
-1FFA>03A9 0300
-1FFB>038F
-1FFC=03A9 0345
-1FFD>00B4
+1FC1>00A8 0342  # NFC round-trip, NFKC one-way
+1FCD>1FBF 0300  # NFC round-trip, NFKC one-way
+1FCE>1FBF 0301  # NFC round-trip, NFKC one-way
+1FCF>1FBF 0342  # NFC round-trip, NFKC one-way
+1FDD>1FFE 0300  # NFC round-trip, NFKC one-way
+1FDE>1FFE 0301  # NFC round-trip, NFKC one-way
+1FDF>1FFE 0342  # NFC round-trip, NFKC one-way
+1FED>00A8 0300  # NFC round-trip, NFKC one-way
 1FFE>0020 0314
-2000>2002
-2001>2003
 2002>0020
 2003>0020
 2004>0020
@@ -1471,10 +304,7 @@ FE20..FE26:230
 2121>0054 0045 004C
 2122>0054 004D
 2124>005A
-2126>03A9
 2128>005A
-212A>004B
-212B>00C5
 212C>0042
 212D>0043
 212F>0065
@@ -1547,56 +377,10 @@ FE20..FE26:230
 217E>0064
 217F>006D
 2189>0030 2044 0033
-219A>2190 0338
-219B>2192 0338
-21AE>2194 0338
-21CD>21D0 0338
-21CE>21D4 0338
-21CF>21D2 0338
-2204>2203 0338
-2209>2208 0338
-220C>220B 0338
-2224>2223 0338
-2226>2225 0338
 222C>222B 222B
 222D>222B 222B 222B
 222F>222E 222E
 2230>222E 222E 222E
-2241>223C 0338
-2244>2243 0338
-2247>2245 0338
-2249>2248 0338
-2260>003D 0338
-2262>2261 0338
-226D>224D 0338
-226E>003C 0338
-226F>003E 0338
-2270>2264 0338
-2271>2265 0338
-2274>2272 0338
-2275>2273 0338
-2278>2276 0338
-2279>2277 0338
-2280>227A 0338
-2281>227B 0338
-2284>2282 0338
-2285>2283 0338
-2288>2286 0338
-2289>2287 0338
-22AC>22A2 0338
-22AD>22A8 0338
-22AE>22A9 0338
-22AF>22AB 0338
-22E0>227C 0338
-22E1>227D 0338
-22E2>2291 0338
-22E3>2292 0338
-22EA>22B2 0338
-22EB>22B3 0338
-22EC>22B4 0338
-22ED>22B5 0338
-2329>3008
-232A>3009
 2460>0031
 2461>0032
 2462>0033
@@ -1740,7 +524,6 @@ FE20..FE26:230
 2A74>003A 003A 003D
 2A75>003D 003D
 2A76>003D 003D 003D
-2ADC>2ADD 0338
 2C7C>006A
 2C7D>0056
 2D6F>2D61
@@ -1965,67 +748,9 @@ FE20..FE26:230
 3038>5341
 3039>5344
 303A>5345
-304C>304B 3099
-304E>304D 3099
-3050>304F 3099
-3052>3051 3099
-3054>3053 3099
-3056>3055 3099
-3058>3057 3099
-305A>3059 3099
-305C>305B 3099
-305E>305D 3099
-3060>305F 3099
-3062>3061 3099
-3065>3064 3099
-3067>3066 3099
-3069>3068 3099
-3070>306F 3099
-3071>306F 309A
-3073>3072 3099
-3074>3072 309A
-3076>3075 3099
-3077>3075 309A
-3079>3078 3099
-307A>3078 309A
-307C>307B 3099
-307D>307B 309A
-3094>3046 3099
 309B>0020 3099
 309C>0020 309A
-309E>309D 3099
 309F>3088 308A
-30AC>30AB 3099
-30AE>30AD 3099
-30B0>30AF 3099
-30B2>30B1 3099
-30B4>30B3 3099
-30B6>30B5 3099
-30B8>30B7 3099
-30BA>30B9 3099
-30BC>30BB 3099
-30BE>30BD 3099
-30C0>30BF 3099
-30C2>30C1 3099
-30C5>30C4 3099
-30C7>30C6 3099
-30C9>30C8 3099
-30D0>30CF 3099
-30D1>30CF 309A
-30D3>30D2 3099
-30D4>30D2 309A
-30D6>30D5 3099
-30D7>30D5 309A
-30D9>30D8 3099
-30DA>30D8 309A
-30DC>30DB 3099
-30DD>30DB 309A
-30F4>30A6 3099
-30F7>30EF 3099
-30F8>30F0 3099
-30F9>30F1 3099
-30FA>30F2 3099
-30FE>30FD 3099
 30FF>30B3 30C8
 3131>1100
 3132>1101
@@ -2637,464 +1362,8 @@ FE20..FE26:230
 33FE>0033 0031 65E5
 33FF>0067 0061 006C
 A770>A76F
-F900>8C48
-F901>66F4
-F902>8ECA
-F903>8CC8
-F904>6ED1
-F905>4E32
-F906>53E5
-F907>9F9C
-F908>9F9C
-F909>5951
-F90A>91D1
-F90B>5587
-F90C>5948
-F90D>61F6
-F90E>7669
-F90F>7F85
-F910>863F
-F911>87BA
-F912>88F8
-F913>908F
-F914>6A02
-F915>6D1B
-F916>70D9
-F917>73DE
-F918>843D
-F919>916A
-F91A>99F1
-F91B>4E82
-F91C>5375
-F91D>6B04
-F91E>721B
-F91F>862D
-F920>9E1E
-F921>5D50
-F922>6FEB
-F923>85CD
-F924>8964
-F925>62C9
-F926>81D8
-F927>881F
-F928>5ECA
-F929>6717
-F92A>6D6A
-F92B>72FC
-F92C>90CE
-F92D>4F86
-F92E>51B7
-F92F>52DE
-F930>64C4
-F931>6AD3
-F932>7210
-F933>76E7
-F934>8001
-F935>8606
-F936>865C
-F937>8DEF
-F938>9732
-F939>9B6F
-F93A>9DFA
-F93B>788C
-F93C>797F
-F93D>7DA0
-F93E>83C9
-F93F>9304
-F940>9E7F
-F941>8AD6
-F942>58DF
-F943>5F04
-F944>7C60
-F945>807E
-F946>7262
-F947>78CA
-F948>8CC2
-F949>96F7
-F94A>58D8
-F94B>5C62
-F94C>6A13
-F94D>6DDA
-F94E>6F0F
-F94F>7D2F
-F950>7E37
-F951>964B
-F952>52D2
-F953>808B
-F954>51DC
-F955>51CC
-F956>7A1C
-F957>7DBE
-F958>83F1
-F959>9675
-F95A>8B80
-F95B>62CF
-F95C>6A02
-F95D>8AFE
-F95E>4E39
-F95F>5BE7
-F960>6012
-F961>7387
-F962>7570
-F963>5317
-F964>78FB
-F965>4FBF
-F966>5FA9
-F967>4E0D
-F968>6CCC
-F969>6578
-F96A>7D22
-F96B>53C3
-F96C>585E
-F96D>7701
-F96E>8449
-F96F>8AAA
-F970>6BBA
-F971>8FB0
-F972>6C88
-F973>62FE
-F974>82E5
-F975>63A0
-F976>7565
-F977>4EAE
-F978>5169
-F979>51C9
-F97A>6881
-F97B>7CE7
-F97C>826F
-F97D>8AD2
-F97E>91CF
-F97F>52F5
-F980>5442
-F981>5973
-F982>5EEC
-F983>65C5
-F984>6FFE
-F985>792A
-F986>95AD
-F987>9A6A
-F988>9E97
-F989>9ECE
-F98A>529B
-F98B>66C6
-F98C>6B77
-F98D>8F62
-F98E>5E74
-F98F>6190
-F990>6200
-F991>649A
-F992>6F23
-F993>7149
-F994>7489
-F995>79CA
-F996>7DF4
-F997>806F
-F998>8F26
-F999>84EE
-F99A>9023
-F99B>934A
-F99C>5217
-F99D>52A3
-F99E>54BD
-F99F>70C8
-F9A0>88C2
-F9A1>8AAA
-F9A2>5EC9
-F9A3>5FF5
-F9A4>637B
-F9A5>6BAE
-F9A6>7C3E
-F9A7>7375
-F9A8>4EE4
-F9A9>56F9
-F9AA>5BE7
-F9AB>5DBA
-F9AC>601C
-F9AD>73B2
-F9AE>7469
-F9AF>7F9A
-F9B0>8046
-F9B1>9234
-F9B2>96F6
-F9B3>9748
-F9B4>9818
-F9B5>4F8B
-F9B6>79AE
-F9B7>91B4
-F9B8>96B8
-F9B9>60E1
-F9BA>4E86
-F9BB>50DA
-F9BC>5BEE
-F9BD>5C3F
-F9BE>6599
-F9BF>6A02
-F9C0>71CE
-F9C1>7642
-F9C2>84FC
-F9C3>907C
-F9C4>9F8D
-F9C5>6688
-F9C6>962E
-F9C7>5289
-F9C8>677B
-F9C9>67F3
-F9CA>6D41
-F9CB>6E9C
-F9CC>7409
-F9CD>7559
-F9CE>786B
-F9CF>7D10
-F9D0>985E
-F9D1>516D
-F9D2>622E
-F9D3>9678
-F9D4>502B
-F9D5>5D19
-F9D6>6DEA
-F9D7>8F2A
-F9D8>5F8B
-F9D9>6144
-F9DA>6817
-F9DB>7387
-F9DC>9686
-F9DD>5229
-F9DE>540F
-F9DF>5C65
-F9E0>6613
-F9E1>674E
-F9E2>68A8
-F9E3>6CE5
-F9E4>7406
-F9E5>75E2
-F9E6>7F79
-F9E7>88CF
-F9E8>88E1
-F9E9>91CC
-F9EA>96E2
-F9EB>533F
-F9EC>6EBA
-F9ED>541D
-F9EE>71D0
-F9EF>7498
-F9F0>85FA
-F9F1>96A3
-F9F2>9C57
-F9F3>9E9F
-F9F4>6797
-F9F5>6DCB
-F9F6>81E8
-F9F7>7ACB
-F9F8>7B20
-F9F9>7C92
-F9FA>72C0
-F9FB>7099
-F9FC>8B58
-F9FD>4EC0
-F9FE>8336
-F9FF>523A
-FA00>5207
-FA01>5EA6
-FA02>62D3
-FA03>7CD6
-FA04>5B85
-FA05>6D1E
-FA06>66B4
-FA07>8F3B
-FA08>884C
-FA09>964D
-FA0A>898B
-FA0B>5ED3
-FA0C>5140
-FA0D>55C0
-FA10>585A
-FA12>6674
-FA15>51DE
-FA16>732A
-FA17>76CA
-FA18>793C
-FA19>795E
-FA1A>7965
-FA1B>798F
-FA1C>9756
-FA1D>7CBE
-FA1E>7FBD
-FA20>8612
-FA22>8AF8
-FA25>9038
-FA26>90FD
-FA2A>98EF
-FA2B>98FC
-FA2C>9928
-FA2D>9DB4
-FA30>4FAE
-FA31>50E7
-FA32>514D
-FA33>52C9
-FA34>52E4
-FA35>5351
-FA36>559D
-FA37>5606
-FA38>5668
-FA39>5840
-FA3A>58A8
-FA3B>5C64
-FA3C>5C6E
-FA3D>6094
-FA3E>6168
-FA3F>618E
-FA40>61F2
-FA41>654F
-FA42>65E2
-FA43>6691
-FA44>6885
-FA45>6D77
-FA46>6E1A
-FA47>6F22
-FA48>716E
-FA49>722B
-FA4A>7422
-FA4B>7891
-FA4C>793E
-FA4D>7949
-FA4E>7948
-FA4F>7950
-FA50>7956
-FA51>795D
-FA52>798D
-FA53>798E
-FA54>7A40
-FA55>7A81
-FA56>7BC0
-FA57>7DF4
-FA58>7E09
-FA59>7E41
-FA5A>7F72
-FA5B>8005
-FA5C>81ED
-FA5D>8279
-FA5E>8279
-FA5F>8457
-FA60>8910
-FA61>8996
-FA62>8B01
-FA63>8B39
-FA64>8CD3
-FA65>8D08
-FA66>8FB6
-FA67>9038
-FA68>96E3
-FA69>97FF
-FA6A>983B
-FA6B>6075
-FA6C>242EE
-FA6D>8218
-FA70>4E26
-FA71>51B5
-FA72>5168
-FA73>4F80
-FA74>5145
-FA75>5180
-FA76>52C7
-FA77>52FA
-FA78>559D
-FA79>5555
-FA7A>5599
-FA7B>55E2
-FA7C>585A
-FA7D>58B3
-FA7E>5944
-FA7F>5954
-FA80>5A62
-FA81>5B28
-FA82>5ED2
-FA83>5ED9
-FA84>5F69
-FA85>5FAD
-FA86>60D8
-FA87>614E
-FA88>6108
-FA89>618E
-FA8A>6160
-FA8B>61F2
-FA8C>6234
-FA8D>63C4
-FA8E>641C
-FA8F>6452
-FA90>6556
-FA91>6674
-FA92>6717
-FA93>671B
-FA94>6756
-FA95>6B79
-FA96>6BBA
-FA97>6D41
-FA98>6EDB
-FA99>6ECB
-FA9A>6F22
-FA9B>701E
-FA9C>716E
-FA9D>77A7
-FA9E>7235
-FA9F>72AF
-FAA0>732A
-FAA1>7471
-FAA2>7506
-FAA3>753B
-FAA4>761D
-FAA5>761F
-FAA6>76CA
-FAA7>76DB
-FAA8>76F4
-FAA9>774A
-FAAA>7740
-FAAB>78CC
-FAAC>7AB1
-FAAD>7BC0
-FAAE>7C7B
-FAAF>7D5B
-FAB0>7DF4
-FAB1>7F3E
-FAB2>8005
-FAB3>8352
-FAB4>83EF
-FAB5>8779
-FAB6>8941
-FAB7>8986
-FAB8>8996
-FAB9>8ABF
-FABA>8AF8
-FABB>8ACB
-FABC>8B01
-FABD>8AFE
-FABE>8AED
-FABF>8B39
-FAC0>8B8A
-FAC1>8D08
-FAC2>8F38
-FAC3>9072
-FAC4>9199
-FAC5>9276
-FAC6>967C
-FAC7>96E3
-FAC8>9756
-FAC9>97DB
-FACA>97FF
-FACB>980B
-FACC>983B
-FACD>9B12
-FACE>9F9C
-FACF>2284A
-FAD0>22844
-FAD1>233D5
-FAD2>3B9D
-FAD3>4018
-FAD4>4039
-FAD5>25249
-FAD6>25CD0
-FAD7>27ED3
-FAD8>9F43
-FAD9>9F8E
+A7F8>0126
+A7F9>0153
 FB00>0066 0066
 FB01>0066 0069
 FB02>0066 006C
@@ -3107,8 +1376,6 @@ FB14>0574 0565
 FB15>0574 056B
 FB16>057E 0576
 FB17>0574 056D
-FB1D>05D9 05B4
-FB1F>05F2 05B7
 FB20>05E2
 FB21>05D0
 FB22>05D3
@@ -3119,38 +1386,6 @@ FB26>05DD
 FB27>05E8
 FB28>05EA
 FB29>002B
-FB2A>05E9 05C1
-FB2B>05E9 05C2
-FB2C>FB49 05C1
-FB2D>FB49 05C2
-FB2E>05D0 05B7
-FB2F>05D0 05B8
-FB30>05D0 05BC
-FB31>05D1 05BC
-FB32>05D2 05BC
-FB33>05D3 05BC
-FB34>05D4 05BC
-FB35>05D5 05BC
-FB36>05D6 05BC
-FB38>05D8 05BC
-FB39>05D9 05BC
-FB3A>05DA 05BC
-FB3B>05DB 05BC
-FB3C>05DC 05BC
-FB3E>05DE 05BC
-FB40>05E0 05BC
-FB41>05E1 05BC
-FB43>05E3 05BC
-FB44>05E4 05BC
-FB46>05E6 05BC
-FB47>05E7 05BC
-FB48>05E8 05BC
-FB49>05E9 05BC
-FB4A>05EA 05BC
-FB4B>05D5 05B9
-FB4C>05D1 05BF
-FB4D>05DB 05BF
-FB4E>05E4 05BF
 FB4F>05D0 05DC
 FB50>0671
 FB51>0671
@@ -4174,22 +2409,6 @@ FFEB>2192
 FFEC>2193
 FFED>25A0
 FFEE>25CB
-1109A>11099 110BA
-1109C>1109B 110BA
-110AB>110A5 110BA
-1D15E>1D157 1D165
-1D15F>1D158 1D165
-1D160>1D15F 1D16E
-1D161>1D15F 1D16F
-1D162>1D15F 1D170
-1D163>1D15F 1D171
-1D164>1D15F 1D172
-1D1BB>1D1B9 1D165
-1D1BC>1D1BA 1D165
-1D1BD>1D1BB 1D16E
-1D1BE>1D1BC 1D16E
-1D1BF>1D1BB 1D16F
-1D1C0>1D1BC 1D16F
 1D400>0041
 1D401>0042
 1D402>0043
@@ -5186,6 +3405,147 @@ FFEE>25CB
 1D7FD>0037
 1D7FE>0038
 1D7FF>0039
+1EE00>0627
+1EE01>0628
+1EE02>062C
+1EE03>062F
+1EE05>0648
+1EE06>0632
+1EE07>062D
+1EE08>0637
+1EE09>064A
+1EE0A>0643
+1EE0B>0644
+1EE0C>0645
+1EE0D>0646
+1EE0E>0633
+1EE0F>0639
+1EE10>0641
+1EE11>0635
+1EE12>0642
+1EE13>0631
+1EE14>0634
+1EE15>062A
+1EE16>062B
+1EE17>062E
+1EE18>0630
+1EE19>0636
+1EE1A>0638
+1EE1B>063A
+1EE1C>066E
+1EE1D>06BA
+1EE1E>06A1
+1EE1F>066F
+1EE21>0628
+1EE22>062C
+1EE24>0647
+1EE27>062D
+1EE29>064A
+1EE2A>0643
+1EE2B>0644
+1EE2C>0645
+1EE2D>0646
+1EE2E>0633
+1EE2F>0639
+1EE30>0641
+1EE31>0635
+1EE32>0642
+1EE34>0634
+1EE35>062A
+1EE36>062B
+1EE37>062E
+1EE39>0636
+1EE3B>063A
+1EE42>062C
+1EE47>062D
+1EE49>064A
+1EE4B>0644
+1EE4D>0646
+1EE4E>0633
+1EE4F>0639
+1EE51>0635
+1EE52>0642
+1EE54>0634
+1EE57>062E
+1EE59>0636
+1EE5B>063A
+1EE5D>06BA
+1EE5F>066F
+1EE61>0628
+1EE62>062C
+1EE64>0647
+1EE67>062D
+1EE68>0637
+1EE69>064A
+1EE6A>0643
+1EE6C>0645
+1EE6D>0646
+1EE6E>0633
+1EE6F>0639
+1EE70>0641
+1EE71>0635
+1EE72>0642
+1EE74>0634
+1EE75>062A
+1EE76>062B
+1EE77>062E
+1EE79>0636
+1EE7A>0638
+1EE7B>063A
+1EE7C>066E
+1EE7E>06A1
+1EE80>0627
+1EE81>0628
+1EE82>062C
+1EE83>062F
+1EE84>0647
+1EE85>0648
+1EE86>0632
+1EE87>062D
+1EE88>0637
+1EE89>064A
+1EE8B>0644
+1EE8C>0645
+1EE8D>0646
+1EE8E>0633
+1EE8F>0639
+1EE90>0641
+1EE91>0635
+1EE92>0642
+1EE93>0631
+1EE94>0634
+1EE95>062A
+1EE96>062B
+1EE97>062E
+1EE98>0630
+1EE99>0636
+1EE9A>0638
+1EE9B>063A
+1EEA1>0628
+1EEA2>062C
+1EEA3>062F
+1EEA5>0648
+1EEA6>0632
+1EEA7>062D
+1EEA8>0637
+1EEA9>064A
+1EEAB>0644
+1EEAC>0645
+1EEAD>0646
+1EEAE>0633
+1EEAF>0639
+1EEB0>0641
+1EEB1>0635
+1EEB2>0642
+1EEB3>0631
+1EEB4>0634
+1EEB5>062A
+1EEB6>062B
+1EEB7>062E
+1EEB8>0630
+1EEB9>0636
+1EEBA>0638
+1EEBB>063A
 1F100>0030 002E
 1F101>0030 002C
 1F102>0031 002C
@@ -5260,6 +3620,8 @@ FFEE>25CB
 1F14D>0053 0053
 1F14E>0050 0050 0056
 1F14F>0057 0043
+1F16A>004D 0043
+1F16B>004D 0044
 1F190>0044 004A
 1F200>307B 304B
 1F201>30B3 30B3
@@ -5318,545 +3680,3 @@ FFEE>25CB
 1F248>3014 6557 3015
 1F250>5F97
 1F251>53EF
-2F800>4E3D
-2F801>4E38
-2F802>4E41
-2F803>20122
-2F804>4F60
-2F805>4FAE
-2F806>4FBB
-2F807>5002
-2F808>507A
-2F809>5099
-2F80A>50E7
-2F80B>50CF
-2F80C>349E
-2F80D>2063A
-2F80E>514D
-2F80F>5154
-2F810>5164
-2F811>5177
-2F812>2051C
-2F813>34B9
-2F814>5167
-2F815>518D
-2F816>2054B
-2F817>5197
-2F818>51A4
-2F819>4ECC
-2F81A>51AC
-2F81B>51B5
-2F81C>291DF
-2F81D>51F5
-2F81E>5203
-2F81F>34DF
-2F820>523B
-2F821>5246
-2F822>5272
-2F823>5277
-2F824>3515
-2F825>52C7
-2F826>52C9
-2F827>52E4
-2F828>52FA
-2F829>5305
-2F82A>5306
-2F82B>5317
-2F82C>5349
-2F82D>5351
-2F82E>535A
-2F82F>5373
-2F830>537D
-2F831>537F
-2F832>537F
-2F833>537F
-2F834>20A2C
-2F835>7070
-2F836>53CA
-2F837>53DF
-2F838>20B63
-2F839>53EB
-2F83A>53F1
-2F83B>5406
-2F83C>549E
-2F83D>5438
-2F83E>5448
-2F83F>5468
-2F840>54A2
-2F841>54F6
-2F842>5510
-2F843>5553
-2F844>5563
-2F845>5584
-2F846>5584
-2F847>5599
-2F848>55AB
-2F849>55B3
-2F84A>55C2
-2F84B>5716
-2F84C>5606
-2F84D>5717
-2F84E>5651
-2F84F>5674
-2F850>5207
-2F851>58EE
-2F852>57CE
-2F853>57F4
-2F854>580D
-2F855>578B
-2F856>5832
-2F857>5831
-2F858>58AC
-2F859>214E4
-2F85A>58F2
-2F85B>58F7
-2F85C>5906
-2F85D>591A
-2F85E>5922
-2F85F>5962
-2F860>216A8
-2F861>216EA
-2F862>59EC
-2F863>5A1B
-2F864>5A27
-2F865>59D8
-2F866>5A66
-2F867>36EE
-2F868>36FC
-2F869>5B08
-2F86A>5B3E
-2F86B>5B3E
-2F86C>219C8
-2F86D>5BC3
-2F86E>5BD8
-2F86F>5BE7
-2F870>5BF3
-2F871>21B18
-2F872>5BFF
-2F873>5C06
-2F874>5F53
-2F875>5C22
-2F876>3781
-2F877>5C60
-2F878>5C6E
-2F879>5CC0
-2F87A>5C8D
-2F87B>21DE4
-2F87C>5D43
-2F87D>21DE6
-2F87E>5D6E
-2F87F>5D6B
-2F880>5D7C
-2F881>5DE1
-2F882>5DE2
-2F883>382F
-2F884>5DFD
-2F885>5E28
-2F886>5E3D
-2F887>5E69
-2F888>3862
-2F889>22183
-2F88A>387C
-2F88B>5EB0
-2F88C>5EB3
-2F88D>5EB6
-2F88E>5ECA
-2F88F>2A392
-2F890>5EFE
-2F891>22331
-2F892>22331
-2F893>8201
-2F894>5F22
-2F895>5F22
-2F896>38C7
-2F897>232B8
-2F898>261DA
-2F899>5F62
-2F89A>5F6B
-2F89B>38E3
-2F89C>5F9A
-2F89D>5FCD
-2F89E>5FD7
-2F89F>5FF9
-2F8A0>6081
-2F8A1>393A
-2F8A2>391C
-2F8A3>6094
-2F8A4>226D4
-2F8A5>60C7
-2F8A6>6148
-2F8A7>614C
-2F8A8>614E
-2F8A9>614C
-2F8AA>617A
-2F8AB>618E
-2F8AC>61B2
-2F8AD>61A4
-2F8AE>61AF
-2F8AF>61DE
-2F8B0>61F2
-2F8B1>61F6
-2F8B2>6210
-2F8B3>621B
-2F8B4>625D
-2F8B5>62B1
-2F8B6>62D4
-2F8B7>6350
-2F8B8>22B0C
-2F8B9>633D
-2F8BA>62FC
-2F8BB>6368
-2F8BC>6383
-2F8BD>63E4
-2F8BE>22BF1
-2F8BF>6422
-2F8C0>63C5
-2F8C1>63A9
-2F8C2>3A2E
-2F8C3>6469
-2F8C4>647E
-2F8C5>649D
-2F8C6>6477
-2F8C7>3A6C
-2F8C8>654F
-2F8C9>656C
-2F8CA>2300A
-2F8CB>65E3
-2F8CC>66F8
-2F8CD>6649
-2F8CE>3B19
-2F8CF>6691
-2F8D0>3B08
-2F8D1>3AE4
-2F8D2>5192
-2F8D3>5195
-2F8D4>6700
-2F8D5>669C
-2F8D6>80AD
-2F8D7>43D9
-2F8D8>6717
-2F8D9>671B
-2F8DA>6721
-2F8DB>675E
-2F8DC>6753
-2F8DD>233C3
-2F8DE>3B49
-2F8DF>67FA
-2F8E0>6785
-2F8E1>6852
-2F8E2>6885
-2F8E3>2346D
-2F8E4>688E
-2F8E5>681F
-2F8E6>6914
-2F8E7>3B9D
-2F8E8>6942
-2F8E9>69A3
-2F8EA>69EA
-2F8EB>6AA8
-2F8EC>236A3
-2F8ED>6ADB
-2F8EE>3C18
-2F8EF>6B21
-2F8F0>238A7
-2F8F1>6B54
-2F8F2>3C4E
-2F8F3>6B72
-2F8F4>6B9F
-2F8F5>6BBA
-2F8F6>6BBB
-2F8F7>23A8D
-2F8F8>21D0B
-2F8F9>23AFA
-2F8FA>6C4E
-2F8FB>23CBC
-2F8FC>6CBF
-2F8FD>6CCD
-2F8FE>6C67
-2F8FF>6D16
-2F900>6D3E
-2F901>6D77
-2F902>6D41
-2F903>6D69
-2F904>6D78
-2F905>6D85
-2F906>23D1E
-2F907>6D34
-2F908>6E2F
-2F909>6E6E
-2F90A>3D33
-2F90B>6ECB
-2F90C>6EC7
-2F90D>23ED1
-2F90E>6DF9
-2F90F>6F6E
-2F910>23F5E
-2F911>23F8E
-2F912>6FC6
-2F913>7039
-2F914>701E
-2F915>701B
-2F916>3D96
-2F917>704A
-2F918>707D
-2F919>7077
-2F91A>70AD
-2F91B>20525
-2F91C>7145
-2F91D>24263
-2F91E>719C
-2F91F>243AB
-2F920>7228
-2F921>7235
-2F922>7250
-2F923>24608
-2F924>7280
-2F925>7295
-2F926>24735
-2F927>24814
-2F928>737A
-2F929>738B
-2F92A>3EAC
-2F92B>73A5
-2F92C>3EB8
-2F92D>3EB8
-2F92E>7447
-2F92F>745C
-2F930>7471
-2F931>7485
-2F932>74CA
-2F933>3F1B
-2F934>7524
-2F935>24C36
-2F936>753E
-2F937>24C92
-2F938>7570
-2F939>2219F
-2F93A>7610
-2F93B>24FA1
-2F93C>24FB8
-2F93D>25044
-2F93E>3FFC
-2F93F>4008
-2F940>76F4
-2F941>250F3
-2F942>250F2
-2F943>25119
-2F944>25133
-2F945>771E
-2F946>771F
-2F947>771F
-2F948>774A
-2F949>4039
-2F94A>778B
-2F94B>4046
-2F94C>4096
-2F94D>2541D
-2F94E>784E
-2F94F>788C
-2F950>78CC
-2F951>40E3
-2F952>25626
-2F953>7956
-2F954>2569A
-2F955>256C5
-2F956>798F
-2F957>79EB
-2F958>412F
-2F959>7A40
-2F95A>7A4A
-2F95B>7A4F
-2F95C>2597C
-2F95D>25AA7
-2F95E>25AA7
-2F95F>7AEE
-2F960>4202
-2F961>25BAB
-2F962>7BC6
-2F963>7BC9
-2F964>4227
-2F965>25C80
-2F966>7CD2
-2F967>42A0
-2F968>7CE8
-2F969>7CE3
-2F96A>7D00
-2F96B>25F86
-2F96C>7D63
-2F96D>4301
-2F96E>7DC7
-2F96F>7E02
-2F970>7E45
-2F971>4334
-2F972>26228
-2F973>26247
-2F974>4359
-2F975>262D9
-2F976>7F7A
-2F977>2633E
-2F978>7F95
-2F979>7FFA
-2F97A>8005
-2F97B>264DA
-2F97C>26523
-2F97D>8060
-2F97E>265A8
-2F97F>8070
-2F980>2335F
-2F981>43D5
-2F982>80B2
-2F983>8103
-2F984>440B
-2F985>813E
-2F986>5AB5
-2F987>267A7
-2F988>267B5
-2F989>23393
-2F98A>2339C
-2F98B>8201
-2F98C>8204
-2F98D>8F9E
-2F98E>446B
-2F98F>8291
-2F990>828B
-2F991>829D
-2F992>52B3
-2F993>82B1
-2F994>82B3
-2F995>82BD
-2F996>82E6
-2F997>26B3C
-2F998>82E5
-2F999>831D
-2F99A>8363
-2F99B>83AD
-2F99C>8323
-2F99D>83BD
-2F99E>83E7
-2F99F>8457
-2F9A0>8353
-2F9A1>83CA
-2F9A2>83CC
-2F9A3>83DC
-2F9A4>26C36
-2F9A5>26D6B
-2F9A6>26CD5
-2F9A7>452B
-2F9A8>84F1
-2F9A9>84F3
-2F9AA>8516
-2F9AB>273CA
-2F9AC>8564
-2F9AD>26F2C
-2F9AE>455D
-2F9AF>4561
-2F9B0>26FB1
-2F9B1>270D2
-2F9B2>456B
-2F9B3>8650
-2F9B4>865C
-2F9B5>8667
-2F9B6>8669
-2F9B7>86A9
-2F9B8>8688
-2F9B9>870E
-2F9BA>86E2
-2F9BB>8779
-2F9BC>8728
-2F9BD>876B
-2F9BE>8786
-2F9BF>45D7
-2F9C0>87E1
-2F9C1>8801
-2F9C2>45F9
-2F9C3>8860
-2F9C4>8863
-2F9C5>27667
-2F9C6>88D7
-2F9C7>88DE
-2F9C8>4635
-2F9C9>88FA
-2F9CA>34BB
-2F9CB>278AE
-2F9CC>27966
-2F9CD>46BE
-2F9CE>46C7
-2F9CF>8AA0
-2F9D0>8AED
-2F9D1>8B8A
-2F9D2>8C55
-2F9D3>27CA8
-2F9D4>8CAB
-2F9D5>8CC1
-2F9D6>8D1B
-2F9D7>8D77
-2F9D8>27F2F
-2F9D9>20804
-2F9DA>8DCB
-2F9DB>8DBC
-2F9DC>8DF0
-2F9DD>208DE
-2F9DE>8ED4
-2F9DF>8F38
-2F9E0>285D2
-2F9E1>285ED
-2F9E2>9094
-2F9E3>90F1
-2F9E4>9111
-2F9E5>2872E
-2F9E6>911B
-2F9E7>9238
-2F9E8>92D7
-2F9E9>92D8
-2F9EA>927C
-2F9EB>93F9
-2F9EC>9415
-2F9ED>28BFA
-2F9EE>958B
-2F9EF>4995
-2F9F0>95B7
-2F9F1>28D77
-2F9F2>49E6
-2F9F3>96C3
-2F9F4>5DB2
-2F9F5>9723
-2F9F6>29145
-2F9F7>2921A
-2F9F8>4A6E
-2F9F9>4A76
-2F9FA>97E0
-2F9FB>2940A
-2F9FC>4AB2
-2F9FD>29496
-2F9FE>980B
-2F9FF>980B
-2FA00>9829
-2FA01>295B6
-2FA02>98E2
-2FA03>4B33
-2FA04>9929
-2FA05>99A7
-2FA06>99C2
-2FA07>99FE
-2FA08>4BCE
-2FA09>29B30
-2FA0A>9B12
-2FA0B>9C40
-2FA0C>9CFD
-2FA0D>4CCE
-2FA0E>4CED
-2FA0F>9D67
-2FA10>2A0CE
-2FA11>4CF8
-2FA12>2A105
-2FA13>2A20E
-2FA14>2A291
-2FA15>9EBB
-2FA16>4D56
-2FA17>9EF9
-2FA18>9EFE
-2FA19>9F05
-2FA1A>9F0F
-2FA1B>9F16
-2FA1C>9F3B
-2FA1D>2A600