walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #46, #47 fontconfig should retrieve type 1 font information from 

FontInfo dictionary Patch provided by g2@magestudios.net (Gerard
    Escalante)
This commit is contained in:
Keith Packard 2003-04-11 22:17:11 +00:00
parent cc30f9ca54
commit d6ea834746
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/fcfreetype.c
View File

@ -31,6 +31,7 @@
#include <freetype/tttables.h> #include <freetype/tttables.h>
#include <freetype/ftsnames.h> #include <freetype/ftsnames.h>
#include <freetype/ttnameid.h> #include <freetype/ttnameid.h>
#include <freetype/t1tables.h>
/* /*
* Keep Han languages separated by eliminating languages * Keep Han languages separated by eliminating languages
@ -130,6 +131,7 @@ FcFreeTypeQuery (const FcChar8 *file,
FcChar8 *style; FcChar8 *style;
int spacing; int spacing;
TT_OS2 *os2; TT_OS2 *os2;
PS_FontInfoRec psfontinfo;
TT_Header *head; TT_Header *head;
const FcChar8 *exclusiveLang = 0; const FcChar8 *exclusiveLang = 0;
FT_SfntName sname; FT_SfntName sname;
@ -564,6 +566,48 @@ FcFreeTypeQuery (const FcChar8 *file,
case 9: width = FC_WIDTH_ULTRAEXPANDED; break; case 9: width = FC_WIDTH_ULTRAEXPANDED; break;
} }
} }
/*
* Type 1: Check for FontInfo dictionary information
* Code from g2@magestudios.net (Gerard Escalante)
*/
if (FT_Get_PS_Font_Info(face, &psfontinfo) == 0)
{
if (strcasecmp("thin", psfontinfo.weight) == 0)
weight = FC_WEIGHT_THIN;
else if (strcasecmp("extralight", psfontinfo.weight) == 0)
weight = FC_WEIGHT_EXTRALIGHT;
else if (strcasecmp("ultralight", psfontinfo.weight) == 0)
weight = FC_WEIGHT_ULTRALIGHT;
else if (strcasecmp("light", psfontinfo.weight) == 0)
weight = FC_WEIGHT_LIGHT;
else if (strcasecmp("regular", psfontinfo.weight) == 0)
weight = FC_WEIGHT_REGULAR;
else if (strcasecmp("normal", psfontinfo.weight) == 0)
weight = FC_WEIGHT_NORMAL;
else if (strcasecmp("medium", psfontinfo.weight) == 0)
weight = FC_WEIGHT_MEDIUM;
else if (strcasecmp("demibold", psfontinfo.weight) == 0)
weight = FC_WEIGHT_DEMIBOLD;
else if (strcasecmp("semibold", psfontinfo.weight) == 0)
weight = FC_WEIGHT_SEMIBOLD;
else if (strcasecmp("extrabold", psfontinfo.weight) == 0)
weight = FC_WEIGHT_EXTRABOLD;
else if (strcasecmp("ultrabold", psfontinfo.weight) == 0)
weight = FC_WEIGHT_EXTRABOLD;
else if (strcasecmp("bold", psfontinfo.weight) == 0)
weight = FC_WEIGHT_BOLD;
else if (strcasecmp("black", psfontinfo.weight) == 0)
weight = FC_WEIGHT_BLACK;
else if (strcasecmp("heavy", psfontinfo.weight) == 0)
weight = FC_WEIGHT_BLACK;
if (psfontinfo.italic_angle < 0)
slant = FC_SLANT_ITALIC;
else if (psfontinfo.italic_angle >= 0)
slant = FC_SLANT_ROMAN;
}
if (!FcPatternAddInteger (pat, FC_SLANT, slant)) if (!FcPatternAddInteger (pat, FC_SLANT, slant))
goto bail1; goto bail1;