*** empty log message ***

2 files changed, 37 insertions, 0 deletions

diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index f9514dd23cf..b3544889e48 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -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 --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 5ccf791a154..171502bc337 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,5 +1,36 @@
 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.
 
         * font.c (font_parse_fcname): Fix parsing of point-size.