Bump version number to 2.3.91.

[fontconfig.git] / fontconfig / fontconfig.h

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index ab312da8110b190d0ed76d1c73a8daf0c7410217..34e7b8bdde964674053ac14904db8f50d2e88005 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -39,8 +39,8 @@ typedef int           FcBool;
  */
 
 #define FC_MAJOR       2
-#define FC_MINOR       2
-#define FC_REVISION    97
+#define FC_MINOR       3
+#define FC_REVISION    91
 
 #define FC_VERSION     ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -54,7 +54,7 @@ typedef int           FcBool;
  * it means multiple copies of the font information.
  */
 
-#define FC_CACHE_VERSION    "1"
+#define FC_CACHE_VERSION    "2"
 
 #define FcTrue         1
 #define FcFalse                0
@@ -85,7 +85,7 @@ typedef int           FcBool;
 #define FC_DPI             "dpi"               /* double */
 #define FC_RGBA                    "rgba"              /* Int */
 #define FC_MINSPACE        "minspace"          /* Bool use minimum line spacing */
-#define FC_SOURCE          "source"            /* String (X11, freetype) */
+#define FC_SOURCE          "source"            /* String (deprecated) */
 #define FC_CHARSET         "charset"           /* CharSet */
 #define FC_LANG                    "lang"              /* String RFC 3066 langs */
 #define FC_FONTVERSION     "fontversion"       /* Int from 'head' table */
@@ -200,18 +200,24 @@ typedef struct _FcPattern   FcPattern;
 
 typedef struct _FcLangSet   FcLangSet;
 
+#define FC_BANK_DYNAMIC 0
+#define FC_BANK_FIRST 1
+
 typedef struct _FcValue {
     FcType     type;
     union {
-       const FcChar8   *s;
+       const FcChar8  *s;
+       int             s_off;
        int             i;
        FcBool          b;
        double          d;
-       const FcMatrix  *m;
-       const FcCharSet *c;
+       const FcMatrix  *m;
+       const FcCharSet *c;
+       int             c_off;
        void            *f;
        const FcPattern *p;
-       const FcLangSet *l;
+       const FcLangSet *l;
+       int             l_off; // this is a difference of char *s
     } u;
 } FcValue;
 
@@ -749,9 +755,13 @@ FcStrCopy (const FcChar8 *s);
 FcChar8 *
 FcStrCopyFilename (const FcChar8 *s);
     
-#define FcIsUpper(c)   (('A' <= (c) && (c) <= 'Z'))
-#define FcIsLower(c)   (('a' <= (c) && (c) <= 'z'))
-#define FcToLower(c)   (FcIsUpper(c) ? (c) - 'A' + 'a' : (c))
+/* These are ASCII only, suitable only for pattern element names */
+#define FcIsUpper(c)   ((0101 <= (c) && (c) <= 0132))
+#define FcIsLower(c)   ((0141 <= (c) && (c) <= 0172))
+#define FcToLower(c)   (FcIsUpper(c) ? (c) - 0101 + 0141 : (c))
+
+FcChar8 *
+FcStrDowncase (const FcChar8 *s);
 
 int
 FcStrCmpIgnoreCase (const FcChar8 *s1, const FcChar8 *s2);