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 loadfont_scale = 4;
static int skip_unused = 1;
static int full_unicode = 0;
#ifdef HAVE_FREETYPE
+#ifdef HAVE_FT2BUILD_H
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_SIZES_H
+#include FT_SFNT_NAMES_H
+#include FT_TRUETYPE_IDS_H
+#include FT_OUTLINE_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)
{
drawer_t* draw = (drawer_t*)user;
FPOINT to;
- to.x = _to->x/(float)FT_SUBPIXELS;
- to.y = -_to->y/(float)FT_SUBPIXELS;
+ 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/(float)FT_SUBPIXELS;
- to.y = -_to->y/(float)FT_SUBPIXELS;
+ 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/(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;
+ 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/(float)FT_SUBPIXELS;
- to.y = -_to->y/(float)FT_SUBPIXELS;
- c.x = _c->x/(float)FT_SUBPIXELS;
- c.y = -_c->y/(float)FT_SUBPIXELS;
+ 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;
}
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*FT_SCALE, 16*FT_SCALE);
+ 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);
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)
g = -1;
font->ascii2glyph[t] = g;
if(g>=0) {
- max_unicode = t;
+ max_unicode = t+1;
if(!font->glyph2ascii[g]) {
font->glyph2ascii[g] = t;
}
continue;
}
- draw.finish(&draw);
-
#if 0
if(bbox.xMin > 0) {
font->glyph[font->numchars].advance = (bbox.xMax*FT_SCALE)/FT_SUBPIXELS;