minor, spacing

This commit is contained in:
Ebrahim Byagowi 2020-04-24 23:45:17 +04:30
parent 89ad3c6cc5
commit 08428a15c3
19 changed files with 194 additions and 164 deletions

View File

@ -307,7 +307,8 @@ struct CFFIndex
public: public:
COUNT count; /* Number of object data. Note there are (count+1) offsets */ COUNT count; /* Number of object data. Note there are (count+1) offsets */
HBUINT8 offSize; /* The byte size of each offset in the offsets array. */ HBUINT8 offSize; /* The byte size of each offset in the offsets array. */
HBUINT8 offsets[HB_VAR_ARRAY]; /* The array of (count + 1) offsets into objects array (1-base). */ HBUINT8 offsets[HB_VAR_ARRAY];
/* The array of (count + 1) offsets into objects array (1-base). */
/* HBUINT8 data[HB_VAR_ARRAY]; Object data */ /* HBUINT8 data[HB_VAR_ARRAY]; Object data */
public: public:
DEFINE_SIZE_ARRAY (COUNT::static_size + HBUINT8::static_size, offsets); DEFINE_SIZE_ARRAY (COUNT::static_size + HBUINT8::static_size, offsets);

View File

@ -163,8 +163,10 @@ struct hdmx
protected: protected:
HBUINT16 version; /* Table version number (0) */ HBUINT16 version; /* Table version number (0) */
HBUINT16 numRecords; /* Number of device records. */ HBUINT16 numRecords; /* Number of device records. */
HBUINT32 sizeDeviceRecord; /* Size of a device record, 32-bit aligned. */ HBUINT32 sizeDeviceRecord;
DeviceRecord firstDeviceRecord; /* Array of device records. */ /* Size of a device record, 32-bit aligned. */
DeviceRecord firstDeviceRecord;
/* Array of device records. */
public: public:
DEFINE_SIZE_MIN (8); DEFINE_SIZE_MIN (8);
}; };

View File

@ -60,9 +60,11 @@ struct _hea
FWORD lineGap; /* Typographic line gap. */ FWORD lineGap; /* Typographic line gap. */
UFWORD advanceMax; /* Maximum advance width/height value in UFWORD advanceMax; /* Maximum advance width/height value in
* metrics table. */ * metrics table. */
FWORD minLeadingBearing; /* Minimum left/top sidebearing value in FWORD minLeadingBearing;
/* Minimum left/top sidebearing value in
* metrics table. */ * metrics table. */
FWORD minTrailingBearing; /* Minimum right/bottom sidebearing value; FWORD minTrailingBearing;
/* Minimum right/bottom sidebearing value;
* calculated as Min(aw - lsb - * calculated as Min(aw - lsb -
* (xMax - xMin)) for horizontal. */ * (xMax - xMin)) for horizontal. */
FWORD maxExtent; /* horizontal: Max(lsb + (xMax - xMin)), FWORD maxExtent; /* horizontal: Max(lsb + (xMax - xMin)),
@ -81,7 +83,8 @@ struct _hea
HBINT16 reserved3; /* Set to 0. */ HBINT16 reserved3; /* Set to 0. */
HBINT16 reserved4; /* Set to 0. */ HBINT16 reserved4; /* Set to 0. */
HBINT16 metricDataFormat;/* 0 for current format. */ HBINT16 metricDataFormat;/* 0 for current format. */
HBUINT16 numberOfLongMetrics; /* Number of LongMetric entries in metric HBUINT16 numberOfLongMetrics;
/* Number of LongMetric entries in metric
* table. */ * table. */
public: public:
DEFINE_SIZE_STATIC (36); DEFINE_SIZE_STATIC (36);

View File

