From 78cd8d365f242eed70141dfad40521d4463b0409 Mon Sep 17 00:00:00 2001
From: Robin Leroy <egg.robin.leroy@gmail.com>
Date: Wed, 26 Mar 2025 11:17:34 +0100
Subject: [PATCH 1/3] Other=ISO_Comment

---
 .../src/main/java/org/unicode/props/UnicodeProperty.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java b/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
index ee1ef259b9..ab1728f134 100644
--- a/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
+++ b/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
@@ -952,6 +952,13 @@ private class MyXSymbolTable extends UnicodeSet.XSymbolTable {
             @Override
             public boolean applyPropertyAlias(
                     String propertyName, String propertyValue, UnicodeSet result) {
+                if (propertyName.equals("C") && propertyValue.isEmpty()) {
+                    // C matches isc=ISO_Comment, and we are not able to distinguish
+                    // \p{C} (=\p{General_Category=Other}) from \p{C=} (=\p{ISO_Comment=}) here.
+                    // Fall back to ICU, since this symbol table does not implement GC groupings.
+                    // TODO(egg): This symbol table needs to go, see #1073, #1074.
+                    return false;
+                }
                 if (false) System.out.println(propertyName + "=" + propertyValue);
                 UnicodeProperty prop = getProperty(propertyName);
                 if (prop == null) return false;

From 23eace712afc8552e9493ad6a71db09e22541e23 Mon Sep 17 00:00:00 2001
From: Robin Leroy <egg.robin.leroy@gmail.com>
Date: Wed, 26 Mar 2025 17:48:01 +0100
Subject: [PATCH 2/3] c

---
 .../src/main/java/org/unicode/props/UnicodeProperty.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java b/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
index ab1728f134..298b59ea2c 100644
--- a/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
+++ b/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
@@ -952,7 +952,7 @@ private class MyXSymbolTable extends UnicodeSet.XSymbolTable {
             @Override
             public boolean applyPropertyAlias(
                     String propertyName, String propertyValue, UnicodeSet result) {
-                if (propertyName.equals("C") && propertyValue.isEmpty()) {
+                if ((propertyName.equals("C") || propertyName.equals("c")) && propertyValue.isEmpty()) {
                     // C matches isc=ISO_Comment, and we are not able to distinguish
                     // \p{C} (=\p{General_Category=Other}) from \p{C=} (=\p{ISO_Comment=}) here.
                     // Fall back to ICU, since this symbol table does not implement GC groupings.

From b470e08f6a91920bf28c0ed76a6c2762b00b594f Mon Sep 17 00:00:00 2001
From: Robin Leroy <egg.robin.leroy@gmail.com>
Date: Wed, 26 Mar 2025 18:51:49 +0100
Subject: [PATCH 3/3] spots

---
 .../src/main/java/org/unicode/props/UnicodeProperty.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java b/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
index 298b59ea2c..9ea7729a76 100644
--- a/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
+++ b/unicodetools/src/main/java/org/unicode/props/UnicodeProperty.java
@@ -952,7 +952,8 @@ private class MyXSymbolTable extends UnicodeSet.XSymbolTable {
             @Override
             public boolean applyPropertyAlias(
                     String propertyName, String propertyValue, UnicodeSet result) {
-                if ((propertyName.equals("C") || propertyName.equals("c")) && propertyValue.isEmpty()) {
+                if ((propertyName.equals("C") || propertyName.equals("c"))
+                        && propertyValue.isEmpty()) {
                     // C matches isc=ISO_Comment, and we are not able to distinguish
                     // \p{C} (=\p{General_Category=Other}) from \p{C=} (=\p{ISO_Comment=}) here.
                     // Fall back to ICU, since this symbol table does not implement GC groupings.