walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-aat-fdsc-table.hh
View File

@ -65,7 +65,7 @@ struct FontDescriptor
protected: protected:
Tag tag; /* The 4-byte table tag name. */ Tag tag; /* The 4-byte table tag name. */
union { union {
HBFixed value; /* The value for the descriptor tag. */ HBFixed value; /* The value for the descriptor tag. */
HBUINT32 nalfType; /* If the tag is `nalf`, see non_alphabetic_value_t */ HBUINT32 nalfType; /* If the tag is `nalf`, see non_alphabetic_value_t */
} u; } u;
public: public:
@ -108,7 +108,7 @@ struct fdsc
} }
protected: protected:
HBFixed version; /* Version number of the font descriptors HBFixed version; /* Version number of the font descriptors
* table (0x00010000 for the current version). */ * table (0x00010000 for the current version). */
LArrayOf<FontDescriptor> LArrayOf<FontDescriptor>
descriptors; /* List of tagged-coordinate pairs style descriptors descriptors; /* List of tagged-coordinate pairs style descriptors

8
src/hb-aat-layout-just-table.hh
View File

@ -271,14 +271,14 @@ struct JustWidthDeltaEntry
}; };
protected: protected:
HBFixed beforeGrowLimit;/* The ratio by which the advance width of the HBFixed beforeGrowLimit;/* The ratio by which the advance width of the
* glyph is permitted to grow on the left or top side. */ * glyph is permitted to grow on the left or top side. */
HBFixed beforeShrinkLimit; HBFixed beforeShrinkLimit;
/* The ratio by which the advance width of the /* The ratio by which the advance width of the
* glyph is permitted to shrink on the left or top side. */ * glyph is permitted to shrink on the left or top side. */
HBFixed afterGrowLimit; /* The ratio by which the advance width of the glyph HBFixed afterGrowLimit; /* The ratio by which the advance width of the glyph
* is permitted to shrink on the left or top side. */ * is permitted to shrink on the left or top side. */
HBFixed afterShrinkLimit; HBFixed afterShrinkLimit;
/* The ratio by which the advance width of the glyph /* The ratio by which the advance width of the glyph
* is at most permitted to shrink on the right or * is at most permitted to shrink on the right or
* bottom side. */ * bottom side. */

4
src/hb-aat-layout-opbd-table.hh
View File

@ -160,8 +160,8 @@ struct opbd
* Format 0 indicates distance and Format 1 indicates * Format 0 indicates distance and Format 1 indicates
* control point. */ * control point. */
union { union {
opbdFormat0 format0; opbdFormat0 format0;
opbdFormat1 format1; opbdFormat1 format1;
} u; } u;
public: public:
DEFINE_SIZE_MIN (8); DEFINE_SIZE_MIN (8);

2
src/hb-aat-layout-trak-table.hh
View File

@ -62,7 +62,7 @@ struct TrackTableEntry
} }
protected: protected:
HBFixed track; /* Track value for this record. */ HBFixed track; /* Track value for this record. */
NameID trackNameID; /* The 'name' table index for this track. NameID trackNameID; /* The 'name' table index for this track.
* (a short word or phrase like "loose" * (a short word or phrase like "loose"
* or "very tight") */ * or "very tight") */

3
src/hb-ot-cff-common.hh
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);

4
src/hb-ot-cmap-table.hh
View File

@ -1516,9 +1516,9 @@ struct cmap
} }
protected: protected:
HBUINT16 version; /* Table version number (0). */ HBUINT16 version; /* Table version number (0). */
SortedArrayOf<EncodingRecord> SortedArrayOf<EncodingRecord>
encodingRecord; /* Encoding tables. */ encodingRecord; /* Encoding tables. */
public: public:
DEFINE_SIZE_ARRAY (4, encodingRecord); DEFINE_SIZE_ARRAY (4, encodingRecord);
}; };

10
src/hb-ot-hdmx-table.hh
View File

@ -161,10 +161,12 @@ 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);
}; };

