From 0f0f19326e2dacf9abb12f755b17348205142a01 Mon Sep 17 00:00:00 2001
From: John Wilcock <jowilco@microsoft.com>
Date: Fri, 13 Jun 2025 16:46:32 -0700
Subject: [PATCH 1/2] Updated Unikemet regular expressions; however, RegEx for
 kEH_FVal doesn't validate against current data, so hack for now.

---
 .../data/ucdxml/dev/ucd.nounihan.grouped.xml  | 30 +++++++++----------
 .../org/unicode/xml/AttributeResolver.java    |  1 +
 .../org/unicode/props/IndexPropertyRegex.txt  | 13 ++++----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/unicodetools/data/ucdxml/dev/ucd.nounihan.grouped.xml b/unicodetools/data/ucdxml/dev/ucd.nounihan.grouped.xml
index e7e4a03a7..d68533433 100644
--- a/unicodetools/data/ucdxml/dev/ucd.nounihan.grouped.xml
+++ b/unicodetools/data/ucdxml/dev/ucd.nounihan.grouped.xml
@@ -425,7 +425,7 @@
          <char cp="00B5" na="MICRO SIGN" dt="com" dm="03BC" suc="039C" stc="039C" uc="039C" tc="039C" scf="03BC" cf="03BC" sc="Zyyy" scx="Zyyy" Lower="Y" NFD_QC="Y" NFKC_QC="N" CWCF="Y" CWKCF="Y" CWT="Y" CWU="Y" NFKC_CF="03BC" NFKC_SCF="03BC"/>
          <char cp="00B6" na="PILCROW SIGN" gc="Po" dt="none" bc="ON" ea="A" lb="AI" sc="Zyyy" scx="Zyyy" Alpha="N" IDS="N" XIDS="N" IDC="N" XIDC="N" Pat_Syn="Y" WB="XX" SB="XX" NFD_QC="Y" NFKD_QC="Y" Cased="N" CWCM="N" na1="PARAGRAPH SIGN"/>
          <char cp="00B7" na="MIDDLE DOT" gc="Po" dt="none" bc="ON" ea="A" lb="AI" sc="Zyyy" scx="Avst Cari Copt Dupl Elba Geor Glag Gong Goth Grek Hani Latn Lydi Mahj Perm Shaw" Alpha="N" Ext="Y" Dia="Y" IDS="N" XIDS="N" OIDC="Y" WB="ML" SB="XX" NFD_QC="Y" NFKD_QC="Y" CI="Y" Cased="N" CWCM="N"/>
-         <char cp="00B8" na="CEDILLA" gc="Sk" dt="com" dm="0020 0327" bc="ON" ea="A" lb="AI" sc="Zyyy" scx="Zyyy" Alpha="N" Dia="Y" IDS="N" XIDS="N" IDC="N" XIDC="N" WB="XX" SB="XX" NFD_QC="Y" NFKC_QC="N" CI="Y" Cased="N" CWCM="N" CWKCF="Y" NFKC_CF="0020 0327" na1="SPACING CEDILLA" NFKC_SCF="0020 0327"/>
+         <char cp="00B8" na="CEDILLA" gc="Sk" dt="com" dm="0020 0327" bc="ON" ea="A" lb="AI" sc="Zyyy" scx="Zyyy" Alpha="N" Dia="Y" IDS="N" XIDS="N" IDC="N" XIDC="N" SB="XX" NFD_QC="Y" NFKC_QC="N" CI="Y" Cased="N" CWCM="N" CWKCF="Y" NFKC_CF="0020 0327" na1="SPACING CEDILLA" NFKC_SCF="0020 0327"/>
          <char cp="00B9" na="SUPERSCRIPT ONE" gc="No" dt="sup" dm="0031" nt="Di" nv="1" bc="EN" ea="A" lb="AI" sc="Zyyy" scx="Zyyy" Alpha="N" IDS="N" XIDS="N" IDC="N" XIDC="N" WB="XX" SB="XX" NFD_QC="Y" NFKC_QC="N" Cased="N" CWCM="N" CWKCF="Y" NFKC_CF="0031" na1="SUPERSCRIPT DIGIT ONE" NFKC_SCF="0031" ID_Compat_Math_Continue="Y"/>
          <char cp="00BA" na="MASCULINE ORDINAL INDICATOR" gc="Lo" dt="sup" dm="006F" ea="A" lb="AI" Lower="Y" OLower="Y" NFD_QC="Y" NFKC_QC="N" CWCM="N" CWKCF="Y" NFKC_CF="006F" NFKC_SCF="006F"/>
          <char cp="00BB" na="RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK" gc="Pf" dt="none" bc="ON" Bidi_M="Y" bmg="00AB" lb="QU" sc="Zyyy" scx="Zyyy" QMark="Y" Alpha="N" IDS="N" XIDS="N" IDC="N" XIDC="N" Pat_Syn="Y" WB="XX" SB="CL" NFD_QC="Y" NFKD_QC="Y" Cased="N" CWCM="N" na1="RIGHT POINTING GUILLEMET"/>
@@ -36420,7 +36420,7 @@
          <char cp="13052" na="EGYPTIAN HIEROGLYPH B003" kEH_Cat="B-09-011" kEH_Desc="Woman, pregnant, seated, both knees down, right arm forward, angling down towards the knee, left arm hanging beside the body, with the head and arms of a child coming from the legs." kEH_Func="Classifier birth" kEH_FVal="msꞽ" kEH_UniK="B003" kEH_JSesh="B3" kEH_HG="B3" kEH_IFAO="54,5"/>
          <char cp="13053" na="EGYPTIAN HIEROGLYPH B004" kEH_Cat="B-09-004" kEH_Desc="Woman, pregnant, seated, both knees down, right arm forward, angling down towards the knee, left arm hanging beside the body, with three vertical lines coming from the legs." kEH_Func="Classifier birth" kEH_FVal="msꞽ" kEH_UniK="B004" kEH_JSesh="B4" kEH_HG="B4"/>
          <char cp="13054" na="EGYPTIAN HIEROGLYPH B005" kEH_Cat="B-09-014" kEH_Desc="Woman, seated, both knees down, nursing a child, seated on her lap, left arm forward, hand over the chest of the woman, right arm hanging beside the body; right arm forward, embracing/holding the child, left arm over the chest." kEH_Func="Classifier nursing, rearing" kEH_FVal="rnn" kEH_UniK="B005" kEH_JSesh="B5" kEH_HG="B5" kEH_IFAO="54,8"/>
