Add FC_EMBEDDED_BITMAP object type to tell Xft/Cairo whether to load

embedded bitmaps or not.
reviewed by: plam
This commit is contained in:
Patrick Lam 2005-10-26 06:34:29 +00:00
parent 961d9b9993
commit 720298e773
5 changed files with 18 additions and 0 deletions

View File

@ -1,3 +1,14 @@
2005-10-25 Jinghua Luo <sunmoon1997@gmail.com>
reviewed by: plam
* fontconfig/fonts.conf.in:
* fontconfig/fontconfig.h:
* src/fcdefault.c:
* src/fcname.c:
Add FC_EMBEDDED_BITMAP object type to tell Xft/Cairo whether
to load embedded bitmaps or not.
2005-10-25 Patrick Lam <plam@mit.edu> 2005-10-25 Patrick Lam <plam@mit.edu>
* src/fcfreetype.c (FcFreeTypeQuery): * src/fcfreetype.c (FcFreeTypeQuery):

View File

@ -102,6 +102,7 @@ typedef int FcBool;
#define FC_CAPABILITY "capability" /* String */ #define FC_CAPABILITY "capability" /* String */
#define FC_FONTFORMAT "fontformat" /* String */ #define FC_FONTFORMAT "fontformat" /* String */
#define FC_EMBOLDEN "embolden" /* Bool - true if emboldening needed*/ #define FC_EMBOLDEN "embolden" /* Bool - true if emboldening needed*/
#define FC_EMBEDDED_BITMAP "embeddedbitmap" /* Bool - true to enable embedded bitmaps */
#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION #define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION
#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION #define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION

View File

@ -341,6 +341,10 @@
<edit name="slant" mode="assign"> <edit name="slant" mode="assign">
<const>oblique</const> <const>oblique</const>
</edit> </edit>
<!-- and disable embedded bitmaps for artificial oblique -->
<edit name="embeddedbitmap" mode="assign">
<bool>false</bool>
</edit>
</match> </match>
<!-- <!--

View File

@ -33,6 +33,7 @@ static struct {
{ FC_VERTICAL_LAYOUT, FcFalse }, /* FC_LOAD_VERTICAL_LAYOUT */ { FC_VERTICAL_LAYOUT, FcFalse }, /* FC_LOAD_VERTICAL_LAYOUT */
{ FC_AUTOHINT, FcFalse }, /* FC_LOAD_FORCE_AUTOHINT */ { FC_AUTOHINT, FcFalse }, /* FC_LOAD_FORCE_AUTOHINT */
{ FC_GLOBAL_ADVANCE, FcTrue }, /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */ { FC_GLOBAL_ADVANCE, FcTrue }, /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */
{ FC_EMBEDDED_BITMAP, FcTrue }, /* !FC_LOAD_NO_BITMAP */
}; };
#define NUM_FC_BOOL_DEFAULTS (int) (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0]) #define NUM_FC_BOOL_DEFAULTS (int) (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0])

View File

@ -72,6 +72,7 @@ static const FcObjectType _FcBaseObjectTypes[] = {
{ FC_CAPABILITY, FcTypeString }, { FC_CAPABILITY, FcTypeString },
{ FC_FONTFORMAT, FcTypeString }, { FC_FONTFORMAT, FcTypeString },
{ FC_EMBOLDEN, FcTypeBool }, { FC_EMBOLDEN, FcTypeBool },
{ FC_EMBEDDED_BITMAP, FcTypeBool },
}; };
#define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0]) #define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])