From: handa <handa>
Date: Sun, 7 Nov 2004 23:08:52 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-1-2-0~87
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a88ffb58ae1cbe668fcb8cd0e05d5033ec3e1669;p=m17n%2Fm17n-lib.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4a52af4..3ced870 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-08  Kenichi Handa  <handa@m17n.org>
+
+	* m17n-X.c (device_open): Try at most 32 fonts to find a
+	non-autoscaled font.
+
+	* font.c (xlfd_parse_name): Fix previous change.
+
 2004-11-05  Kenichi Handa  <handa@m17n.org>
 
 	* font.c: (commont_style): Include dummy elements "slanted" and
diff --git a/src/font.c b/src/font.c
index efbd90d..e4de266 100644
--- a/src/font.c
+++ b/src/font.c
@@ -712,7 +712,8 @@ xlfd_parse_name (char *name, MFont *font)
     field[i++] = NULL;
 
   resy = field[XLFD_RESY] ? atoi (field[XLFD_RESY]) : 0;
-  avgwidth = field[XLFD_AVGWIDTH] ? atoi (field[XLFD_AVGWIDTH]) : 0;
+  avgwidth = ((field[XLFD_AVGWIDTH] && isdigit (field[XLFD_AVGWIDTH][0]))
+	      ? atoi (field[XLFD_AVGWIDTH]) : 1);
   if (! avgwidth)
     size = 0;
   else if (! field[XLFD_PIXEL])