[elpa] externals/engrave-faces 0cc9159 12/36: No longer set default face information separately

[ELPA Syncer]

branch: externals/engrave-faces
commit 0cc9159956785078ddd8c66619a81c52f9a5182e
Author: TEC <tec@tecosaur.com>
Commit: TEC <tec@tecosaur.com>

    No longer set default face information separately
    
    This is now possible thanks to the earlier re-implementation of face
    inheritance.
---
 engrave-faces-latex.el | 16 +++++++---------
 engrave-faces.el       |  9 ++++-----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/engrave-faces-latex.el b/engrave-faces-latex.el
index 81c809f..76f8b16 100644
--- a/engrave-faces-latex.el
+++ b/engrave-faces-latex.el
@@ -16,13 +16,11 @@
 
 (defun engrave-faces-latex-gen-preamble ()
   "TODO"
-  (concat
-   "\\definecolor{EFD}{HTML}{" (substring (plist-get 
engrave-faces-preset-default :foreground) 1) "}\n"
-   (mapconcat
-    (lambda (face-style)
-      (engrave-faces-latex-gen-preamble-line (car face-style) (cdr 
face-style)))
-    engrave-faces-preset-styles
-    "\n")))
+  (mapconcat
+   (lambda (face-style)
+     (engrave-faces-latex-gen-preamble-line (car face-style) (cdr face-style)))
+   engrave-faces-preset-styles
+   "\n"))
 
 (defun engrave-faces-latex-gen-preamble-line (face style)
   (let ((short (plist-get style         :slug))
@@ -59,7 +57,7 @@
 (defun engrave-faces-latex-face-mapper (faces content)
   "TODO"
   (let ((protected-content (replace-regexp-in-string "[\\{}$%&_#]" "\\\\\\&" 
content))
-        (style (assoc faces engrave-faces-preset-styles)))
+        (style (unless (eq faces 'default) (assoc faces 
engrave-faces-preset-styles))))
     (if (string-match-p "\\`[\n[:space:]]+\\'" content)
         protected-content
       (if (and style (eq engrave-faces-latex-output-style 'preset))
@@ -76,7 +74,7 @@
   (insert (if (eq engrave-faces-latex-output-style 'preset)
               "\\color{EFD}"
             (concat "\\color[HTML]{"
-                    (substring (plist-get (assoc 'default 
engrave-faces-preset-styles)
+                    (substring (plist-get (cdr (assoc 'default 
engrave-faces-preset-styles))
                                           :foreground) 1)
                     "}")))
   (dolist (find-sub engrave-faces-latex-char-replacements)
diff --git a/engrave-faces.el b/engrave-faces.el
index 5b69c21..9dd559f 100644
--- a/engrave-faces.el
+++ b/engrave-faces.el
@@ -178,7 +178,8 @@ To consider inheritence, use 
`engrave-faces-explicit-inheritance' first."
 ;;; Style helpers
 
 (defvar engrave-faces-preset-styles ; doom-one-light
-  '((font-lock-keyword-face              :short "keyword"          :slug "k"   
  :foreground "#e45649")
+  '((default                             :short "default"          :slug "D"   
  :foreground "#383a42")
+    (font-lock-keyword-face              :short "keyword"          :slug "k"   
  :foreground "#e45649")
     (font-lock-doc-face                  :short "doc"              :slug "d"   
  :foreground "#84888b" :slant italic)
     (font-lock-type-face                 :short "type"             :slug "t"   
  :foreground "#986801")
     (font-lock-string-face               :short "string"           :slug "s"   
  :foreground "#50a14f")
@@ -207,9 +208,6 @@ To consider inheritence, use 
`engrave-faces-explicit-inheritance' first."
     (rainbow-delimiters-depth-9-face     :short "rd9"              :slug 
"rdix"  :foreground "#887070"))
   "TODO")
 
-(defvar engrave-faces-preset-default '(:foreground "#383a42")
-  "TODO")
-
 (defun engrave-faces-check-nondefault (attr value)
   (unless (or (eq value (face-attribute 'default attr nil t))
               (eq value 'unspecified))
@@ -227,7 +225,8 @@ To consider inheritence, use 
`engrave-faces-explicit-inheritance' first."
                   (mapcar
                    (lambda (attr)
                      (let ((attr-val (face-attribute (car face-style) attr nil 
t)))
-                       (when (engrave-faces-check-nondefault attr attr-val)
+                       (when (or (engrave-faces-check-nondefault attr attr-val)
+                                 (eq (car face-style) 'default))
                          (list attr attr-val))))
                    engrave-faces-attributes-of-interest))))
    engrave-faces-preset-styles))