Skip to content

Commit dfea3ca

Browse files
authored
kMandarin, kTotalStrokes, and kUnihanCore2020 in PropertyAliases.txt (#1106)
* UTC-183-C28 Add the Informative properties kMandarin, kTotalStrokes, and kUnihanCore2020 to PropertyAliases.txt, with respective short aliases cjkMandarin, cjkTotalStrokes, and cjkUnihanCore2020. For Unicode Version 17.0. See L2/25-087 item 1.5. * GenerateEnums * Add them to TUP * Regenerate UCD * UTC-183-A58 Cite more annexes * Regenerate UCD
1 parent 38ef145 commit dfea3ca

File tree

6 files changed

+34
-13
lines changed

6 files changed

+34
-13
lines changed

unicodetools/data/ucd/dev/PropertyAliases.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# PropertyAliases-17.0.0.txt
2-
# Date: 2025-01-27, 18:09:29 GMT
2+
# Date: 2025-04-25, 14:00:52 GMT
33
# © 2025 Unicode®, Inc.
44
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
55
# For terms of use and license, see https://www.unicode.org/terms_of_use.html
@@ -48,8 +48,11 @@
4848
#
4949
# The combination of property value and property name is, however, unique.
5050
#
51-
# For more information, see UAX #44, Unicode Character Database, and
52-
# UTS #18, Unicode Regular Expressions.
51+
# For more information, see:
52+
# - UAX #44, Unicode Character Database;
53+
# - UAX #38, Unicode Han Database (Unihan);
54+
# - UAX #57, Unicode Egyptian Hieroglyph Database (Unikemet);
55+
# - UTS #18, Unicode Regular Expressions.
5356
# ================================================
5457

5558

@@ -96,7 +99,10 @@ cjkIRG_TSource ; kIRG_TSource
9699
cjkIRG_UKSource ; kIRG_UKSource
97100
cjkIRG_USource ; kIRG_USource
98101
cjkIRG_VSource ; kIRG_VSource
102+
cjkMandarin ; kMandarin
99103
cjkRSUnicode ; kRSUnicode ; Unicode_Radical_Stroke; URS
104+
cjkTotalStrokes ; kTotalStrokes
105+
cjkUnihanCore2020 ; kUnihanCore2020
100106
isc ; ISO_Comment
101107
JSN ; Jamo_Short_Name
102108
kEH_Cat ; kEH_Cat
@@ -220,6 +226,6 @@ XO_NFKC ; Expands_On_NFKC
220226
XO_NFKD ; Expands_On_NFKD
221227

222228
# ================================================
223-
# Total: 142
229+
# Total: 145
224230

225231
# EOF

unicodetools/data/ucd/dev/PropertyValueAliases.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# PropertyValueAliases-17.0.0.txt
2-
# Date: 2025-02-14, 15:50:28 GMT
2+
# Date: 2025-04-25, 13:37:02 GMT
33
# © 2025 Unicode®, Inc.
44
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
55
# For terms of use and license, see https://www.unicode.org/terms_of_use.html
@@ -1722,4 +1722,16 @@ kEH_NoMirror; Y ; Yes ; T
17221722
kEH_NoRotate; N ; No ; F ; False
17231723
kEH_NoRotate; Y ; Yes ; T ; True
17241724

1725+
# kMandarin (cjkMandarin)
1726+
1727+
# @missing: 0000..10FFFF; kMandarin; <none>
1728+
1729+
# kTotalStrokes (cjkTotalStrokes)
1730+
1731+
# @missing: 0000..10FFFF; kTotalStrokes; <none>
1732+
1733+
# kUnihanCore2020 (cjkUnihanCore2020)
1734+
1735+
# @missing: 0000..10FFFF; kUnihanCore2020; <none>
1736+
17251737
# EOF

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ public enum UcdProperty {
348348
PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "cjkMainlandTelegraph"),
349349
kMandarin(
350350
PropertyType.Miscellaneous,
351-
DerivedPropertyStatus.Provisional,
351+
DerivedPropertyStatus.Approved,
352352
null,
353353
ValueCardinality.Ordered,
354354
"cjkMandarin"),
@@ -468,12 +468,12 @@ public enum UcdProperty {
468468
"cjkTang"),
469469
kTotalStrokes(
470470
PropertyType.Miscellaneous,
471-
DerivedPropertyStatus.Provisional,
471+
DerivedPropertyStatus.Approved,
472472
null,
473473
ValueCardinality.Ordered,
474474
"cjkTotalStrokes"),
475475
kUnihanCore2020(
476-
PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "cjkUnihanCore2020"),
476+
PropertyType.Miscellaneous, DerivedPropertyStatus.Approved, "cjkUnihanCore2020"),
477477
kVietnamese(
478478
PropertyType.Miscellaneous,
479479
DerivedPropertyStatus.Provisional,

unicodetools/src/main/java/org/unicode/text/UCD/ToolUnicodePropertySource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,9 @@ public String _getValue(int codepoint) {
309309
"cjkIRG_VSource",
310310
"cjkIRG_VSource",
311311
"kIRG_VSource");
312+
add(iup.getProperty("kMandarin"));
313+
add(iup.getProperty("kTotalStrokes"));
314+
add(iup.getProperty("kUnihanCore2020"));
312315
add(iup.getProperty("kEH_Cat"));
313316
add(iup.getProperty("kEH_Desc"));
314317
add(iup.getProperty("kEH_HG"));

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ cjkGradeLevel ; kGradeLevel ; Provisional
112112
cjkHDZRadBreak ; kHDZRadBreak ; Provisional
113113
cjkHKGlyph ; kHKGlyph ; Provisional
114114
cjkPhonetic ; kPhonetic ; Provisional
115-
cjkTotalStrokes ; kTotalStrokes ; Provisional
116115
cjkBigFive ; kBigFive ; Provisional
117116
cjkCCCII ; kCCCII ; Provisional
118117
cjkCNS1986 ; kCNS1986 ; Provisional
@@ -151,7 +150,6 @@ cjkHanyuPinyin ; kHanyuPinyin ; Provisional
151150
cjkJapaneseKun ; kJapaneseKun ; Provisional
152151
cjkJapaneseOn ; kJapaneseOn ; Provisional
153152
cjkKorean ; kKorean ; Provisional
154-
cjkMandarin ; kMandarin ; Provisional
155153
cjkTang ; kTang ; Provisional
156154
cjkVietnamese ; kVietnamese ; Provisional
157155
cjkXHC1983 ; kXHC1983 ; Provisional
@@ -166,7 +164,6 @@ cjkTGH ; kTGH ; Provisional
166164
# 13.0
167165
cjkSpoofingVariant ; kSpoofingVariant ; Provisional
168166
cjkTGHZ2013 ; kTGHZ2013 ; Provisional
169-
cjkUnihanCore2020 ; kUnihanCore2020 ; Provisional
170167
# 14.0
171168
cjkStrange ; kStrange ; Provisional
172169
# 15.0

unicodetools/src/main/resources/org/unicode/text/UCD/PropertyAliasesHeader.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
#
4141
# The combination of property value and property name is, however, unique.
4242
#
43-
# For more information, see UAX #44, Unicode Character Database, and
44-
# UTS #18, Unicode Regular Expressions.
43+
# For more information, see:
44+
# - UAX #44, Unicode Character Database;
45+
# - UAX #38, Unicode Han Database (Unihan);
46+
# - UAX #57, Unicode Egyptian Hieroglyph Database (Unikemet);
47+
# - UTS #18, Unicode Regular Expressions.
4548
# ================================================
4649

0 commit comments

Comments
 (0)