61
src/hb-ot-hhea-table.hh
View File

@ -54,35 +54,38 @@ struct _hea
} }
public: public:
FixedVersion<>version; /* 0x00010000u for version 1.0. */ FixedVersion<>version; /* 0x00010000u for version 1.0. */
FWORD ascender; /* Typographic ascent. */ FWORD ascender; /* Typographic ascent. */
FWORD descender; /* Typographic descent. */ FWORD descender; /* Typographic descent. */
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;
* metrics table. */ /* Minimum left/top sidebearing value in
FWORD minTrailingBearing; /* Minimum right/bottom sidebearing value; * metrics table. */
* calculated as Min(aw - lsb - FWORD minTrailingBearing;
* (xMax - xMin)) for horizontal. */ /* Minimum right/bottom sidebearing value;
FWORD maxExtent; /* horizontal: Max(lsb + (xMax - xMin)), * calculated as Min(aw - lsb -
* vertical: minLeadingBearing+(yMax-yMin). */ * (xMax - xMin)) for horizontal. */
HBINT16 caretSlopeRise; /* Used to calculate the slope of the FWORD maxExtent; /* horizontal: Max(lsb + (xMax - xMin)),
* cursor (rise/run); 1 for vertical caret, * vertical: minLeadingBearing+(yMax-yMin). */
* 0 for horizontal.*/ HBINT16 caretSlopeRise; /* Used to calculate the slope of the
HBINT16 caretSlopeRun; /* 0 for vertical caret, 1 for horizontal. */ * cursor (rise/run); 1 for vertical caret,
HBINT16 caretOffset; /* The amount by which a slanted * 0 for horizontal.*/
* highlight on a glyph needs HBINT16 caretSlopeRun; /* 0 for vertical caret, 1 for horizontal. */
* to be shifted to produce the HBINT16 caretOffset; /* The amount by which a slanted
* best appearance. Set to 0 for * highlight on a glyph needs
* non-slanted fonts. */ * to be shifted to produce the
HBINT16 reserved1; /* Set to 0. */ * best appearance. Set to 0 for
HBINT16 reserved2; /* Set to 0. */ * non-slanted fonts. */
HBINT16 reserved3; /* Set to 0. */ HBINT16 reserved1; /* Set to 0. */
HBINT16 reserved4; /* Set to 0. */ HBINT16 reserved2; /* Set to 0. */
HBINT16 metricDataFormat; /* 0 for current format. */ HBINT16 reserved3; /* Set to 0. */
HBUINT16 numberOfLongMetrics; /* Number of LongMetric entries in metric HBINT16 reserved4; /* Set to 0. */
* table. */ HBINT16 metricDataFormat;/* 0 for current format. */
HBUINT16 numberOfLongMetrics;
/* Number of LongMetric entries in metric
* table. */
public: public:
DEFINE_SIZE_STATIC (36); DEFINE_SIZE_STATIC (36);
}; };

44
src/hb-ot-hmtx-table.hh
View File

@ -295,27 +295,29 @@ struct hmtxvmtx
}; };
protected: protected:
UnsizedArrayOf<LongMetric>longMetricZ;/* Paired advance width and leading UnsizedArrayOf<LongMetric>
* bearing values for each glyph. The longMetricZ; /* Paired advance width and leading
* value numOfHMetrics comes from * bearing values for each glyph. The
* the 'hhea' table. If the font is * value numOfHMetrics comes from
* monospaced, only one entry need * the 'hhea' table. If the font is
* be in the array, but that entry is * monospaced, only one entry need
* required. The last entry applies to * be in the array, but that entry is
* all subsequent glyphs. */ * required. The last entry applies to
/*UnsizedArrayOf<FWORD> leadingBearingX;*//* Here the advance is assumed * all subsequent glyphs. */
* to be the same as the advance /*UnsizedArrayOf<FWORD> leadingBearingX;*/
* for the last entry above. The /* Here the advance is assumed
* number of entries in this array is * to be the same as the advance
* derived from numGlyphs (from 'maxp' * for the last entry above. The
* table) minus numberOfLongMetrics. * number of entries in this array is
* This generally is used with a run * derived from numGlyphs (from 'maxp'
* of monospaced glyphs (e.g., Kanji * table) minus numberOfLongMetrics.
* fonts or Courier fonts). Only one * This generally is used with a run
* run is allowed and it must be at * of monospaced glyphs (e.g., Kanji
* the end. This allows a monospaced * fonts or Courier fonts). Only one
* font to vary the side bearing * run is allowed and it must be at
* values for each glyph. */ * the end. This allows a monospaced
* font to vary the side bearing
* values for each glyph. */
public: public:
DEFINE_SIZE_ARRAY (0, longMetricZ); DEFINE_SIZE_ARRAY (0, longMetricZ);
}; };

