# HG changeset patch
# User Kenichi Handa <handa@etlken>
# Date 1277880941 -32400
# Node ID bcae1f83a33e10012e1ed4ab1566cb5e8ccc8d07
# Parent  25b7075107623c0870d7bf43129fbe2714bd837e
Check FC_DUAL too.  For such fonts, check width one by one.

diff -r 25b707510762 -r bcae1f83a33e src/ChangeLog
--- a/src/ChangeLog	Wed Jun 30 15:51:39 2010 +0900
+++ b/src/ChangeLog	Wed Jun 30 15:55:41 2010 +0900
@@ -1,3 +1,10 @@
+2009-06-17  Naohiro Aota  <naota@elisp.net>  (tiny change)
+
+	* xftfont.c (xftfont_open): Check font width one by one also when
+	spacing is dual.
+
+	* ftfont.c (ftfont_open): Ditto.
+
 2010-06-30  Glenn Morris  <rgm@gnu.org>
 
 	* s/sol2-6.h (INHIBIT_X11R6_XIM): Remove, handled by configure now.
diff -r 25b707510762 -r bcae1f83a33e src/ftfont.c
--- a/src/ftfont.c	Wed Jun 30 15:51:39 2010 +0900
+++ b/src/ftfont.c	Wed Jun 30 15:55:41 2010 +0900
@@ -1262,7 +1262,7 @@
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else
     spacing = FC_PROPORTIONAL;
-  if (spacing != FC_PROPORTIONAL)
+  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
     font->min_width = font->average_width = font->space_width
       = (scalable ? ft_face->max_advance_width * size / upEM
 	 : ft_face->size->metrics.max_advance >> 6);
diff -r 25b707510762 -r bcae1f83a33e src/xftfont.c
--- a/src/xftfont.c	Wed Jun 30 15:51:39 2010 +0900
+++ b/src/xftfont.c	Wed Jun 30 15:55:41 2010 +0900
@@ -429,7 +429,7 @@
 	ascii_printable[i] = ' ' + i;
     }
   BLOCK_INPUT;
-  if (spacing != FC_PROPORTIONAL)
+  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
     {
       font->min_width = font->average_width = font->space_width
 	= xftfont->max_advance_width;