(font_score): Check AVGWIDTH too.

c0a6070d · Kenichi Handa · 19a4c504 · c0a6070d · c0a6070d
Commit c0a6070d authored Apr 21, 2009 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

src/ChangeLog src/ChangeLog +1 -0

src/font.c src/font.c +3 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 2009-04-21  Kenichi Handa  <handa@m17n.org>

 	* font.c (font_load_for_lface): Cancel previous change.
+	(font_score): Check AVGWIDTH too.

 	* coding.c (decode_coding_utf_16): Reduce charbuf_end for the
 	worst case.

--- a/src/font.c
+++ b/src/font.c
@@ -2270,6 +2270,9 @@ font_score (entity, spec_prop)
      if (! NILP (spec_prop[FONT_DPI_INDEX])
 	  && ! EQ (spec_prop[FONT_DPI_INDEX], AREF (entity, FONT_DPI_INDEX)))
 	diff |= 1;
+      if (! NILP (spec_prop[FONT_AVGWIDTH_INDEX])
+	  && ! EQ (spec_prop[FONT_AVGWIDTH_INDEX], AREF (entity, FONT_AVGWIDTH_INDEX)))
+	diff |= 1;
      score |= min (diff, 127) << sort_shift_bits[FONT_SIZE_INDEX];
    }