Handle the ambiguous delimiter in kEH_FVal

Author: jowilco

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

@@ -538,6 +538,9 @@ public void setMultiValued(String multivalued2) {
         if (property == UcdProperty.Name_Alias || property == UcdProperty.Standardized_Variant) {
             multivaluedSplit = NO_SPLIT;
         }
+        if (property == UcdProperty.kEH_FVal) {
+            multivaluedSplit = Pattern.compile(" [\\|/] ");
+        }
         if (multivalued2.endsWith("_COMMA")) {
             multivaluedSplit = COMMA;
             multivalued = ValueCardinality.Unordered;

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

@@ -217,7 +217,12 @@ public enum UcdProperty {
     kEACC(PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "cjkEACC"),
     kEH_Cat(PropertyType.Miscellaneous, DerivedPropertyStatus.Approved, "kEH_Cat"),
     kEH_Desc(PropertyType.Miscellaneous, DerivedPropertyStatus.Approved, "kEH_Desc"),
-    kEH_FVal(PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "kEH_FVal"),
+    kEH_FVal(
+            PropertyType.Miscellaneous,
+            DerivedPropertyStatus.Provisional,
+            null,
+            ValueCardinality.Unordered,
+            "kEH_FVal"),
     kEH_Func(
             PropertyType.Miscellaneous,
             DerivedPropertyStatus.Provisional,

unicodetools/src/main/java/org/unicode/xml/AttributeResolver.java

@@ -212,8 +212,11 @@ public String getAttributeValue(UcdProperty prop, int codepoint) {
                         }
                         return Optional.ofNullable(resolvedValue).orElse("");
                     case kDefinition:
-                    case kEH_FVal:
                         return resolvedValue;
+                    case kEH_FVal:
+                        if (resolvedValue != null) {
+                            return resolvedValue.replaceAll("[\\|]+", " | ");
+                        }
                     default:
                         if (resolvedValue != null) {
                             return resolvedValue.replaceAll("\\" + SET_SEPARATOR, " ");

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

@@ -220,7 +220,7 @@ kEH_Cat ;                     SINGLE_VALUED ;                ([A-IK-Z]|AA)-\d{2}
 kEH_Desc ;                    SINGLE_VALUED ;                [^\t"]+
 kEH_Func ;                    MULTI_VALUED ;                 [^\t"]+
 # Revisit once the spec settles down.
-kEH_FVal ;                    SINGLE_VALUED ;                [^\t"]+
+kEH_FVal ;                    MULTI_VALUED ;                 [bdf-hjkmnpr-twy\.,\/\-\+=;?>\&\(\)\{\}\s\x{303}\x{30C}\x{323}\x{32E}\x{331}\x{A723}\x{A725}\x{A7BD}]+
 kEH_HG ;                      MULTI_VALUED ;                 ([A-IK-Z]|AA)\d{1,3}[A-Za-z]{0,2}
 kEH_IFAO ;                    MULTI_VALUED ;                 \d{1,3},\d{1,2}[ab]?
 kEH_JSesh ;                   MULTI_VALUED ;                 ([A-IK-Z]|Aa|NL|NU|Ff)\d{1,3}[A-Za-z]{0,5}|(US1|US22|US248|US685)([A-IK-Z]|Aa|NL|NU)\d{1,3}[A-Za-z]{0,5}