Change RCS tag, add FcLangSetContains

diff --git a/fontconfig/fcfreetype.h b/fontconfig/fcfreetype.h
index f0299effaddbd4ac54858f5a08d9795d7445e53e..037d7e10577fe8a5304cf6d4eeb49a7264742044 100644 (file)
--- a/fontconfig/fcfreetype.h
+++ b/fontconfig/fcfreetype.h
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/lib/fontconfig/fontconfig/fcfreetype.h,v 1.2 2002/02/15 06:01:27 keithp Exp $
+ * $RCSId: xc/lib/fontconfig/fontconfig/fcfreetype.h,v 1.2 2002/02/15 06:01:27 keithp Exp $
  *
- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2001 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that

diff --git a/fontconfig/fcprivate.h b/fontconfig/fcprivate.h
index c12eb0a42dfb0487e2681000d1939acbddab7fdc..477e1df21dc217df8a576c1be811bd71ca0baaee 100644 (file)
--- a/fontconfig/fcprivate.h
+++ b/fontconfig/fcprivate.h
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.5 2002/08/19 19:32:04 keithp Exp $
+ * $RCSId: xc/lib/fontconfig/fontconfig/fcprivate.h,v 1.5 2002/08/19 19:32:04 keithp Exp $
  *
- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2001 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index ae5dde5ee26c0e842b2c1817cd411a00c431202d..ac2355f451ea38a7849aeeee939c303b40aab8bc 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -1,7 +1,7 @@
 /*
- * $XFree86: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.30 2002/09/26 00:17:27 keithp Exp $
+ * $RCSId: 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.
+ * Copyright © 2001 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -459,6 +459,9 @@ FcLangSetHasLang (const FcLangSet *ls, const FcChar8 *lang);
 FcLangResult
 FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb);
 
+FcBool
+FcLangSetContains (const FcLangSet *lsa, const FcLangSet *lsb);
+
 FcBool
 FcLangSetEqual (const FcLangSet *lsa, const FcLangSet *lsb);
 
@@ -703,7 +706,9 @@ FcStrCopy (const FcChar8 *s);
 FcChar8 *
 FcStrCopyFilename (const FcChar8 *s);
     
-#define FcToLower(c)   (('A' <= (c) && (c) <= 'Z') ? (c) - 'A' + 'a' : (c))
+#define FcIsUpper(c)   (('A' <= (c) && (c) <= 'Z'))
+#define FcIsLower(c)   (('a' <= (c) && (c) <= 'z'))
+#define FcToLower(c)   (FcIsUpper(c) ? (c) - 'A' + 'a' : (c))
 
 int
 FcStrCmpIgnoreCase (const FcChar8 *s1, const FcChar8 *s2);