diff options
| author | Protesilaos Stavrou <info@protesilaos.com> | 2023-10-25 12:13:40 +0300 |
|---|---|---|
| committer | Protesilaos Stavrou <info@protesilaos.com> | 2023-10-25 12:13:40 +0300 |
| commit | e4feb5f9c2dd8e69806a7d4c87bbd2f924a99284 (patch) | |
| tree | 2d793fd1a26ffc241e4b50cbb9b88ec3de457adb | |
| parent | 5305f6cf9c0486860022c242ee5585db4057597c (diff) | |
BREAKING: remove 'ef-themes-region' and document how to use overrides
I am introducing the new 'fg-region' entry in each theme's palette. It
is semantic colour mapping for the region's foreground. By default, it
is set to the special 'unspecified' symbol, meaning that the region's
underlying text colour is not overriden. Setting 'fg-region' to a
colour will override all underlying region foregrounds with that one.
Using palette overrides instead of hardcoded toggles gives users
maximum flexibility over the choice of colour and exact intensity they
need.
| -rw-r--r-- | README.org | 115 | ||||
| -rw-r--r-- | ef-autumn-theme.el | 8 | ||||
| -rw-r--r-- | ef-bio-theme.el | 8 | ||||
| -rw-r--r-- | ef-cherie-theme.el | 8 | ||||
| -rw-r--r-- | ef-cyprus-theme.el | 8 | ||||
| -rw-r--r-- | ef-dark-theme.el | 8 | ||||
| -rw-r--r-- | ef-day-theme.el | 8 | ||||
| -rw-r--r-- | ef-deuteranopia-dark-theme.el | 8 | ||||
| -rw-r--r-- | ef-deuteranopia-light-theme.el | 8 | ||||
| -rw-r--r-- | ef-duo-dark-theme.el | 8 | ||||
| -rw-r--r-- | ef-duo-light-theme.el | 8 | ||||
| -rw-r--r-- | ef-elea-dark-theme.el | 8 | ||||
| -rw-r--r-- | ef-elea-light-theme.el | 8 | ||||
| -rw-r--r-- | ef-frost-theme.el | 8 | ||||
| -rw-r--r-- | ef-kassio-theme.el | 8 | ||||
| -rw-r--r-- | ef-light-theme.el | 8 | ||||
| -rw-r--r-- | ef-maris-dark-theme.el | 8 | ||||
| -rw-r--r-- | ef-maris-light-theme.el | 8 | ||||
| -rw-r--r-- | ef-melissa-dark-theme.el | 8 | ||||
| -rw-r--r-- | ef-melissa-light-theme.el | 8 | ||||
| -rw-r--r-- | ef-night-theme.el | 8 | ||||
| -rw-r--r-- | ef-spring-theme.el | 8 | ||||
| -rw-r--r-- | ef-summer-theme.el | 8 | ||||
| -rw-r--r-- | ef-symbiosis-theme.el | 8 | ||||
| -rw-r--r-- | ef-themes.el | 65 | ||||
| -rw-r--r-- | ef-trio-dark-theme.el | 8 | ||||
| -rw-r--r-- | ef-trio-light-theme.el | 8 | ||||
| -rw-r--r-- | ef-tritanopia-dark-theme.el | 8 | ||||
| -rw-r--r-- | ef-tritanopia-light-theme.el | 8 | ||||
| -rw-r--r-- | ef-winter-theme.el | 8 |
30 files changed, 158 insertions, 246 deletions
@@ -151,10 +151,6 @@ Everything is in place to set up the package. (setq ef-themes-mixed-fonts t ef-themes-variable-pitch-ui t) -;; Read the doc string or manual for this one. The symbols can be -;; combined in any order. -(setq ef-themes-region '(intense no-extend neutral)) - ;; Disable all other themes to avoid awkward blending: (mapc #'disable-theme custom-enabled-themes) @@ -403,45 +399,6 @@ This will retain the original aesthetic for that level. For example: (t . t))) ; default style for all unspecified levels #+end_src -** Style of region highlight -:PROPERTIES: -:CUSTOM_ID: h:1d5fa3d8-a769-455a-aac7-5c1b925bb10b -:END: - -#+vindex: ef-themes-region -The user option ~ef-themes-region~ controls the appearance of the -~region~ face (the highlighted selection of an area). - -The value it accepts is a list of symbols. - -If ~nil~ or an empty list (the default), use a subtle background for -the region and preserve the color of selected text. - -The ~no-extend~ symbol limits the highlighted area to the end of the -line, so that it does not reach the edge of the window. - -The ~neutral~ symbol makes the highlighted area's background gray (or -more gray, depending on the theme). - -The ~intense~ symbol amplifies the intensity of the highlighted area's -background color. It also overrides any text color to keep it -legible. - -Combinations of those symbols are expressed in any order. - -In user configuration files the form may look like this: - -#+begin_src emacs-lisp -(setq ef-themes-region '(intense no-extend)) -#+end_src - -Other examples: - -#+begin_src emacs-lisp -(setq ef-themes-region '(intense)) -(setq ef-themes-region '(intense no-extend neutral)) -#+end_src - ** Palette overrides :PROPERTIES: :CUSTOM_ID: h:4b923795-4b23-4345-81e5-d1c108a84b6a @@ -626,6 +583,60 @@ theme's palette ([[#h:8dd67bf5-879e-46e5-b277-5bac141f53d1][Preview theme colors the buffer. In the above example, the first instance of =blue-warmer= is the override and the second is the original one. +** Stylistic variants using palette overrides +:PROPERTIES: +:CUSTOM_ID: h:df1199d8-eaba-47db-805d-6b568a577bf3 +:END: + +[ Part of {{{development-version}}}. ] + +This section contains practical examples of overriding the palette of +the themes ([[#h:4b923795-4b23-4345-81e5-d1c108a84b6a][Palette overrides]]). Users can copy the code to their init +file, evaluate it, and then re-load the theme for changes to take +effect. To apply overrides at startup simply define them before the +call that loads the theme. + +*** Make the region more intense +:PROPERTIES: +:CUSTOM_ID: h:c8605d37-66e1-42aa-986e-d7514c3af6fe +:END: + +[ Part of {{{development-version}}}. ] + +This is one of our practical examples to override the semantic colors +of the Ef themes ([[#h:df1199d8-eaba-47db-805d-6b568a577bf3][Stylistic variants using palette overrides]]). Here we +show how to make the region override the underlying text colors(i.e. +to be more legible) and how to make the background more intense. + +[[#h:a5140c9c-18b2-45db-8021-38d0b5074116][Do not extend the region background]]. + +#+begin_src emacs-lisp +;; These overrides are common to all Ef themes. We also provide +;; theme-specific options, such as `ef-summer-palette-overrides'. +;; +;; In general, the theme-specific overrides are better for overriding +;; color values, such as redefining what `blue-faint' looks like. The +;; common overrides are best used for changes to semantic color +;; mappings, as we show below. +;; +;; Use the command `ef-themes-preview-colors' or its variant +;; `ef-themes-preview-colors-current' to review the available palette +;; entries. + + +;; Use an intense background combined with the theme's intense +;; foreground. +(setq ef-themes-common-palette-overrides + '((bg-region bg-magenta-intense) + (fg-region fg-intense))) + +;; Same idea as above, but less pronounced. +(setq ef-themes-common-palette-overrides + '((bg-region bg-magenta-subtle) + (fg-region fg-main))) +#+end_src + + * Loading a theme :PROPERTIES: :CUSTOM_ID: h:75d74aea-d17f-497f-a3b8-f0bf4c372de0 @@ -1030,6 +1041,24 @@ In this document, we always mention ~ef-themes-post-load-hook~ though the user can replace it with ~after-enable-theme-hook~ should they need to (provided they understand the implications). +** Do not extend the region background +:PROPERTIES: +:CUSTOM_ID: h:a5140c9c-18b2-45db-8021-38d0b5074116 +:END: + +By the default, the background of the ~region~ face extends from the +end of the line to the edge of the window. To limit it to the end of +the line, we need to override the face's =:extend= attribute. Adding +this to the Emacs configuration file will suffice: + +#+begin_src emacs-lisp +;; Do not extend `region' background past the end of the line. +(custom-set-faces + '(region ((t :extend nil)))) +#+end_src + +[[#h:c8605d37-66e1-42aa-986e-d7514c3af6fe][Make the region more intense]]. + ** Add support for hl-todo :PROPERTIES: :CUSTOM_ID: h:19c549dc-d13f-45c4-a727-3618591d5c4f diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el index 7f089d6..b256b80 100644 --- a/ef-autumn-theme.el +++ b/ef-autumn-theme.el @@ -141,7 +141,6 @@ (bg-hover "#265f4a") (bg-hover-secondary "#55345a") (bg-hl-line "#302a3a") - (bg-region "#3f1020") (bg-paren "#2f6c4a") (bg-err "#391400") ; check with err (bg-warning "#332800") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#4f4400") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt cyan-cooler) + (bg-region "#3f1020") + (fg-region unspecified) + ;;;; Code mappings (builtin red-cooler) diff --git a/ef-bio-theme.el b/ef-bio-theme.el index d99be1d..b6fdeb7 100644 --- a/ef-bio-theme.el +++ b/ef-bio-theme.el @@ -141,7 +141,6 @@ (bg-hover "#4f3f9a") (bg-hover-secondary "#003e5f") (bg-hl-line "#00331f") - (bg-region "#3a3027") (bg-paren "#664950") (bg-err "#381400") ; check with err (bg-warning "#332800") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#0f5450") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt cyan-cooler) + (bg-region "#3a3027") + (fg-region unspecified) + ;;;; Code mappings (builtin green) diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el index 6022823..197b6e6 100644 --- a/ef-cherie-theme.el +++ b/ef-cherie-theme.el @@ -141,7 +141,6 @@ (bg-hover "#303f6f") (bg-hover-secondary "#66364f") (bg-hl-line "#401f33") - (bg-region "#232f3f") (bg-paren "#3f5f75") (bg-err "#3c0f12") ; check with err (bg-warning "#352905") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#3f3460") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt magenta-warmer) + (bg-region "#232f3f") + (fg-region unspecified) + ;;;; Code mappings (builtin blue-warmer) diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el index ba55ab0..dd58412 100644 --- a/ef-cyprus-theme.el +++ b/ef-cyprus-theme.el @@ -141,7 +141,6 @@ (bg-hover "#efc26f") (bg-hover-secondary "#afc0f0") (bg-hl-line "#f0e0d4") - (bg-region "#e0e7e5") (bg-paren "#9fcfdf") (bg-err "#ffd4bf") ; check with err (bg-warning "#f0e8ba") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#dcd09f") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier green-faint) (prompt green) + (bg-region "#e0e7e5") + (fg-region unspecified) + ;;;; Code mappings (builtin green-warmer) diff --git a/ef-dark-theme.el b/ef-dark-theme.el index 2ab7ec9..4a8b642 100644 --- a/ef-dark-theme.el +++ b/ef-dark-theme.el @@ -141,7 +141,6 @@ (bg-hover "#004a5f") (bg-hover-secondary "#551f5a") (bg-hl-line "#002435") - (bg-region "#2a234a") (bg-paren "#20577a") (bg-err "#360d09") ; check with err (bg-warning "#332600") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#3a3465") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt green-cooler) + (bg-region "#2a234a") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta) diff --git a/ef-day-theme.el b/ef-day-theme.el index bc88617..7bd9ad5 100644 --- a/ef-day-theme.el +++ b/ef-day-theme.el @@ -141,7 +141,6 @@ (bg-hover "#b0e0df") (bg-hover-secondary "#febccf") (bg-hl-line "#f9e2b2") - (bg-region "#f0d2df") (bg-paren "#8fcfdf") (bg-err "#ffdde5") ; check with err (bg-warning "#ffe0aa") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#f0a0f0") (bg-char-2 "#d0e000") -;;; Conditional hues - - (bg-region-intense "#dfc39a") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt yellow) + (bg-region "#f0d2df") + (fg-region unspecified) + ;;;; Code mappings (builtin red-cooler) diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el index 101f620..4cfa2a9 100644 --- a/ef-deuteranopia-dark-theme.el +++ b/ef-deuteranopia-dark-theme.el @@ -144,7 +144,6 @@ (bg-hover "#4f4f00") (bg-hover-secondary "#00405f") (bg-hl-line "#2e2e1b") - (bg-region "#223848") (bg-paren "#0f4f9a") (bg-err "#342b00") ; check with err (bg-warning "#32351f") ; check with warning @@ -166,10 +165,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#1f2f70") - ;;; Mappings ;;;; General mappings @@ -185,6 +180,9 @@ (identifier cyan-faint) (prompt blue-cooler) + (bg-region "#223848") + (fg-region unspecified) + ;;;; Code mappings (builtin blue-warmer) diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el index 49ec762..67bf72b 100644 --- a/ef-deuteranopia-light-theme.el +++ b/ef-deuteranopia-light-theme.el @@ -144,7 +144,6 @@ (bg-hover "#eebb20") (bg-hover-secondary "#afafef") (bg-hl-line "#f3e0d5") - (bg-region "#dadadf") (bg-paren "#8fc0cf") (bg-err "#f0e0a0") ; check with err (bg-warning "#e3ea9a") ; check with warning @@ -166,10 +165,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#cfcf9a") - ;;; Mappings ;;;; General mappings @@ -185,6 +180,9 @@ (identifier cyan-faint) (prompt blue) + (bg-region "#dadadf") + (fg-region unspecified) + ;;;; Code mappings (builtin cyan) diff --git a/ef-duo-dark-theme.el b/ef-duo-dark-theme.el index c1886e1..5de5b80 100644 --- a/ef-duo-dark-theme.el +++ b/ef-duo-dark-theme.el @@ -144,7 +144,6 @@ (bg-hover "#664f4a") (bg-hover-secondary "#264f4a") (bg-hl-line "#301a4f") - (bg-region "#042a50") (bg-paren "#2f608e") (bg-err "#360d09") ; check with err (bg-warning "#332600") ; check with warning @@ -166,10 +165,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#1f2f70") - ;;; Mappings ;;;; General mappings @@ -185,6 +180,9 @@ (identifier red-faint) (prompt yellow) + (bg-region "#042a50") + (fg-region unspecified) + ;;;; Code mappings (builtin cyan) diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el index 72eae99..f6422f1 100644 --- a/ef-duo-light-theme.el +++ b/ef-duo-light-theme.el @@ -144,7 +144,6 @@ (bg-hover "#b4cfff") (bg-hover-secondary "#aaeccf") (bg-hl-line "#f9e8c0") - (bg-region "#caeafa") (bg-paren "#afbfef") (bg-err "#ffdfe6") ; check with err (bg-warning "#ffe5ba") ; check with warning @@ -166,10 +165,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#dfc2b0") - ;;; Mappings ;;;; General mappings @@ -185,6 +180,9 @@ (identifier red-faint) (prompt blue-warmer) + (bg-region "#caeafa") + (fg-region unspecified) + ;;;; Code mappings (builtin cyan-cooler) diff --git a/ef-elea-dark-theme.el b/ef-elea-dark-theme.el index 0d00f9e..190be5c 100644 --- a/ef-elea-dark-theme.el +++ b/ef-elea-dark-theme.el @@ -141,7 +141,6 @@ (bg-hover "#894f7a") (bg-hover-secondary "#425d4a") (bg-hl-line "#2f413f") - (bg-region "#543040") (bg-paren "#3f6f5f") (bg-err "#551525") ; check with err (bg-warning "#403f20") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#6f6600") -;;; Conditional hues - - (bg-region-intense "#6f4489") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt magenta-cooler) + (bg-region "#543040") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta-faint) diff --git a/ef-elea-light-theme.el b/ef-elea-light-theme.el index 83ac140..8936bed 100644 --- a/ef-elea-light-theme.el +++ b/ef-elea-light-theme.el @@ -141,7 +141,6 @@ (bg-hover "#dfbac0") (bg-hover-secondary "#b5dfbf") (bg-hl-line "#d0e7c4") - (bg-region "#d9d2ef") (bg-paren "#8ad3a2") (bg-err "#f2d5b5") ; check with err (bg-warning "#e8e8aa") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#f0a0f0") (bg-char-2 "#d0e000") -;;; Conditional hues - - (bg-region-intense "#c6b2d3") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt magenta-warmer) + (bg-region "#d9d2ef") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta-faint) diff --git a/ef-frost-theme.el b/ef-frost-theme.el index 980fee3..f7b8176 100644 --- a/ef-frost-theme.el +++ b/ef-frost-theme.el @@ -141,7 +141,6 @@ (bg-hover "#eab5ff") (bg-hover-secondary "#aae0bf") (bg-hl-line "#dff6e4") - (bg-region "#d4eaf3") (bg-paren "#cab0ef") (bg-err "#ffdfda") ; check with err (bg-warning "#ffe9bf") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#aadfcc") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt cyan) + (bg-region "#d4eaf3") + (fg-region unspecified) + ;;;; Code mappings (builtin cyan) diff --git a/ef-kassio-theme.el b/ef-kassio-theme.el index c018dfc..da4c399 100644 --- a/ef-kassio-theme.el +++ b/ef-kassio-theme.el @@ -141,7 +141,6 @@ (bg-hover "#c0d0ff") (bg-hover-secondary "#efd5ff") (bg-hl-line "#f2e5d9") - (bg-region "#dfe4f4") (bg-paren "#b0dffa") (bg-err "#ffdde5") ; check with err (bg-warning "#ffe0aa") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#f0c0f0") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier yellow-cooler) (prompt blue-warmer) + (bg-region "#dfe4f4") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta) diff --git a/ef-light-theme.el b/ef-light-theme.el index 033f2cb..723651b 100644 --- a/ef-light-theme.el +++ b/ef-light-theme.el @@ -141,7 +141,6 @@ (bg-hover "#aaeccf") (bg-hover-secondary "#ccbfff") (bg-hl-line "#e4efd8") - (bg-region "#bfefff") (bg-paren "#dfa0f3") (bg-err "#ffd5ea") ; check with err (bg-warning "#ffeabb") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#afdfc0") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt green-cooler) + (bg-region "#bfefff") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta) diff --git a/ef-maris-dark-theme.el b/ef-maris-dark-theme.el index c7f66f9..55a2418 100644 --- a/ef-maris-dark-theme.el +++ b/ef-maris-dark-theme.el @@ -141,7 +141,6 @@ (bg-hover "#684d54") (bg-hover-secondary "#49516a") (bg-hl-line "#243242") - (bg-region "#183c65") (bg-paren "#6c5d54") (bg-err "#551525") ; check with err (bg-warning "#403f20") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#6f6600") -;;; Conditional hues - - (bg-region-intense "#3f4f7e") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt blue-warmer) + (bg-region "#183c65") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta-faint) diff --git a/ef-maris-light-theme.el b/ef-maris-light-theme.el index 5145a9e..5d00042 100644 --- a/ef-maris-light-theme.el +++ b/ef-maris-light-theme.el @@ -141,7 +141,6 @@ (bg-hover "#d2b4cf") (bg-hover-secondary "#b7bbea") (bg-hl-line "#dae5f0") - (bg-region "#c8dcff") (bg-paren "#cab3b2") (bg-err "#f2c2b5") ; check with err (bg-warning "#e8df9a") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#f0a0f0") (bg-char-2 "#d0e000") -;;; Conditional hues - - (bg-region-intense "#a6bfd3") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt blue-warmer) + (bg-region "#c8dcff") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta-faint) diff --git a/ef-melissa-dark-theme.el b/ef-melissa-dark-theme.el index ba35478..fae93d3 100644 --- a/ef-melissa-dark-theme.el +++ b/ef-melissa-dark-theme.el @@ -141,7 +141,6 @@ (bg-hover "#29595f") (bg-hover-secondary "#5a661f") (bg-hl-line "#4f311f") - (bg-region "#443a4f") (bg-paren "#5f6f1f") (bg-err "#551a05") ; check with err (bg-warning "#4f3f10") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#6f6600") -;;; Conditional hues - - (bg-region-intense "#6a5040") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier red-faint) (prompt green-warmer) + (bg-region "#443a4f") + (fg-region unspecified) + ;;;; Code mappings (builtin yellow-cooler) diff --git a/ef-melissa-light-theme.el b/ef-melissa-light-theme.el index 909c664..b601e76 100644 --- a/ef-melissa-light-theme.el +++ b/ef-melissa-light-theme.el @@ -141,7 +141,6 @@ (bg-hover "#aee7df") (bg-hover-secondary "#c4d47a") (bg-hl-line "#fae7b0") - (bg-region "#f0d4d8") (bg-paren "#afcf8f") (bg-err "#ffd4b5") ; check with err (bg-warning "#ffe89f") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#f0a0f0") (bg-char-2 "#d0e000") -;;; Conditional hues - - (bg-region-intense "#eacf8f") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier red-faint) (prompt green-warmer) + (bg-region "#f0d4d8") + (fg-region unspecified) + ;;;; Code mappings (builtin yellow-cooler) diff --git a/ef-night-theme.el b/ef-night-theme.el index 74f2b10..1fc3e73 100644 --- a/ef-night-theme.el +++ b/ef-night-theme.el @@ -141,7 +141,6 @@ (bg-hover "#6f345a") (bg-hover-secondary "#493737") (bg-hl-line "#002255") - (bg-region "#222f40") (bg-paren "#664950") (bg-err "#331419") ; check with err (bg-warning "#332613") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#3f2f60") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt cyan-warmer) + (bg-region "#222f40") + (fg-region unspecified) + ;;;; Code mappings (builtin green-cooler) diff --git a/ef-spring-theme.el b/ef-spring-theme.el index 3c0da87..1927ec9 100644 --- a/ef-spring-theme.el +++ b/ef-spring-theme.el @@ -141,7 +141,6 @@ (bg-hover "#ffc09f") (bg-hover-secondary "#f0bfff") (bg-hl-line "#f9e0e5") - (bg-region "#d0e6ff") (bg-paren "#7fddd0") (bg-err "#ffe8e0") ; check with err (bg-warning "#ffecba") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#cfb5f0") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt green) + (bg-region "#d0e6ff") + (fg-region unspecified) + ;;;; Code mappings (builtin green) diff --git a/ef-summer-theme.el b/ef-summer-theme.el index 0d5d4ca..63e369e 100644 --- a/ef-summer-theme.el +++ b/ef-summer-theme.el @@ -141,7 +141,6 @@ (bg-hover "#b4cfff") (bg-hover-secondary "#aaeccf") (bg-hl-line "#ffd6e5") - (bg-region "#eecfff") (bg-paren "#9fc0ef") (bg-err "#ffd0e6") ; check with err (bg-warning "#ffe5ba") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#caaadf") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt magenta-warmer) + (bg-region "#eecfff") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta) diff --git a/ef-symbiosis-theme.el b/ef-symbiosis-theme.el index 77032a7..b8143de 100644 --- a/ef-symbiosis-theme.el +++ b/ef-symbiosis-theme.el @@ -141,7 +141,6 @@ (bg-hover "#304477") (bg-hover-secondary "#5f3f3a") (bg-hl-line "#1f2f3f") - (bg-region "#2f2630") (bg-paren "#005f4a") (bg-err "#360d09") ; check with err (bg-warning "#332600") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#425425") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier yellow-faint) (prompt cyan) + (bg-region "#2f2630") + (fg-region unspecified) + ;;;; Code mappings (builtin blue) diff --git a/ef-themes.el b/ef-themes.el index 2895fe3..1a860dc 100644 --- a/ef-themes.el +++ b/ef-themes.el @@ -295,41 +295,7 @@ ELPA (by Protesilaos))." :type 'boolean :link '(info-link "(ef-themes) UI typeface")) -(defcustom ef-themes-region nil - "Control the appearance of the `region' face. - -The value is a list of symbols. - -If nil or an empty list (the default), use a subtle background -for the region and preserve the color of selected text. - -The `no-extend' symbol limits the highlighted area to the end of -the line, so that it does not reach the edge of the window. - -The `neutral' symbol makes the highlighted area's background -gray (or more gray, depending on the theme). - -The `intense' symbol amplifies the intensity of the highlighted -area's background color. It also overrides any text color to -keep it legible. - -Combinations of those symbols are expressed in any order. - -In user configuration files the form may look like this: - - (setq ef-themes-region \\='(intense no-extend)) - -Other examples: - - (setq ef-themes-region \\='(intense)) - (setq ef-themes-region \\='(intense no-extend neutral))" - :group 'ef-themes - :package-version '(ef-themes . "0.10.0") - :type '(set :tag "Properties" :greedy t - (const :tag "Do not extend to the edge of the window" no-extend) - (const :tag "More neutral/gray background" neutral) - (const :tag "More intense background (also override text color)" accented)) - :link '(info-link "(ef-themes) Style of region highlight")) +(make-obsolete-variable 'ef-themes-region nil "1.4.0 (use palette overrides to change region colours)") (defcustom ef-themes-common-palette-overrides nil "Set palette overrides for all the Ef themes. @@ -413,33 +379,6 @@ sequence given SEQ-PRED, using SEQ-DEFAULT as a fallback." :weight (or weight 'unspecified)))) -(defun ef-themes--region (bg bgneutral bgintense bgintenseneutral fgintense) - "Apply `ef-themes-region' styles. - -BG is the default background. BGNEUTRAL is its gray counterpart. -BGINTENSE is an amplified variant of BG, while BGINTENSENEUTRAL -is a more intense neutral background. FGINTENSE is the -foreground that is used with any of the intense backgrounds." - (let ((properties (ef-themes--list-or-warn 'ef-themes-region))) - (list - :background - (cond - ((and (memq 'intense properties) (memq 'neutral properties)) - bgintenseneutral) - ((memq 'intense properties) - bgintense) - ((memq 'neutral properties) - bgneutral) - (bg)) - :foreground - (if (memq 'intense properties) - fgintense - 'unspecified) - :extend - (if (memq 'no-extend properties) - nil - t)))) - ;;; Commands and their helper functions (defun ef-themes--retrieve-palette-value (color palette) @@ -915,7 +854,7 @@ text should not be underlined as well) yet still blend in." `(default ((,c :background ,bg-main :foreground ,fg-main))) `(italic ((,c :slant italic))) `(menu ((,c :background ,bg-dim :foreground ,fg-main))) - `(region ((,c ,@(ef-themes--region bg-region bg-alt bg-region-intense bg-active fg-intense)))) + `(region ((,c :background ,bg-region :foreground ,fg-region))) `(scroll-bar ((,c :background ,bg-dim :foreground ,fg-dim))) `(tool-bar ((,c :background ,bg-dim :foreground ,fg-main))) `(vertical-border ((,c :foreground ,border))) diff --git a/ef-trio-dark-theme.el b/ef-trio-dark-theme.el index 054c1b8..22544ba 100644 --- a/ef-trio-dark-theme.el +++ b/ef-trio-dark-theme.el @@ -141,7 +141,6 @@ (bg-hover "#004f3f") (bg-hover-secondary "#452f5f") (bg-hl-line "#34223f") - (bg-region "#16304f") (bg-paren "#2f605e") (bg-err "#3a0f06") ; check with err (bg-warning "#332910") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#5d336c") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier red-faint) (prompt blue-cooler) + (bg-region "#16304f") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta-cooler) diff --git a/ef-trio-light-theme.el b/ef-trio-light-theme.el index a2ce368..4021868 100644 --- a/ef-trio-light-theme.el +++ b/ef-trio-light-theme.el @@ -141,7 +141,6 @@ (bg-hover "#aaeccf") (bg-hover-secondary "#b4cfff") (bg-hl-line "#cfe6ff") - (bg-region "#eed0ff") (bg-paren "#dfadaf") (bg-err "#ffdfe6") ; check with err (bg-warning "#ffe5bf") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#ffaaff") (bg-char-2 "#dff000") -;;; Conditional hues - - (bg-region-intense "#aacacf") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier red-faint) (prompt blue-cooler) + (bg-region "#eed0ff") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta-cooler) diff --git a/ef-tritanopia-dark-theme.el b/ef-tritanopia-dark-theme.el index 008dd23..6e53238 100644 --- a/ef-tritanopia-dark-theme.el +++ b/ef-tritanopia-dark-theme.el @@ -144,7 +144,6 @@ (bg-hover "#00405f") (bg-hover-secondary "#5e3e5b") (bg-hl-line "#3f1515") - (bg-region "#202d3f") (bg-paren "#2f5f7a") (bg-err "#3a0f0f") ; check with err (bg-warning "#371430") ; check with warning @@ -166,10 +165,6 @@ (bg-char-1 "#00709f") (bg-char-2 "#5f3faf") -;;; Conditional hues - - (bg-region-intense "#5f303f") - ;;; Mappings ;;;; General mappings @@ -185,6 +180,9 @@ (identifier magenta-faint) (prompt cyan) + (bg-region "#202d3f") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta) diff --git a/ef-tritanopia-light-theme.el b/ef-tritanopia-light-theme.el index f50ffb7..aeabca7 100644 --- a/ef-tritanopia-light-theme.el +++ b/ef-tritanopia-light-theme.el @@ -144,7 +144,6 @@ (bg-hover "#8fcfff") (bg-hover-secondary "#eda9dc") (bg-hl-line "#ffdadf") - (bg-region "#dadadf") (bg-paren "#8fc0cf") (bg-err "#ffbfca") ; check with err (bg-warning "#efcae6") ; check with warning @@ -166,10 +165,6 @@ (bg-char-1 "#bfbfff") (bg-char-2 "#5fcfdf") -;;; Conditional hues - - (bg-region-intense "#dfa5a5") - ;;; Mappings ;;;; General mappings @@ -185,6 +180,9 @@ (identifier magenta-faint) (prompt cyan) + (bg-region "#dadadf") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta) diff --git a/ef-winter-theme.el b/ef-winter-theme.el index 1ac03a7..429d6ad 100644 --- a/ef-winter-theme.el +++ b/ef-winter-theme.el @@ -141,7 +141,6 @@ (bg-hover "#00474f") (bg-hover-secondary "#44196f") (bg-hl-line "#003045") - (bg-region "#342464") (bg-paren "#2f608e") (bg-err "#330d06") ; check with err (bg-warning "#332610") ; check with warning @@ -163,10 +162,6 @@ (bg-char-1 "#7f1f7f") (bg-char-2 "#625a00") -;;; Conditional hues - - (bg-region-intense "#4f2f5d") - ;;; Mappings ;;;; General mappings @@ -182,6 +177,9 @@ (identifier magenta-faint) (prompt magenta-warmer) + (bg-region "#342464") + (fg-region unspecified) + ;;;; Code mappings (builtin magenta-warmer) |
