From: handa <handa>
Date: Tue, 2 Nov 2004 06:08:48 +0000 (+0000)
Subject: (OTF_EncodingSubtable2): New members subHeaderCount
X-Git-Tag: REL-0-9-5~101
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32d0537a93e0b3b3e3e8a08eede799ab0f4d9406;p=m17n%2Flibotf.git

(OTF_EncodingSubtable2): New members subHeaderCount
and glyphIndexCount.
(OTF_Glyph): New member alternate_set.
---

diff --git a/src/otf.h b/src/otf.h
index 72ac823..9499a60 100644
--- a/src/otf.h
+++ b/src/otf.h
@@ -146,9 +146,11 @@ typedef struct
 
 typedef struct
 {
-  unsigned subHeaderKeys[256];
+  unsigned short subHeaderKeys[256];
+  int subHeaderCount;
   OTF_cmapSubHeader *subHeaders;
-  unsigned *glyphIndexArray;
+  int glyphIndexCount;
+  OTF_GlyphID *glyphIndexArray;
 } OTF_EncodingSubtable2;
 
 typedef struct
@@ -1173,6 +1175,8 @@ typedef struct
       OTF_Anchor *mark2_anchor;
     } f6;
   } f;
+
+  OTF_AlternateSet *alternate_set;
 } OTF_Glyph;
 
 /***
@@ -1184,7 +1188,7 @@ typedef struct
   /* How many glyphs are allocated at the memory pointed by the member
       <glyphs>.  */
   int size;
-  /* How many glyphs contains valid information.  */
+  /* How many glyphs contain valid information.  */
   int used;
   /* Array of glyphs.  It must be allocated by malloc().  The
      functions otf_drive_XXX() may reallocate it and increase the