37
src/hb-ot-kern-table.hh
View File

@ -86,21 +86,26 @@ struct KernSubTableFormat3
} }
protected: protected:
KernSubTableHeader header; KernSubTableHeader
HBUINT16 glyphCount; /* The number of glyphs in this font. */ header;
HBUINT8 kernValueCount; /* The number of kerning values. */ HBUINT16 glyphCount; /* The number of glyphs in this font. */
HBUINT8 leftClassCount; /* The number of left-hand classes. */ HBUINT8 kernValueCount; /* The number of kerning values. */
HBUINT8 rightClassCount;/* The number of right-hand classes. */ HBUINT8 leftClassCount; /* The number of left-hand classes. */
HBUINT8 flags; /* Set to zero (reserved for future use). */ HBUINT8 rightClassCount;/* The number of right-hand classes. */
UnsizedArrayOf<FWORD> kernValueZ; /* The kerning values. HBUINT8 flags; /* Set to zero (reserved for future use). */
* Length kernValueCount. */ UnsizedArrayOf<FWORD>
kernValueZ; /* The kerning values.
* Length kernValueCount. */
#if 0 #if 0
UnsizedArrayOf<HBUINT8>leftClass; /* The left-hand classes. UnsizedArrayOf<HBUINT8>
* Length glyphCount. */ leftClass; /* The left-hand classes.
UnsizedArrayOf<HBUINT8>rightClass; /* The right-hand classes. * Length glyphCount. */
* Length glyphCount. */ UnsizedArrayOf<HBUINT8>
UnsizedArrayOf<HBUINT8>kernIndex; /* The indices into the kernValue array. rightClass; /* The right-hand classes.
* Length leftClassCount * rightClassCount */ * Length glyphCount. */
UnsizedArrayOf<HBUINT8>kernIndex;
/* The indices into the kernValue array.
* Length leftClassCount * rightClassCount */
#endif #endif
public: public:
DEFINE_SIZE_ARRAY (KernSubTableHeader::static_size + 6, kernValueZ); DEFINE_SIZE_ARRAY (KernSubTableHeader::static_size + 6, kernValueZ);
@ -246,8 +251,8 @@ struct KernAATSubTableHeader
HBUINT8 coverage; /* Coverage bits. */ HBUINT8 coverage; /* Coverage bits. */
HBUINT8 format; /* Subtable format. */ HBUINT8 format; /* Subtable format. */
HBUINT16 tupleIndex; /* The tuple index (used for variations fonts). HBUINT16 tupleIndex; /* The tuple index (used for variations fonts).
* This value specifies which tuple this subtable covers. * This value specifies which tuple this subtable covers.
* Note: We don't implement. */ * Note: We don't implement. */
public: public:
DEFINE_SIZE_STATIC (8); DEFINE_SIZE_STATIC (8);
}; };

2
src/hb-ot-layout-gsubgpos.hh
View File

