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 <freetype/ft2build.h>
+#include FT_FREETYPE_H
+#else
#include <freetype/freetype.h>
#include <freetype/ftglyph.h>
+#include <freetype/ftsizes.h>
#include <freetype/ftsnames.h>
#include <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
+#endif
-#define FT_SCALE loadfont_scale
+#define FT_SCALE 1
#define FT_SUBPIXELS 64
static int ft_move_to(FT_Vector* _to, void* user)
SWFFONT* font;
int t;
int*glyph2glyph;
+ FT_Size size;
+ int max_unicode = 0;
+ int charmap = -1;
if(ftlibrary == 0) {
if(FT_Init_FreeType(&ftlibrary)) {
}
}
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;
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 && index<face->num_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 && gindex<face->num_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 && index<face->num_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 && gindex<face->num_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));
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;
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;
}
continue;
}
- draw.finish(&draw);
-
#if 0
if(bbox.xMin > 0) {
font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
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);
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);
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;
}
last = pos;
outline = outline->link;
+ printf("(%f,%f) ", pos.x, pos.y);
}
+ printf("\n");
draw.finish(&draw);
}
charname++;
}
+ T1_DeleteFont(nr);
+
+ for(t=0;t<256;t++)
+ free(encoding[t]);
return font;
}
if(is_swf) {
return swf_ReadFont(filename);
}
+
#if defined(HAVE_FREETYPE)
return swf_LoadTrueTypeFont(filename);
#elif defined(HAVE_T1LIB)
git.asbjorn.biz / swftools.git / blobdiff