aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2017-01-22 20:16:51 -0800
committerBehdad Esfahbod <behdad@behdad.org>2017-01-22 20:16:51 -0800
commitd6bdbbca307d1a4aed60a78133eea40a1a9d5bf3 (patch)
tree6826ad2abe4981eaacbf00b96fdb4366dd57b932
parenta11d9a0466e480efebd69a34827675387cd2ca34 (diff)
downloadharfbuzz_ng-d6bdbbca307d1a4aed60a78133eea40a1a9d5bf3.tar.gz
[var] Remove HB_OT_TAG_fvar/avar
We're not going to define public macros for tags for tables. There's little use to those and they are implementation detail.
-rw-r--r--docs/harfbuzz-sections.txt2
-rw-r--r--src/hb-ot-var-avar-table.hh2
-rw-r--r--src/hb-ot-var-fvar-table.hh2
-rw-r--r--src/hb-ot-var.h3
4 files changed, 4 insertions, 5 deletions
diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt
index 3011ee996..a91eb4c2c 100644
--- a/docs/harfbuzz-sections.txt
+++ b/docs/harfbuzz-sections.txt
@@ -440,8 +440,6 @@ Xhb_ot_layout_lookup_substitute
<SECTION>
<FILE>hb-ot-var</FILE>
-HB_OT_TAG_avar
-HB_OT_TAG_fvar
HB_OT_TAG_VAR_AXIS_ITALIC
HB_OT_TAG_VAR_AXIS_OPTICAL_SIZE
HB_OT_TAG_VAR_AXIS_SLANT
diff --git a/src/hb-ot-var-avar-table.hh b/src/hb-ot-var-avar-table.hh
index 743d5870e..7c8449a84 100644
--- a/src/hb-ot-var-avar-table.hh
+++ b/src/hb-ot-var-avar-table.hh
@@ -88,6 +88,8 @@ struct SegmentMaps : ArrayOf<AxisValueMap>
* avar — Axis Variations Table
*/
+#define HB_OT_TAG_avar HB_TAG('a','v','a','r')
+
struct avar
{
static const hb_tag_t tableTag = HB_OT_TAG_avar;
diff --git a/src/hb-ot-var-fvar-table.hh b/src/hb-ot-var-fvar-table.hh
index cb88de883..0c48769df 100644
--- a/src/hb-ot-var-fvar-table.hh
+++ b/src/hb-ot-var-fvar-table.hh
@@ -81,6 +81,8 @@ struct AxisRecord
* fvar — Font Variations Table
*/
+#define HB_OT_TAG_fvar HB_TAG('f','v','a','r')
+
struct fvar
{
static const hb_tag_t tableTag = HB_OT_TAG_fvar;
diff --git a/src/hb-ot-var.h b/src/hb-ot-var.h
index ea69aa5fc..a2c0c5f2b 100644
--- a/src/hb-ot-var.h
+++ b/src/hb-ot-var.h
@@ -36,9 +36,6 @@
HB_BEGIN_DECLS
-#define HB_OT_TAG_fvar HB_TAG('f','v','a','r')
-#define HB_OT_TAG_avar HB_TAG('a','v','a','r')
-
#define HB_OT_TAG_VAR_AXIS_ITALIC HB_TAG('i','t','a','l')
#define HB_OT_TAG_VAR_AXIS_OPTICAL_SIZE HB_TAG('o','p','s','z')
#define HB_OT_TAG_VAR_AXIS_SLANT HB_TAG('s','l','n','t')