From 700a15fe4b80da9c67befd85ae10a166f5b65962 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 26 Aug 2013 17:49:36 -0400 Subject: [PATCH] Add HB_DISABLE_DEPRECATED That moment that you have to accept that you made API mistakes... --- docs/reference/Makefile.am | 2 +- docs/reference/harfbuzz-sections.txt | 8 +++++--- src/hb-common.h | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 1e1b5e7c..71a75db5 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -28,7 +28,7 @@ SCANGOBJ_OPTIONS= # Extra options to supply to gtkdoc-scan. # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--rebuild-types +SCAN_OPTIONS=--rebuild-types --deprecated-guards="HB_DISABLE_DEPRECATED" # Extra options to supply to gtkdoc-mkdb. # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml diff --git a/docs/reference/harfbuzz-sections.txt b/docs/reference/harfbuzz-sections.txt index 3ba4b0ce..416d76d9 100644 --- a/docs/reference/harfbuzz-sections.txt +++ b/docs/reference/harfbuzz-sections.txt @@ -102,6 +102,7 @@ hb_script_from_string hb_script_get_horizontal_direction hb_script_t hb_script_to_iso15924_tag +HB_SCRIPT_CANADIAN_ABORIGINAL hb_tag_from_string hb_tag_t hb_tag_to_string @@ -276,9 +277,6 @@ HB_OT_LAYOUT_NO_SCRIPT_INDEX HB_OT_TAG_GDEF HB_OT_TAG_GPOS HB_OT_TAG_GSUB -Xhb_ot_layout_lookup_enumerate_sequences -Xhb_ot_layout_lookup_position -Xhb_ot_layout_lookup_substitute hb_ot_layout_collect_lookups hb_ot_layout_feature_get_lookups hb_ot_layout_get_attach_points @@ -305,6 +303,10 @@ hb_ot_layout_table_find_script hb_ot_layout_table_get_feature_tags hb_ot_layout_table_get_script_tags hb_ot_shape_plan_collect_lookups + +Xhb_ot_layout_lookup_enumerate_sequences +Xhb_ot_layout_lookup_position +Xhb_ot_layout_lookup_substitute
diff --git a/src/hb-common.h b/src/hb-common.h index 8699bf63..5040b908 100644 --- a/src/hb-common.h +++ b/src/hb-common.h @@ -273,8 +273,10 @@ typedef enum /*---*/ HB_SCRIPT_INVALID = HB_TAG_NONE } hb_script_t; -/* Deprecated misspellings. */ +#ifndef HB_DISABLE_DEPRECATED +/* Deprecated misspelling. */ #define HB_SCRIPT_CANADIAN_ABORIGINAL HB_SCRIPT_CANADIAN_SYLLABICS +#endif /* These are moved out of hb_script_t because glib-mkenums chokes otherwise. */ #if 0 -- GitLab