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

[Indic] Better check for applying 'init'

Browse Source 
Specifically, don't apply 'init' if previous char is a joiner.

Fixes some more of Bengali.
This commit is contained in:
Behdad Esfahbod 2012-07-20 13:37:48 -04:00
parent 34a7440b7c
commit 2c372b80f6
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1101,14 +1101,7 @@ final_reordering_syllable (hb_buffer_t *buffer,
if (info[start].indic_position () == POS_PRE_M && if (info[start].indic_position () == POS_PRE_M &&
(!start || (!start ||
!(FLAG (_hb_glyph_info_get_general_category (&info[start - 1])) & !(FLAG (_hb_glyph_info_get_general_category (&info[start - 1])) &
(FLAG (HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER) | FLAG_RANGE (HB_UNICODE_GENERAL_CATEGORY_FORMAT, HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK))))
FLAG (HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER) |
FLAG (HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER) |
FLAG (HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER) |
FLAG (HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER) |
FLAG (HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK) |
FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) |
FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)))))
info[start].mask |= init_mask; info[start].mask |= init_mask;

3
src/hb-private.hh
View File

@ -734,7 +734,8 @@ hb_in_range (T u, T lo, T hi)
* For example, for testing "x ∈ {x1, x2, x3}" use: * For example, for testing "x ∈ {x1, x2, x3}" use:
* (FLAG(x) & (FLAG(x1) | FLAG(x2) | FLAG(x3))) * (FLAG(x) & (FLAG(x1) | FLAG(x2) | FLAG(x3)))
*/ */
#define FLAG(x) (1<<(x)) #define FLAG(x) (ASSERT_STATIC_EXPR_ZERO((x) < 8 * sizeof(int)) + (1<<(x)))
#define FLAG_RANGE(x,y) (ASSERT_STATIC_EXPR_ZERO ((x) < (y)) + FLAG(y+1) - FLAG(x))
template <typename T, typename T2> inline void template <typename T, typename T2> inline void