organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-13630 Unicode 11 beta data mar06, API constants for new property values

Browse source 
X-SVN-Rev: 41092
This commit is contained in:
Markus Scherer 2018-03-09 23:53:02 +00:00
parent b5e8865ff2
commit 1752b5c8c9
43 changed files with 12533 additions and 9508 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1155
icu4c/source/common/norm2_nfc_data.h
View file

File diff suppressed because it is too large Load diff

1562
icu4c/source/common/propname_data.h
View file

File diff suppressed because it is too large Load diff

1401
icu4c/source/common/ubidi_props_data.h
View file

File diff suppressed because it is too large Load diff

1202
icu4c/source/common/ucase_props_data.h
View file

File diff suppressed because it is too large Load diff

6601
icu4c/source/common/uchar_props_data.h
View file

File diff suppressed because it is too large Load diff

44
icu4c/source/common/unicode/uchar.h
View file

@ -42,7 +42,7 @@ U_CDECL_BEGIN
* @see u_getUnicodeVersion
* @stable ICU 2.0
*/
#define U_UNICODE_VERSION "10.0"
#define U_UNICODE_VERSION "11.0"
/**
* \file
@ -1683,6 +1683,31 @@ enum UBlockCode {
/** @stable ICU 60 */
UBLOCK_ZANABAZAR_SQUARE = 280, /*[11A00]*/
// New blocks in Unicode 11.0
/** @stable ICU 62 */
UBLOCK_CHESS_SYMBOLS = 281, /*[1FA00]*/
/** @stable ICU 62 */
UBLOCK_DOGRA = 282, /*[11800]*/
/** @stable ICU 62 */
UBLOCK_GEORGIAN_EXTENDED = 283, /*[1C90]*/
/** @stable ICU 62 */
UBLOCK_GUNJALA_GONDI = 284, /*[11D60]*/
/** @stable ICU 62 */
UBLOCK_HANIFI_ROHINGYA = 285, /*[10D00]*/
/** @stable ICU 62 */
UBLOCK_INDIC_SIYAQ_NUMBERS = 286, /*[1EC70]*/
/** @stable ICU 62 */
UBLOCK_MAKASAR = 287, /*[11EE0]*/
/** @stable ICU 62 */
UBLOCK_MAYAN_NUMERALS = 288, /*[1D2E0]*/
/** @stable ICU 62 */
UBLOCK_MEDEFAIDRIN = 289, /*[16E40]*/
/** @stable ICU 62 */
UBLOCK_OLD_SOGDIAN = 290, /*[10F00]*/
/** @stable ICU 62 */
UBLOCK_SOGDIAN = 291, /*[10F30]*/
#ifndef U_HIDE_DEPRECATED_API
/**
* One more than the highest normal UBlockCode value.
@ -1690,7 +1715,7 @@ enum UBlockCode {
*
* @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
*/
UBLOCK_COUNT = 281,
UBLOCK_COUNT = 292,
#endif // U_HIDE_DEPRECATED_API
/** @stable ICU 2.0 */
@ -1979,6 +2004,9 @@ typedef enum UJoiningGroup {
U_JG_MALAYALAM_SSA, /**< @stable ICU 60 */
U_JG_MALAYALAM_TTA, /**< @stable ICU 60 */
U_JG_HANIFI_ROHINGYA_KINNA_YA, /**< @stable ICU 62 */
U_JG_HANIFI_ROHINGYA_PA, /**< @stable ICU 62 */
#ifndef U_HIDE_DEPRECATED_API
/**
* One more than the highest normal UJoiningGroup value.
@ -2029,6 +2057,11 @@ typedef enum UGraphemeClusterBreak {
U_GCB_GLUE_AFTER_ZWJ = 16, /*[GAZ]*/
/** @stable ICU 58 */
U_GCB_ZWJ = 17, /*[ZWJ]*/
/** @stable ICU 62 */
U_GCB_LINKING_CONSONANT = 18, /*[LinkC]*/
/** @stable ICU 62 */
U_GCB_VIRAMA = 19, /*[Virama]*/
#ifndef U_HIDE_DEPRECATED_API
/**
* One more than the highest normal UGraphemeClusterBreak value.
@ -2036,7 +2069,7 @@ typedef enum UGraphemeClusterBreak {
*
* @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
*/
U_GCB_COUNT = 18
U_GCB_COUNT = 20
#endif // U_HIDE_DEPRECATED_API
} UGraphemeClusterBreak;
@ -2090,6 +2123,9 @@ typedef enum UWordBreakValues {
U_WB_GLUE_AFTER_ZWJ = 20, /*[GAZ]*/
/** @stable ICU 58 */
U_WB_ZWJ = 21, /*[ZWJ]*/
/** @stable ICU 62 */
U_WB_WSEGSPACE = 22, /*[WSEGSPACE]*/
#ifndef U_HIDE_DEPRECATED_API
/**
* One more than the highest normal UWordBreakValues value.
@ -2097,7 +2133,7 @@ typedef enum UWordBreakValues {
*
* @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
*/
U_WB_COUNT = 22
U_WB_COUNT = 23
#endif // U_HIDE_DEPRECATED_API
} UWordBreakValues;

17
icu4c/source/common/unicode/uscript.h
View file

@ -451,6 +451,21 @@ typedef enum UScriptCode {
/** @stable ICU 60 */
USCRIPT_ZANABAZAR_SQUARE = 177,/* Zanb */
/** @stable ICU 62 */
USCRIPT_DOGRA = 178,/* Dogr */
/** @stable ICU 62 */
USCRIPT_GUNJALA_GONDI = 179,/* Gong */
/** @stable ICU 62 */
USCRIPT_MAKASAR = 180,/* Maka */
/** @stable ICU 62 */
USCRIPT_MEDEFAIDRIN = 181,/* Medf */
/** @stable ICU 62 */
USCRIPT_HANIFI_ROHINGYA = 182,/* Rohg */
/** @stable ICU 62 */
USCRIPT_SOGDIAN = 183,/* Sogd */
/** @stable ICU 62 */
USCRIPT_OLD_SOGDIAN = 184,/* Sogo */
#ifndef U_HIDE_DEPRECATED_API
/**
* One more than the highest normal UScriptCode value.
@ -458,7 +473,7 @@ typedef enum UScriptCode {
*
* @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
*/
USCRIPT_CODE_LIMIT = 178
USCRIPT_CODE_LIMIT = 185
#endif // U_HIDE_DEPRECATED_API
} UScriptCode;

BIN
icu4c/source/data/in/nfc.nrm
View file

Binary file not shown.

BIN
icu4c/source/data/in/nfkc.nrm
View file

Binary file not shown.

BIN
icu4c/source/data/in/nfkc_cf.nrm
View file

Binary file not shown.

BIN
icu4c/source/data/in/pnames.icu
View file

Binary file not shown.

BIN
icu4c/source/data/in/ubidi.icu
View file

Binary file not shown.

BIN
icu4c/source/data/in/ucase.icu
View file

Binary file not shown.

BIN
icu4c/source/data/in/unames.icu
View file

Binary file not shown.

BIN
icu4c/source/data/in/uprops.icu
View file

Binary file not shown.

BIN
icu4c/source/data/in/uts46.nrm
View file

Binary file not shown.

2
icu4c/source/data/makedata.mak
View file

@ -19,7 +19,7 @@ U_ICUDATA_NAME=icudt61
U_ICUDATA_NAME=icudt61
!ENDIF
U_ICUDATA_ENDIAN_SUFFIX=l
UNICODE_VERSION=10.0
UNICODE_VERSION=11.0
ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll
# ICUMAKE

85
icu4c/source/data/unidata/CaseFolding.txt
View file

@ -1,6 +1,6 @@
# CaseFolding-10.0.0.txt
# Date: 2017-04-14, 05:40:18 GMT
# © 2017 Unicode®, Inc.
# CaseFolding-11.0.0.txt
# Date: 2018-01-31, 08:20:09 GMT
# © 2018 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 http://www.unicode.org/terms_of_use.html
#
@ -603,6 +603,52 @@
1C86; C; 044A; # CYRILLIC SMALL LETTER TALL HARD SIGN
1C87; C; 0463; # CYRILLIC SMALL LETTER TALL YAT
1C88; C; A64B; # CYRILLIC SMALL LETTER UNBLENDED UK
1C90; C; 10D0; # GEORGIAN MTAVRULI CAPITAL LETTER AN
1C91; C; 10D1; # GEORGIAN MTAVRULI CAPITAL LETTER BAN
1C92; C; 10D2; # GEORGIAN MTAVRULI CAPITAL LETTER GAN
1C93; C; 10D3; # GEORGIAN MTAVRULI CAPITAL LETTER DON
1C94; C; 10D4; # GEORGIAN MTAVRULI CAPITAL LETTER EN
1C95; C; 10D5; # GEORGIAN MTAVRULI CAPITAL LETTER VIN
1C96; C; 10D6; # GEORGIAN MTAVRULI CAPITAL LETTER ZEN
1C97; C; 10D7; # GEORGIAN MTAVRULI CAPITAL LETTER TAN
1C98; C; 10D8; # GEORGIAN MTAVRULI CAPITAL LETTER IN
1C99; C; 10D9; # GEORGIAN MTAVRULI CAPITAL LETTER KAN
1C9A; C; 10DA; # GEORGIAN MTAVRULI CAPITAL LETTER LAS
1C9B; C; 10DB; # GEORGIAN MTAVRULI CAPITAL LETTER MAN
1C9C; C; 10DC; # GEORGIAN MTAVRULI CAPITAL LETTER NAR
1C9D; C; 10DD; # GEORGIAN MTAVRULI CAPITAL LETTER ON
1C9E; C; 10DE; # GEORGIAN MTAVRULI CAPITAL LETTER PAR
1C9F; C; 10DF; # GEORGIAN MTAVRULI CAPITAL LETTER ZHAR
1CA0; C; 10E0; # GEORGIAN MTAVRULI CAPITAL LETTER RAE
1CA1; C; 10E1; # GEORGIAN MTAVRULI CAPITAL LETTER SAN
1CA2; C; 10E2; # GEORGIAN MTAVRULI CAPITAL LETTER TAR
1CA3; C; 10E3; # GEORGIAN MTAVRULI CAPITAL LETTER UN
1CA4; C; 10E4; # GEORGIAN MTAVRULI CAPITAL LETTER PHAR
1CA5; C; 10E5; # GEORGIAN MTAVRULI CAPITAL LETTER KHAR
1CA6; C; 10E6; # GEORGIAN MTAVRULI CAPITAL LETTER GHAN
1CA7; C; 10E7; # GEORGIAN MTAVRULI CAPITAL LETTER QAR
1CA8; C; 10E8; # GEORGIAN MTAVRULI CAPITAL LETTER SHIN
1CA9; C; 10E9; # GEORGIAN MTAVRULI CAPITAL LETTER CHIN
1CAA; C; 10EA; # GEORGIAN MTAVRULI CAPITAL LETTER CAN
1CAB; C; 10EB; # GEORGIAN MTAVRULI CAPITAL LETTER JIL
1CAC; C; 10EC; # GEORGIAN MTAVRULI CAPITAL LETTER CIL
1CAD; C; 10ED; # GEORGIAN MTAVRULI CAPITAL LETTER CHAR
1CAE; C; 10EE; # GEORGIAN MTAVRULI CAPITAL LETTER XAN
1CAF; C; 10EF; # GEORGIAN MTAVRULI CAPITAL LETTER JHAN
1CB0; C; 10F0; # GEORGIAN MTAVRULI CAPITAL LETTER HAE
1CB1; C; 10F1; # GEORGIAN MTAVRULI CAPITAL LETTER HE
1CB2; C; 10F2; # GEORGIAN MTAVRULI CAPITAL LETTER HIE
1CB3; C; 10F3; # GEORGIAN MTAVRULI CAPITAL LETTER WE
1CB4; C; 10F4; # GEORGIAN MTAVRULI CAPITAL LETTER HAR
1CB5; C; 10F5; # GEORGIAN MTAVRULI CAPITAL LETTER HOE
1CB6; C; 10F6; # GEORGIAN MTAVRULI CAPITAL LETTER FI
1CB7; C; 10F7; # GEORGIAN MTAVRULI CAPITAL LETTER YN
1CB8; C; 10F8; # GEORGIAN MTAVRULI CAPITAL LETTER ELIFI
1CB9; C; 10F9; # GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN
1CBA; C; 10FA; # GEORGIAN MTAVRULI CAPITAL LETTER AIN
1CBD; C; 10FD; # GEORGIAN MTAVRULI CAPITAL LETTER AEN
1CBE; C; 10FE; # GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN
1CBF; C; 10FF; # GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN
1E00; C; 1E01; # LATIN CAPITAL LETTER A WITH RING BELOW
1E02; C; 1E03; # LATIN CAPITAL LETTER B WITH DOT ABOVE
1E04; C; 1E05; # LATIN CAPITAL LETTER B WITH DOT BELOW
@ -1180,6 +1226,7 @@ A7B2; C; 029D; # LATIN CAPITAL LETTER J WITH CROSSED-TAIL
A7B3; C; AB53; # LATIN CAPITAL LETTER CHI
A7B4; C; A7B5; # LATIN CAPITAL LETTER BETA
A7B6; C; A7B7; # LATIN CAPITAL LETTER OMEGA
A7B8; C; A7B9; # LATIN CAPITAL LETTER U WITH STROKE
AB70; C; 13A0; # CHEROKEE SMALL LETTER A
AB71; C; 13A1; # CHEROKEE SMALL LETTER E
AB72; C; 13A2; # CHEROKEE SMALL LETTER I
@ -1457,6 +1504,38 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
118BD; C; 118DD; # WARANG CITI CAPITAL LETTER SSUU
118BE; C; 118DE; # WARANG CITI CAPITAL LETTER SII
118BF; C; 118DF; # WARANG CITI CAPITAL LETTER VIYO
16E40; C; 16E60; # MEDEFAIDRIN CAPITAL LETTER M
16E41; C; 16E61; # MEDEFAIDRIN CAPITAL LETTER S
16E42; C; 16E62; # MEDEFAIDRIN CAPITAL LETTER V
16E43; C; 16E63; # MEDEFAIDRIN CAPITAL LETTER W
16E44; C; 16E64; # MEDEFAIDRIN CAPITAL LETTER ATIU
16E45; C; 16E65; # MEDEFAIDRIN CAPITAL LETTER Z
16E46; C; 16E66; # MEDEFAIDRIN CAPITAL LETTER KP
16E47; C; 16E67; # MEDEFAIDRIN CAPITAL LETTER P
16E48; C; 16E68; # MEDEFAIDRIN CAPITAL LETTER T
16E49; C; 16E69; # MEDEFAIDRIN CAPITAL LETTER G
16E4A; C; 16E6A; # MEDEFAIDRIN CAPITAL LETTER F
16E4B; C; 16E6B; # MEDEFAIDRIN CAPITAL LETTER I
16E4C; C; 16E6C; # MEDEFAIDRIN CAPITAL LETTER K
16E4D; C; 16E6D; # MEDEFAIDRIN CAPITAL LETTER A
16E4E; C; 16E6E; # MEDEFAIDRIN CAPITAL LETTER J
16E4F; C; 16E6F; # MEDEFAIDRIN CAPITAL LETTER E
16E50; C; 16E70; # MEDEFAIDRIN CAPITAL LETTER B
16E51; C; 16E71; # MEDEFAIDRIN CAPITAL LETTER C
16E52; C; 16E72; # MEDEFAIDRIN CAPITAL LETTER U
16E53; C; 16E73; # MEDEFAIDRIN CAPITAL LETTER YU
16E54; C; 16E74; # MEDEFAIDRIN CAPITAL LETTER L
16E55; C; 16E75; # MEDEFAIDRIN CAPITAL LETTER Q
16E56; C; 16E76; # MEDEFAIDRIN CAPITAL LETTER HP
16E57; C; 16E77; # MEDEFAIDRIN CAPITAL LETTER NY
16E58; C; 16E78; # MEDEFAIDRIN CAPITAL LETTER X
16E59; C; 16E79; # MEDEFAIDRIN CAPITAL LETTER D
16E5A; C; 16E7A; # MEDEFAIDRIN CAPITAL LETTER OE
16E5B; C; 16E7B; # MEDEFAIDRIN CAPITAL LETTER N
16E5C; C; 16E7C; # MEDEFAIDRIN CAPITAL LETTER R
16E5D; C; 16E7D; # MEDEFAIDRIN CAPITAL LETTER O
16E5E; C; 16E7E; # MEDEFAIDRIN CAPITAL LETTER AI
16E5F; C; 16E7F; # MEDEFAIDRIN CAPITAL LETTER Y
1E900; C; 1E922; # ADLAM CAPITAL LETTER ALIF
1E901; C; 1E923; # ADLAM CAPITAL LETTER DAALI
1E902; C; 1E924; # ADLAM CAPITAL LETTER LAAM