@ -433,7 +433,7 @@ struct hb_ot_apply_context_t :
} }
void reset (unsigned int start_index_, void reset (unsigned int start_index_,
unsigned int num_items_) unsigned int num_items_)
{ {
idx = start_index_; idx = start_index_;
num_items = num_items_; num_items = num_items_;

130
src/hb-ot-math-table.hh
View File

@ -48,7 +48,7 @@ struct MathValueRecord
} }
protected: protected:
HBINT16 value; /* The X or Y value in design units */ HBINT16 value; /* The X or Y value in design units */
OffsetTo<Device> deviceTable; /* Offset to the device table - from the OffsetTo<Device> deviceTable; /* Offset to the device table - from the
* beginning of parent table. May be NULL. * beginning of parent table. May be NULL.
* Suggested format for device table is 1. */ * Suggested format for device table is 1. */
@ -279,14 +279,15 @@ struct MathKern
protected: protected:
HBUINT16 heightCount; HBUINT16 heightCount;
UnsizedArrayOf<MathValueRecord> UnsizedArrayOf<MathValueRecord>
mathValueRecordsZ; /* Array of correction heights at mathValueRecordsZ;
* which the kern value changes. /* Array of correction heights at
* Sorted by the height value in * which the kern value changes.
* design units (heightCount entries), * Sorted by the height value in
* Followed by: * design units (heightCount entries),
* Array of kern values corresponding * Followed by:
* to heights. (heightCount+1 entries). * Array of kern values corresponding
*/ * to heights. (heightCount+1 entries).
*/
public: public:
DEFINE_SIZE_ARRAY (2, mathValueRecordsZ); DEFINE_SIZE_ARRAY (2, mathValueRecordsZ);
@ -345,15 +346,18 @@ struct MathKernInfo
} }
protected: protected:
OffsetTo<Coverage> mathKernCoverage; /* Offset to Coverage table - OffsetTo<Coverage>
* from the beginning of the mathKernCoverage;
* MathKernInfo table. */ /* Offset to Coverage table -
ArrayOf<MathKernInfoRecord> mathKernInfoRecords; /* Array of * from the beginning of the
* MathKernInfoRecords, * MathKernInfo table. */
* per-glyph information for ArrayOf<MathKernInfoRecord>
* mathematical positioning mathKernInfoRecords;
* of subscripts and /* Array of MathKernInfoRecords,
* superscripts. */ * per-glyph information for
* mathematical positioning
* of subscripts and
* superscripts. */
public: public:
DEFINE_SIZE_ARRAY (4, mathKernInfoRecords); DEFINE_SIZE_ARRAY (4, mathKernInfoRecords);
@ -471,19 +475,21 @@ 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;
* connector material, in design units, is at /* Advance width/ height of the straight bar
* the beginning of the glyph, in the * connector material, in design units, is at
* direction of the extension. */ * the beginning of the glyph, in the
HBUINT16 endConnectorLength; /* Advance width/ height of the straight bar * direction of the extension. */
* connector material, in design units, is at HBUINT16 endConnectorLength;
* the end of the glyph, in the direction of /* Advance width/ height of the straight bar
* the extension. */ * connector material, in design units, is at
HBUINT16 fullAdvance; /* Full advance width/height for this part, * the end of the glyph, in the direction of
* in the direction of the extension. * the extension. */
* In design units. */ HBUINT16 fullAdvance; /* Full advance width/height for this part,
PartFlags partFlags; /* Part qualifiers. */ * in the direction of the extension.
* In design units. */
PartFlags partFlags; /* Part qualifiers. */
public: public:
DEFINE_SIZE_STATIC (10); DEFINE_SIZE_STATIC (10);
@ -522,12 +528,15 @@ struct MathGlyphAssembly
} }
protected: protected:
MathValueRecord italicsCorrection; /* Italics correction of this MathValueRecord
* MathGlyphAssembly. Should not italicsCorrection;
* depend on the assembly size. */ /* Italics correction of this
ArrayOf<MathGlyphPartRecord> partRecords; /* Array of part records, from * MathGlyphAssembly. Should not
* left to right and bottom to * depend on the assembly size. */
* top. */ ArrayOf<MathGlyphPartRecord>
partRecords; /* Array of part records, from
* left to right and bottom to
* top. */
public: public:
DEFINE_SIZE_ARRAY (6, partRecords); DEFINE_SIZE_ARRAY (6, partRecords);
@ -645,22 +654,24 @@ struct MathVariants
} }
protected: protected:
HBUINT16 minConnectorOverlap; HBUINT16 minConnectorOverlap;
/* 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;
* from the beginning of MathVariants /* Offset to Coverage table -
* table. */ * from the beginning of MathVariants
OffsetTo<Coverage> horizGlyphCoverage;/* Offset to Coverage table - * table. */
* from the beginning of MathVariants OffsetTo<Coverage> horizGlyphCoverage;
* table. */ /* Offset to Coverage table -
HBUINT16 vertGlyphCount; /* Number of glyphs for which * from the beginning of MathVariants
* information is provided for * table. */
* vertically growing variants. */ HBUINT16 vertGlyphCount; /* Number of glyphs for which
HBUINT16 horizGlyphCount;/* Number of glyphs for which * information is provided for
* information is provided for * vertically growing variants. */
* horizontally growing variants. */ HBUINT16 horizGlyphCount;/* Number of glyphs for which
* information is provided for
* horizontally growing variants. */
/* Array of offsets to MathGlyphConstruction tables - from the beginning of /* Array of offsets to MathGlyphConstruction tables - from the beginning of
the MathVariants table, for shapes growing in vertical/horizontal the MathVariants table, for shapes growing in vertical/horizontal
@ -703,11 +714,14 @@ struct MATH
const MathVariants &get_variants () const { return this+mathVariants; } const MathVariants &get_variants () const { return this+mathVariants; }
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);

7
src/hb-ot-maxp-table.hh
View File

@ -126,9 +126,10 @@ 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);

5
src/hb-ot-meta-table.hh
View File

@ -108,12 +108,13 @@ 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. */
LArrayOf<DataMap> LArrayOf<DataMap>
dataMaps; /* Array of data map records. */ dataMaps;/* Array of data map records. */
public: public:
DEFINE_SIZE_ARRAY (16, dataMaps); DEFINE_SIZE_ARRAY (16, dataMaps);
}; };

