diff options
| -rw-r--r-- | src/hb-common.cc | 20 | ||||
| -rw-r--r-- | src/hb-ot-shape-complex-indic.cc | 53 | ||||
| -rw-r--r-- | src/hb-ot-shape-complex-myanmar.cc | 7 | ||||
| -rw-r--r-- | src/hb-private.hh | 29 |
4 files changed, 54 insertions, 55 deletions
diff --git a/src/hb-common.cc b/src/hb-common.cc index 27ecfa78..540d252c 100644 --- a/src/hb-common.cc +++ b/src/hb-common.cc @@ -36,6 +36,24 @@ #include <locale.h> +/* hb_options_t */ + +hb_options_union_t _hb_options; + +void +_hb_options_init (void) +{ + hb_options_union_t u; + u.i = 0; + u.opts.initialized = 1; + + char *c = getenv ("HB_OPTIONS"); + u.opts.uniscribe_bug_compatible = c && strstr (c, "uniscribe-bug-compatible"); + + /* This is idempotent and threadsafe. */ + _hb_options = u; +} + /* hb_tag_t */ @@ -414,5 +432,3 @@ hb_version_check (unsigned int major, { return HB_VERSION_CHECK (major, minor, micro); } - - diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc index fe627836..41872df6 100644 --- a/src/hb-ot-shape-complex-indic.cc +++ b/src/hb-ot-shape-complex-indic.cc @@ -268,49 +268,6 @@ set_indic_properties (hb_glyph_info_t &info) /* - * Global Indic shaper options. - */ - -struct indic_options_t -{ - int initialized : 1; - int uniscribe_bug_compatible : 1; -}; - -union indic_options_union_t { - int i; - indic_options_t opts; -}; -ASSERT_STATIC (sizeof (int) == sizeof (indic_options_union_t)); - -static indic_options_union_t -indic_options_init (void) -{ - indic_options_union_t u; - u.i = 0; - u.opts.initialized = 1; - - char *c = getenv ("HB_OT_INDIC_OPTIONS"); - u.opts.uniscribe_bug_compatible = c && strstr (c, "uniscribe-bug-compatible"); - - return u; -} - -static inline indic_options_t -indic_options (void) -{ - static indic_options_union_t options; - - if (unlikely (!options.i)) { - /* This is idempotent and threadsafe. */ - options = indic_options_init (); - } - - return options.opts; -} - - -/* * Indic configurations. Note that we do not want to keep every single script-specific * behavior in these tables necessarily. This should mainly be used for per-script * properties that are cheaper keeping here, than in the code. Ie. if, say, one and @@ -484,7 +441,7 @@ static void override_features_indic (hb_ot_shape_planner_t *plan) { /* Uniscribe does not apply 'kern'. */ - if (indic_options ().uniscribe_bug_compatible) + if (hb_options ().uniscribe_bug_compatible) plan->map.add_feature (HB_TAG('k','e','r','n'), 0, true); plan->map.add_feature (HB_TAG('l','i','g','a'), 0, true); @@ -1044,7 +1001,7 @@ initial_reordering_standalone_cluster (const hb_ot_shape_plan_t *plan, /* We treat NBSP/dotted-circle as if they are consonants, so we should just chain. * Only if not in compatibility mode that is... */ - if (indic_options ().uniscribe_bug_compatible) + if (hb_options ().uniscribe_bug_compatible) { /* For dotted-circle, this is what Uniscribe does: * If dotted-circle is the last glyph, it just does nothing. @@ -1380,7 +1337,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan, * Uniscribe doesn't do this. * TEST: U+0930,U+094D,U+0915,U+094B,U+094D */ - if (!indic_options ().uniscribe_bug_compatible && + if (!hb_options ().uniscribe_bug_compatible && unlikely (is_halant_or_coeng (info[new_reph_pos]))) { for (unsigned int i = base + 1; i < new_reph_pos; i++) if (info[i].indic_category() == OT_M) { @@ -1484,7 +1441,7 @@ final_reordering_syllable (const hb_ot_shape_plan_t *plan, /* * Finish off the clusters and go home! */ - if (indic_options ().uniscribe_bug_compatible) + if (hb_options ().uniscribe_bug_compatible) { /* Uniscribe merges the entire cluster. * This means, half forms are submerged into the main consonants cluster. @@ -1600,7 +1557,7 @@ decompose_indic (const hb_ot_shape_normalize_context_t *c, hb_codepoint_t glyph; - if (indic_options ().uniscribe_bug_compatible || + if (hb_options ().uniscribe_bug_compatible || (c->font->get_glyph (ab, 0, &glyph) && indic_plan->pstf.would_substitute (&glyph, 1, true, c->font->face))) { diff --git a/src/hb-ot-shape-complex-myanmar.cc b/src/hb-ot-shape-complex-myanmar.cc index 27a656df..8c7697fc 100644 --- a/src/hb-ot-shape-complex-myanmar.cc +++ b/src/hb-ot-shape-complex-myanmar.cc @@ -128,12 +128,9 @@ override_features_myanmar (hb_ot_shape_planner_t *plan) * Windows 8 has lookups for it. But testing suggests that * Windows 8 Uniscribe is NOT applying it. It *is* applying * 'mkmk' however. - * - * We want to apply it, since that's the right thing to do. */ -#if 0 - plan->map.add_feature (HB_TAG('m','a','r','k'), 0, true); -#endif + if (hb_options ().uniscribe_bug_compatible) + plan->map.add_feature (HB_TAG('m','a','r','k'), 0, true); } diff --git a/src/hb-private.hh b/src/hb-private.hh index be0d505f..15e4f5f6 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -854,4 +854,33 @@ hb_codepoint_parse (const char *s, unsigned int len, int base, hb_codepoint_t *o } +/* Global runtime options. */ + +struct hb_options_t +{ + int initialized : 1; + int uniscribe_bug_compatible : 1; +}; + +union hb_options_union_t { + int i; + hb_options_t opts; +}; +ASSERT_STATIC (sizeof (int) == sizeof (hb_options_union_t)); + +HB_INTERNAL void +_hb_options_init (void); + +extern HB_INTERNAL hb_options_union_t _hb_options; + +static inline hb_options_t +hb_options (void) +{ + if (unlikely (!_hb_options.i)) + _hb_options_init (); + + return _hb_options.opts; +} + + #endif /* HB_PRIVATE_HH */ |