Regenerate DoNotEmit (#1246)

* argh

* what a mess

* Hopefully good enough

* Typos from L2/24-144

* Regenerate UCD

* After Markus’s review

Author: eggrobin

UnicodeJsps/src/main/java/org/unicode/jsp/XPropertyFactory.java

@@ -423,6 +423,11 @@ protected String _getValue(int codepoint) {
             return Common.getXStringPropertyValue(fakeEnumValue, codepoint, NameChoice.LONG);
         }
 
+        @Override
+        protected String _getValue(String string) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         protected List _getValueAliases(String valueAlias, List result) {
             addUnique("<string>", result);
@@ -466,6 +471,11 @@ protected List _getValueAliases(String valueAlias, List result) {
             return result;
         }
 
+        @Override
+        protected String _getValue(String string) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         protected String _getVersion() {
             return VersionInfo.ICU_VERSION.toString();
@@ -642,6 +652,11 @@ protected String _getValue(int codepoint) {
             return YESNO_ARRAY[unicodeSet.contains(codepoint) ? 0 : 1];
         }
 
+        @Override
+        protected String _getValue(String string) {
+            return YESNO_ARRAY[unicodeSet.contains(string) ? 0 : 1];
+        }
+
         @Override
         protected List _getAvailableValues(List result) {
             return YESNO;

unicodetools/data/ucd/dev/DoNotEmit.txt

@@ -1,11 +1,11 @@
-# DoNotEmit-17.0.0.txt
-# Date: 2025-08-14
+# DoNotEmit-18.0.0.txt
+# Date: 2025-11-25, 16:30:13 GMT
 # © 2025 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
 #
-# For documentation, see UAX #44: Unicode Character Database,
-# at https://www.unicode.org/reports/tr44/
+# Unicode Character Database
+#   For documentation, see https://www.unicode.org/reports/tr44/
 #
 # Do_Not_Emit
 #
@@ -343,9 +343,9 @@
 # ================================================
 
 # Latin, from text in the "Latin" section of the core specification, the NamesList, and the uppercase mapping
+0131 0307; 0069 0307; Dotless_Form # LATIN SMALL LETTER DOTLESS I, COMBINING DOT ABOVE; LATIN SMALL LETTER I, COMBINING DOT ABOVE
 0140; 006C 00B7; Preferred_Spelling # LATIN SMALL LETTER L WITH MIDDLE DOT; LATIN SMALL LETTER L, MIDDLE DOT
 0149; 2019 006E; Deprecated # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE; RIGHT SINGLE QUOTATION MARK, LATIN SMALL LETTER N
-0131 0307; 0069 0307; Dotless_Form # LATIN SMALL LETTER DOTLESS I, COMBINING DOT ABOVE; LATIN SMALL LETTER I, COMBINING DOT ABOVE
 0237 0307; 006A 0307; Dotless_Form # LATIN SMALL LETTER DOTLESS J, COMBINING DOT ABOVE; LATIN SMALL LETTER J, COMBINING DOT ABOVE
 # Characters with overstruck tilde for which a precomposed form exists,
 # but the sequences are not canonically equivalent
@@ -402,22 +402,22 @@
 0281 0321; 1DF36; Precomposed_Form # LATIN LETTER SMALL CAPITAL INVERTED R, COMBINING PALATALIZED HOOK BELOW; LATIN LETTER SMALL CAPITAL INVERTED R WITH PALATAL HOOK
 0283 0321; 1D8B; Precomposed_Form # LATIN SMALL LETTER ESH, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER ESH WITH PALATAL HOOK
 028B 0321; 1DF39; Precomposed_Form # LATIN SMALL LETTER V WITH HOOK, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER V WITH HOOK AND PALATAL HOOK
-0295 0321; 1DF3A; Precomposed_Form # LATIN LETTER PHARYNGEAL VOICED FRICATIVE, COMBINING PALATALIZED HOOK BELOW; LATIN LETTER PHARYNGEAL VOICED FRICATIVE WITH PALATAL HOOK
 0292 0321; 1DF18; Precomposed_Form # LATIN SMALL LETTER EZH, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER EZH WITH PALATAL HOOK
+0295 0321; 1DF3A; Precomposed_Form # LATIN LETTER PHARYNGEAL VOICED FRICATIVE, COMBINING PALATALIZED HOOK BELOW; LATIN LETTER PHARYNGEAL VOICED FRICATIVE WITH PALATAL HOOK
 02A3 0321; 1DF2E; Precomposed_Form # LATIN SMALL LETTER DZ DIGRAPH, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER DZ DIGRAPH WITH PALATAL HOOK
 02A4 0321; 1DF12; Precomposed_Form # LATIN SMALL LETTER DEZH DIGRAPH, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER DEZH DIGRAPH WITH PALATAL HOOK
 02A6 0321; 1DF38; Precomposed_Form # LATIN SMALL LETTER TS DIGRAPH, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER TS DIGRAPH WITH PALATAL HOOK
 02A7 0321; 1DF17; Precomposed_Form # LATIN SMALL LETTER TESH DIGRAPH, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER TESH DIGRAPH WITH PALATAL HOOK
-02B0 0321; 1DF26; Precomposed_Form # MODIFIER LETTER SMALL H, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL H WITH PALATAL HOOK
+02B0 0321; 1DFF6; Precomposed_Form # MODIFIER LETTER SMALL H, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL H WITH PALATAL HOOK
 02E1 0321; 1DAA; Precomposed_Form # MODIFIER LETTER SMALL L, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL L WITH PALATAL HOOK
-02E2 0321; 1DF28; Precomposed_Form # MODIFIER LETTER SMALL S, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL S WITH PALATAL HOOK
-03B2 0321; 1DF3B; Precomposed_Form # GREEK SMALL LETTER BETA, COMBINING PALATALIZED HOOK BELOW; GREEK SMALL LETTER BETA WITH PALATAL HOOK
-03B8 0321; 1DF3C; Precomposed_Form # GREEK SMALL LETTER THETA, COMBINING PALATALIZED HOOK BELOW; GREEK SMALL LETTER THETA WITH PALATAL HOOK
-03C7 0321; 1DF3D; Precomposed_Form # GREEK SMALL LETTER CHI, COMBINING PALATALIZED HOOK BELOW; GREEK SMALL LETTER CHI WITH PALATAL HOOK
-1D48 0321; 1DF25; Precomposed_Form # MODIFIER LETTER SMALL D, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL D WITH PALATAL HOOK
+02E2 0321; 1DFF8; Precomposed_Form # MODIFIER LETTER SMALL S, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL S WITH PALATAL HOOK
+03B2 0321; 1DF3B; Precomposed_Form # GREEK SMALL LETTER BETA, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER BETA WITH PALATAL HOOK
+03B8 0321; 1DF3C; Precomposed_Form # GREEK SMALL LETTER THETA, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER THETA WITH PALATAL HOOK
+03C7 0321; 1DF3D; Precomposed_Form # GREEK SMALL LETTER CHI, COMBINING PALATALIZED HOOK BELOW; LATIN SMALL LETTER CHI WITH PALATAL HOOK
+1D48 0321; 1DFF5; Precomposed_Form # MODIFIER LETTER SMALL D, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL D WITH PALATAL HOOK
 1D57 0321; 1DB5; Precomposed_Form # MODIFIER LETTER SMALL T, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL T WITH PALATAL HOOK
-1DBB 0321; 1DF29; Precomposed_Form # MODIFIER LETTER SMALL Z, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL Z WITH PALATAL HOOK
-207F 0321; 1DF27; Precomposed_Form # SUPERSCRIPT LATIN SMALL LETTER N, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL N WITH PALATAL HOOK
+1DBB 0321; 1DFF9; Precomposed_Form # MODIFIER LETTER SMALL Z, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL Z WITH PALATAL HOOK
+207F 0321; 1DFF7; Precomposed_Form # SUPERSCRIPT LATIN SMALL LETTER N, COMBINING PALATALIZED HOOK BELOW; MODIFIER LETTER SMALL N WITH PALATAL HOOK
 # Characters with retroflex hook for which a precomposed form exists,
 # but the sequences are not canonically equivalent
 0052 0322; 2C64; Precomposed_Form # LATIN CAPITAL LETTER R, COMBINING RETROFLEX HOOK BELOW; LATIN CAPITAL LETTER R WITH TAIL

unicodetools/src/main/java/org/unicode/jsp/ICUPropertyFactory.java

@@ -158,6 +158,11 @@ public String _getValue(int codePoint) {
             return null;
         }
 
+        @Override
+        protected String _getValue(String string) {
+            throw new UnsupportedOperationException();
+        }
+
         private String getAge(int codePoint) {
             String temp = UCharacter.getAge(codePoint).toString();
             if (temp.equals("0.0.0.0")) return "unassigned";

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

@@ -812,6 +812,11 @@ protected String _getValue(int codepoint) {
             return resolveValue(result, codepoint);
         }
 
+        @Override
+        protected String _getValue(String string) {
+            return _getRawUnicodeMap().get(string);
+        }
+
         @Override
         public UnicodeSet getSet(PatternMatcher matcher, UnicodeSet result) {
             if (baseVersionProperties == null) {

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

@@ -288,6 +288,26 @@ public String getValue(int codepoint) {
         return _getValue(codepoint);
     }
 
+    public Iterable<String> getValues(String string) {
+        String value = _getValue(string);
+        return isMultivalued && value != null
+                ? delimiterSplitter.split(value)
+                : Collections.singleton(value);
+    }
+
+    public String getValue(String string) {
+        final var it = getValues(string).iterator();
+        final var result = it.next();
+        if (it.hasNext()) {
+            throw new IllegalArgumentException(
+                    name
+                            + ": getValue("
+                            + string
+                            + ") but the property is multivalued for that string");
+        }
+        return result;
+    }
+
     // public String getValue(int codepoint, boolean isShort) {
     // return getValue(codepoint);
     // }
@@ -331,6 +351,8 @@ public List<String> getAvailableValues(List<String> result) {
 
     protected abstract String _getValue(int codepoint);
 
+    protected abstract String _getValue(String string);
+
     protected abstract List<String> _getNameAliases(List<String> result);
 
     protected abstract List<String> _getValueAliases(String valueAlias, List<String> result);
@@ -1205,6 +1227,11 @@ public String _getValue(int codepoint) {
             return filter.remap(property.getValue(codepoint));
         }
 
+        @Override
+        public String _getValue(String string) {
+            return filter.remap(property.getValue(string));
+        }
+
         @Override
         public List<String> _getValueAliases(String valueAlias, List<String> result) {
             if (backmap == null) {
@@ -1551,6 +1578,11 @@ private void _addToValues(String item, String alias) {
             _ensureValueInAliases(item);
             addValueAlias(item, alias, AliasAddAction.REQUIRE_MAIN_ALIAS);
         }
+
+        @Override
+        protected String _getValue(String string) {
+            throw new UnsupportedOperationException();
+        }
         /*        public String _getVersion() {
         return version;
         }
@@ -1602,6 +1634,11 @@ protected String _getValue(int codepoint) {
             return unicodeMap.getValue(codepoint);
         }
 
+        @Override
+        public String _getValue(String string) {
+            return unicodeMap.getValue(string);
+        }
+
         /* protected List _getValueAliases(String valueAlias, List result) {
         if (!unicodeMap.getAvailableValues().contains(valueAlias)) return result;
         result.add(valueAlias);
@@ -1758,6 +1795,11 @@ protected String _getValue(int codepoint) {
             return YESNO_ARRAY[unicodeSet.contains(codepoint) ? 0 : 1];
         }
 
+        @Override
+        public String _getValue(String string) {
+            return YESNO_ARRAY[unicodeSet.contains(string) ? 0 : 1];
+        }
+
         @Override
         protected List<String> _getAvailableValues(List<String> result) {
             return YESNO;