Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2 Tangut components and 28 Tangut ideographs #578

Merged
merged 21 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion unicodetools/data/ucd/dev/UnicodeData.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
18D80;TANGUT COMPONENT-769;Lo;0;L;;;;;N;;;;;
18D81;TANGUT COMPONENT-770;Lo;0;L;;;;;N;;;;;
0000;<control>;Cc;0;BN;;;;;N;NULL;;;;
0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;
0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;
Expand Down Expand Up @@ -26008,7 +26010,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
16FF0;VIETNAMESE ALTERNATE READING MARK CA;Mc;6;L;;;;;N;;;;;
16FF1;VIETNAMESE ALTERNATE READING MARK NHAY;Mc;6;L;;;;;N;;;;;
17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
187F7;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
187FF;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
18801;TANGUT COMPONENT-002;Lo;0;L;;;;;N;;;;;
18802;TANGUT COMPONENT-003;Lo;0;L;;;;;N;;;;;
Expand Down
10 changes: 10 additions & 0 deletions unicodetools/src/main/java/org/unicode/text/UCD/UCD.java
Original file line number Diff line number Diff line change
Expand Up @@ -1308,6 +1308,11 @@ public static int mapToRepresentative(int ch, int rCompositeVersion) {
// Unicode 12 added TANGUT IDEOGRAPH-187F2..TANGUT IDEOGRAPH-187F7.
return TANGUT_BASE;
}
// REMOVE BEFORE FLIGHT: The actual version will be greater than 0x100000.
if (ch <= 0x187FF && rCompositeVersion >= 0x100000) {
// Unicode [..] added TANGUT IDEOGRAPH-187F8..TANGUT IDEOGRAPH-187FF.
return TANGUT_BASE;
}
}

if (rCompositeVersion >= 0xd0000) {
Expand All @@ -1320,6 +1325,11 @@ public static int mapToRepresentative(int ch, int rCompositeVersion) {
if (ch <= 0x18D08) {
return TANGUT_SUP_BASE; // 18D00..18D08 Tangut Ideograph Supplement
}
// REMOVE BEFORE FLIGHT: The actual version will be greater than 0x100000.
if (ch <= 0x18D1C && rCompositeVersion >= 0x100000) {
// Unicode [..] added TANGUT IDEOGRAPH-18D09..TANGUT IDEOGRAPH-18D1C.
return TANGUT_BASE;
}
}

// 20000..2A6DF; CJK Unified Ideographs Extension B
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,16 @@ public interface UCD_Types {
// Unicode 12:
// 17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
// 187F7;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
// Unicode [..]:
markusicu marked this conversation as resolved.
Show resolved Hide resolved
// 17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
// 187FF;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
public static final int TANGUT_SUP_BASE = 0x18D00;
// Unicode 13:
// 18D00;<Tangut Ideograph Supplement, First>;Lo;0;L;;;;;N;;;;;
// 18D08;<Tangut Ideograph Supplement, Last>;Lo;0;L;;;;;N;;;;;
// Unicode [..]:
// 18D00;<Tangut Ideograph Supplement, First>;Lo;0;L;;;;;N;;;;;
// 18D1C;<Tangut Ideograph Supplement, Last>;Lo;0;L;;;;;N;;;;;

public static final int
// 4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
Expand Down