ICU-10821 Unicode 7.0 in trunk, from branches/markus/uni70@35631

X-SVN-Rev: 35632
This commit is contained in:
Markus Scherer 2014-04-14 22:30:09 +00:00
parent b655078cda
commit 567aebade1
58 changed files with 73944 additions and 57716 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/* /*
******************************************************************************* *******************************************************************************
* *
* Copyright (C) 2004-2013, International Business Machines * Copyright (C) 2004-2014, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
* *
******************************************************************************* *******************************************************************************
@ -32,6 +32,7 @@ struct UBiDiProps {
const int32_t *indexes; const int32_t *indexes;
const uint32_t *mirrors; const uint32_t *mirrors;
const uint8_t *jgArray; const uint8_t *jgArray;
const uint8_t *jgArray2;
UTrie2 trie; UTrie2 trie;
uint8_t formatVersion[4]; uint8_t formatVersion[4];
@ -84,18 +85,28 @@ ubidi_addPropertyStarts(const UBiDiProps *bdp, const USetAdder *sa, UErrorCode *
start=bdp->indexes[UBIDI_IX_JG_START]; start=bdp->indexes[UBIDI_IX_JG_START];
limit=bdp->indexes[UBIDI_IX_JG_LIMIT]; limit=bdp->indexes[UBIDI_IX_JG_LIMIT];
jgArray=bdp->jgArray; jgArray=bdp->jgArray;
prev=0; for(;;) {
while(start<limit) { prev=0;
jg=*jgArray++; while(start<limit) {
if(jg!=prev) { jg=*jgArray++;
sa->add(sa->set, start); if(jg!=prev) {
prev=jg; sa->add(sa->set, start);
prev=jg;
}
++start;
}
if(prev!=0) {
/* add the limit code point if the last value was not 0 (it is now start==limit) */
sa->add(sa->set, limit);
}
if(limit==bdp->indexes[UBIDI_IX_JG_LIMIT]) {
/* switch to the second Joining_Group range */
start=bdp->indexes[UBIDI_IX_JG_START2];
limit=bdp->indexes[UBIDI_IX_JG_LIMIT2];
jgArray=bdp->jgArray2;
} else {
break;
} }
++start;
}
if(prev!=0) {
/* add the limit code point if the last value was not 0 (it is now start==limit) */
sa->add(sa->set, limit);
} }
/* add code points with hardcoded properties, plus the ones following them */ /* add code points with hardcoded properties, plus the ones following them */
@ -204,9 +215,13 @@ ubidi_getJoiningGroup(const UBiDiProps *bdp, UChar32 c) {
limit=bdp->indexes[UBIDI_IX_JG_LIMIT]; limit=bdp->indexes[UBIDI_IX_JG_LIMIT];
if(start<=c && c<limit) { if(start<=c && c<limit) {
return (UJoiningGroup)bdp->jgArray[c-start]; return (UJoiningGroup)bdp->jgArray[c-start];
} else {
return U_JG_NO_JOINING_GROUP;
} }
start=bdp->indexes[UBIDI_IX_JG_START2];
limit=bdp->indexes[UBIDI_IX_JG_LIMIT2];
if(start<=c && c<limit) {
return (UJoiningGroup)bdp->jgArray2[c-start];
}
return U_JG_NO_JOINING_GROUP;
} }
U_CFUNC UBidiPairedBracketType U_CFUNC UBidiPairedBracketType

View File

@ -1,7 +1,7 @@
/* /*
******************************************************************************* *******************************************************************************
* *
* Copyright (C) 2004-2013, International Business Machines * Copyright (C) 2004-2014, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
* *
******************************************************************************* *******************************************************************************
@ -90,6 +90,8 @@ enum {
UBIDI_IX_JG_START, UBIDI_IX_JG_START,
UBIDI_IX_JG_LIMIT, UBIDI_IX_JG_LIMIT,
UBIDI_IX_JG_START2, /* new in format version 2.2, ICU 54 */
UBIDI_IX_JG_LIMIT2,
UBIDI_MAX_VALUES_INDEX=15, UBIDI_MAX_VALUES_INDEX=15,
UBIDI_IX_TOP=16 UBIDI_IX_TOP=16

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,7 @@ U_CDECL_BEGIN
* @see u_getUnicodeVersion * @see u_getUnicodeVersion
* @stable ICU 2.0 * @stable ICU 2.0
*/ */
#define U_UNICODE_VERSION "6.3" #define U_UNICODE_VERSION "7.0"
/** /**
* \file * \file
@ -1452,8 +1452,75 @@ enum UBlockCode {
/** @stable ICU 49 */ /** @stable ICU 49 */
UBLOCK_TAKRI = 220, /*[11680]*/ UBLOCK_TAKRI = 220, /*[11680]*/
/* New blocks in Unicode 7.0 */
/** @stable ICU 54 */
UBLOCK_BASSA_VAH = 221, /*[16AD0]*/
/** @stable ICU 54 */
UBLOCK_CAUCASIAN_ALBANIAN = 222, /*[10530]*/
/** @stable ICU 54 */
UBLOCK_COPTIC_EPACT_NUMBERS = 223, /*[102E0]*/
/** @stable ICU 54 */
UBLOCK_COMBINING_DIACRITICAL_MARKS_EXTENDED = 224, /*[1AB0]*/
/** @stable ICU 54 */
UBLOCK_DUPLOYAN = 225, /*[1BC00]*/
/** @stable ICU 54 */
UBLOCK_ELBASAN = 226, /*[10500]*/
/** @stable ICU 54 */
UBLOCK_GEOMETRIC_SHAPES_EXTENDED = 227, /*[1F780]*/
/** @stable ICU 54 */
UBLOCK_GRANTHA = 228, /*[11300]*/
/** @stable ICU 54 */
UBLOCK_KHOJKI = 229, /*[11200]*/
/** @stable ICU 54 */
UBLOCK_KHUDAWADI = 230, /*[112B0]*/
/** @stable ICU 54 */
UBLOCK_LATIN_EXTENDED_E = 231, /*[AB30]*/
/** @stable ICU 54 */
UBLOCK_LINEAR_A = 232, /*[10600]*/
/** @stable ICU 54 */
UBLOCK_MAHAJANI = 233, /*[11150]*/
/** @stable ICU 54 */
UBLOCK_MANICHAEAN = 234, /*[10AC0]*/
/** @stable ICU 54 */
UBLOCK_MENDE_KIKAKUI = 235, /*[1E800]*/
/** @stable ICU 54 */
UBLOCK_MODI = 236, /*[11600]*/
/** @stable ICU 54 */
UBLOCK_MRO = 237, /*[16A40]*/
/** @stable ICU 54 */
UBLOCK_MYANMAR_EXTENDED_B = 238, /*[A9E0]*/
/** @stable ICU 54 */
UBLOCK_NABATAEAN = 239, /*[10880]*/
/** @stable ICU 54 */
UBLOCK_OLD_NORTH_ARABIAN = 240, /*[10A80]*/
/** @stable ICU 54 */
UBLOCK_OLD_PERMIC = 241, /*[10350]*/
/** @stable ICU 54 */
UBLOCK_ORNAMENTAL_DINGBATS = 242, /*[1F650]*/
/** @stable ICU 54 */
UBLOCK_PAHAWH_HMONG = 243, /*[16B00]*/
/** @stable ICU 54 */
UBLOCK_PALMYRENE = 244, /*[10860]*/
/** @stable ICU 54 */
UBLOCK_PAU_CIN_HAU = 245, /*[11AC0]*/
/** @stable ICU 54 */
UBLOCK_PSALTER_PAHLAVI = 246, /*[10B80]*/
/** @stable ICU 54 */
UBLOCK_SHORTHAND_FORMAT_CONTROLS = 247, /*[1BCA0]*/
/** @stable ICU 54 */
UBLOCK_SIDDHAM = 248, /*[11580]*/
/** @stable ICU 54 */
UBLOCK_SINHALA_ARCHAIC_NUMBERS = 249, /*[111E0]*/
/** @stable ICU 54 */
UBLOCK_SUPPLEMENTAL_ARROWS_C = 250, /*[1F800]*/
/** @stable ICU 54 */
UBLOCK_TIRHUTA = 251, /*[11480]*/
/** @stable ICU 54 */
UBLOCK_WARANG_CITI = 252, /*[118A0]*/
/** @stable ICU 2.0 */ /** @stable ICU 2.0 */
UBLOCK_COUNT = 221, UBLOCK_COUNT = 253,
/** @stable ICU 2.0 */ /** @stable ICU 2.0 */
UBLOCK_INVALID_CODE=-1 UBLOCK_INVALID_CODE=-1
@ -1662,6 +1729,34 @@ typedef enum UJoiningGroup {
U_JG_FARSI_YEH, /**< @stable ICU 4.4 */ U_JG_FARSI_YEH, /**< @stable ICU 4.4 */
U_JG_NYA, /**< @stable ICU 4.4 */ U_JG_NYA, /**< @stable ICU 4.4 */
U_JG_ROHINGYA_YEH, /**< @stable ICU 49 */ U_JG_ROHINGYA_YEH, /**< @stable ICU 49 */
U_JG_MANICHAEAN_ALEPH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_AYIN, /**< @stable ICU 54 */
U_JG_MANICHAEAN_BETH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_DALETH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_DHAMEDH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_FIVE, /**< @stable ICU 54 */
U_JG_MANICHAEAN_GIMEL, /**< @stable ICU 54 */
U_JG_MANICHAEAN_HETH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_HUNDRED, /**< @stable ICU 54 */
U_JG_MANICHAEAN_KAPH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_LAMEDH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_MEM, /**< @stable ICU 54 */
U_JG_MANICHAEAN_NUN, /**< @stable ICU 54 */
U_JG_MANICHAEAN_ONE, /**< @stable ICU 54 */
U_JG_MANICHAEAN_PE, /**< @stable ICU 54 */
U_JG_MANICHAEAN_QOPH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_RESH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_SADHE, /**< @stable ICU 54 */
U_JG_MANICHAEAN_SAMEKH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_TAW, /**< @stable ICU 54 */
U_JG_MANICHAEAN_TEN, /**< @stable ICU 54 */
U_JG_MANICHAEAN_TETH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_THAMEDH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_TWENTY, /**< @stable ICU 54 */
U_JG_MANICHAEAN_WAW, /**< @stable ICU 54 */
U_JG_MANICHAEAN_YODH, /**< @stable ICU 54 */
U_JG_MANICHAEAN_ZAYIN, /**< @stable ICU 54 */
U_JG_STRAIGHT_WAW, /**< @stable ICU 54 */
U_JG_COUNT U_JG_COUNT
} UJoiningGroup; } UJoiningGroup;

View File

@ -186,7 +186,7 @@ typedef enum UScriptCode {
/** @stable ICU 3.4 */ /** @stable ICU 3.4 */
USCRIPT_OLD_PERSIAN = 61, /* Xpeo */ USCRIPT_OLD_PERSIAN = 61, /* Xpeo */
/* New script codes from ISO 15924 */ /* New script codes from Unicode and ISO 15924 */
/** @stable ICU 3.6 */ /** @stable ICU 3.6 */
USCRIPT_BALINESE = 62, /* Bali */ USCRIPT_BALINESE = 62, /* Bali */
/** @stable ICU 3.6 */ /** @stable ICU 3.6 */
@ -278,7 +278,6 @@ typedef enum UScriptCode {
/** @stable ICU 3.6 */ /** @stable ICU 3.6 */
USCRIPT_UNKNOWN = 103,/* Zzzz */ /* Unknown="Code for uncoded script", for unassigned code points */ USCRIPT_UNKNOWN = 103,/* Zzzz */ /* Unknown="Code for uncoded script", for unassigned code points */
/* New script codes from ISO 15924 */
/** @stable ICU 3.8 */ /** @stable ICU 3.8 */
USCRIPT_CARIAN = 104,/* Cari */ USCRIPT_CARIAN = 104,/* Cari */
/** @stable ICU 3.8 */ /** @stable ICU 3.8 */
@ -304,7 +303,6 @@ typedef enum UScriptCode {
/** @stable ICU 3.8 */ /** @stable ICU 3.8 */
USCRIPT_MEITEI_MAYEK = 115,/* Mtei */ USCRIPT_MEITEI_MAYEK = 115,/* Mtei */
/* New script codes from ISO 15924 */
/** @stable ICU 4.0 */ /** @stable ICU 4.0 */
USCRIPT_IMPERIAL_ARAMAIC = 116,/* Armi */ USCRIPT_IMPERIAL_ARAMAIC = 116,/* Armi */
/** @stable ICU 4.0 */ /** @stable ICU 4.0 */
@ -334,7 +332,6 @@ typedef enum UScriptCode {
/** @stable ICU 4.0 */ /** @stable ICU 4.0 */
USCRIPT_SYMBOLS = 129,/* Zsym */ USCRIPT_SYMBOLS = 129,/* Zsym */
/* New script codes from ISO 15924 */
/** @stable ICU 4.4 */ /** @stable ICU 4.4 */
USCRIPT_BAMUM = 130,/* Bamu */ USCRIPT_BAMUM = 130,/* Bamu */
/** @stable ICU 4.4 */ /** @stable ICU 4.4 */
@ -344,7 +341,6 @@ typedef enum UScriptCode {
/** @stable ICU 4.4 */ /** @stable ICU 4.4 */
USCRIPT_OLD_SOUTH_ARABIAN = 133,/* Sarb */ USCRIPT_OLD_SOUTH_ARABIAN = 133,/* Sarb */
/* New script codes from ISO 15924 */
/** @stable ICU 4.6 */ /** @stable ICU 4.6 */
USCRIPT_BASSA_VAH = 134,/* Bass */ USCRIPT_BASSA_VAH = 134,/* Bass */
/** @stable ICU 4.6 */ /** @stable ICU 4.6 */
@ -357,7 +353,7 @@ typedef enum UScriptCode {
USCRIPT_KPELLE = 138,/* Kpel */ USCRIPT_KPELLE = 138,/* Kpel */
/** @stable ICU 4.6 */ /** @stable ICU 4.6 */
USCRIPT_LOMA = 139,/* Loma */ USCRIPT_LOMA = 139,/* Loma */
/** @stable ICU 4.6 */ /** Mende Kikakui @stable ICU 4.6 */
USCRIPT_MENDE = 140,/* Mend */ USCRIPT_MENDE = 140,/* Mend */
/** @stable ICU 4.6 */ /** @stable ICU 4.6 */
USCRIPT_MEROITIC_CURSIVE = 141,/* Merc */ USCRIPT_MEROITIC_CURSIVE = 141,/* Merc */
@ -367,8 +363,10 @@ typedef enum UScriptCode {
USCRIPT_NABATAEAN = 143,/* Nbat */ USCRIPT_NABATAEAN = 143,/* Nbat */
/** @stable ICU 4.6 */ /** @stable ICU 4.6 */
USCRIPT_PALMYRENE = 144,/* Palm */ USCRIPT_PALMYRENE = 144,/* Palm */
/** @stable ICU 54 */
USCRIPT_KHUDAWADI = 145,/* Sind */
/** @stable ICU 4.6 */ /** @stable ICU 4.6 */
USCRIPT_SINDHI = 145,/* Sind */ USCRIPT_SINDHI = USCRIPT_KHUDAWADI,
/** @stable ICU 4.6 */ /** @stable ICU 4.6 */
USCRIPT_WARANG_CITI = 146,/* Wara */ USCRIPT_WARANG_CITI = 146,/* Wara */
@ -403,10 +401,23 @@ typedef enum UScriptCode {
/** @stable ICU 52 */ /** @stable ICU 52 */
USCRIPT_MAHAJANI = 160,/* Mahj */ USCRIPT_MAHAJANI = 160,/* Mahj */
/** @stable ICU 54 */
USCRIPT_AHOM = 161,/* Ahom */
/** @stable ICU 54 */
USCRIPT_HATRAN = 162,/* Hatr */
/** @stable ICU 54 */
USCRIPT_MODI = 163,/* Modi */
/** @stable ICU 54 */
USCRIPT_MULTANI = 164,/* Mult */
/** @stable ICU 54 */
USCRIPT_PAU_CIN_HAU = 165,/* Pauc */
/** @stable ICU 54 */
USCRIPT_SIDDHAM = 166,/* Sidd */
/* Private use codes from Qaaa - Qabx are not supported */ /* Private use codes from Qaaa - Qabx are not supported */
/** @stable ICU 2.2 */ /** @stable ICU 2.2 */
USCRIPT_CODE_LIMIT = 161 USCRIPT_CODE_LIMIT = 167
} UScriptCode; } UScriptCode;
/** /**

View File

@ -1,6 +1,6 @@
/* /*
******************************************************************************* *******************************************************************************
* Copyright (C) 2013, International Business Machines * Copyright (C) 2013-2014, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
******************************************************************************* *******************************************************************************
* file name: uscript_props.cpp * file name: uscript_props.cpp
@ -118,7 +118,7 @@ const int32_t SCRIPT_PROPS[] = {
0, 0,
0x5B57 | RECOMMENDED | LB_LETTERS, // Hans 0x5B57 | RECOMMENDED | LB_LETTERS, // Hans
0x5B57 | RECOMMENDED | LB_LETTERS, // Hant 0x5B57 | RECOMMENDED | LB_LETTERS, // Hant
0, 0x16B1C | EXCLUSION, // Hmng
0, 0,
0, 0,
0xA984 | LIMITED_USE | LB_LETTERS, // Java 0xA984 | LIMITED_USE | LB_LETTERS, // Java
@ -126,13 +126,13 @@ const int32_t SCRIPT_PROPS[] = {
0, 0,
0, 0,
0x1C00 | LIMITED_USE, // Lepc 0x1C00 | LIMITED_USE, // Lepc
0, 0x10647 | EXCLUSION, // Lina
0x0840 | LIMITED_USE | RTL, // Mand 0x0840 | LIMITED_USE | RTL, // Mand
0, 0,
0x10980 | EXCLUSION | RTL, // Mero 0x10980 | EXCLUSION | RTL, // Mero
0x07CA | LIMITED_USE | RTL, // Nkoo 0x07CA | LIMITED_USE | RTL, // Nkoo
0x10C00 | EXCLUSION | RTL, // Orkh 0x10C00 | EXCLUSION | RTL, // Orkh
0, 0x1036B | EXCLUSION, // Perm
0xA840 | EXCLUSION, // Phag 0xA840 | EXCLUSION, // Phag
0x10900 | EXCLUSION | RTL, // Phnx 0x10900 | EXCLUSION | RTL, // Phnx
0x16F00 | ASPIRATIONAL, // Plrd 0x16F00 | ASPIRATIONAL, // Plrd
@ -164,9 +164,9 @@ const int32_t SCRIPT_PROPS[] = {
0x11103 | LIMITED_USE, // Cakm 0x11103 | LIMITED_USE, // Cakm
0xAC00 | RECOMMENDED, // Kore 0xAC00 | RECOMMENDED, // Kore
0x11083 | EXCLUSION, // Kthi 0x11083 | EXCLUSION, // Kthi
0, 0x10AD8 | EXCLUSION | RTL, // Mani
0x10B60 | EXCLUSION | RTL, // Phli 0x10B60 | EXCLUSION | RTL, // Phli
0, 0x10B8F | EXCLUSION | RTL, // Phlp
0, 0,
0x10B40 | EXCLUSION | RTL, // Prti 0x10B40 | EXCLUSION | RTL, // Prti
0x0800 | EXCLUSION | RTL, // Samr 0x0800 | EXCLUSION | RTL, // Samr
@ -177,22 +177,22 @@ const int32_t SCRIPT_PROPS[] = {
0xA4D0 | LIMITED_USE, // Lisu 0xA4D0 | LIMITED_USE, // Lisu
0, 0,
0x10A60 | EXCLUSION | RTL, // Sarb 0x10A60 | EXCLUSION | RTL, // Sarb
0x16AE6 | EXCLUSION, // Bass
0x1BC20 | EXCLUSION, // Dupl
0x10500 | EXCLUSION, // Elba
0x11315 | EXCLUSION, // Gran
0, 0,
0, 0,
0, 0x1E802 | EXCLUSION | RTL, // Mend
0,
0,
0,
0,
0x109A0 | EXCLUSION | RTL, // Merc 0x109A0 | EXCLUSION | RTL, // Merc
0x10A95 | EXCLUSION | RTL, // Narb
0x10896 | EXCLUSION | RTL, // Nbat
0x10873 | EXCLUSION | RTL, // Palm
0x112BE | EXCLUSION, // Sind
0x118B4 | EXCLUSION | CASED, // Wara
0, 0,
0, 0,
0, 0x16A4F | EXCLUSION, // Mroo
0,
0,
0,
0,
0,
0, 0,
0x11183 | EXCLUSION, // Shrd 0x11183 | EXCLUSION, // Shrd
0x110D0 | EXCLUSION, // Sora 0x110D0 | EXCLUSION, // Sora
@ -200,10 +200,16 @@ const int32_t SCRIPT_PROPS[] = {
0, 0,
0, 0,
0, 0,
0x11208 | EXCLUSION, // Khoj
0x11484 | EXCLUSION, // Tirh
0x10537 | EXCLUSION, // Aghb
0x11152 | EXCLUSION, // Mahj
0, 0,
0, 0,
0x1160E | EXCLUSION, // Modi
0, 0,
0, 0x11AC0 | EXCLUSION, // Pauc
0x1158E | EXCLUSION, // Sidd
// End copy-paste from parsescriptmetadata.py // End copy-paste from parsescriptmetadata.py
}; };

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -13,7 +13,7 @@
U_ICUDATA_NAME=icudt54 U_ICUDATA_NAME=icudt54
############################################################################## ##############################################################################
U_ICUDATA_ENDIAN_SUFFIX=l U_ICUDATA_ENDIAN_SUFFIX=l
UNICODE_VERSION=6.3 UNICODE_VERSION=7.0
ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll ICU_LIB_TARGET=$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll
# ICUMAKE # ICUMAKE

View File

@ -1,8 +1,8 @@
# CaseFolding-6.3.0.txt # CaseFolding-7.0.0.txt
# Date: 2012-12-20, 22:14:35 GMT [MD] # Date: 2014-03-18, 07:28:41 GMT [MD, KW]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2014 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html # For terms of use, see http://www.unicode.org/terms_of_use.html
# For documentation, see http://www.unicode.org/reports/tr44/ # For documentation, see http://www.unicode.org/reports/tr44/
# #
@ -25,7 +25,7 @@
# #
# For information on case folding, including how to have case folding # For information on case folding, including how to have case folding
# preserve normalization formats, see Section 3.13 Default Case Algorithms in # preserve normalization formats, see Section 3.13 Default Case Algorithms in
# The Unicode Standard, Version 5.0. # The Unicode Standard, Version 7.0.
# #
# ================================================================================ # ================================================================================
# Format # Format
@ -58,8 +58,6 @@
# All code points not explicitly listed for Case_Folding # All code points not explicitly listed for Case_Folding
# have the value C for the status field, and the code point itself for the mapping field. # have the value C for the status field, and the code point itself for the mapping field.
# @missing: 0000..10FFFF; C; <code point>
# ================================================================= # =================================================================
0041; C; 0061; # LATIN CAPITAL LETTER A 0041; C; 0061; # LATIN CAPITAL LETTER A
0042; C; 0062; # LATIN CAPITAL LETTER B 0042; C; 0062; # LATIN CAPITAL LETTER B
@ -298,6 +296,7 @@
0370; C; 0371; # GREEK CAPITAL LETTER HETA 0370; C; 0371; # GREEK CAPITAL LETTER HETA
0372; C; 0373; # GREEK CAPITAL LETTER ARCHAIC SAMPI 0372; C; 0373; # GREEK CAPITAL LETTER ARCHAIC SAMPI
0376; C; 0377; # GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA 0376; C; 0377; # GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
037F; C; 03F3; # GREEK CAPITAL LETTER YOT
0386; C; 03AC; # GREEK CAPITAL LETTER ALPHA WITH TONOS 0386; C; 03AC; # GREEK CAPITAL LETTER ALPHA WITH TONOS
0388; C; 03AD; # GREEK CAPITAL LETTER EPSILON WITH TONOS 0388; C; 03AD; # GREEK CAPITAL LETTER EPSILON WITH TONOS
0389; C; 03AE; # GREEK CAPITAL LETTER ETA WITH TONOS 0389; C; 03AE; # GREEK CAPITAL LETTER ETA WITH TONOS
@ -505,6 +504,10 @@
0522; C; 0523; # CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK 0522; C; 0523; # CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
0524; C; 0525; # CYRILLIC CAPITAL LETTER PE WITH DESCENDER 0524; C; 0525; # CYRILLIC CAPITAL LETTER PE WITH DESCENDER
0526; C; 0527; # CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER 0526; C; 0527; # CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER
0528; C; 0529; # CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
052A; C; 052B; # CYRILLIC CAPITAL LETTER DZZHE
052C; C; 052D; # CYRILLIC CAPITAL LETTER DCHE
052E; C; 052F; # CYRILLIC CAPITAL LETTER EL WITH DESCENDER
0531; C; 0561; # ARMENIAN CAPITAL LETTER AYB 0531; C; 0561; # ARMENIAN CAPITAL LETTER AYB
0532; C; 0562; # ARMENIAN CAPITAL LETTER BEN 0532; C; 0562; # ARMENIAN CAPITAL LETTER BEN
0533; C; 0563; # ARMENIAN CAPITAL LETTER GIM 0533; C; 0563; # ARMENIAN CAPITAL LETTER GIM
@ -1088,6 +1091,8 @@ A690; C; A691; # CYRILLIC CAPITAL LETTER TSSE
A692; C; A693; # CYRILLIC CAPITAL LETTER TCHE A692; C; A693; # CYRILLIC CAPITAL LETTER TCHE
A694; C; A695; # CYRILLIC CAPITAL LETTER HWE A694; C; A695; # CYRILLIC CAPITAL LETTER HWE
A696; C; A697; # CYRILLIC CAPITAL LETTER SHWE A696; C; A697; # CYRILLIC CAPITAL LETTER SHWE
A698; C; A699; # CYRILLIC CAPITAL LETTER DOUBLE O
A69A; C; A69B; # CYRILLIC CAPITAL LETTER CROSSED O
A722; C; A723; # LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF A722; C; A723; # LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
A724; C; A725; # LATIN CAPITAL LETTER EGYPTOLOGICAL AIN A724; C; A725; # LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
A726; C; A727; # LATIN CAPITAL LETTER HENG A726; C; A727; # LATIN CAPITAL LETTER HENG
@ -1138,12 +1143,22 @@ A78B; C; A78C; # LATIN CAPITAL LETTER SALTILLO
A78D; C; 0265; # LATIN CAPITAL LETTER TURNED H A78D; C; 0265; # LATIN CAPITAL LETTER TURNED H
A790; C; A791; # LATIN CAPITAL LETTER N WITH DESCENDER A790; C; A791; # LATIN CAPITAL LETTER N WITH DESCENDER
A792; C; A793; # LATIN CAPITAL LETTER C WITH BAR A792; C; A793; # LATIN CAPITAL LETTER C WITH BAR
A796; C; A797; # LATIN CAPITAL LETTER B WITH FLOURISH
A798; C; A799; # LATIN CAPITAL LETTER F WITH STROKE
A79A; C; A79B; # LATIN CAPITAL LETTER VOLAPUK AE
A79C; C; A79D; # LATIN CAPITAL LETTER VOLAPUK OE
A79E; C; A79F; # LATIN CAPITAL LETTER VOLAPUK UE
A7A0; C; A7A1; # LATIN CAPITAL LETTER G WITH OBLIQUE STROKE A7A0; C; A7A1; # LATIN CAPITAL LETTER G WITH OBLIQUE STROKE
A7A2; C; A7A3; # LATIN CAPITAL LETTER K WITH OBLIQUE STROKE A7A2; C; A7A3; # LATIN CAPITAL LETTER K WITH OBLIQUE STROKE
A7A4; C; A7A5; # LATIN CAPITAL LETTER N WITH OBLIQUE STROKE A7A4; C; A7A5; # LATIN CAPITAL LETTER N WITH OBLIQUE STROKE
A7A6; C; A7A7; # LATIN CAPITAL LETTER R WITH OBLIQUE STROKE A7A6; C; A7A7; # LATIN CAPITAL LETTER R WITH OBLIQUE STROKE
A7A8; C; A7A9; # LATIN CAPITAL LETTER S WITH OBLIQUE STROKE A7A8; C; A7A9; # LATIN CAPITAL LETTER S WITH OBLIQUE STROKE
A7AA; C; 0266; # LATIN CAPITAL LETTER H WITH HOOK A7AA; C; 0266; # LATIN CAPITAL LETTER H WITH HOOK
A7AB; C; 025C; # LATIN CAPITAL LETTER REVERSED OPEN E
A7AC; C; 0261; # LATIN CAPITAL LETTER SCRIPT G
A7AD; C; 026C; # LATIN CAPITAL LETTER L WITH BELT
A7B0; C; 029E; # LATIN CAPITAL LETTER TURNED K
A7B1; C; 0287; # LATIN CAPITAL LETTER TURNED T
FB00; F; 0066 0066; # LATIN SMALL LIGATURE FF FB00; F; 0066 0066; # LATIN SMALL LIGATURE FF
FB01; F; 0066 0069; # LATIN SMALL LIGATURE FI FB01; F; 0066 0069; # LATIN SMALL LIGATURE FI
FB02; F; 0066 006C; # LATIN SMALL LIGATURE FL FB02; F; 0066 006C; # LATIN SMALL LIGATURE FL
@ -1222,5 +1237,37 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
10425; C; 1044D; # DESERET CAPITAL LETTER ENG 10425; C; 1044D; # DESERET CAPITAL LETTER ENG
10426; C; 1044E; # DESERET CAPITAL LETTER OI 10426; C; 1044E; # DESERET CAPITAL LETTER OI
10427; C; 1044F; # DESERET CAPITAL LETTER EW 10427; C; 1044F; # DESERET CAPITAL LETTER EW
118A0; C; 118C0; # WARANG CITI CAPITAL LETTER NGAA
118A1; C; 118C1; # WARANG CITI CAPITAL LETTER A
118A2; C; 118C2; # WARANG CITI CAPITAL LETTER WI
118A3; C; 118C3; # WARANG CITI CAPITAL LETTER YU
118A4; C; 118C4; # WARANG CITI CAPITAL LETTER YA
118A5; C; 118C5; # WARANG CITI CAPITAL LETTER YO
118A6; C; 118C6; # WARANG CITI CAPITAL LETTER II
118A7; C; 118C7; # WARANG CITI CAPITAL LETTER UU
118A8; C; 118C8; # WARANG CITI CAPITAL LETTER E
118A9; C; 118C9; # WARANG CITI CAPITAL LETTER O
118AA; C; 118CA; # WARANG CITI CAPITAL LETTER ANG
118AB; C; 118CB; # WARANG CITI CAPITAL LETTER GA
118AC; C; 118CC; # WARANG CITI CAPITAL LETTER KO
118AD; C; 118CD; # WARANG CITI CAPITAL LETTER ENY
118AE; C; 118CE; # WARANG CITI CAPITAL LETTER YUJ
118AF; C; 118CF; # WARANG CITI CAPITAL LETTER UC
118B0; C; 118D0; # WARANG CITI CAPITAL LETTER ENN
118B1; C; 118D1; # WARANG CITI CAPITAL LETTER ODD
118B2; C; 118D2; # WARANG CITI CAPITAL LETTER TTE
118B3; C; 118D3; # WARANG CITI CAPITAL LETTER NUNG
118B4; C; 118D4; # WARANG CITI CAPITAL LETTER DA
118B5; C; 118D5; # WARANG CITI CAPITAL LETTER AT
118B6; C; 118D6; # WARANG CITI CAPITAL LETTER AM
118B7; C; 118D7; # WARANG CITI CAPITAL LETTER BU
118B8; C; 118D8; # WARANG CITI CAPITAL LETTER PU
118B9; C; 118D9; # WARANG CITI CAPITAL LETTER HIYO
118BA; C; 118DA; # WARANG CITI CAPITAL LETTER HOLO
118BB; C; 118DB; # WARANG CITI CAPITAL LETTER HORR
118BC; C; 118DC; # WARANG CITI CAPITAL LETTER HAR
118BD; C; 118DD; # WARANG CITI CAPITAL LETTER SSUU
118BE; C; 118DE; # WARANG CITI CAPITAL LETTER SII
118BF; C; 118DF; # WARANG CITI CAPITAL LETTER VIYO
# #
# EOF # EOF

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
# DerivedNormalizationProps-6.3.0.txt # DerivedNormalizationProps-7.0.0.txt
# Date: 2013-03-02, 16:07:38 GMT [MD] # Date: 2013-12-03, 15:11:47 GMT [MD]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2013 Unicode, Inc.
@ -980,11 +980,15 @@ FB46..FB4E ; NFD_QC; N
1109C ; NFD_QC; N 1109C ; NFD_QC; N
110AB ; NFD_QC; N 110AB ; NFD_QC; N
1112E..1112F ; NFD_QC; N 1112E..1112F ; NFD_QC; N
1134B..1134C ; NFD_QC; N
114BB..114BC ; NFD_QC; N
114BE ; NFD_QC; N
115BA..115BB ; NFD_QC; N
1D15E..1D164 ; NFD_QC; N 1D15E..1D164 ; NFD_QC; N
1D1BB..1D1C0 ; NFD_QC; N 1D1BB..1D1C0 ; NFD_QC; N
2F800..2FA1D ; NFD_QC; N 2F800..2FA1D ; NFD_QC; N
# Total code points: 13225 # Total code points: 13232
# ================================================ # ================================================
@ -1116,8 +1120,14 @@ FB46..FB4E ; NFC_QC; N
3099..309A ; NFC_QC; M 3099..309A ; NFC_QC; M
110BA ; NFC_QC; M 110BA ; NFC_QC; M
11127 ; NFC_QC; M 11127 ; NFC_QC; M
1133E ; NFC_QC; M
11357 ; NFC_QC; M
114B0 ; NFC_QC; M
114BA ; NFC_QC; M
114BD ; NFC_QC; M
115AF ; NFC_QC; M
# Total code points: 104 # Total code points: 110
# ================================================ # ================================================
@ -1454,8 +1464,10 @@ FB46..FB4E ; NFC_QC; N
32B1..32BF ; NFKD_QC; N 32B1..32BF ; NFKD_QC; N
32C0..32FE ; NFKD_QC; N 32C0..32FE ; NFKD_QC; N
3300..33FF ; NFKD_QC; N 3300..33FF ; NFKD_QC; N
A69C..A69D ; NFKD_QC; N
A770 ; NFKD_QC; N A770 ; NFKD_QC; N
A7F8..A7F9 ; NFKD_QC; N A7F8..A7F9 ; NFKD_QC; N
AB5C..AB5F ; NFKD_QC; N
AC00..D7A3 ; NFKD_QC; N AC00..D7A3 ; NFKD_QC; N
F900..FA0D ; NFKD_QC; N F900..FA0D ; NFKD_QC; N
FA10 ; NFKD_QC; N FA10 ; NFKD_QC; N
@ -1581,6 +1593,10 @@ FFED..FFEE ; NFKD_QC; N
1109C ; NFKD_QC; N 1109C ; NFKD_QC; N
110AB ; NFKD_QC; N 110AB ; NFKD_QC; N
1112E..1112F ; NFKD_QC; N 1112E..1112F ; NFKD_QC; N
1134B..1134C ; NFKD_QC; N
114BB..114BC ; NFKD_QC; N
114BE ; NFKD_QC; N
115BA..115BB ; NFKD_QC; N
1D15E..1D164 ; NFKD_QC; N 1D15E..1D164 ; NFKD_QC; N
1D1BB..1D1C0 ; NFKD_QC; N 1D1BB..1D1C0 ; NFKD_QC; N
1D400..1D454 ; NFKD_QC; N 1D400..1D454 ; NFKD_QC; N
@ -1668,7 +1684,7 @@ FFED..FFEE ; NFKD_QC; N
1F250..1F251 ; NFKD_QC; N 1F250..1F251 ; NFKD_QC; N
2F800..2FA1D ; NFKD_QC; N 2F800..2FA1D ; NFKD_QC; N
# Total code points: 16880 # Total code points: 16893
# ================================================ # ================================================
@ -1860,8 +1876,10 @@ FFED..FFEE ; NFKD_QC; N
32B1..32BF ; NFKC_QC; N 32B1..32BF ; NFKC_QC; N
32C0..32FE ; NFKC_QC; N 32C0..32FE ; NFKC_QC; N
3300..33FF ; NFKC_QC; N 3300..33FF ; NFKC_QC; N
A69C..A69D ; NFKC_QC; N
A770 ; NFKC_QC; N A770 ; NFKC_QC; N
A7F8..A7F9 ; NFKC_QC; N A7F8..A7F9 ; NFKC_QC; N
AB5C..AB5F ; NFKC_QC; N
F900..FA0D ; NFKC_QC; N F900..FA0D ; NFKC_QC; N
FA10 ; NFKC_QC; N FA10 ; NFKC_QC; N
FA12 ; NFKC_QC; N FA12 ; NFKC_QC; N
@ -2069,7 +2087,7 @@ FFED..FFEE ; NFKC_QC; N
1F250..1F251 ; NFKC_QC; N 1F250..1F251 ; NFKC_QC; N
2F800..2FA1D ; NFKC_QC; N 2F800..2FA1D ; NFKC_QC; N
# Total code points: 4787 # Total code points: 4793
# ================================================ # ================================================
@ -2111,8 +2129,14 @@ FFED..FFEE ; NFKC_QC; N
3099..309A ; NFKC_QC; M 3099..309A ; NFKC_QC; M
110BA ; NFKC_QC; M 110BA ; NFKC_QC; M
11127 ; NFKC_QC; M 11127 ; NFKC_QC; M
1133E ; NFKC_QC; M
11357 ; NFKC_QC; M
114B0 ; NFKC_QC; M
114BA ; NFKC_QC; M
114BD ; NFKC_QC; M
115AF ; NFKC_QC; M
# Total code points: 104 # Total code points: 110
# ================================================ # ================================================
@ -2338,10 +2362,14 @@ FB46..FB4E ; Expands_On_NFD
1109C ; Expands_On_NFD 1109C ; Expands_On_NFD
110AB ; Expands_On_NFD 110AB ; Expands_On_NFD
1112E..1112F ; Expands_On_NFD 1112E..1112F ; Expands_On_NFD
1134B..1134C ; Expands_On_NFD
114BB..114BC ; Expands_On_NFD
114BE ; Expands_On_NFD
115BA..115BB ; Expands_On_NFD
1D15E..1D164 ; Expands_On_NFD 1D15E..1D164 ; Expands_On_NFD
1D1BB..1D1C0 ; Expands_On_NFD 1D1BB..1D1C0 ; Expands_On_NFD
# Total code points: 12208 # Total code points: 12215
# ================================================ # ================================================
@ -2687,6 +2715,10 @@ FFE3 ; Expands_On_NFKD
1109C ; Expands_On_NFKD 1109C ; Expands_On_NFKD
110AB ; Expands_On_NFKD 110AB ; Expands_On_NFKD
1112E..1112F ; Expands_On_NFKD 1112E..1112F ; Expands_On_NFKD
1134B..1134C ; Expands_On_NFKD
114BB..114BC ; Expands_On_NFKD
114BE ; Expands_On_NFKD
115BA..115BB ; Expands_On_NFKD
1D15E..1D164 ; Expands_On_NFKD 1D15E..1D164 ; Expands_On_NFKD
1D1BB..1D1C0 ; Expands_On_NFKD 1D1BB..1D1C0 ; Expands_On_NFKD
1F100..1F10A ; Expands_On_NFKD 1F100..1F10A ; Expands_On_NFKD
@ -2699,7 +2731,7 @@ FFE3 ; Expands_On_NFKD
1F213 ; Expands_On_NFKD 1F213 ; Expands_On_NFKD
1F240..1F248 ; Expands_On_NFKD 1F240..1F248 ; Expands_On_NFKD
# Total code points: 13380 # Total code points: 13387
# ================================================ # ================================================
@ -3126,6 +3158,7 @@ FFE3 ; Expands_On_NFKC
0376 ; NFKC_CF; 0377 0376 ; NFKC_CF; 0377
037A ; NFKC_CF; 0020 03B9 037A ; NFKC_CF; 0020 03B9
037E ; NFKC_CF; 003B 037E ; NFKC_CF; 003B
037F ; NFKC_CF; 03F3
0384 ; NFKC_CF; 0020 0301 0384 ; NFKC_CF; 0020 0301
0385 ; NFKC_CF; 0020 0308 0301 0385 ; NFKC_CF; 0020 0308 0301
0386 ; NFKC_CF; 03AC 0386 ; NFKC_CF; 03AC
@ -3338,6 +3371,10 @@ FFE3 ; Expands_On_NFKC
0522 ; NFKC_CF; 0523 0522 ; NFKC_CF; 0523
0524 ; NFKC_CF; 0525 0524 ; NFKC_CF; 0525
0526 ; NFKC_CF; 0527 0526 ; NFKC_CF; 0527
0528 ; NFKC_CF; 0529
052A ; NFKC_CF; 052B
052C ; NFKC_CF; 052D
052E ; NFKC_CF; 052F
0531 ; NFKC_CF; 0561 0531 ; NFKC_CF; 0561
0532 ; NFKC_CF; 0562 0532 ; NFKC_CF; 0562
0533 ; NFKC_CF; 0563 0533 ; NFKC_CF; 0563
@ -5151,6 +5188,10 @@ A690 ; NFKC_CF; A691
A692 ; NFKC_CF; A693 A692 ; NFKC_CF; A693
A694 ; NFKC_CF; A695 A694 ; NFKC_CF; A695
A696 ; NFKC_CF; A697 A696 ; NFKC_CF; A697
A698 ; NFKC_CF; A699
A69A ; NFKC_CF; A69B
A69C ; NFKC_CF; 044A
A69D ; NFKC_CF; 044C
A722 ; NFKC_CF; A723 A722 ; NFKC_CF; A723
A724 ; NFKC_CF; A725 A724 ; NFKC_CF; A725
A726 ; NFKC_CF; A727 A726 ; NFKC_CF; A727
@ -5202,14 +5243,28 @@ A78B ; NFKC_CF; A78C
A78D ; NFKC_CF; 0265 A78D ; NFKC_CF; 0265
A790 ; NFKC_CF; A791 A790 ; NFKC_CF; A791
A792 ; NFKC_CF; A793 A792 ; NFKC_CF; A793
A796 ; NFKC_CF; A797
A798 ; NFKC_CF; A799
A79A ; NFKC_CF; A79B
A79C ; NFKC_CF; A79D
A79E ; NFKC_CF; A79F
A7A0 ; NFKC_CF; A7A1 A7A0 ; NFKC_CF; A7A1
A7A2 ; NFKC_CF; A7A3 A7A2 ; NFKC_CF; A7A3
A7A4 ; NFKC_CF; A7A5 A7A4 ; NFKC_CF; A7A5
A7A6 ; NFKC_CF; A7A7 A7A6 ; NFKC_CF; A7A7
A7A8 ; NFKC_CF; A7A9 A7A8 ; NFKC_CF; A7A9
A7AA ; NFKC_CF; 0266 A7AA ; NFKC_CF; 0266
A7AB ; NFKC_CF; 025C
A7AC ; NFKC_CF; 0261
A7AD ; NFKC_CF; 026C
A7B0 ; NFKC_CF; 029E
A7B1 ; NFKC_CF; 0287
A7F8 ; NFKC_CF; 0127 A7F8 ; NFKC_CF; 0127
A7F9 ; NFKC_CF; 0153 A7F9 ; NFKC_CF; 0153
AB5C ; NFKC_CF; A727
AB5D ; NFKC_CF; AB37
AB5E ; NFKC_CF; 026B
AB5F ; NFKC_CF; AB52
F900 ; NFKC_CF; 8C48 F900 ; NFKC_CF; 8C48
F901 ; NFKC_CF; 66F4 F901 ; NFKC_CF; 66F4
F902 ; NFKC_CF; 8ECA F902 ; NFKC_CF; 8ECA
@ -6586,6 +6641,39 @@ FFF0..FFF8 ; NFKC_CF;
10425 ; NFKC_CF; 1044D 10425 ; NFKC_CF; 1044D
10426 ; NFKC_CF; 1044E 10426 ; NFKC_CF; 1044E
10427 ; NFKC_CF; 1044F 10427 ; NFKC_CF; 1044F
118A0 ; NFKC_CF; 118C0
118A1 ; NFKC_CF; 118C1
118A2 ; NFKC_CF; 118C2
118A3 ; NFKC_CF; 118C3
118A4 ; NFKC_CF; 118C4
118A5 ; NFKC_CF; 118C5
118A6 ; NFKC_CF; 118C6
118A7 ; NFKC_CF; 118C7
118A8 ; NFKC_CF; 118C8
118A9 ; NFKC_CF; 118C9
118AA ; NFKC_CF; 118CA
118AB ; NFKC_CF; 118CB
118AC ; NFKC_CF; 118CC
118AD ; NFKC_CF; 118CD
118AE ; NFKC_CF; 118CE
118AF ; NFKC_CF; 118CF
118B0 ; NFKC_CF; 118D0
118B1 ; NFKC_CF; 118D1
118B2 ; NFKC_CF; 118D2
118B3 ; NFKC_CF; 118D3
118B4 ; NFKC_CF; 118D4
118B5 ; NFKC_CF; 118D5
118B6 ; NFKC_CF; 118D6
118B7 ; NFKC_CF; 118D7
118B8 ; NFKC_CF; 118D8
118B9 ; NFKC_CF; 118D9
118BA ; NFKC_CF; 118DA
118BB ; NFKC_CF; 118DB
118BC ; NFKC_CF; 118DC
118BD ; NFKC_CF; 118DD
118BE ; NFKC_CF; 118DE
118BF ; NFKC_CF; 118DF
1BCA0..1BCA3 ; NFKC_CF;
1D15E ; NFKC_CF; 1D157 1D165 1D15E ; NFKC_CF; 1D157 1D165
1D15F ; NFKC_CF; 1D158 1D165 1D15F ; NFKC_CF; 1D158 1D165
1D160 ; NFKC_CF; 1D158 1D165 1D16E 1D160 ; NFKC_CF; 1D158 1D165 1D16E
@ -8405,7 +8493,7 @@ E0080..E00FF ; NFKC_CF;
E0100..E01EF ; NFKC_CF; E0100..E01EF ; NFKC_CF;
E01F0..E0FFF ; NFKC_CF; E01F0..E0FFF ; NFKC_CF;
# Total code points: 9946 # Total code points: 10005
# ================================================ # ================================================
@ -8576,6 +8664,7 @@ E01F0..E0FFF ; NFKC_CF;
0376 ; Changes_When_NFKC_Casefolded 0376 ; Changes_When_NFKC_Casefolded
037A ; Changes_When_NFKC_Casefolded 037A ; Changes_When_NFKC_Casefolded
037E ; Changes_When_NFKC_Casefolded 037E ; Changes_When_NFKC_Casefolded
037F ; Changes_When_NFKC_Casefolded
0384..0385 ; Changes_When_NFKC_Casefolded 0384..0385 ; Changes_When_NFKC_Casefolded
0386 ; Changes_When_NFKC_Casefolded 0386 ; Changes_When_NFKC_Casefolded
0387 ; Changes_When_NFKC_Casefolded 0387 ; Changes_When_NFKC_Casefolded
@ -8698,6 +8787,10 @@ E01F0..E0FFF ; NFKC_CF;
0522 ; Changes_When_NFKC_Casefolded 0522 ; Changes_When_NFKC_Casefolded
0524 ; Changes_When_NFKC_Casefolded 0524 ; Changes_When_NFKC_Casefolded
0526 ; Changes_When_NFKC_Casefolded 0526 ; Changes_When_NFKC_Casefolded
0528 ; Changes_When_NFKC_Casefolded
052A ; Changes_When_NFKC_Casefolded
052C ; Changes_When_NFKC_Casefolded
052E ; Changes_When_NFKC_Casefolded
0531..0556 ; Changes_When_NFKC_Casefolded 0531..0556 ; Changes_When_NFKC_Casefolded
0587 ; Changes_When_NFKC_Casefolded 0587 ; Changes_When_NFKC_Casefolded
061C ; Changes_When_NFKC_Casefolded 061C ; Changes_When_NFKC_Casefolded
@ -9091,6 +9184,9 @@ A690 ; Changes_When_NFKC_Casefolded
A692 ; Changes_When_NFKC_Casefolded A692 ; Changes_When_NFKC_Casefolded
A694 ; Changes_When_NFKC_Casefolded A694 ; Changes_When_NFKC_Casefolded
A696 ; Changes_When_NFKC_Casefolded A696 ; Changes_When_NFKC_Casefolded
A698 ; Changes_When_NFKC_Casefolded
A69A ; Changes_When_NFKC_Casefolded
A69C..A69D ; Changes_When_NFKC_Casefolded
A722 ; Changes_When_NFKC_Casefolded A722 ; Changes_When_NFKC_Casefolded
A724 ; Changes_When_NFKC_Casefolded A724 ; Changes_When_NFKC_Casefolded
A726 ; Changes_When_NFKC_Casefolded A726 ; Changes_When_NFKC_Casefolded
@ -9141,13 +9237,20 @@ A78B ; Changes_When_NFKC_Casefolded
A78D ; Changes_When_NFKC_Casefolded A78D ; Changes_When_NFKC_Casefolded
A790 ; Changes_When_NFKC_Casefolded A790 ; Changes_When_NFKC_Casefolded
A792 ; Changes_When_NFKC_Casefolded A792 ; Changes_When_NFKC_Casefolded
A796 ; Changes_When_NFKC_Casefolded
A798 ; Changes_When_NFKC_Casefolded
A79A ; Changes_When_NFKC_Casefolded
A79C ; Changes_When_NFKC_Casefolded
A79E ; Changes_When_NFKC_Casefolded
A7A0 ; Changes_When_NFKC_Casefolded A7A0 ; Changes_When_NFKC_Casefolded
A7A2 ; Changes_When_NFKC_Casefolded A7A2 ; Changes_When_NFKC_Casefolded
A7A4 ; Changes_When_NFKC_Casefolded A7A4 ; Changes_When_NFKC_Casefolded
A7A6 ; Changes_When_NFKC_Casefolded A7A6 ; Changes_When_NFKC_Casefolded
A7A8 ; Changes_When_NFKC_Casefolded A7A8 ; Changes_When_NFKC_Casefolded
A7AA ; Changes_When_NFKC_Casefolded A7AA..A7AD ; Changes_When_NFKC_Casefolded
A7B0..A7B1 ; Changes_When_NFKC_Casefolded
A7F8..A7F9 ; Changes_When_NFKC_Casefolded A7F8..A7F9 ; Changes_When_NFKC_Casefolded
AB5C..AB5F ; Changes_When_NFKC_Casefolded
F900..FA0D ; Changes_When_NFKC_Casefolded F900..FA0D ; Changes_When_NFKC_Casefolded
FA10 ; Changes_When_NFKC_Casefolded FA10 ; Changes_When_NFKC_Casefolded
FA12 ; Changes_When_NFKC_Casefolded FA12 ; Changes_When_NFKC_Casefolded
@ -9272,6 +9375,8 @@ FFE9..FFEC ; Changes_When_NFKC_Casefolded
FFED..FFEE ; Changes_When_NFKC_Casefolded FFED..FFEE ; Changes_When_NFKC_Casefolded
FFF0..FFF8 ; Changes_When_NFKC_Casefolded FFF0..FFF8 ; Changes_When_NFKC_Casefolded
10400..10427 ; Changes_When_NFKC_Casefolded 10400..10427 ; Changes_When_NFKC_Casefolded
118A0..118BF ; Changes_When_NFKC_Casefolded
1BCA0..1BCA3 ; Changes_When_NFKC_Casefolded
1D15E..1D164 ; Changes_When_NFKC_Casefolded 1D15E..1D164 ; Changes_When_NFKC_Casefolded
1D173..1D17A ; Changes_When_NFKC_Casefolded 1D173..1D17A ; Changes_When_NFKC_Casefolded
1D1BB..1D1C0 ; Changes_When_NFKC_Casefolded 1D1BB..1D1C0 ; Changes_When_NFKC_Casefolded
@ -9367,6 +9472,6 @@ E0080..E00FF ; Changes_When_NFKC_Casefolded
E0100..E01EF ; Changes_When_NFKC_Casefolded E0100..E01EF ; Changes_When_NFKC_Casefolded
E01F0..E0FFF ; Changes_When_NFKC_Casefolded E01F0..E0FFF ; Changes_When_NFKC_Casefolded
# Total code points: 9946 # Total code points: 10005
# EOF # EOF

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,10 @@
# NormalizationCorrections-6.3.0.txt # NormalizationCorrections-7.0.0.txt
# Date: 2013-01-02, 08:39:00 GMT [KW, LI] # Date: 2013-12-17, 00:00:00 GMT [KW, LI]
# #
# This file is a normative contributory data file in the # This file is a normative contributory data file in the
# Unicode Character Database. # Unicode Character Database.
# #
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2014 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html # For terms of use, see http://www.unicode.org/terms_of_use.html
# #
# The normalization stability policy of the Unicode Consortium # The normalization stability policy of the Unicode Consortium

View File

@ -1,5 +1,5 @@
# NormalizationTest-6.3.0.txt # NormalizationTest-7.0.0.txt
# Date: 2012-12-20, 22:18:30 GMT [MD] # Date: 2013-11-27, 09:54:41 GMT [MD]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2013 Unicode, Inc.
@ -2402,9 +2402,15 @@
33FD;33FD;33FD;0033 0030 65E5;0033 0030 65E5; 33FD;33FD;33FD;0033 0030 65E5;0033 0030 65E5;
33FE;33FE;33FE;0033 0031 65E5;0033 0031 65E5; 33FE;33FE;33FE;0033 0031 65E5;0033 0031 65E5;
33FF;33FF;33FF;0067 0061 006C;0067 0061 006C; 33FF;33FF;33FF;0067 0061 006C;0067 0061 006C;
A69C;A69C;A69C;044A;044A;
A69D;A69D;A69D;044C;044C;
A770;A770;A770;A76F;A76F; A770;A770;A770;A76F;A76F;
A7F8;A7F8;A7F8;0126;0126; A7F8;A7F8;A7F8;0126;0126;
A7F9;A7F9;A7F9;0153;0153; A7F9;A7F9;A7F9;0153;0153;
AB5C;AB5C;AB5C;A727;A727;
AB5D;AB5D;AB5D;AB37;AB37;
AB5E;AB5E;AB5E;026B;026B;
AB5F;AB5F;AB5F;AB52;AB52;
AC00;AC00;1100 1161;AC00;1100 1161; AC00;AC00;1100 1161;AC00;1100 1161;
AC01;AC01;1100 1161 11A8;AC01;1100 1161 11A8; AC01;AC01;1100 1161 11A8;AC01;1100 1161 11A8;
AC02;AC02;1100 1161 11A9;AC02;1100 1161 11A9; AC02;AC02;1100 1161 11A9;AC02;1100 1161 11A9;
@ -15121,6 +15127,13 @@ FFEE;FFEE;FFEE;25CB;25CB;
110AB;110AB;110A5 110BA;110AB;110A5 110BA; 110AB;110AB;110A5 110BA;110AB;110A5 110BA;
1112E;1112E;11131 11127;1112E;11131 11127; 1112E;1112E;11131 11127;1112E;11131 11127;
1112F;1112F;11132 11127;1112F;11132 11127; 1112F;1112F;11132 11127;1112F;11132 11127;
1134B;1134B;11347 1133E;1134B;11347 1133E;
1134C;1134C;11347 11357;1134C;11347 11357;
114BB;114BB;114B9 114BA;114BB;114B9 114BA;
114BC;114BC;114B9 114B0;114BC;114B9 114B0;
114BE;114BE;114B9 114BD;114BE;114B9 114BD;
115BA;115BA;115B8 115AF;115BA;115B8 115AF;
115BB;115BB;115B9 115AF;115BB;115B9 115AF;
1D15E;1D157 1D165;1D157 1D165;1D157 1D165;1D157 1D165; 1D15E;1D157 1D165;1D157 1D165;1D157 1D165;1D157 1D165;
1D15F;1D158 1D165;1D158 1D165;1D158 1D165;1D158 1D165; 1D15F;1D158 1D165;1D158 1D165;1D158 1D165;1D158 1D165;
1D160;1D158 1D165 1D16E;1D158 1D165 1D16E;1D158 1D165 1D16E;1D158 1D165 1D16E; 1D160;1D158 1D165 1D16E;1D158 1D165 1D16E;1D158 1D165 1D16E;1D158 1D165 1D16E;
@ -17564,6 +17577,8 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 08FD 0315 0300 05AE 0062;0061 05AE 08FD 0300 0315 0062;0061 05AE 08FD 0300 0315 0062;0061 05AE 08FD 0300 0315 0062;0061 05AE 08FD 0300 0315 0062; 0061 08FD 0315 0300 05AE 0062;0061 05AE 08FD 0300 0315 0062;0061 05AE 08FD 0300 0315 0062;0061 05AE 08FD 0300 0315 0062;0061 05AE 08FD 0300 0315 0062;
0061 0315 0300 05AE 08FE 0062;00E0 05AE 08FE 0315 0062;0061 05AE 0300 08FE 0315 0062;00E0 05AE 08FE 0315 0062;0061 05AE 0300 08FE 0315 0062; 0061 0315 0300 05AE 08FE 0062;00E0 05AE 08FE 0315 0062;0061 05AE 0300 08FE 0315 0062;00E0 05AE 08FE 0315 0062;0061 05AE 0300 08FE 0315 0062;
0061 08FE 0315 0300 05AE 0062;0061 05AE 08FE 0300 0315 0062;0061 05AE 08FE 0300 0315 0062;0061 05AE 08FE 0300 0315 0062;0061 05AE 08FE 0300 0315 0062; 0061 08FE 0315 0300 05AE 0062;0061 05AE 08FE 0300 0315 0062;0061 05AE 08FE 0300 0315 0062;0061 05AE 08FE 0300 0315 0062;0061 05AE 08FE 0300 0315 0062;
0061 0315 0300 05AE 08FF 0062;00E0 05AE 08FF 0315 0062;0061 05AE 0300 08FF 0315 0062;00E0 05AE 08FF 0315 0062;0061 05AE 0300 08FF 0315 0062;
0061 08FF 0315 0300 05AE 0062;0061 05AE 08FF 0300 0315 0062;0061 05AE 08FF 0300 0315 0062;0061 05AE 08FF 0300 0315 0062;0061 05AE 08FF 0300 0315 0062;
0061 3099 093C 0334 093C 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062; 0061 3099 093C 0334 093C 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;
0061 093C 3099 093C 0334 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062; 0061 093C 3099 093C 0334 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;0061 0334 093C 093C 3099 0062;
0061 05B0 094D 3099 094D 0062;0061 3099 094D 094D 05B0 0062;0061 3099 094D 094D 05B0 0062;0061 3099 094D 094D 05B0 0062;0061 3099 094D 094D 05B0 0062; 0061 05B0 094D 3099 094D 0062;0061 3099 094D 094D 05B0 0062;0061 3099 094D 094D 05B0 0062;0061 3099 094D 094D 05B0 0062;0061 3099 094D 094D 05B0 0062;
@ -17726,6 +17741,34 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 1A7C 0315 0300 05AE 0062;0061 05AE 1A7C 0300 0315 0062;0061 05AE 1A7C 0300 0315 0062;0061 05AE 1A7C 0300 0315 0062;0061 05AE 1A7C 0300 0315 0062; 0061 1A7C 0315 0300 05AE 0062;0061 05AE 1A7C 0300 0315 0062;0061 05AE 1A7C 0300 0315 0062;0061 05AE 1A7C 0300 0315 0062;0061 05AE 1A7C 0300 0315 0062;
0061 059A 0316 302A 1A7F 0062;0061 302A 0316 1A7F 059A 0062;0061 302A 0316 1A7F 059A 0062;0061 302A 0316 1A7F 059A 0062;0061 302A 0316 1A7F 059A 0062; 0061 059A 0316 302A 1A7F 0062;0061 302A 0316 1A7F 059A 0062;0061 302A 0316 1A7F 059A 0062;0061 302A 0316 1A7F 059A 0062;0061 302A 0316 1A7F 059A 0062;
0061 1A7F 059A 0316 302A 0062;0061 302A 1A7F 0316 059A 0062;0061 302A 1A7F 0316 059A 0062;0061 302A 1A7F 0316 059A 0062;0061 302A 1A7F 0316 059A 0062; 0061 1A7F 059A 0316 302A 0062;0061 302A 1A7F 0316 059A 0062;0061 302A 1A7F 0316 059A 0062;0061 302A 1A7F 0316 059A 0062;0061 302A 1A7F 0316 059A 0062;
0061 0315 0300 05AE 1AB0 0062;00E0 05AE 1AB0 0315 0062;0061 05AE 0300 1AB0 0315 0062;00E0 05AE 1AB0 0315 0062;0061 05AE 0300 1AB0 0315 0062;
0061 1AB0 0315 0300 05AE 0062;0061 05AE 1AB0 0300 0315 0062;0061 05AE 1AB0 0300 0315 0062;0061 05AE 1AB0 0300 0315 0062;0061 05AE 1AB0 0300 0315 0062;
0061 0315 0300 05AE 1AB1 0062;00E0 05AE 1AB1 0315 0062;0061 05AE 0300 1AB1 0315 0062;00E0 05AE 1AB1 0315 0062;0061 05AE 0300 1AB1 0315 0062;
0061 1AB1 0315 0300 05AE 0062;0061 05AE 1AB1 0300 0315 0062;0061 05AE 1AB1 0300 0315 0062;0061 05AE 1AB1 0300 0315 0062;0061 05AE 1AB1 0300 0315 0062;
0061 0315 0300 05AE 1AB2 0062;00E0 05AE 1AB2 0315 0062;0061 05AE 0300 1AB2 0315 0062;00E0 05AE 1AB2 0315 0062;0061 05AE 0300 1AB2 0315 0062;
0061 1AB2 0315 0300 05AE 0062;0061 05AE 1AB2 0300 0315 0062;0061 05AE 1AB2 0300 0315 0062;0061 05AE 1AB2 0300 0315 0062;0061 05AE 1AB2 0300 0315 0062;
0061 0315 0300 05AE 1AB3 0062;00E0 05AE 1AB3 0315 0062;0061 05AE 0300 1AB3 0315 0062;00E0 05AE 1AB3 0315 0062;0061 05AE 0300 1AB3 0315 0062;
0061 1AB3 0315 0300 05AE 0062;0061 05AE 1AB3 0300 0315 0062;0061 05AE 1AB3 0300 0315 0062;0061 05AE 1AB3 0300 0315 0062;0061 05AE 1AB3 0300 0315 0062;
0061 0315 0300 05AE 1AB4 0062;00E0 05AE 1AB4 0315 0062;0061 05AE 0300 1AB4 0315 0062;00E0 05AE 1AB4 0315 0062;0061 05AE 0300 1AB4 0315 0062;
0061 1AB4 0315 0300 05AE 0062;0061 05AE 1AB4 0300 0315 0062;0061 05AE 1AB4 0300 0315 0062;0061 05AE 1AB4 0300 0315 0062;0061 05AE 1AB4 0300 0315 0062;
0061 059A 0316 302A 1AB5 0062;0061 302A 0316 1AB5 059A 0062;0061 302A 0316 1AB5 059A 0062;0061 302A 0316 1AB5 059A 0062;0061 302A 0316 1AB5 059A 0062;
0061 1AB5 059A 0316 302A 0062;0061 302A 1AB5 0316 059A 0062;0061 302A 1AB5 0316 059A 0062;0061 302A 1AB5 0316 059A 0062;0061 302A 1AB5 0316 059A 0062;
0061 059A 0316 302A 1AB6 0062;0061 302A 0316 1AB6 059A 0062;0061 302A 0316 1AB6 059A 0062;0061 302A 0316 1AB6 059A 0062;0061 302A 0316 1AB6 059A 0062;
0061 1AB6 059A 0316 302A 0062;0061 302A 1AB6 0316 059A 0062;0061 302A 1AB6 0316 059A 0062;0061 302A 1AB6 0316 059A 0062;0061 302A 1AB6 0316 059A 0062;
0061 059A 0316 302A 1AB7 0062;0061 302A 0316 1AB7 059A 0062;0061 302A 0316 1AB7 059A 0062;0061 302A 0316 1AB7 059A 0062;0061 302A 0316 1AB7 059A 0062;
0061 1AB7 059A 0316 302A 0062;0061 302A 1AB7 0316 059A 0062;0061 302A 1AB7 0316 059A 0062;0061 302A 1AB7 0316 059A 0062;0061 302A 1AB7 0316 059A 0062;
0061 059A 0316 302A 1AB8 0062;0061 302A 0316 1AB8 059A 0062;0061 302A 0316 1AB8 059A 0062;0061 302A 0316 1AB8 059A 0062;0061 302A 0316 1AB8 059A 0062;
0061 1AB8 059A 0316 302A 0062;0061 302A 1AB8 0316 059A 0062;0061 302A 1AB8 0316 059A 0062;0061 302A 1AB8 0316 059A 0062;0061 302A 1AB8 0316 059A 0062;
0061 059A 0316 302A 1AB9 0062;0061 302A 0316 1AB9 059A 0062;0061 302A 0316 1AB9 059A 0062;0061 302A 0316 1AB9 059A 0062;0061 302A 0316 1AB9 059A 0062;
0061 1AB9 059A 0316 302A 0062;0061 302A 1AB9 0316 059A 0062;0061 302A 1AB9 0316 059A 0062;0061 302A 1AB9 0316 059A 0062;0061 302A 1AB9 0316 059A 0062;
0061 059A 0316 302A 1ABA 0062;0061 302A 0316 1ABA 059A 0062;0061 302A 0316 1ABA 059A 0062;0061 302A 0316 1ABA 059A 0062;0061 302A 0316 1ABA 059A 0062;
0061 1ABA 059A 0316 302A 0062;0061 302A 1ABA 0316 059A 0062;0061 302A 1ABA 0316 059A 0062;0061 302A 1ABA 0316 059A 0062;0061 302A 1ABA 0316 059A 0062;
0061 0315 0300 05AE 1ABB 0062;00E0 05AE 1ABB 0315 0062;0061 05AE 0300 1ABB 0315 0062;00E0 05AE 1ABB 0315 0062;0061 05AE 0300 1ABB 0315 0062;
0061 1ABB 0315 0300 05AE 0062;0061 05AE 1ABB 0300 0315 0062;0061 05AE 1ABB 0300 0315 0062;0061 05AE 1ABB 0300 0315 0062;0061 05AE 1ABB 0300 0315 0062;
0061 0315 0300 05AE 1ABC 0062;00E0 05AE 1ABC 0315 0062;0061 05AE 0300 1ABC 0315 0062;00E0 05AE 1ABC 0315 0062;0061 05AE 0300 1ABC 0315 0062;
0061 1ABC 0315 0300 05AE 0062;0061 05AE 1ABC 0300 0315 0062;0061 05AE 1ABC 0300 0315 0062;0061 05AE 1ABC 0300 0315 0062;0061 05AE 1ABC 0300 0315 0062;
0061 059A 0316 302A 1ABD 0062;0061 302A 0316 1ABD 059A 0062;0061 302A 0316 1ABD 059A 0062;0061 302A 0316 1ABD 059A 0062;0061 302A 0316 1ABD 059A 0062;
0061 1ABD 059A 0316 302A 0062;0061 302A 1ABD 0316 059A 0062;0061 302A 1ABD 0316 059A 0062;0061 302A 1ABD 0316 059A 0062;0061 302A 1ABD 0316 059A 0062;
0061 3099 093C 0334 1B34 0062;0061 0334 093C 1B34 3099 0062;0061 0334 093C 1B34 3099 0062;0061 0334 093C 1B34 3099 0062;0061 0334 093C 1B34 3099 0062; 0061 3099 093C 0334 1B34 0062;0061 0334 093C 1B34 3099 0062;0061 0334 093C 1B34 3099 0062;0061 0334 093C 1B34 3099 0062;0061 0334 093C 1B34 3099 0062;
0061 1B34 3099 093C 0334 0062;0061 0334 1B34 093C 3099 0062;0061 0334 1B34 093C 3099 0062;0061 0334 1B34 093C 3099 0062;0061 0334 1B34 093C 3099 0062; 0061 1B34 3099 093C 0334 0062;0061 0334 1B34 093C 3099 0062;0061 0334 1B34 093C 3099 0062;0061 0334 1B34 093C 3099 0062;0061 0334 1B34 093C 3099 0062;
0061 05B0 094D 3099 1B44 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062; 0061 05B0 094D 3099 1B44 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062;0061 3099 094D 1B44 05B0 0062;
@ -17810,6 +17853,10 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 1CED 059A 0316 302A 0062;0061 302A 1CED 0316 059A 0062;0061 302A 1CED 0316 059A 0062;0061 302A 1CED 0316 059A 0062;0061 302A 1CED 0316 059A 0062; 0061 1CED 059A 0316 302A 0062;0061 302A 1CED 0316 059A 0062;0061 302A 1CED 0316 059A 0062;0061 302A 1CED 0316 059A 0062;0061 302A 1CED 0316 059A 0062;
0061 0315 0300 05AE 1CF4 0062;00E0 05AE 1CF4 0315 0062;0061 05AE 0300 1CF4 0315 0062;00E0 05AE 1CF4 0315 0062;0061 05AE 0300 1CF4 0315 0062; 0061 0315 0300 05AE 1CF4 0062;00E0 05AE 1CF4 0315 0062;0061 05AE 0300 1CF4 0315 0062;00E0 05AE 1CF4 0315 0062;0061 05AE 0300 1CF4 0315 0062;
0061 1CF4 0315 0300 05AE 0062;0061 05AE 1CF4 0300 0315 0062;0061 05AE 1CF4 0300 0315 0062;0061 05AE 1CF4 0300 0315 0062;0061 05AE 1CF4 0300 0315 0062; 0061 1CF4 0315 0300 05AE 0062;0061 05AE 1CF4 0300 0315 0062;0061 05AE 1CF4 0300 0315 0062;0061 05AE 1CF4 0300 0315 0062;0061 05AE 1CF4 0300 0315 0062;
0061 0315 0300 05AE 1CF8 0062;00E0 05AE 1CF8 0315 0062;0061 05AE 0300 1CF8 0315 0062;00E0 05AE 1CF8 0315 0062;0061 05AE 0300 1CF8 0315 0062;
0061 1CF8 0315 0300 05AE 0062;0061 05AE 1CF8 0300 0315 0062;0061 05AE 1CF8 0300 0315 0062;0061 05AE 1CF8 0300 0315 0062;0061 05AE 1CF8 0300 0315 0062;
0061 0315 0300 05AE 1CF9 0062;00E0 05AE 1CF9 0315 0062;0061 05AE 0300 1CF9 0315 0062;00E0 05AE 1CF9 0315 0062;0061 05AE 0300 1CF9 0315 0062;
0061 1CF9 0315 0300 05AE 0062;0061 05AE 1CF9 0300 0315 0062;0061 05AE 1CF9 0300 0315 0062;0061 05AE 1CF9 0300 0315 0062;0061 05AE 1CF9 0300 0315 0062;
0061 0315 0300 05AE 1DC0 0062;00E0 05AE 1DC0 0315 0062;0061 05AE 0300 1DC0 0315 0062;00E0 05AE 1DC0 0315 0062;0061 05AE 0300 1DC0 0315 0062; 0061 0315 0300 05AE 1DC0 0062;00E0 05AE 1DC0 0315 0062;0061 05AE 0300 1DC0 0315 0062;00E0 05AE 1DC0 0315 0062;0061 05AE 0300 1DC0 0315 0062;
0061 1DC0 0315 0300 05AE 0062;0061 05AE 1DC0 0300 0315 0062;0061 05AE 1DC0 0300 0315 0062;0061 05AE 1DC0 0300 0315 0062;0061 05AE 1DC0 0300 0315 0062; 0061 1DC0 0315 0300 05AE 0062;0061 05AE 1DC0 0300 0315 0062;0061 05AE 1DC0 0300 0315 0062;0061 05AE 1DC0 0300 0315 0062;0061 05AE 1DC0 0300 0315 0062;
0061 0315 0300 05AE 1DC1 0062;00E0 05AE 1DC1 0315 0062;0061 05AE 0300 1DC1 0315 0062;00E0 05AE 1DC1 0315 0062;0061 05AE 0300 1DC1 0315 0062; 0061 0315 0300 05AE 1DC1 0062;00E0 05AE 1DC1 0315 0062;0061 05AE 0300 1DC1 0315 0062;00E0 05AE 1DC1 0315 0062;0061 05AE 0300 1DC1 0315 0062;
@ -17888,6 +17935,36 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 1DE5 0315 0300 05AE 0062;0061 05AE 1DE5 0300 0315 0062;0061 05AE 1DE5 0300 0315 0062;0061 05AE 1DE5 0300 0315 0062;0061 05AE 1DE5 0300 0315 0062; 0061 1DE5 0315 0300 05AE 0062;0061 05AE 1DE5 0300 0315 0062;0061 05AE 1DE5 0300 0315 0062;0061 05AE 1DE5 0300 0315 0062;0061 05AE 1DE5 0300 0315 0062;
0061 0315 0300 05AE 1DE6 0062;00E0 05AE 1DE6 0315 0062;0061 05AE 0300 1DE6 0315 0062;00E0 05AE 1DE6 0315 0062;0061 05AE 0300 1DE6 0315 0062; 0061 0315 0300 05AE 1DE6 0062;00E0 05AE 1DE6 0315 0062;0061 05AE 0300 1DE6 0315 0062;00E0 05AE 1DE6 0315 0062;0061 05AE 0300 1DE6 0315 0062;
0061 1DE6 0315 0300 05AE 0062;0061 05AE 1DE6 0300 0315 0062;0061 05AE 1DE6 0300 0315 0062;0061 05AE 1DE6 0300 0315 0062;0061 05AE 1DE6 0300 0315 0062; 0061 1DE6 0315 0300 05AE 0062;0061 05AE 1DE6 0300 0315 0062;0061 05AE 1DE6 0300 0315 0062;0061 05AE 1DE6 0300 0315 0062;0061 05AE 1DE6 0300 0315 0062;
0061 0315 0300 05AE 1DE7 0062;00E0 05AE 1DE7 0315 0062;0061 05AE 0300 1DE7 0315 0062;00E0 05AE 1DE7 0315 0062;0061 05AE 0300 1DE7 0315 0062;
0061 1DE7 0315 0300 05AE 0062;0061 05AE 1DE7 0300 0315 0062;0061 05AE 1DE7 0300 0315 0062;0061 05AE 1DE7 0300 0315 0062;0061 05AE 1DE7 0300 0315 0062;
0061 0315 0300 05AE 1DE8 0062;00E0 05AE 1DE8 0315 0062;0061 05AE 0300 1DE8 0315 0062;00E0 05AE 1DE8 0315 0062;0061 05AE 0300 1DE8 0315 0062;
0061 1DE8 0315 0300 05AE 0062;0061 05AE 1DE8 0300 0315 0062;0061 05AE 1DE8 0300 0315 0062;0061 05AE 1DE8 0300 0315 0062;0061 05AE 1DE8 0300 0315 0062;
0061 0315 0300 05AE 1DE9 0062;00E0 05AE 1DE9 0315 0062;0061 05AE 0300 1DE9 0315 0062;00E0 05AE 1DE9 0315 0062;0061 05AE 0300 1DE9 0315 0062;
0061 1DE9 0315 0300 05AE 0062;0061 05AE 1DE9 0300 0315 0062;0061 05AE 1DE9 0300 0315 0062;0061 05AE 1DE9 0300 0315 0062;0061 05AE 1DE9 0300 0315 0062;
0061 0315 0300 05AE 1DEA 0062;00E0 05AE 1DEA 0315 0062;0061 05AE 0300 1DEA 0315 0062;00E0 05AE 1DEA 0315 0062;0061 05AE 0300 1DEA 0315 0062;
0061 1DEA 0315 0300 05AE 0062;0061 05AE 1DEA 0300 0315 0062;0061 05AE 1DEA 0300 0315 0062;0061 05AE 1DEA 0300 0315 0062;0061 05AE 1DEA 0300 0315 0062;
0061 0315 0300 05AE 1DEB 0062;00E0 05AE 1DEB 0315 0062;0061 05AE 0300 1DEB 0315 0062;00E0 05AE 1DEB 0315 0062;0061 05AE 0300 1DEB 0315 0062;
0061 1DEB 0315 0300 05AE 0062;0061 05AE 1DEB 0300 0315 0062;0061 05AE 1DEB 0300 0315 0062;0061 05AE 1DEB 0300 0315 0062;0061 05AE 1DEB 0300 0315 0062;
0061 0315 0300 05AE 1DEC 0062;00E0 05AE 1DEC 0315 0062;0061 05AE 0300 1DEC 0315 0062;00E0 05AE 1DEC 0315 0062;0061 05AE 0300 1DEC 0315 0062;
0061 1DEC 0315 0300 05AE 0062;0061 05AE 1DEC 0300 0315 0062;0061 05AE 1DEC 0300 0315 0062;0061 05AE 1DEC 0300 0315 0062;0061 05AE 1DEC 0300 0315 0062;
0061 0315 0300 05AE 1DED 0062;00E0 05AE 1DED 0315 0062;0061 05AE 0300 1DED 0315 0062;00E0 05AE 1DED 0315 0062;0061 05AE 0300 1DED 0315 0062;
0061 1DED 0315 0300 05AE 0062;0061 05AE 1DED 0300 0315 0062;0061 05AE 1DED 0300 0315 0062;0061 05AE 1DED 0300 0315 0062;0061 05AE 1DED 0300 0315 0062;
0061 0315 0300 05AE 1DEE 0062;00E0 05AE 1DEE 0315 0062;0061 05AE 0300 1DEE 0315 0062;00E0 05AE 1DEE 0315 0062;0061 05AE 0300 1DEE 0315 0062;
0061 1DEE 0315 0300 05AE 0062;0061 05AE 1DEE 0300 0315 0062;0061 05AE 1DEE 0300 0315 0062;0061 05AE 1DEE 0300 0315 0062;0061 05AE 1DEE 0300 0315 0062;
0061 0315 0300 05AE 1DEF 0062;00E0 05AE 1DEF 0315 0062;0061 05AE 0300 1DEF 0315 0062;00E0 05AE 1DEF 0315 0062;0061 05AE 0300 1DEF 0315 0062;
0061 1DEF 0315 0300 05AE 0062;0061 05AE 1DEF 0300 0315 0062;0061 05AE 1DEF 0300 0315 0062;0061 05AE 1DEF 0300 0315 0062;0061 05AE 1DEF 0300 0315 0062;
0061 0315 0300 05AE 1DF0 0062;00E0 05AE 1DF0 0315 0062;0061 05AE 0300 1DF0 0315 0062;00E0 05AE 1DF0 0315 0062;0061 05AE 0300 1DF0 0315 0062;
0061 1DF0 0315 0300 05AE 0062;0061 05AE 1DF0 0300 0315 0062;0061 05AE 1DF0 0300 0315 0062;0061 05AE 1DF0 0300 0315 0062;0061 05AE 1DF0 0300 0315 0062;
0061 0315 0300 05AE 1DF1 0062;00E0 05AE 1DF1 0315 0062;0061 05AE 0300 1DF1 0315 0062;00E0 05AE 1DF1 0315 0062;0061 05AE 0300 1DF1 0315 0062;
0061 1DF1 0315 0300 05AE 0062;0061 05AE 1DF1 0300 0315 0062;0061 05AE 1DF1 0300 0315 0062;0061 05AE 1DF1 0300 0315 0062;0061 05AE 1DF1 0300 0315 0062;
0061 0315 0300 05AE 1DF2 0062;00E0 05AE 1DF2 0315 0062;0061 05AE 0300 1DF2 0315 0062;00E0 05AE 1DF2 0315 0062;0061 05AE 0300 1DF2 0315 0062;
0061 1DF2 0315 0300 05AE 0062;0061 05AE 1DF2 0300 0315 0062;0061 05AE 1DF2 0300 0315 0062;0061 05AE 1DF2 0300 0315 0062;0061 05AE 1DF2 0300 0315 0062;
0061 0315 0300 05AE 1DF3 0062;00E0 05AE 1DF3 0315 0062;0061 05AE 0300 1DF3 0315 0062;00E0 05AE 1DF3 0315 0062;0061 05AE 0300 1DF3 0315 0062;
0061 1DF3 0315 0300 05AE 0062;0061 05AE 1DF3 0300 0315 0062;0061 05AE 1DF3 0300 0315 0062;0061 05AE 1DF3 0300 0315 0062;0061 05AE 1DF3 0300 0315 0062;
0061 0315 0300 05AE 1DF4 0062;00E0 05AE 1DF4 0315 0062;0061 05AE 0300 1DF4 0315 0062;00E0 05AE 1DF4 0315 0062;0061 05AE 0300 1DF4 0315 0062;
0061 1DF4 0315 0300 05AE 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062;0061 05AE 1DF4 0300 0315 0062;
0061 0315 0300 05AE 1DF5 0062;00E0 05AE 1DF5 0315 0062;0061 05AE 0300 1DF5 0315 0062;00E0 05AE 1DF5 0315 0062;0061 05AE 0300 1DF5 0315 0062;
0061 1DF5 0315 0300 05AE 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062;0061 05AE 1DF5 0300 0315 0062;
0061 035D 035C 0315 1DFC 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062; 0061 035D 035C 0315 1DFC 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;0061 0315 035C 1DFC 035D 0062;
0061 1DFC 035D 035C 0315 0062;0061 0315 1DFC 035C 035D 0062;0061 0315 1DFC 035C 035D 0062;0061 0315 1DFC 035C 035D 0062;0061 0315 1DFC 035C 035D 0062; 0061 1DFC 035D 035C 0315 0062;0061 0315 1DFC 035C 035D 0062;0061 0315 1DFC 035C 035D 0062;0061 0315 1DFC 035C 035D 0062;0061 0315 1DFC 035C 035D 0062;
0061 059A 0316 302A 1DFD 0062;0061 302A 0316 1DFD 059A 0062;0061 302A 0316 1DFD 059A 0062;0061 302A 0316 1DFD 059A 0062;0061 302A 0316 1DFD 059A 0062; 0061 059A 0316 302A 1DFD 0062;0061 302A 0316 1DFD 059A 0062;0061 302A 0316 1DFD 059A 0062;0061 302A 0316 1DFD 059A 0062;0061 302A 0316 1DFD 059A 0062;
@ -18154,8 +18231,34 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 FE25 0315 0300 05AE 0062;0061 05AE FE25 0300 0315 0062;0061 05AE FE25 0300 0315 0062;0061 05AE FE25 0300 0315 0062;0061 05AE FE25 0300 0315 0062; 0061 FE25 0315 0300 05AE 0062;0061 05AE FE25 0300 0315 0062;0061 05AE FE25 0300 0315 0062;0061 05AE FE25 0300 0315 0062;0061 05AE FE25 0300 0315 0062;
0061 0315 0300 05AE FE26 0062;00E0 05AE FE26 0315 0062;0061 05AE 0300 FE26 0315 0062;00E0 05AE FE26 0315 0062;0061 05AE 0300 FE26 0315 0062; 0061 0315 0300 05AE FE26 0062;00E0 05AE FE26 0315 0062;0061 05AE 0300 FE26 0315 0062;00E0 05AE FE26 0315 0062;0061 05AE 0300 FE26 0315 0062;
0061 FE26 0315 0300 05AE 0062;0061 05AE FE26 0300 0315 0062;0061 05AE FE26 0300 0315 0062;0061 05AE FE26 0300 0315 0062;0061 05AE FE26 0300 0315 0062; 0061 FE26 0315 0300 05AE 0062;0061 05AE FE26 0300 0315 0062;0061 05AE FE26 0300 0315 0062;0061 05AE FE26 0300 0315 0062;0061 05AE FE26 0300 0315 0062;
0061 059A 0316 302A FE27 0062;0061 302A 0316 FE27 059A 0062;0061 302A 0316 FE27 059A 0062;0061 302A 0316 FE27 059A 0062;0061 302A 0316 FE27 059A 0062;
0061 FE27 059A 0316 302A 0062;0061 302A FE27 0316 059A 0062;0061 302A FE27 0316 059A 0062;0061 302A FE27 0316 059A 0062;0061 302A FE27 0316 059A 0062;
0061 059A 0316 302A FE28 0062;0061 302A 0316 FE28 059A 0062;0061 302A 0316 FE28 059A 0062;0061 302A 0316 FE28 059A 0062;0061 302A 0316 FE28 059A 0062;
0061 FE28 059A 0316 302A 0062;0061 302A FE28 0316 059A 0062;0061 302A FE28 0316 059A 0062;0061 302A FE28 0316 059A 0062;0061 302A FE28 0316 059A 0062;
0061 059A 0316 302A FE29 0062;0061 302A 0316 FE29 059A 0062;0061 302A 0316 FE29 059A 0062;0061 302A 0316 FE29 059A 0062;0061 302A 0316 FE29 059A 0062;
0061 FE29 059A 0316 302A 0062;0061 302A FE29 0316 059A 0062;0061 302A FE29 0316 059A 0062;0061 302A FE29 0316 059A 0062;0061 302A FE29 0316 059A 0062;
0061 059A 0316 302A FE2A 0062;0061 302A 0316 FE2A 059A 0062;0061 302A 0316 FE2A 059A 0062;0061 302A 0316 FE2A 059A 0062;0061 302A 0316 FE2A 059A 0062;
0061 FE2A 059A 0316 302A 0062;0061 302A FE2A 0316 059A 0062;0061 302A FE2A 0316 059A 0062;0061 302A FE2A 0316 059A 0062;0061 302A FE2A 0316 059A 0062;
0061 059A 0316 302A FE2B 0062;0061 302A 0316 FE2B 059A 0062;0061 302A 0316 FE2B 059A 0062;0061 302A 0316 FE2B 059A 0062;0061 302A 0316 FE2B 059A 0062;
0061 FE2B 059A 0316 302A 0062;0061 302A FE2B 0316 059A 0062;0061 302A FE2B 0316 059A 0062;0061 302A FE2B 0316 059A 0062;0061 302A FE2B 0316 059A 0062;
0061 059A 0316 302A FE2C 0062;0061 302A 0316 FE2C 059A 0062;0061 302A 0316 FE2C 059A 0062;0061 302A 0316 FE2C 059A 0062;0061 302A 0316 FE2C 059A 0062;
0061 FE2C 059A 0316 302A 0062;0061 302A FE2C 0316 059A 0062;0061 302A FE2C 0316 059A 0062;0061 302A FE2C 0316 059A 0062;0061 302A FE2C 0316 059A 0062;
0061 059A 0316 302A FE2D 0062;0061 302A 0316 FE2D 059A 0062;0061 302A 0316 FE2D 059A 0062;0061 302A 0316 FE2D 059A 0062;0061 302A 0316 FE2D 059A 0062;
0061 FE2D 059A 0316 302A 0062;0061 302A FE2D 0316 059A 0062;0061 302A FE2D 0316 059A 0062;0061 302A FE2D 0316 059A 0062;0061 302A FE2D 0316 059A 0062;
0061 059A 0316 302A 101FD 0062;0061 302A 0316 101FD 059A 0062;0061 302A 0316 101FD 059A 0062;0061 302A 0316 101FD 059A 0062;0061 302A 0316 101FD 059A 0062; 0061 059A 0316 302A 101FD 0062;0061 302A 0316 101FD 059A 0062;0061 302A 0316 101FD 059A 0062;0061 302A 0316 101FD 059A 0062;0061 302A 0316 101FD 059A 0062;
0061 101FD 059A 0316 302A 0062;0061 302A 101FD 0316 059A 0062;0061 302A 101FD 0316 059A 0062;0061 302A 101FD 0316 059A 0062;0061 302A 101FD 0316 059A 0062; 0061 101FD 059A 0316 302A 0062;0061 302A 101FD 0316 059A 0062;0061 302A 101FD 0316 059A 0062;0061 302A 101FD 0316 059A 0062;0061 302A 101FD 0316 059A 0062;
0061 059A 0316 302A 102E0 0062;0061 302A 0316 102E0 059A 0062;0061 302A 0316 102E0 059A 0062;0061 302A 0316 102E0 059A 0062;0061 302A 0316 102E0 059A 0062;
0061 102E0 059A 0316 302A 0062;0061 302A 102E0 0316 059A 0062;0061 302A 102E0 0316 059A 0062;0061 302A 102E0 0316 059A 0062;0061 302A 102E0 0316 059A 0062;
0061 0315 0300 05AE 10376 0062;00E0 05AE 10376 0315 0062;0061 05AE 0300 10376 0315 0062;00E0 05AE 10376 0315 0062;0061 05AE 0300 10376 0315 0062;
0061 10376 0315 0300 05AE 0062;0061 05AE 10376 0300 0315 0062;0061 05AE 10376 0300 0315 0062;0061 05AE 10376 0300 0315 0062;0061 05AE 10376 0300 0315 0062;
0061 0315 0300 05AE 10377 0062;00E0 05AE 10377 0315 0062;0061 05AE 0300 10377 0315 0062;00E0 05AE 10377 0315 0062;0061 05AE 0300 10377 0315 0062;
0061 10377 0315 0300 05AE 0062;0061 05AE 10377 0300 0315 0062;0061 05AE 10377 0300 0315 0062;0061 05AE 10377 0300 0315 0062;0061 05AE 10377 0300 0315 0062;
0061 0315 0300 05AE 10378 0062;00E0 05AE 10378 0315 0062;0061 05AE 0300 10378 0315 0062;00E0 05AE 10378 0315 0062;0061 05AE 0300 10378 0315 0062;
0061 10378 0315 0300 05AE 0062;0061 05AE 10378 0300 0315 0062;0061 05AE 10378 0300 0315 0062;0061 05AE 10378 0300 0315 0062;0061 05AE 10378 0300 0315 0062;
0061 0315 0300 05AE 10379 0062;00E0 05AE 10379 0315 0062;0061 05AE 0300 10379 0315 0062;00E0 05AE 10379 0315 0062;0061 05AE 0300 10379 0315 0062;
0061 10379 0315 0300 05AE 0062;0061 05AE 10379 0300 0315 0062;0061 05AE 10379 0300 0315 0062;0061 05AE 10379 0300 0315 0062;0061 05AE 10379 0300 0315 0062;
0061 0315 0300 05AE 1037A 0062;00E0 05AE 1037A 0315 0062;0061 05AE 0300 1037A 0315 0062;00E0 05AE 1037A 0315 0062;0061 05AE 0300 1037A 0315 0062;
0061 1037A 0315 0300 05AE 0062;0061 05AE 1037A 0300 0315 0062;0061 05AE 1037A 0300 0315 0062;0061 05AE 1037A 0300 0315 0062;0061 05AE 1037A 0300 0315 0062;
0061 059A 0316 302A 10A0D 0062;0061 302A 0316 10A0D 059A 0062;0061 302A 0316 10A0D 059A 0062;0061 302A 0316 10A0D 059A 0062;0061 302A 0316 10A0D 059A 0062; 0061 059A 0316 302A 10A0D 0062;0061 302A 0316 10A0D 059A 0062;0061 302A 0316 10A0D 059A 0062;0061 302A 0316 10A0D 059A 0062;0061 302A 0316 10A0D 059A 0062;
0061 10A0D 059A 0316 302A 0062;0061 302A 10A0D 0316 059A 0062;0061 302A 10A0D 0316 059A 0062;0061 302A 10A0D 0316 059A 0062;0061 302A 10A0D 0316 059A 0062; 0061 10A0D 059A 0316 302A 0062;0061 302A 10A0D 0316 059A 0062;0061 302A 10A0D 0316 059A 0062;0061 302A 10A0D 0316 059A 0062;0061 302A 10A0D 0316 059A 0062;
0061 0315 0300 05AE 10A0F 0062;00E0 05AE 10A0F 0315 0062;0061 05AE 0300 10A0F 0315 0062;00E0 05AE 10A0F 0315 0062;0061 05AE 0300 10A0F 0315 0062; 0061 0315 0300 05AE 10A0F 0062;00E0 05AE 10A0F 0315 0062;0061 05AE 0300 10A0F 0315 0062;00E0 05AE 10A0F 0315 0062;0061 05AE 0300 10A0F 0315 0062;
@ -18168,8 +18271,14 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 10A3A 059A 0316 302A 0062;0061 302A 10A3A 0316 059A 0062;0061 302A 10A3A 0316 059A 0062;0061 302A 10A3A 0316 059A 0062;0061 302A 10A3A 0316 059A 0062; 0061 10A3A 059A 0316 302A 0062;0061 302A 10A3A 0316 059A 0062;0061 302A 10A3A 0316 059A 0062;0061 302A 10A3A 0316 059A 0062;0061 302A 10A3A 0316 059A 0062;
0061 05B0 094D 3099 10A3F 0062;0061 3099 094D 10A3F 05B0 0062;0061 3099 094D 10A3F 05B0 0062;0061 3099 094D 10A3F 05B0 0062;0061 3099 094D 10A3F 05B0 0062; 0061 05B0 094D 3099 10A3F 0062;0061 3099 094D 10A3F 05B0 0062;0061 3099 094D 10A3F 05B0 0062;0061 3099 094D 10A3F 05B0 0062;0061 3099 094D 10A3F 05B0 0062;
0061 10A3F 05B0 094D 3099 0062;0061 3099 10A3F 094D 05B0 0062;0061 3099 10A3F 094D 05B0 0062;0061 3099 10A3F 094D 05B0 0062;0061 3099 10A3F 094D 05B0 0062; 0061 10A3F 05B0 094D 3099 0062;0061 3099 10A3F 094D 05B0 0062;0061 3099 10A3F 094D 05B0 0062;0061 3099 10A3F 094D 05B0 0062;0061 3099 10A3F 094D 05B0 0062;
0061 0315 0300 05AE 10AE5 0062;00E0 05AE 10AE5 0315 0062;0061 05AE 0300 10AE5 0315 0062;00E0 05AE 10AE5 0315 0062;0061 05AE 0300 10AE5 0315 0062;
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 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 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 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;
0061 1107F 05B0 094D 3099 0062;0061 3099 1107F 094D 05B0 0062;0061 3099 1107F 094D 05B0 0062;0061 3099 1107F 094D 05B0 0062;0061 3099 1107F 094D 05B0 0062;
0061 05B0 094D 3099 110B9 0062;0061 3099 094D 110B9 05B0 0062;0061 3099 094D 110B9 05B0 0062;0061 3099 094D 110B9 05B0 0062;0061 3099 094D 110B9 05B0 0062; 0061 05B0 094D 3099 110B9 0062;0061 3099 094D 110B9 05B0 0062;0061 3099 094D 110B9 05B0 0062;0061 3099 094D 110B9 05B0 0062;0061 3099 094D 110B9 05B0 0062;
0061 110B9 05B0 094D 3099 0062;0061 3099 110B9 094D 05B0 0062;0061 3099 110B9 094D 05B0 0062;0061 3099 110B9 094D 05B0 0062;0061 3099 110B9 094D 05B0 0062; 0061 110B9 05B0 094D 3099 0062;0061 3099 110B9 094D 05B0 0062;0061 3099 110B9 094D 05B0 0062;0061 3099 110B9 094D 05B0 0062;0061 3099 110B9 094D 05B0 0062;
0061 3099 093C 0334 110BA 0062;0061 0334 093C 110BA 3099 0062;0061 0334 093C 110BA 3099 0062;0061 0334 093C 110BA 3099 0062;0061 0334 093C 110BA 3099 0062; 0061 3099 093C 0334 110BA 0062;0061 0334 093C 110BA 3099 0062;0061 0334 093C 110BA 3099 0062;0061 0334 093C 110BA 3099 0062;0061 0334 093C 110BA 3099 0062;
@ -18184,12 +18293,86 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 11133 05B0 094D 3099 0062;0061 3099 11133 094D 05B0 0062;0061 3099 11133 094D 05B0 0062;0061 3099 11133 094D 05B0 0062;0061 3099 11133 094D 05B0 0062; 0061 11133 05B0 094D 3099 0062;0061 3099 11133 094D 05B0 0062;0061 3099 11133 094D 05B0 0062;0061 3099 11133 094D 05B0 0062;0061 3099 11133 094D 05B0 0062;
0061 05B0 094D 3099 11134 0062;0061 3099 094D 11134 05B0 0062;0061 3099 094D 11134 05B0 0062;0061 3099 094D 11134 05B0 0062;0061 3099 094D 11134 05B0 0062; 0061 05B0 094D 3099 11134 0062;0061 3099 094D 11134 05B0 0062;0061 3099 094D 11134 05B0 0062;0061 3099 094D 11134 05B0 0062;0061 3099 094D 11134 05B0 0062;
0061 11134 05B0 094D 3099 0062;0061 3099 11134 094D 05B0 0062;0061 3099 11134 094D 05B0 0062;0061 3099 11134 094D 05B0 0062;0061 3099 11134 094D 05B0 0062; 0061 11134 05B0 094D 3099 0062;0061 3099 11134 094D 05B0 0062;0061 3099 11134 094D 05B0 0062;0061 3099 11134 094D 05B0 0062;0061 3099 11134 094D 05B0 0062;
0061 3099 093C 0334 11173 0062;0061 0334 093C 11173 3099 0062;0061 0334 093C 11173 3099 0062;0061 0334 093C 11173 3099 0062;0061 0334 093C 11173 3099 0062;
0061 11173 3099 093C 0334 0062;0061 0334 11173 093C 3099 0062;0061 0334 11173 093C 3099 0062;0061 0334 11173 093C 3099 0062;0061 0334 11173 093C 3099 0062;
0061 05B0 094D 3099 111C0 0062;0061 3099 094D 111C0 05B0 0062;0061 3099 094D 111C0 05B0 0062;0061 3099 094D 111C0 05B0 0062;0061 3099 094D 111C0 05B0 0062; 0061 05B0 094D 3099 111C0 0062;0061 3099 094D 111C0 05B0 0062;0061 3099 094D 111C0 05B0 0062;0061 3099 094D 111C0 05B0 0062;0061 3099 094D 111C0 05B0 0062;
0061 111C0 05B0 094D 3099 0062;0061 3099 111C0 094D 05B0 0062;0061 3099 111C0 094D 05B0 0062;0061 3099 111C0 094D 05B0 0062;0061 3099 111C0 094D 05B0 0062; 0061 111C0 05B0 094D 3099 0062;0061 3099 111C0 094D 05B0 0062;0061 3099 111C0 094D 05B0 0062;0061 3099 111C0 094D 05B0 0062;0061 3099 111C0 094D 05B0 0062;
0061 05B0 094D 3099 11235 0062;0061 3099 094D 11235 05B0 0062;0061 3099 094D 11235 05B0 0062;0061 3099 094D 11235 05B0 0062;0061 3099 094D 11235 05B0 0062;
0061 11235 05B0 094D 3099 0062;0061 3099 11235 094D 05B0 0062;0061 3099 11235 094D 05B0 0062;0061 3099 11235 094D 05B0 0062;0061 3099 11235 094D 05B0 0062;
0061 3099 093C 0334 11236 0062;0061 0334 093C 11236 3099 0062;0061 0334 093C 11236 3099 0062;0061 0334 093C 11236 3099 0062;0061 0334 093C 11236 3099 0062;
0061 11236 3099 093C 0334 0062;0061 0334 11236 093C 3099 0062;0061 0334 11236 093C 3099 0062;0061 0334 11236 093C 3099 0062;0061 0334 11236 093C 3099 0062;
0061 3099 093C 0334 112E9 0062;0061 0334 093C 112E9 3099 0062;0061 0334 093C 112E9 3099 0062;0061 0334 093C 112E9 3099 0062;0061 0334 093C 112E9 3099 0062;
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 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;
0061 1134D 05B0 094D 3099 0062;0061 3099 1134D 094D 05B0 0062;0061 3099 1134D 094D 05B0 0062;0061 3099 1134D 094D 05B0 0062;0061 3099 1134D 094D 05B0 0062;
0061 0315 0300 05AE 11366 0062;00E0 05AE 11366 0315 0062;0061 05AE 0300 11366 0315 0062;00E0 05AE 11366 0315 0062;0061 05AE 0300 11366 0315 0062;
0061 11366 0315 0300 05AE 0062;0061 05AE 11366 0300 0315 0062;0061 05AE 11366 0300 0315 0062;0061 05AE 11366 0300 0315 0062;0061 05AE 11366 0300 0315 0062;
0061 0315 0300 05AE 11367 0062;00E0 05AE 11367 0315 0062;0061 05AE 0300 11367 0315 0062;00E0 05AE 11367 0315 0062;0061 05AE 0300 11367 0315 0062;
0061 11367 0315 0300 05AE 0062;0061 05AE 11367 0300 0315 0062;0061 05AE 11367 0300 0315 0062;0061 05AE 11367 0300 0315 0062;0061 05AE 11367 0300 0315 0062;
0061 0315 0300 05AE 11368 0062;00E0 05AE 11368 0315 0062;0061 05AE 0300 11368 0315 0062;00E0 05AE 11368 0315 0062;0061 05AE 0300 11368 0315 0062;
0061 11368 0315 0300 05AE 0062;0061 05AE 11368 0300 0315 0062;0061 05AE 11368 0300 0315 0062;0061 05AE 11368 0300 0315 0062;0061 05AE 11368 0300 0315 0062;
0061 0315 0300 05AE 11369 0062;00E0 05AE 11369 0315 0062;0061 05AE 0300 11369 0315 0062;00E0 05AE 11369 0315 0062;0061 05AE 0300 11369 0315 0062;
0061 11369 0315 0300 05AE 0062;0061 05AE 11369 0300 0315 0062;0061 05AE 11369 0300 0315 0062;0061 05AE 11369 0300 0315 0062;0061 05AE 11369 0300 0315 0062;
0061 0315 0300 05AE 1136A 0062;00E0 05AE 1136A 0315 0062;0061 05AE 0300 1136A 0315 0062;00E0 05AE 1136A 0315 0062;0061 05AE 0300 1136A 0315 0062;
0061 1136A 0315 0300 05AE 0062;0061 05AE 1136A 0300 0315 0062;0061 05AE 1136A 0300 0315 0062;0061 05AE 1136A 0300 0315 0062;0061 05AE 1136A 0300 0315 0062;
0061 0315 0300 05AE 1136B 0062;00E0 05AE 1136B 0315 0062;0061 05AE 0300 1136B 0315 0062;00E0 05AE 1136B 0315 0062;0061 05AE 0300 1136B 0315 0062;
0061 1136B 0315 0300 05AE 0062;0061 05AE 1136B 0300 0315 0062;0061 05AE 1136B 0300 0315 0062;0061 05AE 1136B 0300 0315 0062;0061 05AE 1136B 0300 0315 0062;
0061 0315 0300 05AE 1136C 0062;00E0 05AE 1136C 0315 0062;0061 05AE 0300 1136C 0315 0062;00E0 05AE 1136C 0315 0062;0061 05AE 0300 1136C 0315 0062;
0061 1136C 0315 0300 05AE 0062;0061 05AE 1136C 0300 0315 0062;0061 05AE 1136C 0300 0315 0062;0061 05AE 1136C 0300 0315 0062;0061 05AE 1136C 0300 0315 0062;
0061 0315 0300 05AE 11370 0062;00E0 05AE 11370 0315 0062;0061 05AE 0300 11370 0315 0062;00E0 05AE 11370 0315 0062;0061 05AE 0300 11370 0315 0062;
0061 11370 0315 0300 05AE 0062;0061 05AE 11370 0300 0315 0062;0061 05AE 11370 0300 0315 0062;0061 05AE 11370 0300 0315 0062;0061 05AE 11370 0300 0315 0062;
0061 0315 0300 05AE 11371 0062;00E0 05AE 11371 0315 0062;0061 05AE 0300 11371 0315 0062;00E0 05AE 11371 0315 0062;0061 05AE 0300 11371 0315 0062;
0061 11371 0315 0300 05AE 0062;0061 05AE 11371 0300 0315 0062;0061 05AE 11371 0300 0315 0062;0061 05AE 11371 0300 0315 0062;0061 05AE 11371 0300 0315 0062;
0061 0315 0300 05AE 11372 0062;00E0 05AE 11372 0315 0062;0061 05AE 0300 11372 0315 0062;00E0 05AE 11372 0315 0062;0061 05AE 0300 11372 0315 0062;
0061 11372 0315 0300 05AE 0062;0061 05AE 11372 0300 0315 0062;0061 05AE 11372 0300 0315 0062;0061 05AE 11372 0300 0315 0062;0061 05AE 11372 0300 0315 0062;
0061 0315 0300 05AE 11373 0062;00E0 05AE 11373 0315 0062;0061 05AE 0300 11373 0315 0062;00E0 05AE 11373 0315 0062;0061 05AE 0300 11373 0315 0062;
0061 11373 0315 0300 05AE 0062;0061 05AE 11373 0300 0315 0062;0061 05AE 11373 0300 0315 0062;0061 05AE 11373 0300 0315 0062;0061 05AE 11373 0300 0315 0062;
0061 0315 0300 05AE 11374 0062;00E0 05AE 11374 0315 0062;0061 05AE 0300 11374 0315 0062;00E0 05AE 11374 0315 0062;0061 05AE 0300 11374 0315 0062;
0061 11374 0315 0300 05AE 0062;0061 05AE 11374 0300 0315 0062;0061 05AE 11374 0300 0315 0062;0061 05AE 11374 0300 0315 0062;0061 05AE 11374 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;
0061 114C3 3099 093C 0334 0062;0061 0334 114C3 093C 3099 0062;0061 0334 114C3 093C 3099 0062;0061 0334 114C3 093C 3099 0062;0061 0334 114C3 093C 3099 0062;
0061 05B0 094D 3099 115BF 0062;0061 3099 094D 115BF 05B0 0062;0061 3099 094D 115BF 05B0 0062;0061 3099 094D 115BF 05B0 0062;0061 3099 094D 115BF 05B0 0062;
0061 115BF 05B0 094D 3099 0062;0061 3099 115BF 094D 05B0 0062;0061 3099 115BF 094D 05B0 0062;0061 3099 115BF 094D 05B0 0062;0061 3099 115BF 094D 05B0 0062;
0061 3099 093C 0334 115C0 0062;0061 0334 093C 115C0 3099 0062;0061 0334 093C 115C0 3099 0062;0061 0334 093C 115C0 3099 0062;0061 0334 093C 115C0 3099 0062;
0061 115C0 3099 093C 0334 0062;0061 0334 115C0 093C 3099 0062;0061 0334 115C0 093C 3099 0062;0061 0334 115C0 093C 3099 0062;0061 0334 115C0 093C 3099 0062;
0061 05B0 094D 3099 1163F 0062;0061 3099 094D 1163F 05B0 0062;0061 3099 094D 1163F 05B0 0062;0061 3099 094D 1163F 05B0 0062;0061 3099 094D 1163F 05B0 0062;
0061 1163F 05B0 094D 3099 0062;0061 3099 1163F 094D 05B0 0062;0061 3099 1163F 094D 05B0 0062;0061 3099 1163F 094D 05B0 0062;0061 3099 1163F 094D 05B0 0062;
0061 05B0 094D 3099 116B6 0062;0061 3099 094D 116B6 05B0 0062;0061 3099 094D 116B6 05B0 0062;0061 3099 094D 116B6 05B0 0062;0061 3099 094D 116B6 05B0 0062; 0061 05B0 094D 3099 116B6 0062;0061 3099 094D 116B6 05B0 0062;0061 3099 094D 116B6 05B0 0062;0061 3099 094D 116B6 05B0 0062;0061 3099 094D 116B6 05B0 0062;
0061 116B6 05B0 094D 3099 0062;0061 3099 116B6 094D 05B0 0062;0061 3099 116B6 094D 05B0 0062;0061 3099 116B6 094D 05B0 0062;0061 3099 116B6 094D 05B0 0062; 0061 116B6 05B0 094D 3099 0062;0061 3099 116B6 094D 05B0 0062;0061 3099 116B6 094D 05B0 0062;0061 3099 116B6 094D 05B0 0062;0061 3099 116B6 094D 05B0 0062;
0061 3099 093C 0334 116B7 0062;0061 0334 093C 116B7 3099 0062;0061 0334 093C 116B7 3099 0062;0061 0334 093C 116B7 3099 0062;0061 0334 093C 116B7 3099 0062; 0061 3099 093C 0334 116B7 0062;0061 0334 093C 116B7 3099 0062;0061 0334 093C 116B7 3099 0062;0061 0334 093C 116B7 3099 0062;0061 0334 093C 116B7 3099 0062;
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 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 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;
0061 16AF1 093C 0334 0062;0061 16AF1 0334 093C 0062;0061 16AF1 0334 093C 0062;0061 16AF1 0334 093C 0062;0061 16AF1 0334 093C 0062;
0061 093C 0334 16AF2 0062;0061 0334 16AF2 093C 0062;0061 0334 16AF2 093C 0062;0061 0334 16AF2 093C 0062;0061 0334 16AF2 093C 0062;
0061 16AF2 093C 0334 0062;0061 16AF2 0334 093C 0062;0061 16AF2 0334 093C 0062;0061 16AF2 0334 093C 0062;0061 16AF2 0334 093C 0062;
0061 093C 0334 16AF3 0062;0061 0334 16AF3 093C 0062;0061 0334 16AF3 093C 0062;0061 0334 16AF3 093C 0062;0061 0334 16AF3 093C 0062;
0061 16AF3 093C 0334 0062;0061 16AF3 0334 093C 0062;0061 16AF3 0334 093C 0062;0061 16AF3 0334 093C 0062;0061 16AF3 0334 093C 0062;
0061 093C 0334 16AF4 0062;0061 0334 16AF4 093C 0062;0061 0334 16AF4 093C 0062;0061 0334 16AF4 093C 0062;0061 0334 16AF4 093C 0062;
0061 16AF4 093C 0334 0062;0061 16AF4 0334 093C 0062;0061 16AF4 0334 093C 0062;0061 16AF4 0334 093C 0062;0061 16AF4 0334 093C 0062;
0061 0315 0300 05AE 16B30 0062;00E0 05AE 16B30 0315 0062;0061 05AE 0300 16B30 0315 0062;00E0 05AE 16B30 0315 0062;0061 05AE 0300 16B30 0315 0062;
0061 16B30 0315 0300 05AE 0062;0061 05AE 16B30 0300 0315 0062;0061 05AE 16B30 0300 0315 0062;0061 05AE 16B30 0300 0315 0062;0061 05AE 16B30 0300 0315 0062;
0061 0315 0300 05AE 16B31 0062;00E0 05AE 16B31 0315 0062;0061 05AE 0300 16B31 0315 0062;00E0 05AE 16B31 0315 0062;0061 05AE 0300 16B31 0315 0062;
0061 16B31 0315 0300 05AE 0062;0061 05AE 16B31 0300 0315 0062;0061 05AE 16B31 0300 0315 0062;0061 05AE 16B31 0300 0315 0062;0061 05AE 16B31 0300 0315 0062;
0061 0315 0300 05AE 16B32 0062;00E0 05AE 16B32 0315 0062;0061 05AE 0300 16B32 0315 0062;00E0 05AE 16B32 0315 0062;0061 05AE 0300 16B32 0315 0062;
0061 16B32 0315 0300 05AE 0062;0061 05AE 16B32 0300 0315 0062;0061 05AE 16B32 0300 0315 0062;0061 05AE 16B32 0300 0315 0062;0061 05AE 16B32 0300 0315 0062;
0061 0315 0300 05AE 16B33 0062;00E0 05AE 16B33 0315 0062;0061 05AE 0300 16B33 0315 0062;00E0 05AE 16B33 0315 0062;0061 05AE 0300 16B33 0315 0062;
0061 16B33 0315 0300 05AE 0062;0061 05AE 16B33 0300 0315 0062;0061 05AE 16B33 0300 0315 0062;0061 05AE 16B33 0300 0315 0062;0061 05AE 16B33 0300 0315 0062;
0061 0315 0300 05AE 16B34 0062;00E0 05AE 16B34 0315 0062;0061 05AE 0300 16B34 0315 0062;00E0 05AE 16B34 0315 0062;0061 05AE 0300 16B34 0315 0062;
0061 16B34 0315 0300 05AE 0062;0061 05AE 16B34 0300 0315 0062;0061 05AE 16B34 0300 0315 0062;0061 05AE 16B34 0300 0315 0062;0061 05AE 16B34 0300 0315 0062;
0061 0315 0300 05AE 16B35 0062;00E0 05AE 16B35 0315 0062;0061 05AE 0300 16B35 0315 0062;00E0 05AE 16B35 0315 0062;0061 05AE 0300 16B35 0315 0062;
0061 16B35 0315 0300 05AE 0062;0061 05AE 16B35 0300 0315 0062;0061 05AE 16B35 0300 0315 0062;0061 05AE 16B35 0300 0315 0062;0061 05AE 16B35 0300 0315 0062;
0061 0315 0300 05AE 16B36 0062;00E0 05AE 16B36 0315 0062;0061 05AE 0300 16B36 0315 0062;00E0 05AE 16B36 0315 0062;0061 05AE 0300 16B36 0315 0062;
0061 16B36 0315 0300 05AE 0062;0061 05AE 16B36 0300 0315 0062;0061 05AE 16B36 0300 0315 0062;0061 05AE 16B36 0300 0315 0062;0061 05AE 16B36 0300 0315 0062;
0061 093C 0334 1BC9E 0062;0061 0334 1BC9E 093C 0062;0061 0334 1BC9E 093C 0062;0061 0334 1BC9E 093C 0062;0061 0334 1BC9E 093C 0062;
0061 1BC9E 093C 0334 0062;0061 1BC9E 0334 093C 0062;0061 1BC9E 0334 093C 0062;0061 1BC9E 0334 093C 0062;0061 1BC9E 0334 093C 0062;
0061 302A 031B 1DCE 1D165 0062;0061 1DCE 031B 1D165 302A 0062;0061 1DCE 031B 1D165 302A 0062;0061 1DCE 031B 1D165 302A 0062;0061 1DCE 031B 1D165 302A 0062; 0061 302A 031B 1DCE 1D165 0062;0061 1DCE 031B 1D165 302A 0062;0061 1DCE 031B 1D165 302A 0062;0061 1DCE 031B 1D165 302A 0062;0061 1DCE 031B 1D165 302A 0062;
0061 1D165 302A 031B 1DCE 0062;0061 1DCE 1D165 031B 302A 0062;0061 1DCE 1D165 031B 302A 0062;0061 1DCE 1D165 031B 302A 0062;0061 1DCE 1D165 031B 302A 0062; 0061 1D165 302A 031B 1DCE 0062;0061 1DCE 1D165 031B 302A 0062;0061 1DCE 1D165 031B 302A 0062;0061 1DCE 1D165 031B 302A 0062;0061 1DCE 1D165 031B 302A 0062;
0061 302A 031B 1DCE 1D166 0062;0061 1DCE 031B 1D166 302A 0062;0061 1DCE 031B 1D166 302A 0062;0061 1DCE 031B 1D166 302A 0062;0061 1DCE 031B 1D166 302A 0062; 0061 302A 031B 1DCE 1D166 0062;0061 1DCE 031B 1D166 302A 0062;0061 1DCE 031B 1D166 302A 0062;0061 1DCE 031B 1D166 302A 0062;0061 1DCE 031B 1D166 302A 0062;
@ -18256,6 +18439,20 @@ FFEE;FFEE;FFEE;25CB;25CB;
0061 1D243 0315 0300 05AE 0062;0061 05AE 1D243 0300 0315 0062;0061 05AE 1D243 0300 0315 0062;0061 05AE 1D243 0300 0315 0062;0061 05AE 1D243 0300 0315 0062; 0061 1D243 0315 0300 05AE 0062;0061 05AE 1D243 0300 0315 0062;0061 05AE 1D243 0300 0315 0062;0061 05AE 1D243 0300 0315 0062;0061 05AE 1D243 0300 0315 0062;
0061 0315 0300 05AE 1D244 0062;00E0 05AE 1D244 0315 0062;0061 05AE 0300 1D244 0315 0062;00E0 05AE 1D244 0315 0062;0061 05AE 0300 1D244 0315 0062; 0061 0315 0300 05AE 1D244 0062;00E0 05AE 1D244 0315 0062;0061 05AE 0300 1D244 0315 0062;00E0 05AE 1D244 0315 0062;0061 05AE 0300 1D244 0315 0062;
0061 1D244 0315 0300 05AE 0062;0061 05AE 1D244 0300 0315 0062;0061 05AE 1D244 0300 0315 0062;0061 05AE 1D244 0300 0315 0062;0061 05AE 1D244 0300 0315 0062; 0061 1D244 0315 0300 05AE 0062;0061 05AE 1D244 0300 0315 0062;0061 05AE 1D244 0300 0315 0062;0061 05AE 1D244 0300 0315 0062;0061 05AE 1D244 0300 0315 0062;
0061 059A 0316 302A 1E8D0 0062;0061 302A 0316 1E8D0 059A 0062;0061 302A 0316 1E8D0 059A 0062;0061 302A 0316 1E8D0 059A 0062;0061 302A 0316 1E8D0 059A 0062;
0061 1E8D0 059A 0316 302A 0062;0061 302A 1E8D0 0316 059A 0062;0061 302A 1E8D0 0316 059A 0062;0061 302A 1E8D0 0316 059A 0062;0061 302A 1E8D0 0316 059A 0062;
0061 059A 0316 302A 1E8D1 0062;0061 302A 0316 1E8D1 059A 0062;0061 302A 0316 1E8D1 059A 0062;0061 302A 0316 1E8D1 059A 0062;0061 302A 0316 1E8D1 059A 0062;
0061 1E8D1 059A 0316 302A 0062;0061 302A 1E8D1 0316 059A 0062;0061 302A 1E8D1 0316 059A 0062;0061 302A 1E8D1 0316 059A 0062;0061 302A 1E8D1 0316 059A 0062;
0061 059A 0316 302A 1E8D2 0062;0061 302A 0316 1E8D2 059A 0062;0061 302A 0316 1E8D2 059A 0062;0061 302A 0316 1E8D2 059A 0062;0061 302A 0316 1E8D2 059A 0062;
0061 1E8D2 059A 0316 302A 0062;0061 302A 1E8D2 0316 059A 0062;0061 302A 1E8D2 0316 059A 0062;0061 302A 1E8D2 0316 059A 0062;0061 302A 1E8D2 0316 059A 0062;
0061 059A 0316 302A 1E8D3 0062;0061 302A 0316 1E8D3 059A 0062;0061 302A 0316 1E8D3 059A 0062;0061 302A 0316 1E8D3 059A 0062;0061 302A 0316 1E8D3 059A 0062;
0061 1E8D3 059A 0316 302A 0062;0061 302A 1E8D3 0316 059A 0062;0061 302A 1E8D3 0316 059A 0062;0061 302A 1E8D3 0316 059A 0062;0061 302A 1E8D3 0316 059A 0062;
0061 059A 0316 302A 1E8D4 0062;0061 302A 0316 1E8D4 059A 0062;0061 302A 0316 1E8D4 059A 0062;0061 302A 0316 1E8D4 059A 0062;0061 302A 0316 1E8D4 059A 0062;
0061 1E8D4 059A 0316 302A 0062;0061 302A 1E8D4 0316 059A 0062;0061 302A 1E8D4 0316 059A 0062;0061 302A 1E8D4 0316 059A 0062;0061 302A 1E8D4 0316 059A 0062;
0061 059A 0316 302A 1E8D5 0062;0061 302A 0316 1E8D5 059A 0062;0061 302A 0316 1E8D5 059A 0062;0061 302A 0316 1E8D5 059A 0062;0061 302A 0316 1E8D5 059A 0062;
0061 1E8D5 059A 0316 302A 0062;0061 302A 1E8D5 0316 059A 0062;0061 302A 1E8D5 0316 059A 0062;0061 302A 1E8D5 0316 059A 0062;0061 302A 1E8D5 0316 059A 0062;
0061 059A 0316 302A 1E8D6 0062;0061 302A 0316 1E8D6 059A 0062;0061 302A 0316 1E8D6 059A 0062;0061 302A 0316 1E8D6 059A 0062;0061 302A 0316 1E8D6 059A 0062;
0061 1E8D6 059A 0316 302A 0062;0061 302A 1E8D6 0316 059A 0062;0061 302A 1E8D6 0316 059A 0062;0061 302A 1E8D6 0316 059A 0062;0061 302A 1E8D6 0316 059A 0062;
# #
@Part3 # PRI #29 Test @Part3 # PRI #29 Test
# #
@ -18427,5 +18624,12 @@ D6FC 0334 11AE;D6FC 0334 11AE;1112 1170 0334 11AE;D6FC 0334 11AE;1112 1170 0334
D750 0334 11B5;D750 0334 11B5;1112 1173 0334 11B5;D750 0334 11B5;1112 1173 0334 11B5; D750 0334 11B5;D750 0334 11B5;1112 1173 0334 11B5;D750 0334 11B5;1112 1173 0334 11B5;
11131 0334 11127;11131 0334 11127;11131 0334 11127;11131 0334 11127;11131 0334 11127; 11131 0334 11127;11131 0334 11127;11131 0334 11127;11131 0334 11127;11131 0334 11127;
11132 0334 11127;11132 0334 11127;11132 0334 11127;11132 0334 11127;11132 0334 11127; 11132 0334 11127;11132 0334 11127;11132 0334 11127;11132 0334 11127;11132 0334 11127;
11347 0334 1133E;11347 0334 1133E;11347 0334 1133E;11347 0334 1133E;11347 0334 1133E;
11347 0334 11357;11347 0334 11357;11347 0334 11357;11347 0334 11357;11347 0334 11357;
114B9 0334 114B0;114B9 0334 114B0;114B9 0334 114B0;114B9 0334 114B0;114B9 0334 114B0;
114B9 0334 114BA;114B9 0334 114BA;114B9 0334 114BA;114B9 0334 114BA;114B9 0334 114BA;
114B9 0334 114BD;114B9 0334 114BD;114B9 0334 114BD;114B9 0334 114BD;114B9 0334 114BD;
115B8 0334 115AF;115B8 0334 115AF;115B8 0334 115AF;115B8 0334 115AF;115B8 0334 115AF;
115B9 0334 115AF;115B9 0334 115AF;115B9 0334 115AF;115B9 0334 115AF;115B9 0334 115AF;
# #
# EOF # EOF

View File

@ -1,18 +1,25 @@
# SpecialCasing-6.3.0.txt # SpecialCasing-7.0.0.txt
# Date: 2013-05-08, 13:54:51 GMT [MD] # Date: 2014-03-18, 07:18:02 GMT [MD]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2014 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html # For terms of use, see http://www.unicode.org/terms_of_use.html
# For documentation, see http://www.unicode.org/reports/tr44/ # For documentation, see http://www.unicode.org/reports/tr44/
# #
# Special Casing Properties # Special Casing
# #
# This file is a supplement to the UnicodeData file. # This file is a supplement to the UnicodeData.txt file. It does not define any
# It contains additional information about the casing of Unicode characters. # properties, but rather provides additional information about the casing of
# (For compatibility, the UnicodeData.txt file only contains case mappings for # Unicode characters, for situations when casing incurs a change in string length
# characters where they are 1-1, and independent of context and language. # or is dependent on context or locale. For compatibility, the UnicodeData.txt
# For more information, see the discussion of Case Mappings in the Unicode Standard. # file only contains simple case mappings for characters where they are one-to-one
# and independent of context and language. The data in this file, combined with
# the simple case mappings in UnicodeData.txt, defines the full case mappings
# Lowercase_Mapping (lc), Titlecase_Mapping (tc), and Uppercase_Mapping (uc).
#
# Note that the preferred mechanism for defining tailored casing operations is
# the Unicode Common Locale Data Repository (CLDR). For more information, see the
# discussion of case mappings and case algorithms in the Unicode Standard.
# #
# All code points not listed in this file that do not have a simple case mappings # All code points not listed in this file that do not have a simple case mappings
# in UnicodeData.txt map to themselves. # in UnicodeData.txt map to themselves.
@ -21,16 +28,17 @@
# ================================================================================ # ================================================================================
# The entries in this file are in the following machine-readable format: # The entries in this file are in the following machine-readable format:
# #
# <code>; <lower> ; <title> ; <upper> ; (<condition_list> ;)? # <comment> # <code>; <lower>; <title>; <upper>; (<condition_list>;)? # <comment>
# #
# <code>, <lower>, <title>, and <upper> provide character values in hex. If there is more # <code>, <lower>, <title>, and <upper> provide the respective full case mappings
# than one character, they are separated by spaces. Other than as used to separate # of <code>, expressed as character values in hex. If there is more than one character,
# elements, spaces are to be ignored. # they are separated by spaces. Other than as used to separate elements, spaces are
# to be ignored.
# #
# The <condition_list> is optional. Where present, it consists of one or more language IDs # The <condition_list> is optional. Where present, it consists of one or more language IDs
# or contexts, separated by spaces. In these conditions: # or casing contexts, separated by spaces. In these conditions:
# - A condition list overrides the normal behavior if all of the listed conditions are true. # - A condition list overrides the normal behavior if all of the listed conditions are true.
# - The context is always the context of the characters in the original string, # - The casing context is always the context of the characters in the original string,
# NOT in the resulting string. # NOT in the resulting string.
# - Case distinctions in the condition list are not significant. # - Case distinctions in the condition list are not significant.
# - Conditions preceded by "Not_" represent the negation of the condition. # - Conditions preceded by "Not_" represent the negation of the condition.
@ -38,18 +46,14 @@
# #
# A language ID is defined by BCP 47, with '-' and '_' treated equivalently. # A language ID is defined by BCP 47, with '-' and '_' treated equivalently.
# #
# A context for a character C is defined by Section 3.13 Default Case # A casing context for a character is defined by Section 3.13 Default Case Algorithms
# Algorithms, of The Unicode Standard, Version 6.3. # of The Unicode Standard.
# (This is identical to the context defined by Unicode 4.1.0,
# as specified in http://www.unicode.org/versions/Unicode4.1.0/)
# #
# Parsers of this file must be prepared to deal with future additions to this format: # Parsers of this file must be prepared to deal with future additions to this format:
# * Additional contexts # * Additional contexts
# * Additional fields # * Additional fields
# ================================================================================ # ================================================================================
# @missing: 0000..10FFFF; <slc>; <stc>; <suc>;
# ================================================================================ # ================================================================================
# Unconditional mappings # Unconditional mappings
# ================================================================================ # ================================================================================
@ -114,7 +118,7 @@ FB17; FB17; 0544 056D; 0544 053D; # ARMENIAN SMALL LIGATURE MEN XEH
# This process can be achieved by first transforming the text to NFC before casing. # This process can be achieved by first transforming the text to NFC before casing.
# E.g. <alpha><iota_subscript><acute> is uppercased to <ALPHA><acute><IOTA> # E.g. <alpha><iota_subscript><acute> is uppercased to <ALPHA><acute><IOTA>
# The following cases are already in the UnicodeData file, so are only commented here. # The following cases are already in the UnicodeData.txt file, so are only commented here.
# 0345; 0345; 0345; 0399; # COMBINING GREEK YPOGEGRAMMENI # 0345; 0345; 0345; 0399; # COMBINING GREEK YPOGEGRAMMENI
@ -205,7 +209,7 @@ FB17; FB17; 0544 056D; 0544 053D; # ARMENIAN SMALL LIGATURE MEN XEH
03A3; 03C2; 03A3; 03A3; Final_Sigma; # GREEK CAPITAL LETTER SIGMA 03A3; 03C2; 03A3; 03A3; Final_Sigma; # GREEK CAPITAL LETTER SIGMA
# Note: the following cases for non-final are already in the UnicodeData file. # Note: the following cases for non-final are already in the UnicodeData.txt file.
# 03A3; 03C3; 03A3; 03A3; # GREEK CAPITAL LETTER SIGMA # 03A3; 03C3; 03A3; 03A3; # GREEK CAPITAL LETTER SIGMA
# 03C3; 03C3; 03A3; 03A3; # GREEK SMALL LETTER SIGMA # 03C3; 03C3; 03A3; 03A3; # GREEK SMALL LETTER SIGMA
@ -268,7 +272,7 @@ FB17; FB17; 0544 056D; 0544 053D; # ARMENIAN SMALL LIGATURE MEN XEH
0069; 0069; 0130; 0130; tr; # LATIN SMALL LETTER I 0069; 0069; 0130; 0130; tr; # LATIN SMALL LETTER I
0069; 0069; 0130; 0130; az; # LATIN SMALL LETTER I 0069; 0069; 0130; 0130; az; # LATIN SMALL LETTER I
# Note: the following case is already in the UnicodeData file. # Note: the following case is already in the UnicodeData.txt file.
# 0131; 0131; 0049; 0049; tr; # LATIN SMALL LETTER DOTLESS I # 0131; 0131; 0049; 0049; tr; # LATIN SMALL LETTER DOTLESS I

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
* Copyright (C) 2004-2013, International Business Machines * Copyright (C) 2004-2014, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
* *
* file name: changes.txt * file name: changes.txt
@ -13,6 +13,390 @@
---------------------------------------------------------------------------- *** ---------------------------------------------------------------------------- ***
Unicode 8.0 update for ICU ??
* UCA issue from 7.0
- U+1DE9 COMBINING LATIN SMALL LETTER BETA
sorts with Greek Beta, should sort with Latin B?
+ Ken says:
No, it was deliberate:
03B2;GREEK SMALL LETTER BETA;Ll;;;;0392;;0392
1D5D;MODIFIER LETTER SMALL BETA;Lm;<super> 03B2;;;;;
1DE9;COMBINING LATIN SMALL LETTER BETA;Mn;<sort> 03B2;;;;;
1D66;GREEK SUBSCRIPT SMALL LETTER BETA;Ll;<sub> 03B2;;;;;
Note the relationship to U+1D5D.
When the disunified *Latin* beta base letter shows up in Unicode 8.0:
U+A7B4 LATIN CAPITAL LETTER BETA
U+A7B5 LATIN SMALL LETTER BETA
we could re-evaluate what U+1DE9 equates to, for collation,
but currently there isnt any Latin beta to serve that function
in Unicode 7.0.
---------------------------------------------------------------------------- ***
Unicode 7.0 update for ICU 54
http://www.unicode.org/review/pri271/ -- beta review
http://www.unicode.org/reports/uax-proposed-updates.html
http://www.unicode.org/versions/beta-7.0.0.html#notable_issues
http://www.unicode.org/reports/tr44/tr44-13.html
*** ICU Trac
- ticket 10821: Unicode 7.0, UCA 7.0
- C++ branches/markus/uni70 at r35584 from trunk at r35580
- Java branches/markus/uni70 at r35587 from trunk at r35545
*** CLDR Trac
- ticket 7195: UCA 7.0 CLDR root collation
- branches/markus/uni70 at r10062 from trunk at r10061
- ticket 6762: script metadata for Unicode 7.0 new scripts
*** 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
* file preparation
- download UCD & IDNA files
- make sure that the Unicode data folder passed into preparseucd.py
includes a copy of the latest IdnaMappingTable.txt (can be in some subfolder)
- only for manual diffs: remove version suffixes from the file names
~/unidata/uni70/20140403$ ../../desuffixucd.py .
(see https://sites.google.com/site/unicodetools/inputdata)
- only for manual diffs: extract Unihan.zip to "here" (.../ucd/Unihan/*.txt), delete Unihan.zip
- ~/svn.icutools/trunk/src/unicode$ py/preparseucd.py ~/unidata/uni70/20140403 ~/svn.icu/uni70/src ~/svn.icutools/trunk/src
- This writes files (especially ppucd.txt) to the ICU4C unidata and testdata subfolders.
- Restore TODO diffs in source/data/unidata/UCARules.txt
~/svn.icu/uni70/src$ meld ../../trunk/src/source/data/unidata/UCARules.txt source/data/unidata/UCARules.txt
- Restore ICU patches for ticket #10176 in source/test/testdata/LineBreakTest.txt
* initial preparseucd.py changes
- remove new Unicode scripts from the
only-in-ISO-15924 list according to the error message:
ValueError: remove ['Hmng', 'Lina', 'Perm', 'Mani', 'Phlp', 'Bass',
'Dupl', 'Elba', 'Gran', 'Mend', 'Narb', 'Nbat', 'Palm',
'Sind', 'Wara', 'Mroo', 'Khoj', 'Tirh', 'Aghb', 'Mahj']
from _scripts_only_in_iso15924
-> fix expectedLong names in cucdapi.c/TestUScriptCodeAPI()
and in com.ibm.icu.dev.test.lang.TestUScript.java
- NamesList.txt now has a heading with a non-ASCII character
+ keep ppucd.txt in platform charset, rather than changing tool/test parsers
+ escape non-ASCII characters in heading comments
- gets Unicode copyright line from PropertyAliases.txt which is currently still at 2013
+ get the copyright from the first file whose copyright line contains the current year
* PropertyValueAliases.txt changes
- 32 new Block (blk) values:
blk; Bassa_Vah ; Bassa_Vah
blk; Caucasian_Albanian ; Caucasian_Albanian
blk; Coptic_Epact_Numbers ; Coptic_Epact_Numbers
blk; Diacriticals_Ext ; Combining_Diacritical_Marks_Extended
blk; Duployan ; Duployan
blk; Elbasan ; Elbasan
blk; Geometric_Shapes_Ext ; Geometric_Shapes_Extended
blk; Grantha ; Grantha
blk; Khojki ; Khojki
blk; Khudawadi ; Khudawadi
blk; Latin_Ext_E ; Latin_Extended_E
blk; Linear_A ; Linear_A
blk; Mahajani ; Mahajani
blk; Manichaean ; Manichaean
blk; Mende_Kikakui ; Mende_Kikakui
blk; Modi ; Modi
blk; Mro ; Mro
blk; Myanmar_Ext_B ; Myanmar_Extended_B
blk; Nabataean ; Nabataean
blk; Old_North_Arabian ; Old_North_Arabian
blk; Old_Permic ; Old_Permic
blk; Ornamental_Dingbats ; Ornamental_Dingbats
blk; Pahawh_Hmong ; Pahawh_Hmong
blk; Palmyrene ; Palmyrene
blk; Pau_Cin_Hau ; Pau_Cin_Hau
blk; Psalter_Pahlavi ; Psalter_Pahlavi
blk; Shorthand_Format_Controls ; Shorthand_Format_Controls
blk; Siddham ; Siddham
blk; Sinhala_Archaic_Numbers ; Sinhala_Archaic_Numbers
blk; Sup_Arrows_C ; Supplemental_Arrows_C
blk; Tirhuta ; Tirhuta
blk; Warang_Citi ; Warang_Citi
-> add to uchar.h
use long property names for enum constants
-> 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
- 28 new Joining_Group (jg) values:
jg ; Manichaean_Aleph ; Manichaean_Aleph
jg ; Manichaean_Ayin ; Manichaean_Ayin
jg ; Manichaean_Beth ; Manichaean_Beth
jg ; Manichaean_Daleth ; Manichaean_Daleth
jg ; Manichaean_Dhamedh ; Manichaean_Dhamedh
jg ; Manichaean_Five ; Manichaean_Five
jg ; Manichaean_Gimel ; Manichaean_Gimel
jg ; Manichaean_Heth ; Manichaean_Heth
jg ; Manichaean_Hundred ; Manichaean_Hundred
jg ; Manichaean_Kaph ; Manichaean_Kaph
jg ; Manichaean_Lamedh ; Manichaean_Lamedh
jg ; Manichaean_Mem ; Manichaean_Mem
jg ; Manichaean_Nun ; Manichaean_Nun
jg ; Manichaean_One ; Manichaean_One
jg ; Manichaean_Pe ; Manichaean_Pe
jg ; Manichaean_Qoph ; Manichaean_Qoph
jg ; Manichaean_Resh ; Manichaean_Resh
jg ; Manichaean_Sadhe ; Manichaean_Sadhe
jg ; Manichaean_Samekh ; Manichaean_Samekh
jg ; Manichaean_Taw ; Manichaean_Taw
jg ; Manichaean_Ten ; Manichaean_Ten
jg ; Manichaean_Teth ; Manichaean_Teth
jg ; Manichaean_Thamedh ; Manichaean_Thamedh
jg ; Manichaean_Twenty ; Manichaean_Twenty
jg ; Manichaean_Waw ; Manichaean_Waw
jg ; Manichaean_Yodh ; Manichaean_Yodh
jg ; Manichaean_Zayin ; Manichaean_Zayin
jg ; Straight_Waw ; Straight_Waw
-> uchar.h & UCharacter.JoiningGroup
- 23 new Script (sc) values:
sc ; Aghb ; Caucasian_Albanian
sc ; Bass ; Bassa_Vah
sc ; Dupl ; Duployan
sc ; Elba ; Elbasan
sc ; Gran ; Grantha
sc ; Hmng ; Pahawh_Hmong
sc ; Khoj ; Khojki
sc ; Lina ; Linear_A
sc ; Mahj ; Mahajani
sc ; Mani ; Manichaean
sc ; Mend ; Mende_Kikakui
sc ; Modi ; Modi
sc ; Mroo ; Mro
sc ; Narb ; Old_North_Arabian
sc ; Nbat ; Nabataean
sc ; Palm ; Palmyrene
sc ; Pauc ; Pau_Cin_Hau
sc ; Perm ; Old_Permic
sc ; Phlp ; Psalter_Pahlavi
sc ; Sidd ; Siddham
sc ; Sind ; Khudawadi
sc ; Tirh ; Tirhuta
sc ; Wara ; Warang_Citi
-> uscript.h (many were added before)
comment "Mende Kikakui" for USCRIPT_MENDE
add USCRIPT_KHUDAWADI, make USCRIPT_SINDHI an alias
-> com.ibm.icu.lang.UScript
find USCRIPT_([^ ]+) *= ([0-9]+),(.+)
replace public static final int \1 = \2; \3
- 6 new script codes from ISO 15924 http://www.unicode.org/iso15924/codechanges.html
(added 2012-11-01)
Ahom 338 Ahom
Hatr 127 Hatran
Mult 323 Multani
(added 2013-10-12)
Modi 324 Modi
Pauc 263 Pau Cin Hau
Sidd 302 Siddham
-> uscript.h (some overlap with additions from Unicode)
-> com.ibm.icu.lang.UScript
find USCRIPT_([^ ]+) *= ([0-9]+),(.+)
replace public static final int \1 = \2; \3
-> add Ahom, Hatr, Mult to preparseucd.py _scripts_only_in_iso15924
-> add to expectedLong and expectedShort names in cintltst/cucdapi.c/TestUScriptCodeAPI()
and in com.ibm.icu.dev.test.lang.TestUScript.java
* update Script metadata: SCRIPT_PROPS[] in uscript_props.cpp & UScript.ScriptMetadata
(not strictly necessary for NOT_ENCODED scripts)
~/svn.icutools/trunk/src/unicode$ py/parsescriptmetadata.py ~/svn.icu/uni70/src/source/common/unicode/uscript.h ~/svn.cldr/trunk/common/properties/scriptMetadata.txt
* generate normalization data files
- ~/svn.icu/uni70/dbg$ export LD_LIBRARY_PATH=~/svn.icu/uni70/dbg/lib
- ~/svn.icu/uni70/dbg$ SRC_DATA_IN=~/svn.icu/uni70/src/source/data/in
- ~/svn.icu/uni70/dbg$ UNIDATA=~/svn.icu/uni70/src/source/data/unidata
- ~/svn.icu/uni70/dbg$ bin/gennorm2 -o $SRC_DATA_IN/nfc.nrm -s $UNIDATA/norm2 nfc.txt
- ~/svn.icu/uni70/dbg$ bin/gennorm2 -o $SRC_DATA_IN/nfkc.nrm -s $UNIDATA/norm2 nfc.txt nfkc.txt
- ~/svn.icu/uni70/dbg$ bin/gennorm2 -o $SRC_DATA_IN/nfkc_cf.nrm -s $UNIDATA/norm2 nfc.txt nfkc.txt nfkc_cf.txt
- ~/svn.icu/uni70/dbg$ bin/gennorm2 -o $SRC_DATA_IN/uts46.nrm -s $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.
~/svn.icu/uni70/dbg$ echo;echo;make -j5 install > out.txt 2>&1 ; tail -n 20 out.txt
* build Unicode tools using CMake+make
~/svn.icutools/trunk/src/unicode/c/icudefs.txt:
# Location (--prefix) of where ICU was installed.
set(ICU_INST_DIR /home/mscherer/svn.icu/uni70/inst)
# Location of the ICU source tree.
set(ICU_SRC_DIR /home/mscherer/svn.icu/uni70/src)
~/svn.icutools/trunk/dbg/unicode/c$ cmake ../../../src/unicode/c
~/svn.icutools/trunk/dbg/unicode/c$ make
* genprops work
- new code point range for Joining_Group values: 10AC0..10AFF Manichaean
+ add second array of Joining_Group values for at most 10800..10FFF
icutools: unicode/c/genprops/bidipropsbuilder.cpp
icu: source/common/ubidi_props.h/.c/_data.h
icu4j: main/classes/core/src/com/ibm/icu/impl/UBiDiProps.java
* generate core properties data files
- ~/svn.icutools/trunk/dbg/unicode/c$ genprops/genprops ~/svn.icu/uni70/src
- ~/svn.icutools/trunk/dbg/unicode/c$ genuca/genuca ~/svn.icu/uni70/src
- rebuild ICU (make install) & tools
- run genuca again (see step above) so that it picks up the new nfc.nrm
- 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..7.0: U+2260, U+226E, U+226F
- nothing new in 7.0, no test file to update
* run & fix ICU4C tests
* update Java data files
- refresh just the UCD-related files, just to be safe
- see (ICU4C)/source/data/icu4j-readme.txt
- mkdir /tmp/icu4j
- ~/svn.icu/uni70/dbg$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
output:
...
Unicode .icu files built to ./out/build/icudt53l
echo timestamp > uni-core-data
mkdir -p ./out/icu4j/com/ibm/icu/impl/data/icudt53b
mkdir -p ./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt53b
echo pnames.icu ubidi.icu ucase.icu uprops.icu > ./out/icu4j/add.txt
LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH ../bin/icupkg ./out/tmp/icudt53l.dat ./out/icu4j/icudt53b.dat -a ./out/icu4j/add.txt -s ./out/build/icudt53l -x '*' -tb -d ./out/icu4j/com/ibm/icu/impl/data/icudt53b
mv ./out/icu4j/"com/ibm/icu/impl/data/icudt53b/zoneinfo64.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt53b/metaZones.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt53b/timezoneTypes.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt53b/windowsZones.res" "./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt53b"
jar cf ./out/icu4j/icudata.jar -C ./out/icu4j com/ibm/icu/impl/data/icudt53b/
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/icudt53b/
mkdir -p /tmp/icu4j/main/shared/data
cp ./out/icu4j/icutzdata.jar /tmp/icu4j/main/shared/data
make[1]: Leaving directory `/home/mscherer/svn.icu/uni70/dbg/data'
- copy the big-endian Unicode data files to another location,
separate from the other data files
mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/icudt53b/coll
mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/icudt53b/brkitr
cd ~/svn.icu/uni70/dbg/data/out/icu4j
cp com/ibm/icu/impl/data/icudt53b/confusables.cfu /tmp/icu4j/com/ibm/icu/impl/data/icudt53b
cp com/ibm/icu/impl/data/icudt53b/*.icu /tmp/icu4j/com/ibm/icu/impl/data/icudt53b
rm /tmp/icu4j/com/ibm/icu/impl/data/icudt53b/cnvalias.icu
cp com/ibm/icu/impl/data/icudt53b/*.nrm /tmp/icu4j/com/ibm/icu/impl/data/icudt53b
cp com/ibm/icu/impl/data/icudt53b/coll/*.icu /tmp/icu4j/com/ibm/icu/impl/data/icudt53b/coll
cp com/ibm/icu/impl/data/icudt53b/brkitr/* /tmp/icu4j/com/ibm/icu/impl/data/icudt53b/brkitr
- refresh ICU4J
~/svn.icu/uni70/dbg/data/out/icu4j$ jar uf ~/svn.icu4j/trunk/src/main/shared/data/icudata.jar -C /tmp/icu4j com/ibm/icu/impl/data/icudt53b
* 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
~/svn.icu/uni70/src$ cd source/data/unidata
cp confusables.txt confusablesWholeScript.txt NormalizationCorrections.txt NormalizationTest.txt SpecialCasing.txt UnicodeData.txt ~/svn.icu4j/trunk/src/main/tests/core/src/com/ibm/icu/dev/data/unicode
cd ../../test/testdata
cp BidiCharacterTest.txt BidiTest.txt ~/svn.icu4j/trunk/src/main/tests/core/src/com/ibm/icu/dev/data/unicode
cp ~/unidata/uni70/20140409/ucd/CompositionExclusions.txt ~/svn.icu4j/trunk/src/main/tests/core/src/com/ibm/icu/dev/data/unicode
* UCA
- download UCA files (mostly allkeys.txt) from http://www.unicode.org/Public/UCA/<beta version>/
- run desuffixucd.py (see https://sites.google.com/site/unicodetools/inputdata)
- update the input files for Mark's UCA tools, in ~/svn.unitools/trunk/data/uca/7.0.0/
- run Mark's UCA Main: https://sites.google.com/site/unicodetools/home#TOC-UCA
- output files are in ~/svn.unitools/Generated/uca/7.0.0/
- review data; compare files, use blankweights.sed or similar
~/svn.unitools$ sed -r -f blankweights.sed Generated/uca/7.0.0/CollationAuxiliary/FractionalUCA.txt > frac-7.0.txt
- cd ~/svn.unitools/Generated/uca/7.0.0/
- update source/data/unidata/FractionalUCA.txt with FractionalUCA_SHORT.txt
cp CollationAuxiliary/FractionalUCA_SHORT.txt ~/svn.icu/uni70/src/source/data/unidata/FractionalUCA.txt
- update source/data/unidata/UCARules.txt with UCA_Rules_SHORT.txt
(note removing the underscore before "Rules")
cp CollationAuxiliary/UCA_Rules_SHORT.txt ~/svn.icu/uni70/src/source/data/unidata/UCARules.txt
- update (ICU4C)/source/test/testdata/CollationTest_*.txt
and (ICU4J)/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_*.txt
with output from Mark's Unicode tools (..._CLDR_..._SHORT.txt)
cp CollationAuxiliary/CollationTest_CLDR_NON_IGNORABLE_SHORT.txt ~/svn.icu/uni70/src/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt
cp CollationAuxiliary/CollationTest_CLDR_SHIFTED_SHORT.txt ~/svn.icu/uni70/src/source/test/testdata/CollationTest_SHIFTED_SHORT.txt
cp ~/svn.icu/uni70/src/source/test/testdata/CollationTest_*.txt ~/svn.icu4j/trunk/src/main/tests/collate/src/com/ibm/icu/dev/data
- run genuca, see command line above
- rebuild ICU4C
- refresh ICU4J collation data:
(subset of instructions above for properties data refresh, except copies all coll/*)
~/svn.icu/uni70/dbg$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
~/svn.icu/uni70/dbg$ mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/icudt53b/coll
~/svn.icu/uni70/dbg/data/out/icu4j$ cp com/ibm/icu/impl/data/icudt53b/coll/* /tmp/icu4j/com/ibm/icu/impl/data/icudt53b/coll
~/svn.icu/uni70/dbg/data/out/icu4j$ jar uf ~/svn.icu4j/trunk/src/main/shared/data/icudata.jar -C /tmp/icu4j com/ibm/icu/impl/data/icudt53b
- run all tests with the *_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
- copy all output from Mark's UCA tool to unicode.org for review & staging by Ken & editors
- copy most of ~/svn.unitools/Generated/uca/7.0.0/CollationAuxiliary/* to CLDR branch
~/svn.unitools$ cp Generated/uca/7.0.0/CollationAuxiliary/* ~/svn.cldr/trunk/common/uca/
* When refreshing all of ICU4J data from ICU4C
- ~/svn.icu/uni70/dbg$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
- cp /tmp/icu4j/main/shared/data/icudata.jar ~/svn.icu4j/trunk/src/main/shared/data
or
- ~/svn.icu/uni70/dbg$ make ICU4J_ROOT=~/svn.icu4j/trunk/src icu4j-data-install
* run & fix ICU4J tests
*** LayoutEngine script information
(For details see the Unicode 5.2 change log below.)
* Run icu4j-tools: com.ibm.icu.dev.tool.layout.ScriptNameBuilder.
This generates LEScripts.h, LELanguages.h, ScriptAndLanguageTags.h and ScriptAndLanguageTags.cpp
in the working directory.
(It also generates ScriptRunData.cpp, which is no longer needed.)
The generated files have a current copyright date and "@stable" statement.
ICU 54: Fixed tools/misc/src/com/ibm/icu/dev/tool/layout/ScriptIDModuleWriter.java
for "born stable" Unicode API constants, and to stop parsing ICU version numbers
which may not contain dots any more.
- diff current <icu>/source/layout files vs. generated ones
~/svn.icu4j/trunk/src$ meld ~/svn.icu/uni70/src/source/layout tools/misc/src/com/ibm/icu/dev/tool/layout
review and manually merge desired changes;
fix gratuitous changes, incorrect @draft/@stable and missing aliases;
Unicode-derived script codes should be "born stable" like constants in uchar.h, uscript.h etc.
- if you just copy the above files, then
fix mixed line endings, review the diffs as above and restore changes to API tags etc.;
manually re-add the "Indic script xyz v.2" tags in ScriptAndLanguageTags.h
*** API additions
- send notice to icu-design about new born-@stable API (enum constants etc.)
*** 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
---------------------------------------------------------------------------- ***
Unicode 6.3 update Unicode 6.3 update
http://www.unicode.org/review/pri249/ -- beta review http://www.unicode.org/review/pri249/ -- beta review

View File

@ -1,4 +1,4 @@
# Copyright (C) 1999-2013, International Business Machines # Copyright (C) 1999-2014, International Business Machines
# Corporation and others. All Rights Reserved. # Corporation and others. All Rights Reserved.
# #
# file name: nfc.txt # file name: nfc.txt
@ -7,7 +7,7 @@
# #
# Complete data for Unicode NFC normalization. # Complete data for Unicode NFC normalization.
* Unicode 6.3.0 * Unicode 7.0.0
# Canonical_Combining_Class (ccc) values # Canonical_Combining_Class (ccc) values
0300..0314:230 0300..0314:230
@ -142,7 +142,7 @@
08F6:220 08F6:220
08F7..08F8:230 08F7..08F8:230
08F9..08FA:220 08F9..08FA:220
08FB..08FE:230 08FB..08FF:230
093C:7 093C:7
094D:9 094D:9
0951:230 0951:230
@ -199,6 +199,10 @@
1A60:9 1A60:9
1A75..1A7C:230 1A75..1A7C:230
1A7F:220 1A7F:220
1AB0..1AB4:230
1AB5..1ABA:220
1ABB..1ABC:230
1ABD:220
1B34:7 1B34:7
1B44:9 1B44:9
1B6B:230 1B6B:230
@ -217,6 +221,7 @@
1CE2..1CE8:1 1CE2..1CE8:1
1CED:220 1CED:220
1CF4:230 1CF4:230
1CF8..1CF9:230
1DC0..1DC1:230 1DC0..1DC1:230
1DC2:220 1DC2:220
1DC3..1DC9:230 1DC3..1DC9:230
@ -226,7 +231,7 @@
1DCE:214 1DCE:214
1DCF:220 1DCF:220
1DD0:202 1DD0:202
1DD1..1DE6:230 1DD1..1DF5:230
1DFC:233 1DFC:233
1DFD:220 1DFD:220
1DFE:230 1DFE:230
@ -274,21 +279,44 @@ AAF6:9
ABED:9 ABED:9
FB1E:26 FB1E:26
FE20..FE26:230 FE20..FE26:230
FE27..FE2D:220
101FD:220 101FD:220
102E0:220
10376..1037A:230
10A0D:220 10A0D:220
10A0F:230 10A0F:230
10A38:230 10A38:230
10A39:1 10A39:1
10A3A:220 10A3A:220
10A3F:9 10A3F:9
10AE5:230
10AE6:220
11046:9 11046:9
1107F:9
110B9:9 110B9:9
110BA:7 110BA:7
11100..11102:230 11100..11102:230
11133..11134:9 11133..11134:9
11173:7
111C0:9 111C0:9
11235:9
11236:7
112E9:7
112EA:9
1133C:7
1134D:9
11366..1136C:230
11370..11374:230
114C2:9
114C3:7
115BF:9
115C0:7
1163F:9
116B6:9 116B6:9
116B7:7 116B7:7
16AF0..16AF4:1
16B30..16B36:230
1BC9E:1
1D165..1D166:216 1D165..1D166:216
1D167..1D169:1 1D167..1D169:1
1D16D:226 1D16D:226
@ -298,6 +326,7 @@ FE20..FE26:230
1D18A..1D18B:220 1D18A..1D18B:220
1D1AA..1D1AD:230 1D1AA..1D1AD:230
1D242..1D244:230 1D242..1D244:230
1E8D0..1E8D6:220
# Canonical decomposition mappings # Canonical decomposition mappings
00C0=0041 0300 00C0=0041 0300
@ -1798,6 +1827,13 @@ FB4E>05E4 05BF
110AB=110A5 110BA 110AB=110A5 110BA
1112E=11131 11127 1112E=11131 11127
1112F=11132 11127 1112F=11132 11127
1134B=11347 1133E
1134C=11347 11357
114BB=114B9 114BA
114BC=114B9 114B0
114BE=114B9 114BD
115BA=115B8 115AF
115BB=115B9 115AF
1D15E>1D157 1D165 1D15E>1D157 1D165
1D15F>1D158 1D165 1D15F>1D158 1D165
1D160>1D15F 1D16E 1D160>1D15F 1D16E

View File

@ -1,4 +1,4 @@
# Copyright (C) 1999-2013, International Business Machines # Copyright (C) 1999-2014, International Business Machines
# Corporation and others. All Rights Reserved. # Corporation and others. All Rights Reserved.
# #
# file name: nfkc.txt # file name: nfkc.txt
@ -11,7 +11,7 @@
# to NFKC one-way mappings. # to NFKC one-way mappings.
# Use this file as the second gennorm2 input file after nfc.txt. # Use this file as the second gennorm2 input file after nfc.txt.
* Unicode 6.3.0 * Unicode 7.0.0
00A0>0020 00A0>0020
00A8>0020 0308 00A8>0020 0308
@ -1361,9 +1361,15 @@
33FD>0033 0030 65E5 33FD>0033 0030 65E5
33FE>0033 0031 65E5 33FE>0033 0031 65E5
33FF>0067 0061 006C 33FF>0067 0061 006C
A69C>044A
A69D>044C
A770>A76F A770>A76F
A7F8>0126 A7F8>0126
A7F9>0153 A7F9>0153
AB5C>A727
AB5D>AB37
AB5E>026B
AB5F>AB52
FB00>0066 0066 FB00>0066 0066
FB01>0066 0069 FB01>0066 0069
FB02>0066 006C FB02>0066 006C

View File

@ -1,5 +1,5 @@
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2014 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html # For terms of use, see http://www.unicode.org/terms_of_use.html
# For documentation, see http://www.unicode.org/reports/tr44/ # For documentation, see http://www.unicode.org/reports/tr44/
# #
@ -12,7 +12,7 @@
# and reformatted into syntax for the gennorm2 Normalizer2 data generator tool. # 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. # Use this file as the third gennorm2 input file after nfc.txt and nfkc.txt.
* Unicode 6.3.0 * Unicode 7.0.0
0041>0061 0041>0061
0042>0062 0042>0062
@ -286,6 +286,7 @@
0376>0377 0376>0377
037A>0020 03B9 037A>0020 03B9
037E>003B 037E>003B
037F>03F3
0384>0020 0301 0384>0020 0301
0385>0020 0308 0301 0385>0020 0308 0301
0386>03AC 0386>03AC
@ -498,6 +499,10 @@
0522>0523 0522>0523
0524>0525 0524>0525
0526>0527 0526>0527
0528>0529
052A>052B
052C>052D
052E>052F
0531>0561 0531>0561
0532>0562 0532>0562
0533>0563 0533>0563
@ -2308,6 +2313,10 @@ A690>A691
A692>A693 A692>A693
A694>A695 A694>A695
A696>A697 A696>A697
A698>A699
A69A>A69B
A69C>044A
A69D>044C
A722>A723 A722>A723
A724>A725 A724>A725
A726>A727 A726>A727
@ -2359,14 +2368,28 @@ A78B>A78C
A78D>0265 A78D>0265
A790>A791 A790>A791
A792>A793 A792>A793
A796>A797
A798>A799
A79A>A79B
A79C>A79D
A79E>A79F
A7A0>A7A1 A7A0>A7A1
A7A2>A7A3 A7A2>A7A3
A7A4>A7A5 A7A4>A7A5
A7A6>A7A7 A7A6>A7A7
A7A8>A7A9 A7A8>A7A9
A7AA>0266 A7AA>0266
A7AB>025C
A7AC>0261
A7AD>026C
A7B0>029E
A7B1>0287
A7F8>0127 A7F8>0127
A7F9>0153 A7F9>0153
AB5C>A727
AB5D>AB37
AB5E>026B
AB5F>AB52
F900>8C48 F900>8C48
F901>66F4 F901>66F4
F902>8ECA F902>8ECA
@ -3743,6 +3766,39 @@ FFF0..FFF8>
10425>1044D 10425>1044D
10426>1044E 10426>1044E
10427>1044F 10427>1044F
118A0>118C0
118A1>118C1
118A2>118C2
118A3>118C3
118A4>118C4
118A5>118C5
118A6>118C6
118A7>118C7
118A8>118C8
118A9>118C9
118AA>118CA
118AB>118CB
118AC>118CC
118AD>118CD
118AE>118CE
118AF>118CF
118B0>118D0
118B1>118D1
118B2>118D2
118B3>118D3
118B4>118D4
118B5>118D5
118B6>118D6
118B7>118D7
118B8>118D8
118B9>118D9
118BA>118DA
118BB>118DB
118BC>118DC
118BD>118DD
118BE>118DE
118BF>118DF
1BCA0..1BCA3>
1D15E>1D157 1D165 1D15E>1D157 1D165
1D15F>1D158 1D165 1D15F>1D158 1D165
1D160>1D158 1D165 1D16E 1D160>1D158 1D165 1D16E

View File

@ -1,9 +1,9 @@
# Original file: # Original file:
# IdnaMappingTable-6.2.0.txt # IdnaMappingTable-7.0.0.txt
# Date: 2012-06-26 17:39:32 GMT [MD] # Date: 2014-02-14 01:03:07 GMT [MD]
# #
# Unicode IDNA Compatible Preprocessing (UTS #46) # Unicode IDNA Compatible Preprocessing (UTS #46)
# Copyright (c) 1991-2012 Unicode, Inc. # Copyright (c) 1991-2014 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html # For terms of use, see http://www.unicode.org/terms_of_use.html
# For documentation, see http://www.unicode.org/reports/tr46/ # For documentation, see http://www.unicode.org/reports/tr46/
@ -485,7 +485,8 @@
037A >0020 03B9 # 1.1 GREEK YPOGEGRAMMENI 037A >0020 03B9 # 1.1 GREEK YPOGEGRAMMENI
# 037B..037D valid # 5.0 GREEK SMALL REVERSED LUNATE SIGMA SYMBOL..GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL # 037B..037D valid # 5.0 GREEK SMALL REVERSED LUNATE SIGMA SYMBOL..GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
037E >003B # 1.1 GREEK QUESTION MARK 037E >003B # 1.1 GREEK QUESTION MARK
037F..0383 >FFFD # NA <reserved-037F>..<reserved-0383> 037F >03F3 # 7.0 GREEK CAPITAL LETTER YOT
0380..0383 >FFFD # NA <reserved-0380>..<reserved-0383>
0384 >0020 0301 # 1.1 GREEK TONOS 0384 >0020 0301 # 1.1 GREEK TONOS
0385 >0020 0308 0301 #1.1 GREEK DIALYTIKA TONOS 0385 >0020 0308 0301 #1.1 GREEK DIALYTIKA TONOS
0386 >03AC # 1.1 GREEK CAPITAL LETTER ALPHA WITH TONOS 0386 >03AC # 1.1 GREEK CAPITAL LETTER ALPHA WITH TONOS
@ -827,7 +828,15 @@
# 0525 valid # 5.2 CYRILLIC SMALL LETTER PE WITH DESCENDER # 0525 valid # 5.2 CYRILLIC SMALL LETTER PE WITH DESCENDER
0526 >0527 # 6.0 CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER 0526 >0527 # 6.0 CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER
# 0527 valid # 6.0 CYRILLIC SMALL LETTER SHHA WITH DESCENDER # 0527 valid # 6.0 CYRILLIC SMALL LETTER SHHA WITH DESCENDER
0528..0530 >FFFD # NA <reserved-0528>..<reserved-0530> 0528 >0529 # 7.0 CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
# 0529 valid # 7.0 CYRILLIC SMALL LETTER EN WITH LEFT HOOK
052A >052B # 7.0 CYRILLIC CAPITAL LETTER DZZHE
# 052B valid # 7.0 CYRILLIC SMALL LETTER DZZHE
052C >052D # 7.0 CYRILLIC CAPITAL LETTER DCHE
# 052D valid # 7.0 CYRILLIC SMALL LETTER DCHE
052E >052F # 7.0 CYRILLIC CAPITAL LETTER EL WITH DESCENDER
# 052F valid # 7.0 CYRILLIC SMALL LETTER EL WITH DESCENDER
0530 >FFFD # NA <reserved-0530>
0531 >0561 # 1.1 ARMENIAN CAPITAL LETTER AYB 0531 >0561 # 1.1 ARMENIAN CAPITAL LETTER AYB
0532 >0562 # 1.1 ARMENIAN CAPITAL LETTER BEN 0532 >0562 # 1.1 ARMENIAN CAPITAL LETTER BEN
0533 >0563 # 1.1 ARMENIAN CAPITAL LETTER GIM 0533 >0563 # 1.1 ARMENIAN CAPITAL LETTER GIM
@ -875,7 +884,8 @@
0588 >FFFD # NA <reserved-0588> 0588 >FFFD # NA <reserved-0588>
# 0589 valid # 1.1 ARMENIAN FULL STOP # 0589 valid # 1.1 ARMENIAN FULL STOP
# 058A valid # 3.0 ARMENIAN HYPHEN # 058A valid # 3.0 ARMENIAN HYPHEN
058B..058E >FFFD # NA <reserved-058B>..<reserved-058E> 058B..058C >FFFD # NA <reserved-058B>..<reserved-058C>
# 058D..058E valid # 7.0 RIGHT-FACING ARMENIAN ETERNITY SIGN..LEFT-FACING ARMENIAN ETERNITY SIGN
# 058F valid # 6.1 ARMENIAN DRAM SIGN # 058F valid # 6.1 ARMENIAN DRAM SIGN
0590 >FFFD # NA <reserved-0590> 0590 >FFFD # NA <reserved-0590>
# 0591..05A1 valid # 2.0 HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER # 0591..05A1 valid # 2.0 HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER
@ -900,7 +910,7 @@
05F5..05FF >FFFD # NA <reserved-05F5>..<reserved-05FF> 05F5..05FF >FFFD # NA <reserved-05F5>..<reserved-05FF>
0600..0603 >FFFD # 4.0 ARABIC NUMBER SIGN..ARABIC SIGN SAFHA 0600..0603 >FFFD # 4.0 ARABIC NUMBER SIGN..ARABIC SIGN SAFHA
0604 >FFFD # 6.1 ARABIC SIGN SAMVAT 0604 >FFFD # 6.1 ARABIC SIGN SAMVAT
0605 >FFFD # NA <reserved-0605> 0605 >FFFD # 7.0 ARABIC NUMBER MARK ABOVE
# 0606..060A valid # 5.1 ARABIC-INDIC CUBE ROOT..ARABIC-INDIC PER TEN THOUSAND SIGN # 0606..060A valid # 5.1 ARABIC-INDIC CUBE ROOT..ARABIC-INDIC PER TEN THOUSAND SIGN
# 060B valid # 4.1 AFGHANI SIGN # 060B valid # 4.1 AFGHANI SIGN
# 060C valid # 1.1 ARABIC COMMA # 060C valid # 1.1 ARABIC COMMA
@ -908,7 +918,8 @@
# 0610..0615 valid # 4.0 ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL HIGH TAH # 0610..0615 valid # 4.0 ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL HIGH TAH
# 0616..061A valid # 5.1 ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH..ARABIC SMALL KASRA # 0616..061A valid # 5.1 ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH..ARABIC SMALL KASRA
# 061B valid # 1.1 ARABIC SEMICOLON # 061B valid # 1.1 ARABIC SEMICOLON
061C..061D >FFFD # NA <reserved-061C>..<reserved-061D> 061C >FFFD # 6.3 ARABIC LETTER MARK
061D >FFFD # NA <reserved-061D>
# 061E valid # 4.1 ARABIC TRIPLE DOT PUNCTUATION MARK # 061E valid # 4.1 ARABIC TRIPLE DOT PUNCTUATION MARK
# 061F valid # 1.1 ARABIC QUESTION MARK # 061F valid # 1.1 ARABIC QUESTION MARK
# 0620 valid # 6.0 ARABIC LETTER KASHMIRI YEH # 0620 valid # 6.0 ARABIC LETTER KASHMIRI YEH
@ -971,11 +982,12 @@
# 085E valid # 6.0 MANDAIC PUNCTUATION # 085E valid # 6.0 MANDAIC PUNCTUATION
085F..089F >FFFD # NA <reserved-085F>..<reserved-089F> 085F..089F >FFFD # NA <reserved-085F>..<reserved-089F>
# 08A0 valid # 6.1 ARABIC LETTER BEH WITH SMALL V BELOW # 08A0 valid # 6.1 ARABIC LETTER BEH WITH SMALL V BELOW
08A1 >FFFD # NA <reserved-08A1> # 08A1 valid # 7.0 ARABIC LETTER BEH WITH HAMZA ABOVE
# 08A2..08AC valid # 6.1 ARABIC LETTER JEEM WITH TWO DOTS ABOVE..ARABIC LETTER ROHINGYA YEH # 08A2..08AC valid # 6.1 ARABIC LETTER JEEM WITH TWO DOTS ABOVE..ARABIC LETTER ROHINGYA YEH
08AD..08E3 >FFFD # NA <reserved-08AD>..<reserved-08E3> # 08AD..08B2 valid # 7.0 ARABIC LETTER LOW ALEF..ARABIC LETTER ZAIN WITH INVERTED V ABOVE
08B3..08E3 >FFFD # NA <reserved-08B3>..<reserved-08E3>
# 08E4..08FE valid # 6.1 ARABIC CURLY FATHA..ARABIC DAMMA WITH DOT # 08E4..08FE valid # 6.1 ARABIC CURLY FATHA..ARABIC DAMMA WITH DOT
08FF >FFFD # NA <reserved-08FF> # 08FF valid # 7.0 ARABIC MARK SIDEWAYS NOON GHUNNA
# 0900 valid # 5.2 DEVANAGARI SIGN INVERTED CANDRABINDU # 0900 valid # 5.2 DEVANAGARI SIGN INVERTED CANDRABINDU
# 0901..0903 valid # 1.1 DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN VISARGA # 0901..0903 valid # 1.1 DEVANAGARI SIGN CANDRABINDU..DEVANAGARI SIGN VISARGA
# 0904 valid # 4.0 DEVANAGARI LETTER SHORT A # 0904 valid # 4.0 DEVANAGARI LETTER SHORT A
@ -1001,12 +1013,12 @@
# 0970 valid # 1.1 DEVANAGARI ABBREVIATION SIGN # 0970 valid # 1.1 DEVANAGARI ABBREVIATION SIGN
# 0971..0972 valid # 5.1 DEVANAGARI SIGN HIGH SPACING DOT..DEVANAGARI LETTER CANDRA A # 0971..0972 valid # 5.1 DEVANAGARI SIGN HIGH SPACING DOT..DEVANAGARI LETTER CANDRA A
# 0973..0977 valid # 6.0 DEVANAGARI LETTER OE..DEVANAGARI LETTER UUE # 0973..0977 valid # 6.0 DEVANAGARI LETTER OE..DEVANAGARI LETTER UUE
0978 >FFFD # NA <reserved-0978> # 0978 valid # 7.0 DEVANAGARI LETTER MARWARI DDA
# 0979..097A valid # 5.2 DEVANAGARI LETTER ZHA..DEVANAGARI LETTER HEAVY YA # 0979..097A valid # 5.2 DEVANAGARI LETTER ZHA..DEVANAGARI LETTER HEAVY YA
# 097B..097C valid # 5.0 DEVANAGARI LETTER GGA..DEVANAGARI LETTER JJA # 097B..097C valid # 5.0 DEVANAGARI LETTER GGA..DEVANAGARI LETTER JJA
# 097D valid # 4.1 DEVANAGARI LETTER GLOTTAL STOP # 097D valid # 4.1 DEVANAGARI LETTER GLOTTAL STOP
# 097E..097F valid # 5.0 DEVANAGARI LETTER DDDA..DEVANAGARI LETTER BBA # 097E..097F valid # 5.0 DEVANAGARI LETTER DDDA..DEVANAGARI LETTER BBA
0980 >FFFD # NA <reserved-0980> # 0980 valid # 7.0 BENGALI ANJI
# 0981..0983 valid # 1.1 BENGALI SIGN CANDRABINDU..BENGALI SIGN VISARGA # 0981..0983 valid # 1.1 BENGALI SIGN CANDRABINDU..BENGALI SIGN VISARGA
0984 >FFFD # NA <reserved-0984> 0984 >FFFD # NA <reserved-0984>
# 0985..098C valid # 1.1 BENGALI LETTER A..BENGALI LETTER VOCALIC L # 0985..098C valid # 1.1 BENGALI LETTER A..BENGALI LETTER VOCALIC L
@ -1184,7 +1196,8 @@
# 0BE7..0BEF valid # 1.1 TAMIL DIGIT ONE..TAMIL DIGIT NINE # 0BE7..0BEF valid # 1.1 TAMIL DIGIT ONE..TAMIL DIGIT NINE
# 0BF0..0BF2 valid # 1.1 TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND # 0BF0..0BF2 valid # 1.1 TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND
# 0BF3..0BFA valid # 4.0 TAMIL DAY SIGN..TAMIL NUMBER SIGN # 0BF3..0BFA valid # 4.0 TAMIL DAY SIGN..TAMIL NUMBER SIGN
0BFB..0C00 >FFFD # NA <reserved-0BFB>..<reserved-0C00> 0BFB..0BFF >FFFD # NA <reserved-0BFB>..<reserved-0BFF>
# 0C00 valid # 7.0 TELUGU SIGN COMBINING CANDRABINDU ABOVE
# 0C01..0C03 valid # 1.1 TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA # 0C01..0C03 valid # 1.1 TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA
0C04 >FFFD # NA <reserved-0C04> 0C04 >FFFD # NA <reserved-0C04>
# 0C05..0C0C valid # 1.1 TELUGU LETTER A..TELUGU LETTER VOCALIC L # 0C05..0C0C valid # 1.1 TELUGU LETTER A..TELUGU LETTER VOCALIC L
@ -1194,7 +1207,7 @@
# 0C12..0C28 valid # 1.1 TELUGU LETTER O..TELUGU LETTER NA # 0C12..0C28 valid # 1.1 TELUGU LETTER O..TELUGU LETTER NA
0C29 >FFFD # NA <reserved-0C29> 0C29 >FFFD # NA <reserved-0C29>
# 0C2A..0C33 valid # 1.1 TELUGU LETTER PA..TELUGU LETTER LLA # 0C2A..0C33 valid # 1.1 TELUGU LETTER PA..TELUGU LETTER LLA
0C34 >FFFD # NA <reserved-0C34> # 0C34 valid # 7.0 TELUGU LETTER LLLA
# 0C35..0C39 valid # 1.1 TELUGU LETTER VA..TELUGU LETTER HA # 0C35..0C39 valid # 1.1 TELUGU LETTER VA..TELUGU LETTER HA
0C3A..0C3C >FFFD # NA <reserved-0C3A>..<reserved-0C3C> 0C3A..0C3C >FFFD # NA <reserved-0C3A>..<reserved-0C3C>
# 0C3D valid # 5.1 TELUGU SIGN AVAGRAHA # 0C3D valid # 5.1 TELUGU SIGN AVAGRAHA
@ -1214,7 +1227,8 @@
# 0C66..0C6F valid # 1.1 TELUGU DIGIT ZERO..TELUGU DIGIT NINE # 0C66..0C6F valid # 1.1 TELUGU DIGIT ZERO..TELUGU DIGIT NINE
0C70..0C77 >FFFD # NA <reserved-0C70>..<reserved-0C77> 0C70..0C77 >FFFD # NA <reserved-0C70>..<reserved-0C77>
# 0C78..0C7F valid # 5.1 TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU SIGN TUUMU # 0C78..0C7F valid # 5.1 TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU SIGN TUUMU
0C80..0C81 >FFFD # NA <reserved-0C80>..<reserved-0C81> 0C80 >FFFD # NA <reserved-0C80>
# 0C81 valid # 7.0 KANNADA SIGN CANDRABINDU
# 0C82..0C83 valid # 1.1 KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA # 0C82..0C83 valid # 1.1 KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA
0C84 >FFFD # NA <reserved-0C84> 0C84 >FFFD # NA <reserved-0C84>
# 0C85..0C8C valid # 1.1 KANNADA LETTER A..KANNADA LETTER VOCALIC L # 0C85..0C8C valid # 1.1 KANNADA LETTER A..KANNADA LETTER VOCALIC L
@ -1244,7 +1258,8 @@
# 0CE6..0CEF valid # 1.1 KANNADA DIGIT ZERO..KANNADA DIGIT NINE # 0CE6..0CEF valid # 1.1 KANNADA DIGIT ZERO..KANNADA DIGIT NINE
0CF0 >FFFD # NA <reserved-0CF0> 0CF0 >FFFD # NA <reserved-0CF0>
# 0CF1..0CF2 valid # 5.0 KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA # 0CF1..0CF2 valid # 5.0 KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
0CF3..0D01 >FFFD # NA <reserved-0CF3>..<reserved-0D01> 0CF3..0D00 >FFFD # NA <reserved-0CF3>..<reserved-0D00>
# 0D01 valid # 7.0 MALAYALAM SIGN CANDRABINDU
# 0D02..0D03 valid # 1.1 MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA # 0D02..0D03 valid # 1.1 MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA
0D04 >FFFD # NA <reserved-0D04> 0D04 >FFFD # NA <reserved-0D04>
# 0D05..0D0C valid # 1.1 MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L # 0D05..0D0C valid # 1.1 MALAYALAM LETTER A..MALAYALAM LETTER VOCALIC L
@ -1295,7 +1310,9 @@
# 0DD6 valid # 3.0 SINHALA VOWEL SIGN DIGA PAA-PILLA # 0DD6 valid # 3.0 SINHALA VOWEL SIGN DIGA PAA-PILLA
0DD7 >FFFD # NA <reserved-0DD7> 0DD7 >FFFD # NA <reserved-0DD7>
# 0DD8..0DDF valid # 3.0 SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA # 0DD8..0DDF valid # 3.0 SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA
0DE0..0DF1 >FFFD # NA <reserved-0DE0>..<reserved-0DF1> 0DE0..0DE5 >FFFD # NA <reserved-0DE0>..<reserved-0DE5>
# 0DE6..0DEF valid # 7.0 SINHALA LITH DIGIT ZERO..SINHALA LITH DIGIT NINE
0DF0..0DF1 >FFFD # NA <reserved-0DF0>..<reserved-0DF1>
# 0DF2..0DF3 valid # 3.0 SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA # 0DF2..0DF3 valid # 3.0 SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA
# 0DF4 valid # 3.0 SINHALA PUNCTUATION KUNDDALIYA # 0DF4 valid # 3.0 SINHALA PUNCTUATION KUNDDALIYA
0DF5..0E00 >FFFD # NA <reserved-0DF5>..<reserved-0E00> 0DF5..0E00 >FFFD # NA <reserved-0DF5>..<reserved-0E00>
@ -1533,7 +1550,8 @@
169D..169F >FFFD # NA <reserved-169D>..<reserved-169F> 169D..169F >FFFD # NA <reserved-169D>..<reserved-169F>
# 16A0..16EA valid # 3.0 RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X # 16A0..16EA valid # 3.0 RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X
# 16EB..16F0 valid # 3.0 RUNIC SINGLE PUNCTUATION..RUNIC BELGTHOR SYMBOL # 16EB..16F0 valid # 3.0 RUNIC SINGLE PUNCTUATION..RUNIC BELGTHOR SYMBOL
16F1..16FF >FFFD # NA <reserved-16F1>..<reserved-16FF> # 16F1..16F8 valid # 7.0 RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC
16F9..16FF >FFFD # NA <reserved-16F9>..<reserved-16FF>
# 1700..170C valid # 3.2 TAGALOG LETTER A..TAGALOG LETTER YA # 1700..170C valid # 3.2 TAGALOG LETTER A..TAGALOG LETTER YA
170D >FFFD # NA <reserved-170D> 170D >FFFD # NA <reserved-170D>
# 170E..1714 valid # 3.2 TAGALOG LETTER LA..TAGALOG SIGN VIRAMA # 170E..1714 valid # 3.2 TAGALOG LETTER LA..TAGALOG SIGN VIRAMA
@ -1578,7 +1596,8 @@
# 18B0..18F5 valid # 5.2 CANADIAN SYLLABICS OY..CANADIAN SYLLABICS CARRIER DENTAL S # 18B0..18F5 valid # 5.2 CANADIAN SYLLABICS OY..CANADIAN SYLLABICS CARRIER DENTAL S
18F6..18FF >FFFD # NA <reserved-18F6>..<reserved-18FF> 18F6..18FF >FFFD # NA <reserved-18F6>..<reserved-18FF>
# 1900..191C valid # 4.0 LIMBU VOWEL-CARRIER LETTER..LIMBU LETTER HA # 1900..191C valid # 4.0 LIMBU VOWEL-CARRIER LETTER..LIMBU LETTER HA
191D..191F >FFFD # NA <reserved-191D>..<reserved-191F> # 191D..191E valid # 7.0 LIMBU LETTER GYAN..LIMBU LETTER TRA
191F >FFFD # NA <reserved-191F>
# 1920..192B valid # 4.0 LIMBU VOWEL SIGN A..LIMBU SUBJOINED LETTER WA # 1920..192B valid # 4.0 LIMBU VOWEL SIGN A..LIMBU SUBJOINED LETTER WA
192C..192F >FFFD # NA <reserved-192C>..<reserved-192F> 192C..192F >FFFD # NA <reserved-192C>..<reserved-192F>
# 1930..193B valid # 4.0 LIMBU SMALL LETTER KA..LIMBU SIGN SA-I # 1930..193B valid # 4.0 LIMBU SMALL LETTER KA..LIMBU SIGN SA-I
@ -1614,7 +1633,10 @@
# 1AA0..1AA6 valid # 5.2 TAI THAM SIGN WIANG..TAI THAM SIGN REVERSED ROTATED RANA # 1AA0..1AA6 valid # 5.2 TAI THAM SIGN WIANG..TAI THAM SIGN REVERSED ROTATED RANA
# 1AA7 valid # 5.2 TAI THAM SIGN MAI YAMOK # 1AA7 valid # 5.2 TAI THAM SIGN MAI YAMOK
# 1AA8..1AAD valid # 5.2 TAI THAM SIGN KAAN..TAI THAM SIGN CAANG # 1AA8..1AAD valid # 5.2 TAI THAM SIGN KAAN..TAI THAM SIGN CAANG
1AAE..1AFF >FFFD # NA <reserved-1AAE>..<reserved-1AFF> 1AAE..1AAF >FFFD # NA <reserved-1AAE>..<reserved-1AAF>
# 1AB0..1ABD valid # 7.0 COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
# 1ABE valid # 7.0 COMBINING PARENTHESES OVERLAY
1ABF..1AFF >FFFD # NA <reserved-1ABF>..<reserved-1AFF>
# 1B00..1B4B valid # 5.0 BALINESE SIGN ULU RICEM..BALINESE LETTER ASYURA SASAK # 1B00..1B4B valid # 5.0 BALINESE SIGN ULU RICEM..BALINESE LETTER ASYURA SASAK
1B4C..1B4F >FFFD # NA <reserved-1B4C>..<reserved-1B4F> 1B4C..1B4F >FFFD # NA <reserved-1B4C>..<reserved-1B4F>
# 1B50..1B59 valid # 5.0 BALINESE DIGIT ZERO..BALINESE DIGIT NINE # 1B50..1B59 valid # 5.0 BALINESE DIGIT ZERO..BALINESE DIGIT NINE
@ -1643,7 +1665,9 @@
# 1CD3 valid # 5.2 VEDIC SIGN NIHSHVASA # 1CD3 valid # 5.2 VEDIC SIGN NIHSHVASA
# 1CD4..1CF2 valid # 5.2 VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC SIGN ARDHAVISARGA # 1CD4..1CF2 valid # 5.2 VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC SIGN ARDHAVISARGA
# 1CF3..1CF6 valid # 6.1 VEDIC SIGN ROTATED ARDHAVISARGA..VEDIC SIGN UPADHMANIYA # 1CF3..1CF6 valid # 6.1 VEDIC SIGN ROTATED ARDHAVISARGA..VEDIC SIGN UPADHMANIYA
1CF7..1CFF >FFFD # NA <reserved-1CF7>..<reserved-1CFF> 1CF7 >FFFD # NA <reserved-1CF7>
# 1CF8..1CF9 valid # 7.0 VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE
1CFA..1CFF >FFFD # NA <reserved-1CFA>..<reserved-1CFF>
# 1D00..1D2B valid # 4.0 LATIN LETTER SMALL CAPITAL A..CYRILLIC LETTER SMALL CAPITAL EL # 1D00..1D2B valid # 4.0 LATIN LETTER SMALL CAPITAL A..CYRILLIC LETTER SMALL CAPITAL EL
1D2C >0061 # 4.0 MODIFIER LETTER CAPITAL A 1D2C >0061 # 4.0 MODIFIER LETTER CAPITAL A
1D2D >00E6 # 4.0 MODIFIER LETTER CAPITAL AE 1D2D >00E6 # 4.0 MODIFIER LETTER CAPITAL AE
@ -1752,7 +1776,8 @@
# 1DC0..1DC3 valid # 4.1 COMBINING DOTTED GRAVE ACCENT..COMBINING SUSPENSION MARK # 1DC0..1DC3 valid # 4.1 COMBINING DOTTED GRAVE ACCENT..COMBINING SUSPENSION MARK
# 1DC4..1DCA valid # 5.0 COMBINING MACRON-ACUTE..COMBINING LATIN SMALL LETTER R BELOW # 1DC4..1DCA valid # 5.0 COMBINING MACRON-ACUTE..COMBINING LATIN SMALL LETTER R BELOW
# 1DCB..1DE6 valid # 5.1 COMBINING BREVE-MACRON..COMBINING LATIN SMALL LETTER Z # 1DCB..1DE6 valid # 5.1 COMBINING BREVE-MACRON..COMBINING LATIN SMALL LETTER Z
1DE7..1DFB >FFFD # NA <reserved-1DE7>..<reserved-1DFB> # 1DE7..1DF5 valid # 7.0 COMBINING LATIN SMALL LETTER ALPHA..COMBINING UP TACK ABOVE
1DF6..1DFB >FFFD # NA <reserved-1DF6>..<reserved-1DFB>
# 1DFC valid # 6.0 COMBINING DOUBLE INVERTED BREVE BELOW # 1DFC valid # 6.0 COMBINING DOUBLE INVERTED BREVE BELOW
# 1DFD valid # 5.2 COMBINING ALMOST EQUAL TO BELOW # 1DFD valid # 5.2 COMBINING ALMOST EQUAL TO BELOW
# 1DFE..1DFF valid # 5.0 COMBINING LEFT ARROWHEAD ABOVE..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW # 1DFE..1DFF valid # 5.0 COMBINING LEFT ARROWHEAD ABOVE..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
@ -2239,7 +2264,8 @@
2060 > # 3.2 WORD JOINER 2060 > # 3.2 WORD JOINER
2061..2063 >FFFD # 3.2 FUNCTION APPLICATION..INVISIBLE SEPARATOR 2061..2063 >FFFD # 3.2 FUNCTION APPLICATION..INVISIBLE SEPARATOR
2064 > # 5.1 INVISIBLE PLUS 2064 > # 5.1 INVISIBLE PLUS
2065..2069 >FFFD # NA <reserved-2065>..<reserved-2069> 2065 >FFFD # NA <reserved-2065>
2066..2069 >FFFD # 6.3 LEFT-TO-RIGHT ISOLATE..POP DIRECTIONAL ISOLATE
206A..206F >FFFD # 1.1 INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES 206A..206F >FFFD # 1.1 INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES
2070 >0030 # 1.1 SUPERSCRIPT ZERO 2070 >0030 # 1.1 SUPERSCRIPT ZERO
2071 >0069 # 3.2 SUPERSCRIPT LATIN SMALL LETTER I 2071 >0069 # 3.2 SUPERSCRIPT LATIN SMALL LETTER I
@ -2297,8 +2323,7 @@
# 20B6..20B8 valid # 5.2 LIVRE TOURNOIS SIGN..TENGE SIGN # 20B6..20B8 valid # 5.2 LIVRE TOURNOIS SIGN..TENGE SIGN
# 20B9 valid # 6.0 INDIAN RUPEE SIGN # 20B9 valid # 6.0 INDIAN RUPEE SIGN
# 20BA valid # 6.2 TURKISH LIRA SIGN # 20BA valid # 6.2 TURKISH LIRA SIGN
20BB..20BC >FFFD # NA <reserved-20BB>..<reserved-20BC> # 20BB..20BD valid # 7.0 NORDIC MARK SIGN..RUBLE SIGN
# 20BD valid # 7.0 RUBLE SIGN
20BE..20CF >FFFD # NA <reserved-20BE>..<reserved-20CF> 20BE..20CF >FFFD # NA <reserved-20BE>..<reserved-20CF>
# 20D0..20E1 valid # 1.1 COMBINING LEFT HARPOON ABOVE..COMBINING LEFT RIGHT ARROW ABOVE # 20D0..20E1 valid # 1.1 COMBINING LEFT HARPOON ABOVE..COMBINING LEFT RIGHT ARROW ABOVE
# 20E2..20E3 valid # 3.0 COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING KEYCAP # 20E2..20E3 valid # 3.0 COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING KEYCAP
@ -2455,7 +2480,8 @@
# 23DC..23E7 valid # 5.0 TOP PARENTHESIS..ELECTRICAL INTERSECTION # 23DC..23E7 valid # 5.0 TOP PARENTHESIS..ELECTRICAL INTERSECTION
# 23E8 valid # 5.2 DECIMAL EXPONENT SYMBOL # 23E8 valid # 5.2 DECIMAL EXPONENT SYMBOL
# 23E9..23F3 valid # 6.0 BLACK RIGHT-POINTING DOUBLE TRIANGLE..HOURGLASS WITH FLOWING SAND # 23E9..23F3 valid # 6.0 BLACK RIGHT-POINTING DOUBLE TRIANGLE..HOURGLASS WITH FLOWING SAND
23F4..23FF >FFFD # NA <reserved-23F4>..<reserved-23FF> # 23F4..23FA valid # 7.0 BLACK MEDIUM LEFT-POINTING TRIANGLE..BLACK CIRCLE FOR RECORD
23FB..23FF >FFFD # NA <reserved-23FB>..<reserved-23FF>
# 2400..2424 valid # 1.1 SYMBOL FOR NULL..SYMBOL FOR NEWLINE # 2400..2424 valid # 1.1 SYMBOL FOR NULL..SYMBOL FOR NEWLINE
# 2425..2426 valid # 3.0 SYMBOL FOR DELETE FORM TWO..SYMBOL FOR SUBSTITUTE FORM TWO # 2425..2426 valid # 3.0 SYMBOL FOR DELETE FORM TWO..SYMBOL FOR SUBSTITUTE FORM TWO
2427..243F >FFFD # NA <reserved-2427>..<reserved-243F> 2427..243F >FFFD # NA <reserved-2427>..<reserved-243F>
@ -2615,7 +2641,7 @@
# 26E3 valid # 5.2 HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE # 26E3 valid # 5.2 HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE
# 26E4..26E7 valid # 6.0 PENTAGRAM..INVERTED PENTAGRAM # 26E4..26E7 valid # 6.0 PENTAGRAM..INVERTED PENTAGRAM
# 26E8..26FF valid # 5.2 BLACK CROSS ON SHIELD..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE # 26E8..26FF valid # 5.2 BLACK CROSS ON SHIELD..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE
2700 >FFFD # NA <reserved-2700> # 2700 valid # 7.0 BLACK SAFETY SCISSORS
# 2701..2704 valid # 1.1 UPPER BLADE SCISSORS..WHITE SCISSORS # 2701..2704 valid # 1.1 UPPER BLADE SCISSORS..WHITE SCISSORS
# 2705 valid # 6.0 WHITE HEAVY CHECK MARK # 2705 valid # 6.0 WHITE HEAVY CHECK MARK
# 2706..2709 valid # 1.1 TELEPHONE LOCATION SIGN..ENVELOPE # 2706..2709 valid # 1.1 TELEPHONE LOCATION SIGN..ENVELOPE
@ -2665,10 +2691,19 @@
# 2B1B..2B1F valid # 5.1 BLACK LARGE SQUARE..BLACK PENTAGON # 2B1B..2B1F valid # 5.1 BLACK LARGE SQUARE..BLACK PENTAGON
# 2B20..2B23 valid # 5.0 WHITE PENTAGON..HORIZONTAL BLACK HEXAGON # 2B20..2B23 valid # 5.0 WHITE PENTAGON..HORIZONTAL BLACK HEXAGON
# 2B24..2B4C valid # 5.1 BLACK LARGE CIRCLE..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR # 2B24..2B4C valid # 5.1 BLACK LARGE CIRCLE..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
2B4D..2B4F >FFFD # NA <reserved-2B4D>..<reserved-2B4F> # 2B4D..2B4F valid # 7.0 DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..SHORT BACKSLANTED SOUTH ARROW
# 2B50..2B54 valid # 5.1 WHITE MEDIUM STAR..WHITE RIGHT-POINTING PENTAGON # 2B50..2B54 valid # 5.1 WHITE MEDIUM STAR..WHITE RIGHT-POINTING PENTAGON
# 2B55..2B59 valid # 5.2 HEAVY LARGE CIRCLE..HEAVY CIRCLED SALTIRE # 2B55..2B59 valid # 5.2 HEAVY LARGE CIRCLE..HEAVY CIRCLED SALTIRE
2B5A..2BFF >FFFD # NA <reserved-2B5A>..<reserved-2BFF> # 2B5A..2B73 valid # 7.0 SLANTED NORTH ARROW WITH HOOKED HEAD..DOWNWARDS TRIANGLE-HEADED ARROW TO BAR
2B74..2B75 >FFFD # NA <reserved-2B74>..<reserved-2B75>
# 2B76..2B95 valid # 7.0 NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
2B96..2B97 >FFFD # NA <reserved-2B96>..<reserved-2B97>
# 2B98..2BB9 valid # 7.0 THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD..UP ARROWHEAD IN A RECTANGLE BOX
2BBA..2BBC >FFFD # NA <reserved-2BBA>..<reserved-2BBC>
# 2BBD..2BC8 valid # 7.0 BALLOT BOX WITH LIGHT X..BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED
2BC9 >FFFD # NA <reserved-2BC9>
# 2BCA..2BD1 valid # 7.0 TOP HALF BLACK CIRCLE..UNCERTAINTY SIGN
2BD2..2BFF >FFFD # NA <reserved-2BD2>..<reserved-2BFF>
2C00 >2C30 # 4.1 GLAGOLITIC CAPITAL LETTER AZU 2C00 >2C30 # 4.1 GLAGOLITIC CAPITAL LETTER AZU
2C01 >2C31 # 4.1 GLAGOLITIC CAPITAL LETTER BUKY 2C01 >2C31 # 4.1 GLAGOLITIC CAPITAL LETTER BUKY
2C02 >2C32 # 4.1 GLAGOLITIC CAPITAL LETTER VEDE 2C02 >2C32 # 4.1 GLAGOLITIC CAPITAL LETTER VEDE
@ -2895,7 +2930,8 @@
# 2E30 valid # 5.1 RING POINT # 2E30 valid # 5.1 RING POINT
# 2E31 valid # 5.2 WORD SEPARATOR MIDDLE DOT # 2E31 valid # 5.2 WORD SEPARATOR MIDDLE DOT
# 2E32..2E3B valid # 6.1 TURNED COMMA..THREE-EM DASH # 2E32..2E3B valid # 6.1 TURNED COMMA..THREE-EM DASH
2E3C..2E7F >FFFD # NA <reserved-2E3C>..<reserved-2E7F> # 2E3C..2E42 valid # 7.0 STENOGRAPHIC FULL STOP..DOUBLE LOW-REVERSED-9 QUOTATION MARK
2E43..2E7F >FFFD # NA <reserved-2E43>..<reserved-2E7F>
# 2E80..2E99 valid # 3.0 CJK RADICAL REPEAT..CJK RADICAL RAP # 2E80..2E99 valid # 3.0 CJK RADICAL REPEAT..CJK RADICAL RAP
2E9A >FFFD # NA <reserved-2E9A> 2E9A >FFFD # NA <reserved-2E9A>
# 2E9B..2E9E valid # 3.0 CJK RADICAL CHOKE..CJK RADICAL DEATH # 2E9B..2E9E valid # 3.0 CJK RADICAL CHOKE..CJK RADICAL DEATH
@ -3878,7 +3914,13 @@ A694 >A695 # 5.1 CYRILLIC CAPITAL LETTER HWE
# A695 valid # 5.1 CYRILLIC SMALL LETTER HWE # A695 valid # 5.1 CYRILLIC SMALL LETTER HWE
A696 >A697 # 5.1 CYRILLIC CAPITAL LETTER SHWE A696 >A697 # 5.1 CYRILLIC CAPITAL LETTER SHWE
# A697 valid # 5.1 CYRILLIC SMALL LETTER SHWE # A697 valid # 5.1 CYRILLIC SMALL LETTER SHWE
A698..A69E >FFFD # NA <reserved-A698>..<reserved-A69E> A698 >A699 # 7.0 CYRILLIC CAPITAL LETTER DOUBLE O
# A699 valid # 7.0 CYRILLIC SMALL LETTER DOUBLE O
A69A >A69B # 7.0 CYRILLIC CAPITAL LETTER CROSSED O
# A69B valid # 7.0 CYRILLIC SMALL LETTER CROSSED O
A69C >044A # 7.0 MODIFIER LETTER CYRILLIC HARD SIGN
A69D >044C # 7.0 MODIFIER LETTER CYRILLIC SOFT SIGN
A69E >FFFD # NA <reserved-A69E>
# A69F valid # 6.1 COMBINING CYRILLIC LETTER IOTIFIED E # A69F valid # 6.1 COMBINING CYRILLIC LETTER IOTIFIED E
# A6A0..A6E5 valid # 5.2 BAMUM LETTER A..BAMUM LETTER KI # A6A0..A6E5 valid # 5.2 BAMUM LETTER A..BAMUM LETTER KI
# A6E6..A6EF valid # 5.2 BAMUM LETTER MO..BAMUM LETTER KOGHOM # A6E6..A6EF valid # 5.2 BAMUM LETTER MO..BAMUM LETTER KOGHOM
@ -3992,7 +4034,17 @@ A790 >A791 # 6.0 LATIN CAPITAL LETTER N WITH DESCE
# A791 valid # 6.0 LATIN SMALL LETTER N WITH DESCENDER # A791 valid # 6.0 LATIN SMALL LETTER N WITH DESCENDER
A792 >A793 # 6.1 LATIN CAPITAL LETTER C WITH BAR A792 >A793 # 6.1 LATIN CAPITAL LETTER C WITH BAR
# A793 valid # 6.1 LATIN SMALL LETTER C WITH BAR # A793 valid # 6.1 LATIN SMALL LETTER C WITH BAR
A794..A79F >FFFD # NA <reserved-A794>..<reserved-A79F> # A794..A795 valid # 7.0 LATIN SMALL LETTER C WITH PALATAL HOOK..LATIN SMALL LETTER H WITH PALATAL HOOK
A796 >A797 # 7.0 LATIN CAPITAL LETTER B WITH FLOURISH
# A797 valid # 7.0 LATIN SMALL LETTER B WITH FLOURISH
A798 >A799 # 7.0 LATIN CAPITAL LETTER F WITH STROKE
# A799 valid # 7.0 LATIN SMALL LETTER F WITH STROKE
A79A >A79B # 7.0 LATIN CAPITAL LETTER VOLAPUK AE
# A79B valid # 7.0 LATIN SMALL LETTER VOLAPUK AE
A79C >A79D # 7.0 LATIN CAPITAL LETTER VOLAPUK OE
# A79D valid # 7.0 LATIN SMALL LETTER VOLAPUK OE
A79E >A79F # 7.0 LATIN CAPITAL LETTER VOLAPUK UE
# A79F valid # 7.0 LATIN SMALL LETTER VOLAPUK UE
A7A0 >A7A1 # 6.0 LATIN CAPITAL LETTER G WITH OBLIQUE STROKE A7A0 >A7A1 # 6.0 LATIN CAPITAL LETTER G WITH OBLIQUE STROKE
# A7A1 valid # 6.0 LATIN SMALL LETTER G WITH OBLIQUE STROKE # A7A1 valid # 6.0 LATIN SMALL LETTER G WITH OBLIQUE STROKE
A7A2 >A7A3 # 6.0 LATIN CAPITAL LETTER K WITH OBLIQUE STROKE A7A2 >A7A3 # 6.0 LATIN CAPITAL LETTER K WITH OBLIQUE STROKE
@ -4004,7 +4056,14 @@ A7A6 >A7A7 # 6.0 LATIN CAPITAL LETTER R WITH OBLIQ
A7A8 >A7A9 # 6.0 LATIN CAPITAL LETTER S WITH OBLIQUE STROKE A7A8 >A7A9 # 6.0 LATIN CAPITAL LETTER S WITH OBLIQUE STROKE
# A7A9 valid # 6.0 LATIN SMALL LETTER S WITH OBLIQUE STROKE # A7A9 valid # 6.0 LATIN SMALL LETTER S WITH OBLIQUE STROKE
A7AA >0266 # 6.1 LATIN CAPITAL LETTER H WITH HOOK A7AA >0266 # 6.1 LATIN CAPITAL LETTER H WITH HOOK
A7AB..A7F7 >FFFD # NA <reserved-A7AB>..<reserved-A7F7> A7AB >025C # 7.0 LATIN CAPITAL LETTER REVERSED OPEN E
A7AC >0261 # 7.0 LATIN CAPITAL LETTER SCRIPT G
A7AD >026C # 7.0 LATIN CAPITAL LETTER L WITH BELT
A7AE..A7AF >FFFD # NA <reserved-A7AE>..<reserved-A7AF>
A7B0 >029E # 7.0 LATIN CAPITAL LETTER TURNED K
A7B1 >0287 # 7.0 LATIN CAPITAL LETTER TURNED T
A7B2..A7F6 >FFFD # NA <reserved-A7B2>..<reserved-A7F6>
# A7F7 valid # 7.0 LATIN EPIGRAPHIC LETTER SIDEWAYS I
A7F8 >0127 # 6.1 MODIFIER LETTER CAPITAL H WITH STROKE A7F8 >0127 # 6.1 MODIFIER LETTER CAPITAL H WITH STROKE
A7F9 >0153 # 6.1 MODIFIER LETTER SMALL LIGATURE OE A7F9 >0153 # 6.1 MODIFIER LETTER SMALL LIGATURE OE
# A7FA valid # 6.0 LATIN LETTER SMALL CAPITAL TURNED M # A7FA valid # 6.0 LATIN LETTER SMALL CAPITAL TURNED M
@ -4039,7 +4098,8 @@ A9CE >FFFD # NA <reserved-A9CE>
# A9CF..A9D9 valid # 5.2 JAVANESE PANGRANGKEP..JAVANESE DIGIT NINE # A9CF..A9D9 valid # 5.2 JAVANESE PANGRANGKEP..JAVANESE DIGIT NINE
A9DA..A9DD >FFFD # NA <reserved-A9DA>..<reserved-A9DD> A9DA..A9DD >FFFD # NA <reserved-A9DA>..<reserved-A9DD>
# A9DE..A9DF valid # 5.2 JAVANESE PADA TIRTA TUMETES..JAVANESE PADA ISEN-ISEN # A9DE..A9DF valid # 5.2 JAVANESE PADA TIRTA TUMETES..JAVANESE PADA ISEN-ISEN
A9E0..A9FF >FFFD # NA <reserved-A9E0>..<reserved-A9FF> # A9E0..A9FE valid # 7.0 MYANMAR LETTER SHAN GHA..MYANMAR LETTER TAI LAING BHA
A9FF >FFFD # NA <reserved-A9FF>
# AA00..AA36 valid # 5.1 CHAM LETTER A..CHAM CONSONANT SIGN WA # AA00..AA36 valid # 5.1 CHAM LETTER A..CHAM CONSONANT SIGN WA
AA37..AA3F >FFFD # NA <reserved-AA37>..<reserved-AA3F> AA37..AA3F >FFFD # NA <reserved-AA37>..<reserved-AA3F>
# AA40..AA4D valid # 5.1 CHAM LETTER FINAL K..CHAM CONSONANT SIGN FINAL H # AA40..AA4D valid # 5.1 CHAM LETTER FINAL K..CHAM CONSONANT SIGN FINAL H
@ -4050,7 +4110,7 @@ AA5A..AA5B >FFFD # NA <reserved-AA5A>..<reserved-AA5B>
# AA60..AA76 valid # 5.2 MYANMAR LETTER KHAMTI GA..MYANMAR LOGOGRAM KHAMTI HM # AA60..AA76 valid # 5.2 MYANMAR LETTER KHAMTI GA..MYANMAR LOGOGRAM KHAMTI HM
# AA77..AA79 valid # 5.2 MYANMAR SYMBOL AITON EXCLAMATION..MYANMAR SYMBOL AITON TWO # AA77..AA79 valid # 5.2 MYANMAR SYMBOL AITON EXCLAMATION..MYANMAR SYMBOL AITON TWO
# AA7A..AA7B valid # 5.2 MYANMAR LETTER AITON RA..MYANMAR SIGN PAO KAREN TONE # AA7A..AA7B valid # 5.2 MYANMAR LETTER AITON RA..MYANMAR SIGN PAO KAREN TONE
AA7C..AA7F >FFFD # NA <reserved-AA7C>..<reserved-AA7F> # AA7C..AA7F valid # 7.0 MYANMAR SIGN TAI LAING TONE-2..MYANMAR LETTER SHWE PALAUNG SHA
# AA80..AAC2 valid # 5.2 TAI VIET LETTER LOW KO..TAI VIET TONE MAI SONG # AA80..AAC2 valid # 5.2 TAI VIET LETTER LOW KO..TAI VIET TONE MAI SONG
AAC3..AADA >FFFD # NA <reserved-AAC3>..<reserved-AADA> AAC3..AADA >FFFD # NA <reserved-AAC3>..<reserved-AADA>
# AADB..AADD valid # 5.2 TAI VIET SYMBOL KON..TAI VIET SYMBOL SAM # AADB..AADD valid # 5.2 TAI VIET SYMBOL KON..TAI VIET SYMBOL SAM
@ -4068,7 +4128,16 @@ AB17..AB1F >FFFD # NA <reserved-AB17>..<reserved-AB1F>
# AB20..AB26 valid # 6.0 ETHIOPIC SYLLABLE CCHHA..ETHIOPIC SYLLABLE CCHHO # AB20..AB26 valid # 6.0 ETHIOPIC SYLLABLE CCHHA..ETHIOPIC SYLLABLE CCHHO
AB27 >FFFD # NA <reserved-AB27> AB27 >FFFD # NA <reserved-AB27>
# AB28..AB2E valid # 6.0 ETHIOPIC SYLLABLE BBA..ETHIOPIC SYLLABLE BBO # AB28..AB2E valid # 6.0 ETHIOPIC SYLLABLE BBA..ETHIOPIC SYLLABLE BBO
AB2F..ABBF >FFFD # NA <reserved-AB2F>..<reserved-ABBF> AB2F >FFFD # NA <reserved-AB2F>
# AB30..AB5A valid # 7.0 LATIN SMALL LETTER BARRED ALPHA..LATIN SMALL LETTER Y WITH SHORT RIGHT LEG
# AB5B valid # 7.0 MODIFIER BREVE WITH INVERTED BREVE
AB5C >A727 # 7.0 MODIFIER LETTER SMALL HENG
AB5D >AB37 # 7.0 MODIFIER LETTER SMALL L WITH INVERTED LAZY S
AB5E >026B # 7.0 MODIFIER LETTER SMALL L WITH MIDDLE TILDE
AB5F >AB52 # 7.0 MODIFIER LETTER SMALL U WITH LEFT HOOK
AB60..AB63 >FFFD # NA <reserved-AB60>..<reserved-AB63>
# AB64..AB65 valid # 7.0 LATIN SMALL LETTER INVERTED ALPHA..GREEK LETTER SMALL CAPITAL OMEGA
AB66..ABBF >FFFD # NA <reserved-AB66>..<reserved-ABBF>
# ABC0..ABEA valid # 5.2 MEETEI MAYEK LETTER KOK..MEETEI MAYEK VOWEL SIGN NUNG # ABC0..ABEA valid # 5.2 MEETEI MAYEK LETTER KOK..MEETEI MAYEK VOWEL SIGN NUNG
# ABEB valid # 5.2 MEETEI MAYEK CHEIKHEI # ABEB valid # 5.2 MEETEI MAYEK CHEIKHEI
# ABEC..ABED valid # 5.2 MEETEI MAYEK LUM IYEK..MEETEI MAYEK APUN IYEK # ABEC..ABED valid # 5.2 MEETEI MAYEK LUM IYEK..MEETEI MAYEK APUN IYEK
@ -5117,7 +5186,8 @@ FE19 >FFFD # 4.1 PRESENTATION FORM FOR VERTICAL HO
FE1A..FE1F >FFFD # NA <reserved-FE1A>..<reserved-FE1F> FE1A..FE1F >FFFD # NA <reserved-FE1A>..<reserved-FE1F>
# FE20..FE23 valid # 1.1 COMBINING LIGATURE LEFT HALF..COMBINING DOUBLE TILDE RIGHT HALF # FE20..FE23 valid # 1.1 COMBINING LIGATURE LEFT HALF..COMBINING DOUBLE TILDE RIGHT HALF
# FE24..FE26 valid # 5.1 COMBINING MACRON LEFT HALF..COMBINING CONJOINING MACRON # FE24..FE26 valid # 5.1 COMBINING MACRON LEFT HALF..COMBINING CONJOINING MACRON
FE27..FE2F >FFFD # NA <reserved-FE27>..<reserved-FE2F> # FE27..FE2D valid # 7.0 COMBINING LIGATURE LEFT HALF BELOW..COMBINING CONJOINING MACRON BELOW
FE2E..FE2F >FFFD # NA <reserved-FE2E>..<reserved-FE2F>
FE30 >FFFD # 1.1 PRESENTATION FORM FOR VERTICAL TWO DOT LEADER FE30 >FFFD # 1.1 PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
FE31 >2014 # 1.1 PRESENTATION FORM FOR VERTICAL EM DASH FE31 >2014 # 1.1 PRESENTATION FORM FOR VERTICAL EM DASH
FE32 >2013 # 1.1 PRESENTATION FORM FOR VERTICAL EN DASH FE32 >2013 # 1.1 PRESENTATION FORM FOR VERTICAL EN DASH
@ -5487,25 +5557,33 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
10134..10136 >FFFD # NA <reserved-10134>..<reserved-10136> 10134..10136 >FFFD # NA <reserved-10134>..<reserved-10136>
# 10137..1013Fvalid # 4.0 AEGEAN WEIGHT BASE UNIT..AEGEAN MEASURE THIRD SUBUNIT # 10137..1013Fvalid # 4.0 AEGEAN WEIGHT BASE UNIT..AEGEAN MEASURE THIRD SUBUNIT
# 10140..1018Avalid # 4.1 GREEK ACROPHONIC ATTIC ONE QUARTER..GREEK ZERO SIGN # 10140..1018Avalid # 4.1 GREEK ACROPHONIC ATTIC ONE QUARTER..GREEK ZERO SIGN
1018B..1018F >FFFD # NA <reserved-1018B>..<reserved-1018F> # 1018B..1018Cvalid # 7.0 GREEK ONE QUARTER SIGN..GREEK SINUSOID SIGN
1018D..1018F >FFFD # NA <reserved-1018D>..<reserved-1018F>
# 10190..1019Bvalid # 5.1 ROMAN SEXTANS SIGN..ROMAN CENTURIAL SIGN # 10190..1019Bvalid # 5.1 ROMAN SEXTANS SIGN..ROMAN CENTURIAL SIGN
1019C..101CF >FFFD # NA <reserved-1019C>..<reserved-101CF> 1019C..1019F >FFFD # NA <reserved-1019C>..<reserved-1019F>
# 101A0 valid # 7.0 GREEK SYMBOL TAU RHO
101A1..101CF >FFFD # NA <reserved-101A1>..<reserved-101CF>
# 101D0..101FCvalid # 5.1 PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND # 101D0..101FCvalid # 5.1 PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND
# 101FD valid # 5.1 PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE # 101FD valid # 5.1 PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE
101FE..1027F >FFFD # NA <reserved-101FE>..<reserved-1027F> 101FE..1027F >FFFD # NA <reserved-101FE>..<reserved-1027F>
# 10280..1029Cvalid # 5.1 LYCIAN LETTER A..LYCIAN LETTER X # 10280..1029Cvalid # 5.1 LYCIAN LETTER A..LYCIAN LETTER X
1029D..1029F >FFFD # NA <reserved-1029D>..<reserved-1029F> 1029D..1029F >FFFD # NA <reserved-1029D>..<reserved-1029F>
# 102A0..102D0valid # 5.1 CARIAN LETTER A..CARIAN LETTER UUU3 # 102A0..102D0valid # 5.1 CARIAN LETTER A..CARIAN LETTER UUU3
102D1..102FF >FFFD # NA <reserved-102D1>..<reserved-102FF> 102D1..102DF >FFFD # NA <reserved-102D1>..<reserved-102DF>
# 102E0 valid # 7.0 COPTIC EPACT THOUSANDS MARK
# 102E1..102FBvalid # 7.0 COPTIC EPACT DIGIT ONE..COPTIC EPACT NUMBER NINE HUNDRED
102FC..102FF >FFFD # NA <reserved-102FC>..<reserved-102FF>
# 10300..1031Evalid # 3.1 OLD ITALIC LETTER A..OLD ITALIC LETTER UU # 10300..1031Evalid # 3.1 OLD ITALIC LETTER A..OLD ITALIC LETTER UU
1031F >FFFD # NA <reserved-1031F> # 1031F valid # 7.0 OLD ITALIC LETTER ESS
# 10320..10323valid # 3.1 OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY # 10320..10323valid # 3.1 OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY
10324..1032F >FFFD # NA <reserved-10324>..<reserved-1032F> 10324..1032F >FFFD # NA <reserved-10324>..<reserved-1032F>
# 10330..10340valid # 3.1 GOTHIC LETTER AHSA..GOTHIC LETTER PAIRTHRA # 10330..10340valid # 3.1 GOTHIC LETTER AHSA..GOTHIC LETTER PAIRTHRA
# 10341 valid # 3.1 GOTHIC LETTER NINETY # 10341 valid # 3.1 GOTHIC LETTER NINETY
# 10342..10349valid # 3.1 GOTHIC LETTER RAIDA..GOTHIC LETTER OTHAL # 10342..10349valid # 3.1 GOTHIC LETTER RAIDA..GOTHIC LETTER OTHAL
# 1034A valid # 3.1 GOTHIC LETTER NINE HUNDRED # 1034A valid # 3.1 GOTHIC LETTER NINE HUNDRED
1034B..1037F >FFFD # NA <reserved-1034B>..<reserved-1037F> 1034B..1034F >FFFD # NA <reserved-1034B>..<reserved-1034F>
# 10350..1037Avalid # 7.0 OLD PERMIC LETTER AN..COMBINING OLD PERMIC LETTER SII
1037B..1037F >FFFD # NA <reserved-1037B>..<reserved-1037F>
# 10380..1039Dvalid # 4.0 UGARITIC LETTER ALPA..UGARITIC LETTER SSU # 10380..1039Dvalid # 4.0 UGARITIC LETTER ALPA..UGARITIC LETTER SSU
1039E >FFFD # NA <reserved-1039E> 1039E >FFFD # NA <reserved-1039E>
# 1039F valid # 4.0 UGARITIC WORD DIVIDER # 1039F valid # 4.0 UGARITIC WORD DIVIDER
@ -5558,7 +5636,19 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
# 1044E..1049Dvalid # 4.0 DESERET SMALL LETTER OI..OSMANYA LETTER OO # 1044E..1049Dvalid # 4.0 DESERET SMALL LETTER OI..OSMANYA LETTER OO
1049E..1049F >FFFD # NA <reserved-1049E>..<reserved-1049F> 1049E..1049F >FFFD # NA <reserved-1049E>..<reserved-1049F>
# 104A0..104A9valid # 4.0 OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE # 104A0..104A9valid # 4.0 OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE
104AA..107FF >FFFD # NA <reserved-104AA>..<reserved-107FF> 104AA..104FF >FFFD # NA <reserved-104AA>..<reserved-104FF>
# 10500..10527valid # 7.0 ELBASAN LETTER A..ELBASAN LETTER KHE
10528..1052F >FFFD # NA <reserved-10528>..<reserved-1052F>
# 10530..10563valid # 7.0 CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW
10564..1056E >FFFD # NA <reserved-10564>..<reserved-1056E>
# 1056F valid # 7.0 CAUCASIAN ALBANIAN CITATION MARK
10570..105FF >FFFD # NA <reserved-10570>..<reserved-105FF>
# 10600..10736valid # 7.0 LINEAR A SIGN AB001..LINEAR A SIGN A664
10737..1073F >FFFD # NA <reserved-10737>..<reserved-1073F>
# 10740..10755valid # 7.0 LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE
10756..1075F >FFFD # NA <reserved-10756>..<reserved-1075F>
# 10760..10767valid # 7.0 LINEAR A SIGN A800..LINEAR A SIGN A807
10768..107FF >FFFD # NA <reserved-10768>..<reserved-107FF>
# 10800..10805valid # 4.0 CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA # 10800..10805valid # 4.0 CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA
10806..10807 >FFFD # NA <reserved-10806>..<reserved-10807> 10806..10807 >FFFD # NA <reserved-10806>..<reserved-10807>
# 10808 valid # 4.0 CYPRIOT SYLLABLE JO # 10808 valid # 4.0 CYPRIOT SYLLABLE JO
@ -5573,7 +5663,12 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
# 10840..10855valid # 5.2 IMPERIAL ARAMAIC LETTER ALEPH..IMPERIAL ARAMAIC LETTER TAW # 10840..10855valid # 5.2 IMPERIAL ARAMAIC LETTER ALEPH..IMPERIAL ARAMAIC LETTER TAW
10856 >FFFD # NA <reserved-10856> 10856 >FFFD # NA <reserved-10856>
# 10857..1085Fvalid # 5.2 IMPERIAL ARAMAIC SECTION SIGN..IMPERIAL ARAMAIC NUMBER TEN THOUSAND # 10857..1085Fvalid # 5.2 IMPERIAL ARAMAIC SECTION SIGN..IMPERIAL ARAMAIC NUMBER TEN THOUSAND
10860..108FF >FFFD # NA <reserved-10860>..<reserved-108FF> # 10860..10876valid # 7.0 PALMYRENE LETTER ALEPH..PALMYRENE LETTER TAW
# 10877..1087Fvalid # 7.0 PALMYRENE LEFT-POINTING FLEURON..PALMYRENE NUMBER TWENTY
# 10880..1089Evalid # 7.0 NABATAEAN LETTER FINAL ALEPH..NABATAEAN LETTER TAW
1089F..108A6 >FFFD # NA <reserved-1089F>..<reserved-108A6>
# 108A7..108AFvalid # 7.0 NABATAEAN NUMBER ONE..NABATAEAN NUMBER ONE HUNDRED
108B0..108FF >FFFD # NA <reserved-108B0>..<reserved-108FF>
# 10900..10915valid # 5.0 PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU # 10900..10915valid # 5.0 PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
# 10916..10919valid # 5.0 PHOENICIAN NUMBER ONE..PHOENICIAN NUMBER ONE HUNDRED # 10916..10919valid # 5.0 PHOENICIAN NUMBER ONE..PHOENICIAN NUMBER ONE HUNDRED
# 1091A..1091Bvalid # 5.2 PHOENICIAN NUMBER TWO..PHOENICIAN NUMBER THREE # 1091A..1091Bvalid # 5.2 PHOENICIAN NUMBER TWO..PHOENICIAN NUMBER THREE
@ -5606,7 +5701,15 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
10A59..10A5F >FFFD # NA <reserved-10A59>..<reserved-10A5F> 10A59..10A5F >FFFD # NA <reserved-10A59>..<reserved-10A5F>
# 10A60..10A7Cvalid # 5.2 OLD SOUTH ARABIAN LETTER HE..OLD SOUTH ARABIAN LETTER THETH # 10A60..10A7Cvalid # 5.2 OLD SOUTH ARABIAN LETTER HE..OLD SOUTH ARABIAN LETTER THETH
# 10A7D..10A7Fvalid # 5.2 OLD SOUTH ARABIAN NUMBER ONE..OLD SOUTH ARABIAN NUMERIC INDICATOR # 10A7D..10A7Fvalid # 5.2 OLD SOUTH ARABIAN NUMBER ONE..OLD SOUTH ARABIAN NUMERIC INDICATOR
10A80..10AFF >FFFD # NA <reserved-10A80>..<reserved-10AFF> # 10A80..10A9Cvalid # 7.0 OLD NORTH ARABIAN LETTER HEH..OLD NORTH ARABIAN LETTER ZAH
# 10A9D..10A9Fvalid # 7.0 OLD NORTH ARABIAN NUMBER ONE..OLD NORTH ARABIAN NUMBER TWENTY
10AA0..10ABF >FFFD # NA <reserved-10AA0>..<reserved-10ABF>
# 10AC0..10AC7valid # 7.0 MANICHAEAN LETTER ALEPH..MANICHAEAN LETTER WAW
# 10AC8 valid # 7.0 MANICHAEAN SIGN UD
# 10AC9..10AE6valid # 7.0 MANICHAEAN LETTER ZAYIN..MANICHAEAN ABBREVIATION MARK BELOW
10AE7..10AEA >FFFD # NA <reserved-10AE7>..<reserved-10AEA>
# 10AEB..10AF6valid # 7.0 MANICHAEAN NUMBER ONE..MANICHAEAN PUNCTUATION LINE FILLER
10AF7..10AFF >FFFD # NA <reserved-10AF7>..<reserved-10AFF>
# 10B00..10B35valid # 5.2 AVESTAN LETTER A..AVESTAN LETTER HE # 10B00..10B35valid # 5.2 AVESTAN LETTER A..AVESTAN LETTER HE
10B36..10B38 >FFFD # NA <reserved-10B36>..<reserved-10B38> 10B36..10B38 >FFFD # NA <reserved-10B36>..<reserved-10B38>
# 10B39..10B3Fvalid # 5.2 AVESTAN ABBREVIATION MARK..LARGE ONE RING OVER TWO RINGS PUNCTUATION # 10B39..10B3Fvalid # 5.2 AVESTAN ABBREVIATION MARK..LARGE ONE RING OVER TWO RINGS PUNCTUATION
@ -5616,7 +5719,12 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
# 10B60..10B72valid # 5.2 INSCRIPTIONAL PAHLAVI LETTER ALEPH..INSCRIPTIONAL PAHLAVI LETTER TAW # 10B60..10B72valid # 5.2 INSCRIPTIONAL PAHLAVI LETTER ALEPH..INSCRIPTIONAL PAHLAVI LETTER TAW
10B73..10B77 >FFFD # NA <reserved-10B73>..<reserved-10B77> 10B73..10B77 >FFFD # NA <reserved-10B73>..<reserved-10B77>
# 10B78..10B7Fvalid # 5.2 INSCRIPTIONAL PAHLAVI NUMBER ONE..INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND # 10B78..10B7Fvalid # 5.2 INSCRIPTIONAL PAHLAVI NUMBER ONE..INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND
10B80..10BFF >FFFD # NA <reserved-10B80>..<reserved-10BFF> # 10B80..10B91valid # 7.0 PSALTER PAHLAVI LETTER ALEPH..PSALTER PAHLAVI LETTER TAW
10B92..10B98 >FFFD # NA <reserved-10B92>..<reserved-10B98>
# 10B99..10B9Cvalid # 7.0 PSALTER PAHLAVI SECTION MARK..PSALTER PAHLAVI FOUR DOTS WITH DOT
10B9D..10BA8 >FFFD # NA <reserved-10B9D>..<reserved-10BA8>
# 10BA9..10BAFvalid # 7.0 PSALTER PAHLAVI NUMBER ONE..PSALTER PAHLAVI NUMBER ONE HUNDRED
10BB0..10BFF >FFFD # NA <reserved-10BB0>..<reserved-10BFF>
# 10C00..10C48valid # 5.2 OLD TURKIC LETTER ORKHON A..OLD TURKIC LETTER ORKHON BASH # 10C00..10C48valid # 5.2 OLD TURKIC LETTER ORKHON A..OLD TURKIC LETTER ORKHON BASH
10C49..10E5F >FFFD # NA <reserved-10C49>..<reserved-10E5F> 10C49..10E5F >FFFD # NA <reserved-10C49>..<reserved-10E5F>
# 10E60..10E7Evalid # 5.2 RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS # 10E60..10E7Evalid # 5.2 RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS
@ -5626,7 +5734,8 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
1104E..11051 >FFFD # NA <reserved-1104E>..<reserved-11051> 1104E..11051 >FFFD # NA <reserved-1104E>..<reserved-11051>
# 11052..11065valid # 6.0 BRAHMI NUMBER ONE..BRAHMI NUMBER ONE THOUSAND # 11052..11065valid # 6.0 BRAHMI NUMBER ONE..BRAHMI NUMBER ONE THOUSAND
# 11066..1106Fvalid # 6.0 BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE # 11066..1106Fvalid # 6.0 BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE
11070..1107F >FFFD # NA <reserved-11070>..<reserved-1107F> 11070..1107E >FFFD # NA <reserved-11070>..<reserved-1107E>
# 1107F valid # 7.0 BRAHMI NUMBER JOINER
# 11080..110BAvalid # 5.2 KAITHI SIGN CANDRABINDU..KAITHI SIGN NUKTA # 11080..110BAvalid # 5.2 KAITHI SIGN CANDRABINDU..KAITHI SIGN NUKTA
# 110BB..110BCvalid # 5.2 KAITHI ABBREVIATION SIGN..KAITHI ENUMERATION SIGN # 110BB..110BCvalid # 5.2 KAITHI ABBREVIATION SIGN..KAITHI ENUMERATION SIGN
110BD >FFFD # 5.2 KAITHI NUMBER SIGN 110BD >FFFD # 5.2 KAITHI NUMBER SIGN
@ -5640,26 +5749,155 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
11135 >FFFD # NA <reserved-11135> 11135 >FFFD # NA <reserved-11135>
# 11136..1113Fvalid # 6.1 CHAKMA DIGIT ZERO..CHAKMA DIGIT NINE # 11136..1113Fvalid # 6.1 CHAKMA DIGIT ZERO..CHAKMA DIGIT NINE
# 11140..11143valid # 6.1 CHAKMA SECTION MARK..CHAKMA QUESTION MARK # 11140..11143valid # 6.1 CHAKMA SECTION MARK..CHAKMA QUESTION MARK
11144..1117F >FFFD # NA <reserved-11144>..<reserved-1117F> 11144..1114F >FFFD # NA <reserved-11144>..<reserved-1114F>
# 11150..11173valid # 7.0 MAHAJANI LETTER A..MAHAJANI SIGN NUKTA
# 11174..11175valid # 7.0 MAHAJANI ABBREVIATION SIGN..MAHAJANI SECTION MARK
# 11176 valid # 7.0 MAHAJANI LIGATURE SHRI
11177..1117F >FFFD # NA <reserved-11177>..<reserved-1117F>
# 11180..111C4valid # 6.1 SHARADA SIGN CANDRABINDU..SHARADA OM # 11180..111C4valid # 6.1 SHARADA SIGN CANDRABINDU..SHARADA OM
# 111C5..111C8valid # 6.1 SHARADA DANDA..SHARADA SEPARATOR # 111C5..111C8valid # 6.1 SHARADA DANDA..SHARADA SEPARATOR
111C9..111CF >FFFD # NA <reserved-111C9>..<reserved-111CF> 111C9..111CC >FFFD # NA <reserved-111C9>..<reserved-111CC>
# 111CD valid # 7.0 SHARADA SUTRA MARK
111CE..111CF >FFFD # NA <reserved-111CE>..<reserved-111CF>
# 111D0..111D9valid # 6.1 SHARADA DIGIT ZERO..SHARADA DIGIT NINE # 111D0..111D9valid # 6.1 SHARADA DIGIT ZERO..SHARADA DIGIT NINE
111DA..1167F >FFFD # NA <reserved-111DA>..<reserved-1167F> # 111DA valid # 7.0 SHARADA EKAM
111DB..111E0 >FFFD # NA <reserved-111DB>..<reserved-111E0>
# 111E1..111F4valid # 7.0 SINHALA ARCHAIC DIGIT ONE..SINHALA ARCHAIC NUMBER ONE THOUSAND
111F5..111FF >FFFD # NA <reserved-111F5>..<reserved-111FF>
# 11200..11211valid # 7.0 KHOJKI LETTER A..KHOJKI LETTER JJA
11212 >FFFD # NA <reserved-11212>
# 11213..11237valid # 7.0 KHOJKI LETTER NYA..KHOJKI SIGN SHADDA
# 11238..1123Dvalid # 7.0 KHOJKI DANDA..KHOJKI ABBREVIATION SIGN
1123E..112AF >FFFD # NA <reserved-1123E>..<reserved-112AF>
# 112B0..112EAvalid # 7.0 KHUDAWADI LETTER A..KHUDAWADI SIGN VIRAMA
112EB..112EF >FFFD # NA <reserved-112EB>..<reserved-112EF>
# 112F0..112F9valid # 7.0 KHUDAWADI DIGIT ZERO..KHUDAWADI DIGIT NINE
112FA..11300 >FFFD # NA <reserved-112FA>..<reserved-11300>
# 11301..11303valid # 7.0 GRANTHA SIGN CANDRABINDU..GRANTHA SIGN VISARGA
11304 >FFFD # NA <reserved-11304>
# 11305..1130Cvalid # 7.0 GRANTHA LETTER A..GRANTHA LETTER VOCALIC L
1130D..1130E >FFFD # NA <reserved-1130D>..<reserved-1130E>
# 1130F..11310valid # 7.0 GRANTHA LETTER EE..GRANTHA LETTER AI
11311..11312 >FFFD # NA <reserved-11311>..<reserved-11312>
# 11313..11328valid # 7.0 GRANTHA LETTER OO..GRANTHA LETTER NA
11329 >FFFD # NA <reserved-11329>
# 1132A..11330valid # 7.0 GRANTHA LETTER PA..GRANTHA LETTER RA
11331 >FFFD # NA <reserved-11331>
# 11332..11333valid # 7.0 GRANTHA LETTER LA..GRANTHA LETTER LLA
11334 >FFFD # NA <reserved-11334>
# 11335..11339valid # 7.0 GRANTHA LETTER VA..GRANTHA LETTER HA
1133A..1133B >FFFD # NA <reserved-1133A>..<reserved-1133B>
# 1133C..11344valid # 7.0 GRANTHA SIGN NUKTA..GRANTHA VOWEL SIGN VOCALIC RR
11345..11346 >FFFD # NA <reserved-11345>..<reserved-11346>
# 11347..11348valid # 7.0 GRANTHA VOWEL SIGN EE..GRANTHA VOWEL SIGN AI
11349..1134A >FFFD # NA <reserved-11349>..<reserved-1134A>
# 1134B..1134Dvalid # 7.0 GRANTHA VOWEL SIGN OO..GRANTHA SIGN VIRAMA
1134E..11356 >FFFD # NA <reserved-1134E>..<reserved-11356>
# 11357 valid # 7.0 GRANTHA AU LENGTH MARK
11358..1135C >FFFD # NA <reserved-11358>..<reserved-1135C>
# 1135D..11363valid # 7.0 GRANTHA SIGN PLUTA..GRANTHA VOWEL SIGN VOCALIC LL
11364..11365 >FFFD # NA <reserved-11364>..<reserved-11365>
# 11366..1136Cvalid # 7.0 COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX
1136D..1136F >FFFD # NA <reserved-1136D>..<reserved-1136F>
# 11370..11374valid # 7.0 COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA
11375..1147F >FFFD # NA <reserved-11375>..<reserved-1147F>
# 11480..114C5valid # 7.0 TIRHUTA ANJI..TIRHUTA GVANG
# 114C6 valid # 7.0 TIRHUTA ABBREVIATION SIGN
# 114C7 valid # 7.0 TIRHUTA OM
114C8..114CF >FFFD # NA <reserved-114C8>..<reserved-114CF>
# 114D0..114D9valid # 7.0 TIRHUTA DIGIT ZERO..TIRHUTA DIGIT NINE
114DA..1157F >FFFD # NA <reserved-114DA>..<reserved-1157F>
# 11580..115B5valid # 7.0 SIDDHAM LETTER A..SIDDHAM VOWEL SIGN VOCALIC RR
115B6..115B7 >FFFD # NA <reserved-115B6>..<reserved-115B7>
# 115B8..115C0valid # 7.0 SIDDHAM VOWEL SIGN E..SIDDHAM SIGN NUKTA
# 115C1..115C9valid # 7.0 SIDDHAM SIGN SIDDHAM..SIDDHAM END OF TEXT MARK
115CA..115FF >FFFD # NA <reserved-115CA>..<reserved-115FF>
# 11600..11640valid # 7.0 MODI LETTER A..MODI SIGN ARDHACANDRA
# 11641..11643valid # 7.0 MODI DANDA..MODI ABBREVIATION SIGN
# 11644 valid # 7.0 MODI SIGN HUVA
11645..1164F >FFFD # NA <reserved-11645>..<reserved-1164F>
# 11650..11659valid # 7.0 MODI DIGIT ZERO..MODI DIGIT NINE
1165A..1167F >FFFD # NA <reserved-1165A>..<reserved-1167F>
# 11680..116B7valid # 6.1 TAKRI LETTER A..TAKRI SIGN NUKTA # 11680..116B7valid # 6.1 TAKRI LETTER A..TAKRI SIGN NUKTA
116B8..116BF >FFFD # NA <reserved-116B8>..<reserved-116BF> 116B8..116BF >FFFD # NA <reserved-116B8>..<reserved-116BF>
# 116C0..116C9valid # 6.1 TAKRI DIGIT ZERO..TAKRI DIGIT NINE # 116C0..116C9valid # 6.1 TAKRI DIGIT ZERO..TAKRI DIGIT NINE
116CA..11FFF >FFFD # NA <reserved-116CA>..<reserved-11FFF> 116CA..1189F >FFFD # NA <reserved-116CA>..<reserved-1189F>
118A0 >118C0 # 7.0 WARANG CITI CAPITAL LETTER NGAA
118A1 >118C1 # 7.0 WARANG CITI CAPITAL LETTER A
118A2 >118C2 # 7.0 WARANG CITI CAPITAL LETTER WI
118A3 >118C3 # 7.0 WARANG CITI CAPITAL LETTER YU
118A4 >118C4 # 7.0 WARANG CITI CAPITAL LETTER YA
118A5 >118C5 # 7.0 WARANG CITI CAPITAL LETTER YO
118A6 >118C6 # 7.0 WARANG CITI CAPITAL LETTER II
118A7 >118C7 # 7.0 WARANG CITI CAPITAL LETTER UU
118A8 >118C8 # 7.0 WARANG CITI CAPITAL LETTER E
118A9 >118C9 # 7.0 WARANG CITI CAPITAL LETTER O
118AA >118CA # 7.0 WARANG CITI CAPITAL LETTER ANG
118AB >118CB # 7.0 WARANG CITI CAPITAL LETTER GA
118AC >118CC # 7.0 WARANG CITI CAPITAL LETTER KO
118AD >118CD # 7.0 WARANG CITI CAPITAL LETTER ENY
118AE >118CE # 7.0 WARANG CITI CAPITAL LETTER YUJ
118AF >118CF # 7.0 WARANG CITI CAPITAL LETTER UC
118B0 >118D0 # 7.0 WARANG CITI CAPITAL LETTER ENN
118B1 >118D1 # 7.0 WARANG CITI CAPITAL LETTER ODD
118B2 >118D2 # 7.0 WARANG CITI CAPITAL LETTER TTE
118B3 >118D3 # 7.0 WARANG CITI CAPITAL LETTER NUNG
118B4 >118D4 # 7.0 WARANG CITI CAPITAL LETTER DA
118B5 >118D5 # 7.0 WARANG CITI CAPITAL LETTER AT
118B6 >118D6 # 7.0 WARANG CITI CAPITAL LETTER AM
118B7 >118D7 # 7.0 WARANG CITI CAPITAL LETTER BU
118B8 >118D8 # 7.0 WARANG CITI CAPITAL LETTER PU
118B9 >118D9 # 7.0 WARANG CITI CAPITAL LETTER HIYO
118BA >118DA # 7.0 WARANG CITI CAPITAL LETTER HOLO
118BB >118DB # 7.0 WARANG CITI CAPITAL LETTER HORR
118BC >118DC # 7.0 WARANG CITI CAPITAL LETTER HAR
118BD >118DD # 7.0 WARANG CITI CAPITAL LETTER SSUU
118BE >118DE # 7.0 WARANG CITI CAPITAL LETTER SII
118BF >118DF # 7.0 WARANG CITI CAPITAL LETTER VIYO
# 118C0..118E9valid # 7.0 WARANG CITI SMALL LETTER NGAA..WARANG CITI DIGIT NINE
# 118EA..118F2valid # 7.0 WARANG CITI NUMBER TEN..WARANG CITI NUMBER NINETY
118F3..118FE >FFFD # NA <reserved-118F3>..<reserved-118FE>
# 118FF valid # 7.0 WARANG CITI OM
11900..11ABF >FFFD # NA <reserved-11900>..<reserved-11ABF>
# 11AC0..11AF8valid # 7.0 PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL
11AF9..11FFF >FFFD # NA <reserved-11AF9>..<reserved-11FFF>
# 12000..1236Evalid # 5.0 CUNEIFORM SIGN A..CUNEIFORM SIGN ZUM # 12000..1236Evalid # 5.0 CUNEIFORM SIGN A..CUNEIFORM SIGN ZUM
1236F..123FF >FFFD # NA <reserved-1236F>..<reserved-123FF> # 1236F..12398valid # 7.0 CUNEIFORM SIGN KAP ELAMITE..CUNEIFORM SIGN UM TIMES ME
12399..123FF >FFFD # NA <reserved-12399>..<reserved-123FF>
# 12400..12462valid # 5.0 CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER # 12400..12462valid # 5.0 CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER
12463..1246F >FFFD # NA <reserved-12463>..<reserved-1246F> # 12463..1246Evalid # 7.0 CUNEIFORM NUMERIC SIGN ONE QUARTER GUR..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM
1246F >FFFD # NA <reserved-1246F>
# 12470..12473valid # 5.0 CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON # 12470..12473valid # 5.0 CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
12474..12FFF >FFFD # NA <reserved-12474>..<reserved-12FFF> # 12474 valid # 7.0 CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON
12475..12FFF >FFFD # NA <reserved-12475>..<reserved-12FFF>
# 13000..1342Evalid # 5.2 EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032 # 13000..1342Evalid # 5.2 EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032
1342F..167FF >FFFD # NA <reserved-1342F>..<reserved-167FF> 1342F..167FF >FFFD # NA <reserved-1342F>..<reserved-167FF>
# 16800..16A38valid # 6.0 BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ # 16800..16A38valid # 6.0 BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ
16A39..16EFF >FFFD # NA <reserved-16A39>..<reserved-16EFF> 16A39..16A3F >FFFD # NA <reserved-16A39>..<reserved-16A3F>
# 16A40..16A5Evalid # 7.0 MRO LETTER TA..MRO LETTER TEK
16A5F >FFFD # NA <reserved-16A5F>
# 16A60..16A69valid # 7.0 MRO DIGIT ZERO..MRO DIGIT NINE
16A6A..16A6D >FFFD # NA <reserved-16A6A>..<reserved-16A6D>
# 16A6E..16A6Fvalid # 7.0 MRO DANDA..MRO DOUBLE DANDA
16A70..16ACF >FFFD # NA <reserved-16A70>..<reserved-16ACF>
# 16AD0..16AEDvalid # 7.0 BASSA VAH LETTER ENNI..BASSA VAH LETTER I
16AEE..16AEF >FFFD # NA <reserved-16AEE>..<reserved-16AEF>
# 16AF0..16AF4valid # 7.0 BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
# 16AF5 valid # 7.0 BASSA VAH FULL STOP
16AF6..16AFF >FFFD # NA <reserved-16AF6>..<reserved-16AFF>
# 16B00..16B36valid # 7.0 PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG MARK CIM TAUM
# 16B37..16B3Fvalid # 7.0 PAHAWH HMONG SIGN VOS THOM..PAHAWH HMONG SIGN XYEEM FAIB
# 16B40..16B43valid # 7.0 PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM
# 16B44..16B45valid # 7.0 PAHAWH HMONG SIGN XAUS..PAHAWH HMONG SIGN CIM TSOV ROG
16B46..16B4F >FFFD # NA <reserved-16B46>..<reserved-16B4F>
# 16B50..16B59valid # 7.0 PAHAWH HMONG DIGIT ZERO..PAHAWH HMONG DIGIT NINE
16B5A >FFFD # NA <reserved-16B5A>
# 16B5B..16B61valid # 7.0 PAHAWH HMONG NUMBER TENS..PAHAWH HMONG NUMBER TRILLIONS
16B62 >FFFD # NA <reserved-16B62>
# 16B63..16B77valid # 7.0 PAHAWH HMONG SIGN VOS LUB..PAHAWH HMONG SIGN CIM NRES TOS
16B78..16B7C >FFFD # NA <reserved-16B78>..<reserved-16B7C>
# 16B7D..16B8Fvalid # 7.0 PAHAWH HMONG CLAN SIGN TSHEEJ..PAHAWH HMONG CLAN SIGN VWJ
16B90..16EFF >FFFD # NA <reserved-16B90>..<reserved-16EFF>
# 16F00..16F44valid # 6.1 MIAO LETTER PA..MIAO LETTER HHA # 16F00..16F44valid # 6.1 MIAO LETTER PA..MIAO LETTER HHA
16F45..16F4F >FFFD # NA <reserved-16F45>..<reserved-16F4F> 16F45..16F4F >FFFD # NA <reserved-16F45>..<reserved-16F4F>
# 16F50..16F7Evalid # 6.1 MIAO LETTER NASALIZATION..MIAO VOWEL SIGN NG # 16F50..16F7Evalid # 6.1 MIAO LETTER NASALIZATION..MIAO VOWEL SIGN NG
@ -5667,7 +5905,20 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
# 16F8F..16F9Fvalid # 6.1 MIAO TONE RIGHT..MIAO LETTER REFORMED TONE-8 # 16F8F..16F9Fvalid # 6.1 MIAO TONE RIGHT..MIAO LETTER REFORMED TONE-8
16FA0..1AFFF >FFFD # NA <reserved-16FA0>..<reserved-1AFFF> 16FA0..1AFFF >FFFD # NA <reserved-16FA0>..<reserved-1AFFF>
# 1B000..1B001valid # 6.0 KATAKANA LETTER ARCHAIC E..HIRAGANA LETTER ARCHAIC YE # 1B000..1B001valid # 6.0 KATAKANA LETTER ARCHAIC E..HIRAGANA LETTER ARCHAIC YE
1B002..1CFFF >FFFD # NA <reserved-1B002>..<reserved-1CFFF> 1B002..1BBFF >FFFD # NA <reserved-1B002>..<reserved-1BBFF>
# 1BC00..1BC6Avalid # 7.0 DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M
1BC6B..1BC6F >FFFD # NA <reserved-1BC6B>..<reserved-1BC6F>
# 1BC70..1BC7Cvalid # 7.0 DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK
1BC7D..1BC7F >FFFD # NA <reserved-1BC7D>..<reserved-1BC7F>
# 1BC80..1BC88valid # 7.0 DUPLOYAN AFFIX HIGH ACUTE..DUPLOYAN AFFIX HIGH VERTICAL
1BC89..1BC8F >FFFD # NA <reserved-1BC89>..<reserved-1BC8F>
# 1BC90..1BC99valid # 7.0 DUPLOYAN AFFIX LOW ACUTE..DUPLOYAN AFFIX LOW ARROW
1BC9A..1BC9B >FFFD # NA <reserved-1BC9A>..<reserved-1BC9B>
# 1BC9C valid # 7.0 DUPLOYAN SIGN O WITH CROSS
# 1BC9D..1BC9Evalid # 7.0 DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK
# 1BC9F valid # 7.0 DUPLOYAN PUNCTUATION CHINOOK FULL STOP
1BCA0..1BCA3 > # 7.0 SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP
1BCA4..1CFFF >FFFD # NA <reserved-1BCA4>..<reserved-1CFFF>
# 1D000..1D0F5valid # 3.1 BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO # 1D000..1D0F5valid # 3.1 BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO
1D0F6..1D0FF >FFFD # NA <reserved-1D0F6>..<reserved-1D0FF> 1D0F6..1D0FF >FFFD # NA <reserved-1D0F6>..<reserved-1D0FF>
# 1D100..1D126valid # 3.1 MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2 # 1D100..1D126valid # 3.1 MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2
@ -6708,7 +6959,12 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
1D7FD >0037 # 3.1 MATHEMATICAL MONOSPACE DIGIT SEVEN 1D7FD >0037 # 3.1 MATHEMATICAL MONOSPACE DIGIT SEVEN
1D7FE >0038 # 3.1 MATHEMATICAL MONOSPACE DIGIT EIGHT 1D7FE >0038 # 3.1 MATHEMATICAL MONOSPACE DIGIT EIGHT
1D7FF >0039 # 3.1 MATHEMATICAL MONOSPACE DIGIT NINE 1D7FF >0039 # 3.1 MATHEMATICAL MONOSPACE DIGIT NINE
1D800..1EDFF >FFFD # NA <reserved-1D800>..<reserved-1EDFF> 1D800..1E7FF >FFFD # NA <reserved-1D800>..<reserved-1E7FF>
# 1E800..1E8C4valid # 7.0 MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON
1E8C5..1E8C6 >FFFD # NA <reserved-1E8C5>..<reserved-1E8C6>
# 1E8C7..1E8CFvalid # 7.0 MENDE KIKAKUI DIGIT ONE..MENDE KIKAKUI DIGIT NINE
# 1E8D0..1E8D6valid # 7.0 MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
1E8D7..1EDFF >FFFD # NA <reserved-1E8D7>..<reserved-1EDFF>
1EE00 >0627 # 6.1 ARABIC MATHEMATICAL ALEF 1EE00 >0627 # 6.1 ARABIC MATHEMATICAL ALEF
1EE01 >0628 # 6.1 ARABIC MATHEMATICAL BEH 1EE01 >0628 # 6.1 ARABIC MATHEMATICAL BEH
1EE02 >062C # 6.1 ARABIC MATHEMATICAL JEEM 1EE02 >062C # 6.1 ARABIC MATHEMATICAL JEEM
@ -6892,11 +7148,13 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
# 1F0A0..1F0AEvalid # 6.0 PLAYING CARD BACK..PLAYING CARD KING OF SPADES # 1F0A0..1F0AEvalid # 6.0 PLAYING CARD BACK..PLAYING CARD KING OF SPADES
1F0AF..1F0B0 >FFFD # NA <reserved-1F0AF>..<reserved-1F0B0> 1F0AF..1F0B0 >FFFD # NA <reserved-1F0AF>..<reserved-1F0B0>
# 1F0B1..1F0BEvalid # 6.0 PLAYING CARD ACE OF HEARTS..PLAYING CARD KING OF HEARTS # 1F0B1..1F0BEvalid # 6.0 PLAYING CARD ACE OF HEARTS..PLAYING CARD KING OF HEARTS
1F0BF..1F0C0 >FFFD # NA <reserved-1F0BF>..<reserved-1F0C0> # 1F0BF valid # 7.0 PLAYING CARD RED JOKER
1F0C0 >FFFD # NA <reserved-1F0C0>
# 1F0C1..1F0CFvalid # 6.0 PLAYING CARD ACE OF DIAMONDS..PLAYING CARD BLACK JOKER # 1F0C1..1F0CFvalid # 6.0 PLAYING CARD ACE OF DIAMONDS..PLAYING CARD BLACK JOKER
1F0D0 >FFFD # NA <reserved-1F0D0> 1F0D0 >FFFD # NA <reserved-1F0D0>
# 1F0D1..1F0DFvalid # 6.0 PLAYING CARD ACE OF CLUBS..PLAYING CARD WHITE JOKER # 1F0D1..1F0DFvalid # 6.0 PLAYING CARD ACE OF CLUBS..PLAYING CARD WHITE JOKER
1F0E0..1F0FF >FFFD # NA <reserved-1F0E0>..<reserved-1F0FF> # 1F0E0..1F0F5valid # 7.0 PLAYING CARD FOOL..PLAYING CARD TRUMP-21
1F0F6..1F0FF >FFFD # NA <reserved-1F0F6>..<reserved-1F0FF>
1F100 >FFFD # 5.2 DIGIT ZERO FULL STOP 1F100 >FFFD # 5.2 DIGIT ZERO FULL STOP
1F101 >0030 002C # 5.2 DIGIT ZERO COMMA 1F101 >0030 002C # 5.2 DIGIT ZERO COMMA
1F102 >0031 002C # 5.2 DIGIT ONE COMMA 1F102 >0031 002C # 5.2 DIGIT ONE COMMA
@ -6908,7 +7166,8 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
1F108 >0037 002C # 5.2 DIGIT SEVEN COMMA 1F108 >0037 002C # 5.2 DIGIT SEVEN COMMA
1F109 >0038 002C # 5.2 DIGIT EIGHT COMMA 1F109 >0038 002C # 5.2 DIGIT EIGHT COMMA
1F10A >0039 002C # 5.2 DIGIT NINE COMMA 1F10A >0039 002C # 5.2 DIGIT NINE COMMA
1F10B..1F10F >FFFD # NA <reserved-1F10B>..<reserved-1F10F> # 1F10B..1F10Cvalid # 7.0 DINGBAT CIRCLED SANS-SERIF DIGIT ZERO..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO
1F10D..1F10F >FFFD # NA <reserved-1F10D>..<reserved-1F10F>
1F110 >0028 0061 0029 #5.2 PARENTHESIZED LATIN CAPITAL LETTER A 1F110 >0028 0061 0029 #5.2 PARENTHESIZED LATIN CAPITAL LETTER A
1F111 >0028 0062 0029 #5.2 PARENTHESIZED LATIN CAPITAL LETTER B 1F111 >0028 0062 0029 #5.2 PARENTHESIZED LATIN CAPITAL LETTER B
1F112 >0028 0063 0029 #5.2 PARENTHESIZED LATIN CAPITAL LETTER C 1F112 >0028 0063 0029 #5.2 PARENTHESIZED LATIN CAPITAL LETTER C
@ -7056,33 +7315,44 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
1F251 >53EF # 6.0 CIRCLED IDEOGRAPH ACCEPT 1F251 >53EF # 6.0 CIRCLED IDEOGRAPH ACCEPT
1F252..1F2FF >FFFD # NA <reserved-1F252>..<reserved-1F2FF> 1F252..1F2FF >FFFD # NA <reserved-1F252>..<reserved-1F2FF>
# 1F300..1F320valid # 6.0 CYCLONE..SHOOTING STAR # 1F300..1F320valid # 6.0 CYCLONE..SHOOTING STAR
1F321..1F32F >FFFD # NA <reserved-1F321>..<reserved-1F32F> # 1F321..1F32Cvalid # 7.0 THERMOMETER..WIND BLOWING FACE
1F32D..1F32F >FFFD # NA <reserved-1F32D>..<reserved-1F32F>
# 1F330..1F335valid # 6.0 CHESTNUT..CACTUS # 1F330..1F335valid # 6.0 CHESTNUT..CACTUS
1F336 >FFFD # NA <reserved-1F336> # 1F336 valid # 7.0 HOT PEPPER
# 1F337..1F37Cvalid # 6.0 TULIP..BABY BOTTLE # 1F337..1F37Cvalid # 6.0 TULIP..BABY BOTTLE
1F37D..1F37F >FFFD # NA <reserved-1F37D>..<reserved-1F37F> # 1F37D valid # 7.0 FORK AND KNIFE WITH PLATE
1F37E..1F37F >FFFD # NA <reserved-1F37E>..<reserved-1F37F>
# 1F380..1F393valid # 6.0 RIBBON..GRADUATION CAP # 1F380..1F393valid # 6.0 RIBBON..GRADUATION CAP
1F394..1F39F >FFFD # NA <reserved-1F394>..<reserved-1F39F> # 1F394..1F39Fvalid # 7.0 HEART WITH TIP ON THE LEFT..ADMISSION TICKETS
# 1F3A0..1F3C4valid # 6.0 CAROUSEL HORSE..SURFER # 1F3A0..1F3C4valid # 6.0 CAROUSEL HORSE..SURFER
1F3C5 >FFFD # NA <reserved-1F3C5> # 1F3C5 valid # 7.0 SPORTS MEDAL
# 1F3C6..1F3CAvalid # 6.0 TROPHY..SWIMMER # 1F3C6..1F3CAvalid # 6.0 TROPHY..SWIMMER
1F3CB..1F3DF >FFFD # NA <reserved-1F3CB>..<reserved-1F3DF> # 1F3CB..1F3CEvalid # 7.0 WEIGHT LIFTER..RACING CAR
1F3CF..1F3D3 >FFFD # NA <reserved-1F3CF>..<reserved-1F3D3>
# 1F3D4..1F3DFvalid # 7.0 SNOW CAPPED MOUNTAIN..STADIUM
# 1F3E0..1F3F0valid # 6.0 HOUSE BUILDING..EUROPEAN CASTLE # 1F3E0..1F3F0valid # 6.0 HOUSE BUILDING..EUROPEAN CASTLE
1F3F1..1F3FF >FFFD # NA <reserved-1F3F1>..<reserved-1F3FF> # 1F3F1..1F3F7valid # 7.0 WHITE PENNANT..LABEL
1F3F8..1F3FF >FFFD # NA <reserved-1F3F8>..<reserved-1F3FF>
# 1F400..1F43Evalid # 6.0 RAT..PAW PRINTS # 1F400..1F43Evalid # 6.0 RAT..PAW PRINTS
1F43F >FFFD # NA <reserved-1F43F> # 1F43F valid # 7.0 CHIPMUNK
# 1F440 valid # 6.0 EYES # 1F440 valid # 6.0 EYES
1F441 >FFFD # NA <reserved-1F441> # 1F441 valid # 7.0 EYE
# 1F442..1F4F7valid # 6.0 EAR..CAMERA # 1F442..1F4F7valid # 6.0 EAR..CAMERA
1F4F8 >FFFD # NA <reserved-1F4F8> # 1F4F8 valid # 7.0 CAMERA WITH FLASH
# 1F4F9..1F4FCvalid # 6.0 VIDEO CAMERA..VIDEOCASSETTE # 1F4F9..1F4FCvalid # 6.0 VIDEO CAMERA..VIDEOCASSETTE
1F4FD..1F4FF >FFFD # NA <reserved-1F4FD>..<reserved-1F4FF> # 1F4FD..1F4FEvalid # 7.0 FILM PROJECTOR..PORTABLE STEREO
1F4FF >FFFD # NA <reserved-1F4FF>
# 1F500..1F53Dvalid # 6.0 TWISTED RIGHTWARDS ARROWS..DOWN-POINTING SMALL RED TRIANGLE # 1F500..1F53Dvalid # 6.0 TWISTED RIGHTWARDS ARROWS..DOWN-POINTING SMALL RED TRIANGLE
1F53E..1F53F >FFFD # NA <reserved-1F53E>..<reserved-1F53F> # 1F53E..1F53Fvalid # 7.0 LOWER RIGHT SHADOWED WHITE CIRCLE..UPPER RIGHT SHADOWED WHITE CIRCLE
# 1F540..1F543valid # 6.1 CIRCLED CROSS POMMEE..NOTCHED LEFT SEMICIRCLE WITH THREE DOTS # 1F540..1F543valid # 6.1 CIRCLED CROSS POMMEE..NOTCHED LEFT SEMICIRCLE WITH THREE DOTS
1F544..1F54F >FFFD # NA <reserved-1F544>..<reserved-1F54F> # 1F544..1F54Avalid # 7.0 NOTCHED RIGHT SEMICIRCLE WITH THREE DOTS..DOVE OF PEACE
1F54B..1F54F >FFFD # NA <reserved-1F54B>..<reserved-1F54F>
# 1F550..1F567valid # 6.0 CLOCK FACE ONE OCLOCK..CLOCK FACE TWELVE-THIRTY # 1F550..1F567valid # 6.0 CLOCK FACE ONE OCLOCK..CLOCK FACE TWELVE-THIRTY
1F568..1F5FA >FFFD # NA <reserved-1F568>..<reserved-1F5FA> # 1F568..1F579valid # 7.0 RIGHT SPEAKER..JOYSTICK
1F57A >FFFD # NA <reserved-1F57A>
# 1F57B..1F5A3valid # 7.0 LEFT HAND TELEPHONE RECEIVER..BLACK DOWN POINTING BACKHAND INDEX
1F5A4 >FFFD # NA <reserved-1F5A4>
# 1F5A5..1F5FAvalid # 7.0 DESKTOP COMPUTER..WORLD MAP
# 1F5FB..1F5FFvalid # 6.0 MOUNT FUJI..MOYAI # 1F5FB..1F5FFvalid # 6.0 MOUNT FUJI..MOYAI
# 1F600 valid # 6.1 GRINNING FACE # 1F600 valid # 6.1 GRINNING FACE
# 1F601..1F610valid # 6.0 GRINNING FACE WITH SMILING EYES..NEUTRAL FACE # 1F601..1F610valid # 6.0 GRINNING FACE WITH SMILING EYES..NEUTRAL FACE
@ -7106,13 +7376,31 @@ FFFE..FFFF >FFFD # 1.1 <noncharacter-FFFE>..<noncharacte
# 1F630..1F633valid # 6.0 FACE WITH OPEN MOUTH AND COLD SWEAT..FLUSHED FACE # 1F630..1F633valid # 6.0 FACE WITH OPEN MOUTH AND COLD SWEAT..FLUSHED FACE
# 1F634 valid # 6.1 SLEEPING FACE # 1F634 valid # 6.1 SLEEPING FACE
# 1F635..1F640valid # 6.0 DIZZY FACE..WEARY CAT FACE # 1F635..1F640valid # 6.0 DIZZY FACE..WEARY CAT FACE
1F641..1F644 >FFFD # NA <reserved-1F641>..<reserved-1F644> # 1F641..1F642valid # 7.0 SLIGHTLY FROWNING FACE..SLIGHTLY SMILING FACE
1F643..1F644 >FFFD # NA <reserved-1F643>..<reserved-1F644>
# 1F645..1F64Fvalid # 6.0 FACE WITH NO GOOD GESTURE..PERSON WITH FOLDED HANDS # 1F645..1F64Fvalid # 6.0 FACE WITH NO GOOD GESTURE..PERSON WITH FOLDED HANDS
1F650..1F67F >FFFD # NA <reserved-1F650>..<reserved-1F67F> # 1F650..1F67Fvalid # 7.0 NORTH WEST POINTING LEAF..REVERSE CHECKER BOARD
# 1F680..1F6C5valid # 6.0 ROCKET..LEFT LUGGAGE # 1F680..1F6C5valid # 6.0 ROCKET..LEFT LUGGAGE
1F6C6..1F6FF >FFFD # NA <reserved-1F6C6>..<reserved-1F6FF> # 1F6C6..1F6CFvalid # 7.0 TRIANGLE WITH ROUNDED CORNERS..BED
1F6D0..1F6DF >FFFD # NA <reserved-1F6D0>..<reserved-1F6DF>
# 1F6E0..1F6ECvalid # 7.0 HAMMER AND WRENCH..AIRPLANE ARRIVING
1F6ED..1F6EF >FFFD # NA <reserved-1F6ED>..<reserved-1F6EF>
# 1F6F0..1F6F3valid # 7.0 SATELLITE..PASSENGER SHIP
1F6F4..1F6FF >FFFD # NA <reserved-1F6F4>..<reserved-1F6FF>
# 1F700..1F773valid # 6.0 ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE # 1F700..1F773valid # 6.0 ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE
1F774..1FFFD >FFFD # NA <reserved-1F774>..<reserved-1FFFD> 1F774..1F77F >FFFD # NA <reserved-1F774>..<reserved-1F77F>
# 1F780..1F7D4valid # 7.0 BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE..HEAVY TWELVE POINTED PINWHEEL STAR
1F7D5..1F7FF >FFFD # NA <reserved-1F7D5>..<reserved-1F7FF>
# 1F800..1F80Bvalid # 7.0 LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
1F80C..1F80F >FFFD # NA <reserved-1F80C>..<reserved-1F80F>
# 1F810..1F847valid # 7.0 LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD..DOWNWARDS HEAVY ARROW
1F848..1F84F >FFFD # NA <reserved-1F848>..<reserved-1F84F>
# 1F850..1F859valid # 7.0 LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW
1F85A..1F85F >FFFD # NA <reserved-1F85A>..<reserved-1F85F>
# 1F860..1F887valid # 7.0 WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW
1F888..1F88F >FFFD # NA <reserved-1F888>..<reserved-1F88F>
# 1F890..1F8ADvalid # 7.0 LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS
1F8AE..1FFFD >FFFD # NA <reserved-1F8AE>..<reserved-1FFFD>
1FFFE..1FFFF >FFFD # 2.0 <noncharacter-1FFFE>..<noncharacter-1FFFF> 1FFFE..1FFFF >FFFD # 2.0 <noncharacter-1FFFE>..<noncharacter-1FFFF>
# 20000..2A6D6valid # 3.1 CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6 # 20000..2A6D6valid # 3.1 CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
2A6D7..2A6FF >FFFD # NA <reserved-2A6D7>..<reserved-2A6FF> 2A6D7..2A6FF >FFFD # NA <reserved-2A6D7>..<reserved-2A6FF>

File diff suppressed because it is too large Load Diff

View File

@ -29,18 +29,18 @@ 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,0x23,0x23,0,0,0,0,0x24,0, 0,0,0,0,0,0,0,0,0x23,0x23,0,0,0,0,0x24,0,
0,0,0,0,0,0x25,0,0,0,0x13,0,0,0,0,0,0, 0,0,0,0,0,0x25,0,0,0,0x13,0,0,0,0,0,0,
0x26,0,0,0x27,0,0,0,0,0,0x23,0x28,0x10,0,0x29,0,0x2a, 0x26,0,0,0x27,0,0x28,0,0,0,0x23,0x29,0x10,0,0x2a,0,0x2b,
0,0x2b,0,0,0,0,0x2c,0x2d,0,0,0,0,0,0,1,0x2e, 0,0x2c,0,0,0,0,0x2d,0x2e,0,0,0,0,0,0,1,0x2f,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0x2f,0x30,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0x30,0x31,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0x31,0,0,0,0x32,0,0,0,1, 0,0,0,0,0,0,0,0x32,0,0,0,0x33,0,0,0,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0x33,0,0,0x34,0,0,0,0,0,0,0,0,0,0,0, 0,0x34,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,
@ -99,9 +99,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,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0x35,0x32,0,0,0x36,0,0,0,0,0,0,0,0, 0,0,0,0x36,0x33,0,0,0x37,0,0,0,0,0,0,0,0,
0x20,0,0,0,0,0,0x28,0x37,0,0x38,0x39,0,0,0x39,0x3a,0, 0x20,0,0,0,0,0,0x29,0x38,0,0x39,0x3a,0,0,0x3a,0x3b,0,
0,0,0,0,0,0x3b,0x3c,0x3d,0,0,0,0,0,0,0,0x17, 0,0,0,0,0,0x3c,0x3d,0x3e,0,0,0,0,0,0,0,0x17,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -124,7 +124,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, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,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,0x23,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0x3f,0x40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,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,
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,
@ -141,17 +141,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,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 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,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0x41,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0x40,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0x42,0,0,0,0,0,0,0,0,0,0,0,0,0,0
}; };
const uint32_t CollationFCD::lcccBits[65]={ const uint32_t CollationFCD::lcccBits[67]={
0,0xffffffff,0xffff7fff,0xffff,0xf8,0xfffe0000,0xbfffffff,0xb6,0x7ff0000,0xfffff800,0x10000,0x9fc00000,0x3d9f,0x20000,0xffff0000,0x7ff, 0,0xffffffff,0xffff7fff,0xffff,0xf8,0xfffe0000,0xbfffffff,0xb6,0x7ff0000,0xfffff800,0x10000,0x9fc00000,0x3d9f,0x20000,0xffff0000,0x7ff,
0xff800,0xfbc00000,0x3eef,0xe000000,0x7ffffff0,0x10000000,0x1e2000,0x2000,0x602000,0x400,0x7000000,0xf00,0x3000000,0x2a00000,0x3c3e0000,0xdf, 0xff800,0xfbc00000,0x3eef,0xe000000,0xfffffff0,0x10000000,0x1e2000,0x2000,0x602000,0x400,0x7000000,0xf00,0x3000000,0x2a00000,0x3c3e0000,0xdf,
0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200,0x1800000,0x9fe00001,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x1021fd,0xf000007f,0x1fff0000, 0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200,0x1800000,0x9fe00001,0x3fff0000,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x31021fd,0xf03fffff,
0x1ffe2,0x38000,0x80000000,0xfc00,0x6000000,0x3ff08000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,2,0x400000,0x35,0x40000000, 0x1fff0000,0x1ffe2,0x38000,0x80000000,0xfc00,0x6000000,0x3ff08000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,2,0x400000,0x4000035,
0x7f 0x4108000,0x40000000,0x3fff
}; };
const uint8_t CollationFCD::tcccIndex[2048]={ const uint8_t CollationFCD::tcccIndex[2048]={
@ -168,18 +168,18 @@ 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,0x3d,0x3d,0,0,0,0,0x3e,0, 0,0,0,0,0,0,0,0,0x3d,0x3d,0,0,0,0,0x3e,0,
0,0,0,0,0,0x3f,0,0,0,0x28,0,0,0,0,0,0, 0,0,0,0,0,0x3f,0,0,0,0x28,0,0,0,0,0,0,
0x40,0,0,0x41,0,0,0,0,0,0x3d,0x42,0x25,0,0x43,0,0x44, 0x40,0,0,0x41,0,0x42,0,0,0,0x3d,0x43,0x25,0,0x44,0,0x45,
0,0x45,0,0,0,0,0x46,0x47,0,0,0,0,0,0,1,0x48, 0,0x46,0,0,0,0,0x47,0x48,0,0,0,0,0,0,1,0x49,
1,1,1,1,0x49,1,1,0x4a,0x4b,1,0x4c,0x4d,1,0x4e,0x4f,0x50, 1,1,1,1,0x4a,1,1,0x4b,0x4c,1,0x4d,0x4e,1,0x4f,0x50,0x51,
0,0,0,0,0,0,0x51,0x52,0,0x53,0,0,0x54,0x55,0x56,0, 0,0,0,0,0,0,0x52,0x53,0,0x54,0,0,0x55,0x56,0x57,0,
0x57,0x58,0x59,0x5a,0x5b,0x5c,0,0x5d,0,0,0,0,0,0,0,0, 0x58,0x59,0x5a,0x5b,0x5c,0x5d,0,0x5e,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0x2c,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0x2c,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0x5e,0,0,0,0x5f,0,0,0,1, 0,0,0,0,0,0,0,0x5f,0,0,0,0x60,0,0,0,1,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0x60,0x61,0x62,0x63,0x61,0x62,0x64,0,0,0,0,0,0,0,0, 0,0x61,0x62,0x63,0x64,0x62,0x63,0x65,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -238,9 +238,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,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0x65,0x5f,0,0,0x66,0,0,0,0,0,0,0,0, 0,0,0,0x66,0x60,0,0,0x67,0,0,0,0,0,0,0,0,
0x3a,0,0,0,0,0,0x42,0x67,0,0x68,0x69,0,0,0x69,0x6a,0, 0x3a,0,0,0,0,0,0x43,0x68,0,0x69,0x6a,0,0,0x6a,0x6b,0,
0,0,0,0,0,0x6b,0x6c,0x6d,0,0,0,0,0,0,0,0x30, 0,0,0,0,0,0x6c,0x6d,0x6e,0,0,0,0,0,0,0,0x30,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -263,7 +263,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, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0x6e,0x3d,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0x6f,0x70,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -280,20 +280,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,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0x3c,0x6f,0x70,0,0,0,0,0, 0,0,0,0,0,0,0,0,0x3c,0x71,0x72,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0x71,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0x73,0,0,0,0,0,0,0,0,0,0,0,0,0,0
}; };
const uint32_t CollationFCD::tcccBits[114]={ const uint32_t CollationFCD::tcccBits[116]={
0,0xffffffff,0x3e7effbf,0xbe7effbf,0xfffcffff,0x7ef1ff3f,0xfff3f1f8,0x7fffff3f,0x18003,0xdfffe000,0xff31ffcf,0xcfffffff,0xfffc0,0xffff7fff,0xffff,0x1d760, 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, 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,0x7ffffff0,0x10120200,0xff1e2000,0x10000000,0xb0002000,0x10480000,0x4e002000, 0x9fc80005,0x3d9f,0x20000,0xffff0000,0x7ff,0xff800,0xfbc00000,0x3eef,0xe000000,0xfffffff0,0x10120200,0xff1e2000,0x10000000,0xb0002000,0x10480000,0x4e002000,
0x2000,0x30002000,0x602100,0x24000400,0x7000000,0xf00,0x3000000,0x2a00000,0x3d7e0000,0xdf,0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200, 0x2000,0x30002000,0x602100,0x24000400,0x7000000,0xf00,0x3000000,0x2a00000,0x3d7e0000,0xdf,0x40,0x6800000,0xe0000000,0x100000,0x20040000,0x200,
0x1800000,0x9fe00001,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x1021fd,0xf000007f,0xbffffff,0x3ffffff,0x3f3fffff,0xaaff3f3f,0x3fffffff,0x1fdfffff,0xefcfffde, 0x1800000,0x9fe00001,0x3fff0000,0x10,0xc00,0xc0040,0x800000,0xfff70000,0x31021fd,0xf03fffff,0xbffffff,0x3ffffff,0x3f3fffff,0xaaff3f3f,0x3fffffff,0x1fdfffff,
0x1fdc7fff,0x1fff0000,0x1ffe2,0x800,0xc000000,0x4000,0xe000,0x1210,0x50,0x292,0x333e005,0x333,0xf000,0x3c0f,0x38000,0x80000000, 0xefcfffde,0x1fdc7fff,0x1fff0000,0x1ffe2,0x800,0xc000000,0x4000,0xe000,0x1210,0x50,0x292,0x333e005,0x333,0xf000,0x3c0f,0x38000,
0xfc00,0x55555000,0x36db02a5,0x46100000,0x47900000,0x3ff08000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,2,0x400000,0x35,0x5f7ffc00, 0x80000000,0xfc00,0x55555000,0x36db02a5,0x46100000,0x47900000,0x3ff08000,0x30000,0x3ffff,0x3800,0x80000,1,0xc19d0000,2,0x400000,0x4000035,
0x7fdb,0x7f 0x4108000,0x5f7ffc00,0x7fdb,0x3fff
}; };
U_NAMESPACE_END U_NAMESPACE_END

View File

@ -125,8 +125,8 @@ private:
static const uint8_t lcccIndex[2048]; static const uint8_t lcccIndex[2048];
static const uint8_t tcccIndex[2048]; static const uint8_t tcccIndex[2048];
static const uint32_t lcccBits[65]; static const uint32_t lcccBits[];
static const uint32_t tcccBits[114]; static const uint32_t tcccBits[];
}; };
U_NAMESPACE_END U_NAMESPACE_END

View File

@ -1,11 +1,11 @@
/* /*
* *
* (C) Copyright IBM Corp. 1998-2013. All Rights Reserved. * (C) Copyright IBM Corp. 1998-2014. All Rights Reserved.
* *
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
* YOU REALLY KNOW WHAT YOU'RE DOING. * YOU REALLY KNOW WHAT YOU'RE DOING.
* *
* Generated on: 11/01/2011 04:08:09 PM PDT * Generated on: 04/08/2014 03:20:04 PM PDT
*/ */
#ifndef __LESCRIPTS_H #ifndef __LESCRIPTS_H
@ -233,15 +233,25 @@ enum ScriptCodes {
* @stable ICU 49 * @stable ICU 49
*/ */
hluwScriptCode = 156, /* bump to match current ICU */ hluwScriptCode = 156,
khojScriptCode = 157, khojScriptCode = 157,
tirhScriptCode = 158, tirhScriptCode = 158,
/** /**
* @stable ICU 52 * @stable ICU 52
*/ */
aghbScriptCode = 159, aghbScriptCode = 159,
mahjScriptCode = 160, mahjScriptCode = 160,
/**
* @stable ICU 54
*/
ahomScriptCode = 161,
hatrScriptCode = 162,
modiScriptCode = 163,
multScriptCode = 164,
paucScriptCode = 165,
siddScriptCode = 166,
/** /**
* @stable ICU 2.2 * @stable ICU 2.2

View File

@ -1,11 +1,11 @@
/* /*
* *
* (C) Copyright IBM Corp. 1998-2011. All Rights Reserved. * (C) Copyright IBM Corp. 1998-2014. All Rights Reserved.
* *
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
* YOU REALLY KNOW WHAT YOU'RE DOING. * YOU REALLY KNOW WHAT YOU'RE DOING.
* *
* Generated on: 11/01/2011 04:08:11 PM PDT * Generated on: 04/08/2014 03:20:04 PM PDT
*/ */
#include "LETypes.h" #include "LETypes.h"
@ -90,7 +90,7 @@ const LETag OpenTypeLayoutEngine::scriptTags[] = {
geokScriptTag, /* 'geok' (GEOK) */ geokScriptTag, /* 'geok' (GEOK) */
hansScriptTag, /* 'hans' (HANS) */ hansScriptTag, /* 'hans' (HANS) */
hantScriptTag, /* 'hant' (HANT) */ hantScriptTag, /* 'hant' (HANT) */
hmngScriptTag, /* 'hmng' (HMNG) */ hmngScriptTag, /* 'hmng' (PAHAWH_HMONG) */
hungScriptTag, /* 'hung' (HUNG) */ hungScriptTag, /* 'hung' (HUNG) */
indsScriptTag, /* 'inds' (INDS) */ indsScriptTag, /* 'inds' (INDS) */
javaScriptTag, /* 'java' (JAVANESE) */ javaScriptTag, /* 'java' (JAVANESE) */
@ -98,13 +98,13 @@ const LETag OpenTypeLayoutEngine::scriptTags[] = {
latfScriptTag, /* 'latf' (LATF) */ latfScriptTag, /* 'latf' (LATF) */
latgScriptTag, /* 'latg' (LATG) */ latgScriptTag, /* 'latg' (LATG) */
lepcScriptTag, /* 'lepc' (LEPCHA) */ lepcScriptTag, /* 'lepc' (LEPCHA) */
linaScriptTag, /* 'lina' (LINA) */ linaScriptTag, /* 'lina' (LINEAR_A) */
mandScriptTag, /* 'mand' (MANDAIC) */ mandScriptTag, /* 'mand' (MANDAIC) */
mayaScriptTag, /* 'maya' (MAYA) */ mayaScriptTag, /* 'maya' (MAYA) */
meroScriptTag, /* 'mero' (MEROITIC_HIEROGLYPHS) */ meroScriptTag, /* 'mero' (MEROITIC_HIEROGLYPHS) */
nkooScriptTag, /* 'nko ' (NKO) */ nkooScriptTag, /* 'nko ' (NKO) */
orkhScriptTag, /* 'orkh' (OLD_TURKIC) */ orkhScriptTag, /* 'orkh' (OLD_TURKIC) */
permScriptTag, /* 'perm' (PERM) */ permScriptTag, /* 'perm' (OLD_PERMIC) */
phagScriptTag, /* 'phag' (PHAGS_PA) */ phagScriptTag, /* 'phag' (PHAGS_PA) */
phnxScriptTag, /* 'phnx' (PHOENICIAN) */ phnxScriptTag, /* 'phnx' (PHOENICIAN) */
plrdScriptTag, /* 'plrd' (MIAO) */ plrdScriptTag, /* 'plrd' (MIAO) */
@ -136,9 +136,9 @@ const LETag OpenTypeLayoutEngine::scriptTags[] = {
cakmScriptTag, /* 'cakm' (CHAKMA) */ cakmScriptTag, /* 'cakm' (CHAKMA) */
koreScriptTag, /* 'kore' (KORE) */ koreScriptTag, /* 'kore' (KORE) */
kthiScriptTag, /* 'kthi' (KAITHI) */ kthiScriptTag, /* 'kthi' (KAITHI) */
maniScriptTag, /* 'mani' (MANI) */ maniScriptTag, /* 'mani' (MANICHAEAN) */
phliScriptTag, /* 'phli' (INSCRIPTIONAL_PAHLAVI) */ phliScriptTag, /* 'phli' (INSCRIPTIONAL_PAHLAVI) */
phlpScriptTag, /* 'phlp' (PHLP) */ phlpScriptTag, /* 'phlp' (PSALTER_PAHLAVI) */
phlvScriptTag, /* 'phlv' (PHLV) */ phlvScriptTag, /* 'phlv' (PHLV) */
prtiScriptTag, /* 'prti' (INSCRIPTIONAL_PARTHIAN) */ prtiScriptTag, /* 'prti' (INSCRIPTIONAL_PARTHIAN) */
samrScriptTag, /* 'samr' (SAMARITAN) */ samrScriptTag, /* 'samr' (SAMARITAN) */
@ -149,30 +149,39 @@ const LETag OpenTypeLayoutEngine::scriptTags[] = {
lisuScriptTag, /* 'lisu' (LISU) */ lisuScriptTag, /* 'lisu' (LISU) */
nkgbScriptTag, /* 'nkgb' (NKGB) */ nkgbScriptTag, /* 'nkgb' (NKGB) */
sarbScriptTag, /* 'sarb' (OLD_SOUTH_ARABIAN) */ sarbScriptTag, /* 'sarb' (OLD_SOUTH_ARABIAN) */
bassScriptTag, /* 'bass' (BASS) */ bassScriptTag, /* 'bass' (BASSA_VAH) */
duplScriptTag, /* 'dupl' (DUPL) */ duplScriptTag, /* 'dupl' (DUPLOYAN) */
elbaScriptTag, /* 'elba' (ELBA) */ elbaScriptTag, /* 'elba' (ELBASAN) */
granScriptTag, /* 'gran' (GRAN) */ granScriptTag, /* 'gran' (GRANTHA) */
kpelScriptTag, /* 'kpel' (KPEL) */ kpelScriptTag, /* 'kpel' (KPEL) */
lomaScriptTag, /* 'loma' (LOMA) */ lomaScriptTag, /* 'loma' (LOMA) */
mendScriptTag, /* 'mend' (MEND) */ mendScriptTag, /* 'mend' (MENDE_KIKAKUI) */
mercScriptTag, /* 'merc' (MEROITIC_CURSIVE) */ mercScriptTag, /* 'merc' (MEROITIC_CURSIVE) */
narbScriptTag, /* 'narb' (NARB) */ narbScriptTag, /* 'narb' (OLD_NORTH_ARABIAN) */
nbatScriptTag, /* 'nbat' (NBAT) */ nbatScriptTag, /* 'nbat' (NABATAEAN) */
palmScriptTag, /* 'palm' (PALM) */ palmScriptTag, /* 'palm' (PALMYRENE) */
sindScriptTag, /* 'sind' (SIND) */ sindScriptTag, /* 'sind' (KHUDAWADI) */
waraScriptTag, /* 'wara' (WARA) */ waraScriptTag, /* 'wara' (WARANG_CITI) */
afakScriptTag, /* 'afak' (AFAK) */ afakScriptTag, /* 'afak' (AFAK) */
jurcScriptTag, /* 'jurc' (JURC) */ jurcScriptTag, /* 'jurc' (JURC) */
mrooScriptTag, /* 'mroo' (MROO) */ mrooScriptTag, /* 'mroo' (MRO) */
nshuScriptTag, /* 'nshu' (NSHU) */ nshuScriptTag, /* 'nshu' (NSHU) */
shrdScriptTag, /* 'shrd' (SHARADA) */ shrdScriptTag, /* 'shrd' (SHARADA) */
soraScriptTag, /* 'sora' (SORA_SOMPENG) */ soraScriptTag, /* 'sora' (SORA_SOMPENG) */
takrScriptTag, /* 'takr' (TAKRI) */ takrScriptTag, /* 'takr' (TAKRI) */
tangScriptTag, /* 'tang' (TANG) */ tangScriptTag, /* 'tang' (TANG) */
woleScriptTag, /* 'wole' (WOLE) */ woleScriptTag, /* 'wole' (WOLE) */
khojScriptTag, /* 'khoj' (KHOJ) */ hluwScriptTag, /* 'hluw' (HLUW) */
tirhScriptTag /* 'tirh' (TIRH) */ khojScriptTag, /* 'khoj' (KHOJKI) */
tirhScriptTag, /* 'tirh' (TIRHUTA) */
aghbScriptTag, /* 'aghb' (CAUCASIAN_ALBANIAN) */
mahjScriptTag, /* 'mahj' (MAHAJANI) */
ahomScriptTag, /* 'ahom' (AHOM) */
hatrScriptTag, /* 'hatr' (HATR) */
modiScriptTag, /* 'modi' (MODI) */
multScriptTag, /* 'mult' (MULT) */
paucScriptTag, /* 'pauc' (PAU_CIN_HAU) */
siddScriptTag /* 'sidd' (SIDDHAM) */
}; };
const LETag OpenTypeLayoutEngine::languageTags[] = { const LETag OpenTypeLayoutEngine::languageTags[] = {

View File

@ -1,11 +1,11 @@
/* /*
* *
* (C) Copyright IBM Corp. 1998-2011. All Rights Reserved. * (C) Copyright IBM Corp. 1998-2014. All Rights Reserved.
* *
* WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
* YOU REALLY KNOW WHAT YOU'RE DOING. * YOU REALLY KNOW WHAT YOU'RE DOING.
* *
* Generated on: 11/01/2011 04:08:11 PM PDT * Generated on: 04/08/2014 03:20:04 PM PDT
*/ */
#ifndef __SCRIPTANDLANGUAGES_H #ifndef __SCRIPTANDLANGUAGES_H
@ -104,7 +104,7 @@ const LETag egypScriptTag = 0x65677970; /* 'egyp' (EGYPTIAN_HIEROGLYPHS) */
const LETag geokScriptTag = 0x67656F6B; /* 'geok' (GEOK) */ const LETag geokScriptTag = 0x67656F6B; /* 'geok' (GEOK) */
const LETag hansScriptTag = 0x68616E73; /* 'hans' (HANS) */ const LETag hansScriptTag = 0x68616E73; /* 'hans' (HANS) */
const LETag hantScriptTag = 0x68616E74; /* 'hant' (HANT) */ const LETag hantScriptTag = 0x68616E74; /* 'hant' (HANT) */
const LETag hmngScriptTag = 0x686D6E67; /* 'hmng' (HMNG) */ const LETag hmngScriptTag = 0x686D6E67; /* 'hmng' (PAHAWH_HMONG) */
const LETag hungScriptTag = 0x68756E67; /* 'hung' (HUNG) */ const LETag hungScriptTag = 0x68756E67; /* 'hung' (HUNG) */
const LETag indsScriptTag = 0x696E6473; /* 'inds' (INDS) */ const LETag indsScriptTag = 0x696E6473; /* 'inds' (INDS) */
const LETag javaScriptTag = 0x6A617661; /* 'java' (JAVANESE) */ const LETag javaScriptTag = 0x6A617661; /* 'java' (JAVANESE) */
@ -112,13 +112,13 @@ const LETag kaliScriptTag = 0x6B616C69; /* 'kali' (KAYAH_LI) */
const LETag latfScriptTag = 0x6C617466; /* 'latf' (LATF) */ const LETag latfScriptTag = 0x6C617466; /* 'latf' (LATF) */
const LETag latgScriptTag = 0x6C617467; /* 'latg' (LATG) */ const LETag latgScriptTag = 0x6C617467; /* 'latg' (LATG) */
const LETag lepcScriptTag = 0x6C657063; /* 'lepc' (LEPCHA) */ const LETag lepcScriptTag = 0x6C657063; /* 'lepc' (LEPCHA) */
const LETag linaScriptTag = 0x6C696E61; /* 'lina' (LINA) */ const LETag linaScriptTag = 0x6C696E61; /* 'lina' (LINEAR_A) */
const LETag mandScriptTag = 0x6D616E64; /* 'mand' (MANDAIC) */ const LETag mandScriptTag = 0x6D616E64; /* 'mand' (MANDAIC) */
const LETag mayaScriptTag = 0x6D617961; /* 'maya' (MAYA) */ const LETag mayaScriptTag = 0x6D617961; /* 'maya' (MAYA) */
const LETag meroScriptTag = 0x6D65726F; /* 'mero' (MEROITIC_HIEROGLYPHS) */ const LETag meroScriptTag = 0x6D65726F; /* 'mero' (MEROITIC_HIEROGLYPHS) */
const LETag nkooScriptTag = 0x6E6B6F20; /* 'nko ' (NKO) */ const LETag nkooScriptTag = 0x6E6B6F20; /* 'nko ' (NKO) */
const LETag orkhScriptTag = 0x6F726B68; /* 'orkh' (OLD_TURKIC) */ const LETag orkhScriptTag = 0x6F726B68; /* 'orkh' (OLD_TURKIC) */
const LETag permScriptTag = 0x7065726D; /* 'perm' (PERM) */ const LETag permScriptTag = 0x7065726D; /* 'perm' (OLD_PERMIC) */
const LETag phagScriptTag = 0x70686167; /* 'phag' (PHAGS_PA) */ const LETag phagScriptTag = 0x70686167; /* 'phag' (PHAGS_PA) */
const LETag phnxScriptTag = 0x70686E78; /* 'phnx' (PHOENICIAN) */ const LETag phnxScriptTag = 0x70686E78; /* 'phnx' (PHOENICIAN) */
const LETag plrdScriptTag = 0x706C7264; /* 'plrd' (MIAO) */ const LETag plrdScriptTag = 0x706C7264; /* 'plrd' (MIAO) */
@ -150,9 +150,9 @@ const LETag avstScriptTag = 0x61767374; /* 'avst' (AVESTAN) */
const LETag cakmScriptTag = 0x63616B6D; /* 'cakm' (CHAKMA) */ const LETag cakmScriptTag = 0x63616B6D; /* 'cakm' (CHAKMA) */
const LETag koreScriptTag = 0x6B6F7265; /* 'kore' (KORE) */ const LETag koreScriptTag = 0x6B6F7265; /* 'kore' (KORE) */
const LETag kthiScriptTag = 0x6B746869; /* 'kthi' (KAITHI) */ const LETag kthiScriptTag = 0x6B746869; /* 'kthi' (KAITHI) */
const LETag maniScriptTag = 0x6D616E69; /* 'mani' (MANI) */ const LETag maniScriptTag = 0x6D616E69; /* 'mani' (MANICHAEAN) */
const LETag phliScriptTag = 0x70686C69; /* 'phli' (INSCRIPTIONAL_PAHLAVI) */ const LETag phliScriptTag = 0x70686C69; /* 'phli' (INSCRIPTIONAL_PAHLAVI) */
const LETag phlpScriptTag = 0x70686C70; /* 'phlp' (PHLP) */ const LETag phlpScriptTag = 0x70686C70; /* 'phlp' (PSALTER_PAHLAVI) */
const LETag phlvScriptTag = 0x70686C76; /* 'phlv' (PHLV) */ const LETag phlvScriptTag = 0x70686C76; /* 'phlv' (PHLV) */
const LETag prtiScriptTag = 0x70727469; /* 'prti' (INSCRIPTIONAL_PARTHIAN) */ const LETag prtiScriptTag = 0x70727469; /* 'prti' (INSCRIPTIONAL_PARTHIAN) */
const LETag samrScriptTag = 0x73616D72; /* 'samr' (SAMARITAN) */ const LETag samrScriptTag = 0x73616D72; /* 'samr' (SAMARITAN) */
@ -163,30 +163,39 @@ const LETag bamuScriptTag = 0x62616D75; /* 'bamu' (BAMUM) */
const LETag lisuScriptTag = 0x6C697375; /* 'lisu' (LISU) */ const LETag lisuScriptTag = 0x6C697375; /* 'lisu' (LISU) */
const LETag nkgbScriptTag = 0x6E6B6762; /* 'nkgb' (NKGB) */ const LETag nkgbScriptTag = 0x6E6B6762; /* 'nkgb' (NKGB) */
const LETag sarbScriptTag = 0x73617262; /* 'sarb' (OLD_SOUTH_ARABIAN) */ const LETag sarbScriptTag = 0x73617262; /* 'sarb' (OLD_SOUTH_ARABIAN) */
const LETag bassScriptTag = 0x62617373; /* 'bass' (BASS) */ const LETag bassScriptTag = 0x62617373; /* 'bass' (BASSA_VAH) */
const LETag duplScriptTag = 0x6475706C; /* 'dupl' (DUPL) */ const LETag duplScriptTag = 0x6475706C; /* 'dupl' (DUPLOYAN) */
const LETag elbaScriptTag = 0x656C6261; /* 'elba' (ELBA) */ const LETag elbaScriptTag = 0x656C6261; /* 'elba' (ELBASAN) */
const LETag granScriptTag = 0x6772616E; /* 'gran' (GRAN) */ const LETag granScriptTag = 0x6772616E; /* 'gran' (GRANTHA) */
const LETag kpelScriptTag = 0x6B70656C; /* 'kpel' (KPEL) */ const LETag kpelScriptTag = 0x6B70656C; /* 'kpel' (KPEL) */
const LETag lomaScriptTag = 0x6C6F6D61; /* 'loma' (LOMA) */ const LETag lomaScriptTag = 0x6C6F6D61; /* 'loma' (LOMA) */
const LETag mendScriptTag = 0x6D656E64; /* 'mend' (MEND) */ const LETag mendScriptTag = 0x6D656E64; /* 'mend' (MENDE_KIKAKUI) */
const LETag mercScriptTag = 0x6D657263; /* 'merc' (MEROITIC_CURSIVE) */ const LETag mercScriptTag = 0x6D657263; /* 'merc' (MEROITIC_CURSIVE) */
const LETag narbScriptTag = 0x6E617262; /* 'narb' (NARB) */ const LETag narbScriptTag = 0x6E617262; /* 'narb' (OLD_NORTH_ARABIAN) */
const LETag nbatScriptTag = 0x6E626174; /* 'nbat' (NBAT) */ const LETag nbatScriptTag = 0x6E626174; /* 'nbat' (NABATAEAN) */
const LETag palmScriptTag = 0x70616C6D; /* 'palm' (PALM) */ const LETag palmScriptTag = 0x70616C6D; /* 'palm' (PALMYRENE) */
const LETag sindScriptTag = 0x73696E64; /* 'sind' (SIND) */ const LETag sindScriptTag = 0x73696E64; /* 'sind' (KHUDAWADI) */
const LETag waraScriptTag = 0x77617261; /* 'wara' (WARA) */ const LETag waraScriptTag = 0x77617261; /* 'wara' (WARANG_CITI) */
const LETag afakScriptTag = 0x6166616B; /* 'afak' (AFAK) */ const LETag afakScriptTag = 0x6166616B; /* 'afak' (AFAK) */
const LETag jurcScriptTag = 0x6A757263; /* 'jurc' (JURC) */ const LETag jurcScriptTag = 0x6A757263; /* 'jurc' (JURC) */
const LETag mrooScriptTag = 0x6D726F6F; /* 'mroo' (MROO) */ const LETag mrooScriptTag = 0x6D726F6F; /* 'mroo' (MRO) */
const LETag nshuScriptTag = 0x6E736875; /* 'nshu' (NSHU) */ const LETag nshuScriptTag = 0x6E736875; /* 'nshu' (NSHU) */
const LETag shrdScriptTag = 0x73687264; /* 'shrd' (SHARADA) */ const LETag shrdScriptTag = 0x73687264; /* 'shrd' (SHARADA) */
const LETag soraScriptTag = 0x736F7261; /* 'sora' (SORA_SOMPENG) */ const LETag soraScriptTag = 0x736F7261; /* 'sora' (SORA_SOMPENG) */
const LETag takrScriptTag = 0x74616B72; /* 'takr' (TAKRI) */ const LETag takrScriptTag = 0x74616B72; /* 'takr' (TAKRI) */
const LETag tangScriptTag = 0x74616E67; /* 'tang' (TANG) */ const LETag tangScriptTag = 0x74616E67; /* 'tang' (TANG) */
const LETag woleScriptTag = 0x776F6C65; /* 'wole' (WOLE) */ const LETag woleScriptTag = 0x776F6C65; /* 'wole' (WOLE) */
const LETag khojScriptTag = 0x6B686F6A; /* 'khoj' (KHOJ) */ const LETag hluwScriptTag = 0x686C7577; /* 'hluw' (HLUW) */
const LETag tirhScriptTag = 0x74697268; /* 'tirh' (TIRH) */ const LETag khojScriptTag = 0x6B686F6A; /* 'khoj' (KHOJKI) */
const LETag tirhScriptTag = 0x74697268; /* 'tirh' (TIRHUTA) */
const LETag aghbScriptTag = 0x61676862; /* 'aghb' (CAUCASIAN_ALBANIAN) */
const LETag mahjScriptTag = 0x6D61686A; /* 'mahj' (MAHAJANI) */
const LETag ahomScriptTag = 0x61686F6D; /* 'ahom' (AHOM) */
const LETag hatrScriptTag = 0x68617472; /* 'hatr' (HATR) */
const LETag modiScriptTag = 0x6D6F6469; /* 'modi' (MODI) */
const LETag multScriptTag = 0x6D756C74; /* 'mult' (MULT) */
const LETag paucScriptTag = 0x70617563; /* 'pauc' (PAU_CIN_HAU) */
const LETag siddScriptTag = 0x73696464; /* 'sidd' (SIDDHAM) */
const LETag nullScriptTag = 0x00000000; /* '' (NULL) */ const LETag nullScriptTag = 0x00000000; /* '' (NULL) */

View File

@ -4922,17 +4922,22 @@ static void TestReorderingAPIWithRuleCreatedCollator(void)
ucol_close(myCollation); ucol_close(myCollation);
} }
static int compareUScriptCodes(const void * a, const void * b) static UBool containsExpectedScript(const int32_t scripts[], int32_t length, int32_t expectedScript) {
{ int32_t i;
return ( *(int32_t*)a - *(int32_t*)b ); for (i = 0; i < length; ++i) {
if (expectedScript == scripts[i]) { return TRUE; }
}
return FALSE;
} }
static void TestEquivalentReorderingScripts(void) { static void TestEquivalentReorderingScripts(void) {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
int32_t equivalentScripts[50]; int32_t equivalentScripts[100];
int32_t equivalentScriptsLength; int32_t length;
int loopIndex; int i;
int32_t equivalentScriptsResult[] = { int32_t prevScript;
/* At least these scripts are expected to be equivalent. There may be more. */
static const int32_t expectedScripts[] = {
USCRIPT_BOPOMOFO, USCRIPT_BOPOMOFO,
USCRIPT_LISU, USCRIPT_LISU,
USCRIPT_LYCIAN, USCRIPT_LYCIAN,
@ -4961,46 +4966,49 @@ static void TestEquivalentReorderingScripts(void) {
USCRIPT_MEROITIC_HIEROGLYPHS USCRIPT_MEROITIC_HIEROGLYPHS
}; };
qsort(equivalentScriptsResult, LEN(equivalentScriptsResult), sizeof(int32_t), compareUScriptCodes);
/* UScript.GOTHIC */ /* UScript.GOTHIC */
equivalentScriptsLength = ucol_getEquivalentReorderCodes(USCRIPT_GOTHIC, equivalentScripts, LEN(equivalentScripts), &status); length = ucol_getEquivalentReorderCodes(
USCRIPT_GOTHIC, equivalentScripts, LEN(equivalentScripts), &status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
log_err_status(status, "ERROR: retrieving equivalent reorder codes: %s\n", myErrorName(status)); log_err_status(status, "ERROR/Gothic: retrieving equivalent reorder codes: %s\n", myErrorName(status));
return; return;
} }
/* if (length < LEN(expectedScripts)) {
fprintf(stdout, "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); log_err("ERROR/Gothic: retrieved equivalent script length wrong: "
fprintf(stdout, "equivalentScriptsLength = %d\n", equivalentScriptsLength); "expected at least %d, was = %d\n",
for (loopIndex = 0; loopIndex < equivalentScriptsLength; loopIndex++) { LEN(expectedScripts), length);
fprintf(stdout, "%d = %x\n", loopIndex, equivalentScripts[loopIndex]);
} }
*/ prevScript = -1;
if (equivalentScriptsLength != LEN(equivalentScriptsResult)) { for (i = 0; i < length; ++i) {
log_err_status(status, "ERROR: retrieved equivalent script length wrong: expected = %d, was = %d\n", LEN(equivalentScriptsResult), equivalentScriptsLength); int32_t script = equivalentScripts[i];
return; if (script <= prevScript) {
log_err("ERROR/Gothic: equivalent scripts out of order at index %d\n", i);
}
prevScript = script;
} }
for (loopIndex = 0; loopIndex < equivalentScriptsLength; loopIndex++) { for (i = 0; i < LEN(expectedScripts); i++) {
if (equivalentScriptsResult[loopIndex] != equivalentScripts[loopIndex]) { if (!containsExpectedScript(equivalentScripts, length, expectedScripts[i])) {
log_err_status(status, "ERROR: equivalent scripts results don't match: expected = %d, was = %d\n", equivalentScriptsResult[loopIndex], equivalentScripts[loopIndex]); log_err("ERROR/Gothic: equivalent scripts do not contain %d\n",
return; expectedScripts[i]);
} }
} }
/* UScript.SHAVIAN */ /* UScript.SHAVIAN */
equivalentScriptsLength = ucol_getEquivalentReorderCodes(USCRIPT_SHAVIAN, equivalentScripts, LEN(equivalentScripts), &status); length = ucol_getEquivalentReorderCodes(
USCRIPT_SHAVIAN, equivalentScripts, LEN(equivalentScripts), &status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
log_err_status(status, "ERROR: retrieving equivalent reorder codes: %s\n", myErrorName(status)); log_err_status(status, "ERROR/Shavian: retrieving equivalent reorder codes: %s\n", myErrorName(status));
return; return;
} }
if (equivalentScriptsLength != LEN(equivalentScriptsResult)) { if (length < LEN(expectedScripts)) {
log_err_status(status, "ERROR: retrieved equivalent script length wrong: expected = %d, was = %d\n", LEN(equivalentScriptsResult), equivalentScriptsLength); log_err("ERROR/Shavian: retrieved equivalent script length wrong: "
return; "expected at least %d, was = %d\n",
LEN(expectedScripts), length);
} }
for (loopIndex = 0; loopIndex < equivalentScriptsLength; loopIndex++) { for (i = 0; i < LEN(expectedScripts); i++) {
if (equivalentScriptsResult[loopIndex] != equivalentScripts[loopIndex]) { if (!containsExpectedScript(equivalentScripts, length, expectedScripts[i])) {
log_err_status(status, "ERROR: equivalent scripts results don't match: expected = %d, was = %d\n", equivalentScriptsResult[loopIndex], equivalentScripts[loopIndex]); log_err("ERROR/Shavian: equivalent scripts do not contain %d\n",
return; expectedScripts[i]);
} }
} }
} }

View File

@ -304,34 +304,41 @@ void TestUScriptCodeAPI(){
* Whenever this happens, the long script names here need to be updated. * Whenever this happens, the long script names here need to be updated.
*/ */
static const char* expectedLong[] = { static const char* expectedLong[] = {
"Balinese", "Batak", "Blis", "Brahmi", "Cham", "Cirt", "Cyrs", "Egyd", "Egyh", "Egyptian_Hieroglyphs", "Balinese", "Batak", "Blis", "Brahmi", "Cham", "Cirt", "Cyrs",
"Geok", "Hans", "Hant", "Hmng", "Hung", "Inds", "Javanese", "Kayah_Li", "Latf", "Latg", "Egyd", "Egyh", "Egyptian_Hieroglyphs",
"Lepcha", "Lina", "Mandaic", "Maya", "Meroitic_Hieroglyphs", "Nko", "Old_Turkic", "Perm", "Phags_Pa", "Phoenician", "Geok", "Hans", "Hant", "Pahawh_Hmong", "Hung", "Inds",
"Javanese", "Kayah_Li", "Latf", "Latg",
"Lepcha", "Linear_A", "Mandaic", "Maya", "Meroitic_Hieroglyphs",
"Nko", "Old_Turkic", "Old_Permic", "Phags_Pa", "Phoenician",
"Miao", "Roro", "Sara", "Syre", "Syrj", "Syrn", "Teng", "Vai", "Visp", "Cuneiform", "Miao", "Roro", "Sara", "Syre", "Syrj", "Syrn", "Teng", "Vai", "Visp", "Cuneiform",
"Zxxx", "Unknown", "Zxxx", "Unknown",
"Carian", "Jpan", "Tai_Tham", "Lycian", "Lydian", "Ol_Chiki", "Rejang", "Saurashtra", "Sgnw", "Sundanese", "Carian", "Jpan", "Tai_Tham", "Lycian", "Lydian", "Ol_Chiki", "Rejang", "Saurashtra", "Sgnw", "Sundanese",
"Moon", "Meetei_Mayek", "Moon", "Meetei_Mayek",
/* new in ICU 4.0 */ /* new in ICU 4.0 */
"Imperial_Aramaic", "Avestan", "Chakma", "Kore", "Imperial_Aramaic", "Avestan", "Chakma", "Kore",
"Kaithi", "Mani", "Inscriptional_Pahlavi", "Phlp", "Phlv", "Inscriptional_Parthian", "Samaritan", "Tai_Viet", "Kaithi", "Manichaean", "Inscriptional_Pahlavi", "Psalter_Pahlavi", "Phlv",
"Inscriptional_Parthian", "Samaritan", "Tai_Viet",
"Zmth", "Zsym", "Zmth", "Zsym",
/* new in ICU 4.4 */ /* new in ICU 4.4 */
"Bamum", "Lisu", "Nkgb", "Old_South_Arabian", "Bamum", "Lisu", "Nkgb", "Old_South_Arabian",
/* new in ICU 4.6 */ /* new in ICU 4.6 */
"Bass", "Dupl", "Elba", "Gran", "Kpel", "Loma", "Mend", "Meroitic_Cursive", "Bassa_Vah", "Duployan", "Elbasan", "Grantha", "Kpel",
"Narb", "Nbat", "Palm", "Sind", "Wara", "Loma", "Mende_Kikakui", "Meroitic_Cursive",
"Old_North_Arabian", "Nabataean", "Palmyrene", "Khudawadi", "Warang_Citi",
/* new in ICU 4.8 */ /* new in ICU 4.8 */
"Afak", "Jurc", "Mroo", "Nshu", "Sharada", "Sora_Sompeng", "Takri", "Tang", "Wole", "Afak", "Jurc", "Mro", "Nshu", "Sharada", "Sora_Sompeng", "Takri", "Tang", "Wole",
/* new in ICU 49 */ /* new in ICU 49 */
"Hluw", "Khoj", "Tirh", "Hluw", "Khojki", "Tirhuta",
/* new in ICU 52 */ /* new in ICU 52 */
"Aghb", "Mahj" "Caucasian_Albanian", "Mahajani",
/* new in ICU 54 */
"Ahom", "Hatr", "Modi", "Mult", "Pau_Cin_Hau", "Siddham"
}; };
static const char* expectedShort[] = { static const char* expectedShort[] = {
"Bali", "Batk", "Blis", "Brah", "Cham", "Cirt", "Cyrs", "Egyd", "Egyh", "Egyp", "Bali", "Batk", "Blis", "Brah", "Cham", "Cirt", "Cyrs", "Egyd", "Egyh", "Egyp",
"Geok", "Hans", "Hant", "Hmng", "Hung", "Inds", "Java", "Kali", "Latf", "Latg", "Geok", "Hans", "Hant", "Hmng", "Hung", "Inds", "Java", "Kali", "Latf", "Latg",
"Lepc", "Lina", "Mand", "Maya", "Mero", "Nkoo", "Orkh", "Perm", "Phag", "Phnx", "Lepc", "Lina", "Mand", "Maya", "Mero", "Nkoo", "Orkh", "Perm", "Phag", "Phnx",
"Plrd", "Roro", "Sara", "Syre", "Syrj", "Syrn", "Teng", "Vaii", "Visp", "Xsux", "Plrd", "Roro", "Sara", "Syre", "Syrj", "Syrn", "Teng", "Vaii", "Visp", "Xsux",
"Zxxx", "Zzzz", "Zxxx", "Zzzz",
"Cari", "Jpan", "Lana", "Lyci", "Lydi", "Olck", "Rjng", "Saur", "Sgnw", "Sund", "Cari", "Jpan", "Lana", "Lyci", "Lydi", "Olck", "Rjng", "Saur", "Sgnw", "Sund",
"Moon", "Mtei", "Moon", "Mtei",
@ -349,7 +356,9 @@ void TestUScriptCodeAPI(){
/* new in ICU 49 */ /* new in ICU 49 */
"Hluw", "Khoj", "Tirh", "Hluw", "Khoj", "Tirh",
/* new in ICU 52 */ /* new in ICU 52 */
"Aghb", "Mahj" "Aghb", "Mahj",
/* new in ICU 54 */
"Ahom", "Hatr", "Modi", "Mult", "Pauc", "Sidd"
}; };
int32_t j = 0; int32_t j = 0;
if(LENGTHOF(expectedLong)!=(USCRIPT_CODE_LIMIT-USCRIPT_BALINESE)) { if(LENGTHOF(expectedLong)!=(USCRIPT_CODE_LIMIT-USCRIPT_BALINESE)) {

View File

@ -2425,8 +2425,7 @@ TestAdditionalProperties() {
{ 0x10909, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT }, { 0x10909, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT },
{ 0x10fe4, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT }, { 0x10fe4, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT },
{ 0x0605, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC }, { 0x061d, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC },
{ 0x061c, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC },
{ 0x063f, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC }, { 0x063f, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC },
{ 0x070e, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC }, { 0x070e, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC },
{ 0x0775, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC }, { 0x0775, UCHAR_BIDI_CLASS, U_RIGHT_TO_LEFT_ARABIC },
@ -2439,7 +2438,7 @@ TestAdditionalProperties() {
{ 0x155A, UCHAR_BLOCK, UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS }, { 0x155A, UCHAR_BLOCK, UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS },
{ 0x1717, UCHAR_BLOCK, UBLOCK_TAGALOG }, { 0x1717, UCHAR_BLOCK, UBLOCK_TAGALOG },
{ 0x1900, UCHAR_BLOCK, UBLOCK_LIMBU }, { 0x1900, UCHAR_BLOCK, UBLOCK_LIMBU },
{ 0x1AFF, UCHAR_BLOCK, UBLOCK_NO_BLOCK }, { 0x1CBF, UCHAR_BLOCK, UBLOCK_NO_BLOCK },
{ 0x3040, UCHAR_BLOCK, UBLOCK_HIRAGANA }, { 0x3040, UCHAR_BLOCK, UBLOCK_HIRAGANA },
{ 0x1D0FF, UCHAR_BLOCK, UBLOCK_BYZANTINE_MUSICAL_SYMBOLS }, { 0x1D0FF, UCHAR_BLOCK, UBLOCK_BYZANTINE_MUSICAL_SYMBOLS },
{ 0x50000, UCHAR_BLOCK, UBLOCK_NO_BLOCK }, { 0x50000, UCHAR_BLOCK, UBLOCK_NO_BLOCK },
@ -2647,6 +2646,15 @@ TestAdditionalProperties() {
{ 0xFF5B, UCHAR_BIDI_PAIRED_BRACKET_TYPE, U_BPT_OPEN }, { 0xFF5B, UCHAR_BIDI_PAIRED_BRACKET_TYPE, U_BPT_OPEN },
{ 0xFF5D, UCHAR_BIDI_PAIRED_BRACKET_TYPE, U_BPT_CLOSE }, { 0xFF5D, UCHAR_BIDI_PAIRED_BRACKET_TYPE, U_BPT_CLOSE },
{ -1, 0x700, 0 }, /* version break for Unicode 7.0 */
/* new character range with Joining_Group values */
{ 0x10ABF, UCHAR_JOINING_GROUP, U_JG_NO_JOINING_GROUP },
{ 0x10AC0, UCHAR_JOINING_GROUP, U_JG_MANICHAEAN_ALEPH },
{ 0x10AC1, UCHAR_JOINING_GROUP, U_JG_MANICHAEAN_BETH },
{ 0x10AEF, UCHAR_JOINING_GROUP, U_JG_MANICHAEAN_HUNDRED },
{ 0x10AF0, UCHAR_JOINING_GROUP, U_JG_NO_JOINING_GROUP },
/* undefined UProperty values */ /* undefined UProperty values */
{ 0x61, 0x4a7, 0 }, { 0x61, 0x4a7, 0 },
{ 0x234bc, 0x15ed, 0 } { 0x234bc, 0x15ed, 0 }

View File

@ -1,7 +1,7 @@
/* /*
******************************************************************************* *******************************************************************************
* *
* Copyright (C) 2009-2013, International Business Machines * Copyright (C) 2009-2014, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
* *
******************************************************************************* *******************************************************************************
@ -39,8 +39,6 @@ public:
void TestBidiTest(); void TestBidiTest();
void TestBidiCharacterTest(); void TestBidiCharacterTest();
private: private:
char *getUnidataPath(char path[]);
UBool parseLevels(const char *&start); UBool parseLevels(const char *&start);
UBool parseOrdering(const char *start); UBool parseOrdering(const char *start);
UBool parseInputStringFromBiDiClasses(const char *&start); UBool parseInputStringFromBiDiClasses(const char *&start);
@ -77,42 +75,6 @@ void BiDiConformanceTest::runIndexedTest(int32_t index, UBool exec, const char *
TESTCASE_AUTO_END; TESTCASE_AUTO_END;
} }
// TODO: Move to a common place (IntlTest?) to avoid duplication with UnicodeTest (ucdtest.cpp).
char *BiDiConformanceTest::getUnidataPath(char path[]) {
IcuTestErrorCode errorCode(*this, "getUnidataPath");
const int kUnicodeDataTxtLength=15; // strlen("UnicodeData.txt")
// Look inside ICU_DATA first.
strcpy(path, pathToDataDirectory());
strcat(path, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
FILE *f=fopen(path, "r");
if(f!=NULL) {
fclose(f);
*(strchr(path, 0)-kUnicodeDataTxtLength)=0; // Remove the basename.
return path;
}
// As a fallback, try to guess where the source data was located
// at the time ICU was built, and look there.
# ifdef U_TOPSRCDIR
strcpy(path, U_TOPSRCDIR U_FILE_SEP_STRING "data");
# else
strcpy(path, loadTestData(errorCode));
strcat(path, U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".."
U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".."
U_FILE_SEP_STRING "data");
# endif
strcat(path, U_FILE_SEP_STRING);
strcat(path, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
f=fopen(path, "r");
if(f!=NULL) {
fclose(f);
*(strchr(path, 0)-kUnicodeDataTxtLength)=0; // Remove the basename.
return path;
}
return NULL;
}
U_DEFINE_LOCAL_OPEN_POINTER(LocalStdioFilePointer, FILE, fclose); U_DEFINE_LOCAL_OPEN_POINTER(LocalStdioFilePointer, FILE, fclose);
UBool BiDiConformanceTest::parseLevels(const char *&start) { UBool BiDiConformanceTest::parseLevels(const char *&start) {

View File

@ -1608,6 +1608,48 @@ const char *IntlTest::getSourceTestData(UErrorCode& /*err*/) {
return srcDataDir; return srcDataDir;
} }
char *IntlTest::getUnidataPath(char path[]) {
const int kUnicodeDataTxtLength = 15; // strlen("UnicodeData.txt")
// Look inside ICU_DATA first.
strcpy(path, pathToDataDirectory());
strcat(path, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
FILE *f = fopen(path, "r");
if(f != NULL) {
fclose(f);
*(strchr(path, 0) - kUnicodeDataTxtLength) = 0; // Remove the basename.
return path;
}
// As a fallback, try to guess where the source data was located
// at the time ICU was built, and look there.
# ifdef U_TOPSRCDIR
strcpy(path, U_TOPSRCDIR U_FILE_SEP_STRING "data");
# else
UErrorCode errorCode = U_ZERO_ERROR;
const char *testDataPath = loadTestData(errorCode);
if(U_FAILURE(errorCode)) {
it_errln(UnicodeString(
"unable to find path to source/data/unidata/ and loadTestData() failed: ") +
u_errorName(errorCode));
return NULL;
}
strcpy(path, testDataPath);
strcat(path, U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".."
U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".."
U_FILE_SEP_STRING "data");
# endif
strcat(path, U_FILE_SEP_STRING);
strcat(path, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
f = fopen(path, "r");
if(f != NULL) {
fclose(f);
*(strchr(path, 0) - kUnicodeDataTxtLength) = 0; // Remove the basename.
return path;
}
return NULL;
}
const char* IntlTest::fgDataDir = NULL; const char* IntlTest::fgDataDir = NULL;
/* returns the path to icu/source/data */ /* returns the path to icu/source/data */

View File

@ -371,6 +371,7 @@ public:
static const char* loadTestData(UErrorCode& err); static const char* loadTestData(UErrorCode& err);
virtual const char* getTestDataPath(UErrorCode& err); virtual const char* getTestDataPath(UErrorCode& err);
static const char* getSourceTestData(UErrorCode& err); static const char* getSourceTestData(UErrorCode& err);
static char *getUnidataPath(char path[]);
// static members // static members
public: public:

View File

@ -369,12 +369,11 @@ U_DEFINE_LOCAL_OPEN_POINTER(LocalStdioFilePointer, FILE, fclose);
// verify that it transforms correctly in a skeleton. // verify that it transforms correctly in a skeleton.
// //
void IntlTestSpoof::testConfData() { void IntlTestSpoof::testConfData() {
UErrorCode status = U_ZERO_ERROR;
const char *testDataDir = IntlTest::getSourceTestData(status);
TEST_ASSERT_SUCCESS(status);
char buffer[2000]; char buffer[2000];
uprv_strcpy(buffer, testDataDir); if (getUnidataPath(buffer) == NULL) {
errln("Skipping test spoof/testConfData. Unable to find path to source/data/unidata/.");
return;
}
uprv_strcat(buffer, "confusables.txt"); uprv_strcat(buffer, "confusables.txt");
LocalStdioFilePointer f(fopen(buffer, "rb")); LocalStdioFilePointer f(fopen(buffer, "rb"));
@ -394,6 +393,7 @@ void IntlTestSpoof::testConfData() {
} }
UnicodeString confusablesTxt = UnicodeString::fromUTF8(StringPiece(fileBuf.getAlias(), fileSize)); UnicodeString confusablesTxt = UnicodeString::fromUTF8(StringPiece(fileBuf.getAlias(), fileSize));
UErrorCode status = U_ZERO_ERROR;
LocalUSpoofCheckerPointer sc(uspoof_open(&status)); LocalUSpoofCheckerPointer sc(uspoof_open(&status));
TEST_ASSERT_SUCCESS(status); TEST_ASSERT_SUCCESS(status);

View File

@ -1,6 +1,6 @@
/******************************************************************** /********************************************************************
* COPYRIGHT: * COPYRIGHT:
* Copyright (c) 1997-2013, International Business Machines Corporation and * Copyright (c) 1997-2014, International Business Machines Corporation and
* others. All Rights Reserved. * others. All Rights Reserved.
********************************************************************/ ********************************************************************/
@ -198,39 +198,22 @@ void UnicodeTest::TestAdditionalProperties() {
return; return;
} }
char newPath[256]; char path[500];
char backupPath[256]; if(getUnidataPath(path) == NULL) {
errln("unable to find path to source/data/unidata/");
return;
}
char *basename=strchr(path, 0);
strcpy(basename, "DerivedCoreProperties.txt");
char *fields[2][2]; char *fields[2][2];
UErrorCode errorCode=U_ZERO_ERROR; UErrorCode errorCode=U_ZERO_ERROR;
u_parseDelimitedFile(path, ';', fields, 2, derivedPropsLineFn, this, &errorCode);
/* Look inside ICU_DATA first */
strcpy(newPath, pathToDataDirectory());
strcat(newPath, "unidata" U_FILE_SEP_STRING "DerivedCoreProperties.txt");
// As a fallback, try to guess where the source data was located
// at the time ICU was built, and look there.
# ifdef U_TOPSRCDIR
strcpy(backupPath, U_TOPSRCDIR U_FILE_SEP_STRING "data");
# else
strcpy(backupPath, loadTestData(errorCode));
strcat(backupPath, U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data");
# endif
strcat(backupPath, U_FILE_SEP_STRING);
strcat(backupPath, "unidata" U_FILE_SEP_STRING "DerivedCoreProperties.txt");
char *path=newPath;
u_parseDelimitedFile(newPath, ';', fields, 2, derivedPropsLineFn, this, &errorCode);
if(errorCode==U_FILE_ACCESS_ERROR) {
errorCode=U_ZERO_ERROR;
path=backupPath;
u_parseDelimitedFile(backupPath, ';', fields, 2, derivedPropsLineFn, this, &errorCode);
}
if(U_FAILURE(errorCode)) { if(U_FAILURE(errorCode)) {
errln("error parsing DerivedCoreProperties.txt: %s\n", u_errorName(errorCode)); errln("error parsing DerivedCoreProperties.txt: %s\n", u_errorName(errorCode));
return; return;
} }
char *basename=path+strlen(path)-strlen("DerivedCoreProperties.txt");
strcpy(basename, "DerivedNormalizationProps.txt"); strcpy(basename, "DerivedNormalizationProps.txt");
u_parseDelimitedFile(path, ';', fields, 2, derivedPropsLineFn, this, &errorCode); u_parseDelimitedFile(path, ';', fields, 2, derivedPropsLineFn, this, &errorCode);
if(U_FAILURE(errorCode)) { if(U_FAILURE(errorCode)) {

View File

@ -1,6 +1,6 @@
/* /*
******************************************************************************** ********************************************************************************
* Copyright (C) 1999-2013 International Business Machines Corporation and * Copyright (C) 1999-2014 International Business Machines Corporation and
* others. All Rights Reserved. * others. All Rights Reserved.
******************************************************************************** ********************************************************************************
* Date Name Description * Date Name Description
@ -1054,7 +1054,7 @@ void UnicodeSetTest::TestPropertySet() {
// U+FDF2 has Script=Arabic and also Arab in its Script_Extensions, // U+FDF2 has Script=Arabic and also Arab in its Script_Extensions,
// so scx-sc is missing U+FDF2. // so scx-sc is missing U+FDF2.
"[[:Script_Extensions=Arabic:]-[:Arab:]]", "[[:Script_Extensions=Arabic:]-[:Arab:]]",
"\\u0640\\u064B\\u0650\\u0655\\uFDFD", "\\u0640\\u064B\\u0650\\u0655",
"\\uFDF2" "\\uFDF2"
}; };

View File

@ -1,5 +1,5 @@
# BidiTest-6.3.0.txt # BidiTest-7.0.0.txt
# Date: 2013-09-14, 09:20:12 GMT [RP] # Date: 2013-11-27, 09:54:24 GMT [MD]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2013 Unicode, Inc.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
# GraphemeBreakTest-6.3.0.txt # GraphemeBreakTest-7.0.0.txt
# Date: 2012-12-20, 22:18:29 GMT [MD] # Date: 2013-11-27, 09:54:39 GMT [MD]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2013 Unicode, Inc.

View File

@ -1,8 +1,8 @@
# LineBreakTest-6.3.0.txt # LineBreakTest-7.0.0.txt
# Date: 2012-12-20, 22:18:30 GMT [MD] # Date: 2014-02-19, 15:51:25 GMT [MD]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2014 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html # For terms of use, see http://www.unicode.org/terms_of_use.html
# For documentation, see http://www.unicode.org/reports/tr44/ # For documentation, see http://www.unicode.org/reports/tr44/
# #
@ -4914,9 +4914,9 @@
× 002F × 0020 ÷ AC01 ÷ # × [0.3] SOLIDUS (SY) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3] × 002F × 0020 ÷ AC01 ÷ # × [0.3] SOLIDUS (SY) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
× 002F × 0308 ÷ AC01 ÷ # × [0.3] SOLIDUS (SY) × [9.0] COMBINING DIAERESIS (CM) ÷ [999.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3] × 002F × 0308 ÷ AC01 ÷ # × [0.3] SOLIDUS (SY) × [9.0] COMBINING DIAERESIS (CM) ÷ [999.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
× 002F × 0308 × 0020 ÷ AC01 ÷ # × [0.3] SOLIDUS (SY) × [9.0] COMBINING DIAERESIS (CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3] × 002F × 0308 × 0020 ÷ AC01 ÷ # × [0.3] SOLIDUS (SY) × [9.0] COMBINING DIAERESIS (CM) × [7.01] SPACE (SP) ÷ [18.0] HANGUL SYLLABLE GAG (H3) ÷ [0.3]
× 002F × 05D0 ÷ # × [0.3] SOLIDUS (SY) ÷ [21.05] HEBREW LETTER ALEF (HL) ÷ [0.3] × 002F × 05D0 ÷ # × [0.3] SOLIDUS (SY) ÷ [21.05] HEBREW LETTER ALEF (HL) ÷ [0.3] -- ICU patch for ticket #10176
× 002F × 0020 ÷ 05D0 ÷ # × [0.3] SOLIDUS (SY) × [7.01] SPACE (SP) ÷ [18.0] HEBREW LETTER ALEF (HL) ÷ [0.3] × 002F × 0020 ÷ 05D0 ÷ # × [0.3] SOLIDUS (SY) × [7.01] SPACE (SP) ÷ [18.0] HEBREW LETTER ALEF (HL) ÷ [0.3]
× 002F × 0308 × 05D0 ÷ # × [0.3] SOLIDUS (SY) × [9.0] COMBINING DIAERESIS (CM) ÷ [21.05] HEBREW LETTER ALEF (HL) ÷ [0.3] × 002F × 0308 × 05D0 ÷ # × [0.3] SOLIDUS (SY) × [9.0] COMBINING DIAERESIS (CM) ÷ [21.05] HEBREW LETTER ALEF (HL) ÷ [0.3] -- ICU patch for ticket #10176
× 002F × 0308 × 0020 ÷ 05D0 ÷ # × [0.3] SOLIDUS (SY) × [9.0] COMBINING DIAERESIS (CM) × [7.01] SPACE (SP) ÷ [18.0] HEBREW LETTER ALEF (HL) ÷ [0.3] × 002F × 0308 × 0020 ÷ 05D0 ÷ # × [0.3] SOLIDUS (SY) × [9.0] COMBINING DIAERESIS (CM) × [7.01] SPACE (SP) ÷ [18.0] HEBREW LETTER ALEF (HL) ÷ [0.3]
× 002F × 002D ÷ # × [0.3] SOLIDUS (SY) × [21.02] HYPHEN-MINUS (HY) ÷ [0.3] × 002F × 002D ÷ # × [0.3] SOLIDUS (SY) × [21.02] HYPHEN-MINUS (HY) ÷ [0.3]
× 002F × 0020 ÷ 002D ÷ # × [0.3] SOLIDUS (SY) × [7.01] SPACE (SP) ÷ [18.0] HYPHEN-MINUS (HY) ÷ [0.3] × 002F × 0020 ÷ 002D ÷ # × [0.3] SOLIDUS (SY) × [7.01] SPACE (SP) ÷ [18.0] HYPHEN-MINUS (HY) ÷ [0.3]

View File

@ -1,5 +1,5 @@
# SentenceBreakTest-6.3.0.txt # SentenceBreakTest-7.0.0.txt
# Date: 2012-12-20, 22:18:42 GMT [MD] # Date: 2013-11-27, 09:54:53 GMT [MD]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2013 Unicode, Inc.

View File

@ -1,5 +1,5 @@
# WordBreakTest-6.3.0.txt # WordBreakTest-7.0.0.txt
# Date: 2013-07-05, 14:09:03 GMT [MD] # Date: 2013-11-27, 09:54:53 GMT [MD]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2013 Unicode, Inc. # Copyright (c) 1991-2013 Unicode, Inc.

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
/* /*
******************************************************************************* *******************************************************************************
* *
* Copyright (C) 2005-2012, International Business Machines * Copyright (C) 2005-2014, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
* *
******************************************************************************* *******************************************************************************
@ -500,9 +500,11 @@ ubidi_swap(const UDataSwapper *ds,
ds->swapArray32(ds, inBytes+offset, count, outBytes+offset, pErrorCode); ds->swapArray32(ds, inBytes+offset, count, outBytes+offset, pErrorCode);
offset+=count; offset+=count;
/* just skip the uint8_t jgArray[] */ /* just skip the uint8_t jgArray[] and jgArray2[] */
count=indexes[UBIDI_IX_JG_LIMIT]-indexes[UBIDI_IX_JG_START]; count=indexes[UBIDI_IX_JG_LIMIT]-indexes[UBIDI_IX_JG_START];
offset+=count; offset+=count;
count=indexes[UBIDI_IX_JG_LIMIT2]-indexes[UBIDI_IX_JG_START2];
offset+=count;
U_ASSERT(offset==size); U_ASSERT(offset==size);
} }