503
icu4c/source/data/unidata/DerivedCoreProperties.txt
View file

File diff suppressed because it is too large Load diff

93
icu4c/source/data/unidata/DerivedNormalizationProps.txt
View file

@ -1,6 +1,6 @@
# DerivedNormalizationProps-10.0.0.txt
# Date: 2017-02-14, 04:26:07 GMT
# © 2017 Unicode®, Inc.
# DerivedNormalizationProps-11.0.0.txt
# Date: 2018-01-31, 08:20:15 GMT
# © 2018 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 http://www.unicode.org/terms_of_use.html
#
@ -3522,6 +3522,52 @@ FFE3 ; Expands_On_NFKC
1C86 ; NFKC_CF; 044A
1C87 ; NFKC_CF; 0463
1C88 ; NFKC_CF; A64B
1C90 ; NFKC_CF; 10D0
1C91 ; NFKC_CF; 10D1
1C92 ; NFKC_CF; 10D2
1C93 ; NFKC_CF; 10D3
1C94 ; NFKC_CF; 10D4
1C95 ; NFKC_CF; 10D5
1C96 ; NFKC_CF; 10D6
1C97 ; NFKC_CF; 10D7
1C98 ; NFKC_CF; 10D8
1C99 ; NFKC_CF; 10D9
1C9A ; NFKC_CF; 10DA
1C9B ; NFKC_CF; 10DB
1C9C ; NFKC_CF; 10DC
1C9D ; NFKC_CF; 10DD
1C9E ; NFKC_CF; 10DE
1C9F ; NFKC_CF; 10DF
1CA0 ; NFKC_CF; 10E0
1CA1 ; NFKC_CF; 10E1
1CA2 ; NFKC_CF; 10E2
1CA3 ; NFKC_CF; 10E3
1CA4 ; NFKC_CF; 10E4
1CA5 ; NFKC_CF; 10E5
1CA6 ; NFKC_CF; 10E6
1CA7 ; NFKC_CF; 10E7
1CA8 ; NFKC_CF; 10E8
1CA9 ; NFKC_CF; 10E9
1CAA ; NFKC_CF; 10EA
1CAB ; NFKC_CF; 10EB
1CAC ; NFKC_CF; 10EC
1CAD ; NFKC_CF; 10ED
1CAE ; NFKC_CF; 10EE
1CAF ; NFKC_CF; 10EF
1CB0 ; NFKC_CF; 10F0
1CB1 ; NFKC_CF; 10F1
1CB2 ; NFKC_CF; 10F2
1CB3 ; NFKC_CF; 10F3
1CB4 ; NFKC_CF; 10F4
1CB5 ; NFKC_CF; 10F5
1CB6 ; NFKC_CF; 10F6
1CB7 ; NFKC_CF; 10F7
1CB8 ; NFKC_CF; 10F8
1CB9 ; NFKC_CF; 10F9
1CBA ; NFKC_CF; 10FA
1CBD ; NFKC_CF; 10FD
1CBE ; NFKC_CF; 10FE
1CBF ; NFKC_CF; 10FF
1D2C ; NFKC_CF; 0061
1D2D ; NFKC_CF; 00E6
1D2E ; NFKC_CF; 0062
@ -5279,6 +5325,7 @@ A7B2 ; NFKC_CF; 029D
A7B3 ; NFKC_CF; AB53
A7B4 ; NFKC_CF; A7B5
A7B6 ; NFKC_CF; A7B7
A7B8 ; NFKC_CF; A7B9
A7F8 ; NFKC_CF; 0127
A7F9 ; NFKC_CF; 0153
AB5C ; NFKC_CF; A727
@ -6860,6 +6907,38 @@ FFF0..FFF8 ; NFKC_CF;
118BD ; NFKC_CF; 118DD
118BE ; NFKC_CF; 118DE
118BF ; NFKC_CF; 118DF
16E40 ; NFKC_CF; 16E60
16E41 ; NFKC_CF; 16E61
16E42 ; NFKC_CF; 16E62
16E43 ; NFKC_CF; 16E63
16E44 ; NFKC_CF; 16E64
16E45 ; NFKC_CF; 16E65
16E46 ; NFKC_CF; 16E66
16E47 ; NFKC_CF; 16E67
16E48 ; NFKC_CF; 16E68
16E49 ; NFKC_CF; 16E69
16E4A ; NFKC_CF; 16E6A
16E4B ; NFKC_CF; 16E6B
16E4C ; NFKC_CF; 16E6C
16E4D ; NFKC_CF; 16E6D
16E4E ; NFKC_CF; 16E6E
16E4F ; NFKC_CF; 16E6F
16E50 ; NFKC_CF; 16E70
16E51 ; NFKC_CF; 16E71
16E52 ; NFKC_CF; 16E72
16E53 ; NFKC_CF; 16E73
16E54 ; NFKC_CF; 16E74
16E55 ; NFKC_CF; 16E75
16E56 ; NFKC_CF; 16E76
16E57 ; NFKC_CF; 16E77
16E58 ; NFKC_CF; 16E78
16E59 ; NFKC_CF; 16E79
16E5A ; NFKC_CF; 16E7A
16E5B ; NFKC_CF; 16E7B
16E5C ; NFKC_CF; 16E7C
16E5D ; NFKC_CF; 16E7D
16E5E ; NFKC_CF; 16E7E
16E5F ; NFKC_CF; 16E7F
1BCA0..1BCA3 ; NFKC_CF;
1D15E ; NFKC_CF; 1D157 1D165
1D15F ; NFKC_CF; 1D158 1D165
@ -8715,7 +8794,7 @@ E0080..E00FF ; NFKC_CF;
E0100..E01EF ; NFKC_CF;
E01F0..E0FFF ; NFKC_CF;
# Total code points: 10227
# Total code points: 10306
# ================================================
@ -9054,6 +9133,8 @@ E01F0..E0FFF ; NFKC_CF;
180B..180D ; Changes_When_NFKC_Casefolded
180E ; Changes_When_NFKC_Casefolded
1C80..1C88 ; Changes_When_NFKC_Casefolded
1C90..1CBA ; Changes_When_NFKC_Casefolded
1CBD..1CBF ; Changes_When_NFKC_Casefolded
1D2C..1D2E ; Changes_When_NFKC_Casefolded
1D30..1D3A ; Changes_When_NFKC_Casefolded
1D3C..1D4D ; Changes_When_NFKC_Casefolded
@ -9474,6 +9555,7 @@ A7A8 ; Changes_When_NFKC_Casefolded
A7AA..A7AE ; Changes_When_NFKC_Casefolded
A7B0..A7B4 ; Changes_When_NFKC_Casefolded
A7B6 ; Changes_When_NFKC_Casefolded
A7B8 ; Changes_When_NFKC_Casefolded
A7F8..A7F9 ; Changes_When_NFKC_Casefolded
AB5C..AB5F ; Changes_When_NFKC_Casefolded
AB70..ABBF ; Changes_When_NFKC_Casefolded
@ -9604,6 +9686,7 @@ FFF0..FFF8 ; Changes_When_NFKC_Casefolded
104B0..104D3 ; Changes_When_NFKC_Casefolded
10C80..10CB2 ; Changes_When_NFKC_Casefolded
118A0..118BF ; Changes_When_NFKC_Casefolded
16E40..16E5F ; Changes_When_NFKC_Casefolded
1BCA0..1BCA3 ; Changes_When_NFKC_Casefolded
1D15E..1D164 ; Changes_When_NFKC_Casefolded
1D173..1D17A ; Changes_When_NFKC_Casefolded
@ -9701,6 +9784,6 @@ E0080..E00FF ; Changes_When_NFKC_Casefolded
E0100..E01EF ; Changes_When_NFKC_Casefolded
E01F0..E0FFF ; Changes_When_NFKC_Casefolded
# Total code points: 10227
# Total code points: 10306
# EOF

