[elpa] externals/modus-operandi-theme a044e41 10/54: Add support for YASNIPPET
branch: externals/modus-operandi-theme commit a044e41472d2c6c7479d4ddc733deadbbc34f953 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for YASNIPPET --- README.org | 1 + modus-operandi-theme.el | 3 +++ modus-vivendi-theme.el | 3 +++ 3 files changed, 7 insertions(+) diff --git a/README.org b/README.org index ef72bda..3322c6e 100644 --- a/README.org +++ b/README.org @@ -778,6 +778,7 @@ the "full support" may not be 100% true… + xref + xterm-color (and ansi-colors) + yaml-mode ++ yasnippet + ztree Plus many other miscellaneous faces that are provided by the out-of-the-box diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index b320f16..a910876 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -298,6 +298,7 @@ ;; xref ;; xterm-color (and ansi-colors) ;; yaml-mode +;; yasnippet ;; ztree ;;; Code: @@ -3242,6 +3243,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(xref-match ((,class (:inherit match yaml-mode `(yaml-tab-face ((,class (:inherit modus-theme-intense-red + yasnippet + `(yas-field-highlight-face ((,class (:background ,bg-alt :foreground ,fg-main ztree `(ztreep-arrow-face ((,class (:foreground ,fg-inactive `(ztreep-diff-header-face ((,class (:height 1.2 :foreground ,fg-special-cold :weight bold diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index ccaf838..0e2bc4c 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -298,6 +298,7 @@ ;; xref ;; xterm-color (and ansi-colors) ;; yaml-mode +;; yasnippet ;; ztree ;;; Code: @@ -3242,6 +3243,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(xref-match ((,class (:inherit match yaml-mode `(yaml-tab-face ((,class (:inherit modus-theme-intense-red + yasnippet + `(yas-field-highlight-face ((,class (:background ,bg-alt :foreground ,fg-main ztree `(ztreep-arrow-face ((,class (:foreground ,fg-inactive `(ztreep-diff-header-face ((,class (:height 1.2 :foreground ,fg-special-cold :weight bold
[elpa] externals/modus-operandi-theme 4a9bd23 06/54: Apply optional highest scale to org-document-title
branch: externals/modus-operandi-theme commit 4a9bd230c8fc8bd21f4c8f2d6ec8fafd98ab526f Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Apply optional highest scale to org-document-title This extends commit 5bff8ce and was recommended in issue 40: https://gitlab.com/protesilaos/modus-themes/-/issues/40 --- modus-operandi-theme.el | 2 ++ modus-vivendi-theme.el | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 14ad5c5..cefc974 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2479,6 +2479,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(org-default ((,class (:background ,bg-main :foreground ,fg-main `(org-document-info ((,class (:foreground ,fg-special-cold `(org-document-title ((,class (:foreground ,fg-special-cold :weight bold + `(org-document-title ((,class (,@(modus-operandi-theme-scale modus-operandi-theme-scale-5) + :foreground ,fg-special-cold :weight bold `(org-done ((,class (,@(modus-operandi-theme-org-todo-block green-nuanced-bg green-nuanced green) `(org-drawer ((,class (:foreground ,cyan-alt `(org-ellipsis ((,class (:foreground nil ; inherits from the heading's colour diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 2b297c3..d20bcfc 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -2479,6 +2479,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(org-default ((,class (:background ,bg-main :foreground ,fg-main `(org-document-info ((,class (:foreground ,fg-special-cold `(org-document-title ((,class (:foreground ,fg-special-cold :weight bold + `(org-document-title ((,class (,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-5) + :foreground ,fg-special-cold :weight bold `(org-done ((,class (,@(modus-vivendi-theme-org-todo-block green-nuanced-bg green-nuanced green) `(org-drawer ((,class (:foreground ,cyan-alt `(org-ellipsis ((,class (:foreground nil ; inherits from the heading's colour
[elpa] externals/modus-operandi-theme 0d9b1d4 03/54: Expand README with new customisation methods
branch: externals/modus-operandi-theme commit 0d9b1d42bc0e74721a1ec521a14ed45ea7947621 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Expand README with new customisation methods --- README.org | 105 - 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/README.org b/README.org index b3efc45..20ade8a 100644 --- a/README.org +++ b/README.org @@ -318,7 +318,7 @@ the use of proportional fonts more useful are highly appreciated (see [[#h:25ba8d6f-6604-4338-b774-bbe531d467f6][section on contributing]]). The default is to use whatever the default typeface is, typically a monospaced family. -** Complete example configuration +** Complete example configuration for the above :PROPERTIES: :CUSTOM_ID: h:0e3b8a62-8d72-4439-be2d-cb12ed98f4cb :END: @@ -359,6 +359,109 @@ Need more ideas? Check the [[https://protesilaos.com/dotemacs/#h:b7444e76-75d4- do not try to interpret the values of the variables, as I always test different combinations and scenaria). +** Full access to the palette for further tweaks + :PROPERTIES: + :CUSTOM_ID: h:b7282635-4fe9-415a-abdf-962b736ff5b6 + :END: + +Unlike the previous options which follow a straightforward pattern of +allowing the user to quickly select their preference, the themes also +provide a more powerful, albeit difficult, mechanism of controlling +things with precision. + +*** Option 1 to redefine colour values +:PROPERTIES: +:CUSTOM_ID: h:149e23b6-ada1-480f-95cd-c56fb40999b5 +:END: + +The variables are: + ++ =modus-operandi-theme-override-colors-alist= ++ =modus-vivendi-theme-override-colors-alist= + +Users can specify an association list that maps the names of colour +variables to hexadecimal RGB values (in the form of =#RRGGBB=). This +means that it is possible to override the entire palette or subsets +thereof (see the source code for the actual names and values). + +Example: + +#+begin_src emacs-lisp +;; Redefine the values of those three variables for the given theme +(setq modus-vivendi-theme-override-colors-alist + '(("magenta" . "#ffaabb") +("magenta-alt" . "#ee88ff") +("magenta-alt-other" . "#bbaaff"))) +#+end_src + +*** Option 2 to apply colour variables to faces +:PROPERTIES: +:CUSTOM_ID: h:9754abfd-c890-4af3-91a8-1a2cb2b5be44 +:END: + +The macro symbols are: + ++ =modus-operandi-theme-with-color-variables= ++ =modus-vivendi-theme-with-color-variables= + +Users can wrap face customisation snippets inside this macro in order to +pass the variables that the themes use and map them to face attributes. +This means that one can essentially override or extend the original +design (also in tandem with option 1). + +Len Trigg who proposed [[https://gitlab.com/protesilaos/modus-themes/-/issues/39][the whole idea in issue 39]] uses this method to +tweak how a couple of Magit faces will look in GUI and terminal Emacs +respectively (follow the link for screen shots and details). This is +Len's sample package declaration (with comments by me): + +#+begin_src emacs-lisp +(use-package modus-vivendi-theme + :init ; enable some of the customisation options before loading the theme + (setq modus-vivendi-theme-visible-fringe t +modus-vivendi-theme-3d-modeline t) + :config + (defun customize-modus-vivendi () ; function that passes further customisations to the theme +"Customize modus-vivendi theme" +(if (member 'modus-vivendi custom-enabled-themes) +(modus-vivendi-theme-with-color-variables ; this macro allows us to access the colour palette + (custom-theme-set-faces + 'modus-vivendi + `(magit-branch-current supports :box t)) (:foreground ,blue-alt-other :background ,bg-alt :box t)) ; use a box property if possible and also apply a background + (t (:foreground ,blue-alt-other :background ,bg-alt :underline t ; use an underline if the box is not available + `(magit-branch-remote-head supports :box t)) (:foreground ,magenta-alt-other :background ,bg-alt :box t)) + (t (:foreground ,magenta-alt-other :background ,bg-alt :underline t + + + (add-hook 'after-load-theme-hook 'customize-modus-vivendi) ; invoke the above function when appropriate in order to override the styles of the desired faces + (load-theme 'modus-vivendi t)) ; load the theme +#+end_src + +*** Further considerations +:PROPERTIES: +:CUSTOM_ID: h:4acda0f1-564e-48ff-8998-ebf7618377dd +:END: + +Please understand that these customisation methods are meant for +advanced users or those who are prepared to do their own research. If +you think that the themes do not work well in some context you can +inform me about it: maybe you do not need to carry your own +customisations. We can just fix the issue in its source. + +To
[elpa] externals/modus-operandi-theme 5bff8ce 04/54: Add another step in the font scale for headings
branch: externals/modus-operandi-theme commit 5bff8ced717568b498a57c4b068a7837da008166 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add another step in the font scale for headings This is intended for use in contexts where the document's title is supposed to be larger than the largest subheading. --- README.org | 12 modus-operandi-theme.el | 5 + modus-vivendi-theme.el | 5 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/README.org b/README.org index 20ade8a..ae34777 100644 --- a/README.org +++ b/README.org @@ -213,18 +213,21 @@ In addition to toggles for enabling scaled headings, users can also specify the exact multiplier relative to the base font size. These are the variables in their default sizes, from the smallest to the largest (the numbers are very conservative, but you are free to increase them a -bit, such as =1.2=, =1.4=, =1.6=, =1.8=): +bit, such as =1.2=, =1.4=, =1.6=, =1.8=, =2.0=---or use a resource for finding a +consistent scale, like [[https://www.modularscale.com][modularscale.com]]): #+begin_src emacs-lisp (setq modus-operandi-theme-scale-1 1.05 modus-operandi-theme-scale-2 1.1 modus-operandi-theme-scale-3 1.15 - modus-operandi-theme-scale-4 1.2) + modus-operandi-theme-scale-4 1.2 + modus-operandi-theme-scale-5 1.3) (setq modus-vivendi-theme-scale-1 1.05 modus-vivendi-theme-scale-2 1.1 modus-vivendi-theme-scale-3 1.15 - modus-vivendi-theme-scale-4 1.2) + modus-vivendi-theme-scale-4 1.2 + modus-vivendi-theme-scale-5 1.3) #+end_src Note that in Org, scaling only increases the size of the heading, but @@ -350,7 +353,8 @@ being available. modus-operandi-theme-scale-1 1.05 modus-operandi-theme-scale-2 1.1 modus-operandi-theme-scale-3 1.15 -modus-operandi-theme-scale-4 1.2) +modus-operandi-theme-scale-4 1.2 +modus-operandi-theme-scale-5 1.3) :config (load-theme 'modus-operandi t)) #+end_src diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index d7a8743..0d6c4ec 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -57,6 +57,7 @@ ;; modus-operandi-theme-scale-2 1.1 ;; modus-operandi-theme-scale-3 1.15 ;; modus-operandi-theme-scale-4 1.2 +;; modus-operandi-theme-scale-5 1.3 ;; ;; What follows is the list of explicitly supported packages or face ;; groups (there are implicitly supported packages as well, which @@ -411,6 +412,10 @@ between foreground and background is >= 7:1)." "Font size slightly larger than `modus-operandi-theme-scale-3'." :type 'number) +(defcustom modus-operandi-theme-scale-5 1.3 + "Font size slightly larger than `modus-operandi-theme-scale-4'." + :type 'number) + (defcustom modus-operandi-theme-visible-fringes nil "Use a visible style for fringes." :type 'boolean) diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 0e33162..19875f8 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -57,6 +57,7 @@ ;; modus-vivendi-theme-scale-2 1.1 ;; modus-vivendi-theme-scale-3 1.15 ;; modus-vivendi-theme-scale-4 1.2 +;; modus-vivendi-theme-scale-5 1.3 ;; ;; What follows is the list of explicitly supported packages or face ;; groups (there are implicitly supported packages as well, which @@ -411,6 +412,10 @@ between foreground and background is >= 7:1)." "Font size slightly larger than `modus-vivendi-theme-scale-3'." :type 'number) +(defcustom modus-vivendi-theme-scale-5 1.3 + "Font size slightly larger than `modus-vivendi-theme-scale-4'." + :type 'number) + (defcustom modus-vivendi-theme-visible-fringes nil "Use a visible style for fringes." :type 'boolean)
[elpa] externals/modus-operandi-theme 9954f47 28/54: Major Review of fly{check, make, spell} for GUI/TUI
branch: externals/modus-operandi-theme commit 9954f4747fc88a3f8f427428a5032167aab1dd0a Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Major Review of fly{check,make,spell} for GUI/TUI For GUI Emacs, all affected faces will now just use a colour-coded wavy underline. We no longer change the foreground value of the offending text. Whereas before the text would also get a colour, which was too intrusive in most circumstances. If support for wavy underlines is not available, we assume the presence of a TUI, which generally is also more limited in its ability to reproduce colours accurately. So for those cases we apply a straight underline combined with a colour-coded foreground for the affected text. This makes it more intense compared to the GUI equivalent, but is the necessary course of action to overcome the constraints imposed by the underlying terminal. --- modus-operandi-theme.el | 28 ++-- modus-vivendi-theme.el | 28 ++-- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 4d8f77e..6bdd3e5 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -1590,8 +1590,8 @@ Also bind `class' to ((class color) (min-colors 89))." flycheck `(flycheck-error ((,(append '((supports :underline (:style wave))) class) - (:foreground ,red-nuanced :underline (:color ,fg-lang-error :style wave))) - (,class (:foreground ,red-nuanced :underline (:color ,fg-lang-error :style line) + (:underline (:color ,fg-lang-error :style wave))) + (,class (:foreground ,fg-lang-error :underline t `(flycheck-error-list-checker-name ((,class (:foreground ,magenta-active `(flycheck-error-list-column-number ((,class (:foreground ,fg-special-cold `(flycheck-error-list-error ((,class (:foreground ,red :weight ,modus-theme-bold @@ -1607,13 +1607,13 @@ Also bind `class' to ((class color) (min-colors 89))." `(flycheck-fringe-warning ((,class (:inherit modus-theme-fringe-yellow `(flycheck-info ((,(append '((supports :underline (:style wave))) class) - (:foreground ,blue-nuanced :underline (:color ,fg-lang-note :style wave))) - (,class (:foreground ,blue-nuanced :underline (:color ,fg-lang-note :style line) + (:underline (:color ,fg-lang-note :style wave))) + (,class (:foreground ,fg-lang-note :underline t `(flycheck-verify-select-checker ((,class (:box (:line-width 1 :color nil :style released-button) `(flycheck-warning ((,(append '((supports :underline (:style wave))) class) - (:foreground ,yellow-nuanced :underline (:color ,fg-lang-warning :style wave))) - (,class (:foreground ,yellow-nuanced :underline (:color ,fg-lang-warning :style line) + (:underline (:color ,fg-lang-warning :style wave))) + (,class (:foreground ,fg-lang-warning :underline t flycheck-indicator `(flycheck-indicator-disabled ((,class (:foreground ,fg-inactive :slant ,modus-theme-slant `(flycheck-indicator-error ((,class (:foreground ,red-active :weight ,modus-theme-bold @@ -1631,24 +1631,24 @@ Also bind `class' to ((class color) (min-colors 89))." flymake `(flymake-error ((,(append '((supports :underline (:style wave))) class) - (:foreground ,red-nuanced :underline (:color ,fg-lang-error :style wave))) - (,class (:foreground ,red-nuanced :underline (:color ,fg-lang-error :style line) + (:underline (:color ,fg-lang-error :style wave))) + (,class (:foreground ,fg-lang-error :underline t `(flymake-note ((,(append '((supports :underline (:style wave))) class) - (:foreground ,blue-nuanced :underline (:color ,fg-lang-note :style wave))) - (,class (:foreground ,blue-nuanced :underline (:color ,fg-lang-note :style line) + (:underline (:color ,fg-lang-note :style wave))) + (,class (:foreground ,fg-lang-note :underline t `(flymake-warning ((,(append '((supports :underline (:style wave))) class) - (:foreground ,yellow-nuanced :underline (:color ,fg-lang-warning :style wave))) - (,class (:foreground ,yellow-nuanced :underline (:color ,fg-lang-warning :style line) + (:underline (:color ,fg-lang-warning :style wave))) + (,class (:foreground ,fg-lang-warning :underline t flyspell `(flyspell-duplicate ((,(append '((supports :underline (:style wave))) class) - (:foreground ,fg-lang-warning :underline (:style wave))) + (:underline (:color ,fg-lang-warning :style wave))) (,class (:foreground ,fg-lang-warning :underline t `(flyspell-incorrect ((,(append '((supports :underline (:style wave))) class) - (:foreground ,fg-lang-error :underline (:style wave))) + (:underline (:color ,fg-lang-error :style wave
[elpa] externals/modus-operandi-theme 22444f9 23/54: Minor refinements to some ERC faces
branch: externals/modus-operandi-theme commit 22444f96d631b75fb6cb00ad401d7e0b0b702a6f Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Minor refinements to some ERC faces --- modus-operandi-theme.el | 16 modus-vivendi-theme.el | 16 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 674eaab..dc50f5a 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -1503,24 +1503,24 @@ Also bind `class' to ((class color) (min-colors 89))." `(erc-bold-face ((,class (:weight bold `(erc-button ((,class (:inherit button `(erc-command-indicator-face ((,class (:foreground ,cyan-alt :weight bold - `(erc-current-nick-face ((,class (:foreground ,blue + `(erc-current-nick-face ((,class (:foreground ,magenta-alt-other `(erc-dangerous-host-face ((,class (:inherit modus-theme-intense-red - `(erc-direct-msg-face ((,class (:foreground ,fg-special-mild + `(erc-direct-msg-face ((,class (:foreground ,magenta `(erc-error-face ((,class (:foreground ,red :weight bold `(erc-fool-face ((,class (:foreground ,fg-inactive - `(erc-header-line ((,class (:background ,bg-alt :foreground ,fg-main + `(erc-header-line ((,class (:background ,bg-header :foreground ,fg-header `(erc-input-face ((,class (:foreground ,fg-special-calm `(erc-inverse-face ((,class (:inherit erc-default-face :inverse-video t `(erc-keyword-face ((,class (:foreground ,magenta-alt :weight bold `(erc-my-nick-face ((,class (:foreground ,magenta :weight bold `(erc-my-nick-prefix-face ((,class (:inherit erc-my-nick-face - `(erc-nick-default-face ((,class (:foreground ,fg-special-cold :weight bold + `(erc-nick-default-face ((,class (:foreground ,blue :weight bold `(erc-nick-msg-face ((,class (:foreground ,green :weight bold - `(erc-nick-prefix-face ((,class (:inherit erc-nick-default-face :weight bold - `(erc-notice-face ((,class (:foreground ,fg-special-warm - `(erc-pal-face ((,class (:foreground ,magenta-alt-other :weight bold + `(erc-nick-prefix-face ((,class (:inherit erc-nick-default-face + `(erc-notice-face ((,class (:foreground ,fg-unfocused + `(erc-pal-face ((,class (:foreground ,red-alt :weight bold `(erc-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold - `(erc-timestamp-face ((,class (:foreground ,blue-alt + `(erc-timestamp-face ((,class (:foreground ,blue-nuanced `(erc-underline-face ((,class (:underline t ert `(ert-test-result-expected ((,class (:inherit modus-theme-intense-green diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 5b69d62..7456888 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -1503,24 +1503,24 @@ Also bind `class' to ((class color) (min-colors 89))." `(erc-bold-face ((,class (:weight bold `(erc-button ((,class (:inherit button `(erc-command-indicator-face ((,class (:foreground ,cyan-alt :weight bold - `(erc-current-nick-face ((,class (:foreground ,blue + `(erc-current-nick-face ((,class (:foreground ,magenta-alt-other `(erc-dangerous-host-face ((,class (:inherit modus-theme-intense-red - `(erc-direct-msg-face ((,class (:foreground ,fg-special-mild + `(erc-direct-msg-face ((,class (:foreground ,magenta `(erc-error-face ((,class (:foreground ,red :weight bold `(erc-fool-face ((,class (:foreground ,fg-inactive - `(erc-header-line ((,class (:background ,bg-alt :foreground ,fg-main + `(erc-header-line ((,class (:background ,bg-header :foreground ,fg-header `(erc-input-face ((,class (:foreground ,fg-special-calm `(erc-inverse-face ((,class (:inherit erc-default-face :inverse-video t `(erc-keyword-face ((,class (:foreground ,magenta-alt :weight bold `(erc-my-nick-face ((,class (:foreground ,magenta :weight bold `(erc-my-nick-prefix-face ((,class (:inherit erc-my-nick-face - `(erc-nick-default-face ((,class (:foreground ,fg-special-cold :weight bold + `(erc-nick-default-face ((,class (:foreground ,blue :weight bold `(erc-nick-msg-face ((,class (:foreground ,green :weight bold - `(erc-nick-prefix-face ((,class (:inherit erc-nick-default-face :weight bold - `(erc-notice-face ((,class (:foreground ,fg-special-warm - `(erc-pal-face ((,class (:foreground ,magenta-alt-other :weight bold + `(erc-nick-prefix-face ((,class (:inherit erc-nick-default-face + `(erc-notice-face ((,class (:foreground ,fg-unfocused + `(erc-pal-face ((,class (:foreground ,red-alt :weight bold `(erc-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold - `(erc-timestamp-face ((,class (:foreground ,blue-alt + `(erc-timestamp-face ((,class (:foreground ,blue-nuanced `(erc-under
[elpa] externals/modus-operandi-theme d6586a4 01/54: Refactor mapping of colours to faces. EXPERIMENTAL
branch: externals/modus-operandi-theme commit d6586a4f1d07a96cb3195e39f95e36353f220251 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Refactor mapping of colours to faces. EXPERIMENTAL The design of the colour palette and of the macro that maps it to faces is copied from zenbern-theme.el, commit 7dd7968: https://github.com/bbatsov/zenburn-emacs With these changes it will be possible for users to override a subset of the palette (or the entirety of it for that matter). This change is an initial response to issue 39: https://gitlab.com/protesilaos/modus-themes/-/issues/39 --- modus-operandi-theme.el | 422 +--- modus-vivendi-theme.el | 422 +--- 2 files changed, 510 insertions(+), 334 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 2c0a7b4..012aeae 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -504,188 +504,271 @@ AMOUNT is a customisation option." ;; Define colour palette. Each colour must have a >= 7:1 contrast ;; ratio relative to the foreground/background colour it is rendered ;; against. -(let ((class '((class color) (min-colors 89))) - (fg-main "#00") (bg-main "#ff") - (fg-alt "#505050") (bg-alt "#f3f1f3") - (fg-dim "#282828") (bg-dim "#f8f8f8") - ;; specifically for on/off states (e.g. `mode-line') - ;; - ;; must be combined with themselves - (fg-active "#191919") (bg-active "#e0e0e0") - (fg-inactive "#424242") (bg-inactive "#efedef") - ;; special base values, used only for cases where the above - ;; fg-* or bg-* cannot or should not be used (to avoid confusion) - ;; must be combined with: {fg,bg}-{main,alt,dim} - (fg-special-cold "#093060") (bg-special-cold "#dde3f4") - (fg-special-mild "#184034") (bg-special-mild "#c4ede0") - (fg-special-warm "#5d3026") (bg-special-warm "#f0e0d4") - (fg-special-calm "#61284f") (bg-special-calm "#f8ddea") - ;; styles for the main constructs - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' - (red "#a8") (green "#005f00") - (yellow "#8b3800") (blue "#0030a6") - (magenta "#721045") (cyan "#005589") - ;; styles for common, but still specialised constructs - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' - (red-alt "#972500") (green-alt "#305c00") - (yellow-alt "#714900") (blue-alt "#223fbf") - (magenta-alt "#8f0075") (cyan-alt "#185870") - ;; same purpose as above, just slight differences - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' - (red-alt-other "#a0132f") (green-alt-other "#095f1c") - (yellow-alt-other "#804000") (blue-alt-other "#bb") - (magenta-alt-other "#5317ac") (cyan-alt-other "#005a68") - ;; styles for elements that should be very subtle - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' - (red-nuanced "#4d0006") (green-nuanced "#003000") - (yellow-nuanced "#3a2a00") (blue-nuanced "#001170") - (magenta-nuanced "#381050") (cyan-nuanced "#003434") - ;; styles for slightly accented background - ;; - ;; must be combined with any of the above foreground values - (red-nuanced-bg "#fef2f2") (green-nuanced-bg "#f4faf4") - (yellow-nuanced-bg "#fcf6f1") (blue-nuanced-bg "#f4f4ff") - (magenta-nuanced-bg "#fff4fc") (cyan-nuanced-bg "#f0f6fa") - ;; styles for elements that should draw attention to themselves - ;; - ;; must be combined with: `bg-main' - (red-intense "#b6") (green-intense "#006800") - (yellow-intense "#904200") (blue-intense "#ee") - (magenta-intense "#7000e0") (cyan-intense "#205b93") - ;; styles for background elements that should be visible yet - ;; subtle - ;; - ;; must be combined with: `fg-dim' - (red-subtle-bg "#f2b0a2") (green-subtle-bg "#aecf90") - (yellow-subtle-bg "#e4c340") (blue-subtle-bg "#b5d0ff") - (magenta-subtle-bg "#f0d3ff") (cyan-subtle-bg "#c0efff") - ;; styles for background elements that should be visible and - ;; distinguishable - ;; - ;; must be combined with: `fg-main' - (red-intense-bg "#ff8892") (green-intense-bg "#5ada88") - (yellow-intense-bg "#f5df23") (blue-intense-bg "#6aaeff") - (magenta-intense-bg "#d5baff") (cyan-intense-bg "#42cbd4") - ;; styles for refined git diffs and other contexts where both the - ;; foreground and the background need to have the same/similar hue - ;; - ;; must be combined with themselves OR the foregrounds can be - ;; combined with any of the base backgrounds - (red-refine-bg "#ff") (green-refine-bg "#aceaac") - (yellow-refine-bg "#fff29a") (blue-refine-bg "#8ac7ff") - (magenta-refine-bg "#ffccff") (cyan-refine-bg "#8eecf4") - (red-refine-fg "
[elpa] externals/modus-operandi-theme a3d064d 26/54: Several refinements to the README
branch: externals/modus-operandi-theme commit a3d064daca76323bf0ddc412bbac76926e520e89 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Several refinements to the README --- README.org | 136 +++-- 1 file changed, 88 insertions(+), 48 deletions(-) diff --git a/README.org b/README.org index 55bdfe1..394705f 100644 --- a/README.org +++ b/README.org @@ -109,8 +109,31 @@ snippet: (load-theme 'modus-vivendi t) ; Dark theme #+END_SRC -Make sure to /remove any other theme/ that is being loaded, otherwise -you might run into unexpected issues. +Make sure to /remove any other theme/ that is being loaded, otherwise you +might run into unexpected issues (you can also =M-x disable-theme=). + +*** Load depending on the time of the day +:PROPERTIES: +:CUSTOM_ID: h:4e936e31-e9eb-4b50-8fdd-45d827a03cca +:END: + +This is a neat trick contributed by [[https://www.reddit.com/r/emacs/comments/gdtqov/weekly_tipstricketc_thread/fq9186h/][b3n on r/emacs]]. It will select the +appropriate theme based on the time of the day and it will also switch +themes when the time comes. + +#+begin_src emacs-lisp +;; Light for the day +(load-theme 'modus-operandi t t) +(run-at-time "05:00" (* 60 60 24) (lambda () (enable-theme 'modus-operandi))) + +;; Dark for the night +(load-theme 'modus-vivendi t t) +(run-at-time "21:00" (* 60 60 24) (lambda () (enable-theme 'modus-vivendi))) +#+end_src + +Note that the =load-theme= here is slightly different than the one in the +section right above, because it does not enable the theme directly (the +subsequent =enable-theme= does that when needed). * Customisation options :PROPERTIES: @@ -155,12 +178,15 @@ fully fledged =use-package= declaration. + =modus-operandi-theme-distinct-org-blocks= + =modus-vivendi-theme-distinct-org-blocks= -Use a distinct background for Org's source blocks and extend their -headings until the edge of the window (the "extend" part is for Emacs -versions >= 27, whereas before they would extend regardless). The -default is to use the same background as the rest of the buffer for the -contents of the block, while beginning and end lines do not extend to -the end of the window (again, the "extend" is for Emacs 27 or higher). +Use a distinct background for Org's source blocks and extend the +background of their beginning and end lines to the edge of the window +(the "extend" part is for Emacs versions >= 27, whereas before they +would extend regardless). + +The default is to use the same background as the rest of the buffer for +the contents of the block, while beginning and end lines do not extend +to the end of the window (again, the "extend" is for Emacs 27 or +higher). ** Option for colourful "rainbow" headings :PROPERTIES: @@ -175,9 +201,11 @@ while retaining all other heading properties (such as a bold weight and the optional scaled height ---see relevant customisation toggle). The colours follow the rainbow's spectrum. In Org headings, some additional tweaks are made to adapt keywords (like "TODO") to the more vivid -presentation. The default uses a more frugal aesthetic for headings, -letting their bold typography and the nuances between the various -heading levels provide the elements of differentiation. +presentation. + +The default uses a more frugal aesthetic for headings, letting their +bold typography and the nuances between the various heading levels +provide the elements of differentiation. ** Option for sectioned headings :PROPERTIES: @@ -187,9 +215,6 @@ heading levels provide the elements of differentiation. + =modus-operandi-theme-section-headings= + =modus-vivendi-theme-section-headings= -The default is to use only a subtle foreground and a bold weight for -headings, while no boxes or {under,over}-line effects are present. - Uses a background colour and an overline to mark section headings in =org-mode= and =outline-mode=. These attributes are applied in addition to the existing foreground colour and the bold weight and can, therefore, @@ -197,6 +222,9 @@ be combined with the "rainbow" headings option (as well as all the other options pertaining to headings). For Org several additional faces are configured accordingly, such as TODO keywords which gain a box style. +The default is to use only a subtle foreground and a bold weight for +headings, while no boxes or {under,over}-line effects are present. + ** Option for scaled headings :PROPERTIES: :CUSTOM_ID: h:db0275ea-11c2-47c9-82a9-10b65d8df0f8 @@ -212,9 +240,10 @@ headers and body copy. In addition to toggles for enabling scaled headings, users can also specify a number of their own. -+ If it is a *floating point*, say, =1.5= then it is interpreted as a - multiple of the base font size (there are many ways to set the main - font on Emacs, such as those [[https://gitlab.com/protesilaos/modus-themes/-/issues/43#note_337308289][I documented in issue 43]])
[elpa] externals/modus-operandi-theme feaef70 08/54: Refine ORG-MODE faces for mixed font workflows
branch: externals/modus-operandi-theme commit feaef70a558ad732f3cb35e060fc018af0d9b39a Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Refine ORG-MODE faces for mixed font workflows Several faces will now use a monospaced font even when the user opts for a proportionately-spaced family as their main typeface. The previous settings would "break" the layout when the user enabled something like (variable-pitch-mode). Now things work as expected. Note though that depending on the user's font settings, some adjustments may be necessary (though these are outside the scope of the themes). Example: (set-face-attribute 'variable-pitch nil :family "Source Sans Pro" :height 110) (set-face-attribute 'fixed-pitch nil :family "Source Code Pro" :height 110) This set of changes was recommended in issue 40: https://gitlab.com/protesilaos/modus-themes/-/issues/40 --- README.org | 30 ++ modus-operandi-theme.el | 16 +--- modus-vivendi-theme.el | 16 +--- 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/README.org b/README.org index ae34777..0a31c36 100644 --- a/README.org +++ b/README.org @@ -466,6 +466,36 @@ package which offers live colour previews. This is how I configure it: (setq rainbow-x-colors nil)) #+end_src +** Optional minimum extra configurations for mixed fonts + :PROPERTIES: + :CUSTOM_ID: h:ea30ff0e-3bb6-4801-baf1-d49169d94cd5 + :END: + +The themes are designed to cope well with mixed font settings. +Currently this applies to Org mode (courtesy of [[https://gitlab.com/protesilaos/modus-themes/-/issues/40][Ben in issue 40]]). + +In practice it means that some parts of an Org buffer will use a +monospaced font even when the user opts for a proportionately-spaced +typeface as their default (such as by enabling =(variable-pitch-mode)=). +This is to ensure that code blocks and other relevant elements use the +appropriate type settings and are positioned correctly. + +To specify the font families and their respective height, you could do +something like: + +#+begin_src emacs-lisp +(set-face-attribute 'variable-pitch nil :family "Source Sans Pro" :height 110) +(set-face-attribute 'fixed-pitch nil :family "Source Code Pro" :height 110) +#+end_src + +In this example, you are defining the attributes of the =variable-pitch= +face (proportional) and of =fixed-pitch= (monospace), which are then +inherited by other faces at the theme level. + +If any Org power user is reading this section, I encourage you to +recommend some other /minimal/ tweaks and customisations that could +improve the user experience. + * Face coverage :PROPERTIES: :CUSTOM_ID: h:944a3bdf-f545-40a0-a26c-b2cec8b2b316 diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index f9cd957..b320f16 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2457,11 +2457,12 @@ Also bind `class' to ((class color) (min-colors 89))." :foreground ,fg-special-mild ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3) `(org-archived ((,class (:background ,bg-alt :foreground ,fg-alt - `(org-block ((,class (,@(modus-operandi-theme-org-src-block bg-dim bg-main) :foreground ,fg-main + `(org-block ((,class (,@(modus-operandi-theme-org-src-block bg-dim bg-main) + :inherit fixed-pitch :foreground ,fg-main `(org-block-begin-line ((,class (,@(and (>= emacs-major-version 27) modus-operandi-theme-distinct-org-blocks '(:extend t)) -:background ,bg-alt :foreground ,fg-special-mild +:inherit fixed-pitch :background ,bg-alt :foreground ,fg-special-mild `(org-block-end-line ((,class (:inherit org-block-begin-line `(org-checkbox ((,class (:weight bold `(org-checkbox-statistics-done ((,class (:foreground ,green @@ -2471,14 +2472,14 @@ Also bind `class' to ((class color) (min-colors 89))." ,@(modus-operandi-theme-heading-block yellow-nuanced-bg yellow-nuanced) `(org-clock-overlay ((,class (:inherit modus-theme-special-cold - `(org-code ((,class (:foreground ,magenta + `(org-code ((,class (:inherit fixed-pitch :foreground ,magenta `(org-column ((,class (:background ,bg-alt `(org-column-title ((,class (:underline t :background ,bg-alt :weight bold `(org-date ((,class (:foreground ,blue-nuanced `(org-date-selected ((,class (:inherit modus-theme-intense-cyan :weight bold `(org-default ((,class (:background ,bg-main :foreground ,fg-main `(org-document-info
[elpa] externals/modus-operandi-theme 677116a 05/54: Make "section headings" customisation `:extend t'
branch: externals/modus-operandi-theme commit 677116a7da11522864fa0aeca98ef028e8a0dbf3 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Make "section headings" customisation `:extend t' This is for versions of Emacs that are >= 27. The face's attributes, such as the background colour, will now extend to the end of the window rather than stop at the last character. Such was the standard behaviour in prior Emacs releases. The idea for this change was recommended in issue 40: https://gitlab.com/protesilaos/modus-themes/-/issues/40 --- modus-operandi-theme.el | 4 +++- modus-vivendi-theme.el | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 0d6c4ec..14ad5c5 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -446,7 +446,9 @@ RAINBOW is the saturated one." "Conditionally extend heading styles. Apply BG to background and FG to overline." (if modus-operandi-theme-section-headings - (list :background bg :overline fg) + (append + (and (>= emacs-major-version 27) '(:extend t)) + (list :background bg :overline fg)) (list :background nil :overline nil))) (defun modus-operandi-theme-org-todo-block (bgbox fgbox fg) diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 19875f8..2b297c3 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -446,7 +446,9 @@ RAINBOW is the saturated one." "Conditionally extend heading styles. Apply BG to background and FG to overline." (if modus-vivendi-theme-section-headings - (list :background bg :overline fg) + (append + (and (>= emacs-major-version 27) '(:extend t)) + (list :background bg :overline fg)) (list :background nil :overline nil))) (defun modus-vivendi-theme-org-todo-block (bgbox fgbox fg)
[elpa] externals/modus-operandi-theme a937f90 14/54: Modus Vivendi: tweak colour for header lines
branch: externals/modus-operandi-theme commit a937f903bb13f5879e539fa841c8ed46bc567f8b Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Modus Vivendi: tweak colour for header lines --- modus-vivendi-theme.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 4aeb119..0cfd2f3 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -660,7 +660,7 @@ AMOUNT is a customisation option." ("fg-unfocused" . "#93959b") -("bg-header" . "#2a2a2a") ("fg-header" . "#dd") +("bg-header" . "#212121") ("fg-header" . "#dd") ("bg-whitespace" . "#170016") ("fg-whitespace" . "#a4959f")
[elpa] externals/modus-operandi-theme 2ffe984 16/54: Clarify docs for scaled headings and their values
branch: externals/modus-operandi-theme commit 2ffe9848acb3f728f5d338646053646fdf619eb9 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Clarify docs for scaled headings and their values This is meant to address the lack of clarity regarding the possible values that these variables may accept. Refer to issue 43 for more on the matter: https://gitlab.com/protesilaos/modus-themes/-/issues/43 --- README.org | 18 +- modus-operandi-theme.el | 45 - modus-vivendi-theme.el | 45 - 3 files changed, 93 insertions(+), 15 deletions(-) diff --git a/README.org b/README.org index 22ed876..bd440f6 100644 --- a/README.org +++ b/README.org @@ -210,11 +210,19 @@ noticeable in modes like Org. The default is to use the same size for headers and body copy. In addition to toggles for enabling scaled headings, users can also -specify the exact multiplier relative to the base font size. These are -the variables in their default sizes, from the smallest to the largest -(the numbers are very conservative, but you are free to increase them a -bit, such as =1.2=, =1.4=, =1.6=, =1.8=, =2.0=---or use a resource for finding a -consistent scale, like [[https://www.modularscale.com][modularscale.com]]): +specify a number of their own. + ++ If it is a *floating point*, say, =1.5= then it is interpreted as a + multiple of the base font size (there are many ways to set the main + font on Emacs, such as those [[https://gitlab.com/protesilaos/modus-themes/-/issues/43#note_337308289][I documented in issue 43]]). ++ If it is an *integer*, it is read as an absolute font height. The + number is basically the point size multiplied by a hundred. So if you + want it to be =18pt= you must pass =180=. + +Below are the variables in their default values, using the floating +point paradigm. The numbers are very conservative, but you are free to +change them to your liking, such as =1.2=, =1.4=, =1.6=, =1.8=, =2.0=---or use a +resource for finding a consistent scale, like [[https://www.modularscale.com][modularscale.com]]: #+begin_src emacs-lisp (setq modus-operandi-theme-scale-1 1.05 diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 93429d3..003737f 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -400,23 +400,58 @@ between foreground and background is >= 7:1)." :type 'boolean) (defcustom modus-operandi-theme-scale-1 1.05 - "Font size that is slightly larger than the base value." + "Font size that is slightly larger than the base value. +The default is a floating point that is interpreted as a multiple +of the base font size. However, the variable also accepts an +integer, understood as an absolute height (e.g. a value of 140 is +the same as setting the font at 14 point size). + +For more on the matter, read the documentation of +`set-face-attribute', specifically the ':height' section." :type 'number) (defcustom modus-operandi-theme-scale-2 1.1 - "Font size slightly larger than `modus-operandi-theme-scale-1'." + "Font size slightly larger than `modus-operandi-theme-scale-1'. +The default is a floating point that is interpreted as a multiple +of the base font size. However, the variable also accepts an +integer, understood as an absolute height (e.g. a value of 140 is +the same as setting the font at 14 point size). + +For more on the matter, read the documentation of +`set-face-attribute', specifically the ':height' section." :type 'number) (defcustom modus-operandi-theme-scale-3 1.15 - "Font size slightly larger than `modus-operandi-theme-scale-2'." + "Font size slightly larger than `modus-operandi-theme-scale-2'. +The default is a floating point that is interpreted as a multiple +of the base font size. However, the variable also accepts an +integer, understood as an absolute height (e.g. a value of 140 is +the same as setting the font at 14 point size). + +For more on the matter, read the documentation of +`set-face-attribute', specifically the ':height' section." :type 'number) (defcustom modus-operandi-theme-scale-4 1.2 - "Font size slightly larger than `modus-operandi-theme-scale-3'." + "Font size slightly larger than `modus-operandi-theme-scale-3'. +The default is a floating point that is interpreted as a multiple +of the base font size. However, the variable also accepts an +integer, understood as an absolute height (e.g. a value of 140 is +the same as setting the font at 14 point size). + +For more on the matter, read the documentation of +`set-face-attribute', specifically the ':height' section." :type 'number) (defcustom modus-operandi-theme-scale-5 1.3 - "Font size slightly larger than `modus-operandi-theme-scale-4'." + "Font size slightly larger than `modus-operandi-theme-scale-4'. +The default is a floating point that is interpreted as a multiple +of the base font size. However, the var
[elpa] externals/modus-operandi-theme updated (fc03967 -> 503a772)
monnier pushed a change to branch externals/modus-operandi-theme. from fc03967 Merge 'master' into elpa/modus-operandi-theme new d6586a4 Refactor mapping of colours to faces. EXPERIMENTAL new e4714ff Finalise palette implementation and customisation new 0d9b1d4 Expand README with new customisation methods new 5bff8ce Add another step in the font scale for headings new 677116a Make "section headings" customisation `:extend t' new 4a9bd23 Apply optional highest scale to org-document-title new 67a677e Fix `org-hide' colour new feaef70 Refine ORG-MODE faces for mixed font workflows new 91ce02b Expand README on face customisation new a044e41 Add support for YASNIPPET new c72b01c Add support for INDIUM new 58a9924 Add support for VDIFF new f76c36a Major review of colours for tabs. Tweak faces. new a937f90 Modus Vivendi: tweak colour for header lines new 775c8f9 Clarify the use of the special `bg-tab-bar' colour new 2ffe984 Clarify docs for scaled headings and their values new 7c37202 Don't set background in regular ORG modeline clock new 78a2baf Clarify that Org #+TITLE does not scale in v0.8.1 new 7a8a7cb Implement minor palette tweaks for Modus Operandi new a99bec3 Improve README section on font family settings new 22444f9 Minor refinements to some ERC faces new ccc6d66 Minor refinements to some RCIRC faces new 985675e Allow byte compile with `eval-when-compile' new c05fbab Do not `autoload' defcustom new ae0e956 Fix regression with byte compilation new a3d064d Several refinements to the README new 4b3f6a3 Add tentative support for CIRCE new 9954f47 Major Review of fly{check,make,spell} for GUI/TUI new e14182f Tweak `minibuffer-prompt' colour for consistency new 1faab94 Tweak MAGIT header line key colour new a9479f3 Add support for MINIMAP new 0b8a919 Add support for HYPERLIST new 9b5d56d Add support for EROS new dbe1c96 Minor tweaks for GNUS summary selected, ticked new 51660bb Add support for GOLDEN-RATIO-SCROLL-SCREEN new 3bd7eac Add support for JOURNALCTL-MODE new 40667a5 Review EROS face (better for longer echo messages) new f4233e6 Minor refinements to JOURNALCTL-MODE new 39809b0 Review IMENU-LIST faces (more harmonious combos) new 4a430b1 Review SELECTRUM faces (due to changes upstream) new f4b5279 New custom option for intense standard completions new 6e9c5a2 Modus Vivendi: tweak yellow-refine-{bg,fg} colours new 3519501 Apply minor update (re-formatting) to docs new c8b29cc Add support for HIGHLIGHT-INDENTATION new e42eb37 Add support for missing `helm-comint-*' faces new 148f73a Add support for missing `helm-eshell-*' faces new 600e433 Add README note on fontifying Org section heading new 3c0ab7b Document implicit support for `swift-mode' new 08ec1bd Link issue 49 in README note about Helm grep face new 7c67f73 Add support for EL-SEARCH new 1057ede Add support for NXML-MODE new 3406e29 Upgrade to version 0.9.0 new 24504f6 Remove superfluous file new 503a772 Merge remote-tracking branch 'modus-themes/elpa/modus-operandi-theme' into externals/modus-operandi-theme Summary of changes: CHANGELOG.org | 153 README.org | 384 + modus-operandi-theme.el | 623 3 files changed, 903 insertions(+), 257 deletions(-)
[elpa] externals/modus-operandi-theme e4714ff 02/54: Finalise palette implementation and customisation
branch: externals/modus-operandi-theme commit e4714ff9f7d3adec509b388485bdb5af2e2bc351 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Finalise palette implementation and customisation This is the product of the information provided in issue 39: https://gitlab.com/protesilaos/modus-themes/-/issues/39 --- modus-operandi-theme.el | 198 +--- modus-vivendi-theme.el | 198 +--- 2 files changed, 136 insertions(+), 260 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 012aeae..d7a8743 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -49,6 +49,7 @@ ;; modus-operandi-theme-distinct-org-blocks ;; modus-operandi-theme-3d-modeline ;; modus-operandi-theme-subtle-diffs +;; modus-operandi-theme-override-colors-alist ;; ;; The default scale is as follows (it can be customised as well): ;; @@ -499,8 +500,6 @@ AMOUNT is a customisation option." (when modus-operandi-theme-scale-headings (list :height amount))) - - ;; Define colour palette. Each colour must have a >= 7:1 contrast ;; ratio relative to the foreground/background colour it is rendered ;; against. @@ -510,140 +509,95 @@ AMOUNT is a customisation option." ;; https://github.com/bbatsov/zenburn-emacs (defvar modus-operandi-theme-default-colors-alist '(;; base values -("fg-main" . "#00") -("bg-main" . "#ff") -("fg-alt" . "#505050") -("bg-alt" . "#f3f1f3") -("fg-dim" . "#282828") -("bg-dim" . "#f8f8f8") +("bg-main" . "#ff") ("fg-main" . "#00") +("bg-alt" . "#f3f1f3") ("fg-alt" . "#505050") +("bg-dim" . "#f8f8f8") ("fg-dim" . "#282828") ;; specifically for on/off states (e.g. `mode-line') ;; ;; must be combined with themselves -("fg-active" . "#191919") -("bg-active" . "#e0e0e0") -("fg-inactive" . "#424242") -("bg-inactive" . "#efedef") +("bg-active" . "#e0e0e0") ("fg-active" . "#191919") +("bg-inactive" . "#efedef") ("fg-inactive" . "#424242") ;; special base values, used only for cases where the above ;; fg-* or bg-* cannot or should not be used (to avoid confusion) ;; must be combined with: {fg,bg}-{main,alt,dim} -("fg-special-cold" . "#093060") -("bg-special-cold" . "#dde3f4") -("fg-special-mild" . "#184034") -("bg-special-mild" . "#c4ede0") -("fg-special-warm" . "#5d3026") -("bg-special-warm" . "#f0e0d4") -("fg-special-calm" . "#61284f") -("bg-special-calm" . "#f8ddea") +("bg-special-cold" . "#dde3f4") ("fg-special-cold" . "#093060") +("bg-special-mild" . "#c4ede0") ("fg-special-mild" . "#184034") +("bg-special-warm" . "#f0e0d4") ("fg-special-warm" . "#5d3026") +("bg-special-calm" . "#f8ddea") ("fg-special-calm" . "#61284f") ;; styles for the main constructs ;; ;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red" . "#a8") -("green" . "#005f00") -("yellow" . "#8b3800") -("blue" . "#0030a6") -("magenta" . "#721045") -("cyan" . "#005589") +("red" . "#a8") ("green" . "#005f00") +("yellow" . "#8b3800") ("blue" . "#0030a6") +("magenta" . "#721045") ("cyan" . "#005589") ;; styles for common, but still specialised constructs ;; ;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-alt" . "#972500") -("green-alt" . "#305c00") -("yellow-alt" . "#714900") -("blue-alt" . "#223fbf") -("magenta-alt" . "#8f0075") -("cyan-alt" . "#185870") +("red-alt" . "#972500") ("green-alt" . "#305c00") +("yellow-alt" . "#714900") ("blue-alt" . "#223fbf") +("magenta-alt" . "#8f0075") ("cyan-alt" . "#185870") ;; same purpose as above, just slight differences ;; ;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-alt-other" . "#a0132f") -("green-alt-other" . "#095f1c") -("yellow-alt-other" . "#804000") -("blue-alt-other" . "#bb") -("magenta-alt-other" . "#5317ac") -("cyan-alt-other" . "#005a68") +("red-alt-other" . "#a0132f") ("green-alt-other" . "#095f1c") +("yellow-alt-other" . "#804000") ("blue-alt-other" . "#bb") +("magenta-alt-other" . "#5317ac") ("cyan-alt-other" . "#005a68") ;; styles for elements that should be very subtle ;; ;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-nuanced" . "#4d0006") -("green-nuanced" . "#003000") -("yellow-nuanced" . "#3a2a00") -("blue-nuanced" . "#001170") -("magenta-nuanced" . "#381050") -("cyan-nuanced" . "#003434") +("red-nuanced" . "#4d0006") ("green-nuanced" . "#003000") +("yellow-nuanced" . "#3a2a00") ("blue-nuanced" . "#001170") +("magenta-nuanced" . "#381050") ("cyan-nuanced" . "#003434") ;; styles for slightly accented background ;; ;; must be combined with any of the above foreground values -("red-nuanced-bg
[elpa] externals/modus-operandi-theme 4b3f6a3 27/54: Add tentative support for CIRCE
branch: externals/modus-operandi-theme commit 4b3f6a383642fb81a3407dde5d887e2d937ec471 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add tentative support for CIRCE This also covers some faces provided by libraries for `lui' (Linewise User Interface) that are part of the Circe code repo. The support is considered "tentative" because there may still be refinements to be made to some lui faces. --- README.org | 1 + modus-operandi-theme.el | 9 + modus-vivendi-theme.el | 9 + 3 files changed, 19 insertions(+) diff --git a/README.org b/README.org index 394705f..c06ed6e 100644 --- a/README.org +++ b/README.org @@ -635,6 +635,7 @@ the "full support" may not be 100% true… + centaur-tabs + change-log and log-view (=vc-print-log= and =vc-print-root-log=) + cider ++ circe + color-rg + column-enforce-mode + company-mode* diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index edcc529..4d8f77e 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -84,6 +84,7 @@ ;; centaur-tabs ;; change-log and log-view (`vc-print-log' and `vc-print-root-log') ;; cider +;; circe ;; color-rg ;; column-enforce-mode ;; company-mode @@ -1090,6 +1091,14 @@ Also bind `class' to ((class color) (min-colors 89))." `(cider-test-success-face ((,class (:inherit modus-theme-intense-green `(cider-traced-face ((,class (:box (:line-width -1 :color ,cyan :style nil) :background ,bg-dim `(cider-warning-highlight-face ((,class (:foreground ,yellow :underline t + circe (and lui) + `(circe-fool-face ((,class (:foreground ,fg-alt + `(circe-highlight-nick-face ((,class (:foreground ,blue :weight bold + `(circe-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold + `(circe-server-face ((,class (:foreground ,fg-unfocused + `(lui-button-face ((,class (:foreground ,blue :underline t + `(lui-highlight-face ((,class (:foreground ,magenta-alt + `(lui-time-stamp-face ((,class (:foreground ,blue-nuanced color-rg `(color-rg-font-lock-column-number ((,class (:foreground ,magenta-alt-other `(color-rg-font-lock-command ((,class (:foreground ,fg-main :weight bold diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index a375c81..c3f59a2 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -84,6 +84,7 @@ ;; centaur-tabs ;; change-log and log-view (`vc-print-log' and `vc-print-root-log') ;; cider +;; circe ;; color-rg ;; column-enforce-mode ;; company-mode @@ -1090,6 +1091,14 @@ Also bind `class' to ((class color) (min-colors 89))." `(cider-test-success-face ((,class (:inherit modus-theme-intense-green `(cider-traced-face ((,class (:box (:line-width -1 :color ,cyan :style nil) :background ,bg-dim `(cider-warning-highlight-face ((,class (:foreground ,yellow :underline t + circe (and lui) + `(circe-fool-face ((,class (:foreground ,fg-alt + `(circe-highlight-nick-face ((,class (:foreground ,blue :weight bold + `(circe-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold + `(circe-server-face ((,class (:foreground ,fg-unfocused + `(lui-button-face ((,class (:foreground ,blue :underline t + `(lui-highlight-face ((,class (:foreground ,magenta-alt + `(lui-time-stamp-face ((,class (:foreground ,blue-nuanced color-rg `(color-rg-font-lock-column-number ((,class (:foreground ,magenta-alt-other `(color-rg-font-lock-command ((,class (:foreground ,fg-main :weight bold
[elpa] externals/modus-operandi-theme 67a677e 07/54: Fix `org-hide' colour
branch: externals/modus-operandi-theme commit 67a677e3ef0f239763cf8f17040ef2991eaaca28 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Fix `org-hide' colour This should always be the same as the default background, as per the face's docstring. --- modus-operandi-theme.el | 2 +- modus-vivendi-theme.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index cefc974..f9cd957 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2497,7 +2497,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(org-headline-done ((,class (:foreground ,green-nuanced ,@(modus-operandi-theme-heading-block green-nuanced-bg green-nuanced) - `(org-hide ((,class (:foreground ,fg-main + `(org-hide ((,class (:foreground ,bg-main `(org-latex-and-related ((,class (:foreground ,magenta-refine-fg `(org-level-1 ((,class (:inherit ,modus-theme-variable-pitch :weight bold ,@(modus-operandi-theme-heading-foreground fg-main magenta-alt-other) diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index d20bcfc..2d370ea 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -2497,7 +2497,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(org-headline-done ((,class (:foreground ,green-nuanced ,@(modus-vivendi-theme-heading-block green-nuanced-bg green-nuanced) - `(org-hide ((,class (:foreground ,fg-main + `(org-hide ((,class (:foreground ,bg-main `(org-latex-and-related ((,class (:foreground ,magenta-refine-fg `(org-level-1 ((,class (:inherit ,modus-theme-variable-pitch :weight bold ,@(modus-vivendi-theme-heading-foreground fg-main magenta-alt-other)
[elpa] externals/modus-operandi-theme 91ce02b 09/54: Expand README on face customisation
branch: externals/modus-operandi-theme commit 91ce02b12791a61c35e45b5a44ea80b708744a23 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Expand README on face customisation --- README.org | 32 1 file changed, 32 insertions(+) diff --git a/README.org b/README.org index 0a31c36..ef72bda 100644 --- a/README.org +++ b/README.org @@ -440,6 +440,38 @@ Len's sample package declaration (with comments by me): (load-theme 'modus-vivendi t)) ; load the theme #+end_src +Perhaps you want something simpler, such as a nice style for the cursor: + +#+begin_src emacs-lisp +(modus-operandi-theme-with-color-variables + (custom-theme-set-faces + 'modus-operandi + `(cursor ((t (:background ,blue-alt)) + +(modus-vivendi-theme-with-color-variables + (custom-theme-set-faces + 'modus-vivendi + `(cursor ((t (:background ,red-alt)) +#+end_src + +The code for the bespoke =after-load-theme-hook= could be something like +the following (courtesy of the [[https://github.com/seagle0128/.emacs.d/blob/master/lisp/init-funcs.el][Centaur Emacs project]]): + +#+begin_src emacs-lisp +(defvar after-load-theme-hook nil + "Hook run after a color theme is loaded using `load-theme'.") + +(defun run-after-load-theme-hook (&rest _) + "Run `after-load-theme-hook'." + (run-hooks 'after-load-theme-hook)) + +(advice-add #'load-theme :after #'run-after-load-theme-hook) +#+end_src + +If you need more ideas check how I configure the themes in [[https://gitlab.com/protesilaos/dotemacs][my dotemacs]]. +If something is not clear or not working as intended, please let me +know. + *** Further considerations :PROPERTIES: :CUSTOM_ID: h:4acda0f1-564e-48ff-8998-ebf7618377dd
[elpa] externals/modus-operandi-theme 58a9924 12/54: Add support for VDIFF
branch: externals/modus-operandi-theme commit 58a99245faef017ca48e61485c32b279d5ee8372 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for VDIFF --- README.org | 1 + modus-operandi-theme.el | 19 +++ modus-vivendi-theme.el | 19 +++ 3 files changed, 39 insertions(+) diff --git a/README.org b/README.org index 49dc19d..22ed876 100644 --- a/README.org +++ b/README.org @@ -760,6 +760,7 @@ the "full support" may not be 100% true… + undo-tree + vc (built-in mode line status for version control) + vc-annotate (=C-x v g=) ++ vdiff + vimish-fold + visible-mark + visual-regexp diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 953356e..99b987e 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -280,6 +280,7 @@ ;; undo-tree ;; vc (built-in mode line status for version control) ;; vc-annotate (C-x v g) +;; vdiff ;; vimish-fold ;; visible-mark ;; visual-regexp @@ -3089,6 +3090,24 @@ Also bind `class' to ((class color) (min-colors 89))." `(vc-removed-state ((,class (:foreground ,red-active `(vc-state-base ((,class (:foreground ,fg-active `(vc-up-to-date-state ((,class (:foreground ,fg-special-cold + vdiff + `(vdiff-addition-face ((,class ,(modus-operandi-theme-diffs +bg-main green +bg-diff-focus-added fg-diff-focus-added + `(vdiff-change-face ((,class ,(modus-operandi-theme-diffs + bg-main yellow + bg-diff-focus-changed fg-diff-focus-changed + `(vdiff-closed-fold-face ((,class (:background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1 + `(vdiff-refine-added ((,class ,(modus-operandi-theme-diffs + bg-diff-added fg-diff-added + bg-diff-refine-added fg-diff-refine-added + `(vdiff-refine-changed ((,class ,(modus-operandi-theme-diffs + bg-diff-changed fg-diff-changed + bg-diff-refine-changed fg-diff-refine-changed + `(vdiff-subtraction-face ((,class ,(modus-operandi-theme-diffs + bg-main red + bg-diff-focus-removed fg-diff-focus-removed + `(vdiff-target-face ((,class (:inherit modus-theme-intense-blue vimish-fold `(vimish-fold-fringe ((,class (:foreground ,cyan-active `(vimish-fold-mouse-face ((,class (:inherit modus-theme-intense-blue diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 001f55b..9d00f91 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -280,6 +280,7 @@ ;; undo-tree ;; vc (built-in mode line status for version control) ;; vc-annotate (C-x v g) +;; vdiff ;; vimish-fold ;; visible-mark ;; visual-regexp @@ -3089,6 +3090,24 @@ Also bind `class' to ((class color) (min-colors 89))." `(vc-removed-state ((,class (:foreground ,red-active `(vc-state-base ((,class (:foreground ,fg-active `(vc-up-to-date-state ((,class (:foreground ,fg-special-cold + vdiff + `(vdiff-addition-face ((,class ,(modus-vivendi-theme-diffs +bg-main green +bg-diff-focus-added fg-diff-focus-added + `(vdiff-change-face ((,class ,(modus-vivendi-theme-diffs + bg-main yellow + bg-diff-focus-changed fg-diff-focus-changed + `(vdiff-closed-fold-face ((,class (:background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1 + `(vdiff-refine-added ((,class ,(modus-vivendi-theme-diffs + bg-diff-added fg-diff-added + bg-diff-refine-added fg-diff-refine-added + `(vdiff-refine-changed ((,class ,(modus-vivendi-theme-diffs + bg-diff-changed fg-diff-changed + bg-diff-refine-changed fg-diff-refine-changed + `(vdiff-subtraction-face ((,class ,(modus-vivendi-theme-diffs + bg-main red + bg-diff-focus-removed fg-diff-focus-removed + `(vdiff-target-face ((,class (:inherit modus-theme-intense-blue vimish-fold `(vimish-fold-fringe ((,class (:foreground ,cyan-active `(vimish-fold-mouse-face ((,class (:inherit modus-theme-intense-blue
[elpa] externals/modus-operandi-theme 7a8a7cb 19/54: Implement minor palette tweaks for Modus Operandi
branch: externals/modus-operandi-theme commit 7a8a7cbe570d57f0e879e9107eabaaa3e33f8fad Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Implement minor palette tweaks for Modus Operandi Read the report which should be viewed inside of an org-mode buffer: https://protesilaos.com/codelog/2020-05-10-modus-operandi-palette-review/ The gist is that this is a series of subtle tweaks to some colours in order to improve how they may combine under various circumstances. --- modus-operandi-theme.el | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 10b39cd..674eaab 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -555,7 +555,7 @@ AMOUNT is a customisation option." (defvar modus-operandi-theme-default-colors-alist '(;; base values ("bg-main" . "#ff") ("fg-main" . "#00") -("bg-alt" . "#f3f1f3") ("fg-alt" . "#505050") +("bg-alt" . "#f0f0f0") ("fg-alt" . "#505050") ("bg-dim" . "#f8f8f8") ("fg-dim" . "#282828") ;; specifically for on/off states (e.g. `mode-line') ;; @@ -572,21 +572,21 @@ AMOUNT is a customisation option." ;; styles for the main constructs ;; ;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red" . "#a8") ("green" . "#005f00") -("yellow" . "#8b3800") ("blue" . "#0030a6") -("magenta" . "#721045") ("cyan" . "#005589") +("red" . "#a6") ("green" . "#005e00") +("yellow" . "#813e00") ("blue" . "#0030a6") +("magenta" . "#721045") ("cyan" . "#00538b") ;; styles for common, but still specialised constructs ;; ;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-alt" . "#972500") ("green-alt" . "#305c00") -("yellow-alt" . "#714900") ("blue-alt" . "#223fbf") -("magenta-alt" . "#8f0075") ("cyan-alt" . "#185870") +("red-alt" . "#972500") ("green-alt" . "#315b00") +("yellow-alt" . "#70480f") ("blue-alt" . "#223fbf") +("magenta-alt" . "#8f0075") ("cyan-alt" . "#30517f") ;; same purpose as above, just slight differences ;; ;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-alt-other" . "#a0132f") ("green-alt-other" . "#095f1c") -("yellow-alt-other" . "#804000") ("blue-alt-other" . "#bb") -("magenta-alt-other" . "#5317ac") ("cyan-alt-other" . "#005a68") +("red-alt-other" . "#a0132f") ("green-alt-other" . "#145c33") +("yellow-alt-other" . "#863927") ("blue-alt-other" . "#bb") +("magenta-alt-other" . "#5317ac") ("cyan-alt-other" . "#005a5f") ;; styles for elements that should be very subtle ;; ;; must be combined with: `bg-main', `bg-alt', `bg-dim' @@ -677,7 +677,7 @@ AMOUNT is a customisation option." ;; the window divider colours apply to faces with just an fg value ;; ;; all pairs are combinable with themselves -("bg-hl-line" . "#f1f2f6") +("bg-hl-line" . "#f2eff3") ("bg-paren-match" . "#efcabf") ("bg-region" . "#bcbcbc") @@ -687,10 +687,10 @@ AMOUNT is a customisation option." ("fg-tab-active" . "#30169e") ("fg-escape-char-construct" . "#8b1030") -("fg-escape-char-backslash" . "#644f00") +("fg-escape-char-backslash" . "#654d0f") ("fg-lang-error" . "#9f004f") -("fg-lang-warning" . "#605000") +("fg-lang-warning" . "#604f0f") ("fg-lang-note" . "#4040ae") ("fg-window-divider-inner" . "#88")
[elpa] externals/modus-operandi-theme 39809b0 39/54: Review IMENU-LIST faces (more harmonious combos)
branch: externals/modus-operandi-theme commit 39809b0977c5b7fff83d071cc6e637144f5934fd Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Review IMENU-LIST faces (more harmonious combos) --- modus-operandi-theme.el | 14 +++--- modus-vivendi-theme.el | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 1dc4f12..dc9a5c7 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2027,14 +2027,14 @@ Also bind `class' to ((class color) (min-colors 89))." `(iflipb-current-buffer-face ((,class (:foreground ,cyan-alt :weight bold `(iflipb-other-buffer-face ((,class (:foreground ,fg-alt imenu-list - `(imenu-list-entry-face-0 ((,class (:foreground ,magenta-alt-other - `(imenu-list-entry-face-1 ((,class (:foreground ,cyan-alt-other - `(imenu-list-entry-face-2 ((,class (:foreground ,yellow-alt-other - `(imenu-list-entry-face-3 ((,class (:foreground ,green-alt-other + `(imenu-list-entry-face-0 ((,class (:foreground ,cyan + `(imenu-list-entry-face-1 ((,class (:foreground ,blue + `(imenu-list-entry-face-2 ((,class (:foreground ,cyan-alt-other + `(imenu-list-entry-face-3 ((,class (:foreground ,blue-alt `(imenu-list-entry-subalist-face-0 ((,class (:foreground ,magenta-alt-other :weight bold :underline t - `(imenu-list-entry-subalist-face-1 ((,class (:foreground ,cyan-alt-other :weight bold :underline t - `(imenu-list-entry-subalist-face-2 ((,class (:foreground ,yellow-alt-other :weight bold :underline t - `(imenu-list-entry-subalist-face-3 ((,class (:foreground ,green-alt-other :weight bold :underline t + `(imenu-list-entry-subalist-face-1 ((,class (:foreground ,magenta :weight bold :underline t + `(imenu-list-entry-subalist-face-2 ((,class (:foreground ,green-alt-other :weight bold :underline t + `(imenu-list-entry-subalist-face-3 ((,class (:foreground ,red-alt-other :weight bold :underline t indium `(indium-breakpoint-face ((,class (:foreground ,red-active `(indium-frame-url-face ((,class (:foreground ,fg-alt :underline t diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index b8ddf93..bf64d53 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -2027,14 +2027,14 @@ Also bind `class' to ((class color) (min-colors 89))." `(iflipb-current-buffer-face ((,class (:foreground ,cyan-alt :weight bold `(iflipb-other-buffer-face ((,class (:foreground ,fg-alt imenu-list - `(imenu-list-entry-face-0 ((,class (:foreground ,magenta-alt-other - `(imenu-list-entry-face-1 ((,class (:foreground ,cyan-alt-other - `(imenu-list-entry-face-2 ((,class (:foreground ,yellow-alt-other - `(imenu-list-entry-face-3 ((,class (:foreground ,green-alt-other + `(imenu-list-entry-face-0 ((,class (:foreground ,cyan + `(imenu-list-entry-face-1 ((,class (:foreground ,blue + `(imenu-list-entry-face-2 ((,class (:foreground ,cyan-alt-other + `(imenu-list-entry-face-3 ((,class (:foreground ,blue-alt `(imenu-list-entry-subalist-face-0 ((,class (:foreground ,magenta-alt-other :weight bold :underline t - `(imenu-list-entry-subalist-face-1 ((,class (:foreground ,cyan-alt-other :weight bold :underline t - `(imenu-list-entry-subalist-face-2 ((,class (:foreground ,yellow-alt-other :weight bold :underline t - `(imenu-list-entry-subalist-face-3 ((,class (:foreground ,green-alt-other :weight bold :underline t + `(imenu-list-entry-subalist-face-1 ((,class (:foreground ,magenta :weight bold :underline t + `(imenu-list-entry-subalist-face-2 ((,class (:foreground ,green-alt-other :weight bold :underline t + `(imenu-list-entry-subalist-face-3 ((,class (:foreground ,red-alt-other :weight bold :underline t indium `(indium-breakpoint-face ((,class (:foreground ,red-active `(indium-frame-url-face ((,class (:foreground ,fg-alt :underline t
[elpa] externals/modus-operandi-theme a99bec3 20/54: Improve README section on font family settings
branch: externals/modus-operandi-theme commit a99bec324b712d9444fa1c2abd4ef083e6cba64d Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Improve README section on font family settings --- README.org | 36 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/README.org b/README.org index 0b81b69..55bdfe1 100644 --- a/README.org +++ b/README.org @@ -511,31 +511,43 @@ package which offers live colour previews. This is how I configure it: (setq rainbow-x-colors nil)) #+end_src -** Optional minimum extra configurations for mixed fonts +** Font configurations for Org (and others) :PROPERTIES: :CUSTOM_ID: h:ea30ff0e-3bb6-4801-baf1-d49169d94cd5 :END: The themes are designed to cope well with mixed font settings. -Currently this applies to Org mode (courtesy of [[https://gitlab.com/protesilaos/modus-themes/-/issues/40][Ben in issue 40]]). +Currently this applies to Org mode (courtesy of [[https://gitlab.com/protesilaos/modus-themes/-/issues/40][Ben in issue 40]]), though +it may be extended to other major modes as well (e.g. markdown). -In practice it means that some parts of an Org buffer will use a -monospaced font even when the user opts for a proportionately-spaced -typeface as their default (such as by enabling =(variable-pitch-mode)=). -This is to ensure that code blocks and other relevant elements use the +In practice it means that some parts of a buffer will use a monospaced +font even when the user opts for a proportionately-spaced typeface as +their default (such as by enabling =variable-pitch-mode=). This is to +ensure that code blocks, tables, and other relevant elements use the appropriate type settings and are positioned correctly. -To specify the font families and their respective height, you could do -something like: +*To make everything use your desired font families*, you need to configure +the =variable-pitch= (proportional spacing) and =fixed-pitch= (monospaced) +faces respectively. Otherwise you may get unintended combinations (such +as those experienced by Mark in [[https://gitlab.com/protesilaos/modus-themes/-/issues/42][issue 42]]). + +Put something like this in your initialisation file: #+begin_src emacs-lisp -(set-face-attribute 'variable-pitch nil :family "Source Sans Pro" :height 110) +(set-face-attribute 'variable-pitch nil :family "DejaVu Sans" :height 110) (set-face-attribute 'fixed-pitch nil :family "Source Code Pro" :height 110) #+end_src -In this example, you are defining the attributes of the =variable-pitch= -face (proportional) and of =fixed-pitch= (monospace), which are then -inherited by other faces at the theme level. +You can also set your standard font the same way. For example: + +#+begin_src emacs-lisp +(set-face-attribute 'default nil :family "Fira Code" :height 120) +#+end_src + +The value of the =:height= attribute essentially is the point size × 100. +So if you want to use Fira Code at point size =12=, you set the height to +=120=. Values do not need to be rounded to multiples of ten, so the likes +of =125= are perfectly valid. If any Org power user is reading this section, I encourage you to recommend some other /minimal/ tweaks and customisations that could
[elpa] externals/modus-operandi-theme 775c8f9 15/54: Clarify the use of the special `bg-tab-bar' colour
branch: externals/modus-operandi-theme commit 775c8f93c473da6f694be5c13308b7660b47d210 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Clarify the use of the special `bg-tab-bar' colour --- modus-operandi-theme.el | 3 +++ modus-vivendi-theme.el | 3 +++ 2 files changed, 6 insertions(+) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 97e597a..93429d3 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -621,6 +621,9 @@ AMOUNT is a customisation option." ;; combined with `fg-main', while `bg-tab-inactive' should be ;; combined with `fg-dim' ;; +;; `bg-tab-bar' is only intended for the bar that holds the tabs and +;; can only be combined with `fg-main' +;; ;; `fg-tab-active' is meant to be combined with `bg-tab-active', ;; though only for styling special elements, such as underlining ;; the current tab diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 0cfd2f3..0fea2d0 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -621,6 +621,9 @@ AMOUNT is a customisation option." ;; combined with `fg-main', while `bg-tab-inactive' should be ;; combined with `fg-dim' ;; +;; `bg-tab-bar' is only intended for the bar that holds the tabs and +;; can only be combined with `fg-main' +;; ;; `fg-tab-active' is meant to be combined with `bg-tab-active', ;; though only for styling special elements, such as underlining ;; the current tab
[elpa] externals/modus-operandi-theme 148f73a 46/54: Add support for missing `helm-eshell-*' faces
branch: externals/modus-operandi-theme commit 148f73a1b5ec0b4c5139d51a19778a7a74a2df10 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for missing `helm-eshell-*' faces These are part of the main `helm' package. --- modus-operandi-theme.el | 2 ++ modus-vivendi-theme.el | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index c2253bf..b41b471 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -1902,6 +1902,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(helm-comint-prompts-promptidx ((,class (:foreground ,cyan-active `(helm-delete-async-message ((,class (:foreground ,magenta-active :weight bold `(helm-eob-line ((,class (:background ,bg-main :foreground ,fg-main + `(helm-eshell-prompts-buffer-name ((,class (:foreground ,green-active + `(helm-eshell-prompts-promptidx ((,class (:foreground ,cyan-active `(helm-etags-file ((,class (:foreground ,fg-dim :underline t `(helm-ff-denied ((,class (:inherit modus-theme-intense-red `(helm-ff-directory ((,class (:inherit helm-buffer-directory diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 8a535b8..cb36142 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -1902,6 +1902,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(helm-comint-prompts-promptidx ((,class (:foreground ,cyan-active `(helm-delete-async-message ((,class (:foreground ,magenta-active :weight bold `(helm-eob-line ((,class (:background ,bg-main :foreground ,fg-main + `(helm-eshell-prompts-buffer-name ((,class (:foreground ,green-active + `(helm-eshell-prompts-promptidx ((,class (:foreground ,cyan-active `(helm-etags-file ((,class (:foreground ,fg-dim :underline t `(helm-ff-denied ((,class (:inherit modus-theme-intense-red `(helm-ff-directory ((,class (:inherit helm-buffer-directory
[elpa] externals/modus-operandi-theme f4b5279 41/54: New custom option for intense standard completions
branch: externals/modus-operandi-theme commit f4b52791cac8524f576e8536bdd49f6bd0a2d763 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou New custom option for intense standard completions --- README.org | 21 modus-operandi-theme.el | 51 - modus-vivendi-theme.el | 51 - 3 files changed, 105 insertions(+), 18 deletions(-) diff --git a/README.org b/README.org index b8cca80..7d68c84 100644 --- a/README.org +++ b/README.org @@ -356,6 +356,27 @@ The default is to use colour-coded backgrounds for line-wise highlights. which is, nonetheless, more subtle with this option than with its default equivalent. +** Option for intense standard completions + :PROPERTIES: + :CUSTOM_ID: h:5b0b1e66-8287-4f3f-ba14-011c29320a3f + :END: + ++ =modus-operandi-theme-intense-standard-completions= ++ =modus-vivendi-theme-intense-standard-completions= + +Display faces for built-in completion frameworks, such as =icomplete=, +with a combination of background and foreground colours. This covers +every completion interface that either is part of the upstream Emacs +distribution or extends some built-in library. For example, =orderless= +is a powerful completion style that can be used with core Emacs. So it +also is covered by this customisation option. + +With this enabled, Icomplete and others will use similar UI metaphors to +those of =ivy=, =helm=, =selectrum= (among others). + +The default is to only use foreground colour values for the various +matching characters or items of standard completion tools. + ** Option for proportional fonts in headings :PROPERTIES: :CUSTOM_ID: h:33023fa6-6482-45d4-9b5e-3c73c945718f diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 9144152..d794a24 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -49,6 +49,7 @@ ;; modus-operandi-theme-distinct-org-blocks ;; modus-operandi-theme-3d-modeline ;; modus-operandi-theme-subtle-diffs +;; modus-operandi-theme-intense-standard-completions ;; modus-operandi-theme-override-colors-alist ;; ;; The default scale is as follows (it can be customised as well): @@ -476,6 +477,10 @@ For more on the matter, read the documentation of "Use fewer/dim backgrounds in `diff-mode', `ediff',`magit'." :type 'boolean) +(defcustom modus-operandi-theme-intense-standard-completions nil + "Use prominent backgrounds for Icomplete, Ido, or similar." + :type 'boolean) + ;; Helper functions that are meant to ease the implementation of the ;; above customisation options. (defun modus-operandi-theme-heading-foreground (subtle rainbow) @@ -544,6 +549,17 @@ INTENSE-FG should be one of the dedicated foregrounds for diffs" (list :background subtle-bg :foreground subtle-fg) (list :background intense-bg :foreground intense-fg))) +(defun modus-operandi-theme-completions (subtle-fg intense-bg intense-fg) + "Combinations for `modus-operandi-theme-intense-standard-completions'. + +SUBTLE-FG should be an appropriate accent value. INTENSE-BG +should be one of the accented backgrounds. INTENSE-FG should be +one of the foreground intended to be combined with the +aforementioned background." + (if modus-operandi-theme-intense-standard-completions + (list :background intense-bg :foreground intense-fg) +(list :foreground subtle-fg))) + (defun modus-operandi-theme-scale (amount) "Scale heading by AMOUNT. @@ -1153,8 +1169,11 @@ Also bind `class' to ((class color) (min-colors 89))." `(compilation-warning ((,class (:foreground ,yellow :weight ,modus-theme-bold completions `(completions-annotations ((,class (:foreground ,fg-special-cold :slant ,modus-theme-slant - `(completions-common-part ((,class (:foreground ,cyan-alt-other - `(completions-first-difference ((,class (:foreground ,blue-alt-other :weight bold + `(completions-common-part ((,class (,@(modus-operandi-theme-completions +cyan-alt-other green-refine-bg green-refine-fg) + `(completions-first-difference ((,class (,@(modus-operandi-theme-completions + blue-alt-other blue-intense-bg fg-main) +:weight bold counsel `(counsel-active-mode ((,class (:foreground ,magenta-alt-other `(counsel-application-name ((,class (:foreground ,red-alt-other @@ -2010,14 +2029,20 @@ Also bind `class' to ((class color) (min-colors 89))." `(hyperlist-tag ((,class (:foreground ,red `(hyperlist-toplevel ((,class (:foreground ,fg-main :weight bold icomplete - `(icomplete-first-match ((,class (:foreground ,magenta :weight bold + `(icomplete-first-match ((,class (,@(modus-operandi-theme-completions +magenta magenta-intense-bg fg-main
[elpa] externals/modus-operandi-theme ae0e956 25/54: Fix regression with byte compilation
branch: externals/modus-operandi-theme commit ae0e9564d1e18d281e5500901c0660adf76b9b64 Merge: ccc6d66 c05fbab Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Fix regression with byte compilation This merges branch 'experimental-byte-compile' and addresses issue 44: https://gitlab.com/protesilaos/modus-themes/-/issues/44 The gist is that the themes should now byte compile cleanly, as was the case prior to commit d6586a4, while also supporting the features that were introduced in that commit as well as e4714ff (the features were documented in 0d9b1d4 and 91ce02b). Special thanks to André Alexandre Gomes (GitLab user @aadcg) for the valuable insights and the support in the investigation that led to this changeset. --- modus-operandi-theme.el | 368 modus-vivendi-theme.el | 368 2 files changed, 364 insertions(+), 372 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index c2f71c6..edcc529 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -552,206 +552,206 @@ AMOUNT is a customisation option." ;; The design of the colour palette and of the macro that maps it to ;; faces is copied from zenbern-theme.el from commit 7dd7968: ;; https://github.com/bbatsov/zenburn-emacs -(defvar modus-operandi-theme-default-colors-alist - '(;; base values -("bg-main" . "#ff") ("fg-main" . "#00") -("bg-alt" . "#f0f0f0") ("fg-alt" . "#505050") -("bg-dim" . "#f8f8f8") ("fg-dim" . "#282828") -;; specifically for on/off states (e.g. `mode-line') -;; -;; must be combined with themselves -("bg-active" . "#e0e0e0") ("fg-active" . "#191919") -("bg-inactive" . "#efedef") ("fg-inactive" . "#424242") -;; special base values, used only for cases where the above -;; fg-* or bg-* cannot or should not be used (to avoid confusion) -;; must be combined with: {fg,bg}-{main,alt,dim} -("bg-special-cold" . "#dde3f4") ("fg-special-cold" . "#093060") -("bg-special-mild" . "#c4ede0") ("fg-special-mild" . "#184034") -("bg-special-warm" . "#f0e0d4") ("fg-special-warm" . "#5d3026") -("bg-special-calm" . "#f8ddea") ("fg-special-calm" . "#61284f") -;; styles for the main constructs -;; -;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red" . "#a6") ("green" . "#005e00") -("yellow" . "#813e00") ("blue" . "#0030a6") -("magenta" . "#721045") ("cyan" . "#00538b") -;; styles for common, but still specialised constructs -;; -;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-alt" . "#972500") ("green-alt" . "#315b00") -("yellow-alt" . "#70480f") ("blue-alt" . "#223fbf") -("magenta-alt" . "#8f0075") ("cyan-alt" . "#30517f") -;; same purpose as above, just slight differences -;; -;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-alt-other" . "#a0132f") ("green-alt-other" . "#145c33") -("yellow-alt-other" . "#863927") ("blue-alt-other" . "#bb") -("magenta-alt-other" . "#5317ac") ("cyan-alt-other" . "#005a5f") -;; styles for elements that should be very subtle -;; -;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-nuanced" . "#4d0006") ("green-nuanced" . "#003000") -("yellow-nuanced" . "#3a2a00") ("blue-nuanced" . "#001170") -("magenta-nuanced" . "#381050") ("cyan-nuanced" . "#003434") -;; styles for slightly accented background -;; -;; must be combined with any of the above foreground values -("red-nuanced-bg" . "#fef2f2") ("green-nuanced-bg" . "#f4faf4") -("yellow-nuanced-bg" . "#fcf6f1") ("blue-nuanced-bg" . "#f4f4ff") -("magenta-nuanced-bg" . "#fff4fc") ("cyan-nuanced-bg" . "#f0f6fa") -;; styles for elements that should draw attention to themselves -;; -;; must be combined with: `bg-main' -("red-intense" . "#b6") ("green-intense" . "#006800") -("yellow-intense" . "#904200") ("blue-intense" . "#ee") -("magenta-intense" . "#7000e0") ("cyan-intense" . "#205b93") -;; styles for background elements that should be visible yet -;; subtle -;; -;; must be combined with: `fg-dim' -("red-subtle-bg" . "#f2b0a2") ("green-subtle-bg" . "#aecf90") -("yellow-subtle-bg" . "#e4c340") ("blue-subtle-bg" . "#b5d0ff") -("magenta-subtle-bg" . "#f0d3ff") ("cyan-subtle-bg" . "#c0efff") -;; styles for background elements that should be visible and -;; distinguishable -;; -;; must be combined with: `fg-main' -("red-intense-bg" . "#ff8892") ("green-intense-bg" . "#5ada88") -("yellow-intense-bg" . "#f5df23") ("blue-intense-bg" . "#6aaeff") -("magenta-intense-bg" . "#d5baff") ("cyan-intense-bg" . "#42cbd4") -;; styles for refined contexts where both the foreground and the -;; background need to have the same/similar hue -;; -;; must be combine
[elpa] externals/modus-operandi-theme 78a2baf 18/54: Clarify that Org #+TITLE does not scale in v0.8.1
branch: externals/modus-operandi-theme commit 78a2baf4ad4e37b7fc095b4c9c6f2cb65b0ec32f Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Clarify that Org #+TITLE does not scale in v0.8.1 This is in response to a subthread on issue 40: https://gitlab.com/protesilaos/modus-themes/-/issues/40#note_337638863 --- README.org | 5 + 1 file changed, 5 insertions(+) diff --git a/README.org b/README.org index bd440f6..0b81b69 100644 --- a/README.org +++ b/README.org @@ -243,6 +243,11 @@ not of keywords that are added to it, like "TODO". This is outside the control of the themes and I am not aware of any way to make such keywords scale accordingly. +Also note that in the latest tagged release (=0.8.1=) an Org file's +=#+TITLE= will not scale at all. This has been fixed in =master= and will +be available in version =0.9.0=, which is expected in early June 2020 +(the fix pertains to the introduction of =*-scale-5=). + ** Option for visible fringes :PROPERTIES: :CUSTOM_ID: h:d989f116-7559-40bc-bf94-ef508d480960
[elpa] externals/modus-operandi-theme c72b01c 11/54: Add support for INDIUM
branch: externals/modus-operandi-theme commit c72b01cd400588bcd03cdacd29e79fe3fe18ab2e Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for INDIUM --- README.org | 1 + modus-operandi-theme.el | 9 + modus-vivendi-theme.el | 9 + 3 files changed, 19 insertions(+) diff --git a/README.org b/README.org index 3322c6e..49dc19d 100644 --- a/README.org +++ b/README.org @@ -662,6 +662,7 @@ the "full support" may not be 100% true… + iedit + iflipb + imenu-list ++ indium + info + info-colors + interaction-log diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index a910876..953356e 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -180,6 +180,7 @@ ;; iedit ;; iflipb ;; imenu-list +;; indium ;; info ;; info-colors ;; interaction-log @@ -1965,6 +1966,14 @@ Also bind `class' to ((class color) (min-colors 89))." `(imenu-list-entry-subalist-face-1 ((,class (:foreground ,cyan-alt-other :weight bold :underline t `(imenu-list-entry-subalist-face-2 ((,class (:foreground ,yellow-alt-other :weight bold :underline t `(imenu-list-entry-subalist-face-3 ((,class (:foreground ,green-alt-other :weight bold :underline t + indium + `(indium-breakpoint-face ((,class (:foreground ,red-active + `(indium-frame-url-face ((,class (:foreground ,fg-alt :underline t + `(indium-keyword-face ((,class (:foreground ,magenta-alt-other + `(indium-litable-face ((,class (:foreground ,fg-special-warm :slant ,modus-theme-slant + `(indium-repl-error-face ((,class (:foreground ,red :weight bold + `(indium-repl-prompt-face ((,class (:foreground ,cyan-alt-other + `(indium-repl-stdout-face ((,class (:foreground ,fg-main info `(Info-quoted ((,class (:foreground ,magenta ; the capitalisation is canonical `(info-header-node ((,class (:foreground ,fg-special-warm diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 0e2bc4c..001f55b 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -180,6 +180,7 @@ ;; iedit ;; iflipb ;; imenu-list +;; indium ;; info ;; info-colors ;; interaction-log @@ -1965,6 +1966,14 @@ Also bind `class' to ((class color) (min-colors 89))." `(imenu-list-entry-subalist-face-1 ((,class (:foreground ,cyan-alt-other :weight bold :underline t `(imenu-list-entry-subalist-face-2 ((,class (:foreground ,yellow-alt-other :weight bold :underline t `(imenu-list-entry-subalist-face-3 ((,class (:foreground ,green-alt-other :weight bold :underline t + indium + `(indium-breakpoint-face ((,class (:foreground ,red-active + `(indium-frame-url-face ((,class (:foreground ,fg-alt :underline t + `(indium-keyword-face ((,class (:foreground ,magenta-alt-other + `(indium-litable-face ((,class (:foreground ,fg-special-warm :slant ,modus-theme-slant + `(indium-repl-error-face ((,class (:foreground ,red :weight bold + `(indium-repl-prompt-face ((,class (:foreground ,cyan-alt-other + `(indium-repl-stdout-face ((,class (:foreground ,fg-main info `(Info-quoted ((,class (:foreground ,magenta ; the capitalisation is canonical `(info-header-node ((,class (:foreground ,fg-special-warm
[elpa] externals/modus-operandi-theme f4233e6 38/54: Minor refinements to JOURNALCTL-MODE
branch: externals/modus-operandi-theme commit f4233e6efa4b62ad392dd202481762d98f39ecaf Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Minor refinements to JOURNALCTL-MODE These tweaks should make the affected columns easier to tell apart, while also keeping a consistent rhythm. --- modus-operandi-theme.el | 4 ++-- modus-vivendi-theme.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 8947e4e..1dc4f12 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2129,9 +2129,9 @@ Also bind `class' to ((class color) (min-colors 89))." `(journalctl-error-face ((,class (:foreground ,red :weight bold `(journalctl-finished-face ((,class (:foreground ,green :weight bold `(journalctl-host-face ((,class (:foreground ,blue - `(journalctl-process-face ((,class (:foreground ,cyan + `(journalctl-process-face ((,class (:foreground ,cyan-alt-other `(journalctl-starting-face ((,class (:foreground ,green - `(journalctl-timestamp-face ((,class (:foreground ,fg-alt + `(journalctl-timestamp-face ((,class (:foreground ,fg-special-cold `(journalctl-warning-face ((,class (:foreground ,yellow :weight bold js2-mode `(js2-error ((,class (:foreground ,red diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 19b68c8..b8ddf93 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -2129,9 +2129,9 @@ Also bind `class' to ((class color) (min-colors 89))." `(journalctl-error-face ((,class (:foreground ,red :weight bold `(journalctl-finished-face ((,class (:foreground ,green :weight bold `(journalctl-host-face ((,class (:foreground ,blue - `(journalctl-process-face ((,class (:foreground ,cyan + `(journalctl-process-face ((,class (:foreground ,cyan-alt-other `(journalctl-starting-face ((,class (:foreground ,green - `(journalctl-timestamp-face ((,class (:foreground ,fg-alt + `(journalctl-timestamp-face ((,class (:foreground ,fg-special-cold `(journalctl-warning-face ((,class (:foreground ,yellow :weight bold js2-mode `(js2-error ((,class (:foreground ,red
[elpa] externals/modus-vivendi-theme updated (bcb644b -> c7bf002)
monnier pushed a change to branch externals/modus-vivendi-theme. from bcb644b Merge 'master' into elpa/modus-vivendi-theme adds d6586a4 Refactor mapping of colours to faces. EXPERIMENTAL adds e4714ff Finalise palette implementation and customisation adds 0d9b1d4 Expand README with new customisation methods adds 5bff8ce Add another step in the font scale for headings adds 677116a Make "section headings" customisation `:extend t' adds 4a9bd23 Apply optional highest scale to org-document-title adds 67a677e Fix `org-hide' colour adds feaef70 Refine ORG-MODE faces for mixed font workflows adds 91ce02b Expand README on face customisation adds a044e41 Add support for YASNIPPET adds c72b01c Add support for INDIUM adds 58a9924 Add support for VDIFF adds f76c36a Major review of colours for tabs. Tweak faces. adds a937f90 Modus Vivendi: tweak colour for header lines adds 775c8f9 Clarify the use of the special `bg-tab-bar' colour adds 2ffe984 Clarify docs for scaled headings and their values adds 7c37202 Don't set background in regular ORG modeline clock adds 78a2baf Clarify that Org #+TITLE does not scale in v0.8.1 adds 7a8a7cb Implement minor palette tweaks for Modus Operandi adds a99bec3 Improve README section on font family settings adds 22444f9 Minor refinements to some ERC faces adds ccc6d66 Minor refinements to some RCIRC faces adds 985675e Allow byte compile with `eval-when-compile' adds c05fbab Do not `autoload' defcustom adds ae0e956 Fix regression with byte compilation adds a3d064d Several refinements to the README adds 4b3f6a3 Add tentative support for CIRCE adds 9954f47 Major Review of fly{check,make,spell} for GUI/TUI adds e14182f Tweak `minibuffer-prompt' colour for consistency adds 1faab94 Tweak MAGIT header line key colour adds a9479f3 Add support for MINIMAP adds 0b8a919 Add support for HYPERLIST adds 9b5d56d Add support for EROS adds dbe1c96 Minor tweaks for GNUS summary selected, ticked adds 51660bb Add support for GOLDEN-RATIO-SCROLL-SCREEN adds 3bd7eac Add support for JOURNALCTL-MODE adds 40667a5 Review EROS face (better for longer echo messages) adds f4233e6 Minor refinements to JOURNALCTL-MODE adds 39809b0 Review IMENU-LIST faces (more harmonious combos) adds 4a430b1 Review SELECTRUM faces (due to changes upstream) adds f4b5279 New custom option for intense standard completions adds 6e9c5a2 Modus Vivendi: tweak yellow-refine-{bg,fg} colours adds 3519501 Apply minor update (re-formatting) to docs adds c8b29cc Add support for HIGHLIGHT-INDENTATION adds e42eb37 Add support for missing `helm-comint-*' faces adds 148f73a Add support for missing `helm-eshell-*' faces adds 600e433 Add README note on fontifying Org section heading adds 3c0ab7b Document implicit support for `swift-mode' adds 08ec1bd Link issue 49 in README note about Helm grep face adds 7c67f73 Add support for EL-SEARCH adds 1057ede Add support for NXML-MODE adds 3406e29 Upgrade to version 0.9.0 new d749476 Remove superfluous file new c7bf002 Merge remote-tracking branch 'modus-themes/elpa/modus-vivendi-theme' into externals/modus-vivendi-theme Summary of changes: CHANGELOG.org | 153 README.org | 384 +- modus-vivendi-theme.el | 623 + 3 files changed, 903 insertions(+), 257 deletions(-)
[elpa] externals/modus-operandi-theme 0b8a919 32/54: Add support for HYPERLIST
branch: externals/modus-operandi-theme commit 0b8a919d62c67a68096c61ac8db69f271b247b53 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for HYPERLIST --- README.org | 1 + modus-operandi-theme.el | 11 +++ modus-vivendi-theme.el | 11 +++ 3 files changed, 23 insertions(+) diff --git a/README.org b/README.org index 0c407ad..8913cdf 100644 --- a/README.org +++ b/README.org @@ -726,6 +726,7 @@ the "full support" may not be 100% true… + hl-line-mode + hl-todo + hydra ++ hyperlist + ibuffer + icomplete + icomplete-vertical diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index bb550ad..4801d87 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -175,6 +175,7 @@ ;; hl-line-mode ;; hl-todo ;; hydra +;; hyperlist ;; ibuffer ;; icomplete ;; ido-mode @@ -1990,6 +1991,16 @@ Also bind `class' to ((class color) (min-colors 89))." `(hydra-face-pink ((,class (:foreground ,magenta-alt :weight bold `(hydra-face-red ((,class (:foreground ,red :weight bold `(hydra-face-teal ((,class (:foreground ,cyan :weight bold + hyperlist + `(hyperlist-condition ((,class (:foreground ,green + `(hyperlist-hashtag ((,class (:foreground ,yellow + `(hyperlist-operator ((,class (:foreground ,blue-alt + `(hyperlist-paren ((,class (:foreground ,cyan-alt-other + `(hyperlist-quote ((,class (:foreground ,cyan-alt + `(hyperlist-ref ((,class (:foreground ,magenta-alt-other + `(hyperlist-stars ((,class (:foreground ,fg-alt + `(hyperlist-tag ((,class (:foreground ,red + `(hyperlist-toplevel ((,class (:foreground ,fg-main :weight bold icomplete `(icomplete-first-match ((,class (:foreground ,magenta :weight bold icomplete-vertical diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 11dda06..bb56203 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -175,6 +175,7 @@ ;; hl-line-mode ;; hl-todo ;; hydra +;; hyperlist ;; ibuffer ;; icomplete ;; ido-mode @@ -1990,6 +1991,16 @@ Also bind `class' to ((class color) (min-colors 89))." `(hydra-face-pink ((,class (:foreground ,magenta-alt :weight bold `(hydra-face-red ((,class (:foreground ,red :weight bold `(hydra-face-teal ((,class (:foreground ,cyan :weight bold + hyperlist + `(hyperlist-condition ((,class (:foreground ,green + `(hyperlist-hashtag ((,class (:foreground ,yellow + `(hyperlist-operator ((,class (:foreground ,blue-alt + `(hyperlist-paren ((,class (:foreground ,cyan-alt-other + `(hyperlist-quote ((,class (:foreground ,cyan-alt + `(hyperlist-ref ((,class (:foreground ,magenta-alt-other + `(hyperlist-stars ((,class (:foreground ,fg-alt + `(hyperlist-tag ((,class (:foreground ,red + `(hyperlist-toplevel ((,class (:foreground ,fg-main :weight bold icomplete `(icomplete-first-match ((,class (:foreground ,magenta :weight bold icomplete-vertical
[elpa] externals/modus-operandi-theme e42eb37 45/54: Add support for missing `helm-comint-*' faces
branch: externals/modus-operandi-theme commit e42eb378f12e82ea150438b46f75259b22e7acd7 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for missing `helm-comint-*' faces These are part of the main `helm' package. --- modus-operandi-theme.el | 2 ++ modus-vivendi-theme.el | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index e1a9fe0..c2253bf 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -1898,6 +1898,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(helm-buffer-size ((,class (:foreground ,fg-alt `(helm-candidate-number ((,class (:foreground ,cyan-active `(helm-candidate-number-suspended ((,class (:foreground ,yellow-active + `(helm-comint-prompts-buffer-name ((,class (:foreground ,green-active + `(helm-comint-prompts-promptidx ((,class (:foreground ,cyan-active `(helm-delete-async-message ((,class (:foreground ,magenta-active :weight bold `(helm-eob-line ((,class (:background ,bg-main :foreground ,fg-main `(helm-etags-file ((,class (:foreground ,fg-dim :underline t diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index c8a2d45..8a535b8 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -1898,6 +1898,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(helm-buffer-size ((,class (:foreground ,fg-alt `(helm-candidate-number ((,class (:foreground ,cyan-active `(helm-candidate-number-suspended ((,class (:foreground ,yellow-active + `(helm-comint-prompts-buffer-name ((,class (:foreground ,green-active + `(helm-comint-prompts-promptidx ((,class (:foreground ,cyan-active `(helm-delete-async-message ((,class (:foreground ,magenta-active :weight bold `(helm-eob-line ((,class (:background ,bg-main :foreground ,fg-main `(helm-etags-file ((,class (:foreground ,fg-dim :underline t
[elpa] externals/modus-operandi-theme 600e433 47/54: Add README note on fontifying Org section heading
branch: externals/modus-operandi-theme commit 600e4339423e003ef9e9dfa3e52f162972afafa6 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add README note on fontifying Org section heading --- README.org | 8 1 file changed, 8 insertions(+) diff --git a/README.org b/README.org index 818203e..20daefb 100644 --- a/README.org +++ b/README.org @@ -225,6 +225,14 @@ configured accordingly, such as TODO keywords which gain a box style. The default is to use only a subtle foreground and a bold weight for headings, while no boxes or {under,over}-line effects are present. +Note that the background for sectioned headings will extend to the edge +of the window. To make it cover just the area occupied by the heading's +text, use this: + +#+begin_src emacs-lisp +(setq org-fontify-whole-heading-line nil) +#+end_src + ** Option for scaled headings :PROPERTIES: :CUSTOM_ID: h:db0275ea-11c2-47c9-82a9-10b65d8df0f8
[elpa] externals/modus-operandi-theme 1057ede 51/54: Add support for NXML-MODE
branch: externals/modus-operandi-theme commit 1057edec21883bcffeeda2b544178f151509e4d5 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for NXML-MODE This is a built-in library which would inherit from font-lock. These changes are meant to improve some semantic constructs and to make sure colours are combined better. --- README.org | 1 + modus-operandi-theme.el | 26 ++ modus-vivendi-theme.el | 26 ++ 3 files changed, 53 insertions(+) diff --git a/README.org b/README.org index c261b82..da4f45a 100644 --- a/README.org +++ b/README.org @@ -802,6 +802,7 @@ the "full support" may not be 100% true… + neotree + no-emoji + num3-mode ++ nxml-mode + orderless + org* + org-journal diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 3e7b7ae..6494b4c 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -221,6 +221,7 @@ ;; neotree ;; no-emoji ;; num3-mode +;; nxml-mode ;; orderless ;; org ;; org-journal @@ -2554,6 +2555,31 @@ Also bind `class' to ((class color) (min-colors 89))." `(no-emoji ((,class (:foreground ,cyan num3-mode `(num3-face-even ((,class (:background ,bg-alt :weight bold + nxml-mode + `(nxml-attribute-colon ((,class (:foreground ,fg-main + `(nxml-attribute-local-name ((,class (:foreground ,cyan-alt + `(nxml-attribute-prefix ((,class (:foreground ,cyan-alt-other :weight ,modus-theme-bold + `(nxml-attribute-value ((,class (:foreground ,blue + `(nxml-cdata-section-CDATA ((,class (:foreground ,red-alt :weight ,modus-theme-bold + `(nxml-cdata-section-delimiter ((,class (:foreground ,red-alt + `(nxml-char-ref-delimiter ((,class (:foreground ,green-alt-other + `(nxml-char-ref-number ((,class (:foreground ,green-alt-other :weight ,modus-theme-bold + `(nxml-delimited-data ((,class (:foreground ,fg-special-cold :slant ,modus-theme-slant + `(nxml-delimiter ((,class (:foreground ,fg-dim + `(nxml-element-colon ((,class (:foreground ,fg-main + `(nxml-element-local-name ((,class (:foreground ,magenta + `(nxml-element-prefix ((,class (:foreground ,magenta-alt :weight ,modus-theme-bold + `(nxml-entity-ref-delimiter ((,class (:foreground ,green-alt-other + `(nxml-entity-ref-name ((,class (:foreground ,green-alt-other :weight ,modus-theme-bold + `(nxml-glyph ((,class (:inherit modus-theme-intense-neutral + `(nxml-hash ((,class (:foreground ,blue-alt :weight ,modus-theme-bold + `(nxml-heading ((,class (:weight bold + `(nxml-name ((,class (:foreground ,magenta-alt :weight ,modus-theme-bold + `(nxml-namespace-attribute-colon ((,class (:foreground ,fg-main + `(nxml-namespace-attribute-prefix ((,class (:foreground ,cyan + `(nxml-processing-instruction-target ((,class (:foreground ,magenta-alt-other :weight ,modus-theme-bold + `(nxml-prolog-keyword ((,class (:foreground ,magenta-alt-other :weight ,modus-theme-bold + `(nxml-ref ((,class (:foreground ,green-alt-other :weight ,modus-theme-bold orderless `(orderless-match-face-0 ((,class (,@(modus-operandi-theme-completions blue-alt blue-refine-bg blue-refine-fg) diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index f22fb0d..667b931 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -221,6 +221,7 @@ ;; neotree ;; no-emoji ;; num3-mode +;; nxml-mode ;; orderless ;; org ;; org-journal @@ -2554,6 +2555,31 @@ Also bind `class' to ((class color) (min-colors 89))." `(no-emoji ((,class (:foreground ,cyan num3-mode `(num3-face-even ((,class (:background ,bg-alt :weight bold + nxml-mode + `(nxml-attribute-colon ((,class (:foreground ,fg-main + `(nxml-attribute-local-name ((,class (:foreground ,cyan-alt + `(nxml-attribute-prefix ((,class (:foreground ,cyan-alt-other :weight ,modus-theme-bold + `(nxml-attribute-value ((,class (:foreground ,blue + `(nxml-cdata-section-CDATA ((,class (:foreground ,red-alt :weight ,modus-theme-bold + `(nxml-cdata-section-delimiter ((,class (:foreground ,red-alt + `(nxml-char-ref-delimiter ((,class (:foreground ,green-alt-other + `(nxml-char-ref-number ((,class (:foreground ,green-alt-other :weight ,modus-theme-bold + `(nxml-delimited-data ((,class (:foreground ,fg-special-cold :slant ,modus-theme-slant + `(nxml-delimiter ((,class (:foreground ,fg-dim + `(nxml-element-colon ((,class (:foreground ,fg-main + `(nxml-element-local-name ((,class (:foreground ,magenta + `(nxml-element-prefix ((,class (:foreground ,magenta-alt :weight ,modus-theme-bold + `(nxml-entity-ref-delimiter ((,class (:foreground ,green-alt-other + `(nxml-entity-ref-name ((,class (:foreground ,gr
[elpa] externals/modus-vivendi-theme c7bf002 2/2: Merge remote-tracking branch 'modus-themes/elpa/modus-vivendi-theme' into externals/modus-vivendi-theme
branch: externals/modus-vivendi-theme commit c7bf00204a359df5f02ee7bcecbf0d4bc1a3c4eb Merge: bcb644b d749476 Author: Stefan Monnier Commit: Stefan Monnier Merge remote-tracking branch 'modus-themes/elpa/modus-vivendi-theme' into externals/modus-vivendi-theme --- CHANGELOG.org | 153 README.org | 384 +- modus-vivendi-theme.el | 623 + 3 files changed, 903 insertions(+), 257 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 40ff91f..1514836 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -6,6 +6,159 @@ This document contains the release notes that are included in each tagged commit on https://gitlab.com/protesilaos/modus-themes. The newest release is at the top. +* 0.9.0 + +Modus Operandi and Modus Vivendi version 0.9.0 + +By Protesilaos Stavrou on 2020-06-03 + +This entry records the changes since version 0.8.0 (2020-04-28). The +present release contains about 50 commits, covering a month of active +development. + +All changes are aligned with the primary objective of this project, +which is conformance with the WCAG AAA accessibility standard for colour +contrast. This translates to a minimum contrast ratio of 7:1 between a +given combination of foreground and background colours. The highest +standard of its kind. + +All customisation options that are booleans are off ('nil') by default. +The project's policy is to offer such features on an "opt-in" basis, +while always respecting the principle of least surprise. + +Refer to the README for further information on the exact names of +symbols and the like. + +New customisation options +- + ++ It is now possible to make the faces of Icomplete, Ido, and a few + other related tools such as 'orderless', use coloured backgrounds to + style their feedback. This is the aesthetic already in effect for + Ivy, Helm, and Selectrum. The default is more subtle, in that it uses + just an accented foreground value without any added background. + ++ Advanced users can now override both the exact values of colour + variables, as well as the mapping of properties/variables to faces. + In practice this means that it is possible to completely change parts + of the theme (or the entirety of it for that matter). It also means + that users can simply access the theme's palette for the sake of + correctly passing the appropriate value to some bespoke face of + theirs. + ++ An extra increment for scaled headings is now available. This should + hold the highest value on the scale. Such variables only take effect + when the user opts for the "scaled headings" option. + +Overview of changes +--- + ++ A set of internal reforms were carried through in order to allow the + colour palette to be accessed from user configuration files. This + required a lot of debugging work to make sure the themes compile + properly and performance is not affected. + + - The original idea for this redesign was suggested by Len Trigg in +issue 39: https://gitlab.com/protesilaos/modus-themes/-/issues/39. +Len also provided a real-world implementation of this new option, +which is included in the project's README. + + - André Alexandre Gomes helped figure out the problems caused by the +initial design of this feature. In particular, André identified a +performance penalty as well as errors pertaining to byte +compilation. Everything was eventually resolved. For more see +issue 44: https://gitlab.com/protesilaos/modus-themes/-/issues/44. + ++ Several org-mode faces were reviewed in order to cope well with mixed + font settings. This is about use-cases where the main typeface is + proportionately-spaced, either by default or by some minor mode like + the built-in 'variable-pitch-mode'. The intent of configuring those + faces is to make them always inherit a fixed-pitch (monospace) font + family, in the interest of preserving the alignment of elements. The + idea, suggested code, as well as user feedback were offered by Ben in + issue 40: https://gitlab.com/protesilaos/modus-themes/-/issues/40. + ++ Mixed font settings may have some side-effects depending on user + configurations. This is unavoidable as we cannot control how users + define their fonts. Mark Barton reported one such case, while he was + able to fix it by making use of the suggested typeface definitions. + See issue 42: https://gitlab.com/protesilaos/modus-themes/-/issues/42. + ++ The faces for the 'tab-bar-mode' and 'tab-line-mode' that ship with + Emacs 27 were written anew. Same for those of 'centaur-tabs'. The + ideas for the redesign as well as the overall aesthetic are Ben's, per + issue 41: https://gitlab.com/protesilaos/modus-themes/-/issues/41. + ++ An edge case with Helm's interpretation of colour values for its + ripgrep interface was reported by Manuel Uberti in issue 49: + https:
[elpa] externals/modus-operandi-theme e14182f 29/54: Tweak `minibuffer-prompt' colour for consistency
branch: externals/modus-operandi-theme commit e14182f68b4a0997399ce7b751ce04594820afb3 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Tweak `minibuffer-prompt' colour for consistency --- modus-operandi-theme.el | 2 +- modus-vivendi-theme.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 6bdd3e5..ce86e2f 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -837,7 +837,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(italic ((,class (:foreground ,fg-special-cold :slant italic `(nobreak-hyphen ((,class (:foreground ,fg-escape-char-construct `(nobreak-space ((,class (:foreground ,fg-escape-char-construct :underline t - `(minibuffer-prompt ((,class (:foreground ,cyan-alt + `(minibuffer-prompt ((,class (:foreground ,cyan-alt-other `(mm-command-output ((,class (:foreground ,red-alt-other `(mm-uu-extract ((,class (:background ,bg-dim :foreground ,fg-special-mild `(next-error ((,class (:inherit modus-theme-subtle-red diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 58a59a2..183cd32 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -837,7 +837,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(italic ((,class (:foreground ,fg-special-cold :slant italic `(nobreak-hyphen ((,class (:foreground ,fg-escape-char-construct `(nobreak-space ((,class (:foreground ,fg-escape-char-construct :underline t - `(minibuffer-prompt ((,class (:foreground ,cyan-alt + `(minibuffer-prompt ((,class (:foreground ,cyan-alt-other `(mm-command-output ((,class (:foreground ,red-alt-other `(mm-uu-extract ((,class (:background ,bg-dim :foreground ,fg-special-mild `(next-error ((,class (:inherit modus-theme-subtle-red
[elpa] externals/modus-operandi-theme 985675e 21/54: Allow byte compile with `eval-when-compile'
branch: externals/modus-operandi-theme commit 985675e625e8146bbaf02f58c552c31e8730e954 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Allow byte compile with `eval-when-compile' This is an attempt to address the underlying regression presented in issue 44: https://gitlab.com/protesilaos/modus-themes/-/issues/44 --- modus-operandi-theme.el | 367 modus-vivendi-theme.el | 367 2 files changed, 364 insertions(+), 370 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 674eaab..696ba0e 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -552,206 +552,207 @@ AMOUNT is a customisation option." ;; The design of the colour palette and of the macro that maps it to ;; faces is copied from zenbern-theme.el from commit 7dd7968: ;; https://github.com/bbatsov/zenburn-emacs -(defvar modus-operandi-theme-default-colors-alist - '(;; base values -("bg-main" . "#ff") ("fg-main" . "#00") -("bg-alt" . "#f0f0f0") ("fg-alt" . "#505050") -("bg-dim" . "#f8f8f8") ("fg-dim" . "#282828") -;; specifically for on/off states (e.g. `mode-line') -;; -;; must be combined with themselves -("bg-active" . "#e0e0e0") ("fg-active" . "#191919") -("bg-inactive" . "#efedef") ("fg-inactive" . "#424242") -;; special base values, used only for cases where the above -;; fg-* or bg-* cannot or should not be used (to avoid confusion) -;; must be combined with: {fg,bg}-{main,alt,dim} -("bg-special-cold" . "#dde3f4") ("fg-special-cold" . "#093060") -("bg-special-mild" . "#c4ede0") ("fg-special-mild" . "#184034") -("bg-special-warm" . "#f0e0d4") ("fg-special-warm" . "#5d3026") -("bg-special-calm" . "#f8ddea") ("fg-special-calm" . "#61284f") -;; styles for the main constructs -;; -;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red" . "#a6") ("green" . "#005e00") -("yellow" . "#813e00") ("blue" . "#0030a6") -("magenta" . "#721045") ("cyan" . "#00538b") -;; styles for common, but still specialised constructs -;; -;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-alt" . "#972500") ("green-alt" . "#315b00") -("yellow-alt" . "#70480f") ("blue-alt" . "#223fbf") -("magenta-alt" . "#8f0075") ("cyan-alt" . "#30517f") -;; same purpose as above, just slight differences -;; -;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-alt-other" . "#a0132f") ("green-alt-other" . "#145c33") -("yellow-alt-other" . "#863927") ("blue-alt-other" . "#bb") -("magenta-alt-other" . "#5317ac") ("cyan-alt-other" . "#005a5f") -;; styles for elements that should be very subtle -;; -;; must be combined with: `bg-main', `bg-alt', `bg-dim' -("red-nuanced" . "#4d0006") ("green-nuanced" . "#003000") -("yellow-nuanced" . "#3a2a00") ("blue-nuanced" . "#001170") -("magenta-nuanced" . "#381050") ("cyan-nuanced" . "#003434") -;; styles for slightly accented background -;; -;; must be combined with any of the above foreground values -("red-nuanced-bg" . "#fef2f2") ("green-nuanced-bg" . "#f4faf4") -("yellow-nuanced-bg" . "#fcf6f1") ("blue-nuanced-bg" . "#f4f4ff") -("magenta-nuanced-bg" . "#fff4fc") ("cyan-nuanced-bg" . "#f0f6fa") -;; styles for elements that should draw attention to themselves -;; -;; must be combined with: `bg-main' -("red-intense" . "#b6") ("green-intense" . "#006800") -("yellow-intense" . "#904200") ("blue-intense" . "#ee") -("magenta-intense" . "#7000e0") ("cyan-intense" . "#205b93") -;; styles for background elements that should be visible yet -;; subtle -;; -;; must be combined with: `fg-dim' -("red-subtle-bg" . "#f2b0a2") ("green-subtle-bg" . "#aecf90") -("yellow-subtle-bg" . "#e4c340") ("blue-subtle-bg" . "#b5d0ff") -("magenta-subtle-bg" . "#f0d3ff") ("cyan-subtle-bg" . "#c0efff") -;; styles for background elements that should be visible and -;; distinguishable -;; -;; must be combined with: `fg-main' -("red-intense-bg" . "#ff8892") ("green-intense-bg" . "#5ada88") -("yellow-intense-bg" . "#f5df23") ("blue-intense-bg" . "#6aaeff") -("magenta-intense-bg" . "#d5baff") ("cyan-intense-bg" . "#42cbd4") -;; styles for refined contexts where both the foreground and the -;; background need to have the same/similar hue -;; -;; must be combined with themselves OR the foregrounds can be -;; combined with any of the base backgrounds -("red-refine-bg" . "#ff") ("red-refine-fg" . "#78") -("green-refine-bg" . "#aceaac") ("green-refine-fg" . "#004c00") -("yellow-refine-bg" . "#fff29a") ("yellow-refine-fg" . "#604000") -("blue-refine-bg" . "#8ac7ff") ("blue-refine-fg" . "#002288") -("magenta-refine-bg" . "#ffccff") ("magenta-refine-fg" . "#770077") -(
[elpa] externals/modus-operandi-theme dbe1c96 34/54: Minor tweaks for GNUS summary selected, ticked
branch: externals/modus-operandi-theme commit dbe1c9678de27d18e3999aee59fe7b504e85999b Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Minor tweaks for GNUS summary selected, ticked --- modus-operandi-theme.el | 6 +++--- modus-vivendi-theme.el | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index e89aad3..018be99 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -1840,7 +1840,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(gnus-summary-cancelled ((,class (:background ,bg-mark-other :foreground ,fg-mark-other :weight bold `(gnus-summary-high-ancient ((,class (:foreground ,fg-alt :weight bold `(gnus-summary-high-read ((,class (:foreground ,fg-special-cold :weight bold - `(gnus-summary-high-ticked ((,class (:foreground ,red-alt :weight bold + `(gnus-summary-high-ticked ((,class (:foreground ,red-alt-other :weight bold `(gnus-summary-high-undownloaded ((,class (:foreground ,yellow :weight bold `(gnus-summary-high-unread ((,class (:foreground ,fg-main :weight bold `(gnus-summary-low-ancient ((,class (:foreground ,fg-alt :slant italic @@ -1850,10 +1850,10 @@ Also bind `class' to ((class color) (min-colors 89))." `(gnus-summary-low-unread ((,class (:foreground ,fg-special-cold :weight bold `(gnus-summary-normal-ancient ((,class (:foreground ,fg-special-calm `(gnus-summary-normal-read ((,class (:foreground ,fg-special-cold - `(gnus-summary-normal-ticked ((,class (:foreground ,red-alt + `(gnus-summary-normal-ticked ((,class (:foreground ,red-alt-other `(gnus-summary-normal-undownloaded ((,class (:foreground ,yellow `(gnus-summary-normal-unread ((,class (:foreground ,fg-main - `(gnus-summary-selected ((,class (:inherit modus-theme-subtle-cyan + `(gnus-summary-selected ((,class (:inherit modus-theme-subtle-blue helm `(helm-M-x-key ((,class (:foreground ,magenta-alt-other :weight bold `(helm-action ((,class (:underline t diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 7b8f9fb..accfe4c 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -1840,7 +1840,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(gnus-summary-cancelled ((,class (:background ,bg-mark-other :foreground ,fg-mark-other :weight bold `(gnus-summary-high-ancient ((,class (:foreground ,fg-alt :weight bold `(gnus-summary-high-read ((,class (:foreground ,fg-special-cold :weight bold - `(gnus-summary-high-ticked ((,class (:foreground ,red-alt :weight bold + `(gnus-summary-high-ticked ((,class (:foreground ,red-alt-other :weight bold `(gnus-summary-high-undownloaded ((,class (:foreground ,yellow :weight bold `(gnus-summary-high-unread ((,class (:foreground ,fg-main :weight bold `(gnus-summary-low-ancient ((,class (:foreground ,fg-alt :slant italic @@ -1850,10 +1850,10 @@ Also bind `class' to ((class color) (min-colors 89))." `(gnus-summary-low-unread ((,class (:foreground ,fg-special-cold :weight bold `(gnus-summary-normal-ancient ((,class (:foreground ,fg-special-calm `(gnus-summary-normal-read ((,class (:foreground ,fg-special-cold - `(gnus-summary-normal-ticked ((,class (:foreground ,red-alt + `(gnus-summary-normal-ticked ((,class (:foreground ,red-alt-other `(gnus-summary-normal-undownloaded ((,class (:foreground ,yellow `(gnus-summary-normal-unread ((,class (:foreground ,fg-main - `(gnus-summary-selected ((,class (:inherit modus-theme-subtle-cyan + `(gnus-summary-selected ((,class (:inherit modus-theme-subtle-blue helm `(helm-M-x-key ((,class (:foreground ,magenta-alt-other :weight bold `(helm-action ((,class (:underline t
[elpa] externals/modus-operandi-theme 7c67f73 50/54: Add support for EL-SEARCH
branch: externals/modus-operandi-theme commit 7c67f73d6fda88646eb80bc2d2d786cba762ec04 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for EL-SEARCH --- README.org | 1 + modus-operandi-theme.el | 6 ++ modus-vivendi-theme.el | 6 ++ 3 files changed, 13 insertions(+) diff --git a/README.org b/README.org index 6d1b7e2..c261b82 100644 --- a/README.org +++ b/README.org @@ -704,6 +704,7 @@ the "full support" may not be 100% true… + ebdb + ediff + eglot ++ el-search + eldoc-box + elfeed + elfeed-score diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index b41b471..3e7b7ae 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -124,6 +124,7 @@ ;; ebdb ;; ediff ;; eglot +;; el-search ;; eldoc-box ;; elfeed ;; elfeed-score @@ -1478,6 +1479,11 @@ Also bind `class' to ((class color) (min-colors 89))." `(ediff-odd-diff-C ((,class (:background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1 eglot `(eglot-mode-line ((,class (:foreground ,magenta-active :weight ,modus-theme-bold + el-search + `(el-search-highlight-in-prompt-face ((,class (:foreground ,magenta-alt :weight bold + `(el-search-match ((,class (:inherit modus-theme-intense-green + `(el-search-other-match ((,class (:inherit modus-theme-special-mild + `(el-search-occur-match ((,class (:inherit modus-theme-special-calm eldoc-box `(eldoc-box-body ((,class (:background ,bg-alt :foreground ,fg-main `(eldoc-box-border ((,class (:background ,fg-alt diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index cb36142..f22fb0d 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -124,6 +124,7 @@ ;; ebdb ;; ediff ;; eglot +;; el-search ;; eldoc-box ;; elfeed ;; elfeed-score @@ -1478,6 +1479,11 @@ Also bind `class' to ((class color) (min-colors 89))." `(ediff-odd-diff-C ((,class (:background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1 eglot `(eglot-mode-line ((,class (:foreground ,magenta-active :weight ,modus-theme-bold + el-search + `(el-search-highlight-in-prompt-face ((,class (:foreground ,magenta-alt :weight bold + `(el-search-match ((,class (:inherit modus-theme-intense-green + `(el-search-other-match ((,class (:inherit modus-theme-special-mild + `(el-search-occur-match ((,class (:inherit modus-theme-special-calm eldoc-box `(eldoc-box-body ((,class (:background ,bg-alt :foreground ,fg-main `(eldoc-box-border ((,class (:background ,fg-alt
[elpa] externals/modus-operandi-theme 7c37202 17/54: Don't set background in regular ORG modeline clock
branch: externals/modus-operandi-theme commit 7c37202e84e9000c754d460538bbdff9294177a7 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Don't set background in regular ORG modeline clock This fixes a mistake of mine. The use of `bg-main' in the modeline meant that the clock's area would look the same as that of the buffer. Whereas now it will inherit the modeline's background (bg-active or bg-inactive). While the use of `fg-main' (pure black/white depending on the theme) ensures that the clock has a text colour that is more intense than the ordinary text on the modeline (though without having any accent that would draw too much attention to it). --- modus-operandi-theme.el | 2 +- modus-vivendi-theme.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 003737f..10b39cd 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2583,7 +2583,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(org-list-dt ((,class (:weight bold `(org-macro ((,class (:inherit org-latex-and-related `(org-meta-line ((,class (:inherit fixed-pitch :foreground ,fg-alt :slant ,modus-theme-slant - `(org-mode-line-clock ((,class (:background ,bg-main :foreground ,fg-main + `(org-mode-line-clock ((,class (:foreground ,fg-main `(org-mode-line-clock-overrun ((,class (:inherit modus-theme-active-red `(org-priority ((,class (,@(modus-operandi-theme-org-todo-block blue-nuanced-bg blue-nuanced magenta) ,@(modus-operandi-theme-heading-foreground magenta blue-alt) diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 169db5a..5b69d62 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -2583,7 +2583,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(org-list-dt ((,class (:weight bold `(org-macro ((,class (:inherit org-latex-and-related `(org-meta-line ((,class (:inherit fixed-pitch :foreground ,fg-alt :slant ,modus-theme-slant - `(org-mode-line-clock ((,class (:background ,bg-main :foreground ,fg-main + `(org-mode-line-clock ((,class (:foreground ,fg-main `(org-mode-line-clock-overrun ((,class (:inherit modus-theme-active-red `(org-priority ((,class (,@(modus-vivendi-theme-org-todo-block blue-nuanced-bg blue-nuanced magenta) ,@(modus-vivendi-theme-heading-foreground magenta blue-alt)
[elpa] externals/modus-operandi-theme 3519501 43/54: Apply minor update (re-formatting) to docs
branch: externals/modus-operandi-theme commit 3519501369fddfa55771f93c449889594164c220 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Apply minor update (re-formatting) to docs --- README.org | 1 + modus-operandi-theme.el | 30 ++ modus-vivendi-theme.el | 30 ++ 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/README.org b/README.org index 7d68c84..c231495 100644 --- a/README.org +++ b/README.org @@ -419,6 +419,7 @@ being available. modus-operandi-theme-visible-fringes t modus-operandi-theme-3d-modeline t modus-operandi-theme-subtle-diffs t +modus-operandi-theme-intense-standard-completions t modus-operandi-theme-distinct-org-blocks t modus-operandi-theme-proportional-fonts t modus-operandi-theme-rainbow-headings t diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index d794a24..6b0b1fa 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -485,8 +485,7 @@ For more on the matter, read the documentation of ;; above customisation options. (defun modus-operandi-theme-heading-foreground (subtle rainbow) "Apply foreground value to headings. -SUBTLE is the default aesthetic. -RAINBOW is the saturated one." +SUBTLE is the default aesthetic. RAINBOW is the saturated one." (if modus-operandi-theme-rainbow-headings (list :foreground rainbow) (list :foreground subtle))) @@ -502,9 +501,8 @@ Apply BG to background and FG to overline." (defun modus-operandi-theme-org-todo-block (bgbox fgbox fg) "Conditionally extend the styles of Org keywords. -BGBOX applies to the background. -FGBOX applies to the foreground and the border. -FG is used when no block style is in effect." +BGBOX applies to the background. FGBOX applies to the foreground +and the border. FG is used when no block style is in effect." (if modus-operandi-theme-section-headings (list :background bgbox :foreground fgbox :box (list :color fgbox)) (list :foreground fg))) @@ -519,10 +517,10 @@ blocks the same background as the rest of the buffer." (defun modus-operandi-theme-modeline-box (col3d col &optional btn int) "Control the box properties of the mode line. -COL3D is the border that is intended for the three-dimensional modeline. -COL applies to the two-dimensional modeline. -Optional BTN provides the 3d button style. -Optional INT defines a border width." +COL3D is the border that is intended for the three-dimensional +modeline. COL applies to the two-dimensional modeline. Optional +BTN provides the 3d button style. Optional INT defines a border +width." (let* ((style (if btn 'released-button nil)) (int (if int int 1))) (if modus-operandi-theme-3d-modeline @@ -531,9 +529,9 @@ Optional INT defines a border width." (defun modus-operandi-theme-modeline-props (bg3d fg3d &optional bg fg) "Control the background and foreground of the mode line. -BG is the modeline's background. -FG is the modeline's foreground. -BG3D and FG3D apply to the three-dimensional modeline style." +BG is the modeline's background. FG is the modeline's +foreground. BG3D and FG3D apply to the three-dimensional +modeline style." (if modus-operandi-theme-3d-modeline (list :background bg3d :foreground fg3d) (list :background bg :foreground fg))) @@ -541,10 +539,10 @@ BG3D and FG3D apply to the three-dimensional modeline style." (defun modus-operandi-theme-diffs (subtle-bg subtle-fg intense-bg intense-fg) "Colour combinations for `modus-operandi-theme-subtle-diffs'. -SUBTLE-BG should be similar or the same as the main background -SUBTLE-FG should be an appropriate accent value -INTENSE-BG should be one of the dedicated backgrounds for diffs -INTENSE-FG should be one of the dedicated foregrounds for diffs" +SUBTLE-BG should be similar or the same as the main background. +SUBTLE-FG should be an appropriate accent value. INTENSE-BG +should be one of the dedicated backgrounds for diffs. INTENSE-FG +should be one of the dedicated foregrounds for diffs" (if modus-operandi-theme-subtle-diffs (list :background subtle-bg :foreground subtle-fg) (list :background intense-bg :foreground intense-fg))) diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 2d0e12e..47f8fd5 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -485,8 +485,7 @@ For more on the matter, read the documentation of ;; above customisation options. (defun modus-vivendi-theme-heading-foreground (subtle rainbow) "Apply foreground value to headings. -SUBTLE is the default aesthetic. -RAINBOW is the saturated one." +SUBTLE is the default aesthetic. RAINBOW is the saturated one." (if modus-vivendi-theme-rainbow-headings (list :foreground rainbow) (list :foreground subtle))) @@ -502,9 +501,8 @@ Apply BG to background and FG to overline." (defun modus-vivendi-theme-org-todo-block (b
[elpa] externals/modus-operandi-theme 4a430b1 40/54: Review SELECTRUM faces (due to changes upstream)
branch: externals/modus-operandi-theme commit 4a430b1a4dc6fbfb254afe30fc134f2c8521 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Review SELECTRUM faces (due to changes upstream) Selectrum will place the *-highlight over selectrum-current-candidate, so we can no longer use just a foreground value for the former as it leads to inaccessible colour combinations. A background+foreground combination is needed instead. To that end, the mapping of colours is also changed to better match the aesthetics of this tool. --- modus-operandi-theme.el | 6 +++--- modus-vivendi-theme.el | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index dc9a5c7..9144152 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2896,9 +2896,9 @@ Also bind `class' to ((class color) (min-colors 89))." ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4) `(sallet-substring-match ((,class (:inherit modus-theme-refine-blue selectrum - `(selectrum-current-candidate ((,class (:inherit modus-theme-intense-cyan - `(selectrum-primary-highlight ((,class (:foreground ,magenta-alt :weight bold - `(selectrum-secondary-highlight ((,class (:foreground ,blue-alt-other :weight bold + `(selectrum-current-candidate ((,class (:inherit modus-theme-intense-magenta + `(selectrum-primary-highlight ((,class (:inherit modus-theme-refine-blue :weight bold + `(selectrum-secondary-highlight ((,class (:inherit modus-theme-refine-cyan :weight bold sesman `(sesman-browser-button-face ((,class (:foreground ,blue-alt-other :underline t `(sesman-browser-highligh-face ((,class (:inherit modus-theme-subtle-blue diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index bf64d53..eae1207 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -2896,9 +2896,9 @@ Also bind `class' to ((class color) (min-colors 89))." ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4) `(sallet-substring-match ((,class (:inherit modus-theme-refine-blue selectrum - `(selectrum-current-candidate ((,class (:inherit modus-theme-intense-cyan - `(selectrum-primary-highlight ((,class (:foreground ,magenta-alt :weight bold - `(selectrum-secondary-highlight ((,class (:foreground ,blue-alt-other :weight bold + `(selectrum-current-candidate ((,class (:inherit modus-theme-intense-magenta + `(selectrum-primary-highlight ((,class (:inherit modus-theme-refine-blue :weight bold + `(selectrum-secondary-highlight ((,class (:inherit modus-theme-refine-cyan :weight bold sesman `(sesman-browser-button-face ((,class (:foreground ,blue-alt-other :underline t `(sesman-browser-highligh-face ((,class (:inherit modus-theme-subtle-blue
[elpa] externals/modus-operandi-theme f76c36a 13/54: Major review of colours for tabs. Tweak faces.
branch: externals/modus-operandi-theme commit f76c36a071c32032b135b59d6878e63fd63ed802 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Major review of colours for tabs. Tweak faces. The palette intended for tabbed interfaces has been designed anew. It was essential to make these colours work in a broad range of scenaria, such as by accounting for their style relative to a buffer's header line or their foreground compared to that of a buffer. The face groups for tab-bar and tab-line (Emacs 27) have been reviewed to make better use of the new colours. The centaur-tabs faces received some minor tweaks as well (in the interest of consistency). The present commit incorporates the feedback I received in issue 41: https://gitlab.com/protesilaos/modus-themes/-/issues/41 --- modus-operandi-theme.el | 34 +- modus-vivendi-theme.el | 34 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 99b987e..97e597a 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -643,9 +643,10 @@ AMOUNT is a customisation option." ("bg-paren-match" . "#efcabf") ("bg-region" . "#bcbcbc") -("bg-tab-active" . "#ababab") -("bg-tab-inactive" . "#dadada") -("fg-tab-active" . "#77") +("bg-tab-bar" . "#d5d5d5") +("bg-tab-active" . "#f6f6f6") +("bg-tab-inactive" . "#bdbdbd") +("fg-tab-active" . "#30169e") ("fg-escape-char-construct" . "#8b1030") ("fg-escape-char-backslash" . "#644f00") @@ -993,13 +994,13 @@ Also bind `class' to ((class color) (min-colors 89))." `(cfw:face-toolbar-button-on ((,class (:background ,bg-main :foreground ,blue-intense :weight bold centaur-tabs `(centaur-tabs-active-bar-face ((,class (:background ,fg-tab-active - `(centaur-tabs-close-mouse-face ((,class (:underline t + `(centaur-tabs-close-mouse-face ((,class (:foreground ,red-active :weight bold :underline t `(centaur-tabs-close-selected ((,class (:inherit centaur-tabs-selected `(centaur-tabs-close-unselected ((,class (:inherit centaur-tabs-unselected `(centaur-tabs-modified-marker-selected ((,class (:inherit centaur-tabs-selected `(centaur-tabs-modified-marker-unselected ((,class (:inherit centaur-tabs-unselected `(centaur-tabs-default ((,class (:background ,bg-main :foreground ,bg-main - `(centaur-tabs-selected ((,class (:background ,bg-tab-active :foreground ,fg-main + `(centaur-tabs-selected ((,class (:background ,bg-tab-active :foreground ,fg-main :weight bold `(centaur-tabs-selected-modified ((,class (:background ,bg-tab-active :foreground ,fg-main :slant italic `(centaur-tabs-unselected ((,class (:background ,bg-tab-inactive :foreground ,fg-dim `(centaur-tabs-unselected-modified ((,class (:background ,bg-tab-inactive :foreground ,fg-dim :slant italic @@ -3290,20 +3291,19 @@ Also bind `class' to ((class color) (min-colors 89))." (custom-theme-set-faces 'modus-operandi tab-bar-mode - `(tab-bar ((,class (:background ,bg-alt :foreground ,fg-alt - `(tab-bar-tab ((,class (:box (:line-width 1 :color ,fg-window-divider-inner) - :background ,bg-tab-active :foreground ,fg-main - `(tab-bar-tab-inactive ((,class (:box (:line-width 1 :color ,bg-tab-active) + `(tab-bar ((,class (:background ,bg-tab-bar :foreground ,fg-main + `(tab-bar-tab ((,class (:box (:line-width 2 :color ,bg-tab-active) + :background ,bg-tab-active :foreground ,fg-main :weight bold + `(tab-bar-tab-inactive ((,class (:box (:line-width 2 :color ,bg-tab-inactive) :background ,bg-tab-inactive :foreground ,fg-dim tab-line-mode - `(tab-line ((,class (:height 0.95 :background ,bg-active :foreground ,fg-active - `(tab-line-close-highlight ((,class (:foreground ,red-active - `(tab-line-highlight ((,class (:background ,bg-tab-active :foreground ,fg-main - `(tab-line-tab ((,class (:box (:line-width 1 :color ,fg-window-divider-inner) -:background ,bg-tab-active :foreground ,fg-main - `(tab-line-tab-current ((,class (:box (:line-width 1 :color ,fg-window-divider-inner) -:background ,bg-tab-active :foreground ,fg-main - `(tab-line-tab-inactive ((,class (:box (:line-width 1 :color ,bg-tab-active) + `(tab-line ((,class (:height 0.95 :background ,bg-tab-bar :foreground ,fg-main + `(tab-line-close-highlight ((,class (:foreground ,red + `(tab-line-highlight ((,class (:background ,blue-subtle-bg :foreground ,fg-dim + `(tab-line-tab ((,class (:box (:line-width 2
[elpa] externals/modus-operandi-theme a9479f3 31/54: Add support for MINIMAP
branch: externals/modus-operandi-theme commit a9479f3a5e82ae892ae054aa4d271ddca5d416ba Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for MINIMAP --- README.org | 1 + modus-operandi-theme.el | 4 modus-vivendi-theme.el | 4 3 files changed, 9 insertions(+) diff --git a/README.org b/README.org index c06ed6e..0c407ad 100644 --- a/README.org +++ b/README.org @@ -757,6 +757,7 @@ the "full support" may not be 100% true… + markup-faces (=adoc-mode=) + mentor + messages ++ minimap + modeline + mood-line + mu4e diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 8706cbd..bb550ad 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -205,6 +205,7 @@ ;; markup-faces (`adoc-mode') ;; mentor ;; messages +;; minimap ;; modeline ;; mood-line ;; mu4e @@ -2388,6 +2389,9 @@ Also bind `class' to ((class color) (min-colors 89))." `(message-header-xheader ((,class (:foreground ,blue-alt-other `(message-mml ((,class (:foreground ,green-alt-other `(message-separator ((,class (:background ,bg-alt :foreground ,fg-special-warm + minimap + `(minimap-active-region-background ((,class (:background ,bg-active + `(minimap-current-line-face ((,class (:background ,cyan-intense-bg :foreground ,fg-main modeline `(mode-line ((,class (:box ,(modus-operandi-theme-modeline-box bg-inactive fg-inactive t) ,@(modus-operandi-theme-modeline-props diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index bdc8571..11dda06 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -205,6 +205,7 @@ ;; markup-faces (`adoc-mode') ;; mentor ;; messages +;; minimap ;; modeline ;; mood-line ;; mu4e @@ -2388,6 +2389,9 @@ Also bind `class' to ((class color) (min-colors 89))." `(message-header-xheader ((,class (:foreground ,blue-alt-other `(message-mml ((,class (:foreground ,green-alt-other `(message-separator ((,class (:background ,bg-alt :foreground ,fg-special-warm + minimap + `(minimap-active-region-background ((,class (:background ,bg-active + `(minimap-current-line-face ((,class (:background ,cyan-intense-bg :foreground ,fg-main modeline `(mode-line ((,class (:box ,(modus-vivendi-theme-modeline-box bg-inactive fg-inactive t) ,@(modus-vivendi-theme-modeline-props
[elpa] externals/modus-operandi-theme 6e9c5a2 42/54: Modus Vivendi: tweak yellow-refine-{bg, fg} colours
branch: externals/modus-operandi-theme commit 6e9c5a29b5e75cefecd3f5c1dbb58bc48657 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Modus Vivendi: tweak yellow-refine-{bg,fg} colours This is to ensure more consistent contrast ratios with the rest of the palette. Basically "yellow refine" should not pop out significantly more than its peers. --- modus-vivendi-theme.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 5117efd..2d0e12e 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -649,7 +649,7 @@ AMOUNT is a customisation option." ;; combined with any of the base backgrounds ("red-refine-bg" . "#77002a") ("red-refine-fg" . "#ffb9ab") ("green-refine-bg" . "#00422a") ("green-refine-fg" . "#9ff0cf") - ("yellow-refine-bg" . "#705000") ("yellow-refine-fg" . "#ac") + ("yellow-refine-bg" . "#693200") ("yellow-refine-fg" . "#e2d980") ("blue-refine-bg" . "#242679") ("blue-refine-fg" . "#8ec6ff") ("magenta-refine-bg" . "#71206a") ("magenta-refine-fg" . "#ffcaf0") ("cyan-refine-bg" . "#004065") ("cyan-refine-fg" . "#8ae4f2")
[elpa] externals/modus-operandi-theme 51660bb 35/54: Add support for GOLDEN-RATIO-SCROLL-SCREEN
branch: externals/modus-operandi-theme commit 51660bb183b0400c67612bb9ff7fd4622e6979b0 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for GOLDEN-RATIO-SCROLL-SCREEN --- README.org | 1 + modus-operandi-theme.el | 3 +++ modus-vivendi-theme.el | 3 +++ 3 files changed, 7 insertions(+) diff --git a/README.org b/README.org index b58b1f2..a08f011 100644 --- a/README.org +++ b/README.org @@ -712,6 +712,7 @@ the "full support" may not be 100% true… + git-timemachine + git-walktree + gnus ++ golden-ratio-scroll-screen + helm* (also see [[#h:e4408911-e186-4825-bd4f-4d0ea55cd6d6][section below on Helm's grep-related functions]]) + helm-ls-git + helm-switch-shell diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 018be99..4f8235b 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -161,6 +161,7 @@ ;; git-timemachine ;; git-walktree ;; gnus +;; golden-ratio-scroll-screen ;; helm ;; helm-ls-git ;; helm-switch-shell @@ -1854,6 +1855,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(gnus-summary-normal-undownloaded ((,class (:foreground ,yellow `(gnus-summary-normal-unread ((,class (:foreground ,fg-main `(gnus-summary-selected ((,class (:inherit modus-theme-subtle-blue + golden-ratio-scroll-screen + `(golden-ratio-scroll-highlight-line-face ((,class (:background ,cyan-subtle-bg :foreground ,fg-main helm `(helm-M-x-key ((,class (:foreground ,magenta-alt-other :weight bold `(helm-action ((,class (:underline t diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index accfe4c..5b1f246 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -161,6 +161,7 @@ ;; git-timemachine ;; git-walktree ;; gnus +;; golden-ratio-scroll-screen ;; helm ;; helm-ls-git ;; helm-switch-shell @@ -1854,6 +1855,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(gnus-summary-normal-undownloaded ((,class (:foreground ,yellow `(gnus-summary-normal-unread ((,class (:foreground ,fg-main `(gnus-summary-selected ((,class (:inherit modus-theme-subtle-blue + golden-ratio-scroll-screen + `(golden-ratio-scroll-highlight-line-face ((,class (:background ,cyan-subtle-bg :foreground ,fg-main helm `(helm-M-x-key ((,class (:foreground ,magenta-alt-other :weight bold `(helm-action ((,class (:underline t
[elpa] externals/modus-operandi-theme 503a772 54/54: Merge remote-tracking branch 'modus-themes/elpa/modus-operandi-theme' into externals/modus-operandi-theme
branch: externals/modus-operandi-theme commit 503a7726db58dd13cdb9aba4097d4c1f1b93d842 Merge: fc03967 24504f6 Author: Stefan Monnier Commit: Stefan Monnier Merge remote-tracking branch 'modus-themes/elpa/modus-operandi-theme' into externals/modus-operandi-theme --- CHANGELOG.org | 153 README.org | 384 + modus-operandi-theme.el | 623 3 files changed, 903 insertions(+), 257 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 40ff91f..1514836 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -6,6 +6,159 @@ This document contains the release notes that are included in each tagged commit on https://gitlab.com/protesilaos/modus-themes. The newest release is at the top. +* 0.9.0 + +Modus Operandi and Modus Vivendi version 0.9.0 + +By Protesilaos Stavrou on 2020-06-03 + +This entry records the changes since version 0.8.0 (2020-04-28). The +present release contains about 50 commits, covering a month of active +development. + +All changes are aligned with the primary objective of this project, +which is conformance with the WCAG AAA accessibility standard for colour +contrast. This translates to a minimum contrast ratio of 7:1 between a +given combination of foreground and background colours. The highest +standard of its kind. + +All customisation options that are booleans are off ('nil') by default. +The project's policy is to offer such features on an "opt-in" basis, +while always respecting the principle of least surprise. + +Refer to the README for further information on the exact names of +symbols and the like. + +New customisation options +- + ++ It is now possible to make the faces of Icomplete, Ido, and a few + other related tools such as 'orderless', use coloured backgrounds to + style their feedback. This is the aesthetic already in effect for + Ivy, Helm, and Selectrum. The default is more subtle, in that it uses + just an accented foreground value without any added background. + ++ Advanced users can now override both the exact values of colour + variables, as well as the mapping of properties/variables to faces. + In practice this means that it is possible to completely change parts + of the theme (or the entirety of it for that matter). It also means + that users can simply access the theme's palette for the sake of + correctly passing the appropriate value to some bespoke face of + theirs. + ++ An extra increment for scaled headings is now available. This should + hold the highest value on the scale. Such variables only take effect + when the user opts for the "scaled headings" option. + +Overview of changes +--- + ++ A set of internal reforms were carried through in order to allow the + colour palette to be accessed from user configuration files. This + required a lot of debugging work to make sure the themes compile + properly and performance is not affected. + + - The original idea for this redesign was suggested by Len Trigg in +issue 39: https://gitlab.com/protesilaos/modus-themes/-/issues/39. +Len also provided a real-world implementation of this new option, +which is included in the project's README. + + - André Alexandre Gomes helped figure out the problems caused by the +initial design of this feature. In particular, André identified a +performance penalty as well as errors pertaining to byte +compilation. Everything was eventually resolved. For more see +issue 44: https://gitlab.com/protesilaos/modus-themes/-/issues/44. + ++ Several org-mode faces were reviewed in order to cope well with mixed + font settings. This is about use-cases where the main typeface is + proportionately-spaced, either by default or by some minor mode like + the built-in 'variable-pitch-mode'. The intent of configuring those + faces is to make them always inherit a fixed-pitch (monospace) font + family, in the interest of preserving the alignment of elements. The + idea, suggested code, as well as user feedback were offered by Ben in + issue 40: https://gitlab.com/protesilaos/modus-themes/-/issues/40. + ++ Mixed font settings may have some side-effects depending on user + configurations. This is unavoidable as we cannot control how users + define their fonts. Mark Barton reported one such case, while he was + able to fix it by making use of the suggested typeface definitions. + See issue 42: https://gitlab.com/protesilaos/modus-themes/-/issues/42. + ++ The faces for the 'tab-bar-mode' and 'tab-line-mode' that ship with + Emacs 27 were written anew. Same for those of 'centaur-tabs'. The + ideas for the redesign as well as the overall aesthetic are Ben's, per + issue 41: https://gitlab.com/protesilaos/modus-themes/-/issues/41. + ++ An edge case with Helm's interpretation of colour values for its + ripgrep interface was reported by Manuel Uberti in issue 49: + ht
[elpa] externals/modus-operandi-theme 9b5d56d 33/54: Add support for EROS
branch: externals/modus-operandi-theme commit 9b5d56d99943bf50ad89f300b0064b9b8c76d86e Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for EROS --- README.org | 1 + modus-operandi-theme.el | 3 +++ modus-vivendi-theme.el | 3 +++ 3 files changed, 7 insertions(+) diff --git a/README.org b/README.org index 8913cdf..b58b1f2 100644 --- a/README.org +++ b/README.org @@ -682,6 +682,7 @@ the "full support" may not be 100% true… + epa + equake + erc ++ eros + ert + eshell + evil* (evil-mode) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 4801d87..e89aad3 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -131,6 +131,7 @@ ;; epa ;; equake ;; erc +;; eros ;; ert ;; eshell ;; evil (evil-mode) @@ -1533,6 +1534,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(erc-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold `(erc-timestamp-face ((,class (:foreground ,blue-nuanced `(erc-underline-face ((,class (:underline t + eros + `(eros-result-overlay-face ((,class (:inherit modus-theme-refine-blue ert `(ert-test-result-expected ((,class (:inherit modus-theme-intense-green `(ert-test-result-unexpected ((,class (:inherit modus-theme-intense-red diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index bb56203..7b8f9fb 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -131,6 +131,7 @@ ;; epa ;; equake ;; erc +;; eros ;; ert ;; eshell ;; evil (evil-mode) @@ -1533,6 +1534,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(erc-prompt-face ((,class (:foreground ,cyan-alt-other :weight bold `(erc-timestamp-face ((,class (:foreground ,blue-nuanced `(erc-underline-face ((,class (:underline t + eros + `(eros-result-overlay-face ((,class (:inherit modus-theme-refine-blue ert `(ert-test-result-expected ((,class (:inherit modus-theme-intense-green `(ert-test-result-unexpected ((,class (:inherit modus-theme-intense-red
[elpa] externals/modus-operandi-theme 3bd7eac 36/54: Add support for JOURNALCTL-MODE
branch: externals/modus-operandi-theme commit 3bd7eac09dbcfd293549cf4e2138945ba1792a7a Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for JOURNALCTL-MODE This is a new package. It may still need some review. This commit should address issue 47: https://gitlab.com/protesilaos/modus-themes/-/issues/47 --- README.org | 1 + modus-operandi-theme.el | 9 + modus-vivendi-theme.el | 9 + 3 files changed, 19 insertions(+) diff --git a/README.org b/README.org index a08f011..b8cca80 100644 --- a/README.org +++ b/README.org @@ -745,6 +745,7 @@ the "full support" may not be 100% true… + ivy* + ivy-posframe + jira (org-jira) ++ journalctl-mode + js2-mode + julia + jupyter diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 4f8235b..b8effb7 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -193,6 +193,7 @@ ;; ivy ;; ivy-posframe ;; jira (org-jira) +;; journalctl-mode ;; js2-mode ;; julia ;; jupyter @@ -2123,6 +2124,14 @@ Also bind `class' to ((class color) (min-colors 89))." `(jiralib-link-filter-face ((,class (:underline t `(jiralib-link-issue-face ((,class (:underline t `(jiralib-link-project-face ((,class (:underline t + journalctl-mode + `(journalctl-error-face ((,class (:foreground ,red :weight bold + `(journalctl-finished-face ((,class (:foreground ,green :weight bold + `(journalctl-host-face ((,class (:foreground ,blue + `(journalctl-process-face ((,class (:foreground ,cyan + `(journalctl-starting-face ((,class (:foreground ,green + `(journalctl-timestamp-face ((,class (:foreground ,fg-alt + `(journalctl-warning-face ((,class (:foreground ,yellow :weight bold js2-mode `(js2-error ((,class (:foreground ,red `(js2-external-variable ((,class (:foreground ,cyan-alt-other diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 5b1f246..2f1f898 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -193,6 +193,7 @@ ;; ivy ;; ivy-posframe ;; jira (org-jira) +;; journalctl-mode ;; js2-mode ;; julia ;; jupyter @@ -2123,6 +2124,14 @@ Also bind `class' to ((class color) (min-colors 89))." `(jiralib-link-filter-face ((,class (:underline t `(jiralib-link-issue-face ((,class (:underline t `(jiralib-link-project-face ((,class (:underline t + journalctl-mode + `(journalctl-error-face ((,class (:foreground ,red :weight bold + `(journalctl-finished-face ((,class (:foreground ,green :weight bold + `(journalctl-host-face ((,class (:foreground ,blue + `(journalctl-process-face ((,class (:foreground ,cyan + `(journalctl-starting-face ((,class (:foreground ,green + `(journalctl-timestamp-face ((,class (:foreground ,fg-alt + `(journalctl-warning-face ((,class (:foreground ,yellow :weight bold js2-mode `(js2-error ((,class (:foreground ,red `(js2-external-variable ((,class (:foreground ,cyan-alt-other
[elpa] externals/modus-operandi-theme 1faab94 30/54: Tweak MAGIT header line key colour
branch: externals/modus-operandi-theme commit 1faab9421160a0cacb4bbd9fecff9a61651c6ebd Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Tweak MAGIT header line key colour This is visible when, e.g., running a commit fixup (such as with `c F' from the main status area). --- modus-operandi-theme.el | 2 +- modus-vivendi-theme.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index ce86e2f..8706cbd 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2241,7 +2241,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(magit-hash ((,class (:foreground ,fg-special-warm `(magit-head ((,class (:inherit magit-branch-local `(magit-header-line ((,class (:foreground ,cyan-active :weight bold - `(magit-header-line-key ((,class (:foreground ,blue-active :weight bold + `(magit-header-line-key ((,class (:foreground ,red-active :weight bold `(magit-header-line-log-select ((,class (:foreground ,fg-main :weight bold `(magit-keyword ((,class (:foreground ,magenta `(magit-keyword-squash ((,class (:foreground ,yellow-alt-other :weight bold diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 183cd32..bdc8571 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -2241,7 +2241,7 @@ Also bind `class' to ((class color) (min-colors 89))." `(magit-hash ((,class (:foreground ,fg-special-warm `(magit-head ((,class (:inherit magit-branch-local `(magit-header-line ((,class (:foreground ,cyan-active :weight bold - `(magit-header-line-key ((,class (:foreground ,blue-active :weight bold + `(magit-header-line-key ((,class (:foreground ,red-active :weight bold `(magit-header-line-log-select ((,class (:foreground ,fg-main :weight bold `(magit-keyword ((,class (:foreground ,magenta `(magit-keyword-squash ((,class (:foreground ,yellow-alt-other :weight bold
[elpa] externals/modus-operandi-theme ccc6d66 24/54: Minor refinements to some RCIRC faces
branch: externals/modus-operandi-theme commit ccc6d66a25f6316af07ef256221647de2783b318 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Minor refinements to some RCIRC faces --- modus-operandi-theme.el | 6 +++--- modus-vivendi-theme.el | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index dc50f5a..c2f71c6 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -2792,12 +2792,12 @@ Also bind `class' to ((class color) (min-colors 89))." `(rcirc-bright-nick ((,class (:foreground ,magenta-alt :weight bold `(rcirc-dim-nick ((,class (:foreground ,fg-alt `(rcirc-my-nick ((,class (:foreground ,magenta :weight bold - `(rcirc-nick-in-message ((,class (:foreground ,blue + `(rcirc-nick-in-message ((,class (:foreground ,magenta-alt-other `(rcirc-nick-in-message-full-line ((,class (:foreground ,fg-special-mild :weight bold `(rcirc-other-nick ((,class (:foreground ,fg-special-cold :weight bold `(rcirc-prompt ((,class (:foreground ,cyan-alt-other :weight bold - `(rcirc-server ((,class (:foreground ,fg-special-warm - `(rcirc-timestamp ((,class (:foreground ,fg-inactive + `(rcirc-server ((,class (:foreground ,fg-unfocused + `(rcirc-timestamp ((,class (:foreground ,blue-nuanced `(rcirc-url ((,class (:foreground ,blue :underline t regexp-builder (re-builder) `(reb-match-0 ((,class (:inherit modus-theme-intense-blue diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 7456888..a651d70 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -2792,12 +2792,12 @@ Also bind `class' to ((class color) (min-colors 89))." `(rcirc-bright-nick ((,class (:foreground ,magenta-alt :weight bold `(rcirc-dim-nick ((,class (:foreground ,fg-alt `(rcirc-my-nick ((,class (:foreground ,magenta :weight bold - `(rcirc-nick-in-message ((,class (:foreground ,blue + `(rcirc-nick-in-message ((,class (:foreground ,magenta-alt-other `(rcirc-nick-in-message-full-line ((,class (:foreground ,fg-special-mild :weight bold `(rcirc-other-nick ((,class (:foreground ,fg-special-cold :weight bold `(rcirc-prompt ((,class (:foreground ,cyan-alt-other :weight bold - `(rcirc-server ((,class (:foreground ,fg-special-warm - `(rcirc-timestamp ((,class (:foreground ,fg-inactive + `(rcirc-server ((,class (:foreground ,fg-unfocused + `(rcirc-timestamp ((,class (:foreground ,blue-nuanced `(rcirc-url ((,class (:foreground ,blue :underline t regexp-builder (re-builder) `(reb-match-0 ((,class (:inherit modus-theme-intense-blue
[elpa] externals/modus-operandi-theme 3c0ab7b 48/54: Document implicit support for `swift-mode'
branch: externals/modus-operandi-theme commit 3c0ab7bb48b5046c5ffcd2f70eae9edac48331f0 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Document implicit support for `swift-mode' --- README.org | 1 + 1 file changed, 1 insertion(+) diff --git a/README.org b/README.org index 20daefb..b7cbbec 100644 --- a/README.org +++ b/README.org @@ -904,6 +904,7 @@ inherit from some basic faces. Please confirm. + comint + bongo + edit-indirect ++ swift-mode ** Help needed :PROPERTIES:
[elpa] externals/modus-operandi-theme c05fbab 22/54: Do not `autoload' defcustom
branch: externals/modus-operandi-theme commit c05fbabbff88a66ca6226abcc474309b2dff90cc Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Do not `autoload' defcustom --- modus-operandi-theme.el | 1 - modus-vivendi-theme.el | 1 - 2 files changed, 2 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 696ba0e..fdfae37 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -726,7 +726,6 @@ AMOUNT is a customisation option." "The entire palette of `modus-operandi-theme'. Each element has the form (NAME . HEX).") -;;;###autoload (defcustom modus-operandi-theme-override-colors-alist '() "Place to override default theme colors. You can override a subset of the theme's default colors by diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 7c9557e..ab661cb 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -726,7 +726,6 @@ AMOUNT is a customisation option." "The entire palette of `modus-vivendi-theme'. Each element has the form (NAME . HEX).") -;;;###autoload (defcustom modus-vivendi-theme-override-colors-alist '() "Place to override default theme colors. You can override a subset of the theme's default colors by
[elpa] externals/modus-operandi-theme 40667a5 37/54: Review EROS face (better for longer echo messages)
branch: externals/modus-operandi-theme commit 40667a517001a852109e65d92b1d1045a8c08da7 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Review EROS face (better for longer echo messages) The previous design was good for short feedback, such as `t' or `nil', but it did not scale well. This should be an improvement overall. --- modus-operandi-theme.el | 3 ++- modus-vivendi-theme.el | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index b8effb7..8947e4e 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -1537,7 +1537,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(erc-timestamp-face ((,class (:foreground ,blue-nuanced `(erc-underline-face ((,class (:underline t eros - `(eros-result-overlay-face ((,class (:inherit modus-theme-refine-blue + `(eros-result-overlay-face ((,class (:box (:line-width -1 :color ,blue) + :background ,bg-dim :foreground ,fg-dim ert `(ert-test-result-expected ((,class (:inherit modus-theme-intense-green `(ert-test-result-unexpected ((,class (:inherit modus-theme-intense-red diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 2f1f898..19b68c8 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -1537,7 +1537,8 @@ Also bind `class' to ((class color) (min-colors 89))." `(erc-timestamp-face ((,class (:foreground ,blue-nuanced `(erc-underline-face ((,class (:underline t eros - `(eros-result-overlay-face ((,class (:inherit modus-theme-refine-blue + `(eros-result-overlay-face ((,class (:box (:line-width -1 :color ,blue) + :background ,bg-dim :foreground ,fg-dim ert `(ert-test-result-expected ((,class (:inherit modus-theme-intense-green `(ert-test-result-unexpected ((,class (:inherit modus-theme-intense-red
[elpa] externals/modus-operandi-theme 3406e29 52/54: Upgrade to version 0.9.0
branch: externals/modus-operandi-theme commit 3406e29e82a135292200b993dc30f5d45aed26a3 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Upgrade to version 0.9.0 This entry records the changes since version 0.8.0 (2020-04-28). The present release contains about 50 commits, covering a month of active development. All changes are aligned with the primary objective of this project, which is conformance with the WCAG AAA accessibility standard for colour contrast. This translates to a minimum contrast ratio of 7:1 between a given combination of foreground and background colours. The highest standard of its kind. All customisation options that are booleans are off ('nil') by default. The project's policy is to offer such features on an "opt-in" basis, while always respecting the principle of least surprise. Refer to the README for further information on the exact names of symbols and the like. New customisation options - + It is now possible to make the faces of Icomplete, Ido, and a few other related tools such as 'orderless', use coloured backgrounds to style their feedback. This is the aesthetic already in effect for Ivy, Helm, and Selectrum. The default is more subtle, in that it uses just an accented foreground value without any added background. + Advanced users can now override both the exact values of colour variables, as well as the mapping of properties/variables to faces. In practice this means that it is possible to completely change parts of the theme (or the entirety of it for that matter). It also means that users can simply access the theme's palette for the sake of correctly passing the appropriate value to some bespoke face of theirs. + An extra increment for scaled headings is now available. This should hold the highest value on the scale. Such variables only take effect when the user opts for the "scaled headings" option. Overview of changes --- + A set of internal reforms were carried through in order to allow the colour palette to be accessed from user configuration files. This required a lot of debugging work to make sure the themes compile properly and performance is not affected. - The original idea for this redesign was suggested by Len Trigg in issue 39: https://gitlab.com/protesilaos/modus-themes/-/issues/39. Len also provided a real-world implementation of this new option, which is included in the project's README. - André Alexandre Gomes helped figure out the problems caused by the initial design of this feature. In particular, André identified a performance penalty as well as errors pertaining to byte compilation. Everything was eventually resolved. For more see issue 44: https://gitlab.com/protesilaos/modus-themes/-/issues/44. + Several org-mode faces were reviewed in order to cope well with mixed font settings. This is about use-cases where the main typeface is proportionately-spaced, either by default or by some minor mode like the built-in 'variable-pitch-mode'. The intent of configuring those faces is to make them always inherit a fixed-pitch (monospace) font family, in the interest of preserving the alignment of elements. The idea, suggested code, as well as user feedback were offered by Ben in issue 40: https://gitlab.com/protesilaos/modus-themes/-/issues/40. + Mixed font settings may have some side-effects depending on user configurations. This is unavoidable as we cannot control how users define their fonts. Mark Barton reported one such case, while he was able to fix it by making use of the suggested typeface definitions. See issue 42: https://gitlab.com/protesilaos/modus-themes/-/issues/42. + The faces for the 'tab-bar-mode' and 'tab-line-mode' that ship with Emacs 27 were written anew. Same for those of 'centaur-tabs'. The ideas for the redesign as well as the overall aesthetic are Ben's, per issue 41: https://gitlab.com/protesilaos/modus-themes/-/issues/41. + An edge case with Helm's interpretation of colour values for its ripgrep interface was reported by Manuel Uberti in issue 49: https://gitlab.com/protesilaos/modus-themes/-/issues/49. It essentially had to do with the syntax for the regexp engine as read by the underlying 'rg' executable. Collaboration on that front eventually led to fixes in Helm itself, committed by its maintainer. Note that the README for the Modus themes already contains information on how Helm applies a face to the matches of grep or grep-like commands. Issue 49 confirmed what was already known in that regar
[elpa] externals/modus-operandi-theme 08ec1bd 49/54: Link issue 49 in README note about Helm grep face
branch: externals/modus-operandi-theme commit 08ec1bd8e67ceac2b86a877d8054468f0d780c68 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Link issue 49 in README note about Helm grep face https://gitlab.com/protesilaos/modus-themes/-/issues/49 --- README.org | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.org b/README.org index b7cbbec..6d1b7e2 100644 --- a/README.org +++ b/README.org @@ -1029,6 +1029,9 @@ ANSI colour number 1 (red) from the already-supported array of I presented [[https://gitlab.com/protesilaos/modus-themes/-/issues/21#note_302748582][some screen shots of this in issue 21]]. +A similar scenario was [[https://gitlab.com/protesilaos/modus-themes/-/issues/49][also encountered in issue 49]] which was promptly +fixed by the Helm maintainer. + ** Note on VC-ANNOTATE-BACKGROUND-MODE :PROPERTIES: :CUSTOM_ID: h:5b5d4420-50cc-4d53-a9f8-825cba6b68f1
[elpa] externals/modus-operandi-theme c8b29cc 44/54: Add support for HIGHLIGHT-INDENTATION
branch: externals/modus-operandi-theme commit c8b29ccf00bc49a01a9d46a4c5223b007f817877 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add support for HIGHLIGHT-INDENTATION This should address issue 48, though any further refinements are always welcome: https://gitlab.com/protesilaos/modus-themes/-/issues/48 --- README.org | 1 + modus-operandi-theme.el | 4 modus-vivendi-theme.el | 4 3 files changed, 9 insertions(+) diff --git a/README.org b/README.org index c231495..818203e 100644 --- a/README.org +++ b/README.org @@ -743,6 +743,7 @@ the "full support" may not be 100% true… + highlight-blocks + highlight-defined + highlight-escape-sequences (=hes-mode=) ++ highlight-indentation + highlight-numbers + highlight-symbol + highlight-thing diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el index 6b0b1fa..e1a9fe0 100644 --- a/modus-operandi-theme.el +++ b/modus-operandi-theme.el @@ -171,6 +171,7 @@ ;; highlight-blocks ;; highlight-defined ;; highlight-escape-sequences (`hes-mode') +;; highlight-indentation ;; highlight-numbers ;; highlight-symbol ;; highlight-thing @@ -2000,6 +2001,9 @@ Also bind `class' to ((class color) (min-colors 89))." highlight-escape-sequences (`hes-mode') `(hes-escape-backslash-face ((,class (:foreground ,fg-escape-char-construct :weight bold `(hes-escape-sequence-face ((,class (:foreground ,fg-escape-char-backslash :weight bold + highlight-indentation + `(highlight-indentation-face ((,class (:background ,bg-hl-line + `(highlight-indentation-current-column-face ((,class (:background ,bg-active highlight-numbers `(highlight-numbers-number ((,class (:foreground ,blue-alt-other highlight-symbol diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el index 47f8fd5..c8a2d45 100644 --- a/modus-vivendi-theme.el +++ b/modus-vivendi-theme.el @@ -171,6 +171,7 @@ ;; highlight-blocks ;; highlight-defined ;; highlight-escape-sequences (`hes-mode') +;; highlight-indentation ;; highlight-numbers ;; highlight-symbol ;; highlight-thing @@ -2000,6 +2001,9 @@ Also bind `class' to ((class color) (min-colors 89))." highlight-escape-sequences (`hes-mode') `(hes-escape-backslash-face ((,class (:foreground ,fg-escape-char-construct :weight bold `(hes-escape-sequence-face ((,class (:foreground ,fg-escape-char-backslash :weight bold + highlight-indentation + `(highlight-indentation-face ((,class (:background ,bg-hl-line + `(highlight-indentation-current-column-face ((,class (:background ,bg-active highlight-numbers `(highlight-numbers-number ((,class (:foreground ,blue-alt-other highlight-symbol
[elpa] master fced843: In wisi, missed a few files in 3.1.2 release
branch: master commit fced8435670570df42415e76652d2b1cd7fb8f8c Author: Stephen Leake Commit: Stephen Leake In wisi, missed a few files in 3.1.2 release --- packages/wisi/sal-gen_unbounded_definite_vectors.adb | 12 packages/wisi/sal-gen_unbounded_definite_vectors.ads | 8 +--- packages/wisi/sal.adb| 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/wisi/sal-gen_unbounded_definite_vectors.adb b/packages/wisi/sal-gen_unbounded_definite_vectors.adb index faf1b45..9e1c189 100644 --- a/packages/wisi/sal-gen_unbounded_definite_vectors.adb +++ b/packages/wisi/sal-gen_unbounded_definite_vectors.adb @@ -525,8 +525,10 @@ package body SAL.Gen_Unbounded_Definite_Vectors is end Variable_Ref; overriding function First (Object : Iterator) return Cursor - is begin - if Object.Container.Elements = null then + is + use all type Ada.Containers.Count_Type; + begin + if Object.Container.Length = 0 then return (Object.Container, Invalid_Peek_Index); else return (Object.Container, To_Peek_Type (Object.Container.First)); @@ -534,8 +536,10 @@ package body SAL.Gen_Unbounded_Definite_Vectors is end First; overriding function Last (Object : Iterator) return Cursor - is begin - if Object.Container.Elements = null then + is + use all type Ada.Containers.Count_Type; + begin + if Object.Container.Length = 0 then return (Object.Container, Invalid_Peek_Index); else return (Object.Container, To_Peek_Type (Object.Container.Last)); diff --git a/packages/wisi/sal-gen_unbounded_definite_vectors.ads b/packages/wisi/sal-gen_unbounded_definite_vectors.ads index 818a223..29ecae0 100644 --- a/packages/wisi/sal-gen_unbounded_definite_vectors.ads +++ b/packages/wisi/sal-gen_unbounded_definite_vectors.ads @@ -177,10 +177,12 @@ package SAL.Gen_Unbounded_Definite_Vectors is function Iterate (Container : aliased in Vector) return Iterator_Interfaces.Reversible_Iterator'Class; function Constant_Ref (Container : aliased in Vector; Position : in Cursor) return Constant_Reference_Type - with Inline, Pre => Has_Element (Position); + with Pre => Has_Element (Position) and then + To_Index (Position) in Container.First_Index .. Container.Last_Index; function Variable_Ref (Container : aliased in Vector; Position : in Cursor) return Variable_Reference_Type - with Pre => Has_Element (Position); + with Pre => Has_Element (Position) and then + To_Index (Position) in Container.First_Index .. Container.Last_Index; pragma Inline (Variable_Ref); private @@ -194,7 +196,7 @@ private Elements : Array_Access; -- Elements may be non-null with First = No_Index, after -- Set_Capacity. If First /= No_Index and Last >= First, Elements /= - -- null. + -- null. First > Last means Vector is empty. First: Extended_Index := No_Index; Last : Extended_Index := No_Index; end record; diff --git a/packages/wisi/sal.adb b/packages/wisi/sal.adb index 08a2184..6265651 100644 --- a/packages/wisi/sal.adb +++ b/packages/wisi/sal.adb @@ -26,7 +26,7 @@ package body SAL is function Version return String is begin - return "SAL 3.4"; + return "SAL 3.5"; end Version; end SAL;