Skip to content

Commit 763c03b

Browse files
josh-hadleysrl295
josh-hadley
and
srl295
authored
Update jsps for 15.1 beta (#491)
* Update jsps for 15.1 beta * Update CachedProps.java * programmatically determine jspVersion instead of hard-code * Updated jsp bins * fix: fix github deploy --------- Co-authored-by: Steven R. Loomis <[email protected]>
1 parent 851cc36 commit 763c03b

File tree

117 files changed

+1059
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+1059
-200
lines changed

‎.github/workflows/push-jsp-on-tag.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Get the version
5959
id: get_tag_name
6060
run: echo ::set-output name=GIT_TAG_NAME::${GITHUB_REF/refs\/tags\//}
61-
- uses: RafikFarhad/push-to-gcr-github-action@v3
61+
- uses: RafikFarhad/push-to-gcr-github-action@241707854fb71f655ec4e2a98bb16505f218bcc2
6262
with:
6363
gcloud_service_key: ${{ secrets.GCLOUD_SERVICE_KEY }}
6464
registry: us.gcr.io

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
import org.unicode.cldr.draft.FileUtilities;
2727
import org.unicode.jsp.UnicodeDataInput.ItemReader;
2828
import org.unicode.props.UnicodeProperty;
29+
import org.unicode.text.utility.Settings;
2930

3031
public class CachedProps {
31-
public static final boolean IS_BETA = false;
32+
public static final boolean IS_BETA = true;
3233

3334
public static final Splitter HASH_SPLITTER = Splitter.on('#').trimResults();
3435
public static final Splitter SEMI_SPLITTER = Splitter.on(';').trimResults();
@@ -43,7 +44,9 @@ public class CachedProps {
4344
final BiMultimap<String, String> nameToAliases = new BiMultimap<String, String>(null, null);
4445
final Map<String, BiMultimap<String, String>> nameToValueToAliases = new LinkedHashMap();
4546

46-
static CachedProps CACHED_PROPS = getInstance(VersionInfo.getInstance(14));
47+
static String jspVersion = IS_BETA ? Settings.lastVersion : Settings.latestVersion;
48+
static VersionInfo jspVersionInfo = VersionInfo.getInstance(jspVersion);
49+
static CachedProps CACHED_PROPS = getInstance(jspVersionInfo);
4750

4851
static UnicodeProperty NAMES = CachedProps.CACHED_PROPS.getProperty("Name");
4952

‎UnicodeJsps/src/main/resources/org/unicode/jsp/IdentifierStatus.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# IdentifierStatus.txt
2-
# Date: 2022-08-26, 16:49:09 GMT
3-
# © 2022 Unicode®, Inc.
2+
# Date: 2023-05-16, 22:25:15 GMT
3+
# © 2023 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, see https://www.unicode.org/terms_of_use.html
66
#
77
# Unicode Security Mechanisms for UTS #39
8-
# Version: 15.0.0
8+
# Version: 15.1.0
99
#
1010
# For documentation and usage, see https://www.unicode.org/reports/tr39
1111
#
@@ -582,7 +582,8 @@ FA27..FA29 ; Allowed # 1.1 [3] CJK COMPATIBILITY IDEOGRAPH-FA27..CJK CO
582582
2B740..2B81D ; Allowed # 6.0 [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
583583
2B820..2CEA1 ; Allowed # 8.0 [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
584584
2CEB0..2EBE0 ; Allowed # 10.0 [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
585+
2EBF0..2EE4A ; Allowed # 15.1 [603] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE4A
585586
30000..3134A ; Allowed # 13.0 [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
586587
31350..323AF ; Allowed # 15.0 [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
587588

588-
# Total code points: 112156
589+
# Total code points: 112759

‎UnicodeJsps/src/main/resources/org/unicode/jsp/IdentifierType.txt

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# IdentifierType.txt
2-
# Date: 2022-08-26, 16:49:09 GMT
3-
# © 2022 Unicode®, Inc.
2+
# Date: 2023-05-16, 22:25:14 GMT
3+
# © 2023 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, see https://www.unicode.org/terms_of_use.html
66
#
77
# Unicode Security Mechanisms for UTS #39
8-
# Version: 15.0.0
8+
# Version: 15.1.0
99
#
1010
# For documentation and usage, see https://www.unicode.org/reports/tr39
1111
#
@@ -576,10 +576,11 @@ FA27..FA29 ; Recommended # 1.1 [3] CJK COMPATIBILITY ID
576576
2B740..2B81D ; Recommended # 6.0 [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
577577
2B820..2CEA1 ; Recommended # 8.0 [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
578578
2CEB0..2EBE0 ; Recommended # 10.0 [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
579+
2EBF0..2EE4A ; Recommended # 15.1 [603] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE4A
579580
30000..3134A ; Recommended # 13.0 [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
580581
31350..323AF ; Recommended # 15.0 [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF
581582

582-
# Total code points: 112139
583+
# Total code points: 112742
583584

584585
# Identifier_Type: Inclusion
585586

@@ -1892,6 +1893,7 @@ A8F8..A8FA ; Obsolete Not_XID # 5.2 [3] DEVANAGARI SIGN PUSH
18921893
2E9B..2E9E ; Not_XID # 3.0 [4] CJK RADICAL CHOKE..CJK RADICAL DEATH
18931894
2EA0..2EF2 ; Not_XID # 3.0 [83] CJK RADICAL CIVILIAN..CJK RADICAL J-SIMPLIFIED TURTLE
18941895
2FF0..2FFB ; Not_XID # 3.0 [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
1896+
2FFC..2FFF ; Not_XID # 15.1 [4] IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION
18951897
3001..3004 ; Not_XID # 1.1 [4] IDEOGRAPHIC COMMA..JAPANESE INDUSTRIAL STANDARD SYMBOL
18961898
3008..301D ; Not_XID # 1.1 [22] LEFT ANGLE BRACKET..REVERSED DOUBLE PRIME QUOTATION MARK
18971899
301F..3020 ; Not_XID # 1.1 [2] LOW DOUBLE PRIME QUOTATION MARK..POSTAL MARK FACE
@@ -1903,6 +1905,7 @@ A8F8..A8FA ; Obsolete Not_XID # 5.2 [3] DEVANAGARI SIGN PUSH
19031905
3190..3191 ; Not_XID # 1.1 [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK
19041906
31C0..31CF ; Not_XID # 4.1 [16] CJK STROKE T..CJK STROKE N
19051907
31D0..31E3 ; Not_XID # 5.1 [20] CJK STROKE H..CJK STROKE Q
1908+
31EF ; Not_XID # 15.1 IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION
19061909
3248..324F ; Not_XID # 5.2 [8] CIRCLED NUMBER TEN ON BLACK SQUARE..CIRCLED NUMBER EIGHTY ON BLACK SQUARE
19071910
A67E ; Not_XID # 5.1 CYRILLIC KAVYKA
19081911
A720..A721 ; Not_XID # 5.0 [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE
@@ -2136,7 +2139,7 @@ FFFD ; Not_XID # 1.1 REPLACEMENT CHARACTE
21362139
1FB00..1FB92 ; Not_XID # 13.0 [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
21372140
1FB94..1FBCA ; Not_XID # 13.0 [55] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON
21382141

2139-
# Total code points: 5699
2142+
# Total code points: 5704
21402143

21412144
# Identifier_Type: Not_NFKC
21422145

‎UnicodeJsps/src/main/resources/org/unicode/jsp/IdnaMappingTable.txt

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# IdnaMappingTable.txt
2-
# Date: 2022-05-02, 19:29:26 GMT
3-
# © 2022 Unicode®, Inc.
2+
# Date: 2023-05-15, 22:37:02 GMT
3+
# © 2023 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, see https://www.unicode.org/terms_of_use.html
66
#
77
# Unicode IDNA Compatible Preprocessing for UTS #46
8-
# Version: 15.0.0
8+
# Version: 15.1.0
99
#
1010
# For documentation and usage, see https://www.unicode.org/reports/tr46
1111
#
@@ -2565,11 +2565,7 @@
25652565
222E ; valid ; ; NV8 # 1.1 CONTOUR INTEGRAL
25662566
222F ; mapped ; 222E 222E # 1.1 SURFACE INTEGRAL
25672567
2230 ; mapped ; 222E 222E 222E #1.1 VOLUME INTEGRAL
2568-
2231..225F ; valid ; ; NV8 # 1.1 CLOCKWISE INTEGRAL..QUESTIONED EQUAL TO
2569-
2260 ; disallowed_STD3_valid # 1.1 NOT EQUAL TO
2570-
2261..226D ; valid ; ; NV8 # 1.1 IDENTICAL TO..NOT EQUIVALENT TO
2571-
226E..226F ; disallowed_STD3_valid # 1.1 NOT LESS-THAN..NOT GREATER-THAN
2572-
2270..22F1 ; valid ; ; NV8 # 1.1 NEITHER LESS-THAN NOR EQUAL TO..DOWN RIGHT DIAGONAL ELLIPSIS
2568+
2231..22F1 ; valid ; ; NV8 # 1.1 CLOCKWISE INTEGRAL..DOWN RIGHT DIAGONAL ELLIPSIS
25732569
22F2..22FF ; valid ; ; NV8 # 3.2 ELEMENT OF WITH LONG HORIZONTAL STROKE..Z NOTATION BAG MEMBERSHIP
25742570
2300 ; valid ; ; NV8 # 1.1 DIAMETER SIGN
25752571
2301 ; valid ; ; NV8 # 3.0 ELECTRIC ARROW
@@ -3273,7 +3269,7 @@
32733269
2FD5 ; mapped ; 9FA0 # 3.0 KANGXI RADICAL FLUTE
32743270
2FD6..2FEF ; disallowed # NA <reserved-2FD6>..<reserved-2FEF>
32753271
2FF0..2FFB ; disallowed # 3.0 IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
3276-
2FFC..2FFF ; disallowed # NA <reserved-2FFC>..<reserved-2FFF>
3272+
2FFC..2FFF ; disallowed # 15.1 IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION
32773273
3000 ; disallowed_STD3_mapped ; 0020 # 1.1 IDEOGRAPHIC SPACE
32783274
3001 ; valid ; ; NV8 # 1.1 IDEOGRAPHIC COMMA
32793275
3002 ; mapped ; 002E # 1.1 IDEOGRAPHIC FULL STOP
@@ -3425,7 +3421,8 @@
34253421
31BB..31BF ; valid # 13.0 BOPOMOFO FINAL LETTER G..BOPOMOFO LETTER AH
34263422
31C0..31CF ; valid ; ; NV8 # 4.1 CJK STROKE T..CJK STROKE N
34273423
31D0..31E3 ; valid ; ; NV8 # 5.1 CJK STROKE H..CJK STROKE Q
3428-
31E4..31EF ; disallowed # NA <reserved-31E4>..<reserved-31EF>
3424+
31E4..31EE ; disallowed # NA <reserved-31E4>..<reserved-31EE>
3425+
31EF ; valid ; ; NV8 # 15.1 IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION
34293426
31F0..31FF ; valid # 3.2 KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO
34303427
3200 ; disallowed_STD3_mapped ; 0028 1100 0029 #1.1 PARENTHESIZED HANGUL KIYEOK
34313428
3201 ; disallowed_STD3_mapped ; 0028 1102 0029 #1.1 PARENTHESIZED HANGUL NIEUN
@@ -8450,7 +8447,9 @@ FFFE..FFFF ; disallowed # 1.1 <noncharacter-FFFE
84508447
2B820..2CEA1 ; valid # 8.0 CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
84518448
2CEA2..2CEAF ; disallowed # NA <reserved-2CEA2>..<reserved-2CEAF>
84528449
2CEB0..2EBE0 ; valid # 10.0 CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
8453-
2EBE1..2F7FF ; disallowed # NA <reserved-2EBE1>..<reserved-2F7FF>
8450+
2EBE1..2EBEF ; disallowed # NA <reserved-2EBE1>..<reserved-2EBEF>
8451+
2EBF0..2EE4A ; valid # 15.1 CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE4A
8452+
2EE4B..2F7FF ; disallowed # NA <reserved-2EE4B>..<reserved-2F7FF>
84548453
2F800 ; mapped ; 4E3D # 3.1 CJK COMPATIBILITY IDEOGRAPH-2F800
84558454
2F801 ; mapped ; 4E38 # 3.1 CJK COMPATIBILITY IDEOGRAPH-2F801
84568455
2F802 ; mapped ; 4E41 # 3.1 CJK COMPATIBILITY IDEOGRAPH-2F802

‎UnicodeJsps/src/main/resources/org/unicode/jsp/NameAliases.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# NameAliases-15.0.0.txt
2-
# Date: 2022-07-26, 20:13:00 GMT [KW]
3-
# © 2022 Unicode®, Inc.
1+
# NameAliases-15.1.0.txt
2+
# Date: 2023-01-05
3+
# © 2023 Unicode®, Inc.
44
# For terms of use, see https://www.unicode.org/terms_of_use.html
55
#
66
# Unicode Character Database

0 commit comments

Comments
 (0)