X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fttf.h;h=e5462e99cd5ed103663929063827e52e19c7193d;hp=932f5e8023fb5b5b0a67ccc8ee9e4674510b4a8a;hb=bdad407fb79c2f7be9f3603694ebdeadc645b52d;hpb=114fd977a15dcc7a9b52700279576cba80e6dc09

diff --git a/lib/ttf.h b/lib/ttf.h
index 932f5e8..e5462e9 100644
--- a/lib/ttf.h
+++ b/lib/ttf.h
@@ -122,7 +122,7 @@ typedef struct _ttfpoint {
 } ttfpoint_t;
 typedef struct _ttfglyph {
     U16 advance;
-    U16 bearing;
+    S16 bearing;
     S16 xmin,ymin,xmax,ymax;
     int code_size;
     U8*code;
@@ -145,11 +145,31 @@ typedef struct _table_post {
     U16 underline_thickness;
 } table_post_t;
 
+typedef struct _table_cvt {
+    S16*values;
+    int num;
+} table_cvt_t;
+
+typedef struct _table_gasp {
+    int num;
+    struct {
+	U16 size;
+	U16 behaviour;
+    } *records;
+} table_gasp_t;
+
+typedef struct _table_code {
+    U8*code;
+    int size;
+} table_code_t;
+
 typedef struct _ttf {
-    char*full_name;
-    char*family_name;
-    char*subfamily_name;
-    char*version_string;
+    char*family_name;     /* nameId 1 */
+    char*subfamily_name;  /* nameId 2 */
+    char*font_uid;        /* nameId 3 */
+    char*full_name;       /* nameId 4 */
+    char*version_string;  /* nameId 5 */
+    char*postscript_name; /* nameId 6 */
 
     ttf_table_t*tables;
 
@@ -158,12 +178,16 @@ typedef struct _ttf {
     table_os2_t*os2;
     table_hea_t*hea;
     table_post_t*post;
+    table_cvt_t*cvt;
+    table_gasp_t*gasp;
+    table_code_t*prep;
+    table_code_t*fpgm;
 
     U16 flags;
     char is_vertical;
 
     S16 ascent;
-    S16 descent;
+    S16 descent; // ymin, *not* negative ymin
     S16 lineGap;
 
     int num_glyphs;