From 699e61193a5ffcf38071872a4d28359181586597 Mon Sep 17 00:00:00 2001
From: Protesilaos Stavrou <info@protesilaos.com>
Date: Thu, 22 Feb 2024 12:49:43 +0200
Subject: [PATCH] emacs: update the fontaine configuration

---
 .../prot-emacs-modules/prot-emacs-theme.el    | 65 +++++++++++++++++--
 emacs/.emacs.d/prot-emacs.org                 | 65 +++++++++++++++++--
 2 files changed, 116 insertions(+), 14 deletions(-)

diff --git a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-theme.el b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-theme.el
index 6328824b..1e1e5e38 100644
--- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-theme.el
+++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-theme.el
@@ -195,6 +195,13 @@
            :default-weight semilight
            :default-height 115
            :bold-weight extrabold)
+          (live-stream
+           :default-family "Iosevka Comfy Wide Motion"
+           :default-height 130
+           :default-weight medium
+           :fixed-pitch-family "Iosevka Comfy Wide Motion"
+           :variable-pitch-family "Iosevka Comfy Wide Duo"
+           :bold-weight extrabold)
           (large
            :inherit medium
            :default-height 150)
@@ -206,20 +213,64 @@
            ;; <https://protesilaos.com/emacs/fontaine>.
            :default-family "Iosevka Comfy"
            :default-weight regular
+           :default-slant normal
            :default-height 100
-           :fixed-pitch-family nil ; falls back to :default-family
-           :fixed-pitch-weight nil ; falls back to :default-weight
+
+           :fixed-pitch-family "Iosevka Comfy"
+           :fixed-pitch-weight nil
+           :fixed-pitch-slant nil
            :fixed-pitch-height 1.0
-           :fixed-pitch-serif-family nil ; falls back to :default-family
-           :fixed-pitch-serif-weight nil ; falls back to :default-weight
+
+           :fixed-pitch-serif-family nil
+           :fixed-pitch-serif-weight nil
+           :fixed-pitch-serif-slant nil
            :fixed-pitch-serif-height 1.0
+
            :variable-pitch-family "Iosevka Comfy Motion Duo"
            :variable-pitch-weight nil
+           :variable-pitch-slant nil
            :variable-pitch-height 1.0
-           :bold-family nil ; use whatever the underlying face has
+
+           :mode-line-active-family nil
+           :mode-line-active-weight nil
+           :mode-line-active-slant nil
+           :mode-line-active-height 1.0
+
+           :mode-line-inactive-family nil
+           :mode-line-inactive-weight nil
+           :mode-line-inactive-slant nil
+           :mode-line-inactive-height 1.0
+
+           :header-line-family nil
+           :header-line-weight nil
+           :header-line-slant nil
+           :header-line-height 1.0
+
+           :line-number-family nil
+           :line-number-weight nil
+           :line-number-slant nil
+           :line-number-height 1.0
+
+           :tab-bar-family nil
+           :tab-bar-weight nil
+           :tab-bar-slant nil
+           :tab-bar-height 1.0
+
+           :tab-line-family nil
+           :tab-line-weight nil
+           :tab-line-slant nil
+           :tab-line-height 1.0
+
+           :bold-family nil
            :bold-weight bold
+           :bold-slant nil
+           :bold-height 1.0
+
            :italic-family nil
+           :italic-weight nil
            :italic-slant italic
+           :italic-height 1.0
+
            :line-spacing nil)))
 
   ;; Set last preset or fall back to desired style from `fontaine-presets'.
@@ -227,13 +278,13 @@
 
   ;; The other side of `fontaine-restore-latest-preset'.
   (add-hook 'kill-emacs-hook #'fontaine-store-latest-preset)
