Update Qt internals to use QChar::Script

...and remove the outdated QUnicodeTables::Script enum.
QFontEngineData now has one extra slot that never used
(engines[QChar::Script_Inherited]). engines[QChar::Script_Unknown],
if accessed, would be set with a Box engine instance, and could be used
as a minor optimization some time later.

In order to preserve the existing behavior, we map all scripts up to Latin to Common.

Change-Id: Ide4182a0f8447b4bf25713ecc3fe8097b8fed040
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

1 files changed, 76 insertions, 1 deletions

diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/tools/qharfbuzz_p.h
index 8330921323..9efbdcb692 100644
--- a/src/corelib/tools/qharfbuzz_p.h
+++ b/src/corelib/tools/qharfbuzz_p.h
@@ -53,11 +53,86 @@
 #ifndef QHARFBUZZ_P_H
 #define QHARFBUZZ_P_H
 
-#include <QtCore/qglobal.h>
+#include <QtCore/qchar.h>
+
 #include <harfbuzz-shaper.h>
 
 QT_BEGIN_NAMESPACE
 
+static inline HB_Script script_to_hbscript(uchar script)
+{
+    switch (script) {
+    case QChar::Script_Inherited: return HB_Script_Inherited;
+    case QChar::Script_Common: return HB_Script_Common;
+    case QChar::Script_Arabic: return HB_Script_Arabic;
+    case QChar::Script_Armenian: return HB_Script_Armenian;
+    case QChar::Script_Bengali: return HB_Script_Bengali;
+    case QChar::Script_Cyrillic: return HB_Script_Cyrillic;
+    case QChar::Script_Devanagari: return HB_Script_Devanagari;
+    case QChar::Script_Georgian: return HB_Script_Georgian;
+    case QChar::Script_Greek: return HB_Script_Greek;
+    case QChar::Script_Gujarati: return HB_Script_Gujarati;
+    case QChar::Script_Gurmukhi: return HB_Script_Gurmukhi;
+    case QChar::Script_Hangul: return HB_Script_Hangul;
+    case QChar::Script_Hebrew: return HB_Script_Hebrew;
+    case QChar::Script_Kannada: return HB_Script_Kannada;
+    case QChar::Script_Khmer: return HB_Script_Khmer;
+    case QChar::Script_Lao: return HB_Script_Lao;
+    case QChar::Script_Malayalam: return HB_Script_Malayalam;
+    case QChar::Script_Myanmar: return HB_Script_Myanmar;
+    case QChar::Script_Ogham: return HB_Script_Ogham;
+    case QChar::Script_Oriya: return HB_Script_Oriya;
+    case QChar::Script_Runic: return HB_Script_Runic;
+    case QChar::Script_Sinhala: return HB_Script_Sinhala;
+    case QChar::Script_Syriac: return HB_Script_Syriac;
+    case QChar::Script_Tamil: return HB_Script_Tamil;
+    case QChar::Script_Telugu: return HB_Script_Telugu;
+    case QChar::Script_Thaana: return HB_Script_Thaana;
+    case QChar::Script_Thai: return HB_Script_Thai;
+    case QChar::Script_Tibetan: return HB_Script_Tibetan;
+    case QChar::Script_Nko: return HB_Script_Nko;
+    default: break;
+    };
+    return HB_Script_Common;
+}
+
+static inline uchar hbscript_to_script(uchar script)
+{
+    switch (script) {
+    case HB_Script_Inherited: return QChar::Script_Inherited;
+    case HB_Script_Common: return QChar::Script_Common;
+    case HB_Script_Arabic: return QChar::Script_Arabic;
+    case HB_Script_Armenian: return QChar::Script_Armenian;
+    case HB_Script_Bengali: return QChar::Script_Bengali;
+    case HB_Script_Cyrillic: return QChar::Script_Cyrillic;
+    case HB_Script_Devanagari: return QChar::Script_Devanagari;
+    case HB_Script_Georgian: return QChar::Script_Georgian;
+    case HB_Script_Greek: return QChar::Script_Greek;
+    case HB_Script_Gujarati: return QChar::Script_Gujarati;
+    case HB_Script_Gurmukhi: return QChar::Script_Gurmukhi;
+    case HB_Script_Hangul: return QChar::Script_Hangul;
+    case HB_Script_Hebrew: return QChar::Script_Hebrew;
+    case HB_Script_Kannada: return QChar::Script_Kannada;
+    case HB_Script_Khmer: return QChar::Script_Khmer;
+    case HB_Script_Lao: return QChar::Script_Lao;
+    case HB_Script_Malayalam: return QChar::Script_Malayalam;
+    case HB_Script_Myanmar: return QChar::Script_Myanmar;
+    case HB_Script_Ogham: return QChar::Script_Ogham;
+    case HB_Script_Oriya: return QChar::Script_Oriya;
+    case HB_Script_Runic: return QChar::Script_Runic;
+    case HB_Script_Sinhala: return QChar::Script_Sinhala;
+    case HB_Script_Syriac: return QChar::Script_Syriac;
+    case HB_Script_Tamil: return QChar::Script_Tamil;
+    case HB_Script_Telugu: return QChar::Script_Telugu;
+    case HB_Script_Thaana: return QChar::Script_Thaana;
+    case HB_Script_Thai: return QChar::Script_Thai;
+    case HB_Script_Tibetan: return QChar::Script_Tibetan;
+    case HB_Script_Nko: return QChar::Script_Nko;
+    default: break;
+    };
+    return QChar::Script_Common;
+}
+
 Q_CORE_EXPORT HB_Bool qShapeItem(HB_ShaperItem *item);
 
 // ### temporary