Bug 1183209 patch 3: update generated data files to Unicode 8, and adapt internal XIDMOD types to the new types in Unicode's xidmodifications.txt, r=jfkthame

This commit is contained in:
Simon Montagu 2015-07-15 05:55:24 -07:00
parent a3b651a1de
commit 9f32d87101
12 changed files with 1615 additions and 733 deletions

View File

@ -633,14 +633,11 @@ gfxShapedText::SetGlyphs(uint32_t aIndex, CompressedGlyph aGlyph,
#define ZWNJ 0x200C #define ZWNJ 0x200C
#define ZWJ 0x200D #define ZWJ 0x200D
// U+061C ARABIC LETTER MARK is expected to be added to XIDMOD_DEFAULT_IGNORABLE
// in a future Unicode update. Add it manually for now
#define ALM 0x061C
static inline bool static inline bool
IsDefaultIgnorable(uint32_t aChar) IsDefaultIgnorable(uint32_t aChar)
{ {
return GetIdentifierModification(aChar) == XIDMOD_DEFAULT_IGNORABLE || return GetIdentifierModification(aChar) == XIDMOD_DEFAULT_IGNORABLE ||
aChar == ZWNJ || aChar == ZWJ || aChar == ALM; aChar == ZWNJ || aChar == ZWJ;
} }
void void

View File

@ -9,8 +9,8 @@
#include "mozilla/ArrayUtils.h" // for ArrayLength #include "mozilla/ArrayUtils.h" // for ArrayLength
#include <stdlib.h> // for bsearch #include <stdlib.h> // for bsearch
/* SpecialCasing-7.0.0.txt */ /* SpecialCasing-8.0.0.txt */
/* Date: 2014-03-18, 07:18:02 GMT [MD] */ /* Date: 2014-12-16, 23:08:04 GMT [MD] */
using mozilla::unicode::MultiCharMapping; using mozilla::unicode::MultiCharMapping;

View File

@ -62,15 +62,18 @@ inline VerticalOrientation GetVerticalOrientation(uint32_t aCh) {
} }
enum XidmodType { enum XidmodType {
XIDMOD_INCLUSION,
XIDMOD_RECOMMENDED, XIDMOD_RECOMMENDED,
XIDMOD_DEFAULT_IGNORABLE, XIDMOD_INCLUSION,
XIDMOD_HISTORIC, XIDMOD_UNCOMMON_USE,
XIDMOD_LIMITED_USE,
XIDMOD_NOT_NFKC,
XIDMOD_NOT_XID,
XIDMOD_OBSOLETE,
XIDMOD_TECHNICAL, XIDMOD_TECHNICAL,
XIDMOD_OBSOLETE,
XIDMOD_ASPIRATIONAL,
XIDMOD_LIMITED_USE,
XIDMOD_EXCLUSION,
XIDMOD_NOT_XID,
XIDMOD_NOT_NFKC,
XIDMOD_DEFAULT_IGNORABLE,
XIDMOD_DEPRECATED,
XIDMOD_NOT_CHARS XIDMOD_NOT_CHARS
}; };
@ -78,11 +81,6 @@ inline XidmodType GetIdentifierModification(uint32_t aCh) {
return XidmodType(GetCharProps2(aCh).mXidmod); return XidmodType(GetCharProps2(aCh).mXidmod);
} }
inline bool IsRestrictedForIdentifiers(uint32_t aCh) {
XidmodType xm = GetIdentifierModification(aCh);
return (xm > XIDMOD_RECOMMENDED);
}
/** /**
* Return the numeric value of the character. The value returned is the value * Return the numeric value of the character. The value returned is the value
* of the Numeric_Value in field 7 of the UCD, or -1 if field 7 is empty. * of the Numeric_Value in field 7 of the UCD, or -1 if field 7 is empty.

File diff suppressed because one or more lines are too long

View File

@ -11,13 +11,13 @@
*/ */
/* /*
* Created on Tue Apr 7 00:14:33 2015 from UCD data files with version info: * Created on Mon Jul 13 19:06:12 2015 from UCD data files with version info:
* *
# Date: 2014-06-12, 20:18:00 GMT [KW] # Date: 2015-06-16, 20:24:00 GMT [KW]
# #
# Unicode Character Database # Unicode Character Database
# Copyright (c) 1991-2014 Unicode, Inc. # Copyright (c) 1991-2015 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 the following: # For documentation, see the following:
@ -25,32 +25,32 @@
# UAX #38, "Unicode Han Database (Unihan)" # UAX #38, "Unicode Han Database (Unihan)"
# UAX #44, "Unicode Character Database." # UAX #44, "Unicode Character Database."
# #
# The UAXes can be accessed at http://www.unicode.org/versions/Unicode7.0.0/ # The UAXes can be accessed at http://www.unicode.org/versions/Unicode8.0.0/
This directory contains the final data files This directory contains the final data files
for the Unicode Character Database, for Version 7.0.0 of the Unicode for the Unicode Character Database, for Version 8.0.0 of the Unicode
Standard. Standard.
# Scripts-7.0.0.txt # Scripts-8.0.0.txt
# Date: 2014-05-15, 00:11:35 GMT [MD] # Date: 2015-03-11, 22:29:42 GMT [MD]
# EastAsianWidth-7.0.0.txt # EastAsianWidth-8.0.0.txt
# Date: 2014-02-28, 23:15:00 GMT [KW, LI] # Date: 2015-02-10, 21:00:00 GMT [KW, LI]
# BidiMirroring-7.0.0.txt # BidiMirroring-8.0.0.txt
# Date: 2013-12-17, 00:00:00 GMT [KW, LI] # Date: 2015-01-20, 18:30:00 GMT [KW, LI]
# HangulSyllableType-7.0.0.txt # HangulSyllableType-8.0.0.txt
# Date: 2013-11-27, 09:54:39 GMT [MD] # Date: 2014-12-16, 23:07:45 GMT [MD]
# File: xidmodifications.txt # File: xidmodifications.txt
# Version: 7.0.0 # Version: 8.0.0
# Generated: 2014-09-09, 13:36:12 GMT # Generated: 2015-05-17, 03:09:04 GMT
# #
# Unihan_Variants.txt # Unihan_Variants.txt
# Date: 2014-05-09 18:17:02 GMT [JHJ] # Date: 2015-04-30 18:38:20 GMT [JHJ]
# VerticalOrientation-13.txt # VerticalOrientation-13.txt
# Date: 2014-09-03, 17:30:00 GMT [EM, KI, LI] # Date: 2014-09-03, 17:30:00 GMT [EM, KI, LI]
@ -213,9 +213,15 @@ enum {
MOZ_SCRIPT_SIDDHAM = 123, MOZ_SCRIPT_SIDDHAM = 123,
MOZ_SCRIPT_TIRHUTA = 124, MOZ_SCRIPT_TIRHUTA = 124,
MOZ_SCRIPT_WARANG_CITI = 125, MOZ_SCRIPT_WARANG_CITI = 125,
MOZ_SCRIPT_MATHEMATICAL_NOTATION = 126, MOZ_SCRIPT_AHOM = 126,
MOZ_SCRIPT_ANATOLIAN_HIEROGLYPHS = 127,
MOZ_SCRIPT_HATRAN = 128,
MOZ_SCRIPT_MULTANI = 129,
MOZ_SCRIPT_OLD_HUNGARIAN = 130,
MOZ_SCRIPT_SIGNWRITING = 131,
MOZ_SCRIPT_MATHEMATICAL_NOTATION = 132,
MOZ_NUM_SCRIPT_CODES = 127, MOZ_NUM_SCRIPT_CODES = 133,
MOZ_SCRIPT_INVALID = -1 MOZ_SCRIPT_INVALID = -1
}; };

View File

@ -518,6 +518,92 @@
&#x2D25; &#x2D25;
&#x2D27; &#x2D27;
&#x2D2D; &#x2D2D;
&#xAB70;
&#xAB71;
&#xAB72;
&#xAB73;
&#xAB74;
&#xAB75;
&#xAB76;
&#xAB77;
&#xAB78;
&#xAB79;
&#xAB7A;
&#xAB7B;
&#xAB7C;
&#xAB7D;
&#xAB7E;
&#xAB7F;
&#xAB80;
&#xAB81;
&#xAB82;
&#xAB83;
&#xAB84;
&#xAB85;
&#xAB86;
&#xAB87;
&#xAB88;
&#xAB89;
&#xAB8A;
&#xAB8B;
&#xAB8C;
&#xAB8D;
&#xAB8E;
&#xAB8F;
&#xAB90;
&#xAB91;
&#xAB92;
&#xAB93;
&#xAB94;
&#xAB95;
&#xAB96;
&#xAB97;
&#xAB98;
&#xAB99;
&#xAB9A;
&#xAB9B;
&#xAB9C;
&#xAB9D;
&#xAB9E;
&#xAB9F;
&#xABA0;
&#xABA1;
&#xABA2;
&#xABA3;
&#xABA4;
&#xABA5;
&#xABA6;
&#xABA7;
&#xABA8;
&#xABA9;
&#xABAA;
&#xABAB;
&#xABAC;
&#xABAD;
&#xABAE;
&#xABAF;
&#xABB0;
&#xABB1;
&#xABB2;
&#xABB3;
&#xABB4;
&#xABB5;
&#xABB6;
&#xABB7;
&#xABB8;
&#xABB9;
&#xABBA;
&#xABBB;
&#xABBC;
&#xABBD;
&#xABBE;
&#xABBF;
&#x13F8;
&#x13F9;
&#x13FA;
&#x13FB;
&#x13FC;
&#x13FD;
&#x1E01; &#x1E01;
&#x1E03; &#x1E03;
&#x1E05; &#x1E05;
@ -1003,6 +1089,10 @@
&#x026C; &#x026C;
&#x029E; &#x029E;
&#x0287; &#x0287;
&#x029D;
&#xAB53;
&#xA7B5;
&#xA7B7;
&#xFF41; &#xFF41;
&#xFF42; &#xFF42;
&#xFF43; &#xFF43;
@ -1069,6 +1159,57 @@
&#x1044D; &#x1044D;
&#x1044E; &#x1044E;
&#x1044F; &#x1044F;
&#x10CC0;
&#x10CC1;
&#x10CC2;
&#x10CC3;
&#x10CC4;
&#x10CC5;
&#x10CC6;
&#x10CC7;
&#x10CC8;
&#x10CC9;
&#x10CCA;
&#x10CCB;
&#x10CCC;
&#x10CCD;
&#x10CCE;
&#x10CCF;
&#x10CD0;
&#x10CD1;
&#x10CD2;
&#x10CD3;
&#x10CD4;
&#x10CD5;
&#x10CD6;
&#x10CD7;
&#x10CD8;
&#x10CD9;
&#x10CDA;
&#x10CDB;
&#x10CDC;
&#x10CDD;
&#x10CDE;
&#x10CDF;
&#x10CE0;
&#x10CE1;
&#x10CE2;
&#x10CE3;
&#x10CE4;
&#x10CE5;
&#x10CE6;
&#x10CE7;
&#x10CE8;
&#x10CE9;
&#x10CEA;
&#x10CEB;
&#x10CEC;
&#x10CED;
&#x10CEE;
&#x10CEF;
&#x10CF0;
&#x10CF1;
&#x10CF2;
&#x118C0; &#x118C0;
&#x118C1; &#x118C1;
&#x118C2; &#x118C2;

View File

@ -518,6 +518,92 @@
&#x10C5; &#x10C5;
&#x10C7; &#x10C7;
&#x10CD; &#x10CD;
&#x13A0;
&#x13A1;
&#x13A2;
&#x13A3;
&#x13A4;
&#x13A5;
&#x13A6;
&#x13A7;
&#x13A8;
&#x13A9;
&#x13AA;
&#x13AB;
&#x13AC;
&#x13AD;
&#x13AE;
&#x13AF;
&#x13B0;
&#x13B1;
&#x13B2;
&#x13B3;
&#x13B4;
&#x13B5;
&#x13B6;
&#x13B7;
&#x13B8;
&#x13B9;
&#x13BA;
&#x13BB;
&#x13BC;
&#x13BD;
&#x13BE;
&#x13BF;
&#x13C0;
&#x13C1;
&#x13C2;
&#x13C3;
&#x13C4;
&#x13C5;
&#x13C6;
&#x13C7;
&#x13C8;
&#x13C9;
&#x13CA;
&#x13CB;
&#x13CC;
&#x13CD;
&#x13CE;
&#x13CF;
&#x13D0;
&#x13D1;
&#x13D2;
&#x13D3;
&#x13D4;
&#x13D5;
&#x13D6;
&#x13D7;
&#x13D8;
&#x13D9;
&#x13DA;
&#x13DB;
&#x13DC;
&#x13DD;
&#x13DE;
&#x13DF;
&#x13E0;
&#x13E1;
&#x13E2;
&#x13E3;
&#x13E4;
&#x13E5;
&#x13E6;
&#x13E7;
&#x13E8;
&#x13E9;
&#x13EA;
&#x13EB;
&#x13EC;
&#x13ED;
&#x13EE;
&#x13EF;
&#x13F0;
&#x13F1;
&#x13F2;
&#x13F3;
&#x13F4;
&#x13F5;
&#x1E00; &#x1E00;
&#x1E02; &#x1E02;
&#x1E04; &#x1E04;
@ -1003,6 +1089,10 @@
&#xA7AD; &#xA7AD;
&#xA7B0; &#xA7B0;
&#xA7B1; &#xA7B1;
&#xA7B2;
&#xA7B3;
&#xA7B4;
&#xA7B6;
&#xFF21; &#xFF21;
&#xFF22; &#xFF22;
&#xFF23; &#xFF23;
@ -1069,6 +1159,57 @@
&#x10425; &#x10425;
&#x10426; &#x10426;
&#x10427; &#x10427;
&#x10C80;
&#x10C81;
&#x10C82;
&#x10C83;
&#x10C84;
&#x10C85;
&#x10C86;
&#x10C87;
&#x10C88;
&#x10C89;
&#x10C8A;
&#x10C8B;
&#x10C8C;
&#x10C8D;
&#x10C8E;
&#x10C8F;
&#x10C90;
&#x10C91;
&#x10C92;
&#x10C93;
&#x10C94;
&#x10C95;
&#x10C96;
&#x10C97;
&#x10C98;
&#x10C99;
&#x10C9A;
&#x10C9B;
&#x10C9C;
&#x10C9D;
&#x10C9E;
&#x10C9F;
&#x10CA0;
&#x10CA1;
&#x10CA2;
&#x10CA3;
&#x10CA4;
&#x10CA5;
&#x10CA6;
&#x10CA7;
&#x10CA8;
&#x10CA9;
&#x10CAA;
&#x10CAB;
&#x10CAC;
&#x10CAD;
&#x10CAE;
&#x10CAF;
&#x10CB0;
&#x10CB1;
&#x10CB2;
&#x118A0; &#x118A0;
&#x118A1; &#x118A1;
&#x118A2; &#x118A2;

View File

@ -256,6 +256,7 @@
&#x01B2;x &#x01B2;x
&#x0245;x &#x0245;x
&#x01B7;x &#x01B7;x
&#xA7B2;x
&#xA7B0;x &#xA7B0;x
&#x0345;X &#x0345;X
&#x0370;x &#x0370;x
@ -511,6 +512,12 @@
&#x0555;x &#x0555;x
&#x0556;x &#x0556;x
&#x0535;&#x0582;x <!-- ARMENIAN SMALL LIGATURE ECH YIWN --> &#x0535;&#x0582;x <!-- ARMENIAN SMALL LIGATURE ECH YIWN -->
&#x13F0;x
&#x13F1;x
&#x13F2;x
&#x13F3;x
&#x13F4;x
&#x13F5;x
&#xA77D;x &#xA77D;x
&#x2C63;x &#x2C63;x
&#x1E00;x &#x1E00;x
@ -1051,6 +1058,89 @@
&#xA7A4;x &#xA7A4;x
&#xA7A6;x &#xA7A6;x
&#xA7A8;x &#xA7A8;x
&#xA7B4;x
&#xA7B6;x
&#xA7B3;x
&#x13A0;x
&#x13A1;x
&#x13A2;x
&#x13A3;x
&#x13A4;x
&#x13A5;x
&#x13A6;x
&#x13A7;x
&#x13A8;x
&#x13A9;x
&#x13AA;x
&#x13AB;x
&#x13AC;x
&#x13AD;x
&#x13AE;x
&#x13AF;x
&#x13B0;x
&#x13B1;x
&#x13B2;x
&#x13B3;x
&#x13B4;x
&#x13B5;x
&#x13B6;x
&#x13B7;x
&#x13B8;x
&#x13B9;x
&#x13BA;x
&#x13BB;x
&#x13BC;x
&#x13BD;x
&#x13BE;x
&#x13BF;x
&#x13C0;x
&#x13C1;x
&#x13C2;x
&#x13C3;x
&#x13C4;x
&#x13C5;x
&#x13C6;x
&#x13C7;x
&#x13C8;x
&#x13C9;x
&#x13CA;x
&#x13CB;x
&#x13CC;x
&#x13CD;x
&#x13CE;x
&#x13CF;x
&#x13D0;x
&#x13D1;x
&#x13D2;x
&#x13D3;x
&#x13D4;x
&#x13D5;x
&#x13D6;x
&#x13D7;x
&#x13D8;x
&#x13D9;x
&#x13DA;x
&#x13DB;x
&#x13DC;x
&#x13DD;x
&#x13DE;x
&#x13DF;x
&#x13E0;x
&#x13E1;x
&#x13E2;x
&#x13E3;x
&#x13E4;x
&#x13E5;x
&#x13E6;x
&#x13E7;x
&#x13E8;x
&#x13E9;x
&#x13EA;x
&#x13EB;x
&#x13EC;x
&#x13ED;x
&#x13EE;x
&#x13EF;x
&#x0046;&#x0066;x <!-- LATIN SMALL LIGATURE FF --> &#x0046;&#x0066;x <!-- LATIN SMALL LIGATURE FF -->
&#x0046;&#x0069;x <!-- LATIN SMALL LIGATURE FI --> &#x0046;&#x0069;x <!-- LATIN SMALL LIGATURE FI -->
&#x0046;&#x006C;x <!-- LATIN SMALL LIGATURE FL --> &#x0046;&#x006C;x <!-- LATIN SMALL LIGATURE FL -->
@ -1129,6 +1219,57 @@
&#x10425;x &#x10425;x
&#x10426;x &#x10426;x
&#x10427;x &#x10427;x
&#x10C80;x
&#x10C81;x
&#x10C82;x
&#x10C83;x
&#x10C84;x
&#x10C85;x
&#x10C86;x
&#x10C87;x
&#x10C88;x
&#x10C89;x
&#x10C8A;x
&#x10C8B;x
&#x10C8C;x
&#x10C8D;x
&#x10C8E;x
&#x10C8F;x
&#x10C90;x
&#x10C91;x
&#x10C92;x
&#x10C93;x
&#x10C94;x
&#x10C95;x
&#x10C96;x
&#x10C97;x
&#x10C98;x
&#x10C99;x
&#x10C9A;x
&#x10C9B;x
&#x10C9C;x
&#x10C9D;x
&#x10C9E;x
&#x10C9F;x
&#x10CA0;x
&#x10CA1;x
&#x10CA2;x
&#x10CA3;x
&#x10CA4;x
&#x10CA5;x
&#x10CA6;x
&#x10CA7;x
&#x10CA8;x
&#x10CA9;x
&#x10CAA;x
&#x10CAB;x
&#x10CAC;x
&#x10CAD;x
&#x10CAE;x
&#x10CAF;x
&#x10CB0;x
&#x10CB1;x
&#x10CB2;x
&#x118A0;x &#x118A0;x
&#x118A1;x &#x118A1;x
&#x118A2;x &#x118A2;x

View File

@ -256,6 +256,7 @@
&#x028B;x &#x028B;x
&#x028C;x &#x028C;x
&#x0292;x &#x0292;x
&#x029D;x
&#x029E;x &#x029E;x
&#x0345;x &#x0345;x
&#x0371;x &#x0371;x
@ -511,6 +512,12 @@
&#x0585;x &#x0585;x
&#x0586;x &#x0586;x
&#x0587;x <!-- ARMENIAN SMALL LIGATURE ECH YIWN --> &#x0587;x <!-- ARMENIAN SMALL LIGATURE ECH YIWN -->
&#x13F8;x
&#x13F9;x
&#x13FA;x
&#x13FB;x
&#x13FC;x
&#x13FD;x
&#x1D79;x &#x1D79;x
&#x1D7D;x &#x1D7D;x
&#x1E01;x &#x1E01;x
@ -1051,6 +1058,89 @@
&#xA7A5;x &#xA7A5;x
&#xA7A7;x &#xA7A7;x
&#xA7A9;x &#xA7A9;x
&#xA7B5;x
&#xA7B7;x
&#xAB53;x
&#xAB70;x
&#xAB71;x
&#xAB72;x
&#xAB73;x
&#xAB74;x
&#xAB75;x
&#xAB76;x
&#xAB77;x
&#xAB78;x
&#xAB79;x
&#xAB7A;x
&#xAB7B;x
&#xAB7C;x
&#xAB7D;x
&#xAB7E;x
&#xAB7F;x
&#xAB80;x
&#xAB81;x
&#xAB82;x
&#xAB83;x
&#xAB84;x
&#xAB85;x
&#xAB86;x
&#xAB87;x
&#xAB88;x
&#xAB89;x
&#xAB8A;x
&#xAB8B;x
&#xAB8C;x
&#xAB8D;x
&#xAB8E;x
&#xAB8F;x
&#xAB90;x
&#xAB91;x
&#xAB92;x
&#xAB93;x
&#xAB94;x
&#xAB95;x
&#xAB96;x
&#xAB97;x
&#xAB98;x
&#xAB99;x
&#xAB9A;x
&#xAB9B;x
&#xAB9C;x
&#xAB9D;x
&#xAB9E;x
&#xAB9F;x
&#xABA0;x
&#xABA1;x
&#xABA2;x
&#xABA3;x
&#xABA4;x
&#xABA5;x
&#xABA6;x
&#xABA7;x
&#xABA8;x
&#xABA9;x
&#xABAA;x
&#xABAB;x
&#xABAC;x
&#xABAD;x
&#xABAE;x
&#xABAF;x
&#xABB0;x
&#xABB1;x
&#xABB2;x
&#xABB3;x
&#xABB4;x
&#xABB5;x
&#xABB6;x
&#xABB7;x
&#xABB8;x
&#xABB9;x
&#xABBA;x
&#xABBB;x
&#xABBC;x
&#xABBD;x
&#xABBE;x
&#xABBF;x
&#xFB00;x <!-- LATIN SMALL LIGATURE FF --> &#xFB00;x <!-- LATIN SMALL LIGATURE FF -->
&#xFB01;x <!-- LATIN SMALL LIGATURE FI --> &#xFB01;x <!-- LATIN SMALL LIGATURE FI -->
&#xFB02;x <!-- LATIN SMALL LIGATURE FL --> &#xFB02;x <!-- LATIN SMALL LIGATURE FL -->
@ -1129,6 +1219,57 @@
&#x1044D;x &#x1044D;x
&#x1044E;x &#x1044E;x
&#x1044F;x &#x1044F;x
&#x10CC0;x
&#x10CC1;x
&#x10CC2;x
&#x10CC3;x
&#x10CC4;x
&#x10CC5;x
&#x10CC6;x
&#x10CC7;x
&#x10CC8;x
&#x10CC9;x
&#x10CCA;x
&#x10CCB;x
&#x10CCC;x
&#x10CCD;x
&#x10CCE;x
&#x10CCF;x
&#x10CD0;x
&#x10CD1;x
&#x10CD2;x
&#x10CD3;x
&#x10CD4;x
&#x10CD5;x
&#x10CD6;x
&#x10CD7;x
&#x10CD8;x
&#x10CD9;x
&#x10CDA;x
&#x10CDB;x
&#x10CDC;x
&#x10CDD;x
&#x10CDE;x
&#x10CDF;x
&#x10CE0;x
&#x10CE1;x
&#x10CE2;x
&#x10CE3;x
&#x10CE4;x
&#x10CE5;x
&#x10CE6;x
&#x10CE7;x
&#x10CE8;x
&#x10CE9;x
&#x10CEA;x
&#x10CEB;x
&#x10CEC;x
&#x10CED;x
&#x10CEE;x
&#x10CEF;x
&#x10CF0;x
&#x10CF1;x
&#x10CF2;x
&#x118C0;x &#x118C0;x
&#x118C1;x &#x118C1;x
&#x118C2;x &#x118C2;x

View File

@ -252,6 +252,7 @@
&#x01B2; &#x01B2;
&#x0245; &#x0245;
&#x01B7; &#x01B7;
&#xA7B2;
&#xA7B0; &#xA7B0;
&#x0399; &#x0399;
&#x0370; &#x0370;
@ -507,6 +508,12 @@
&#x0555; &#x0555;
&#x0556; &#x0556;
&#x0535;&#x0552; <!-- ARMENIAN SMALL LIGATURE ECH YIWN --> &#x0535;&#x0552; <!-- ARMENIAN SMALL LIGATURE ECH YIWN -->
&#x13F0;
&#x13F1;
&#x13F2;
&#x13F3;
&#x13F4;
&#x13F5;
&#xA77D; &#xA77D;
&#x2C63; &#x2C63;
&#x1E00; &#x1E00;
@ -1074,6 +1081,89 @@
&#xA7A4; &#xA7A4;
&#xA7A6; &#xA7A6;
&#xA7A8; &#xA7A8;
&#xA7B4;
&#xA7B6;
&#xA7B3;
&#x13A0;
&#x13A1;
&#x13A2;
&#x13A3;
&#x13A4;
&#x13A5;
&#x13A6;
&#x13A7;
&#x13A8;
&#x13A9;
&#x13AA;
&#x13AB;
&#x13AC;
&#x13AD;
&#x13AE;
&#x13AF;
&#x13B0;
&#x13B1;
&#x13B2;
&#x13B3;
&#x13B4;
&#x13B5;
&#x13B6;
&#x13B7;
&#x13B8;
&#x13B9;
&#x13BA;
&#x13BB;
&#x13BC;
&#x13BD;
&#x13BE;
&#x13BF;
&#x13C0;
&#x13C1;
&#x13C2;
&#x13C3;
&#x13C4;
&#x13C5;
&#x13C6;
&#x13C7;
&#x13C8;
&#x13C9;
&#x13CA;
&#x13CB;
&#x13CC;
&#x13CD;
&#x13CE;
&#x13CF;
&#x13D0;
&#x13D1;
&#x13D2;
&#x13D3;
&#x13D4;
&#x13D5;
&#x13D6;
&#x13D7;
&#x13D8;
&#x13D9;
&#x13DA;
&#x13DB;
&#x13DC;
&#x13DD;
&#x13DE;
&#x13DF;
&#x13E0;
&#x13E1;
&#x13E2;
&#x13E3;
&#x13E4;
&#x13E5;
&#x13E6;
&#x13E7;
&#x13E8;
&#x13E9;
&#x13EA;
&#x13EB;
&#x13EC;
&#x13ED;
&#x13EE;
&#x13EF;
&#x0046;&#x0046; <!-- LATIN SMALL LIGATURE FF --> &#x0046;&#x0046; <!-- LATIN SMALL LIGATURE FF -->
&#x0046;&#x0049; <!-- LATIN SMALL LIGATURE FI --> &#x0046;&#x0049; <!-- LATIN SMALL LIGATURE FI -->
&#x0046;&#x004C; <!-- LATIN SMALL LIGATURE FL --> &#x0046;&#x004C; <!-- LATIN SMALL LIGATURE FL -->
@ -1152,6 +1242,57 @@
&#x10425; &#x10425;
&#x10426; &#x10426;
&#x10427; &#x10427;
&#x10C80;
&#x10C81;
&#x10C82;
&#x10C83;
&#x10C84;
&#x10C85;
&#x10C86;
&#x10C87;
&#x10C88;
&#x10C89;
&#x10C8A;
&#x10C8B;
&#x10C8C;
&#x10C8D;
&#x10C8E;
&#x10C8F;
&#x10C90;
&#x10C91;
&#x10C92;
&#x10C93;
&#x10C94;
&#x10C95;
&#x10C96;
&#x10C97;
&#x10C98;
&#x10C99;
&#x10C9A;
&#x10C9B;
&#x10C9C;
&#x10C9D;
&#x10C9E;
&#x10C9F;
&#x10CA0;
&#x10CA1;
&#x10CA2;
&#x10CA3;
&#x10CA4;
&#x10CA5;
&#x10CA6;
&#x10CA7;
&#x10CA8;
&#x10CA9;
&#x10CAA;
&#x10CAB;
&#x10CAC;
&#x10CAD;
&#x10CAE;
&#x10CAF;
&#x10CB0;
&#x10CB1;
&#x10CB2;
&#x118A0; &#x118A0;
&#x118A1; &#x118A1;
&#x118A2; &#x118A2;

View File

@ -252,6 +252,7 @@
&#x028B; &#x028B;
&#x028C; &#x028C;
&#x0292; &#x0292;
&#x029D;
&#x029E; &#x029E;
&#x0345; &#x0345;
&#x0371; &#x0371;
@ -507,6 +508,12 @@
&#x0585; &#x0585;
&#x0586; &#x0586;
&#x0587; <!-- ARMENIAN SMALL LIGATURE ECH YIWN --> &#x0587; <!-- ARMENIAN SMALL LIGATURE ECH YIWN -->
&#x13F8;
&#x13F9;
&#x13FA;
&#x13FB;
&#x13FC;
&#x13FD;
&#x1D79; &#x1D79;
&#x1D7D; &#x1D7D;
&#x1E01; &#x1E01;
@ -1074,6 +1081,89 @@
&#xA7A5; &#xA7A5;
&#xA7A7; &#xA7A7;
&#xA7A9; &#xA7A9;
&#xA7B5;
&#xA7B7;
&#xAB53;
&#xAB70;
&#xAB71;
&#xAB72;
&#xAB73;
&#xAB74;
&#xAB75;
&#xAB76;
&#xAB77;
&#xAB78;
&#xAB79;
&#xAB7A;
&#xAB7B;
&#xAB7C;
&#xAB7D;
&#xAB7E;
&#xAB7F;
&#xAB80;
&#xAB81;
&#xAB82;
&#xAB83;
&#xAB84;
&#xAB85;
&#xAB86;
&#xAB87;
&#xAB88;
&#xAB89;
&#xAB8A;
&#xAB8B;
&#xAB8C;
&#xAB8D;
&#xAB8E;
&#xAB8F;
&#xAB90;
&#xAB91;
&#xAB92;
&#xAB93;
&#xAB94;
&#xAB95;
&#xAB96;
&#xAB97;
&#xAB98;
&#xAB99;
&#xAB9A;
&#xAB9B;
&#xAB9C;
&#xAB9D;
&#xAB9E;
&#xAB9F;
&#xABA0;
&#xABA1;
&#xABA2;
&#xABA3;
&#xABA4;
&#xABA5;
&#xABA6;
&#xABA7;
&#xABA8;
&#xABA9;
&#xABAA;
&#xABAB;
&#xABAC;
&#xABAD;
&#xABAE;
&#xABAF;
&#xABB0;
&#xABB1;
&#xABB2;
&#xABB3;
&#xABB4;
&#xABB5;
&#xABB6;
&#xABB7;
&#xABB8;
&#xABB9;
&#xABBA;
&#xABBB;
&#xABBC;
&#xABBD;
&#xABBE;
&#xABBF;
&#xFB00; <!-- LATIN SMALL LIGATURE FF --> &#xFB00; <!-- LATIN SMALL LIGATURE FF -->
&#xFB01; <!-- LATIN SMALL LIGATURE FI --> &#xFB01; <!-- LATIN SMALL LIGATURE FI -->
&#xFB02; <!-- LATIN SMALL LIGATURE FL --> &#xFB02; <!-- LATIN SMALL LIGATURE FL -->
@ -1152,6 +1242,57 @@
&#x1044D; &#x1044D;
&#x1044E; &#x1044E;
&#x1044F; &#x1044F;
&#x10CC0;
&#x10CC1;
&#x10CC2;
&#x10CC3;
&#x10CC4;
&#x10CC5;
&#x10CC6;
&#x10CC7;
&#x10CC8;
&#x10CC9;
&#x10CCA;
&#x10CCB;
&#x10CCC;
&#x10CCD;
&#x10CCE;
&#x10CCF;
&#x10CD0;
&#x10CD1;
&#x10CD2;
&#x10CD3;
&#x10CD4;
&#x10CD5;
&#x10CD6;
&#x10CD7;
&#x10CD8;
&#x10CD9;
&#x10CDA;
&#x10CDB;
&#x10CDC;
&#x10CDD;
&#x10CDE;
&#x10CDF;
&#x10CE0;
&#x10CE1;
&#x10CE2;
&#x10CE3;
&#x10CE4;
&#x10CE5;
&#x10CE6;
&#x10CE7;
&#x10CE8;
&#x10CE9;
&#x10CEA;
&#x10CEB;
&#x10CEC;
&#x10CED;
&#x10CEE;
&#x10CEF;
&#x10CF0;
&#x10CF1;
&#x10CF2;
&#x118C0; &#x118C0;
&#x118C1; &#x118C1;
&#x118C2; &#x118C2;

View File

@ -775,18 +775,14 @@ bool nsIDNService::isLabelSafe(const nsAString &label)
// Check for restricted characters; aspirational scripts are permitted // Check for restricted characters; aspirational scripts are permitted
XidmodType xm = GetIdentifierModification(ch); XidmodType xm = GetIdentifierModification(ch);
int32_t script = GetScriptCode(ch); if (xm != XIDMOD_RECOMMENDED &&
if (xm > XIDMOD_RECOMMENDED && xm != XIDMOD_INCLUSION &&
!(xm == XIDMOD_LIMITED_USE && xm != XIDMOD_ASPIRATIONAL) {
(script == MOZ_SCRIPT_CANADIAN_ABORIGINAL ||
script == MOZ_SCRIPT_MIAO ||
script == MOZ_SCRIPT_MONGOLIAN ||
script == MOZ_SCRIPT_TIFINAGH ||
script == MOZ_SCRIPT_YI))) {
return false; return false;
} }
// Check for mixed script // Check for mixed script
int32_t script = GetScriptCode(ch);
if (script != MOZ_SCRIPT_COMMON && if (script != MOZ_SCRIPT_COMMON &&
script != MOZ_SCRIPT_INHERITED && script != MOZ_SCRIPT_INHERITED &&
script != lastScript) { script != lastScript) {