2.2.0
diff --git a/NEWS b/NEWS
index 9bfe99a..ff4f6e2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,38 @@
+Overview of changes leading to 2.2.0
+Thursday, November 29, 2018
+====================================
+- Misc shaping bug fixes.
+- Add font variations named-instance API.
+- Deprecate font variations axis enumeration API and add replacement.
+- AAT shaping improvements:
+ o Fixed 'kern' table Format 2 implementation.
+ o Implement 'feat' table API for feature detection.
+ o Blacklist 'GSUB' table of fonts from 'MUTF' foundry that also have 'morx'.
+
+New API:
++hb_aat_layout_feature_type_t
++hb_aat_layout_feature_selector_t
++hb_aat_layout_get_feature_types()
++hb_aat_layout_feature_type_get_name_id
++hb_aat_layout_feature_selector_info_t
++HB_AAT_LAYOUT_NO_SELECTOR_INDEX
++hb_aat_layout_feature_type_get_selector_infos()
++hb_ot_var_axis_flags_t
++hb_ot_var_axis_info_t
++hb_ot_var_get_axis_infos()
++hb_ot_var_find_axis_info()
++hb_ot_var_get_named_instance_count()
++hb_ot_var_named_instance_get_subfamily_name_id()
++hb_ot_var_named_instance_get_postscript_name_id()
++hb_ot_var_named_instance_get_design_coords()
+
+Deprecated API:
++HB_OT_VAR_NO_AXIS_INDEX
++hb_ot_var_axis_t
++hb_ot_var_get_axes()
++hb_ot_var_find_axis()
+
+
Overview of changes leading to 2.1.3
Friday, November 16, 2018
====================================
diff --git a/configure.ac b/configure.ac
index e9db42a..0649464 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([HarfBuzz],
- [2.1.3],
+ [2.2.0],
[https://github.com/harfbuzz/harfbuzz/issues/new],
[harfbuzz],
[http://harfbuzz.org/])
diff --git a/src/hb-aat-layout.cc b/src/hb-aat-layout.cc
index 727da42..fae6780 100644
--- a/src/hb-aat-layout.cc
+++ b/src/hb-aat-layout.cc
@@ -318,7 +318,7 @@
*
* Return value: Number of all available feature types.
*
- * Since: REPLACEME
+ * Since: 2.2.0
*/
unsigned int
hb_aat_layout_get_feature_types (hb_face_t *face,
@@ -336,7 +336,7 @@
*
* Return value: Name ID index
*
- * Since: REPLACEME
+ * Since: 2.2.0
*/
hb_ot_name_id_t
hb_aat_layout_feature_type_get_name_id (hb_face_t *face,
@@ -358,7 +358,7 @@
*
* Return value: Number of all available feature selectors.
*
- * Since: REPLACEME
+ * Since: 2.2.0
*/
unsigned int
hb_aat_layout_feature_type_get_selector_infos (hb_face_t *face,
diff --git a/src/hb-aat-layout.h b/src/hb-aat-layout.h
index 5912e01..696e903 100644
--- a/src/hb-aat-layout.h
+++ b/src/hb-aat-layout.h
@@ -39,7 +39,7 @@
* hb_aat_layout_feature_type_t:
*
*
- * Since: REPLACEME
+ * Since: 2.2.0
*/
typedef enum
{
@@ -92,7 +92,7 @@
* hb_aat_layout_feature_selector_t:
*
*
- * Since: REPLACEME
+ * Since: 2.2.0
*/
typedef enum
{
diff --git a/src/hb-deprecated.h b/src/hb-deprecated.h
index a74431f..9ceb264 100644
--- a/src/hb-deprecated.h
+++ b/src/hb-deprecated.h
@@ -247,7 +247,7 @@
* HB_OT_VAR_NO_AXIS_INDEX:
*
* Since: 1.4.2
- * Deprecated: REPLACEME
+ * Deprecated: 2.2.0
*/
#define HB_OT_VAR_NO_AXIS_INDEX 0xFFFFFFFFu
@@ -255,7 +255,7 @@
* hb_ot_var_axis_t:
*
* Since: 1.4.2
- * Deprecated: REPLACEME
+ * Deprecated: 2.2.0
*/
typedef struct hb_ot_var_axis_t
{
diff --git a/src/hb-ot-var.cc b/src/hb-ot-var.cc
index 56d2481..e327fb7 100644
--- a/src/hb-ot-var.cc
+++ b/src/hb-ot-var.cc
@@ -79,7 +79,7 @@
* hb_ot_var_get_axes:
*
* Since: 1.4.2
- * Deprecated: REPLACEME
+ * Deprecated: 2.2.0
**/
unsigned int
hb_ot_var_get_axes (hb_face_t *face,
@@ -94,7 +94,7 @@
* hb_ot_var_find_axis:
*
* Since: 1.4.2
- * Deprecated: REPLACEME
+ * Deprecated: 2.2.0
**/
hb_bool_t
hb_ot_var_find_axis (hb_face_t *face,
@@ -108,7 +108,7 @@
/**
* hb_ot_var_get_axis_infos:
*
- * Since: REPLACEME
+ * Since: 2.2.0
**/
HB_EXTERN unsigned int
hb_ot_var_get_axis_infos (hb_face_t *face,
@@ -122,7 +122,7 @@
/**
* hb_ot_var_find_axis_info:
*
- * Since: REPLACEME
+ * Since: 2.2.0
**/
HB_EXTERN hb_bool_t
hb_ot_var_find_axis_info (hb_face_t *face,
diff --git a/src/hb-ot-var.h b/src/hb-ot-var.h
index 779be10..b9d5e40 100644
--- a/src/hb-ot-var.h
+++ b/src/hb-ot-var.h
@@ -63,7 +63,7 @@
* hb_ot_var_axis_flags_t:
* @HB_OT_VAR_AXIS_FLAG_HIDDEN: The axis should not be exposed directly in user interfaces.
*
- * Since: REPLACEME
+ * Since: 2.2.0
*/
typedef enum { /*< flags >*/
HB_OT_VAR_AXIS_FLAG_HIDDEN = 0x00000001u,
@@ -74,7 +74,7 @@
/**
* hb_ot_var_axis_info_t:
*
- * Since: REPLACEME
+ * Since: 2.2.0
*/
typedef struct hb_ot_var_axis_info_t
{
diff --git a/src/hb-version.h b/src/hb-version.h
index fb9f8f3..7c4a8ad 100644
--- a/src/hb-version.h
+++ b/src/hb-version.h
@@ -37,10 +37,10 @@
#define HB_VERSION_MAJOR 2
-#define HB_VERSION_MINOR 1
-#define HB_VERSION_MICRO 3
+#define HB_VERSION_MINOR 2
+#define HB_VERSION_MICRO 0
-#define HB_VERSION_STRING "2.1.3"
+#define HB_VERSION_STRING "2.2.0"
#define HB_VERSION_ATLEAST(major,minor,micro) \
((major)*10000+(minor)*100+(micro) <= \