X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxfont.c;h=119f003d1ef17eb1890bf4b67b30ccd215a8aa5c;hp=d7a88030d60f13029ece41fbe12aab05a97059c2;hb=4f2366641015f517c0e4f841b7ae6a9b90c7b184;hpb=879464ce804e0c877db5f4b47fdbfee812f99731

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index d7a8803..119f003 100644
--- a/lib/gfxfont.c
+++ b/lib/gfxfont.c
@@ -690,16 +690,22 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
 	    int g = font->unicode2glyph[u];
 	    if(invalid_unicode(u))
 		continue;
-	    if(g>=0 && !ttf->unicode[u]) {
+	    if(g>=0 && g<font->num_glyphs && !ttf->unicode[u]) {
 		ttf->unicode[u] = g+offset;
 	    }
 	}
     }
+	
     ttf->ascent = font->ascent;
-    ttf->descent = font->descent;
-    ttf->lineGap = font->ascent + font->descent;
+    ttf->descent = -font->descent;
+    ttf->lineGap = 0;
 
-    ttf->name = strdup(font->id);
+    ttf->full_name = strdup(font->id);
+    ttf->family_name = strdup(font->id);
+    ttf->subfamily_name = strdup(font->id);
+    ttf->postscript_name = strdup(font->id);
+    ttf->version_string = strdup("Version 1.0");
+    ttf->font_uid = strdup(font->id);
 
     ttf_create_truetype_tables(ttf);
     return ttf;
@@ -712,3 +718,10 @@ void gfxfont_save(gfxfont_t*font, const char*filename)
     ttf_destroy(ttf);
 }
 
+void gfxfont_save_eot(gfxfont_t*font, const char*filename)
+{
+    ttf_t*ttf = gfxfont_to_ttf(font);
+    ttf_save_eot(ttf, filename);
+    ttf_destroy(ttf);
+}
+