Deprecate obsolete functions
`hb_ot_tags` replaces `hb_ot_tags_from_script` and
`hb_ot_tag_from_language`.
`hb_ot_layout_table_select_script` replaces
`hb_ot_layout_table_choose_script`.
`hb_ot_layout_script_select_language` replaces
`hb_ot_layout_script_find_language`.
diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index eb0caff..1f526e3 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -155,6 +155,10 @@
HB_SCRIPT_CANADIAN_ABORIGINAL
hb_font_funcs_set_glyph_func
hb_font_get_glyph_func_t
+hb_ot_layout_table_choose_script
+hb_ot_layout_table_find_script
+hb_ot_tag_from_language
+hb_ot_tags_from_script
hb_set_invert
hb_unicode_eastasian_width_func_t
hb_unicode_eastasian_width
@@ -498,9 +502,7 @@
hb_ot_layout_script_find_language
hb_ot_layout_script_get_language_tags
hb_ot_layout_script_select_language
-hb_ot_layout_table_choose_script
hb_ot_layout_table_find_feature_variations
-hb_ot_layout_table_find_script
hb_ot_layout_table_get_feature_tags
hb_ot_layout_table_get_script_tags
hb_ot_layout_table_get_lookup_count
@@ -556,11 +558,9 @@
HB_OT_MAX_TAGS_PER_SCRIPT
HB_OT_TAG_DEFAULT_LANGUAGE
HB_OT_TAG_DEFAULT_SCRIPT
-hb_ot_tag_from_language
hb_ot_tag_to_language
hb_ot_tag_to_script
hb_ot_tags
-hb_ot_tags_from_script
</SECTION>
<SECTION>
diff --git a/src/hb-deprecated.h b/src/hb-deprecated.h
index 2deb249..4659073 100644
--- a/src/hb-deprecated.h
+++ b/src/hb-deprecated.h
@@ -211,6 +211,29 @@
hb_direction_t direction,
hb_position_t *x, hb_position_t *y);
+/* Like hb_ot_layout_table_find_script, but takes zero-terminated array of scripts to test */
+HB_EXTERN HB_DEPRECATED hb_bool_t
+hb_ot_layout_table_choose_script (hb_face_t *face,
+ hb_tag_t table_tag,
+ const hb_tag_t *script_tags,
+ unsigned int *script_index,
+ hb_tag_t *chosen_script);
+
+HB_EXTERN HB_DEPRECATED hb_bool_t
+hb_ot_layout_script_find_language (hb_face_t *face,
+ hb_tag_t table_tag,
+ unsigned int script_index,
+ hb_tag_t language_tag,
+ unsigned int *language_index);
+
+HB_EXTERN HB_DEPRECATED void
+hb_ot_tags_from_script (hb_script_t script,
+ hb_tag_t *script_tag_1,
+ hb_tag_t *script_tag_2);
+
+HB_EXTERN HB_DEPRECATED hb_tag_t
+hb_ot_tag_from_language (hb_language_t language);
+
#endif
diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h
index 89bf0c0..ab149cf 100644
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -111,14 +111,6 @@
hb_tag_t script_tag,
unsigned int *script_index);
-/* Like find_script, but takes zero-terminated array of scripts to test */
-HB_EXTERN hb_bool_t
-hb_ot_layout_table_choose_script (hb_face_t *face,
- hb_tag_t table_tag,
- const hb_tag_t *script_tags,
- unsigned int *script_index,
- hb_tag_t *chosen_script);
-
HB_EXTERN hb_bool_t
hb_ot_layout_table_select_script (hb_face_t *face,
hb_tag_t table_tag,
@@ -143,13 +135,6 @@
hb_tag_t *language_tags /* OUT */);
HB_EXTERN hb_bool_t
-hb_ot_layout_script_find_language (hb_face_t *face,
- hb_tag_t table_tag,
- unsigned int script_index,
- hb_tag_t language_tag,
- unsigned int *language_index);
-
-HB_EXTERN hb_bool_t
hb_ot_layout_script_select_language (hb_face_t *face,
hb_tag_t table_tag,
unsigned int script_index,
diff --git a/src/hb-ot-tag.h b/src/hb-ot-tag.h
index 98d7b4f..44f66c3 100644
--- a/src/hb-ot-tag.h
+++ b/src/hb-ot-tag.h
@@ -50,17 +50,9 @@
unsigned int *language_count /* IN/OUT */,
hb_tag_t *language_tags /* OUT */);
-HB_EXTERN void
-hb_ot_tags_from_script (hb_script_t script,
- hb_tag_t *script_tag_1,
- hb_tag_t *script_tag_2);
-
HB_EXTERN hb_script_t
hb_ot_tag_to_script (hb_tag_t tag);
-HB_EXTERN hb_tag_t
-hb_ot_tag_from_language (hb_language_t language);
-
HB_EXTERN hb_language_t
hb_ot_tag_to_language (hb_tag_t tag);
