X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Frecord.c;h=cf04db6a03a2b0975eda257ff9ec14dec9df76b1;hb=4c389168a91bf083e434885fbfd8f51c6dab56fc;hp=a8a0088672b5ea848c97cc726d857c3204b00077;hpb=e0a702738ce558dd303389b345ec5349f39a5ccf;p=swftools.git

diff --git a/lib/devices/record.c b/lib/devices/record.c
index a8a0088..cf04db6 100644
--- a/lib/devices/record.c
+++ b/lib/devices/record.c
@@ -241,6 +241,8 @@ static void dumpFont(writer_t*w, gfxfont_t*font)
     writer_writeString(w, font->id);
     writer_writeU32(w, font->num_glyphs);
     writer_writeU32(w, font->max_unicode);
+    writer_writeDouble(w, font->ascent);
+    writer_writeDouble(w, font->descent);
     int t;
     for(t=0;t<font->num_glyphs;t++) {
 	dumpLine(w, font->glyphs[t].line);
@@ -255,6 +257,12 @@ static void dumpFont(writer_t*w, gfxfont_t*font)
     for(t=0;t<font->max_unicode;t++) {
 	writer_writeU32(w, font->unicode2glyph[t]);
     }
+    writer_writeU32(w, font->kerning_size);
+    for(t=0;t<font->kerning_size;t++) {
+	writer_writeU32(w, font->kerning[t].c1);
+	writer_writeU32(w, font->kerning[t].c2);
+	writer_writeU32(w, font->kerning[t].advance);
+    }
 }
 static gfxfont_t*readFont(reader_t*r)
 {
@@ -262,6 +270,8 @@ static gfxfont_t*readFont(reader_t*r)
     font->id = reader_readString(r);
     font->num_glyphs = reader_readU32(r);
     font->max_unicode = reader_readU32(r);
+    font->ascent = reader_readDouble(r);
+    font->descent = reader_readDouble(r);
     font->glyphs = (gfxglyph_t*)rfx_calloc(sizeof(gfxglyph_t)*font->num_glyphs);
     font->unicode2glyph = (int*)rfx_calloc(sizeof(font->unicode2glyph[0])*font->max_unicode);
     int t;
@@ -278,6 +288,15 @@ static gfxfont_t*readFont(reader_t*r)
     for(t=0;t<font->max_unicode;t++) {
 	font->unicode2glyph[t] = reader_readU32(r);
     }
+    font->kerning_size = reader_readU32(r);
+    if(font->kerning_size) {
+	font->kerning = malloc(sizeof(gfxkerning_t)*font->kerning_size);
+	for(t=0;t<font->kerning_size;t++) {
+	    font->kerning[t].c1 = reader_readU32(r);
+	    font->kerning[t].c2 = reader_readU32(r);
+	    font->kerning[t].advance = reader_readU32(r);
+	}
+    }
     return font;
 }