-         <char cp="13055" na="EGYPTIAN HIEROGLYPH B005A" kEH_Cat="B-02-010" kEH_Desc="Woman, seated, both knees down, with long hair and a band of cloth around the head, bound at the back, with two sticks forming a cross-like structure over the legs." kEH_Func="Logogram weaver or nurse" kEH_FVal="?   mnḫ.t" kEH_UniK="B005A" kEH_JSesh="B104"/>
+         <char cp="13055" na="EGYPTIAN HIEROGLYPH B005A" kEH_Cat="B-02-010" kEH_Desc="Woman, seated, both knees down, with long hair and a band of cloth around the head, bound at the back, with two sticks forming a cross-like structure over the legs." kEH_Func="Logogram weaver or nurse" kEH_FVal="? | mnḫ.t" kEH_UniK="B005A" kEH_JSesh="B104"/>
          <char cp="13056" na="EGYPTIAN HIEROGLYPH B006" kEH_Cat="B-09-020" kEH_Desc="Woman, seated on a block throne, with a child on her lap, facing her, both arms down; both arms forward, right arm behind the child, left arm in front of the child." kEH_Func="Classifier nursing, rearing" kEH_FVal="rnn" kEH_UniK="B006" kEH_JSesh="B6" kEH_HG="B6" kEH_IFAO="54,13"/>
          <char cp="13057" na="EGYPTIAN HIEROGLYPH B007" kEH_Cat="B-01-022" kEH_Desc="Woman, seated, both knees up, with covered legs and arms, with long hair, wearing a diadem, holding a flower which curves forward, with the flower orientated downwards." kEH_Func="Classifier female royalty" kEH_UniK="B007" kEH_JSesh="B7" kEH_HG="B7" kEH_IFAO="49,6"/>
          <char cp="13058" na="EGYPTIAN HIEROGLYPH B008" kEH_Cat="B-02-002" kEH_Desc="Woman, seated, both knees down, no arms visible, with a flower on the knee, which curves towards the face, with the flower in front of the face." kEH_Func="Classifier human being (together with A1)" kEH_FVal="ḥr.w-nb" kEH_UniK="B008" kEH_JSesh="B8" kEH_HG="B8" kEH_IFAO="49,15"/>
@@ -37315,7 +37315,7 @@
          <char cp="133D1" na="EGYPTIAN HIEROGLYPH X003" kEH_Cat="X-03-010" kEH_Desc="A loaf of bread, without internal detail." kEH_Func="Classifier bread/food" kEH_UniK="X003" kEH_JSesh="X3" kEH_HG="X3" kEH_IFAO="462,7"/>
          <char cp="133D2" na="EGYPTIAN HIEROGLYPH X004" kEH_Cat="X-04-010" kEH_Desc="A roll of bread, with a diamond in the middle." kEH_Func="Classifier Festival" kEH_UniK="X004" kEH_JSesh="X4F" kEH_HG="X4F" kEH_IFAO="462,14"/>
          <char cp="133D3" na="EGYPTIAN HIEROGLYPH X004A" kEH_Cat="X-04-008" kEH_Desc="An roll of bread, with round imprints at the var sides and in the middle." kEH_FVal="t" kEH_UniK="X004A" kEH_JSesh="X4A"/>
-         <char cp="133D4" na="EGYPTIAN HIEROGLYPH X004B" kEH_Cat="X-04-011" kEH_Desc="A roll of bread without internal detail." kEH_Func="Classifier bread, Festival; Phonemogram t; Logogram t (bread); Phono-repeater: sn, fḳꜣ" kEH_FVal="t   sn, fḳꜣ" kEH_UniK="X004B"/>
+         <char cp="133D4" na="EGYPTIAN HIEROGLYPH X004B" kEH_Cat="X-04-011" kEH_Desc="A roll of bread without internal detail." kEH_Func="Classifier bread, Festival; Phonemogram t; Logogram t (bread); Phono-repeater: sn, fḳꜣ" kEH_FVal="t | sn, fḳꜣ" kEH_UniK="X004B"/>
          <char cp="133D5" na="EGYPTIAN HIEROGLYPH X005" kEH_Cat="X-05-001" kEH_Desc="An horizontal oval shape, with two upward curving strokes added at the front short side." kEH_Func="Phono-repeater" kEH_FVal="sn" kEH_UniK="X005" kEH_JSesh="X5" kEH_HG="X5" kEH_IFAO="463,3"/>
          <char cp="133D6" na="EGYPTIAN HIEROGLYPH X006" kEH_Cat="X-06-007" kEH_Desc="A round loaf with a finger mark at the bottom." kEH_Func="Classifier offering, cake, loaf" kEH_FVal="t-ꜣsr" kEH_UniK="X006" kEH_JSesh="X6" kEH_HG="X6"/>
          <char cp="133D7" na="EGYPTIAN HIEROGLYPH X006A" kEH_Cat="X-06-005" kEH_Core="L" kEH_Func="" kEH_UniK="X006A" kEH_JSesh="US1X6AEXTU" kEH_AltSeq="133D6"/>
@@ -37455,7 +37455,7 @@
          <char cp="13462" kEH_Cat="A-01-004" kEH_Desc="Man, seated, right knee raised, right foot in front of the left knee, left foot horizontal, right arm raised in front, left arm in front of the body." kEH_Func="Logogram (first person singular)" kEH_FVal="ꞽ" kEH_UniK="A001H"/>
          <char cp="13463" kEH_Cat="A-01-006" kEH_Desc="Man, seated on heel, both knees down, right arm raised, left arm in front of body." kEH_Func="Classifier human being" kEH_FVal="wnn.yw" kEH_UniK="A001G"/>
          <char cp="13464" kEH_Cat="A-01-007" kEH_Desc="Man, squatting, both knees forwards, knees horizontal, right arm raised, left arm in front of body." kEH_Func="Classifier court, entourage" kEH_FVal="šny.t" kEH_UniK="A001I"/>
