Treat zh-hk fonts differently from zh-tw fonts. This patch may cause

    fontconfig to treat A-X fonts differently from A-Y fonts; please mail
    the fontconfig list if this causes any problems.
reviewed by: plam

diff --git a/ChangeLog b/ChangeLog
index b4c3c8a8c5b44571f47475767c9e2cf459442d51..a851906b9c65b0d365d85f852ecc69996a67b076 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-24  James Su  <james.su@gmail.com>
+       reviewed by: plam
+       
+       * src/fcfreetype.c (FcFreeTypeIsExclusiveLang):
+       * fc-lang/zh_hk.orth:
+
+       Treat zh-hk fonts differently from zh-tw fonts.  This patch may
+       cause fontconfig to treat A-X fonts differently from A-Y fonts;
+       please mail the fontconfig list if this causes any problems.
+
 2006-01-24  Patrick Lam  <plam@mit.edu>
        * src/fccache.c (FcDirCacheUnlink, FcDirCacheWrite):
        * src/fcfreetype.c (FcFreeTypeQuery):

diff --git a/fc-lang/zh_hk.orth b/fc-lang/zh_hk.orth
index 89661f116db4e2b17bcb7dc1e706765888a50f93..1bea8332e70fd58059c92e2741a5e50a9d1729db 100644 (file)
--- a/fc-lang/zh_hk.orth
+++ b/fc-lang/zh_hk.orth
@@ -2237,4 +2237,4 @@
 9F99
 9F9F
 9FA5
-F907
+20547

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 7f0af31937a6ab51e32cf62714e76115242abd37..27dff11cff821f631f9a9144e27ef38d06751fdc 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -97,7 +97,7 @@ FcFreeTypeIsExclusiveLang (const FcChar8  *lang)
 
     for (i = 0; i < NUM_CODE_PAGE_RANGE; i++)
     {
-       if (FcLangCompare (lang, FcCodePageRange[i].lang) != FcLangDifferentLang)
+       if (FcLangCompare (lang, FcCodePageRange[i].lang) == FcLangEqual)
            return FcTrue;
     }
     return FcFalse;