(w32font_open_internal): Prefer truetype fonts unless

'raster' specified.

diff --git a/src/ChangeLog b/src/ChangeLog
index 722c9fb0fb896ac475b084459dcea7dd1b0e0745..fbebde7a3a7739b4396bc822651b4d46bc445029 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-29  Jason Rumney  <jasonr@gnu.org>
+
+        * w32font.c (w32font_open_internal): Prefer truetype fonts unless
+        'raster' specified.
+
 2008-05-29  Juanma Barranquero  <lekktu@gmail.com>
 
        * xfaces.c (Fx_list_fonts, Finternal_copy_lisp_face):

diff --git a/src/w32font.c b/src/w32font.c
index 1828af108ee1080940ad5f8f42d41e34af3a06e7..78f8049d851c43ff91dd16a9b6133961e55f9072 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -772,6 +772,12 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
   bzero (&logfont, sizeof (logfont));
   fill_in_logfont (f, &logfont, font_entity);
 
+  /* Prefer truetype fonts, to avoid known problems with type1 fonts, and
+     limitations in bitmap fonts.  */
+  val = AREF (font_entity, FONT_FOUNDRY_INDEX);
+  if (!EQ (val, Qraster))
+    logfont.lfOutPrecision = OUT_TT_PRECIS;
+
   size = XINT (AREF (font_entity, FONT_SIZE_INDEX));
   if (!size)
     size = pixel_size;