-         <char cp="13465" kEH_Cat="A-01-010" kEH_Desc="Man, seated, both knees raised, foot flat on the ground, right arm raised, left arm hanging beside the body." kEH_Func="Classifier occupation/relationship (fisherman or brewer)" kEH_FVal="ḏbḥ(.w)   dbḥ" kEH_UniK="A071A" kEH_IFAO="1,5"/>
+         <char cp="13465" kEH_Cat="A-01-010" kEH_Desc="Man, seated, both knees raised, foot flat on the ground, right arm raised, left arm hanging beside the body." kEH_Func="Classifier occupation/relationship (fisherman or brewer)" kEH_FVal="ḏbḥ(.w) | dbḥ" kEH_UniK="A071A" kEH_IFAO="1,5"/>
          <char cp="13466" kEH_Cat="A-01-011" kEH_Desc="Man, seated, right knee raised, right arm raised, right hand horizontal, hand palm upwards, left arm in front of body." kEH_Func="Classifier to conspire, to brood" kEH_FVal="wꜣ" kEH_UniK="HJ A426B" kEH_JSesh="A426B" kEH_HG="A426B" kEH_IFAO="1,7"/>
          <char cp="13467" kEH_Cat="A-01-012" kEH_Desc="Man, seated, right knee raised, right arm raised, left arm in front of body, hand extending beyond the torso." kEH_Func="Classifier personal name" kEH_UniK="A001E" kEH_IFAO="1,8"/>
          <char cp="13468" kEH_Cat="A-01-014" kEH_Desc="Man, seated on heel, right leg extended with foot in front of left leg, right arm raised with hand held vertically, hand palm outwards, left arm hanging beside the body." kEH_Func="Logogram (enemies)" kEH_FVal="ḫft.yw" kEH_UniK="A068B" kEH_JSesh="A68" kEH_HG="A68" kEH_IFAO="1,10"/>
@@ -38351,7 +38351,7 @@
          <char cp="137E2" kEH_Cat="C-11-005" kEH_Desc="God, standing, with the head of a falcon, wearing the double crown (S5), right arm forwards, holding a spear with the point downwards, left arm hanging beside the body, on top of a bovid, lying on the ground, legs folded under the body, tail down." kEH_Func="Logogram (Wenty)" kEH_FVal="wnty" kEH_UniK="C071B" kEH_IFAO="68,6"/>
          <char cp="137E3" kEH_Cat="C-11-006" kEH_Desc="God, standing, with the head of a falcon, right arm forwards, holding a spear with the point downwards, left arm hanging beside the body, on top of a crocodile (I3)." kEH_Func="Classifier divinity" kEH_FVal="wnty" kEH_UniK="HJ C073" kEH_JSesh="C73" kEH_HG="C73" kEH_IFAO="68,7"/>
          <char cp="137E4" kEH_Cat="C-11-008" kEH_Desc="God, standing, with the head of a falcon, wearing the double crown (S5), holding a harpoon with the point down, diagonally over the body, from the tip of the right foot beyond the left shoulder, right arm lowered, right hand holding the harpoon between the waist and knee, left arm raised, holding the shaft on top of a crocodile, head looking backwards (I3E)." kEH_Func="Classifier harpooner" kEH_FVal="(ꞽ)ꜣ(w).ty" kEH_UniK="HJ C076" kEH_JSesh="C76" kEH_HG="C76" kEH_IFAO="68,9"/>
-         <char cp="137E5" kEH_Cat="C-11-009" kEH_Desc="God, standing, with the head of a falcon, wearing the double crown (S5), holding a harpoon with the point down, diagonally over the body, from the tip of the right foot beyond the left shoulder, right arm lowered, right hand holding the harpoon between the waist and knee, left arm raised, holding the shaft near the end, on top of a crocodile (I3)." kEH_Func="Logogram (harpooner) or Logogram (Wenty)" kEH_FVal="ꞽꜣw.ty   wnty" kEH_UniK="HJ C076A" kEH_JSesh="C76A" kEH_HG="C76A" kEH_IFAO="68,10"/>
+         <char cp="137E5" kEH_Cat="C-11-009" kEH_Desc="God, standing, with the head of a falcon, wearing the double crown (S5), holding a harpoon with the point down, diagonally over the body, from the tip of the right foot beyond the left shoulder, right arm lowered, right hand holding the harpoon between the waist and knee, left arm raised, holding the shaft near the end, on top of a crocodile (I3)." kEH_Func="Logogram (harpooner) or Logogram (Wenty)" kEH_FVal="ꞽꜣw.ty | wnty" kEH_UniK="HJ C076A" kEH_JSesh="C76A" kEH_HG="C76A" kEH_IFAO="68,10"/>
          <char cp="137E6" kEH_Cat="C-11-010" kEH_Desc="God, standing, with the head of a falcon, wearing the double crown (S5), right arm forwards, holding a spear with the point downwards, left arm hanging beside the body, on top of a crocodile (I3)." kEH_Func="Logogram (Wenty)" kEH_FVal="wnty" kEH_UniK="HJ C074" kEH_JSesh="C74" kEH_HG="C74" kEH_IFAO="68,11"/>
          <char cp="137E7" kEH_Cat="C-12-001" kEH_Desc="God, seated, both knees up, with covered legs and arms, with a long-curved beard, wearing a headdress consisting of a combination of the Atef crown and the red crown (S53vara?), holding a sceptre with a straight shaft, topped with the head of the Seth animal vertically." kEH_Func="Classifier divinity (Geb)" kEH_FVal="gbb" kEH_UniK="HJ C077" kEH_JSesh="C77" kEH_HG="C77" kEH_IFAO="68,12"/>
          <char cp="137E8" kEH_Cat="C-13-002" kEH_Desc="God, seated, right knee raised, with long-curved beard and long wig, raised arms at either side of the body, hands held vertically, with the hand palms inwards." kEH_Func="Logogram (million, many)" kEH_FVal="ḥḥ" kEH_UniK="A073C"/>
@@ -38792,7 +38792,7 @@
          <char cp="1399B" kEH_Cat="D-14-003" kEH_Desc="A mouth with a downward sloping line at the front short end." kEH_Func="Classifier spit" kEH_FVal="nš/nẖ" kEH_UniK="HJ D152" kEH_JSesh="D152" kEH_HG="D152"/>
          <char cp="1399C" kEH_Cat="D-14-004" kEH_Desc="A human mouth, seen from the side, with a downward sloping line coming from the lips." kEH_Func="Phonemogram" kEH_FVal="p" kEH_UniK="HJ D026B" kEH_JSesh="D26B" kEH_HG="D26B" kEH_IFAO="101,13"/>
          <char cp="1399D" kEH_Cat="D-14-006" kEH_Desc="A human mouth, seen from the side, with a dotted downward sloping line coming from the lips." kEH_Func="Phonemogram" kEH_FVal="p" kEH_UniK="HJ D026A" kEH_JSesh="D26A" kEH_HG="D26A" kEH_IFAO="102,3"/>
