Replace HB_JustificationClass with QGlyphAttributes::JustificationClass

Also move stringToGlyphs() helper closer to shapeTextWithHarfbuzz(),
where it is only used.
As of now, Harfbuzz-old dependency in QTextEngine can be disabled
by simply if-defing a single piece of code.

Change-Id: Ic6f7d9b64bf9201d7540c58db46e20f28de8120d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index ec7f7407b2..29f44ef9bd 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -96,6 +96,20 @@ typedef quint8 q_hb_bitfield;
 #endif
 
 typedef struct {
+    typedef enum {
+        NoJustification= 0,   /* Justification can't be applied after this glyph */
+        Arabic_Space   = 1,   /* This glyph represents a space inside arabic text */
+        Character      = 2,   /* Inter-character justification point follows this glyph */
+        Space          = 4,   /* This glyph represents a blank outside an Arabic run */
+        Arabic_Normal  = 7,   /* Normal Middle-Of-Word glyph that connects to the right (begin) */
+        Arabic_Waw     = 8,   /* Next character is final form of Waw/Ain/Qaf/Fa */
+        Arabic_BaRa    = 9,   /* Next two chars are Ba + Ra/Ya/AlefMaksura */
+        Arabic_Alef    = 10,  /* Next character is final form of Alef/Tah/Lam/Kaf/Gaf */
+        Arabic_HaaDal  = 11,  /* Next character is final form of Haa/Dal/Taa Marbutah */
+        Arabic_Seen    = 12,  /* Initial or Medial form Of Seen/Sad */
+        Arabic_Kashida = 13   /* Kashida(U+640) in middle of word */
+    } JustificationClass;
+
     q_hb_bitfield justification   :4;  /* Justification class */
     q_hb_bitfield clusterStart    :1;  /* First glyph of representation of cluster */
     q_hb_bitfield mark            :1;  /* needs to be positioned around base char */