Attachment 45930 Details for Bug 36474 – patch

[patch] patch

fontconfig-110422.patch (text/plain), 5.57 KB, created by Koji Otani on 2011-04-22 01:22:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koji Otani

Created: 2011-04-22 01:22:12 UTC

Size: 5.57 KB

patch

obsolete

>--- poppler/GlobalParams.cc.org	2011-04-20 15:24:41.000000000 +0900
>+++ poppler/GlobalParams.cc	2011-04-21 13:34:33.000000000 +0900
>@@ -1028,6 +1028,42 @@
>   }
> }
> 
>+static char *getFontLang(GfxFont *font)
>+{
>+  char *lang;
>+
>+  // find the language we want the font to support
>+  if (font->isCIDFont())
>+  {
>+    GooString *collection = ((GfxCIDFont *)font)->getCollection();
>+    if (collection)
>+    {
>+      if (strcmp(collection->getCString(), "Adobe-GB1") == 0)
>+        lang = "zh-cn"; // Simplified Chinese
>+      else if (strcmp(collection->getCString(), "Adobe-CNS1") == 0)
>+        lang = "zh-tw"; // Traditional Chinese
>+      else if (strcmp(collection->getCString(), "Adobe-Japan1") == 0)
>+        lang = "ja"; // Japanese
>+      else if (strcmp(collection->getCString(), "Adobe-Japan2") == 0)
>+        lang = "ja"; // Japanese
>+      else if (strcmp(collection->getCString(), "Adobe-Korea1") == 0)
>+        lang = "ko"; // Korean
>+      else if (strcmp(collection->getCString(), "Adobe-UCS") == 0)
>+        lang = "xx";
>+      else if (strcmp(collection->getCString(), "Adobe-Identity") == 0)
>+        lang = "xx";
>+      else
>+      {
>+        error(-1, "Unknown CID font collection, please report to poppler bugzilla.");
>+        lang = "xx";
>+      }
>+    }
>+    else lang = "xx";
>+  }
>+  else lang = "xx";
>+  return lang;
>+}
>+
> static FcPattern *buildFcPattern(GfxFont *font)
> {
>   int weight = -1,
>@@ -1064,6 +1100,8 @@
>     weight = FC_WEIGHT_BOLD;
>   if (findModifier(modifiers, "Light", &start))
>     weight = FC_WEIGHT_LIGHT;
>+  if (findModifier(modifiers, "Medium", &start))
>+    weight = FC_WEIGHT_MEDIUM;
>   if (findModifier(modifiers, "Condensed", &start))
>     width = FC_WIDTH_CONDENSED;
>   
>@@ -1127,35 +1165,7 @@
>     default: break; 
>   }
>   
>-  // find the language we want the font to support
>-  if (font->isCIDFont())
>-  {
>-    GooString *collection = ((GfxCIDFont *)font)->getCollection();
>-    if (collection)
>-    {
>-      if (strcmp(collection->getCString(), "Adobe-GB1") == 0)
>-        lang = "zh-cn"; // Simplified Chinese
>-      else if (strcmp(collection->getCString(), "Adobe-CNS1") == 0)
>-        lang = "zh-tw"; // Traditional Chinese
>-      else if (strcmp(collection->getCString(), "Adobe-Japan1") == 0)
>-        lang = "ja"; // Japanese
>-      else if (strcmp(collection->getCString(), "Adobe-Japan2") == 0)
>-        lang = "ja"; // Japanese
>-      else if (strcmp(collection->getCString(), "Adobe-Korea1") == 0)
>-        lang = "ko"; // Korean
>-      else if (strcmp(collection->getCString(), "Adobe-UCS") == 0)
>-        lang = "xx";
>-      else if (strcmp(collection->getCString(), "Adobe-Identity") == 0)
>-        lang = "xx";
>-      else
>-      {
>-        error(-1, "Unknown CID font collection, please report to poppler bugzilla.");
>-        lang = "xx";
>-      }
>-    }
>-    else lang = "xx";
>-  }
>-  else lang = "xx";
>+  lang = getFontLang(font);
>   
>   p = FcPatternBuild(NULL,
>                     FC_FAMILY, FcTypeString, family,
>@@ -1192,6 +1202,8 @@
>     FcResult res;
>     FcFontSet *set;
>     int i;
>+    FcLangSet *lb = NULL;
>+    char *lang;
>     p = buildFcPattern(font);
> 
>     if (!p)
>@@ -1201,29 +1213,59 @@
>     set = FcFontSort(NULL, p, FcFalse, NULL, &res);
>     if (!set)
>       goto fin;
>-    for (i = 0; i < set->nfont; ++i)
>+
>+    // find the language we want the font to support
>+    lang = getFontLang(font);
>+    if (strcmp(lang,"xx") != 0) {
>+      lb = FcLangSetCreate();
>+      FcLangSetAdd(lb,(FcChar8 *)lang);
>+    }
>+
>+    /*
>+      scan twice.
>+      first: fonts support the language
>+      second: all fonts (fall back)
>+    */
>+    while (dfp == NULL)
>     {
>-      res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s);
>-      if (res != FcResultMatch || !s)
>-        continue;
>-      ext = strrchr((char*)s,'.');
>-      if (!ext)
>-        continue;
>-      if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4))
>+      for (i = 0; i < set->nfont; ++i)
>       {
>-        dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
>-        dfp->tt.fileName = new GooString((char*)s);
>-        FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, &(dfp->tt.faceIndex));
>+        res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s);
>+        if (res != FcResultMatch || !s)
>+          continue;
>+        if (lb != NULL) {
>+          FcLangSet *l;
>+          res = FcPatternGetLangSet(set->fonts[i], FC_LANG, 0, &l);
>+          if (res != FcResultMatch || !FcLangSetContains(l,lb)) {
>+            continue;
>+          }
>+        }
>+        ext = strrchr((char*)s,'.');
>+        if (!ext)
>+          continue;
>+        if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4))
>+        {
>+          dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
>+          dfp->tt.fileName = new GooString((char*)s);
>+          FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, &(dfp->tt.faceIndex));
>+        }
>+        else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4)) 
>+        {
>+          dfp = new DisplayFontParam(fontName->copy(), displayFontT1);  
>+          dfp->t1.fileName = new GooString((char*)s);
>+        }
>+        else
>+          continue;
>+        font->dfp = dfp;
>+        break;
>       }
>-      else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4)) 
>-      {
>-        dfp = new DisplayFontParam(fontName->copy(), displayFontT1);  
>-        dfp->t1.fileName = new GooString((char*)s);
>+      if (lb != NULL) {
>+        FcLangSetDestroy(lb);
>+        lb = NULL;
>+      } else {
>+        /* scan all fonts of the list */
>+        break;
>       }
>-      else
>-        continue;
>-      font->dfp = dfp;
>-      break;
>     }
>     FcFontSetDestroy(set);
>   }

Actions: View | Splinter Review

Attachments on bug 36474: 45930

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.