Add prose mappings (WORK-IN-PROGRESS)

The idea is to expand the palette to make semantic colour mappings
more "semantic" and to allow users more freedom to override what they
want.

21 files changed, 237 insertions, 17 deletions

diff --git a/ef-autumn-theme.el b/ef-autumn-theme.el
index c65b5dc..3f61735 100644
--- a/ef-autumn-theme.el
+++ b/ef-autumn-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code yellow-warmer)
+      (prose-done green-cooler)
+      (prose-macro cyan-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim green-cooler)
 
       (accent-0 green-cooler)
       (accent-1 yellow-warmer)
diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index b0e331b..4a6a917 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code blue-warmer)
+      (prose-done green)
+      (prose-macro magenta-warmer)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red)
+      (prose-verbatim green-cooler)
 
       (accent-0 green-cooler)
       (accent-1 blue-warmer)
diff --git a/ef-cherie-theme.el b/ef-cherie-theme.el
index f9f15df..95f8b6f 100644
--- a/ef-cherie-theme.el
+++ b/ef-cherie-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code yellow)
+      (prose-done green)
+      (prose-macro blue-warmer)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim magenta-warmer)
 
       (accent-0 magenta-warmer)
       (accent-1 yellow)
diff --git a/ef-cyprus-theme.el b/ef-cyprus-theme.el
index 9386f67..6217be0 100644
--- a/ef-cyprus-theme.el
+++ b/ef-cyprus-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code red-cooler)
+      (prose-done green)
+      (prose-macro cyan-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim green)
 
       (accent-0 green)
       (accent-1 red-cooler)
diff --git a/ef-dark-theme.el b/ef-dark-theme.el
index ea2afdd..eb79600 100644
--- a/ef-dark-theme.el
+++ b/ef-dark-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code magenta-warmer)
+      (prose-done green)
+      (prose-macro green-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim blue)
 
       (accent-0 blue)
       (accent-1 magenta-warmer)
diff --git a/ef-day-theme.el b/ef-day-theme.el
index f15395b..42ab169 100644
--- a/ef-day-theme.el
+++ b/ef-day-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code green-cooler)
+      (prose-done green)
+      (prose-macro yellow)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim red)
 
       (accent-0 red)
       (accent-1 green-cooler)
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index a8a143d..92928ca 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -192,6 +192,17 @@
       (date-weekday cyan)
       (date-weekend magenta-faint)
 
+;;;; Prose mappings
+
+      (prose-code yellow-warmer)
+      (prose-done blue-cooler)
+      (prose-macro cyan-warmer)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo yellow-warmer)
+      (prose-verbatim blue-cooler)
 
       (accent-0 blue-cooler)
       (accent-1 yellow-warmer)
diff --git a/ef-deuteranopia-light-theme.el b/ef-deuteranopia-light-theme.el
index 8369e73..e3edc05 100644
--- a/ef-deuteranopia-light-theme.el
+++ b/ef-deuteranopia-light-theme.el
@@ -192,6 +192,17 @@
       (date-weekday cyan)
       (date-weekend magenta-faint)
 
+;;;; Prose mappings
+
+      (prose-code yellow-warmer)
+      (prose-done blue-cooler)
+      (prose-macro cyan)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo yellow-warmer)
+      (prose-verbatim blue-cooler)
 
       (accent-0 blue-cooler)
       (accent-1 yellow-warmer)
diff --git a/ef-duo-dark-theme.el b/ef-duo-dark-theme.el
index 6530468..d6a5ccc 100644
--- a/ef-duo-dark-theme.el
+++ b/ef-duo-dark-theme.el
@@ -192,6 +192,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code yellow-warmer)
+      (prose-done green)
+      (prose-macro green-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red)
+      (prose-verbatim blue-warmer)
 
       (accent-0 blue-warmer)
       (accent-1 yellow-warmer)
diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el
index 624856c..def8289 100644
--- a/ef-duo-light-theme.el
+++ b/ef-duo-light-theme.el
@@ -192,6 +192,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code yellow-warmer)
+      (prose-done green)
+      (prose-macro green-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red)
+      (prose-verbatim blue-warmer)
 
       (accent-0 blue-warmer)
       (accent-1 yellow-warmer)
diff --git a/ef-frost-theme.el b/ef-frost-theme.el
index d86b36c..76c1464 100644
--- a/ef-frost-theme.el
+++ b/ef-frost-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code green-cooler)
+      (prose-done green)
+      (prose-macro magenta-warmer)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red)
+      (prose-verbatim blue-warmer)
 
       (accent-0 blue-warmer)
       (accent-1 green-cooler)
diff --git a/ef-light-theme.el b/ef-light-theme.el
index 2dd1d44..4413cf3 100644
--- a/ef-light-theme.el
+++ b/ef-light-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code magenta-warmer)
+      (prose-done green)
+      (prose-macro green-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim blue-warmer)
 
       (accent-0 blue-warmer)
       (accent-1 magenta-warmer)
diff --git a/ef-night-theme.el b/ef-night-theme.el
index 8c17016..44f55d4 100644
--- a/ef-night-theme.el
+++ b/ef-night-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code magenta-warmer)
+      (prose-done green-cooler)
+      (prose-macro cyan-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red)
+      (prose-verbatim blue-cooler)
 
       (accent-0 blue-cooler)
       (accent-1 magenta-warmer)
diff --git a/ef-spring-theme.el b/ef-spring-theme.el
index 6bc55ad..515faca 100644
--- a/ef-spring-theme.el
+++ b/ef-spring-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code red-cooler)
+      (prose-done green)
+      (prose-macro blue)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim green)
 
       (accent-0 green)
       (accent-1 red-cooler)
diff --git a/ef-summer-theme.el b/ef-summer-theme.el
index 303c6e5..8701ef0 100644
--- a/ef-summer-theme.el
+++ b/ef-summer-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code yellow)
+      (prose-done green-cooler)
+      (prose-macro cyan-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim magenta-cooler)
 
       (accent-0 magenta-cooler)
       (accent-1 yellow)
diff --git a/ef-themes.el b/ef-themes.el
index 44c5db8..b6190c4 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -916,9 +916,9 @@ Optional prefix argument MAPPINGS has the same meaning as for
     `(font-latex-slide-title-face ((,c :inherit ef-themes-heading-0)))
     `(font-latex-string-face ((,c :inherit font-lock-string-face)))
     `(font-latex-underline-face ((,c :inherit underline)))
-    `(font-latex-verbatim-face ((,c :inherit ef-themes-fixed-pitch :foreground ,accent-0)))
+    `(font-latex-verbatim-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-verbatim)))
     `(font-latex-warning-face ((,c :inherit font-lock-warning-face)))
-    `(tex-verbatim ((,c :inherit ef-themes-fixed-pitch :foreground ,accent-0)))
+    `(tex-verbatim ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-verbatim)))
     ;; `(texinfo-heading ((,c :foreground ,magenta)))
     `(TeX-error-description-error ((,c :inherit error)))
     `(TeX-error-description-help ((,c :inherit success)))
@@ -1574,7 +1574,7 @@ Optional prefix argument MAPPINGS has the same meaning as for
     `(markdown-header-face-5 ((,c :inherit ef-themes-heading-5)))
     `(markdown-header-face-6 ((,c :inherit ef-themes-heading-6)))
     `(markdown-highlighting-face ((,c :background ,bg-info :foreground ,info)))
-    `(markdown-inline-code-face ((,c :inherit ef-themes-fixed-pitch :foreground ,accent-1))) ; same as `org-code'
+    `(markdown-inline-code-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-code)))
     `(markdown-italic-face ((,c :inherit italic)))
     `(markdown-language-keyword-face ((,c :inherit ef-themes-fixed-pitch :background ,bg-dim)))
     `(markdown-line-break-face ((,c :inherit nobreak-space)))
