fixed bugs in ttf writer

[swftools.git] / lib / gfxfont.c

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index cc6c62c..d1f5806 100644 (file)
--- a/lib/gfxfont.c
+++ b/lib/gfxfont.c
@@ -539,6 +539,7 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
     ttf->glyphs = rfx_calloc(num_glyphs*sizeof(ttfglyph_t));
     double scale = 1.0;
     int max_unicode = font->max_unicode;
+    int remap_pos=0;
     for(t=0;t<font->num_glyphs;t++) {
        gfxglyph_t*src = &font->glyphs[t];
        ttfglyph_t*dest = &ttf->glyphs[t+offset];
@@ -553,6 +554,7 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
        dest->num_points = count;
        dest->points = rfx_calloc(count*sizeof(ttfpoint_t));
        count = 0;
+       line = src->line;
        while(line) {
            if(line->type == gfx_splineTo) {
                dest->points[count].x = line->sx*scale;
@@ -570,6 +572,8 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
            count++;
            line=line->next;
        }
+       if(count)
+           dest->points[count-1].flags |= GLYPH_CONTOUR_END;
 
        /* compute bounding box */
        int s;
@@ -578,39 +582,52 @@ ttf_t* gfxfont_to_ttf(gfxfont_t*font)
            dest->ymin = dest->ymax = dest->points[0].y;
            for(s=1;s<count;s++) {
                if(dest->points[s].x < dest->xmin) 
-                   dest->xmin = dest->points[0].x;
-               if(dest->points[s].y < dest->xmin) 
-                   dest->xmin = dest->points[0].y;
-               if(dest->points[s].x > dest->xmin) 
-                   dest->xmax = dest->points[0].x;
-               if(dest->points[s].y > dest->xmin) 
-                   dest->ymax = dest->points[0].y;
+                   dest->xmin = dest->points[s].x;
+               if(dest->points[s].y < dest->ymin) 
+                   dest->ymin = dest->points[s].y;
+               if(dest->points[s].x > dest->xmax) 
+                   dest->xmax = dest->points[s].x;
+               if(dest->points[s].y > dest->ymax) 
+                   dest->ymax = dest->points[s].y;
            }
        }
 
        dest->advance = src->advance*scale;
-       if(src->unicode > max_unicode)
-           max_unicode = src->unicode;
+
+       int u = font->glyphs[t].unicode;
+       if(u<32 || (u>=0xe000 && u<0xf900)) {
+           u = 0xe000 + remap_pos++;
+       }
+       if(u > max_unicode)
+           max_unicode = u;
     }
     ttf->unicode_size = max_unicode+1;
     ttf->unicode = rfx_calloc(sizeof(unicode_t)*ttf->unicode_size);
-    for(t=0;t<ttf->num_glyphs;t++) {
+    remap_pos=0;
+    for(t=0;t<font->num_glyphs;t++) {
        gfxglyph_t*src = &font->glyphs[t];
        int u = font->glyphs[t].unicode;
-       if(u>=0)
+       if(u<32 || (u>=0xe000 && u<0xf900)) {
+           u = 0xe000 + remap_pos++;
+       }
+       if(u>=0 && u<ttf->unicode_size)
            ttf->unicode[u] = t+offset;
     }
     int u;
     for(u=0;u<font->max_unicode;u++) {
-       int g = font->unicode2glyph[t];
-       if(g>=0) {
-           ttf->unicode[u] = g;
+       int g = font->unicode2glyph[u];
+       if(u<32 || (u>=0xe000 && u<0xf900))
+           continue;
+       if(g>=0 && !ttf->unicode[u]) {
+           ttf->unicode[u] = g+offset;
        }
     }
     ttf->ascent = font->ascent;
     ttf->descent = font->descent;
     ttf->lineGap = font->ascent + font->descent;
 
+    ttf->name = strdup(font->id);
+
     ttf_create_truetype_tables(ttf);
     return ttf;
 }