From: Kenichi Handa <handa@etlken>
Date: Wed, 30 Jun 2010 06:55:41 +0000 (+0900)
Subject: Check FC_DUAL too.  For such fonts, check width one by one.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~91
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=769e9d470d674ba60fcf085bccd29824657dc776;p=emacs.git

Check FC_DUAL too.  For such fonts, check width one by one.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2670410284b..8d5413685ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/ftfont.c b/src/ftfont.c
index 9699dc58009..33a96143fd0 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1262,7 +1262,7 @@ ftfont_open (f, entity, pixel_size)
     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 --git a/src/xftfont.c b/src/xftfont.c
index 5d4581be4e9..197cc9c1f5b 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -429,7 +429,7 @@ xftfont_open (f, entity, pixel_size)
 	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;