Change comments a bit in fonts.conf.in

[fontconfig.git] / fontconfig / fontconfig.h

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 73b949ececd3fdc1c8bce17099638642dea02aec..de82f280e22f30fe51167aa17134b07e9107ab0f 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.26 2002/08/19 19:32:04 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.30 2002/09/26 00:17:27 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -41,6 +41,18 @@ typedef int          FcBool;
 
 #define FC_VERSION     ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
+/*
+ * Current font cache file format version
+ * This is appended to the cache files so that multiple
+ * versions of the library will peacefully coexist
+ *
+ * Change this value whenever the disk format for the cache file
+ * changes in any non-compatible way.  Try to avoid such changes as
+ * it means multiple copies of the font information.
+ */
+
+#define FC_CACHE_VERSION    "1"
+
 #define FcTrue         1
 #define FcFalse                0
 
@@ -70,10 +82,11 @@ typedef int         FcBool;
 #define FC_MINSPACE        "minspace"          /* Bool use minimum line spacing */
 #define FC_SOURCE          "source"            /* String (X11, freetype) */
 #define FC_CHARSET         "charset"           /* CharSet */
-#define FC_LANG                    "lang"              /* String OS/2 CodePageRange */
+#define FC_LANG                    "lang"              /* String RFC 3066 langs */
+#define FC_FONTVERSION     "fontversion"       /* Int from 'head' table */
 
-#define FC_DIR_CACHE_FILE          "fonts.cache"
-#define FC_USER_CACHE_FILE         ".fonts.cache"
+#define FC_DIR_CACHE_FILE          "fonts.cache-"FC_CACHE_VERSION
+#define FC_USER_CACHE_FILE         ".fonts.cache-"FC_CACHE_VERSION
 
 /* Adjust outline rasterizer */
 #define FC_CHAR_WIDTH      "charwidth" /* Int */
@@ -95,11 +108,12 @@ typedef int                FcBool;
 #define FC_CHARCELL        110
 
 /* sub-pixel order */
-#define FC_RGBA_NONE       0
+#define FC_RGBA_UNKNOWN            0
 #define FC_RGBA_RGB        1
 #define FC_RGBA_BGR        2
 #define FC_RGBA_VRGB       3
 #define FC_RGBA_VBGR       4
+#define FC_RGBA_NONE       5
 
 typedef enum _FcType {
     FcTypeVoid,