nebkor/emacs-dot-d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: ef-themes and fontaine to apply fonts correctly

Browse source 
Switching themes was giving an error before this change, due to some
mistake in the font-spec
This commit is contained in:
Vedang Manerikar 2024-11-17 22:27:34 +05:30
parent df90c4fdd0
commit beb50682fb
2 changed files with 103 additions and 62 deletions

101
unravel-emacs.org
View file

@ -412,21 +412,24 @@ Prot is the lead developer and maintainer of this package.
(("<f5>" . ef-themes-rotate)
("C-<f5>" . ef-themes-select))
:config
(setq ef-themes-to-toggle '(ef-elea-light ef-elea-dark)
ef-themes-variable-pitch-ui t
ef-themes-mixed-fonts t
ef-themes-headings ; read the manual's entry of the doc string
(setq ef-themes-to-toggle '(ef-elea-light ef-elea-dark))
(setq ef-themes-variable-pitch-ui t)
(setq ef-themes-mixed-fonts t)
(setq ef-themes-rotate ef-themes-items)
(setq ef-themes-headings ; read the manual's entry of the doc string
'((0 . (variable-pitch light 1.9))
(1 . (variable-pitch light 1.8))
(2 . (variable-pitch regular 1.7))
(3 . (variable-pitch regular 1.6))
(4 . (variable-pitch regular 1.5))
(5 . (variable-pitch 1.4)) ; absence of weight means `bold'
(5 . (variable-pitch 1.4)) ; absence of weight means `bold'
(6 . (variable-pitch 1.3))
(7 . (variable-pitch 1.2))
(agenda-date . (semilight 1.5))
(agenda-structure . (variable-pitch light 1.9))
(t . (variable-pitch 1.1))))
(setq ef-themes-disable-other-themes t)
(mapc #'disable-theme custom-enabled-themes)
(ef-themes-select 'ef-elea-light))
#+end_src
@ -686,7 +689,9 @@ Another section defines some complementary functionality
((after-init . fontaine-mode)
(after-init . (lambda ()
;; Set last preset or fall back to desired style from `fontaine-presets'.
(fontaine-set-preset (or (fontaine-restore-latest-preset) 'large)))))
(fontaine-set-preset (or (fontaine-restore-latest-preset) 'regular))))
(enable-theme-functions . fontaine-apply-current-preset)
(ef-themes-post-load . fontaine-apply-current-preset))
:config
;; This is defined in Emacs C code: it belongs to font settings.
(setq x-underline-at-descent-line nil)
@ -700,26 +705,23 @@ Another section defines some complementary functionality
(setq fontaine-presets
'((small
:default-height 80)
(regular) ; like this it uses all the fallback values and is named `regular'
:default-family "Iosevka"
:default-height 130)
(regular
:default-height 150)
(medium
:default-weight semilight
:default-height 115
:default-height 170
:bold-weight extrabold)
(large
:inherit medium
:default-height 150)
(live-stream
:default-family "Iosevka"
:default-height 150
:default-weight medium
:fixed-pitch-family "Iosevka"
:variable-pitch-family "Iosevka"
:bold-weight extrabold)
:default-height 190)
(presentation
:default-height 180)
:inherit medium
:default-height 250)
(jumbo
:default-height 260)
:inherit medium
:default-height 330)
(t
;; I keep all properties for didactic purposes, but most can be
;; omitted. See the fontaine manual for the technicalities:
@ -728,15 +730,15 @@ Another section defines some complementary functionality
:default-weight regular
:default-slant normal
:default-width normal
:default-height 100
:default-height 150
:fixed-pitch-family "Iosevka Fixed"
:fixed-pitch-weight nil
:fixed-pitch-family nil ; falls back to :default-family
:fixed-pitch-weight nil ; falls back to :default-weight
:fixed-pitch-slant nil
:fixed-pitch-width nil
:fixed-pitch-height 1.0
:fixed-pitch-serif-family "Iosevka"
:fixed-pitch-serif-family nil
:fixed-pitch-serif-weight nil
:fixed-pitch-serif-slant nil
:fixed-pitch-serif-width nil
@ -748,49 +750,49 @@ Another section defines some complementary functionality
:variable-pitch-width nil
:variable-pitch-height 1.0
:mode-line-active-family "Iosevka Term"
:mode-line-active-family nil
:mode-line-active-weight nil
:mode-line-active-slant nil
:mode-line-active-width nil
:mode-line-active-height 1.0
:mode-line-inactive-family "Iosevka Term"
:mode-line-inactive-family nil
:mode-line-inactive-weight nil
:mode-line-inactive-slant nil
:mode-line-inactive-width nil
:mode-line-inactive-height 1.0
:header-line-family "Iosevka Term"
:header-line-family nil
:header-line-weight nil
:header-line-slant nil
:header-line-width nil
:header-line-height 1.0
:line-number-family "Iosevka Term"
:line-number-family nil
:line-number-weight nil
:line-number-slant nil
:line-number-width nil
:line-number-height 1.0
:tab-bar-family "Iosevka Term"
:tab-bar-family nil
:tab-bar-weight nil
:tab-bar-slant nil
:tab-bar-width nil
:tab-bar-height 1.0
:tab-line-family "Iosevka Term"
:tab-line-family nil
:tab-line-weight nil
:tab-line-slant nil
:tab-line-width nil
:tab-line-height 1.0
:bold-family "Iosevka"
:bold-family nil
:bold-slant nil
:bold-weight bold
:bold-width nil
:bold-height 1.0
:italic-family "Iosevka"
:italic-family nil
:italic-weight nil
:italic-slant italic
:italic-width nil
@ -892,6 +894,43 @@ in the function ~prot/enable-variable-pitch~.
("C-x C-0" . global-text-scale-adjust)))
#+end_src
*** Information about the Iosevka Comfy fonts
:PROPERTIES:
:CUSTOM_ID: h:3b989679-7e3f-4f03-b4bb-611006ea01ce
:END:
/Iosevka Comfy/ is a customised build of the Iosevka typeface, with a
consistent rounded style and overrides for almost all individual
glyphs in both roman (upright) and italic (slanted) variants. Many
font families are available, covering a broad range of typographic
weights. The README file in the git repository covers all the
technicalities.
| Family | Shapes | Spacing | Style | Ligatures |
|---------------------------------+--------+---------+------------+-----------|
| Iosevka Comfy | Sans | Compact | Monospaced | Yes |
| Iosevka Comfy Fixed | Sans | Compact | Monospaced | No |
| Iosevka Comfy Duo | Sans | Compact | Duospaced | Yes |
|---------------------------------+--------+---------+------------+-----------|
| Iosevka Comfy Motion | Slab | Compact | Monospaced | Yes |
| Iosevka Comfy Motion Fixed | Slab | Compact | Monospaced | No |
| Iosevka Comfy Motion Duo | Slab | Compact | Duospaced | Yes |
|---------------------------------+--------+---------+------------+-----------|
| Iosevka Comfy Wide | Sans | Wide | Monospaced | Yes |
| Iosevka Comfy Wide Fixed | Sans | Wide | Monospaced | No |
| Iosevka Comfy Wide Duo | Sans | Wide | Duospaced | Yes |
|---------------------------------+--------+---------+------------+-----------|
| Iosevka Comfy Wide Motion | Slab | Wide | Monospaced | Yes |
| Iosevka Comfy Wide Motion Fixed | Slab | Wide | Monospaced | No |
| Iosevka Comfy Wide Motion Duo | Slab | Wide | Duospaced | Yes |
+ Git repositories:
- GitHub: <https://github.com/protesilaos/iosevka-comfy>
- GitLab: <https://gitlab.com/protesilaos/iosevka-comfy>
+ Sample pictures: <https://protesilaos.com/emacs/iosevka-comfy-pictures>
+ Backronym: Iosevka ... Could Only Modify a Font, Yes
** Finally, we provide the =unravel-theme.el= module
:PROPERTIES:
:CUSTOM_ID: h:bac0ce0a-db68-42e7-ba2c-f350f91f80ef

64
unravel-modules/unravel-theme.el
View file

@ -11,21 +11,24 @@
(("<f5>" . ef-themes-rotate)
("C-<f5>" . ef-themes-select))
:config
(setq ef-themes-to-toggle '(ef-elea-light ef-elea-dark)
ef-themes-variable-pitch-ui t
ef-themes-mixed-fonts t
ef-themes-headings ; read the manual's entry of the doc string
(setq ef-themes-to-toggle '(ef-elea-light ef-elea-dark))
(setq ef-themes-variable-pitch-ui t)
(setq ef-themes-mixed-fonts t)
(setq ef-themes-rotate ef-themes-items)
(setq ef-themes-headings ; read the manual's entry of the doc string
'((0 . (variable-pitch light 1.9))
(1 . (variable-pitch light 1.8))
(2 . (variable-pitch regular 1.7))
(3 . (variable-pitch regular 1.6))
(4 . (variable-pitch regular 1.5))
(5 . (variable-pitch 1.4)) ; absence of weight means `bold'
(5 . (variable-pitch 1.4)) ; absence of weight means `bold'
(6 . (variable-pitch 1.3))
(7 . (variable-pitch 1.2))
(agenda-date . (semilight 1.5))
(agenda-structure . (variable-pitch light 1.9))
(t . (variable-pitch 1.1))))
(setq ef-themes-disable-other-themes t)
(mapc #'disable-theme custom-enabled-themes)
(ef-themes-select 'ef-elea-light))
@ -158,7 +161,9 @@
((after-init . fontaine-mode)
(after-init . (lambda ()
;; Set last preset or fall back to desired style from `fontaine-presets'.
(fontaine-set-preset (or (fontaine-restore-latest-preset) 'large)))))
(fontaine-set-preset (or (fontaine-restore-latest-preset) 'regular))))
(enable-theme-functions . fontaine-apply-current-preset)
(ef-themes-post-load . fontaine-apply-current-preset))
:config
;; This is defined in Emacs C code: it belongs to font settings.
(setq x-underline-at-descent-line nil)
@ -172,26 +177,23 @@
(setq fontaine-presets
'((small
:default-height 80)
(regular) ; like this it uses all the fallback values and is named `regular'
:default-family "Iosevka"
:default-height 130)
(regular
:default-height 150)
(medium
:default-weight semilight
:default-height 115
:default-height 170
:bold-weight extrabold)
(large
:inherit medium
:default-height 150)
(live-stream
:default-family "Iosevka"
:default-height 150
:default-weight medium
:fixed-pitch-family "Iosevka"
:variable-pitch-family "Iosevka"
:bold-weight extrabold)
:default-height 190)
(presentation
:default-height 180)
:inherit medium
:default-height 250)
(jumbo
:default-height 260)
:inherit medium
:default-height 330)
(t
;; I keep all properties for didactic purposes, but most can be
;; omitted. See the fontaine manual for the technicalities:
@ -200,15 +202,15 @@
:default-weight regular
:default-slant normal
:default-width normal
:default-height 100
:default-height 150
:fixed-pitch-family "Iosevka Fixed"
:fixed-pitch-weight nil
:fixed-pitch-family nil ; falls back to :default-family
:fixed-pitch-weight nil ; falls back to :default-weight
:fixed-pitch-slant nil
:fixed-pitch-width nil
:fixed-pitch-height 1.0
:fixed-pitch-serif-family "Iosevka"
:fixed-pitch-serif-family nil
:fixed-pitch-serif-weight nil
:fixed-pitch-serif-slant nil
:fixed-pitch-serif-width nil
@ -220,49 +222,49 @@
:variable-pitch-width nil
:variable-pitch-height 1.0
:mode-line-active-family "Iosevka Term"
:mode-line-active-family nil
:mode-line-active-weight nil
:mode-line-active-slant nil
:mode-line-active-width nil
:mode-line-active-height 1.0
:mode-line-inactive-family "Iosevka Term"
:mode-line-inactive-family nil
:mode-line-inactive-weight nil
:mode-line-inactive-slant nil
:mode-line-inactive-width nil
:mode-line-inactive-height 1.0
:header-line-family "Iosevka Term"
:header-line-family nil
:header-line-weight nil
:header-line-slant nil
:header-line-width nil
:header-line-height 1.0
:line-number-family "Iosevka Term"
:line-number-family nil
:line-number-weight nil
:line-number-slant nil
:line-number-width nil
:line-number-height 1.0
:tab-bar-family "Iosevka Term"
:tab-bar-family nil
:tab-bar-weight nil
:tab-bar-slant nil
:tab-bar-width nil
:tab-bar-height 1.0
:tab-line-family "Iosevka Term"
:tab-line-family nil
:tab-line-weight nil
:tab-line-slant nil
:tab-line-width nil
:tab-line-height 1.0
:bold-family "Iosevka"
:bold-family nil
:bold-slant nil
:bold-weight bold
:bold-width nil
:bold-height 1.0
:italic-family "Iosevka"
:italic-family nil
:italic-weight nil
:italic-slant italic
:italic-width nil