[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-ot-shape-complex-use.cc |    2 +-
 test/shaping/hb_test_tools.py  |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit eb1e60287732ede6040ce6f7498c10909448d248
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 1 15:31:50 2018 +0200

    [test] Try import unicodedata2 as unicodedata

diff --git a/test/shaping/hb_test_tools.py b/test/shaping/hb_test_tools.py
index 8348dc26..c9a44033 100644
--- a/test/shaping/hb_test_tools.py
+++ b/test/shaping/hb_test_tools.py
@@ -4,6 +4,10 @@ from __future__ import print_function, division, absolute_import
 
 import sys, os, re, difflib, unicodedata, errno, cgi
 from itertools import *
+try:
+	import unicodedata2 as unicodedata
+except Exception:
+	pass
 
 diff_symbols = "-+=*&^%$#@!~/"
 diff_colors = ['red', 'green', 'blue']
commit 81afdbe803ca949d915d03cab4a6ed6c6e6ff304
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 1 15:01:04 2018 +0200

    [use] Disable automatic ZWJ for 'akhn' feature
    
    Fixes https://github.com/harfbuzz/harfbuzz/issues/746

diff --git a/src/hb-ot-shape-complex-use.cc b/src/hb-ot-shape-complex-use.cc
index 0ca088ba..929d60d9 100644
--- a/src/hb-ot-shape-complex-use.cc
+++ b/src/hb-ot-shape-complex-use.cc
@@ -132,7 +132,7 @@ collect_features_use (hb_ot_shape_planner_t *plan)
   map->enable_feature (HB_TAG('l','o','c','l'));
   map->enable_feature (HB_TAG('c','c','m','p'));
   map->enable_feature (HB_TAG('n','u','k','t'));
-  map->enable_feature (HB_TAG('a','k','h','n'));
+  map->add_feature (HB_TAG('a','k','h','n'), F_GLOBAL | F_MANUAL_ZWJ);
 
   /* "Reordering group" */
   map->add_gsub_pause (clear_substitution_flags);