[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-ot-shape-complex-indic.cc |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 952121007c6f6f374e4cf1734ebcfe2d2d71c71c
Author: Jonathan Kew <jfkthame at gmail.com>
Date:   Tue Aug 6 10:36:14 2013 -0400

    [Indic] don't apply 'calt' by default in Indic shaper

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index d3c475b..a9835df 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -445,6 +445,10 @@ override_features_indic (hb_ot_shape_planner_t *plan)
   if (hb_options ().uniscribe_bug_compatible)
     plan->map.add_feature (HB_TAG('k','e','r','n'), 0, F_GLOBAL);
 
+  /* 'calt' is enabled by default in hb-ot-shape.cc, but is a
+   * discretionary, non-default feature for Indic scripts. */
+  plan->map.add_feature (HB_TAG('c','a','l','t'), 0, F_GLOBAL);
+
   plan->map.add_feature (HB_TAG('l','i','g','a'), 0, F_GLOBAL);
 }