comparison lisp/international/fontset.el @ 22510:3c054c9dea07

(x-style-funcs-alist): Fix the elements that call two x-... functions so they don't call the second if the first gives nil. (fontset-default-styles): New variable. (create-fontset-from-fontset-spec): Use fontset-default-styles.

22509:a57016ec7f14

    (bold-oblique
     . ,(function (lambda (x) (x-make-font-oblique (x-make-font-bold x))))))
  "Alist of font style vs function to generate a X font name of the style.
The function is called with one argument, a font name.")

(defun x-modify-font-name (fontname style)
  "Substitute style specification part of FONTNAME for STYLE.
STYLE should be listed in the variable `x-style-funcs-alist'."
  (let ((func (cdr (assq style x-style-funcs-alist))))
    (if func

		    (cons (cons name ascii-font)
			  fontset-alias-alist))))

	;; At last, handle style variants.
	(if (eq style-variant t)
	    (setq style-variant (mapcar 'car x-style-funcs-alist)))

	(if style-variant
	    ;; Generate fontset names of style variants and set them
	    ;; in uninstantiated-fontset-alist.
	    (let* (nonascii-fontlist

22510:3c054c9dea07

    (bold-oblique
     . ,(function (lambda (x) (x-make-font-oblique (x-make-font-bold x))))))
  "Alist of font style vs function to generate a X font name of the style.
The function is called with one argument, a font name.")

(defconst x-style-funcs-alist
  `((bold . x-make-font-bold)
    (demibold . x-make-font-demibold)
    (italic . x-make-font-italic)
    (oblique . x-make-font-oblique)
    (bold-italic . x-make-font-bold-italic)
    (demibold-italic
     . ,(function (lambda (x)
		    (let ((y (x-make-font-demibold x)))
		      (and y (x-make-font-italic y))))))
    (demibold-oblique
     . ,(function (lambda (x)
		    (let ((y (x-make-font-demibold x)))
		      (and y (x-make-font-oblique y))))))
    (bold-oblique
     . ,(function (lambda (x)
		    (let ((y (x-make-font-bold x)))
		      (and y (x-make-font-oblique y)))))))
  "Alist of font style vs function to generate a X font name of the style.
The function is called with one argument, a font name.")

(defcustom fontset-default-styles '(bold italic bold-italic)
  "List of alternative styles to create for a fontset.
Valid elements include `bold', `demibold'; `italic', `oblique';
and combinations of one from each group,
such as `bold-italic' and `demibold-oblique'."
  :group 'faces
  :type '(set bold demibold italic oblique bold-italic bold-oblique
	      demibold-italic demibold-oblique))

(defun x-modify-font-name (fontname style)
  "Substitute style specification part of FONTNAME for STYLE.
STYLE should be listed in the variable `x-style-funcs-alist'."
  (let ((func (cdr (assq style x-style-funcs-alist))))
    (if func

		    (cons (cons name ascii-font)
			  fontset-alias-alist))))

	;; At last, handle style variants.
	(if (eq style-variant t)
	    (setq style-variant fontset-default-styles))

	(if style-variant
	    ;; Generate fontset names of style variants and set them
	    ;; in uninstantiated-fontset-alist.
	    (let* (nonascii-fontlist