[Emacs-diffs] /srv/bzr/emacs/trunk r100668: Check FC_DUAL too. For such fonts, check width one by one.

[Kenichi Handa]

------------------------------------------------------------
revno: 100668 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Wed 2010-06-30 15:56:19 +0900
message:
  Check FC_DUAL too.  For such fonts, check width one by one.
modified:
  src/ChangeLog
  src/ftfont.c
  src/xftfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-06-30 03:43:30 +0000
+++ b/src/ChangeLog     2010-06-30 06:55:41 +0000
@@ -1,3 +1,10 @@
+2009-06-17  Naohiro Aota  <address@hidden>  (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  <address@hidden>
 
        * s/sol2-6.h (INHIBIT_X11R6_XIM): Remove, handled by configure now.

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2010-05-11 11:15:29 +0000
+++ b/src/ftfont.c      2010-06-30 06:55:41 +0000
@@ -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);

=== modified file 'src/xftfont.c'
--- a/src/xftfont.c     2010-01-13 08:35:10 +0000
+++ b/src/xftfont.c     2010-06-30 06:55:41 +0000
@@ -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;