-         <char cp="1399E" kEH_Cat="D-15-004" kEH_Desc="A long beard, curling up." kEH_Func="Classifier beard or Classifier hair" kEH_FVal="ḫꜣbs   ḥnsk.t" kEH_UniK="HJ D156" kEH_JSesh="D156" kEH_HG="D156" kEH_IFAO="102,10"/>
+         <char cp="1399E" kEH_Cat="D-15-004" kEH_Desc="A long beard, curling up." kEH_Func="Classifier beard or Classifier hair" kEH_FVal="ḫꜣbs | ḥnsk.t" kEH_UniK="HJ D156" kEH_JSesh="D156" kEH_HG="D156" kEH_IFAO="102,10"/>
          <char cp="1399F" kEH_Cat="D-17-001" kEH_Desc="The lower half of a human, seated on heel, both knees down." kEH_Func="Logogram (to sit)" kEH_FVal="ḥmsꞽ" kEH_UniK="HJ D159" kEH_JSesh="D159" kEH_HG="D159" kEH_IFAO="103,1"/>
          <char cp="139A0" kEH_Cat="D-18-006" kEH_Desc="Two arms, raised upwards, with the forearms and hands vertical, represented by circles." kEH_Func="Logogram (spirit, essence)" kEH_FVal="kꜣ" kEH_UniK="D028B"/>
          <char cp="139A1" kEH_Cat="D-18-007" kEH_Desc="Two arms, unconnected, raised upwards, with the forearms and hands vertical, hand palms inwards." kEH_UniK="HJ D028A" kEH_JSesh="D28A" kEH_HG="D28A" kEH_IFAO="103,8"/>
@@ -38837,7 +38837,7 @@
          <char cp="139C8" kEH_Cat="D-25-012" kEH_Desc="A forearm with the hand holding a loop of cord with the ends upwards (V6)." kEH_Func="Classifier enveloping" kEH_FVal="ꜥtḫ" kEH_UniK="HJ D228" kEH_JSesh="D228" kEH_HG="D228" kEH_IFAO="111,8"/>
          <char cp="139C9" kEH_Cat="D-25-016" kEH_Desc="A forearm, with the palm of the hand downwards, with the upper arm represented by a loop, which is angled forwards." kEH_Func="Logogram (arm, shoulder)" kEH_FVal="rmn" kEH_UniK="D041A"/>
          <char cp="139CA" kEH_Cat="D-25-020" kEH_Desc="A forearm, with the hand held like a fist, and the upper arm represented by a loop." kEH_Func="Classifier shoulder/arm" kEH_FVal="rmn" kEH_UniK="D043B" kEH_IFAO="111,16"/>
-         <char cp="139CB" kEH_Cat="D-25-023" kEH_Desc="A forearm with the hand holding a wide cup (W10)" kEH_Func="Logogram (to offer, to present) or Phonemogram" kEH_FVal="ḥnk   (r)dꞽ" kEH_UniK="HJ D220" kEH_JSesh="D220" kEH_HG="D220" kEH_IFAO="112,3"/>
+         <char cp="139CB" kEH_Cat="D-25-023" kEH_Desc="A forearm with the hand holding a wide cup (W10)" kEH_Func="Logogram (to offer, to present) or Phonemogram" kEH_FVal="ḥnk | (r)dꞽ" kEH_UniK="HJ D220" kEH_JSesh="D220" kEH_HG="D220" kEH_IFAO="112,3"/>
          <char cp="139CC" kEH_Cat="D-25-024" kEH_Desc="A forearm with the hand holding two arms, raised upwards, with the forearms and hands vertical, hand palms inwards (D28)." kEH_Func="Phonemogram" kEH_FVal="mk" kEH_UniK="HJ D217" kEH_JSesh="D217" kEH_HG="D217" kEH_IFAO="112,4"/>
          <char cp="139CD" kEH_Cat="D-25-025" kEH_Desc="A forearm with the hand holding 3 vertical strokes." kEH_Func="Logogram (to receive)" kEH_FVal="šsp" kEH_UniK="HJ D218" kEH_JSesh="D218" kEH_HG="D218" kEH_IFAO="112,5"/>
          <char cp="139CE" kEH_Cat="D-25-026" kEH_Desc="A forearm with the hand holding the sun upon a butcher's block (N7)." kEH_Func="Logogram (course (of the day); daily requirements)" kEH_FVal="ẖr.t-hrw" kEH_UniK="HJ D219" kEH_JSesh="D219" kEH_HG="D219"/>
@@ -39164,7 +39164,7 @@
          <char cp="13B0F" kEH_Cat="E-20-069" kEH_Desc="A baboon, standing on its hind legs, tail down, arms extended forwards, left forearm horizontal, holding a lotus flower with a bud at either side, with a long vertical stem, with the right hand above the flower." kEH_Func="Logogram/phonemogram (the beautiful lotus flower)" kEH_FVal="nḫb nfr" kEH_UniK="HJ E066" kEH_JSesh="E66" kEH_HG="E66" kEH_IFAO="140,16"/>
          <char cp="13B10" kEH_Cat="E-20-070" kEH_Core="N" kEH_UniK="HJ E067" kEH_JSesh="E67" kEH_HG="E67" kEH_IFAO="141,1"/>
          <char cp="13B11" kEH_Cat="E-20-072" kEH_Desc="A baboon, standing on its hind legs, tail down, right arm extended forwards, forearm horizontal, hand palm upwards, holding a column imitating a bundle of stalks tied together (R11), with a folded piece of cloth, short section outwards below the right hand; left arm extended backwards, hand at the height of the shoulder, hand palm upwards, supporting a quail chick (G43)." kEH_Func="Phonemogram" kEH_FVal="ḏd + s + r" kEH_UniK="HJ E068" kEH_JSesh="E68" kEH_HG="E68" kEH_IFAO="141,2"/>
