Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fill weight and slant fields of a fontset

Browse source 
generted from the specified ASCII font by values got from the
resolved ASCII font name.
This commit is contained in:
Kenichi Handa 1998-07-03 04:39:22 +00:00
parent 53caf287d1
commit 68404bed20
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lisp/term/x-win.el
View file

@ -674,10 +674,10 @@ This is in addition to the primary selection.")
(let ((font (or (cdr (assq 'font initial-frame-alist))
(cdr (assq 'font default-frame-alist))
(x-get-resource "font" "Font")))
xlfd-fields)
xlfd-fields resolved-name)
(if (and font
(not (query-fontset font))
(x-resolve-font-name font)
(setq resolved-name (x-resolve-font-name font))
(setq xlfd-fields (x-decompose-font-name font)))
(if (string= "fontset"
(aref xlfd-fields xlfd-regexp-registry-subnum))
@ -703,6 +703,23 @@ This is in addition to the primary selection.")
(aset xlfd-fields xlfd-regexp-family-subnum nil)
(aset xlfd-fields xlfd-regexp-registry-subnum "fontset")
(aset xlfd-fields xlfd-regexp-encoding-subnum "startup")
;; The fontset name should have concrete values in
;; weight and slant field.
(let ((weight (aref xlfd-fields xlfd-regexp-weight-subnum))
(slant (aref xlfd-fields xlfd-regexp-slant-subnum))
xlfd-temp)
(if (or (not weight) (string-match "[*?]*" weight))
(progn
(setq xlfd-temp (x-decompose-font-name resolved-name))
(aset xlfd-fields xlfd-regexp-weight-subnum
(aref xlfd-temp xlfd-regexp-weight-subnum))))
(if (or (not slant) (string-match "[*?]*" slant))
(progn
(or xlfd-temp
(setq xlfd-temp
(x-decompose-font-name resolved-name)))
(aset xlfd-fields xlfd-regexp-slant-subnum
(aref xlfd-temp xlfd-regexp-slant-subnum)))))
(setq fontset (x-compose-font-name xlfd-fields))
(create-fontset-from-fontset-spec
(concat fontset ", ascii:" font) styles)