Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
9e269017
Commit
9e269017
authored
Jan 28, 2011
by
Kenichi Handa
Browse files
(ftfont_spec_pattern): Check each extra property value.
parent
17dd1fc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
7 deletions
+18
-7
src/ChangeLog
src/ChangeLog
+5
-0
src/ftfont.c
src/ftfont.c
+13
-7
No files found.
src/ChangeLog
View file @
9e269017
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.
src/ftfont.c
View file @
9e269017
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment