Merge branch 'parse-unikemet' into parse-tangut-and-nüshu-sources

unicode-org · Jun 7, 2024 · 1200b0a · 1200b0a
2 parents 424e301 + f2d062c
commit 1200b0a
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 15 deletions.
diff --git a/unicodetools/data/ucd/dev/PropertyAliases.txt b/unicodetools/data/ucd/dev/PropertyAliases.txt
@@ -1,5 +1,5 @@
 # PropertyAliases-16.0.0.txt
-# Date: 2024-04-30, 21:48:30 GMT
+# Date: 2024-06-06, 21:52:48 GMT
 # © 2024 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
@@ -99,6 +99,11 @@ cjkIRG_VSource           ; kIRG_VSource
 cjkRSUnicode             ; kRSUnicode                  ; Unicode_Radical_Stroke; URS
 isc                      ; ISO_Comment
 JSN                      ; Jamo_Short_Name
+kEH_Cat                  ; kEH_Cat
+kEH_Desc                 ; kEH_Desc
+kEH_HG                   ; kEH_HG
+kEH_IFAO                 ; kEH_IFAO
+kEH_JSesh                ; kEH_JSesh
 na                       ; Name
 na1                      ; Unicode_1_Name
 Name_Alias               ; Name_Alias
@@ -179,6 +184,8 @@ IDSB                     ; IDS_Binary_Operator
 IDST                     ; IDS_Trinary_Operator
 IDSU                     ; IDS_Unary_Operator
 Join_C                   ; Join_Control
+kEH_NoMirror             ; kEH_NoMirror
+kEH_NoRotate             ; kEH_NoRotate
 LOE                      ; Logical_Order_Exception
 Lower                    ; Lowercase
 Math                     ; Math
@@ -213,6 +220,6 @@ XO_NFKC                  ; Expands_On_NFKC
 XO_NFKD                  ; Expands_On_NFKD
 
 # ================================================
-# Total:    135
+# Total:    142
 
 # EOF
diff --git a/unicodetools/data/ucd/dev/PropertyValueAliases.txt b/unicodetools/data/ucd/dev/PropertyValueAliases.txt
@@ -1,5 +1,5 @@
 # PropertyValueAliases-16.0.0.txt
-# Date: 2024-04-30, 21:48:30 GMT
+# Date: 2024-06-06, 22:21:34 GMT
 # © 2024 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use and license, see https://www.unicode.org/terms_of_use.html
@@ -1674,4 +1674,34 @@ XIDS; Y                               ; Yes                              ; T
 
 # @missing: 0000..10FFFF; cjkRSUnicode; <none>
 
+# kEH_Cat (kEH_Cat)
+
+# @missing: 0000..10FFFF; kEH_Cat; <none>
+
+# kEH_Desc (kEH_Desc)
+
+# @missing: 0000..10FFFF; kEH_Desc; <none>
+
+# kEH_HG (kEH_HG)
+
+# @missing: 0000..10FFFF; kEH_HG; <none>
+
+# kEH_IFAO (kEH_IFAO)
+
+# @missing: 0000..10FFFF; kEH_IFAO; <none>
+
+# kEH_JSesh (kEH_JSesh)
+
+# @missing: 0000..10FFFF; kEH_JSesh; <none>
+
+# kEH_NoMirror (kEH_NoMirror)
+
+kEH_NoMirror; N                       ; No                               ; F                                ; False
+kEH_NoMirror; Y                       ; Yes                              ; T                                ; True
+
+# kEH_NoRotate (kEH_NoRotate)
+
+kEH_NoRotate; N                       ; No                               ; F                                ; False
+kEH_NoRotate; Y                       ; Yes                              ; T                                ; True
+
 # EOF
diff --git a/unicodetools/src/main/java/org/unicode/props/PropertyStatus.java b/unicodetools/src/main/java/org/unicode/props/PropertyStatus.java
@@ -131,6 +131,7 @@ public enum PropertyScope {
                     UcdProperty.Emoji_KDDI,
                     UcdProperty.Emoji_SB);
 
