# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1151474315 0
# Node ID 6e0ae7121a9cb88353e4495a1c8adbf88057d3f2
# Parent  8de7c6bf6944cd8c493099c41bf8e06a04acf15c
*** empty log message ***

diff -r 8de7c6bf6944 -r 6e0ae7121a9c lisp/ChangeLog.unicode
--- a/lisp/ChangeLog.unicode	Wed Jun 28 05:58:24 2006 +0000
+++ b/lisp/ChangeLog.unicode	Wed Jun 28 05:58:35 2006 +0000
@@ -1,3 +1,8 @@
+2006-06-28  Kenichi Handa  <handa@m17n.org>
+
+	* international/fontset.el (font-encoding-alist): Fix for
+	"ethiopic-unicode".
+
 2006-06-23  Kenichi Handa  <handa@m17n.org>
 
 	* international/fontset.el (script-representative-chars): Add an
diff -r 8de7c6bf6944 -r 6e0ae7121a9c src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Wed Jun 28 05:58:24 2006 +0000
+++ b/src/ChangeLog.unicode	Wed Jun 28 05:58:35 2006 +0000
@@ -1,3 +1,48 @@
+2006-06-28  Kenichi Handa  <handa@m17n.org>
+
+	* font.c (QCscalable, Qc, Qm, Qp, Qd): New variables.
+	(syms_of_font): Initialize them.
+	(font_pixel_size): Allow float value in dpi.
+	(font_prop_validate_type): Deleted.
+	(font_prop_validate_symbol, font_prop_validate_style): Argument
+	changed.  Caller changed.
+	(font_prop_validate_non_neg): Renamed from
+	font_prop_validate_size.
+	(font_prop_validate_extra): Deleted.
+	(font_prop_validate_spacing): New function.
+	(font_property_table): Add elements for all known properties.
+	(get_font_prop_index): Renamed from check_font_prop_name.  New
+	argument FROM.  Caller changed.
+	(font_prop_validate): Validate all known properties.
+	(font_put_extra): Argument force deleted.  Caller changed.
+	(font_expand_wildcards): Make it static.  Fix the way of shrinking
+	the possible range.
+	(font_parse_xlfd): Arguemnt merge deleted.  Fix handling of RESX,
+	RESY, SPACING, and AVGWIDTH.  Don't validate property values here.
+	Caller changed.
+	(font_unparse_xlfd): Handle dpi, spacing, and scalable properties.
+	(font_parse_fcname): Arguemnt merge deleted.  Fix parsing of point
+	size.  Don't validate properties values here.  Caller changed.
+	(font_unparse_fcname): Handle dpi, spacing, and scalable
+	properties.
+	(font_open_by_name): Delete unused variable.
+	(Ffont_spec): Likewise.  Validate property values.
+	(Ffont_match_p): New function.
+
+	* font.h (QCscalable): Extern it.
+	(font_parse_xlfd, font_parse_fcname): Prototype adjusted.
+
+	* ftfont.c (ftfont_list): Handle properties dpi, spacing, and
+	scalable.
+
+	* xfont.c (xfont_query_font): Adjusted for the change of
+	font_parse_xlfd.
+	(xfont_list_pattern): New function.
+	(xfont_list): Use xfont_list_pattern.
+
+	* xftfont.c (xftfont_prepare_face): Cancel previous change.
+	(xftfont_done_face): Likewise.
+
 2006-06-26  Kenichi Handa  <handa@m17n.org>
 
 	* font.h (Flist_fonts): EXFUN it.