[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit 2cc933aff97916e5d0fe42883f40f0879f848e25
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 23 08:22:55 2012 -0400

    [Indic] Fix cluster formation with left-matras and conjunct forms
    
    Test case was: <U+0D15,U+0D4D,U+0D15,U+0D4A>.

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index 2e0b88f..6ba9c16 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -882,11 +882,11 @@ final_reordering_syllable (hb_buffer_t *buffer,
 	  info[new_pos] = tmp;
 	  new_pos--;
 	}
-      buffer->merge_clusters (new_pos, base);
+      buffer->merge_clusters (new_pos, MIN (end, base + 1));
     } else {
       for (unsigned int i = start; i < base; i++)
 	if (info[i].indic_position () == POS_PRE_M) {
-	  buffer->merge_clusters (i, base);
+	  buffer->merge_clusters (i, MIN (end, base + 1));
 	  break;
 	}
     }