+  (add-hook 'fontaine-set-preset-hook #'fontaine-store-latest-preset)
 
   ;; Persist font configurations while switching themes.  The
   ;; `enable-theme-functions' is from Emacs 29.
   (add-hook 'enable-theme-functions #'fontaine-apply-current-preset)
 
-  (define-key global-map (kbd "C-c f") #'fontaine-set-preset)
-  (define-key global-map (kbd "C-c F") #'fontaine-set-face-font))
+  (define-key global-map (kbd "C-c f") #'fontaine-set-preset))
 
 (prot-emacs-configure
   (:delay 5)
diff --git a/emacs/.emacs.d/prot-emacs.org b/emacs/.emacs.d/prot-emacs.org
index 75906c42..bbd4cbe0 100644
--- a/emacs/.emacs.d/prot-emacs.org
+++ b/emacs/.emacs.d/prot-emacs.org
@@ -2327,6 +2327,13 @@ The next section defines some complementary functionality
            :default-weight semilight
            :default-height 115
            :bold-weight extrabold)
+          (live-stream
+           :default-family "Iosevka Comfy Wide Motion"
+           :default-height 130
+           :default-weight medium
+           :fixed-pitch-family "Iosevka Comfy Wide Motion"
+           :variable-pitch-family "Iosevka Comfy Wide Duo"
+           :bold-weight extrabold)
           (large
            :inherit medium
            :default-height 150)
@@ -2338,20 +2345,64 @@ The next section defines some complementary functionality
            ;; <https://protesilaos.com/emacs/fontaine>.
            :default-family "Iosevka Comfy"
            :default-weight regular
+           :default-slant normal
            :default-height 100
-           :fixed-pitch-family nil ; falls back to :default-family
-           :fixed-pitch-weight nil ; falls back to :default-weight
+
+           :fixed-pitch-family "Iosevka Comfy"
+           :fixed-pitch-weight nil
+           :fixed-pitch-slant nil
            :fixed-pitch-height 1.0
-           :fixed-pitch-serif-family nil ; falls back to :default-family
-           :fixed-pitch-serif-weight nil ; falls back to :default-weight
+
+           :fixed-pitch-serif-family nil
+           :fixed-pitch-serif-weight nil
+           :fixed-pitch-serif-slant nil
            :fixed-pitch-serif-height 1.0
+
            :variable-pitch-family "Iosevka Comfy Motion Duo"
            :variable-pitch-weight nil
+           :variable-pitch-slant nil
            :variable-pitch-height 1.0
-           :bold-family nil ; use whatever the underlying face has
+
+           :mode-line-active-family nil
+           :mode-line-active-weight nil
+           :mode-line-active-slant nil
+           :mode-line-active-height 1.0
+
+           :mode-line-inactive-family nil
+           :mode-line-inactive-weight nil
+           :mode-line-inactive-slant nil
+           :mode-line-inactive-height 1.0
+
+           :header-line-family nil
+           :header-line-weight nil
+           :header-line-slant nil
+           :header-line-height 1.0
+
+           :line-number-family nil
+           :line-number-weight nil
+           :line-number-slant nil
+           :line-number-height 1.0
+
+           :tab-bar-family nil
+           :tab-bar-weight nil
+           :tab-bar-slant nil
+           :tab-bar-height 1.0
+
+           :tab-line-family nil
+           :tab-line-weight nil
+           :tab-line-slant nil
+           :tab-line-height 1.0
+
+           :bold-family nil
            :bold-weight bold
+           :bold-slant nil
+           :bold-height 1.0
+
            :italic-family nil
+           :italic-weight nil
            :italic-slant italic
+           :italic-height 1.0
+
            :line-spacing nil)))
 
   ;; Set last preset or fall back to desired style from `fontaine-presets'.
@@ -2359,13 +2410,13 @@ The next section defines some complementary functionality
 
   ;; The other side of `fontaine-restore-latest-preset'.
   (add-hook 'kill-emacs-hook #'fontaine-store-latest-preset)
+  (add-hook 'fontaine-set-preset-hook #'fontaine-store-latest-preset)
 
   ;; Persist font configurations while switching themes.  The
   ;; `enable-theme-functions' is from Emacs 29.
   (add-hook 'enable-theme-functions #'fontaine-apply-current-preset)
 
-  (define-key global-map (kbd "C-c f") #'fontaine-set-preset)
-  (define-key global-map (kbd "C-c F") #'fontaine-set-face-font))
+  (define-key global-map (kbd "C-c f") #'fontaine-set-preset))
 #+end_src
 
 *** The =prot-emacs-theme.el= section about ~variable-pitch-mode~ and font resizing