bug 724826 pt 2 - replace the use of cattable.h with nsUnicodePropert…

…yData for more accurate (and faster) category lookup. r=smontagu
mozilla · Feb 24, 2012 · 1a6e616 · 1a6e616
1 parent c61fa71
commit 1a6e616
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 4,808 deletions.
diff --git a/intl/unicharutil/public/nsUnicodeProperties.h b/intl/unicharutil/public/nsUnicodeProperties.h
@@ -39,17 +39,26 @@
 #define NS_UNICODEPROPERTIES_H
 
 #include "prtypes.h"
+#include "nsIUGenCategory.h"
 
 namespace mozilla {
 
 namespace unicode {
 
+extern nsIUGenCategory::nsUGenCategory sDetailedToGeneralCategory[];
+
 PRUint32 GetMirroredChar(PRUint32 aCh);
 
 PRUint8 GetCombiningClass(PRUint32 aCh);
 
+// returns the detailed General Category in terms of HB_UNICODE_* values
 PRUint8 GetGeneralCategory(PRUint32 aCh);
 
+// returns the simplified Gen Category as defined in nsIUGenCategory
+inline nsIUGenCategory::nsUGenCategory GetGenCategory(PRUint32 aCh) {
+  return sDetailedToGeneralCategory[GetGeneralCategory(aCh)];
+}
+
 PRUint8 GetEastAsianWidth(PRUint32 aCh);
 
 PRInt32 GetScriptCode(PRUint32 aCh);