comparison lisp/font.el @ 4453:29efd169efe7

Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 11 May 2008 11:24:01 +0200
parents e214ff9f9507 f5693b5f7f2d
children de0228446b18
comparison
equal deleted inserted replaced
4452:82f8351e71c8 4453:29efd169efe7
811 (let* ((name fontname) 811 (let* ((name fontname)
812 (device (or device (default-x-device))) 812 (device (or device (default-x-device)))
813 (pattern (fc-font-match device (fc-name-parse name))) 813 (pattern (fc-font-match device (fc-name-parse name)))
814 (font-obj (make-font)) 814 (font-obj (make-font))
815 (family (fc-pattern-get-family pattern 0)) 815 (family (fc-pattern-get-family pattern 0))
816 (size (fc-pattern-get-size pattern 0)) 816 (size (fc-pattern-get-or-compute-size pattern 0))
817 (weight (fc-pattern-get-weight pattern 0))) 817 (weight (fc-pattern-get-weight pattern 0)))
818 (set-font-family font-obj 818 (set-font-family font-obj
819 (and (not (equal family 'fc-result-no-match)) 819 (and (not (equal family 'fc-result-no-match))
820 family)) 820 family))
821 (set-font-size font-obj 821 (set-font-size font-obj