[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcmatch.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5e6b8894ea9d03caabdfc3a6bcd0c402edf840a8
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Sep 18 17:31:10 2013 +0900

    Copy all values from the font to the pattern if the pattern doesn't have the element

diff --git a/src/fcmatch.c b/src/fcmatch.c
index dec92b9..627aa1a 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -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++)
     {