Add NameID

src/hb-aat-layout-trak-table.hh

@@ -56,11 +56,11 @@ struct TrackTableEntry
   }
 
   protected:
-  Fixed			track;		/* Track value for this record. */
-  HBUINT16		trackNameID;	/* The 'name' table index for this track */
+  Fixed		track;		/* Track value for this record. */
+  NameID	trackNameID;	/* The 'name' table index for this track */
   OffsetTo<UnsizedArrayOf<FWORD> >
-			values;		/* Offset from start of tracking table to
-					 * per-size tracking values for this track. */
+		values;		/* Offset from start of tracking table to
+				 * per-size tracking values for this track. */
 
   public:
   DEFINE_SIZE_STATIC (8);

src/hb-open-type-private.hh

@@ -729,6 +729,9 @@ DEFINE_NULL_DATA (Tag, "    ");
 /* Glyph index number, same as uint16 (length = 16 bits) */
 typedef HBUINT16 GlyphID;
 
+/* Name-table index, same as uint16 (length = 16 bits) */
+typedef HBUINT16 NameID;
+
 /* Script/language-system/feature index */
 struct Index : HBUINT16 {
   static const unsigned int NOT_FOUND_INDEX = 0xFFFFu;

src/hb-ot-layout-common-private.hh

@@ -398,7 +398,7 @@ struct FeatureParamsStylisticSet
 				 * added to the end of this Feature Parameters
 				 * table in the future. */
 
-  HBUINT16	uiNameID;	/* The 'name' table name ID that specifies a
+  NameID	uiNameID;	/* The 'name' table name ID that specifies a
 				 * string (or strings, for multiple languages)
 				 * for a user-interface label for this
 				 * feature.  The values of uiLabelNameId and
@@ -427,24 +427,24 @@ struct FeatureParamsCharacterVariants
   }
 
   HBUINT16	format;			/* Format number is set to 0. */
-  HBUINT16	featUILableNameID;	/* The ‘name’ table name ID that
+  NameID	featUILableNameID;	/* The ‘name’ table name ID that
 					 * specifies a string (or strings,
 					 * for multiple languages) for a
 					 * user-interface label for this
 					 * feature. (May be nullptr.) */
-  HBUINT16	featUITooltipTextNameID;/* The ‘name’ table name ID that
+  NameID	featUITooltipTextNameID;/* The ‘name’ table name ID that
 					 * specifies a string (or strings,
 					 * for multiple languages) that an
 					 * application can use for tooltip
 					 * text for this feature. (May be
 					 * nullptr.) */
-  HBUINT16	sampleTextNameID;	/* The ‘name’ table name ID that
+  NameID	sampleTextNameID;	/* The ‘name’ table name ID that
 					 * specifies sample text that
 					 * illustrates the effect of this
 					 * feature. (May be nullptr.) */
   HBUINT16	numNamedParameters;	/* Number of named parameters. (May
 					 * be zero.) */
-  HBUINT16	firstParamUILabelNameID;/* The first ‘name’ table name ID
+  NameID	firstParamUILabelNameID;/* The first ‘name’ table name ID
 					 * used to specify strings for
 					 * user-interface labels for the
 					 * feature parameters. (Must be zero

src/hb-ot-var-fvar-table.hh

@@ -42,11 +42,11 @@ struct InstanceRecord
   }
 
   protected:
-  HBUINT16	subfamilyNameID;/* The name ID for entries in the 'name' table
+  NameID	subfamilyNameID;/* The name ID for entries in the 'name' table
 				 * that provide subfamily names for this instance. */
   HBUINT16	reserved;	/* Reserved for future use — set to 0. */
   Fixed		coordinates[VAR];/* The coordinates array for this instance. */
-  //HBUINT16	postScriptNameIDX;/*Optional. The name ID for entries in the 'name'
+  //NameID	postScriptNameIDX;/*Optional. The name ID for entries in the 'name'
   //				  * table that provide PostScript names for this
   //				  * instance. */
 
@@ -68,7 +68,7 @@ struct AxisRecord
   Fixed		defaultValue;	/* The default coordinate value for the axis. */
   Fixed		maxValue;	/* The maximum coordinate value for the axis. */
   HBUINT16	reserved;	/* Reserved for future use — set to 0. */
-  HBUINT16	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. */
 
   public: