Copy all values from the font to the pattern if the pattern doesn't have the element
authorAkira TAGOH <akira@tagoh.org>
Wed, 18 Sep 2013 08:31:10 +0000 (17:31 +0900)
committerAkira TAGOH <akira@tagoh.org>
Wed, 18 Sep 2013 08:33:45 +0000 (17:33 +0900)
src/fcmatch.c

index dec92b9..627aa1a 100644 (file)
@@ -552,14 +552,16 @@ FcFontRenderPrepare (FcConfig         *config,
 
                continue;
            }
+           FcPatternObjectAdd (new, fe->object, v, FcFalse);
        }
        else
        {
            if (fel)
                goto copy_lang;
-           v = FcValueCanonicalize(&FcPatternEltValues (fe)->value);
+           FcPatternObjectListAdd (new, fe->object,
+                                   FcValueListDuplicate (FcPatternEltValues (fe)),
+                                   FcTrue);
        }
-       FcPatternObjectAdd (new, fe->object, v, FcFalse);
     }
     for (i = 0; i < pat->num; i++)
     {