Add FcMatchScan to resolve Delicious font matching issues (bug #6769)

[fontconfig.git] / fontconfig / fontconfig.h

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 218fb1d4593a9cce3eab06d90ec9b7cfeb117219..15e8f7fffba0d8cece4fe9efc718d367d0a0ac5b 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -46,7 +46,7 @@ typedef int           FcBool;
 
 #define FC_MAJOR       2
 #define FC_MINOR       3
-#define FC_REVISION    94
+#define FC_REVISION    95
 
 #define FC_VERSION     ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -103,6 +103,7 @@ typedef int         FcBool;
 #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_DECORATIVE      "decorative"        /* Bool - true if style is a decorative variant */
 
 #define FC_CACHE_SUFFIX                    ".cache-"FC_CACHE_VERSION
 #define FC_DIR_CACHE_FILE          "fonts.cache-"FC_CACHE_VERSION
@@ -211,18 +212,15 @@ typedef struct _FcLangSet   FcLangSet;
 typedef struct _FcValue {
     FcType     type;
     union {
-       const FcChar8  *s;
-       int             s_off;
+       const FcChar8   *s;
        int             i;
        FcBool          b;
        double          d;
-       const FcMatrix  *m;
-       const FcCharSet *c;
-       int             c_off;
+       const FcMatrix  *m;
+       const FcCharSet *c;
        void            *f;
        const FcPattern *p;
-       const FcLangSet *l;
-       int             l_off; /* this is a difference of char *s */
+       const FcLangSet *l;
     } u;
 } FcValue;
 
@@ -239,7 +237,7 @@ typedef struct _FcObjectSet {
 } FcObjectSet;
     
 typedef enum _FcMatchKind {
-    FcMatchPattern, FcMatchFont
+    FcMatchPattern, FcMatchFont, FcMatchScan
 } FcMatchKind;
 
 typedef enum _FcLangResult {
@@ -278,12 +276,6 @@ _FCFUNCPROTOBEGIN
 FcBool
 FcDirCacheValid (const FcChar8 *cache_file);
 
-FcBool
-FcDirCacheHasCurrentArch (const FcChar8 *dir);
-
-FcBool
-FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config);
-
 /* fcblanks.c */
 FcBlanks *
 FcBlanksCreate (void);
@@ -328,10 +320,6 @@ FcConfigBuildFonts (FcConfig *config);
 FcStrList *
 FcConfigGetFontDirs (FcConfig   *config);
 
-const FcChar8 *
-FcConfigNormalizeFontDir (FcConfig     *config, 
-                         const FcChar8 *d);
-
 FcStrList *
 FcConfigGetConfigDirs (FcConfig   *config);
 
@@ -668,9 +656,6 @@ FcNameParse (const FcChar8 *name);
 FcChar8 *
 FcNameUnparse (FcPattern *pat);
 
-FcChar8 *
-FcNameUnparseEscaped (FcPattern *pat, FcBool escape);
-
 /* fcpat.c */
 FcPattern *
 FcPatternCreate (void);