Skip to content

Commit ce39bf4

Browse files
markusicumarkusicu
committed
Unicode 17 TangutSources.txt & NushuSources.txt
Renames three file field names according to 183-C29 & 183-C30.
1 parent 375aa15 commit ce39bf4

File tree

8 files changed

+7016
-6997
lines changed

8 files changed

+7016
-6997
lines changed

‎unicodetools/data/ucd/dev/NushuSources.txt‎

Lines changed: 796 additions & 796 deletions
Large diffs are not rendered by default.

‎unicodetools/data/ucd/dev/TangutSources.txt‎

Lines changed: 6177 additions & 6177 deletions
Large diffs are not rendered by default.

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,16 @@ public enum UcdProperty {
366366
ValueCardinality.Unordered,
367367
"cjkMojiJoho"),
368368
kMorohashi(PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "cjkMorohashi"),
369+
kNSHU_DubenSrc(
370+
PropertyType.Miscellaneous,
371+
DerivedPropertyStatus.UCDNonProperty,
372+
"kNSHU_DubenSrc",
373+
"kSrc_NushuDuben"),
374+
kNSHU_Reading(
375+
PropertyType.Miscellaneous,
376+
DerivedPropertyStatus.UCDNonProperty,
377+
"kNSHU_Reading",
378+
"kReading"),
369379
kNelson(
370380
PropertyType.Miscellaneous,
371381
DerivedPropertyStatus.Provisional,
@@ -390,7 +400,6 @@ public enum UcdProperty {
390400
kRSKangXi(PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "cjkRSKangXi"),
391401
kRSKorean(PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "cjkRSKorean"),
392402
kRSMerged(PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "cjkRSMerged"),
393-
kRSTUnicode(PropertyType.Miscellaneous, DerivedPropertyStatus.UCDNonProperty, "kRSTUnicode"),
394403
kRSUnicode(
395404
PropertyType.Miscellaneous,
396405
DerivedPropertyStatus.Approved,
@@ -399,7 +408,6 @@ public enum UcdProperty {
399408
"cjkRSUnicode",
400409
"Unicode_Radical_Stroke",
401410
"URS"),
402-
kReading(PropertyType.Miscellaneous, DerivedPropertyStatus.UCDNonProperty, "kReading"),
403411
kSBGY(
404412
PropertyType.Miscellaneous,
405413
DerivedPropertyStatus.Provisional,
@@ -436,8 +444,6 @@ public enum UcdProperty {
436444
null,
437445
ValueCardinality.Unordered,
438446
"cjkSpoofingVariant"),
439-
kSrc_NushuDuben(
440-
PropertyType.Miscellaneous, DerivedPropertyStatus.UCDNonProperty, "kSrc_NushuDuben"),
441447
kStrange(
442448
PropertyType.Miscellaneous,
443449
DerivedPropertyStatus.Provisional,
@@ -458,6 +464,11 @@ public enum UcdProperty {
458464
"cjkTGHZ2013"),
459465
kTGT_MergedSrc(
460466
PropertyType.Miscellaneous, DerivedPropertyStatus.UCDNonProperty, "kTGT_MergedSrc"),
467+
kTGT_RSUnicode(
468+
PropertyType.Miscellaneous,
469+
DerivedPropertyStatus.UCDNonProperty,
470+
"kTGT_RSUnicode",
471+
"kRSTUnicode"),
461472
kTaiwanTelegraph(
462473
PropertyType.Miscellaneous, DerivedPropertyStatus.Provisional, "cjkTaiwanTelegraph"),
463474
kTang(

‎unicodetools/src/main/java/org/unicode/props/UcdPropertyValues.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,18 +1670,18 @@ public static kEH_Core_Values forName(String name) {
16701670
// kMojiJoho
16711671
// kMorohashi
16721672
// kNelson
1673+
// kNSHU_DubenSrc
1674+
// kNSHU_Reading
16731675
// kOtherNumeric
16741676
// kPhonetic
16751677
// kPrimaryNumeric
16761678
// kPseudoGB1
1677-
// kReading
16781679
// kRSAdobe_Japan1_6
16791680
// kRSJapanese
16801681
// kRSKangXi
16811682
// kRSKanWa
16821683
// kRSKorean
16831684
// kRSMerged
1684-
// kRSTUnicode
16851685
// kRSUnicode
16861686
// kSBGY
16871687
// kSemanticVariant
@@ -1690,14 +1690,14 @@ public static kEH_Core_Values forName(String name) {
16901690
// kSMSZD2003Readings
16911691
// kSpecializedSemanticVariant
16921692
// kSpoofingVariant
1693-
// kSrc_NushuDuben
16941693
// kStrange
16951694
// kTaiwanTelegraph
16961695
// kTang
16971696
// kTayNumeric
16981697
// kTGH
16991698
// kTGHZ2013
17001699
// kTGT_MergedSrc
1700+
// kTGT_RSUnicode
17011701
// kTotalStrokes
17021702
// kTraditionalVariant
17031703
// kUnihanCore2020

‎unicodetools/src/main/java/org/unicode/xml/GeneratePropertyValues.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ private static String getFormattedSyntax(UcdProperty ucdProperty) {
658658
+ " }?";
659659
formattedAttributeString = attributeString + kTGT_MergedSrc;
660660
break;
661-
case kReading:
661+
case kNSHU_Reading:
662662
// Ideally, should be obtained from a TR.
663663
String kReading = "{ xsd:string }?";
664664
formattedAttributeString = attributeString + kReading;
@@ -1371,15 +1371,15 @@ private static String getFormattedUnihanProperties() {
13711371
}
13721372

13731373
private static String getFormattedTangutProperties() {
1374-
return getFormattedSyntax(UcdProperty.kRSTUnicode)
1374+
return getFormattedSyntax(UcdProperty.kTGT_RSUnicode)
13751375
+ DOUBLELINE
13761376
+ getFormattedSyntax(UcdProperty.kTGT_MergedSrc);
13771377
}
13781378

13791379
private static String getFormattedNushuProperties() {
1380-
return getFormattedSyntax(UcdProperty.kSrc_NushuDuben)
1380+
return getFormattedSyntax(UcdProperty.kNSHU_DubenSrc)
13811381
+ DOUBLELINE
1382-
+ getFormattedSyntax(UcdProperty.kReading);
1382+
+ getFormattedSyntax(UcdProperty.kNSHU_Reading);
13831383
}
13841384

13851385
private static String getFormattedEmojiProperties() {

‎unicodetools/src/main/java/org/unicode/xml/UCDPropertyDetail.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,9 +1884,9 @@ public class UCDPropertyDetail {
18841884
true,
18851885
false,
18861886
true);
1887-
public static UCDPropertyDetail kRSTUnicode_Detail =
1887+
public static UCDPropertyDetail kTGT_RSUnicode_Detail =
18881888
new UCDPropertyDetail(
1889-
UcdProperty.kRSTUnicode,
1889+
UcdProperty.kTGT_RSUnicode,
18901890
VersionInfo.getInstance(9, 0, 0),
18911891
212,
18921892
false,
@@ -1902,18 +1902,18 @@ public class UCDPropertyDetail {
19021902
true,
19031903
false,
19041904
true);
1905-
public static UCDPropertyDetail kSrc_NushuDuben_Detail =
1905+
public static UCDPropertyDetail kNSHU_DubenSrc_Detail =
19061906
new UCDPropertyDetail(
1907-
UcdProperty.kSrc_NushuDuben,
1907+
UcdProperty.kNSHU_DubenSrc,
19081908
VersionInfo.getInstance(10, 0, 0),
19091909
214,
19101910
false,
19111911
true,
19121912
false,
19131913
true);
1914-
public static UCDPropertyDetail kReading_Detail =
1914+
public static UCDPropertyDetail kNSHU_Reading_Detail =
19151915
new UCDPropertyDetail(
1916-
UcdProperty.kReading,
1916+
UcdProperty.kNSHU_Reading,
19171917
VersionInfo.getInstance(10, 0, 0),
19181918
215,
19191919
false,

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,20 @@ cjkZhuang ; kZhuang ; Provisional
181181
# 17.0
182182
cjkTayNumeric ; kTayNumeric ; Provisional
183183

184+
# [183-C29] Consensus: In TangutSources.txt,
185+
# change the tag kRSTUnicode to kTGT_RSUnicode.
186+
# For Unicode Version 17.0. See L2/25-087 item 1.9.
187+
# (Changed between 17 alpha and beta.)
184188
kTGT_MergedSrc ; kTGT_MergedSrc ; UCDNonProperty
185-
kRSTUnicode ; kRSTUnicode ; UCDNonProperty
189+
kTGT_RSUnicode ; kTGT_RSUnicode ; kRSTUnicode ; UCDNonProperty
186190

187-
kSrc_NushuDuben ; kSrc_NushuDuben ; UCDNonProperty
188-
kReading ; kReading ; UCDNonProperty
191+
# [183-C30] Consensus: In NushuSources.txt,
192+
# change the tag kSrc_NushuDuben to kNSHU_DubenSrc, and change the tag kReading to kNSHU_Reading.
193+
# For Unicode Version 17.0. See L2/25-087 item 1.9.
194+
# (Changed between 17 alpha and beta.)
195+
kNSHU_DubenSrc ; kNSHU_DubenSrc ; kSrc_NushuDuben ; UCDNonProperty
196+
kNSHU_Reading ; kNSHU_Reading ; kReading ; UCDNonProperty
189197

190198
kEH_Func ; kEH_Func ; Provisional
191199
kEH_FVal ; kEH_FVal ; Provisional
192-
kEH_UniK ; kEH_UniK ; Provisional
200+
kEH_UniK ; kEH_UniK ; Provisional

‎unicodetools/src/main/resources/org/unicode/props/ExtraPropertyValueAliases.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,10 @@ Indic_Positional_Category ; Invisible ; Invisible
336336
Indic_Syllabic_Category ; Consonant_Repha ; Consonant_Repha
337337

338338
# @missing: 0000..10FFFF; kTGT_MergedSrc ; <none>
339-
# @missing: 0000..10FFFF; kRSTUnicode ; <none>
339+
# @missing: 0000..10FFFF; kTGT_RSUnicode ; <none>
340340

341-
# @missing: 0000..10FFFF; kSrc_NushuDuben ; <none>
342-
# @missing: 0000..10FFFF; kReading ; <none>
341+
# @missing: 0000..10FFFF; kNSHU_DubenSrc ; <none>
342+
# @missing: 0000..10FFFF; kNSHU_Reading ; <none>
343343

344344
# @missing: 0000..10FFFF; kEH_Core ; N
345345
kEH_Core ; C ; Core

0 commit comments

Comments
 (0)