[fcmatch] Use larger multipliers to enforce order

Previously the matcher multiplied comparison results by 100 and added
index value to it.  With long lists of families (lots of aliases),
reaching 100 is not that hard.  That could result in a non-match early
in the list to be preferred over a match late in the list.  Changing
the multiplier from 100 to 1000 should fix that.

To keep things relatively in order, the lang multiplier is changed
from 1000 to 10000.

diff --git a/src/fcmatch.c b/src/fcmatch.c
index ac63fbef6e9c3d1bb392041d0990c1cb8f54b23e..4d20a61fc9b7f09d702f4bb8641b69dee8ff9386 100644 (file)
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -328,7 +328,7 @@ FcCompareValueList (FcObject         object,
                *result = FcResultTypeMismatch;
                return FcFalse;
            }
                *result = FcResultTypeMismatch;
                return FcFalse;
            }

-           v = v * 100 + j;
+           v = v * 1000 + j;

            if (v < best)
            {
                if (bestValue)
            if (v < best)
            {
                if (bestValue)


@@ -768,7 +768,7 @@ FcFontSetSort (FcConfig         *config,
            }
        }
        if (!satisfies)
            }
        }
        if (!satisfies)

-           nodeps[f]->score[MATCH_LANG_INDEX] = 1000.0;
+           nodeps[f]->score[MATCH_LANG_INDEX] = 10000.0;

     }
 
     /*
     }
 
     /*