Match 'ultra' on word boundaries to detect ultra bold fonts. (bug 2511)

[fontconfig.git] / src / fcfreetype.c

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 20a59577d78eb963b9a8f4e7effd07c1bf61ddea..572e7f2a05925dee6624156c29886a165275652d 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -858,7 +858,6 @@ FcNoticeFoundry(const FT_String *notice)
             const char *n = notice_foundry_data + nf->notice_offset;
             const char *f = notice_foundry_data + nf->foundry_offset;
 
-           printf ("foundry \"%s\" -> \"%s\"\n", n, f);
            if (strstr ((const char *) notice, n))
                return (const FcChar8 *) f;
         }
@@ -960,8 +959,18 @@ FcStringContainsConst (const FcChar8           *string,
     int        i;
 
     for (i = 0; i < nc; i++)
-       if (FcStrContainsIgnoreBlanksAndCase (string, c[i].name))
-           return c[i].value;
+    {
+       if (c[i].name[0] == '<')
+       {
+           if (FcStrContainsWord (string, c[i].name + 1))
+               return c[i].value;
+       }
+       else
+       {
+           if (FcStrContainsIgnoreBlanksAndCase (string, c[i].name))
+               return c[i].value;
+       }
+    }
     return -1;
 }
 
@@ -983,6 +992,10 @@ static const FcStringConst  weightConsts[] = {
     { (FC8) "superbold",       FC_WEIGHT_EXTRABOLD },
     { (FC8) "ultrabold",       FC_WEIGHT_ULTRABOLD },
     { (FC8) "bold",            FC_WEIGHT_BOLD },
+    { (FC8) "ultrablack",      FC_WEIGHT_ULTRABLACK },
+    { (FC8) "superblack",      FC_WEIGHT_EXTRABLACK },
+    { (FC8) "extrablack",      FC_WEIGHT_EXTRABLACK },
+    { (FC8) "<ultra",          FC_WEIGHT_ULTRABOLD }, /* only if a word */
     { (FC8) "black",           FC_WEIGHT_BLACK },
     { (FC8) "heavy",           FC_WEIGHT_HEAVY },
 };
@@ -1440,8 +1453,10 @@ FcFreeTypeQueryFace (const FT_Face  face,
            weight = FC_WEIGHT_BOLD;
        else if (os2->usWeightClass < 850)
            weight = FC_WEIGHT_EXTRABOLD;
-       else if (os2->usWeightClass < 950)
+       else if (os2->usWeightClass < 925)
            weight = FC_WEIGHT_BLACK;
+       else if (os2->usWeightClass < 1000)
+           weight = FC_WEIGHT_EXTRABLACK;
        if ((FcDebug() & FC_DBG_SCANV) && weight != -1)
            printf ("\tos2 weight class %d maps to weight %d\n",
                    os2->usWeightClass, weight);