Skip to content

Update jsps for 15.1 beta #491

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jun 12, 2023
Merged

Update jsps for 15.1 beta #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39aed55
Update jsps for 15.1 beta
josh-hadley May 31, 2023
7fda4b0
Update CachedProps.java
josh-hadley May 31, 2023
dbb92fb
Updated jsp bins
josh-hadley May 31, 2023
6ec306a
fix: fix github deploy
srl295 Jun 12, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/push-jsp-on-tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Get the version
id: get_tag_name
run: echo ::set-output name=GIT_TAG_NAME::${GITHUB_REF/refs\/tags\//}
- uses: RafikFarhad/push-to-gcr-github-action@v3
- uses: RafikFarhad/push-to-gcr-github-action@241707854fb71f655ec4e2a98bb16505f218bcc2
with:
gcloud_service_key: ${{ secrets.GCLOUD_SERVICE_KEY }}
registry: us.gcr.io
Expand Down
7 changes: 5 additions & 2 deletions UnicodeJsps/src/main/java/org/unicode/jsp/CachedProps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
import org.unicode.cldr.draft.FileUtilities;
import org.unicode.jsp.UnicodeDataInput.ItemReader;
import org.unicode.props.UnicodeProperty;
import org.unicode.text.utility.Settings;

public class CachedProps {
public static final boolean IS_BETA = false;
public static final boolean IS_BETA = true;

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

static CachedProps CACHED_PROPS = getInstance(VersionInfo.getInstance(14));
static String jspVersion = IS_BETA ? Settings.lastVersion : Settings.latestVersion;
static VersionInfo jspVersionInfo = VersionInfo.getInstance(jspVersion);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussion: As long as we are serving ICU data, we should use jspVersionInfo = UCharacter.getUnicodeVersion();

static CachedProps CACHED_PROPS = getInstance(jspVersionInfo);

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

Expand Down
9 changes: 5 additions & 4 deletions UnicodeJsps/src/main/resources/org/unicode/jsp/IdentifierStatus.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# IdentifierStatus.txt
# Date: 2022-08-26, 16:49:09 GMT
# © 2022 Unicode®, Inc.
# Date: 2023-05-16, 22:25:15 GMT
# © 2023 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see https://www.unicode.org/terms_of_use.html
#
# Unicode Security Mechanisms for UTS #39
# Version: 15.0.0
# Version: 15.1.0
#
# For documentation and usage, see https://www.unicode.org/reports/tr39
#
Expand Down Expand Up @@ -582,7 +582,8 @@ FA27..FA29 ; Allowed # 1.1 [3] CJK COMPATIBILITY IDEOGRAPH-FA27..CJK CO
2B740..2B81D ; Allowed # 6.0 [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
2B820..2CEA1 ; Allowed # 8.0 [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
2CEB0..2EBE0 ; Allowed # 10.0 [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
2EBF0..2EE4A ; Allowed # 15.1 [603] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE4A
30000..3134A ; Allowed # 13.0 [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
31350..323AF ; Allowed # 15.0 [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF

# Total code points: 112156
# Total code points: 112759
13 changes: 8 additions & 5 deletions UnicodeJsps/src/main/resources/org/unicode/jsp/IdentifierType.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# IdentifierType.txt
# Date: 2022-08-26, 16:49:09 GMT
# © 2022 Unicode®, Inc.
# Date: 2023-05-16, 22:25:14 GMT
# © 2023 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see https://www.unicode.org/terms_of_use.html
#
# Unicode Security Mechanisms for UTS #39
# Version: 15.0.0
# Version: 15.1.0
#
# For documentation and usage, see https://www.unicode.org/reports/tr39
#
Expand Down Expand Up @@ -576,10 +576,11 @@ FA27..FA29 ; Recommended # 1.1 [3] CJK COMPATIBILITY ID
2B740..2B81D ; Recommended # 6.0 [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
2B820..2CEA1 ; Recommended # 8.0 [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
2CEB0..2EBE0 ; Recommended # 10.0 [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
2EBF0..2EE4A ; Recommended # 15.1 [603] CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE4A
30000..3134A ; Recommended # 13.0 [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
31350..323AF ; Recommended # 15.0 [4192] CJK UNIFIED IDEOGRAPH-31350..CJK UNIFIED IDEOGRAPH-323AF

# Total code points: 112139
# Total code points: 112742

# Identifier_Type: Inclusion

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

# Total code points: 5699
# Total code points: 5704

# Identifier_Type: Not_NFKC

Expand Down
21 changes: 10 additions & 11 deletions UnicodeJsps/src/main/resources/org/unicode/jsp/IdnaMappingTable.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# IdnaMappingTable.txt
# Date: 2022-05-02, 19:29:26 GMT
# © 2022 Unicode®, Inc.
# Date: 2023-05-15, 22:37:02 GMT
# © 2023 Unicode®, Inc.
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
# For terms of use, see https://www.unicode.org/terms_of_use.html
#
# Unicode IDNA Compatible Preprocessing for UTS #46
# Version: 15.0.0
# Version: 15.1.0
#
# For documentation and usage, see https://www.unicode.org/reports/tr46
#
Expand Down Expand Up @@ -2565,11 +2565,7 @@
222E ; valid ; ; NV8 # 1.1 CONTOUR INTEGRAL
222F ; mapped ; 222E 222E # 1.1 SURFACE INTEGRAL
2230 ; mapped ; 222E 222E 222E #1.1 VOLUME INTEGRAL
2231..225F ; valid ; ; NV8 # 1.1 CLOCKWISE INTEGRAL..QUESTIONED EQUAL TO
2260 ; disallowed_STD3_valid # 1.1 NOT EQUAL TO
2261..226D ; valid ; ; NV8 # 1.1 IDENTICAL TO..NOT EQUIVALENT TO
226E..226F ; disallowed_STD3_valid # 1.1 NOT LESS-THAN..NOT GREATER-THAN
2270..22F1 ; valid ; ; NV8 # 1.1 NEITHER LESS-THAN NOR EQUAL TO..DOWN RIGHT DIAGONAL ELLIPSIS
2231..22F1 ; valid ; ; NV8 # 1.1 CLOCKWISE INTEGRAL..DOWN RIGHT DIAGONAL ELLIPSIS
22F2..22FF ; valid ; ; NV8 # 3.2 ELEMENT OF WITH LONG HORIZONTAL STROKE..Z NOTATION BAG MEMBERSHIP
2300 ; valid ; ; NV8 # 1.1 DIAMETER SIGN
2301 ; valid ; ; NV8 # 3.0 ELECTRIC ARROW
Expand Down Expand Up @@ -3273,7 +3269,7 @@
2FD5 ; mapped ; 9FA0 # 3.0 KANGXI RADICAL FLUTE
2FD6..2FEF ; disallowed # NA <reserved-2FD6>..<reserved-2FEF>
2FF0..2FFB ; disallowed # 3.0 IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
2FFC..2FFF ; disallowed # NA <reserved-2FFC>..<reserved-2FFF>
2FFC..2FFF ; disallowed # 15.1 IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ROTATION
3000 ; disallowed_STD3_mapped ; 0020 # 1.1 IDEOGRAPHIC SPACE
3001 ; valid ; ; NV8 # 1.1 IDEOGRAPHIC COMMA
3002 ; mapped ; 002E # 1.1 IDEOGRAPHIC FULL STOP
Expand Down Expand Up @@ -3425,7 +3421,8 @@
31BB..31BF ; valid # 13.0 BOPOMOFO FINAL LETTER G..BOPOMOFO LETTER AH
31C0..31CF ; valid ; ; NV8 # 4.1 CJK STROKE T..CJK STROKE N
31D0..31E3 ; valid ; ; NV8 # 5.1 CJK STROKE H..CJK STROKE Q
31E4..31EF ; disallowed # NA <reserved-31E4>..<reserved-31EF>
31E4..31EE ; disallowed # NA <reserved-31E4>..<reserved-31EE>
31EF ; valid ; ; NV8 # 15.1 IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION
31F0..31FF ; valid # 3.2 KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO
3200 ; disallowed_STD3_mapped ; 0028 1100 0029 #1.1 PARENTHESIZED HANGUL KIYEOK
3201 ; disallowed_STD3_mapped ; 0028 1102 0029 #1.1 PARENTHESIZED HANGUL NIEUN
Expand Down Expand Up @@ -8450,7 +8447,9 @@ FFFE..FFFF ; disallowed # 1.1 <noncharacter-FFFE
2B820..2CEA1 ; valid # 8.0 CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
2CEA2..2CEAF ; disallowed # NA <reserved-2CEA2>..<reserved-2CEAF>
2CEB0..2EBE0 ; valid # 10.0 CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
2EBE1..2F7FF ; disallowed # NA <reserved-2EBE1>..<reserved-2F7FF>
2EBE1..2EBEF ; disallowed # NA <reserved-2EBE1>..<reserved-2EBEF>
2EBF0..2EE4A ; valid # 15.1 CJK UNIFIED IDEOGRAPH-2EBF0..CJK UNIFIED IDEOGRAPH-2EE4A
2EE4B..2F7FF ; disallowed # NA <reserved-2EE4B>..<reserved-2F7FF>
2F800 ; mapped ; 4E3D # 3.1 CJK COMPATIBILITY IDEOGRAPH-2F800
2F801 ; mapped ; 4E38 # 3.1 CJK COMPATIBILITY IDEOGRAPH-2F801
2F802 ; mapped ; 4E41 # 3.1 CJK COMPATIBILITY IDEOGRAPH-2F802
Expand Down
6 changes: 3 additions & 3 deletions UnicodeJsps/src/main/resources/org/unicode/jsp/NameAliases.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NameAliases-15.0.0.txt
# Date: 2022-07-26, 20:13:00 GMT [KW]
# © 2022 Unicode®, Inc.
# NameAliases-15.1.0.txt
# Date: 2023-01-05
# © 2023 Unicode®, Inc.
# For terms of use, see https://www.unicode.org/terms_of_use.html
#
# Unicode Character Database
Expand Down
Loading