along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+#include <stdio.h>
+#include <stdlib.h>
+#include "../rfxswf.h"
+
static int loadfont_scale = 4;
static int skip_unused = 1;
static int full_unicode = 0;
static FT_Library ftlibrary = 0;
-SWFFONT* swf_LoadTrueTypeFont(char*filename)
+SWFFONT* swf_LoadTrueTypeFont(const char*filename)
{
FT_Face face;
FT_Error error;
if(FT_HAS_GLYPH_NAMES(face)) {
font->glyphnames = (char**)rfx_calloc(face->num_glyphs*sizeof(char*));
}
-
- 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);
+ name = face->family_name;
+ if(!(name && *name))
+ name = FT_Get_Postscript_Name(face);
if(name && *name)
font->name = (U8*)strdup(name);
glyph2glyph = (int*)rfx_calloc(face->num_glyphs*sizeof(int));
+ SRECT fontbbox = {0,0,0,0};
+
for(t=0; t < face->num_glyphs; t++) {
FT_Glyph glyph;
FT_BBox bbox;
font->glyph[font->numchars].advance = 0;
#endif
+ SRECT b = swf_ShapeDrawerGetBBox(&draw);
+
+ //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;
+
+ font->layout->bounds[font->numchars] = b;
font->glyph[font->numchars].shape = swf_ShapeDrawerToShape(&draw);
-
- 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;
+
+ swf_ExpandRect2(&fontbbox, &font->layout->bounds[font->numchars]);
draw.dealloc(&draw);
glyph2glyph[t] = font->numchars;
font->numchars++;
}
+
+ //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->ascent = -fontbbox.ymin;
+ if(font->layout->ascent < 0)
+ font->layout->ascent = 0;
+ font->layout->descent = fontbbox.ymax;
+ if(font->layout->descent < 0)
+ font->layout->descent = 0;
+ font->layout->leading = fontbbox.ymax - fontbbox.ymin;
+
/* 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 */
}
#else //HAVE_FREETYPE
-SWFFONT* swf_LoadTrueTypeFont(char*filename)
+SWFFONT* swf_LoadTrueTypeFont(const char*filename)
{
fprintf(stderr, "Warning: no freetype library- not able to load %s\n", filename);
return 0;
static int counter = 0;
-SWFFONT* swf_LoadT1Font(char*filename)
+SWFFONT* swf_LoadT1Font(const char*filename)
{
SWFFONT * font;
int nr;
#else
-SWFFONT* swf_LoadT1Font(char*filename)
+SWFFONT* swf_LoadT1Font(const char*filename)
{
fprintf(stderr, "Warning: no t1lib- not able to load %s\n", filename);
return 0;
return 0;
}
-SWFFONT* swf_LoadFont(char*filename)
+SWFFONT* swf_LoadFont(const char*filename)
{
int is_swf;
if(filename == 0)