ICU-22707 Add support for property Modifier_Combining_Mark

unicode-org · Jul 30, 2024 · e9ba161 · e9ba161
1 parent 06c077b
commit e9ba161
Show file tree

Hide file tree

Showing 14 changed files with 209 additions and 106 deletions.
diff --git a/icu4c/source/common/characterproperties.cpp b/icu4c/source/common/characterproperties.cpp
@@ -184,6 +184,7 @@ void U_CALLCONV initInclusion(UPropertySource src, UErrorCode &errorCode) {
         sa.add(sa.set, 0x2FFF + 1);
         break;
     case UPROPS_SRC_ID_COMPAT_MATH:
+    case UPROPS_SRC_MCM:
         uprops_addPropertyStarts(src, &sa, &errorCode);
         break;
     case UPROPS_SRC_BLOCK:

diff --git a/icu4c/source/common/propname_data.h b/icu4c/source/common/propname_data.h
diff --git a/icu4c/source/common/unicode/uchar.h b/icu4c/source/common/unicode/uchar.h
@@ -553,13 +553,19 @@ typedef enum UProperty {
      * @draft ICU 74
      */
     UCHAR_ID_COMPAT_MATH_CONTINUE=74,
+    /**
+     * Binary property Modifier_Combining_Mark.
+     * Used by the AMTRA algorithm in UAX #53.
+     * @draft ICU 76
+     */
+    UCHAR_MODIFIER_COMBINING_MARK=75,
 #endif  // U_HIDE_DRAFT_API
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the last constant for binary Unicode properties.
      * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
-    UCHAR_BINARY_LIMIT=75,
+    UCHAR_BINARY_LIMIT=76,
 #endif  // U_HIDE_DEPRECATED_API
 
     /** Enumerated property Bidi_Class.

diff --git a/icu4c/source/common/uprops.cpp b/icu4c/source/common/uprops.cpp
@@ -359,6 +359,19 @@ static constexpr UChar32 ID_COMPAT_MATH_START[] = {
     0x1D7C3
 };
 
+/** Ranges (start/limit pairs) of Modifier_Combining_mark (only), from UCD PropList.txt. */
+static constexpr UChar32 MODIFIER_COMBINING_MARK[] = {
+    0x0654, 0x0655 + 1,
+    0x0658, 0x0658 + 1, // U+0658
+    0x06DC, 0x06DC + 1, // U+06DC
+    0x06E3, 0x06E3 + 1, // U+06E3
+    0x06E7, 0x06E8 + 1,
+    0x08CA, 0x08CB + 1,
+    0x08CD, 0x08CF + 1,
+    0x08D3, 0x08D3 + 1, // U+08D3
+    0x08F3, 0x08F3 + 1  // U+08F3
+};
+
 static UBool isIDCompatMathStart(const BinaryProperty &/*prop*/, UChar32 c, UProperty /*which*/) {
     if (c < ID_COMPAT_MATH_START[0]) { return false; }  // fastpath for common scripts
     for (UChar32 startChar : ID_COMPAT_MATH_START) {
@@ -375,6 +388,14 @@ static UBool isIDCompatMathContinue(const BinaryProperty &prop, UChar32 c, UProp
     return isIDCompatMathStart(prop, c, UCHAR_ID_COMPAT_MATH_START);
 }
 
+static UBool isModifierCombiningMark(const BinaryProperty &/*prop*/, UChar32 c, UProperty /*which*/) {
+    for (int32_t i = 0; i < UPRV_LENGTHOF(MODIFIER_COMBINING_MARK); i += 2) {
+        if (c < MODIFIER_COMBINING_MARK[i]) { return false; }  // below range start
+        if (c < MODIFIER_COMBINING_MARK[i + 1]) { return true; }  // below range limit
+    }
+    return false;
+}
+
 static const BinaryProperty binProps[UCHAR_BINARY_LIMIT]={
     /*
      * column and mask values for binary properties from u_getUnicodeProperties().
@@ -459,6 +480,7 @@ static const BinaryProperty binProps[UCHAR_BINARY_LIMIT]={
     { UPROPS_SRC_IDSU, 0, isIDSUnaryOperator }, // UCHAR_IDS_UNARY_OPERATOR
     { UPROPS_SRC_ID_COMPAT_MATH, 0, isIDCompatMathStart }, // UCHAR_ID_COMPAT_MATH_START
     { UPROPS_SRC_ID_COMPAT_MATH, 0, isIDCompatMathContinue }, // UCHAR_ID_COMPAT_MATH_CONTINUE
+    { UPROPS_SRC_MCM, 0 , isModifierCombiningMark }, // UCHAR_MODIFIER_COMBINING_MARK
 };
 
 U_CAPI UBool U_EXPORT2
@@ -846,6 +868,13 @@ uprops_addPropertyStarts(UPropertySource src, const USetAdder *sa, UErrorCode *p
         }
         return;
     }
+    if (src == UPROPS_SRC_MCM) {
+        // range limits
+        for (UChar32 c : MODIFIER_COMBINING_MARK) {
+            sa->add(sa->set, c);
+        }
+        return;
+    }
     if (!ulayout_ensureData(*pErrorCode)) { return; }
     const UCPTrie *trie;
     switch (src) {

diff --git a/icu4c/source/common/uprops.h b/icu4c/source/common/uprops.h
@@ -449,6 +449,7 @@ enum UPropertySource {
     UPROPS_SRC_IDSU,
     UPROPS_SRC_ID_COMPAT_MATH,
     UPROPS_SRC_BLOCK,
+    UPROPS_SRC_MCM,
     /** One more than the highest UPropertySource (UPROPS_SRC_) constant. */
     UPROPS_SRC_COUNT
 };

diff --git a/icu4c/source/data/in/pnames.icu b/icu4c/source/data/in/pnames.icu
diff --git a/icu4c/source/test/cintltst/cucdtst.c b/icu4c/source/test/cintltst/cucdtst.c
@@ -2810,6 +2810,13 @@ TestAdditionalProperties(void) {
         { 0x05C0, UCHAR_INDIC_CONJUNCT_BREAK, U_INCB_NONE },
         { 0xD800, UCHAR_INDIC_CONJUNCT_BREAK, U_INCB_NONE },
 
+        /* Modifier_Combining_Mark values */
+        { 0xD800, UCHAR_MODIFIER_COMBINING_MARK, false },
+        { 0x0653, UCHAR_MODIFIER_COMBINING_MARK, false },
+        { 0x0654, UCHAR_MODIFIER_COMBINING_MARK, true },
+        { 0x0655, UCHAR_MODIFIER_COMBINING_MARK, true },
+        { 0x0656, UCHAR_MODIFIER_COMBINING_MARK, false },
+
         /* undefined UProperty values */
         { 0x61, 0x4a7, 0 },
         { 0x234bc, 0x15ed, 0 }

diff --git a/icu4c/source/test/intltest/ucdtest.cpp b/icu4c/source/test/intltest/ucdtest.cpp
@@ -1099,6 +1099,7 @@ void UnicodeTest::TestPropertiesUsingPpucd() {
         { UCHAR_INDIC_CONJUNCT_BREAK, U_INCB_CONSONANT },
         { UCHAR_INDIC_CONJUNCT_BREAK, U_INCB_EXTEND },
         { UCHAR_INDIC_CONJUNCT_BREAK, U_INCB_LINKER },
+        { UCHAR_MODIFIER_COMBINING_MARK },
     };
 
     // Iterate through PPUCD file, accumulating each line's data into each UnicodeSet per property

diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/CharacterPropertiesImpl.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/CharacterPropertiesImpl.java
@@ -82,6 +82,9 @@ private static UnicodeSet getInclusionsForSource(int src) {
             case UCharacterProperty.SRC_ID_COMPAT_MATH:
                 UCharacterProperty.mathCompat_addPropertyStarts(incl);
                 break;
+            case UCharacterProperty.SRC_MCM:
+                UCharacterProperty.mcm_addPropertyStarts(incl);
+                break;
             case UCharacterProperty.SRC_BLOCK:
                 UCharacterProperty.INSTANCE.ublock_addPropertyStarts(incl);
                 break;

diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/UCharacterProperty.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/UCharacterProperty.java
@@ -115,8 +115,9 @@ public final class UCharacterProperty
     public static final int SRC_IDSU=16;
     public static final int SRC_ID_COMPAT_MATH=17;
     public static final int SRC_BLOCK=18;
+    public static final int SRC_MCM=19;
     /** One more than the highest UPropertySource (SRC_) constant. */
-    public static final int SRC_COUNT=19;
+    public static final int SRC_COUNT=20;
 
     private static final class LayoutProps {
         private static final class IsAcceptable implements ICUBinary.Authenticate {
@@ -407,6 +408,19 @@ boolean contains(int c) {
         0x1D7C3
     };
 
+    /** Ranges (start/limit pairs) of Modifier_Combining_mark (only), from UCD PropList.txt. */
+    private static final int[] MODIFIER_COMBINING_MARK = {
+        0x0654, 0x0655 + 1,
+        0x0658, 0x0658 + 1, // U+0658
+        0x06DC, 0x06DC + 1, // U+06DC
+        0x06E3, 0x06E3 + 1, // U+06E3
+        0x06E7, 0x06E8 + 1,
+        0x08CA, 0x08CB + 1,
+        0x08CD, 0x08CF + 1,
+        0x08D3, 0x08D3 + 1, // U+08D3
+        0x08F3, 0x08F3 + 1  // U+08F3
+};
+
     private class MathCompatBinaryProperty extends BinaryProperty {
         int which;
         MathCompatBinaryProperty(int which) {
@@ -429,6 +443,20 @@ boolean contains(int c) {
         }
     }
 
+    private class MCMBinaryProperty extends BinaryProperty {
+        MCMBinaryProperty() {
+            super(SRC_MCM);
+        }
+        @Override
+        boolean contains(int c) {
+            for (int i = 0; i < MODIFIER_COMBINING_MARK.length; i += 2) {
+                if (c < MODIFIER_COMBINING_MARK[i]) { return false; }  // below range start
+                if (c < MODIFIER_COMBINING_MARK[i + 1]) { return true; }  // below range limit
+            }
+            return false;
+        }
+    }
+
     BinaryProperty[] binProps={
         /*
          * Binary-property implementations must be in order of corresponding UProperty,
@@ -629,6 +657,7 @@ boolean contains(int c) {
         },
         new MathCompatBinaryProperty(UProperty.ID_COMPAT_MATH_START),
         new MathCompatBinaryProperty(UProperty.ID_COMPAT_MATH_CONTINUE),
+        new MCMBinaryProperty(),
     };
 
     public boolean hasBinaryProperty(int c, int which) {
@@ -1803,6 +1832,13 @@ static void mathCompat_addPropertyStarts(UnicodeSet set) {
         }
     }
 
+    static void mcm_addPropertyStarts(UnicodeSet set) {
+        // range limits
+        for (int c : MODIFIER_COMBINING_MARK) {
+            set.add(c);
+        }
+    }
+
     public void ublock_addPropertyStarts(UnicodeSet set) {
         // Add the start code point of each same-value range of the trie.
         // We store Block values indexed by the code point shifted right 4 bits;

diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/lang/UProperty.java b/icu4j/main/core/src/main/java/com/ibm/icu/lang/UProperty.java
@@ -641,12 +641,20 @@ public interface UProperty
      */
     public static final int ID_COMPAT_MATH_CONTINUE = 74;
 
+    /**
+     * Binary property Modifier_Combining_Mark.
+     * <p>Used by the AMTRA algorithm in UAX #53.
+     *
+     * @draft ICU 76
+     */
+    public static final int MODIFIER_COMBINING_MARK = 75;
+
     /**
      * One more than the last constant for binary Unicode properties.
      * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
     @Deprecated
-    public static final int BINARY_LIMIT = 75;
+    public static final int BINARY_LIMIT = 76;
 
     /**
      * Enumerated property Bidi_Class.

diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pnames.icu b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/pnames.icu
diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/lang/UCharacterTest.java
@@ -2220,6 +2220,13 @@ public void TestAdditionalProperties()
             { 0x05C0, UProperty.INDIC_CONJUNCT_BREAK, UCharacter.IndicConjunctBreak.NONE.ordinal() },
             { 0xD800, UProperty.INDIC_CONJUNCT_BREAK, UCharacter.IndicConjunctBreak.NONE.ordinal() },
 
+            /* Modifier_Combining_Mark values */
+            { 0xD800, UProperty.MODIFIER_COMBINING_MARK, FALSE },
+            { 0x0653, UProperty.MODIFIER_COMBINING_MARK, FALSE },
+            { 0x0654, UProperty.MODIFIER_COMBINING_MARK, TRUE },
+            { 0x0655, UProperty.MODIFIER_COMBINING_MARK, TRUE },
+            { 0x0656, UProperty.MODIFIER_COMBINING_MARK, FALSE },
+
             /* undefined UProperty values */
             { 0x61, 0x4a7, 0 },
             { 0x234bc, 0x15ed, 0 }

diff --git a/tools/unicode/c/genprops/pnames_data.h b/tools/unicode/c/genprops/pnames_data.h
@@ -1249,7 +1249,7 @@ static const Value VALUES_ID_Type[12] = {
     Value(U_ID_TYPE_RECOMMENDED, "Recommended Recommended"),
 };
 
-static const Property PROPERTIES[120] = {
+static const Property PROPERTIES[121] = {
     Property(UCHAR_ALPHABETIC, "Alpha Alphabetic"),
     Property(UCHAR_ASCII_HEX_DIGIT, "AHex ASCII_Hex_Digit"),
     Property(UCHAR_BIDI_CONTROL, "Bidi_C Bidi_Control"),
@@ -1325,6 +1325,7 @@ static const Property PROPERTIES[120] = {
     Property(UCHAR_IDS_UNARY_OPERATOR, "IDSU IDS_Unary_Operator"),
     Property(UCHAR_ID_COMPAT_MATH_START, "ID_Compat_Math_Start ID_Compat_Math_Start"),
     Property(UCHAR_ID_COMPAT_MATH_CONTINUE, "ID_Compat_Math_Continue ID_Compat_Math_Continue"),
+    Property(UCHAR_MODIFIER_COMBINING_MARK, "MCM Modifier_Combining_Mark"),
     Property(UCHAR_BIDI_CLASS, "bc Bidi_Class", VALUES_bc, 23),
     Property(UCHAR_BLOCK, "blk Block", VALUES_blk, 339),
     Property(UCHAR_CANONICAL_COMBINING_CLASS, "ccc Canonical_Combining_Class", VALUES_ccc, 58),