X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=e5ff9ee612056ba5bf4a63ff11a123f5cdf305f9;hb=cdb1e053dfd92d2044d44a1d0503b68c1184d1e3;hp=f355829a883abd5f569bf38b10b9ed04cee81460;hpb=cf1c327737a887c027ae2669da0fb431cd866ee6;p=swftools.git

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index f355829..e5ff9ee 100644
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -21,23 +21,35 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+static int loadfont_scale = 64;
+static int skip_unused = 1;
+static int full_unicode = 0;
+
+void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode)
+{
+    if(_scale) loadfont_scale = _scale;
+    skip_unused = _skip_unused;
+    full_unicode = _full_unicode;
+}
+
 #ifdef HAVE_FREETYPE
 
 #include <freetype/freetype.h>
 #include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
 #include <freetype/ftsnames.h>
 #include <freetype/ttnameid.h>
 #include <freetype/ftoutln.h>
 
-#define FT_SCALE 1
+#define FT_SCALE loadfont_scale
 #define FT_SUBPIXELS 64
 
 static int ft_move_to(FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
-    to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
-    to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
+    to.x = _to->x/(float)FT_SUBPIXELS;
+    to.y = -_to->y/(float)FT_SUBPIXELS;
     draw->moveTo(draw, &to);
     return 0;
 }
@@ -45,8 +57,8 @@ static int ft_line_to(FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
-    to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
-    to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
+    to.x = _to->x/(float)FT_SUBPIXELS;
+    to.y = -_to->y/(float)FT_SUBPIXELS;
     draw->lineTo(draw, &to);
     return 0;
 }
@@ -54,12 +66,12 @@ static int ft_cubic_to(FT_Vector* _c1, FT_Vector* _c2, FT_Vector* _to, void* use
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT c1,c2,to;
-    to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
-    to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c1.x = _c1->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c1.y = -_c1->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c2.x = _c2->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c2.y = -_c2->y*FT_SCALE/(float)FT_SUBPIXELS;
+    to.x = _to->x/(float)FT_SUBPIXELS;
+    to.y = -_to->y/(float)FT_SUBPIXELS;
+    c1.x = _c1->x/(float)FT_SUBPIXELS;
+    c1.y = -_c1->y/(float)FT_SUBPIXELS;
+    c2.x = _c2->x/(float)FT_SUBPIXELS;
+    c2.y = -_c2->y/(float)FT_SUBPIXELS;
     draw_cubicTo(draw, &c1, &c2, &to);
     return 0;
 }
@@ -67,10 +79,10 @@ static int ft_conic_to(FT_Vector* _c, FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT c,to;
-    to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
-    to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c.x = _c->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c.y = -_c->y*FT_SCALE/(float)FT_SUBPIXELS;
+    to.x = _to->x/(float)FT_SUBPIXELS;
+    to.y = -_to->y/(float)FT_SUBPIXELS;
+    c.x = _c->x/(float)FT_SUBPIXELS;
+    c.y = -_c->y/(float)FT_SUBPIXELS;
     draw_conicTo(draw, &c, &to);
     return 0;
 }
@@ -94,6 +106,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     FT_UInt gindex;
     SWFFONT* font;
     int t;
+    int*glyph2glyph;
+    FT_Size size;
+    int max_unicode = 0;
    
     if(ftlibrary == 0) {
 	if(FT_Init_FreeType(&ftlibrary)) {
@@ -102,12 +117,16 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	}
     }
     error = FT_New_Face(ftlibrary, filename, 0, &face);
+    FT_Set_Pixel_Sizes (face, 16*FT_SCALE, 16*FT_SCALE);
+
     if(error) {
 	fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
 	return 0;
     }
-    if(face->num_glyphs <= 0)
+    if(face->num_glyphs <= 0) {
+	fprintf(stderr, "File %s contains %d glyphs\n", face->num_glyphs);
 	return 0;
+    }
 
     font = malloc(sizeof(SWFFONT));
     memset(font, 0, sizeof(SWFFONT));
@@ -116,23 +135,22 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     font->layout = malloc(sizeof(SWFLAYOUT));
     memset(font->layout, 0, sizeof(SWFLAYOUT));
     font->layout->bounds = malloc(face->num_glyphs*sizeof(SRECT));
-    font->numchars = face->num_glyphs;
     font->style =  ((face->style_flags&FT_STYLE_FLAG_ITALIC)?FONT_STYLE_ITALIC:0)
 	          |((face->style_flags&FT_STYLE_FLAG_BOLD)?FONT_STYLE_BOLD:0);
     font->encoding = FONT_ENCODING_UNICODE;
     font->glyph2ascii = malloc(face->num_glyphs*sizeof(U16));
     memset(font->glyph2ascii, 0, face->num_glyphs*sizeof(U16));
     font->maxascii = 0;
-    memset(font->ascii2glyph, -1, font->maxascii*sizeof(int));
     font->glyph = malloc(face->num_glyphs*sizeof(SWFGLYPH));