4
icu4c/source/data/unidata/NormalizationCorrections.txt
View file

@ -1,5 +1,5 @@
# NormalizationCorrections-10.0.0.txt
# Date: 2017-04-13, 01:00:00 GMT [KW, LI]
# NormalizationCorrections-11.0.0.txt
# Date: 2017-12-06, 01:00:00 GMT [KW, LI]
# © 2017 Unicode®, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
#

52
icu4c/source/data/unidata/NormalizationTest.txt
View file

@ -1,6 +1,6 @@
# NormalizationTest-10.0.0.txt
# Date: 2017-03-08, 08:41:55 GMT
# © 2017 Unicode®, Inc.
# NormalizationTest-11.0.0.txt
# Date: 2018-02-19, 18:33:08 GMT
# © 2018 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 http://www.unicode.org/terms_of_use.html
#
@ -17479,6 +17479,8 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 07F2 059A 0316 302A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062;0061 302A 07F2 0316 059A 0062;
0061 0315 0300 05AE 07F3 0062;00E0 05AE 07F3 0315 0062;0061 05AE 0300 07F3 0315 0062;00E0 05AE 07F3 0315 0062;0061 05AE 0300 07F3 0315 0062;
0061 07F3 0315 0300 05AE 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062;0061 05AE 07F3 0300 0315 0062;
0061 059A 0316 302A 07FD 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062;0061 302A 0316 07FD 059A 0062;
0061 07FD 059A 0316 302A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062;0061 302A 07FD 0316 059A 0062;
0061 0315 0300 05AE 0816 0062;00E0 05AE 0816 0315 0062;0061 05AE 0300 0816 0315 0062;00E0 05AE 0816 0315 0062;0061 05AE 0300 0816 0315 0062;
0061 0816 0315 0300 05AE 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062;0061 05AE 0816 0300 0315 0062;
0061 0315 0300 05AE 0817 0062;00E0 05AE 0817 0315 0062;0061 05AE 0300 0817 0315 0062;00E0 05AE 0817 0315 0062;0061 05AE 0300 0817 0315 0062;
@ -17527,6 +17529,8 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 085A 059A 0316 302A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062;0061 302A 085A 0316 059A 0062;
0061 059A 0316 302A 085B 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062;0061 302A 0316 085B 059A 0062;
0061 085B 059A 0316 302A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062;0061 302A 085B 0316 059A 0062;
0061 059A 0316 302A 08D3 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062;0061 302A 0316 08D3 059A 0062;
0061 08D3 059A 0316 302A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062;0061 302A 08D3 0316 059A 0062;
0061 0315 0300 05AE 08D4 0062;00E0 05AE 08D4 0315 0062;0061 05AE 0300 08D4 0315 0062;00E0 05AE 08D4 0315 0062;0061 05AE 0300 08D4 0315 0062;
0061 08D4 0315 0300 05AE 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062;0061 05AE 08D4 0300 0315 0062;
0061 0315 0300 05AE 08D5 0062;00E0 05AE 08D5 0315 0062;0061 05AE 0300 08D5 0315 0062;00E0 05AE 08D5 0315 0062;0061 05AE 0300 08D5 0315 0062;
@ -17629,6 +17633,8 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 09BC 3099 093C 0334 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062;0061 0334 09BC 093C 3099 0062;
0061 05B0 094D 3099 09CD 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062;0061 3099 094D 09CD 05B0 0062;
0061 09CD 05B0 094D 3099 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062;0061 3099 09CD 094D 05B0 0062;
0061 0315 0300 05AE 09FE 0062;00E0 05AE 09FE 0315 0062;0061 05AE 0300 09FE 0315 0062;00E0 05AE 09FE 0315 0062;0061 05AE 0300 09FE 0315 0062;
0061 09FE 0315 0300 05AE 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062;0061 05AE 09FE 0300 0315 0062;
0061 3099 093C 0334 0A3C 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062;0061 0334 093C 0A3C 3099 0062;
0061 0A3C 3099 093C 0334 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062;0061 0334 0A3C 093C 3099 0062;
0061 05B0 094D 3099 0A4D 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062;0061 3099 094D 0A4D 05B0 0062;
@ -18329,6 +18335,36 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 10AE5 0315 0300 05AE 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062;0061 05AE 10AE5 0300 0315 0062;
0061 059A 0316 302A 10AE6 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062;0061 302A 0316 10AE6 059A 0062;
0061 10AE6 059A 0316 302A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062;0061 302A 10AE6 0316 059A 0062;
0061 0315 0300 05AE 10D24 0062;00E0 05AE 10D24 0315 0062;0061 05AE 0300 10D24 0315 0062;00E0 05AE 10D24 0315 0062;0061 05AE 0300 10D24 0315 0062;
0061 10D24 0315 0300 05AE 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062;0061 05AE 10D24 0300 0315 0062;
0061 0315 0300 05AE 10D25 0062;00E0 05AE 10D25 0315 0062;0061 05AE 0300 10D25 0315 0062;00E0 05AE 10D25 0315 0062;0061 05AE 0300 10D25 0315 0062;
0061 10D25 0315 0300 05AE 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062;0061 05AE 10D25 0300 0315 0062;
0061 0315 0300 05AE 10D26 0062;00E0 05AE 10D26 0315 0062;0061 05AE 0300 10D26 0315 0062;00E0 05AE 10D26 0315 0062;0061 05AE 0300 10D26 0315 0062;
0061 10D26 0315 0300 05AE 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062;0061 05AE 10D26 0300 0315 0062;
0061 0315 0300 05AE 10D27 0062;00E0 05AE 10D27 0315 0062;0061 05AE 0300 10D27 0315 0062;00E0 05AE 10D27 0315 0062;0061 05AE 0300 10D27 0315 0062;
0061 10D27 0315 0300 05AE 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062;0061 05AE 10D27 0300 0315 0062;
0061 059A 0316 302A 10F46 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062;0061 302A 0316 10F46 059A 0062;
0061 10F46 059A 0316 302A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062;0061 302A 10F46 0316 059A 0062;
0061 059A 0316 302A 10F47 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062;0061 302A 0316 10F47 059A 0062;
0061 10F47 059A 0316 302A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062;0061 302A 10F47 0316 059A 0062;
0061 0315 0300 05AE 10F48 0062;00E0 05AE 10F48 0315 0062;0061 05AE 0300 10F48 0315 0062;00E0 05AE 10F48 0315 0062;0061 05AE 0300 10F48 0315 0062;
0061 10F48 0315 0300 05AE 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062;0061 05AE 10F48 0300 0315 0062;
0061 0315 0300 05AE 10F49 0062;00E0 05AE 10F49 0315 0062;0061 05AE 0300 10F49 0315 0062;00E0 05AE 10F49 0315 0062;0061 05AE 0300 10F49 0315 0062;
0061 10F49 0315 0300 05AE 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062;0061 05AE 10F49 0300 0315 0062;
0061 0315 0300 05AE 10F4A 0062;00E0 05AE 10F4A 0315 0062;0061 05AE 0300 10F4A 0315 0062;00E0 05AE 10F4A 0315 0062;0061 05AE 0300 10F4A 0315 0062;
0061 10F4A 0315 0300 05AE 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062;0061 05AE 10F4A 0300 0315 0062;
0061 059A 0316 302A 10F4B 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062;0061 302A 0316 10F4B 059A 0062;
0061 10F4B 059A 0316 302A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062;0061 302A 10F4B 0316 059A 0062;
0061 0315 0300 05AE 10F4C 0062;00E0 05AE 10F4C 0315 0062;0061 05AE 0300 10F4C 0315 0062;00E0 05AE 10F4C 0315 0062;0061 05AE 0300 10F4C 0315 0062;
0061 10F4C 0315 0300 05AE 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062;0061 05AE 10F4C 0300 0315 0062;
0061 059A 0316 302A 10F4D 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062;0061 302A 0316 10F4D 059A 0062;
0061 10F4D 059A 0316 302A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062;0061 302A 10F4D 0316 059A 0062;
0061 059A 0316 302A 10F4E 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062;0061 302A 0316 10F4E 059A 0062;
0061 10F4E 059A 0316 302A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062;0061 302A 10F4E 0316 059A 0062;
0061 059A 0316 302A 10F4F 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062;0061 302A 0316 10F4F 059A 0062;
0061 10F4F 059A 0316 302A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062;0061 302A 10F4F 0316 059A 0062;
0061 059A 0316 302A 10F50 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062;0061 302A 0316 10F50 059A 0062;
0061 10F50 059A 0316 302A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062;0061 302A 10F50 0316 059A 0062;
0061 05B0 094D 3099 11046 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062;0061 3099 094D 11046 05B0 0062;
0061 11046 05B0 094D 3099 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062;0061 3099 11046 094D 05B0 0062;
0061 05B0 094D 3099 1107F 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062;0061 3099 094D 1107F 05B0 0062;
@ -18361,6 +18397,8 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 112E9 3099 093C 0334 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062;0061 0334 112E9 093C 3099 0062;
0061 05B0 094D 3099 112EA 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062;0061 3099 094D 112EA 05B0 0062;
0061 112EA 05B0 094D 3099 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062;0061 3099 112EA 094D 05B0 0062;
0061 3099 093C 0334 1133B 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062;0061 0334 093C 1133B 3099 0062;
0061 1133B 3099 093C 0334 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062;0061 0334 1133B 093C 3099 0062;
0061 3099 093C 0334 1133C 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062;0061 0334 093C 1133C 3099 0062;
0061 1133C 3099 093C 0334 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062;0061 0334 1133C 093C 3099 0062;
0061 05B0 094D 3099 1134D 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062;0061 3099 094D 1134D 05B0 0062;
@ -18393,6 +18431,8 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 11442 05B0 094D 3099 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062;0061 3099 11442 094D 05B0 0062;
0061 3099 093C 0334 11446 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062;0061 0334 093C 11446 3099 0062;
0061 11446 3099 093C 0334 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062;0061 0334 11446 093C 3099 0062;
0061 0315 0300 05AE 1145E 0062;00E0 05AE 1145E 0315 0062;0061 05AE 0300 1145E 0315 0062;00E0 05AE 1145E 0315 0062;0061 05AE 0300 1145E 0315 0062;
0061 1145E 0315 0300 05AE 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062;0061 05AE 1145E 0300 0315 0062;
0061 05B0 094D 3099 114C2 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062;0061 3099 094D 114C2 05B0 0062;
0061 114C2 05B0 094D 3099 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062;0061 3099 114C2 094D 05B0 0062;
0061 3099 093C 0334 114C3 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062;0061 0334 093C 114C3 3099 0062;
@ -18409,6 +18449,10 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 116B7 3099 093C 0334 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;0061 0334 116B7 093C 3099 0062;
0061 05B0 094D 3099 1172B 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;0061 3099 094D 1172B 05B0 0062;
0061 1172B 05B0 094D 3099 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;0061 3099 1172B 094D 05B0 0062;
0061 05B0 094D 3099 11839 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062;0061 3099 094D 11839 05B0 0062;
0061 11839 05B0 094D 3099 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062;0061 3099 11839 094D 05B0 0062;
0061 3099 093C 0334 1183A 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062;0061 0334 093C 1183A 3099 0062;
0061 1183A 3099 093C 0334 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062;0061 0334 1183A 093C 3099 0062;
0061 05B0 094D 3099 11A34 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;0061 3099 094D 11A34 05B0 0062;
0061 11A34 05B0 094D 3099 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;0061 3099 11A34 094D 05B0 0062;
0061 05B0 094D 3099 11A47 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;0061 3099 094D 11A47 05B0 0062;
@ -18423,6 +18467,8 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 11D44 05B0 094D 3099 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;0061 3099 11D44 094D 05B0 0062;
0061 05B0 094D 3099 11D45 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;0061 3099 094D 11D45 05B0 0062;
0061 11D45 05B0 094D 3099 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;0061 3099 11D45 094D 05B0 0062;
0061 05B0 094D 3099 11D97 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;0061 3099 094D 11D97 05B0 0062;
0061 11D97 05B0 094D 3099 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;0061 3099 11D97 094D 05B0 0062;
0061 093C 0334 16AF0 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;0061 0334 16AF0 093C 0062;
0061 16AF0 093C 0334 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;0061 16AF0 0334 093C 0062;
0061 093C 0334 16AF1 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;0061 0334 16AF1 093C 0062;

