[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcmatch.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 612ee2a5c91b8929b2cc5abce4af84d8d7e66bd0
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Mar 1 22:21:25 2013 +0900

    Fix broken sort order with FcFontSort()
    
    which was introduced by 4eab908c8679a797ac7016b77a93ee41bb11b0fc

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 09c1b6a..23f985a 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -911,6 +911,13 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
 			}
 			patternLangSat[i] = FcTrue;
 			satisfies = FcTrue;
+			/* adjust score to ensure it's not more than 10000.0
+			 * which would means the lang didn't satisfy the requirements
+			 */
+			if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0)
+			    nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
+			if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0)
+			    nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
 			break;
 		    }
 		}