(add_opentype_font_name_to_list): Skip non unicode fonts.

diff --git a/src/ChangeLog b/src/ChangeLog
index 655d0ba9c2f664d85150bf772ba80067bec30d6c..be81b8db3d04bfd58df9aa8a42802825b814367e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-10  Jason Rumney  <jasonr@gnu.org>
+
+        * w32uniscribe.c (add_opentype_font_name_to_list): Skip non unicode
+        fonts.
+
 2008-06-10  Chong Yidong  <cyd@stupidchicken.com>
 
        * xfns.c (Fx_font_dialog): New function.

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 470dfd9d1819a02d023eb7f4508d86f71d353ca2..2abd742e8d5812b40ae395b5630cacb953828201 100644 (file)
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -485,6 +485,13 @@ add_opentype_font_name_to_list (logical_font, physical_font, font_type,
       && font_type != TRUETYPE_FONTTYPE)
     return 1;
 
+  /* Skip fonts that have no unicode coverage.  */
+  if (!physical_font->ntmFontSig.fsUsb[3]
+      && !physical_font->ntmFontSig.fsUsb[2]
+      && !physical_font->ntmFontSig.fsUsb[1]
+      && !(physical_font->ntmFontSig.fsUsb[0] & 0x3fffffff))
+    return 1;
+
   family = font_intern_prop (logical_font->elfLogFont.lfFaceName,
                             strlen (logical_font->elfLogFont.lfFaceName), 1);
   if (! memq_no_quit (family, *list))