# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1164332929 0
# Node ID 9a7955701103a92ec7d0e0d015d8e91f30aa074f
# Parent  94842604dfcec24b9db56307119534ef088fdddf
*** empty log message ***

diff -r 94842604dfce -r 9a7955701103 src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Fri Nov 24 01:48:30 2006 +0000
+++ b/src/ChangeLog.unicode	Fri Nov 24 01:48:49 2006 +0000
@@ -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 -r 94842604dfce -r 9a7955701103 src/xfont.c
--- a/src/xfont.c	Fri Nov 24 01:48:30 2006 +0000
+++ b/src/xfont.c	Fri Nov 24 01:48:49 2006 +0000
@@ -592,6 +592,7 @@
   if (! xfont)
     return NULL;
   font = malloc (sizeof (struct font));
+  font->format = Qx;
   font->font.font = xfont;
   font->entity = entity;
   font->pixel_size = pixel_size;