@@ -1584,7 +1584,7 @@ Optional prefix argument MAPPINGS has the same meaning as for
     `(markdown-metadata-value-face ((,c :foreground ,string)))
     `(markdown-missing-link-face ((,c :inherit warning)))
     `(markdown-pre-face ((,c :inherit markdown-code-face)))
-    `(markdown-table-face ((,c :inherit ef-themes-fixed-pitch :foreground ,fg-alt))) ; same as `org-table'
+    `(markdown-table-face ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-table)))
     `(markdown-url-face ((,c :foreground ,fg-alt)))
 ;;;; messages
     `(message-cited-text-1 ((,c :foreground ,mail-0)))
@@ -1737,11 +1737,11 @@ Optional prefix argument MAPPINGS has the same meaning as for
     `(org-date ((,c :inherit ef-themes-fixed-pitch :foreground ,date-common)))
     `(org-date-selected ((,c :foreground ,date-common :inverse-video t)))
     `(org-dispatcher-highlight ((,c :inherit warning :background ,bg-warning)))
-    `(org-document-info ((,c :foreground ,rainbow-1)))
-    `(org-document-info-keyword ((,c :inherit shadow)))
+    `(org-document-info ((,c :foreground ,prose-metadata-value)))
+    `(org-document-info-keyword ((,c :foreground ,prose-metadata)))
     `(org-document-title ((,c :inherit ef-themes-heading-0)))
-    `(org-done ((,c :foreground ,info)))
-    `(org-drawer ((,c :inherit (shadow ef-themes-fixed-pitch))))
+    `(org-done ((,c :foreground ,prose-done)))
+    `(org-drawer ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata)))
     `(org-ellipsis (( ))) ; inherits from the heading's color
     `(org-footnote ((,c :inherit link)))
     `(org-formula ((,c :inherit ef-themes-fixed-pitch :foreground ,fnname)))
@@ -1761,28 +1761,28 @@ Optional prefix argument MAPPINGS has the same meaning as for
     `(org-level-8 ((,c :inherit ef-themes-heading-8)))
     `(org-link ((,c :inherit link)))
     `(org-list-dt ((,c :inherit bold)))
-    `(org-macro ((,c :inherit ef-themes-fixed-pitch :foreground ,accent-2)))
-    `(org-meta-line ((,c :inherit (shadow ef-themes-fixed-pitch))))
+    `(org-macro ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-macro)))
+    `(org-meta-line ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata)))
     `(org-mode-line-clock (( )))
     `(org-mode-line-clock-overrun ((,c :inherit bold :foreground ,modeline-err)))
-    `(org-priority ((,c :foreground ,fg-alt)))
-    `(org-property-value ((,c :inherit ef-themes-fixed-pitch :foreground ,fg-alt)))
+    `(org-priority ((,c :foreground ,prose-tag)))
+    `(org-property-value ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-metadata-value)))
     `(org-quote ((,c :inherit org-block)))
     `(org-scheduled ((,c :foreground ,date-scheduled)))
     `(org-scheduled-previously ((,c :inherit org-scheduled)))
     `(org-scheduled-today ((,c :inherit org-scheduled)))
     `(org-sexp-date ((,c :foreground ,date-common)))
     `(org-special-keyword ((,c :inherit (shadow ef-themes-fixed-pitch))))
-    `(org-table ((,c :inherit ef-themes-fixed-pitch :foreground ,fg-alt)))
+    `(org-table ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-table)))
     `(org-table-header ((,c :inherit (bold org-table))))
-    `(org-tag ((,c :foreground ,fg-alt)))
+    `(org-tag ((,c :foreground ,prose-tag)))
     `(org-tag-group ((,c :inherit (bold org-tag))))
     `(org-target ((,c :underline t)))
     `(org-time-grid ((,c :foreground ,fg-dim)))
