/*
- * $XFree86: xc/lib/Fc/xftname.c,v 1.10 2001/03/30 18:50:18 keithp Exp $
+ * $XFree86: xc/lib/fontconfig/src/fcname.c,v 1.9 2002/06/26 22:14:08 keithp Exp $
*
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
{ FC_SLANT, FcTypeInteger, },
{ FC_WEIGHT, FcTypeInteger, },
{ FC_SIZE, FcTypeDouble, },
+ { FC_ASPECT, FcTypeDouble, },
{ FC_PIXEL_SIZE, FcTypeDouble, },
{ FC_SPACING, FcTypeInteger, },
{ FC_FOUNDRY, FcTypeString, },
/* { FC_CORE, FcTypeBool, }, */
{ FC_ANTIALIAS, FcTypeBool, },
+ { 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, },*/
for (i = 0; i < l->ntypes; i++)
{
t = &l->types[i];
- if (!FcStrCmpIgnoreCase (object, t->object))
+ if (!strcmp (object, t->object))
return t;
}
}
}
static const FcConstant _FcBaseConstants[] = {
- { "light", "weight", FC_WEIGHT_LIGHT, },
- { "medium", "weight", FC_WEIGHT_MEDIUM, },
- { "demibold", "weight", FC_WEIGHT_DEMIBOLD, },
- { "bold", "weight", FC_WEIGHT_BOLD, },
- { "black", "weight", FC_WEIGHT_BLACK, },
-
- { "roman", "slant", FC_SLANT_ROMAN, },
- { "italic", "slant", FC_SLANT_ITALIC, },
- { "oblique", "slant", FC_SLANT_OBLIQUE, },
-
- { "proportional", "spacing", FC_PROPORTIONAL, },
- { "mono", "spacing", FC_MONO, },
- { "charcell", "spacing", FC_CHARCELL, },
-
- { "rgb", "rgba", FC_RGBA_RGB, },
- { "bgr", "rgba", FC_RGBA_BGR, },
- { "vrgb", "rgba", FC_RGBA_VRGB },
- { "vbgr", "rgba", FC_RGBA_VBGR },
+ { (FcChar8 *) "light", "weight", FC_WEIGHT_LIGHT, },
+ { (FcChar8 *) "medium", "weight", FC_WEIGHT_MEDIUM, },
+ { (FcChar8 *) "demibold", "weight", FC_WEIGHT_DEMIBOLD, },
+ { (FcChar8 *) "bold", "weight", FC_WEIGHT_BOLD, },
+ { (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 *) "proportional", "spacing", FC_PROPORTIONAL, },
+ { (FcChar8 *) "mono", "spacing", FC_MONO, },
+ { (FcChar8 *) "charcell", "spacing", FC_CHARCELL, },
+
+ { (FcChar8 *) "none", "rgba", FC_RGBA_NONE },
+ { (FcChar8 *) "rgb", "rgba", FC_RGBA_RGB, },
+ { (FcChar8 *) "bgr", "rgba", FC_RGBA_BGR, },
+ { (FcChar8 *) "vrgb", "rgba", FC_RGBA_VRGB },
+ { (FcChar8 *) "vbgr", "rgba", FC_RGBA_VBGR },
};
#define NUM_FC_CONSTANTS (sizeof _FcBaseConstants/sizeof _FcBaseConstants[0])
}
const FcConstant *
-FcNameGetConstant (char *string)
+FcNameGetConstant (FcChar8 *string)
{
const FcConstantList *l;
int i;
}
FcBool
-FcNameConstant (char *string, int *result)
+FcNameConstant (FcChar8 *string, int *result)
{
const FcConstant *c;
}
FcBool
-FcNameBool (char *v, FcBool *result)
+FcNameBool (FcChar8 *v, FcBool *result)
{
char c0, c1;
}
static FcValue
-FcNameConvert (FcType type, char *string, FcMatrix *m)
+FcNameConvert (FcType type, FcChar8 *string, FcMatrix *m)
{
FcValue v;
switch (v.type) {
case FcTypeInteger:
if (!FcNameConstant (string, &v.u.i))
- v.u.i = atoi (string);
+ v.u.i = atoi ((char *) string);
break;
case FcTypeString:
v.u.s = string;
v.u.b = FcFalse;
break;
case FcTypeDouble:
- v.u.d = strtod (string, 0);
+ v.u.d = strtod ((char *) string, 0);
break;
case FcTypeMatrix:
v.u.m = m;
- sscanf (string, "%lg %lg %lg %lg", &m->xx, &m->xy, &m->yx, &m->yy);
+ sscanf ((char *) string, "%lg %lg %lg %lg", &m->xx, &m->xy, &m->yx, &m->yy);
break;
case FcTypeCharSet:
v.u.c = FcNameParseCharSet (string);
return v;
}
-static const char *
-FcNameFindNext (const char *cur, const char *delim, char *save, char *last)
+static const FcChar8 *
+FcNameFindNext (const FcChar8 *cur, const char *delim, FcChar8 *save, FcChar8 *last)
{
- char c;
+ FcChar8 c;
while ((c = *cur))
{
}
FcPattern *
-FcNameParse (const char *name)
+FcNameParse (const FcChar8 *name)
{
- char *save;
+ FcChar8 *save;
FcPattern *pat;
double d;
- char *e;
- char delim;
+ FcChar8 *e;
+ FcChar8 delim;
FcValue v;
FcMatrix m;
const FcObjectType *t;
const FcConstant *c;
- save = malloc (strlen (name) + 1);
+ save = malloc (strlen ((char *) name) + 1);
if (!save)
goto bail0;
pat = FcPatternCreate ();
for (;;)
{
name = FcNameFindNext (name, "-,:", save, &delim);
- d = strtod (save, &e);
+ d = strtod ((char *) save, (char **) &e);
if (e != save)
{
if (!FcPatternAddDouble (pat, FC_SIZE, d))
{
if (delim == '=' || delim == '_')
{
- t = FcNameGetObjectType (save);
+ t = FcNameGetObjectType ((char *) save);
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))
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,
+FcNameUnparseValue (FcStrBuf *buf,
FcValue v,
FcChar8 *escape)
{
case FcTypeString:
return FcNameUnparseString (buf, v.u.s, escape);
case FcTypeBool:
- return FcNameUnparseString (buf, v.u.b ? "True" : "False", 0);
+ return FcNameUnparseString (buf, v.u.b ? (FcChar8 *) "True" : (FcChar8 *) "False", 0);
case FcTypeMatrix:
sprintf ((char *) temp, "%g %g %g %g",
v.u.m->xx, v.u.m->xy, v.u.m->yx, v.u.m->yy);
return FcNameUnparseString (buf, temp, 0);
case FcTypeCharSet:
return FcNameUnparseCharSet (buf, v.u.c);
+ case FcTypeFTFace:
+ return FcTrue;
}
return FcFalse;
}
static FcBool
-FcNameUnparseValueList (FcNameBuf *buf,
+FcNameUnparseValueList (FcStrBuf *buf,
FcValueList *v,
- char *escape)
+ FcChar8 *escape)
{
while (v)
{
if (!FcNameUnparseValue (buf, v->value, escape))
return FcFalse;
if ((v = v->next))
- if (!FcNameUnparseString (buf, ",", 0))
+ if (!FcNameUnparseString (buf, (FcChar8 *) ",", 0))
return FcFalse;
}
return FcTrue;
FcChar8 *
FcNameUnparse (FcPattern *pat)
{
- FcNameBuf buf;
+ 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, FC_ESCAPE_FIXED))
+ if (!FcNameUnparseValueList (&buf, e->values, (FcChar8 *) FC_ESCAPE_FIXED))
goto bail0;
}
- e = FcPatternFind (pat, FC_SIZE, FcFalse);
+ e = FcPatternFindElt (pat, FC_SIZE);
if (e)
{
- if (!FcNameUnparseString (&buf, "-", 0))
+ if (!FcNameUnparseString (&buf, (FcChar8 *) "-", 0))
goto bail0;
- if (!FcNameUnparseValueList (&buf, e->values, FC_ESCAPE_FIXED))
+ if (!FcNameUnparseValueList (&buf, e->values, (FcChar8 *) FC_ESCAPE_FIXED))
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, ":", 0))
+ if (!FcNameUnparseString (&buf, (FcChar8 *) ":", 0))
goto bail0;
- if (!FcNameUnparseString (&buf, o->object, FC_ESCAPE_VARIABLE))
+ if (!FcNameUnparseString (&buf, (FcChar8 *) o->object, (FcChar8 *) FC_ESCAPE_VARIABLE))
goto bail0;
- if (!FcNameUnparseString (&buf, "=", 0))
+ if (!FcNameUnparseString (&buf, (FcChar8 *) "=", 0))
goto bail0;
if (!FcNameUnparseValueList (&buf, e->values,
- FC_ESCAPE_VARIABLE))
+ (FcChar8 *) FC_ESCAPE_VARIABLE))
goto bail0;
}
}
}
- return FcNameBufDone (&buf);
+ return FcStrBufDone (&buf);
bail0:
- FcNameBufDestroy (&buf);
+ FcStrBufDestroy (&buf);
return 0;
}