Skip to content

Commit eb095ba

Browse files
eggrobineggrobin
committed
Merge remote-tracking branch 'la-vache/main' into utc-183-kenfiles 
2 parents 54c24de + 3e6896f commit eb095ba

38 files changed

+1830
-1643
lines changed

‎UnicodeJsps/src/main/java/org/unicode/jsp/UnicodeUtilities.java‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,9 +1702,12 @@ class PropertyAssignment {
17021702
VersionInfo first;
17031703
VersionInfo last;
17041704
ArrayList<String> values;
1705+
int span;
17051706
}
17061707
final boolean isMultivalued = getFactory().getProperty(propName).isMultivalued();
17071708
List<PropertyAssignment> history = new ArrayList<>();
1709+
int prehistoricSpan = 0;
1710+
int posthistoricSpan = 0;
17081711
if (getFactory().getProperty(propName)
17091712
instanceof IndexUnicodeProperties.IndexUnicodeProperty) {
17101713
for (int i = Utility.UNICODE_VERSIONS.size() - 1; i >= 0; --i) {
@@ -1724,9 +1727,12 @@ class PropertyAssignment {
17241727
final var property = IndexUnicodeProperties.make(version).getProperty(propName);
17251728
// Skip properties prior to their creation, as well as properties that no longer
17261729
// exist on the range minVersion..maxVersion.
1727-
if (property.isTrivial()
1728-
&& !property.getName().equals("ISO_Comment")
1729-
&& history.isEmpty()) {
1730+
if (property.isTrivial() && !property.getName().equals("ISO_Comment")) {
1731+
if (history.isEmpty()) {
1732+
++prehistoricSpan;
1733+
} else {
1734+
++posthistoricSpan;
1735+
}
17301736
continue;
17311737
}
17321738
ArrayList<String> values = new ArrayList<>();
@@ -1738,9 +1744,11 @@ class PropertyAssignment {
17381744
assignment.first = version;
17391745
assignment.last = version;
17401746
assignment.values = values;
1747+
assignment.span = 1;
17411748
history.add(assignment);
17421749
} else {
17431750
lastAssignment.last = version;
1751+
++lastAssignment.span;
17441752
}
17451753
}
17461754
} else {
@@ -1760,6 +1768,9 @@ class PropertyAssignment {
17601768
+ "'>"
17611769
+ (provisional ? "(" + propName + ")" : propName)
17621770
+ "</a></th>");
1771+
if (prehistoricSpan > 0) {
1772+
out.append("<td class='nonexistent' colspan=" + prehistoricSpan + "></td>");
1773+
}
17631774
for (PropertyAssignment assignment : history) {
17641775
String first =
17651776
assignment.first.getVersionString(2, 4)
@@ -1787,6 +1798,8 @@ class PropertyAssignment {
17871798
out.append(
17881799
"<td"
17891800
+ defaultClass
1801+
+ " colspan="
1802+
+ assignment.span
17901803
+ ">"
17911804
+ (isMultivalued || htmlValue.contains("<")
17921805
? "<span" + (isNew ? " class='changed'" : "") + ">"
@@ -1803,6 +1816,9 @@ class PropertyAssignment {
18031816
+ (isMultivalued || htmlValue.contains("<") ? "</span>" : "</a>")
18041817
+ "</td>");
18051818
}
1819+
if (posthistoricSpan > 0) {
1820+
out.append("<td class='nonexistent' colspan=" + posthistoricSpan + "></td>");
1821+
}
18061822
out.append("</tr>");
18071823
}
18081824
}

‎UnicodeJsps/src/main/webapp/index.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ h3 {background-color: #EEEEEE}
3131
.L1 {background-color: #CCCCCC}
3232
.L0 {background-color: #C8C8C8}
3333
.default { background-color: #C8C8C8}
34+
.nonexistent { background-color: #FFC8C8}
3435
.control {
3536
font-family: 'Last Resort'
3637
}

‎unicodetools/data/emoji/dev/emoji-sequences.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# emoji-sequences.txt
2-
# Date: 2025-01-08, 04:57:12 GMT
2+
# Date: 2025-04-23, 17:41:13 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
@@ -1324,11 +1324,11 @@
13241324
1F939 1F3FD ; RGI_Emoji_Modifier_Sequence ; person juggling: medium skin tone # E3.0 [1] (🤹🏽)
13251325
1F939 1F3FE ; RGI_Emoji_Modifier_Sequence ; person juggling: medium-dark skin tone # E3.0 [1] (🤹🏾)
13261326
1F939 1F3FF ; RGI_Emoji_Modifier_Sequence ; person juggling: dark skin tone # E3.0 [1] (🤹🏿)
1327-
1F93C 1F3FB ; RGI_Emoji_Modifier_Sequence ; people wrestling: light skin tone # E3.0 [1] (🤼🏻)
1328-
1F93C 1F3FC ; RGI_Emoji_Modifier_Sequence ; people wrestling: medium-light skin tone # E3.0 [1] (🤼🏼)
1329-
1F93C 1F3FD ; RGI_Emoji_Modifier_Sequence ; people wrestling: medium skin tone # E3.0 [1] (🤼🏽)
1330-
1F93C 1F3FE ; RGI_Emoji_Modifier_Sequence ; people wrestling: medium-dark skin tone # E3.0 [1] (🤼🏾)
1331-
1F93C 1F3FF ; RGI_Emoji_Modifier_Sequence ; people wrestling: dark skin tone # E3.0 [1] (🤼🏿)
1327+
1F93C 1F3FB ; RGI_Emoji_Modifier_Sequence ; people wrestling: light skin tone # E17.0 [1] (🤼🏻)
1328+
1F93C 1F3FC ; RGI_Emoji_Modifier_Sequence ; people wrestling: medium-light skin tone # E17.0 [1] (🤼🏼)
1329+
1F93C 1F3FD ; RGI_Emoji_Modifier_Sequence ; people wrestling: medium skin tone # E17.0 [1] (🤼🏽)
1330+
1F93C 1F3FE ; RGI_Emoji_Modifier_Sequence ; people wrestling: medium-dark skin tone # E17.0 [1] (🤼🏾)
1331+
1F93C 1F3FF ; RGI_Emoji_Modifier_Sequence ; people wrestling: dark skin tone # E17.0 [1] (🤼🏿)
13321332
1F93D 1F3FB ; RGI_Emoji_Modifier_Sequence ; person playing water polo: light skin tone # E3.0 [1] (🤽🏻)
13331333
1F93D 1F3FC ; RGI_Emoji_Modifier_Sequence ; person playing water polo: medium-light skin tone # E3.0 [1] (🤽🏼)
13341334
1F93D 1F3FD ; RGI_Emoji_Modifier_Sequence ; person playing water polo: medium skin tone # E3.0 [1] (🤽🏽)

‎unicodetools/data/emoji/dev/emoji-test.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# emoji-test.txt
2-
# Date: 2025-01-16, 01:47:18 GMT
2+
# Date: 2025-04-23, 17:41:13 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
@@ -2983,11 +2983,11 @@
29832983
1F938 1F3FF 200D 2640 FE0F ; fully-qualified # 🤸🏿‍♀️ E4.0 woman cartwheeling: dark skin tone
29842984
1F938 1F3FF 200D 2640 ; minimally-qualified # 🤸🏿‍♀ E4.0 woman cartwheeling: dark skin tone
29852985
1F93C ; fully-qualified # 🤼 E3.0 people wrestling
2986-
1F93C 1F3FB ; fully-qualified # 🤼🏻 E3.0 people wrestling: light skin tone
2987-
1F93C 1F3FC ; fully-qualified # 🤼🏼 E3.0 people wrestling: medium-light skin tone
2988-
1F93C 1F3FD ; fully-qualified # 🤼🏽 E3.0 people wrestling: medium skin tone
2989-
1F93C 1F3FE ; fully-qualified # 🤼🏾 E3.0 people wrestling: medium-dark skin tone
2990-
1F93C 1F3FF ; fully-qualified # 🤼🏿 E3.0 people wrestling: dark skin tone
2986+
1F93C 1F3FB ; fully-qualified # 🤼🏻 E17.0 people wrestling: light skin tone
2987+
1F93C 1F3FC ; fully-qualified # 🤼🏼 E17.0 people wrestling: medium-light skin tone
2988+
1F93C 1F3FD ; fully-qualified # 🤼🏽 E17.0 people wrestling: medium skin tone
2989+
1F93C 1F3FE ; fully-qualified # 🤼🏾 E17.0 people wrestling: medium-dark skin tone
2990+
1F93C 1F3FF ; fully-qualified # 🤼🏿 E17.0 people wrestling: dark skin tone
29912991
1F93C 200D 2642 FE0F ; fully-qualified # 🤼‍♂️ E4.0 men wrestling
29922992
1F93C 200D 2642 ; minimally-qualified # 🤼‍♂ E4.0 men wrestling
29932993
1F93C 1F3FB 200D 2642 FE0F ; fully-qualified # 🤼🏻‍♂️ E17.0 men wrestling: light skin tone

‎unicodetools/data/emoji/dev/internal/emoji-proposals.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1838,7 +1838,7 @@
18381838

18391839
# L2/24-252, L2/14-173
18401840
1F46F 1F3FF; L2/24-252, L2/14-173 # 2025 (👯🏿) people with bunny ears: dark skin tone
1841-
1F93C 1F3FF; L2/24-252, L2/14-173 # 2016 (🤼🏿) people wrestling: dark skin tone
1841+
1F93C 1F3FF; L2/24-252, L2/14-173 # 2025 (🤼🏿) people wrestling: dark skin tone
18421842

18431843
# L2/24-252, L2/16‑160, L2/14-173
18441844
1F46F 1F3FF 200D 2640; L2/24-252, L2/16‑160, L2/14-173 # 2025 (👯🏿‍♀️) women with bunny ears: dark skin tone

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DerivedAge-17.0.0.txt
2-
# Date: 2025-01-27, 18:09:08 GMT
2+
# Date: 2025-04-25, 16:56:46 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
@@ -2072,6 +2072,7 @@ A7DA..A7DC ; 16.0 # [3] LATIN CAPITAL LETTER LAMBDA..LATIN CAPITAL LETTER L
20722072
0CDC ; 17.0 # KANNADA ARCHAIC SHRII
20732073
1ACF..1ADD ; 17.0 # [15] COMBINING DOUBLE CARON..COMBINING DOT-AND-RING BELOW
20742074
1AE0..1AEB ; 17.0 # [12] COMBINING LEFT TACK ABOVE..COMBINING DOUBLE RIGHTWARDS ARROW ABOVE
2075+
20C1 ; 17.0 # SAUDI RIYAL SIGN
20752076
2B96 ; 17.0 # EQUALS SIGN WITH INFINITY ABOVE
20762077
A7CE..A7CF ; 17.0 # [2] LATIN CAPITAL LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER PHARYNGEAL VOICED FRICATIVE
20772078
A7D2 ; 17.0 # LATIN CAPITAL LETTER DOUBLE THORN
@@ -2080,7 +2081,7 @@ A7F1 ; 17.0 # MODIFIER LETTER CAPITAL S
20802081
FBC3..FBD2 ; 17.0 # [16] ARABIC LIGATURE JALLA WA-ALAA..ARABIC LIGATURE ALAYHI AR-RAHMAH
20812082
FD90..FD91 ; 17.0 # [2] ARABIC LIGATURE RAHMATU ALLAAHI ALAYH..ARABIC LIGATURE RAHMATU ALLAAHI ALAYHAA
20822083
FDC8..FDCE ; 17.0 # [7] ARABIC LIGATURE RAHIMAHU ALLAAH TAAALAA..ARABIC LIGATURE KARRAMA ALLAAHU WAJHAH
2083-
10940..1095C ; 17.0 # [29] SIDETIC LETTER N01..SIDETIC LETTER N29
2084+
10940..10959 ; 17.0 # [26] SIDETIC LETTER N01..SIDETIC LETTER N26
20842085
10EC5..10EC7 ; 17.0 # [3] ARABIC SMALL YEH BARREE WITH TWO DOTS BELOW..ARABIC LETTER YEH WITH FOUR DOTS BELOW
20852086
10ED0..10ED8 ; 17.0 # [9] ARABIC BIBLICAL END OF VERSE..ARABIC LIGATURE NAWWARA ALLAAHU MARQADAH
20862087
10EFA..10EFB ; 17.0 # [2] ARABIC DOUBLE VERTICAL BAR BELOW..ARABIC SMALL LOW NOON
@@ -2113,9 +2114,10 @@ FDC8..FDCE ; 17.0 # [7] ARABIC LIGATURE RAHIMAHU ALLAAH TAAALAA..ARABIC LIG
21132114
1FAEA ; 17.0 # DISTORTED FACE
21142115
1FAEF ; 17.0 # FIGHT CLOUD
21152116
1FBFA ; 17.0 # ALARM BELL SYMBOL
2116-
2B73A..2B73E ; 17.0 # [5] CJK UNIFIED IDEOGRAPH-2B73A..CJK UNIFIED IDEOGRAPH-2B73E
2117+
2B73A..2B73F ; 17.0 # [6] CJK UNIFIED IDEOGRAPH-2B73A..CJK UNIFIED IDEOGRAPH-2B73F
2118+
2CEA2..2CEAD ; 17.0 # [12] CJK UNIFIED IDEOGRAPH-2CEA2..CJK UNIFIED IDEOGRAPH-2CEAD
21172119
323B0..33479 ; 17.0 # [4298] CJK UNIFIED IDEOGRAPH-323B0..CJK UNIFIED IDEOGRAPH-33479
21182120

2119-
# Total code points: 4836
2121+
# Total code points: 4847
21202122

21212123
# EOF

0 commit comments

Comments
 (0)