diff options
| author | Craig Jennings <c@cjennings.net> | 2026-07-20 08:47:36 -0500 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-07-20 08:47:36 -0500 |
| commit | 8049b06d1c96023164a4027c08e26e3773c19f18 (patch) | |
| tree | afe19c58adf296975cfe3711901b396328e1c343 | |
| parent | d9a8a6382854bb06c3aac6a5a4779a48cc82b48a (diff) | |
| download | dotemacs-8049b06d1c96023164a4027c08e26e3773c19f18.tar.gz dotemacs-8049b06d1c96023164a4027c08e26e3773c19f18.zip | |
feat(fontaine): rename Coding to Coding M, add Coding L at 14pt
The Berkeley Mono code ladder is now Coding XS (11pt), Coding M (13pt),
Coding L (14pt), and Coding XL (16pt).
| -rw-r--r-- | modules/font-config.el | 6 | ||||
| -rw-r--r-- | modules/font-profiles.el | 5 | ||||
| -rw-r--r-- | tests/test-font-config.el | 24 |
3 files changed, 21 insertions, 14 deletions
diff --git a/modules/font-config.el b/modules/font-config.el index b55c13fa..e4549c95 100644 --- a/modules/font-config.el +++ b/modules/font-config.el @@ -64,7 +64,8 @@ (writing . "Writing") (reading . "Reading") (coding-xs . "Coding XS") - (coding . "Coding") + (coding-m . "Coding M") + (coding-l . "Coding L") (coding-xl . "Coding XL") (presentation . "Presentation")) "Human names for Fontaine workflow profiles.") @@ -74,7 +75,8 @@ (writing . "Berkeley Mono + Merriweather") (reading . "Merriweather") (coding-xs . "Berkeley Mono") - (coding . "Berkeley Mono") + (coding-m . "Berkeley Mono") + (coding-l . "Berkeley Mono") (coding-xl . "Berkeley Mono") (presentation . "Berkeley Mono + Lexend")) "Human-readable font combinations for Fontaine workflow profiles.") diff --git a/modules/font-profiles.el b/modules/font-profiles.el index 07930065..a2c40562 100644 --- a/modules/font-profiles.el +++ b/modules/font-profiles.el @@ -55,9 +55,12 @@ (coding-xs :default-height 110 :variable-pitch-family "BerkeleyMono Nerd Font") - (coding + (coding-m :default-height 130 :variable-pitch-family "BerkeleyMono Nerd Font") + (coding-l + :default-height 140 + :variable-pitch-family "BerkeleyMono Nerd Font") (coding-xl :default-height 160 :variable-pitch-family "BerkeleyMono Nerd Font") diff --git a/tests/test-font-config.el b/tests/test-font-config.el index 29ac9a87..06ea226b 100644 --- a/tests/test-font-config.el +++ b/tests/test-font-config.el @@ -135,11 +135,11 @@ ;;; Fontaine workflow profiles (ert-deftest test-font-config-fontaine-presets-are-task-oriented () - "Normal: the picker exposes seven complete workflow destinations." + "Normal: the picker exposes eight complete workflow destinations." (skip-unless test-font-config--available) (require 'font-config) (should (equal (delq t (mapcar #'car fontaine-presets)) - '(everyday writing reading coding-xs coding coding-xl + '(everyday writing reading coding-xs coding-m coding-l coding-xl presentation)))) (ert-deftest test-font-config-fontaine-candidates-describe-end-state () @@ -147,7 +147,7 @@ (skip-unless test-font-config--available) (require 'font-config) (let ((candidates (cj/fontaine-profile-candidates))) - (should (= (length candidates) 7)) + (should (= (length candidates) 8)) (should (member (nth 0 candidates) '("Everyday — Berkeley Mono + Lexend · 13 pt" "Everyday — Berkeley Mono + Lexend · 14 pt"))) @@ -158,17 +158,19 @@ (should (equal (nth 3 candidates) "Coding XS — Berkeley Mono · 11 pt")) (should (equal (nth 4 candidates) - "Coding — Berkeley Mono · 13 pt")) + "Coding M — Berkeley Mono · 13 pt")) (should (equal (nth 5 candidates) - "Coding XL — Berkeley Mono · 16 pt")) + "Coding L — Berkeley Mono · 14 pt")) (should (equal (nth 6 candidates) + "Coding XL — Berkeley Mono · 16 pt")) + (should (equal (nth 7 candidates) "Presentation — Berkeley Mono + Lexend · 20 pt")))) (ert-deftest test-font-config-fontaine-candidate-round-trips-to-profile () "Boundary: a displayed destination maps back to its Fontaine symbol." (skip-unless test-font-config--available) (require 'font-config) - (dolist (profile '(everyday writing reading coding-xs coding coding-xl + (dolist (profile '(everyday writing reading coding-xs coding-m coding-l coding-xl presentation)) (let ((label (cj/fontaine-profile-label profile))) (should (eq (cj/fontaine-profile-from-label label) profile))))) @@ -177,7 +179,7 @@ "Normal: every workflow profile uses Berkeley Mono for fixed pitch." (skip-unless test-font-config--available) (require 'font-config) - (dolist (profile '(everyday writing coding-xs coding coding-xl presentation)) + (dolist (profile '(everyday writing coding-xs coding-m coding-l coding-xl presentation)) (let ((properties (fontaine--get-preset-properties profile))) (should (equal (plist-get properties :default-family) "BerkeleyMono Nerd Font"))))) @@ -271,7 +273,7 @@ (cj/fontaine-profile-label 'writing)) " current")) (should (equal (cj/fontaine-profile-annotation - (cj/fontaine-profile-label 'coding)) + (cj/fontaine-profile-label 'coding-m)) "")))) (ert-deftest test-font-config-fontaine-selector-applies-picked-profile () @@ -319,9 +321,9 @@ (applied nil)) (cl-letf (((symbol-function 'fontaine-set-preset) (lambda (profile) (setq applied profile)))) - (cj/fontaine-apply-profile 'coding) - (should (eq applied 'coding)) - (should (equal (car fontaine-preset-history) "coding"))))) + (cj/fontaine-apply-profile 'coding-m) + (should (eq applied 'coding-m)) + (should (equal (car fontaine-preset-history) "coding-m"))))) (ert-deftest test-font-config-fontaine-apply-rejects-unknown-profile () "Error: applying an unknown workflow profile signals a user error." |
