[elpa] externals/ef-themes fa1c39d19e 3/7: Add support for Avy; include relevant semantic colour mappings

[ELPA Syncer]

branch: externals/ef-themes
commit fa1c39d19e9a4d516b4c1e1c8aa441d038c19ea2
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Add support for Avy; include relevant semantic colour mappings
---
 README.org                     |  1 +
 ef-autumn-theme.el             |  4 ++++
 ef-bio-theme.el                |  4 ++++
 ef-cherie-theme.el             |  4 ++++
 ef-cyprus-theme.el             |  4 ++++
 ef-dark-theme.el               |  4 ++++
 ef-day-theme.el                |  4 ++++
 ef-deuteranopia-dark-theme.el  |  4 ++++
 ef-deuteranopia-light-theme.el |  4 ++++
 ef-duo-dark-theme.el           |  4 ++++
 ef-duo-light-theme.el          |  4 ++++
 ef-elea-dark-theme.el          |  4 ++++
 ef-elea-light-theme.el         |  4 ++++
 ef-frost-theme.el              |  4 ++++
 ef-kassio-theme.el             |  4 ++++
 ef-light-theme.el              |  4 ++++
 ef-night-theme.el              |  4 ++++
 ef-spring-theme.el             |  4 ++++
 ef-summer-theme.el             |  4 ++++
 ef-symbiosis-theme.el          |  4 ++++
 ef-themes.el                   | 19 +++++++++++++++++++
 ef-trio-dark-theme.el          |  4 ++++
 ef-trio-light-theme.el         |  4 ++++
 ef-tritanopia-dark-theme.el    |  4 ++++
 ef-tritanopia-light-theme.el   |  4 ++++
 ef-winter-theme.el             |  4 ++++
 26 files changed, 116 insertions(+)

diff --git a/README.org b/README.org
index 791feeb5ca..1a2d8f5a50 100644
--- a/README.org
+++ b/README.org
@@ -1282,6 +1282,7 @@ everything most users need.
 - ansi-color
 - auctex
 - auto-dim-other-buffers
+- avy [Part of {{{development-version}}}]
 - bongo
 - bookmark
 - calendar and diary
diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index 65508aa518..e8a0f769b8 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#4f4400")
diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index 286f21500d..49843ca656 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#0f5450")
diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el
index 3e1570f513..18f69e0876 100644
--- a/ef-cherie-theme.el
+++ b/ef-cherie-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#3f3460")
diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el
index be5c16db47..6cde58eb3a 100644
--- a/ef-cyprus-theme.el
+++ b/ef-cyprus-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af5f")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#dcd09f")
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index 366f47d1d8..226b52afeb 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#3a3465")
diff --git a/ef-day-theme.el b/ef-day-theme.el
index 7820cb0760..894f2b8523 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af52")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#f0a0f0")
+      (bg-char-2 "#d0e000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#dfc39a")
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index 4d84a5dae9..c09ceb2425 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -158,6 +158,10 @@
       (underline-warning "#bfaf50")
       (underline-info    "#22cff2")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#1f2f70")
diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el
index defb573ca5..3c86ac4d2c 100644
--- a/ef-deuteranopia-light-theme.el
+++ b/ef-deuteranopia-light-theme.el
@@ -158,6 +158,10 @@
       (underline-warning "#6f3f00")
       (underline-info    "#025f92")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#cfcf9a")
diff --git a/ef-duo-dark-theme.el b/ef-duo-dark-theme.el
index c84f0abc35..5448d02705 100644
--- a/ef-duo-dark-theme.el
+++ b/ef-duo-dark-theme.el
@@ -158,6 +158,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#1f2f70")
diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el
index a7bbb0ab27..d07256bf7a 100644
--- a/ef-duo-light-theme.el
+++ b/ef-duo-light-theme.el
@@ -158,6 +158,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af52")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#dfc2b0")
diff --git a/ef-elea-dark-theme.el b/ef-elea-dark-theme.el
index 7823272d0c..2b4244d385 100644
--- a/ef-elea-dark-theme.el
+++ b/ef-elea-dark-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#6f6600")
+
 ;;; Conditional hues
 
       (bg-region-intense "#6f4489")
diff --git a/ef-elea-light-theme.el b/ef-elea-light-theme.el
index 1f932ba14c..bc22800ce1 100644
--- a/ef-elea-light-theme.el
+++ b/ef-elea-light-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af5f")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#f0a0f0")
+      (bg-char-2 "#d0e000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#c6b2d3")
diff --git a/ef-frost-theme.el b/ef-frost-theme.el
index 1fb9357b9c..64b5461c12 100644
--- a/ef-frost-theme.el
+++ b/ef-frost-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af52")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#aadfcc")
diff --git a/ef-kassio-theme.el b/ef-kassio-theme.el
index 7928449b41..e58606a7c5 100644
--- a/ef-kassio-theme.el
+++ b/ef-kassio-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af52")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#f0c0f0")
diff --git a/ef-light-theme.el b/ef-light-theme.el
index c1b8e55fac..0fff90a248 100644
--- a/ef-light-theme.el
+++ b/ef-light-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af52")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#afdfc0")
diff --git a/ef-night-theme.el b/ef-night-theme.el
index 68ca22d4d5..250141a4b9 100644
--- a/ef-night-theme.el
+++ b/ef-night-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#3f2f60")
diff --git a/ef-spring-theme.el b/ef-spring-theme.el
index ed3b75d1ad..8290db2931 100644
--- a/ef-spring-theme.el
+++ b/ef-spring-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af52")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#cfb5f0")
diff --git a/ef-summer-theme.el b/ef-summer-theme.el
index 2760ae278a..3be0211822 100644
--- a/ef-summer-theme.el
+++ b/ef-summer-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af52")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#caaadf")
diff --git a/ef-symbiosis-theme.el b/ef-symbiosis-theme.el
index 521fa4dd4b..311d97df1f 100644
--- a/ef-symbiosis-theme.el
+++ b/ef-symbiosis-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#425425")
diff --git a/ef-themes.el b/ef-themes.el
index 5d9dd8b0dc..a71a5a5a2c 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -844,6 +844,15 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
   :package-version '(ef-themes . "0.4.0")
   :group 'ef-themes-faces)
 
