set-fontset-font calls fixed

2 files changed, 133 insertions, 12 deletions

diff --git a/init.org b/init.org
index 9de60ed..50697fd 100644
--- a/init.org
+++ b/init.org
@@ -296,20 +296,23 @@
       See [[https://emacs.stackexchange.com/questions/251/line-height-with-unicode-characters/5386#5386][fonts - Line height with unicode characters]] for a good
       discussion.
       #+begin_src emacs-lisp
-        (defun jao--set-fontsets (f)
-          (set-fontset-font t 64257 "Quivira" f)
-          (set-fontset-font t 'egyptian "Noto Sans Egyptian Hieroglyphs" f)
-          (set-fontset-font t 'hangul "NanumGothicCoding" f)
-          (set-fontset-font t 'unicode (face-attribute 'default :family) f)
-          (set-fontset-font t 'unicode-bmp (face-attribute 'default :family) f)
-          (set-fontset-font t 'symbol "Symbola-10" f)
-          (set-fontset-font t 'greek "GFS Didot" f)
-          (set-fontset-font t 'mathematical "FreeSerif" f)
-          (set-fontset-font t 'emoji "Noto Color Emoji" f)
+        (defun jao--set-fontsets (_f)
+          (set-fontset-font t 64257 "Quivira" nil 'prepend)
+          (set-fontset-font t 'egyptian "Noto Sans Egyptian Hieroglyphs"
+                            nil 'prepend)
+          (set-fontset-font t 'hangul "NanumGothicCoding" nil 'prepend)
+          (set-fontset-font t 'unicode (face-attribute 'default :family)
+                            nil 'prependf)
+          (set-fontset-font t 'unicode-bmp (face-attribute 'default :family)
+                            nil 'prependf)
+          (set-fontset-font t 'symbol "Symbola-10" nil 'prepend)
+          (set-fontset-font t 'greek "GFS Didot" nil 'prepend)
+          (set-fontset-font t 'mathematical "FreeSerif" nil 'prepend)
+          (set-fontset-font t 'emoji "Noto Color Emoji" nil 'prepend)
           ;; boxes
-          (set-fontset-font t '(9472 . 9599) "Source Code Pro" f)
+          (set-fontset-font t '(9472 . 9599) "Source Code Pro" nil 'prepend)
           ;; variation selector-16
-          (set-fontset-font t 65039 "BabelStone Modern-1" f))
+          (set-fontset-font t 65039 "BabelStone Modern-1" nil 'prepend))
 
         (jao--set-fontsets nil)
         (add-to-list 'after-make-frame-functions 'jao--set-fontsets)
diff --git a/lib/themes/jao-black-and-white.el b/lib/themes/jao-black-and-white.el
new file mode 100644
index 0000000..c222a5b
--- /dev/null
+++ b/lib/themes/jao-black-and-white.el
@@ -0,0 +1,118 @@
+;;; jao-light-theme.el --- a light theme  -*- lexical-binding: t; -*-
+
+;; Author: jao <mail@jao.io>
+;; Keywords: themes
+
+;; This program 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.
+
+;; This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+(jao-define-custom-theme jao-black-and-white
+  (:names (bg1 "white")
+          (bg2 "gray95")
+          (bg3 "gray90")
+          (bg4 "gray85")
+          (bg5 "gray98")
+          (bg6 "gray99")
+          (bg7 "gray80")
+
+          (fg1  "black")
+          (fg2 "gray10")
+          (fg3 "gray20")
+          (fg4 "gray30")
+          (fg5 "gray40")
+
+          (hl "cornsilk1")
+
+          (str  "grey05")
+
+          (search   "#e8e800")
+          (search2  "#ffffb4")
+
+          (warning "orange4")
+          (red     "burlywood4")
+          (ok      "#005555"))
+  (:face-family "Roboto Mono")
+  (:bold-weight 'medium)
+  (:palette (fg "black")
+            (bg "white")
+            (box "grey88")
+            (button (c fg5 bg4) bx nit)
+            (hilite (c nil hl))
+            (link nbf (ul fg5))
+            (visited-link (ul bg7) nbf)
+            (tab-sel (~ mode-line))
+            (tab-unsel (~ mode-line-inactive))
+            (comment (c fg5) it)
+            (keyword (c fg2) bf)
+            (type (c nil) nbf)
+            (function it)
+            (variable-name (c fg1))
+            (constant (c fg3))
+            (string (c str) it)
+            (warning (c warning))
+            (error (c red) bf)
+            (dimm (c "lemonchiffon4"))
+            (gnus-mail (c "black"))
+            (gnus-news (c "black"))
+            (outline (c "black") bf)
+            (outline-1 (c ok) bf)
+            (outline-2 (c ok) nbf)
+            (outline-3 ul)
+            (outline-4 ul)
+            (outline-5 ul)
+            (f00 (c ok))
+            (f01 (c ok) it)
+            (f02 (c fg1))
+            (f10 (p f00))
+            (f11 (p f01))
+            (f12 (p f02)))
+  (:x-faces (compilation-info (c "#223142" nil) nbf)
+            (completions-group-separator (c nil ni) (st "grey80"))
+            (corfu-default (~ default) (c "black" "grey95"))
+            (corfu-bar (c nil "grey80")) ;; moving part of the bar
+            (corfu-border (~ corfu-background)) ;; background of the bar
+            (corfu-current (c "black" "grey95") nbf nit (ul "grey70"))
+            (cursor (c "sienna3" "sienna3"))
+            (diff-hl-change (c "white" pale-blue))
+            (diff-hl-insert (c "white" "honeydew2"))
+            (diff-hl-delete (c "white" "wheat1"))
+            (fill-column-indicator (c "grey80"))
+            (fringe (c "grey70" nil))
+            (gnus-button (p f01) bf)
+            (gnus-cite-1 (c "darkslategray" nil))
+            (gnus-cite-2 (c "slate gray" nil))
+            (gnus-cite-3 (c "slate gray" nil))
+            (gnus-cite-4 (c "slate gray" nil))
+            (gnus-summary-selected (c green) nbf)
+            (gnus-summary-cancelled (c "sienna3" nil) st)
+            (header-line (c "grey30" dimm-background-2)
+                         :box (:line-width 1 :color "grey90"))
+            (magit-diff-context-highlight (c nil yellow) ex)
+            (magit-diff-hunk-heading-highlight (c nil yellow) it bf)
+            (mode-line (c "grey30" dimm-background-2)
+                       :box (:line-width -1 :color "grey90"))
+            (mode-line-inactive (c "grey40" "white")
+                                :box (:line-width -1 :color "grey90"))
+            (mode-line-buffer-id (~ default) (c dark-blue-2 nil) nit)
+            (mode-line-emphasis (c green nil))
+            (mode-line-highlight (c green nil))
+            (org-link (p link) (ul "grey80"))
+            (scroll-bar (c "grey80" nil))
+            (show-paren-match (c nil "grey85"))
+            (vertical-border (c "grey70" nil))
+            (widget-button (~ default) nit (ul "grey80"))))
+
+;; (enable-theme 'jao-black-and-white)
+;; (jao-mode-line-adjust-faces)
+
+(provide 'jao-black-and-white-theme)