Mercurial > hg > xemacs-beta
comparison lisp/fontconfig.el @ 5474:4dee0387b9de
Merged with trunk.
author | Mats Lidell <matsl@xemacs.org> |
---|---|
date | Tue, 29 Mar 2011 00:02:47 +0200 |
parents | b9167d522a9a 3889ef128488 |
children | 23dc211f4d2f |
comparison
equal
deleted
inserted
replaced
5473:ac37a5f7e5be | 5474:4dee0387b9de |
---|---|
350 (let ((pair (assoc str fc-font-name-weight-mapping-string-reverse))) | 350 (let ((pair (assoc str fc-font-name-weight-mapping-string-reverse))) |
351 (if pair (cdr pair)))) | 351 (if pair (cdr pair)))) |
352 | 352 |
353 (defun fc-pattern-get-or-compute-size (pattern id) | 353 (defun fc-pattern-get-or-compute-size (pattern id) |
354 "Get the size from `pattern' associated with `id' or try to compute it. | 354 "Get the size from `pattern' associated with `id' or try to compute it. |
355 Returns 'fc-result-no-match if unsucessful." | 355 Returns 'fc-result-no-match if unsuccessful." |
356 ;; Many font patterns don't have a "size" property, but do have a | 356 ;; Many font patterns don't have a "size" property, but do have a |
357 ;; "dpi" and a "pixelsize" property". | 357 ;; "dpi" and a "pixelsize" property". |
358 (let ((maybe (fc-pattern-get-size pattern id))) | 358 (let ((maybe (fc-pattern-get-size pattern id))) |
359 (if (not (eq maybe 'fc-result-no-match)) | 359 (if (not (eq maybe 'fc-result-no-match)) |
360 maybe | 360 maybe |