-         <char cp="13B12" kEH_Cat="E-20-076" kEH_Desc="A baboon, dancing, right leg vertical, left leg raised, left knee in front of the right leg, left foot behind the right leg, right arm extended forwards and downwards, holding an ornamental chevaux de frise on top of walls, with a circle dividing the top and base (Aa30), of nearly the size of the baboon near the base of the ornament." kEH_Func="Logogram (to adorn) or Logogram (to be friendly)" kEH_FVal="sẖkr   ꞽmꜣ" kEH_UniK="E070A"/>
+         <char cp="13B12" kEH_Cat="E-20-076" kEH_Desc="A baboon, dancing, right leg vertical, left leg raised, left knee in front of the right leg, left foot behind the right leg, right arm extended forwards and downwards, holding an ornamental chevaux de frise on top of walls, with a circle dividing the top and base (Aa30), of nearly the size of the baboon near the base of the ornament." kEH_Func="Logogram (to adorn) or Logogram (to be friendly)" kEH_FVal="sẖkr | ꞽmꜣ" kEH_UniK="E070A"/>
          <char cp="13B13" kEH_Cat="E-20-078" kEH_Desc="A baboon, seated on a block, tail down, arms extended forward." kEH_Func="?" kEH_UniK="HJ E248" kEH_JSesh="E248" kEH_HG="E248"/>
          <char cp="13B14" kEH_Cat="E-21-001" kEH_Desc="A mouse." kEH_Func="Classifier mouse" kEH_FVal="pnw" kEH_UniK="HJ E130" kEH_JSesh="E130" kEH_HG="E130" kEH_IFAO="141,3"/>
          <char cp="13B15" kEH_Cat="E-22-001" kEH_Desc="A lion, lying down, with the face of a man, with a long, curved beard and coif." kEH_Func="Logogram (lord)" kEH_FVal="nb" kEH_UniK="HJ E151A" kEH_JSesh="E151A" kEH_HG="E151A" kEH_IFAO="141,4"/>
@@ -39406,7 +39406,7 @@
          <char cp="13C01" kEH_Cat="F-30-004" kEH_Desc="A pustule or gland, with a forward, downward dotted line of fluid issuing forth." kEH_Func="Classifier scent" kEH_FVal="stꞽ" kEH_UniK="HJ AA003A" kEH_JSesh="Aa3A" kEH_HG="AA3A" kEH_IFAO="473,5"/>
          <char cp="13C02" kEH_Cat="F-30-009" kEH_Desc="A pustule or gland without blobs at the side, with a forward, downward dotted line of fluid issuing forth." kEH_Func="Classifier scent" kEH_FVal="stꞽ" kEH_UniK="HJ AA003B" kEH_JSesh="Aa3B" kEH_HG="AA3B"/>
          <char cp="13C03" kEH_Cat="F-31-004" kEH_Desc="A human placenta (a circle with multiple horizontal lines written within, which do not connect to the circle." kEH_Func="Phonemogram" kEH_FVal="ḫ" kEH_UniK="AA001C"/>
-         <char cp="13C04" kEH_Cat="F-31-005" kEH_Desc="A circle with a broad dot inside." kEH_Func="Phonemogram or Classifier enemy" kEH_FVal="ḫ   ḫfty" kEH_UniK="AA001D"/>
+         <char cp="13C04" kEH_Cat="F-31-005" kEH_Desc="A circle with a broad dot inside." kEH_Func="Phonemogram or Classifier enemy" kEH_FVal="ḫ | ḫfty" kEH_UniK="AA001D"/>
          <char cp="13C05" kEH_Cat="F-32-001" kEH_Desc="A liver." kEH_Func="Classifier liver" kEH_FVal="mꞽs.t" kEH_UniK="HJ D279" kEH_JSesh="D279" kEH_HG="D279" kEH_IFAO="170,12"/>
          <char cp="13C06" kEH_Cat="F-32-002" kEH_Core="N" kEH_UniK="HJ F146" kEH_JSesh="F146" kEH_HG="F146" kEH_IFAO="170,13"/>
          <char cp="13C07" kEH_Cat="F-32-005" kEH_Desc="A talon or fang." kEH_Func="Classifier (talons or fangs)" kEH_FVal="wḫꜣ.w" kEH_UniK="HJ F130" kEH_JSesh="F130" kEH_HG="F130"/>
@@ -39609,7 +39609,7 @@
          <char cp="13CCC" kEH_Cat="G-15-018" kEH_Desc="A falcon, lying down on a bed, with a leonid head, legs and tail (Q19)." kEH_Func="Logogram" kEH_FVal="sḏr" kEH_UniK="HJ G165" kEH_JSesh="G165" kEH_HG="G165" kEH_IFAO="194,10"/>
          <char cp="13CCD" kEH_Cat="G-15-019" kEH_Core="N" kEH_UniK="HJ G162B" kEH_JSesh="G162B" kEH_HG="G162B"/>
          <char cp="13CCE" kEH_Cat="G-15-020" kEH_Core="N" kEH_UniK="G295A"/>
-         <char cp="13CCF" kEH_Cat="G-16-001" kEH_Desc="A bird with a small tail." kEH_Func="Classifier (some type of bird) or (Dedwen, divinity)" kEH_FVal="bn   ddwn" kEH_UniK="HJ G229" kEH_JSesh="G229" kEH_HG="G229" kEH_IFAO="194,11"/>
+         <char cp="13CCF" kEH_Cat="G-16-001" kEH_Desc="A bird with a small tail." kEH_Func="Classifier (some type of bird) or (Dedwen, divinity)" kEH_FVal="bn | ddwn" kEH_UniK="HJ G229" kEH_JSesh="G229" kEH_HG="G229" kEH_IFAO="194,11"/>
          <char cp="13CD0" kEH_Cat="G-16-010" kEH_Desc="A swallow (Hirundo rustica savignii) (G36), on top of a mouth (D21)." kEH_Func="Phonemogram" kEH_FVal="wr" kEH_UniK="HJ G220" kEH_JSesh="G220" kEH_HG="G220" kEH_IFAO="195,8"/>
          <char cp="13CD1" kEH_Cat="G-16-015" kEH_Desc="A house sparrow (Passer domesticus niloticus), with upward curling line coming from the tail." kEH_Func="Classifier negative, bad" kEH_FVal="ꞽw.ty" kEH_UniK="G037C" kEH_IFAO="195,14"/>
          <char cp="13CD2" kEH_Cat="G-17-002" kEH_Core="N" kEH_UniK="G022X" kEH_JSesh="G22" kEH_HG="G22"/>
@@ -40100,7 +40100,7 @@
          <char cp="13EB7" kEH_Cat="M-26-001" kEH_Desc="A vine on two forked supports." kEH_Func="Logogram (gardiner, vinter)" kEH_FVal="kꜣn.y" kEH_UniK="HJ M043A" kEH_JSesh="M43A" kEH_HG="M43A" kEH_IFAO="258,12"/>
          <char cp="13EB8" kEH_Cat="M-26-003" kEH_Desc="A vine with fruits on two forked supports, on top of a base, with the back of the vine descending to the base." kEH_Func="Classifier wine" kEH_FVal="ꞽrp" kEH_UniK="M043C"/>
          <char cp="13EB9" kEH_Cat="M-28-005" kEH_Desc="A fig." kEH_Func="Classifier fig" kEH_FVal="dꜣb" kEH_UniK="HJ M194" kEH_JSesh="M194" kEH_HG="M194" kEH_IFAO="259,13"/>
