From e65aaaa00a3b5ac811b5c73b5186cd7d65731f7b Mon Sep 17 00:00:00 2001 From: Elie Roux Date: Sun, 5 Mar 2017 14:53:39 +0100 Subject: [PATCH] BASE: start api --- src/Makefile.sources | 2 ++ src/hb-ot-base.cc | 58 ++++++++++++++++++++++++++++++++++ src/hb-ot-base.h | 56 ++++++++++++++++++++++++++++++++ src/hb-ot-layout-base-table.hh | 15 ++------- 4 files changed, 118 insertions(+), 13 deletions(-) create mode 100644 src/hb-ot-base.cc create mode 100644 src/hb-ot-base.h diff --git a/src/Makefile.sources b/src/Makefile.sources index 0f83f6ebd..db7305659 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -68,6 +68,7 @@ HB_NODIST_headers = \ HB_FALLBACK_sources = hb-fallback-shape.cc HB_OT_sources = \ + hb-ot-base.cc \ hb-ot-font.cc \ hb-ot-layout.cc \ hb-ot-layout-base-table.hh \ @@ -121,6 +122,7 @@ 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.cc b/src/hb-ot-base.cc new file mode 100644 index 000000000..27e0b208a --- /dev/null +++ b/src/hb-ot-base.cc @@ -0,0 +1,58 @@ +/* + * Copyright © 2017 Elie Roux + * + * 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. + * + */ + +#include "hb-open-type-private.hh" + +#include "hb-ot-layout-private.hh" +#include "hb-ot-layout-base-table.hh" + +static inline const OT::BASE& +_get_base (hb_face_t *face) +{ + if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::BASE); + hb_ot_layout_t * layout = hb_ot_layout_from_face (face); + return *(layout->base.get ()); +} + +/* + * OT::BASE + */ + +/** + * hb_ot_base_has_data: + * @face: #hb_face_t to test + * + * This function allows to verify the presence of an OpenType BASE table on the + * face. + * + * Return value: true if face has a BASE table, false otherwise + * + * Since: XXX + **/ +hb_bool_t +hb_ot_base_has_data (hb_face_t *face) +{ + return &_get_base (face) != &OT::Null(OT::BASE); +} diff --git a/src/hb-ot-base.h b/src/hb-ot-base.h new file mode 100644 index 000000000..9d82d2289 --- /dev/null +++ b/src/hb-ot-base.h @@ -0,0 +1,56 @@ +/* + * Copyright © 2017 Elie Roux + * + * 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 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 c60ce6de5..0d1e197e1 100644 --- a/src/hb-ot-layout-base-table.hh +++ b/src/hb-ot-layout-base-table.hh @@ -28,18 +28,7 @@ #include "hb-open-type-private.hh" #include "hb-ot-layout-common-private.hh" - -#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') +#include "hb-ot-base.h" namespace OT { @@ -743,7 +732,7 @@ struct BASE inline SHORT get_vert_min_value (unsigned int baseScriptIndex, unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const { return u.format1_0.get_vert_min_value(baseScriptIndex, baseLangSysIndex, featureTableTagIndex); } - inline bool sanitize (hb_sanitize_context_t *c, const void *base) const + inline bool sanitize (hb_sanitize_context_t *c) const { TRACE_SANITIZE (this); if (!u.version.sanitize (c)) return_trace (false);