[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-unicode-private.hh |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 15f67048e45853ad4069fd4334e132bc3db4d2c4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Dec 27 19:33:28 2013 -0500

    Reorder Tai Tham SAKOT to ensure it comes after any tone marks

diff --git a/src/hb-unicode-private.hh b/src/hb-unicode-private.hh
index 779d8ae..cd54cf7 100644
--- a/src/hb-unicode-private.hh
+++ b/src/hb-unicode-private.hh
@@ -106,7 +106,11 @@ HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE
   modified_combining_class (hb_codepoint_t unicode)
   {
     /* XXX This hack belongs to the Myanmar shaper. */
-    if (unicode == 0x1037) unicode = 0x103A;
+    if (unlikely (unicode == 0x1037)) unicode = 0x103A;
+
+    /* XXX This hack belongs to the SEA shaper (for Tai Tham):
+     * Reorder SAKOT to ensure it comes after any tone marks. */
+    if (unlikely (unicode == 0x1A60)) return 254;
 
     return _hb_modified_combining_class[combining_class (unicode)];
   }