-         <char cp="13EBA" kEH_Cat="M-28-007" kEH_Desc="A vertical head of lettuce." kEH_Func="Classifier Min (mnw) or logogram ꜥbw (lettuce)" kEH_FVal="mnw   ꜥbw" kEH_UniK="HJ M191" kEH_JSesh="M191" kEH_HG="M191" kEH_IFAO="260,1"/>
+         <char cp="13EBA" kEH_Cat="M-28-007" kEH_Desc="A vertical head of lettuce." kEH_Func="Classifier Min (mnw) or logogram ꜥbw (lettuce)" kEH_FVal="mnw | ꜥbw" kEH_UniK="HJ M191" kEH_JSesh="M191" kEH_HG="M191" kEH_IFAO="260,1"/>
          <char cp="13EBB" kEH_Cat="M-28-009" kEH_Desc="A bundle of unions, on top of a wide cup (W10)." kEH_Func="Classifier unions" kEH_FVal="ḥḏ(.w)" kEH_UniK="HJ M201" kEH_JSesh="M201" kEH_HG="M201" kEH_IFAO="260,3"/>
          <char cp="13EBC" kEH_Cat="M-28-010" kEH_Desc="A head of lettuce." kEH_Func="Classifier plants" kEH_FVal="sm" kEH_UniK="HJ M181" kEH_JSesh="M181" kEH_HG="M181" kEH_IFAO="257,6"/>
          <char cp="13EBD" kEH_Cat="M-28-013" kEH_Core="N" kEH_UniK="HJ M173" kEH_JSesh="M173" kEH_HG="M173"/>
@@ -40527,7 +40527,7 @@
          <char cp="14062" kEH_Cat="P-03-070" kEH_Desc="A moon-sickle shaped boat with a higher stern than prow, with the head of an antelope (F81) on top of the stern, on top of a rectangle representing water, with loop of cord with the ends upwards (V6) written inside the boat." kEH_Func="Logogram (cloth, clothing)" kEH_FVal="mnḫ.t" kEH_UniK="HJ V047A" kEH_JSesh="V47A" kEH_HG="V47A"/>
          <char cp="14063" kEH_Cat="P-03-071" kEH_Desc="A moon-sickle shaped boat with a higher stern than prow, with the head of an antelope (F81) on top of the stern, with a low cone shape inside the boat/ship." kEH_Func="Logogram (cloth, clothing)" kEH_FVal="mnḫ.t" kEH_UniK="P058A"/>
          <char cp="14064" kEH_Cat="P-03-073" kEH_Core="N" kEH_UniK="HJ P058" kEH_JSesh="P58" kEH_HG="P58" kEH_IFAO="330,7"/>
-         <char cp="14065" kEH_Cat="P-03-076" kEH_Desc="A moon-sickle shaped boat with a higher prow than stern, with the head of an antelope (F81) on top of the prow, on top of a rectangle representing water, with a falcon (G5) standing on top of a façade of a shrine with a flat roof, with oblique sides, with a large doorway (O21B), inside the boat/ship, with an oar/rudder at the back." kEH_Func="Logogram ḥnw (Henu-bark of Sokar) or phonemogram skr" kEH_FVal="ḥnw   skr" kEH_UniK="HJ P059B" kEH_JSesh="P59B" kEH_HG="P59B" kEH_IFAO="330,10"/>
+         <char cp="14065" kEH_Cat="P-03-076" kEH_Desc="A moon-sickle shaped boat with a higher prow than stern, with the head of an antelope (F81) on top of the prow, on top of a rectangle representing water, with a falcon (G5) standing on top of a façade of a shrine with a flat roof, with oblique sides, with a large doorway (O21B), inside the boat/ship, with an oar/rudder at the back." kEH_Func="Logogram ḥnw (Henu-bark of Sokar) or phonemogram skr" kEH_FVal="ḥnw | skr" kEH_UniK="HJ P059B" kEH_JSesh="P59B" kEH_HG="P59B" kEH_IFAO="330,10"/>
          <char cp="14066" kEH_Cat="P-03-077" kEH_Desc="A moon-sickle shaped boat with a higher prow than stern, with the head of an antelope (F81) on top of the prow, on top of a rectangle with a broad base, with a falcon (G5) standing on top of a low cone shape, written inside the boat/ship." kEH_Func="Logogram (Henu-bark of Sokar)" kEH_FVal="ḥnw" kEH_UniK="HJ P059A" kEH_JSesh="P59A" kEH_HG="P59A" kEH_IFAO="330,11"/>
          <char cp="14067" kEH_Cat="P-03-078" kEH_Desc="A moon-sickle shaped boat with a higher prow than stern, with the head of an antelope (F81) on top of the prow, on top of a rectangle representing water, with a falcon (G5) standing on top of a tall cone shape, inside the boat/ship, with an oar/rudder at the back." kEH_Func="Logogram (Henu-bark of Sokar)" kEH_FVal="ḥnw" kEH_UniK="P059D" kEH_IFAO="330,12"/>
          <char cp="14068" kEH_Cat="P-03-083" kEH_Desc="A moon-sickle shaped boat with a higher prow than stern, with the head of an antelope (F81) on top of the prow, on top of a sledge with two vertical internal strokes, with a falcon (G5) standing on top of a rectangular shrine, inside the boat/ship, with an oar/rudder at the back." kEH_Func="Classifier bark of Sokar" kEH_FVal="ḥny" kEH_UniK="HJ P115" kEH_JSesh="P115" kEH_HG="P115" kEH_IFAO="330,16"/>
@@ -40710,7 +40710,7 @@
          <char cp="14119" kEH_Cat="R-09-017" kEH_Desc="A mirror resembling circle on top of standard used for the carrying of religious symbols with the vertical stick at the far side (R92A)." kEH_Func="Classifier mirror" kEH_FVal="ꜥnḫ" kEH_UniK="HJ R123" kEH_JSesh="R123" kEH_HG="R123"/>
          <char cp="1411A" kEH_Cat="R-09-021" kEH_Core="N" kEH_UniK="HJ R092" kEH_JSesh="R92" kEH_HG="R92"/>
          <char cp="1411B" kEH_Cat="R-09-031" kEH_Desc="An unknown object, resembling a piece of cloth with two bands at the back, on top of a standard used for carrying religious symbols (R12)." kEH_Func="Logogram (Duau (divinity))" kEH_FVal="dwꜣ.w" kEH_UniK="HJ R059" kEH_JSesh="R59" kEH_HG="R59" kEH_IFAO="357,12"/>