8
src/hb-ot-name-table.hh
View File

@ -353,12 +353,12 @@ struct name
}; };
/* We only implement format 0 for now. */ /* We only implement format 0 for now. */
HBUINT16 format; /* Format selector (=0/1). */ HBUINT16 format; /* Format selector (=0/1). */
HBUINT16 count; /* Number of name records. */ HBUINT16 count; /* Number of name records. */
NNOffsetTo<UnsizedArrayOf<HBUINT8>> NNOffsetTo<UnsizedArrayOf<HBUINT8>>
stringOffset; /* Offset to start of string storage (from start of table). */ stringOffset; /* Offset to start of string storage (from start of table). */
UnsizedArrayOf<NameRecord> UnsizedArrayOf<NameRecord>
nameRecordZ; /* The name records where count is the number of records. */ nameRecordZ; /* The name records where count is the number of records. */
public: public:
DEFINE_SIZE_ARRAY (6, nameRecordZ); DEFINE_SIZE_ARRAY (6, nameRecordZ);
}; };

2
src/hb-ot-post-table.hh
View File

@ -259,7 +259,7 @@ struct post
* 0x00020000 for version 2.0 * 0x00020000 for version 2.0
* 0x00025000 for version 2.5 (deprecated) * 0x00025000 for version 2.5 (deprecated)
* 0x00030000 for version 3.0 */ * 0x00030000 for version 3.0 */
HBFixed italicAngle; /* Italic angle in counter-clockwise degrees HBFixed italicAngle; /* Italic angle in counter-clockwise degrees
* from the vertical. Zero for upright text, * from the vertical. Zero for upright text,
* negative for text that leans to the right * negative for text that leans to the right
* (forward). */ * (forward). */

