procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one element, not a list, for match case.

Browse source
This commit is contained in:
Adrian Robert 2009-07-29 16:03:12 +00:00
parent d6a69b30c7
commit 1586503c80
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2009-07-29 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfont.m (ns_findfonts): Fix 2009-07-24 change to return only one
element, not a list, for match case.
2009-07-28 Kenichi Handa <handa@m17n.org>
* font.c (font_parse_xlfd): Check DPI and AVGWIDTH properties more

13
src/nsfont.m
View file

@ -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 ? Fcons (ns_fallback_entity (), list) : Qnil;
return isMatch ? ns_fallback_entity () : Qnil;
cFamilies = ns_get_covering_families (ns_get_req_script (font_spec), 0.90);
@ -483,9 +483,12 @@ seems to be limited for now (2009/05) to ja, zh, and ko. */
if (![cFamilies containsObject:
[desc objectForKey: NSFontFamilyAttribute]])
continue;
list = Fcons (ns_descriptor_to_entity (desc,
tem = ns_descriptor_to_entity (desc,
AREF (font_spec, FONT_EXTRA_INDEX),
NULL), list);
NULL);
if (isMatch)
return tem;
list = Fcons (tem, list);
if (fabs (ns_attribute_fvalue (desc, NSFontSlantTrait)) > 0.05)
foundItal = YES;
}
@ -503,8 +506,8 @@ seems to be limited for now (2009/05) to ja, zh, and ko. */
}
/* Return something if was a match and nothing found. */
if (isMatch && XINT (Flength (list)) == 0)
list = Fcons (ns_fallback_entity (), Qnil);
if (isMatch)
return ns_fallback_entity ();
if (NSFONT_TRACE)
fprintf (stderr, " Returning %d entities.\n", XINT (Flength (list)));