mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-01 11:20:41 -08:00
Code Issues Projects Releases Wiki Activity

(create-fontset-from-fontset-spec):

Browse source 
Generate ASCII font names of style variants fontsets from a
resolved ASCII font name of a base fontset.
This commit is contained in:
Kenichi Handa 1998-06-26 03:29:58 +00:00
parent fd28674852
commit 8f90191767
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lisp/international/fontset.el
View file

@ -461,7 +461,7 @@ signaled unless the optional 3rd argument NOERROR is non-nil."
(error "Invalid fontset spec: %s" fontset-spec))
(let ((idx (match-end 0))
(name (match-string 0 fontset-spec))
fontlist full-fontlist ascii-font charset)
fontlist full-fontlist ascii-font resolved-ascii-font charset)
(if (query-fontset name)
(or noerror
(error "Fontset \"%s\" already exists"))
@ -493,14 +493,14 @@ signaled unless the optional 3rd argument NOERROR is non-nil."
(or (rassoc alias fontset-alias-alist)
(setq fontset-alias-alist
(cons (cons name alias) fontset-alias-alist)))))
(let ((resolved-ascii-font (cdr (assq 'ascii full-fontlist))))
(setq fontset-alias-alist
(cons (cons name resolved-ascii-font)
fontset-alias-alist))
(or (equal ascii-font resolved-ascii-font)
(setq fontset-alias-alist
(cons (cons name ascii-font)
fontset-alias-alist))))
(setq resolved-ascii-font (cdr (assq 'ascii full-fontlist)))
(setq fontset-alias-alist
(cons (cons name resolved-ascii-font)
fontset-alias-alist))
(or (equal ascii-font resolved-ascii-font)
(setq fontset-alias-alist
(cons (cons name ascii-font)
fontset-alias-alist)))
;; At last, handle style variants.
(if (eq style-variant t)
@ -526,7 +526,8 @@ signaled unless the optional 3rd argument NOERROR is non-nil."
(when new-name
;; Modify ASCII font name for the style...
(setq new-ascii-font
(or font (x-modify-font-name ascii-font style)))
(or font
(x-modify-font-name resolved-ascii-font style)))
;; but leave fonts for the other charsets unmodified
;; for the momemnt. They are modified for the style
;; in instantiate-fontset.