@ -295,7 +295,8 @@ struct hmtxvmtx
}; };
protected: protected:
UnsizedArrayOf<LongMetric>longMetricZ;/* Paired advance width and leading UnsizedArrayOf<LongMetric>
longMetricZ; /* Paired advance width and leading
* bearing values for each glyph. The * bearing values for each glyph. The
* value numOfHMetrics comes from * value numOfHMetrics comes from
* the 'hhea' table. If the font is * the 'hhea' table. If the font is
@ -303,7 +304,8 @@ struct hmtxvmtx
* be in the array, but that entry is * be in the array, but that entry is
* required. The last entry applies to * required. The last entry applies to
* all subsequent glyphs. */ * all subsequent glyphs. */
/*UnsizedArrayOf<FWORD> leadingBearingX;*//* Here the advance is assumed /*UnsizedArrayOf<FWORD> leadingBearingX;*/
/* Here the advance is assumed
* to be the same as the advance * to be the same as the advance
* for the last entry above. The * for the last entry above. The
* number of entries in this array is * number of entries in this array is

View File

@ -86,20 +86,25 @@ struct KernSubTableFormat3
} }
protected: protected:
KernSubTableHeader header; KernSubTableHeader
header;
HBUINT16 glyphCount; /* The number of glyphs in this font. */ HBUINT16 glyphCount; /* The number of glyphs in this font. */
HBUINT8 kernValueCount; /* The number of kerning values. */ HBUINT8 kernValueCount; /* The number of kerning values. */
HBUINT8 leftClassCount; /* The number of left-hand classes. */ HBUINT8 leftClassCount; /* The number of left-hand classes. */
HBUINT8 rightClassCount;/* The number of right-hand classes. */ HBUINT8 rightClassCount;/* The number of right-hand classes. */
HBUINT8 flags; /* Set to zero (reserved for future use). */ HBUINT8 flags; /* Set to zero (reserved for future use). */
UnsizedArrayOf<FWORD> kernValueZ; /* The kerning values. UnsizedArrayOf<FWORD>
kernValueZ; /* The kerning values.
* Length kernValueCount. */ * Length kernValueCount. */
#if 0 #if 0
UnsizedArrayOf<HBUINT8>leftClass; /* The left-hand classes. UnsizedArrayOf<HBUINT8>
leftClass; /* The left-hand classes.
* Length glyphCount. */ * Length glyphCount. */
UnsizedArrayOf<HBUINT8>rightClass; /* The right-hand classes. UnsizedArrayOf<HBUINT8>
rightClass; /* The right-hand classes.
* Length glyphCount. */ * Length glyphCount. */
UnsizedArrayOf<HBUINT8>kernIndex; /* The indices into the kernValue array. UnsizedArrayOf<HBUINT8>kernIndex;
/* The indices into the kernValue array.
* Length leftClassCount * rightClassCount */ * Length leftClassCount * rightClassCount */
#endif #endif
public: public:

View File

