Add semantic mappings for terminal colours

1 files changed, 39 insertions, 32 deletions

diff --git a/ef-themes.el b/ef-themes.el
index 9d48a94..d8c2e9c 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -962,23 +962,24 @@ text should not be underlined as well) yet still blend in."
     `(all-the-icons-ibuffer-mode-face ((,c :foreground ,constant)))
     `(all-the-icons-ibuffer-size-face ((,c :foreground ,variable)))
 ;;;; ansi-color
-    `(ansi-color-black ((,c :background "black" :foreground "black")))
-    `(ansi-color-blue ((,c :background ,blue :foreground ,blue)))
+    ;; Those are in Emacs28.
+    `(ansi-color-black ((,c :background ,bg-term-black :foreground ,fg-term-black)))
+    `(ansi-color-blue ((,c :background ,bg-term-blue :foreground ,fg-term-blue)))
     `(ansi-color-bold ((,c :inherit bold)))
-    `(ansi-color-bright-black ((,c :background "gray35" :foreground "gray35")))
-    `(ansi-color-bright-blue ((,c :background ,blue-warmer :foreground ,blue-warmer)))
-    `(ansi-color-bright-cyan ((,c :background ,cyan-cooler :foreground ,cyan-cooler)))
-    `(ansi-color-bright-green ((,c :background ,green-cooler :foreground ,green-cooler)))
-    `(ansi-color-bright-magenta ((,c :background ,magenta-cooler :foreground ,magenta-cooler)))
-    `(ansi-color-bright-red ((,c :background ,red-warmer :foreground ,red-warmer)))
-    `(ansi-color-bright-white ((,c :background "white" :foreground "white")))
-    `(ansi-color-bright-yellow ((,c :background ,yellow-warmer :foreground ,yellow-warmer)))
-    `(ansi-color-cyan ((,c :background ,cyan :foreground ,cyan)))
-    `(ansi-color-green ((,c :background ,green :foreground ,green)))
-    `(ansi-color-magenta ((,c :background ,magenta :foreground ,magenta)))
-    `(ansi-color-red ((,c :background ,red :foreground ,red)))
-    `(ansi-color-white ((,c :background "gray65" :foreground "gray65")))
-    `(ansi-color-yellow ((,c :background ,yellow :foreground ,yellow)))
+    `(ansi-color-bright-black ((,c :background ,bg-term-black-bright :foreground ,fg-term-black-bright)))
+    `(ansi-color-bright-blue ((,c :background ,bg-term-blue-bright :foreground ,fg-term-blue-bright)))
+    `(ansi-color-bright-cyan ((,c :background ,bg-term-cyan-bright :foreground ,fg-term-cyan-bright)))
+    `(ansi-color-bright-green ((,c :background ,bg-term-green-bright :foreground ,fg-term-green-bright)))
+    `(ansi-color-bright-magenta ((,c :background ,bg-term-magenta-bright :foreground ,fg-term-magenta-bright)))
+    `(ansi-color-bright-red ((,c :background ,bg-term-red-bright :foreground ,fg-term-red-bright)))
+    `(ansi-color-bright-white ((,c :background ,bg-term-white-bright :foreground ,fg-term-white-bright)))
+    `(ansi-color-bright-yellow ((,c :background ,bg-term-yellow-bright :foreground ,fg-term-yellow-bright)))
+    `(ansi-color-cyan ((,c :background ,bg-term-cyan :foreground ,fg-term-cyan)))
+    `(ansi-color-green ((,c :background ,bg-term-green :foreground ,fg-term-green)))
+    `(ansi-color-magenta ((,c :background ,bg-term-magenta :foreground ,fg-term-magenta)))
+    `(ansi-color-red ((,c :background ,bg-term-red :foreground ,fg-term-red)))
+    `(ansi-color-white ((,c :background ,bg-term-white :foreground ,fg-term-white)))
+    `(ansi-color-yellow ((,c :background ,bg-term-yellow :foreground ,fg-term-yellow)))
 ;;;; auctex and tex
     `(font-latex-bold-face ((,c :inherit bold)))
     `(font-latex-doctex-documentation-face ((,c :inherit font-lock-doc-face)))
@@ -2215,16 +2216,19 @@ text should not be underlined as well) yet still blend in."
     `(tempel-field ((,c :background ,bg-info :foreground ,info)))
     `(tempel-form ((,c :background ,bg-err :foreground ,err)))
 ;;;; term
+    ;; NOTE 2023-08-10: `term-color-black' and `term-color-white' use
+    ;; the "bright" semantic color mappings to make sure they are
+    ;; distinct from `term'.
     `(term ((,c :background ,bg-main :foreground ,fg-main)))
     `(term-bold ((,c :inherit bold)))
-    `(term-color-black ((,c :background "black" :foreground "black")))
-    `(term-color-blue ((,c :background ,blue :foreground ,blue)))
-    `(term-color-cyan ((,c :background ,cyan :foreground ,cyan)))
-    `(term-color-green ((,c :background ,green :foreground ,green)))
-    `(term-color-magenta ((,c :background ,magenta :foreground ,magenta)))
-    `(term-color-red ((,c :background ,red :foreground ,red)))
-    `(term-color-white ((,c :background "white" :foreground "white")))
-    `(term-color-yellow ((,c :background ,yellow :foreground ,yellow)))
+    `(term-color-black ((,c :background ,bg-term-black-bright :foreground ,fg-term-black-bright)))
+    `(term-color-blue ((,c :background ,bg-term-blue :foreground ,fg-term-blue)))
+    `(term-color-cyan ((,c :background ,bg-term-cyan :foreground ,fg-term-cyan)))
+    `(term-color-green ((,c :background ,bg-term-green :foreground ,fg-term-green)))
+    `(term-color-magenta ((,c :background ,bg-term-magenta :foreground ,fg-term-magenta)))
+    `(term-color-red ((,c :background ,bg-term-red :foreground ,fg-term-red)))
+    `(term-color-white ((,c :background ,bg-term-white-bright :foreground ,fg-term-white-bright)))
+    `(term-color-yellow ((,c :background ,bg-term-yellow :foreground ,fg-term-yellow)))
     `(term-underline ((,c :underline t)))
 ;;;; textsec
     `(textsec-suspicious (( )))
@@ -2313,17 +2317,20 @@ text should not be underlined as well) yet still blend in."
     `(vertico-quick1 ((,c :inherit bold :background ,bg-char-0)))
     `(vertico-quick2 ((,c :inherit bold :background ,bg-char-1)))
 ;;;; vterm
-    `(vterm-color-black ((,c :background "gray35" :foreground "black")))
-    `(vterm-color-blue ((,c :background ,blue-warmer :foreground ,blue)))
-    `(vterm-color-cyan ((,c :background ,cyan-cooler :foreground ,cyan)))
+    ;; NOTE 2023-08-10: `vterm-color-black' and `vterm-color-white'
+    ;; use the "bright" semantic color mappings to make sure they are
+    ;; distinct from `vterm-color-default'.
+    `(vterm-color-black ((,c :background ,bg-term-black :foreground ,fg-term-black)))
+    `(vterm-color-blue ((,c :background ,bg-term-blue :foreground ,fg-term-blue)))
+    `(vterm-color-cyan ((,c :background ,bg-term-cyan :foreground ,fg-term-cyan)))
     `(vterm-color-default ((,c :background ,bg-main :foreground ,fg-main)))
-    `(vterm-color-green ((,c :background ,green-cooler :foreground ,green)))
+    `(vterm-color-green ((,c :background ,bg-term-green :foreground ,fg-term-green)))
     `(vterm-color-inverse-video ((,c :background ,bg-main :inverse-video t)))
-    `(vterm-color-magenta ((,c :background ,magenta-cooler :foreground ,magenta)))
-    `(vterm-color-red ((,c :background ,red-warmer :foreground ,red)))
+    `(vterm-color-magenta ((,c :background ,bg-term-magenta :foreground ,fg-term-magenta)))
+    `(vterm-color-red ((,c :background ,bg-term-red :foreground ,fg-term-red)))
     `(vterm-color-underline ((,c :underline t)))
-    `(vterm-color-white ((,c :background "white" :foreground "gray65")))
-    `(vterm-color-yellow ((,c :background ,yellow-warmer :foreground ,yellow)))
+    `(vterm-color-white ((,c :background ,bg-term-white :foreground ,fg-term-white)))
+    `(vterm-color-yellow ((,c :background ,bg-term-yellow :foreground ,fg-term-yellow)))
 ;;;; vundo
     `(vundo-default ((,c :inherit shadow)))
     `(vundo-highlight ((,c :inherit (bold vundo-node) :foreground ,err)))