Commit 9e269017 authored by Kenichi Handa's avatar Kenichi Handa

(ftfont_spec_pattern): Check each extra property value.

parent 17dd1fc8
2011-01-28 Kenichi Handa <handa@m17n.org>
* ftfont.c (ftfont_spec_pattern): Check each extra property
value.
2011-01-28 Stefan Monnier <monnier@iro.umontreal.ca>
* xdisp.c (safe_eval_handler): Distinguish symbols and strings.
......@@ -749,7 +749,10 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots
key = XCAR (XCAR (extra)), val = XCDR (XCAR (extra));
if (EQ (key, QCdpi))
dpi = XINT (val);
{
if (INTEGERP (val))
dpi = XINT (val);
}
else if (EQ (key, QClang))
{
if (! langset)
......@@ -769,12 +772,15 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots
}
else if (EQ (key, QCotf))
{
*otspec = ftfont_get_open_type_spec (val);
if (! *otspec)
return NULL;
strcat (otlayout, "otlayout:");
OTF_TAG_STR ((*otspec)->script_tag, otlayout + 9);
script = (*otspec)->script;
if (CONSP (val))
{
*otspec = ftfont_get_open_type_spec (val);
if (! *otspec)
return NULL;
strcat (otlayout, "otlayout:");
OTF_TAG_STR ((*otspec)->script_tag, otlayout + 9);
script = (*otspec)->script;
}
}
else if (EQ (key, QCscript))
script = val;
......
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