From df829e7db9145ae7095eca54b309a2da3e368be1 Mon Sep 17 00:00:00 2001 From: jao Date: Fri, 4 Dec 2020 11:15:55 +0000 Subject: jao-themes: defining palette faces for convenience --- themes/jao-themes.el | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) diff --git a/themes/jao-themes.el b/themes/jao-themes.el index 5530bc5..9f2e29e 100644 --- a/themes/jao-themes.el +++ b/themes/jao-themes.el @@ -39,6 +39,42 @@ (defvar jao-themes--f11 '((c "cadetblue4"))) (defvar jao-themes--f12 '((c "darkslategrey"))) +(defface jao-themes-hilite '((t :inherit default)) "") +(defface jao-themes-italic '((t :inherit default)) "") +(defface jao-themes-button '((t :inherit default)) "") +(defface jao-themes-strike-through '((t :inherite default)) "") +(defface jao-themes-outline '((t :inherite default)) "") +(defface jao-themes-outline-1 '((t :inherite default)) "") +(defface jao-themes-outline-2 '((t :inherite default)) "") +(defface jao-themes-outline-3 '((t :inherite default)) "") +(defface jao-themes-outline-4 '((t :inherite default)) "") +(defface jao-themes-outline-5 '((t :inherite default)) "") +(defface jao-themes-outline-6 '((t :inherite default)) "") +(defface jao-themes-outline-7 '((t :inherite default)) "") +(defface jao-themes-outline-8 '((t :inherite default)) "") +(defface jao-themes-link '((t :inherite default)) "") +(defface jao-themes-visited-link '((t :inherite default)) "") +(defface jao-themes-gnus-mail '((t :inherite default)) "") +(defface jao-themes-gnus-news '((t :inherite default)) "") +(defface jao-themes-tab-sel '((t :inherite default)) "") +(defface jao-themes-tab-unsel '((t :inherite default)) "") +(defface jao-themes-comment '((t :inherite default)) "") +(defface jao-themes-warning '((t :inherite default)) "") +(defface jao-themes-error '((t :inherite default)) "") +(defface jao-themes-constant '((t :inherite default)) "") +(defface jao-themes-function '((t :inherite default)) "") +(defface jao-themes-keyword '((t :inherite default)) "") +(defface jao-themes-string '((t :inherite default)) "") +(defface jao-themes-type '((t :inherite default)) "") +(defface jao-themes-variable-name '((t :inherite default)) "") +(defface jao-themes-dimm '((t :inherite default)) "") +(defface jao-themes-f00 '((t :inherite default)) "") +(defface jao-themes-f01 '((t :inherite default)) "") +(defface jao-themes-f02 '((t :inherite default)) "") +(defface jao-themes-f10 '((t :inherite default)) "") +(defface jao-themes-f11 '((t :inherite default)) "") +(defface jao-themes-f12 '((t :inherite default)) "") + (defsubst jao-themes--palette-face (face) (intern (format "jao-themes--%s" face))) @@ -136,7 +172,7 @@ (defun jao-themes--parse-face-sym (s) (cond ((listp s) - (case (car s) + (cl-case (car s) (c `(:foreground ,(jao-themes--color (cadr s)) :background ,(jao-themes--color (caddr s)))) (p (let ((var (jao-themes--palette-face (cadr s)))) @@ -149,7 +185,7 @@ (~ (cdr (assq (cadr s) *jao--parsed-faces*))) (t (list s)))) ((atom s) - (case s + (cl-case s (~ '(:inherit)) (dbg `(:background ,jao-themes--bg)) (dfg `(:foreground ,jao-themes--fg)) @@ -203,6 +239,41 @@ (defun jao-themes--dfs (fs) (let ((dfs (append + `((jao-themes-hilite (p hilite)) + (jao-themes-italic (p italic)) + (jao-themes-button (p button)) + (jao-themes-strike-through (p strike-through)) + (jao-themes-outline (p outline)) + (jao-themes-outline-1 (p outline-1)) + (jao-themes-outline-2 (p outline-2)) + (jao-themes-outline-3 (p outline-3)) + (jao-themes-outline-4 (p outline-4)) + (jao-themes-outline-5 (p outline-5)) + (jao-themes-outline-6 (p outline-6)) + (jao-themes-outline-7 (p outline-7)) + (jao-themes-outline-8 (p outline-8)) + (jao-themes-link (p link)) + (jao-themes-visited-link (p visited-link)) + (jao-themes-gnus-mail (p gnus-mail)) + (jao-themes-gnus-news (p gnus-news)) + (jao-themes-tab-sel (p tab-sel)) + (jao-themes-tab-unsel (p tab-unsel)) + (jao-themes-comment (p comment)) + (jao-themes-warning (p warning)) + (jao-themes-error (p error)) + (jao-themes-constant (p constant)) + (jao-themes-function (p function)) + (jao-themes-keyword (p keyword)) + (jao-themes-string (p string)) + (jao-themes-type (p type)) + (jao-themes-variable-name (p variable-name)) + (jao-themes-dimm (p dimm)) + (jao-themes-f00 (p f00)) + (jao-themes-f01 (p f01)) + (jao-themes-f02 (p f02)) + (jao-themes-f10 (p f10)) + (jao-themes-f11 (p f11)) + (jao-themes-f12 (p f12))) `((aw-background-face (p dimm)) (aw-leading-char-face (~ error) :height 1.5) (awesome-tray-module-awesome-tab-face (p f00)) @@ -596,7 +667,9 @@ (helm-ls-git-modified-not-staged-face (p warning)) (helm-ls-git-renamed-modified-face (p warning)) (helm-ls-git-untracked-face (p error)) - (highlight (p hilite))) + (highlight (p hilite)) + (hydra-face-blue (p f00)) + (hydra-face-red (p error))) `((ido-first-match (p warning)) (ido-first-match-face (p warning)) (ido-incomplete-regexp (p error)) -- cgit v1.2.3