| Index: third_party/harfbuzz-ng/src/hb-ot-shape-complex-tibetan.cc
|
| diff --git a/third_party/harfbuzz-ng/src/hb-shape-plan-private.hh b/third_party/harfbuzz-ng/src/hb-ot-shape-complex-tibetan.cc
|
| similarity index 54%
|
| copy from third_party/harfbuzz-ng/src/hb-shape-plan-private.hh
|
| copy to third_party/harfbuzz-ng/src/hb-ot-shape-complex-tibetan.cc
|
| index adb1576a0dfd82c0c2afdbe70c79e6c0b75fd0f8..01465a426f8f613a1d0ae62520af8c626dcf195f 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-shape-plan-private.hh
|
| +++ b/third_party/harfbuzz-ng/src/hb-ot-shape-complex-tibetan.cc
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright © 2012 Google, Inc.
|
| + * Copyright © 2010,2012 Google, Inc.
|
| *
|
| * This is part of HarfBuzz, a text shaping library.
|
| *
|
| @@ -24,37 +24,38 @@
|
| * Google Author(s): Behdad Esfahbod
|
| */
|
|
|
| -#ifndef HB_SHAPE_PLAN_PRIVATE_HH
|
| -#define HB_SHAPE_PLAN_PRIVATE_HH
|
| +#include "hb-ot-shape-complex-private.hh"
|
|
|
| -#include "hb-private.hh"
|
| -#include "hb-shape-plan.h"
|
| -#include "hb-object-private.hh"
|
| -#include "hb-shaper-private.hh"
|
|
|
| -
|
| -struct hb_shape_plan_t
|
| +static const hb_tag_t tibetan_features[] =
|
| {
|
| - hb_object_header_t header;
|
| - ASSERT_POD ();
|
| -
|
| - hb_bool_t default_shaper_list;
|
| - hb_face_t *face_unsafe; /* We don't carry a reference to face. */
|
| - hb_segment_properties_t props;
|
| -
|
| - hb_shape_func_t *shaper_func;
|
| - const char *shaper_name;
|
| -
|
| - struct hb_shaper_data_t shaper_data;
|
| + HB_TAG('a','b','v','s'),
|
| + HB_TAG('b','l','w','s'),
|
| + HB_TAG('a','b','v','m'),
|
| + HB_TAG('b','l','w','m'),
|
| + HB_TAG_NONE
|
| };
|
|
|
| -#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS \
|
| - , const hb_feature_t *user_features \
|
| - , unsigned int num_user_features
|
| -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, shape_plan);
|
| -#include "hb-shaper-list.hh"
|
| -#undef HB_SHAPER_IMPLEMENT
|
| -#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS
|
| +static void
|
| +collect_features_tibetan (hb_ot_shape_planner_t *plan)
|
| +{
|
| + for (const hb_tag_t *script_features = tibetan_features; script_features && *script_features; script_features++)
|
| + plan->map.add_global_bool_feature (*script_features);
|
| +}
|
|
|
|
|
| -#endif /* HB_SHAPE_PLAN_PRIVATE_HH */
|
| +const hb_ot_complex_shaper_t _hb_ot_complex_shaper_tibetan =
|
| +{
|
| + "default",
|
| + collect_features_tibetan,
|
| + NULL, /* override_features */
|
| + NULL, /* data_create */
|
| + NULL, /* data_destroy */
|
| + NULL, /* preprocess_text */
|
| + HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT,
|
| + NULL, /* decompose */
|
| + NULL, /* compose */
|
| + NULL, /* setup_masks */
|
| + HB_OT_SHAPE_ZERO_WIDTH_MARKS_DEFAULT,
|
| + true, /* fallback_position */
|
| +};
|
|
|