-    `(org-todo ((,c :foreground ,err)))
+    `(org-todo ((,c :foreground ,prose-todo)))
     `(org-upcoming-deadline ((,c :foreground ,date-deadline)))
     `(org-upcoming-distant-deadline ((,c :inherit org-upcoming-deadline)))
-    `(org-verbatim ((,c :inherit ef-themes-fixed-pitch :foreground ,accent-0)))
+    `(org-verbatim ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-verbatim)))
     `(org-verse ((,c :inherit org-block)))
     `(org-warning ((,c :inherit warning)))
 ;;;; org-habit
@@ -1905,7 +1905,7 @@ Optional prefix argument MAPPINGS has the same meaning as for
     `(sh-heredoc ((,c :inherit font-lock-doc-face)))
     `(sh-quoted-exec ((,c :inherit font-lock-builtin-face)))
 ;;;; shr
-    `(shr-code ((,c :inherit ef-themes-fixed-pitch :foreground ,accent-1))) ; same as `org-code'
+    `(shr-code ((,c :inherit ef-themes-fixed-pitch :foreground ,prose-code)))
     `(shr-h1 ((,c :inherit ef-themes-heading-1)))
     `(shr-h2 ((,c :inherit ef-themes-heading-2)))
     `(shr-h3 ((,c :inherit ef-themes-heading-3)))
diff --git a/ef-trio-dark-theme.el b/ef-trio-dark-theme.el
index 266d49a..891cf42 100644
--- a/ef-trio-dark-theme.el
+++ b/ef-trio-dark-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code green-cooler)
+      (prose-done green)
+      (prose-macro blue-warmer)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim magenta-warmer)
 
       (accent-0 magenta-warmer)
       (accent-1 green-cooler)
diff --git a/ef-trio-light-theme.el b/ef-trio-light-theme.el
index 610e5fb..954465f 100644
--- a/ef-trio-light-theme.el
+++ b/ef-trio-light-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code green-cooler)
+      (prose-done green)
+      (prose-macro blue-warmer)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim magenta-warmer)
 
       (accent-0 magenta-warmer)
       (accent-1 green-cooler)
diff --git a/ef-tritanopia-dark-theme.el b/ef-tritanopia-dark-theme.el
index 4b80194..c1df3da 100644
--- a/ef-tritanopia-dark-theme.el
+++ b/ef-tritanopia-dark-theme.el
@@ -192,6 +192,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code red)
+      (prose-done cyan)
+      (prose-macro cyan-warmer)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim cyan)
 
       (accent-0 cyan)
       (accent-1 red)
diff --git a/ef-tritanopia-light-theme.el b/ef-tritanopia-light-theme.el
index b814a60..6c5eb2b 100644
--- a/ef-tritanopia-light-theme.el
+++ b/ef-tritanopia-light-theme.el
@@ -192,6 +192,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code red)
+      (prose-done cyan)
+      (prose-macro cyan-warmer)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim cyan)
 
       (accent-0 cyan)
       (accent-1 red)
diff --git a/ef-winter-theme.el b/ef-winter-theme.el
index 1ae7ccb..f9f62f0 100644
--- a/ef-winter-theme.el
+++ b/ef-winter-theme.el
@@ -189,6 +189,17 @@
       (date-weekday cyan)
       (date-weekend red-faint)
 
+;;;; Prose mappings
+
+      (prose-code yellow)
+      (prose-done green)
+      (prose-macro green-cooler)
+      (prose-metadata fg-dim)
+      (prose-metadata-value fg-alt)
+      (prose-table fg-alt)
+      (prose-tag fg-alt)
+      (prose-todo red-warmer)
+      (prose-verbatim magenta-cooler)
 
       (accent-0 magenta-cooler)
       (accent-1 yellow)