Change RCS tag

[fontconfig.git] / src / fcint.h

diff --git a/src/fcint.h b/src/fcint.h
index 105a5511ac51b98ee432546a511ee220d6d6dd71..1a9ee549d75ee87325927f494418be929f6384a5 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fcint.h,v 1.24 2002/08/22 07:36:44 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcint.h,v 1.27 2002/08/31 22:17:32 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -97,7 +97,7 @@ typedef struct _FcSymbolic {
 #define FC_MEM_NUM         29
 
 typedef enum _FcValueBinding {
-    FcValueBindingWeak, FcValueBindingStrong
+    FcValueBindingWeak, FcValueBindingStrong, FcValueBindingSame
 } FcValueBinding;
 
 typedef struct _FcValueList {
@@ -238,18 +238,20 @@ typedef struct _FcGlobalCacheFile {
     FcChar8                    *name;
 } FcGlobalCacheFile;
 
+typedef struct _FcGlobalCacheDir FcGlobalCacheDir;
+
 typedef struct _FcGlobalCacheSubdir {
     struct _FcGlobalCacheSubdir        *next;
-    FcChar8                    *file;
+    FcGlobalCacheDir           *ent;
 } FcGlobalCacheSubdir;
 
-typedef struct _FcGlobalCacheDir {
+struct _FcGlobalCacheDir {
     struct _FcGlobalCacheDir   *next;
     FcGlobalCacheInfo          info;
     int                                len;
     FcGlobalCacheFile          *ents[FC_GLOBAL_CACHE_FILE_HASH_SIZE];
     FcGlobalCacheSubdir                *subdirs;
-} FcGlobalCacheDir;
+};
 
 typedef struct _FcGlobalCache {
     FcGlobalCacheDir           *ents[FC_GLOBAL_CACHE_DIR_HASH_SIZE];
@@ -342,6 +344,10 @@ void
 FcGlobalCacheReferenced (FcGlobalCache     *cache,
                         FcGlobalCacheInfo  *info);
 
+void
+FcGlobalCacheReferenceSubdir (FcGlobalCache *cache,
+                             const FcChar8 *dir);
+
 FcGlobalCacheDir *
 FcGlobalCacheDirGet (FcGlobalCache  *cache,
                     const FcChar8  *dir,
@@ -433,15 +439,9 @@ FcNameUnparseCharSet (FcStrBuf *buf, const FcCharSet *c);
 FcCharSet *
 FcNameParseCharSet (FcChar8 *string);
 
-FcChar32
-FcFreeTypeUcs4ToPrivate (FcChar32 ucs4, const FcCharMap *map);
-
-FcChar32
-FcFreeTypePrivateToUcs4 (FcChar32 private, const FcCharMap *map);
+FcCharLeaf *
+FcCharSetFindLeafCreate (FcCharSet *fcs, FcChar32 ucs4);
 
-const FcCharMap *
-FcFreeTypeGetPrivateMap (FT_Encoding encoding);
-    
 /* fcdbg.c */
 void
 FcValueListPrint (const FcValueList *l);
@@ -477,6 +477,15 @@ FcFreeTypeIsExclusiveLang (const FcChar8  *lang);
 FcBool
 FcFreeTypeHasLang (FcPattern *pattern, const FcChar8 *lang);
 
+FcChar32
+FcFreeTypeUcs4ToPrivate (FcChar32 ucs4, const FcCharMap *map);
+
+FcChar32
+FcFreeTypePrivateToUcs4 (FcChar32 private, const FcCharMap *map);
+
+const FcCharMap *
+FcFreeTypeGetPrivateMap (FT_Encoding encoding);
+    
 /* fcfs.c */
 /* fcgram.y */
 int
@@ -634,4 +643,7 @@ FcStrBufData (FcStrBuf *buf, const FcChar8 *s, int len);
 int
 FcStrCmpIgnoreBlanksAndCase (const FcChar8 *s1, const FcChar8 *s2);
 
+FcBool
+FcStrUsesHome (const FcChar8 *s);
+
 #endif /* _FC_INT_H_ */