X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswffont.c;h=a812275611f396eb48af1994aba73fc0ba48281a;hb=cabd1ffdcf5cffd42fba19c15bdbd93adb55a0c7;hp=4d145344fd875a80eee32f8b4596533c13f79c54;hpb=295dd98fad95646311da550526a4156a61929970;p=swftools.git diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c index 4d14534..a812275 100644 --- a/lib/modules/swffont.c +++ b/lib/modules/swffont.c @@ -21,25 +21,32 @@ 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 = 1; +static int loadfont_scale = 4; static int skip_unused = 1; +static int full_unicode = 0; -// TODO: should be named "setLoadFontParameters" -void swf_SetLoadFontParameters(int _scale, int _skip_unused) +void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode) { - loadfont_scale = _scale; + if(_scale) loadfont_scale = _scale; skip_unused = _skip_unused; + full_unicode = _full_unicode; } #ifdef HAVE_FREETYPE +#ifdef HAVE_FREETYPE_FT2BUILD_H +#include +#include FT_FREETYPE_H +#else #include #include +#include #include #include #include +#endif -#define FT_SCALE loadfont_scale +#define FT_SCALE 1 #define FT_SUBPIXELS 64 static int ft_move_to(FT_Vector* _to, void* user) @@ -105,6 +112,9 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) SWFFONT* font; int t; int*glyph2glyph; + FT_Size size; + int max_unicode = 0; + int charmap = -1; if(ftlibrary == 0) { if(FT_Init_FreeType(&ftlibrary)) { @@ -113,6 +123,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) } } error = FT_New_Face(ftlibrary, filename, 0, &face); + FT_Set_Pixel_Sizes (face, 16*loadfont_scale, 16*loadfont_scale); + if(error) { fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename); return 0; @@ -142,42 +154,60 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) memset(font->glyphnames,0,face->num_glyphs*sizeof(char*)); } - 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->ascent = abs(face->ascender)*FT_SCALE*loadfont_scale*20/FT_SUBPIXELS/2; //face->bbox.xMin; + font->layout->descent = abs(face->descender)*FT_SCALE*loadfont_scale*20/FT_SUBPIXELS/2; //face->bbox.xMax; + font->layout->leading = font->layout->ascent + font->layout->descent; font->layout->kerningcount = 0; name = FT_Get_Postscript_Name(face); if(name && *name) font->name = (U8*)strdup(name); -/* // Map Glyphs to Unicode, version 1 (quick and dirty): - int t; - for(t=0;t<65536;t++) { - int index = FT_Get_Char_Index(face, t); - if(index>=0 && indexnum_glyphs) { - if(font->glyph2ascii[index]<0) - font->glyph2ascii[index] = t; - } - }*/ - - // Map Glyphs to Unicode, version 2 (much nicer): - // (The third way would be the AGL algorithm, as proposed - // by Werner Lemberg on freetype@freetype.org) - - charcode = FT_Get_First_Char(face, &gindex); - while(gindex != 0) + while(1) { - if(gindex >= 0 && gindexnum_glyphs) { - if(!font->glyph2ascii[gindex]) { - font->glyph2ascii[gindex] = charcode; - if(charcode + 1 > font->maxascii) { - font->maxascii = charcode + 1; + /* // Map Glyphs to Unicode, version 1 (quick and dirty): + int t; + for(t=0;t<65536;t++) { + int index = FT_Get_Char_Index(face, t); + if(index>=0 && indexnum_glyphs) { + if(font->glyph2ascii[index]<0) + font->glyph2ascii[index] = t; + } + }*/ + + // Map Glyphs to Unicode, version 2 (much nicer): + // (The third way would be the AGL algorithm, as proposed + // by Werner Lemberg on freetype@freetype.org) + + charcode = FT_Get_First_Char(face, &gindex); + while(gindex != 0) + { + if(gindex >= 0 && gindexnum_glyphs) { + if(!font->glyph2ascii[gindex]) { + font->glyph2ascii[gindex] = charcode; + if(charcode + 1 > font->maxascii) { + font->maxascii = charcode + 1; + } } } + charcode = FT_Get_Next_Char(face, charcode, &gindex); } - charcode = FT_Get_Next_Char(face, charcode, &gindex); + + /* if we didn't find a single encoding character, try + the font's charmaps instead. That usually means that + the encoding is no longer unicode. + TODO: find a way to convert the encoding to unicode + */ + if(font->maxascii == 0 && charmap < face->num_charmaps - 1) { + charmap++; + FT_Set_Charmap(face, face->charmaps[charmap]); + font->encoding = 0;//anything but unicode FIXME + } else + break; } + + if(full_unicode) + font->maxascii = 65535; font->ascii2glyph = malloc(font->maxascii*sizeof(int)); @@ -187,11 +217,13 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) 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; @@ -216,14 +248,14 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) if(!font->glyph2ascii[t] && !hasname && skip_unused) { continue; } - error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE); + error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP); if(error) { - fprintf(stderr, "Couldn't load glyph %d\n", t); + fprintf(stderr, "Couldn't load glyph %d, error:%d\n", t, error); continue; } error = FT_Get_Glyph(face->glyph, &glyph); if(error) { - fprintf(stderr, "Couldn't get glyph %d\n", t); + fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error); continue; } @@ -255,8 +287,6 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename) continue; } - draw.finish(&draw); - #if 0 if(bbox.xMin > 0) { font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS; @@ -427,7 +457,6 @@ SWFFONT* swf_LoadT1Font(char*filename) swf_Shape01DrawerInit(&draw, 0); - printf("Char %d (%08x)", c, outline); while(outline) { pos.x += (outline->dest.x/(float)0xffff); pos.y += (outline->dest.y/(float)0xffff); @@ -520,9 +549,6 @@ SWFFONT* swf_LoadFont(char*filename) return swf_ReadFont(filename); } - - return swf_LoadT1Font(filename); - #if defined(HAVE_FREETYPE) return swf_LoadTrueTypeFont(filename); #elif defined(HAVE_T1LIB)