Fixes from review

Author: jowilco

unicodetools/src/main/java/org/unicode/props/UcdProperty.java

@@ -105,11 +105,7 @@ public enum UcdProperty {
             ValueCardinality.Unordered,
             "Do_Not_Emit_Dispreferred"),
     Do_Not_Emit_Preferred(
-            PropertyType.String,
-            DerivedPropertyStatus.UCDNonProperty,
-            null,
-            ValueCardinality.Unordered,
-            "Do_Not_Emit_Preferred"),
+            PropertyType.String, DerivedPropertyStatus.UCDNonProperty, "Do_Not_Emit_Preferred"),
     Equivalent_Unified_Ideograph(PropertyType.String, DerivedPropertyStatus.Approved, "EqUIdeo"),
     FC_NFKC_Closure(PropertyType.String, DerivedPropertyStatus.Approved, "FC_NFKC"),
     Idn_Mapping(PropertyType.String, DerivedPropertyStatus.NonUCDNonProperty, "idnm"),
@@ -118,7 +114,11 @@ public enum UcdProperty {
     NFKC_Casefold(PropertyType.String, DerivedPropertyStatus.Approved, "NFKC_CF"),
     NFKC_Simple_Casefold(PropertyType.String, DerivedPropertyStatus.Approved, "NFKC_SCF"),
     Names_List_Cross_Ref(
-            PropertyType.String, DerivedPropertyStatus.UCDNonProperty, "Names_List_Cross_Ref"),
+            PropertyType.String,
+            DerivedPropertyStatus.UCDNonProperty,
+            null,
+            ValueCardinality.Unordered,
+            "Names_List_Cross_Ref"),
     Simple_Case_Folding(PropertyType.String, DerivedPropertyStatus.Approved, "scf", "sfc"),
     Simple_Lowercase_Mapping(PropertyType.String, DerivedPropertyStatus.Approved, "slc"),
     Simple_Titlecase_Mapping(PropertyType.String, DerivedPropertyStatus.Approved, "stc"),
@@ -128,12 +128,7 @@ public enum UcdProperty {
     kCompatibilityVariant(
             PropertyType.String, DerivedPropertyStatus.Approved, "cjkCompatibilityVariant"),
     kEH_AltSeq(PropertyType.String, DerivedPropertyStatus.Provisional, "kEH_AltSeq"),
-    kSEAL_MCJK(
-            PropertyType.String,
-            DerivedPropertyStatus.Provisional,
-            null,
-            ValueCardinality.Unordered,
-            "kSEAL_MCJK"),
+    kSEAL_MCJK(PropertyType.String, DerivedPropertyStatus.Provisional, "kSEAL_MCJK"),
     kSimplifiedVariant(
             PropertyType.String,
             DerivedPropertyStatus.Provisional,
@@ -205,9 +200,17 @@ public enum UcdProperty {
     Named_Sequences(PropertyType.Miscellaneous, DerivedPropertyStatus.UCDNonProperty, "NS"),
     Named_Sequences_Prov(PropertyType.Miscellaneous, DerivedPropertyStatus.UCDNonProperty, "NSP"),
     Names_List_Alias(
-            PropertyType.Miscellaneous, DerivedPropertyStatus.UCDNonProperty, "Names_List_Alias"),
+            PropertyType.Miscellaneous,
+            DerivedPropertyStatus.UCDNonProperty,
+            null,
+            ValueCardinality.Unordered,
+            "Names_List_Alias"),
     Names_List_Comment(
-            PropertyType.Miscellaneous, DerivedPropertyStatus.UCDNonProperty, "Names_List_Comment"),
+            PropertyType.Miscellaneous,
+            DerivedPropertyStatus.UCDNonProperty,
+            null,
+            ValueCardinality.Unordered,
+            "Names_List_Comment"),
     Names_List_Subheader(
             PropertyType.Miscellaneous,
             DerivedPropertyStatus.UCDNonProperty,

unicodetools/src/main/resources/org/unicode/props/IndexPropertyRegex.txt

@@ -76,16 +76,16 @@ Arabic_Shaping_Schematic_Name ; SINGLE_VALUED ;             .*
 CJK_Radical ;                 ORDERED ;                     [0-9]{1,3}'{0,3}
 Do_Not_Emit_Dispreferred ;    MULTI_VALUED ;                .*
 Do_Not_Emit_Dispreferred_Type ; MULTI_VALUED ;              <enum>
-Do_Not_Emit_Preferred ;       MULTI_VALUED ;                .*
+Do_Not_Emit_Preferred ;       SINGLE_VALUED ;               .*
 Emoji_DCM ;                   SINGLE_VALUED ;               [0-9A-F]{4}
 Emoji_KDDI ;                  SINGLE_VALUED ;               [0-9A-F]{4}
 Emoji_SB ;                    SINGLE_VALUED ;               [0-9A-F]{4}
 emoji_variation_sequence ;    SINGLE_VALUED ;               text style|emoji style
 Named_Sequences ;             SINGLE_VALUED ;               $name
 Named_Sequences_Prov ;        SINGLE_VALUED ;               $name
-Names_List_Alias  ;           SINGLE_VALUED ;               .*
-Names_List_Comment ;          SINGLE_VALUED ;               .*
-Names_List_Cross_Ref ;        SINGLE_VALUED ;               .*
+Names_List_Alias  ;           MULTI_VALUED ;                .*
+Names_List_Comment ;          MULTI_VALUED ;                .*
+Names_List_Cross_Ref ;        MULTI_VALUED ;                .*
 Names_List_Subheader ;        MULTI_VALUED ;                .*
 Names_List_Subheader_Notice ; MULTI_VALUED ;                .*
 Non_Unihan_Numeric_Value ;    SINGLE_VALUED ;               NaN|$rational
@@ -250,7 +250,7 @@ kTGT_Numeric ;                SINGLE_VALUED ;                NaN|$digit+|$positi
 ## Seal
 kSEAL_CCZSrc ;                SINGLE_VALUED ;                C-\d{5}
 kSEAL_DYCSrc ;                SINGLE_VALUED ;                D-\d{5}
-kSEAL_MCJK ;                  MULTI_VALUED ;                 [0-9A-F]{4,5}
+kSEAL_MCJK ;                  SINGLE_VALUED ;                [0-9A-F]{4,5}
 kSEAL_QJZSrc ;                SINGLE_VALUED ;                K-\d{5}
 kSEAL_Rad ;                   MULTI_VALUED ;                 \d{1,3}\.[A-F0-9]{4,5}
-kSEAL_THXSrc ;                SINGLE_VALUED ;                TH-\d{5}|TH-(X|Y)\d{3}|KD-[0-9A-F]{5}
+kSEAL_THXSrc ;                SINGLE_VALUED ;                TH-(\d{5}|X\d{3}|Y\d{3})