(OTF_cmapSegment): Fix typo.

(OTF_EncodingSubtable4): Fix typo.
(OTF_UVSMapping): New type.
(OTF_UnicodeValueRange): New type.
(OTF_VariationSelectorRecord): New type.
(OTF_EncodingSubtable14): Fix previous change.

diff --git a/src/otf.h b/src/otf.h
index 3310242..a7114d4 100644 (file)
--- a/src/otf.h
+++ b/src/otf.h
@@ -165,7 +165,7 @@ typedef struct
   unsigned endCount;
   int idDelta;
   unsigned idRangeOffset;
-} OTF_cmapSegument;
+} OTF_cmapSegment;
 
 typedef struct
 {
@@ -173,7 +173,7 @@ typedef struct
   unsigned searchRange;
   unsigned entrySelector;
   unsigned rangeShift;
-  OTF_cmapSegument *segments;
+  OTF_cmapSegment *segments;
   int GlyphCount;
   unsigned *glyphIdArray;
 } OTF_EncodingSubtable4;
@@ -214,8 +214,33 @@ typedef struct
 
 typedef struct
 {
-  unsigned nbytes;
-  unsigned char *data;
+  unsigned unicodeValue;
+  unsigned short glyphID;
+} OTF_UVSMapping;
+
+typedef struct
+{
+  unsigned startUnicodeValue;
+  unsigned short additionalCount;
+} OTF_UnicodeValueRange;
+
+typedef struct
+{
+  unsigned varSelector;
+  unsigned defaultUVSOffset;
+  unsigned nonDefaultUVSOffset;
+  /* DefaultUVS */
+  unsigned numUnicodeValueRanges;
+  OTF_UnicodeValueRange *unicodeValueRanges;
+  /* NonDefaultUVS */
+  unsigned numUVSMappings;
+  OTF_UVSMapping *uvsMappings;
+} OTF_VariationSelectorRecord;
+
+typedef struct
+{
+  unsigned nRecords;
+  OTF_VariationSelectorRecord *Records;
 } OTF_EncodingSubtable14;
 
 typedef struct