From 69f26bf39c824d6bf5b1c0d410380cc5462ad5ca Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 18 Jul 2012 15:45:43 -0400 Subject: [PATCH] [Indic] Fix Matra reordering when base is at end of syllable For example: U+915,U+200c,U+93f Fixes last Tamil failure! --- src/hb-ot-shape-complex-indic.cc | 2 +- .../in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index 1c80ea49c..abe74b2d8 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -473,7 +473,7 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff /* Reorder characters */ for (unsigned int i = start; i < base; i++) - info[i].indic_position() = POS_PRE_C; + info[i].indic_position() = MIN (POS_PRE_C, info[i].indic_position()); if (base < end) info[base].indic_position() = POS_BASE_C; diff --git a/test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt b/test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt index 23afbe0c8..83cac77ce 100644 --- a/test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt +++ b/test/shaping/texts/in-tree/shaper-indic/indic/script-devanagari/misc/misc.txt @@ -29,3 +29,4 @@ र्अ्‌ र्अ्‍ र्आ्र् +क‌ि