*** empty log message ***

diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 65e5b5b89ea1431ffdfde1d0caf1d1a2a6401f7d..6021374624815642f036828e8de2ee91709c8de3 100644 (file)
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,21 @@
+2006-11-24  Kenichi Handa  <handa@m17n.org>
+
+       * xfont.c (xfont_open): Set font->format.
+
+       * xftfont.c (xftfont_open): Set font->format.
+
+       * ftfont.c (ftfont_pattern_entity): Add fontformat in a pattern.
+       (ftfont_list): Include FC_FONTFORMAT in FcObject.
+       (ftfont_open): Set font->format.
+       (ftfont_font_format): New function.
+
+       * font.h (struct font): New memeber format.
+
+       * font.c (Qopentype): New variable.
+       (syms_of_font): Defsym it.
+       (Fquery_font): Change the format of the last element of the return
+       value.
+
 2006-11-22  Kenichi Handa  <handa@m17n.org>
 
        * search.c (simple_search): Fix sync with HEAD.

diff --git a/src/xfont.c b/src/xfont.c
index 9941fb2655a32b2d09b76915d432df044f52b963..0ea677cdeecab24763067135c45e4692cc2fb94f 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -592,6 +592,7 @@ xfont_open (f, entity, pixel_size)
   if (! xfont)
     return NULL;
   font = malloc (sizeof (struct font));
+  font->format = Qx;
   font->font.font = xfont;
   font->entity = entity;
   font->pixel_size = pixel_size;