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 [1/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...

Author: sarowe
Date: Fri Jul 27 07:15:13 2012
New Revision: 1366298

URL: http://svn.apache.org/viewvc?rev=1366298&view=rev
Log:
LUCENE-3747: Support Unicode 6.1.0.  (backport from trunk r1365971, r1366231, r1366284)

Added:
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.java   (with props)
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std34/StandardTokenizerImpl34.jflex
      - copied, changed from r1366269, lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/ASCIITLD.jflex-macro
      - copied unchanged from r1366269, lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/SUPPLEMENTARY.jflex-macro
      - copied unchanged from r1366269, lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.java   (with props)
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/UAX29URLEmailTokenizerImpl36.jflex
      - copied, changed from r1366269, lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std36/package.html
      - copied, changed from r1366269, lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package.html
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_1_0.java
      - copied unchanged from r1365971, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_1_0.java
    lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-49.1.jar.sha1
      - copied unchanged from r1365971, lucene/dev/trunk/lucene/analysis/icu/lib/icu4j-49.1.jar.sha1
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/nfc.txt
      - copied unchanged from r1365971, lucene/dev/trunk/lucene/analysis/icu/src/data/utr30/nfc.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
      - copied unchanged from r1365971, lucene/dev/trunk/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
    lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/icu4j-49.1.jar.sha1
      - copied unchanged from r1365971, lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-49.1.jar.sha1
    lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/icu4j-49.1.jar.sha1
      - copied unchanged from r1365971, lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-49.1.jar.sha1
Removed:
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_0_0.java
    lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-4.8.1.1.jar.sha1
    lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIcuHack.java
    lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/icu4j-4.8.1.1.jar.sha1
    lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/icu4j-4.8.1.1.jar.sha1
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/analysis/common/build.xml
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ASCIITLD.jflex-macro
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/READ_BEFORE_REGENERATING.txt
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
    lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
    lucene/dev/branches/branch_4x/lucene/analysis/icu/build.xml
    lucene/dev/branches/branch_4x/lucene/analysis/icu/ivy.xml
    lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-LICENSE-BSD_LIKE.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/lib/icu4j-NOTICE.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/DingbatFolding.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/HanRadicalFolding.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/nfkc.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/data/utr30/nfkc_cf.txt
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Hebrew.brk
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Khmer.brk
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Lao.brk
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Myanmar.brk
    lucene/dev/branches/branch_4x/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/utr30.nrm
    lucene/dev/branches/branch_4x/lucene/analysis/kuromoji/build.xml
    lucene/dev/branches/branch_4x/lucene/benchmark/build.xml
    lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/ivy.xml
    lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/icu4j-LICENSE-BSD_LIKE.txt
    lucene/dev/branches/branch_4x/solr/contrib/analysis-extras/lib/icu4j-NOTICE.txt
    lucene/dev/branches/branch_4x/solr/contrib/extraction/ivy.xml
    lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/icu4j-LICENSE-BSD_LIKE.txt
    lucene/dev/branches/branch_4x/solr/contrib/extraction/lib/icu4j-NOTICE.txt

Modified: lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath Fri Jul 27 07:15:13 2012
@@ -98,7 +98,7 @@
 	<classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.8.2.jar"/>
 	<classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
 	<classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
-	<classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-4.8.1.1.jar"/>
+	<classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
 	<classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
 	<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
 	<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template Fri Jul 27 07:15:13 2012
@@ -143,7 +143,7 @@
       <dependency>
         <groupId>com.ibm.icu</groupId>
         <artifactId>icu4j</artifactId>
-        <version>4.8.1.1</version>
+        <version>49.1</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>

Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Fri Jul 27 07:15:13 2012
@@ -66,6 +66,8 @@ API Changes
   parallels with docScore and the default implementation is correct.
   (Robert Muir)
 
+* LUCENE-3747: Support Unicode 6.1.0. (Steve Rowe)
+
 Optimizations
 
 * LUCENE-4171: Performance improvements to Packed64.

Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/build.xml?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/build.xml Fri Jul 27 07:15:13 2012
@@ -78,6 +78,7 @@
     <run-jflex dir="src/java/org/apache/lucene/analysis/standard" name="StandardTokenizerImpl"/>
     <run-jflex dir="src/java/org/apache/lucene/analysis/standard" name="ClassicTokenizerImpl"/>
     <run-jflex dir="src/java/org/apache/lucene/analysis/standard/std31" name="StandardTokenizerImpl31"/>
+    <run-jflex dir="src/java/org/apache/lucene/analysis/standard/std34" name="StandardTokenizerImpl34"/>
   </target>
 
   <target name="jflex-UAX29URLEmailTokenizer" depends="jflex-check" if="jflex.present">
@@ -87,6 +88,7 @@
     <run-jflex dir="src/java/org/apache/lucene/analysis/standard" name="UAX29URLEmailTokenizerImpl"/>
     <run-jflex dir="src/java/org/apache/lucene/analysis/standard/std31" name="UAX29URLEmailTokenizerImpl31"/>
     <run-jflex dir="src/java/org/apache/lucene/analysis/standard/std34" name="UAX29URLEmailTokenizerImpl34"/>
+    <run-jflex dir="src/java/org/apache/lucene/analysis/standard/std36" name="UAX29URLEmailTokenizerImpl36"/>
   </target>
   
   <!-- Remove the inappropriate JFlex-generated constructor -->

Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro?rev=1366298&r1=1366297&r2=1366298&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.SUPPLEMENTARY.jflex-macro Fri Jul 27 07:15:13 2012
@@ -14,43 +14,49 @@
  * limitations under the License.
  */
 
-// Generated using ICU4J 4.8.1.1 on Friday, January 13, 2012 6:20:39 PM UTC
+// Generated using ICU4J 49.1.0.0 on Sunday, July 15, 2012 5:42:00 AM UTC
 // by org.apache.lucene.analysis.icu.GenerateHTMLStripCharFilterSupplementaryMacros
 
 
 ID_Start_Supp = (
-	  [\uD81A][\uDC00-\uDE38]
+	  [\uD802][\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72]
+	| [\uD81A][\uDC00-\uDE38]
 	| [\uD869][\uDC00-\uDED6\uDF00-\uDFFF]
 	| [\uD835][\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]
 	| [\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]
 	| [\uD82C][\uDC00\uDC01]
-	| [\uD804][\uDC03-\uDC37\uDC83-\uDCAF]
 	| [\uD86D][\uDC00-\uDF34\uDF40-\uDFFF]
+	| [\uD81B][\uDF00-\uDF44\uDF50\uDF93-\uDF9F]
 	| [\uD87E][\uDC00-\uDE1D]
+	| [\uD804][\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD83-\uDDB2\uDDC1-\uDDC4]
+	| [\uD83B][\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]
 	| [\uD809][\uDC00-\uDC62]
 	| [\uD808][\uDC00-\uDF6E]
 	| [\uD803][\uDC00-\uDC48]
 	| [\uD800][\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1E\uDF30-\uDF4A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]
 	| [\uD80D][\uDC00-\uDC2E]
+	| [\uD805][\uDE80-\uDEAA]
 	| [\uD86E][\uDC00-\uDC1D]
-	| [\uD802][\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDD00-\uDD15\uDD20-\uDD39\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72]
 	| [\uD801][\uDC00-\uDC9D]
 )
 ID_Continue_Supp = (
 	  [\uD81A][\uDC00-\uDE38]
 	| [\uD869][\uDC00-\uDED6\uDF00-\uDFFF]
 	| [\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]
-	| [\uD804][\uDC00-\uDC46\uDC66-\uDC6F\uDC80-\uDCBA]
 	| [\uD82C][\uDC00\uDC01]
-	| [\uD802][\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDD00-\uDD15\uDD20-\uDD39\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72]
+	| [\uD81B][\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]
 	| [\uD801][\uDC00-\uDC9D\uDCA0-\uDCA9]
 	| [\uD86D][\uDC00-\uDF34\uDF40-\uDFFF]
 	| [\uD87E][\uDC00-\uDE1D]
+	| [\uD802][\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72]
+	| [\uD805][\uDE80-\uDEB7\uDEC0-\uDEC9]
+	| [\uD83B][\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]
 	| [\uD809][\uDC00-\uDC62]
 	| [\uD808][\uDC00-\uDF6E]
 	| [\uD803][\uDC00-\uDC48]
 	| [\uD80D][\uDC00-\uDC2E]
 	| [\uD800][\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1E\uDF30-\uDF4A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]
+	| [\uD804][\uDC00-\uDC46\uDC66-\uDC6F\uDC80-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD80-\uDDC4\uDDD0-\uDDD9]
 	| [\uD86E][\uDC00-\uDC1D]
 	| [\uDB40][\uDD00-\uDDEF]
 	| [\uD834][\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]