+(defface ef-themes-reset-soft nil
+  "Generic face to set most face properties to nil.
+
+This is intended to be inherited by faces that should not retain
+properties from their context (e.g. an overlay over an underlined
+text should not be underlined as well) yet still blend in."
+  :package-version '(ef-themes . "1.2.0")
+  :group 'ef-themes-faces)
+
 ;; This produces `ef-themes-mark-delete' and the like.
 (dolist (scope '(delete select other))
   (custom-declare-face
@@ -881,6 +890,9 @@ Optional prefix argument MAPPINGS has the same meaning as 
for
     `(ef-themes-underline-error ((,c :underline (:style wave :color 
,underline-err))))
     `(ef-themes-underline-info ((,c :underline (:style wave :color 
,underline-info))))
     `(ef-themes-underline-warning ((,c :underline (:style wave :color 
,underline-warning))))
+    `(ef-themes-reset-soft ((,c :background ,bg-main :foreground ,fg-main
+                                :weight normal :slant normal :strike-through 
nil
+                                :box nil :underline nil :overline nil :extend 
nil)))
 ;;;; all basic faces
 ;;;;; absolute essentials
     `(bold ((,c :weight bold)))
@@ -1006,6 +1018,13 @@ Optional prefix argument MAPPINGS has the same meaning 
as for
     `(TeX-error-description-warning ((,c :inherit warning)))
 ;;;; auto-dim-other-buffers
     `(auto-dim-other-buffers-face ((,c :background ,bg-inactive)))
+;;;; avy
+    `(avy-background-face ((,c :background ,bg-dim :foreground ,fg-dim :extend 
t)))
+    `(avy-goto-char-timer-face ((,c :inherit bold :background ,bg-active)))
+    `(avy-lead-face ((,c :inherit (bold ef-themes-reset-soft) :background 
,bg-char-0)))
+    `(avy-lead-face-0 ((,c :inherit (bold ef-themes-reset-soft) :background 
,bg-char-1)))
+    `(avy-lead-face-1 ((,c :inherit ef-themes-reset-soft :background 
,bg-inactive)))
+    `(avy-lead-face-2 ((,c :inherit (bold ef-themes-reset-soft) :background 
,bg-char-2)))
 ;;;; bongo
     `(bongo-album-title (( )))
     `(bongo-artist ((,c :foreground ,rainbow-0)))
diff --git a/ef-trio-dark-theme.el b/ef-trio-dark-theme.el
index 4acdbc6d58..0837eaf720 100644
--- a/ef-trio-dark-theme.el
+++ b/ef-trio-dark-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#5d336c")
diff --git a/ef-trio-light-theme.el b/ef-trio-light-theme.el
index afe9a19a09..43b6f24e72 100644
--- a/ef-trio-light-theme.el
+++ b/ef-trio-light-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#bf5f00")
       (underline-info    "#02af52")
 
+      (bg-char-0 "#7feaff")
+      (bg-char-1 "#ffaaff")
+      (bg-char-2 "#dff000")
+
 ;;; Conditional hues
 
       (bg-region-intense "#aacacf")
diff --git a/ef-tritanopia-dark-theme.el b/ef-tritanopia-dark-theme.el
index 9c7918dc0d..7115a328fd 100644
--- a/ef-tritanopia-dark-theme.el
+++ b/ef-tritanopia-dark-theme.el
@@ -158,6 +158,10 @@
       (underline-warning "#ffafa0")
       (underline-info    "#22ffd2")
 
+      (bg-char-0 "#922a00")
+      (bg-char-1 "#00709f")
+      (bg-char-2 "#5f3faf")
+
 ;;; Conditional hues
 
       (bg-region-intense "#5f303f")
diff --git a/ef-tritanopia-light-theme.el b/ef-tritanopia-light-theme.el
index cd6543e307..5c0e19ce2b 100644
--- a/ef-tritanopia-light-theme.el
+++ b/ef-tritanopia-light-theme.el
@@ -158,6 +158,10 @@
       (underline-warning "#af7f90")
       (underline-info    "#22afc2")
 
+      (bg-char-0 "#ff908f")
+      (bg-char-1 "#bfbfff")
+      (bg-char-2 "#5fcfdf")
+
 ;;; Conditional hues
 
       (bg-region-intense "#dfa5a5")
diff --git a/ef-winter-theme.el b/ef-winter-theme.el
index d8b0f994a6..d0fedacadb 100644
--- a/ef-winter-theme.el
+++ b/ef-winter-theme.el
@@ -155,6 +155,10 @@
       (underline-warning "#c0b000")
       (underline-info    "#22b022")
 
+      (bg-char-0 "#0050af")
+      (bg-char-1 "#7f1f7f")
+      (bg-char-2 "#625a00")
+
 ;;; Conditional hues
 
       (bg-region-intense "#4f2f5d")