corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 738101 - add support for more Unicode properties. r=smontagu

Browse Source
This commit is contained in:
Jonathan Kew
2012-04-23 07:20:11 -07:00
parent 0c4d12aa75
commit ebf1e6695b
5 changed files with 1528 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
intl/unicharutil/util/nsUnicodeProperties.cpp
View File

@@ -38,7 +38,6 @@
#define HB_DONT_DEFINE_STDINT 1
#include "nsUnicodeProperties.h"
#include "nsUnicodeScriptCodes.h"
#include "nsUnicodePropertyData.cpp"
#include "mozilla/Util.h"
@@ -48,6 +47,53 @@
#define UNICODE_BMP_LIMIT 0x10000
#define UNICODE_LIMIT 0x110000
nsCharProps1
GetCharProps1(PRUint32 aCh)
{
if (aCh < UNICODE_BMP_LIMIT) {
return sCharProp1Values[sCharProp1Pages[0][aCh >> kCharProp1CharBits]]
[aCh & ((1 << kCharProp1CharBits) - 1)];
}
if (aCh < (kCharProp1MaxPlane + 1) * 0x10000) {
return sCharProp1Values[sCharProp1Pages[sCharProp1Planes[(aCh >> 16) - 1]]
[(aCh & 0xffff) >> kCharProp1CharBits]]
[aCh & ((1 << kCharProp1CharBits) - 1)];
}
// Default values for unassigned
nsCharProps1 undefined = {0, // Index to mirrored char offsets
0, // Hangul Syllable type
0}; // Combining class
return undefined;
}
nsCharProps2
GetCharProps2(PRUint32 aCh)
{
if (aCh < UNICODE_BMP_LIMIT) {
return sCharProp2Values[sCharProp2Pages[0][aCh >> kCharProp2CharBits]]
[aCh & ((1 << kCharProp2CharBits) - 1)];
}
if (aCh < (kCharProp2MaxPlane + 1) * 0x10000) {
return sCharProp2Values[sCharProp2Pages[sCharProp2Planes[(aCh >> 16) - 1]]
[(aCh & 0xffff) >> kCharProp2CharBits]]
[aCh & ((1 << kCharProp2CharBits) - 1)];
}
NS_NOTREACHED("Getting CharProps for codepoint outside Unicode range");
// Default values for unassigned
nsCharProps2 undefined = {
MOZ_SCRIPT_UNKNOWN, // Script code
0, // East Asian Width
HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED, // General Category
eCharType_LeftToRight, // Bidi Category
mozilla::unicode::XIDMOD_NOT_CHARS, // Xidmod
-1 // Numeric Value
};
return undefined;
}
namespace mozilla {
namespace unicode {
@@ -113,81 +159,7 @@ nsIUGenCategory::nsUGenCategory sDetailedToGeneralCategory[] = {
PRUint32
GetMirroredChar(PRUint32 aCh)
{
// all mirrored chars are in plane 0
if (aCh < UNICODE_BMP_LIMIT) {
int v = sMirrorValues[sMirrorPages[0][aCh >> kMirrorCharBits]]
[aCh & ((1 << kMirrorCharBits) - 1)];
// The mirror value is stored as either an offset (if less than
// kSmallMirrorOffset) from the input character code, or as
// an index into the sDistantMirrors list. This allows the
// mirrored codes to be stored as 8-bit values, as most of them
// are references to nearby character codes.
if (v < kSmallMirrorOffset) {
return aCh + v;
}
return sDistantMirrors[v - kSmallMirrorOffset];
}
return aCh;
}
PRUint8
GetCombiningClass(PRUint32 aCh)
{
if (aCh < UNICODE_BMP_LIMIT) {
return sCClassValues[sCClassPages[0][aCh >> kCClassCharBits]]
[aCh & ((1 << kCClassCharBits) - 1)];
}
if (aCh < (kCClassMaxPlane + 1) * 0x10000) {
return sCClassValues[sCClassPages[sCClassPlanes[(aCh >> 16) - 1]]
[(aCh & 0xffff) >> kCClassCharBits]]
[aCh & ((1 << kCClassCharBits) - 1)];
}
return 0;
}
PRUint8
GetGeneralCategory(PRUint32 aCh)
{
if (aCh < UNICODE_BMP_LIMIT) {
return sCatEAWValues[sCatEAWPages[0][aCh >> kCatEAWCharBits]]
[aCh & ((1 << kCatEAWCharBits) - 1)].mCategory;
}
if (aCh < (kCatEAWMaxPlane + 1) * 0x10000) {
return sCatEAWValues[sCatEAWPages[sCatEAWPlanes[(aCh >> 16) - 1]]
[(aCh & 0xffff) >> kCatEAWCharBits]]
[aCh & ((1 << kCatEAWCharBits) - 1)].mCategory;
}
return PRUint8(HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED);
}
PRUint8
GetEastAsianWidth(PRUint32 aCh)
{
if (aCh < UNICODE_BMP_LIMIT) {
return sCatEAWValues[sCatEAWPages[0][aCh >> kCatEAWCharBits]]
[aCh & ((1 << kCatEAWCharBits) - 1)].mEAW;
}
if (aCh < (kCatEAWMaxPlane + 1) * 0x10000) {
return sCatEAWValues[sCatEAWPages[sCatEAWPlanes[(aCh >> 16) - 1]]
[(aCh & 0xffff) >> kCatEAWCharBits]]
[aCh & ((1 << kCatEAWCharBits) - 1)].mEAW;
}
return 0;
}
PRInt32
GetScriptCode(PRUint32 aCh)
{
if (aCh < UNICODE_BMP_LIMIT) {
return sScriptValues[sScriptPages[0][aCh >> kScriptCharBits]]
[aCh & ((1 << kScriptCharBits) - 1)];
}
if (aCh < (kScriptMaxPlane + 1) * 0x10000) {
return sScriptValues[sScriptPages[sScriptPlanes[(aCh >> 16) - 1]]
[(aCh & 0xffff) >> kScriptCharBits]]
[aCh & ((1 << kScriptCharBits) - 1)];
}
return MOZ_SCRIPT_UNKNOWN;
return aCh + sMirrorOffsets[GetCharProps1(aCh).mMirrorOffsetIndex];
}
PRUint32
@@ -200,17 +172,6 @@ GetScriptTagForCode(PRInt32 aScriptCode)
return sScriptCodeToTag[aScriptCode];
}
HSType
GetHangulSyllableType(PRUint32 aCh)
{
// all Hangul chars are in plane 0
if (aCh < UNICODE_BMP_LIMIT) {
return HSType(sHangulValues[sHangulPages[0][aCh >> kHangulCharBits]]
[aCh & ((1 << kHangulCharBits) - 1)]);
}
return HST_NONE;
}
static inline PRUint32
GetCaseMapValue(PRUint32 aCh)
{
@@ -275,6 +236,25 @@ GetTitlecaseForAll(PRUint32 aCh)
return aCh;
}
HanVariantType
GetHanVariant(PRUint32 aCh)
{
// In the sHanVariantValues array, data for 4 successive characters
// (2 bits each) is packed in to each PRUint8 entry, with the value
// for the lowest character stored in the least significant bits.
PRUint8 v = 0;
if (aCh < UNICODE_BMP_LIMIT) {
v = sHanVariantValues[sHanVariantPages[0][aCh >> kHanVariantCharBits]]
[(aCh & ((1 << kHanVariantCharBits) - 1)) >> 2];
} else if (aCh < (kHanVariantMaxPlane + 1) * 0x10000) {
v = sHanVariantValues[sHanVariantPages[sHanVariantPlanes[(aCh >> 16) - 1]]
[(aCh & 0xffff) >> kHanVariantCharBits]]
[(aCh & ((1 << kHanVariantCharBits) - 1)) >> 2];
}
// extract the appropriate 2-bit field from the value
return HanVariantType((v >> ((aCh & 3) * 2)) & 3);
}
bool
IsClusterExtender(PRUint32 aCh, PRUint8 aCategory)
{