[org] Move font size adjustments to functions

This makes it possible to re-apply the adjustments after a theme
switch which resets font adjustmenst.
This commit is contained in:
Marcel Kapfer 2022-03-30 17:01:27 +02:00
parent f8e5e602d6
commit cf47b7f750
Signed by: mmk2410
GPG key ID: CADE6F0C09F21B09

View file

@ -473,7 +473,9 @@ During the last weeks I got used to using a light theme during daytime and a dar
(defun mmk2410/switch-theme (theme) (defun mmk2410/switch-theme (theme)
(mapcar 'disable-theme custom-enabled-themes) (mapcar 'disable-theme custom-enabled-themes)
(load-theme theme t)) (load-theme theme t)
(mmk2410/org-font-adjust-headlines)
(mmk2410/org-font-adjust-variable-pitch))
(defun mmk2410/switch-theme-night () (defun mmk2410/switch-theme-night ()
(interactive) (interactive)
@ -874,7 +876,8 @@ Hide emphasis markers. While this sometimes is very distracting it mostly looks
I like to have larger headlines in Org for better identifying them. The configuration of [[https://config.daviwil.com/emacs#fonts-and-bullets][David Wilson]] was a large help in this regard. I like to have larger headlines in Org for better identifying them. The configuration of [[https://config.daviwil.com/emacs#fonts-and-bullets][David Wilson]] was a large help in this regard.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(with-eval-after-load 'org (defun mmk2410/org-font-adjust-headlines ()
"Adjust headline sizes, font family and weight"
(dolist (face '((org-level-1 . 1.4) (dolist (face '((org-level-1 . 1.4)
(org-level-2 . 1.3) (org-level-2 . 1.3)
(org-level-3 . 1.2) (org-level-3 . 1.2)
@ -885,12 +888,15 @@ I like to have larger headlines in Org for better identifying them. The configur
(org-level-8 . 1.1))) (org-level-8 . 1.1)))
(set-face-attribute (car face) nil :font "Open Sans" :weight 'bold :height (cdr face)))) (set-face-attribute (car face) nil :font "Open Sans" :weight 'bold :height (cdr face))))
(with-eval-after-load 'org
(mmk2410/org-font-adjust-headlines))
#+end_src #+end_src
When using a variable-pitch font this also applies to stuff like code blocks. The following block resets this change for these unwanted faces. When using a variable-pitch font this also applies to stuff like code blocks. The following block resets this change for these unwanted faces.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(with-eval-after-load 'org (defun mmk2410/org-font-adjust-variable-pitch ()
"Re-delare certain org font as fixed pitch when using variable pitch mode."
(org-indent-mode) (org-indent-mode)
(set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch) (set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch)
(set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch))
@ -899,6 +905,9 @@ When using a variable-pitch font this also applies to stuff like code blocks. Th
(set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch))
(set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch))
(set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch)) (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch))
(with-eval-after-load 'org
(mmk2410/org-font-adjust-variable-pitch))
#+end_src #+end_src
** Org Superstar Mode ** Org Superstar Mode