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

Revert "Zero marks by GDEF for Tibetan"

Browse Source 
This reverts commit d5bd0590ae.

The reasoning behind that logic was flawed and made under
a misunderstanding of the original problem, and caused
regressions as reported by Jonathan Kew in thread titled
"tibetan marks" in Oct 2013.  Apparently I have had fixed
the original problem with this commit:

  7e08f1258d

So, revert the faulty commit and everything seems to be in good
shape.
This commit is contained in:
Behdad Esfahbod 2013-10-28 00:20:59 +01:00
parent 9596b2bf56
commit 71b4c999a5
9 changed files with 21 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-ot-layout-gsubgpos-private.hh
View File

@ -616,8 +616,8 @@ struct hb_apply_context_t
} }
inline void _set_glyph_props (hb_codepoint_t glyph_index, inline void _set_glyph_props (hb_codepoint_t glyph_index,
unsigned int class_guess = 0, unsigned int class_guess = 0,
bool ligature = false) const bool ligature = false) const
{ {
unsigned int add_in = _hb_glyph_info_get_glyph_props (&buffer->cur()) & unsigned int add_in = _hb_glyph_info_get_glyph_props (&buffer->cur()) &
HB_OT_LAYOUT_GLYPH_PROPS_PRESERVE; HB_OT_LAYOUT_GLYPH_PROPS_PRESERVE;

10
src/hb-ot-shape-complex-arabic.cc
View File

@ -177,6 +177,8 @@ collect_features_arabic (hb_ot_shape_planner_t *plan)
* *
* This also makes Arial Bold in Windows7 work. See: * This also makes Arial Bold in Windows7 work. See:
* https://bugzilla.mozilla.org/show_bug.cgi?id=644184 * https://bugzilla.mozilla.org/show_bug.cgi?id=644184
*
* TODO: Add test cases for these two.
*/ */
map->add_gsub_pause (nuke_joiners); map->add_gsub_pause (nuke_joiners);
@ -355,12 +357,6 @@ retry:
arabic_fallback_plan_shape (fallback_plan, font, buffer); arabic_fallback_plan_shape (fallback_plan, font, buffer);
} }
static hb_ot_shape_zero_width_marks_t
zero_width_marks_preference_arabic (const hb_segment_properties_t *props HB_UNUSED)
{
return HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE;
}
const hb_ot_complex_shaper_t _hb_ot_complex_shaper_arabic = const hb_ot_complex_shaper_t _hb_ot_complex_shaper_arabic =
{ {
@ -374,6 +370,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_arabic =
NULL, /* decompose */ NULL, /* decompose */
NULL, /* compose */ NULL, /* compose */
setup_masks_arabic, setup_masks_arabic,
zero_width_marks_preference_arabic, HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE,
true, /* fallback_position */ true, /* fallback_position */
}; };

17
src/hb-ot-shape-complex-default.cc
View File

@ -203,21 +203,6 @@ compose_default (const hb_ot_shape_normalize_context_t *c,
return found; return found;
} }
static hb_ot_shape_zero_width_marks_t
zero_width_marks_preference_default (const hb_segment_properties_t *props)
{
switch ((hb_tag_t) props->script)
{
/* Unicode-2.0 additions */
case HB_SCRIPT_TIBETAN:
return HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_LATE;
default:
return HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE;
}
}
const hb_ot_complex_shaper_t _hb_ot_complex_shaper_default = const hb_ot_complex_shaper_t _hb_ot_complex_shaper_default =
{ {
"default", "default",
@ -230,6 +215,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_default =
NULL, /* decompose */ NULL, /* decompose */
compose_default, compose_default,
NULL, /* setup_masks */ NULL, /* setup_masks */
zero_width_marks_preference_default, HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
true, /* fallback_position */ true, /* fallback_position */
}; };

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

@ -1797,12 +1797,6 @@ compose_indic (const hb_ot_shape_normalize_context_t *c,
return c->unicode->compose (a, b, ab); return c->unicode->compose (a, b, ab);
} }
static hb_ot_shape_zero_width_marks_t
zero_width_marks_preference_indic (const hb_segment_properties_t *props HB_UNUSED)
{
return HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE;
}
const hb_ot_complex_shaper_t _hb_ot_complex_shaper_indic = const hb_ot_complex_shaper_t _hb_ot_complex_shaper_indic =
{ {
@ -1816,6 +1810,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_indic =
decompose_indic, decompose_indic,
compose_indic, compose_indic,
setup_masks_indic, setup_masks_indic,
zero_width_marks_preference_indic, HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE,
false, /* fallback_position */ false, /* fallback_position */
}; };

15
src/hb-ot-shape-complex-myanmar.cc
View File

