walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use FcLangDifferentTerritory instead of FcLangDifferentCountry.

This commit is contained in:
Keith Packard 2007-11-03 21:58:34 -07:00
parent 9b84ecff92
commit c833409f6b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fclang.c
View File

@ -150,13 +150,13 @@ FcLangCompare (const FcChar8 *s1, const FcChar8 *s2)
if (c1 != c2) if (c1 != c2)
{ {
if (FcLangEnd (c1) && FcLangEnd (c2)) if (FcLangEnd (c1) && FcLangEnd (c2))
result = FcLangDifferentCountry; result = FcLangDifferentTerritory;
return result; return result;
} }
else if (!c1) else if (!c1)
return FcLangEqual; return FcLangEqual;
else if (c1 == '-') else if (c1 == '-')
result = FcLangDifferentCountry; result = FcLangDifferentTerritory;
} }
} }
@ -206,7 +206,7 @@ FcCharSetForLang (const FcChar8 *lang)
switch (FcLangCompare (lang, fcLangCharSets[i].lang)) { switch (FcLangCompare (lang, fcLangCharSets[i].lang)) {
case FcLangEqual: case FcLangEqual:
return &fcLangCharSets[i].charset; return &fcLangCharSets[i].charset;
case FcLangDifferentCountry: case FcLangDifferentTerritory:
if (country == -1) if (country == -1)
country = i; country = i;
default: default:
@ -437,7 +437,7 @@ FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb)
if ((lsa->map[i] & fcLangCountrySets[j][i]) && if ((lsa->map[i] & fcLangCountrySets[j][i]) &&
(lsb->map[i] & fcLangCountrySets[j][i])) (lsb->map[i] & fcLangCountrySets[j][i]))
{ {
best = FcLangDifferentCountry; best = FcLangDifferentTerritory;
break; break;
} }
if (lsa->extra) if (lsa->extra)