[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/Makefile.sources           |    1 
 src/hb-ot-base.h               |   56 -----------------------------------------
 src/hb-ot-layout-base-table.hh |    1 
 src/hb-ot-layout.h             |   16 +++++++++++
 src/hb-ot.h                    |    1 
 5 files changed, 16 insertions(+), 59 deletions(-)

New commits:
commit 790a11700773dd664e4d5edac63c404c5ebce080
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Mar 7 15:31:15 2018 +0100

    [ot] Remove hb-ot-base.h
    
    BASE table API will go into hb-ot-layout.h.

diff --git a/src/Makefile.sources b/src/Makefile.sources
index 5428c6b1..072c5532 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -156,7 +156,6 @@ HB_OT_headers = \
 	hb-ot-font.h \
 	hb-ot-layout.h \
 	hb-ot-math.h \
-	hb-ot-base.h \
 	hb-ot-shape.h \
 	hb-ot-tag.h \
 	hb-ot-var.h \
diff --git a/src/hb-ot-base.h b/src/hb-ot-base.h
deleted file mode 100644
index 0437c168..00000000
--- a/src/hb-ot-base.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright © 2017 Elie Roux<elie.roux at telecom-bretagne.eu>
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-#ifndef HB_OT_H_IN
-#error "Include <hb-ot.h> instead."
-#endif
-
-#ifndef HB_OT_BASE_H
-#define HB_OT_BASE_H
-
-#include "hb.h"
-
-HB_BEGIN_DECLS
-
-#define HB_OT_TAG_BASE      HB_TAG('B','A','S','E')
-
-// https://www.microsoft.com/typography/otspec/baselinetags.htm
-
-#define HB_OT_TAG_BASE_HANG HB_TAG('h','a','n','g')
-#define HB_OT_TAG_BASE_ICFB HB_TAG('i','c','f','b')
-#define HB_OT_TAG_BASE_ICFT HB_TAG('i','c','f','t')
-#define HB_OT_TAG_BASE_IDEO HB_TAG('i','d','e','o')
-#define HB_OT_TAG_BASE_IDTB HB_TAG('i','d','t','b')
-#define HB_OT_TAG_BASE_MATH HB_TAG('m','a','t','h')
-#define HB_OT_TAG_BASE_ROMN HB_TAG('r','o','m','n')
-
-/* Methods */
-
-// HB_EXTERN hb_bool_t
-// hb_ot_base_has_data (hb_face_t *face);
-
-HB_END_DECLS
-
-#endif /* HB_OT_BASE_H */
diff --git a/src/hb-ot-layout-base-table.hh b/src/hb-ot-layout-base-table.hh
index 811ef402..20b8bd76 100644
--- a/src/hb-ot-layout-base-table.hh
+++ b/src/hb-ot-layout-base-table.hh
@@ -30,7 +30,6 @@
 
 #include "hb-open-type-private.hh"
 #include "hb-ot-layout-common-private.hh"
-#include "hb-ot-base.h"
 
 namespace OT {
 
diff --git a/src/hb-ot-layout.h b/src/hb-ot-layout.h
index 077644c5..85938ba1 100644
--- a/src/hb-ot-layout.h
+++ b/src/hb-ot-layout.h
@@ -317,6 +317,22 @@ hb_ot_layout_get_size_params (hb_face_t    *face,
 			      unsigned int *range_end          /* OUT.  May be NULL */);
 
 
+/*
+ * BASE
+ */
+#if 0
+
+#define HB_OT_TAG_BASE_HANG HB_TAG('h','a','n','g')
+#define HB_OT_TAG_BASE_ICFB HB_TAG('i','c','f','b')
+#define HB_OT_TAG_BASE_ICFT HB_TAG('i','c','f','t')
+#define HB_OT_TAG_BASE_IDEO HB_TAG('i','d','e','o')
+#define HB_OT_TAG_BASE_IDTB HB_TAG('i','d','t','b')
+#define HB_OT_TAG_BASE_MATH HB_TAG('m','a','t','h')
+#define HB_OT_TAG_BASE_ROMN HB_TAG('r','o','m','n')
+
+#endif
+
+
 HB_END_DECLS
 
 #endif /* HB_OT_LAYOUT_H */
diff --git a/src/hb-ot.h b/src/hb-ot.h
index d1979b81..8c88784a 100644
--- a/src/hb-ot.h
+++ b/src/hb-ot.h
@@ -34,7 +34,6 @@
 #include "hb-ot-font.h"
 #include "hb-ot-layout.h"
 #include "hb-ot-math.h"
-#include "hb-ot-base.h"
 #include "hb-ot-tag.h"
 #include "hb-ot-shape.h"
 #include "hb-ot-var.h"