@ -263,12 +263,6 @@ set_myanmar_properties (hb_glyph_info_t &info)
static hb_ot_shape_normalization_mode_t
normalization_preference_myanmar (const hb_segment_properties_t *props HB_UNUSED)
{
return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT;
}
static void static void
setup_masks_myanmar (const hb_ot_shape_plan_t *plan HB_UNUSED, setup_masks_myanmar (const hb_ot_shape_plan_t *plan HB_UNUSED,
hb_buffer_t *buffer, hb_buffer_t *buffer,
@ -525,10 +519,11 @@ final_reordering (const hb_ot_shape_plan_t *plan,
HB_BUFFER_DEALLOCATE_VAR (buffer, myanmar_position); HB_BUFFER_DEALLOCATE_VAR (buffer, myanmar_position);
} }
static hb_ot_shape_zero_width_marks_t
zero_width_marks_preference_myanmar (const hb_segment_properties_t *props HB_UNUSED) static hb_ot_shape_normalization_mode_t
normalization_preference_myanmar (const hb_segment_properties_t *props HB_UNUSED)
{ {
return HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_EARLY; return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT;
} }
@ -544,6 +539,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_myanmar =
NULL, /* decompose */ NULL, /* decompose */
NULL, /* compose */ NULL, /* compose */
setup_masks_myanmar, setup_masks_myanmar,
zero_width_marks_preference_myanmar, HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_EARLY,
false, /* fallback_position */ false, /* fallback_position */
}; };

8
src/hb-ot-shape-complex-private.hh
View File

@ -39,7 +39,7 @@
#define complex_var_u8_1() var2.u8[3] #define complex_var_u8_1() var2.u8[3]
enum hb_ot_shape_zero_width_marks_t { enum hb_ot_shape_zero_width_marks_type_t {
HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE, HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE,
// HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_EARLY, // HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_EARLY,
HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE, HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
@ -140,11 +140,7 @@ struct hb_ot_complex_shaper_t
hb_buffer_t *buffer, hb_buffer_t *buffer,
hb_font_t *font); hb_font_t *font);
/* zero_width_marks_preference() hb_ot_shape_zero_width_marks_type_t zero_width_marks;
* Called during shape().
*/
hb_ot_shape_zero_width_marks_t
(*zero_width_marks_preference) (const hb_segment_properties_t *props);
bool fallback_position; bool fallback_position;
}; };

14
src/hb-ot-shape-complex-sea.cc
View File

@ -162,12 +162,6 @@ set_sea_properties (hb_glyph_info_t &info)
} }
static hb_ot_shape_normalization_mode_t
normalization_preference_sea (const hb_segment_properties_t *props HB_UNUSED)
{
return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT;
}
static void static void
setup_masks_sea (const hb_ot_shape_plan_t *plan HB_UNUSED, setup_masks_sea (const hb_ot_shape_plan_t *plan HB_UNUSED,
hb_buffer_t *buffer, hb_buffer_t *buffer,
@ -366,10 +360,10 @@ final_reordering (const hb_ot_shape_plan_t *plan,
} }
static hb_ot_shape_zero_width_marks_t static hb_ot_shape_normalization_mode_t
zero_width_marks_preference_sea (const hb_segment_properties_t *props HB_UNUSED) normalization_preference_sea (const hb_segment_properties_t *props HB_UNUSED)
{ {
return HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE; return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT;
} }
@ -385,6 +379,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_sea =
NULL, /* decompose */ NULL, /* decompose */
NULL, /* compose */ NULL, /* compose */
setup_masks_sea, setup_masks_sea,
zero_width_marks_preference_sea, HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE,
false, /* fallback_position */ false, /* fallback_position */
}; };

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

@ -361,13 +361,6 @@ preprocess_text_thai (const hb_ot_shape_plan_t *plan,
do_thai_pua_shaping (plan, buffer, font); do_thai_pua_shaping (plan, buffer, font);
} }
static hb_ot_shape_zero_width_marks_t
zero_width_marks_preference_thai (const hb_segment_properties_t *props HB_UNUSED)
{
return HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE;
}
const hb_ot_complex_shaper_t _hb_ot_complex_shaper_thai = const hb_ot_complex_shaper_t _hb_ot_complex_shaper_thai =
{ {
"thai", "thai",
@ -380,6 +373,6 @@ const hb_ot_complex_shaper_t _hb_ot_complex_shaper_thai =
NULL, /* decompose */ NULL, /* decompose */
NULL, /* compose */ NULL, /* compose */
NULL, /* setup_masks */ NULL, /* setup_masks */
zero_width_marks_preference_thai, HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
false,/* fallback_position */ false,/* fallback_position */
}; };

4
src/hb-ot-shape.cc
View File

@ -452,7 +452,7 @@ hb_ot_position_complex (hb_ot_shape_context_t *c)
bool ret = false; bool ret = false;
unsigned int count = c->buffer->len; unsigned int count = c->buffer->len;
switch (c->plan->shaper->zero_width_marks_preference (&c->plan->props)) switch (c->plan->shaper->zero_width_marks)
{ {
case HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_EARLY: case HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_EARLY:
zero_mark_widths_by_gdef (c->buffer); zero_mark_widths_by_gdef (c->buffer);
@ -497,7 +497,7 @@ hb_ot_position_complex (hb_ot_shape_context_t *c)
ret = true; ret = true;
} }
switch (c->plan->shaper->zero_width_marks_preference (&c->plan->props)) switch (c->plan->shaper->zero_width_marks)
{ {
case HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE: case HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE:
zero_mark_widths_by_unicode (c->buffer); zero_mark_widths_by_unicode (c->buffer);