Deprecate eastasian_width stuff
diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt index 455e4f5..884f3d0 100644 --- a/docs/harfbuzz-sections.txt +++ b/docs/harfbuzz-sections.txt
@@ -156,6 +156,9 @@ hb_font_funcs_set_glyph_func hb_font_get_glyph_func_t hb_set_invert +hb_unicode_eastasian_width_func_t +hb_unicode_eastasian_width +hb_unicode_funcs_set_eastasian_width_func </SECTION> <SECTION> @@ -622,7 +625,6 @@ hb_unicode_decompose hb_unicode_decompose_compatibility hb_unicode_decompose_func_t -hb_unicode_eastasian_width hb_unicode_funcs_create hb_unicode_funcs_destroy hb_unicode_funcs_get_default @@ -636,7 +638,6 @@ hb_unicode_funcs_set_compose_func hb_unicode_funcs_set_decompose_compatibility_func hb_unicode_funcs_set_decompose_func -hb_unicode_funcs_set_eastasian_width_func hb_unicode_funcs_set_general_category_func hb_unicode_funcs_set_mirroring_func hb_unicode_funcs_set_script_func
diff --git a/src/hb-deprecated.h b/src/hb-deprecated.h index eac7efb..519a57e 100644 --- a/src/hb-deprecated.h +++ b/src/hb-deprecated.h
@@ -58,6 +58,43 @@ HB_EXTERN void hb_set_invert (hb_set_t *set); +/** + * hb_unicode_eastasian_width_func_t: + * + * Deprecated: REPLACEME + */ +typedef unsigned int (*hb_unicode_eastasian_width_func_t) (hb_unicode_funcs_t *ufuncs, + hb_codepoint_t unicode, + void *user_data); + +/** + * hb_unicode_funcs_set_eastasian_width_func: + * @ufuncs: a Unicode function structure + * @func: (closure user_data) (destroy destroy) (scope notified): + * @user_data: + * @destroy: + * + * + * + * Since: 0.9.2 + * Deprecated: REPLACEME + **/ +HB_EXTERN void +hb_unicode_funcs_set_eastasian_width_func (hb_unicode_funcs_t *ufuncs, + hb_unicode_eastasian_width_func_t func, + void *user_data, hb_destroy_func_t destroy); + +/** + * hb_unicode_eastasian_width: + * + * Since: 0.9.2 + * Deprecated: REPLACEME + **/ +HB_EXTERN unsigned int +hb_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs, + hb_codepoint_t unicode); + + #endif HB_END_DECLS
diff --git a/src/hb-unicode.h b/src/hb-unicode.h index c8d87e4..604c207 100644 --- a/src/hb-unicode.h +++ b/src/hb-unicode.h
@@ -230,9 +230,6 @@ typedef hb_unicode_combining_class_t (*hb_unicode_combining_class_func_t) (hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode, void *user_data); -typedef unsigned int (*hb_unicode_eastasian_width_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode, - void *user_data); typedef hb_unicode_general_category_t (*hb_unicode_general_category_func_t) (hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode, void *user_data); @@ -299,22 +296,6 @@ void *user_data, hb_destroy_func_t destroy); /** - * hb_unicode_funcs_set_eastasian_width_func: - * @ufuncs: a Unicode function structure - * @func: (closure user_data) (destroy destroy) (scope notified): - * @user_data: - * @destroy: - * - * - * - * Since: 0.9.2 - **/ -HB_EXTERN void -hb_unicode_funcs_set_eastasian_width_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_eastasian_width_func_t func, - void *user_data, hb_destroy_func_t destroy); - -/** * hb_unicode_funcs_set_general_category_func: * @ufuncs: a Unicode function structure * @func: (closure user_data) (destroy destroy) (scope notified): @@ -422,15 +403,6 @@ hb_codepoint_t unicode); /** - * hb_unicode_eastasian_width: - * - * Since: 0.9.2 - **/ -HB_EXTERN unsigned int -hb_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode); - -/** * hb_unicode_general_category: * * Since: 0.9.2