walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Indic] Fix base search in final_reordering 

Fixes most Malayalam failures.  Down from 1.6% to 0.38% now.  Fixes a
few more in other scripts too.
This commit is contained in:
Behdad Esfahbod 2012-07-20 15:47:24 -04:00
parent 81202bd860
commit 5f0eaaad12
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-ot-shape-complex-indic.cc
View File

@ -712,7 +712,7 @@ initial_reordering_consonant_syllable (const hb_ot_map_t *map, hb_buffer_t *buff
} }
/* XXX This will not match for old-Indic spec since the Halant-Ra order is reversed already. */ /* XXX This will not match for old-Indic spec since the Halant-Ra order is reversed already. */
if (basic_mask_array[PREF] && base + 3 <= end) if (basic_mask_array[PREF] && base + 2 < end)
{ {
/* Find a Halant,Ra sequence and mark it fore pre-base reordering processing. */ /* Find a Halant,Ra sequence and mark it fore pre-base reordering processing. */
for (unsigned int i = base + 1; i + 1 < end; i++) for (unsigned int i = base + 1; i + 1 < end; i++)
@ -829,9 +829,13 @@ final_reordering_syllable (hb_buffer_t *buffer,
*/ */
/* Find base again */ /* Find base again */
unsigned int base = end; unsigned int base;
while (start < base && info[base - 1].indic_position() >= POS_BASE_C) for (base = start; base < end; base++)
base--; if (info[base].indic_position() >= POS_BASE_C) {
if (start < base && info[base].indic_position() > POS_BASE_C)
base--;
break;
}
unsigned int start_of_last_cluster = base; unsigned int start_of_last_cluster = base;