-         <char cp="1411C" kEH_Cat="R-09-032" kEH_Desc="A half round loaf of bread (X1), above an egg (H8), in front of a star (N14), written on top of a standard in the shape of a crescent moon, with a loop under the horizontal beam, running over the vertical pole." kEH_Func="Logogram spd.t (Sothis) or ẖn.ty ꞽꜣb.t (foremost of the east)" kEH_FVal="spd.t   ẖn.ty ꞽꜣb.t" kEH_UniK="HJ R058" kEH_JSesh="R58" kEH_HG="R58" kEH_IFAO="357,13"/>
+         <char cp="1411C" kEH_Cat="R-09-032" kEH_Desc="A half round loaf of bread (X1), above an egg (H8), in front of a star (N14), written on top of a standard in the shape of a crescent moon, with a loop under the horizontal beam, running over the vertical pole." kEH_Func="Logogram spd.t (Sothis) or ẖn.ty ꞽꜣb.t (foremost of the east)" kEH_FVal="spd.t | ẖn.ty ꞽꜣb.t" kEH_UniK="HJ R058" kEH_JSesh="R58" kEH_HG="R58" kEH_IFAO="357,13"/>
          <char cp="1411D" kEH_Cat="R-09-037" kEH_Desc="An unknown object, on top of a standard used for carrying religious symbols (R12)." kEH_Func="Logogram (Duau (divinity))" kEH_FVal="dwꜣ.w" kEH_UniK="HJ R060" kEH_JSesh="R60" kEH_HG="R60" kEH_IFAO="358,2"/>
          <char cp="1411E" kEH_Cat="R-09-039" kEH_Desc="A cobra in repose (Naja haje) (I10), upon a pole, with a feather (H6) vertically on its back, in line with the standard, on top of a base with a cone at the far side." kEH_Func="Logogram (border, boundry)" kEH_FVal="ṯnw" kEH_UniK="HJ R061" kEH_JSesh="R61" kEH_HG="R61"/>
          <char cp="1411F" kEH_Cat="R-11-001" kEH_Desc="A feather (H6), angled forwards on top of a standard with a round top." kEH_Func="Logogram (west)" kEH_FVal="ꞽmn.t" kEH_UniK="HJ R014A" kEH_JSesh="R14A" kEH_HG="R14A" kEH_IFAO="358,10"/>
@@ -40833,7 +40833,7 @@
          <char cp="14194" kEH_Cat="S-11-031" kEH_Desc="A necklace, consisting of two eyes, with the markings of the head of a falcon, with a vertical line at the back with a triangle at the curl, as if seen from the front (Jsesh D10C), with an outwards and upwards loop of string, with a flower-like end-piece at the end of the string, orientated towards each other." kEH_Func="Classifier wreath, garland" kEH_FVal="m(ꜣ)ḥ" kEH_UniK="HJ S191" kEH_JSesh="S191" kEH_HG="S191" kEH_IFAO="374,13"/>
          <char cp="14195" kEH_Cat="S-11-035" kEH_Desc="A collar of beads, without detail." kEH_Func="Logogram (necklace)" kEH_FVal="nb" kEH_UniK="HJ S012A" kEH_JSesh="S12A" kEH_HG="S12A" kEH_IFAO="375,1"/>
          <char cp="14196" kEH_Cat="S-11-049" kEH_Desc="A pectoral, resembling the sky (N1), with three vertical lines of short horizontal strokes, with V shaped arrows on top of the sky." kEH_Func="Logogram (to be bright)" kEH_FVal="ṯḥn" kEH_UniK="N004J" kEH_IFAO="375,13"/>
-         <char cp="14197" kEH_Cat="S-11-051" kEH_Desc="The sky (N1) / a pectoral resembling the sky; with three vertical lines consisting of short horizontal strokes, with upwards arrows at the bottom of the vertical lines, with three triangular shapes on top of the sky." kEH_Func="Logogram (to be bright) or Classifier dew/scent/rain" kEH_FVal="ṯḥn   ꞽꜣd.t" kEH_UniK="HJ N004F" kEH_JSesh="N4F" kEH_HG="N4F"/>
+         <char cp="14197" kEH_Cat="S-11-051" kEH_Desc="The sky (N1) / a pectoral resembling the sky; with three vertical lines consisting of short horizontal strokes, with upwards arrows at the bottom of the vertical lines, with three triangular shapes on top of the sky." kEH_Func="Logogram (to be bright) or Classifier dew/scent/rain" kEH_FVal="ṯḥn | ꞽꜣd.t" kEH_UniK="HJ N004F" kEH_JSesh="N4F" kEH_HG="N4F"/>
          <char cp="14198" kEH_Cat="S-11-052" kEH_Core="N" kEH_UniK="S017D" kEH_HG="S17A" kEH_IFAO="375,15"/>
          <char cp="14199" kEH_Cat="S-11-055" kEH_Desc="A pectoral resembling the sky (N1) over three vertical lines with a forked top." kEH_Func="Logogram (brightness)" kEH_FVal="ṯḥn" kEH_UniK="HJ S017B" kEH_JSesh="S17B" kEH_HG="S17B" kEH_IFAO="376,2"/>
          <char cp="1419A" kEH_Cat="S-11-056" kEH_Desc="A pectoral of four glass or faïence beads." kEH_Func="Logogram (to be bright)" kEH_FVal="ṯḥn" kEH_UniK="HJ S015A" kEH_JSesh="S15A" kEH_HG="S15A" kEH_IFAO="376,3"/>
@@ -41091,7 +41091,7 @@
          <char cp="14296" kEH_Cat="U-03-014" kEH_Desc="A half-round vessel on its side, with three forward, downward lines of grain coming from the front." kEH_Func="Classifier harvest, crop" kEH_FVal="šm(.w)" kEH_UniK="HJ U050A" kEH_JSesh="U50A" kEH_HG="U50A"/>
          <char cp="14297" kEH_Cat="U-03-016" kEH_Desc="A half-round vessel on its side, with a forward, downward line of grain coming from the front." kEH_Func="Classifier grain/barley" kEH_FVal="npt" kEH_UniK="U050B" kEH_IFAO="391,3"/>
          <char cp="14298" kEH_Cat="U-03-019" kEH_Desc="A grain measure, resembling a horizontal stick, with a bulb at the front, with a vertical line on top of the horizontal stick, with an upward stroke behind the vertical line." kEH_Func="Classifier grain" kEH_FVal="mh.w" kEH_UniK="HJ U055A" kEH_JSesh="U55A" kEH_HG="U55A" kEH_IFAO="391,8"/>
