From f0432f81a1d96a237f933ac82c1705bb5ca4cdf9 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Tue, 1 Aug 2006 02:40:50 +0000 Subject: [PATCH] (ftfont_pattern_entity): If the pattern doesn't contain FC_SPACING, don't assuce FC_MONO. --- src/ftfont.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ftfont.c b/src/ftfont.c index 6c85bbf7896..9bdb2146d2c 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -140,7 +140,7 @@ ftfont_pattern_entity (p, frame, registry) ASET (entity, FONT_SIZE_INDEX, make_number (0)); if (FcPatternGetInteger (p, FC_SPACING, 0, &numeric) != FcResultMatch) - numeric = FC_MONO; + numeric = -1; file = FcStrCopy (file); if (! file) return Qnil; @@ -151,7 +151,8 @@ ftfont_pattern_entity (p, frame, registry) if (FcPatternAddString (p, FC_FILE, file) == FcFalse || (charset && FcPatternAddCharSet (p, FC_CHARSET, charset) == FcFalse) - || FcPatternAddInteger (p, FC_SPACING, numeric) == FcFalse) + || (numeric >= 0 + && FcPatternAddInteger (p, FC_SPACING, numeric) == FcFalse)) { FcPatternDestroy (p); return Qnil; -- 2.39.5