-    memset(font->glyph, 0, face->num_glyphs*sizeof(U16));
+    memset(font->glyph, 0, face->num_glyphs*sizeof(SWFGLYPH));
     if(FT_HAS_GLYPH_NAMES(face)) {
 	font->glyphnames = malloc(face->num_glyphs*sizeof(char*));
+	memset(font->glyphnames,0,face->num_glyphs*sizeof(char*));
     }
 
-    font->layout->ascent = face->ascender; //face->bbox.xMin;
-    font->layout->descent = face->descender; //face->bbox.xMax;
-    font->layout->leading = -face->bbox.xMin;
+    font->layout->ascent = face->ascender*20/FT_SUBPIXELS; //face->bbox.xMin;
+    font->layout->descent = abs(face->descender)*20/FT_SUBPIXELS; //face->bbox.xMax;
+    font->layout->leading = abs(face->bbox.yMin - face->bbox.yMax); //-face->bbox.xMin*20/FT_SUBPIXELS;
     font->layout->kerningcount = 0;
     
     name = FT_Get_Postscript_Name(face);
@@ -166,14 +184,29 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	}
 	charcode = FT_Get_Next_Char(face, charcode, &gindex);
     }
+
+    if(full_unicode)
+	font->maxascii = 65535;
     
     font->ascii2glyph = malloc(font->maxascii*sizeof(int));
     
     for(t=0;t<font->maxascii;t++) {
-	font->ascii2glyph[t] = FT_Get_Char_Index(face, t);
-	if(!font->ascii2glyph[t])
-	    font->ascii2glyph[t] = -1;
+	int g = FT_Get_Char_Index(face, t);
+	if(!g || g>=face->num_glyphs)
+	    g = -1;
+	font->ascii2glyph[t] = g;
+	if(g>=0) {
+	    max_unicode = t+1;
+	    if(!font->glyph2ascii[g]) {
+		font->glyph2ascii[g] = t;
+	    }
+	}
     }
+    font->maxascii = max_unicode;
+
+    font->numchars = 0;
+
+    glyph2glyph = (int*)malloc(face->num_glyphs*sizeof(int));
 
     for(t=0; t < face->num_glyphs; t++) {
 	FT_Glyph glyph;
@@ -182,16 +215,28 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 	char name[128];
 	drawer_t draw;
 	int ret;
+	char hasname = 0;
 	name[0]=0;
 	if(FT_HAS_GLYPH_NAMES(face)) {
 	    error = FT_Get_Glyph_Name(face, t, name, 127);
-	    if(!error) 
-		font->glyphnames[t] = strdup(name);
+	    if(!error && name[0] && !strstr(name, "notdef")) {
+		font->glyphnames[font->numchars] = strdup(name);
+		hasname = 1;
+	    }
+	}
+	if(!font->glyph2ascii[t] && !hasname && skip_unused) {
+	    continue;
+	}
+	error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP);
+	if(error) {
+	    fprintf(stderr, "Couldn't load glyph %d, error:%d\n", t, error);
+	    continue;
 	}
-	error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
-	if(error) return 0;
 	error = FT_Get_Glyph(face->glyph, &glyph);
-	if(error) return 0;
+	if(error) {
+	    fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
+	    continue;
+	}
 
 	FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
 	bbox.yMin = -bbox.yMin;
@@ -213,31 +258,50 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 	//error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
 	error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
-	if(error) return 0;
+	draw.finish(&draw);
+	
+	if(error) {
+	    fprintf(stderr, "Couldn't decompose glyph %d\n", t);
+	    draw.dealloc(&draw);
+	    continue;
+	}
 
 	draw.finish(&draw);
 
 #if 0
 	if(bbox.xMin > 0) {
-	    font->glyph[t].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
+	    font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
 	} else {
-	    font->glyph[t].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
+	    font->glyph[font->numchars].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
 	}
 #else
-	font->glyph[t].advance = glyph->advance.x/65536;
+	font->glyph[font->numchars].advance = glyph->advance.x*20/65536;
 #endif
 	
-	font->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
+	font->glyph[font->numchars].shape = swf_ShapeDrawerToShape(&draw);
 	
-	font->layout->bounds[t].xmin = (bbox.xMin*FT_SCALE*20)/FT_SUBPIXELS;
-	font->layout->bounds[t].ymin = (bbox.yMin*FT_SCALE*20)/FT_SUBPIXELS;
-	font->layout->bounds[t].xmax = (bbox.xMax*FT_SCALE*20)/FT_SUBPIXELS;
-	font->layout->bounds[t].ymax = (bbox.yMax*FT_SCALE*20)/FT_SUBPIXELS;
+	font->layout->bounds[font->numchars].xmin = (bbox.xMin*FT_SCALE*20)/FT_SUBPIXELS;
+	font->layout->bounds[font->numchars].ymin = (bbox.yMin*FT_SCALE*20)/FT_SUBPIXELS;
+	font->layout->bounds[font->numchars].xmax = (bbox.xMax*FT_SCALE*20)/FT_SUBPIXELS;
+	font->layout->bounds[font->numchars].ymax = (bbox.yMax*FT_SCALE*20)/FT_SUBPIXELS;
 
 	draw.dealloc(&draw);
 
 	FT_Done_Glyph(glyph);
