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

    embedded bitmaps or not.
reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index 3eef5ab7369826d73876d953a2e069e91465e5f2..4ff3a07956a68eb868d92e1bb2f5e3ecd34dccdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
        * src/fcfreetype.c (FcFreeTypeQuery):
 

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 36982f43c9e8a25c0c3e508c33c8f241ac01b295..bff1058664b02a37b4ba0f030238adbb2043bac4 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -102,6 +102,7 @@ typedef int         FcBool;
 #define FC_CAPABILITY       "capability"       /* String */
 #define FC_FONTFORMAT      "fontformat"        /* String */
 #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_USER_CACHE_FILE         ".fonts.cache-"FC_CACHE_VERSION

diff --git a/fonts.conf.in b/fonts.conf.in
index 869fec1a77a42db1fd7503b0169c3185994b87e8..4f7a3084c9128268bd88baccdaa69c8e451c32d2 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -341,6 +341,10 @@
                <edit name="slant" mode="assign">
                        <const>oblique</const>
                </edit>
+                <!-- and disable embedded bitmaps for artificial oblique -->
+                <edit name="embeddedbitmap" mode="assign">
+                        <bool>false</bool>
+                </edit>
        </match>
 
 <!--

diff --git a/src/fcdefault.c b/src/fcdefault.c
index 956862cf0218a5c0d2329bb36480ff69d41c4c30..c309ef65afebb2fae250af8d1aeaee239e4666fd 100644 (file)
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -33,6 +33,7 @@ static struct {
     { FC_VERTICAL_LAYOUT,   FcFalse    },  /* FC_LOAD_VERTICAL_LAYOUT */
     { FC_AUTOHINT,         FcFalse     },  /* FC_LOAD_FORCE_AUTOHINT */
     { 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])

diff --git a/src/fcname.c b/src/fcname.c
index 825a7d58c8ba78000a63227a73bfe0dd03858001..0767e114d2fe14b1d3440bb4a9131dda7559fc6a 100644 (file)
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -72,6 +72,7 @@ static const FcObjectType _FcBaseObjectTypes[] = {
     { FC_CAPABILITY,   FcTypeString },
     { FC_FONTFORMAT,   FcTypeString },
     { FC_EMBOLDEN,     FcTypeBool },
+    { FC_EMBEDDED_BITMAP,   FcTypeBool },
 };
 
 #define NUM_OBJECT_TYPES    (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])