branch: externals/ef-themes
commit 9486965a27996258852927dd4c737fe474f5ae24
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
Add ef-eagle theme
---
contrast-ratios.org | 65 ++++++++++
ef-eagle-theme.el | 348 ++++++++++++++++++++++++++++++++++++++++++++++++++++
ef-themes.el | 1 +
3 files changed, 414 insertions(+)
diff --git a/contrast-ratios.org b/contrast-ratios.org
index 61f79a7404..0d112c140f 100644
--- a/contrast-ratios.org
+++ b/contrast-ratios.org
@@ -832,6 +832,71 @@ a tone. Blue is okay.
| #e7e0da | 5034 | 1.24 |
#+TBLFM: $2='(Δ $1 @1$1) :: $3='(Λ $1 @1$1);%.2f
+* ef-eagle
+:PROPERTIES:
+:CUSTOM_ID: h:bddae4eb-12dd-421f-91fa-e62e640df081
+:END:
+
+** Base colours
+:PROPERTIES:
+:CUSTOM_ID: h:564803b1-08f9-47cc-a01c-738108701cce
+:END:
+
+| Name | | #f1ecd0 | #e4dbc0 | #cec8ae | #e7e3ca |
+|----------------+---------+---------+---------+---------+---------|
+| fg-main | #231a1f | 14.24 | 12.26 | 10.09 | 13.11 |
+| fg-dim | #685f53 | 5.27 | 4.53 | 3.73 | 4.85 |
+| fg-alt | #524874 | 6.95 | 5.99 | 4.92 | 6.40 |
+| red | #882000 | 7.83 | 6.74 | 5.55 | 7.21 |
+| red-warmer | #9a0000 | 7.43 | 6.40 | 5.26 | 6.84 |
+| red-cooler | #8f0038 | 7.93 | 6.83 | 5.62 | 7.30 |
+| red-faint | #702f1f | 8.34 | 7.18 | 5.91 | 7.68 |
+| green | #226022 | 6.38 | 5.50 | 4.52 | 5.87 |
+| green-warmer | #3a7800 | 5.44 | 4.69 | 3.86 | 5.01 |
+| green-cooler | #006e50 | 5.62 | 4.83 | 3.98 | 5.17 |
+| green-faint | #42573f | 6.62 | 5.70 | 4.69 | 6.09 |
+| yellow | #6b4500 | 7.13 | 6.13 | 5.05 | 6.56 |
+| yellow-warmer | #843300 | 7.19 | 6.19 | 5.09 | 6.62 |
+| yellow-cooler | #775228 | 5.84 | 5.03 | 4.14 | 5.37 |
+| yellow-faint | #6a5937 | 5.70 | 4.91 | 4.04 | 5.24 |
+| blue | #113384 | 9.64 | 8.30 | 6.83 | 8.87 |
+| blue-warmer | #3a3da0 | 7.49 | 6.45 | 5.31 | 6.90 |
+| blue-cooler | #000080 | 13.46 | 11.58 | 9.53 | 12.38 |
+| blue-faint | #2f3460 | 9.91 | 8.53 | 7.02 | 9.12 |
+| magenta | #822478 | 7.14 | 6.14 | 5.05 | 6.57 |
+| magenta-warmer | #960f4f | 7.12 | 6.13 | 5.04 | 6.55 |
+| magenta-cooler | #50119f | 9.18 | 7.90 | 6.50 | 8.45 |
+| magenta-faint | #603a6f | 7.57 | 6.51 | 5.36 | 6.96 |
+| cyan | #125a7f | 6.32 | 5.44 | 4.47 | 5.81 |
+| cyan-warmer | #4a5d90 | 5.41 | 4.66 | 3.83 | 4.98 |
+| cyan-cooler | #00676f | 5.57 | 4.79 | 3.94 | 5.12 |
+| cyan-faint | #304f60 | 7.31 | 6.30 | 5.18 | 6.73 |
+#+TBLFM: $3='(Λ $2 @1$3);%.2f :: $4='(Λ $2 @1$4);%.2f :: $5='(Λ $2 @1$5);%.2f
:: $6='(Λ $2 @1$6);%.2f
+
+** Special colours against the modeline
+:PROPERTIES:
+:CUSTOM_ID: h:5fe7ffdf-9222-4fd6-a54c-ded0d1415b0c
+:END:
+
+| Name | | #cfab80 |
+|------------------+---------+---------|
+| modeline-err | #800000 | 5.10 |
+| modeline-warning | #60008f | 5.17 |
+| modeline-info | #1f407f | 4.67 |
+#+TBLFM: $3='(Λ $2 @1$3);%.2f
+
+** Distance and contrast between main backgrounds
+:PROPERTIES:
+:CUSTOM_ID: h:0199de6f-1c86-4b8c-ac15-407fd76c395b
+:END:
+
+# bg-main / bg-dim, bg-main / bg-alt
+| #f1ecd0 | distance | contrast |
+|---------+----------+----------|
+| #e4dbc0 | 2199 | 1.16 |
+| #cec8ae | 11249 | 1.41 |
+#+TBLFM: $2='(Δ $1 @1$1) :: $3='(Λ $1 @1$1);%.2f
+
* ef-elea-dark
:PROPERTIES:
:CUSTOM_ID: h:2c38512b-f72c-4373-8972-de3bcc232df0
diff --git a/ef-eagle-theme.el b/ef-eagle-theme.el
new file mode 100644
index 0000000000..dc832c336b
--- /dev/null
+++ b/ef-eagle-theme.el
@@ -0,0 +1,348 @@
+;;; ef-eagle-theme.el --- Legible light theme with brown, red, and desatured
colors -*- lexical-binding:t -*-
+
+;; Copyright (C) 2022-2024 Free Software Foundation, Inc.
+
+;; Author: Protesilaos Stavrou <i...@protesilaos.com>
+;; Maintainer: Protesilaos Stavrou <i...@protesilaos.com>
+;; URL: https://github.com/protesilaos/ef-themes
+;; Keywords: faces, theme, accessibility
+
+;; This file is NOT part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; The `ef-themes' are a collection of light and dark themes for GNU
+;; Emacs whose goal is to provide colorful ("pretty") yet legible
+;; options for users who want something with a bit more flair than the
+;; `modus-themes' (also designed by me).
+
+;;; Code:
+
+
+
+(eval-and-compile
+ (require 'ef-themes)
+
+;;;###theme-autoload
+ (deftheme ef-eagle
+ "Legible light theme with brown, red, and desaturated colors."
+ :background-mode 'light
+ :kind 'color-scheme
+ :family 'ef)
+
+ (defconst ef-eagle-palette
+ '(
+;;; Basic values
+
+ (bg-main "#f1ecd0")
+ (fg-main "#231a1f")
+ (bg-dim "#e4dbc0")
+ (fg-dim "#685f53")
+ (bg-alt "#cec8ae")
+ (fg-alt "#524874")
+
+ (bg-active "#aea88e")
+ (bg-inactive "#e7e0ca")
+
+;;; Basic hues for foreground values
+
+ (red "#882000")
+ (red-warmer "#9a0000")
+ (red-cooler "#8f0038")
+ (red-faint "#702f1f")
+ (green "#226022")
+ (green-warmer "#3a7800")
+ (green-cooler "#006e50")
+ (green-faint "#42573f")
+ (yellow "#6b4500")
+ (yellow-warmer "#843300")
+ (yellow-cooler "#775228")
+ (yellow-faint "#6a5937")
+ (blue "#113384")
+ (blue-warmer "#3a3da0")
+ (blue-cooler "#000080")
+ (blue-faint "#2f3460")
+ (magenta "#822478")
+ (magenta-warmer "#960f4f")
+ (magenta-cooler "#50119f")
+ (magenta-faint "#603a6f")
+ (cyan "#125a7f")
+ (cyan-warmer "#4a5d90")
+ (cyan-cooler "#00676f")
+ (cyan-faint "#304f60")
+
+;;; Basic hues for background values
+
+ (bg-red-intense "#f08f88")
+ (bg-green-intense "#96df8f")
+ (bg-yellow-intense "#efbf00")
+ (bg-blue-intense "#cfceff")
+ (bg-magenta-intense "#dfafff")
+ (bg-cyan-intense "#a0ddd0")
+
+ (bg-red-subtle "#efcabf")
+ (bg-green-subtle "#c8e8aa")
+ (bg-yellow-subtle "#efe07f")
+ (bg-blue-subtle "#ccdee8")
+ (bg-magenta-subtle "#e3d0e7")
+ (bg-cyan-subtle "#bfe0d0")
+
+;;; Diffs
+
+ (bg-added "#c0e7b0")
+ (bg-added-faint "#e0e7c2")
+ (bg-added-refine "#aad590")
+ (fg-added "#005000")
+
+ (bg-changed "#f5e690")
+ (bg-changed-faint "#f5edaf")
+ (bg-changed-refine "#edd482")
+ (fg-changed "#553d00")
+
+ (bg-removed "#f8cca6")
+ (bg-removed-faint "#f0ddbc")
+ (bg-removed-refine "#f0af90")
+ (fg-removed "#8f1313")
+
+;;; Graphs
+
+ (bg-graph-red-0 "#ef7969")
+ (bg-graph-red-1 "#ffaab4")
+ (bg-graph-green-0 "#45c050")
+ (bg-graph-green-1 "#75ef30")
+ (bg-graph-yellow-0 "#ffcf00")
+ (bg-graph-yellow-1 "#f9ff00")
+ (bg-graph-blue-0 "#7f90ff")
+ (bg-graph-blue-1 "#a6c0ff")
+ (bg-graph-magenta-0 "#e07fff")
+ (bg-graph-magenta-1 "#fad0ff")
+ (bg-graph-cyan-0 "#70d3f0")
+ (bg-graph-cyan-1 "#afefff")
+
+;;; Special hues
+
+ (bg-mode-line "#cfab80")
+ (fg-mode-line "#2f1005")
+ (bg-completion "#dfc8af")
+ (bg-hover "#c0cbd7")
+ (bg-hover-secondary "#c5d8a2")
+ (bg-hl-line "#ecdfba")
+ (bg-paren "#9fd0cc")
+ (bg-err "#f2d4b5") ; check with err
+ (bg-warning "#eee87f") ; check with warning
+ (bg-info "#cdeeb0") ; check with info
+
+ (border "#7f785f")
+ (cursor "#774400")
+ (fg-intense "#000000")
+
+ (modeline-err "#800000")
+ (modeline-warning "#66008f")
+ (modeline-info "#1f407f")
+
+ (underline-err "#ef0f1f")
+ (underline-warning "#bf5f00")
+ (underline-info "#02af52")
+
+ (bg-char-0 "#7feaff")
+ (bg-char-1 "#f0a0f0")
+ (bg-char-2 "#d0e000")
+
+;;; Mappings
+
+;;;; General mappings
+
+ (bg-fringe unspecified)
+ (fg-fringe unspecified)
+
+ (err red-warmer)
+ (warning yellow-warmer)
+ (info green)
+
+ (link yellow-cooler)
+ (link-alt cyan-faint)
+ (name red-warmer)
+ (keybind red-warmer)
+ (identifier cyan-faint)
+ (prompt yellow-warmer)
+
+ (bg-region "#cdc5af")
+ (fg-region unspecified)
+
+;;;; Code mappings
+
+ (builtin yellow-cooler)
+ (comment yellow-faint)
+ (constant green-cooler)
+ (fnname red)
+ (keyword red-faint)
+ (preprocessor red-warmer)
+ (docstring green-faint)
+ (string green-warmer)
+ (type green)
+ (variable cyan)
+ (rx-escape magenta-warmer) ; compare with `string'
+ (rx-construct blue-cooler)
+
+;;;; Accent mappings
+
+ (accent-0 red)
+ (accent-1 green-cooler)
+ (accent-2 blue)
+ (accent-3 red-warmer)
+
+;;;; Date mappings
+
+ (date-common red-faint)
+ (date-deadline red-cooler)
+ (date-event fg-alt)
+ (date-holiday red-warmer)
+ (date-now fg-main)
+ (date-range fg-alt)
+ (date-scheduled yellow-cooler)
+ (date-weekday red)
+ (date-weekend cyan)
+
+;;;; Prose mappings
+
+ (prose-code green-cooler)
+ (prose-done green-warmer)
+ (prose-macro blue)
+ (prose-metadata fg-dim)
+ (prose-metadata-value fg-alt)
+ (prose-table fg-alt)
+ (prose-table-formula warning)
+ (prose-tag yellow-faint)
+ (prose-todo red-warmer)
+ (prose-verbatim red-cooler)
+
+;;;; Mail mappings
+
+ (mail-cite-0 red)
+ (mail-cite-1 yellow)
+ (mail-cite-2 green)
+ (mail-cite-3 blue-faint)
+ (mail-part green-cooler)
+ (mail-recipient yellow)
+ (mail-subject red-warmer)
+ (mail-other yellow-warmer)
+
+;;;; Search mappings
+
+ (bg-search-current bg-yellow-intense)
+ (bg-search-lazy bg-cyan-intense)
+ (bg-search-replace bg-red-intense)
+
+ (bg-search-rx-group-0 bg-magenta-intense)
+ (bg-search-rx-group-1 bg-green-intense)
+ (bg-search-rx-group-2 bg-red-subtle)
+ (bg-search-rx-group-3 bg-cyan-subtle)
+
+;;;; Space mappings
+
+ (bg-space unspecified)
+ (fg-space border)
+ (bg-space-err bg-yellow-intense)
+
+;;;; Tab mappings
+
+ (bg-tab-bar bg-alt)
+ (bg-tab-current bg-main)
+ (bg-tab-other bg-active)
+
+;;;; Terminal mappings
+
+ (bg-term-black "black")
+ (fg-term-black "black")
+ (bg-term-black-bright "gray35")
+ (fg-term-black-bright "gray35")
+
+ (bg-term-red red-cooler)
+ (fg-term-red red-cooler)
+ (bg-term-red-bright red-warmer)
+ (fg-term-red-bright red-warmer)
+
+ (bg-term-green green)
+ (fg-term-green green)
+ (bg-term-green-bright green-warmer)
+ (fg-term-green-bright green-warmer)
+
+ (bg-term-yellow yellow)
+ (fg-term-yellow yellow)
+ (bg-term-yellow-bright yellow-cooler)
+ (fg-term-yellow-bright yellow-cooler)
+
+ (bg-term-blue blue-warmer)
+ (fg-term-blue blue-warmer)
+ (bg-term-blue-bright blue-cooler)
+ (fg-term-blue-bright blue-cooler)
+
+ (bg-term-magenta magenta)
+ (fg-term-magenta magenta)
+ (bg-term-magenta-bright magenta-cooler)
+ (fg-term-magenta-bright magenta-cooler)
+
+ (bg-term-cyan cyan)
+ (fg-term-cyan cyan)
+ (bg-term-cyan-bright cyan-cooler)
+ (fg-term-cyan-bright cyan-cooler)
+
+ (bg-term-white "gray65")
+ (fg-term-white "gray65")
+ (bg-term-white-bright "white")
+ (fg-term-white-bright "white")
+
+;;;; Rainbow mappings
+
+ (rainbow-0 red)
+ (rainbow-1 cyan-faint)
+ (rainbow-2 red-faint)
+ (rainbow-3 green-cooler)
+ (rainbow-4 yellow)
+ (rainbow-5 red-cooler)
+ (rainbow-6 blue-faint)
+ (rainbow-7 yellow-warmer)
+ (rainbow-8 green))
+ "The `ef-eagle' palette.
+Color values have the form (COLOR-NAME HEX-VALUE) with the former
+as a symbol and the latter as a string.
+
+Semantic color mappings have the form (MAPPING-NAME COLOR-NAME)
+with both as symbols. The latter is a color that already exists
+in the palette and is associated with a HEX-VALUE.")
+
+ (defcustom ef-eagle-palette-overrides nil
+ "Overrides for `ef-eagle-palette'.
+
+Mirror the elements of the aforementioned palette, overriding
+their value.
+
+For overrides that are shared across all of the Ef themes,
+refer to `ef-themes-common-palette-overrides'.
+
+To preview the palette entries, use `ef-themes-preview-colors' or
+`ef-themes-preview-colors-current' (read the documentation for
+further details)."
+ :group 'ef-themes
+ :package-version '(ef-themes . "1.0.0")
+ :type '(repeat (list symbol (choice symbol string)))
+ :link '(info-link "(ef-themes) Palette overrides"))
+
+ (ef-themes-theme ef-eagle ef-eagle-palette ef-eagle-palette-overrides)
+
+ (provide-theme 'ef-eagle))
+
+;;; ef-eagle-theme.el ends here
diff --git a/ef-themes.el b/ef-themes.el
index c24eb6004a..6449560c93 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -63,6 +63,7 @@
ef-day
ef-deuteranopia-light
ef-duo-light
+ ef-eagle
ef-elea-light
ef-frost
ef-kassio
