# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1150722153 0
# Node ID 36209537eac973d822ff1723c7c43551962da4ba
# Parent  6f039e9c742f06052e7fd27942b79d17b3f02117
*** empty log message ***

diff -r 6f039e9c742f -r 36209537eac9 lisp/ChangeLog.unicode
--- a/lisp/ChangeLog.unicode	Mon Jun 19 13:02:21 2006 +0000
+++ b/lisp/ChangeLog.unicode	Mon Jun 19 13:02:33 2006 +0000
@@ -1,3 +1,9 @@
+2006-06-19  Kenichi Handa  <handa@m17n.org>
+
+	* faces.el (font-weight-table): Treat regular and normal as the
+	same as medium.
+	(font-slant-table): Add (roman . 100).
+
 2006-06-09  Kenichi Handa  <handa@m17n.org>
 
 	* tar-mode.el (tar-extract): Sync with HEAD.
diff -r 6f039e9c742f -r 36209537eac9 src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Mon Jun 19 13:02:21 2006 +0000
+++ b/src/ChangeLog.unicode	Mon Jun 19 13:02:33 2006 +0000
@@ -1,3 +1,34 @@
+2006-06-19  Kenichi Handa  <handa@m17n.org>
+
+	* font.h (QCspacing, QCdpi): Extern them.
+	(enum font_spacing): New enum.
+	(FONT_PIXEL_SIZE_QUANTUM): New macro.
+
+	* font.c (POINT_TO_PIXEL): Don't divice POINT by 10.
+	(QCspacing, QCdpi): New variables.
+	(syms_of_font): Initialize them.
+	(font_pixel_size): New function.
+	(font_put_extra): New function.
+	(font_parse_xlfd): Fix handling of font size.  Add QCdpi property
+	in FONT_EXTRA.
+	(font_parse_fcname): Handle enumenrated values (e.g. bold).  Fix
+	handling font size.  Add QCname property that contains only
+	unknown properties.
+	(font_score): Change argument.  Caller changed.  Pay attention to
+	FONT_PIXEL_SIZE_QUANTUM.
+	(font_sort_entites): Fix handling of font size.
+	(font_list_entities): Likewise.
+	(font_find_for_lface): Likewise.
+	(font_open_for_lface): Likewise.
+	(font_open_by_name): Likewise.
+	(Ffont_spec): Add QCname property that contains only unknown
+	properties.
+
+	* ftfont.c (ftfont_list): Use assq_no_quit, not Fassq.  Don't
+	include weight in listing pattern, instead check weight of each
+	listed font.  Don't include scalable in pattern.  Pay attention to
+	FONT_PIXEL_SIZE_QUANTUM.
+
 2006-06-19  Kenichi Handa  <handa@m17n.org>
 
 	* lread.c (read_escape): Fix the code synched with HEAD.