#include <freetype/ttnameid.h>
#include <freetype/ftoutln.h>
+#define FT_SCALE 1
+#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/256.0;
- to.y = _to->y/256.0;
+ to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
+ to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
draw->moveTo(draw, &to);
return 0;
}
{
drawer_t* draw = (drawer_t*)user;
FPOINT to;
- to.x = _to->x/256.0;
- to.y = _to->y/256.0;
+ to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
+ to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
draw->lineTo(draw, &to);
return 0;
}
{
drawer_t* draw = (drawer_t*)user;
FPOINT c1,c2,to;
- to.x = _to->x/256.0;
- to.y = _to->y/256.0;
- c1.x = _c1->x/256.0;
- c1.y = _c1->y/256.0;
- c2.x = _c2->x/256.0;
- c2.y = _c2->y/256.0;
+ 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;
draw_cubicTo(draw, &c1, &c2, &to);
return 0;
}
{
drawer_t* draw = (drawer_t*)user;
FPOINT c,to;
- to.x = _to->x/256.0;
- to.y = _to->y/256.0;
- c.x = _c->x/256.0;
- c.y = _c->y/256.0;
+ 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;
draw_conicTo(draw, &c, &to);
return 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, 0, font->maxascii*sizeof(int));
+ 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));
if(FT_HAS_GLYPH_NAMES(face)) {
charcode = FT_Get_Next_Char(face, charcode, &gindex);
}
- memset(font->glyph2ascii, 0, face->num_glyphs*sizeof(U16));
font->ascii2glyph = malloc(font->maxascii*sizeof(int));
- for(t=0;t<font->maxascii;t++)
+ for(t=0;t<font->maxascii;t++) {
font->ascii2glyph[t] = FT_Get_Char_Index(face, t);
+ if(!font->ascii2glyph[t])
+ font->ascii2glyph[t] = -1;
+ }
for(t=0; t < face->num_glyphs; t++) {
FT_Glyph glyph;
FT_BBox bbox;
+ FT_Matrix matrix;
char name[128];
drawer_t draw;
+ int ret;
name[0]=0;
if(FT_HAS_GLYPH_NAMES(face)) {
error = FT_Get_Glyph_Name(face, t, name, 127);
if(error) return 0;
FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
+ bbox.yMin = -bbox.yMin;
+ bbox.yMax = -bbox.yMax;
+ if(bbox.xMax < bbox.xMin) {
+ // swap
+ bbox.xMax ^= bbox.xMin;
+ bbox.xMin ^= bbox.xMax;
+ bbox.xMax ^= bbox.xMin;
+ }
+ if(bbox.yMax < bbox.yMin) {
+ // swap
+ bbox.yMax ^= bbox.yMin;
+ bbox.yMin ^= bbox.yMax;
+ bbox.yMax ^= bbox.yMin;
+ }
swf_Shape01DrawerInit(&draw, 0);
+ //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);
- font->glyph[t].advance = glyph->advance.x*20/256;
+#if 0
+ if(bbox.xMin > 0) {
+ font->glyph[t].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;
+ } else {
+ font->glyph[t].advance = ((bbox.xMax - bbox.xMin)*FT_SCALE)/FT_SUBPIXELS;
+ }
+#else
+ font->glyph[t].advance = glyph->advance.x/65536;
+#endif
+
font->glyph[t].shape = swf_ShapeDrawerToShape(&draw);
- //swf_ShapeDrawerGetBBox(&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;
+
draw.dealloc(&draw);
-
- font->layout->bounds[t].xmin = (bbox.xMin*5*20)/266;
- font->layout->bounds[t].ymin = (bbox.yMin*5*20)/266;
- font->layout->bounds[t].xmax = (bbox.xMax*5*20)/266;
- font->layout->bounds[t].ymax = (bbox.yMax*5*20)/266;
FT_Done_Glyph(glyph);
}
int s,num;
char*encoding[256];
char**charnames;
- char*charname;
+ char**charname;
+ int c;
- T1_SetBitmapPad( 16);
+ T1_SetBitmapPad(16);
if ((T1_InitLib(NO_LOGFILE)==NULL)){
fprintf(stderr, "Initialization of t1lib failed\n");
return 0;
memset(font->layout, 0, sizeof(SWFLAYOUT));
num = 0;
- charname = charnames[0];
+ charname = charnames;
while(*charname) {
charname++;
num++;
}
- font->maxascii = 256;
+ font->maxascii = num;
font->numchars = num;
font->style = (/*bold*/0?FONT_STYLE_BOLD:0) + (angle>0.05?FONT_STYLE_ITALIC:0);
memset(font->layout->bounds, 0, sizeof(SRECT)*num);
font->layout->kerningcount = 0;
font->layout->kerning = 0;
+ font->glyphnames = malloc(num*sizeof(char*));
+ memset(font->glyphnames, 0, num*sizeof(char*));
num = 0;
-
- charname = charnames[0];
- while(*charname) {
- int c;
- T1_OUTLINE * outline = T1_GetCharOutline(nr, c, 100.0, 0);
- int firstx = outline->dest.x/0xffff;
- font->ascii2glyph[s] = num;
- font->glyph2ascii[num] = s;
-
- /* fix bounding box */
- SHAPE2*shape2;
+ charname = charnames;
+ for(c=0;c<font->numchars;c++) {
+ drawer_t draw;
SRECT bbox;
- shape2 = swf_ShapeToShape2(font->glyph[s].shape);
- if(!shape2) { fprintf(stderr, "Shape parse error\n");exit(1);}
- bbox = swf_GetShapeBoundingBox(shape2);
- swf_Shape2Free(shape2);
- font->layout->bounds[num] = bbox;
- //font->glyph[num].advance = (int)(width/6.4); // 128/20
- font->glyph[num].advance = bbox.xmax/20;
- if(!font->glyph[num].advance) {
- font->glyph[num].advance = firstx;
+ T1_OUTLINE * outline;
+ FPOINT pos,last;
+ int firstx;
+
+ outline = T1_GetCharOutline(nr, c, 100.0, 0);
+ firstx = outline->dest.x/0xffff;
+
+ pos.x = 0;
+ pos.y = 0;
+ last = pos;
+
+ font->glyphnames[c] = strdup(*charname);
+
+ if(c<font->maxascii)
+ font->ascii2glyph[c] = c;
+ font->glyph2ascii[c] = c;
+
+ swf_Shape01DrawerInit(&draw, 0);
+
+ while(outline) {
+ pos.x += (outline->dest.x/(float)0xffff);
+ pos.y += (outline->dest.y/(float)0xffff);
+
+ if(outline->type == T1_PATHTYPE_MOVE) {
+ draw.moveTo(&draw,&pos);
+ } else if(outline->type == T1_PATHTYPE_LINE) {
+ draw.lineTo(&draw,&pos);
+ } else if(outline->type == T1_PATHTYPE_BEZIER) {
+ T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline;
+ FPOINT b,c;
+ b.x = o2->B.x/(float)0xffff+last.x;
+ b.y = o2->B.y/(float)0xffff+last.y;
+ c.x = o2->C.x/(float)0xffff+last.x;
+ c.y = o2->C.y/(float)0xffff+last.y;
+ draw_cubicTo(&draw,&b,&c,&pos);
+ } else {
+ fprintf(stderr, "loadT1Font: unknown outline type:%d\n", outline->type);
+ }
+ last = pos;
+ outline = outline->link;
}
+
+ draw.finish(&draw);
+
+ font->glyph[c].shape = swf_ShapeDrawerToShape(&draw);
+ bbox = swf_ShapeDrawerGetBBox(&draw);
+ draw.dealloc(&draw);
+
+ font->layout->bounds[c] = bbox;
+ font->glyph[c].advance = bbox.xmax/20;
+ if(!font->glyph[c].advance) {
+ font->glyph[c].advance = firstx;
+ }
+ charname++;
}
return font;
}
git.asbjorn.biz / swftools.git / blobdiff