@ -279,7 +279,8 @@ struct MathKern
protected: protected:
HBUINT16 heightCount; HBUINT16 heightCount;
UnsizedArrayOf<MathValueRecord> UnsizedArrayOf<MathValueRecord>
mathValueRecordsZ; /* Array of correction heights at mathValueRecordsZ;
/* Array of correction heights at
* which the kern value changes. * which the kern value changes.
* Sorted by the height value in * Sorted by the height value in
* design units (heightCount entries), * design units (heightCount entries),
@ -345,11 +346,14 @@ struct MathKernInfo
} }
protected: protected:
OffsetTo<Coverage> mathKernCoverage; /* Offset to Coverage table - OffsetTo<Coverage>
mathKernCoverage;
/* Offset to Coverage table -
* from the beginning of the * from the beginning of the
* MathKernInfo table. */ * MathKernInfo table. */
ArrayOf<MathKernInfoRecord> mathKernInfoRecords; /* Array of ArrayOf<MathKernInfoRecord>
* MathKernInfoRecords, mathKernInfoRecords;
/* Array of MathKernInfoRecords,
* per-glyph information for * per-glyph information for
* mathematical positioning * mathematical positioning
* of subscripts and * of subscripts and
@ -472,11 +476,13 @@ struct MathGlyphPartRecord
protected: protected:
HBGlyphID glyph; /* Glyph ID for the part. */ HBGlyphID glyph; /* Glyph ID for the part. */
HBUINT16 startConnectorLength; /* Advance width/ height of the straight bar HBUINT16 startConnectorLength;
/* Advance width/ height of the straight bar
* connector material, in design units, is at * connector material, in design units, is at
* the beginning of the glyph, in the * the beginning of the glyph, in the
* direction of the extension. */ * direction of the extension. */
HBUINT16 endConnectorLength; /* Advance width/ height of the straight bar HBUINT16 endConnectorLength;
/* Advance width/ height of the straight bar
* connector material, in design units, is at * connector material, in design units, is at
* the end of the glyph, in the direction of * the end of the glyph, in the direction of
* the extension. */ * the extension. */
@ -522,10 +528,13 @@ struct MathGlyphAssembly
} }
protected: protected:
MathValueRecord italicsCorrection; /* Italics correction of this MathValueRecord
italicsCorrection;
/* Italics correction of this
* MathGlyphAssembly. Should not * MathGlyphAssembly. Should not
* depend on the assembly size. */ * depend on the assembly size. */
ArrayOf<MathGlyphPartRecord> partRecords; /* Array of part records, from ArrayOf<MathGlyphPartRecord>
partRecords; /* Array of part records, from
* left to right and bottom to * left to right and bottom to
* top. */ * top. */
@ -649,10 +658,12 @@ struct MathVariants
/* Minimum overlap of connecting /* Minimum overlap of connecting
* glyphs during glyph construction, * glyphs during glyph construction,
* in design units. */ * in design units. */
OffsetTo<Coverage> vertGlyphCoverage; /* Offset to Coverage table - OffsetTo<Coverage> vertGlyphCoverage;
/* Offset to Coverage table -
* from the beginning of MathVariants * from the beginning of MathVariants
* table. */ * table. */
OffsetTo<Coverage> horizGlyphCoverage;/* Offset to Coverage table - OffsetTo<Coverage> horizGlyphCoverage;
/* Offset to Coverage table -
* from the beginning of MathVariants * from the beginning of MathVariants
* table. */ * table. */
HBUINT16 vertGlyphCount; /* Number of glyphs for which HBUINT16 vertGlyphCount; /* Number of glyphs for which
@ -705,9 +716,12 @@ struct MATH
protected: protected:
FixedVersion<>version; /* Version of the MATH table FixedVersion<>version; /* Version of the MATH table
* initially set to 0x00010000u */ * initially set to 0x00010000u */
OffsetTo<MathConstants> mathConstants;/* MathConstants table */ OffsetTo<MathConstants>
OffsetTo<MathGlyphInfo> mathGlyphInfo;/* MathGlyphInfo table */ mathConstants; /* MathConstants table */
OffsetTo<MathVariants> mathVariants; /* MathVariants table */ OffsetTo<MathGlyphInfo>
mathGlyphInfo; /* MathGlyphInfo table */
OffsetTo<MathVariants>
mathVariants; /* MathVariants table */
public: public:
DEFINE_SIZE_STATIC (10); DEFINE_SIZE_STATIC (10);

View File

@ -128,7 +128,8 @@ struct maxp
protected: protected:
FixedVersion<>version;/* Version of the maxp table (0.5 or 1.0), FixedVersion<>version;/* Version of the maxp table (0.5 or 1.0),
* 0x00005000u or 0x00010000u. */ * 0x00005000u or 0x00010000u. */
HBUINT16 numGlyphs; /* The number of glyphs in the font. */ HBUINT16 numGlyphs;
/* The number of glyphs in the font. */
/*maxpV1Tail v1Tail[HB_VAR_ARRAY]; */ /*maxpV1Tail v1Tail[HB_VAR_ARRAY]; */
public: public:
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);

View File

@ -108,7 +108,8 @@ struct meta
protected: protected:
HBUINT32 version; /* Version number of the metadata table — set to 1. */ HBUINT32 version; /* Version number of the metadata table — set to 1. */
HBUINT32 flags; /* Flags — currently unused; set to 0. */ HBUINT32 flags; /* Flags — currently unused; set to 0. */
HBUINT32 dataOffset; /* Per Apple specification: HBUINT32 dataOffset;
/* Per Apple specification:
* Offset from the beginning of the table to the data. * Offset from the beginning of the table to the data.
* Per OT specification: * Per OT specification:
* Reserved. Not used; should be set to 0. */ * Reserved. Not used; should be set to 0. */

View File

@ -123,7 +123,8 @@ struct VORG
protected: protected:
FixedVersion<>version; /* Version of VORG table. Set to 0x00010000u. */ FixedVersion<>version; /* Version of VORG table. Set to 0x00010000u. */
FWORD defaultVertOriginY; /* The default vertical origin. */ FWORD defaultVertOriginY;
/* The default vertical origin. */
SortedArrayOf<VertOriginMetric> SortedArrayOf<VertOriginMetric>
vertYOrigins; /* The array of vertical origins. */ vertYOrigins; /* The array of vertical origins. */