-         <char cp="14299" kEH_Cat="U-03-022" kEH_Desc="A grain measure, resembling a horizontal stick, with a downward hanging bulb at the front, with a vertical line on top of the horizontal stick, with an upward stroke behind the vertical line." kEH_Func="Classifier grain" kEH_FVal="mh.w   šmꜥ.w   wꜣḥ.yt" kEH_UniK="U054B" kEH_IFAO="391,12"/>
+         <char cp="14299" kEH_Cat="U-03-022" kEH_Desc="A grain measure, resembling a horizontal stick, with a downward hanging bulb at the front, with a vertical line on top of the horizontal stick, with an upward stroke behind the vertical line." kEH_Func="Classifier grain" kEH_FVal="mh.w | šmꜥ.w | wꜣḥ.yt" kEH_UniK="U054B" kEH_IFAO="391,12"/>
          <char cp="1429A" kEH_Cat="U-03-027" kEH_Desc="A grain measure, resembling a horizontal stick, with a downward hanging bulb at the front, with a rectangle on top, with an upward stroke behind the rectangle." kEH_Func="Classifier grain" kEH_FVal="np(r)" kEH_UniK="HJ U054" kEH_JSesh="U54" kEH_HG="U54" kEH_IFAO="392,1"/>
          <char cp="1429B" kEH_Cat="U-03-029" kEH_Core="N" kEH_UniK="HJ U055" kEH_JSesh="U55" kEH_HG="U55" kEH_IFAO="392,3"/>
          <char cp="1429C" kEH_Cat="U-05-001" kEH_Desc="A plough, with a crossbar and two vertical lines on the long beam, without a circle at the front of the long beam." kEH_Func="Phonemogram" kEH_FVal="hb" kEH_UniK="HJ U013A" kEH_JSesh="U13A" kEH_HG="U13A" kEH_IFAO="392,11"/>
diff --git a/unicodetools/src/main/java/org/unicode/xml/AttributeResolver.java b/unicodetools/src/main/java/org/unicode/xml/AttributeResolver.java
index 95a25a6b5..04ed5348f 100644
--- a/unicodetools/src/main/java/org/unicode/xml/AttributeResolver.java
+++ b/unicodetools/src/main/java/org/unicode/xml/AttributeResolver.java
@@ -212,6 +212,7 @@ public String getAttributeValue(UcdProperty prop, int codepoint) {
                         }
                         return Optional.ofNullable(resolvedValue).orElse("");
                     case kDefinition:
+                    case kEH_FVal:
                         return resolvedValue;
                     default:
                         if (resolvedValue != null) {
diff --git a/unicodetools/src/main/resources/org/unicode/props/IndexPropertyRegex.txt b/unicodetools/src/main/resources/org/unicode/props/IndexPropertyRegex.txt
index abf2c2356..9809bce10 100644
--- a/unicodetools/src/main/resources/org/unicode/props/IndexPropertyRegex.txt
+++ b/unicodetools/src/main/resources/org/unicode/props/IndexPropertyRegex.txt
@@ -216,14 +216,15 @@ Names_List_Cross_Ref ; MULTI_VALUED ; .*
 
 # Regex patterns from UAX #57
 
-kEH_Cat ;                     SINGLE_VALUED ;                ([A-IK-Z]|AA)-[0-9]{2}-[0-9]{3}
+kEH_Cat ;                     SINGLE_VALUED ;                ([A-IK-Z]|AA)-\d{2}-\d{3}
 kEH_Desc ;                    SINGLE_VALUED ;                [^\t"]+
 kEH_Func ;                    MULTI_VALUED ;                 [^\t"]+
-kEH_FVal ;                    MULTI_VALUED ;                 [\x{A723}\x{A7BD}y\x{A725}wbpfmnrh\x{1E25}\x{1E2B}\x{1E96}s\x{0161}\x{1E33}kgt\x{1E6F}d\x{1E0F}./|\-;=\(\)\s]+
-kEH_HG ;                      MULTI_VALUED ;                 ([A-IK-Z]|AA)[0-9]{1,3}[A-Za-z]{0,2}
-kEH_IFAO ;                    MULTI_VALUED ;                 [0-9]{1,3},[0-9]{1,2}
-kEH_JSesh ;                   MULTI_VALUED ;                 ([A-IK-Z]|Aa|NL|NU|Ff)[0-9]{1,3}[A-Za-z]{0,5}|(US1|US22|US248|US685)([A-IK-Z]|Aa|NL|NU)[0-9]{1,3}[A-Za-z]{0,5}
-kEH_UniK ;                    SINGLE_VALUED ;                ([A-IK-Z]|AA|NL|NU)[0-9]{3}[A-Z]{0,2}|HJ ([A-IK-Z]|AA)[0-9]{3}[A-Z]{0,2}
+# Revisit once the spec settles down.
+kEH_FVal ;                    SINGLE_VALUED ;                [^\t"]+
+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}
+kEH_UniK ;                    SINGLE_VALUED ;                ([A-IK-Z]|AA|NL|NU)\d{3}[A-Z]{0,2}|HJ ([A-IK-Z]|AA)\d{3}[A-Z]{0,2}
 
 # =============================
 # Catalog/Enum/Binary Properties

From dee0f388203a5961b77bf60b7fd5421861e011fe Mon Sep 17 00:00:00 2001
From: John Wilcock <jowilco@microsoft.com>
Date: Fri, 13 Jun 2025 17:15:58 -0700
Subject: [PATCH 2/2] Generate enums + spotless

---
 .../src/main/java/org/unicode/props/UcdProperty.java       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/unicodetools/src/main/java/org/unicode/props/UcdProperty.java b/unicodetools/src/main/java/org/unicode/props/UcdProperty.java
index 687c2ab5c..53606a32d 100644
--- a/unicodetools/src/main/java/org/unicode/props/UcdProperty.java
+++ b/unicodetools/src/main/java/org/unicode/props/UcdProperty.java
@@ -217,12 +217,7 @@ 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,
-            null,
-            ValueCardinality.Unordered,
-            "kEH_FVal"),
+    kEH_FVal(PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "kEH_FVal"),
     kEH_Func(
             PropertyType.Miscellaneous,
             DerivedPropertyStatus.Provisional,