8
icu4c/source/data/unidata/SpecialCasing.txt
View file

@ -1,6 +1,6 @@
# SpecialCasing-10.0.0.txt
# Date: 2017-04-14, 05:40:43 GMT
# © 2017 Unicode®, Inc.
# SpecialCasing-11.0.0.txt
# Date: 2018-02-22, 06:16:47 GMT
# © 2018 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 http://www.unicode.org/terms_of_use.html
#
@ -121,7 +121,7 @@ FB17; FB17; 0544 056D; 0544 053D; # ARMENIAN SMALL LIGATURE MEN XEH
# The following cases are already in the UnicodeData.txt file, so are only commented here.
# 0345; 0345; 0345; 0399; # COMBINING GREEK YPOGEGRAMMENI
# 0345; 0345; 0399; 0399; # COMBINING GREEK YPOGEGRAMMENI
# All letters with YPOGEGRAMMENI (iota-subscript) or PROSGEGRAMMENI (iota adscript)
# have special uppercases.

778
icu4c/source/data/unidata/UnicodeData.txt
View file

File diff suppressed because it is too large Load diff

354
icu4c/source/data/unidata/changes.txt
View file

@ -49,6 +49,360 @@ For new script codes see http://www.unicode.org/iso15924/codechanges.html
---------------------------------------------------------------------------- ***
Unicode 11.0 update for ICU 62
http://www.unicode.org/versions/Unicode11.0.0/
http://unicode.org/versions/beta-11.0.0.html
TODO: http://blog.unicode.org/2017/03/unicode-100-beta-review.html
TODO: http://www.unicode.org/review/pri350/
http://www.unicode.org/reports/uax-proposed-updates.html
http://www.unicode.org/reports/tr44/tr44-21.html
* Command-line environment setup
UNICODE_DATA=~/unidata/uni11/20180306
CLDR_SRC=~/svn.cldr/uni
ICU_ROOT=~/svn.icu/uni
ICU_SRC=$ICU_ROOT/src
ICUDT=icudt60b
ICU4C_DATA_IN=$ICU_SRC/icu4c/source/data/in
ICU4C_UNIDATA=$ICU_SRC/icu4c/source/data/unidata
export LD_LIBRARY_PATH=$ICU_ROOT/dbg/icu4c/lib
*** ICU Trac
- ticket:13630: Unicode 11
- ^/branches/markus/uni11
*** CLDR Trac
- cldrbug 10978: Unicode 11
*** Unicode version numbers
- makedata.mak
- uchar.h
- com.ibm.icu.util.VersionInfo
- com.ibm.icu.dev.test.lang.UCharacterTest.VERSION_
- Run ICU4C "configure" _after_ updating the Unicode version number in uchar.h
so that the makefiles see the new version number.
*** data files & enums & parser code
* download files
- mkdir -p $UNICODE_DATA
- download Unicode files into $UNICODE_DATA
+ subfolders: emoji, idna, security, ucd, uca
+ inside ucd: extract Unihan.zip to "here" (.../ucd/Unihan/*.txt), delete Unihan.zip
* for manual diffs: remove version suffixes from the file names
~$ unidata/desuffixucd.py $UNICODE_DATA
(see https://sites.google.com/site/unicodetools/inputdata)
TODO missing Unicode 11 versions: idna, security, CLDR root collation
* process and/or copy files
- $ICU_SRC/tools/unicode$ py/preparseucd.py $UNICODE_DATA $ICU_SRC
+ This writes files (especially ppucd.txt) to the ICU4C unidata and testdata subfolders.
+ For debugging, and tweaking how ppucd.txt is written,
the tool has an --only_ppucd option:
py/preparseucd.py $UNICODE_DATA --only_ppucd path/to/ppucd/outputfile
- cp $UNICODE_DATA/security/confusables.txt $ICU4C_UNIDATA
* build ICU (make install)
so that the tools build can pick up the new definitions from the installed header files.
$ICU_ROOT/dbg/icu4c$ echo;echo; make -j7 install > out.txt 2>&1 ; tail -n 30 out.txt ; date
* preparseucd.py changes
- fix other errors
NameError: unknown property Extended_Pictographic
-> add Extended_Pictographic binary property
-> add new short names for all Emoji properties
* new constants for new property values
- preparseucd.py error:
ValueError: missing uchar.h enum constants for some property values:
[(u'blk', set([u'Georgian_Ext', u'Hanifi_Rohingya', u'Medefaidrin', u'Sogdian', u'Makasar',
u'Old_Sogdian', u'Dogra', u'Gunjala_Gondi', u'Chess_Symbols', u'Mayan_Numerals',
u'Indic_Siyaq_Numbers'])),
(u'jg', set([u'Hanifi_Rohingya_Kinna_Ya', u'Hanifi_Rohingya_Pa'])),
(u'sc', set([u'Medf', u'Sogd', u'Dogr', u'Rohg', u'Maka', u'Sogo', u'Gong'])),
(u'GCB', set([u'LinkC', u'Virama'])),
(u'WB', set([u'WSegSpace']))]
= PropertyValueAliases.txt new property values (diff old & new .txt files)
blk; Chess_Symbols ; Chess_Symbols
blk; Dogra ; Dogra
blk; Georgian_Ext ; Georgian_Extended
blk; Gunjala_Gondi ; Gunjala_Gondi
blk; Hanifi_Rohingya ; Hanifi_Rohingya
blk; Indic_Siyaq_Numbers ; Indic_Siyaq_Numbers
blk; Makasar ; Makasar
blk; Mayan_Numerals ; Mayan_Numerals
blk; Medefaidrin ; Medefaidrin
blk; Old_Sogdian ; Old_Sogdian
blk; Sogdian ; Sogdian
-> add to uchar.h
use long property names for enum constants,
for the trailing comment get the block start code point: diff old & new Blocks.txt
-> add to UCharacter.UnicodeBlock IDs
Eclipse find UBLOCK_([^ ]+) = ([0-9]+), (/.+)
replace public static final int \1_ID = \2; \3
-> add to UCharacter.UnicodeBlock objects
Eclipse find UBLOCK_([^ ]+) = [0-9]+, (/.+)
replace public static final UnicodeBlock \1 = new UnicodeBlock("\1", \1_ID); \2
GCB; LinkC ; LinkingConsonant
GCB; Virama ; Virama
-> uchar.h & UCharacter.GraphemeClusterBreak
InSC; Consonant_Initial_Postfixed ; Consonant_Initial_Postfixed
-> ignore: ICU does not yet support this property
jg ; Hanifi_Rohingya_Kinna_Ya ; Hanifi_Rohingya_Kinna_Ya
jg ; Hanifi_Rohingya_Pa ; Hanifi_Rohingya_Pa
-> uchar.h & UCharacter.JoiningGroup
sc ; Dogr ; Dogra
sc ; Gong ; Gunjala_Gondi
sc ; Maka ; Makasar
sc ; Medf ; Medefaidrin
sc ; Rohg ; Hanifi_Rohingya
sc ; Sogd ; Sogdian
sc ; Sogo ; Old_Sogdian
-> uscript.h & com.ibm.icu.lang.UScript
-> Nushu had been added already
-> fix expectedLong names in cucdapi.c/TestUScriptCodeAPI()
and in com.ibm.icu.dev.test.lang.TestUScript.java
WB ; WSegSpace ; WSegSpace
-> uchar.h & UCharacter.WordBreak
* New short names for emoji properties
- see UTS #51
- short names set in preparseucd.py
* New properties
- boolean emoji property Extended_Pictographic
-> added in preparseucd.py
-> uchar.h & UProperty.java
TODO implement, use in RBBI rules
- misc. property Equivalent_Unified_Ideograph (EqUIdeo)
as shown in PropertyValueAliases.txt
-> ??
-> add EqUIdeo=Equivalent_Unified_Ideograph to _ignored_properties
TODO
* update Script metadata: SCRIPT_PROPS[] in uscript_props.cpp & UScript.ScriptMetadata
(not strictly necessary for NOT_ENCODED scripts)
$ICU_SRC/tools/unicode$ py/parsescriptmetadata.py $ICU_SRC/icu4c/source/common/unicode/uscript.h $CLDR_SRC/common/properties/scriptMetadata.txt
TODO
* generate normalization data files
cd $ICU_ROOT/dbg/icu4c
bin/gennorm2 -o $ICU_SRC/icu4c/source/common/norm2_nfc_data.h -s $ICU4C_UNIDATA/norm2 nfc.txt --csource
bin/gennorm2 -o $ICU4C_DATA_IN/nfc.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt
bin/gennorm2 -o $ICU4C_DATA_IN/nfkc.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt nfkc.txt
bin/gennorm2 -o $ICU4C_DATA_IN/nfkc_cf.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt nfkc.txt nfkc_cf.txt
bin/gennorm2 -o $ICU4C_DATA_IN/uts46.nrm -s $ICU4C_UNIDATA/norm2 nfc.txt uts46.txt
* build ICU (make install)
so that the tools build can pick up the new definitions from the installed header files.
$ICU_ROOT/dbg/icu4c$ echo;echo; make -j7 install > out.txt 2>&1 ; tail -n 30 out.txt ; date
* build Unicode tools using CMake+make
$ICU_SRC/tools/unicode/c/icudefs.txt:
# Location (--prefix) of where ICU was installed.
set(ICU_INST_DIR /usr/local/google/home/mscherer/svn.icu/trunk/inst/icu4c)
# Location of the ICU4C source tree.
set(ICU4C_SRC_DIR /usr/local/google/home/mscherer/svn.icu/uni/src/icu4c)
$ICU_ROOT/dbg$
mkdir -p tools/unicode/c
cd tools/unicode/c
$ICU_ROOT/dbg/tools/unicode/c$
cmake ../../../../src/tools/unicode/c
make
* generate core properties data files
$ICU_ROOT/dbg/tools/unicode/c$
genprops/genprops $ICU_SRC/icu4c
genuca/genuca --hanOrder implicit $ICU_SRC/icu4c
genuca/genuca --hanOrder radical-stroke $ICU_SRC/icu4c
- rebuild ICU (make install) & tools
* update uts46test.cpp and UTS46Test.java if there are new characters that are equivalent to
sequences with non-LDH ASCII (that is, their decompositions contain '=' or similar)
- grep IdnaMappingTable.txt or uts46.txt for "disallowed_STD3_valid" on non-ASCII characters
- Unicode 6.0..10.0: U+2260, U+226E, U+226F
- nothing new in this Unicode version, no test file to update
* run & fix ICU4C tests
- Andy handles RBBI & spoof check test failures
* collation: CLDR collation root, UCA DUCET
- UCA DUCET goes into Mark's Unicode tools, see
https://sites.google.com/site/unicodetools/home#TOC-UCA
- CLDR root data files are checked into $CLDR_SRC/common/uca/
cp (Unicode Tools UCA generated)/CollationAuxiliary/* $CLDR_SRC/common/uca/
- update source/data/unidata/FractionalUCA.txt with FractionalUCA_SHORT.txt
cp $CLDR_SRC/common/uca/FractionalUCA_SHORT.txt $ICU4C_UNIDATA/FractionalUCA.txt
- update source/data/unidata/UCARules.txt with UCA_Rules_SHORT.txt
cp $ICU4C_UNIDATA/UCARules.txt /tmp/UCARules-old.txt
(note removing the underscore before "Rules")
cp $CLDR_SRC/common/uca/UCA_Rules_SHORT.txt $ICU4C_UNIDATA/UCARules.txt
- restore TODO diffs in UCARules.txt
meld /tmp/UCARules-old.txt $ICU4C_UNIDATA/UCARules.txt
- update (ICU4C)/source/test/testdata/CollationTest_*.txt
and (ICU4J)/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_*.txt
from the CLDR root files (..._CLDR_..._SHORT.txt)
cp $CLDR_SRC/common/uca/CollationTest_CLDR_NON_IGNORABLE_SHORT.txt $ICU_SRC/icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt
cp $CLDR_SRC/common/uca/CollationTest_CLDR_SHIFTED_SHORT.txt $ICU_SRC/icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt
cp $ICU_SRC/icu4c/source/test/testdata/CollationTest_*.txt $ICU_SRC/icu4j/main/tests/collate/src/com/ibm/icu/dev/data
- if CLDR common/uca/unihan-index.txt changes, then update
CLDR common/collation/root.xml <collation type="private-unihan">
and regenerate (or update in parallel) $ICU_SRC/icu4c/source/data/coll/root.txt
- run genuca, see command line above;
deal with
Error: Unknown script for first-primary sample character U+11D10 on line 28117 of /usr/local/google/home/mscherer/svn.icu/uni10/src/icu4c/source/data/unidata/FractionalUCA.txt:
FDD1 11D10; [70 D5 02, 05, 05] # Masaram_Gondi first primary (compressible)
(add the character to genuca.cpp sampleCharsToScripts[])
+ look up the USCRIPT_ code for the new sample characters
(should be obvious from the comment in the error output)
+ *add* mappings to sampleCharsToScripts[], do not replace them
(in case the script sample characters flip-flop)
+ insert new scripts in DUCET script order, see the top_byte table
at the beginning of FractionalUCA.txt
- rebuild ICU4C
* Unihan collators
https://sites.google.com/site/unicodetools/unihan
- run Unicode Tools
org.unicode.draft.GenerateUnihanCollators
with VM arguments
-ea
-DSVN_WORKSPACE=/usr/local/google/home/mscherer/svn.unitools/trunk
-DOTHER_WORKSPACE=/usr/local/google/home/mscherer/svn.unitools
-DUCD_DIR=/usr/local/google/home/mscherer/svn.unitools/trunk/data
-DCLDR_DIR=/usr/local/google/home/mscherer/svn.cldr/uni
-DUVERSION=11.0.0
- run Unicode Tools
org.unicode.draft.GenerateUnihanCollatorFiles
with the same arguments
- check CLDR diffs
cd $CLDR_SRC
meld common/collation/zh.xml ../Generated/cldr/han/replace/zh.xml
meld common/transforms/Han-Latin.xml ../Generated/cldr/han/replace/Han-Latin.xml
- copy to CLDR
cd $CLDR_SRC
cp ../Generated/cldr/han/replace/zh.xml common/collation/zh.xml
cp ../Generated/cldr/han/replace/Han-Latin.xml common/transforms/Han-Latin.xml
- run CLDR unit tests, commit to CLDR
- generate ICU zh collation data: run CLDR
org.unicode.cldr.icu.NewLdml2IcuConverter
with program arguments
-t collation
-s /usr/local/google/home/mscherer/svn.cldr/uni/common/collation
-m /usr/local/google/home/mscherer/svn.cldr/uni/common/supplemental
-d /usr/local/google/home/mscherer/svn.icu/uni/src/icu4c/source/data/coll
-p /usr/local/google/home/mscherer/svn.icu/uni/src/icu4c/source/data/xml/collation
zh
and VM arguments
-ea
-DCLDR_DIR=/usr/local/google/home/mscherer/svn.cldr/uni
- rebuild ICU4C
* run & fix ICU4C tests, now with new CLDR collation root data
- run all tests with the collation test data *_SHORT.txt or the full files
(the full ones have comments, useful for debugging)
- note on intltest: if collate/UCAConformanceTest fails, then
utility/MultithreadTest/TestCollators will fail as well;
fix the conformance test before looking into the multi-thread test
* update Java data files
- refresh just the UCD/UCA-related/derived files, just to be safe
- see (ICU4C)/source/data/icu4j-readme.txt
- mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
output:
...
Unicode .icu files built to ./out/build/icudt60l
echo timestamp > uni-core-data
mkdir -p ./out/icu4j/com/ibm/icu/impl/data/icudt60b
mkdir -p ./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt60b
echo pnames.icu uprops.icu ucase.icu ubidi.icu nfc.nrm > ./out/icu4j/add.txt
LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH ../bin/icupkg ./out/tmp/icudt60l.dat ./out/icu4j/icudt60b.dat -a ./out/icu4j/add.txt -s ./out/build/icudt60l -x '*' -tb -d ./out/icu4j/com/ibm/icu/impl/data/icudt60b
mv ./out/icu4j/"com/ibm/icu/impl/data/icudt60b/zoneinfo64.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt60b/metaZones.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt60b/timezoneTypes.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt60b/windowsZones.res" "./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt60b"
jar cf ./out/icu4j/icudata.jar -C ./out/icu4j com/ibm/icu/impl/data/icudt60b/
mkdir -p /tmp/icu4j/main/shared/data
cp ./out/icu4j/icudata.jar /tmp/icu4j/main/shared/data
jar cf ./out/icu4j/icutzdata.jar -C ./out/icu4j/tzdata com/ibm/icu/impl/data/icudt60b/
mkdir -p /tmp/icu4j/main/shared/data
cp ./out/icu4j/icutzdata.jar /tmp/icu4j/main/shared/data
make[1]: Leaving directory `/usr/local/google/home/mscherer/svn.icu/uni10/dbg/icu4c/data'
- copy the big-endian Unicode data files to another location,
separate from the other data files,
and then refresh ICU4J
cd $ICU_ROOT/dbg/icu4c/data/out/icu4j
mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/coll
mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/brkitr
cp com/ibm/icu/impl/data/$ICUDT/confusables.cfu /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
cp com/ibm/icu/impl/data/$ICUDT/*.icu /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
rm /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/cnvalias.icu
cp com/ibm/icu/impl/data/$ICUDT/*.nrm /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
cp com/ibm/icu/impl/data/$ICUDT/coll/* /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/coll
cp com/ibm/icu/impl/data/$ICUDT/brkitr/* /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/brkitr
jar uvf $ICU_SRC/icu4j/main/shared/data/icudata.jar -C /tmp/icu4j com/ibm/icu/impl/data/$ICUDT
* When refreshing all of ICU4J data from ICU4C
- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
- cp /tmp/icu4j/main/shared/data/icudata.jar $ICU_SRC/icu4j/main/shared/data
or
- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=$ICU_SRC/icu4j icu4j-data-install
* update CollationFCD.java
+ copy & paste the initializers of lcccIndex[] etc. from
ICU4C/source/i18n/collationfcd.cpp to
ICU4J/main/classes/collate/src/com/ibm/icu/impl/coll/CollationFCD.java
* refresh Java test .txt files
- copy new .txt files into ICU4J's main/tests/core/src/com/ibm/icu/dev/data/unicode
cd $ICU_SRC/icu4c/source/data/unidata
cp confusables.txt confusablesWholeScript.txt NormalizationCorrections.txt NormalizationTest.txt SpecialCasing.txt UnicodeData.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
cd ../../test/testdata
cp BidiCharacterTest.txt BidiTest.txt IdnaTest.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
cp $UNICODE_DATA/ucd/CompositionExclusions.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
* run & fix ICU4J tests
*** API additions
- send notice to icu-design about new born-@stable API (enum constants etc.)
*** CLDR numbering systems
- look for new sets of decimal digits (gc=ND & nv=4) and submit a CLDR ticket
Unicode 10: http://unicode.org/cldr/trac/ticket/10219
Unicode 9: http://unicode.org/cldr/trac/ticket/9692
*** merge the Unicode update branches back onto the trunk
- do not merge the icudata.jar and testdata.jar,
instead rebuild them from merged & tested ICU4C
- make sure that changes to Unicode tools are checked in:
http://www.unicode.org/utility/trac/log/trunk/unicodetools
---------------------------------------------------------------------------- ***
Unicode 10.0 update for ICU 60
http://www.unicode.org/versions/Unicode10.0.0/

17
icu4c/source/data/unidata/norm2/nfc.txt
View file

@ -9,7 +9,7 @@
#
# Complete data for Unicode NFC normalization.
* Unicode 10.0.0
* Unicode 11.0.0
# Canonical_Combining_Class (ccc) values
0300..0314:230
@ -126,11 +126,13 @@
07EB..07F1:230
07F2:220
07F3:230
07FD:220
0816..0819:230
081B..0823:230
0825..0827:230
0829..082D:230
0859..085B:220
08D3:220
08D4..08E1:230
08E3:220
08E4..08E5:230
@ -154,6 +156,7 @@
0953..0954:230
09BC:7
09CD:9
09FE:230
0A3C:7
0A4D:9
0ABC:7
@ -301,6 +304,12 @@ FE2E..FE2F:230
10A3F:9
10AE5:230
10AE6:220
10D24..10D27:230
10F46..10F47:220
10F48..10F4A:230
10F4B:220
10F4C:230
10F4D..10F50:220
11046:9
1107F:9
110B9:9
@ -314,12 +323,13 @@ FE2E..FE2F:230
11236:7
112E9:7
112EA:9
1133C:7
1133B..1133C:7
1134D:9
11366..1136C:230
11370..11374:230
11442:9
11446:7
1145E:230
114C2:9
114C3:7
115BF:9
@ -328,12 +338,15 @@ FE2E..FE2F:230
116B6:9
116B7:7
1172B:9
11839:9
1183A:7
11A34:9
11A47:9
11A99:9
11C3F:9
11D42:7
11D44..11D45:9
11D97:9
16AF0..16AF4:1
16B30..16B36:230
1BC9E:1

2
icu4c/source/data/unidata/norm2/nfkc.txt
View file

@ -13,7 +13,7 @@
# to NFKC one-way mappings.
# Use this file as the second gennorm2 input file after nfc.txt.
* Unicode 10.0.0
* Unicode 11.0.0
00A0>0020
00A8>0020 0308

81
icu4c/source/data/unidata/norm2/nfkc_cf.txt
View file

@ -12,7 +12,7 @@
# and reformatted into syntax for the gennorm2 Normalizer2 data generator tool.
# Use this file as the third gennorm2 input file after nfc.txt and nfkc.txt.
* Unicode 10.0.0
* Unicode 11.0.0
0041>0061
0042>0062
@ -648,6 +648,52 @@
1C86>044A
1C87>0463
1C88>A64B
1C90>10D0
1C91>10D1
1C92>10D2
1C93>10D3
1C94>10D4
1C95>10D5
1C96>10D6
1C97>10D7
1C98>10D8
1C99>10D9
1C9A>10DA
1C9B>10DB
1C9C>10DC
1C9D>10DD
1C9E>10DE
1C9F>10DF
1CA0>10E0
1CA1>10E1
1CA2>10E2
1CA3>10E3
1CA4>10E4
1CA5>10E5
1CA6>10E6
1CA7>10E7
1CA8>10E8
1CA9>10E9
1CAA>10EA
1CAB>10EB
1CAC>10EC
1CAD>10ED
1CAE>10EE
1CAF>10EF
1CB0>10F0
1CB1>10F1
1CB2>10F2
1CB3>10F3
1CB4>10F4
1CB5>10F5
1CB6>10F6
1CB7>10F7
1CB8>10F8
1CB9>10F9
1CBA>10FA
1CBD>10FD
1CBE>10FE
1CBF>10FF
1D2C>0061
1D2D>00E6
1D2E>0062
@ -2403,6 +2449,7 @@ A7B2>029D
A7B3>AB53
A7B4>A7B5
A7B6>A7B7
A7B8>A7B9
A7F8>0127
A7F9>0153
AB5C>A727
@ -3984,6 +4031,38 @@ FFF0..FFF8>
118BD>118DD
118BE>118DE
118BF>118DF
16E40>16E60
16E41>16E61
16E42>16E62
16E43>16E63
16E44>16E64
16E45>16E65
16E46>16E66
16E47>16E67
16E48>16E68
16E49>16E69
16E4A>16E6A
16E4B>16E6B
16E4C>16E6C
16E4D>16E6D
16E4E>16E6E
16E4F>16E6F
16E50>16E70
16E51>16E71
16E52>16E72
16E53>16E73
16E54>16E74
16E55>16E75
16E56>16E76
16E57>16E77
16E58>16E78
16E59>16E79
16E5A>16E7A
16E5B>16E7B
16E5C>16E7C
16E5D>16E7D
16E5E>16E7E
16E5F>16E7F
1BCA0..1BCA3>
1D15E>1D157 1D165
1D15F>1D158 1D165

5704
icu4c/source/data/unidata/ppucd.txt
View file

File diff suppressed because it is too large Load diff

98
icu4c/source/i18n/collationfcd.cpp
View file

@ -22,27 +22,27 @@ const uint8_t CollationFCD::lcccIndex[2048]={
0,0,0,0,0,0,0,0,1,1,2,3,0,0,0,0,
0,0,0,0,4,0,0,0,0,0,0,0,5,6,7,0,
8,0,9,0xa,0,0,0xb,0xc,0xd,0xe,0xf,0,0,0,0,0x10,
0x11,0x12,0x13,0,0,0,0x14,0x15,0,0x16,0x17,0,0,0x16,0x18,0,
0x11,0x12,0x13,0,0,0,0x14,0x15,0,0x16,0x17,0,0,0x16,0x18,0x19,
0,0x16,0x18,0,0,0x16,0x18,0,0,0x16,0x18,0,0,0,0x18,0,
0,0,0x19,0,0,0x16,0x18,0,0,0x1a,0x18,0,0,0,0x1b,0,
0,0x1c,0x1d,0,0,0x1e,0x1d,0,0x1e,0x1f,0,0x20,0x21,0,0x22,0,
0,0x23,0,0,0x18,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0x24,0,0,0,0,0,
0,0,0x1a,0,0,0x16,0x18,0,0,0x1b,0x18,0,0,0,0x1c,0,
0,0x1d,0x1e,0,0,0x1f,0x1e,0,0x1f,0x20,0,0x21,0x22,0,0x23,0,
0,0x24,0,0,0x18,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0x25,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0x25,0x25,0,0,0,0,0x26,0,
0,0,0,0,0,0x27,0,0,0,0x13,0,0,0,0,0,0,
0x28,0,0,0x29,0,0x2a,0,0,0,0x25,0x2b,0x10,0,0x2c,0,0x2d,
0,0x2e,0,0,0,0,0x2f,0x30,0,0,0,0,0,0,1,0x31,
0,0,0,0,0,0,0,0,0x26,0x26,0,0,0,0,0x27,0,
0,0,0,0,0,0x28,0,0,0,0x13,0,0,0,0,0,0,
0x29,0,0,0x2a,0,0x2b,0,0,0,0x26,0x2c,0x2d,0,0x2e,0,0x2f,
0,0x30,0,0,0,0,0x31,0x32,0,0,0,0,0,0,1,0x33,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0x32,0x33,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0x34,0x35,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0x34,0,0,0,0x35,0,0,0,1,
0,0,0,0,0,0,0,0x36,0,0,0,0x37,0,0,0,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0x36,0,0,0x37,0,0,0,0,0,0,0,0,0,0,0,
0,0x38,0,0,0x39,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -101,9 +101,9 @@ const uint8_t CollationFCD::lcccIndex[2048]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0x38,0x39,0,0,0x3a,0,0,0,0,0,0,0,0,
0x22,0,0,0,0,0,0x2b,0x3b,0,0x3c,0x3d,0,0,0x3d,0x3e,0,
0,0,0,0,0,0x3f,0x40,0x41,0,0,0,0,0,0,0,0x18,
0,0,0,0x3a,0x3b,0,0,0x3c,0,0,0,0,0,0,0,0,
0x23,0,0,0,0,0,0x2c,0x3d,0,0x3e,0x3f,0,0,0x3f,0x40,0,
0,0,0,0,0,0x41,0x42,0x43,0,0,0,0,0,0,0,0x18,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -126,7 +126,7 @@ const uint8_t CollationFCD::lcccIndex[2048]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0x42,0x43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0x44,0x45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@ -143,17 +143,17 @@ const uint8_t CollationFCD::lcccIndex[2048]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0x44,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0x19,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
const uint32_t CollationFCD::lcccBits[69]={
const uint32_t CollationFCD::lcccBits[70]={
0,0xffffffff,0xffff7fff,0xffff,0xf8,0xfffe0000,0xbfffffff,0xb6,0x7ff0000,0xfffff800,0x10000,0x9fc00000,0x3d9f,0x20000,0xffff0000,0x7ff,
0xff800,0xfbc00000,0x3eef,0xe000000,0xfff00000,0xfffffffb,0x10000000,0x1e2000,0x2000,0x602000,0x18000000,0x400,0x7000000,0xf00,0x3000000,0x2a00000,
0x3c3e0000,0xdf,0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200,0x1800000,0x9fe00001,0x3fff0000,0x10,0xc00,0xc0040,0x800000,0xfff70000,
0x31021fd,0xfbffffff,0x1fff0000,0x1ffe2,0x38000,0x80000000,0xfc00,0x6000000,0x3ff08000,0xc0000000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,
2,0x400000,0x40000f5,0x5108000,0x40000000
0x200ff800,0xfbc00000,0x3eef,0xe000000,0xfff80000,0xfffffffb,0x10000000,0x1e2000,0x2000,0x40000000,0x602000,0x18000000,0x400,0x7000000,0xf00,0x3000000,
0x2a00000,0x3c3e0000,0xdf,0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200,0x1800000,0x9fe00001,0x3fff0000,0x10,0xff800,0xc00,0xc0040,
0x800000,0xfff70000,0x31021fd,0xfbffffff,0x1fff0000,0x1ffe2,0x38000,0x80000000,0xfc00,0x6000000,0x3ff08000,0xc0000000,0x30000,0x3ffff,0x3800,0x80000,
1,0xc19d0000,2,0x400000,0x40000fd,0x5108000
};
const uint8_t CollationFCD::tcccIndex[2048]={
@ -161,27 +161,27 @@ const uint8_t CollationFCD::tcccIndex[2048]={
0xb,0xc,0,0,0,0,0,0,1,1,0xd,0xe,0xf,0x10,0x11,0,
0x12,0x13,0x14,0x15,0x16,0,0x17,0x18,0,0,0,0,0x19,0x1a,0x1b,0,
0x1c,0x1d,0x1e,0x1f,0,0,0x20,0x21,0x22,0x23,0x24,0,0,0,0,0x25,
0x26,0x27,0x28,0,0,0,0x29,0x2a,0,0x2b,0x2c,0,0,0x2d,0x2e,0,
0,0x2f,0x30,0,0,0x2d,0x31,0,0,0x2d,0x32,0,0,0,0x31,0,
0,0,0x33,0,0,0x2d,0x31,0,0,0x34,0x31,0,0,0,0x35,0,
0,0x36,0x37,0,0,0x38,0x37,0,0x38,0x39,0,0x3a,0x3b,0,0x3c,0,
0,0x3d,0,0,0x31,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0x3e,0,0,0,0,0,
0x26,0x27,0x28,0,0,0,0x29,0x2a,0,0x2b,0x2c,0,0,0x2d,0x2e,0x2f,
0,0x30,0x31,0,0,0x2d,0x32,0,0,0x2d,0x33,0,0,0,0x32,0,
0,0,0x34,0,0,0x2d,0x32,0,0,0x35,0x32,0,0,0,0x36,0,
0,0x37,0x38,0,0,0x39,0x38,0,0x39,0x3a,0,0x3b,0x3c,0,0x3d,0,
0,0x3e,0,0,0x32,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0x3f,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0x3f,0x3f,0,0,0,0,0x40,0,
0,0,0,0,0,0x41,0,0,0,0x28,0,0,0,0,0,0,
0x42,0,0,0x43,0,0x44,0,0,0,0x3f,0x45,0x25,0,0x46,0,0x47,
0,0x48,0,0,0,0,0x49,0x4a,0,0,0,0,0,0,1,0x4b,
1,1,1,1,0x4c,1,1,0x4d,0x4e,1,0x4f,0x50,1,0x51,0x52,0x53,
0,0,0,0,0,0,0x54,0x55,0,0x56,0,0,0x57,0x58,0x59,0,
0x5a,0x5b,0x5c,0x5d,0x5e,0x5f,0,0x60,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0x40,0x40,0,0,0,0,0x41,0,
0,0,0,0,0,0x42,0,0,0,0x28,0,0,0,0,0,0,
0x43,0,0,0x44,0,0x45,0,0,0,0x40,0x46,0x47,0,0x48,0,0x49,
0,0x4a,0,0,0,0,0x4b,0x4c,0,0,0,0,0,0,1,0x4d,
1,1,1,1,0x4e,1,1,0x4f,0x50,1,0x51,0x52,1,0x53,0x54,0x55,
0,0,0,0,0,0,0x56,0x57,0,0x58,0,0,0x59,0x5a,0x5b,0,
0x5c,0x5d,0x5e,0x5f,0x60,0x61,0,0x62,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0x2d,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0x61,0,0,0,0x62,0,0,0,1,
0,0,0,0,0,0,0,0x63,0,0,0,0x64,0,0,0,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0x63,0x64,0x65,0x66,0x64,0x65,0x67,0,0,0,0,0,0,0,0,
0,0x65,0x66,0x67,0x68,0x66,0x67,0x69,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -240,9 +240,9 @@ const uint8_t CollationFCD::tcccIndex[2048]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0x68,0x69,0,0,0x6a,0,0,0,0,0,0,0,0,
0x3c,0,0,0,0,0,0x45,0x6b,0,0x6c,0x6d,0,0,0x6d,0x6e,0,
0,0,0,0,0,0x6f,0x70,0x71,0,0,0,0,0,0,0,0x31,
0,0,0,0x6a,0x6b,0,0,0x6c,0,0,0,0,0,0,0,0,
0x3d,0,0,0,0,0,0x46,0x6d,0,0x6e,0x6f,0,0,0x6f,0x70,0,
0,0,0,0,0,0x71,0x72,0x73,0,0,0,0,0,0,0,0x32,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -265,7 +265,7 @@ const uint8_t CollationFCD::tcccIndex[2048]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0x72,0x73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0x74,0x75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -282,20 +282,20 @@ const uint8_t CollationFCD::tcccIndex[2048]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0x3e,0x74,0x75,0,0,0,0,0,
0,0,0,0,0,0,0,0,0x3f,0x76,0x77,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0xe,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
const uint32_t CollationFCD::tcccBits[118]={
const uint32_t CollationFCD::tcccBits[120]={
0,0xffffffff,0x3e7effbf,0xbe7effbf,0xfffcffff,0x7ef1ff3f,0xfff3f1f8,0x7fffff3f,0x18003,0xdfffe000,0xff31ffcf,0xcfffffff,0xfffc0,0xffff7fff,0xffff,0x1d760,
0x1fc00,0x187c00,0x200708b,0x2000000,0x708b0000,0xc00000,0xf8,0xfccf0006,0x33ffcfc,0xfffe0000,0xbfffffff,0xb6,0x7ff0000,0x7c,0xfffff800,0x10000,
0x9fc80005,0x3d9f,0x20000,0xffff0000,0x7ff,0xff800,0xfbc00000,0x3eef,0xe000000,0xfff00000,0xfffffffb,0x10120200,0xff1e2000,0x10000000,0xb0002000,0x10480000,
0x4e002000,0x2000,0x30002000,0x602100,0x18000000,0x24000400,0x7000000,0xf00,0x3000000,0x2a00000,0x3d7e0000,0xdf,0x40,0x6800000,0xe0000000,0x100000,
0x20040000,0x200,0x1800000,0x9fe00001,0x3fff0000,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x31021fd,0xfbffffff,0xbffffff,0x3ffffff,0x3f3fffff,0xaaff3f3f,
0x3fffffff,0x1fdfffff,0xefcfffde,0x1fdc7fff,0x1fff0000,0x1ffe2,0x800,0xc000000,0x4000,0xe000,0x1210,0x50,0x292,0x333e005,0x333,0xf000,
0x3c0f,0x38000,0x80000000,0xfc00,0x55555000,0x36db02a5,0x46100000,0x47900000,0x3ff08000,0xc0000000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,
2,0x400000,0x40000f5,0x5108000,0x5f7ffc00,0x7fdb
0x9fc80005,0x3d9f,0x20000,0xffff0000,0x7ff,0x200ff800,0xfbc00000,0x3eef,0xe000000,0xfff80000,0xfffffffb,0x10120200,0xff1e2000,0x10000000,0xb0002000,0x40000000,
0x10480000,0x4e002000,0x2000,0x30002000,0x602100,0x18000000,0x24000400,0x7000000,0xf00,0x3000000,0x2a00000,0x3d7e0000,0xdf,0x40,0x6800000,0xe0000000,
0x100000,0x20040000,0x200,0x1800000,0x9fe00001,0x3fff0000,0x10,0xff800,0xc00,0xc0040,0x800000,0xfff70000,0x31021fd,0xfbffffff,0xbffffff,0x3ffffff,
0x3f3fffff,0xaaff3f3f,0x3fffffff,0x1fdfffff,0xefcfffde,0x1fdc7fff,0x1fff0000,0x1ffe2,0x800,0xc000000,0x4000,0xe000,0x1210,0x50,0x292,0x333e005,
0x333,0xf000,0x3c0f,0x38000,0x80000000,0xfc00,0x55555000,0x36db02a5,0x46100000,0x47900000,0x3ff08000,0xc0000000,0x30000,0x3ffff,0x3800,0x80000,
1,0xc19d0000,2,0x400000,0x40000fd,0x5108000,0x5f7ffc00,0x7fdb
};
U_NAMESPACE_END

6
icu4c/source/test/testdata/BidiTest.txt vendored
View file

@ -1,6 +1,6 @@
# BidiTest-10.0.0.txt
# Date: 2017-02-14, 04:25:55 GMT
# © 2017 Unicode®, Inc.
# BidiTest-11.0.0.txt
# Date: 2018-01-31, 08:20:07 GMT
# © 2018 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 http://www.unicode.org/terms_of_use.html
#

1225
icu4c/source/test/testdata/GraphemeBreakTest.txt vendored
View file

File diff suppressed because it is too large Load diff

6
icu4c/source/test/testdata/LineBreakTest.txt vendored
View file

@ -1,6 +1,6 @@
# LineBreakTest-10.0.0.txt
# Date: 2017-04-14, 05:40:30 GMT
# © 2017 Unicode®, Inc.
# LineBreakTest-11.0.0.txt
# Date: 2018-01-31, 08:20:17 GMT
# © 2018 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 http://www.unicode.org/terms_of_use.html
#

6
icu4c/source/test/testdata/SentenceBreakTest.txt vendored
View file

@ -1,6 +1,6 @@
# SentenceBreakTest-10.0.0.txt
# Date: 2017-04-14, 05:40:43 GMT
# © 2017 Unicode®, Inc.
# SentenceBreakTest-11.0.0.txt
# Date: 2018-01-31, 08:20:29 GMT
# © 2018 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 http://www.unicode.org/terms_of_use.html
#

863
icu4c/source/test/testdata/WordBreakTest.txt vendored
View file

File diff suppressed because it is too large Load diff

74
icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
View file

@ -1177,6 +1177,31 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
/** @stable ICU 60 */
public static final int ZANABAZAR_SQUARE_ID = 280; /*[11A00]*/
// New blocks in Unicode 11.0
/** @stable ICU 62 */
public static final int CHESS_SYMBOLS_ID = 281; /*[1FA00]*/
/** @stable ICU 62 */
public static final int DOGRA_ID = 282; /*[11800]*/
/** @stable ICU 62 */
public static final int GEORGIAN_EXTENDED_ID = 283; /*[1C90]*/
/** @stable ICU 62 */
public static final int GUNJALA_GONDI_ID = 284; /*[11D60]*/
/** @stable ICU 62 */
public static final int HANIFI_ROHINGYA_ID = 285; /*[10D00]*/
/** @stable ICU 62 */
public static final int INDIC_SIYAQ_NUMBERS_ID = 286; /*[1EC70]*/
/** @stable ICU 62 */
public static final int MAKASAR_ID = 287; /*[11EE0]*/
/** @stable ICU 62 */
public static final int MAYAN_NUMERALS_ID = 288; /*[1D2E0]*/
/** @stable ICU 62 */
public static final int MEDEFAIDRIN_ID = 289; /*[16E40]*/
/** @stable ICU 62 */
public static final int OLD_SOGDIAN_ID = 290; /*[10F00]*/
/** @stable ICU 62 */
public static final int SOGDIAN_ID = 291; /*[10F30]*/
/**
* One more than the highest normal UnicodeBlock value.
* The highest value is available via UCharacter.getIntPropertyMaxValue(UProperty.BLOCK).
@ -1184,7 +1209,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
* @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
*/
@Deprecated
public static final int COUNT = 281;
public static final int COUNT = 292;
// blocks objects ---------------------------------------------------
@ -2464,6 +2489,39 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
public static final UnicodeBlock ZANABAZAR_SQUARE =
new UnicodeBlock("ZANABAZAR_SQUARE", ZANABAZAR_SQUARE_ID); /*[11A00]*/
// New blocks in Unicode 11.0
/** @stable ICU 62 */
public static final UnicodeBlock CHESS_SYMBOLS =
new UnicodeBlock("CHESS_SYMBOLS", CHESS_SYMBOLS_ID); /*[1FA00]*/
/** @stable ICU 62 */
public static final UnicodeBlock DOGRA = new UnicodeBlock("DOGRA", DOGRA_ID); /*[11800]*/
/** @stable ICU 62 */
public static final UnicodeBlock GEORGIAN_EXTENDED =
new UnicodeBlock("GEORGIAN_EXTENDED", GEORGIAN_EXTENDED_ID); /*[1C90]*/
/** @stable ICU 62 */
public static final UnicodeBlock GUNJALA_GONDI =
new UnicodeBlock("GUNJALA_GONDI", GUNJALA_GONDI_ID); /*[11D60]*/
/** @stable ICU 62 */
public static final UnicodeBlock HANIFI_ROHINGYA =
new UnicodeBlock("HANIFI_ROHINGYA", HANIFI_ROHINGYA_ID); /*[10D00]*/
/** @stable ICU 62 */
public static final UnicodeBlock INDIC_SIYAQ_NUMBERS =
new UnicodeBlock("INDIC_SIYAQ_NUMBERS", INDIC_SIYAQ_NUMBERS_ID); /*[1EC70]*/
/** @stable ICU 62 */
public static final UnicodeBlock MAKASAR = new UnicodeBlock("MAKASAR", MAKASAR_ID); /*[11EE0]*/
/** @stable ICU 62 */
public static final UnicodeBlock MAYAN_NUMERALS =
new UnicodeBlock("MAYAN_NUMERALS", MAYAN_NUMERALS_ID); /*[1D2E0]*/
/** @stable ICU 62 */
public static final UnicodeBlock MEDEFAIDRIN =
new UnicodeBlock("MEDEFAIDRIN", MEDEFAIDRIN_ID); /*[16E40]*/
/** @stable ICU 62 */
public static final UnicodeBlock OLD_SOGDIAN =
new UnicodeBlock("OLD_SOGDIAN", OLD_SOGDIAN_ID); /*[10F00]*/
/** @stable ICU 62 */
public static final UnicodeBlock SOGDIAN = new UnicodeBlock("SOGDIAN", SOGDIAN_ID); /*[10F30]*/
/**
* @stable ICU 2.4
*/
@ -3092,6 +3150,11 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
/** @stable ICU 60 */
public static final int MALAYALAM_TTA = 99;
/** @stable ICU 62 */
public static final int HANIFI_ROHINGYA_KINNA_YA = 100;
/** @stable ICU 62 */
public static final int HANIFI_ROHINGYA_PA = 101;
/**
* One more than the highest normal JoiningGroup value.
* The highest value is available via UCharacter.getIntPropertyMaxValue(UProperty.JoiningGroup).
@ -3099,7 +3162,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
* @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
*/
@Deprecated
public static final int COUNT = 100;
public static final int COUNT = 102;
}
/**
@ -3168,6 +3231,11 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
public static final int GLUE_AFTER_ZWJ = 16; /*[GAZ]*/
/** @stable ICU 58 */
public static final int ZWJ = 17; /*[ZWJ]*/
/** @stable ICU 62 */
public static final int LINKING_CONSONANT = 18; /*[LinkC]*/
/** @stable ICU 62 */
public static final int VIRAMA = 19; /*[Virama]*/
/**
* One more than the highest normal GraphemeClusterBreak value.
* The highest value is available via UCharacter.getIntPropertyMaxValue(UProperty.GRAPHEME_CLUSTER_BREAK).
@ -3175,7 +3243,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
* @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
*/
@Deprecated
public static final int COUNT = 18;
public static final int COUNT = 20;
}
/**

20
icu4j/main/classes/core/src/com/ibm/icu/lang/UScript.java
View file

@ -1013,6 +1013,24 @@ public final class UScript {
*/
public static final int ZANABAZAR_SQUARE = 177; /* Zanb */
/**
* ISO 15924 script code
* @stable ICU 62
*/
public static final int DOGRA = 178; /* Dogr */
/** @stable ICU 62 */
public static final int GUNJALA_GONDI = 179; /* Gong */
/** @stable ICU 62 */
public static final int MAKASAR = 180; /* Maka */
/** @stable ICU 62 */
public static final int MEDEFAIDRIN = 181; /* Medf */
/** @stable ICU 62 */
public static final int HANIFI_ROHINGYA = 182; /* Rohg */
/** @stable ICU 62 */
public static final int SOGDIAN = 183; /* Sogd */
/** @stable ICU 62 */
public static final int OLD_SOGDIAN = 184; /* Sogo */
/**
* One more than the highest normal UScript code.
* The highest value is available via UCharacter.getIntPropertyMaxValue(UProperty.SCRIPT).
@ -1020,7 +1038,7 @@ public final class UScript {
* @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
*/
@Deprecated
public static final int CODE_LIMIT = 178;
public static final int CODE_LIMIT = 185;
private static int[] getCodesFromLocale(ULocale locale) {
// Multi-script languages, equivalent to the LocaleScript data

9
icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
View file

@ -175,6 +175,12 @@ public final class VersionInfo implements Comparable<VersionInfo>
*/
public static final VersionInfo UNICODE_10_0;
/**
* Unicode 11.0 version
* @stable ICU 62
*/
public static final VersionInfo UNICODE_11_0;
/**
* ICU4J current release version
* @stable ICU 2.8
@ -566,10 +572,11 @@ public final class VersionInfo implements Comparable<VersionInfo>
UNICODE_8_0 = getInstance(8, 0, 0, 0);
UNICODE_9_0 = getInstance(9, 0, 0, 0);
UNICODE_10_0 = getInstance(10, 0, 0, 0);
UNICODE_11_0 = getInstance(11, 0, 0, 0);
ICU_VERSION = getInstance(61, 1, 0, 0);
ICU_DATA_VERSION = getInstance(61, 0, 1, 0);
UNICODE_VERSION = UNICODE_10_0;
UNICODE_VERSION = UNICODE_11_0;
UCOL_RUNTIME_VERSION = getInstance(9);
UCOL_BUILDER_VERSION = getInstance(9);

2
icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterTest.java
View file

@ -54,7 +54,7 @@ public final class UCharacterTest extends TestFmwk
/**
* Expected Unicode version.
*/
private final VersionInfo VERSION_ = VersionInfo.getInstance(10);
private final VersionInfo VERSION_ = VersionInfo.getInstance(11);
// constructor ===================================================

3
tools/unicode/c/CMakeLists.txt
View file

@ -7,7 +7,8 @@
# created by: Markus W. Scherer
cmake_minimum_required(VERSION 2.6)
project(ICU_UNI_TOOLS)
set(CMAKE_CXX_FLAGS "-std=c++11")
set(CMAKE_CXX_FLAGS "-std=c++11 -fsanitize=bounds")
set(CMAKE_LD_FLAGS "-fsanitize=bounds")
# This requires an icudefs.txt file with contents like the following:
# Location (--prefix) of where ICU was installed.
#set(ICU_INST_DIR /usr/local/google/home/mscherer/svn.icu/trunk/inst/icu4c)

2
tools/unicode/c/genprops/genprops.h
View file

@ -42,7 +42,7 @@ public:
class PNamesBuilder : public PropsBuilder {
public:
virtual const PropertyNames *getPropertyNames() = 0;
virtual const icu::PropertyNames *getPropertyNames() = 0;
};
PNamesBuilder *createPNamesBuilder(UErrorCode &errorCode);

53
tools/unicode/c/genprops/pnames_data.h
View file

@ -7,7 +7,7 @@
* machine-generated by: icu/tools/unicode/py/preparseucd.py
*/
#define UNICODE_VERSION { 10, 0, 0, 0 }
#define UNICODE_VERSION { 11, 0, 0, 0 }
static const Value VALUES_binprop[2] = {
Value(0, "N No F False"),
@ -40,7 +40,7 @@ static const Value VALUES_bc[23] = {
Value(U_POP_DIRECTIONAL_ISOLATE, "PDI Pop_Directional_Isolate"),
};
static const Value VALUES_blk[281] = {
static const Value VALUES_blk[292] = {
Value(UBLOCK_NO_BLOCK, "NB No_Block"),
Value(UBLOCK_BASIC_LATIN, "ASCII Basic_Latin"),
Value(UBLOCK_LATIN_1_SUPPLEMENT, "Latin_1_Sup Latin_1_Supplement Latin_1"),
@ -322,6 +322,17 @@ static const Value VALUES_blk[281] = {
Value(UBLOCK_SOYOMBO, "Soyombo Soyombo"),
Value(UBLOCK_SYRIAC_SUPPLEMENT, "Syriac_Sup Syriac_Supplement"),
Value(UBLOCK_ZANABAZAR_SQUARE, "Zanabazar_Square Zanabazar_Square"),
Value(UBLOCK_CHESS_SYMBOLS, "Chess_Symbols Chess_Symbols"),
Value(UBLOCK_DOGRA, "Dogra Dogra"),
Value(UBLOCK_GEORGIAN_EXTENDED, "Georgian_Ext Georgian_Extended"),
Value(UBLOCK_GUNJALA_GONDI, "Gunjala_Gondi Gunjala_Gondi"),
Value(UBLOCK_HANIFI_ROHINGYA, "Hanifi_Rohingya Hanifi_Rohingya"),
Value(UBLOCK_INDIC_SIYAQ_NUMBERS, "Indic_Siyaq_Numbers Indic_Siyaq_Numbers"),
Value(UBLOCK_MAKASAR, "Makasar Makasar"),
Value(UBLOCK_MAYAN_NUMERALS, "Mayan_Numerals Mayan_Numerals"),
Value(UBLOCK_MEDEFAIDRIN, "Medefaidrin Medefaidrin"),
Value(UBLOCK_OLD_SOGDIAN, "Old_Sogdian Old_Sogdian"),
Value(UBLOCK_SOGDIAN, "Sogdian Sogdian"),
};
static const Value VALUES_ccc[57] = {
@ -447,7 +458,7 @@ static const Value VALUES_gc[30] = {
Value(U_FINAL_PUNCTUATION, "Pf Final_Punctuation"),
};
static const Value VALUES_jg[100] = {
static const Value VALUES_jg[102] = {
Value(U_JG_NO_JOINING_GROUP, "No_Joining_Group No_Joining_Group"),
Value(U_JG_AIN, "Ain Ain"),
Value(U_JG_ALAPH, "Alaph Alaph"),
@ -548,6 +559,8 @@ static const Value VALUES_jg[100] = {
Value(U_JG_MALAYALAM_RA, "Malayalam_Ra Malayalam_Ra"),
Value(U_JG_MALAYALAM_SSA, "Malayalam_Ssa Malayalam_Ssa"),
Value(U_JG_MALAYALAM_TTA, "Malayalam_Tta Malayalam_Tta"),
Value(U_JG_HANIFI_ROHINGYA_KINNA_YA, "Hanifi_Rohingya_Kinna_Ya Hanifi_Rohingya_Kinna_Ya"),
Value(U_JG_HANIFI_ROHINGYA_PA, "Hanifi_Rohingya_Pa Hanifi_Rohingya_Pa"),
};
static const Value VALUES_jt[6] = {
@ -612,7 +625,7 @@ static const Value VALUES_nt[4] = {
Value(U_NT_NUMERIC, "Nu Numeric"),
};
static const Value VALUES_sc[178] = {
static const Value VALUES_sc[185] = {
Value(USCRIPT_COMMON, "Zyyy Common"),
Value(USCRIPT_INHERITED, "Zinh Inherited Qaai"),
Value(USCRIPT_ARABIC, "Arab Arabic"),
@ -791,6 +804,13 @@ static const Value VALUES_sc[178] = {
Value(USCRIPT_MASARAM_GONDI, "Gonm Masaram_Gondi"),
Value(USCRIPT_SOYOMBO, "Soyo Soyombo"),
Value(USCRIPT_ZANABAZAR_SQUARE, "Zanb Zanabazar_Square"),
Value(USCRIPT_DOGRA, "Dogr Dogra"),
Value(USCRIPT_GUNJALA_GONDI, "Gong Gunjala_Gondi"),
Value(USCRIPT_MAKASAR, "Maka Makasar"),
Value(USCRIPT_MEDEFAIDRIN, "Medf Medefaidrin"),
Value(USCRIPT_HANIFI_ROHINGYA, "Rohg Hanifi_Rohingya"),
Value(USCRIPT_SOGDIAN, "Sogd Sogdian"),
Value(USCRIPT_OLD_SOGDIAN, "Sogo Old_Sogdian"),
};
static const Value VALUES_hst[6] = {
@ -944,7 +964,7 @@ static const Value VALUES_tccc[57] = {
Value(240, "IS Iota_Subscript"),
};
static const Value VALUES_GCB[18] = {
static const Value VALUES_GCB[20] = {
Value(U_GCB_OTHER, "XX Other"),
Value(U_GCB_CONTROL, "CN Control"),
Value(U_GCB_CR, "CR CR"),
@ -963,6 +983,8 @@ static const Value VALUES_GCB[18] = {
Value(U_GCB_E_MODIFIER, "EM E_Modifier"),
Value(U_GCB_GLUE_AFTER_ZWJ, "GAZ Glue_After_Zwj"),
Value(U_GCB_ZWJ, "ZWJ ZWJ"),
Value(U_GCB_LINKING_CONSONANT, "LinkC LinkingConsonant"),
Value(U_GCB_VIRAMA, "Virama Virama"),
};
static const Value VALUES_SB[15] = {
@ -983,7 +1005,7 @@ static const Value VALUES_SB[15] = {
Value(U_SB_SCONTINUE, "SC SContinue"),
};
static const Value VALUES_WB[22] = {
static const Value VALUES_WB[23] = {
Value(U_WB_OTHER, "XX Other"),
Value(U_WB_ALETTER, "LE ALetter"),
Value(U_WB_FORMAT, "FO Format"),
@ -1006,6 +1028,7 @@ static const Value VALUES_WB[22] = {
Value(U_WB_E_MODIFIER, "EM E_Modifier"),
Value(U_WB_GLUE_AFTER_ZWJ, "GAZ Glue_After_Zwj"),
Value(U_WB_ZWJ, "ZWJ ZWJ"),
Value(U_WB_WSEGSPACE, "WSegSpace WSegSpace"),
};
static const Value VALUES_bpt[3] = {
@ -1114,23 +1137,23 @@ static const Property PROPERTIES[103] = {
Property(UCHAR_CHANGES_WHEN_CASEMAPPED, "CWCM Changes_When_Casemapped"),
Property(UCHAR_CHANGES_WHEN_NFKC_CASEFOLDED, "CWKCF Changes_When_NFKC_Casefolded"),
Property(UCHAR_EMOJI, "Emoji Emoji"),
Property(UCHAR_EMOJI_PRESENTATION, "Emoji_Presentation Emoji_Presentation"),
Property(UCHAR_EMOJI_MODIFIER, "Emoji_Modifier Emoji_Modifier"),
Property(UCHAR_EMOJI_MODIFIER_BASE, "Emoji_Modifier_Base Emoji_Modifier_Base"),
Property(UCHAR_EMOJI_COMPONENT, "Emoji_Component Emoji_Component"),
Property(UCHAR_EMOJI_PRESENTATION, "EPres Emoji_Presentation"),
Property(UCHAR_EMOJI_MODIFIER, "EMod Emoji_Modifier"),
Property(UCHAR_EMOJI_MODIFIER_BASE, "EBase Emoji_Modifier_Base"),
Property(UCHAR_EMOJI_COMPONENT, "EComp Emoji_Component"),
Property(UCHAR_REGIONAL_INDICATOR, "RI Regional_Indicator"),
Property(UCHAR_PREPENDED_CONCATENATION_MARK, "PCM Prepended_Concatenation_Mark"),
Property(UCHAR_BIDI_CLASS, "bc Bidi_Class", VALUES_bc, 23),
Property(UCHAR_BLOCK, "blk Block", VALUES_blk, 281),
Property(UCHAR_BLOCK, "blk Block", VALUES_blk, 292),
Property(UCHAR_CANONICAL_COMBINING_CLASS, "ccc Canonical_Combining_Class", VALUES_ccc, 57),
Property(UCHAR_DECOMPOSITION_TYPE, "dt Decomposition_Type", VALUES_dt, 18),
Property(UCHAR_EAST_ASIAN_WIDTH, "ea East_Asian_Width", VALUES_ea, 6),
Property(UCHAR_GENERAL_CATEGORY, "gc General_Category", VALUES_gc, 30),
Property(UCHAR_JOINING_GROUP, "jg Joining_Group", VALUES_jg, 100),
Property(UCHAR_JOINING_GROUP, "jg Joining_Group", VALUES_jg, 102),
Property(UCHAR_JOINING_TYPE, "jt Joining_Type", VALUES_jt, 6),
Property(UCHAR_LINE_BREAK, "lb Line_Break", VALUES_lb, 43),
Property(UCHAR_NUMERIC_TYPE, "nt Numeric_Type", VALUES_nt, 4),
Property(UCHAR_SCRIPT, "sc Script", VALUES_sc, 178),
Property(UCHAR_SCRIPT, "sc Script", VALUES_sc, 185),
Property(UCHAR_HANGUL_SYLLABLE_TYPE, "hst Hangul_Syllable_Type", VALUES_hst, 6),
Property(UCHAR_NFD_QUICK_CHECK, "NFD_QC NFD_Quick_Check", VALUES_NFD_QC, 2),
Property(UCHAR_NFKD_QUICK_CHECK, "NFKD_QC NFKD_Quick_Check", VALUES_NFKD_QC, 2),
@ -1138,9 +1161,9 @@ static const Property PROPERTIES[103] = {
Property(UCHAR_NFKC_QUICK_CHECK, "NFKC_QC NFKC_Quick_Check", VALUES_NFKC_QC, 3),
Property(UCHAR_LEAD_CANONICAL_COMBINING_CLASS, "lccc Lead_Canonical_Combining_Class", VALUES_lccc, 57),
Property(UCHAR_TRAIL_CANONICAL_COMBINING_CLASS, "tccc Trail_Canonical_Combining_Class", VALUES_tccc, 57),
Property(UCHAR_GRAPHEME_CLUSTER_BREAK, "GCB Grapheme_Cluster_Break", VALUES_GCB, 18),
Property(UCHAR_GRAPHEME_CLUSTER_BREAK, "GCB Grapheme_Cluster_Break", VALUES_GCB, 20),
Property(UCHAR_SENTENCE_BREAK, "SB Sentence_Break", VALUES_SB, 15),
Property(UCHAR_WORD_BREAK, "WB Word_Break", VALUES_WB, 22),
Property(UCHAR_WORD_BREAK, "WB Word_Break", VALUES_WB, 23),
Property(UCHAR_BIDI_PAIRED_BRACKET_TYPE, "bpt Bidi_Paired_Bracket_Type", VALUES_bpt, 3),
Property(UCHAR_GENERAL_CATEGORY_MASK, "gcm General_Category_Mask", VALUES_gcm, 38),
Property(UCHAR_NUMERIC_VALUE, "nv Numeric_Value"),

9
tools/unicode/py/preparseucd.py
View file

@ -521,10 +521,11 @@ def ParsePropertyAliases(in_file):
AddBinaryProperty("segstart", "Segment_Starter")
# http://www.unicode.org/reports/tr51/#Emoji_Properties
AddBinaryProperty("Emoji", "Emoji")
AddBinaryProperty("Emoji_Presentation", "Emoji_Presentation")
AddBinaryProperty("Emoji_Modifier", "Emoji_Modifier")
AddBinaryProperty("Emoji_Modifier_Base", "Emoji_Modifier_Base")
AddBinaryProperty("Emoji_Component", "Emoji_Component")
AddBinaryProperty("EPres", "Emoji_Presentation")
AddBinaryProperty("EMod", "Emoji_Modifier")
AddBinaryProperty("EBase", "Emoji_Modifier_Base")
AddBinaryProperty("EComp", "Emoji_Component")
AddBinaryProperty("ExtPict", "Extended_Pictographic")
# C/POSIX character classes that do not have Unicode property [value] aliases.
# See uchar.h.
AddPOSIXBinaryProperty("alnum")