#ifdef out old cache stuff, replace with first version of new mmapping

[fontconfig.git] / src / fcname.c

diff --git a/src/fcname.c b/src/fcname.c
index 0219d16760b8cd4b4a718b0938d464a0f43e5469..a2524ad82d22116506c9685e6ec8786cffc7453d 100644 (file)
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -1,7 +1,7 @@
 /*
  * $RCSId: xc/lib/fontconfig/src/fcname.c,v 1.15 2002/09/26 00:17:28 keithp Exp $
  *
- * Copyright © 2000 Keith Packard
+ * 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
@@ -30,7 +30,11 @@
 
 static const FcObjectType _FcBaseObjectTypes[] = {
     { 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, },
@@ -41,6 +45,7 @@ static const FcObjectType _FcBaseObjectTypes[] = {
     { FC_FOUNDRY,      FcTypeString, },
 /*    { FC_CORE,               FcTypeBool, }, */
     { FC_ANTIALIAS,    FcTypeBool, },
+    { FC_HINT_STYLE,    FcTypeInteger, },
     { FC_HINTING,      FcTypeBool, },
     { FC_VERTICAL_LAYOUT,   FcTypeBool, },
     { FC_AUTOHINT,     FcTypeBool, },
@@ -62,6 +67,9 @@ static const FcObjectType _FcBaseObjectTypes[] = {
     { FC_CHARSET,      FcTypeCharSet },
     { FC_LANG,         FcTypeLangSet },
     { FC_FONTVERSION,  FcTypeInteger },
+    { FC_CAPABILITY,   FcTypeString },
+    { FC_FONTFORMAT,   FcTypeString },
+    { FC_EMBOLDEN,     FcTypeBool },
 };
 
 #define NUM_OBJECT_TYPES    (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])
@@ -167,6 +175,7 @@ static const FcConstant _FcBaseConstants[] = {
     { (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, },
 
@@ -176,6 +185,11 @@ static const FcConstant _FcBaseConstants[] = {
     { (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])
@@ -261,7 +275,7 @@ FcNameConstant (FcChar8 *string, int *result)
 }
 
 FcBool
-FcNameBool (FcChar8 *v, FcBool *result)
+FcNameBool (const FcChar8 *v, FcBool *result)
 {
     char    c0, c1;
 
@@ -307,7 +321,7 @@ FcNameConvert (FcType type, FcChar8 *string, FcMatrix *m)
            v.u.i = atoi ((char *) string);
        break;
     case FcTypeString:
-       v.u.s = string;
+       v.u.si = FcObjectStaticName(string);
        break;
     case FcTypeBool:
        if (!FcNameBool (string, &v.u.b))
@@ -317,14 +331,14 @@ FcNameConvert (FcType type, FcChar8 *string, FcMatrix *m)
        v.u.d = strtod ((char *) string, 0);
        break;
     case FcTypeMatrix:
-       v.u.m = m;
+       v.u.mi = FcMatrixPtrCreateDynamic(m);
        sscanf ((char *) string, "%lg %lg %lg %lg", &m->xx, &m->xy, &m->yx, &m->yy);
        break;
     case FcTypeCharSet:
-       v.u.c = FcNameParseCharSet (string);
+       v.u.ci = FcCharSetPtrCreateDynamic(FcNameParseCharSet (string));
        break;
     case FcTypeLangSet:
-       v.u.l = FcNameParseLangSet (string);
+       v.u.li = FcLangSetPtrCreateDynamic(FcNameParseLangSet (string));
        break;
     default:
        break;
@@ -422,10 +436,10 @@ FcNameParse (const FcChar8 *name)
                        {
                            switch (v.type) {
                            case FcTypeCharSet:
-                               FcCharSetDestroy ((FcCharSet *) v.u.c);
+                               FcCharSetDestroy ((FcCharSet *) FcCharSetPtrU(v.u.ci));
                                break;
                            case FcTypeLangSet:
-                               FcLangSetDestroy ((FcLangSet *) v.u.l);
+                               FcLangSetDestroy ((FcLangSet *) FcLangSetPtrU(v.u.li));
                                break;
                            default:
                                break;
@@ -434,10 +448,10 @@ FcNameParse (const FcChar8 *name)
                        }
                        switch (v.type) {
                        case FcTypeCharSet:
-                           FcCharSetDestroy ((FcCharSet *) v.u.c);
+                           FcCharSetDestroy ((FcCharSet *) FcCharSetPtrU(v.u.ci));
                            break;
                        case FcTypeLangSet:
-                           FcLangSetDestroy ((FcLangSet *) v.u.l);
+                           FcLangSetDestroy ((FcLangSet *) FcLangSetPtrU(v.u.li));
                            break;
                        default:
                            break;
@@ -504,17 +518,20 @@ FcNameUnparseValue (FcStrBuf      *buf,
        sprintf ((char *) temp, "%g", v.u.d);
        return FcNameUnparseString (buf, temp, 0);
     case FcTypeString:
-       return FcNameUnparseString (buf, v.u.s, escape);
+       return FcNameUnparseString (buf, FcObjectPtrU(v.u.si), escape);
     case FcTypeBool:
        return FcNameUnparseString (buf, v.u.b ? (FcChar8 *) "True" : (FcChar8 *) "False", 0);
     case FcTypeMatrix:
+    {
+       FcMatrix * m = FcMatrixPtrU(v.u.mi);
        sprintf ((char *) temp, "%g %g %g %g", 
-                v.u.m->xx, v.u.m->xy, v.u.m->yx, v.u.m->yy);
+                m->xx, m->xy, m->yx, m->yy);
        return FcNameUnparseString (buf, temp, 0);
+    }
     case FcTypeCharSet:
-       return FcNameUnparseCharSet (buf, v.u.c);
+       return FcNameUnparseCharSet (buf, FcCharSetPtrU(v.u.ci));
     case FcTypeLangSet:
-       return FcNameUnparseLangSet (buf, v.u.l);
+       return FcNameUnparseLangSet (buf, FcLangSetPtrU(v.u.li));
     case FcTypeFTFace:
        return FcTrue;
     }
@@ -523,14 +540,14 @@ FcNameUnparseValue (FcStrBuf      *buf,
 
 static FcBool
 FcNameUnparseValueList (FcStrBuf       *buf,
-                       FcValueList     *v,
+                       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;
     }