(font_parse_xlfd): Fix previous change.

(font_parse_fcname): Don't use :fc-unknown-spec.
(FRAME_X_DISPLAY_INFO): Besure to have at least 1 pixel height.
(Fcopy_font_spec): Preserve the order of elements in FONT_EXTRA.
(font_add_log): Prepend the driver name to the resulting fonts.

2 files changed, 50 insertions, 45 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f65fbe91b9..60cff399cd7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2008-06-18  Kenichi Handa  <handa@m17n.org>
+
+        * font.c (font_parse_xlfd): Fix previous change.
+        (font_parse_fcname): Don't use :fc-unknown-spec.
+        (FRAME_X_DISPLAY_INFO): Besure to have at least 1 pixel height.
+        (Fcopy_font_spec): Preserve the order of elements in FONT_EXTRA.
+        (font_add_log): Prepend the driver name to the resulting fonts.
+
+        * ftfont.c (ftfont_pattern_entity): New arg extra.  Caller changed.
+        (ftfont_spec_pattern): Don't check QCfc_unknown_spec and QCname.
+        (ftfont_list) [FC_FONTFORMAT]: Include FC_FONTFORMAT in objset.
+
+        * xftfont.c (QChinting , QCautohint, QChintstyle, QCrgba)
+        (QCembolden): New variables.
+        (syms_of_xftfont): DEFSYM them.
+        (xftfont_open): Call XftFontMatch.  Don't trust the result of
+        XftTextExtents8 if the pixel_size is less than 5.
+
 2008-06-18  Andreas Schwab  <schwab@suse.de>
 
         * font.c (Ffont_face_attributes): Only define if
diff --git a/src/font.c b/src/font.c
index ab413f277f2..d49a19acac0 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1109,7 +1109,7 @@ font_parse_xlfd (name, font)
       if (*p == '~')
         p++;
       ASET (font, FONT_AVGWIDTH_INDEX,
-            font_intern_prop (p, f[XLFD_REGISTRY_INDEX] - 1 - p, 1));
+            font_intern_prop (p, f[XLFD_REGISTRY_INDEX] - 1 - p, 0));
     }
   else
     {
@@ -1403,16 +1403,9 @@ font_parse_fcname (name, font)
         }
       if (props_beg)
         {
-          /* Now parse ":KEY=VAL" patterns.  Store known keys and values in
-             extra, copy unknown ones to COPY.  It is stored in extra slot by
-             the key QCfc_unknown_spec.  */
-          char *copy_start, *copy;
+          /* Now parse ":KEY=VAL" patterns.  */
           Lisp_Object val;
 
-          copy_start = copy = alloca (name + len - props_beg + 2);
-          if (! copy)
-            return -1;
-
           for (p = props_beg; *p; p = q)
             {
               for (q = p + 1; *q && *q != '=' && *q != ':'; q++);
@@ -1445,13 +1438,6 @@ font_parse_fcname (name, font)
                   else if (PROP_MATCH ("proportional", 12))
                     ASET (font, FONT_SPACING_INDEX,
                           make_number (FONT_SPACING_PROPORTIONAL));
-                  else
-                    {
-                      /* Unknown key  */
-                      *copy++ = ':';
-                      bcopy (p, copy, word_len);
-                      copy += word_len;
-                    }
 #undef PROP_MATCH
                 }
               else
@@ -1473,25 +1459,14 @@ font_parse_fcname (name, font)
                   for (q = p; *q && *q != ':'; q++);
                   val = font_intern_prop (p, q - p, 0);
 
-                  if (! NILP (val))
-                    {
-                      if (prop >= FONT_FOUNDRY_INDEX
-                          && prop < FONT_EXTRA_INDEX)
-                        ASET (font, prop,
-                              font_prop_validate (prop, Qnil, val));
-                      else if (prop >= 0)
-                        Ffont_put (font, key, val);
-                      else
-                        {
-                          bcopy (keyhead, copy, q - keyhead);
-                          copy += q - keyhead;
-                        }
-                    }
+                  if (prop >= FONT_FOUNDRY_INDEX
+                      && prop < FONT_EXTRA_INDEX)
+                    ASET (font, prop, font_prop_validate (prop, Qnil, val));
+                  else
+                    Ffont_put (font, key, val);
                 }
