[elpa] externals/ef-themes b96b8df969 1/3: Expand ef-themes-headings to cover the Org agenda

[ELPA Syncer]

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

    Expand ef-themes-headings to cover the Org agenda
---
 README.org   | 21 ++++++++++++++-------
 ef-themes.el | 29 +++++++++++++++++------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/README.org b/README.org
index 1ced6dbc7f..ea007a08b0 100644
--- a/README.org
+++ b/README.org
@@ -289,27 +289,34 @@ regard.
 :CUSTOM_ID: h:a7a02817-e324-43e9-a7d8-fde024530af6
 :END:
 
+[ Expanded as part of {{{development-version}}}.  It now accepts the
+  =agenda-date= and =agenda-structure= keys for the Org agenda headings. ]
+
 #+vindex: ef-themes-headings
 The user option ~ef-themes-headings~ provides support for individual
-heading styles for levels 0 through 8.
+heading styles for regular heading levels 0 through 8, as well as the
+Org agenda headings.
 
-This is an alist that accepts a =(key . list-of-values)= combination.
-The key is either a number, representing the heading's level (0
-through 8) or =t=, which pertains to the fallback style.
+This is an alist that accepts a =(KEY . LIST-OF-VALUES)= combination.
+The =KEY= is either a number, representing the heading's level (0
+through 8) or =t=, which pertains to the fallback style.  The named
+keys =agenda-date= and =agenda-structure= apply to the Org agenda.
 
 Level 0 is a special heading: it is used for what counts as a document
 title or equivalent, such as the =#+title= construct we find in Org
 files.  Levels 1-8 are regular headings.
 
-The list of values covers symbols that refer to properties, as described
-below.  Here is a complete sample, followed by a presentation of all
-available properties:
+The =LIST-OF-VALUES= covers symbols that refer to properties, as
+described below.  Here is a complete sample with various stylistic
+combinations, followed by a presentation of all available properties:
 
 #+begin_src emacs-lisp
 (setq ef-themes-headings
       '((1 . (light variable-pitch 1.5))
         (2 . (regular 1.3))
         (3 . (1.1))
+        (agenda-date (1.3))
+        (agenda-structure (variable-pitch light 1.8))
         (t . (variable-pitch))))
 #+end_src
 
diff --git a/ef-themes.el b/ef-themes.el
index a456ee59db..e4e30c0f99 100644
--- a/ef-themes.el
+++ b/ef-themes.el
@@ -143,22 +143,27 @@ This is a helper variable intended for internal use.")
 (defcustom ef-themes-headings nil
   "Heading styles with optional list of values for levels 0-8.
 
-This is an alist that accepts a (key . list-of-values)
-combination.  The key is either a number, representing the
+This is an alist that accepts a (KEY . LIST-OF-VALUES)
+combination.  The KEY is either a number, representing the
 heading's level (0-8) or t, which pertains to the fallback style.
+The named keys `agenda-date' and `agenda-structure' apply to the
+Org agenda.
 
-Level 0 is a special heading: it is used for what counts as a
-document title or equivalent, such as the #+title construct we
-find in Org files.  Levels 1-8 are regular headings.
+Level 0 is used for what counts as a document title or
+equivalent, such as the #+title construct we find in Org files.
+Levels 1-8 are regular headings.
 
-The list of values covers symbols that refer to properties, as
-described below.  Here is a complete sample, followed by a
-presentation of all available properties:
+The LIST-OF-VALUES covers symbols that refer to properties, as
+described below.  Here is a complete sample with various
+stylistic combinations, followed by a presentation of all
+available properties:
 
     (setq ef-themes-headings
           (quote ((1 . (light variable-pitch 1.5))
                   (2 . (regular 1.3))
                   (3 . (1.1))
+                  (agenda-date (1.3))
+                  (agenda-structure (variable-pitch light 1.8))
                   (t . (variable-pitch)))))
 
 By default (a nil value for this variable), all headings have a
@@ -217,11 +222,11 @@ will retain the original aesthetic for that level.  For 
example:
                   (2 . (1.3))
                   (t . t)))) ; default style for all other levels"
   :group 'ef-themes
-  :package-version '(ef-themes . "0.3.0")
+  :package-version '(ef-themes . "0.10.0")
   :type `(alist
           :options ,(mapcar (lambda (el)
                               (list el ef-themes--headings-choice))
-                            '(0 1 2 3 4 5 6 7 8 t))
+                            '(0 1 2 3 4 5 6 7 8 t agenda-date 
agenda-structure))
           :key-type symbol
           :value-type ,ef-themes--headings-choice)
   :link '(info-link "(ef-themes) Option for headings"))
@@ -1575,7 +1580,7 @@ Helper function for `ef-themes-preview-colors'."
     `(org-agenda-clocking ((,c :background ,bg-warning :foreground ,warning)))
     `(org-agenda-column-dateline ((,c :background ,bg-alt)))
     `(org-agenda-current-time ((,c :foreground ,fg-main)))
-    `(org-agenda-date ((,c :inherit ef-themes-heading-2 :foreground ,date)))
+    `(org-agenda-date ((,c ,@(ef-themes--heading 'agenda-date) :foreground 
,date)))
     `(org-agenda-date-today ((,c :inherit org-agenda-date :underline t)))
     `(org-agenda-date-weekend ((,c :inherit org-agenda-date :foreground ,err)))
     `(org-agenda-date-weekend-today ((,c :inherit org-agenda-date-today 
:foreground ,err)))
@@ -1587,7 +1592,7 @@ Helper function for `ef-themes-preview-colors'."
     `(org-agenda-filter-regexp ((,c :inherit bold :foreground ,modeline-err)))
     `(org-agenda-filter-tags ((,c :inherit bold :foreground ,modeline-err)))
     `(org-agenda-restriction-lock ((,c :background ,bg-dim :foreground 
,fg-dim)))
-    `(org-agenda-structure ((,c :inherit ef-themes-heading-0 :foreground 
,fg-alt)))
+    `(org-agenda-structure ((,c ,@(ef-themes--heading 'agenda-structure) 
:foreground ,fg-alt)))
     `(org-agenda-structure-filter ((,c :inherit org-agenda-structure 
:foreground ,warning)))
     `(org-agenda-structure-secondary ((,c :inherit font-lock-doc-face)))
     `(org-archived ((,c :background ,bg-alt :foreground ,fg-main)))