diff --git a/src/gen-def.py b/src/gen-def.py index b46d346ca..7b609a97a 100755 --- a/src/gen-def.py +++ b/src/gen-def.py @@ -19,23 +19,7 @@ symbols = sorted (re.findall (r"^hb_\w+(?= \()", "\n".join (headers_content), re if '--experimental-api' not in sys.argv: # Move these to harfbuzz-sections.txt when got stable experimental_symbols = \ -"""hb_font_draw_glyph -hb_draw_funcs_t -hb_draw_close_path_func_t -hb_draw_cubic_to_func_t -hb_draw_line_to_func_t -hb_draw_move_to_func_t -hb_draw_quadratic_to_func_t -hb_draw_funcs_create -hb_draw_funcs_destroy -hb_draw_funcs_is_immutable -hb_draw_funcs_make_immutable -hb_draw_funcs_reference -hb_draw_funcs_set_close_path_func -hb_draw_funcs_set_cubic_to_func -hb_draw_funcs_set_line_to_func -hb_draw_funcs_set_move_to_func -hb_draw_funcs_set_quadratic_to_func""".splitlines () +"""""".splitlines () symbols = [x for x in symbols if x not in experimental_symbols] symbols = "\n".join (symbols) diff --git a/src/hb-draw.cc b/src/hb-draw.cc index c0af6ce01..7b50b2b1e 100644 --- a/src/hb-draw.cc +++ b/src/hb-draw.cc @@ -25,7 +25,6 @@ #include "hb.hh" #ifndef HB_NO_DRAW -#ifdef HB_EXPERIMENTAL_API #include "hb-draw.hh" #include "hb-ot.h" @@ -258,4 +257,3 @@ hb_font_draw_glyph (hb_font_t *font, hb_codepoint_t glyph, } #endif -#endif diff --git a/src/hb-draw.h b/src/hb-draw.h index f82cc3484..3649eee3a 100644 --- a/src/hb-draw.h +++ b/src/hb-draw.h @@ -33,7 +33,6 @@ HB_BEGIN_DECLS -#ifdef HB_EXPERIMENTAL_API typedef void (*hb_draw_move_to_func_t) (hb_position_t to_x, hb_position_t to_y, void *user_data); typedef void (*hb_draw_line_to_func_t) (hb_position_t to_x, hb_position_t to_y, void *user_data); typedef void (*hb_draw_quadratic_to_func_t) (hb_position_t control_x, hb_position_t control_y, @@ -91,7 +90,6 @@ hb_draw_funcs_make_immutable (hb_draw_funcs_t *funcs); HB_EXTERN hb_bool_t hb_draw_funcs_is_immutable (hb_draw_funcs_t *funcs); -#endif HB_END_DECLS diff --git a/src/hb-draw.hh b/src/hb-draw.hh index 2aa0a5b4d..6cf30fc61 100644 --- a/src/hb-draw.hh +++ b/src/hb-draw.hh @@ -27,7 +27,6 @@ #include "hb.hh" -#ifdef HB_EXPERIMENTAL_API struct hb_draw_funcs_t { hb_object_header_t header; @@ -134,6 +133,5 @@ struct draw_helper_t const hb_draw_funcs_t *funcs; void *user_data; }; -#endif #endif /* HB_DRAW_HH */ diff --git a/src/hb-font.h b/src/hb-font.h index a3bbb2e37..99fa5c5af 100644 --- a/src/hb-font.h +++ b/src/hb-font.h @@ -1056,11 +1056,9 @@ HB_EXTERN void hb_font_set_var_named_instance (hb_font_t *font, unsigned instance_index); -#ifdef HB_EXPERIMENTAL_API HB_EXTERN hb_bool_t hb_font_draw_glyph (hb_font_t *font, hb_codepoint_t glyph, const hb_draw_funcs_t *funcs, void *user_data); -#endif HB_END_DECLS diff --git a/src/hb-ot-cff1-table.cc b/src/hb-ot-cff1-table.cc index 3298fa35a..efaadbc4f 100644 --- a/src/hb-ot-cff1-table.cc +++ b/src/hb-ot-cff1-table.cc @@ -442,7 +442,6 @@ bool OT::cff1::accelerator_t::get_extents (hb_font_t *font, hb_codepoint_t glyph return true; } -#ifdef HB_EXPERIMENTAL_API struct cff1_path_param_t { cff1_path_param_t (const OT::cff1::accelerator_t *cff_, hb_font_t *font_, @@ -564,7 +563,6 @@ bool OT::cff1::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, d return _get_path (this, font, glyph, draw_helper); } -#endif struct get_seac_param_t { diff --git a/src/hb-ot-cff1-table.hh b/src/hb-ot-cff1-table.hh index 6fb59315c..8ba7e44a2 100644 --- a/src/hb-ot-cff1-table.hh +++ b/src/hb-ot-cff1-table.hh @@ -1347,9 +1347,7 @@ struct cff1 HB_INTERNAL bool get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const; HB_INTERNAL bool get_seac_components (hb_codepoint_t glyph, hb_codepoint_t *base, hb_codepoint_t *accent) const; -#ifdef HB_EXPERIMENTAL_API HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, draw_helper_t &draw_helper) const; -#endif private: struct gname_t diff --git a/src/hb-ot-cff2-table.cc b/src/hb-ot-cff2-table.cc index 879b7cdb2..6da4d011d 100644 --- a/src/hb-ot-cff2-table.cc +++ b/src/hb-ot-cff2-table.cc @@ -143,7 +143,6 @@ bool OT::cff2::accelerator_t::get_extents (hb_font_t *font, return true; } -#ifdef HB_EXPERIMENTAL_API struct cff2_path_param_t { cff2_path_param_t (hb_font_t *font_, draw_helper_t &draw_helper_) @@ -210,6 +209,5 @@ bool OT::cff2::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, d if (unlikely (!interp.interpret (param))) return false; return true; } -#endif #endif diff --git a/src/hb-ot-cff2-table.hh b/src/hb-ot-cff2-table.hh index 6e1b01c8f..07aead777 100644 --- a/src/hb-ot-cff2-table.hh +++ b/src/hb-ot-cff2-table.hh @@ -515,9 +515,7 @@ struct cff2 HB_INTERNAL bool get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const; -#ifdef HB_EXPERIMENTAL_API HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, draw_helper_t &draw_helper) const; -#endif }; typedef accelerator_templ_t accelerator_subset_t; diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh index 87a7d800c..7cb5ada9a 100644 --- a/src/hb-ot-glyf-table.hh +++ b/src/hb-ot-glyf-table.hh @@ -1152,7 +1152,6 @@ struct glyf return operation_count; } -#ifdef HB_EXPERIMENTAL_API struct path_builder_t { hb_font_t *font; @@ -1271,7 +1270,6 @@ struct glyf bool get_path (hb_font_t *font, hb_codepoint_t gid, draw_helper_t &draw_helper) const { return get_points (font, gid, path_builder_t (font, draw_helper)); } -#endif #ifndef HB_NO_VAR const gvar_accelerator_t *gvar; diff --git a/src/main.cc b/src/main.cc index 1ab013cd3..96b7c3f63 100644 --- a/src/main.cc +++ b/src/main.cc @@ -42,7 +42,7 @@ #define hb_blob_create_from_file_or_fail(x) hb_blob_get_empty () #endif -#if !defined(HB_NO_COLOR) && !defined(HB_NO_DRAW) && defined(HB_EXPERIMENTAL_API) +#if !defined(HB_NO_COLOR) && !defined(HB_NO_DRAW) static void svg_dump (hb_face_t *face, unsigned face_index) { @@ -512,7 +512,7 @@ main (int argc, char **argv) #ifndef MAIN_CC_NO_PRIVATE_API print_layout_info_using_private_api (blob); #endif -#if !defined(HB_NO_COLOR) && !defined(HB_NO_DRAW) && defined(HB_EXPERIMENTAL_API) +#if !defined(HB_NO_COLOR) && !defined(HB_NO_DRAW) dump_glyphs (blob, argv[1]); #endif hb_blob_destroy (blob);