+    // TODO(egg): These lists are not up to date!
     private static final EnumSet<UcdProperty> CONTRIBUTORY_PROPERTY =
             EnumSet.of(
                     UcdProperty.Jamo_Short_Name,
@@ -230,7 +231,10 @@ public enum PropertyScope {
                     UcdProperty.Named_Sequences_Prov,
                     UcdProperty.Regional_Indicator,
                     UcdProperty.Standardized_Variant,
-                    UcdProperty.Vertical_Orientation);
+                    UcdProperty.Vertical_Orientation,
+                    // Unikemet
+                    UcdProperty.kEH_Cat,
+                    UcdProperty.kEH_Desc);
 
     private static final EnumSet<UcdProperty> NORMATIVE_PROPERTY =
             EnumSet.of(
@@ -290,7 +294,13 @@ public enum PropertyScope {
                     UcdProperty.kIRG_MSource,
                     UcdProperty.kIRG_TSource,
                     UcdProperty.kIRG_USource,
-                    UcdProperty.kIRG_VSource);
+                    UcdProperty.kIRG_VSource,
+                    // Unikemet
+                    UcdProperty.kEH_HG,
+                    UcdProperty.kEH_IFAO,
+                    UcdProperty.kEH_JSesh,
+                    UcdProperty.kEH_NoMirror,
+                    UcdProperty.kEH_NoRotate);
     private static final EnumSet<UcdProperty> IMMUTABLE_PROPERTY =
             EnumSet.of(
                     UcdProperty.Name,

diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/ToolUnicodePropertySource.java b/unicodetools/src/main/java/org/unicode/text/UCD/ToolUnicodePropertySource.java
@@ -309,6 +309,13 @@ public String _getValue(int codepoint) {
                 "cjkIRG_VSource",
                 "cjkIRG_VSource",
                 "kIRG_VSource");
+        add(iup.getProperty("kEH_Cat"));
+        add(iup.getProperty("kEH_Desc"));
+        add(iup.getProperty("kEH_HG"));
+        add(iup.getProperty("kEH_IFAO"));
+        add(iup.getProperty("kEH_JSesh"));
+        add(iup.getProperty("kEH_NoMirror"));
+        add(iup.getProperty("kEH_NoRotate"));
         add(iup.getProperty("Emoji"));
         add(iup.getProperty("Emoji_Presentation"));
         add(iup.getProperty("Emoji_Modifier"));

diff --git a/unicodetools/src/main/resources/org/unicode/props/ExtraPropertyAliases.txt b/unicodetools/src/main/resources/org/unicode/props/ExtraPropertyAliases.txt
@@ -173,11 +173,6 @@ kRSTUnicode              ; kRSTUnicode
 kSrc_NushuDuben          ; kSrc_NushuDuben
 kReading                 ; kReading
 
-kEH_Cat                  ; kEH_Cat
-kEH_Desc                 ; kEH_Desc
 kEH_Func                 ; kEH_Func
 kEH_FVal                 ; kEH_FVal
-kEH_JSesh                ; kEH_JSesh
-kEH_HG                   ; kEH_HG
-kEH_IFAO                 ; kEH_IFAO
 kEH_UniK                 ; kEH_UniK
diff --git a/unicodetools/src/main/resources/org/unicode/props/ExtraPropertyValueAliases.txt b/unicodetools/src/main/resources/org/unicode/props/ExtraPropertyValueAliases.txt
@@ -205,11 +205,6 @@ Do_Not_Emit_Type ; Preferred_Spelling       ; Preferred_Spelling
 # @missing: 0000..10FFFF; kSrc_NushuDuben ; <none>
 # @missing: 0000..10FFFF; kReading ; <none>
 
-# @missing: 0000..10FFFF; kEH_Cat ; <none>
-# @missing: 0000..10FFFF; kEH_Desc ; <none>
 # @missing: 0000..10FFFF; kEH_Func ; <none>
 # @missing: 0000..10FFFF; kEH_FVal ; <none>
-# @missing: 0000..10FFFF; kEH_JSesh ; <none>
-# @missing: 0000..10FFFF; kEH_HG ; <none>
-# @missing: 0000..10FFFF; kEH_IFAO ; <none>
 # @missing: 0000..10FFFF; kEH_UniK ; <none>