[HarfBuzz] harfbuzz: Branch 'master' - 4 commits

[Behdad Esfahbod]

 docs/Makefile.am    |    1 -
 src/hb-buffer.h     |    3 ++-
 src/hb-deprecated.h |    6 ------
 src/hb-ot-layout.cc |   10 +++++-----
 src/hb-unicode.cc   |    1 +
 5 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 1e39833ba8547c90a0a4ed7f265a6c4bc8eb8fe1
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Oct 20 16:56:06 2018 -0700

    [docs] Minor

diff --git a/src/hb-buffer.h b/src/hb-buffer.h
index d0aed02d..99e01716 100644
--- a/src/hb-buffer.h
+++ b/src/hb-buffer.h
@@ -89,11 +89,12 @@ typedef struct hb_glyph_info_t
  * 				   of each line after line-breaking, or limiting
  * 				   the reshaping to a small piece around the
  * 				   breaking point only.
+ * @HB_GLYPH_FLAG_DEFINED: All the currently defined flags.
  */
 typedef enum { /*< flags >*/
   HB_GLYPH_FLAG_UNSAFE_TO_BREAK		= 0x00000001,
 
-  HB_GLYPH_FLAG_DEFINED			= 0x00000001 /*< skip >*/ /* OR of all defined flags */
+  HB_GLYPH_FLAG_DEFINED			= 0x00000001 /* OR of all defined flags */
 } hb_glyph_flags_t;
 
 HB_EXTERN hb_glyph_flags_t
commit a5ad8c658dac1fbe63d1034cdfe8df33f50462b6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Oct 20 16:52:55 2018 -0700

    [docs] More fixes

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index fb1d9b11..128253da 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -1115,8 +1115,8 @@ hb_ot_layout_get_size_params (hb_face_t    *face,
 /**
  * hb_ot_layout_feature_get_name_ids:
  * @face: #hb_face_t to work upon
- * @table_tag:
- * @feature_index:
+ * @table_tag: table tag to query, "GSUB" or "GPOS".
+ * @feature_index: index of feature to query.
  * @label_id: (out) (allow-none): The ‘name’ table name ID that specifies a string
  *            for a user-interface label for this feature. (May be NULL.)
  * @tooltip_id: (out) (allow-none): The ‘name’ table name ID that specifies a string
@@ -1188,10 +1188,10 @@ hb_ot_layout_feature_get_name_ids (hb_face_t    *face,
 }
 
 /**
- * hb_ot_layout_feature_get_characters::
+ * hb_ot_layout_feature_get_characters:
  * @face: #hb_face_t to work upon
- * @table_tag:
- * @feature_index:
+ * @table_tag: table tag to query, "GSUB" or "GPOS".
+ * @feature_index: index of feature to query.
  * @start_offset: In case the resulting char_count was equal to its input value, there
  *                is a chance there were more characters on the tag so this API can be
  *                called with an offset till resulting char_count gets to a number
commit 2d9198f205fafda557520d7206f9cfbf3373353f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Oct 20 16:50:39 2018 -0700

    [docs] Fix for hb-version.h being in src tree

diff --git a/docs/Makefile.am b/docs/Makefile.am
index a9935385..e48b9ccd 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -62,7 +62,6 @@ CFILE_GLOB=$(top_srcdir)/src/hb-*.cc
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=$(top_builddir)/src/hb-version.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
commit 314b1af74f1fb71ea5cfcb5a58766773f0b2a5a1
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Oct 20 16:49:16 2018 -0700

    [docs] Fix warning
    
    Fixes https://github.com/harfbuzz/harfbuzz/issues/1260

diff --git a/src/hb-deprecated.h b/src/hb-deprecated.h
index 5af9bdbd..369d0736 100644
--- a/src/hb-deprecated.h
+++ b/src/hb-deprecated.h
@@ -146,12 +146,6 @@ hb_unicode_funcs_set_decompose_compatibility_func (hb_unicode_funcs_t *ufuncs,
 						   hb_unicode_decompose_compatibility_func_t func,
 						   void *user_data, hb_destroy_func_t destroy);
 
-/**
- * hb_unicode_decompose_compatibility:
- * 
- *
- * Deprecated: 2.0.0
- **/
 HB_EXTERN HB_DEPRECATED unsigned int
 hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
 				    hb_codepoint_t      u,
diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index 7b821b46..596e76d0 100644
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -442,6 +442,7 @@ hb_unicode_decompose (hb_unicode_funcs_t *ufuncs,
  * Return value: 
  *
  * Since: 0.9.2
+ * Deprecated: 2.0.0
  **/
 unsigned int
 hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,