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

Set spacing to mono if every encoded glyph is the same width

This commit is contained in:
Keith Packard 2003-03-28 17:08:35 +00:00
parent 7dbeec1738
commit 848d32bd3f
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fontconfig/fcfreetype.h
View File

@ -29,6 +29,9 @@
FT_UInt FT_UInt
FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4); FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4);
FcCharSet *
FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing);
FcCharSet * FcCharSet *
FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks); FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks);

46
src/fcfreetype.c
View File

@ -128,6 +128,7 @@ FcFreeTypeQuery (const FcChar8 *file,
FT_Library ftLibrary; FT_Library ftLibrary;
FcChar8 *family; FcChar8 *family;
FcChar8 *style; FcChar8 *style;
int spacing;
TT_OS2 *os2; TT_OS2 *os2;
TT_Header *head; TT_Header *head;
const FcChar8 *exclusiveLang = 0; const FcChar8 *exclusiveLang = 0;
@ -577,7 +578,7 @@ FcFreeTypeQuery (const FcChar8 *file,
/* /*
* Compute the unicode coverage for the font * Compute the unicode coverage for the font
*/ */
cs = FcFreeTypeCharSet (face, blanks); cs = FcFreeTypeCharSetAndSpacing (face, blanks, &spacing);
if (!cs) if (!cs)
goto bail1; goto bail1;
@ -601,6 +602,10 @@ FcFreeTypeQuery (const FcChar8 *file,
if (!FcPatternAddLangSet (pat, FC_LANG, ls)) if (!FcPatternAddLangSet (pat, FC_LANG, ls))
goto bail2; goto bail2;
if (spacing != FC_PROPORTIONAL)
if (!FcPatternAddInteger (pat, FC_SPACING, spacing))
goto bail2;
/* /*
* Drop our reference to the charset * Drop our reference to the charset
*/ */
@ -1217,7 +1222,8 @@ FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4)
static FcBool static FcBool
FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4, FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4,
FT_UInt glyph, FcBlanks *blanks) FT_UInt glyph, FcBlanks *blanks,
FT_Pos *advance)
{ {
FT_Int load_flags = FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING; FT_Int load_flags = FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
FT_GlyphSlot slot; FT_GlyphSlot slot;
@ -1239,6 +1245,8 @@ FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4,
if (!glyph) if (!glyph)
return FcFalse; return FcFalse;
*advance = slot->metrics.horiAdvance;
switch (slot->format) { switch (slot->format) {
case ft_glyph_format_bitmap: case ft_glyph_format_bitmap:
/* /*
@ -1269,7 +1277,7 @@ FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4,
} }
FcCharSet * FcCharSet *
FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks) FcFreeTypeCharSetAndSpacing (FT_Face face, FcBlanks *blanks, int *spacing)
{ {
FcChar32 page, off, max, ucs4; FcChar32 page, off, max, ucs4;
#ifdef CHECK #ifdef CHECK
@ -1281,6 +1289,8 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks)
int o; int o;
int i; int i;
FT_UInt glyph; FT_UInt glyph;
FT_Pos advance, all_advance = 0;
FcBool has_advance = FcFalse, fixed_advance = FcTrue;
fcs = FcCharSetCreate (); fcs = FcCharSetCreate ();
if (!fcs) if (!fcs)
@ -1301,8 +1311,16 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks)
{ {
ucs4 = map->ent[i].bmp; ucs4 = map->ent[i].bmp;
glyph = FT_Get_Char_Index (face, map->ent[i].encode); glyph = FT_Get_Char_Index (face, map->ent[i].encode);
if (glyph && FcFreeTypeCheckGlyph (face, ucs4, glyph, blanks)) if (glyph &&
FcFreeTypeCheckGlyph (face, ucs4, glyph, blanks, &advance))
{ {
if (!has_advance)
{
has_advance = FcTrue;
all_advance = advance;
}
else if (advance != all_advance)
fixed_advance = FcFalse;
leaf = FcCharSetFindLeafCreate (fcs, ucs4); leaf = FcCharSetFindLeafCreate (fcs, ucs4);
if (!leaf) if (!leaf)
goto bail1; goto bail1;
@ -1342,8 +1360,15 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks)
{ {
glyph = FT_Get_Char_Index (face, ucs4); glyph = FT_Get_Char_Index (face, ucs4);
if (glyph && FcFreeTypeCheckGlyph (face, ucs4, if (glyph && FcFreeTypeCheckGlyph (face, ucs4,
glyph, blanks)) glyph, blanks, &advance))
{ {
if (!has_advance)
{
has_advance = FcTrue;
all_advance = advance;
}
else if (advance != all_advance)
fixed_advance = FcFalse;
if (!leaf) if (!leaf)
{ {
leaf = FcCharSetFindLeafCreate (fcs, ucs4); leaf = FcCharSetFindLeafCreate (fcs, ucs4);
@ -1391,6 +1416,10 @@ FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks)
printf ("Bitmap extra char 0x%x\n", ucs4); printf ("Bitmap extra char 0x%x\n", ucs4);
} }
#endif #endif
if (fixed_advance)
*spacing = FC_MONO;
else
*spacing = FC_PROPORTIONAL;
return fcs; return fcs;
bail1: bail1:
FcCharSetDestroy (fcs); FcCharSetDestroy (fcs);
@ -1398,3 +1427,10 @@ bail0:
return 0; return 0;
} }
FcCharSet *
FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks)
{
int spacing;
return FcFreeTypeCharSetAndSpacing (face, blanks, &spacing);
}