fontconfig: some config file parsing mistakes

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index c41492fe624bfd9348286ff2fd43bd5ee0da9a27..ccd96510ecceb509409cb19a204ea3339378174e 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -154,7 +154,7 @@ FcFreeTypeQuery (const FcChar8      *file,
     if (!FcPatternAddString (pat, FC_SOURCE, (FcChar8 *) "FreeType"))
        goto bail1;
 
-#if 0
+#if 1
     if ((face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) != 0)
        if (!FcPatternAddInteger (pat, FC_SPACING, FC_MONO))
            goto bail1;

diff --git a/src/fcint.h b/src/fcint.h
index 1d0c07036dff13b2e5061ffb0ca3a008f126b46b..0bd06f559c54c4ac6d7d2d18bf804c1508d0715e 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -327,9 +327,6 @@ FcValuePrint (FcValue v);
 void
 FcValueListPrint (FcValueList *l);
 
-void
-FcPatternPrint (FcPattern *p);
-
 void
 FcOpPrint (FcOp op);
 
@@ -433,12 +430,6 @@ FcMemFree (int kind, int size);
 FcBool
 FcNameBool (FcChar8 *v, FcBool *result);
 
-FcBool
-FcStrBufChar (FcStrBuf *buf, FcChar8 c);
-
-FcBool
-FcStrBufString (FcStrBuf *buf, const FcChar8 *s);
-
 /* fcpat.c */
 void
 FcValueListDestroy (FcValueList *l);

diff --git a/src/fcxml.c b/src/fcxml.c
index 64a5269bebc70e1d2101e0c92cb50d7661604acb..bbe41fc1247334c70ecea4c11b5baa3843d897f4 100644 (file)
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/fontconfig/src/fcxml.c,v 1.3 2002/02/18 22:29:28 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcxml.c,v 1.4 2002/02/20 00:32:30 keithp Exp $
  *
  * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -1097,9 +1097,13 @@ FcPopExpr (FcConfigParse *parse)
        break;
     case FcVStackString:
     case FcVStackFamily:
+       expr = FcExprCreateString (vstack->u.string);
+       break;
     case FcVStackField:
+       expr = FcExprCreateField ((char *) vstack->u.string);
+       break;
     case FcVStackConstant:
-       expr = FcExprCreateString (vstack->u.string);
+       expr = FcExprCreateConst (vstack->u.string);
        break;
     case FcVStackPrefer:
     case FcVStackAccept: