From: Jason Rumney <jasonr@gnu.org>
Date: Tue, 10 Jun 2008 22:14:00 +0000 (+0000)
Subject: (add_opentype_font_name_to_list): Skip non unicode fonts.
X-Git-Tag: emacs-pretest-23.0.90~4898
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=351ccb765f7bd06b7dcd55c9abb5dde92c6ad9db;p=emacs.git

(add_opentype_font_name_to_list): Skip non unicode fonts.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 655d0ba9c2f..be81b8db3d0 100644
--- 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 470dfd9d181..2abd742e8d5 100644
--- 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))