changeset 95800:67f150b4adbe

(add_opentype_font_name_to_list): Skip non unicode fonts.
author Jason Rumney <jasonr@gnu.org>
date Tue, 10 Jun 2008 22:14:00 +0000
parents b0653ad2932d
children 70c768d96975
files src/ChangeLog src/w32uniscribe.c
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Jun 10 22:01:59 2008 +0000
+++ b/src/ChangeLog	Tue Jun 10 22:14:00 2008 +0000
@@ -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.
--- a/src/w32uniscribe.c	Tue Jun 10 22:01:59 2008 +0000
+++ b/src/w32uniscribe.c	Tue Jun 10 22:14:00 2008 +0000
@@ -485,6 +485,13 @@
       && 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))