/*
- * $XFree86: xc/lib/Fc/xftname.c,v 1.10 2001/03/30 18:50:18 keithp Exp $
+ * $RCSId: xc/lib/fontconfig/src/fcname.c,v 1.15 2002/09/26 00:17:28 keithp Exp $
*
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2000 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
#include <stdio.h>
#include "fcint.h"
+/* Please do not revoke any of these bindings. */
static const FcObjectType _FcBaseObjectTypes[] = {
+ { "__DUMMY__", FcTypeVoid, },
{ FC_FAMILY, FcTypeString, },
+ { FC_FAMILYLANG, FcTypeString, },
{ FC_STYLE, FcTypeString, },
+ { FC_STYLELANG, FcTypeString, },
+ { FC_FULLNAME, FcTypeString, },
+ { FC_FULLNAMELANG, FcTypeString, },
{ FC_SLANT, FcTypeInteger, },
{ FC_WEIGHT, FcTypeInteger, },
+ { FC_WIDTH, FcTypeInteger, },
{ FC_SIZE, FcTypeDouble, },
+ { FC_ASPECT, FcTypeDouble, },
{ FC_PIXEL_SIZE, FcTypeDouble, },
{ FC_SPACING, FcTypeInteger, },
{ FC_FOUNDRY, FcTypeString, },
/* { FC_CORE, FcTypeBool, }, */
{ FC_ANTIALIAS, FcTypeBool, },
+ { FC_HINT_STYLE, FcTypeInteger, },
+ { FC_HINTING, FcTypeBool, },
+ { FC_VERTICAL_LAYOUT, FcTypeBool, },
+ { FC_AUTOHINT, FcTypeBool, },
+ { FC_GLOBAL_ADVANCE, FcTypeBool, },
/* { FC_XLFD, FcTypeString, }, */
{ FC_FILE, FcTypeString, },
{ FC_INDEX, FcTypeInteger, },
{ FC_RASTERIZER, FcTypeString, },
{ FC_OUTLINE, FcTypeBool, },
{ FC_SCALABLE, FcTypeBool, },
+ { FC_DPI, FcTypeDouble },
{ FC_RGBA, FcTypeInteger, },
{ FC_SCALE, FcTypeDouble, },
-/* { FC_RENDER, FcTypeBool, },*/
{ FC_MINSPACE, FcTypeBool, },
+/* { FC_RENDER, FcTypeBool, },*/
{ FC_CHAR_WIDTH, FcTypeInteger },
{ FC_CHAR_HEIGHT, FcTypeInteger },
{ FC_MATRIX, FcTypeMatrix },
{ FC_CHARSET, FcTypeCharSet },
- { FC_LANG, FcTypeString },
+ { FC_LANG, FcTypeLangSet },
+ { FC_FONTVERSION, FcTypeInteger },
+ { FC_CAPABILITY, FcTypeString },
+ { FC_FONTFORMAT, FcTypeString },
+ { FC_EMBOLDEN, FcTypeBool },
+ { FC_EMBEDDED_BITMAP, FcTypeBool },
};
#define NUM_OBJECT_TYPES (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])
+static FcObjectType * _FcUserObjectNames = 0;
+static int user_obj_alloc = 0;
+static int next_basic_offset = NUM_OBJECT_TYPES;
+
typedef struct _FcObjectTypeList FcObjectTypeList;
struct _FcObjectTypeList {
const FcObjectTypeList *next;
const FcObjectType *types;
int ntypes;
+ int basic_offset;
};
static const FcObjectTypeList _FcBaseObjectTypesList = {
0,
_FcBaseObjectTypes,
- NUM_OBJECT_TYPES
+ NUM_OBJECT_TYPES,
+ 0
};
static const FcObjectTypeList *_FcObjectTypes = &_FcBaseObjectTypesList;
l = (FcObjectTypeList *) malloc (sizeof (FcObjectTypeList));
if (!l)
return FcFalse;
+ FcMemAlloc (FC_MEM_OBJECTTYPE, sizeof (FcObjectTypeList));
l->types = types;
l->ntypes = ntypes;
l->next = _FcObjectTypes;
+ l->basic_offset = next_basic_offset;
+ next_basic_offset += ntypes;
_FcObjectTypes = l;
return FcTrue;
}
-FcBool
-FcNameUnregisterObjectTypes (const FcObjectType *types, int ntypes)
+static FcBool
+FcNameUnregisterObjectTypesFree (const FcObjectType *types, int ntypes,
+ FcBool do_free)
{
const FcObjectTypeList *l, **prev;
if (l->types == types && l->ntypes == ntypes)
{
*prev = l->next;
- free ((void *) l);
+ if (do_free) {
+ FcMemFree (FC_MEM_OBJECTTYPE, sizeof (FcObjectTypeList));
+ free ((void *) l);
+ }
return FcTrue;
}
}
return FcFalse;
}
+FcBool
+FcNameUnregisterObjectTypes (const FcObjectType *types, int ntypes)
+{
+ return FcNameUnregisterObjectTypesFree (types, ntypes, FcTrue);
+}
+
const FcObjectType *
FcNameGetObjectType (const char *object)
{
for (l = _FcObjectTypes; l; l = l->next)
{
+ if (l == (FcObjectTypeList*)_FcUserObjectNames)
+ continue;
+
for (i = 0; i < l->ntypes; i++)
{
t = &l->types[i];
- if (!FcStrCmpIgnoreCase ((FcChar8 *) object, (FcChar8 *) t->object))
+ if (!strcmp (object, t->object))
return t;
}
}
return 0;
}
+#define OBJECT_HASH_SIZE 31
+struct objectBucket {
+ struct objectBucket *next;
+ FcChar32 hash;
+ int id;
+};
+static struct objectBucket *FcObjectBuckets[OBJECT_HASH_SIZE];
+
+/* Design constraint: biggest_known_ntypes must never change
+ * after any call to FcNameRegisterObjectTypes. */
+static const FcObjectType *biggest_known_types = _FcBaseObjectTypes;
+static FcBool allocated_biggest_known_types;
+static int biggest_known_ntypes = NUM_OBJECT_TYPES;
+static int biggest_known_count = 0;
+static char * biggest_ptr;
+
+
+static FcObjectPtr
+FcObjectToPtrLookup (const char * object)
+{
+ FcObjectPtr i = 0, n;
+ const FcObjectTypeList *l;
+ FcObjectType *t = _FcUserObjectNames;
+
+ for (l = _FcObjectTypes; l; l = l->next)
+ {
+ for (i = 0; i < l->ntypes; i++)
+ {
+ t = (FcObjectType *)&l->types[i];
+ if (!strcmp (object, t->object))
+ {
+ if (l == (FcObjectTypeList*)_FcUserObjectNames)
+ return -i;
+ else
+ return l->basic_offset + i;
+ }
+ }
+ }
+
+ /* We didn't match. Look for the correct FcObjectTypeList
+ * to replace it in-place. */
+ for (l = _FcObjectTypes; l; l = l->next)
+ {
+ if (l->types == _FcUserObjectNames)
+ break;
+ }
+
+ if (!_FcUserObjectNames ||
+ (l && l->types == _FcUserObjectNames && user_obj_alloc < l->ntypes))
+ {
+ int nt = user_obj_alloc + 4;
+ FcObjectType * t = realloc (_FcUserObjectNames,
+ nt * sizeof (FcObjectType));
+ if (!t)
+ return 0;
+ _FcUserObjectNames = t;
+ user_obj_alloc = nt;
+ }
+
+ if (l && l->types == _FcUserObjectNames)
+ {
+ n = l->ntypes;
+ FcNameUnregisterObjectTypesFree (l->types, l->ntypes, FcFalse);
+ }
+ else
+ n = 0;
+
+ FcNameRegisterObjectTypes (_FcUserObjectNames, n+1);
+
+ for (l = _FcObjectTypes; l; l = l->next)
+ {
+ if (l->types == _FcUserObjectNames)
+ {
+ t = (FcObjectType *)l->types;
+ break;
+ }
+ }
+
+ if (!t)
+ return 0;
+
+ t[n].object = object;
+ t[n].type = FcTypeVoid;
+
+ return -n;
+}
+
+FcObjectPtr
+FcObjectToPtr (const char * name)
+{
+ FcChar32 hash = FcStringHash ((const FcChar8 *) name);
+ struct objectBucket **p;
+ struct objectBucket *b;
+ int size;
+
+ for (p = &FcObjectBuckets[hash % OBJECT_HASH_SIZE]; (b = *p); p = &(b->next)
+)
+ if (b->hash == hash && !strcmp (name, (char *) (b + 1)))
+ return b->id;
+ size = sizeof (struct objectBucket) + strlen (name) + 1;
+ /* workaround glibc bug which reads strlen in groups of 4 */
+ b = malloc (size + sizeof (int));
+ FcMemAlloc (FC_MEM_STATICSTR, size + sizeof(int));
+ if (!b)
+ return 0;
+ b->next = 0;
+ b->hash = hash;
+ b->id = FcObjectToPtrLookup (name);
+ strcpy ((char *) (b + 1), name);
+ *p = b;
+ return b->id;
+}
+
+void
+FcObjectStaticNameFini (void)
+{
+ int i, size;
+ struct objectBucket *b, *next;
+ char *name;
+
+ for (i = 0; i < OBJECT_HASH_SIZE; i++)
+ {
+ for (b = FcObjectBuckets[i]; b; b = next)
+ {
+ next = b->next;
+ name = (char *) (b + 1);
+ size = sizeof (struct objectBucket) + strlen (name) + 1;
+ FcMemFree (FC_MEM_STATICSTR, size);
+ free (b);
+ }
+ FcObjectBuckets[i] = 0;
+ }
+}
+
+const char *
+FcObjectPtrU (FcObjectPtr si)
+{
+ const FcObjectTypeList *l;
+ int i, j;
+
+ if (si > 0)
+ {
+ if (si < biggest_known_ntypes)
+ return biggest_known_types[si].object;
+
+ j = 0;
+ for (l = _FcObjectTypes; l; l = l->next)
+ for (i = 0; i < l->ntypes; i++, j++)
+ if (j == si)
+ return l->types[i].object;
+ }
+
+ return _FcUserObjectNames[-si].object;
+}
+
+int
+FcObjectNeededBytes ()
+{
+ int num = 0, i;
+ for (i = 0; i < biggest_known_ntypes; i++)
+ {
+ const char * t = biggest_known_types[i].object;
+ num = num + strlen(t) + 1;
+ }
+ biggest_known_count = num;
+ return num + sizeof(int);
+}
+
+int
+FcObjectNeededBytesAlign (void)
+{
+ return __alignof__ (int) + __alignof__ (char);
+}
+
+void *
+FcObjectDistributeBytes (FcCache * metadata, void * block_ptr)
+{
+ block_ptr = ALIGN (block_ptr, int);
+ *(int *)block_ptr = biggest_known_ntypes;
+ block_ptr = (int *) block_ptr + 1;
+ block_ptr = ALIGN (block_ptr, char);
+ biggest_ptr = block_ptr;
+ block_ptr = (char *) block_ptr + biggest_known_count;
+ return block_ptr;
+}
+
+void
+FcObjectSerialize ()
+{
+ int i;
+ for (i = 0; i < biggest_known_ntypes; i++)
+ {
+ const char * t = biggest_known_types[i].object;
+ strcpy (biggest_ptr, t);
+ biggest_ptr = biggest_ptr + strlen(t) + 1;
+ }
+}
+
+void *
+FcObjectUnserialize (FcCache * metadata, void *block_ptr)
+{
+ int new_biggest;
+ new_biggest = *(int *)block_ptr;
+ block_ptr = ALIGN (block_ptr, int);
+ block_ptr = (int *) block_ptr + 1;
+ if (biggest_known_ntypes < new_biggest)
+ {
+ int i;
+ char * bp = (char *)block_ptr;
+ FcObjectType * bn;
+ FcObjectTypeList * bnl;
+
+ bn = malloc (sizeof (const FcObjectType) * (new_biggest + 1));
+ if (!bn)
+ return 0;
+
+ bnl = malloc (sizeof (FcObjectTypeList));
+ if (!bnl)
+ {
+ free (bn);
+ return 0;
+ }
+
+ for (i = 0; i < new_biggest; i++)
+ {
+ const FcObjectType * t = FcNameGetObjectType(bp);
+ if (t)
+ bn[i].type = t->type;
+ else
+ bn[i].type = FcTypeVoid;
+ bn[i].object = bp;
+ bp = bp + strlen(bp) + 1;
+ }
+
+ FcNameUnregisterObjectTypesFree (biggest_known_types, biggest_known_ntypes, FcFalse);
+ if (allocated_biggest_known_types)
+ {
+ free ((FcObjectTypeList *)biggest_known_types);
+ }
+ else
+ allocated_biggest_known_types = FcTrue;
+
+ FcNameRegisterObjectTypes (bn, new_biggest);
+ biggest_known_ntypes = new_biggest;
+ biggest_known_types = (const FcObjectType *)bn;
+ }
+ block_ptr = ALIGN (block_ptr, char);
+ block_ptr = (char *) block_ptr + biggest_known_count;
+ return block_ptr;
+}
+
static const FcConstant _FcBaseConstants[] = {
+ { (FcChar8 *) "thin", "weight", FC_WEIGHT_THIN, },
+ { (FcChar8 *) "extralight", "weight", FC_WEIGHT_EXTRALIGHT, },
+ { (FcChar8 *) "ultralight", "weight", FC_WEIGHT_EXTRALIGHT, },
{ (FcChar8 *) "light", "weight", FC_WEIGHT_LIGHT, },
+ { (FcChar8 *) "book", "weight", FC_WEIGHT_BOOK, },
+ { (FcChar8 *) "regular", "weight", FC_WEIGHT_REGULAR, },
{ (FcChar8 *) "medium", "weight", FC_WEIGHT_MEDIUM, },
{ (FcChar8 *) "demibold", "weight", FC_WEIGHT_DEMIBOLD, },
+ { (FcChar8 *) "semibold", "weight", FC_WEIGHT_DEMIBOLD, },
{ (FcChar8 *) "bold", "weight", FC_WEIGHT_BOLD, },
+ { (FcChar8 *) "extrabold", "weight", FC_WEIGHT_EXTRABOLD, },
+ { (FcChar8 *) "ultrabold", "weight", FC_WEIGHT_EXTRABOLD, },
{ (FcChar8 *) "black", "weight", FC_WEIGHT_BLACK, },
{ (FcChar8 *) "roman", "slant", FC_SLANT_ROMAN, },
{ (FcChar8 *) "italic", "slant", FC_SLANT_ITALIC, },
{ (FcChar8 *) "oblique", "slant", FC_SLANT_OBLIQUE, },
+ { (FcChar8 *) "ultracondensed", "width", FC_WIDTH_ULTRACONDENSED },
+ { (FcChar8 *) "extracondensed", "width", FC_WIDTH_EXTRACONDENSED },
+ { (FcChar8 *) "condensed", "width", FC_WIDTH_CONDENSED },
+ { (FcChar8 *) "semicondensed", "width", FC_WIDTH_SEMICONDENSED },
+ { (FcChar8 *) "normal", "width", FC_WIDTH_NORMAL },
+ { (FcChar8 *) "semiexpanded", "width", FC_WIDTH_SEMIEXPANDED },
+ { (FcChar8 *) "expanded", "width", FC_WIDTH_EXPANDED },
+ { (FcChar8 *) "extraexpanded", "width", FC_WIDTH_EXTRAEXPANDED },
+ { (FcChar8 *) "ultraexpanded", "width", FC_WIDTH_ULTRAEXPANDED },
+
{ (FcChar8 *) "proportional", "spacing", FC_PROPORTIONAL, },
+ { (FcChar8 *) "dual", "spacing", FC_DUAL, },
{ (FcChar8 *) "mono", "spacing", FC_MONO, },
{ (FcChar8 *) "charcell", "spacing", FC_CHARCELL, },
+ { (FcChar8 *) "unknown", "rgba", FC_RGBA_UNKNOWN },
{ (FcChar8 *) "rgb", "rgba", FC_RGBA_RGB, },
{ (FcChar8 *) "bgr", "rgba", FC_RGBA_BGR, },
{ (FcChar8 *) "vrgb", "rgba", FC_RGBA_VRGB },
{ (FcChar8 *) "vbgr", "rgba", FC_RGBA_VBGR },
+ { (FcChar8 *) "none", "rgba", FC_RGBA_NONE },
+
+ { (FcChar8 *) "hintnone", "hintstyle", FC_HINT_NONE },
+ { (FcChar8 *) "hintslight", "hintstyle", FC_HINT_SLIGHT },
+ { (FcChar8 *) "hintmedium", "hintstyle", FC_HINT_MEDIUM },
+ { (FcChar8 *) "hintfull", "hintstyle", FC_HINT_FULL },
};
#define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0])
l = (FcConstantList *) malloc (sizeof (FcConstantList));
if (!l)
return FcFalse;
+ FcMemAlloc (FC_MEM_CONSTANT, sizeof (FcConstantList));
l->consts = consts;
l->nconsts = nconsts;
l->next = _FcConstants;
if (l->consts == consts && l->nconsts == nconsts)
{
*prev = l->next;
+ FcMemFree (FC_MEM_CONSTANT, sizeof (FcConstantList));
free ((void *) l);
return FcTrue;
}
{
const FcConstantList *l;
int i;
-
+
for (l = _FcConstants; l; l = l->next)
{
for (i = 0; i < l->nconsts; i++)
}
FcBool
-FcNameBool (FcChar8 *v, FcBool *result)
+FcNameBool (const FcChar8 *v, FcBool *result)
{
char c0, c1;
c0 = *v;
- if (isupper (c0))
- c0 = tolower (c0);
+ c0 = FcToLower (c0);
if (c0 == 't' || c0 == 'y' || c0 == '1')
{
*result = FcTrue;
if (c0 == 'o')
{
c1 = v[1];
- if (isupper (c1))
- c1 = tolower (c1);
+ c1 = FcToLower (c1);
if (c1 == 'n')
{
*result = FcTrue;
v.u.i = atoi ((char *) string);
break;
case FcTypeString:
- v.u.s = string;
+ v.u.s = FcStrStaticName(string);
break;
case FcTypeBool:
if (!FcNameBool (string, &v.u.b))
case FcTypeCharSet:
v.u.c = FcNameParseCharSet (string);
break;
+ case FcTypeLangSet:
+ v.u.l = FcNameParseLangSet (string);
+ break;
default:
break;
}
const FcObjectType *t;
const FcConstant *c;
+ /* freed below */
save = malloc (strlen ((char *) name) + 1);
if (!save)
goto bail0;
for (;;)
{
name = FcNameFindNext (name, ":,", save, &delim);
- if (save[0] && t)
+ if (t)
{
v = FcNameConvert (t->type, save, &m);
if (!FcPatternAdd (pat, t->object, v, FcTrue))
{
- if (v.type == FcTypeCharSet)
+ switch (v.type) {
+ case FcTypeCharSet:
FcCharSetDestroy ((FcCharSet *) v.u.c);
+ break;
+ case FcTypeLangSet:
+ FcLangSetDestroy ((FcLangSet *) v.u.l);
+ break;
+ default:
+ break;
+ }
goto bail2;
}
- if (v.type == FcTypeCharSet)
+ switch (v.type) {
+ case FcTypeCharSet:
FcCharSetDestroy ((FcCharSet *) v.u.c);
+ break;
+ case FcTypeLangSet:
+ FcLangSetDestroy ((FcLangSet *) v.u.l);
+ break;
+ default:
+ break;
+ }
}
if (delim != ',')
break;
bail0:
return 0;
}
-
-static void
-FcNameBufInit (FcNameBuf *buf, FcChar8 *init, int size)
-{
- buf->buf = init;
- buf->allocated = FcFalse;
- buf->failed = FcFalse;
- buf->len = 0;
- buf->size = size;
-}
-
-static void
-FcNameBufDestroy (FcNameBuf *buf)
-{
- if (buf->allocated)
- free (buf->buf);
-}
-
-static FcChar8 *
-FcNameBufDone (FcNameBuf *buf)
-{
- FcChar8 *ret;
-
- ret = malloc (buf->len + 1);
- if (ret)
- {
- memcpy (ret, buf->buf, buf->len);
- ret[buf->len] = '\0';
- }
- FcNameBufDestroy (buf);
- return ret;
-}
-
-FcBool
-FcNameBufChar (FcNameBuf *buf, FcChar8 c)
-{
- if (buf->len == buf->size)
- {
- FcChar8 *new;
- int size;
-
- if (buf->allocated)
- {
- size = buf->size * 2;
- new = realloc (buf->buf, size);
- }
- else
- {
- size = buf->size + 1024;
- new = malloc (size);
- if (new)
- {
- buf->allocated = FcTrue;
- memcpy (new, buf->buf, buf->len);
- }
- }
- if (!new)
- {
- buf->failed = FcTrue;
- return FcFalse;
- }
- buf->size = size;
- buf->buf = new;
- }
- buf->buf[buf->len++] = c;
- return FcTrue;
-}
-
-FcBool
-FcNameBufString (FcNameBuf *buf, const FcChar8 *s)
-{
- FcChar8 c;
- while ((c = *s++))
- if (!FcNameBufChar (buf, c))
- return FcFalse;
- return FcTrue;
-}
-
static FcBool
-FcNameUnparseString (FcNameBuf *buf,
+FcNameUnparseString (FcStrBuf *buf,
const FcChar8 *string,
const FcChar8 *escape)
{
{
if (escape && strchr ((char *) escape, (char) c))
{
- if (!FcNameBufChar (buf, escape[0]))
+ if (!FcStrBufChar (buf, escape[0]))
return FcFalse;
}
- if (!FcNameBufChar (buf, c))
+ if (!FcStrBufChar (buf, c))
return FcFalse;
}
return FcTrue;
}
static FcBool
-FcNameUnparseValue (FcNameBuf *buf,
- FcValue v,
+FcNameUnparseValue (FcStrBuf *buf,
+ FcValue *v0,
FcChar8 *escape)
{
FcChar8 temp[1024];
+ FcValue v = FcValueCanonicalize(v0);
switch (v.type) {
case FcTypeVoid:
return FcNameUnparseString (buf, temp, 0);
case FcTypeCharSet:
return FcNameUnparseCharSet (buf, v.u.c);
+ case FcTypeLangSet:
+ return FcNameUnparseLangSet (buf, v.u.l);
+ case FcTypeFTFace:
+ return FcTrue;
}
return FcFalse;
}
static FcBool
-FcNameUnparseValueList (FcNameBuf *buf,
- FcValueList *v,
+FcNameUnparseValueList (FcStrBuf *buf,
+ FcValueListPtr v,
FcChar8 *escape)
{
- while (v)
+ while (FcValueListPtrU(v))
{
- if (!FcNameUnparseValue (buf, v->value, escape))
+ if (!FcNameUnparseValue (buf, &FcValueListPtrU(v)->value, escape))
return FcFalse;
- if ((v = v->next))
+ if (FcValueListPtrU(v = FcValueListPtrU(v)->next))
if (!FcNameUnparseString (buf, (FcChar8 *) ",", 0))
return FcFalse;
}
FcChar8 *
FcNameUnparse (FcPattern *pat)
{
- FcNameBuf buf;
+ return FcNameUnparseEscaped (pat, FcTrue);
+}
+
+FcChar8 *
+FcNameUnparseEscaped (FcPattern *pat, FcBool escape)
+{
+ FcStrBuf buf;
FcChar8 buf_static[8192];
int i;
FcPatternElt *e;
const FcObjectTypeList *l;
const FcObjectType *o;
- FcNameBufInit (&buf, buf_static, sizeof (buf_static));
- e = FcPatternFind (pat, FC_FAMILY, FcFalse);
+ FcStrBufInit (&buf, buf_static, sizeof (buf_static));
+ e = FcPatternFindElt (pat, FC_FAMILY);
if (e)
{
- if (!FcNameUnparseValueList (&buf, e->values, (FcChar8 *) FC_ESCAPE_FIXED))
+ if (!FcNameUnparseValueList (&buf, e->values, escape ? (FcChar8 *) FC_ESCAPE_FIXED : 0))
goto bail0;
}
- e = FcPatternFind (pat, FC_SIZE, FcFalse);
+ e = FcPatternFindElt (pat, FC_SIZE);
if (e)
{
if (!FcNameUnparseString (&buf, (FcChar8 *) "-", 0))
goto bail0;
- if (!FcNameUnparseValueList (&buf, e->values, (FcChar8 *) FC_ESCAPE_FIXED))
+ if (!FcNameUnparseValueList (&buf, e->values, escape ? (FcChar8 *) FC_ESCAPE_FIXED : 0))
goto bail0;
}
for (l = _FcObjectTypes; l; l = l->next)
!strcmp (o->object, FC_FILE))
continue;
- e = FcPatternFind (pat, o->object, FcFalse);
+ e = FcPatternFindElt (pat, o->object);
if (e)
{
if (!FcNameUnparseString (&buf, (FcChar8 *) ":", 0))
goto bail0;
- if (!FcNameUnparseString (&buf, (FcChar8 *) o->object, (FcChar8 *) FC_ESCAPE_VARIABLE))
+ if (!FcNameUnparseString (&buf, (FcChar8 *) o->object, escape ? (FcChar8 *) FC_ESCAPE_VARIABLE : 0))
goto bail0;
if (!FcNameUnparseString (&buf, (FcChar8 *) "=", 0))
goto bail0;
- if (!FcNameUnparseValueList (&buf, e->values,
- (FcChar8 *) FC_ESCAPE_VARIABLE))
+ if (!FcNameUnparseValueList (&buf, e->values, escape ?
+ (FcChar8 *) FC_ESCAPE_VARIABLE : 0))
goto bail0;
}
}
}
- return FcNameBufDone (&buf);
+ return FcStrBufDone (&buf);
bail0:
- FcNameBufDestroy (&buf);
+ FcStrBufDestroy (&buf);
return 0;
}