+              p = q;
             }
-          if (copy_start != copy)
-            font_put_extra (font, QCfc_unknown_spec,
-                            make_unibyte_string (copy_start, copy - copy_start));
         }
     }
   else
@@ -2722,7 +2697,7 @@ font_open_entity (f, entity, pixel_size)
   struct font_driver_list *driver_list;
   Lisp_Object objlist, size, val, font_object;
   struct font *font;
-  int min_width;
+  int min_width, height;
 
   font_assert (FONT_ENTITY_P (entity));
   size = AREF (entity, FONT_SIZE_INDEX);
@@ -2756,20 +2731,21 @@ font_open_entity (f, entity, pixel_size)
                : font->average_width ? font->average_width
                : font->space_width ? font->space_width
                : 1);
+  height = (font->height ? font->height : 1);
 #ifdef HAVE_WINDOW_SYSTEM
   FRAME_X_DISPLAY_INFO (f)->n_fonts++;
   if (FRAME_X_DISPLAY_INFO (f)->n_fonts == 1)
     {
       FRAME_SMALLEST_CHAR_WIDTH (f) = min_width;
-      FRAME_SMALLEST_FONT_HEIGHT (f) = font->height;
+      FRAME_SMALLEST_FONT_HEIGHT (f) = height;
       fonts_changed_p = 1;
     }
   else
     {
       if (FRAME_SMALLEST_CHAR_WIDTH (f) > min_width)
         FRAME_SMALLEST_CHAR_WIDTH (f) = min_width, fonts_changed_p = 1;
-      if (FRAME_SMALLEST_FONT_HEIGHT (f) > font->height)
-        FRAME_SMALLEST_FONT_HEIGHT (f) = font->height, fonts_changed_p = 1;
+      if (FRAME_SMALLEST_FONT_HEIGHT (f) > height)
+        FRAME_SMALLEST_FONT_HEIGHT (f) = height, fonts_changed_p = 1;
     }
 #endif
 
@@ -3676,19 +3652,24 @@ DEFUN ("copy-font-spec", Fcopy_font_spec, Scopy_font_spec, 1, 1, 0,
      (font)
      Lisp_Object font;
 {
-  Lisp_Object new_spec, tail, extra;
+  Lisp_Object new_spec, tail, prev, extra;
   int i;
 
   CHECK_FONT (font);
   new_spec = font_make_spec ();
   for (i = 1; i < FONT_EXTRA_INDEX; i++)
     ASET (new_spec, i, AREF (font, i));
-  extra = Qnil;
-  for (tail = AREF (font, FONT_EXTRA_INDEX); CONSP (tail); tail = XCDR (tail))
-    {
-      if (! EQ (XCAR (XCAR (tail)), QCfont_entity))
-        extra = Fcons (Fcons (XCAR (XCAR (tail)), XCDR (XCAR (tail))), extra);
-    }
+  extra = Fcopy_sequence (AREF (font, FONT_EXTRA_INDEX));
+  /* We must remove :font-entity property.  */
+  for (prev = Qnil, tail = extra; CONSP (tail); prev = tail, tail = XCDR (tail))
+    if (EQ (XCAR (XCAR (tail)), QCfont_entity))
+      {
+        if (NILP (prev))
+          extra = XCDR (extra);
+        else
+          XSETCDR (prev, XCDR (tail));
+        break;
+      }
   ASET (new_spec, FONT_EXTRA_INDEX, extra);
   return new_spec;
 }
@@ -4759,7 +4740,13 @@ font_add_log (action, arg, result)
   if (FONTP (arg))
     arg = Ffont_xlfd_name (arg, Qt);
   if (FONTP (result))
-    result = Ffont_xlfd_name (result, Qt);
+    {
+      val = Ffont_xlfd_name (result, Qt);
+      if (! FONT_SPEC_P (result))
+        val = concat3 (SYMBOL_NAME (AREF (result, FONT_TYPE_INDEX)),
+                       build_string (":"), val);
+      result = val;
+    }
   else if (CONSP (result))
     {
       result = Fcopy_sequence (result);