Check FC_DUAL too. For such fonts, check width one by one (Bug#4129).

* xftfont.c (xftfont_open): Check font width one by one also when
spacing is dual.

* ftfont.c (ftfont_open): Ditto.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ba3f0e12a27dd5e6e948c4d12cd9b5ba500917d..0db4a543ab797a48cf78a832ce9b233fe353f90d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-30  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-26  Andreas Schwab  <schwab@linux-m68k.org>
 
        * alloc.c (Fmake_byte_code): Don't access undefined argument

diff --git a/src/ftfont.c b/src/ftfont.c
index 9699dc580090d0a77feded7b76faebd29b2cd4cf..33a96143fd0b2561e5abe37c951999098dbe2d14 100644 (file)
--- 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 5d4581be4e94b37ae6f74762186fcc92a724a611..197cc9c1f5b6e0a22ac2eb7f1b12d39e83f63b8a 100644 (file)
--- 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;