DEFINE_NULL_ASSERT_SIZE (LigCaretList, 4);
/*
- * GDEF Header
+ * GDEF
*/
-struct GDEFHeader {
+struct GDEF {
static const hb_tag_t GDEFTag = HB_TAG ('G','D','E','F');
- STATIC_DEFINE_GET_FOR_DATA (GDEFHeader);
- /* XXX check version here */
+ STATIC_DEFINE_GET_FOR_DATA (GDEF);
+ /* XXX check version here? */
DEFINE_ACCESSOR (ClassDef, get_glyph_class_def, glyphClassDef);
DEFINE_ACCESSOR (AttachList, get_attach_list, attachList);
* mark attachment type--from beginning
* of GDEF header (may be Null) */
};
-DEFINE_NULL_ASSERT_SIZE (GDEFHeader, 12);
+DEFINE_NULL_ASSERT_SIZE (GDEF, 12);
#endif /* HB_OT_LAYOUT_GDEF_PRIVATE_H */
struct TTCHeader {
/* OpenTypeFontFaces, in no particular order */
DEFINE_OFFSET_ARRAY_TYPE (OffsetTable, offsetTable, numFonts);
- /* XXX check version here */
+ /* XXX check version here? */
private:
Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */
DEFINE_NULL_ASSERT_SIZE (Device, 6);
/*
- * GSUB/GPOS Header
+ * GSUB/GPOS Common
*/
-typedef struct GSUBGPOSHeader {
+typedef struct GSUBGPOS {
static const hb_tag_t GSUBTag = HB_TAG ('G','S','U','B');
static const hb_tag_t GPOSTag = HB_TAG ('G','P','O','S');
- STATIC_DEFINE_GET_FOR_DATA (GSUBGPOSHeader);
- /* XXX check version here */
+ STATIC_DEFINE_GET_FOR_DATA (GSUBGPOS);
+ /* XXX check version here? */
DEFINE_LIST_ACCESSOR(Script, script); /* get_script_list, get_script(i) */
DEFINE_LIST_ACCESSOR(Feature, feature);/* get_feature_list, get_feature(i) */
* GSUB/GPOS table */
Offset lookupList; /* Offset to LookupList table--from beginning of
* GSUB/GPOS table */
-} GSUBHeader, GPOSHeader;
-DEFINE_NULL_ASSERT_SIZE (GSUBGPOSHeader, 10);
-DEFINE_NULL_ALIAS (GSUBHeader, GSUBGPOSHeader);
-DEFINE_NULL_ALIAS (GPOSHeader, GSUBGPOSHeader);
+};
+DEFINE_NULL_ASSERT_SIZE (GSUBGPOS, 10);
#endif /* HB_OT_LAYOUT_OPEN_PRIVATE_H */
(const char *)table.get_tag(), table.get_offset(), table.get_length());
if (table.get_tag() == "GSUB" || table.get_tag() == "GPOS") {
- const GSUBGPOSHeader &g = GSUBGPOSHeader::get_for_data (ot[table]);
+ const GSUBGPOS &g = GSUBGPOS::get_for_data (ot[table]);
const ScriptList &scripts = g.get_script_list();
int num_scripts = scripts.get_len ();
lookup.get_type(), lookup.get_flag());
}
} else if (table.get_tag() == "GDEF") {
- const GDEFHeader &gdef = GDEFHeader::get_for_data (ot[table]);
+ const GDEF &gdef = GDEF::get_for_data (ot[table]);
for (int glyph = 0; glyph < 1; glyph++)
printf (" glyph %d has class %d and mark attachment type %d\n",