+	font->glyph2ascii[font->numchars] = font->glyph2ascii[t];
+	glyph2glyph[t] = font->numchars;
+	font->numchars++;
     }
+    /* notice: if skip_unused is true, font->glyph2ascii, font->glyphnames and font->layout->bounds will 
+	       have more memory allocated than just font->numchars, but only the first font->numchars 
+	       are used/valid */
+
+    for(t=0;t<font->maxascii;t++) {
+	if(font->ascii2glyph[t]>=0) {
+	    font->ascii2glyph[t] = glyph2glyph[font->ascii2glyph[t]];
+	}
+    }
+    free(glyph2glyph);
 
     FT_Done_Face(face);
     FT_Done_FreeType(ftlibrary);ftlibrary=0;
@@ -260,6 +324,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
 static int t1lib_initialized = 0;
 
+static int counter = 0;
+
 SWFFONT* swf_LoadT1Font(char*filename)
 {
     SWFFONT * font;
@@ -268,10 +334,11 @@ SWFFONT* swf_LoadT1Font(char*filename)
     char*fontname,*fullname,*familyname;
     BBox bbox;
     int s,num;
-    char*encoding[256];
     char**charnames;
     char**charname;
+    char*encoding[256];
     int c;
+    int t;
 
     if(!t1lib_initialized) {
 	T1_SetBitmapPad(16);
@@ -284,10 +351,11 @@ SWFFONT* swf_LoadT1Font(char*filename)
     nr = T1_AddFont(filename);
     T1_LoadFont(nr);
 
-    num = T1_SetDefaultEncoding(encoding);
-    for(;num<256;num++) encoding[num] = 0;
-
     charnames = T1_GetAllCharNames(nr);
+    if(!charnames) {
+	fprintf(stderr, "No Charnames record- not a Type1 Font?\n");
+	return 0;
+    }
 
     angle = T1_GetItalicAngle(nr);
     fontname = T1_GetFontName(nr);
@@ -311,8 +379,16 @@ SWFFONT* swf_LoadT1Font(char*filename)
     charname = charnames;
     while(*charname) {
 	charname++;
+	if(num<256) {
+	    if(*charname) encoding[num] = strdup(*charname);
+	    else          encoding[num] = strdup(".notdef");
+	}
 	num++;
     }
+    for(t=num;t<256;t++)
+	encoding[t] = strdup(".notdef");
+    
+    //T1_ReencodeFont(nr, encoding);
 
     font->maxascii = num;
     font->numchars = num;
@@ -383,7 +459,9 @@ SWFFONT* swf_LoadT1Font(char*filename)
 	    }
 	    last = pos;
 	    outline = outline->link;
+	    printf("(%f,%f) ", pos.x, pos.y);
 	}
+	printf("\n");
 	
 	draw.finish(&draw);
 
@@ -392,12 +470,16 @@ SWFFONT* swf_LoadT1Font(char*filename)
 	draw.dealloc(&draw);
 	    
 	font->layout->bounds[c] = bbox;
-	font->glyph[c].advance = bbox.xmax/20;
+	font->glyph[c].advance = bbox.xmax;
 	if(!font->glyph[c].advance) {
 	    font->glyph[c].advance = firstx;
 	}
 	charname++;
     }
+    T1_DeleteFont(nr);
+
+    for(t=0;t<256;t++)
+	free(encoding[t]);
     return font;
 }
 
@@ -411,6 +493,13 @@ SWFFONT* swf_LoadT1Font(char*filename)
 
 #endif
 
+SWFFONT* swf_DummyFont()
+{
+    SWFFONT*font = (SWFFONT*)malloc(sizeof(SWFFONT));
+    memset(font, 0, sizeof(SWFFONT));
+    return font;
+}
+
 static int isSWF(const char*filename)
 {
     FILE*fi = fopen(filename, "rb");
@@ -431,18 +520,22 @@ static int isSWF(const char*filename)
 
 SWFFONT* swf_LoadFont(char*filename)
 {
-    int is_swf = isSWF(filename);
+    int is_swf;
+    if(filename == 0)
+	return swf_DummyFont();
+    is_swf = isSWF(filename);
     if(is_swf<0)
 	return 0;
     if(is_swf) {
 	return swf_ReadFont(filename);
     }
+
 #if defined(HAVE_FREETYPE)
     return swf_LoadTrueTypeFont(filename);
 #elif defined(HAVE_T1LIB)
     return swf_LoadT1Font(filename);
 #else
-    fprintf(stderr, "Error: Neither T1lib nor FreeType support compiled in. Could not load %s\n", infile);
+    fprintf(stderr, "Error: Neither T1lib nor FreeType support compiled in. Could not load %s\n", filename);
     return 0;
 #endif
 }