[HarfBuzz] harfbuzz-ng: Branch 'master' - 3 commits

[Behdad Esfahbod]

 src/Makefile.am                  |    1 +
 src/hb-ot-shape-complex-indic.cc |    4 ++--
 test/hb-test.h                   |    4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit a54a5505a35eef5315a8e2e7a79502901e3eff5f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 20 16:42:10 2011 -0400

    Minor

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index 53464aa..03ea10f 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -293,8 +293,8 @@ void
 _hb_ot_shape_complex_collect_features_indic (hb_ot_map_builder_t *map, const hb_segment_properties_t  *props)
 {
   map->add_bool_feature (HB_TAG('l','o','c','l'));
-  /* The Indic specs do not require ccmp, but we apply since if there is a
-   * use of it, it's typically at the beginning. */
+  /* The Indic specs do not require ccmp, but we apply it here since if
+   * there is a use of it, it's typically at the beginning. */
   map->add_bool_feature (HB_TAG('c','c','m','p'));
 
   map->add_gsub_pause (NULL, NULL);
commit 23db8d5c92c96a34c716b68e1aa6819c5a20477a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 12 12:02:26 2011 -0400

    [test] Work around glib <= 2.30 API

diff --git a/test/hb-test.h b/test/hb-test.h
index 09008aa..de9a79a 100644
--- a/test/hb-test.h
+++ b/test/hb-test.h
@@ -156,6 +156,10 @@ typedef void (*hb_test_fixture_func_t) (gpointer      fixture,
                                         gconstpointer user_data);
 #endif
 
+#if !GLIB_CHECK_VERSION(2,30,0)
+#define g_test_fail() g_error("Test failed")
+#endif
+
 static inline void
 hb_test_add_func (const char *test_path,
 		  hb_test_func_t   test_func)
commit 22989c5ffc8cce1ea05d729cdf33661c35a52334
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 12 11:54:58 2011 -0400

    Distribute hb-ot-shape-complex-indic-machine.rl

diff --git a/src/Makefile.am b/src/Makefile.am
index 7966dd0..4bff997 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,6 +124,7 @@ GENERATORS = \
 EXTRA_DIST += $(GENERATORS)
 
 BUILT_SOURCES = hb-ot-shape-complex-indic-machine.hh
+EXTRA_DIST += hb-ot-shape-complex-indic-machine.rl
 hb-ot-shape-complex-indic-machine.hh: hb-ot-shape-complex-indic-machine.rl
 	$(AM_V_GEN)ragel -e -F1 -o $@ $^