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

[Indic] Do clustering like Uniscribe does 

Hindi Wikipedia failures down to 6639 (0.938381%)!
This commit is contained in:
Behdad Esfahbod 2012-05-10 18:34:34 +02:00
parent b20c9ebaf5
commit 21d2803133
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,8 +575,6 @@ final_reordering_syllable (hb_buffer_t *buffer,
* 6. Otherwise, reorder reph to the end of the syllable. * 6. Otherwise, reorder reph to the end of the syllable.
*/ */
start_of_last_cluster = start; /* Yay, one big cluster! */
/* Now let's go shopping for a position. */ /* Now let's go shopping for a position. */
unsigned int new_reph_pos = end - 1; unsigned int new_reph_pos = end - 1;
while (new_reph_pos > start && (FLAG (info[new_reph_pos].indic_position()) & (FLAG (POS_SMVD)))) while (new_reph_pos > start && (FLAG (info[new_reph_pos].indic_position()) & (FLAG (POS_SMVD))))
@ -598,6 +596,7 @@ final_reordering_syllable (hb_buffer_t *buffer,
hb_glyph_info_t reph = info[start]; hb_glyph_info_t reph = info[start];
memmove (&info[start], &info[start + 1], (new_reph_pos - start) * sizeof (info[0])); memmove (&info[start], &info[start + 1], (new_reph_pos - start) * sizeof (info[0]));
info[new_reph_pos] = reph; info[new_reph_pos] = reph;
start_of_last_cluster = start; /* Yay, one big cluster! */
} }
@ -617,8 +616,25 @@ final_reordering_syllable (hb_buffer_t *buffer,
* consonant. * consonant.
*/ */
/* TODO */
buffer->merge_clusters (start, end); /* Finish off the clusters and go home! */
if (1) {
/* This is what Uniscribe does. Ie. add cluster boundaries after Halant,ZWNJ.
* This means, half forms are submerged into the main consonants cluster.
* This is unnecessary, and makes cursor positioning harder, but that's what
* Uniscribe does. */
unsigned int cluster_start = start;
for (unsigned int i = start + 1; i < start_of_last_cluster; i++)
if (info[i - 1].indic_category() == OT_H && info[i].indic_category() == OT_ZWNJ) {
i++;
buffer->merge_clusters (cluster_start, i);
cluster_start = i;
}
start_of_last_cluster = cluster_start;
}
buffer->merge_clusters (start_of_last_cluster, end);
} }