Commit 1395c6f5 authored by Adrian Robert's avatar Adrian Robert

* nsfont.m (ns_findfonts): Correctly return fallback in match case.

parent 22556bc5
2009-07-24 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfont.m (ns_findfonts): Correctly return fallback in match case.
2009-07-23 Yavor Doganov <yavor@gnu.org>
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
......
......@@ -464,7 +464,7 @@ seems to be limited for now (2009/05) to ja, zh, and ko. */
/* If has non-unicode registry, give up. */
tem = AREF (font_spec, FONT_REGISTRY_INDEX);
if (! NILP (tem) && !EQ (tem, Qiso10646_1) && !EQ (tem, Qunicode_bmp))
return isMatch ? ns_fallback_entity () : Qnil;
return isMatch ? Fcons (ns_fallback_entity (), list) : Qnil;
cFamilies = ns_get_covering_families (ns_get_req_script (font_spec), 0.90);
......@@ -502,6 +502,10 @@ seems to be limited for now (2009/05) to ja, zh, and ko. */
"synthItal"), list);
}
/* Return something if was a match and nothing found. */
if (isMatch && XINT (Flength (list)) == 0)
list = Fcons (ns_fallback_entity (), Qnil);
if (NSFONT_TRACE)
fprintf (stderr, " Returning %d entities.\n", XINT (Flength (list)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment