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

[Behdad Esfahbod]

 src/gen-use-table.py                 |    3 ++-
 src/hb-ot-shape-complex-use-table.cc |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 086235f59310ed77542d4916d31a4285c68630ff
Merge: 2092f595 c565fc3f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Nov 13 19:50:25 2018 -0500

    Merge pull request #1382 from punchcutter/master
    
    Change USE Category for Grantha Virama

commit c565fc3fb3b14c02e30af28b9d4d4289b0d2e162
Author: punchcutter <zarijoscha at gmail.com>
Date:   Tue Nov 13 12:51:10 2018 -0800

    Change USE Category for Grantha Virama
    https://github.com/harfbuzz/harfbuzz/issues/1379

diff --git a/src/gen-use-table.py b/src/gen-use-table.py
index ebfae6fa..a8a7a232 100755
--- a/src/gen-use-table.py
+++ b/src/gen-use-table.py
@@ -200,7 +200,8 @@ def is_HALANT(U, UISC, UGC):
 	return UISC in [Virama, Invisible_Stacker] and not is_HALANT_OR_VOWEL_MODIFIER(U, UISC, UGC)
 def is_HALANT_OR_VOWEL_MODIFIER(U, UISC, UGC):
 	# https://github.com/harfbuzz/harfbuzz/issues/1102
-	return U == 0x11046
+	# https://github.com/harfbuzz/harfbuzz/issues/1379
+	return U in [0x11046, 0x1134D]
 def is_HALANT_NUM(U, UISC, UGC):
 	return UISC == Number_Joiner
 def is_ZWNJ(U, UISC, UGC):
diff --git a/src/hb-ot-shape-complex-use-table.cc b/src/hb-ot-shape-complex-use-table.cc
index e9c88aec..bfc92d3b 100644
--- a/src/hb-ot-shape-complex-use-table.cc
+++ b/src/hb-ot-shape-complex-use-table.cc
@@ -582,7 +582,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = {
   /* 11310 */     B,     O,     O,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,     B,
   /* 11320 */     B,     B,     B,     B,     B,     B,     B,     B,     B,     O,     B,     B,     B,     B,     B,     B,
   /* 11330 */     B,     O,     B,     B,     O,     B,     B,     B,     B,     B,     O, CMBlw, CMBlw,     B,  VPst,  VPst,
-  /* 11340 */  VAbv,  VPst,  VPst,  VPst,  VPst,     O,     O,  VPre,  VPre,     O,     O,  VPst,  VPst,     H,     O,     O,
+  /* 11340 */  VAbv,  VPst,  VPst,  VPst,  VPst,     O,     O,  VPre,  VPre,     O,     O,  VPst,  VPst,   HVM,     O,     O,
   /* 11350 */     O,     O,     O,     O,     O,     O,     O,  VPst,     O,     O,     O,     O,     O,     O,     B,     B,
   /* 11360 */     B,     B,  VPst,  VPst,     O,     O, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv,     O,     O,     O,
   /* 11370 */ VMAbv, VMAbv, VMAbv, VMAbv, VMAbv,     O,     O,     O,