14
src/hb-ot-stat-table.hh
View File

@ -77,7 +77,7 @@ struct AxisValueFormat1
NameID valueNameID; /* The name ID for entries in the 'name' table NameID valueNameID; /* The name ID for entries in the 'name' table
* that provide a display string for this * that provide a display string for this
* attribute value. */ * attribute value. */
HBFixed value; /* A numeric value for this attribute value. */ HBFixed value; /* A numeric value for this attribute value. */
public: public:
DEFINE_SIZE_STATIC (12); DEFINE_SIZE_STATIC (12);
}; };
@ -102,10 +102,10 @@ struct AxisValueFormat2
NameID valueNameID; /* The name ID for entries in the 'name' table NameID valueNameID; /* The name ID for entries in the 'name' table
* that provide a display string for this * that provide a display string for this
* attribute value. */ * attribute value. */
HBFixed nominalValue; /* A numeric value for this attribute value. */ HBFixed nominalValue; /* A numeric value for this attribute value. */
HBFixed rangeMinValue; /* The minimum value for a range associated HBFixed rangeMinValue; /* The minimum value for a range associated
* with the specified name ID. */ * with the specified name ID. */
HBFixed rangeMaxValue; /* The maximum value for a range associated HBFixed rangeMaxValue; /* The maximum value for a range associated
* with the specified name ID. */ * with the specified name ID. */
public: public:
DEFINE_SIZE_STATIC (20); DEFINE_SIZE_STATIC (20);
@ -131,8 +131,8 @@ struct AxisValueFormat3
NameID valueNameID; /* The name ID for entries in the 'name' table NameID valueNameID; /* The name ID for entries in the 'name' table
* that provide a display string for this * that provide a display string for this
* attribute value. */ * attribute value. */
HBFixed value; /* A numeric value for this attribute value. */ HBFixed value; /* A numeric value for this attribute value. */
HBFixed linkedValue; /* The numeric value for a style-linked mapping HBFixed linkedValue; /* The numeric value for a style-linked mapping
* from this value. */ * from this value. */
public: public:
DEFINE_SIZE_STATIC (16); DEFINE_SIZE_STATIC (16);
@ -150,7 +150,7 @@ struct AxisValueRecord
HBUINT16 axisIndex; /* Zero-base index into the axis record array HBUINT16 axisIndex; /* Zero-base index into the axis record array
* identifying the axis to which this value * identifying the axis to which this value
* applies. Must be less than designAxisCount. */ * applies. Must be less than designAxisCount. */
HBFixed value; /* A numeric value for this attribute value. */ HBFixed value; /* A numeric value for this attribute value. */
public: public:
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);
}; };

6
src/hb-ot-var-fvar-table.hh
View File

@ -83,9 +83,9 @@ struct AxisRecord
public: public:
Tag axisTag; /* Tag identifying the design variation for the axis. */ Tag axisTag; /* Tag identifying the design variation for the axis. */
HBFixed minValue; /* The minimum coordinate value for the axis. */ HBFixed minValue; /* The minimum coordinate value for the axis. */
HBFixed defaultValue; /* The default coordinate value for the axis. */ HBFixed defaultValue; /* The default coordinate value for the axis. */
HBFixed maxValue; /* The maximum coordinate value for the axis. */ HBFixed maxValue; /* The maximum coordinate value for the axis. */
HBUINT16 flags; /* Axis flags. */ HBUINT16 flags; /* Axis flags. */
NameID axisNameID; /* The name ID for entries in the 'name' table that NameID axisNameID; /* The name ID for entries in the 'name' table that
* provide a display name for this axis. */ * provide a display name for this axis. */

7
src/hb-ot-vorg-table.hh
View File

@ -122,10 +122,11 @@ 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. */
public: public:
DEFINE_SIZE_ARRAY(8, vertYOrigins); DEFINE_SIZE_ARRAY(8, vertYOrigins);