Add contains/not_contains, fix LangSet equal operator to use FcLangEqual

[fontconfig.git] / src / fclist.c

diff --git a/src/fclist.c b/src/fclist.c
index b87e92f55c6d4fafbb70c6e1bdababd1450bb9e1..6c04a1ad124e70e48885d6a5b947db3525ed76be 100644 (file)
--- a/src/fclist.c
+++ b/src/fclist.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fclist.c,v 1.5 2002/06/03 08:31:15 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fclist.c,v 1.10 2002/08/22 07:36:44 keithp Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -142,7 +142,7 @@ FcListValueListEqual (FcValueList   *v1orig,
     for (v1 = v1orig; v1; v1 = v1->next)
     {
        for (v2 = v2orig; v2; v2 = v2->next)
-           if (FcConfigCompareValue (v1->value, FcOpEqual, v2->value))
+           if (FcValueEqual (v1->value, v2->value))
                break;
        if (!v2)
            return FcFalse;
@@ -150,7 +150,7 @@ FcListValueListEqual (FcValueList   *v1orig,
     for (v2 = v2orig; v2; v2 = v2->next)
     {
        for (v1 = v1orig; v1; v1 = v1->next)
-           if (FcConfigCompareValue (v1->value, FcOpEqual, v2->value))
+           if (FcValueEqual (v1->value, v2->value))
                break;
        if (!v1)
            return FcFalse;
@@ -171,7 +171,7 @@ FcListPatternEqual (FcPattern       *p1,
        e1 = FcPatternFindElt (p1, os->objects[i]);
        e2 = FcPatternFindElt (p2, os->objects[i]);
        if (!e1 && !e2)
-           return FcTrue;
+           continue;
        if (!e1 || !e2)
            return FcFalse;
        if (!FcListValueListEqual (e1->values, e2->values))
@@ -247,6 +247,8 @@ FcListValueHash (FcValue    v)
        return FcCharSetCount (v.u.c);
     case FcTypeFTFace:
        return (FcChar32) v.u.f;
+    case FcTypeLangSet:
+       return FcLangSetHash (v.u.l);
     }
     return 0;
 }