* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
@ 2020-10-12 6:37 Protesilaos Stavrou
2020-10-16 10:50 ` Stefan Kangas
2020-10-16 17:13 ` Stefan Kangas
0 siblings, 2 replies; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-12 6:37 UTC (permalink / raw)
To: 43944
[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]
Commit c1b0515952 to Emacs 'master' on August 27 added two new themes.
Their version was 0.12.0. A new version is now available, as well as a
texinfo file that documents all their customisation options. Please see
the attached patch.
Now some administrative considerations:
+ The two themes are also available in GNU ELPA. What is the best way
to ensure that we sync between emacs.git and elpa.git? GNU ELPA has
hitherto pulled from dedicated branches on my upstream git repository.
Maybe it would be better/easier to start building directly from the
Emacs source? This would reduce the overall workload.
+ Sending attachments with large diffs has the downside of losing the
commit history. Do Emacs maintainers wish to keep track of it? If
so, what would be the best way to preserve it, seeing as I am
developing them on my own upstream? For context, the Leuven theme,
which is also developed externally, only gets updated in relatively
large increments, such as in commits to Emacs 'master' 99f8a1c917,
b5ccc1beb3, and 95e509140e.
+ Should the texinfo file be mentioned in the NEWS entry about the two
themes? The attached patch does not include such a change.
I am prepared to do whatever the maintainers consider necessary. Thank
you for your time!
Best regards,
Protesilaos
--
Protesilaos Stavrou
protesilaos.com
[-- Attachment #2: 0001-Update-modus-operandi-modus-vivendi-to-0.13.0.patch --]
[-- Type: text/x-patch, Size: 370482 bytes --]
From 0afbe5d90596c28d577dd341fdd96f8d4ccb9ab6 Mon Sep 17 00:00:00 2001
From: Protesilaos Stavrou <info@protesilaos.com>
Date: Mon, 12 Oct 2020 09:11:00 +0300
Subject: [PATCH] Update modus-operandi, modus-vivendi to 0.13.0
* etc/themes/modus-operandi-theme.el: Update to version 0.13.0.
* etc/themes/modus-vivendi-theme.el: Update to version 0.13.0.
* doc/misc/modus-themes.texi: Include new texinfo documentation for
modus-operandi and modus-vivendi themes.
---
doc/misc/modus-themes.texi | 2836 ++++++++++++++++++++++++++++
etc/themes/modus-operandi-theme.el | 1386 +++++++++-----
etc/themes/modus-vivendi-theme.el | 1376 +++++++++-----
3 files changed, 4617 insertions(+), 981 deletions(-)
create mode 100644 doc/misc/modus-themes.texi
diff --git a/doc/misc/modus-themes.texi b/doc/misc/modus-themes.texi
new file mode 100644
index 0000000000..bc62d1a227
--- /dev/null
+++ b/doc/misc/modus-themes.texi
@@ -0,0 +1,2836 @@
+\input texinfo @c -*- texinfo -*-
+@c %**start of header
+@setfilename modus-themes.info
+@settitle Modus themes for GNU Emacs
+@documentencoding UTF-8
+@documentlanguage en
+@c %**end of header
+
+@dircategory Emacs
+@direntry
+* Modus Themes: (modus-themes). Highly accessible themes (WCAG AAA).
+@end direntry
+
+@finalout
+@titlepage
+@title Modus themes for GNU Emacs
+@author Protesilaos Stavrou (@email{info@@protesilaos.com})
+@end titlepage
+
+@ifnottex
+@node Top
+@top Modus themes for GNU Emacs
+
+This manual, written by Protesilaos Stavrou, describes the customisation
+options for the @samp{modus-operandi} and @samp{modus-vivendi} themes, and provides
+every other piece of information pertinent to them.
+
+The documentation furnished herein corresponds to version 0.13.0,
+released on 2020-10-08. Any reference to a newer feature which does
+not yet form part of the latest tagged commit, is explicitly marked as
+such.
+
+Copyright (C) 2020 Free Software Foundation, Inc.
+
+@quotation
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, with no Front-Cover Texts,
+and with no Back-Cover Texts.
+
+@end quotation
+
+@end ifnottex
+
+@menu
+* Overview::
+* Installation::
+* Enable and load::
+* Customisation Options::
+* Advanced customisation (do-it-yourself)::
+* Face coverage::
+* Notes for individual packages::
+* Contributing::
+* Acknowledgements::
+* Meta::
+* External projects (ports)::
+* GNU Free Documentation License::
+
+@detailmenu
+--- The Detailed Node Listing ---
+
+Overview
+
+* How do the themes look like::
+* Learn about the latest changes::
+
+Installation
+
+* Install from the archives::
+* Install on GNU/Linux::
+
+Install on GNU/Linux
+
+* Debian 11 Bullseye::
+* GNU Guix::
+
+Enable and load
+
+* Load automatically::
+* Load at a given time or at sunset/sunrise::
+* Toggle between the themes on demand::
+* Configure options prior to loading::
+
+Customisation Options
+
+* Bold constructs:: Toggle bold constructs in code
+* Slanted constructs:: Toggle slanted constructs (italics) in code
+* Syntax highlighting:: Toggle subtle colouration in programming modes
+* No mixed fonts:: Toggle mixing of font families
+* Link underline:: Toggle underlined text in links
+* Command prompts:: Choose among plain, subtle, or intense prompts
+* Mode line:: Choose among plain, three-dimension, or moody-compliant styles
+* Completion UIs:: Choose among standard, moderate, or opinionated looks
+* Fringes:: Choose among plain, subtle, or intense fringe visibility
+* Line highlighting:: Toggle intense style for current line highlighting
+* Matching parentheses:: Toggle intense style for matching delimiters/parentheses
+* Diffs:: Choose among intense, desaturated, or text-only diffs
+* Org mode blocks:: Choose among plain, greyscale, or rainbow styles
+* Heading styles:: Choose among several styles, also per heading level
+* Scaled headings:: Toggle scaling of headings
+* Headings' font:: Toggle proportionately spaced fonts in headings
+
+Scaled headings
+
+* Scaled heading sizes:: Specify rate of increase for scaled headings
+
+Advanced customisation (do-it-yourself)
+
+* Tweak colours (DIY):: Declare your own palette overrides
+* Font configs (DIY):: Optimise for mixed typeface buffers
+* Org user faces (DIY):: Extend styles for org-mode keywords and priorities
+
+Face coverage
+
+* Supported packages:: Full list of covered face groups
+* Covered indirectly::
+* Will NOT be supported::
+
+Notes for individual packages
+
+* Note on company-mode overlay pop-up::
+* Note for ERC escaped colour sequences::
+* Note for powerline or spaceline::
+* Note on shr colours::
+* Note for Helm grep::
+* Note on vc-annotate-background-mode::
+
+Contributing
+
+* Sources of the themes::
+* Issues you can help with::
+* Merge requests:: Legal considerations for code patches
+
+@end detailmenu
+@end menu
+
+@node Overview
+@chapter Overview
+
+The Modus themes are designed for accessible readability. They conform
+with the highest standard for colour contrast between any given
+combination of background and foreground values. This corresponds to
+the WCAG AAA standard, which specifies a minimum rate of distance in
+relative luminance of 7:1.
+
+Modus Operandi (@samp{modus-operandi}) is a light theme, while Modus Vivendi
+(@samp{modus-vivendi}) is dark. Each theme's colour palette is designed to
+meet the needs of the numerous interfaces that are possible in the Emacs
+computing environment.
+
+The overarching objective of this project is to always offer accessible
+colour combinations. There shall never be a compromise on this
+principle. If there arises an inescapable trade-off between readability
+and stylistic considerations, we will always opt for the former.
+
+To ensure that users have a consistently accessible experience, the
+themes strive to achieve as close to full face coverage as possible
+(see @ref{Face coverage}).
+
+Starting with version 0.12.0 and onwards, the themes are built into GNU
+Emacs (current version is 0.13.0).
+
+@menu
+* How do the themes look like::
+* Learn about the latest changes::
+@end menu
+
+@node How do the themes look like
+@section How do the themes look like
+
+Check the web page with @uref{https://protesilaos.com/modus-themes-pictures/, the screen shots}. There are lots of scenaria on
+display that draw attention to details and important aspects in the
+design of the themes. They also showcase the numerous customisation
+options.
+
+@ref{Customisation Options, , Customisation options}.
+
+@node Learn about the latest changes
+@section Learn about the latest changes
+
+Please refer to the @uref{https://protesilaos.com/modus-themes-changelog, web page with the change log}. It is comprehensive
+and covers everything that goes into every tagged release of the themes.
+
+@node Installation
+@chapter Installation
+
+The Modus themes are built into Emacs' development branch (@samp{master}) which
+corresponds to the nominal version 28.0.50. Otherwise they can be
+installed using Emacs' package manager or manually from their code
+repository.
+
+Modus Operandi (light theme) and Modus Vivendi (dark) are normally
+distributed as standalone packages in Emacs-specific archives: GNU ELPA,
+MELPA, and MELPA Stable. There also exist packages for GNU/Linux
+distributions.
+
+@menu
+* Install from the archives::
+* Install on GNU/Linux::
+@end menu
+
+@node Install from the archives
+@section Install from the archives
+
+@samp{modus-operandi-theme} and @samp{modus-vivendi-theme} are available from GNU
+ELPA, MELPA, MELPA Stable.
+
+Prior to querying any package archive, make sure to have updated the
+index, with @samp{M-x package-refresh-contents}. Then all you need to do is
+type @samp{M-x package-install} and specify the theme of your choice.
+
+GNU ELPA and MELPA Stable contain the last tagged release. While MELPA
+builds from the latest commit to the @uref{https://gitlab.com/protesilaos/modus-themes, Modus theme's Git repository}.
+
+@node Install on GNU/Linux
+@section Install on GNU/Linux
+
+The themes are also available from the archives of some GNU/Linux
+distributions. These should correspond to a tagged release rather than
+building directly from the latest Git commit. It all depends on the
+distro's packaging policies.
+
+@menu
+* Debian 11 Bullseye::
+* GNU Guix::
+@end menu
+
+@node Debian 11 Bullseye
+@subsection Debian 11 Bullseye
+
+The two themes are distributed as a single package for Debian and its
+derivatives. Currently in the unstable and testing suites and should be
+available in time for Debian 11 Bullseye (next stable).
+
+Get them with:
+
+@example
+sudo apt install elpa-modus-themes
+@end example
+
+@node GNU Guix
+@subsection GNU Guix
+
+Users of either the Guix System (the distro) or just Guix (the package
+manager) can get each theme as a standalone package.
+
+@example
+guix package -i modus-operandi-theme
+@end example
+
+And/or:
+
+@example
+guix package -i modus-vivendi-theme
+@end example
+
+@node Enable and load
+@chapter Enable and load
+
+This section documents techniques on how to load the theme of your
+choice and how to further control its initialisation. It also includes
+some sample code snippets that could help you in the task, especially if
+you intend to use both Modus Operandi and Modus Vivendi.
+
+@menu
+* Load automatically::
+* Load at a given time or at sunset/sunrise::
+* Toggle between the themes on demand::
+* Configure options prior to loading::
+@end menu
+
+@node Load automatically
+@section Load automatically
+
+A simple way to load the theme from your Emacs initialisation file is to
+include either of the following expressions:
+
+@lisp
+(load-theme 'modus-operandi t) ; Light theme
+(load-theme 'modus-vivendi t) ; Dark theme
+@end lisp
+
+Make sure to remove any other theme that is being loaded, otherwise you
+might run into unexpected issues.
+
+Note that you can always @samp{M-x disable-theme} and specify an item. The
+command does exactly what its name suggests. To deactivate all enabled
+themes at once, in case you have multiple of them enabled, you may
+evaluate the expression:
+
+@lisp
+(mapc #'disable-theme custom-enabled-themes)
+@end lisp
+
+@node Load at a given time or at sunset/sunrise
+@section Load at a given time or at sunset/sunrise
+
+It is possible to schedule a time during the day at or after which a
+given theme will be loaded.@footnote{Contributed on Reddit by user b3n
+@uref{https://www.reddit.com/r/emacs/comments/gdtqov/weekly_tipstricketc_thread/fq9186h/}.}
+
+@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 lisp
+
+A modified version of the above technique is to use the sunrise and
+sunset as references, instead of specifying a fixed hour value.@footnote{Contributed directly by André Alexandre Gomes @uref{https://gitlab.com/aadcg}.}
+If you set @samp{calendar-latitude} and @samp{calendar-longitude} (defined in the
+built-in @samp{solar.el} library---read it with @samp{M-x find-library}), you can
+automatically switch between both themes at the appropriate time-of-day.
+Note that @emph{those calendar variables need to be set before loading the
+themes}.
+
+@lisp
+;; Define coordinates
+(setq calendar-latitude 35.17
+ calendar-longitude 33.36)
+
+;; Light at sunrise
+(load-theme 'modus-operandi t t)
+(run-at-time (nth 1 (split-string (sunrise-sunset)))
+ (* 60 60 24)
+ (lambda ()
+ (enable-theme 'modus-operandi)))
+
+;; Dark at sunset
+(load-theme 'modus-vivendi t t)
+(run-at-time (nth 4 (split-string (sunrise-sunset)))
+ (* 60 60 24)
+ (lambda ()
+ (enable-theme 'modus-vivendi)))
+@end lisp
+
+For the sake of completeness, the @samp{load-theme} call in these snippets is
+slightly different than the one shown in @ref{Load automatically}, because it
+does not enable the theme directly: the subsequent @samp{enable-theme} does
+that when needed.
+
+@node Toggle between the themes on demand
+@section Toggle between the themes on demand
+
+With both themes available, it is possible to design a simple command to
+switch between them on demand.
+
+@lisp
+(defun modus-themes-toggle ()
+ "Toggle between `modus-operandi' and `modus-vivendi' themes."
+ (interactive)
+ (if (eq (car custom-enabled-themes) 'modus-operandi)
+ (progn
+ (disable-theme 'modus-operandi)
+ (load-theme 'modus-vivendi t))
+ (disable-theme 'modus-vivendi)
+ (load-theme 'modus-operandi t)))
+@end lisp
+
+You could use @samp{(mapc #'disable-theme custom-enabled-themes)} instead of
+disabling a single target, but you get the idea.
+
+@node Configure options prior to loading
+@section Configure options prior to loading
+
+If you plan to use both themes and wish to apply styles consistently
+(see @ref{Customisation Options}), you could define wrapper functions around
+the standard @samp{load-theme} command. These extend the simple function we
+presented in @ref{Toggle between the themes on demand}.
+
+Here is a comprehensive setup (the values assigned to the variables are
+just for the sake of this demonstration):@footnote{The @samp{defmacro} and @samp{dolist}
+method were contributed on Reddit by user b3n
+@uref{https://www.reddit.com/r/emacs/comments/gqsz8u/weekly_tipstricketc_thread/fsfakhg/}.}
+
+@lisp
+(defmacro modus-themes-format-sexp (sexp &rest objects)
+ `(eval (read (format ,(format "%S" sexp) ,@@objects))))
+
+(dolist (theme '("operandi" "vivendi"))
+ (modus-themes-format-sexp
+ (defun modus-%1$s-theme-load ()
+ (setq modus-%1$s-theme-slanted-constructs t
+ modus-%1$s-theme-bold-constructs t
+ modus-%1$s-theme-fringes 'subtle ; @{nil,'subtle,'intense@}
+ modus-%1$s-theme-mode-line '3d ; @{nil,'3d,'moody@}
+ modus-%1$s-theme-faint-syntax nil
+ modus-%1$s-theme-intense-hl-line nil
+ modus-%1$s-theme-intense-paren-match nil
+ modus-%1$s-theme-no-link-underline t
+ modus-%1$s-theme-no-mixed-fonts nil
+ modus-%1$s-theme-prompts nil ; @{nil,'subtle,'intense@}
+ modus-%1$s-theme-completions 'moderate ; @{nil,'moderate,'opinionated@}
+ modus-%1$s-theme-diffs nil ; @{nil,'desaturated,'fg-only@}
+ modus-%1$s-theme-org-blocks 'greyscale ; @{nil,'greyscale,'rainbow@}
+ modus-%1$s-theme-headings ; Read further below in the manual for this one
+ '((1 . section)
+ (2 . line)
+ (t . rainbow-line-no-bold))
+ modus-%1$s-theme-variable-pitch-headings nil
+ modus-%1$s-theme-scale-headings t
+ modus-%1$s-theme-scale-1 1.1
+ modus-%1$s-theme-scale-2 1.15
+ modus-%1$s-theme-scale-3 1.21
+ modus-%1$s-theme-scale-4 1.27
+ modus-%1$s-theme-scale-5 1.33)
+ (load-theme 'modus-%1$s t))
+ theme))
+
+(defun modus-themes-toggle ()
+ "Toggle between `modus-operandi' and `modus-vivendi' themes."
+ (interactive)
+ (if (eq (car custom-enabled-themes) 'modus-operandi)
+ (progn
+ (disable-theme 'modus-operandi)
+ (modus-vivendi-theme-load))
+ (disable-theme 'modus-vivendi)
+ (modus-operandi-theme-load)))
+@end lisp
+
+@node Customisation Options
+@chapter Customisation Options
+
+The Modus themes are highly configurable. Though they should work well
+without any further tweaks.
+
+By default, all customisation options are set to @samp{nil}.
+
+All customisation options need to be evaluated before loading their
+theme (see @ref{Enable and load}).
+
+@menu
+* Bold constructs:: Toggle bold constructs in code
+* Slanted constructs:: Toggle slanted constructs (italics) in code
+* Syntax highlighting:: Toggle subtle colouration in programming modes
+* No mixed fonts:: Toggle mixing of font families
+* Link underline:: Toggle underlined text in links
+* Command prompts:: Choose among plain, subtle, or intense prompts
+* Mode line:: Choose among plain, three-dimension, or moody-compliant styles
+* Completion UIs:: Choose among standard, moderate, or opinionated looks
+* Fringes:: Choose among plain, subtle, or intense fringe visibility
+* Line highlighting:: Toggle intense style for current line highlighting
+* Matching parentheses:: Toggle intense style for matching delimiters/parentheses
+* Diffs:: Choose among intense, desaturated, or text-only diffs
+* Org mode blocks:: Choose among plain, greyscale, or rainbow styles
+* Heading styles:: Choose among several styles, also per heading level
+* Scaled headings:: Toggle scaling of headings
+* Headings' font:: Toggle proportionately spaced fonts in headings
+@end menu
+
+@node Bold constructs
+@section Option for more bold constructs
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-bold-constructs}
+@item
+@samp{modus-vivendi-theme-bold-constructs}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Display several constructs in bold weight. This concerns keywords and
+other important aspects of code syntax. It also affects certain mode
+line indicators and command-line prompts.
+
+The default is to only use a bold weight when it is required.
+
+Additionally, and while not necessary, to define the precise weight for
+bold constructs, you can change the typographic intensity of the @samp{bold}
+face. The standard is a bold weight. It requires no further
+intervention. Assuming though that your typeface of choice supports a
+``semibold'' weight, adding the following snippet to your init file should
+suffice.
+
+@lisp
+(set-face-attribute 'bold nil :weight 'semibold)
+@end lisp
+
+Note that if you are switching themes, you need to re-evaluate this
+expression after the new theme is loaded.
+
+@node Slanted constructs
+@section Option for more slanted constructs
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-slanted-constructs}
+@item
+@samp{modus-vivendi-theme-slanted-constructs}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Choose to render more faces in slanted text (italics). This typically
+affects documentation strings and code comments.
+
+The default is to not use italics unless it is absolutely necessary.
+
+@node Syntax highlighting
+@section Option for faint code syntax highlighting
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-faint-syntax}
+@item
+@samp{modus-vivendi-theme-faint-syntax}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Use less saturated colours in programming modes for highlighting code
+syntax. The default is to use saturated colours.
+
+This option essentially affects the font-lock faces, so it may also have
+implications in other places that are hard-wired to rely directly on
+them instead of specifying their own faces (which could inherit from
+font-lock if that is the intent). The author is aware of @samp{vc-dir} as a
+case in point.
+
+@node No mixed fonts
+@section Option for no font mixing
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-no-mixed-fonts}
+@item
+@samp{modus-vivendi-theme-no-mixed-fonts}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+By default, the themes configure some spacing-sensitive faces, such as
+Org tables and code blocks, to always inherit from the @samp{fixed-pitch} face.
+This is to ensure that those constructs remain monospaced when users opt
+for something like the built-in @samp{M-x variable-pitch-mode}. Otherwise the
+layout would appear broken. To disable this behaviour, set the option
+to @samp{t}.
+
+Users may prefer to use another package for handling mixed typeface
+configurations, rather than letting the theme do it, perhaps because a
+purpose-specific package has extra functionality. Two possible options
+are @uref{https://melpa.org/#/org-variable-pitch, org-variable-pitch} and @uref{https://melpa.org/#/mixed-pitch, mixed-pitch}.
+
+@node Link underline
+@section Option for no link underline
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-no-link-underline}
+@item
+@samp{modus-vivendi-theme-no-link-underline}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Remove the underline effect from links, symbolic links, and buttons.
+The default is to apply an underline.
+
+@node Command prompts
+@section Option for command prompt styles
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-prompts}
+@item
+@samp{modus-vivendi-theme-prompts}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{subtle}
+@item
+@samp{intense}
+@end enumerate
+
+The symbols ``subtle'' and ``intense'' will apply a combination of accented
+background and foreground to the minibuffer and other REPL prompts (like
+@samp{M-x shell} and @samp{M-x eshell}). The difference between the two is that the
+latter has a more pronounced/noticeable effect than the former.
+
+The default is to not use any background for such prompts, while relying
+exclusively on an accented foreground colour.
+
+@node Mode line
+@section Option for mode line presentation
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-mode-line}
+@item
+@samp{modus-vivendi-theme-mode-line}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{3d}
+@item
+@samp{moody}
+@end enumerate
+
+The default value (@samp{nil}) produces a two-dimensional effect both for the
+active and inactive modelines. The differences between the two are
+limited to distinct shades of greyscale values, with the active being
+more intense than the inactive.
+
+A @samp{3d} symbol will make the active modeline look like a three-dimensional
+rectangle. Inactive modelines remain 2D, though they are slightly toned
+down relative to the default. This aesthetic is the same as what you
+get when you run Emacs without any customisations (@samp{emacs -Q} on the
+command line).
+
+While @samp{moody} removes all box effects from the modelines and applies
+underline and overline properties instead. It also tones down a bit the
+inactive modelines. This is meant to optimise things for use with the
+@uref{https://github.com/tarsius/moody, moody package} (hereinafter referred to as ``Moody''), though it can work
+fine even without it.
+
+Note that Moody does not expose any faces that the themes could style
+directly. Instead it re-purposes existing ones to render its tabs and
+ribbons. As such, there may be cases where the contrast ratio falls
+below the 7:1 target that the themes conform with (WCAG AAA). To hedge
+against this, we configure a fallback foreground for the @samp{moody} option,
+which will come into effect when the background of the modeline changes
+to something less accessible, such as Moody ribbons (read the doc string
+of @samp{set-face-attribute}, specifically @samp{:distant-foreground}). This fallback
+comes into effect when Emacs determines that the background and
+foreground of the given construct are too close to each other in terms
+of colour distance. In effect, users would need to experiment with the
+variable @samp{face-near-same-color-threshold} to trigger the fallback colour.
+We find that a value of @samp{45000} would suffice, contrary to the default
+@samp{30000}. Do not set the value too high, because that would have the
+adverse effect of always overriding the default colour (which has been
+carefully designed to be highly accessible).
+
+Furthermore, because Moody expects an underline and overline instead of
+a box style, it is recommended you also include this in your setup:
+
+@lisp
+(setq x-underline-at-descent-line t)
+@end lisp
+
+@node Completion UIs
+@section Option for completion framework aesthetics
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-completions}
+@item
+@samp{modus-vivendi-theme-completions}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{moderate}
+@item
+@samp{opinionated}
+@end enumerate
+
+This is a special option that has different effects depending on the
+completion UI@. The interfaces can be grouped in two categories, based
+on their default aesthetics: (i) those that only or mostly use
+foreground colours for their interaction model, and (ii) those that
+combine background and foreground values for some of their metaphors.
+The former category encompasses Icomplete, Ido, Selectrum as well as
+pattern matching styles like Orderless and Flx. The latter covers Helm,
+Ivy, and similar.
+
+A value of @samp{nil} will respect the metaphors of each completion framework.
+
+The symbol @samp{moderate} will apply a combination of background and
+foreground that is fairly subtle. For Icomplete and friends this
+constitutes a departure from their default aesthetics, however the
+difference is small. While Helm et al will appear slightly different
+than their original looks, as they are toned down a bit.
+
+The symbol @samp{opinionated} will apply colour combinations that refashion the
+completion UI@. For the Icomplete camp this means that intense
+background and foreground combinations are used: in effect their looks
+emulate those of Ivy and co. in their original style. Whereas the other
+group of packages will revert to an even more nuanced aesthetic with
+some additional changes to the choice of hues.
+
+To appreciate the scope of this customisation option, you should spend
+some time with every one of the @samp{nil} (default), @samp{moderate}, and @samp{opinionated}
+possibilities.
+
+@node Fringes
+@section Option for fringe visibility
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-fringes}
+@item
+@samp{modus-vivendi-theme-fringes}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{subtle}
+@item
+@samp{intense}
+@end enumerate
+
+The ``subtle'' symbol will apply a greyscale background that is visible,
+yet close enough to the main background colour. While the ``intense''
+symbol will use a more noticeable greyscale background.
+
+The default is to use the same colour as that of the main background,
+meaning that the fringes are not obvious though they still occupy the
+space given to them by @samp{fringe-mode}.
+
+@node Line highlighting
+@section Option for line highlighting (hl-line-mode)
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-intense-hl-line}
+@item
+@samp{modus-vivendi-theme-intense-hl-line}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Draw the current line of @samp{hl-line-mode} or its global equivalent in a more
+prominent background colour. This would also affect several packages
+that enable @samp{hl-line-mode}, such as @samp{elfeed} and @samp{mu4e}.
+
+The default is to use a more subtle grey.
+
+@node Matching parentheses
+@section Option for parenthesis matching (show-paren-mode)
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-intense-paren-match}
+@item
+@samp{modus-vivendi-theme-intense-paren-match}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Apply a more intense background to the matching parentheses (or
+delimiters). This affects tools such as the built-in @samp{show-paren-mode}.
+The default is to use a subtle warm colour for the background of those
+overlays.
+
+@node Diffs
+@section Option for diff buffer looks
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-diffs}
+@item
+@samp{modus-vivendi-theme-diffs}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{desaturated}
+@item
+@samp{fg-only}
+@end enumerate
+
+By default the themes will apply richly coloured backgrounds to the
+output of diffs, such as those of @samp{diff-mode}, @samp{ediff}, @samp{smerge-mode}, and
+@samp{magit}. These are colour combinations of an accented background and
+foreground so that, for example, added lines have a pronounced green
+background with an appropriate shade of green for the affected text.
+Word-wise or ``refined'' changes follow this pattern but use different
+shades of those colours to remain distinct.
+
+A @samp{desaturated} value tones down all relevant colour values. It still
+combines an accented background with an appropriate foreground, yet its
+overall impression is very subtle. Refined changes are a bit more
+intense to fulfil their intended function, though still less saturated
+than default.
+
+While @samp{fg-only} will remove all accented backgrounds and instead rely on
+colour-coded text to denote changes. For instance, added lines use an
+intense green foreground, while their background is the same as the rest
+of the buffer. Word-wise highlights still use a background value which
+is, nonetheless, more subtle than its default equivalent.
+
+Concerning @samp{magit}, an extra set of tweaks are introduced for the effect
+of highlighting the current diff hunk, so as to remain consistent with
+the overall experience of that mode. Expect changes that are consistent
+with the overall intent of the aforementioned.
+
+@node Org mode blocks
+@section Option for org-mode block styles
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-org-blocks}
+@item
+@samp{modus-vivendi-theme-org-blocks}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{greyscale}
+@item
+@samp{rainbow}
+@end enumerate
+
+The default is to use the same background as the rest of the buffer for
+the contents of the block.
+
+A value of @samp{greyscale} will apply a subtle neutral grey background to the
+block's contents. It will also extend to the edge of the window the
+background of the ``begin'' and ``end'' block delimiter lines (only relevant
+for Emacs versions >= 27 where the 'extend' keyword is recognised by
+@samp{set-face-attribute}).
+
+While @samp{rainbow} will instead use an accented background for the contents
+of the block. The exact colour will depend on the programming language
+and is controlled by the @samp{org-src-block-faces} variable (refer to the
+theme's source code for the current association list). This is most
+suitable for users who work on literate programming documents that mix
+and match several languages.
+
+Note that the ``rainbow'' blocks may require you to also reload the
+major-mode so that the colours are applied properly: use @samp{M-x org-mode} or
+@samp{M-x org-mode-restart} to refresh the buffer. Or start typing in each
+code block (inefficient at scale, but it still works).
+
+@node Heading styles
+@section Option for headings' overall style
+
+This is defined as an alist and, therefore, uses a different approach
+than other customisation options documented in this manual.
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-headings}
+@item
+@samp{modus-vivendi-theme-headings}
+@end itemize
+
+Possible values, which can be specified for each heading level (examples
+further below):
+
+@itemize
+@item
+nil (default fallback option---covers all heading levels)
+@item
+@samp{t} (default style for a single heading, when the fallback differs)
+@item
+@samp{no-bold}
+@item
+@samp{line}
+@item
+@samp{line-no-bold}
+@item
+@samp{rainbow}
+@item
+@samp{rainbow-line}
+@item
+@samp{rainbow-line-no-bold}
+@item
+@samp{highlight}
+@item
+@samp{highlight-no-bold}
+@item
+@samp{rainbow-highlight}
+@item
+@samp{rainbow-highlight-no-bold}
+@item
+@samp{section}
+@item
+@samp{section-no-bold}
+@item
+@samp{rainbow-section}
+@item
+@samp{rainbow-section-no-bold}
+@end itemize
+
+To control faces per level from 1-8, use something like this (same for
+@samp{modus-vivendi-theme-headings}):
+
+@lisp
+(setq modus-operandi-theme-headings
+ '((1 . section)
+ (2 . line)
+ (3 . highlight)
+ (t . rainbow-no-bold)))
+@end lisp
+
+The above uses the @samp{section} value for heading levels 1, the @samp{line} for
+headings 2, @samp{highlight} for 3. All other levels fall back to
+@samp{rainbow-line-no-bold}.
+
+To set a uniform value for all heading levels, use this pattern:
+
+@lisp
+;; A given style for every heading
+(setq modus-operandi-theme-headings
+ '((t . rainbow-line-no-bold)))
+
+;; Default aesthetic for every heading
+(setq modus-operandi-theme-headings
+ '((t . nil)))
+@end lisp
+
+The default style for headings uses a fairly desaturated foreground
+value in combination with a bold typographic weight. To specify this
+style for a given level N (assuming you wish to have another fallback
+option), just specify the value @samp{t} like this:
+
+@lisp
+(setq modus-operandi-theme-headings
+ '((1 . t)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+@end lisp
+
+A description of all other possible styles:
+
+@itemize
+@item
+@samp{no-bold} retains the default text colour while removing the typographic
+weight.
+
+@item
+@samp{line} is the same as the default plus an overline over the heading.
+
+@item
+@samp{line-no-bold} is the same as @samp{line} without bold weight.
+
+@item
+@samp{rainbow} uses a more colourful foreground in combination with bold
+weight.
+
+@item
+@samp{rainbow-line} is the same as @samp{rainbow} plus an overline.
+
+@item
+@samp{rainbow-line-no-bold} is the same as @samp{rainbow-line} without the bold
+weight.
+
+@item
+@samp{highlight} retains the default style of a fairly desaturated foreground
+combined with a bold weight and adds to it a subtle accented
+background.
+
+@item
+@samp{highlight-no-bold} is the same as @samp{highlight} without a bold weight.
+
+@item
+@samp{rainbow-highlight} is the same as @samp{highlight} but with a more colourful
+foreground.
+
+@item
+@samp{rainbow-highlight-no-bold} is the same as @samp{rainbow-highlight} without a
+bold weight.
+
+@item
+@samp{section} retains the default looks and adds to them both an overline
+and a slightly accented background. It is, in effect, a combination
+of the @samp{line} and @samp{highlight} values.
+
+@item
+@samp{section-no-bold} is the same as @samp{section} without a bold weight.
+
+@item
+@samp{rainbow-section} is the same as @samp{section} but with a more colourful
+foreground.
+
+@item
+@samp{rainbow-section-no-bold} is the same as @samp{rainbow-section} without a bold
+weight.``
+@end itemize
+
+@node Scaled headings
+@section Option for scaled headings
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-scale-headings}
+@item
+@samp{modus-vivendi-theme-scale-headings}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Make headings larger in height relative to the main text. This is
+noticeable in modes like Org. The default is to use the same size for
+headings and body copy.
+
+@menu
+* Scaled heading sizes:: Specify rate of increase for scaled headings
+@end menu
+
+@node Scaled heading sizes
+@subsection Control the scale of headings
+
+In addition to toggles for enabling scaled headings, users can also
+specify a number of their own.
+
+@itemize
+@item
+If it is a floating point, say, @samp{1.5}, it is interpreted as a multiple
+of the base font size. This is the recommended method.
+
+@item
+If it is an integer, it is read as an absolute font height. The
+number is basically the point size multiplied by ten. So if you want
+it to be @samp{18pt} you must pass @samp{180}. Please understand that setting an
+absolute value is discouraged, as it will break the layout when you
+try to change font sizes with the built-in @samp{text-scale-adjust} command
+(see @ref{Font configs (DIY), , Font configurations}).
+@end itemize
+
+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 @samp{1.2}, @samp{1.4}, @samp{1.6}, @samp{1.8}, @samp{2.0}---or use a
+resource for finding a consistent scale:
+
+@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-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-5 1.3)
+@end lisp
+
+Note that in earlier versions of Org, scaling would only increase the
+size of the heading, but not of keywords that were added to it, like
+``TODO''. The issue has been fixed upstream:
+@uref{https://protesilaos.com/codelog/2020-09-24-org-headings-adapt/}.
+
+@node Headings' font
+@section Option for variable-pitch font in headings
+
+Symbol names:
+
+@itemize
+@item
+@samp{modus-operandi-theme-variable-pitch-headings}
+@item
+@samp{modus-vivendi-theme-variable-pitch-headings}
+@end itemize
+
+Possible values:
+
+@enumerate
+@item
+@samp{nil} (default)
+@item
+@samp{t}
+@end enumerate
+
+Choose to apply a proportionately spaced, else ``variable-pitch'',
+typeface to headings (such as in Org mode). The default is to use the
+main font family.
+
+@ref{Font configs (DIY), , Font configurations for Org (and others)}.
+
+@node Advanced customisation (do-it-yourself)
+@chapter Advanced customisation (do-it-yourself)
+
+Unlike the predefined customisation options which follow a
+straightforward pattern of allowing the user to quickly specify their
+preference, the themes also provide a more flexible, albeit difficult,
+mechanism to control things with precision (see @ref{Customisation Options}).
+
+This section is of interest only to users who are prepared to maintain
+their own local tweaks and who are willing to deal with any possible
+incompatibilities between versioned releases of the themes. As such,
+they are labelled as ``do-it-yourself'' or ``DIY''.
+
+@menu
+* Tweak colours (DIY):: Declare your own palette overrides
+* Font configs (DIY):: Optimise for mixed typeface buffers
+* Org user faces (DIY):: Extend styles for org-mode keywords and priorities
+@end menu
+
+@node Tweak colours (DIY)
+@section Full access to the themes' palette
+
+The variables are:
+
+@itemize
+@item
+@samp{modus-operandi-theme-override-colors-alist}
+@item
+@samp{modus-vivendi-theme-override-colors-alist}
+@end itemize
+
+Users can specify an association list that maps the names of colour
+variables to hexadecimal RGB values (in the form of @samp{#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:
+
+@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 lisp
+
+If you want to be creative, you can define a minor mode that refashions
+the themes on demand. The following is a minor mode that gets activated
+on demand. We combine it with the function to switch between Modus
+Operandi and Modus Vivendi (see @ref{Toggle between the themes on demand} for
+a basic command, and/or @ref{Configure options prior to loading} for a more
+comprehensive setup).
+
+@lisp
+(define-minor-mode modus-themes-alt-mode
+ "Override Modus themes' palette variables with custom values.
+
+This is intended as a proof-of-concept. It is, nonetheless, a
+perfectly accessible alternative, conforming with the design
+principles of the Modus themes. It still is not as good as the
+default colours."
+ :init-value nil
+ :global t
+ (if modus-themes-alt-mode
+ (setq modus-operandi-theme-override-colors-alist
+ '(("bg-main" . "#fefcf4")
+ ("bg-dim" . "#faf6ef")
+ ("bg-alt" . "#f7efe5")
+ ("bg-hl-line" . "#f4f0e3")
+ ("bg-active" . "#e8dfd1")
+ ("bg-inactive" . "#f6ece5")
+ ("bg-region" . "#c6bab1")
+ ("bg-header" . "#ede3e0")
+ ("bg-tab-bar" . "#dcd3d3")
+ ("bg-tab-active" . "#fdf6eb")
+ ("bg-tab-inactive" . "#c8bab8")
+ ("fg-unfocused" . "#55556f"))
+ modus-vivendi-theme-override-colors-alist
+ '(("bg-main" . "#100b17")
+ ("bg-dim" . "#161129")
+ ("bg-alt" . "#181732")
+ ("bg-hl-line" . "#191628")
+ ("bg-active" . "#282e46")
+ ("bg-inactive" . "#1a1e39")
+ ("bg-region" . "#393a53")
+ ("bg-header" . "#202037")
+ ("bg-tab-bar" . "#262b41")
+ ("bg-tab-active" . "#120f18")
+ ("bg-tab-inactive" . "#3a3a5a")
+ ("fg-unfocused" . "#9a9aab")))
+ (setq modus-operandi-theme-override-colors-alist nil
+ modus-vivendi-theme-override-colors-alist nil)))
+
+(defun modus-themes-toggle (&optional arg)
+ "Toggle between `modus-operandi' and `modus-vivendi' themes.
+
+With optional \\[universal-argument] prefix, enable
+`modus-themes-alt-mode' for the loaded theme."
+ (interactive "P")
+ (if arg
+ (modus-themes-alt-mode 1)
+ (modus-themes-alt-mode -1))
+ (if (eq (car custom-enabled-themes) 'modus-operandi)
+ (progn
+ (disable-theme 'modus-operandi)
+ (load-theme 'modus-vivendi t))
+ (disable-theme 'modus-vivendi)
+ (load-theme 'modus-operandi t)))
+@end lisp
+
+@printindex cp
+
+@node Font configs (DIY)
+@section Font configurations for Org (and others)
+
+The themes are designed to cope well with mixed font settings (@ref{No mixed fonts, , Option
+for no font mixing}). Currently this applies to @samp{org-mode} and
+@samp{markdown-mode}.
+
+In practice it means that the user can safely opt for a more
+prose-friendly proportionately spaced typeface as their default, while
+letting spacing-sensitive elements like tables and inline code always
+use a monospaced font, by inheriting from the @samp{fixed-pitch} face.
+
+Users can try the built-in @samp{M-x variable-pitch-mode} to see the effect in
+action.
+
+To make everything use your desired font families, you need to configure
+the @samp{variable-pitch} (proportional spacing) and @samp{fixed-pitch} (monospaced)
+faces respectively. It may also be convenient to set your main typeface
+by configuring the @samp{default} face the same way.
+
+Put something like this in your initialisation file (make sure to read
+the documentation of @samp{set-face-attribute}, with @samp{M-x describe-function}):
+
+@lisp
+;; Main typeface
+(set-face-attribute 'default nil :family "DejaVu Sans Mono" :height 110)
+
+;; Proportionately spaced typeface
+(set-face-attribute 'variable-pitch nil :family "DejaVu Serif" :height 1.0)
+
+;; Monospaced typeface
+(set-face-attribute 'fixed-pitch nil :family "DejaVu Sans Mono" :height 1.0)
+@end lisp
+
+Note the differences in the @samp{:height} property. The @samp{default} face must
+specify an absolute value, which is the point size × 10. So if you want
+to use a font at point size @samp{11}, you set the height at @samp{110}.@footnote{@samp{:height}
+values do not need to be rounded to multiples of ten: the likes of @samp{115}
+are perfectly valid—some typefaces will change to account for those
+finer increments.} Whereas every other face must have a value that is
+relative to the default, represented as a floating point (if you use an
+integer, say, @samp{15} then that means an absolute height). This is of
+paramount importantance: it ensures that all fonts can scale gracefully
+when using something like the @samp{text-scale-adjust} command which only
+operates on the base font size (i.e. the @samp{default} face's absolute
+height).
+
+An alternative syntax for the @samp{default} face, is to pass all typeface
+parameters directly to a @samp{font} property.@footnote{Has the benefit of
+accepting @samp{fontconfig} parameters (GNU/Linux), such as @samp{"DejaVu Sans
+Mono-11:hintstyle=hintslight:autohint=false"}.
+@uref{https://www.freedesktop.org/software/fontconfig/fontconfig-user.html}}
+Note that here we use a standard point size:
+
+@lisp
+(set-face-attribute 'default nil :font "DejaVu Sans Mono-11")
+@end lisp
+
+Again, remember to only ever specify an absolute height for the @samp{default}.
+
+@printindex cp
+
+@node Org user faces (DIY)
+@section Org user faces (DIY)
+
+Users of @samp{org-mode} have the option to configure various keywords and
+priority cookies to better match their workflow. User options are
+@samp{org-todo-keyword-faces} and @samp{org-priority-faces}.
+
+As those are meant to be custom faces, it would be futile to have the
+themes try to guess what each user would want to use, which keywords to
+target, and so on. Instead, we can provide guidelines on how to
+customise things to one's liking with the intent of retaining the
+overall aesthetics of the theme.
+
+Please bear in mind that the end result of those is not controlled by
+the active theme but by how Org maps faces to its constructs. Editing
+those while @samp{org-mode} is active requires @samp{M-x org-mode-restart} for changes
+to take effect.
+
+Let us assume you wish to visually differentiate your keywords. You
+have something like this:
+
+@lisp
+(setq org-todo-keywords
+ '((sequence "TODO(t)" "|" "DONE(D)" "CANCEL(C)")
+ (sequence "MEET(m)" "|" "MET(M)")
+ (sequence "STUDY(s)" "|" "STUDIED(S)")
+ (sequence "WRITE(w)" "|" "WROTE(W)")))
+@end lisp
+
+You could then use a variant of the following to inherit from a face
+that uses the styles you want and also to preserve the properties
+applied by the @samp{org-todo} face:
+
+@lisp
+(setq org-todo-keyword-faces
+ '(("MEET" . '(font-lock-preprocessor-face org-todo))
+ ("STUDY" . '(font-lock-variable-name-face org-todo))
+ ("WRITE" . '(font-lock-type-face org-todo))))
+@end lisp
+
+This will refashion the keywords you specify, while letting the other
+items in @samp{org-todo-keywords} use their original styles (which are defined
+in the @samp{org-todo} and @samp{org-done} faces).
+
+If you want back the defaults, try specifying just the @samp{org-todo} face:
+
+@lisp
+(setq org-todo-keyword-faces
+ '(("MEET" . org-todo)
+ ("STUDY" . org-todo)
+ ("WRITE" . org-todo)))
+@end lisp
+
+When you inherit from multiple faces, you need to quote the list as
+shown further above. The order is important: the last item is applied
+over the previous ones. If you do not want to blend multiple faces, you
+do not need a quoted list. A pattern of @samp{keyword . face} would suffice.
+
+Both approaches can be used simultaneously, as illustrated in this
+configuration of the priority cookies:
+
+@lisp
+(setq org-priority-faces
+ '((?A . '(org-scheduled-today org-priority))
+ (?B . org-priority)
+ (?C . '(shadow org-priority))))
+@end lisp
+
+To find all the faces that are loaded in your current Emacs session, use
+@samp{M-x list-faces-display}. Also try @samp{M-x describe-variable} and then specify
+the name of each of those Org variables demonstrated above. Their
+documentation strings will offer you further guidance.
+
+Furthermore, consider reading the ``Notes for aspiring Emacs theme
+developers'', published on 2020-08-28 by me (Protesilaos Stavrou):
+@uref{https://protesilaos.com/codelog/2020-08-28-notes-emacs-theme-devs/}.
+
+@printindex cp
+
+@printindex cp
+
+@node Face coverage
+@chapter Face coverage
+
+Modus Operandi and Modus Vivendi try to provide as close to full face
+coverage as possible. This is necessary to ensure a consistently
+accessible reading experience across all possible interfaces.
+
+@menu
+* Supported packages:: Full list of covered face groups
+* Covered indirectly::
+* Will NOT be supported::
+@end menu
+
+@node Supported packages
+@section Full support for packages or face groups
+
+This list will always be updated to reflect the current state of the
+project. The idea is to offer an overview of the known status of all
+affected face groups. The items with an appended asterisk @samp{*} tend to
+have lots of extensions, so the ``full support'' may not be 100% true…
+
+@itemize
+@item
+ace-window
+@item
+ag
+@item
+alert
+@item
+all-the-icons
+@item
+annotate
+@item
+anzu
+@item
+apropos
+@item
+apt-sources-list
+@item
+artbollocks-mode
+@item
+auctex and @TeX{}
+@item
+auto-dim-other-buffers
+@item
+avy
+@item
+awesome-tray
+@item
+binder
+@item
+bm
+@item
+bongo
+@item
+boon
+@item
+breakpoint (provided by the built-in @samp{gdb-mi.el} library)
+@item
+buffer-expose
+@item
+calendar and diary
+@item
+calfw
+@item
+centaur-tabs
+@item
+change-log and log-view (such as @samp{vc-print-log} and @samp{vc-print-root-log})
+@item
+cider
+@item
+circe
+@item
+color-rg
+@item
+column-enforce-mode
+@item
+company-mode*
+@item
+company-posframe
+@item
+compilation-mode
+@item
+completions
+@item
+counsel*
+@item
+counsel-css
+@item
+counsel-notmuch
+@item
+counsel-org-capture-string
+@item
+cov
+@item
+cperl-mode
+@item
+csv-mode
+@item
+ctrlf
+@item
+custom (@samp{M-x customize})
+@item
+dap-mode
+@item
+dashboard (emacs-dashboard)
+@item
+deadgrep
+@item
+debbugs
+@item
+define-word
+@item
+deft
+@item
+dictionary
+@item
+diff-hl
+@item
+diff-mode
+@item
+dim-autoload
+@item
+dir-treeview
+@item
+dired
+@item
+dired-async
+@item
+dired-git
+@item
+dired-git-info
+@item
+dired-narrow
+@item
+dired-subtree
+@item
+diredfl
+@item
+disk-usage
+@item
+doom-modeline
+@item
+dynamic-ruler
+@item
+easy-jekyll
+@item
+easy-kill
+@item
+ebdb
+@item
+ediff
+@item
+eglot
+@item
+el-search
+@item
+eldoc-box
+@item
+elfeed
+@item
+elfeed-score
+@item
+emms
+@item
+enhanced-ruby-mode
+@item
+epa
+@item
+equake
+@item
+erc
+@item
+eros
+@item
+ert
+@item
+eshell
+@item
+eshell-fringe-status
+@item
+eshell-git-prompt
+@item
+eshell-prompt-extras (epe)
+@item
+eshell-syntax-highlighting
+@item
+evil* (evil-mode)
+@item
+evil-goggles
+@item
+evil-visual-mark-mode
+@item
+eww
+@item
+eyebrowse
+@item
+fancy-dabbrev
+@item
+flycheck
+@item
+flycheck-color-mode-line
+@item
+flycheck-indicator
+@item
+flycheck-posframe
+@item
+flymake
+@item
+flyspell
+@item
+flyspell-correct
+@item
+flx
+@item
+freeze-it
+@item
+frog-menu
+@item
+focus
+@item
+fold-this
+@item
+font-lock (generic syntax highlighting)
+@item
+forge
+@item
+fountain (fountain-mode)
+@item
+geiser
+@item
+git-commit
+@item
+git-gutter (and variants)
+@item
+git-lens
+@item
+git-rebase
+@item
+git-timemachine
+@item
+git-walktree
+@item
+gnus
+@item
+golden-ratio-scroll-screen
+@item
+helm*
+@item
+helm-ls-git
+@item
+helm-switch-shell
+@item
+helm-xref
+@item
+helpful
+@item
+highlight-blocks
+@item
+highlight-defined
+@item
+highlight-escape-sequences (@samp{hes-mode})
+@item
+highlight-indentation
+@item
+highlight-numbers
+@item
+highlight-symbol
+@item
+highlight-tail
+@item
+highlight-thing
+@item
+hl-defined
+@item
+hl-fill-column
+@item
+hl-line-mode
+@item
+hl-todo
+@item
+hydra
+@item
+hyperlist
+@item
+ibuffer
+@item
+icomplete
+@item
+icomplete-vertical
+@item
+ido-mode
+@item
+iedit
+@item
+iflipb
+@item
+imenu-list
+@item
+indium
+@item
+info
+@item
+info-colors
+@item
+interaction-log
+@item
+ioccur
+@item
+isearch, occur, etc.
+@item
+ivy*
+@item
+ivy-posframe
+@item
+jira (org-jira)
+@item
+journalctl-mode
+@item
+js2-mode
+@item
+julia
+@item
+jupyter
+@item
+kaocha-runner
+@item
+keycast
+@item
+line numbers (@samp{display-line-numbers-mode} and global variant)
+@item
+lsp-mode
+@item
+lsp-ui
+@item
+magit
+@item
+magit-imerge
+@item
+man
+@item
+markdown-mode
+@item
+markup-faces (@samp{adoc-mode})
+@item
+mentor
+@item
+messages
+@item
+minibuffer-line
+@item
+minimap
+@item
+modeline
+@item
+mood-line
+@item
+moody
+@item
+mpdel
+@item
+mu4e
+@item
+mu4e-conversation
+@item
+multiple-cursors
+@item
+neotree
+@item
+no-emoji
+@item
+notmuch
+@item
+num3-mode
+@item
+nxml-mode
+@item
+objed
+@item
+orderless
+@item
+org*
+@item
+org-journal
+@item
+org-noter
+@item
+org-pomodoro
+@item
+org-recur
+@item
+org-roam
+@item
+org-superstar
+@item
+org-table-sticky-header
+@item
+org-treescope
+@item
+origami
+@item
+outline-mode
+@item
+outline-minor-faces
+@item
+package (@samp{M-x list-packages})
+@item
+page-break-lines
+@item
+paradox
+@item
+paren-face
+@item
+parrot
+@item
+pass
+@item
+persp-mode
+@item
+perspective
+@item
+phi-grep
+@item
+phi-search
+@item
+pkgbuild-mode
+@item
+pomidor
+@item
+powerline
+@item
+powerline-evil
+@item
+proced
+@item
+prodigy
+@item
+racket-mode
+@item
+rainbow-blocks
+@item
+rainbow-identifiers
+@item
+rainbow-delimiters
+@item
+rcirc
+@item
+regexp-builder (also known as @samp{re-builder})
+@item
+rg (rg.el)
+@item
+ripgrep
+@item
+rmail
+@item
+ruler-mode
+@item
+sallet
+@item
+selectrum
+@item
+semantic
+@item
+sesman
+@item
+shell-script-mode
+@item
+show-paren-mode
+@item
+side-notes
+@item
+skewer-mode
+@item
+smart-mode-line
+@item
+smartparens
+@item
+smerge
+@item
+spaceline
+@item
+speedbar
+@item
+spell-fu
+@item
+stripes
+@item
+suggest
+@item
+switch-window
+@item
+swiper
+@item
+swoop
+@item
+sx
+@item
+symbol-overlay
+@item
+syslog-mode
+@item
+table (built-in table.el)
+@item
+telephone-line
+@item
+term
+@item
+tomatinho
+@item
+transient (pop-up windows such as Magit's)
+@item
+trashed
+@item
+treemacs
+@item
+tty-menu
+@item
+tuareg
+@item
+typescript
+@item
+undo-tree
+@item
+vc (built-in mode line status for version control)
+@item
+vc-annotate (@samp{C-x v g})
+@item
+vdiff
+@item
+vimish-fold
+@item
+visible-mark
+@item
+visual-regexp
+@item
+volatile-highlights
+@item
+vterm
+@item
+wcheck-mode
+@item
+web-mode
+@item
+wgrep
+@item
+which-function-mode
+@item
+which-key
+@item
+whitespace-mode
+@item
+window-divider-mode
+@item
+winum
+@item
+writegood-mode
+@item
+woman
+@item
+xah-elisp-mode
+@item
+xref
+@item
+xterm-color (and ansi-colors)
+@item
+yaml-mode
+@item
+yasnippet
+@item
+ztree
+@end itemize
+
+Plus many other miscellaneous faces that are provided by the upstream
+GNU Emacs distribution.
+
+@node Covered indirectly
+@section Covered indirectly
+
+These do not require any extra styles because they are configured to
+inherit from some basic faces. Please confirm.
+
+@itemize
+@item
+edit-indirect
+@item
+evil-owl
+@item
+perl-mode
+@item
+php-mode
+@item
+rjsx-mode
+@item
+swift-mode
+@end itemize
+
+@node Will NOT be supported
+@section Will NOT be supported
+
+I have thus far identified a single package that does fit into the
+overarching objective of this project: @uref{https://github.com/hlissner/emacs-solaire-mode, solaire}. It basically tries to
+cast a less intense background on the main file-visiting buffers, so
+that secondary elements like sidebars can have the default (pure
+white/black) background.
+
+I will only cover this package if it ever supports the inverse effect:
+less intense colours (but still accessible) for supportive interfaces
+and the intended styles for the content you are actually working on.
+
+@node Notes for individual packages
+@chapter Notes for individual packages
+
+This section covers information that may be of interest to users of
+individual packages.
+
+@menu
+* Note on company-mode overlay pop-up::
+* Note for ERC escaped colour sequences::
+* Note for powerline or spaceline::
+* Note on shr colours::
+* Note for Helm grep::
+* Note on vc-annotate-background-mode::
+@end menu
+
+@node Note on company-mode overlay pop-up
+@section Note on company-mode overlay pop-up
+
+By default, the @samp{company-mode} pop-up that lists completion candidates is
+drawn using an overlay. This creates alignment issues every time it is
+placed above a piece of text that has a different height than the
+default.
+
+The solution recommended by the project's maintainer is to use an
+alternative front-end for drawing the pop-up which uses child frames
+instead of overlays.@footnote{@uref{https://github.com/company-mode/company-mode/issues/1010}}@footnote{@uref{https://github.com/tumashu/company-posframe/}}
+
+@node Note for ERC escaped colour sequences
+@section Note for ERC escaped colour sequences
+
+The built-in IRC client @samp{erc} has the ability to colourise any text using
+escape sequences that start with @samp{^C} (inserted with @samp{C-q C-c}) and are
+followed by a number for the foreground and background.@footnote{This page
+explains the basics, though it is not specific to Emacs:
+@uref{https://www.mirc.com/colors.html}} Possible numbers are 0-15, with the
+first entry being the foreground and the second the background,
+separated by a comma. Like this @samp{^C1,6}. The minimum setup is this:
+
+@lisp
+(add-to-list 'erc-modules 'irccontrols)
+(setq erc-interpret-controls-p t
+ erc-interpret-mirc-color t)
+@end lisp
+
+As this allows users to make arbitrary combinations, it is impossible to
+guarantee a consistently high contrast ratio. All we can we do is
+provide guidance on the combinations that satisfy the accessibility
+standard of the themes:
+
+@table @asis
+@item Modus Operandi
+Use foreground colour 1 for all backgrounds from
+2-15. Like so: @samp{C-q C-c1,N} where @samp{N} is the background.
+
+@item Modus Vivendi
+Use foreground colour 0 for all backgrounds from
+2-13. Use foreground @samp{1} for backgrounds 14, 15.
+@end table
+
+Colours 0 and 1 are white and black respectively. So combine them
+together, if you must.
+
+@node Note for powerline or spaceline
+@section Note for powerline or spaceline
+
+Both Powerline and Spaceline package users will likely need to use the
+command @samp{powerline-reset} whenever they make changes to their themes
+and/or modeline setup.
+
+@node Note on shr colours
+@section Note on shr colours
+
+Emacs' HTML rendering mechanism (@samp{shr}) may need explicit configuration to
+respect the theme's colours instead of whatever specifications the
+webpage provides. Consult @samp{C-h v shr-use-colors}.
+
+@node Note for Helm grep
+@section Note for Helm grep
+
+There is one face from the Helm package that is meant to highlight the
+matches of a grep or grep-like command (@samp{ag} or @samp{ripgrep}). It is
+@samp{helm-grep-match}. However, this face can only apply when the user does
+not pass @samp{--color=always} as a command-line option for their command.
+
+Here is the docstring for that face, which is defined in the
+@samp{helm-grep.el} library (view a library with @samp{M-x find-library}).
+
+@quotation
+Face used to highlight grep matches. Have no effect when grep backend
+use ``--color=''
+
+@end quotation
+
+The user must either remove @samp{--color} from the flags passed to the grep
+function, or explicitly use @samp{--color=never} (or equivalent). Helm
+provides user-facing customisation options for controlling the grep
+function's parameters, such as @samp{helm-grep-default-command} and
+@samp{helm-grep-git-grep-command}.
+
+When @samp{--color=always} is in effect, the grep output will use red text in
+bold letter forms to present the matching part in the list of
+candidates. That style still meets the contrast ratio target of >= 7:1
+(accessibility standard WCAG AAA), because it draws the reference to
+ANSI colour number 1 (red) from the already-supported array of
+@samp{ansi-color-names-vector}.
+
+@node Note on vc-annotate-background-mode
+@section Note on vc-annotate-background-mode
+
+Due to the unique way @samp{vc-annotate} (@samp{C-x v g}) applies colours, support for
+its background mode (@samp{vc-annotate-background-mode}) is disabled at the
+theme level.
+
+Normally, such a drastic measure should not belong in a theme: assuming
+the user's preferences is bad practice. However, it has been deemed
+necessary in the interest of preserving colour contrast accessibility
+while still supporting a useful built-in tool.
+
+If there actually is a way to avoid such a course of action, without
+prejudice to the accessibility standard of this project, then please
+report as much or send patches (see @ref{Contributing}).
+
+@node Contributing
+@chapter Contributing
+
+This section documents the canonical sources of the themes and the ways
+in which you can contribute to their ongoing development.
+
+@menu
+* Sources of the themes::
+* Issues you can help with::
+* Merge requests:: Legal considerations for code patches
+@end menu
+
+@node Sources of the themes
+@section Sources of the themes
+
+The @samp{modus-operandi} and @samp{modus-vivendi} themes are built into Emacs.
+Currently they are in the project's @samp{master} branch, which is tracking the
+nominal development release target of @samp{28.0.50}.
+
+The source code of the themes is @uref{https://gitlab.com/protesilaos/modus-themes/, available on Gitlab}, for the time
+being. A @uref{https://github.com/protesilaos/modus-themes/, mirror on Github} is also on offer.
+
+An HTML version of this manual is available as an extension to the
+@uref{https://protesilaos.com/modus-themes/, author's personal website} (does not rely on any non-free code).
+
+@node Issues you can help with
+@section Issues you can help with
+
+A few tasks you can help with:
+
+@itemize
+@item
+Suggest refinements to packages that are covered.
+@item
+Report packages not covered thus far.
+@item
+Report bugs, inconsistencies, shortcomings.
+@item
+Help expand the documentation of covered-but-not-styled packages.
+@item
+Suggest refinements to the colour palette.
+@item
+Help expand this document or any other piece of documentation.
+@item
+Merge requests for code refinements.
+@end itemize
+
+@ref{Merge requests, , Patches require copyright assignment to the FSF}.
+
+It would be great if your feedback also includes some screenshots, GIFs,
+or short videos, as well as further instructions to reproduce a given
+setup. Though this is not a requirement.
+
+Whatever you do, bear in mind the overarching objective of the Modus
+themes: to keep a contrast ratio that is greater or equal to 7:1 between
+background and foreground colours. If a compromise is ever necessary
+between aesthetics and accessibility, it shall always be made in the
+interest of the latter.
+
+@node Merge requests
+@section Patches require copyright assignment to the FSF
+
+Code contributions are most welcome. For any major edit (more than 15
+lines, or so, in aggregate per person), you need to make a copyright
+assignment to the Free Software Foundation. This is necessary because
+the themes are part of the upstream Emacs distribution: the FSF must at
+all times be in a position to enforce the GNU General Public License.
+
+Copyright assignment is a simple process. Check the request form below
+(please adapt it accordingly). You must write an email to the address
+mentioned in the form and then wait for the FSF to send you a legal
+agreement. Sign the document and file it back to them. This could all
+happen via email and take about a week. You are encouraged to go
+through this process. You only need to do it once. It will allow you
+to make contributions to Emacs in general.
+
+@example
+Please email the following information to assign@@gnu.org, and we
+will send you the assignment form for your past and future changes.
+
+Please use your full legal name (in ASCII characters) as the subject
+line of the message.
+----------------------------------------------------------------------
+REQUEST: SEND FORM FOR PAST AND FUTURE CHANGES
+
+[What is the name of the program or package you're contributing to?]
+
+GNU Emacs
+
+[Did you copy any files or text written by someone else in these changes?
+Even if that material is free software, we need to know about it.]
+
+Copied a few snippets from the same files I edited. Their author,
+Protesilaos Stavrou, has already assigned copyright to the Free Software
+Foundation.
+
+[Do you have an employer who might have a basis to claim to own
+your changes? Do you attend a school which might make such a claim?]
+
+
+[For the copyright registration, what country are you a citizen of?]
+
+
+[What year were you born?]
+
+
+[Please write your email address here.]
+
+
+[Please write your postal address here.]
+
+
+
+
+
+[Which files have you changed so far, and which new files have you written
+so far?]
+
+Changed a couple of themes that are part of the Emacs source code:
+
+./etc/themes/modus-operandi-theme.el
+./etc/themes/modus-vivendi-theme.el
+@end example
+
+@node Acknowledgements
+@chapter Acknowledgements
+
+The Modus themes are a collective effort. Every contribution counts.
+
+@table @asis
+@item Author/maintainer
+Protesilaos Stavrou.
+
+@item Code contributions
+Anders Johansson, Basil L@. Contovounisios,
+Markus Beppler, Matthew Stevenson.
+
+@item Ideas and user feedback
+Aaron Jensen, Adam Spiers, Alex Griffin,
+Alex Peitsinis, Alexey Shmalko, Anders Johansson, André Alexandre
+Gomes, Arif Rezai, Basil L@. Contovounisios, Damien Cassou, Dario
+Gjorgjevski, David Edmondson, Davor Rotim, Divan Santana, Gerry
+Agbobada, Gianluca Recchia, Iris Garcia, Len Trigg, Manuel Uberti,
+Mark Burton, Markus Beppler, Michael Goldenberg, Murilo Pereira,
+Nicolas De Jaeghere, Pierre Téchoueyres, Roman Rudakov, Ryan Phillips,
+Shreyas Ragavan, Tassilo Horn, Thibaut Verron, Trey Merkley, Uri
+Sharf, Utkarsh Singh, Vincent Foley. As well as users: Ben,
+Fourchaux, Fredrik, Moesasji, Nick, TheBlob42, dinko, doolio, jixiuf,
+okamsn, tycho garen.
+
+@item Packaging
+Dhavan Vaidya (Debian), Stefan Kangas (core Emacs),
+Stefan Monnier (GNU Elpa).
+
+@item Inspiration for certain features
+Fabrice Niessen (leuven-theme),
+Bozhidar Batsov (zenburn-theme).
+@end table
+
+@node Meta
+@chapter Meta
+
+If you are curious about the principles that govern the development of
+this project read the essay @uref{https://protesilaos.com/codelog/2020-03-17-design-modus-themes-emacs/, On the design of the Modus themes}
+(2020-03-17).
+
+Here are some more publications for those interested in the kind of work
+that goes into this project (sometimes the commits also include details
+of this sort):
+
+@itemize
+@item
+@uref{https://protesilaos.com/codelog/2020-05-10-modus-operandi-palette-review/, Modus Operandi theme subtle palette review} (2020-05-10)
+@item
+@uref{https://protesilaos.com/codelog/2020-06-13-modus-vivendi-palette-review/, Modus Vivendi theme subtle palette review} (2020-06-13)
+@item
+@uref{https://protesilaos.com/codelog/2020-07-04-modus-themes-faint-colours/, Modus themes: new ``faint syntax'' option} (2020-07-04)
+@item
+@uref{https://protesilaos.com/codelog/2020-07-08-modus-themes-nuanced-colours/, Modus themes: major review of ``nuanced'' colours} (2020-07-08)
+@item
+@uref{https://protesilaos.com/codelog/2020-09-14-modus-themes-review-blues/, Modus themes: review of blue colours} (2020-09-14)
+@end itemize
+
+And here are the canonical sources for this project's documentation:
+
+@table @asis
+@item Manual
+@uref{https://protesilaos.com/modus-themes}
+@item Change Log
+@uref{https://protesilaos.com/modus-themes-changelog}
+@item Screenshots
+@uref{https://protesilaos.com/modus-themes-pictures}
+@end table
+
+@node External projects (ports)
+@chapter External projects (ports)
+
+The present section documents projects that extend the scope of the
+Modus themes. The following list will be updated whenever relevant
+information is brought to my attention. If you already have or intend
+to produce such a port, feel welcome @uref{https://protesilaos.com/contact, to contact me}.
+
+@table @asis
+@item Modus exporter
+This is @uref{https://github.com/polaris64/modus-exporter, an Elisp library written by Simon Pugnet}.
+Licensed under the terms of the GNU General Public License. It is
+meant to capture the colour values of the active Modus theme (Operandi
+or Vivendi) and output it as a valid theme for some other application.
+@end table
+
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+
+@example
+ GNU Free Documentation License
+ Version 1.3, 3 November 2008
+
+
+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+ <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense. It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does. But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book. We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License. Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein. The "Document", below,
+refers to any such manual or work. Any member of the public is a
+licensee, and is addressed as "you". You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject. (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.) The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License. If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant. The Document may contain zero
+Invariant Sections. If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License. A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters. A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text. A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification. Examples of
+transparent image formats include PNG, XCF and JPG. Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page. For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+The "publisher" means any person or entity that distributes copies of
+the Document to the public.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language. (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".) To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document. These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no
+other conditions whatsoever to those of this License. You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute. However, you may accept
+compensation in exchange for copies. If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover. Both covers must also clearly and legibly identify
+you as the publisher of these copies. The front cover must present
+the full title with all words of the title equally prominent and
+visible. You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to
+give them a chance to provide you with an updated version of the
+Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it. In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has fewer than five),
+ unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+ to it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section Entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+ Preserve the Title of the section, and preserve in the section all
+ the substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+ or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant. To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version. Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity. If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy. If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications". You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other
+documents released under this License, and replace the individual
+copies of this License in the various documents with a single copy
+that is included in the collection, provided that you follow the rules
+of this License for verbatim copying of each of the documents in all
+other respects.
+
+You may extract a single document from such a collection, and
+distribute it individually under this License, provided you insert a
+copy of this License into the extracted document, and follow this
+License in all other respects regarding verbatim copying of that
+document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections. You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers. In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions of the
+GNU Free Documentation License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns. See
+https://www.gnu.org/licenses/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation. If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation. If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+11. RELICENSING
+
+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works. A
+public wiki that anybody can edit is an example of such a server. A
+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
+means any set of copyrightable works thus published on the MMC site.
+
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
+published by that same organization.
+
+"Incorporate" means to publish or republish a Document, in whole or in
+part, as part of another Document.
+
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
+(2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+ Copyright (c) YEAR YOUR NAME.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+@end example
+
+@bye
diff --git a/etc/themes/modus-operandi-theme.el b/etc/themes/modus-operandi-theme.el
index c1090eedef..db61c97b76 100644
--- a/etc/themes/modus-operandi-theme.el
+++ b/etc/themes/modus-operandi-theme.el
@@ -1,10 +1,10 @@
;;; modus-operandi-theme.el --- Accessible light theme (WCAG AAA) -*- lexical-binding:t -*-
-;; Copyright (c) 2019-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
;; Author: Protesilaos Stavrou <info@protesilaos.com>
;; URL: https://gitlab.com/protesilaos/modus-themes
-;; Version: 0.12.0
+;; Version: 0.13.0
;; Package-Requires: ((emacs "26.1"))
;; Keywords: faces, theme, accessibility
@@ -42,17 +42,18 @@
;; modus-operandi-theme-slanted-constructs (boolean)
;; modus-operandi-theme-bold-constructs (boolean)
;; modus-operandi-theme-variable-pitch-headings (boolean)
-;; modus-operandi-theme-rainbow-headings (boolean)
-;; modus-operandi-theme-section-headings (boolean)
+;; modus-operandi-theme-no-mixed-fonts (boolean)
+;; modus-operandi-theme-headings (alist)
;; modus-operandi-theme-scale-headings (boolean)
;; modus-operandi-theme-fringes (choice)
;; modus-operandi-theme-org-blocks (choice)
;; modus-operandi-theme-prompts (choice)
-;; modus-operandi-theme-3d-modeline (boolean)
-;; modus-operandi-theme-subtle-diffs (boolean)
+;; modus-operandi-theme-mode-line (choice)
+;; modus-operandi-theme-diffs (choice)
;; modus-operandi-theme-faint-syntax (boolean)
;; modus-operandi-theme-intense-hl-line (boolean)
;; modus-operandi-theme-intense-paren-match (boolean)
+;; modus-operandi-theme-no-link-underline (boolean)
;; modus-operandi-theme-completions (choice)
;; modus-operandi-theme-override-colors-alist (alist)
;;
@@ -81,6 +82,8 @@
;; auctex and TeX
;; auto-dim-other-buffers
;; avy
+;; awesome-tray
+;; binder
;; bm
;; bongo
;; boon
@@ -103,6 +106,7 @@
;; counsel-notmuch
;; counsel-org-capture-string
;; cov
+;; cperl-mode
;; csv-mode
;; ctrlf
;; custom (M-x customize)
@@ -116,6 +120,7 @@
;; diff-hl
;; diff-mode
;; dim-autoload
+;; dir-treeview
;; dired
;; dired-async
;; dired-git
@@ -132,6 +137,7 @@
;; ediff
;; eglot
;; el-search
+;; eldoc
;; eldoc-box
;; elfeed
;; elfeed-score
@@ -146,6 +152,7 @@
;; eshell-fringe-status
;; eshell-git-prompt
;; eshell-prompt-extras (epe)
+;; eshell-syntax-highlighting
;; evil (evil-mode)
;; evil-goggles
;; evil-visual-mark-mode
@@ -153,6 +160,7 @@
;; eyebrowse
;; fancy-dabbrev
;; flycheck
+;; flycheck-color-mode-line
;; flycheck-indicator
;; flycheck-posframe
;; flymake
@@ -229,6 +237,7 @@
;; minimap
;; modeline
;; mood-line
+;; mpdel
;; mu4e
;; mu4e-conversation
;; multiple-cursors
@@ -237,6 +246,7 @@
;; notmuch
;; num3-mode
;; nxml-mode
+;; objed
;; orderless
;; org
;; org-journal
@@ -266,6 +276,7 @@
;; powerline-evil
;; proced
;; prodigy
+;; racket-mode
;; rainbow-blocks
;; rainbow-identifiers
;; rainbow-delimiters
@@ -308,6 +319,7 @@
;; treemacs
;; tty-menu
;; tuareg
+;; typescript
;; undo-tree
;; vc (built-in mode line status for version control)
;; vc-annotate (C-x v g)
@@ -411,11 +423,19 @@ between foreground and background is >= 7:1)."
(defface modus-theme-diff-focus-changed nil nil)
(defface modus-theme-diff-focus-removed nil nil)
(defface modus-theme-diff-heading nil nil)
-(defface modus-theme-header nil nil) ; Name is tentative
+(defface modus-theme-pseudo-header nil nil)
(defface modus-theme-mark-alt nil nil)
(defface modus-theme-mark-del nil nil)
(defface modus-theme-mark-sel nil nil)
(defface modus-theme-mark-symbol nil nil)
+(defface modus-theme-heading-1 nil nil)
+(defface modus-theme-heading-2 nil nil)
+(defface modus-theme-heading-3 nil nil)
+(defface modus-theme-heading-4 nil nil)
+(defface modus-theme-heading-5 nil nil)
+(defface modus-theme-heading-6 nil nil)
+(defface modus-theme-heading-7 nil nil)
+(defface modus-theme-heading-8 nil nil)
(defface modus-theme-hl-line nil nil)
;;; Customisation options
@@ -441,14 +461,125 @@ between foreground and background is >= 7:1)."
"Use proportional fonts (variable-pitch) in headings."
:type 'boolean)
+(defcustom modus-operandi-theme-no-mixed-fonts nil
+ "Disable inheritance from `fixed-pitch' in some faces.
+
+This is done by default to allow spacing-sensitive constructs,
+such as Org tables and code blocks, to remain monospaced when
+users opt for something like the command `variable-pitch-mode'.
+The downside with the default is that users need to explicitly
+configure the font family of `fixed-pitch' in order to get a
+consistent experience. That may be something they do not want to
+do. Hence this option to disable any kind of technique for
+mixing fonts."
+ :type 'boolean)
+
+(make-obsolete 'modus-operandi-theme-rainbow-headings
+ 'modus-operandi-theme-headings
+ "`modus-operandi-theme' 0.13.0")
+
(defcustom modus-operandi-theme-rainbow-headings nil
"Use more saturated colours for headings."
:type 'boolean)
+(make-obsolete 'modus-operandi-theme-section-headings
+ 'modus-operandi-theme-headings
+ "`modus-operandi-theme' 0.13.0")
+
(defcustom modus-operandi-theme-section-headings nil
"Use a background and an overline in headings."
:type 'boolean)
+(defcustom modus-operandi-theme-headings
+ '((t . nil))
+ "Alist of styles for headings, with optional value per level.
+
+To control faces per level from 1-8, use something like this:
+
+ (setq modus-operandi-theme-headings
+ '((1 . highlight)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+
+To set a uniform value for all heading levels, use this pattern:
+
+ (setq modus-operandi-theme-headings
+ '((t . rainbow-line-no-bold)))
+
+The default uses a fairly desaturated foreground value in
+combination with a bold typographic weight. To specify this
+style for a given level N (assuming you wish to have another
+fallback option), just specify the value t like this:
+
+ (setq modus-operandi-theme-headings
+ '((1 . t)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+
+A description of all possible values:
+
++ `no-bold' retains the default text colour while removing
+ the typographic weight.
+
++ `line' is the same as the default plus an overline over the
+ heading.
+
++ `line-no-bold' is the same as `line' without bold weight.
+
++ `rainbow' uses a more colourful foreground in combination
+ with bold weight.
+
++ `rainbow-line' is the same as `rainbow' plus an overline.
+
++ `rainbow-line-no-bold' is the same as `rainbow-line' without
+ the bold weight.
+
++ `highlight' retains the default style of a fairly desaturated
+ foreground combined with a bold weight and add to it a subtle
+ accented background.
+
++ `highlight-no-bold' is the same as `highlight' without a bold
+ weight.
+
++ `rainbow-highlight' is the same as `highlight' but with a more
+ colourful foreground.
+
++ `rainbow-highlight-no-bold' is the same as `rainbow-highlight'
+ without a bold weight.
+
++ `section' retains the default looks and adds to them both an
+ overline and a slightly accented background. It is, in effect,
+ a combination of the `line' and `highlight' values.
+
++ `section-no-bold' is the same as `section' without a bold
+ weight.
+
++ `rainbow-section' is the same as `section' but with a more
+ colourful foreground.
+
++ `rainbow-section-no-bold' is the same as `rainbow-section'
+ without a bold weight."
+ :type
+ '(alist
+ :key-type symbol
+ :value-type
+ (choice (const :tag "Fairly desaturated foreground with bold weight (default)" t)
+ (const :tag "Like the default without bold weight" no-bold)
+ (const :tag "Like the default plus overline" line)
+ (const :tag "Like `line' without bold weight" line-no-bold)
+ (const :tag "Like the default but with more colourful foreground" rainbow)
+ (const :tag "Like `rainbow' plus overline" rainbow-line)
+ (const :tag "Like `rainbow' without bold weight" rainbow-no-bold)
+ (const :tag "Like `rainbow-line' without bold weight" rainbow-line-no-bold)
+ (const :tag "Like the default plus subtle background" highlight)
+ (const :tag "Like `highlight' without bold weight" highlight-no-bold)
+ (const :tag "Like `highlight' with more colourful foreground" rainbow-highlight)
+ (const :tag "Like `rainbow-highlight' without bold weight" rainbow-highlight-no-bold)
+ (const :tag "Like `highlight' plus overline" section)
+ (const :tag "Like `section' without bold weight" section-no-bold)
+ (const :tag "Like `section' with more colourful foreground" rainbow-section)
+ (const :tag "Like `rainbow-section' without bold weight" rainbow-section-no-bold))))
+
(defcustom modus-operandi-theme-scale-headings nil
"Use font scaling for headings."
:type 'boolean)
@@ -508,8 +639,9 @@ For more on the matter, read the documentation of
`set-face-attribute', specifically the ':height' section."
:type 'number)
-(define-obsolete-variable-alias 'modus-operandi-theme-visible-fringes
- 'modus-operandi-theme-fringes "`modus-operandi-theme' 0.12.0")
+(make-obsolete 'modus-operandi-theme-visible-fringes
+ 'modus-operandi-theme-fringes
+ "`modus-operandi-theme' 0.12.0")
(defcustom modus-operandi-theme-visible-fringes nil
"Use a visible style for fringes."
@@ -527,15 +659,17 @@ pronounced greyscale value."
(const :tag "Subtle greyscale background" subtle)
(const :tag "Intense greyscale background" intense)))
-(define-obsolete-variable-alias 'modus-operandi-theme-distinct-org-blocks
- 'modus-operandi-theme-org-blocks "`modus-operandi-theme' 0.11.0")
+(make-obsolete 'modus-operandi-theme-distinct-org-blocks
+ 'modus-operandi-theme-org-blocks
+ "`modus-operandi-theme' 0.11.0")
(defcustom modus-operandi-theme-distinct-org-blocks nil
"Use a distinct neutral background for `org-mode' blocks."
:type 'boolean)
-(define-obsolete-variable-alias 'modus-operandi-theme-rainbow-org-src-blocks
- 'modus-operandi-theme-org-blocks "`modus-operandi-theme' 0.11.0")
+(make-obsolete 'modus-operandi-theme-rainbow-org-src-blocks
+ 'modus-operandi-theme-org-blocks
+ "`modus-operandi-theme' 0.11.0")
(defcustom modus-operandi-theme-rainbow-org-src-blocks nil
"Use colour-coded backgrounds for `org-mode' source blocks.
@@ -565,16 +699,69 @@ association list)."
(const :tag "Subtle grey block background" greyscale)
(const :tag "Colour-coded background per programming language" rainbow)))
+(make-obsolete 'modus-operandi-theme-3d-modeline
+ 'modus-operandi-theme-mode-line
+ "`modus-operandi-theme' 0.13.0")
+
(defcustom modus-operandi-theme-3d-modeline nil
"Use a three-dimensional style for the active mode line."
:type 'boolean)
+(defcustom modus-operandi-theme-mode-line nil
+ "Adjust the overall style of the mode line.
+
+Nil is a two-dimensional rectangle with a border around it. The
+active and the inactive modelines use different shades of
+greyscale values for the background and foreground.
+
+A `3d' value will apply a three-dimensional effect to the active
+modeline. The inactive modelines remain two-dimensional and are
+toned down a bit, relative to the nil value.
+
+The `moody' option is meant to optimise the modeline for use with
+the library of the same name. This practically means to remove
+the box effect and rely on underline and overline properties
+instead. It also tones down the inactive modelines. Despite its
+intended purpose, this option can also be used without the
+`moody' library."
+ :type '(choice
+ (const :tag "Two-dimensional box (default)" nil)
+ (const :tag "Three-dimensional style for the active mode line" 3d)
+ (const :tag "No box effects, which are optimal for use with the `moody' library" moody)))
+
+(make-obsolete 'modus-operandi-theme-subtle-diffs
+ 'modus-operandi-theme-diffs
+ "`modus-operandi-theme' 0.13.0")
+
(defcustom modus-operandi-theme-subtle-diffs nil
"Use fewer/dim backgrounds in `diff-mode', `ediff',`magit'."
:type 'boolean)
-(define-obsolete-variable-alias 'modus-operandi-theme-intense-standard-completions
- 'modus-operandi-theme-completions "`modus-operandi-theme' 0.12.0")
+(defcustom modus-operandi-theme-diffs nil
+ "Adjust the overall styles of diffs.
+
+Nil means to use fairly intense colour combinations for diffs.
+For example, you get a rich green background with a green
+foreground for added lines. Word-wise or 'refined' diffs follow
+the same pattern but use different shades of those colours to
+remain distinct.
+
+A `desaturated' value follows the same principles as with the nil
+option, while it tones down all relevant colours.
+
+Option `fg-only' will remove all accented backgrounds, except
+from word-wise changes. It instead uses colour-coded foreground
+values to differentiate between added/removed/changed lines. If
+a background is necessary, such as with `ediff', then a subtle
+greyscale value is used."
+ :type '(choice
+ (const :tag "Intensely coloured backgrounds (default)" nil)
+ (const :tag "Slightly accented backgrounds with tinted text" desaturated)
+ (const :tag "No backgrounds, except for refined diffs" fg-only)))
+
+(make-obsolete 'modus-operandi-theme-intense-standard-completions
+ 'modus-operandi-theme-completions
+ "`modus-operandi-theme' 0.12.0")
(defcustom modus-operandi-theme-intense-standard-completions nil
"Use prominent backgrounds for Icomplete, Ido, or similar."
@@ -582,6 +769,7 @@ association list)."
(defcustom modus-operandi-theme-completions nil
"Apply special styles to the UI of completion frameworks.
+
This concerns Icomplete, Ivy, Helm, Selectrum, Ido, as well as
any other tool meant to enhance their experience. The effect
will vary depending on the completion framework.
@@ -621,7 +809,7 @@ effect than the former."
(const :tag "Intense background and foreground for the prompt" intense)))
(defcustom modus-operandi-theme-intense-hl-line nil
- "Use more prominent background for `hl-line-mode'."
+ "Use more prominent background for command `hl-line-mode'."
:type 'boolean)
(defcustom modus-operandi-theme-intense-paren-match nil
@@ -632,6 +820,10 @@ effect than the former."
"Use less saturated colours for code syntax highlighting."
:type 'boolean)
+(defcustom modus-operandi-theme-no-link-underline nil
+ "Do not underline links."
+ :type 'boolean)
+
;;; Internal functions
;; Helper functions that are meant to ease the implementation of the
@@ -641,6 +833,11 @@ effect than the former."
(when modus-operandi-theme-bold-constructs
(list :inherit 'bold)))
+(defun modus-operandi-theme-mixed-fonts ()
+ "Conditional application of `fixed-pitch' inheritance."
+ (unless modus-operandi-theme-no-mixed-fonts
+ (list :inherit 'fixed-pitch)))
+
(defun modus-operandi-theme-fringe (subtlebg intensebg)
"Conditional use of background colours for fringes.
SUBTLEBG should be a subtle greyscale value. INTENSEBG must be a
@@ -679,29 +876,65 @@ FAINT is the less saturated colour."
(list :foreground faint)
(list :foreground normal)))
-(defun modus-operandi-theme-heading-foreground (subtle rainbow)
- "Apply foreground value to headings.
-SUBTLE is the default aesthetic. RAINBOW is the saturated one."
- (if modus-operandi-theme-rainbow-headings
- (list :foreground rainbow)
- (list :foreground subtle)))
-
-(defun modus-operandi-theme-heading-block (bg fg)
- "Conditionally extend heading styles.
-Apply BG to background and FG to overline."
- (if modus-operandi-theme-section-headings
- (append
- (and (>= emacs-major-version 27) '(:extend t))
- (list :background bg :overline fg))
- (list :background nil :overline nil)))
+(defun modus-operandi-theme-heading-p (key)
+ "Query style of KEY in `modus-operandi-theme-headings'."
+ (cdr (assoc key modus-operandi-theme-headings)))
-(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."
- (if modus-operandi-theme-section-headings
- (list :background bgbox :foreground fgbox :box (list :color fgbox))
- (list :foreground fg)))
+(defun modus-operandi-theme-heading (level fg fg-alt bg border)
+ "Conditional styles for `modus-operandi-theme-headings'.
+
+LEVEL is the heading's position in their order. FG is the
+default text colour. FG-ALT is an accented, more saturated value
+than the default. BG is a nuanced, typically accented,
+background that can work well with either of the foreground
+values. BORDER is a colour value that combines well with the
+background and alternative foreground."
+ (let* ((key (modus-operandi-theme-heading-p `,level))
+ (style (or key (modus-operandi-theme-heading-p t)))
+ (var (if modus-operandi-theme-variable-pitch-headings
+ 'variable-pitch
+ 'default)))
+ (pcase style
+ ('no-bold
+ (list :inherit `,var :foreground fg))
+ ('line
+ (list :inherit `(bold ,var) :foreground fg :overline border))
+ ('line-no-bold
+ (list :inherit `,var :foreground fg :overline border))
+ ('rainbow
+ (list :inherit `(bold ,var) :foreground fg-alt))
+ ('rainbow-no-bold
+ (list :inherit `,var :foreground fg-alt))
+ ('rainbow-line
+ (list :inherit `(bold ,var) :foreground fg-alt :overline border))
+ ('rainbow-line-no-bold
+ (list :inherit `,var :foreground fg-alt :overline border))
+ ('highlight
+ (list :inherit `(bold ,var) :background bg :foreground fg))
+ ('highlight-no-bold
+ (list :inherit `,var :background bg :foreground fg))
+ ('rainbow-highlight
+ (list :inherit `(bold ,var) :background bg :foreground fg-alt))
+ ('rainbow-highlight-no-bold
+ (list :inherit `,var :background bg :foreground fg-alt))
+ ('section
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `(bold ,var) :background bg :foreground fg :overline border)))
+ ('section-no-bold
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `,var :background bg :foreground fg :overline border)))
+ ('rainbow-section
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `(bold ,var) :background bg :foreground fg-alt :overline border)))
+ ('rainbow-section-no-bold
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `,var :background bg :foreground fg-alt :overline border)))
+ (_
+ (list :inherit `(bold ,var) :foreground fg)))))
(defun modus-operandi-theme-org-block (bgblk)
"Conditionally set the background of Org blocks.
@@ -737,46 +970,64 @@ set to `rainbow'."
('rainbow (list :background bgaccent :foreground fgaccent))
(_ (list :background bg :foreground fg))))
-(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."
- (let* ((style (if btn 'released-button nil))
- (int (if int int 1)))
- (if modus-operandi-theme-3d-modeline
- (list :line-width int :color col3d :style style)
- (list :line-width 1 :color col :style nil))))
-
-(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."
- (if modus-operandi-theme-3d-modeline
- (list :background bg3d :foreground fg3d)
- (list :background bg :foreground fg)))
-
-(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"
- (if modus-operandi-theme-subtle-diffs
- (list :background subtle-bg :foreground subtle-fg)
- (list :background intense-bg :foreground intense-fg)))
+(defun modus-operandi-theme-mode-line-attrs
+ (fg bg fg-alt bg-alt border border-3d &optional alt-style border-width fg-distant)
+ "Colour combinations for `modus-operandi-theme-mode-line'.
+
+FG and BG are the default colours. FG-ALT and BG-ALT are meant
+to accommodate the options for a 3D modeline or a `moody'
+compliant one. BORDER applies to all permutations of the
+modeline, except the three-dimensional effect, where BORDER-3D is
+used instead.
+
+Optional ALT-STYLE applies an appropriate style to the mode
+line's box property.
+
+Optional BORDER-WIDTH specifies an integer for the width of the
+rectangle that produces the box effect.
+
+Optional FG-DISTANT should be close to the main background
+values. It is intended to be used as a distant-foreground
+property."
+ (pcase modus-operandi-theme-mode-line
+ ('3d
+ `(:background ,bg-alt :foreground ,fg-alt
+ :box (:line-width ,(or border-width 1)
+ :color ,border-3d
+ :style ,(and alt-style 'released-button))))
+ ('moody
+ `(:background ,bg-alt :foreground ,fg-alt :underline ,border :overline ,border
+ :distant-foreground ,fg-distant))
+ (_
+ `(:foreground ,fg :background ,bg :box ,border))))
+
+(defun modus-operandi-theme-diff (fg-only-bg fg-only-fg mainbg mainfg altbg altfg)
+ "Colour combinations for `modus-operandi-theme-diffs'.
+
+FG-ONLY-BG should be similar or the same as the main background.
+FG-ONLY-FG should be a saturated accent value that can be
+combined with the former.
+
+MAINBG must be one of the dedicated backgrounds for diffs while
+MAINFG must be the same for the foreground.
+
+ALTBG needs to be a slightly accented background that is meant to
+be combined with ALTFG. Both must be less intense than MAINBG
+and MAINFG respectively."
+ (pcase modus-operandi-theme-diffs
+ ('fg-only (list :background fg-only-bg :foreground fg-only-fg))
+ ('desaturated (list :background altbg :foreground altfg))
+ (_ (list :background mainbg :foreground mainfg))))
(defun modus-operandi-theme-standard-completions (mainfg subtlebg intensebg intensefg)
"Combinations for `modus-operandi-theme-completions'.
-These are intended for Icomplete, Ido, and related.
MAINFG is an accented foreground value. SUBTLEBG is an accented
background value that can be combined with MAINFG. INTENSEBG and
INTENSEFG are accented colours that are designed to be used in
-tandem."
+tandem.
+
+These are intended for Icomplete, Ido, and related."
(pcase modus-operandi-theme-completions
('opinionated (list :background intensebg :foreground intensefg))
('moderate (list :background subtlebg :foreground mainfg))
@@ -784,7 +1035,6 @@ tandem."
(defun modus-operandi-theme-extra-completions (subtleface intenseface altface &optional altfg bold)
"Combinations for `modus-operandi-theme-completions'.
-These are intended for Helm, Ivy, Selectrum, etc.
SUBTLEFACE and INTENSEFACE are custom theme faces that combine a
background and foreground value. The difference between the two
@@ -794,10 +1044,12 @@ ALTFACE is a combination of colours that represents a departure
from the UI's default aesthetics. Optional ALTFG is meant to be
used in tandem with it.
-Optional BOLD will apply a heavier weight to the text."
+Optional BOLD will apply a heavier weight to the text.
+
+These are intended for Helm, Ivy, etc."
(pcase modus-operandi-theme-completions
('opinionated (list :inherit (list altface bold)
- :foreground (if altfg altfg 'unspecified)))
+ :foreground (or altfg 'unspecified)))
('moderate (list :inherit (list subtleface bold)))
(_ (list :inherit (list intenseface bold)))))
@@ -826,8 +1078,8 @@ AMOUNT is a customisation option."
;; 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")
+ ("bg-active" . "#d7d7d7") ("fg-active" . "#0a0a0a")
+ ("bg-inactive" . "#efefef") ("fg-inactive" . "#404148")
;; 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}
@@ -839,19 +1091,19 @@ AMOUNT is a customisation option."
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red" . "#a60000") ("green" . "#005e00")
- ("yellow" . "#813e00") ("blue" . "#0030a6")
+ ("yellow" . "#813e00") ("blue" . "#0031a9")
("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")
+ ("yellow-alt" . "#70480f") ("blue-alt" . "#2544bb")
("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" . "#0000bb")
+ ("yellow-alt-other" . "#863927") ("blue-alt-other" . "#0000c0")
("magenta-alt-other" . "#5317ac") ("cyan-alt-other" . "#005a5f")
;; styles for desaturated foreground text, intended for use with
;; the `modus-operandi-theme-faint-syntax' option
@@ -915,21 +1167,24 @@ AMOUNT is a customisation option."
;; styles that are meant exclusively for the mode line
;;
;; must be combined with: `bg-active', `bg-inactive'
- ("red-active" . "#930000") ("green-active" . "#005300")
- ("yellow-active" . "#703700") ("blue-active" . "#0033c0")
- ("magenta-active" . "#6320a0") ("cyan-active" . "#004882")
+ ("red-active" . "#8a0000") ("green-active" . "#004c2e")
+ ("yellow-active" . "#702d1f") ("blue-active" . "#0030b4")
+ ("magenta-active" . "#5c2092") ("cyan-active" . "#003f8a")
;; styles that are meant exclusively for the fringes
;;
- ;; must have a minimum contrast ratio of 1.5:1 with `bg-inactive'
- ;; and be combined with `fg-main' or `fg-dim'
- ("red-fringe-bg" . "#ff9a9a") ("green-fringe-bg" . "#86cf86")
- ("yellow-fringe-bg" . "#e0c050") ("blue-fringe-bg" . "#82afff")
- ("magenta-fringe-bg" . "#f0a3ff") ("cyan-fringe-bg" . "#00d6e0")
+ ;; must be combined with `fg-main'
+ ("red-fringe-bg" . "#f08290") ("green-fringe-bg" . "#62c86a")
+ ("yellow-fringe-bg" . "#dbba3f") ("blue-fringe-bg" . "#82afff")
+ ("magenta-fringe-bg" . "#e0a3ff") ("cyan-fringe-bg" . "#2fcddf")
;; styles reserved for specific faces
;;
;; `bg-hl-line' is between `bg-dim' and `bg-alt', so it should
;; work with all accents that cover those two, plus `bg-main'
;;
+ ;; `bg-hl-alt' and `bg-hl-alt-intense' should only be used when no
+ ;; other greyscale or fairly neutral background is available to
+ ;; properly draw attention to a given construct
+ ;;
;; `bg-header' is between `bg-active' and `bg-inactive', so it
;; can be combined with any of the "active" values, plus the
;; "special" and base foreground colours
@@ -960,8 +1215,11 @@ AMOUNT is a customisation option."
;;
;; all pairs are combinable with themselves
("bg-hl-line" . "#f2eff3")
+ ("bg-hl-line-intense" . "#e0e0e0")
+ ("bg-hl-alt" . "#fbeee0")
+ ("bg-hl-alt-intense" . "#e8dfd1")
("bg-paren-match" . "#e0af82")
- ("bg-paren-match-intense" . "#70af9f")
+ ("bg-paren-match-intense" . "#c488ff")
("bg-region" . "#bcbcbc")
("bg-tab-bar" . "#d5d5d5")
@@ -1094,12 +1352,12 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-nuanced-cyan ((,class :background ,cyan-nuanced-bg
,@(and (>= emacs-major-version 27) '(:extend t)))))
;;;;; fringe-specific combinations
- `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-green ((,class :background ,green-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground ,fg-dim)))
+ `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-green ((,class :background ,green-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground ,fg-main)))
;;;;; special base values
;; these are closer to the grayscale than the accents defined above
;; and should only be used when the next closest alternative would be
@@ -1110,26 +1368,96 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-special-calm ((,class :background ,bg-special-calm :foreground ,fg-special-calm)))
;;;;; diff-specific combinations
;; intended for `diff-mode' or equivalent
- `(modus-theme-diff-added ((,class :background ,bg-diff-added :foreground ,fg-diff-added)))
- `(modus-theme-diff-changed ((,class :background ,bg-diff-changed :foreground ,fg-diff-changed)))
- `(modus-theme-diff-removed ((,class :background ,bg-diff-removed :foreground ,fg-diff-removed)))
- `(modus-theme-diff-refine-added ((,class :background ,bg-diff-refine-added :foreground ,fg-diff-refine-added)))
- `(modus-theme-diff-refine-changed ((,class :background ,bg-diff-refine-changed :foreground ,fg-diff-refine-changed)))
- `(modus-theme-diff-refine-removed ((,class :background ,bg-diff-refine-removed :foreground ,fg-diff-refine-removed)))
- `(modus-theme-diff-focus-added ((,class :background ,bg-diff-focus-added :foreground ,fg-diff-focus-added)))
- `(modus-theme-diff-focus-changed ((,class :background ,bg-diff-focus-changed :foreground ,fg-diff-focus-changed)))
- `(modus-theme-diff-focus-removed ((,class :background ,bg-diff-focus-removed :foreground ,fg-diff-focus-removed)))
- `(modus-theme-diff-heading ((,class :background ,bg-diff-heading :foreground ,fg-diff-heading)))
+ `(modus-theme-diff-added
+ ((,class ,@(modus-operandi-theme-diff
+ bg-main green
+ bg-diff-focus-added fg-diff-focus-added
+ green-nuanced-bg fg-diff-added))))
+ `(modus-theme-diff-changed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-main yellow
+ bg-diff-focus-changed fg-diff-focus-changed
+ yellow-nuanced-bg fg-diff-changed))))
+ `(modus-theme-diff-removed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-main red
+ bg-diff-focus-removed fg-diff-focus-removed
+ red-nuanced-bg fg-diff-removed))))
+ `(modus-theme-diff-refine-added
+ ((,class ,@(modus-operandi-theme-diff
+ bg-diff-added fg-diff-added
+ bg-diff-refine-added fg-diff-refine-added
+ bg-diff-focus-added fg-diff-focus-added))))
+ `(modus-theme-diff-refine-changed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-diff-changed fg-diff-changed
+ bg-diff-refine-changed fg-diff-refine-changed
+ bg-diff-focus-changed fg-diff-focus-changed))))
+ `(modus-theme-diff-refine-removed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-diff-removed fg-diff-removed
+ bg-diff-refine-removed fg-diff-refine-removed
+ bg-diff-focus-removed fg-diff-focus-removed))))
+ `(modus-theme-diff-focus-added
+ ((,class ,@(modus-operandi-theme-diff
+ bg-dim green
+ bg-diff-focus-added fg-diff-focus-added
+ bg-diff-added fg-diff-added))))
+ `(modus-theme-diff-focus-changed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-dim yellow
+ bg-diff-focus-changed fg-diff-focus-changed
+ bg-diff-changed fg-diff-changed))))
+ `(modus-theme-diff-focus-removed
+ ((,class ,@(modus-operandi-theme-diff
+ bg-dim red
+ bg-diff-focus-removed fg-diff-focus-removed
+ bg-diff-removed fg-diff-removed))))
+ `(modus-theme-diff-heading
+ ((,class ,@(modus-operandi-theme-diff
+ bg-alt blue-alt
+ bg-diff-heading fg-diff-heading
+ blue-nuanced-bg blue))))
;;;;; mark indicators
;; colour combinations intended for Dired, Ibuffer, or equivalent
- `(modus-theme-header ((,class :inherit bold :foreground ,fg-main)))
+ `(modus-theme-pseudo-header ((,class :inherit bold :foreground ,fg-main)))
`(modus-theme-mark-alt ((,class :inherit bold :background ,bg-mark-alt :foreground ,fg-mark-alt)))
`(modus-theme-mark-del ((,class :inherit bold :background ,bg-mark-del :foreground ,fg-mark-del)))
`(modus-theme-mark-sel ((,class :inherit bold :background ,bg-mark-sel :foreground ,fg-mark-sel)))
`(modus-theme-mark-symbol ((,class :inherit bold :foreground ,blue-alt)))
+;;;;; heading levels
+ ;; styles for regular headings used in Org, Markdown, Info, etc.
+ `(modus-theme-heading-1
+ ((,class ,@(modus-operandi-theme-heading
+ 1 fg-main magenta-alt-other magenta-nuanced-bg bg-region)
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4))))
+ `(modus-theme-heading-2
+ ((,class ,@(modus-operandi-theme-heading
+ 2 fg-special-warm magenta-alt red-nuanced-bg bg-region)
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3))))
+ `(modus-theme-heading-3
+ ((,class ,@(modus-operandi-theme-heading
+ 3 fg-special-cold blue blue-nuanced-bg bg-region)
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-2))))
+ `(modus-theme-heading-4
+ ((,class ,@(modus-operandi-theme-heading
+ 4 fg-special-mild cyan cyan-nuanced-bg bg-region)
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-1))))
+ `(modus-theme-heading-5
+ ((,class ,@(modus-operandi-theme-heading
+ 5 fg-special-calm green-alt-other green-nuanced-bg bg-region))))
+ `(modus-theme-heading-6
+ ((,class ,@(modus-operandi-theme-heading
+ 6 yellow-nuanced yellow-alt-other yellow-nuanced-bg bg-region))))
+ `(modus-theme-heading-7
+ ((,class ,@(modus-operandi-theme-heading
+ 7 red-nuanced red-alt red-nuanced-bg bg-region))))
+ `(modus-theme-heading-8
+ ((,class ,@(modus-operandi-theme-heading
+ 8 fg-dim magenta bg-alt bg-region))))
;;;;; other custom faces
`(modus-theme-hl-line ((,class :background ,(if modus-operandi-theme-intense-hl-line
- bg-active bg-hl-line)
+ bg-hl-line-intense bg-hl-line)
(and (>= emacs-major-version 27) '(:extend t)))))
;;;; standard faces
;;;;; absolute essentials
@@ -1149,26 +1477,25 @@ Also bind `class' to ((class color) (min-colors 89))."
`(bold ((,class :weight bold)))
`(comint-highlight-input ((,class :inherit bold)))
`(comint-highlight-prompt ((,class ,@(modus-operandi-theme-bold-weight)
- ,@(modus-operandi-theme-prompt cyan
- blue-nuanced-bg
- blue-alt
- blue-refine-bg
- fg-main))))
+ ,@(modus-operandi-theme-prompt
+ cyan
+ blue-nuanced-bg blue-alt
+ blue-refine-bg fg-main))))
`(error ((,class :inherit bold :foreground ,red)))
`(escape-glyph ((,class :foreground ,fg-escape-char-construct)))
`(file-name-shadow ((,class :foreground ,fg-unfocused)))
`(header-line ((,class :background ,bg-header :foreground ,fg-header)))
`(header-line-highlight ((,class :inherit modus-theme-active-blue)))
+ `(help-argument-name ((,class :foreground ,cyan :slant ,modus-theme-slant)))
`(homoglyph ((,class :foreground ,fg-escape-char-construct)))
`(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other)))
`(italic ((,class :slant italic)))
`(nobreak-hyphen ((,class :foreground ,fg-escape-char-construct)))
`(nobreak-space ((,class :foreground ,fg-escape-char-construct :underline t)))
- `(minibuffer-prompt ((,class ,@(modus-operandi-theme-prompt cyan-alt-other
- cyan-nuanced-bg
- cyan
- cyan-refine-bg
- fg-main))))
+ `(minibuffer-prompt ((,class ,@(modus-operandi-theme-prompt
+ cyan-alt-other
+ cyan-nuanced-bg cyan
+ cyan-refine-bg fg-main))))
`(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)))
@@ -1180,9 +1507,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(trailing-whitespace ((,class :background ,red-intense-bg)))
`(warning ((,class :inherit bold :foreground ,yellow)))
;;;;; buttons, links, widgets
- `(button ((,class :foreground ,blue-alt-other :underline t)))
- `(link ((,class :foreground ,blue-alt-other :underline t)))
- `(link-visited ((,class :foreground ,magenta-alt-other :underline t)))
+ `(button ((,class :foreground ,blue-alt-other
+ ,@(unless modus-operandi-theme-no-link-underline
+ (list :underline t)))))
+ `(link ((,class :inherit button)))
+ `(link-visited ((,class :inherit link :foreground ,magenta-alt-other)))
`(tooltip ((,class :background ,bg-special-cold :foreground ,fg-main)))
`(widget-button ((,class :inherit button)))
`(widget-button-pressed ((,class :inherit button :foreground ,magenta)))
@@ -1249,13 +1578,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(anzu-replace-highlight ((,class :inherit modus-theme-refine-yellow :underline t)))
`(anzu-replace-to ((,class :inherit (modus-theme-intense-green bold))))
;;;;; apropos
- `(apropos-function-button ((,class :foreground ,magenta-alt-other :underline t)))
+ `(apropos-function-button ((,class :inherit button :foreground ,magenta-alt-other)))
`(apropos-keybinding ((,class :inherit bold :foreground ,cyan)))
- `(apropos-misc-button ((,class :foreground ,cyan-alt-other :underline t)))
+ `(apropos-misc-button ((,class :inherit button :foreground ,cyan-alt-other)))
`(apropos-property ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-alt)))
- `(apropos-symbol ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,blue-nuanced :underline t)))
- `(apropos-user-option-button ((,class :foreground ,green-alt-other :underline t)))
- `(apropos-variable-button ((,class :foreground ,blue :underline t)))
+ `(apropos-symbol ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,blue-alt-other)))
+ `(apropos-user-option-button ((,class :inherit button :foreground ,green-alt-other)))
+ `(apropos-variable-button ((,class :inherit button :foreground ,blue)))
;;;;; apt-sources-list
`(apt-sources-list-components ((,class :foreground ,cyan)))
`(apt-sources-list-options ((,class :foreground ,yellow)))
@@ -1310,6 +1639,24 @@ Also bind `class' to ((class color) (min-colors 89))."
`(aw-leading-char-face ((,class :inherit bold :height 1.5 :background ,bg-main :foreground ,red-intense)))
`(aw-minibuffer-leading-char-face ((,class :foreground ,magenta-active)))
`(aw-mode-line-face ((,class :inherit bold)))
+;;;;; awesome-tray
+ `(awesome-tray-module-awesome-tab-face ((,class :inherit bold :foreground ,red-alt-other)))
+ `(awesome-tray-module-battery-face ((,class :inherit bold :foreground ,cyan-alt-other)))
+ `(awesome-tray-module-buffer-name-face ((,class :inherit bold :foreground ,yellow-alt-other)))
+ `(awesome-tray-module-circe-face ((,class :inherit bold :foreground ,blue-alt)))
+ `(awesome-tray-module-date-face ((,class :inherit bold :foreground ,fg-dim)))
+ `(awesome-tray-module-evil-face ((,class :inherit bold :foreground ,green-alt)))
+ `(awesome-tray-module-git-face ((,class :inherit bold :foreground ,magenta)))
+ `(awesome-tray-module-last-command-face ((,class :inherit bold :foreground ,blue-alt-other)))
+ `(awesome-tray-module-location-face ((,class :inherit bold :foreground ,yellow)))
+ `(awesome-tray-module-mode-name-face ((,class :inherit bold :foreground ,green)))
+ `(awesome-tray-module-parent-dir-face ((,class :inherit bold :foreground ,cyan)))
+ `(awesome-tray-module-rvm-face ((,class :inherit bold :foreground ,magenta-alt-other)))
+;;;;; binder
+ `(binder-sidebar-highlight ((,class :inherit modus-theme-subtle-cyan)))
+ `(binder-sidebar-marked ((,class :inherit modus-theme-mark-sel)))
+ `(binder-sidebar-missing ((,class :inherit modus-theme-subtle-red)))
+ `(binder-sidebar-tags ((,class :foreground ,cyan)))
;;;;; bm
`(bm-face ((,class :inherit modus-theme-subtle-yellow
,@(and (>= emacs-major-version 27) '(:extend t)))))
@@ -1351,26 +1698,27 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diary-time ((,class :foreground ,blue-alt)))
`(holiday ((,class :foreground ,magenta-alt)))
;;;;; calfw
- `(cfw:face-annotation ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(cfw:face-day-title ((,class :background ,bg-alt :foreground ,fg-main)))
+ `(cfw:face-annotation ((,class :foreground ,fg-special-warm)))
+ `(cfw:face-day-title ((,class :foreground ,fg-main)))
`(cfw:face-default-content ((,class :foreground ,green-alt)))
`(cfw:face-default-day ((,class :inherit (cfw:face-day-title bold))))
- `(cfw:face-disable ((,class :background ,bg-inactive :foreground ,fg-inactive)))
- `(cfw:face-grid ((,class :foreground ,fg-inactive)))
- `(cfw:face-header ((,class :inherit bold ::foreground ,fg-main)))
- `(cfw:face-holiday ((,class :inherit bold :background ,bg-alt :foreground ,magenta)))
+ `(cfw:face-disable ((,class :foreground ,fg-unfocused)))
+ `(cfw:face-grid ((,class :foreground ,fg-window-divider-outer)))
+ `(cfw:face-header ((,class :inherit bold :foreground ,fg-main)))
+ `(cfw:face-holiday ((,class :foreground ,magenta-alt-other)))
`(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
- `(cfw:face-saturday ((,class :inherit bold :background ,bg-alt :foreground ,magenta-alt)))
+ `(cfw:face-saturday ((,class :inherit bold :foreground ,cyan-alt-other)))
`(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
- `(cfw:face-sunday ((,class :inherit bold :background ,bg-alt :foreground ,magenta-alt-other)))
+ `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other)))
`(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch
- :foreground ,fg-special-warm
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4))))
- `(cfw:face-today ((,class :inherit bold :foreground ,blue)))
- `(cfw:face-today-title ((,class :inherit modus-theme-special-mild :box t)))
- `(cfw:face-toolbar ((,class :background ,bg-active :foreground ,bg-active)))
- `(cfw:face-toolbar-button-off ((,class :background ,bg-alt :foreground ,cyan)))
- `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,bg-main :foreground ,blue-intense)))
+ :foreground ,fg-special-cold
+ ,@(modus-operandi-theme-scale modus-operandi-theme-scale-5))))
+ `(cfw:face-today ((,class :background ,bg-inactive)))
+ `(cfw:face-today-title ((,class :background ,bg-active)))
+ `(cfw:face-toolbar ((,class :background ,bg-alt :foreground ,bg-alt)))
+ `(cfw:face-toolbar-button-off ((,class :foreground ,fg-alt)))
+ `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,blue-nuanced-bg
+ :foreground ,blue-alt)))
;;;;; centaur-tabs
`(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
`(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground ,red-active :underline t)))
@@ -1392,8 +1740,8 @@ Also bind `class' to ((class color) (min-colors 89))."
`(change-log-function ((,class :foreground ,green-alt-other)))
`(change-log-list ((,class :foreground ,magenta-alt-other)))
`(change-log-name ((,class :foreground ,cyan)))
- `(log-edit-header ((,class :inherit bold :foreground ,green-alt-other)))
- `(log-edit-summary ((,class :foreground ,magenta-alt-other)))
+ `(log-edit-header ((,class :foreground ,fg-special-warm)))
+ `(log-edit-summary ((,class :inherit bold :foreground ,cyan)))
`(log-edit-unknown-header ((,class :foreground ,fg-alt)))
`(log-view-file ((,class :inherit bold :foreground ,fg-special-cold)))
`(log-view-message ((,class :foreground ,fg-alt)))
@@ -1437,7 +1785,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(circe-highlight-nick-face ((,class :inherit bold :foreground ,blue)))
`(circe-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(circe-server-face ((,class :foreground ,fg-unfocused)))
- `(lui-button-face ((,class :foreground ,blue :underline t)))
+ `(lui-button-face ((,class :inherit button :foreground ,blue)))
`(lui-highlight-face ((,class :foreground ,magenta-alt)))
`(lui-time-stamp-face ((,class :foreground ,blue-nuanced)))
;;;;; color-rg
@@ -1490,12 +1838,12 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; completions
`(completions-annotations ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
`(completions-common-part ((,class ,@(modus-operandi-theme-standard-completions
- cyan-alt-other cyan-nuanced-bg
- yellow-refine-bg yellow-refine-fg))))
+ blue-alt blue-nuanced-bg
+ cyan-refine-bg cyan-refine-fg))))
`(completions-first-difference ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- blue-alt-other blue-nuanced-bg
- cyan-subtle-bg fg-dim))))
+ magenta-alt blue-nuanced-bg
+ magenta-intense-bg fg-main))))
;;;;; counsel
`(counsel-active-mode ((,class :foreground ,magenta-alt-other)))
`(counsel-application-name ((,class :foreground ,red-alt-other)))
@@ -1531,6 +1879,10 @@ Also bind `class' to ((class color) (min-colors 89))."
`(cov-light-face ((,class :foreground ,blue-intense)))
`(cov-med-face ((,class :foreground ,yellow-intense)))
`(cov-none-face ((,class :foreground ,cyan-intense)))
+;;;;; cperl-mode
+ `(cperl-nonoverridable-face ((,class :foreground ,yellow-alt-other)))
+ `(cperl-array-face ((,class :inherit bold :background ,bg-alt :foreground ,magenta-alt)))
+ `(cperl-hash-face ((,class :inherit bold :background ,bg-alt :foreground ,red-alt :slant ,modus-theme-slant)))
;;;;; csv-mode
`(csv-separator-face ((,class :background ,bg-special-cold :foreground ,fg-main)))
;;;;; ctrlf
@@ -1609,7 +1961,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(deft-title-face ((,class :inherit bold :foreground ,fg-main)))
;;;;; dictionary
`(dictionary-button-face ((,class :inherit bold :foreground ,fg-special-cold)))
- `(dictionary-reference-face ((,class :foreground ,blue-alt-other :underline t)))
+ `(dictionary-reference-face ((,class :inherit :foreground ,blue-alt-other)))
`(dictionary-word-definition-face ((,class :foreground ,fg-main)))
`(dictionary-word-entry-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
;;;;; diff-hl
@@ -1623,47 +1975,54 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diff-hl-insert ((,class :inherit modus-theme-fringe-green)))
`(diff-hl-reverted-hunk-highlight ((,class :inherit (modus-theme-active-magenta bold))))
;;;;; diff-mode
- `(diff-added ((,class ,@(modus-operandi-theme-diffs
- bg-main green
- bg-diff-focus-added fg-diff-focus-added))))
- `(diff-changed ((,class ,@(modus-operandi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
+ `(diff-added ((,class :inherit modus-theme-diff-added)))
+ `(diff-changed ((,class :inherit modus-theme-diff-changed)))
`(diff-context ((,class :foreground ,fg-unfocused)))
`(diff-file-header ((,class :inherit bold :foreground ,blue)))
`(diff-function ((,class :foreground ,fg-special-cold)))
`(diff-header ((,class :foreground ,blue-nuanced)))
- `(diff-hunk-header ((,class ,@(modus-operandi-theme-diffs
- bg-alt blue-alt
- bg-diff-heading fg-diff-heading))))
+ `(diff-hunk-header ((,class :inherit modus-theme-diff-heading)))
`(diff-index ((,class :inherit bold :foreground ,blue-alt)))
`(diff-indicator-added ((,class :inherit diff-added)))
`(diff-indicator-changed ((,class :inherit diff-changed)))
`(diff-indicator-removed ((,class :inherit diff-removed)))
`(diff-nonexistent ((,class :inherit (modus-theme-neutral bold))))
- `(diff-refine-added ((,class ,@(modus-operandi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added fg-diff-refine-added))))
- `(diff-refine-changed ((,class ,@(modus-operandi-theme-diffs
- bg-diff-changed fg-diff-changed
- bg-diff-refine-changed fg-diff-refine-changed))))
- `(diff-refine-removed ((,class ,@(modus-operandi-theme-diffs
- bg-diff-removed fg-diff-removed
- bg-diff-refine-removed fg-diff-refine-removed))))
- `(diff-removed ((,class ,@(modus-operandi-theme-diffs
- bg-main red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ `(diff-refine-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(diff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
+ `(diff-refine-removed ((,class :inherit modus-theme-diff-refine-removed)))
+ `(diff-removed ((,class :inherit modus-theme-diff-removed)))
;;;;; dim-autoload
`(dim-autoload-cookie-line ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+;;;;; dir-treeview
+ `(dir-treeview-archive-face ((,class :foreground ,fg-special-warm)))
+ `(dir-treeview-archive-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,yellow)))
+ `(dir-treeview-audio-face ((,class :foreground ,magenta)))
+ `(dir-treeview-audio-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,magenta-alt)))
+ `(dir-treeview-control-face ((,class :foreground ,fg-alt)))
+ `(dir-treeview-control-mouse-face ((,class :inherit highlight)))
+ `(dir-treeview-default-icon-face ((,class :inherit bold :family "Font Awesome" :foreground ,fg-alt)))
+ `(dir-treeview-default-filename-face ((,class :foreground ,fg-main)))
+ `(dir-treeview-directory-face ((,class :foreground ,blue)))
+ `(dir-treeview-directory-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,blue-alt)))
+ `(dir-treeview-executable-face ((,class :foreground ,red-alt)))
+ `(dir-treeview-executable-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,red-alt-other)))
+ `(dir-treeview-image-face ((,class :foreground ,green-alt-other)))
+ `(dir-treeview-image-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,green-alt)))
+ `(dir-treeview-indent-face ((,class :foreground ,fg-alt)))
+ `(dir-treeview-label-mouse-face ((,class :inherit highlight)))
+ `(dir-treeview-start-dir-face ((,class :inherit modus-theme-pseudo-header)))
+ `(dir-treeview-symlink-face ((,class :inherit button :foreground ,cyan)))
+ `(dir-treeview-video-face ((,class :foreground ,magenta-alt-other)))
+ `(dir-treeview-video-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,magenta-alt-other)))
;;;;; dired
`(dired-directory ((,class :foreground ,blue)))
`(dired-flagged ((,class :inherit modus-theme-mark-del)))
- `(dired-header ((,class :inherit modus-theme-header)))
+ `(dired-header ((,class :inherit modus-theme-pseudo-header)))
`(dired-ignored ((,class :foreground ,fg-alt)))
`(dired-mark ((,class :inherit modus-theme-mark-symbol)))
`(dired-marked ((,class :inherit modus-theme-mark-sel)))
`(dired-perm-write ((,class :foreground ,fg-special-warm)))
- `(dired-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(dired-symlink ((,class :inherit button :foreground ,cyan-alt)))
`(dired-warning ((,class :inherit bold :foreground ,yellow)))
;;;;; dired-async
`(dired-async-failures ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,red-active)))
@@ -1688,43 +2047,44 @@ Also bind `class' to ((class color) (min-colors 89))."
`(dired-subtree-depth-6-face ((,class :background nil)))
;;;;; diredfl
`(diredfl-autofile-name ((,class :inherit modus-theme-special-cold)))
- `(diredfl-compressed-file-name ((,class :foreground ,green-alt-other)))
- `(diredfl-compressed-file-suffix ((,class :foreground ,green-alt)))
- `(diredfl-date-time ((,class :foreground ,fg-special-cold)))
+ `(diredfl-compressed-file-name ((,class :foreground ,fg-special-warm)))
+ `(diredfl-compressed-file-suffix ((,class :foreground ,red-alt)))
+ `(diredfl-date-time ((,class :foreground ,cyan-alt-other)))
`(diredfl-deletion ((,class :inherit modus-theme-mark-del)))
`(diredfl-deletion-file-name ((,class :inherit modus-theme-mark-del)))
- `(diredfl-dir-heading ((,class :inherit modus-theme-header)))
+ `(diredfl-dir-heading ((,class :inherit modus-theme-pseudo-header)))
`(diredfl-dir-name ((,class :inherit dired-directory)))
- `(diredfl-dir-priv ((,class :foreground ,blue)))
- `(diredfl-exec-priv ((,class :foreground ,red-alt-other)))
- `(diredfl-executable-tag ((,class :foreground ,red-alt)))
+ `(diredfl-dir-priv ((,class :foreground ,blue-alt)))
+ `(diredfl-exec-priv ((,class :foreground ,magenta)))
+ `(diredfl-executable-tag ((,class :foreground ,magenta-alt)))
`(diredfl-file-name ((,class :foreground ,fg-main)))
- `(diredfl-file-suffix ((,class :foreground ,fg-special-warm)))
+ `(diredfl-file-suffix ((,class :foreground ,cyan)))
`(diredfl-flag-mark ((,class :inherit modus-theme-mark-sel)))
`(diredfl-flag-mark-line ((,class :inherit modus-theme-mark-sel)))
- `(diredfl-ignored-file-name ((,class :foreground ,fg-inactive)))
+ `(diredfl-ignored-file-name ((,class :foreground ,fg-alt)))
`(diredfl-link-priv ((,class :foreground ,blue-alt-other)))
- `(diredfl-no-priv ((,class :foreground ,fg-inactive)))
- `(diredfl-number ((,class :foreground ,cyan)))
+ `(diredfl-no-priv ((,class :foreground ,fg-alt)))
+ `(diredfl-number ((,class :foreground ,cyan-alt)))
`(diredfl-other-priv ((,class :foreground ,yellow)))
- `(diredfl-rare-priv ((,class :foreground ,magenta-alt-other)))
- `(diredfl-read-priv ((,class :foreground ,magenta)))
- `(diredfl-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(diredfl-rare-priv ((,class :foreground ,red-alt)))
+ `(diredfl-read-priv ((,class :foreground ,fg-main)))
+ `(diredfl-symlink ((,class :inherit dired-symlink)))
`(diredfl-tagged-autofile-name ((,class :inherit modus-theme-refine-magenta)))
- `(diredfl-write-priv ((,class :foreground ,cyan-alt-other)))
+ `(diredfl-write-priv ((,class :foreground ,cyan)))
;;;;; disk-usage
`(disk-usage-children ((,class :foreground ,yellow)))
`(disk-usage-inaccessible ((,class :inherit bold :foreground ,red)))
`(disk-usage-percent ((,class :foreground ,green)))
`(disk-usage-size ((,class :foreground ,cyan)))
- `(disk-usage-symlink ((,class :foreground ,blue :underline t)))
+ `(disk-usage-symlink ((,class :inherit button :foreground ,blue)))
`(disk-usage-symlink-directory ((,class :inherit bold :foreground ,blue-alt)))
;;;;; doom-modeline
`(doom-modeline-bar ((,class :inherit modus-theme-active-blue)))
`(doom-modeline-bar-inactive ((,class :background ,fg-inactive :foreground ,bg-main)))
`(doom-modeline-battery-charging ((,class :foreground ,green-active)))
`(doom-modeline-battery-critical ((,class :inherit bold :foreground ,red-active)))
- `(doom-modeline-battery-error ((,class :inherit modus-theme-active-red)))
+ `(doom-modeline-battery-error ((,class :inherit bold :box (:line-width -2)
+ :foreground ,red-active)))
`(doom-modeline-battery-full ((,class :foreground ,blue-active)))
`(doom-modeline-battery-normal ((,class :foreground ,fg-active)))
`(doom-modeline-battery-warning ((,class :inherit bold :foreground ,yellow-active)))
@@ -1781,18 +2141,24 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ebdb-role-defunct ((,class :foreground ,fg-alt)))
`(eieio-custom-slot-tag-face ((,class :foreground ,red-alt)))
;;;;; ediff
- `(ediff-current-diff-A ((,class ,@(modus-operandi-theme-diffs
- bg-alt red
- bg-diff-removed fg-diff-removed))))
- `(ediff-current-diff-Ancestor ((,class ,@(modus-operandi-theme-diffs
- bg-alt fg-special-cold
- bg-special-cold fg-special-cold))))
- `(ediff-current-diff-B ((,class ,@(modus-operandi-theme-diffs
- bg-alt green
- bg-diff-added fg-diff-added))))
- `(ediff-current-diff-C ((,class ,@(modus-operandi-theme-diffs
- bg-alt yellow
- bg-diff-changed fg-diff-changed))))
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces.
+ `(ediff-current-diff-A ((,class ,@(modus-operandi-theme-diff
+ bg-dim red
+ bg-diff-removed fg-diff-removed
+ red-nuanced-bg red-faint))))
+ `(ediff-current-diff-Ancestor ((,class ,@(modus-operandi-theme-diff
+ bg-dim fg-special-cold
+ bg-special-cold fg-special-cold
+ blue-nuanced-bg blue))))
+ `(ediff-current-diff-B ((,class ,@(modus-operandi-theme-diff
+ bg-dim green
+ bg-diff-added fg-diff-added
+ green-nuanced-bg green-faint))))
+ `(ediff-current-diff-C ((,class ,@(modus-operandi-theme-diff
+ bg-dim yellow
+ bg-diff-changed fg-diff-changed
+ yellow-nuanced-bg yellow-faint))))
`(ediff-even-diff-A ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1)))
`(ediff-even-diff-Ancestor ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-1)))
`(ediff-even-diff-B ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1)))
@@ -1812,6 +2178,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(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
+ ;; NOTE: see https://github.com/purcell/package-lint/issues/187
+ (list 'eldoc-highlight-function-argument `((,class :inherit bold :foreground ,blue-alt-other)))
;;;;; eldoc-box
`(eldoc-box-body ((,class :background ,bg-alt :foreground ,fg-main)))
`(eldoc-box-border ((,class :background ,fg-alt)))
@@ -1821,14 +2190,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(elfeed-log-error-level-face ((,class :foreground ,red)))
`(elfeed-log-info-level-face ((,class :foreground ,green)))
`(elfeed-log-warn-level-face ((,class :foreground ,yellow)))
- `(elfeed-search-date-face ((,class :foreground ,cyan)))
- `(elfeed-search-feed-face ((,class :foreground ,blue)))
- `(elfeed-search-filter-face ((,class :foreground ,magenta-active)))
- `(elfeed-search-last-update-face ((,class :foreground ,green-active)))
- `(elfeed-search-tag-face ((,class :foreground ,cyan-alt-other)))
- `(elfeed-search-title-face ((,class :foreground ,fg-main)))
- `(elfeed-search-unread-count-face ((,class :foreground ,blue-active)))
- `(elfeed-search-unread-title-face ((,class :inherit bold)))
+ `(elfeed-search-date-face ((,class :foreground ,blue-nuanced)))
+ `(elfeed-search-feed-face ((,class :foreground ,cyan)))
+ `(elfeed-search-filter-face ((,class :inherit bold :foreground ,magenta-active)))
+ `(elfeed-search-last-update-face ((,class :foreground ,cyan-active)))
+ `(elfeed-search-tag-face ((,class :foreground ,blue-nuanced)))
+ `(elfeed-search-title-face ((,class :foreground ,fg-dim)))
+ `(elfeed-search-unread-count-face ((,class :foreground ,green-active)))
+ `(elfeed-search-unread-title-face ((,class :inherit bold :foreground ,fg-main)))
;;;;; elfeed-score
`(elfeed-score-date-face ((,class :foreground ,blue)))
`(elfeed-score-debug-level-face ((,class :foreground ,magenta-alt-other)))
@@ -1888,6 +2257,38 @@ Also bind `class' to ((class color) (min-colors 89))."
`(erc-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(erc-timestamp-face ((,class :foreground ,blue-nuanced)))
`(erc-underline-face ((,class :underline t)))
+ `(bg:erc-color-face0 ((,class :background "white")))
+ `(bg:erc-color-face1 ((,class :background "black")))
+ `(bg:erc-color-face10 ((,class :background ,cyan-subtle-bg)))
+ `(bg:erc-color-face11 ((,class :background ,cyan-intense-bg)))
+ `(bg:erc-color-face12 ((,class :background ,blue-subtle-bg)))
+ `(bg:erc-color-face13 ((,class :background ,magenta-subtle-bg)))
+ `(bg:erc-color-face14 ((,class :background "gray60")))
+ `(bg:erc-color-face15 ((,class :background "gray80")))
+ `(bg:erc-color-face2 ((,class :background ,blue-intense-bg)))
+ `(bg:erc-color-face3 ((,class :background ,green-intense-bg)))
+ `(bg:erc-color-face4 ((,class :background ,red-subtle-bg)))
+ `(bg:erc-color-face5 ((,class :background ,red-intense-bg)))
+ `(bg:erc-color-face6 ((,class :background ,magenta-refine-bg)))
+ `(bg:erc-color-face7 ((,class :background ,yellow-subtle-bg)))
+ `(bg:erc-color-face8 ((,class :background ,yellow-refine-bg)))
+ `(bg:erc-color-face9 ((,class :background ,green-subtle-bg)))
+ `(fg:erc-color-face0 ((,class :foreground "white")))
+ `(fg:erc-color-face1 ((,class :foreground "black")))
+ `(fg:erc-color-face10 ((,class :foreground ,cyan)))
+ `(fg:erc-color-face11 ((,class :foreground ,cyan-alt-other)))
+ `(fg:erc-color-face12 ((,class :foreground ,blue)))
+ `(fg:erc-color-face13 ((,class :foreground ,magenta-alt)))
+ `(fg:erc-color-face14 ((,class :foreground "gray60")))
+ `(fg:erc-color-face15 ((,class :foreground "gray80")))
+ `(fg:erc-color-face2 ((,class :foreground ,blue-alt-other)))
+ `(fg:erc-color-face3 ((,class :foreground ,green)))
+ `(fg:erc-color-face4 ((,class :foreground ,red)))
+ `(fg:erc-color-face5 ((,class :foreground ,red-alt)))
+ `(fg:erc-color-face6 ((,class :foreground ,magenta-alt-other)))
+ `(fg:erc-color-face7 ((,class :foreground ,yellow-alt-other)))
+ `(fg:erc-color-face8 ((,class :foreground ,yellow-alt)))
+ `(fg:erc-color-face9 ((,class :foreground ,green-alt-other)))
;;;;; eros
`(eros-result-overlay-face ((,class :box (:line-width -1 :color ,blue)
:background ,bg-dim :foreground ,fg-dim)))
@@ -1904,14 +2305,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(eshell-ls-product ((,class :foreground ,fg-special-warm)))
`(eshell-ls-readonly ((,class :foreground ,fg-special-cold)))
`(eshell-ls-special ((,class :inherit bold :foreground ,magenta)))
- `(eshell-ls-symlink ((,class :foreground ,cyan :underline t)))
+ `(eshell-ls-symlink ((,class :inherit button :foreground ,cyan)))
`(eshell-ls-unreadable ((,class :background ,bg-inactive :foreground ,fg-inactive)))
`(eshell-prompt ((,class ,@(modus-operandi-theme-bold-weight)
- ,@(modus-operandi-theme-prompt green-alt-other
- green-nuanced-bg
- green-alt
- green-refine-bg
- fg-main))))
+ ,@(modus-operandi-theme-prompt
+ green-alt-other
+ green-nuanced-bg green-alt
+ green-refine-bg fg-main))))
;;;;; eshell-fringe-status
`(eshell-fringe-status-failure ((,class :foreground ,red)))
`(eshell-fringe-status-success ((,class :foreground ,green)))
@@ -1939,6 +2339,15 @@ Also bind `class' to ((class color) (min-colors 89))."
`(epe-remote-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
`(epe-status-face ((,class :foreground ,magenta-alt-other)))
`(epe-venv-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+;;;;; eshell-syntax-highlighting
+ `(eshell-syntax-highlighting-alias-face ((,class :foreground ,cyan)))
+ `(eshell-syntax-highlighting-comment-face ((,class :foreground ,fg-alt)))
+ `(eshell-syntax-highlighting-directory-face ((,class :foreground ,blue)))
+ `(eshell-syntax-highlighting-envvar-face ((,class :foreground ,magenta-alt)))
+ `(eshell-syntax-highlighting-invalid-face ((,class :foreground ,red)))
+ `(eshell-syntax-highlighting-lisp-function-face ((,class :foreground ,magenta)))
+ `(eshell-syntax-highlighting-shell-command-face ((,class :foreground ,cyan-alt-other)))
+ `(eshell-syntax-highlighting-string-face ((,class :foreground ,blue-alt)))
;;;;; evil-mode
`(evil-ex-commands ((,class :foreground ,magenta-alt-other)))
`(evil-ex-info ((,class :foreground ,cyan-alt-other)))
@@ -2006,6 +2415,11 @@ Also bind `class' to ((class color) (min-colors 89))."
((,(append '((supports :underline (:style wave))) class)
:underline (:color ,fg-lang-warning :style wave))
(,class :foreground ,fg-lang-warning :underline t)))
+;;;;; flycheck-color-mode-line
+ `(flycheck-color-mode-line-error-face ((,class :inherit flycheck-fringe-error)))
+ `(flycheck-color-mode-line-info-face ((,class :inherit flycheck-fringe-info)))
+ `(flycheck-color-mode-line-running-face ((,class :foreground ,fg-inactive :slant italic)))
+ `(flycheck-color-mode-line-info-face ((,class :inherit flycheck-fringe-warning)))
;;;;; flycheck-indicator
`(flycheck-indicator-disabled ((,class :foreground ,fg-inactive :slant ,modus-theme-slant)))
`(flycheck-indicator-error ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,red-active)))
@@ -2049,7 +2463,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-subtle-magenta
'modus-theme-intense-magenta
'modus-theme-nuanced-magenta
- magenta-alt-other
+ magenta-alt
'bold))))
;;;;; freeze-it
`(freeze-it-show ((,class :background ,bg-dim :foreground ,fg-special-warm)))
@@ -2157,18 +2571,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(git-commit-comment-branch-remote ((,class :foreground ,magenta-alt :slant ,modus-theme-slant)))
`(git-commit-comment-detached ((,class :foreground ,cyan-alt :slant ,modus-theme-slant)))
`(git-commit-comment-file ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
- `(git-commit-comment-heading ((,class :inherit bold :foreground ,fg-alt :slant ,modus-theme-slant)))
+ `(git-commit-comment-heading ((,class :inherit bold :foreground ,fg-dim :slant ,modus-theme-slant)))
`(git-commit-keyword ((,class :foreground ,magenta)))
- `(git-commit-known-pseudo-header ((,class :inherit bold :foreground ,fg-special-warm)))
+ `(git-commit-known-pseudo-header ((,class :foreground ,cyan-alt-other)))
`(git-commit-nonempty-second-line ((,class :inherit modus-theme-refine-yellow)))
`(git-commit-overlong-summary ((,class :inherit modus-theme-refine-yellow)))
- `(git-commit-pseudo-header ((,class :inherit bold :foreground ,fg-alt)))
- `(git-commit-summary ((,class :foreground ,magenta-alt-other)))
-;;;;; git-rebase
- `(git-rebase-comment-hash ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
- `(git-rebase-comment-heading ((,class :inherit bold :foreground ,fg-dim :slant ,modus-theme-slant)))
- `(git-rebase-description ((,class :foreground ,fg-main)))
- `(git-rebase-hash ((,class :foreground ,cyan-alt-other)))
+ `(git-commit-pseudo-header ((,class :foreground ,blue)))
+ `(git-commit-summary ((,class :inherit bold :foreground ,cyan)))
;;;;; git-gutter
`(git-gutter:added ((,class :inherit modus-theme-fringe-green)))
`(git-gutter:deleted ((,class :inherit modus-theme-fringe-red)))
@@ -2194,13 +2603,18 @@ Also bind `class' to ((class color) (min-colors 89))."
`(git-lens-header ((,class :inherit bold :height 1.1 :foreground ,cyan)))
`(git-lens-modified ((,class :inherit bold :foreground ,yellow)))
`(git-lens-renamed ((,class :inherit bold :foreground ,magenta)))
+;;;;; git-rebase
+ `(git-rebase-comment-hash ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
+ `(git-rebase-comment-heading ((,class :inherit bold :foreground ,fg-dim :slant ,modus-theme-slant)))
+ `(git-rebase-description ((,class :foreground ,fg-main)))
+ `(git-rebase-hash ((,class :foreground ,cyan-alt-other)))
;;;;; git-timemachine
`(git-timemachine-commit ((,class :inherit bold :foreground ,yellow-active)))
`(git-timemachine-minibuffer-author-face ((,class :foreground ,fg-special-warm)))
`(git-timemachine-minibuffer-detail-face ((,class :foreground ,red-alt)))
;;;;; git-walktree
`(git-walktree-commit-face ((,class :foreground ,yellow)))
- `(git-walktree-symlink-face ((,class :foreground ,cyan :underline t)))
+ `(git-walktree-symlink-face ((,class :inherit button :foreground ,cyan)))
`(git-walktree-tree-face ((,class :foreground ,magenta)))
;;;;; gnus
`(gnus-button ((,class :inherit button)))
@@ -2239,9 +2653,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(gnus-group-news-6-empty ((,class :foreground ,fg-alt)))
`(gnus-group-news-low ((,class :inherit bold :foreground ,green-nuanced)))
`(gnus-group-news-low-empty ((,class :foreground ,green-nuanced)))
- `(gnus-header-content ((,class :foreground ,fg-special-calm)))
- `(gnus-header-from ((,class :inherit bold :foreground ,cyan-alt :underline nil)))
- `(gnus-header-name ((,class :foreground ,cyan-alt-other)))
+ `(gnus-header-content ((,class :foreground ,cyan)))
+ `(gnus-header-from ((,class :inherit bold :foreground ,cyan-alt-other :underline nil)))
+ `(gnus-header-name ((,class :foreground ,green)))
`(gnus-header-newsgroups ((,class :inherit bold :foreground ,blue-alt)))
`(gnus-header-subject ((,class :inherit bold :foreground ,magenta-alt-other)))
`(gnus-server-agent ((,class :inherit bold :foreground ,cyan)))
@@ -2260,12 +2674,12 @@ Also bind `class' to ((class color) (min-colors 89))."
`(gnus-summary-high-undownloaded ((,class :inherit bold :foreground ,yellow)))
`(gnus-summary-high-unread ((,class :inherit bold :foreground ,fg-main)))
`(gnus-summary-low-ancient ((,class :foreground ,fg-alt :slant italic)))
- `(gnus-summary-low-read ((,class :foreground ,fg-special-cold :slant italic)))
+ `(gnus-summary-low-read ((,class :foreground ,fg-alt :slant italic)))
`(gnus-summary-low-ticked ((,class :foreground ,red-refine-fg :slant italic)))
`(gnus-summary-low-undownloaded ((,class :foreground ,yellow-refine-fg :slant italic)))
`(gnus-summary-low-unread ((,class :inherit bold :foreground ,fg-special-cold)))
`(gnus-summary-normal-ancient ((,class :foreground ,fg-special-calm)))
- `(gnus-summary-normal-read ((,class :foreground ,fg-special-cold)))
+ `(gnus-summary-normal-read ((,class :foreground ,fg-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)))
@@ -2309,11 +2723,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(helm-ff-directory ((,class :inherit helm-buffer-directory)))
`(helm-ff-dirs ((,class :inherit bold :foreground ,blue-alt-other)))
`(helm-ff-dotted-directory ((,class :inherit bold :background ,bg-alt :foreground ,fg-alt)))
- `(helm-ff-dotted-symlink-directory ((,class :inherit helm-ff-dotted-directory :underline t)))
+ `(helm-ff-dotted-symlink-directory ((,class :inherit (button helm-ff-dotted-directory))))
`(helm-ff-executable ((,class :foreground ,magenta-alt)))
`(helm-ff-file ((,class :foreground ,fg-main)))
`(helm-ff-file-extension ((,class :foreground ,fg-special-warm)))
- `(helm-ff-invalid-symlink ((,class :foreground ,red :underline t)))
+ `(helm-ff-invalid-symlink ((,class :inherit button :foreground ,red)))
`(helm-ff-pipe ((,class ,@(modus-operandi-theme-extra-completions
'modus-theme-refine-magenta
'modus-theme-subtle-magenta
@@ -2330,7 +2744,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-refine-red
'modus-theme-nuanced-yellow
red-alt))))
- `(helm-ff-symlink ((,class :foreground ,cyan :underline t)))
+ `(helm-ff-symlink ((,class :inherit button :foreground ,cyan)))
`(helm-ff-truename ((,class :foreground ,blue-alt-other)))
`(helm-grep-cmd-line ((,class :foreground ,yellow-alt-other)))
`(helm-grep-file ((,class :inherit bold :foreground ,fg-special-cold)))
@@ -2366,7 +2780,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-nuanced-cyan
cyan-alt-other))))
`(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt)))
- `(helm-moccur-buffer ((,class :foreground ,cyan-alt-other :underline t)))
+ `(helm-moccur-buffer ((,class :inherit button :foreground ,cyan-alt-other)))
`(helm-mode-prefix ((,class ,@(modus-operandi-theme-extra-completions
'modus-theme-subtle-magenta
'modus-theme-intense-magenta
@@ -2416,8 +2830,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(helm-xref-file-name ((,class :inherit bold :foreground ,fg-special-cold)))
`(helm-xref-file-name ((,class :foreground ,fg-special-warm)))
;;;;; helpful
- `(helpful-heading ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4))))
+ `(helpful-heading ((,class :inherit modus-theme-heading-1)))
;;;;; highlight region or ad-hoc regexp
`(hi-black-b ((,class :background ,fg-main :foreground ,bg-main)))
`(hi-blue ((,class :background ,bg-alt :foreground ,blue :underline t)))
@@ -2487,23 +2900,23 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; icomplete
`(icomplete-first-match ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- magenta magenta-nuanced-bg
- magenta-intense-bg fg-main))))
+ magenta bg-alt
+ bg-active fg-main))))
;;;;; icomplete-vertical
`(icomplete-vertical-separator ((,class :foreground ,fg-alt)))
;;;;; ido-mode
`(ido-first-match ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- magenta magenta-nuanced-bg
- magenta-subtle-bg fg-main))))
+ magenta bg-alt
+ bg-active fg-main))))
`(ido-incomplete-regexp ((,class :inherit error)))
`(ido-indicator ((,class :inherit modus-theme-subtle-yellow)))
`(ido-only-match ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- magenta-intense red-nuanced-bg
- magenta-intense-bg fg-main))))
- `(ido-subdir ((,class :foreground ,blue-alt-other)))
- `(ido-virtual ((,class :foreground ,yellow-alt-other)))
+ green green-nuanced-bg
+ green-intense-bg fg-main))))
+ `(ido-subdir ((,class :foreground ,blue)))
+ `(ido-virtual ((,class :foreground ,fg-special-warm)))
;;;;; iedit
`(iedit-occurrence ((,class :inherit modus-theme-refine-blue)))
`(iedit-read-only-occurrence ((,class :inherit modus-theme-intense-yellow)))
@@ -2521,29 +2934,25 @@ Also bind `class' to ((class color) (min-colors 89))."
`(imenu-list-entry-subalist-face-3 ((,class :inherit bold :foreground ,red-alt-other :underline t)))
;;;;; indium
`(indium-breakpoint-face ((,class :foreground ,red-active)))
- `(indium-frame-url-face ((,class :foreground ,fg-alt :underline t)))
+ `(indium-frame-url-face ((,class :inherit button :foreground ,fg-alt)))
`(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 :inherit bold :foreground ,red)))
`(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-quoted ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,magenta))) ; the capitalisation is canonical
`(info-header-node ((,class :inherit bold :foreground ,fg-alt)))
`(info-header-xref ((,class :foreground ,blue-active)))
`(info-index-match ((,class :inherit match)))
- `(info-menu-header ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-2))))
- `(info-menu-star ((,class :foreground ,fg-main)))
+ `(info-menu-header ((,class :inherit modus-theme-heading-3)))
+ `(info-menu-star ((,class :foreground ,red)))
`(info-node ((,class :inherit bold)))
- `(info-title-1 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4))))
- `(info-title-2 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-warm
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3))))
- `(info-title-3 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-cold
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-2))))
- `(info-title-4 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-mild
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-1))))
+ `(info-title-1 ((,class :inherit modus-theme-heading-1)))
+ `(info-title-2 ((,class :inherit modus-theme-heading-2)))
+ `(info-title-3 ((,class :inherit modus-theme-heading-3)))
+ `(info-title-4 ((,class :inherit modus-theme-heading-4)))
;;;;; info-colors
`(info-colors-lisp-code-block ((,class :inherit fixed-pitch)))
`(info-colors-ref-item-command ((,class :foreground ,magenta)))
@@ -2689,13 +3098,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(kaocha-runner-warning-face ((,class :foreground ,yellow)))
;;;;; keycast
`(keycast-command ((,class :inherit bold :foreground ,blue-active)))
- `(keycast-key ((,class :box ,(modus-operandi-theme-modeline-box blue-alt blue-active t -3)
- ,@(modus-operandi-theme-modeline-props
- blue-active bg-main
- blue-active bg-active))))
+ `(keycast-key ((,class ,@(modus-operandi-theme-mode-line-attrs
+ bg-main blue-active
+ bg-main blue-active
+ blue-active blue-intense
+ 'alt-style -3))))
;;;;; line numbers (display-line-numbers-mode and global variant)
- `(line-number ((,class :background ,bg-dim :foreground ,fg-alt)))
- `(line-number-current-line ((,class :inherit bold :background ,bg-active :foreground ,fg-active)))
+ `(line-number ((,class :inherit default :background ,bg-dim :foreground ,fg-alt)))
+ `(line-number-current-line ((,class :inherit default :background ,bg-active :foreground ,fg-main)))
;;;;; lsp-mode
`(lsp-face-highlight-read ((,class :inherit modus-theme-subtle-blue :underline t)))
`(lsp-face-highlight-textual ((,class :inherit modus-theme-subtle-blue)))
@@ -2725,7 +3135,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(lsp-lens-mouse-face ((,class :height 0.8 :foreground ,blue-alt-other :underline t)))
`(lsp-ui-doc-background ((,class :background ,bg-alt)))
`(lsp-ui-doc-header ((,class :background ,bg-header :foreground ,fg-header)))
- `(lsp-ui-doc-url ((,class :foreground ,blue-alt-other :underline t)))
+ `(lsp-ui-doc-url ((,class :inherit button :foreground ,blue-alt-other)))
`(lsp-ui-peek-filename ((,class :foreground ,fg-special-warm)))
`(lsp-ui-peek-footer ((,class :background ,bg-header :foreground ,fg-header)))
`(lsp-ui-peek-header ((,class :background ,bg-header :foreground ,fg-header)))
@@ -2757,37 +3167,43 @@ Also bind `class' to ((class color) (min-colors 89))."
`(magit-branch-upstream ((,class :slant italic)))
`(magit-cherry-equivalent ((,class :background ,bg-main :foreground ,magenta-intense)))
`(magit-cherry-unmatched ((,class :background ,bg-main :foreground ,cyan-intense)))
- `(magit-diff-added ((,class ,@(modus-operandi-theme-diffs
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces, though only for the standard actions,
+ ;; not the highlighted ones. This is because Magit's interaction
+ ;; model relies on highlighting the current diff hunk.
+ `(magit-diff-added ((,class ,@(modus-operandi-theme-diff
bg-main green
- bg-diff-added fg-diff-added))))
- `(magit-diff-added-highlight ((,class ,@(modus-operandi-theme-diffs
- bg-dim green
- bg-diff-focus-added fg-diff-focus-added))))
- `(magit-diff-base ((,class ,@(modus-operandi-theme-diffs
+ bg-diff-added fg-diff-added
+ green-nuanced-bg fg-diff-added))))
+ `(magit-diff-added-highlight ((,class :inherit modus-theme-diff-focus-added)))
+ `(magit-diff-base ((,class ,@(modus-operandi-theme-diff
bg-main yellow
- bg-diff-changed fg-diff-changed))))
- `(magit-diff-base-highlight ((,class ,@(modus-operandi-theme-diffs
- bg-dim yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
+ bg-diff-changed fg-diff-changed
+ yellow-nuanced-bg fg-diff-changed))))
+ `(magit-diff-base-highlight ((,class :inherit modus-theme-diff-focus-changed)))
`(magit-diff-context ((,class :foreground ,fg-unfocused)))
- `(magit-diff-context-highlight ((,class ,@(modus-operandi-theme-diffs
+ `(magit-diff-context-highlight ((,class ,@(modus-operandi-theme-diff
bg-dim fg-dim
- bg-inactive fg-inactive))))
+ bg-inactive fg-inactive
+ bg-dim fg-alt))))
`(magit-diff-file-heading ((,class :inherit bold :foreground ,fg-special-cold)))
`(magit-diff-file-heading-highlight ((,class :inherit (modus-theme-special-cold bold))))
- `(magit-diff-file-heading-selection ((,class :background ,bg-alt :foreground ,cyan)))
- `(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active :foreground ,fg-inactive)))
- `(magit-diff-hunk-heading-highlight ((,class :inherit (modus-theme-diff-heading bold))))
- `(magit-diff-hunk-heading-selection ((,class :inherit modus-theme-intense-cyan)))
+ `(magit-diff-file-heading-selection ((,class :inherit modus-theme-refine-cyan)))
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces.
+ `(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active
+ :foreground ,fg-inactive)))
+ `(magit-diff-hunk-heading-highlight ((,class :inherit bold :background ,bg-diff-heading
+ :foreground ,fg-diff-heading)))
+ `(magit-diff-hunk-heading-selection ((,class :inherit modus-theme-refine-blue)))
`(magit-diff-hunk-region ((,class :inherit bold)))
`(magit-diff-lines-boundary ((,class :background ,fg-main)))
`(magit-diff-lines-heading ((,class :inherit modus-theme-refine-magenta)))
- `(magit-diff-removed ((,class ,@(modus-operandi-theme-diffs
+ `(magit-diff-removed ((,class ,@(modus-operandi-theme-diff
bg-main red
- bg-diff-removed fg-diff-removed))))
- `(magit-diff-removed-highlight ((,class ,@(modus-operandi-theme-diffs
- bg-dim red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ bg-diff-removed fg-diff-removed
+ red-nuanced-bg fg-diff-removed))))
+ `(magit-diff-removed-highlight ((,class :inherit modus-theme-diff-focus-removed)))
`(magit-diffstat-added ((,class :foreground ,green)))
`(magit-diffstat-removed ((,class :foreground ,red)))
`(magit-dimmed ((,class :foreground ,fg-unfocused)))
@@ -2846,26 +3262,40 @@ Also bind `class' to ((class color) (min-colors 89))."
`(Man-reverse ((,class :inherit modus-theme-subtle-magenta)))
`(Man-underline ((,class :foreground ,cyan :underline t)))
;;;;; markdown-mode
- `(markdown-blockquote-face ((,class :foreground ,fg-special-warm :slant ,modus-theme-slant)))
+ `(markdown-blockquote-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
`(markdown-bold-face ((,class :inherit bold)))
- `(markdown-code-face ((,class :inherit fixed-pitch)))
+ `(markdown-code-face ((,class ,@(modus-operandi-theme-mixed-fonts))))
`(markdown-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
`(markdown-footnote-marker-face ((,class :inherit bold :foreground ,cyan-alt)))
`(markdown-footnote-text-face ((,class :foreground ,fg-main :slant ,modus-theme-slant)))
`(markdown-gfm-checkbox-face ((,class :foreground ,cyan-alt-other)))
`(markdown-header-delimiter-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,fg-dim)))
- `(markdown-header-face ((,class :inherit bold)))
+ `(markdown-header-face ((t nil)))
+ `(markdown-header-face-1 ((,class :inherit modus-theme-heading-1)))
+ `(markdown-header-face-2 ((,class :inherit modus-theme-heading-2)))
+ `(markdown-header-face-3 ((,class :inherit modus-theme-heading-3)))
+ `(markdown-header-face-4 ((,class :inherit modus-theme-heading-4)))
+ `(markdown-header-face-5 ((,class :inherit modus-theme-heading-5)))
+ `(markdown-header-face-6 ((,class :inherit modus-theme-heading-6)))
`(markdown-header-rule-face ((,class :inherit bold :foreground ,fg-special-warm)))
`(markdown-hr-face ((,class :inherit bold :foreground ,fg-special-warm)))
- `(markdown-html-attr-name-face ((,class :inherit fixed-pitch :foreground ,cyan)))
- `(markdown-html-attr-value-face ((,class :inherit fixed-pitch :foreground ,blue)))
- `(markdown-html-entity-face ((,class :inherit fixed-pitch :foreground ,cyan)))
- `(markdown-html-tag-delimiter-face ((,class :inherit fixed-pitch :foreground ,fg-special-mild)))
- `(markdown-html-tag-name-face ((,class :inherit fixed-pitch :foreground ,magenta-alt)))
- `(markdown-inline-code-face ((,class :inherit fixed-pitch :foreground ,magenta)))
+ `(markdown-html-attr-name-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,cyan)))
+ `(markdown-html-attr-value-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,blue)))
+ `(markdown-html-entity-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,cyan)))
+ `(markdown-html-tag-delimiter-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-special-mild)))
+ `(markdown-html-tag-name-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,magenta-alt)))
+ `(markdown-inline-code-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,magenta)))
`(markdown-italic-face ((,class :foreground ,fg-special-cold :slant italic)))
- `(markdown-language-info-face ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
- `(markdown-language-keyword-face ((,class :inherit fixed-pitch :foreground ,green-alt-other)))
+ `(markdown-language-info-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(markdown-language-keyword-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,green-alt-other)))
`(markdown-line-break-face ((,class :inherit modus-theme-refine-cyan :underline t)))
`(markdown-link-face ((,class :inherit link)))
`(markdown-link-title-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
@@ -2877,12 +3307,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(markdown-missing-link-face ((,class :inherit bold :foreground ,yellow)))
`(markdown-plain-url-face ((,class :inherit markdown-link-face)))
`(markdown-pre-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
- :inherit fixed-pitch :background ,bg-dim
+ ,@(modus-operandi-theme-mixed-fonts)
+ :background ,bg-dim
:foreground ,fg-special-mild)))
`(markdown-reference-face ((,class :inherit markdown-markup-face)))
`(markdown-strike-through-face ((,class :strike-through t)))
- `(markdown-table-face ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
- `(markdown-url-face ((,class :foreground ,blue)))
+ `(markdown-table-face ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(markdown-url-face ((,class :foreground ,blue-alt)))
;;;;; markup-faces (`adoc-mode')
`(markup-anchor-face ((,class :foreground ,fg-inactive)))
`(markup-attribute-face ((,class :foreground ,fg-inactive :slant italic)))
@@ -2896,7 +3328,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(markup-emphasis-face ((,class :foreground ,fg-special-cold :slant italic)))
`(markup-error-face ((,class :inherit bold :foreground ,red)))
`(markup-gen-face ((,class :foreground ,magenta-alt)))
- `(markup-internal-reference-face ((,class :foreground ,fg-inactive :underline t)))
+ `(markup-internal-reference-face ((,class :inherit button :foreground ,fg-inactive)))
`(markup-italic-face ((,class :foreground ,fg-special-cold :slant italic)))
`(markup-list-face ((,class :inherit modus-theme-special-calm)))
`(markup-meta-face ((,class :foreground ,fg-inactive)))
@@ -2935,32 +3367,30 @@ Also bind `class' to ((class color) (min-colors 89))."
`(message-cited-text-2 ((,class :foreground ,red-alt)))
`(message-cited-text-3 ((,class :foreground ,green-alt)))
`(message-cited-text-4 ((,class :foreground ,magenta-alt)))
- `(message-header-cc ((,class :foreground ,blue-alt)))
+ `(message-header-cc ((,class :inherit bold :foreground ,cyan-alt)))
`(message-header-name ((,class :foreground ,green-alt-other)))
- `(message-header-newsgroups ((,class :inherit bold :foreground ,blue)))
+ `(message-header-newsgroups ((,class :inherit bold :foreground ,green-alt)))
`(message-header-other ((,class :inherit bold :foreground ,cyan-alt-other)))
`(message-header-subject ((,class :inherit bold :foreground ,magenta-alt-other)))
- `(message-header-to ((,class :inherit bold :foreground ,magenta-alt)))
- `(message-header-xheader ((,class :foreground ,blue-alt-other)))
- `(message-mml ((,class :foreground ,green-alt)))
- `(message-separator ((,class :background ,bg-active :foreground ,fg-special-warm)))
+ `(message-header-to ((,class :inherit bold :foreground ,blue)))
+ `(message-header-xheader ((,class :foreground ,cyan)))
+ `(message-mml ((,class :foreground ,fg-special-warm)))
+ `(message-separator ((,class :inherit modus-theme-intense-neutral)))
;;;;; minibuffer-line
`(minibuffer-line ((,class :foreground ,fg-main)))
;;;;; 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-active fg-alt t)
- ,@(modus-operandi-theme-modeline-props
- bg-active fg-dim
- bg-active fg-active))))
+ `(mode-line ((,class ,@(modus-operandi-theme-mode-line-attrs
+ fg-active bg-active fg-dim bg-active
+ fg-alt bg-active 'alt-style nil bg-main))))
`(mode-line-buffer-id ((,class :inherit bold)))
`(mode-line-emphasis ((,class :inherit bold :foreground ,blue-active)))
`(mode-line-highlight ((,class :inherit modus-theme-active-blue :box (:line-width -1 :style pressed-button))))
- `(mode-line-inactive ((,class :box ,(modus-operandi-theme-modeline-box bg-active bg-region)
- ,@(modus-operandi-theme-modeline-props
- bg-dim fg-inactive
- bg-inactive fg-inactive))))
+ `(mode-line-inactive ((,class ,@(modus-operandi-theme-mode-line-attrs
+ fg-inactive bg-inactive fg-alt bg-dim
+ bg-region bg-active))))
;;;;; mood-line
`(mood-line-modified ((,class :foreground ,magenta-active)))
`(mood-line-status-error ((,class :inherit bold :foreground ,red-active)))
@@ -2969,6 +3399,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mood-line-status-success ((,class :foreground ,green-active)))
`(mood-line-status-warning ((,class :inherit bold :foreground ,yellow-active)))
`(mood-line-unimportant ((,class :foreground ,fg-inactive)))
+;;;;; mpdel
+ `(mpdel-browser-directory-face ((,class :foreground ,blue)))
+ `(mpdel-playlist-current-song-face ((,class :inherit bold :foreground ,blue-alt-other)))
;;;;; mu4e
`(mu4e-attach-number-face ((,class :inherit bold :foreground ,cyan-alt)))
`(mu4e-cited-1-face ((,class :foreground ,blue-alt)))
@@ -2979,7 +3412,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mu4e-cited-6-face ((,class :foreground ,cyan-alt)))
`(mu4e-cited-7-face ((,class :foreground ,magenta)))
`(mu4e-compose-header-face ((,class :inherit mu4e-compose-separator-face)))
- `(mu4e-compose-separator-face ((,class :background ,bg-active :foreground ,fg-special-warm)))
+ `(mu4e-compose-separator-face ((,class :inherit modus-theme-intense-neutral)))
`(mu4e-contact-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(mu4e-context-face ((,class :foreground ,blue-active)))
`(mu4e-draft-face ((,class :foreground ,magenta-alt)))
@@ -2998,7 +3431,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mu4e-moved-face ((,class :foreground ,yellow :slant ,modus-theme-slant)))
`(mu4e-ok-face ((,class :inherit bold :foreground ,green)))
`(mu4e-region-code ((,class :inherit modus-theme-special-calm)))
- `(mu4e-replied-face ((,class :foreground ,cyan-active)))
+ `(mu4e-replied-face ((,class :foreground ,blue-faint)))
`(mu4e-special-header-value-face ((,class :inherit bold :foreground ,blue-alt-other)))
`(mu4e-system-face ((,class :foreground ,fg-mark-del :slant ,modus-theme-slant)))
`(mu4e-title-face ((,class :foreground ,fg-main)))
@@ -3129,10 +3562,15 @@ Also bind `class' to ((class color) (min-colors 89))."
`(nxml-ref ((,class ,@(modus-operandi-theme-syntax-foreground
green-alt-other green-alt-other-faint)
,@(modus-operandi-theme-bold-weight))))
+;;;;; objed
+ `(objed-hl ((,class :background ,(if modus-operandi-theme-intense-hl-line
+ bg-hl-alt-intense bg-hl-alt))))
+ `(objed-mark ((,class :background ,bg-active)))
+ `(objed-mode-line ((,class :foreground ,cyan-active)))
;;;;; orderless
`(orderless-match-face-0 ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- blue-alt blue-nuanced-bg
+ blue-alt-other blue-nuanced-bg
blue-refine-bg blue-refine-fg))))
`(orderless-match-face-1 ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
@@ -3140,70 +3578,62 @@ Also bind `class' to ((class color) (min-colors 89))."
magenta-refine-bg magenta-refine-fg))))
`(orderless-match-face-2 ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- green-alt-other green-nuanced-bg
+ green green-nuanced-bg
green-refine-bg green-refine-fg))))
`(orderless-match-face-3 ((,class :inherit bold
,@(modus-operandi-theme-standard-completions
- yellow-alt-other yellow-nuanced-bg
+ yellow yellow-nuanced-bg
yellow-refine-bg yellow-refine-fg))))
;;;;; org
`(org-agenda-calendar-event ((,class :foreground ,fg-main)))
`(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
- `(org-agenda-clocking ((,class :inherit modus-theme-special-cold)))
+ `(org-agenda-clocking ((,class :inherit modus-theme-special-cold
+ ,@(and (>= emacs-major-version 27) '(:extend t)))))
`(org-agenda-column-dateline ((,class :background ,bg-alt)))
- `(org-agenda-current-time ((,class :inherit modus-theme-subtle-cyan)))
- `(org-agenda-date ((,class :inherit ,modus-theme-variable-pitch :foreground ,cyan-alt-other
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)
- ,@(modus-operandi-theme-heading-block cyan-nuanced-bg cyan-nuanced))))
- `(org-agenda-date-today ((,class :inherit (bold ,modus-theme-variable-pitch)
- :background ,cyan-intense-bg :foreground ,fg-main
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4))))
- `(org-agenda-date-weekend ((,class :inherit ,modus-theme-variable-pitch :foreground ,cyan
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)
- ,@(modus-operandi-theme-heading-block blue-nuanced-bg cyan-nuanced))))
+ `(org-agenda-current-time ((,class :inherit bold :foreground ,blue-alt-other)))
+ `(org-agenda-date ((,class :foreground ,cyan)))
+ `(org-agenda-date-today ((,class :inherit bold :foreground ,fg-main :underline t)))
+ `(org-agenda-date-weekend ((,class :foreground ,cyan-alt-other)))
`(org-agenda-diary ((,class :foreground ,fg-main)))
- `(org-agenda-dimmed-todo-face ((,class :inherit modus-theme-subtle-neutral)))
- `(org-agenda-done ((,class ,@(modus-operandi-theme-org-todo-block green-nuanced-bg green-nuanced green))))
+ `(org-agenda-dimmed-todo-face ((,class :inherit bold :foreground ,fg-alt)))
+ `(org-agenda-done ((,class :foreground ,green-alt)))
`(org-agenda-filter-category ((,class :inherit bold :foreground ,magenta-active)))
`(org-agenda-filter-effort ((,class :inherit bold :foreground ,magenta-active)))
`(org-agenda-filter-regexp ((,class :inherit bold :foreground ,magenta-active)))
`(org-agenda-filter-tags ((,class :inherit bold :foreground ,magenta-active)))
`(org-agenda-restriction-lock ((,class :background ,bg-dim :foreground ,fg-dim)))
- `(org-agenda-structure ((,class :inherit ,modus-theme-variable-pitch
- :foreground ,fg-special-mild
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3))))
+ `(org-agenda-structure ((,class :foreground ,blue-alt)))
`(org-archived ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(org-block ((,class ,@(modus-operandi-theme-org-block bg-dim)
- :inherit fixed-pitch :foreground ,fg-main)))
- `(org-block-begin-line ((,class ,@(modus-operandi-theme-org-block-delim
+ `(org-block ((,class ,@(modus-operandi-theme-mixed-fonts)
+ ,@(modus-operandi-theme-org-block bg-dim)
+ :foreground ,fg-main)))
+ `(org-block-begin-line ((,class ,@(modus-operandi-theme-mixed-fonts)
+ ,@(modus-operandi-theme-org-block-delim
bg-dim fg-special-cold
- bg-alt fg-special-mild)
- :inherit fixed-pitch)))
+ bg-alt fg-special-mild))))
`(org-block-end-line ((,class :inherit org-block-begin-line)))
`(org-checkbox ((,class :box (:line-width 1 :color ,bg-active)
:background ,bg-inactive :foreground ,fg-active)))
- `(org-checkbox-statistics-done ((,class :foreground ,green
- ,@(modus-operandi-theme-heading-block
- green-nuanced-bg green-nuanced))))
- `(org-checkbox-statistics-todo ((,class ,@(modus-operandi-theme-heading-foreground red-alt red)
- ,@(modus-operandi-theme-heading-block
- red-nuanced-bg red-nuanced))))
+ `(org-checkbox-statistics-done ((,class :inherit org-done)))
+ `(org-checkbox-statistics-todo ((,class :inherit org-todo)))
`(org-clock-overlay ((,class :inherit modus-theme-special-cold)))
- `(org-code ((,class :inherit fixed-pitch :foreground ,magenta)))
+ `(org-code ((,class ,@(modus-operandi-theme-mixed-fonts) :foreground ,magenta)))
`(org-column ((,class :background ,bg-alt)))
`(org-column-title ((,class :inherit bold :underline t :background ,bg-alt)))
- `(org-date ((,class :inherit fixed-pitch :foreground ,cyan-alt-other :underline t)))
+ `(org-date ((,class :inherit (button fixed-pitch) :foreground ,cyan-alt-other)))
`(org-date-selected ((,class :inherit bold :foreground ,blue-alt :inverse-video t)))
- `(org-default ((,class :background ,bg-main :foreground ,fg-main)))
`(org-document-info ((,class :foreground ,fg-special-cold)))
- `(org-document-info-keyword ((,class :inherit fixed-pitch :foreground ,fg-alt)))
+ `(org-document-info-keyword ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-alt)))
`(org-document-title ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-cold
,@(modus-operandi-theme-scale modus-operandi-theme-scale-5))))
- `(org-done ((,class ,@(modus-operandi-theme-org-todo-block green-nuanced-bg green-nuanced green))))
- `(org-drawer ((,class :foreground ,cyan-alt)))
+ `(org-done ((,class :box ,bg-region :background ,bg-dim :foreground ,green)))
+ `(org-drawer ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,cyan)))
`(org-ellipsis ((,class :foreground nil))) ; inherits from the heading's colour
- `(org-footnote ((,class :foreground ,blue-alt :underline t)))
- `(org-formula ((,class :inherit fixed-pitch :foreground ,red-alt)))
+ `(org-footnote ((,class :inherit button :foreground ,blue-alt)))
+ `(org-formula ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,red-alt)))
`(org-habit-alert-face ((,class :inherit modus-theme-intense-yellow)))
`(org-habit-alert-future-face ((,class :inherit modus-theme-refine-yellow)))
`(org-habit-clear-face ((,class :inherit modus-theme-intense-magenta)))
@@ -3212,69 +3642,48 @@ Also bind `class' to ((class color) (min-colors 89))."
`(org-habit-overdue-future-face ((,class :inherit modus-theme-refine-red)))
`(org-habit-ready-face ((,class :inherit modus-theme-intense-blue)))
`(org-habit-ready-future-face ((,class :inherit modus-theme-refine-blue)))
- `(org-headline-done ((,class :foreground ,green-nuanced
- ,@(modus-operandi-theme-heading-block
- green-nuanced-bg green-nuanced))))
+ `(org-headline-done ((,class :inherit ,modus-theme-variable-pitch :foreground ,green-nuanced)))
+ `(org-headline-todo ((,class :inherit ,modus-theme-variable-pitch :foreground ,red-nuanced)))
`(org-hide ((,class :foreground ,bg-main)))
`(org-indent ((,class :inherit (fixed-pitch org-hide))))
`(org-latex-and-related ((,class :foreground ,magenta-refine-fg)))
- `(org-level-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-main magenta-alt-other)
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)
- ,@(modus-operandi-theme-heading-block magenta-nuanced-bg magenta-nuanced))))
- `(org-level-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-special-warm magenta-alt)
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3)
- ,@(modus-operandi-theme-heading-block red-nuanced-bg red-nuanced))))
- `(org-level-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-special-cold blue)
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-2)
- ,@(modus-operandi-theme-heading-block blue-nuanced-bg blue-nuanced))))
- `(org-level-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-special-mild cyan)
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-1)
- ,@(modus-operandi-theme-heading-block cyan-nuanced-bg cyan-nuanced))))
- `(org-level-5 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-special-calm green-alt-other)
- ,@(modus-operandi-theme-heading-block green-nuanced-bg green-nuanced))))
- `(org-level-6 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground yellow-nuanced yellow-alt-other)
- ,@(modus-operandi-theme-heading-block yellow-nuanced-bg yellow-nuanced))))
- `(org-level-7 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground red-nuanced red-alt)
- ,@(modus-operandi-theme-heading-block red-nuanced-bg red-nuanced))))
- `(org-level-8 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-dim magenta)
- ,@(modus-operandi-theme-heading-block bg-alt fg-alt))))
+ `(org-level-1 ((,class :inherit modus-theme-heading-1)))
+ `(org-level-2 ((,class :inherit modus-theme-heading-2)))
+ `(org-level-3 ((,class :inherit modus-theme-heading-3)))
+ `(org-level-4 ((,class :inherit modus-theme-heading-4)))
+ `(org-level-5 ((,class :inherit modus-theme-heading-5)))
+ `(org-level-6 ((,class :inherit modus-theme-heading-6)))
+ `(org-level-7 ((,class :inherit modus-theme-heading-7)))
+ `(org-level-8 ((,class :inherit modus-theme-heading-8)))
`(org-link ((,class :inherit link)))
`(org-list-dt ((,class :inherit bold)))
- `(org-macro ((,class :inherit org-latex-and-related)))
- `(org-meta-line ((,class :inherit fixed-pitch :background ,cyan-nuanced-bg :foreground ,cyan-nuanced)))
+ `(org-macro ((,class :background ,blue-nuanced-bg :foreground ,magenta-alt-other)))
+ `(org-meta-line ((,class ,@(modus-operandi-theme-mixed-fonts) :foreground ,fg-alt)))
`(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 magenta-nuanced-bg magenta-nuanced magenta)
- ,@(modus-operandi-theme-heading-foreground magenta magenta-alt-other))))
- `(org-quote ((,class ,@(if modus-operandi-theme-org-blocks
- (append
- (and (>= emacs-major-version 27) '(:extend t))
- (list :background bg-dim))
- (list :background nil))
- :foreground ,fg-special-calm :slant ,modus-theme-slant)))
+ `(org-priority ((,class :box ,bg-region :background ,bg-dim :foreground ,magenta)))
+ `(org-property-value ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,cyan-alt-other)))
+ `(org-quote ((,class ,@(modus-operandi-theme-org-block bg-dim)
+ :foreground ,fg-special-cold :slant ,modus-theme-slant)))
`(org-scheduled ((,class :foreground ,fg-special-warm)))
`(org-scheduled-previously ((,class :foreground ,yellow-alt-other)))
`(org-scheduled-today ((,class :foreground ,magenta-alt-other)))
`(org-sexp-date ((,class :inherit org-date)))
- `(org-special-keyword ((,class ,@(modus-operandi-theme-org-todo-block cyan-nuanced-bg cyan-nuanced cyan-alt))))
- `(org-table ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
- `(org-tag ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-nuanced)))
+ `(org-special-keyword ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,blue-nuanced)))
+ `(org-table ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(org-table-header ((,class :inherit (fixed-pitch modus-theme-intense-neutral))))
+ `(org-tag ((,class :foreground ,magenta-nuanced)))
`(org-tag-group ((,class :inherit bold :foreground ,cyan-nuanced)))
`(org-target ((,class :underline t)))
`(org-time-grid ((,class :foreground ,fg-unfocused)))
- `(org-todo ((,class ,@(modus-operandi-theme-org-todo-block red-nuanced-bg red-nuanced red-alt)
- ,@(modus-operandi-theme-heading-foreground red-alt red))))
+ `(org-todo ((,class :box ,bg-region :background ,bg-dim :foreground ,red-alt)))
`(org-upcoming-deadline ((,class :foreground ,red-alt-other)))
`(org-upcoming-distant-deadline ((,class :foreground ,red-nuanced)))
- `(org-verbatim ((,class :inherit fixed-pitch :background ,bg-alt :foreground ,fg-special-calm)))
+ `(org-verbatim ((,class ,@(modus-operandi-theme-mixed-fonts)
+ :background ,bg-alt :foreground ,fg-special-calm)))
`(org-verse ((,class :inherit org-quote)))
`(org-warning ((,class :inherit bold :foreground ,red-alt-other)))
;;;;; org-journal
@@ -3291,8 +3700,11 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; org-recur
`(org-recur ((,class :foreground ,magenta-active)))
;;;;; org-roam
- `(org-roam-link ((,class :foreground ,blue-alt-other :underline t)))
- `(org-roam-backlink ((,class :foreground ,green-alt-other :underline t)))
+ `(org-roam-link ((,class :inherit button :foreground ,green)))
+ `(org-roam-link-current ((,class :inherit button :foreground ,green-alt)))
+ `(org-roam-link-invalid ((,class :inherit button :foreground ,red)))
+ `(org-roam-link-shielded ((,class :inherit button :foreground ,yellow)))
+ `(org-roam-tag ((,class :foreground ,fg-alt :slant italic)))
;;;;; org-superstar
`(org-superstar-item ((,class :foreground ,fg-main)))
`(org-superstar-leading ((,class :foreground ,fg-whitespace)))
@@ -3305,37 +3717,16 @@ Also bind `class' to ((class color) (min-colors 89))."
`(origami-fold-header-face ((,class :background ,bg-dim :foreground ,fg-dim :box t)))
`(origami-fold-replacement-face ((,class :background ,bg-alt :foreground ,fg-alt)))
;;;;; outline-mode
- `(outline-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-main magenta-alt-other)
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)
- ,@(modus-operandi-theme-heading-block magenta-nuanced-bg magenta-nuanced))))
- `(outline-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-special-warm magenta-alt)
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3)
- ,@(modus-operandi-theme-heading-block red-nuanced-bg red-nuanced))))
- `(outline-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-special-cold blue)
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-2)
- ,@(modus-operandi-theme-heading-block blue-nuanced-bg blue-nuanced))))
- `(outline-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-special-mild cyan)
- ,@(modus-operandi-theme-scale modus-operandi-theme-scale-1)
- ,@(modus-operandi-theme-heading-block cyan-nuanced-bg cyan-nuanced))))
- `(outline-5 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-special-calm green-alt-other)
- ,@(modus-operandi-theme-heading-block green-nuanced-bg green-nuanced))))
- `(outline-6 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground yellow-nuanced yellow-alt-other)
- ,@(modus-operandi-theme-heading-block yellow-nuanced-bg yellow-nuanced))))
- `(outline-7 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground red-nuanced red-alt)
- ,@(modus-operandi-theme-heading-block red-nuanced-bg red-nuanced))))
- `(outline-8 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-operandi-theme-heading-foreground fg-dim magenta)
- ,@(modus-operandi-theme-heading-block bg-alt fg-alt))))
+ `(outline-1 ((,class :inherit modus-theme-heading-1)))
+ `(outline-2 ((,class :inherit modus-theme-heading-2)))
+ `(outline-3 ((,class :inherit modus-theme-heading-3)))
+ `(outline-4 ((,class :inherit modus-theme-heading-4)))
+ `(outline-5 ((,class :inherit modus-theme-heading-5)))
+ `(outline-6 ((,class :inherit modus-theme-heading-6)))
+ `(outline-7 ((,class :inherit modus-theme-heading-7)))
+ `(outline-8 ((,class :inherit modus-theme-heading-8)))
;;;;; outline-minor-faces
- `(outline-minor-0 ((,class ,@(unless modus-operandi-theme-section-headings
- (list :background cyan-nuanced-bg)))))
+ `(outline-minor-0 ((,class nil)))
;;;;; package (M-x list-packages)
`(package-description ((,class :foreground ,fg-special-cold)))
`(package-help-section-name ((,class :inherit bold :foreground ,magenta-alt-other)))
@@ -3423,6 +3814,23 @@ Also bind `class' to ((class color) (min-colors 89))."
`(prodigy-green-face ((,class :foreground ,green)))
`(prodigy-red-face ((,class :foreground ,red)))
`(prodigy-yellow-face ((,class :foreground ,yellow)))
+;;;;; racket-mode
+ `(racket-debug-break-face ((,class :inherit modus-theme-intense-red)))
+ `(racket-debug-locals-face ((,class :box (:line-width -1 :color nil)
+ :foreground ,green-alt-other)))
+ `(racket-debug-result-face ((,class :inherit bold :box (:line-width -1 :color nil)
+ :foreground ,green)))
+ `(racket-here-string-face ((,class :foreground ,blue-alt)))
+ `(racket-keyword-argument-face ((,class :foreground ,red-alt)))
+ `(racket-logger-config-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+ `(racket-logger-debug-face ((,class :foreground ,blue-alt-other)))
+ `(racket-logger-info-face ((,class :foreground ,fg-lang-note)))
+ `(racket-logger-topic-face ((,class :foreground ,magenta :slant ,modus-theme-slant)))
+ `(racket-selfeval-face ((,class :foreground ,green-alt)))
+ `(racket-xp-error-face
+ ((,(append '((supports :underline (:style wave))) class)
+ :underline (:color ,fg-lang-error :style wave))
+ (,class :foreground ,fg-lang-error :underline t)))
;;;;; rainbow-blocks
`(rainbow-blocks-depth-1-face ((,class :foreground ,magenta-alt-other)))
`(rainbow-blocks-depth-2-face ((,class :foreground ,blue)))
@@ -3544,24 +3952,19 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-nuanced-blue
blue-alt-other))))
;;;;; selectrum
- `(selectrum-current-candidate ((,class ,@(modus-operandi-theme-extra-completions
- 'modus-theme-refine-magenta
- 'modus-theme-intense-magenta
- 'modus-theme-nuanced-magenta
- magenta
- 'bold))))
- `(selectrum-primary-highlight ((,class ,@(modus-operandi-theme-extra-completions
- 'modus-theme-refine-blue
- 'modus-theme-intense-blue
- 'modus-theme-nuanced-blue
- blue
- 'bold))))
- `(selectrum-secondary-highlight ((,class ,@(modus-operandi-theme-extra-completions
- 'modus-theme-refine-cyan
- 'modus-theme-intense-cyan
- 'modus-theme-nuanced-cyan
- cyan
- 'bold))))
+ `(selectrum-current-candidate
+ ((,class :inherit bold :foreground ,fg-main :underline ,fg-main
+ :background ,@(pcase modus-operandi-theme-completions
+ ('opinionated (list bg-active))
+ (_ (list bg-inactive))))))
+ `(selectrum-primary-highlight ((,class :inherit bold
+ ,@(modus-operandi-theme-standard-completions
+ magenta-alt magenta-nuanced-bg
+ magenta-refine-bg magenta-refine-fg))))
+ `(selectrum-secondary-highlight ((,class :inherit bold
+ ,@(modus-operandi-theme-standard-completions
+ cyan-alt-other cyan-nuanced-bg
+ cyan-refine-bg cyan-refine-fg))))
;;;;; semantic
`(semantic-complete-inline-face ((,class :foreground ,fg-special-warm :underline t)))
`(semantic-decoration-on-private-members-face ((,class :inherit modus-theme-refine-cyan)))
@@ -3628,23 +4031,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(sp-wrap-overlay-opening-pair ((,class :inherit sp-pair-overlay-face)))
`(sp-wrap-tag-overlay-face ((,class :inherit sp-pair-overlay-face)))
;;;;; smerge
- `(smerge-base ((,class ,@(modus-operandi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
- `(smerge-lower ((,class ,@(modus-operandi-theme-diffs
- bg-main green
- bg-diff-focus-added fg-diff-focus-added))))
+ `(smerge-base ((,class :inherit modus-theme-diff-changed)))
+ `(smerge-lower ((,class :inherit modus-theme-diff-added)))
`(smerge-markers ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2)))
- `(smerge-refined-added ((,class ,@(modus-operandi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added fg-diff-refine-added))))
+ `(smerge-refined-added ((,class :inherit modus-theme-diff-refine-added)))
`(smerge-refined-changed ((,class)))
- `(smerge-refined-removed ((,class ,@(modus-operandi-theme-diffs
- bg-diff-removed fg-diff-removed
- bg-diff-refine-removed fg-diff-refine-removed))))
- `(smerge-upper ((,class ,@(modus-operandi-theme-diffs
- bg-main red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ `(smerge-refined-removed ((,class :inherit modus-theme-diff-refine-removed)))
+ `(smerge-upper ((,class :inherit modus-theme-diff-removed)))
;;;;; spaceline
`(spaceline-evil-emacs ((,class :inherit modus-theme-active-magenta)))
`(spaceline-evil-insert ((,class :inherit modus-theme-active-green)))
@@ -3804,7 +4197,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(trashed-mark ((,class :inherit modus-theme-mark-symbol)))
`(trashed-marked ((,class :inherit modus-theme-mark-alt)))
`(trashed-restored ((,class :inherit modus-theme-mark-sel)))
- `(trashed-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(trashed-symlink ((,class :inherit button :foreground ,cyan-alt)))
;;;;; treemacs
`(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt)))
`(treemacs-directory-face ((,class :inherit dired-directory)))
@@ -3870,39 +4263,33 @@ Also bind `class' to ((class color) (min-colors 89))."
`(tuareg-opam-pkg-variable-name-face ((,class ,@(modus-operandi-theme-syntax-foreground
cyan cyan-faint)
:slant ,modus-theme-slant)))
+;;;;; typescript
+ `(typescript-jsdoc-tag ((,class :foreground ,fg-special-mild :slant ,modus-theme-slant)))
+ `(typescript-jsdoc-type ((,class :foreground ,fg-special-calm :slant ,modus-theme-slant)))
+ `(typescript-jsdoc-value ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
;;;;; undo-tree
`(undo-tree-visualizer-active-branch-face ((,class :inherit bold :foreground ,fg-main)))
`(undo-tree-visualizer-current-face ((,class :foreground ,blue-intense)))
`(undo-tree-visualizer-default-face ((,class :foreground ,fg-alt)))
`(undo-tree-visualizer-register-face ((,class :foreground ,magenta-intense)))
`(undo-tree-visualizer-unmodified-face ((,class :foreground ,green-intense)))
-;;;;; vc
- `(vc-conflict-state ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,red-active)))
- `(vc-edited-state ((,class :foreground ,fg-special-warm)))
+;;;;; vc (vc-hooks.el)
+ `(vc-conflict-state ((,class :foreground ,red-active :slant ,modus-theme-slant)))
+ `(vc-edited-state ((,class :foreground ,yellow-active)))
`(vc-locally-added-state ((,class :foreground ,cyan-active)))
- `(vc-locked-state ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-active)))
- `(vc-missing-state ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,yellow-active)))
- `(vc-needs-update-state ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,fg-special-mild)))
+ `(vc-locked-state ((,class :foreground ,blue-active)))
+ `(vc-missing-state ((,class :foreground ,magenta-active :slant ,modus-theme-slant)))
+ `(vc-needs-update-state ((,class :foreground ,green-active :slant ,modus-theme-slant)))
`(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-addition-face ((,class :inherit modus-theme-diff-added)))
+ `(vdiff-change-face ((,class :inherit modus-theme-diff-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-refine-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(vdiff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
+ `(vdiff-subtraction-face ((,class :inherit modus-theme-diff-removed)))
`(vdiff-target-face ((,class :inherit modus-theme-intense-blue)))
;;;;; vimish-fold
`(vimish-fold-fringe ((,class :foreground ,cyan-active)))
@@ -3925,7 +4312,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(vhl/default-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
:background ,bg-alt :foreground ,blue-nuanced)))
;;;;; vterm
- `(vterm-color-black ((,class :background "black" :foreground "black")))
+ `(vterm-color-black ((,class :background "gray35" :foreground "gray35")))
`(vterm-color-blue ((,class :background ,blue :foreground ,blue)))
`(vterm-color-cyan ((,class :background ,cyan :foreground ,cyan)))
`(vterm-color-default ((,class :background ,bg-main :foreground ,fg-main)))
@@ -3934,7 +4321,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(vterm-color-magenta ((,class :background ,magenta :foreground ,magenta)))
`(vterm-color-red ((,class :background ,red :foreground ,red)))
`(vterm-color-underline ((,class :foreground ,fg-special-warm :underline t)))
- `(vterm-color-white ((,class :background "white" :foreground "white")))
+ `(vterm-color-white ((,class :background "gray65" :foreground "gray65")))
`(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow)))
;;;;; wcheck-mode
`(wcheck-default-face ((,class :foreground ,red :underline t)))
@@ -4135,7 +4522,6 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm)))
`(ztreep-node-face ((,class :foreground ,fg-main))))
;;;; Emacs 27+
- ;; EXPERIMENTAL this form is subject to review
(when (>= emacs-major-version 27)
(custom-theme-set-faces
'modus-operandi
@@ -4143,8 +4529,12 @@ Also bind `class' to ((class color) (min-colors 89))."
;; NOTE that this is specifically for the faces that were
;; introduced in Emacs 27, as the other faces are already
;; supported.
- `(line-number-major-tick ((,class (:background ,yellow-nuanced-bg :foreground ,yellow-nuanced))))
- `(line-number-minor-tick ((,class (:background ,cyan-nuanced-bg :foreground ,cyan-nuanced))))
+ `(line-number-major-tick ((,class :inherit (bold default)
+ :background ,yellow-nuanced-bg
+ :foreground ,yellow-nuanced)))
+ `(line-number-minor-tick ((,class :inherit (bold default)
+ :background ,bg-inactive
+ :foreground ,fg-inactive)))
;;;;; tab-bar-mode
`(tab-bar ((,class :background ,bg-tab-bar :foreground ,fg-main)))
`(tab-bar-tab ((,class :inherit bold :box (:line-width 2 :color ,bg-tab-active)
@@ -4160,12 +4550,22 @@ Also bind `class' to ((class color) (min-colors 89))."
`(tab-line-tab-current ((,class :inherit tab-line-tab)))
`(tab-line-tab-inactive ((,class :box (:line-width 2 :color ,bg-tab-inactive)
:background ,bg-tab-inactive :foreground ,fg-dim)))))
+;;;; Emacs 28+
+ (when (>= emacs-major-version 28)
+ (custom-theme-set-faces
+ 'modus-operandi
+;;;;; isearch regexp groups
+ `(isearch-group-1 ((,class :inherit modus-theme-intense-blue)))
+ `(isearch-group-2 ((,class :inherit modus-theme-intense-magenta)))))
;;; variables
(custom-theme-set-variables
'modus-operandi
;;;; ansi-colors
`(ansi-color-faces-vector [default bold shadow italic underline success warning error])
`(ansi-color-names-vector [,fg-main ,red ,green ,yellow ,blue ,magenta ,cyan ,bg-main])
+;;;; awesome-tray
+ `(awesome-tray-mode-line-active-color ,blue)
+ `(awesome-tray-mode-line-inactive-color ,bg-active)
;;;; flymake fringe indicators
`(flymake-error-bitmap '(flymake-double-exclamation-mark modus-theme-fringe-red))
`(flymake-warning-bitmap '(exclamation-mark modus-theme-fringe-yellow))
@@ -4174,7 +4574,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ibuffer-deletion-face 'modus-theme-mark-del)
`(ibuffer-filter-group-name-face 'modus-theme-mark-symbol)
`(ibuffer-marked-face 'modus-theme-mark-sel)
- `(ibuffer-title-face 'modus-theme-header)
+ `(ibuffer-title-face 'modus-theme-pseudo-header)
;;;; highlight-tail
`(highlight-tail-colors
'((,green-subtle-bg . 0)
diff --git a/etc/themes/modus-vivendi-theme.el b/etc/themes/modus-vivendi-theme.el
index fa1b6be8b8..d45c3ca2ee 100644
--- a/etc/themes/modus-vivendi-theme.el
+++ b/etc/themes/modus-vivendi-theme.el
@@ -1,10 +1,10 @@
;;; modus-vivendi-theme.el --- Accessible dark theme (WCAG AAA) -*- lexical-binding:t -*-
-;; Copyright (c) 2019-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
;; Author: Protesilaos Stavrou <info@protesilaos.com>
;; URL: https://gitlab.com/protesilaos/modus-themes
-;; Version: 0.12.0
+;; Version: 0.13.0
;; Package-Requires: ((emacs "26.1"))
;; Keywords: faces, theme, accessibility
@@ -42,17 +42,18 @@
;; modus-vivendi-theme-slanted-constructs (boolean)
;; modus-vivendi-theme-bold-constructs (boolean)
;; modus-vivendi-theme-variable-pitch-headings (boolean)
-;; modus-vivendi-theme-rainbow-headings (boolean)
-;; modus-vivendi-theme-section-headings (boolean)
+;; modus-vivendi-theme-no-mixed-fonts (boolean)
+;; modus-vivendi-theme-headings (alist)
;; modus-vivendi-theme-scale-headings (boolean)
;; modus-vivendi-theme-fringes (choice)
;; modus-vivendi-theme-org-blocks (choice)
;; modus-vivendi-theme-prompts (choice)
-;; modus-vivendi-theme-3d-modeline (boolean)
-;; modus-vivendi-theme-subtle-diffs (boolean)
+;; modus-vivendi-theme-mode-line (choice)
+;; modus-vivendi-theme-diffs (choice)
;; modus-vivendi-theme-faint-syntax (boolean)
;; modus-vivendi-theme-intense-hl-line (boolean)
;; modus-vivendi-theme-intense-paren-match (boolean)
+;; modus-vivendi-theme-no-link-underline (boolean)
;; modus-vivendi-theme-completions (choice)
;; modus-vivendi-theme-override-colors-alist (alist)
;;
@@ -81,6 +82,8 @@
;; auctex and TeX
;; auto-dim-other-buffers
;; avy
+;; awesome-tray
+;; binder
;; bm
;; bongo
;; boon
@@ -103,6 +106,7 @@
;; counsel-notmuch
;; counsel-org-capture-string
;; cov
+;; cperl-mode
;; csv-mode
;; ctrlf
;; custom (M-x customize)
@@ -116,6 +120,7 @@
;; diff-hl
;; diff-mode
;; dim-autoload
+;; dir-treeview
;; dired
;; dired-async
;; dired-git
@@ -132,6 +137,7 @@
;; ediff
;; eglot
;; el-search
+;; eldoc
;; eldoc-box
;; elfeed
;; elfeed-score
@@ -146,6 +152,7 @@
;; eshell-fringe-status
;; eshell-git-prompt
;; eshell-prompt-extras (epe)
+;; eshell-syntax-highlighting
;; evil (evil-mode)
;; evil-goggles
;; evil-visual-mark-mode
@@ -153,6 +160,7 @@
;; eyebrowse
;; fancy-dabbrev
;; flycheck
+;; flycheck-color-mode-line
;; flycheck-indicator
;; flycheck-posframe
;; flymake
@@ -229,6 +237,7 @@
;; minimap
;; modeline
;; mood-line
+;; mpdel
;; mu4e
;; mu4e-conversation
;; multiple-cursors
@@ -237,6 +246,7 @@
;; notmuch
;; num3-mode
;; nxml-mode
+;; objed
;; orderless
;; org
;; org-journal
@@ -266,6 +276,7 @@
;; powerline-evil
;; proced
;; prodigy
+;; racket-mode
;; rainbow-blocks
;; rainbow-identifiers
;; rainbow-delimiters
@@ -308,6 +319,7 @@
;; treemacs
;; tty-menu
;; tuareg
+;; typescript
;; undo-tree
;; vc (built-in mode line status for version control)
;; vc-annotate (C-x v g)
@@ -411,11 +423,19 @@ between foreground and background is >= 7:1)."
(defface modus-theme-diff-focus-changed nil nil)
(defface modus-theme-diff-focus-removed nil nil)
(defface modus-theme-diff-heading nil nil)
-(defface modus-theme-header nil nil) ; Name is tentative
+(defface modus-theme-pseudo-header nil nil)
(defface modus-theme-mark-alt nil nil)
(defface modus-theme-mark-del nil nil)
(defface modus-theme-mark-sel nil nil)
(defface modus-theme-mark-symbol nil nil)
+(defface modus-theme-heading-1 nil nil)
+(defface modus-theme-heading-2 nil nil)
+(defface modus-theme-heading-3 nil nil)
+(defface modus-theme-heading-4 nil nil)
+(defface modus-theme-heading-5 nil nil)
+(defface modus-theme-heading-6 nil nil)
+(defface modus-theme-heading-7 nil nil)
+(defface modus-theme-heading-8 nil nil)
(defface modus-theme-hl-line nil nil)
;;; Customisation options
@@ -441,14 +461,125 @@ between foreground and background is >= 7:1)."
"Use proportional fonts (variable-pitch) in headings."
:type 'boolean)
+(defcustom modus-vivendi-theme-no-mixed-fonts nil
+ "Disable inheritance from `fixed-pitch' in some faces.
+
+This is done by default to allow spacing-sensitive constructs,
+such as Org tables and code blocks, to remain monospaced when
+users opt for something like the command `variable-pitch-mode'.
+The downside with the default is that users need to explicitly
+configure the font family of `fixed-pitch' in order to get a
+consistent experience. That may be something they do not want to
+do. Hence this option to disable any kind of technique for
+mixing fonts."
+ :type 'boolean)
+
+(make-obsolete 'modus-vivendi-theme-rainbow-headings
+ 'modus-vivendi-theme-headings
+ "`modus-vivendi-theme' 0.13.0")
+
(defcustom modus-vivendi-theme-rainbow-headings nil
"Use more saturated colours for headings."
:type 'boolean)
+(make-obsolete 'modus-vivendi-theme-section-headings
+ 'modus-vivendi-theme-headings
+ "`modus-vivendi-theme' 0.13.0")
+
(defcustom modus-vivendi-theme-section-headings nil
"Use a background and an overline in headings."
:type 'boolean)
+(defcustom modus-vivendi-theme-headings
+ '((t . nil))
+ "Alist of styles for headings, with optional value per level.
+
+To control faces per level from 1-8, use something like this:
+
+ (setq modus-vivendi-theme-headings
+ '((1 . highlight)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+
+To set a uniform value for all heading levels, use this pattern:
+
+ (setq modus-vivendi-theme-headings
+ '((t . rainbow-line-no-bold)))
+
+The default uses a fairly desaturated foreground value in
+combination with a bold typographic weight. To specify this
+style for a given level N (assuming you wish to have another
+fallback option), just specify the value t like this:
+
+ (setq modus-vivendi-theme-headings
+ '((1 . t)
+ (2 . line)
+ (t . rainbow-line-no-bold)))
+
+A description of all possible values:
+
++ `no-bold' retains the default text colour while removing
+ the typographic weight.
+
++ `line' is the same as the default plus an overline over the
+ heading.
+
++ `line-no-bold' is the same as `line' without bold weight.
+
++ `rainbow' uses a more colourful foreground in combination
+ with bold weight.
+
++ `rainbow-line' is the same as `rainbow' plus an overline.
+
++ `rainbow-line-no-bold' is the same as `rainbow-line' without
+ the bold weight.
+
++ `highlight' retains the default style of a fairly desaturated
+ foreground combined with a bold weight and add to it a subtle
+ accented background.
+
++ `highlight-no-bold' is the same as `highlight' without a bold
+ weight.
+
++ `rainbow-highlight' is the same as `highlight' but with a more
+ colourful foreground.
+
++ `rainbow-highlight-no-bold' is the same as `rainbow-highlight'
+ without a bold weight.
+
++ `section' retains the default looks and adds to them both an
+ overline and a slightly accented background. It is, in effect,
+ a combination of the `line' and `highlight' values.
+
++ `section-no-bold' is the same as `section' without a bold
+ weight.
+
++ `rainbow-section' is the same as `section' but with a more
+ colourful foreground.
+
++ `rainbow-section-no-bold' is the same as `rainbow-section'
+ without a bold weight."
+ :type
+ '(alist
+ :key-type symbol
+ :value-type
+ (choice (const :tag "Fairly desaturated foreground with bold weight (default)" t)
+ (const :tag "Like the default without bold weight" no-bold)
+ (const :tag "Like the default plus overline" line)
+ (const :tag "Like `line' without bold weight" line-no-bold)
+ (const :tag "Like the default but with more colourful foreground" rainbow)
+ (const :tag "Like `rainbow' plus overline" rainbow-line)
+ (const :tag "Like `rainbow' without bold weight" rainbow-no-bold)
+ (const :tag "Like `rainbow-line' without bold weight" rainbow-line-no-bold)
+ (const :tag "Like the default plus subtle background" highlight)
+ (const :tag "Like `highlight' without bold weight" highlight-no-bold)
+ (const :tag "Like `highlight' with more colourful foreground" rainbow-highlight)
+ (const :tag "Like `rainbow-highlight' without bold weight" rainbow-highlight-no-bold)
+ (const :tag "Like `highlight' plus overline" section)
+ (const :tag "Like `section' without bold weight" section-no-bold)
+ (const :tag "Like `section' with more colourful foreground" rainbow-section)
+ (const :tag "Like `rainbow-section' without bold weight" rainbow-section-no-bold))))
+
(defcustom modus-vivendi-theme-scale-headings nil
"Use font scaling for headings."
:type 'boolean)
@@ -508,8 +639,9 @@ For more on the matter, read the documentation of
`set-face-attribute', specifically the ':height' section."
:type 'number)
-(define-obsolete-variable-alias 'modus-vivendi-theme-visible-fringes
- 'modus-vivendi-theme-fringes "`modus-vivendi-theme' 0.12.0")
+(make-obsolete 'modus-vivendi-theme-visible-fringes
+ 'modus-vivendi-theme-fringes
+ "`modus-vivendi-theme' 0.12.0")
(defcustom modus-vivendi-theme-visible-fringes nil
"Use a visible style for fringes."
@@ -527,15 +659,17 @@ pronounced greyscale value."
(const :tag "Subtle greyscale background" subtle)
(const :tag "Intense greyscale background" intense)))
-(define-obsolete-variable-alias 'modus-vivendi-theme-distinct-org-blocks
- 'modus-vivendi-theme-org-blocks "`modus-vivendi-theme' 0.11.0")
+(make-obsolete 'modus-vivendi-theme-distinct-org-blocks
+ 'modus-vivendi-theme-org-blocks
+ "`modus-vivendi-theme' 0.11.0")
(defcustom modus-vivendi-theme-distinct-org-blocks nil
"Use a distinct neutral background for `org-mode' blocks."
:type 'boolean)
-(define-obsolete-variable-alias 'modus-vivendi-theme-rainbow-org-src-blocks
- 'modus-vivendi-theme-org-blocks "`modus-vivendi-theme' 0.11.0")
+(make-obsolete 'modus-vivendi-theme-rainbow-org-src-blocks
+ 'modus-vivendi-theme-org-blocks
+ "`modus-vivendi-theme' 0.11.0")
(defcustom modus-vivendi-theme-rainbow-org-src-blocks nil
"Use colour-coded backgrounds for `org-mode' source blocks.
@@ -565,16 +699,69 @@ association list)."
(const :tag "Subtle grey block background" greyscale)
(const :tag "Colour-coded background per programming language" rainbow)))
+(make-obsolete 'modus-vivendi-theme-3d-modeline
+ 'modus-vivendi-theme-mode-line
+ "`modus-vivendi-theme' 0.13.0")
+
(defcustom modus-vivendi-theme-3d-modeline nil
"Use a three-dimensional style for the active mode line."
:type 'boolean)
+(defcustom modus-vivendi-theme-mode-line nil
+ "Adjust the overall style of the mode line.
+
+Nil is a two-dimensional rectangle with a border around it. The
+active and the inactive modelines use different shades of
+greyscale values for the background and foreground.
+
+A `3d' value will apply a three-dimensional effect to the active
+modeline. The inactive modelines remain two-dimensional and are
+toned down a bit, relative to the nil value.
+
+The `moody' option is meant to optimise the modeline for use with
+the library of the same name. This practically means to remove
+the box effect and rely on underline and overline properties
+instead. It also tones down the inactive modelines. Despite its
+intended purpose, this option can also be used without the
+`moody' library."
+ :type '(choice
+ (const :tag "Two-dimensional box (default)" nil)
+ (const :tag "Three-dimensional style for the active mode line" 3d)
+ (const :tag "No box effects, which are optimal for use with the `moody' library" moody)))
+
+(make-obsolete 'modus-vivendi-theme-subtle-diffs
+ 'modus-vivendi-theme-diffs
+ "`modus-vivendi-theme' 0.13.0")
+
(defcustom modus-vivendi-theme-subtle-diffs nil
"Use fewer/dim backgrounds in `diff-mode', `ediff',`magit'."
:type 'boolean)
-(define-obsolete-variable-alias 'modus-vivendi-theme-intense-standard-completions
- 'modus-vivendi-theme-completions "`modus-vivendi-theme' 0.12.0")
+(defcustom modus-vivendi-theme-diffs nil
+ "Adjust the overall styles of diffs.
+
+Nil means to use fairly intense colour combinations for diffs.
+For example, you get a rich green background with a green
+foreground for added lines. Word-wise or 'refined' diffs follow
+the same pattern but use different shades of those colours to
+remain distinct.
+
+A `desaturated' value follows the same principles as with the nil
+option, while it tones down all relevant colours.
+
+Option `fg-only' will remove all accented backgrounds, except
+from word-wise changes. It instead uses colour-coded foreground
+values to differentiate between added/removed/changed lines. If
+a background is necessary, such as with `ediff', then a subtle
+greyscale value is used."
+ :type '(choice
+ (const :tag "Intensely coloured backgrounds (default)" nil)
+ (const :tag "Slightly accented backgrounds with tinted text" desaturated)
+ (const :tag "No backgrounds, except for refined diffs" fg-only)))
+
+(make-obsolete 'modus-vivendi-theme-intense-standard-completions
+ 'modus-vivendi-theme-completions
+ "`modus-vivendi-theme' 0.12.0")
(defcustom modus-vivendi-theme-intense-standard-completions nil
"Use prominent backgrounds for Icomplete, Ido, or similar."
@@ -582,6 +769,7 @@ association list)."
(defcustom modus-vivendi-theme-completions nil
"Apply special styles to the UI of completion frameworks.
+
This concerns Icomplete, Ivy, Helm, Selectrum, Ido, as well as
any other tool meant to enhance their experience. The effect
will vary depending on the completion framework.
@@ -621,7 +809,7 @@ effect than the former."
(const :tag "Intense background and foreground for the prompt" intense)))
(defcustom modus-vivendi-theme-intense-hl-line nil
- "Use more prominent background for `hl-line-mode'."
+ "Use more prominent background for command `hl-line-mode'."
:type 'boolean)
(defcustom modus-vivendi-theme-intense-paren-match nil
@@ -632,6 +820,10 @@ effect than the former."
"Use less saturated colours for code syntax highlighting."
:type 'boolean)
+(defcustom modus-vivendi-theme-no-link-underline nil
+ "Do not underline links."
+ :type 'boolean)
+
;;; Internal functions
;; Helper functions that are meant to ease the implementation of the
@@ -641,6 +833,11 @@ effect than the former."
(when modus-vivendi-theme-bold-constructs
(list :inherit 'bold)))
+(defun modus-vivendi-theme-mixed-fonts ()
+ "Conditional application of `fixed-pitch' inheritance."
+ (unless modus-vivendi-theme-no-mixed-fonts
+ (list :inherit 'fixed-pitch)))
+
(defun modus-vivendi-theme-fringe (subtlebg intensebg)
"Conditional use of background colours for fringes.
SUBTLEBG should be a subtle greyscale value. INTENSEBG must be a
@@ -679,29 +876,65 @@ FAINT is the less saturated colour."
(list :foreground faint)
(list :foreground normal)))
-(defun modus-vivendi-theme-heading-foreground (subtle rainbow)
- "Apply foreground value to headings.
-SUBTLE is the default aesthetic. RAINBOW is the saturated one."
- (if modus-vivendi-theme-rainbow-headings
- (list :foreground rainbow)
- (list :foreground subtle)))
-
-(defun modus-vivendi-theme-heading-block (bg fg)
- "Conditionally extend heading styles.
-Apply BG to background and FG to overline."
- (if modus-vivendi-theme-section-headings
- (append
- (and (>= emacs-major-version 27) '(:extend t))
- (list :background bg :overline fg))
- (list :background nil :overline nil)))
+(defun modus-vivendi-theme-heading-p (key)
+ "Query style of KEY in `modus-vivendi-theme-headings'."
+ (cdr (assoc key modus-vivendi-theme-headings)))
+
+(defun modus-vivendi-theme-heading (level fg fg-alt bg border)
+ "Conditional styles for `modus-vivendi-theme-headings'.
-(defun modus-vivendi-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."
- (if modus-vivendi-theme-section-headings
- (list :background bgbox :foreground fgbox :box (list :color fgbox))
- (list :foreground fg)))
+LEVEL is the heading's position in their order. FG is the
+default text colour. FG-ALT is an accented, more saturated value
+than the default. BG is a nuanced, typically accented,
+background that can work well with either of the foreground
+values. BORDER is a colour value that combines well with the
+background and alternative foreground."
+ (let* ((key (modus-vivendi-theme-heading-p `,level))
+ (style (or key (modus-vivendi-theme-heading-p t)))
+ (var (if modus-vivendi-theme-variable-pitch-headings
+ 'variable-pitch
+ 'default)))
+ (pcase style
+ ('no-bold
+ (list :inherit `,var :foreground fg))
+ ('line
+ (list :inherit `(bold ,var) :foreground fg :overline border))
+ ('line-no-bold
+ (list :inherit `,var :foreground fg :overline border))
+ ('rainbow
+ (list :inherit `(bold ,var) :foreground fg-alt))
+ ('rainbow-no-bold
+ (list :inherit `,var :foreground fg-alt))
+ ('rainbow-line
+ (list :inherit `(bold ,var) :foreground fg-alt :overline border))
+ ('rainbow-line-no-bold
+ (list :inherit `,var :foreground fg-alt :overline border))
+ ('highlight
+ (list :inherit `(bold ,var) :background bg :foreground fg))
+ ('highlight-no-bold
+ (list :inherit `,var :background bg :foreground fg))
+ ('rainbow-highlight
+ (list :inherit `(bold ,var) :background bg :foreground fg-alt))
+ ('rainbow-highlight-no-bold
+ (list :inherit `,var :background bg :foreground fg-alt))
+ ('section
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `(bold ,var) :background bg :foreground fg :overline border)))
+ ('section-no-bold
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `,var :background bg :foreground fg :overline border)))
+ ('rainbow-section
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `(bold ,var) :background bg :foreground fg-alt :overline border)))
+ ('rainbow-section-no-bold
+ (append
+ (and (>= emacs-major-version 27) '(:extend t))
+ (list :inherit `,var :background bg :foreground fg-alt :overline border)))
+ (_
+ (list :inherit `(bold ,var) :foreground fg)))))
(defun modus-vivendi-theme-org-block (bgblk)
"Conditionally set the background of Org blocks.
@@ -737,46 +970,64 @@ set to `rainbow'."
('rainbow (list :background bgaccent :foreground fgaccent))
(_ (list :background bg :foreground fg))))
-(defun modus-vivendi-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."
- (let* ((style (if btn 'released-button nil))
- (int (if int int 1)))
- (if modus-vivendi-theme-3d-modeline
- (list :line-width int :color col3d :style style)
- (list :line-width 1 :color col :style nil))))
-
-(defun modus-vivendi-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."
- (if modus-vivendi-theme-3d-modeline
- (list :background bg3d :foreground fg3d)
- (list :background bg :foreground fg)))
-
-(defun modus-vivendi-theme-diffs (subtle-bg subtle-fg intense-bg intense-fg)
- "Colour combinations for `modus-vivendi-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"
- (if modus-vivendi-theme-subtle-diffs
- (list :background subtle-bg :foreground subtle-fg)
- (list :background intense-bg :foreground intense-fg)))
+(defun modus-vivendi-theme-mode-line-attrs
+ (fg bg fg-alt bg-alt border border-3d &optional alt-style border-width fg-distant)
+ "Colour combinations for `modus-vivendi-theme-mode-line'.
+
+FG and BG are the default colours. FG-ALT and BG-ALT are meant
+to accommodate the options for a 3D modeline or a `moody'
+compliant one. BORDER applies to all permutations of the
+modeline, except the three-dimensional effect, where BORDER-3D is
+used instead.
+
+Optional ALT-STYLE applies an appropriate style to the mode
+line's box property.
+
+Optional BORDER-WIDTH specifies an integer for the width of the
+rectangle that produces the box effect.
+
+Optional FG-DISTANT should be close to the main background
+values. It is intended to be used as a distant-foreground
+property."
+ (pcase modus-vivendi-theme-mode-line
+ ('3d
+ `(:background ,bg-alt :foreground ,fg-alt
+ :box (:line-width ,(or border-width 1)
+ :color ,border-3d
+ :style ,(and alt-style 'released-button))))
+ ('moody
+ `(:background ,bg-alt :foreground ,fg-alt :underline ,border :overline ,border
+ :distant-foreground ,fg-distant))
+ (_
+ `(:foreground ,fg :background ,bg :box ,border))))
+
+(defun modus-vivendi-theme-diff (fg-only-bg fg-only-fg mainbg mainfg altbg altfg)
+ "Colour combinations for `modus-vivendi-theme-diffs'.
+
+FG-ONLY-BG should be similar or the same as the main background.
+FG-ONLY-FG should be a saturated accent value that can be
+combined with the former.
+
+MAINBG must be one of the dedicated backgrounds for diffs while
+MAINFG must be the same for the foreground.
+
+ALTBG needs to be a slightly accented background that is meant to
+be combined with ALTFG. Both must be less intense than MAINBG
+and MAINFG respectively."
+ (pcase modus-vivendi-theme-diffs
+ ('fg-only (list :background fg-only-bg :foreground fg-only-fg))
+ ('desaturated (list :background altbg :foreground altfg))
+ (_ (list :background mainbg :foreground mainfg))))
(defun modus-vivendi-theme-standard-completions (mainfg subtlebg intensebg intensefg)
"Combinations for `modus-vivendi-theme-completions'.
-These are intended for Icomplete, Ido, and related.
MAINFG is an accented foreground value. SUBTLEBG is an accented
background value that can be combined with MAINFG. INTENSEBG and
INTENSEFG are accented colours that are designed to be used in
-tandem."
+tandem.
+
+These are intended for Icomplete, Ido, and related."
(pcase modus-vivendi-theme-completions
('opinionated (list :background intensebg :foreground intensefg))
('moderate (list :background subtlebg :foreground mainfg))
@@ -784,7 +1035,6 @@ tandem."
(defun modus-vivendi-theme-extra-completions (subtleface intenseface altface &optional altfg bold)
"Combinations for `modus-vivendi-theme-completions'.
-These are intended for Helm, Ivy, Selectrum, etc.
SUBTLEFACE and INTENSEFACE are custom theme faces that combine a
background and foreground value. The difference between the two
@@ -794,10 +1044,12 @@ ALTFACE is a combination of colours that represents a departure
from the UI's default aesthetics. Optional ALTFG is meant to be
used in tandem with it.
-Optional BOLD will apply a heavier weight to the text."
+Optional BOLD will apply a heavier weight to the text.
+
+These are intended for Helm, Ivy, etc."
(pcase modus-vivendi-theme-completions
('opinionated (list :inherit (list altface bold)
- :foreground (if altfg altfg 'unspecified)))
+ :foreground (or altfg 'unspecified)))
('moderate (list :inherit (list subtleface bold)))
(_ (list :inherit (list intenseface bold)))))
@@ -826,8 +1078,8 @@ AMOUNT is a customisation option."
;; specifically for on/off states (e.g. `mode-line')
;;
;; must be combined with themselves
- ("bg-active" . "#2f2f2f") ("fg-active" . "#f5f5f5")
- ("bg-inactive" . "#202020") ("fg-inactive" . "#bebebe")
+ ("bg-active" . "#323232") ("fg-active" . "#f4f4f4")
+ ("bg-inactive" . "#1e1e1e") ("fg-inactive" . "#bfc0c4")
;; 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}
@@ -839,19 +1091,19 @@ AMOUNT is a customisation option."
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red" . "#ff8059") ("green" . "#44bc44")
- ("yellow" . "#eecc00") ("blue" . "#29aeff")
+ ("yellow" . "#eecc00") ("blue" . "#2fafff")
("magenta" . "#feacd0") ("cyan" . "#00d3d0")
;; styles for common, but still specialised constructs
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red-alt" . "#f4923b") ("green-alt" . "#80d200")
- ("yellow-alt" . "#cfdf30") ("blue-alt" . "#72a4ff")
+ ("yellow-alt" . "#cfdf30") ("blue-alt" . "#79a8ff")
("magenta-alt" . "#f78fe7") ("cyan-alt" . "#4ae8fc")
;; same purpose as above, just slight differences
;;
;; must be combined with: `bg-main', `bg-alt', `bg-dim'
("red-alt-other" . "#ff9977") ("green-alt-other" . "#00cd68")
- ("yellow-alt-other" . "#f0ce43") ("blue-alt-other" . "#00bdfa")
+ ("yellow-alt-other" . "#f0ce43") ("blue-alt-other" . "#00bcff")
("magenta-alt-other" . "#b6a0ff") ("cyan-alt-other" . "#6ae4b9")
;; styles for desaturated foreground text, intended for use with
;; the `modus-vivendi-theme-faint-syntax' option
@@ -915,21 +1167,24 @@ AMOUNT is a customisation option."
;; styles that are meant exclusively for the mode line
;;
;; must be combined with: `bg-active', `bg-inactive'
- ("red-active" . "#ffa49e") ("green-active" . "#70e030")
- ("yellow-active" . "#efdf00") ("blue-active" . "#00ccff")
- ("magenta-active" . "#d0acff") ("cyan-active" . "#00ddc0")
+ ("red-active" . "#ffa7ba") ("green-active" . "#70d73f")
+ ("yellow-active" . "#dbbe5f") ("blue-active" . "#34cfff")
+ ("magenta-active" . "#d5b1ff") ("cyan-active" . "#00d8b4")
;; styles that are meant exclusively for the fringes
;;
- ;; must have a minimum contrast ratio of 1.5:1 with `bg-inactive'
- ;; and be combined with `fg-main' or `fg-dim'
- ("red-fringe-bg" . "#8f0040") ("green-fringe-bg" . "#006000")
- ("yellow-fringe-bg" . "#6f4a00") ("blue-fringe-bg" . "#3a30ab")
- ("magenta-fringe-bg" . "#692089") ("cyan-fringe-bg" . "#0068a0")
+ ;; must be combined with `fg-main'
+ ("red-fringe-bg" . "#8f1f4b") ("green-fringe-bg" . "#006700")
+ ("yellow-fringe-bg" . "#6f4f00") ("blue-fringe-bg" . "#3f33af")
+ ("magenta-fringe-bg" . "#6f2f89") ("cyan-fringe-bg" . "#004f8f")
;; styles reserved for specific faces
;;
;; `bg-hl-line' is between `bg-dim' and `bg-alt', so it should
;; work with all accents that cover those two, plus `bg-main'
;;
+ ;; `bg-hl-alt' and `bg-hl-alt-intense' should only be used when no
+ ;; other greyscale or fairly neutral background is available to
+ ;; properly draw attention to a given construct
+ ;;
;; `bg-header' is between `bg-active' and `bg-inactive', so it
;; can be combined with any of the "active" values, plus the
;; "special" and base foreground colours
@@ -960,8 +1215,11 @@ AMOUNT is a customisation option."
;;
;; all pairs are combinable with themselves
("bg-hl-line" . "#151823")
+ ("bg-hl-line-intense" . "#2f2f2f")
+ ("bg-hl-alt" . "#181732")
+ ("bg-hl-alt-intense" . "#282e46")
("bg-paren-match" . "#5f362f")
- ("bg-paren-match-intense" . "#255650")
+ ("bg-paren-match-intense" . "#7416b5")
("bg-region" . "#3c3c3c")
("bg-tab-bar" . "#2c2c2c")
@@ -1094,12 +1352,12 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-nuanced-cyan ((,class :background ,cyan-nuanced-bg
,@(and (>= emacs-major-version 27) '(:extend t)))))
;;;;; fringe-specific combinations
- `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-green ((,class :background ,green-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg :foreground ,fg-dim)))
- `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground ,fg-dim)))
+ `(modus-theme-fringe-red ((,class :background ,red-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-green ((,class :background ,green-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-yellow ((,class :background ,yellow-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-blue ((,class :background ,blue-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-magenta ((,class :background ,magenta-fringe-bg :foreground ,fg-main)))
+ `(modus-theme-fringe-cyan ((,class :background ,cyan-fringe-bg :foreground ,fg-main)))
;;;;; special base values
;; these are closer to the grayscale than the accents defined above
;; and should only be used when the next closest alternative would be
@@ -1110,26 +1368,96 @@ Also bind `class' to ((class color) (min-colors 89))."
`(modus-theme-special-calm ((,class :background ,bg-special-calm :foreground ,fg-special-calm)))
;;;;; diff-specific combinations
;; intended for `diff-mode' or equivalent
- `(modus-theme-diff-added ((,class :background ,bg-diff-added :foreground ,fg-diff-added)))
- `(modus-theme-diff-changed ((,class :background ,bg-diff-changed :foreground ,fg-diff-changed)))
- `(modus-theme-diff-removed ((,class :background ,bg-diff-removed :foreground ,fg-diff-removed)))
- `(modus-theme-diff-refine-added ((,class :background ,bg-diff-refine-added :foreground ,fg-diff-refine-added)))
- `(modus-theme-diff-refine-changed ((,class :background ,bg-diff-refine-changed :foreground ,fg-diff-refine-changed)))
- `(modus-theme-diff-refine-removed ((,class :background ,bg-diff-refine-removed :foreground ,fg-diff-refine-removed)))
- `(modus-theme-diff-focus-added ((,class :background ,bg-diff-focus-added :foreground ,fg-diff-focus-added)))
- `(modus-theme-diff-focus-changed ((,class :background ,bg-diff-focus-changed :foreground ,fg-diff-focus-changed)))
- `(modus-theme-diff-focus-removed ((,class :background ,bg-diff-focus-removed :foreground ,fg-diff-focus-removed)))
- `(modus-theme-diff-heading ((,class :background ,bg-diff-heading :foreground ,fg-diff-heading)))
+ `(modus-theme-diff-added
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-main green
+ bg-diff-focus-added fg-diff-focus-added
+ green-nuanced-bg fg-diff-added))))
+ `(modus-theme-diff-changed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-main yellow
+ bg-diff-focus-changed fg-diff-focus-changed
+ yellow-nuanced-bg fg-diff-changed))))
+ `(modus-theme-diff-removed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-main red
+ bg-diff-focus-removed fg-diff-focus-removed
+ red-nuanced-bg fg-diff-removed))))
+ `(modus-theme-diff-refine-added
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-diff-added fg-diff-added
+ bg-diff-refine-added fg-diff-refine-added
+ bg-diff-focus-added fg-diff-focus-added))))
+ `(modus-theme-diff-refine-changed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-diff-changed fg-diff-changed
+ bg-diff-refine-changed fg-diff-refine-changed
+ bg-diff-focus-changed fg-diff-focus-changed))))
+ `(modus-theme-diff-refine-removed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-diff-removed fg-diff-removed
+ bg-diff-refine-removed fg-diff-refine-removed
+ bg-diff-focus-removed fg-diff-focus-removed))))
+ `(modus-theme-diff-focus-added
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-dim green
+ bg-diff-focus-added fg-diff-focus-added
+ bg-diff-added fg-diff-added))))
+ `(modus-theme-diff-focus-changed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-dim yellow
+ bg-diff-focus-changed fg-diff-focus-changed
+ bg-diff-changed fg-diff-changed))))
+ `(modus-theme-diff-focus-removed
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-dim red
+ bg-diff-focus-removed fg-diff-focus-removed
+ bg-diff-removed fg-diff-removed))))
+ `(modus-theme-diff-heading
+ ((,class ,@(modus-vivendi-theme-diff
+ bg-alt blue-alt
+ bg-diff-heading fg-diff-heading
+ blue-nuanced-bg blue))))
;;;;; mark indicators
;; colour combinations intended for Dired, Ibuffer, or equivalent
- `(modus-theme-header ((,class :inherit bold :foreground ,fg-main)))
+ `(modus-theme-pseudo-header ((,class :inherit bold :foreground ,fg-main)))
`(modus-theme-mark-alt ((,class :inherit bold :background ,bg-mark-alt :foreground ,fg-mark-alt)))
`(modus-theme-mark-del ((,class :inherit bold :background ,bg-mark-del :foreground ,fg-mark-del)))
`(modus-theme-mark-sel ((,class :inherit bold :background ,bg-mark-sel :foreground ,fg-mark-sel)))
`(modus-theme-mark-symbol ((,class :inherit bold :foreground ,blue-alt)))
+;;;;; heading levels
+ ;; styles for regular headings used in Org, Markdown, Info, etc.
+ `(modus-theme-heading-1
+ ((,class ,@(modus-vivendi-theme-heading
+ 1 fg-main magenta-alt-other magenta-nuanced-bg bg-region)
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4))))
+ `(modus-theme-heading-2
+ ((,class ,@(modus-vivendi-theme-heading
+ 2 fg-special-warm magenta-alt red-nuanced-bg bg-region)
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3))))
+ `(modus-theme-heading-3
+ ((,class ,@(modus-vivendi-theme-heading
+ 3 fg-special-cold blue blue-nuanced-bg bg-region)
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2))))
+ `(modus-theme-heading-4
+ ((,class ,@(modus-vivendi-theme-heading
+ 4 fg-special-mild cyan cyan-nuanced-bg bg-region)
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-1))))
+ `(modus-theme-heading-5
+ ((,class ,@(modus-vivendi-theme-heading
+ 5 fg-special-calm green-alt-other green-nuanced-bg bg-region))))
+ `(modus-theme-heading-6
+ ((,class ,@(modus-vivendi-theme-heading
+ 6 yellow-nuanced yellow-alt-other yellow-nuanced-bg bg-region))))
+ `(modus-theme-heading-7
+ ((,class ,@(modus-vivendi-theme-heading
+ 7 red-nuanced red-alt red-nuanced-bg bg-region))))
+ `(modus-theme-heading-8
+ ((,class ,@(modus-vivendi-theme-heading
+ 8 fg-dim magenta bg-alt bg-region))))
;;;;; other custom faces
`(modus-theme-hl-line ((,class :background ,(if modus-vivendi-theme-intense-hl-line
- bg-active bg-hl-line)
+ bg-hl-line-intense bg-hl-line)
(and (>= emacs-major-version 27) '(:extend t)))))
;;;; standard faces
;;;;; absolute essentials
@@ -1149,26 +1477,25 @@ Also bind `class' to ((class color) (min-colors 89))."
`(bold ((,class :weight bold)))
`(comint-highlight-input ((,class :inherit bold)))
`(comint-highlight-prompt ((,class ,@(modus-vivendi-theme-bold-weight)
- ,@(modus-vivendi-theme-prompt cyan
- blue-nuanced-bg
- blue-alt
- blue-refine-bg
- fg-main))))
+ ,@(modus-vivendi-theme-prompt
+ cyan
+ blue-nuanced-bg blue-alt
+ blue-refine-bg fg-main))))
`(error ((,class :inherit bold :foreground ,red)))
`(escape-glyph ((,class :foreground ,fg-escape-char-construct)))
`(file-name-shadow ((,class :foreground ,fg-unfocused)))
`(header-line ((,class :background ,bg-header :foreground ,fg-header)))
`(header-line-highlight ((,class :inherit modus-theme-active-blue)))
+ `(help-argument-name ((,class :foreground ,cyan :slant ,modus-theme-slant)))
`(homoglyph ((,class :foreground ,fg-escape-char-construct)))
`(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other)))
`(italic ((,class :slant italic)))
`(nobreak-hyphen ((,class :foreground ,fg-escape-char-construct)))
`(nobreak-space ((,class :foreground ,fg-escape-char-construct :underline t)))
- `(minibuffer-prompt ((,class ,@(modus-vivendi-theme-prompt cyan-alt-other
- cyan-nuanced-bg
- cyan
- cyan-refine-bg
- fg-main))))
+ `(minibuffer-prompt ((,class ,@(modus-vivendi-theme-prompt
+ cyan-alt-other
+ cyan-nuanced-bg cyan
+ cyan-refine-bg fg-main))))
`(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)))
@@ -1180,9 +1507,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(trailing-whitespace ((,class :background ,red-intense-bg)))
`(warning ((,class :inherit bold :foreground ,yellow)))
;;;;; buttons, links, widgets
- `(button ((,class :foreground ,blue-alt-other :underline t)))
- `(link ((,class :foreground ,blue-alt-other :underline t)))
- `(link-visited ((,class :foreground ,magenta-alt-other :underline t)))
+ `(button ((,class :foreground ,blue-alt-other
+ ,@(unless modus-vivendi-theme-no-link-underline
+ (list :underline t)))))
+ `(link ((,class :inherit button)))
+ `(link-visited ((,class :inherit link :foreground ,magenta-alt-other)))
`(tooltip ((,class :background ,bg-special-cold :foreground ,fg-main)))
`(widget-button ((,class :inherit button)))
`(widget-button-pressed ((,class :inherit button :foreground ,magenta)))
@@ -1249,13 +1578,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(anzu-replace-highlight ((,class :inherit modus-theme-refine-yellow :underline t)))
`(anzu-replace-to ((,class :inherit (modus-theme-intense-green bold))))
;;;;; apropos
- `(apropos-function-button ((,class :foreground ,magenta-alt-other :underline t)))
+ `(apropos-function-button ((,class :inherit button :foreground ,magenta-alt-other)))
`(apropos-keybinding ((,class :inherit bold :foreground ,cyan)))
- `(apropos-misc-button ((,class :foreground ,cyan-alt-other :underline t)))
+ `(apropos-misc-button ((,class :inherit button :foreground ,cyan-alt-other)))
`(apropos-property ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-alt)))
- `(apropos-symbol ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,blue-nuanced :underline t)))
- `(apropos-user-option-button ((,class :foreground ,green-alt-other :underline t)))
- `(apropos-variable-button ((,class :foreground ,blue :underline t)))
+ `(apropos-symbol ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,blue-alt-other)))
+ `(apropos-user-option-button ((,class :inherit button :foreground ,green-alt-other)))
+ `(apropos-variable-button ((,class :inherit button :foreground ,blue)))
;;;;; apt-sources-list
`(apt-sources-list-components ((,class :foreground ,cyan)))
`(apt-sources-list-options ((,class :foreground ,yellow)))
@@ -1310,6 +1639,24 @@ Also bind `class' to ((class color) (min-colors 89))."
`(aw-leading-char-face ((,class :inherit bold :height 1.5 :background ,bg-main :foreground ,red-intense)))
`(aw-minibuffer-leading-char-face ((,class :foreground ,magenta-active)))
`(aw-mode-line-face ((,class :inherit bold)))
+;;;;; awesome-tray
+ `(awesome-tray-module-awesome-tab-face ((,class :inherit bold :foreground ,red-alt-other)))
+ `(awesome-tray-module-battery-face ((,class :inherit bold :foreground ,cyan-alt-other)))
+ `(awesome-tray-module-buffer-name-face ((,class :inherit bold :foreground ,yellow-alt-other)))
+ `(awesome-tray-module-circe-face ((,class :inherit bold :foreground ,blue-alt)))
+ `(awesome-tray-module-date-face ((,class :inherit bold :foreground ,fg-dim)))
+ `(awesome-tray-module-evil-face ((,class :inherit bold :foreground ,green-alt)))
+ `(awesome-tray-module-git-face ((,class :inherit bold :foreground ,magenta)))
+ `(awesome-tray-module-last-command-face ((,class :inherit bold :foreground ,blue-alt-other)))
+ `(awesome-tray-module-location-face ((,class :inherit bold :foreground ,yellow)))
+ `(awesome-tray-module-mode-name-face ((,class :inherit bold :foreground ,green)))
+ `(awesome-tray-module-parent-dir-face ((,class :inherit bold :foreground ,cyan)))
+ `(awesome-tray-module-rvm-face ((,class :inherit bold :foreground ,magenta-alt-other)))
+;;;;; binder
+ `(binder-sidebar-highlight ((,class :inherit modus-theme-subtle-cyan)))
+ `(binder-sidebar-marked ((,class :inherit modus-theme-mark-sel)))
+ `(binder-sidebar-missing ((,class :inherit modus-theme-subtle-red)))
+ `(binder-sidebar-tags ((,class :foreground ,cyan)))
;;;;; bm
`(bm-face ((,class :inherit modus-theme-subtle-yellow
,@(and (>= emacs-major-version 27) '(:extend t)))))
@@ -1351,26 +1698,27 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diary-time ((,class :foreground ,blue-alt)))
`(holiday ((,class :foreground ,magenta-alt)))
;;;;; calfw
- `(cfw:face-annotation ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(cfw:face-day-title ((,class :background ,bg-alt :foreground ,fg-main)))
+ `(cfw:face-annotation ((,class :foreground ,fg-special-warm)))
+ `(cfw:face-day-title ((,class :foreground ,fg-main)))
`(cfw:face-default-content ((,class :foreground ,green-alt)))
`(cfw:face-default-day ((,class :inherit (cfw:face-day-title bold))))
- `(cfw:face-disable ((,class :background ,bg-inactive :foreground ,fg-inactive)))
- `(cfw:face-grid ((,class :foreground ,fg-inactive)))
- `(cfw:face-header ((,class :inherit bold ::foreground ,fg-main)))
- `(cfw:face-holiday ((,class :inherit bold :background ,bg-alt :foreground ,magenta)))
+ `(cfw:face-disable ((,class :foreground ,fg-unfocused)))
+ `(cfw:face-grid ((,class :foreground ,fg-window-divider-outer)))
+ `(cfw:face-header ((,class :inherit bold :foreground ,fg-main)))
+ `(cfw:face-holiday ((,class :foreground ,magenta-alt-other)))
`(cfw:face-periods ((,class :foreground ,cyan-alt-other)))
- `(cfw:face-saturday ((,class :inherit bold :background ,bg-alt :foreground ,magenta-alt)))
+ `(cfw:face-saturday ((,class :inherit bold :foreground ,cyan-alt-other)))
`(cfw:face-select ((,class :inherit modus-theme-intense-blue)))
- `(cfw:face-sunday ((,class :inherit bold :background ,bg-alt :foreground ,magenta-alt-other)))
+ `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other)))
`(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch
- :foreground ,fg-special-warm
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4))))
- `(cfw:face-today ((,class :inherit bold :foreground ,blue)))
- `(cfw:face-today-title ((,class :inherit modus-theme-special-mild :box t)))
- `(cfw:face-toolbar ((,class :background ,bg-active :foreground ,bg-active)))
- `(cfw:face-toolbar-button-off ((,class :background ,bg-alt :foreground ,cyan)))
- `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,bg-main :foreground ,blue-intense)))
+ :foreground ,fg-special-cold
+ ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-5))))
+ `(cfw:face-today ((,class :background ,bg-inactive)))
+ `(cfw:face-today-title ((,class :background ,bg-active)))
+ `(cfw:face-toolbar ((,class :background ,bg-alt :foreground ,bg-alt)))
+ `(cfw:face-toolbar-button-off ((,class :foreground ,fg-alt)))
+ `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,blue-nuanced-bg
+ :foreground ,blue-alt)))
;;;;; centaur-tabs
`(centaur-tabs-active-bar-face ((,class :background ,fg-tab-active)))
`(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground ,red-active :underline t)))
@@ -1392,8 +1740,8 @@ Also bind `class' to ((class color) (min-colors 89))."
`(change-log-function ((,class :foreground ,green-alt-other)))
`(change-log-list ((,class :foreground ,magenta-alt-other)))
`(change-log-name ((,class :foreground ,cyan)))
- `(log-edit-header ((,class :inherit bold :foreground ,green-alt-other)))
- `(log-edit-summary ((,class :foreground ,magenta-alt-other)))
+ `(log-edit-header ((,class :foreground ,fg-special-warm)))
+ `(log-edit-summary ((,class :inherit bold :foreground ,cyan)))
`(log-edit-unknown-header ((,class :foreground ,fg-alt)))
`(log-view-file ((,class :inherit bold :foreground ,fg-special-cold)))
`(log-view-message ((,class :foreground ,fg-alt)))
@@ -1437,7 +1785,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(circe-highlight-nick-face ((,class :inherit bold :foreground ,blue)))
`(circe-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(circe-server-face ((,class :foreground ,fg-unfocused)))
- `(lui-button-face ((,class :foreground ,blue :underline t)))
+ `(lui-button-face ((,class :inherit button :foreground ,blue)))
`(lui-highlight-face ((,class :foreground ,magenta-alt)))
`(lui-time-stamp-face ((,class :foreground ,blue-nuanced)))
;;;;; color-rg
@@ -1490,12 +1838,12 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; completions
`(completions-annotations ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
`(completions-common-part ((,class ,@(modus-vivendi-theme-standard-completions
- cyan-alt-other cyan-nuanced-bg
- yellow-refine-bg yellow-refine-fg))))
+ blue-alt blue-nuanced-bg
+ cyan-refine-bg cyan-refine-fg))))
`(completions-first-difference ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- blue-alt-other blue-nuanced-bg
- cyan-subtle-bg fg-dim))))
+ magenta-alt blue-nuanced-bg
+ magenta-intense-bg fg-main))))
;;;;; counsel
`(counsel-active-mode ((,class :foreground ,magenta-alt-other)))
`(counsel-application-name ((,class :foreground ,red-alt-other)))
@@ -1531,6 +1879,10 @@ Also bind `class' to ((class color) (min-colors 89))."
`(cov-light-face ((,class :foreground ,blue-intense)))
`(cov-med-face ((,class :foreground ,yellow-intense)))
`(cov-none-face ((,class :foreground ,cyan-intense)))
+;;;;; cperl-mode
+ `(cperl-nonoverridable-face ((,class :foreground ,yellow-alt-other)))
+ `(cperl-array-face ((,class :inherit bold :background ,bg-alt :foreground ,magenta-alt)))
+ `(cperl-hash-face ((,class :inherit bold :background ,bg-alt :foreground ,red-alt :slant ,modus-theme-slant)))
;;;;; csv-mode
`(csv-separator-face ((,class :background ,bg-special-cold :foreground ,fg-main)))
;;;;; ctrlf
@@ -1609,7 +1961,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(deft-title-face ((,class :inherit bold :foreground ,fg-main)))
;;;;; dictionary
`(dictionary-button-face ((,class :inherit bold :foreground ,fg-special-cold)))
- `(dictionary-reference-face ((,class :foreground ,blue-alt-other :underline t)))
+ `(dictionary-reference-face ((,class :inherit button :foreground ,blue-alt-other)))
`(dictionary-word-definition-face ((,class :foreground ,fg-main)))
`(dictionary-word-entry-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
;;;;; diff-hl
@@ -1623,47 +1975,54 @@ Also bind `class' to ((class color) (min-colors 89))."
`(diff-hl-insert ((,class :inherit modus-theme-fringe-green)))
`(diff-hl-reverted-hunk-highlight ((,class :inherit (modus-theme-active-magenta bold))))
;;;;; diff-mode
- `(diff-added ((,class ,@(modus-vivendi-theme-diffs
- bg-main green
- bg-diff-focus-added fg-diff-focus-added))))
- `(diff-changed ((,class ,@(modus-vivendi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
+ `(diff-added ((,class :inherit modus-theme-diff-added)))
+ `(diff-changed ((,class :inherit modus-theme-diff-changed)))
`(diff-context ((,class :foreground ,fg-unfocused)))
`(diff-file-header ((,class :inherit bold :foreground ,blue)))
`(diff-function ((,class :foreground ,fg-special-cold)))
`(diff-header ((,class :foreground ,blue-nuanced)))
- `(diff-hunk-header ((,class ,@(modus-vivendi-theme-diffs
- bg-alt blue-alt
- bg-diff-heading fg-diff-heading))))
+ `(diff-hunk-header ((,class :inherit modus-theme-diff-heading)))
`(diff-index ((,class :inherit bold :foreground ,blue-alt)))
`(diff-indicator-added ((,class :inherit diff-added)))
`(diff-indicator-changed ((,class :inherit diff-changed)))
`(diff-indicator-removed ((,class :inherit diff-removed)))
`(diff-nonexistent ((,class :inherit (modus-theme-neutral bold))))
- `(diff-refine-added ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added fg-diff-refine-added))))
- `(diff-refine-changed ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-changed fg-diff-changed
- bg-diff-refine-changed fg-diff-refine-changed))))
- `(diff-refine-removed ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-removed fg-diff-removed
- bg-diff-refine-removed fg-diff-refine-removed))))
- `(diff-removed ((,class ,@(modus-vivendi-theme-diffs
- bg-main red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ `(diff-refine-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(diff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
+ `(diff-refine-removed ((,class :inherit modus-theme-diff-refine-removed)))
+ `(diff-removed ((,class :inherit modus-theme-diff-removed)))
;;;;; dim-autoload
`(dim-autoload-cookie-line ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+;;;;; dir-treeview
+ `(dir-treeview-archive-face ((,class :foreground ,fg-special-warm)))
+ `(dir-treeview-archive-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,yellow)))
+ `(dir-treeview-audio-face ((,class :foreground ,magenta)))
+ `(dir-treeview-audio-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,magenta-alt)))
+ `(dir-treeview-control-face ((,class :foreground ,fg-alt)))
+ `(dir-treeview-control-mouse-face ((,class :inherit highlight)))
+ `(dir-treeview-default-icon-face ((,class :inherit bold :family "Font Awesome" :foreground ,fg-alt)))
+ `(dir-treeview-default-filename-face ((,class :foreground ,fg-main)))
+ `(dir-treeview-directory-face ((,class :foreground ,blue)))
+ `(dir-treeview-directory-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,blue-alt)))
+ `(dir-treeview-executable-face ((,class :foreground ,red-alt)))
+ `(dir-treeview-executable-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,red-alt-other)))
+ `(dir-treeview-image-face ((,class :foreground ,green-alt-other)))
+ `(dir-treeview-image-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,green-alt)))
+ `(dir-treeview-indent-face ((,class :foreground ,fg-alt)))
+ `(dir-treeview-label-mouse-face ((,class :inherit highlight)))
+ `(dir-treeview-start-dir-face ((,class :inherit modus-theme-pseudo-header)))
+ `(dir-treeview-symlink-face ((,class :inherit button :foreground ,cyan)))
+ `(dir-treeview-video-face ((,class :foreground ,magenta-alt-other)))
+ `(dir-treeview-video-icon-face ((,class :inherit dir-treeview-default-icon-face :foreground ,magenta-alt-other)))
;;;;; dired
`(dired-directory ((,class :foreground ,blue)))
`(dired-flagged ((,class :inherit modus-theme-mark-del)))
- `(dired-header ((,class :inherit modus-theme-header)))
+ `(dired-header ((,class :inherit modus-theme-pseudo-header)))
`(dired-ignored ((,class :foreground ,fg-alt)))
`(dired-mark ((,class :inherit modus-theme-mark-symbol)))
`(dired-marked ((,class :inherit modus-theme-mark-sel)))
`(dired-perm-write ((,class :foreground ,fg-special-warm)))
- `(dired-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(dired-symlink ((,class :inherit button :foreground ,cyan-alt)))
`(dired-warning ((,class :inherit bold :foreground ,yellow)))
;;;;; dired-async
`(dired-async-failures ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,red-active)))
@@ -1688,43 +2047,44 @@ Also bind `class' to ((class color) (min-colors 89))."
`(dired-subtree-depth-6-face ((,class :background nil)))
;;;;; diredfl
`(diredfl-autofile-name ((,class :inherit modus-theme-special-cold)))
- `(diredfl-compressed-file-name ((,class :foreground ,green-alt-other)))
- `(diredfl-compressed-file-suffix ((,class :foreground ,green-alt)))
- `(diredfl-date-time ((,class :foreground ,fg-special-cold)))
+ `(diredfl-compressed-file-name ((,class :foreground ,fg-special-warm)))
+ `(diredfl-compressed-file-suffix ((,class :foreground ,red-alt)))
+ `(diredfl-date-time ((,class :foreground ,cyan-alt-other)))
`(diredfl-deletion ((,class :inherit modus-theme-mark-del)))
`(diredfl-deletion-file-name ((,class :inherit modus-theme-mark-del)))
- `(diredfl-dir-heading ((,class :inherit modus-theme-header)))
+ `(diredfl-dir-heading ((,class :inherit modus-theme-pseudo-header)))
`(diredfl-dir-name ((,class :inherit dired-directory)))
- `(diredfl-dir-priv ((,class :foreground ,blue)))
- `(diredfl-exec-priv ((,class :foreground ,red-alt-other)))
- `(diredfl-executable-tag ((,class :foreground ,red-alt)))
+ `(diredfl-dir-priv ((,class :foreground ,blue-alt)))
+ `(diredfl-exec-priv ((,class :foreground ,magenta)))
+ `(diredfl-executable-tag ((,class :foreground ,magenta-alt)))
`(diredfl-file-name ((,class :foreground ,fg-main)))
- `(diredfl-file-suffix ((,class :foreground ,fg-special-warm)))
+ `(diredfl-file-suffix ((,class :foreground ,cyan)))
`(diredfl-flag-mark ((,class :inherit modus-theme-mark-sel)))
`(diredfl-flag-mark-line ((,class :inherit modus-theme-mark-sel)))
- `(diredfl-ignored-file-name ((,class :foreground ,fg-inactive)))
+ `(diredfl-ignored-file-name ((,class :foreground ,fg-alt)))
`(diredfl-link-priv ((,class :foreground ,blue-alt-other)))
- `(diredfl-no-priv ((,class :foreground ,fg-inactive)))
- `(diredfl-number ((,class :foreground ,cyan)))
+ `(diredfl-no-priv ((,class :foreground ,fg-alt)))
+ `(diredfl-number ((,class :foreground ,cyan-alt)))
`(diredfl-other-priv ((,class :foreground ,yellow)))
- `(diredfl-rare-priv ((,class :foreground ,magenta-alt-other)))
- `(diredfl-read-priv ((,class :foreground ,magenta)))
- `(diredfl-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(diredfl-rare-priv ((,class :foreground ,red-alt)))
+ `(diredfl-read-priv ((,class :foreground ,fg-main)))
+ `(diredfl-symlink ((,class :inherit dired-symlink)))
`(diredfl-tagged-autofile-name ((,class :inherit modus-theme-refine-magenta)))
- `(diredfl-write-priv ((,class :foreground ,cyan-alt-other)))
+ `(diredfl-write-priv ((,class :foreground ,cyan)))
;;;;; disk-usage
`(disk-usage-children ((,class :foreground ,yellow)))
`(disk-usage-inaccessible ((,class :inherit bold :foreground ,red)))
`(disk-usage-percent ((,class :foreground ,green)))
`(disk-usage-size ((,class :foreground ,cyan)))
- `(disk-usage-symlink ((,class :foreground ,blue :underline t)))
+ `(disk-usage-symlink ((,class :inherit button :foreground ,blue)))
`(disk-usage-symlink-directory ((,class :inherit bold :foreground ,blue-alt)))
;;;;; doom-modeline
`(doom-modeline-bar ((,class :inherit modus-theme-active-blue)))
`(doom-modeline-bar-inactive ((,class :background ,fg-inactive :foreground ,bg-main)))
`(doom-modeline-battery-charging ((,class :foreground ,green-active)))
`(doom-modeline-battery-critical ((,class :inherit bold :foreground ,red-active)))
- `(doom-modeline-battery-error ((,class :inherit modus-theme-active-red)))
+ `(doom-modeline-battery-error ((,class :inherit bold :box (:line-width -2)
+ :foreground ,red-active)))
`(doom-modeline-battery-full ((,class :foreground ,blue-active)))
`(doom-modeline-battery-normal ((,class :foreground ,fg-active)))
`(doom-modeline-battery-warning ((,class :inherit bold :foreground ,yellow-active)))
@@ -1781,18 +2141,24 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ebdb-role-defunct ((,class :foreground ,fg-alt)))
`(eieio-custom-slot-tag-face ((,class :foreground ,red-alt)))
;;;;; ediff
- `(ediff-current-diff-A ((,class ,@(modus-vivendi-theme-diffs
- bg-alt red
- bg-diff-removed fg-diff-removed))))
- `(ediff-current-diff-Ancestor ((,class ,@(modus-vivendi-theme-diffs
- bg-alt fg-special-cold
- bg-special-cold fg-special-cold))))
- `(ediff-current-diff-B ((,class ,@(modus-vivendi-theme-diffs
- bg-alt green
- bg-diff-added fg-diff-added))))
- `(ediff-current-diff-C ((,class ,@(modus-vivendi-theme-diffs
- bg-alt yellow
- bg-diff-changed fg-diff-changed))))
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces.
+ `(ediff-current-diff-A ((,class ,@(modus-vivendi-theme-diff
+ bg-dim red
+ bg-diff-removed fg-diff-removed
+ red-nuanced-bg red-faint))))
+ `(ediff-current-diff-Ancestor ((,class ,@(modus-vivendi-theme-diff
+ bg-dim fg-special-cold
+ bg-special-cold fg-special-cold
+ blue-nuanced-bg blue))))
+ `(ediff-current-diff-B ((,class ,@(modus-vivendi-theme-diff
+ bg-dim green
+ bg-diff-added fg-diff-added
+ green-nuanced-bg green-faint))))
+ `(ediff-current-diff-C ((,class ,@(modus-vivendi-theme-diff
+ bg-dim yellow
+ bg-diff-changed fg-diff-changed
+ yellow-nuanced-bg yellow-faint))))
`(ediff-even-diff-A ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1)))
`(ediff-even-diff-Ancestor ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-1)))
`(ediff-even-diff-B ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1)))
@@ -1812,6 +2178,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(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
+ ;; NOTE: see https://github.com/purcell/package-lint/issues/187
+ (list 'eldoc-highlight-function-argument `((,class :inherit bold :foreground ,blue-alt-other)))
;;;;; eldoc-box
`(eldoc-box-body ((,class :background ,bg-alt :foreground ,fg-main)))
`(eldoc-box-border ((,class :background ,fg-alt)))
@@ -1821,14 +2190,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(elfeed-log-error-level-face ((,class :foreground ,red)))
`(elfeed-log-info-level-face ((,class :foreground ,green)))
`(elfeed-log-warn-level-face ((,class :foreground ,yellow)))
- `(elfeed-search-date-face ((,class :foreground ,cyan)))
- `(elfeed-search-feed-face ((,class :foreground ,blue)))
- `(elfeed-search-filter-face ((,class :foreground ,magenta-active)))
- `(elfeed-search-last-update-face ((,class :foreground ,green-active)))
- `(elfeed-search-tag-face ((,class :foreground ,cyan-alt-other)))
- `(elfeed-search-title-face ((,class :foreground ,fg-main)))
- `(elfeed-search-unread-count-face ((,class :foreground ,blue-active)))
- `(elfeed-search-unread-title-face ((,class :inherit bold)))
+ `(elfeed-search-date-face ((,class :foreground ,blue-nuanced)))
+ `(elfeed-search-feed-face ((,class :foreground ,cyan)))
+ `(elfeed-search-filter-face ((,class :inherit bold :foreground ,magenta-active)))
+ `(elfeed-search-last-update-face ((,class :foreground ,cyan-active)))
+ `(elfeed-search-tag-face ((,class :foreground ,blue-nuanced)))
+ `(elfeed-search-title-face ((,class :foreground ,fg-dim)))
+ `(elfeed-search-unread-count-face ((,class :foreground ,green-active)))
+ `(elfeed-search-unread-title-face ((,class :inherit bold :foreground ,fg-main)))
;;;;; elfeed-score
`(elfeed-score-date-face ((,class :foreground ,blue)))
`(elfeed-score-debug-level-face ((,class :foreground ,magenta-alt-other)))
@@ -1888,6 +2257,38 @@ Also bind `class' to ((class color) (min-colors 89))."
`(erc-prompt-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(erc-timestamp-face ((,class :foreground ,blue-nuanced)))
`(erc-underline-face ((,class :underline t)))
+ `(bg:erc-color-face0 ((,class :background "white")))
+ `(bg:erc-color-face1 ((,class :background "black")))
+ `(bg:erc-color-face10 ((,class :background ,cyan-subtle-bg)))
+ `(bg:erc-color-face11 ((,class :background ,cyan-intense-bg)))
+ `(bg:erc-color-face12 ((,class :background ,blue-subtle-bg)))
+ `(bg:erc-color-face13 ((,class :background ,magenta-subtle-bg)))
+ `(bg:erc-color-face14 ((,class :background "gray60")))
+ `(bg:erc-color-face15 ((,class :background "gray80")))
+ `(bg:erc-color-face2 ((,class :background ,blue-intense-bg)))
+ `(bg:erc-color-face3 ((,class :background ,green-intense-bg)))
+ `(bg:erc-color-face4 ((,class :background ,red-subtle-bg)))
+ `(bg:erc-color-face5 ((,class :background ,red-intense-bg)))
+ `(bg:erc-color-face6 ((,class :background ,magenta-refine-bg)))
+ `(bg:erc-color-face7 ((,class :background ,yellow-subtle-bg)))
+ `(bg:erc-color-face8 ((,class :background ,yellow-refine-bg)))
+ `(bg:erc-color-face9 ((,class :background ,green-subtle-bg)))
+ `(fg:erc-color-face0 ((,class :foreground "white")))
+ `(fg:erc-color-face1 ((,class :foreground "black")))
+ `(fg:erc-color-face10 ((,class :foreground ,cyan)))
+ `(fg:erc-color-face11 ((,class :foreground ,cyan-alt-other)))
+ `(fg:erc-color-face12 ((,class :foreground ,blue)))
+ `(fg:erc-color-face13 ((,class :foreground ,magenta-alt)))
+ `(fg:erc-color-face14 ((,class :foreground "gray60")))
+ `(fg:erc-color-face15 ((,class :foreground "gray80")))
+ `(fg:erc-color-face2 ((,class :foreground ,blue-alt-other)))
+ `(fg:erc-color-face3 ((,class :foreground ,green)))
+ `(fg:erc-color-face4 ((,class :foreground ,red)))
+ `(fg:erc-color-face5 ((,class :foreground ,red-alt)))
+ `(fg:erc-color-face6 ((,class :foreground ,magenta-alt-other)))
+ `(fg:erc-color-face7 ((,class :foreground ,yellow-alt-other)))
+ `(fg:erc-color-face8 ((,class :foreground ,yellow-alt)))
+ `(fg:erc-color-face9 ((,class :foreground ,green-alt-other)))
;;;;; eros
`(eros-result-overlay-face ((,class :box (:line-width -1 :color ,blue)
:background ,bg-dim :foreground ,fg-dim)))
@@ -1904,14 +2305,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(eshell-ls-product ((,class :foreground ,fg-special-warm)))
`(eshell-ls-readonly ((,class :foreground ,fg-special-cold)))
`(eshell-ls-special ((,class :inherit bold :foreground ,magenta)))
- `(eshell-ls-symlink ((,class :foreground ,cyan :underline t)))
+ `(eshell-ls-symlink ((,class :inherit button :foreground ,cyan)))
`(eshell-ls-unreadable ((,class :background ,bg-inactive :foreground ,fg-inactive)))
`(eshell-prompt ((,class ,@(modus-vivendi-theme-bold-weight)
- ,@(modus-vivendi-theme-prompt green-alt-other
- green-nuanced-bg
- green-alt
- green-refine-bg
- fg-main))))
+ ,@(modus-vivendi-theme-prompt
+ green-alt-other
+ green-nuanced-bg green-alt
+ green-refine-bg fg-main))))
;;;;; eshell-fringe-status
`(eshell-fringe-status-failure ((,class :foreground ,red)))
`(eshell-fringe-status-success ((,class :foreground ,green)))
@@ -1939,6 +2339,15 @@ Also bind `class' to ((class color) (min-colors 89))."
`(epe-remote-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
`(epe-status-face ((,class :foreground ,magenta-alt-other)))
`(epe-venv-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+;;;;; eshell-syntax-highlighting
+ `(eshell-syntax-highlighting-alias-face ((,class :foreground ,cyan)))
+ `(eshell-syntax-highlighting-comment-face ((,class :foreground ,fg-alt)))
+ `(eshell-syntax-highlighting-directory-face ((,class :foreground ,blue)))
+ `(eshell-syntax-highlighting-envvar-face ((,class :foreground ,magenta-alt)))
+ `(eshell-syntax-highlighting-invalid-face ((,class :foreground ,red)))
+ `(eshell-syntax-highlighting-lisp-function-face ((,class :foreground ,magenta)))
+ `(eshell-syntax-highlighting-shell-command-face ((,class :foreground ,cyan-alt-other)))
+ `(eshell-syntax-highlighting-string-face ((,class :foreground ,blue-alt)))
;;;;; evil-mode
`(evil-ex-commands ((,class :foreground ,magenta-alt-other)))
`(evil-ex-info ((,class :foreground ,cyan-alt-other)))
@@ -2006,6 +2415,11 @@ Also bind `class' to ((class color) (min-colors 89))."
((,(append '((supports :underline (:style wave))) class)
:underline (:color ,fg-lang-warning :style wave))
(,class :foreground ,fg-lang-warning :underline t)))
+;;;;; flycheck-color-mode-line
+ `(flycheck-color-mode-line-error-face ((,class :inherit flycheck-fringe-error)))
+ `(flycheck-color-mode-line-info-face ((,class :inherit flycheck-fringe-info)))
+ `(flycheck-color-mode-line-running-face ((,class :foreground ,fg-inactive :slant italic)))
+ `(flycheck-color-mode-line-info-face ((,class :inherit flycheck-fringe-warning)))
;;;;; flycheck-indicator
`(flycheck-indicator-disabled ((,class :foreground ,fg-inactive :slant ,modus-theme-slant)))
`(flycheck-indicator-error ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,red-active)))
@@ -2049,7 +2463,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-subtle-magenta
'modus-theme-intense-magenta
'modus-theme-nuanced-magenta
- magenta-alt-other
+ magenta-alt
'bold))))
;;;;; freeze-it
`(freeze-it-show ((,class :background ,bg-dim :foreground ,fg-special-warm)))
@@ -2157,13 +2571,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(git-commit-comment-branch-remote ((,class :foreground ,magenta-alt :slant ,modus-theme-slant)))
`(git-commit-comment-detached ((,class :foreground ,cyan-alt :slant ,modus-theme-slant)))
`(git-commit-comment-file ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
- `(git-commit-comment-heading ((,class :inherit bold :foreground ,fg-alt :slant ,modus-theme-slant)))
+ `(git-commit-comment-heading ((,class :inherit bold :foreground ,fg-dim :slant ,modus-theme-slant)))
`(git-commit-keyword ((,class :foreground ,magenta)))
- `(git-commit-known-pseudo-header ((,class :inherit bold :foreground ,fg-special-warm)))
+ `(git-commit-known-pseudo-header ((,class :foreground ,cyan-alt-other)))
`(git-commit-nonempty-second-line ((,class :inherit modus-theme-refine-yellow)))
`(git-commit-overlong-summary ((,class :inherit modus-theme-refine-yellow)))
- `(git-commit-pseudo-header ((,class :inherit bold :foreground ,fg-alt)))
- `(git-commit-summary ((,class :foreground ,magenta-alt-other)))
+ `(git-commit-pseudo-header ((,class :foreground ,blue)))
+ `(git-commit-summary ((,class :inherit bold :foreground ,cyan)))
;;;;; git-gutter
`(git-gutter:added ((,class :inherit modus-theme-fringe-green)))
`(git-gutter:deleted ((,class :inherit modus-theme-fringe-red)))
@@ -2200,7 +2614,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(git-timemachine-minibuffer-detail-face ((,class :foreground ,red-alt)))
;;;;; git-walktree
`(git-walktree-commit-face ((,class :foreground ,yellow)))
- `(git-walktree-symlink-face ((,class :foreground ,cyan :underline t)))
+ `(git-walktree-symlink-face ((,class :inherit button :foreground ,cyan)))
`(git-walktree-tree-face ((,class :foreground ,magenta)))
;;;;; gnus
`(gnus-button ((,class :inherit button)))
@@ -2239,9 +2653,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(gnus-group-news-6-empty ((,class :foreground ,fg-alt)))
`(gnus-group-news-low ((,class :inherit bold :foreground ,green-nuanced)))
`(gnus-group-news-low-empty ((,class :foreground ,green-nuanced)))
- `(gnus-header-content ((,class :foreground ,fg-special-calm)))
- `(gnus-header-from ((,class :inherit bold :foreground ,cyan-alt :underline nil)))
- `(gnus-header-name ((,class :foreground ,cyan-alt-other)))
+ `(gnus-header-content ((,class :foreground ,cyan)))
+ `(gnus-header-from ((,class :inherit bold :foreground ,cyan-alt-other :underline nil)))
+ `(gnus-header-name ((,class :foreground ,green)))
`(gnus-header-newsgroups ((,class :inherit bold :foreground ,blue-alt)))
`(gnus-header-subject ((,class :inherit bold :foreground ,magenta-alt-other)))
`(gnus-server-agent ((,class :inherit bold :foreground ,cyan)))
@@ -2260,12 +2674,12 @@ Also bind `class' to ((class color) (min-colors 89))."
`(gnus-summary-high-undownloaded ((,class :inherit bold :foreground ,yellow)))
`(gnus-summary-high-unread ((,class :inherit bold :foreground ,fg-main)))
`(gnus-summary-low-ancient ((,class :foreground ,fg-alt :slant italic)))
- `(gnus-summary-low-read ((,class :foreground ,fg-special-cold :slant italic)))
+ `(gnus-summary-low-read ((,class :foreground ,fg-alt :slant italic)))
`(gnus-summary-low-ticked ((,class :foreground ,red-refine-fg :slant italic)))
`(gnus-summary-low-undownloaded ((,class :foreground ,yellow-refine-fg :slant italic)))
`(gnus-summary-low-unread ((,class :inherit bold :foreground ,fg-special-cold)))
`(gnus-summary-normal-ancient ((,class :foreground ,fg-special-calm)))
- `(gnus-summary-normal-read ((,class :foreground ,fg-special-cold)))
+ `(gnus-summary-normal-read ((,class :foreground ,fg-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)))
@@ -2309,11 +2723,11 @@ Also bind `class' to ((class color) (min-colors 89))."
`(helm-ff-directory ((,class :inherit helm-buffer-directory)))
`(helm-ff-dirs ((,class :inherit bold :foreground ,blue-alt-other)))
`(helm-ff-dotted-directory ((,class :inherit bold :background ,bg-alt :foreground ,fg-alt)))
- `(helm-ff-dotted-symlink-directory ((,class :inherit helm-ff-dotted-directory :underline t)))
+ `(helm-ff-dotted-symlink-directory ((,class :inherit (button helm-ff-dotted-directory))))
`(helm-ff-executable ((,class :foreground ,magenta-alt)))
`(helm-ff-file ((,class :foreground ,fg-main)))
`(helm-ff-file-extension ((,class :foreground ,fg-special-warm)))
- `(helm-ff-invalid-symlink ((,class :foreground ,red :underline t)))
+ `(helm-ff-invalid-symlink ((,class :inherit button :foreground ,red)))
`(helm-ff-pipe ((,class ,@(modus-vivendi-theme-extra-completions
'modus-theme-refine-magenta
'modus-theme-subtle-magenta
@@ -2330,7 +2744,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-refine-red
'modus-theme-nuanced-yellow
red-alt))))
- `(helm-ff-symlink ((,class :foreground ,cyan :underline t)))
+ `(helm-ff-symlink ((,class :inherit button :foreground ,cyan)))
`(helm-ff-truename ((,class :foreground ,blue-alt-other)))
`(helm-grep-cmd-line ((,class :foreground ,yellow-alt-other)))
`(helm-grep-file ((,class :inherit bold :foreground ,fg-special-cold)))
@@ -2366,7 +2780,7 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-nuanced-cyan
cyan-alt-other))))
`(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt)))
- `(helm-moccur-buffer ((,class :foreground ,cyan-alt-other :underline t)))
+ `(helm-moccur-buffer ((,class :inherit button :foreground ,cyan-alt-other)))
`(helm-mode-prefix ((,class ,@(modus-vivendi-theme-extra-completions
'modus-theme-subtle-magenta
'modus-theme-intense-magenta
@@ -2416,8 +2830,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(helm-xref-file-name ((,class :inherit bold :foreground ,fg-special-cold)))
`(helm-xref-file-name ((,class :foreground ,fg-special-warm)))
;;;;; helpful
- `(helpful-heading ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4))))
+ `(helpful-heading ((,class :inherit modus-theme-heading-1)))
;;;;; highlight region or ad-hoc regexp
`(hi-black-b ((,class :background ,fg-main :foreground ,bg-main)))
`(hi-blue ((,class :background ,bg-alt :foreground ,blue :underline t)))
@@ -2487,23 +2900,23 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; icomplete
`(icomplete-first-match ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- magenta magenta-nuanced-bg
- magenta-intense-bg fg-main))))
+ magenta bg-alt
+ bg-active fg-main))))
;;;;; icomplete-vertical
`(icomplete-vertical-separator ((,class :foreground ,fg-alt)))
;;;;; ido-mode
`(ido-first-match ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- magenta magenta-nuanced-bg
- magenta-subtle-bg fg-main))))
+ magenta bg-alt
+ bg-active fg-main))))
`(ido-incomplete-regexp ((,class :inherit error)))
`(ido-indicator ((,class :inherit modus-theme-subtle-yellow)))
`(ido-only-match ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- magenta-intense red-nuanced-bg
- magenta-intense-bg fg-main))))
- `(ido-subdir ((,class :foreground ,blue-alt-other)))
- `(ido-virtual ((,class :foreground ,yellow-alt-other)))
+ green green-nuanced-bg
+ green-intense-bg fg-main))))
+ `(ido-subdir ((,class :foreground ,blue)))
+ `(ido-virtual ((,class :foreground ,fg-special-warm)))
;;;;; iedit
`(iedit-occurrence ((,class :inherit modus-theme-refine-blue)))
`(iedit-read-only-occurrence ((,class :inherit modus-theme-intense-yellow)))
@@ -2521,29 +2934,25 @@ Also bind `class' to ((class color) (min-colors 89))."
`(imenu-list-entry-subalist-face-3 ((,class :inherit bold :foreground ,red-alt-other :underline t)))
;;;;; indium
`(indium-breakpoint-face ((,class :foreground ,red-active)))
- `(indium-frame-url-face ((,class :foreground ,fg-alt :underline t)))
+ `(indium-frame-url-face ((,class :inherit button :foreground ,fg-alt)))
`(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 :inherit bold :foreground ,red)))
`(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-quoted ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,magenta))) ; the capitalisation is canonical
`(info-header-node ((,class :inherit bold :foreground ,fg-alt)))
`(info-header-xref ((,class :foreground ,blue-active)))
`(info-index-match ((,class :inherit match)))
- `(info-menu-header ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2))))
- `(info-menu-star ((,class :foreground ,fg-main)))
+ `(info-menu-header ((,class :inherit modus-theme-heading-3)))
+ `(info-menu-star ((,class :foreground ,red)))
`(info-node ((,class :inherit bold)))
- `(info-title-1 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4))))
- `(info-title-2 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-warm
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3))))
- `(info-title-3 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-cold
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2))))
- `(info-title-4 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-mild
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-1))))
+ `(info-title-1 ((,class :inherit modus-theme-heading-1)))
+ `(info-title-2 ((,class :inherit modus-theme-heading-2)))
+ `(info-title-3 ((,class :inherit modus-theme-heading-3)))
+ `(info-title-4 ((,class :inherit modus-theme-heading-4)))
;;;;; info-colors
`(info-colors-lisp-code-block ((,class :inherit fixed-pitch)))
`(info-colors-ref-item-command ((,class :foreground ,magenta)))
@@ -2689,13 +3098,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(kaocha-runner-warning-face ((,class :foreground ,yellow)))
;;;;; keycast
`(keycast-command ((,class :inherit bold :foreground ,blue-active)))
- `(keycast-key ((,class :box ,(modus-vivendi-theme-modeline-box blue-alt blue-active t -3)
- ,@(modus-vivendi-theme-modeline-props
- blue-active bg-main
- blue-active bg-active))))
+ `(keycast-key ((,class ,@(modus-vivendi-theme-mode-line-attrs
+ bg-main blue-active
+ bg-main blue-active
+ blue-active blue-intense
+ 'alt-style -3))))
;;;;; line numbers (display-line-numbers-mode and global variant)
- `(line-number ((,class :background ,bg-dim :foreground ,fg-alt)))
- `(line-number-current-line ((,class :inherit bold :background ,bg-active :foreground ,fg-active)))
+ `(line-number ((,class :inherit default :background ,bg-dim :foreground ,fg-alt)))
+ `(line-number-current-line ((,class :inherit default :background ,bg-active :foreground ,fg-main)))
;;;;; lsp-mode
`(lsp-face-highlight-read ((,class :inherit modus-theme-subtle-blue :underline t)))
`(lsp-face-highlight-textual ((,class :inherit modus-theme-subtle-blue)))
@@ -2725,7 +3135,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(lsp-lens-mouse-face ((,class :height 0.8 :foreground ,blue-alt-other :underline t)))
`(lsp-ui-doc-background ((,class :background ,bg-alt)))
`(lsp-ui-doc-header ((,class :background ,bg-header :foreground ,fg-header)))
- `(lsp-ui-doc-url ((,class :foreground ,blue-alt-other :underline t)))
+ `(lsp-ui-doc-url ((,class :inherit button :foreground ,blue-alt-other)))
`(lsp-ui-peek-filename ((,class :foreground ,fg-special-warm)))
`(lsp-ui-peek-footer ((,class :background ,bg-header :foreground ,fg-header)))
`(lsp-ui-peek-header ((,class :background ,bg-header :foreground ,fg-header)))
@@ -2757,37 +3167,43 @@ Also bind `class' to ((class color) (min-colors 89))."
`(magit-branch-upstream ((,class :slant italic)))
`(magit-cherry-equivalent ((,class :background ,bg-main :foreground ,magenta-intense)))
`(magit-cherry-unmatched ((,class :background ,bg-main :foreground ,cyan-intense)))
- `(magit-diff-added ((,class ,@(modus-vivendi-theme-diffs
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces, though only for the standard actions,
+ ;; not the highlighted ones. This is because Magit's interaction
+ ;; model relies on highlighting the current diff hunk.
+ `(magit-diff-added ((,class ,@(modus-vivendi-theme-diff
bg-main green
- bg-diff-added fg-diff-added))))
- `(magit-diff-added-highlight ((,class ,@(modus-vivendi-theme-diffs
- bg-dim green
- bg-diff-focus-added fg-diff-focus-added))))
- `(magit-diff-base ((,class ,@(modus-vivendi-theme-diffs
+ bg-diff-added fg-diff-added
+ green-nuanced-bg fg-diff-added))))
+ `(magit-diff-added-highlight ((,class :inherit modus-theme-diff-focus-added)))
+ `(magit-diff-base ((,class ,@(modus-vivendi-theme-diff
bg-main yellow
- bg-diff-changed fg-diff-changed))))
- `(magit-diff-base-highlight ((,class ,@(modus-vivendi-theme-diffs
- bg-dim yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
+ bg-diff-changed fg-diff-changed
+ yellow-nuanced-bg fg-diff-changed))))
+ `(magit-diff-base-highlight ((,class :inherit modus-theme-diff-focus-changed)))
`(magit-diff-context ((,class :foreground ,fg-unfocused)))
- `(magit-diff-context-highlight ((,class ,@(modus-vivendi-theme-diffs
+ `(magit-diff-context-highlight ((,class ,@(modus-vivendi-theme-diff
bg-dim fg-dim
- bg-inactive fg-inactive))))
+ bg-inactive fg-inactive
+ bg-dim fg-alt))))
`(magit-diff-file-heading ((,class :inherit bold :foreground ,fg-special-cold)))
`(magit-diff-file-heading-highlight ((,class :inherit (modus-theme-special-cold bold))))
- `(magit-diff-file-heading-selection ((,class :background ,bg-alt :foreground ,cyan)))
- `(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active :foreground ,fg-inactive)))
- `(magit-diff-hunk-heading-highlight ((,class :inherit (modus-theme-diff-heading bold))))
- `(magit-diff-hunk-heading-selection ((,class :inherit modus-theme-intense-cyan)))
+ `(magit-diff-file-heading-selection ((,class :inherit modus-theme-refine-cyan)))
+ ;; NOTE: here we break from the pattern of inheriting from the
+ ;; modus-theme-diff-* faces.
+ `(magit-diff-hunk-heading ((,class :inherit bold :background ,bg-active
+ :foreground ,fg-inactive)))
+ `(magit-diff-hunk-heading-highlight ((,class :inherit bold :background ,bg-diff-heading
+ :foreground ,fg-diff-heading)))
+ `(magit-diff-hunk-heading-selection ((,class :inherit modus-theme-refine-blue)))
`(magit-diff-hunk-region ((,class :inherit bold)))
`(magit-diff-lines-boundary ((,class :background ,fg-main)))
`(magit-diff-lines-heading ((,class :inherit modus-theme-refine-magenta)))
- `(magit-diff-removed ((,class ,@(modus-vivendi-theme-diffs
+ `(magit-diff-removed ((,class ,@(modus-vivendi-theme-diff
bg-main red
- bg-diff-removed fg-diff-removed))))
- `(magit-diff-removed-highlight ((,class ,@(modus-vivendi-theme-diffs
- bg-dim red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ bg-diff-removed fg-diff-removed
+ red-nuanced-bg fg-diff-removed))))
+ `(magit-diff-removed-highlight ((,class :inherit modus-theme-diff-focus-removed)))
`(magit-diffstat-added ((,class :foreground ,green)))
`(magit-diffstat-removed ((,class :foreground ,red)))
`(magit-dimmed ((,class :foreground ,fg-unfocused)))
@@ -2846,26 +3262,40 @@ Also bind `class' to ((class color) (min-colors 89))."
`(Man-reverse ((,class :inherit modus-theme-subtle-magenta)))
`(Man-underline ((,class :foreground ,cyan :underline t)))
;;;;; markdown-mode
- `(markdown-blockquote-face ((,class :foreground ,fg-special-warm :slant ,modus-theme-slant)))
+ `(markdown-blockquote-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
`(markdown-bold-face ((,class :inherit bold)))
- `(markdown-code-face ((,class :inherit fixed-pitch)))
+ `(markdown-code-face ((,class ,@(modus-vivendi-theme-mixed-fonts))))
`(markdown-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
`(markdown-footnote-marker-face ((,class :inherit bold :foreground ,cyan-alt)))
`(markdown-footnote-text-face ((,class :foreground ,fg-main :slant ,modus-theme-slant)))
`(markdown-gfm-checkbox-face ((,class :foreground ,cyan-alt-other)))
`(markdown-header-delimiter-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,fg-dim)))
- `(markdown-header-face ((,class :inherit bold)))
+ `(markdown-header-face ((t nil)))
+ `(markdown-header-face-1 ((,class :inherit modus-theme-heading-1)))
+ `(markdown-header-face-2 ((,class :inherit modus-theme-heading-2)))
+ `(markdown-header-face-3 ((,class :inherit modus-theme-heading-3)))
+ `(markdown-header-face-4 ((,class :inherit modus-theme-heading-4)))
+ `(markdown-header-face-5 ((,class :inherit modus-theme-heading-5)))
+ `(markdown-header-face-6 ((,class :inherit modus-theme-heading-6)))
`(markdown-header-rule-face ((,class :inherit bold :foreground ,fg-special-warm)))
`(markdown-hr-face ((,class :inherit bold :foreground ,fg-special-warm)))
- `(markdown-html-attr-name-face ((,class :inherit fixed-pitch :foreground ,cyan)))
- `(markdown-html-attr-value-face ((,class :inherit fixed-pitch :foreground ,blue)))
- `(markdown-html-entity-face ((,class :inherit fixed-pitch :foreground ,cyan)))
- `(markdown-html-tag-delimiter-face ((,class :inherit fixed-pitch :foreground ,fg-special-mild)))
- `(markdown-html-tag-name-face ((,class :inherit fixed-pitch :foreground ,magenta-alt)))
- `(markdown-inline-code-face ((,class :inherit fixed-pitch :foreground ,magenta)))
+ `(markdown-html-attr-name-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,cyan)))
+ `(markdown-html-attr-value-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,blue)))
+ `(markdown-html-entity-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,cyan)))
+ `(markdown-html-tag-delimiter-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-special-mild)))
+ `(markdown-html-tag-name-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,magenta-alt)))
+ `(markdown-inline-code-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,magenta)))
`(markdown-italic-face ((,class :foreground ,fg-special-cold :slant italic)))
- `(markdown-language-info-face ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
- `(markdown-language-keyword-face ((,class :inherit fixed-pitch :foreground ,green-alt-other)))
+ `(markdown-language-info-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(markdown-language-keyword-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,green-alt-other)))
`(markdown-line-break-face ((,class :inherit modus-theme-refine-cyan :underline t)))
`(markdown-link-face ((,class :inherit link)))
`(markdown-link-title-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
@@ -2877,12 +3307,14 @@ Also bind `class' to ((class color) (min-colors 89))."
`(markdown-missing-link-face ((,class :inherit bold :foreground ,yellow)))
`(markdown-plain-url-face ((,class :inherit markdown-link-face)))
`(markdown-pre-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
- :inherit fixed-pitch :background ,bg-dim
+ ,@(modus-vivendi-theme-mixed-fonts)
+ :background ,bg-dim
:foreground ,fg-special-mild)))
`(markdown-reference-face ((,class :inherit markdown-markup-face)))
`(markdown-strike-through-face ((,class :strike-through t)))
- `(markdown-table-face ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
- `(markdown-url-face ((,class :foreground ,blue)))
+ `(markdown-table-face ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(markdown-url-face ((,class :foreground ,blue-alt)))
;;;;; markup-faces (`adoc-mode')
`(markup-anchor-face ((,class :foreground ,fg-inactive)))
`(markup-attribute-face ((,class :foreground ,fg-inactive :slant italic)))
@@ -2896,7 +3328,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(markup-emphasis-face ((,class :foreground ,fg-special-cold :slant italic)))
`(markup-error-face ((,class :inherit bold :foreground ,red)))
`(markup-gen-face ((,class :foreground ,magenta-alt)))
- `(markup-internal-reference-face ((,class :foreground ,fg-inactive :underline t)))
+ `(markup-internal-reference-face ((,class :inherit button :foreground ,fg-inactive)))
`(markup-italic-face ((,class :foreground ,fg-special-cold :slant italic)))
`(markup-list-face ((,class :inherit modus-theme-special-calm)))
`(markup-meta-face ((,class :foreground ,fg-inactive)))
@@ -2935,32 +3367,30 @@ Also bind `class' to ((class color) (min-colors 89))."
`(message-cited-text-2 ((,class :foreground ,red-alt)))
`(message-cited-text-3 ((,class :foreground ,green-alt)))
`(message-cited-text-4 ((,class :foreground ,magenta-alt)))
- `(message-header-cc ((,class :foreground ,blue-alt)))
+ `(message-header-cc ((,class :inherit bold :foreground ,cyan-alt)))
`(message-header-name ((,class :foreground ,green-alt-other)))
- `(message-header-newsgroups ((,class :inherit bold :foreground ,blue)))
+ `(message-header-newsgroups ((,class :inherit bold :foreground ,green-alt)))
`(message-header-other ((,class :inherit bold :foreground ,cyan-alt-other)))
`(message-header-subject ((,class :inherit bold :foreground ,magenta-alt-other)))
- `(message-header-to ((,class :inherit bold :foreground ,magenta-alt)))
- `(message-header-xheader ((,class :foreground ,blue-alt-other)))
- `(message-mml ((,class :foreground ,green-alt)))
- `(message-separator ((,class :background ,bg-active :foreground ,fg-special-warm)))
+ `(message-header-to ((,class :inherit bold :foreground ,blue)))
+ `(message-header-xheader ((,class :foreground ,cyan)))
+ `(message-mml ((,class :foreground ,fg-special-warm)))
+ `(message-separator ((,class :inherit modus-theme-intense-neutral)))
;;;;; minibuffer-line
`(minibuffer-line ((,class :foreground ,fg-main)))
;;;;; 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-active fg-alt t)
- ,@(modus-vivendi-theme-modeline-props
- bg-active fg-dim
- bg-active fg-active))))
+ `(mode-line ((,class ,@(modus-vivendi-theme-mode-line-attrs
+ fg-active bg-active fg-dim bg-active
+ fg-alt bg-active 'alt-style nil bg-main))))
`(mode-line-buffer-id ((,class :inherit bold)))
`(mode-line-emphasis ((,class :inherit bold :foreground ,blue-active)))
`(mode-line-highlight ((,class :inherit modus-theme-active-blue :box (:line-width -1 :style pressed-button))))
- `(mode-line-inactive ((,class :box ,(modus-vivendi-theme-modeline-box bg-active bg-region)
- ,@(modus-vivendi-theme-modeline-props
- bg-dim fg-inactive
- bg-inactive fg-inactive))))
+ `(mode-line-inactive ((,class ,@(modus-vivendi-theme-mode-line-attrs
+ fg-inactive bg-inactive fg-alt bg-dim
+ bg-region bg-active))))
;;;;; mood-line
`(mood-line-modified ((,class :foreground ,magenta-active)))
`(mood-line-status-error ((,class :inherit bold :foreground ,red-active)))
@@ -2969,6 +3399,9 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mood-line-status-success ((,class :foreground ,green-active)))
`(mood-line-status-warning ((,class :inherit bold :foreground ,yellow-active)))
`(mood-line-unimportant ((,class :foreground ,fg-inactive)))
+;;;;; mpdel
+ `(mpdel-browser-directory-face ((,class :foreground ,blue)))
+ `(mpdel-playlist-current-song-face ((,class :inherit bold :foreground ,blue-alt-other)))
;;;;; mu4e
`(mu4e-attach-number-face ((,class :inherit bold :foreground ,cyan-alt)))
`(mu4e-cited-1-face ((,class :foreground ,blue-alt)))
@@ -2979,7 +3412,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mu4e-cited-6-face ((,class :foreground ,cyan-alt)))
`(mu4e-cited-7-face ((,class :foreground ,magenta)))
`(mu4e-compose-header-face ((,class :inherit mu4e-compose-separator-face)))
- `(mu4e-compose-separator-face ((,class :background ,bg-active :foreground ,fg-special-warm)))
+ `(mu4e-compose-separator-face ((,class :inherit modus-theme-intense-neutral)))
`(mu4e-contact-face ((,class :inherit bold :foreground ,cyan-alt-other)))
`(mu4e-context-face ((,class :foreground ,blue-active)))
`(mu4e-draft-face ((,class :foreground ,magenta-alt)))
@@ -2998,7 +3431,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(mu4e-moved-face ((,class :foreground ,yellow :slant ,modus-theme-slant)))
`(mu4e-ok-face ((,class :inherit bold :foreground ,green)))
`(mu4e-region-code ((,class :inherit modus-theme-special-calm)))
- `(mu4e-replied-face ((,class :foreground ,cyan-active)))
+ `(mu4e-replied-face ((,class :foreground ,blue-faint)))
`(mu4e-special-header-value-face ((,class :inherit bold :foreground ,blue-alt-other)))
`(mu4e-system-face ((,class :foreground ,fg-mark-del :slant ,modus-theme-slant)))
`(mu4e-title-face ((,class :foreground ,fg-main)))
@@ -3129,10 +3562,15 @@ Also bind `class' to ((class color) (min-colors 89))."
`(nxml-ref ((,class ,@(modus-vivendi-theme-syntax-foreground
green-alt-other green-alt-other-faint)
,@(modus-vivendi-theme-bold-weight))))
+;;;;; objed
+ `(objed-hl ((,class :background ,(if modus-vivendi-theme-intense-hl-line
+ bg-hl-alt-intense bg-hl-alt))))
+ `(objed-mark ((,class :background ,bg-active)))
+ `(objed-mode-line ((,class :foreground ,cyan-active)))
;;;;; orderless
`(orderless-match-face-0 ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- blue-alt blue-nuanced-bg
+ blue-alt-other blue-nuanced-bg
blue-refine-bg blue-refine-fg))))
`(orderless-match-face-1 ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
@@ -3140,70 +3578,62 @@ Also bind `class' to ((class color) (min-colors 89))."
magenta-refine-bg magenta-refine-fg))))
`(orderless-match-face-2 ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- green-alt-other green-nuanced-bg
+ green green-nuanced-bg
green-refine-bg green-refine-fg))))
`(orderless-match-face-3 ((,class :inherit bold
,@(modus-vivendi-theme-standard-completions
- yellow-alt-other yellow-nuanced-bg
+ yellow yellow-nuanced-bg
yellow-refine-bg yellow-refine-fg))))
;;;;; org
`(org-agenda-calendar-event ((,class :foreground ,fg-main)))
`(org-agenda-calendar-sexp ((,class :foreground ,cyan-alt)))
- `(org-agenda-clocking ((,class :inherit modus-theme-special-cold)))
+ `(org-agenda-clocking ((,class :inherit modus-theme-special-cold
+ ,@(and (>= emacs-major-version 27) '(:extend t)))))
`(org-agenda-column-dateline ((,class :background ,bg-alt)))
- `(org-agenda-current-time ((,class :inherit modus-theme-subtle-cyan)))
- `(org-agenda-date ((,class :inherit ,modus-theme-variable-pitch :foreground ,cyan-alt-other
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)
- ,@(modus-vivendi-theme-heading-block cyan-nuanced-bg cyan-nuanced))))
- `(org-agenda-date-today ((,class :inherit (bold ,modus-theme-variable-pitch)
- :background ,cyan-intense-bg :foreground ,fg-main
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4))))
- `(org-agenda-date-weekend ((,class :inherit ,modus-theme-variable-pitch :foreground ,cyan
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)
- ,@(modus-vivendi-theme-heading-block blue-nuanced-bg cyan-nuanced))))
+ `(org-agenda-current-time ((,class :inherit bold :foreground ,blue-alt-other)))
+ `(org-agenda-date ((,class :foreground ,cyan)))
+ `(org-agenda-date-today ((,class :inherit bold :foreground ,fg-main :underline t)))
+ `(org-agenda-date-weekend ((,class :foreground ,cyan-alt-other)))
`(org-agenda-diary ((,class :foreground ,fg-main)))
- `(org-agenda-dimmed-todo-face ((,class :inherit modus-theme-subtle-neutral)))
- `(org-agenda-done ((,class ,@(modus-vivendi-theme-org-todo-block green-nuanced-bg green-nuanced green))))
+ `(org-agenda-dimmed-todo-face ((,class :inherit bold :foreground ,fg-alt)))
+ `(org-agenda-done ((,class :foreground ,green-alt)))
`(org-agenda-filter-category ((,class :inherit bold :foreground ,magenta-active)))
`(org-agenda-filter-effort ((,class :inherit bold :foreground ,magenta-active)))
`(org-agenda-filter-regexp ((,class :inherit bold :foreground ,magenta-active)))
`(org-agenda-filter-tags ((,class :inherit bold :foreground ,magenta-active)))
`(org-agenda-restriction-lock ((,class :background ,bg-dim :foreground ,fg-dim)))
- `(org-agenda-structure ((,class :inherit ,modus-theme-variable-pitch
- :foreground ,fg-special-mild
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3))))
+ `(org-agenda-structure ((,class :foreground ,blue-alt)))
`(org-archived ((,class :background ,bg-alt :foreground ,fg-alt)))
- `(org-block ((,class ,@(modus-vivendi-theme-org-block bg-dim)
- :inherit fixed-pitch :foreground ,fg-main)))
- `(org-block-begin-line ((,class ,@(modus-vivendi-theme-org-block-delim
+ `(org-block ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ ,@(modus-vivendi-theme-org-block bg-dim)
+ :foreground ,fg-main)))
+ `(org-block-begin-line ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ ,@(modus-vivendi-theme-org-block-delim
bg-dim fg-special-cold
- bg-alt fg-special-mild)
- :inherit fixed-pitch)))
+ bg-alt fg-special-mild))))
`(org-block-end-line ((,class :inherit org-block-begin-line)))
`(org-checkbox ((,class :box (:line-width 1 :color ,bg-active)
:background ,bg-inactive :foreground ,fg-active)))
- `(org-checkbox-statistics-done ((,class :foreground ,green
- ,@(modus-vivendi-theme-heading-block
- green-nuanced-bg green-nuanced))))
- `(org-checkbox-statistics-todo ((,class ,@(modus-vivendi-theme-heading-foreground red-alt red)
- ,@(modus-vivendi-theme-heading-block
- red-nuanced-bg red-nuanced))))
+ `(org-checkbox-statistics-done ((,class :inherit org-done)))
+ `(org-checkbox-statistics-todo ((,class :inherit org-todo)))
`(org-clock-overlay ((,class :inherit modus-theme-special-cold)))
- `(org-code ((,class :inherit fixed-pitch :foreground ,magenta)))
+ `(org-code ((,class ,@(modus-vivendi-theme-mixed-fonts) :foreground ,magenta)))
`(org-column ((,class :background ,bg-alt)))
`(org-column-title ((,class :inherit bold :underline t :background ,bg-alt)))
- `(org-date ((,class :inherit fixed-pitch :foreground ,cyan-alt-other :underline t)))
+ `(org-date ((,class :inherit (button fixed-pitch) :foreground ,cyan-alt-other)))
`(org-date-selected ((,class :inherit bold :foreground ,blue-alt :inverse-video t)))
- `(org-default ((,class :background ,bg-main :foreground ,fg-main)))
`(org-document-info ((,class :foreground ,fg-special-cold)))
- `(org-document-info-keyword ((,class :inherit fixed-pitch :foreground ,fg-alt)))
+ `(org-document-info-keyword ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-alt)))
`(org-document-title ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-cold
,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-5))))
- `(org-done ((,class ,@(modus-vivendi-theme-org-todo-block green-nuanced-bg green-nuanced green))))
- `(org-drawer ((,class :foreground ,cyan-alt)))
+ `(org-done ((,class :box ,bg-region :background ,bg-dim :foreground ,green)))
+ `(org-drawer ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,cyan)))
`(org-ellipsis ((,class :foreground nil))) ; inherits from the heading's colour
- `(org-footnote ((,class :foreground ,blue-alt :underline t)))
- `(org-formula ((,class :inherit fixed-pitch :foreground ,red-alt)))
+ `(org-footnote ((,class :inherit button :foreground ,blue-alt)))
+ `(org-formula ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,red-alt)))
`(org-habit-alert-face ((,class :inherit modus-theme-intense-yellow)))
`(org-habit-alert-future-face ((,class :inherit modus-theme-refine-yellow)))
`(org-habit-clear-face ((,class :inherit modus-theme-intense-magenta)))
@@ -3212,69 +3642,48 @@ Also bind `class' to ((class color) (min-colors 89))."
`(org-habit-overdue-future-face ((,class :inherit modus-theme-refine-red)))
`(org-habit-ready-face ((,class :inherit modus-theme-intense-blue)))
`(org-habit-ready-future-face ((,class :inherit modus-theme-refine-blue)))
- `(org-headline-done ((,class :foreground ,green-nuanced
- ,@(modus-vivendi-theme-heading-block
- green-nuanced-bg green-nuanced))))
+ `(org-headline-done ((,class :inherit ,modus-theme-variable-pitch :foreground ,green-nuanced)))
+ `(org-headline-todo ((,class :inherit ,modus-theme-variable-pitch :foreground ,red-nuanced)))
`(org-hide ((,class :foreground ,bg-main)))
`(org-indent ((,class :inherit (fixed-pitch org-hide))))
`(org-latex-and-related ((,class :foreground ,magenta-refine-fg)))
- `(org-level-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-main magenta-alt-other)
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)
- ,@(modus-vivendi-theme-heading-block magenta-nuanced-bg magenta-nuanced))))
- `(org-level-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-special-warm magenta-alt)
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3)
- ,@(modus-vivendi-theme-heading-block red-nuanced-bg red-nuanced))))
- `(org-level-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-special-cold blue)
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2)
- ,@(modus-vivendi-theme-heading-block blue-nuanced-bg blue-nuanced))))
- `(org-level-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-special-mild cyan)
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-1)
- ,@(modus-vivendi-theme-heading-block cyan-nuanced-bg cyan-nuanced))))
- `(org-level-5 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-special-calm green-alt-other)
- ,@(modus-vivendi-theme-heading-block green-nuanced-bg green-nuanced))))
- `(org-level-6 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground yellow-nuanced yellow-alt-other)
- ,@(modus-vivendi-theme-heading-block yellow-nuanced-bg yellow-nuanced))))
- `(org-level-7 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground red-nuanced red-alt)
- ,@(modus-vivendi-theme-heading-block red-nuanced-bg red-nuanced))))
- `(org-level-8 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-dim magenta)
- ,@(modus-vivendi-theme-heading-block bg-alt fg-alt))))
+ `(org-level-1 ((,class :inherit modus-theme-heading-1)))
+ `(org-level-2 ((,class :inherit modus-theme-heading-2)))
+ `(org-level-3 ((,class :inherit modus-theme-heading-3)))
+ `(org-level-4 ((,class :inherit modus-theme-heading-4)))
+ `(org-level-5 ((,class :inherit modus-theme-heading-5)))
+ `(org-level-6 ((,class :inherit modus-theme-heading-6)))
+ `(org-level-7 ((,class :inherit modus-theme-heading-7)))
+ `(org-level-8 ((,class :inherit modus-theme-heading-8)))
`(org-link ((,class :inherit link)))
`(org-list-dt ((,class :inherit bold)))
- `(org-macro ((,class :inherit org-latex-and-related)))
- `(org-meta-line ((,class :inherit fixed-pitch :background ,cyan-nuanced-bg :foreground ,cyan-nuanced)))
+ `(org-macro ((,class :background ,blue-nuanced-bg :foreground ,magenta-alt-other)))
+ `(org-meta-line ((,class ,@(modus-vivendi-theme-mixed-fonts) :foreground ,fg-alt)))
`(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 magenta-nuanced-bg magenta-nuanced magenta)
- ,@(modus-vivendi-theme-heading-foreground magenta magenta-alt-other))))
- `(org-quote ((,class ,@(if modus-vivendi-theme-org-blocks
- (append
- (and (>= emacs-major-version 27) '(:extend t))
- (list :background bg-dim))
- (list :background nil))
- :foreground ,fg-special-calm :slant ,modus-theme-slant)))
+ `(org-priority ((,class :box ,bg-region :background ,bg-dim :foreground ,magenta)))
+ `(org-property-value ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,cyan-alt-other)))
+ `(org-quote ((,class ,@(modus-vivendi-theme-org-block bg-dim)
+ :foreground ,fg-special-cold :slant ,modus-theme-slant)))
`(org-scheduled ((,class :foreground ,fg-special-warm)))
`(org-scheduled-previously ((,class :foreground ,yellow-alt-other)))
`(org-scheduled-today ((,class :foreground ,magenta-alt-other)))
`(org-sexp-date ((,class :inherit org-date)))
- `(org-special-keyword ((,class ,@(modus-vivendi-theme-org-todo-block cyan-nuanced-bg cyan-nuanced cyan-alt))))
- `(org-table ((,class :inherit fixed-pitch :foreground ,fg-special-cold)))
- `(org-tag ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-nuanced)))
+ `(org-special-keyword ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,blue-nuanced)))
+ `(org-table ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :foreground ,fg-special-cold)))
+ `(org-table-header ((,class :inherit (fixed-pitch modus-theme-intense-neutral))))
+ `(org-tag ((,class :foreground ,magenta-nuanced)))
`(org-tag-group ((,class :inherit bold :foreground ,cyan-nuanced)))
`(org-target ((,class :underline t)))
`(org-time-grid ((,class :foreground ,fg-unfocused)))
- `(org-todo ((,class ,@(modus-vivendi-theme-org-todo-block red-nuanced-bg red-nuanced red-alt)
- ,@(modus-vivendi-theme-heading-foreground red-alt red))))
+ `(org-todo ((,class :box ,bg-region :background ,bg-dim :foreground ,red-alt)))
`(org-upcoming-deadline ((,class :foreground ,red-alt-other)))
`(org-upcoming-distant-deadline ((,class :foreground ,red-nuanced)))
- `(org-verbatim ((,class :inherit fixed-pitch :background ,bg-alt :foreground ,fg-special-calm)))
+ `(org-verbatim ((,class ,@(modus-vivendi-theme-mixed-fonts)
+ :background ,bg-alt :foreground ,fg-special-calm)))
`(org-verse ((,class :inherit org-quote)))
`(org-warning ((,class :inherit bold :foreground ,red-alt-other)))
;;;;; org-journal
@@ -3291,8 +3700,11 @@ Also bind `class' to ((class color) (min-colors 89))."
;;;;; org-recur
`(org-recur ((,class :foreground ,magenta-active)))
;;;;; org-roam
- `(org-roam-link ((,class :foreground ,blue-alt-other :underline t)))
- `(org-roam-backlink ((,class :foreground ,green-alt-other :underline t)))
+ `(org-roam-link ((,class :inherit button :foreground ,green)))
+ `(org-roam-link-current ((,class :inherit button :foreground ,green-alt)))
+ `(org-roam-link-invalid ((,class :inherit button :foreground ,red)))
+ `(org-roam-link-shielded ((,class :inherit button :foreground ,yellow)))
+ `(org-roam-tag ((,class :foreground ,fg-alt :slant italic)))
;;;;; org-superstar
`(org-superstar-item ((,class :foreground ,fg-main)))
`(org-superstar-leading ((,class :foreground ,fg-whitespace)))
@@ -3305,37 +3717,16 @@ Also bind `class' to ((class color) (min-colors 89))."
`(origami-fold-header-face ((,class :background ,bg-dim :foreground ,fg-dim :box t)))
`(origami-fold-replacement-face ((,class :background ,bg-alt :foreground ,fg-alt)))
;;;;; outline-mode
- `(outline-1 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-main magenta-alt-other)
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)
- ,@(modus-vivendi-theme-heading-block magenta-nuanced-bg magenta-nuanced))))
- `(outline-2 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-special-warm magenta-alt)
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3)
- ,@(modus-vivendi-theme-heading-block red-nuanced-bg red-nuanced))))
- `(outline-3 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-special-cold blue)
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2)
- ,@(modus-vivendi-theme-heading-block blue-nuanced-bg blue-nuanced))))
- `(outline-4 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-special-mild cyan)
- ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-1)
- ,@(modus-vivendi-theme-heading-block cyan-nuanced-bg cyan-nuanced))))
- `(outline-5 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-special-calm green-alt-other)
- ,@(modus-vivendi-theme-heading-block green-nuanced-bg green-nuanced))))
- `(outline-6 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground yellow-nuanced yellow-alt-other)
- ,@(modus-vivendi-theme-heading-block yellow-nuanced-bg yellow-nuanced))))
- `(outline-7 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground red-nuanced red-alt)
- ,@(modus-vivendi-theme-heading-block red-nuanced-bg red-nuanced))))
- `(outline-8 ((,class :inherit (bold ,modus-theme-variable-pitch)
- ,@(modus-vivendi-theme-heading-foreground fg-dim magenta)
- ,@(modus-vivendi-theme-heading-block bg-alt fg-alt))))
+ `(outline-1 ((,class :inherit modus-theme-heading-1)))
+ `(outline-2 ((,class :inherit modus-theme-heading-2)))
+ `(outline-3 ((,class :inherit modus-theme-heading-3)))
+ `(outline-4 ((,class :inherit modus-theme-heading-4)))
+ `(outline-5 ((,class :inherit modus-theme-heading-5)))
+ `(outline-6 ((,class :inherit modus-theme-heading-6)))
+ `(outline-7 ((,class :inherit modus-theme-heading-7)))
+ `(outline-8 ((,class :inherit modus-theme-heading-8)))
;;;;; outline-minor-faces
- `(outline-minor-0 ((,class ,@(unless modus-vivendi-theme-section-headings
- (list :background cyan-nuanced-bg)))))
+ `(outline-minor-0 ((,class nil)))
;;;;; package (M-x list-packages)
`(package-description ((,class :foreground ,fg-special-cold)))
`(package-help-section-name ((,class :inherit bold :foreground ,magenta-alt-other)))
@@ -3423,6 +3814,23 @@ Also bind `class' to ((class color) (min-colors 89))."
`(prodigy-green-face ((,class :foreground ,green)))
`(prodigy-red-face ((,class :foreground ,red)))
`(prodigy-yellow-face ((,class :foreground ,yellow)))
+;;;;; racket-mode
+ `(racket-debug-break-face ((,class :inherit modus-theme-intense-red)))
+ `(racket-debug-locals-face ((,class :box (:line-width -1 :color nil)
+ :foreground ,green-alt-other)))
+ `(racket-debug-result-face ((,class :inherit bold :box (:line-width -1 :color nil)
+ :foreground ,green)))
+ `(racket-here-string-face ((,class :foreground ,blue-alt)))
+ `(racket-keyword-argument-face ((,class :foreground ,red-alt)))
+ `(racket-logger-config-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant)))
+ `(racket-logger-debug-face ((,class :foreground ,blue-alt-other)))
+ `(racket-logger-info-face ((,class :foreground ,fg-lang-note)))
+ `(racket-logger-topic-face ((,class :foreground ,magenta :slant ,modus-theme-slant)))
+ `(racket-selfeval-face ((,class :foreground ,green-alt)))
+ `(racket-xp-error-face
+ ((,(append '((supports :underline (:style wave))) class)
+ :underline (:color ,fg-lang-error :style wave))
+ (,class :foreground ,fg-lang-error :underline t)))
;;;;; rainbow-blocks
`(rainbow-blocks-depth-1-face ((,class :foreground ,magenta-alt-other)))
`(rainbow-blocks-depth-2-face ((,class :foreground ,blue)))
@@ -3544,24 +3952,19 @@ Also bind `class' to ((class color) (min-colors 89))."
'modus-theme-nuanced-blue
blue-alt-other))))
;;;;; selectrum
- `(selectrum-current-candidate ((,class ,@(modus-vivendi-theme-extra-completions
- 'modus-theme-refine-magenta
- 'modus-theme-intense-magenta
- 'modus-theme-nuanced-magenta
- magenta
- 'bold))))
- `(selectrum-primary-highlight ((,class ,@(modus-vivendi-theme-extra-completions
- 'modus-theme-refine-blue
- 'modus-theme-intense-blue
- 'modus-theme-nuanced-blue
- blue
- 'bold))))
- `(selectrum-secondary-highlight ((,class ,@(modus-vivendi-theme-extra-completions
- 'modus-theme-refine-cyan
- 'modus-theme-intense-cyan
- 'modus-theme-nuanced-cyan
- cyan
- 'bold))))
+ `(selectrum-current-candidate
+ ((,class :inherit bold :foreground ,fg-main :underline ,fg-main
+ :background ,@(pcase modus-vivendi-theme-completions
+ ('opinionated (list bg-active))
+ (_ (list bg-inactive))))))
+ `(selectrum-primary-highlight ((,class :inherit bold
+ ,@(modus-vivendi-theme-standard-completions
+ magenta-alt magenta-nuanced-bg
+ magenta-refine-bg magenta-refine-fg))))
+ `(selectrum-secondary-highlight ((,class :inherit bold
+ ,@(modus-vivendi-theme-standard-completions
+ cyan-alt-other cyan-nuanced-bg
+ cyan-refine-bg cyan-refine-fg))))
;;;;; semantic
`(semantic-complete-inline-face ((,class :foreground ,fg-special-warm :underline t)))
`(semantic-decoration-on-private-members-face ((,class :inherit modus-theme-refine-cyan)))
@@ -3628,23 +4031,13 @@ Also bind `class' to ((class color) (min-colors 89))."
`(sp-wrap-overlay-opening-pair ((,class :inherit sp-pair-overlay-face)))
`(sp-wrap-tag-overlay-face ((,class :inherit sp-pair-overlay-face)))
;;;;; smerge
- `(smerge-base ((,class ,@(modus-vivendi-theme-diffs
- bg-main yellow
- bg-diff-focus-changed fg-diff-focus-changed))))
- `(smerge-lower ((,class ,@(modus-vivendi-theme-diffs
- bg-main green
- bg-diff-focus-added fg-diff-focus-added))))
+ `(smerge-base ((,class :inherit modus-theme-diff-changed)))
+ `(smerge-lower ((,class :inherit modus-theme-diff-added)))
`(smerge-markers ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2)))
- `(smerge-refined-added ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-added fg-diff-added
- bg-diff-refine-added fg-diff-refine-added))))
+ `(smerge-refined-added ((,class :inherit modus-theme-diff-refine-added)))
`(smerge-refined-changed ((,class)))
- `(smerge-refined-removed ((,class ,@(modus-vivendi-theme-diffs
- bg-diff-removed fg-diff-removed
- bg-diff-refine-removed fg-diff-refine-removed))))
- `(smerge-upper ((,class ,@(modus-vivendi-theme-diffs
- bg-main red
- bg-diff-focus-removed fg-diff-focus-removed))))
+ `(smerge-refined-removed ((,class :inherit modus-theme-diff-refine-removed)))
+ `(smerge-upper ((,class :inherit modus-theme-diff-removed)))
;;;;; spaceline
`(spaceline-evil-emacs ((,class :inherit modus-theme-active-magenta)))
`(spaceline-evil-insert ((,class :inherit modus-theme-active-green)))
@@ -3804,7 +4197,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(trashed-mark ((,class :inherit modus-theme-mark-symbol)))
`(trashed-marked ((,class :inherit modus-theme-mark-alt)))
`(trashed-restored ((,class :inherit modus-theme-mark-sel)))
- `(trashed-symlink ((,class :foreground ,cyan-alt :underline t)))
+ `(trashed-symlink ((,class :inherit button :foreground ,cyan-alt)))
;;;;; treemacs
`(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt)))
`(treemacs-directory-face ((,class :inherit dired-directory)))
@@ -3870,39 +4263,33 @@ Also bind `class' to ((class color) (min-colors 89))."
`(tuareg-opam-pkg-variable-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground
cyan cyan-faint)
:slant ,modus-theme-slant)))
+;;;;; typescript
+ `(typescript-jsdoc-tag ((,class :foreground ,fg-special-mild :slant ,modus-theme-slant)))
+ `(typescript-jsdoc-type ((,class :foreground ,fg-special-calm :slant ,modus-theme-slant)))
+ `(typescript-jsdoc-value ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant)))
;;;;; undo-tree
`(undo-tree-visualizer-active-branch-face ((,class :inherit bold :foreground ,fg-main)))
`(undo-tree-visualizer-current-face ((,class :foreground ,blue-intense)))
`(undo-tree-visualizer-default-face ((,class :foreground ,fg-alt)))
`(undo-tree-visualizer-register-face ((,class :foreground ,magenta-intense)))
`(undo-tree-visualizer-unmodified-face ((,class :foreground ,green-intense)))
-;;;;; vc
- `(vc-conflict-state ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,red-active)))
- `(vc-edited-state ((,class :foreground ,fg-special-warm)))
+;;;;; vc (vc-hooks.el)
+ `(vc-conflict-state ((,class :foreground ,red-active :slant ,modus-theme-slant)))
+ `(vc-edited-state ((,class :foreground ,yellow-active)))
`(vc-locally-added-state ((,class :foreground ,cyan-active)))
- `(vc-locked-state ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-active)))
- `(vc-missing-state ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,yellow-active)))
- `(vc-needs-update-state ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,fg-special-mild)))
+ `(vc-locked-state ((,class :foreground ,blue-active)))
+ `(vc-missing-state ((,class :foreground ,magenta-active :slant ,modus-theme-slant)))
+ `(vc-needs-update-state ((,class :foreground ,green-active :slant ,modus-theme-slant)))
`(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-addition-face ((,class :inherit modus-theme-diff-added)))
+ `(vdiff-change-face ((,class :inherit modus-theme-diff-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-refine-added ((,class :inherit modus-theme-diff-refine-added)))
+ `(vdiff-refine-changed ((,class :inherit modus-theme-diff-refine-changed)))
+ `(vdiff-subtraction-face ((,class :inherit modus-theme-diff-removed)))
`(vdiff-target-face ((,class :inherit modus-theme-intense-blue)))
;;;;; vimish-fold
`(vimish-fold-fringe ((,class :foreground ,cyan-active)))
@@ -3925,7 +4312,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(vhl/default-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t))
:background ,bg-alt :foreground ,blue-nuanced)))
;;;;; vterm
- `(vterm-color-black ((,class :background "black" :foreground "black")))
+ `(vterm-color-black ((,class :background "gray35" :foreground "gray35")))
`(vterm-color-blue ((,class :background ,blue :foreground ,blue)))
`(vterm-color-cyan ((,class :background ,cyan :foreground ,cyan)))
`(vterm-color-default ((,class :background ,bg-main :foreground ,fg-main)))
@@ -3934,7 +4321,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(vterm-color-magenta ((,class :background ,magenta :foreground ,magenta)))
`(vterm-color-red ((,class :background ,red :foreground ,red)))
`(vterm-color-underline ((,class :foreground ,fg-special-warm :underline t)))
- `(vterm-color-white ((,class :background "white" :foreground "white")))
+ `(vterm-color-white ((,class :background "gray65" :foreground "gray65")))
`(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow)))
;;;;; wcheck-mode
`(wcheck-default-face ((,class :foreground ,red :underline t)))
@@ -4135,7 +4522,6 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm)))
`(ztreep-node-face ((,class :foreground ,fg-main))))
;;;; Emacs 27+
- ;; EXPERIMENTAL this form is subject to review
(when (>= emacs-major-version 27)
(custom-theme-set-faces
'modus-vivendi
@@ -4143,8 +4529,12 @@ Also bind `class' to ((class color) (min-colors 89))."
;; NOTE that this is specifically for the faces that were
;; introduced in Emacs 27, as the other faces are already
;; supported.
- `(line-number-major-tick ((,class (:background ,yellow-nuanced-bg :foreground ,yellow-nuanced))))
- `(line-number-minor-tick ((,class (:background ,cyan-nuanced-bg :foreground ,cyan-nuanced))))
+ `(line-number-major-tick ((,class :inherit (bold default)
+ :background ,yellow-nuanced-bg
+ :foreground ,yellow-nuanced)))
+ `(line-number-minor-tick ((,class :inherit (bold default)
+ :background ,bg-inactive
+ :foreground ,fg-inactive)))
;;;;; tab-bar-mode
`(tab-bar ((,class :background ,bg-tab-bar :foreground ,fg-main)))
`(tab-bar-tab ((,class :inherit bold :box (:line-width 2 :color ,bg-tab-active)
@@ -4160,12 +4550,22 @@ Also bind `class' to ((class color) (min-colors 89))."
`(tab-line-tab-current ((,class :inherit tab-line-tab)))
`(tab-line-tab-inactive ((,class :box (:line-width 2 :color ,bg-tab-inactive)
:background ,bg-tab-inactive :foreground ,fg-dim)))))
+;;;; Emacs 28+
+ (when (>= emacs-major-version 28)
+ (custom-theme-set-faces
+ 'modus-vivendi
+;;;;; isearch regexp groups
+ `(isearch-group-1 ((,class :inherit modus-theme-intense-blue)))
+ `(isearch-group-2 ((,class :inherit modus-theme-intense-magenta)))))
;;; variables
(custom-theme-set-variables
'modus-vivendi
;;;; ansi-colors
`(ansi-color-faces-vector [default bold shadow italic underline success warning error])
`(ansi-color-names-vector [,bg-main ,red ,green ,yellow ,blue ,magenta ,cyan ,fg-main])
+;;;; awesome-tray
+ `(awesome-tray-mode-line-active-color ,blue)
+ `(awesome-tray-mode-line-inactive-color ,bg-active)
;;;; flymake fringe indicators
`(flymake-error-bitmap '(flymake-double-exclamation-mark modus-theme-fringe-red))
`(flymake-warning-bitmap '(exclamation-mark modus-theme-fringe-yellow))
@@ -4174,7 +4574,7 @@ Also bind `class' to ((class color) (min-colors 89))."
`(ibuffer-deletion-face 'modus-theme-mark-del)
`(ibuffer-filter-group-name-face 'modus-theme-mark-symbol)
`(ibuffer-marked-face 'modus-theme-mark-sel)
- `(ibuffer-title-face 'modus-theme-header)
+ `(ibuffer-title-face 'modus-theme-pseudo-header)
;;;; highlight-tail
`(highlight-tail-colors
'((,green-subtle-bg . 0)
--
2.28.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-12 6:37 bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0 Protesilaos Stavrou
@ 2020-10-16 10:50 ` Stefan Kangas
2020-10-16 17:13 ` Stefan Kangas
1 sibling, 0 replies; 24+ messages in thread
From: Stefan Kangas @ 2020-10-16 10:50 UTC (permalink / raw)
To: Protesilaos Stavrou, 43944
Protesilaos Stavrou <info@protesilaos.com> writes:
> Commit c1b0515952 to Emacs 'master' on August 27 added two new themes.
> Their version was 0.12.0. A new version is now available, as well as a
> texinfo file that documents all their customisation options. Please see
> the attached patch.
Thanks.
The patch doesn't apply cleanly here, I guess due to some ^M characters
that sneaked in:
128 git … apply --3way --
/home/skangas/wip/emacs/0001-Update-modus-operandi-modus-vivendi-to-0.13.0.patch
/home/skangas/wip/emacs/0001-Update-modus-operandi-modus-vivendi-to-0.13.0.patch:25:
trailing whitespace.
\input texinfo @c -*- texinfo -*-
/home/skangas/wip/emacs/0001-Update-modus-operandi-modus-vivendi-to-0.13.0.patch:26:
trailing whitespace.
@c %**start of header
/home/skangas/wip/emacs/0001-Update-modus-operandi-modus-vivendi-to-0.13.0.patch:27:
trailing whitespace.
@setfilename modus-themes.info
/home/skangas/wip/emacs/0001-Update-modus-operandi-modus-vivendi-to-0.13.0.patch:28:
trailing whitespace.
@settitle Modus themes for GNU Emacs
/home/skangas/wip/emacs/0001-Update-modus-operandi-modus-vivendi-to-0.13.0.patch:29:
trailing whitespace.
@documentencoding UTF-8
error: corrupt patch at line 2867
(This could be fixed using something like `tr -d '^M'`, I think.)
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
[not found] <draft-87v9ffz1wx.fsf@stefankangas.se>
@ 2020-10-16 13:46 ` Stefan Kangas
2020-10-16 15:30 ` Eli Zaretskii
0 siblings, 1 reply; 24+ messages in thread
From: Stefan Kangas @ 2020-10-16 13:46 UTC (permalink / raw)
To: Protesilaos Stavrou, 43944
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
Stefan Kangas <stefankangas@gmail.com> writes:
> Protesilaos Stavrou <info@protesilaos.com> writes:
>
>> Commit c1b0515952 to Emacs 'master' on August 27 added two new themes.
>> Their version was 0.12.0. A new version is now available, as well as a
>> texinfo file that documents all their customisation options. Please see
>> the attached patch.
>
> Thanks.
>
> The patch doesn't apply cleanly here, I guess due to some ^M characters
> that sneaked in:
I fixed that, reviewed the changes and pushed your patch to master as
commit ad0643e580.
I also made the followup commit 6d4f57dbdf that adapts the new Info
manual to better fit Emacs conventions. Please see the attached patch.
[-- Attachment #2: 0001-Fix-building-modus-themes-Info-manual.patch --]
[-- Type: text/x-diff, Size: 2412 bytes --]
From dfff410d0238f34f5302a5dda160c3cd25489829 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 16 Oct 2020 14:58:51 +0200
Subject: [PATCH 1/3] Fix building modus-themes Info manual
* doc/misc/Makefile.in (INFO_COMMON): Add modus-themes.
* doc/misc/modus-themes.texi: Adapt to fit Emacs conventions.
---
doc/misc/Makefile.in | 2 +-
doc/misc/modus-themes.texi | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 7f536ad952..f4fb7d2ee6 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -69,7 +69,7 @@ INFO_COMMON =
dbus dired-x ebrowse ede ediff edt eieio \
emacs-mime epa erc ert eshell eudc efaq eww \
flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
- mairix-el message mh-e newsticker nxml-mode octave-mode \
+ mairix-el message mh-e modus-themes newsticker nxml-mode octave-mode \
org pcl-cvs pgg rcirc remember reftex sasl \
sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \
url vhdl-mode vip viper widget wisent woman
diff --git a/doc/misc/modus-themes.texi b/doc/misc/modus-themes.texi
index d198efea52..ff48497098 100644
--- a/doc/misc/modus-themes.texi
+++ b/doc/misc/modus-themes.texi
@@ -1,12 +1,15 @@
\input texinfo @c -*- texinfo -*-
@c %**start of header
-@setfilename modus-themes.info
+@setfilename ../../info/modus-themes.info
@settitle Modus themes for GNU Emacs
+@include docstyle.texi
@documentencoding UTF-8
@documentlanguage en
@c %**end of header
-@dircategory Emacs
+@include emacsver.texi
+
+@dircategory Emacs misc features
@direntry
* Modus Themes: (modus-themes). Highly accessible themes (WCAG AAA).
@end direntry
@@ -185,10 +188,9 @@ Learn about the latest changes
@node Installation
@chapter Installation
-The Modus themes are built into Emacs' development branch (@samp{master}) which
-corresponds to the nominal version 28.0.50. Otherwise they can be
-installed using Emacs' package manager or manually from their code
-repository.
+The Modus themes are distributed with Emacs starting with version 28.1.
+On older versions of Emacs, they can be installed using Emacs' package
+manager or manually from their code repository.
Modus Operandi (light theme) and Modus Vivendi (dark) are normally
distributed as standalone packages in Emacs-specific archives: GNU ELPA,
--
2.28.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-16 13:46 ` Stefan Kangas
@ 2020-10-16 15:30 ` Eli Zaretskii
2020-10-16 20:39 ` Protesilaos Stavrou
0 siblings, 1 reply; 24+ messages in thread
From: Eli Zaretskii @ 2020-10-16 15:30 UTC (permalink / raw)
To: Stefan Kangas; +Cc: info, 43944
> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Fri, 16 Oct 2020 06:46:31 -0700
>
> I also made the followup commit 6d4f57dbdf that adapts the new Info
> manual to better fit Emacs conventions. Please see the attached patch.
Please note that I made further changes to the manual, to adapt it to
our conventions and standards.
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-12 6:37 bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0 Protesilaos Stavrou
2020-10-16 10:50 ` Stefan Kangas
@ 2020-10-16 17:13 ` Stefan Kangas
2020-10-17 7:13 ` Protesilaos Stavrou
1 sibling, 1 reply; 24+ messages in thread
From: Stefan Kangas @ 2020-10-16 17:13 UTC (permalink / raw)
To: Protesilaos Stavrou, 43944
Protesilaos Stavrou <info@protesilaos.com> writes:
> + The two themes are also available in GNU ELPA. What is the best way
> to ensure that we sync between emacs.git and elpa.git? GNU ELPA has
> hitherto pulled from dedicated branches on my upstream git repository.
> Maybe it would be better/easier to start building directly from the
> Emacs source? This would reduce the overall workload.
What does "start building directly from the Emacs source" mean here?
FWIW, I don't think we should feel too bound to any particular process;
this seems like a practical matter where we should try to do whatever
is most practical.
> + Sending attachments with large diffs has the downside of losing the
> commit history. Do Emacs maintainers wish to keep track of it? If
> so, what would be the best way to preserve it, seeing as I am
> developing them on my own upstream?
I don't think we generally worry about preserving history for packages
managed externally. We just sync the latest version.
(If one really would like to preserve it, it could perhaps be done with
some git magic. I'm not sure it's worth the extra effort.)
> + Should the texinfo file be mentioned in the NEWS entry about the two
> themes? The attached patch does not include such a change.
We could of course add a NEWS entry for it. Would you like to propose
one?
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-16 15:30 ` Eli Zaretskii
@ 2020-10-16 20:39 ` Protesilaos Stavrou
2020-10-17 0:07 ` Stefan Kangas
2020-10-17 7:13 ` Eli Zaretskii
0 siblings, 2 replies; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-16 20:39 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 43944, Stefan Kangas
On 2020-10-16, 18:30 +0300, Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Stefan Kangas <stefankangas@gmail.com>
>> Date: Fri, 16 Oct 2020 06:46:31 -0700
>>
>> I also made the followup commit 6d4f57dbdf that adapts the new Info
>> manual to better fit Emacs conventions. Please see the attached patch.
>
> Please note that I made further changes to the manual, to adapt it to
> our conventions and standards.
Thanks to both of you for the changes! I will make sure to include them
in my version.
With regard to British English, there is more of it in the *.el files I
shared: "colour" probably is the most common one. Shall I prepare a
patch?
--
Protesilaos Stavrou
protesilaos.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-16 20:39 ` Protesilaos Stavrou
@ 2020-10-17 0:07 ` Stefan Kangas
2020-10-17 7:15 ` Protesilaos Stavrou
2020-10-17 7:13 ` Eli Zaretskii
1 sibling, 1 reply; 24+ messages in thread
From: Stefan Kangas @ 2020-10-17 0:07 UTC (permalink / raw)
To: Protesilaos Stavrou, Eli Zaretskii; +Cc: 43944
Protesilaos Stavrou <info@protesilaos.com> writes:
> With regard to British English, there is more of it in the *.el files I
> shared: "colour" probably is the most common one. Shall I prepare a
> patch?
Sure! Or it could wait until you release the next version, if you
prefer that option.
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-16 17:13 ` Stefan Kangas
@ 2020-10-17 7:13 ` Protesilaos Stavrou
2020-10-17 16:23 ` Stefan Kangas
0 siblings, 1 reply; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-17 7:13 UTC (permalink / raw)
To: Stefan Kangas; +Cc: 43944
[-- Attachment #1: Type: text/plain, Size: 2357 bytes --]
On 2020-10-16, 10:13 -0700, Stefan Kangas <stefankangas@gmail.com> wrote:
> Protesilaos Stavrou <info@protesilaos.com> writes:
>
>> + The two themes are also available in GNU ELPA. What is the best way
>> to ensure that we sync between emacs.git and elpa.git? GNU ELPA has
>> hitherto pulled from dedicated branches on my upstream git repository.
>> Maybe it would be better/easier to start building directly from the
>> Emacs source? This would reduce the overall workload.
>
> What does "start building directly from the Emacs source" mean here?
"Build" is the wrong term here. Sorry about that! My intent is to find
an easy way/workflow to get the files from Emacs into GNU ELPA.
And by "easy" I mean not to duplicate the work we do here. So I would
not have to contact the GNU ELPA maintainers separately and have them
pull from my git source.
> FWIW, I don't think we should feel too bound to any particular process;
> this seems like a practical matter where we should try to do whatever
> is most practical.
Good to know. I have no particular preference on the matter and shall
adapt to whatever you and others may recommend.
>> + Sending attachments with large diffs has the downside of losing the
>> commit history. Do Emacs maintainers wish to keep track of it? If
>> so, what would be the best way to preserve it, seeing as I am
>> developing them on my own upstream?
>
> I don't think we generally worry about preserving history for packages
> managed externally. We just sync the latest version.
>
> (If one really would like to preserve it, it could perhaps be done with
> some git magic. I'm not sure it's worth the extra effort.)
Syncing the latest version works fine for me.
I have thus far published tagged releases on a monthly cadence. Expect
the next one in mid to late November.
>> + Should the texinfo file be mentioned in the NEWS entry about the two
>> themes? The attached patch does not include such a change.
>
> We could of course add a NEWS entry for it. Would you like to propose
> one?
I attach a possible rewording that also corrects "colour" and adds an
explicit reference to the WCAG AAA accessibility spec. Please note that
I do not know how to properly reference an Info node: I used 'C-u 0 x',
which calls 'Info-copy-current-node-name'.
--
Protesilaos Stavrou
protesilaos.com
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Update-Modus-themes-NEWS-entry.patch --]
[-- Type: text/x-patch, Size: 1252 bytes --]
From 4b235a54973570aeb9330c15315f47682b7f121f Mon Sep 17 00:00:00 2001
From: Protesilaos Stavrou <info@protesilaos.com>
Date: Sat, 17 Oct 2020 09:50:48 +0300
Subject: [PATCH] Update Modus themes' NEWS entry
* etc/NEWS: Reword entry about new 'modus-operandi' and
'modus-vivendi' themes. Include reference to their manual.
---
etc/NEWS | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 1838b6b38a..d782e6c12c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1403,9 +1403,11 @@ mode, as are other data files produced by Emacs.
It's a library to create, query, navigate and display hierarchy structures.
** New themes 'modus-vivendi' and 'modus-operandi'.
-These themes are designed for colour-contrast accessibility. You can
-load the new themes using 'M-x customize-themes' or 'load-theme' from
-your init file.
+These themes are designed to conform with the highest standard for
+color-contrast accessibility (WCAG AAA). You can load either of them
+using 'M-x customize-themes' or 'load-theme' from your init file.
+Their on-line documentation describes the customization options they
+provide. Consult '(info "(modus-themes) Top")'.
\f
* Incompatible Editing Changes in Emacs 28.1
--
2.28.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-16 20:39 ` Protesilaos Stavrou
2020-10-17 0:07 ` Stefan Kangas
@ 2020-10-17 7:13 ` Eli Zaretskii
2020-10-17 8:09 ` Protesilaos Stavrou
1 sibling, 1 reply; 24+ messages in thread
From: Eli Zaretskii @ 2020-10-17 7:13 UTC (permalink / raw)
To: Protesilaos Stavrou; +Cc: 43944, stefankangas
> From: Protesilaos Stavrou <info@protesilaos.com>
> Cc: Stefan Kangas <stefankangas@gmail.com>, 43944@debbugs.gnu.org
> Date: Fri, 16 Oct 2020 23:39:55 +0300
>
> With regard to British English, there is more of it in the *.el files I
> shared: "colour" probably is the most common one. Shall I prepare a
> patch?
Yes, please.
Note that I didn't change a couple of those UK English spellings where
they affected too many places, for example one node that is referenced
from many places. If you could take care of that as well, it would be
perfect.
Thanks.
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-17 0:07 ` Stefan Kangas
@ 2020-10-17 7:15 ` Protesilaos Stavrou
0 siblings, 0 replies; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-17 7:15 UTC (permalink / raw)
To: Stefan Kangas; +Cc: 43944
On 2020-10-16, 17:07 -0700, Stefan Kangas <stefankangas@gmail.com> wrote:
> Protesilaos Stavrou <info@protesilaos.com> writes:
>
>> With regard to British English, there is more of it in the *.el files I
>> shared: "colour" probably is the most common one. Shall I prepare a
>> patch?
>
> Sure! Or it could wait until you release the next version, if you
> prefer that option.
I prefer to wait until the next version (coming mid to late November).
Just to be sure that we capture everything.
Thanks again!
--
Protesilaos Stavrou
protesilaos.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-17 7:13 ` Eli Zaretskii
@ 2020-10-17 8:09 ` Protesilaos Stavrou
2020-10-17 8:59 ` Basil L. Contovounesios
0 siblings, 1 reply; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-17 8:09 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: 43944, Stefan Kangas
On 2020-10-17, 10:13 +0300, Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Protesilaos Stavrou <info@protesilaos.com>
>> Cc: Stefan Kangas <stefankangas@gmail.com>, 43944@debbugs.gnu.org
>> Date: Fri, 16 Oct 2020 23:39:55 +0300
>>
>> With regard to British English, there is more of it in the *.el files I
>> shared: "colour" probably is the most common one. Shall I prepare a
>> patch?
>
> Yes, please.
>
> Note that I didn't change a couple of those UK English spellings where
> they affected too many places, for example one node that is referenced
> from many places. If you could take care of that as well, it would be
> perfect.
>
> Thanks.
Thanks! I shall take care of those as well. I prefer to do it for the
next release (to be published in about a month from now). Just to be
sure that we catch everything.
--
Protesilaos Stavrou
protesilaos.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-17 8:09 ` Protesilaos Stavrou
@ 2020-10-17 8:59 ` Basil L. Contovounesios
2020-10-19 8:08 ` Protesilaos Stavrou
0 siblings, 1 reply; 24+ messages in thread
From: Basil L. Contovounesios @ 2020-10-17 8:59 UTC (permalink / raw)
To: Protesilaos Stavrou; +Cc: 43944, Stefan Kangas
Protesilaos Stavrou <info@protesilaos.com> writes:
> Thanks! I shall take care of those as well. I prefer to do it for the
> next release (to be published in about a month from now). Just to be
> sure that we catch everything.
Sorry to give you more work, but while you're at it, could you please
also change the spelling of my surname from Contovounisios to
Contovounesios in the changelog and manual? Not because I care about
attribution, but for consistency ;).
Thanks,
--
Basil
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-17 7:13 ` Protesilaos Stavrou
@ 2020-10-17 16:23 ` Stefan Kangas
2020-10-19 8:12 ` Protesilaos Stavrou
0 siblings, 1 reply; 24+ messages in thread
From: Stefan Kangas @ 2020-10-17 16:23 UTC (permalink / raw)
To: Protesilaos Stavrou; +Cc: 43944
Protesilaos Stavrou <info@protesilaos.com> writes:
> "Build" is the wrong term here. Sorry about that! My intent is to find
> an easy way/workflow to get the files from Emacs into GNU ELPA.
>
> And by "easy" I mean not to duplicate the work we do here. So I would
> not have to contact the GNU ELPA maintainers separately and have them
> pull from my git source.
Right. Hmm, it's a bit tricky to be honest, because there are several
options and AFAICT the workflows are not exactly 100 % streamlined in
all cases. Maybe you could bring this question to emacs-devel?
> Syncing the latest version works fine for me.
>
> I have thus far published tagged releases on a monthly cadence. Expect
> the next one in mid to late November.
Great.
> I attach a possible rewording that also corrects "colour" and adds an
> explicit reference to the WCAG AAA accessibility spec. Please note that
> I do not know how to properly reference an Info node: I used 'C-u 0 x',
> which calls 'Info-copy-current-node-name'.
Great, thanks. I made some minor changes and pushed it to master as
commit 00c4d982e8.
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-17 8:59 ` Basil L. Contovounesios
@ 2020-10-19 8:08 ` Protesilaos Stavrou
2020-10-19 16:34 ` Basil L. Contovounesios
0 siblings, 1 reply; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-19 8:08 UTC (permalink / raw)
To: Basil L. Contovounesios; +Cc: 43944
On 2020-10-17, 09:59 +0100, "Basil L. Contovounesios" <contovob@tcd.ie> wrote:
> Protesilaos Stavrou <info@protesilaos.com> writes:
>
>> Thanks! I shall take care of those as well. I prefer to do it for the
>> next release (to be published in about a month from now). Just to be
>> sure that we catch everything.
>
> Sorry to give you more work, but while you're at it, could you please
> also change the spelling of my surname from Contovounisios to
> Contovounesios in the changelog and manual? Not because I care about
> attribution, but for consistency ;).
>
> Thanks,
I just fixed the spelling of your name on my end. Is it okay if I defer
the submission of this change until mid-November, when the new version
of the themes will be available? Otherwise feel free to fix it now.
--
Protesilaos Stavrou
protesilaos.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-17 16:23 ` Stefan Kangas
@ 2020-10-19 8:12 ` Protesilaos Stavrou
2020-10-19 12:18 ` Stefan Kangas
0 siblings, 1 reply; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-19 8:12 UTC (permalink / raw)
To: Stefan Kangas; +Cc: 43944
On 2020-10-17, 16:23 +0000, Stefan Kangas <stefankangas@gmail.com> wrote:
> Protesilaos Stavrou <info@protesilaos.com> writes:
>
>> "Build" is the wrong term here. Sorry about that! My intent is to find
>> an easy way/workflow to get the files from Emacs into GNU ELPA.
>>
>> And by "easy" I mean not to duplicate the work we do here. So I would
>> not have to contact the GNU ELPA maintainers separately and have them
>> pull from my git source.
>
> Right. Hmm, it's a bit tricky to be honest, because there are several
> options and AFAICT the workflows are not exactly 100 % streamlined in
> all cases. Maybe you could bring this question to emacs-devel?
Yes, I shall post on emacs-devel.
>> I attach a possible rewording that also corrects "colour" and adds an
>> explicit reference to the WCAG AAA accessibility spec. Please note that
>> I do not know how to properly reference an Info node: I used 'C-u 0 x',
>> which calls 'Info-copy-current-node-name'.
>
> Great, thanks. I made some minor changes and pushed it to master as
> commit 00c4d982e8.
Thank you!
--
Protesilaos Stavrou
protesilaos.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 8:12 ` Protesilaos Stavrou
@ 2020-10-19 12:18 ` Stefan Kangas
2020-10-19 12:31 ` Protesilaos Stavrou
0 siblings, 1 reply; 24+ messages in thread
From: Stefan Kangas @ 2020-10-19 12:18 UTC (permalink / raw)
To: Protesilaos Stavrou; +Cc: 43944
Protesilaos Stavrou <info@protesilaos.com> writes:
> Yes, I shall post on emacs-devel.
Excellent. Do we have anything more to discuss in this bug report or
should it be closed?
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 12:18 ` Stefan Kangas
@ 2020-10-19 12:31 ` Protesilaos Stavrou
2020-10-19 12:57 ` Protesilaos Stavrou
0 siblings, 1 reply; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-19 12:31 UTC (permalink / raw)
To: Stefan Kangas; +Cc: 43944
On 2020-10-19, 14:18 +0200, Stefan Kangas <stefankangas@gmail.com> wrote:
> Protesilaos Stavrou <info@protesilaos.com> writes:
>
>> Yes, I shall post on emacs-devel.
>
> Excellent. Do we have anything more to discuss in this bug report or
> should it be closed?
I did find some more references in the manual to package archives that
do not conform with the Emacs conventions.
Please give me some extra time while I prepare another patch (instead of
deferring it to the next release, as I had initially suggested).
--
Protesilaos Stavrou
protesilaos.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 12:31 ` Protesilaos Stavrou
@ 2020-10-19 12:57 ` Protesilaos Stavrou
2020-10-19 15:42 ` Stefan Kangas
0 siblings, 1 reply; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-19 12:57 UTC (permalink / raw)
To: Stefan Kangas; +Cc: 43944
[-- Attachment #1: Type: text/plain, Size: 1076 bytes --]
On 2020-10-19, 15:31 +0300, Protesilaos Stavrou <info@protesilaos.com> wrote:
> On 2020-10-19, 14:18 +0200, Stefan Kangas <stefankangas@gmail.com> wrote:
>
>> Protesilaos Stavrou <info@protesilaos.com> writes:
>>
>>> Yes, I shall post on emacs-devel.
>>
>> Excellent. Do we have anything more to discuss in this bug report or
>> should it be closed?
>
> I did find some more references in the manual to package archives that
> do not conform with the Emacs conventions.
>
> Please give me some extra time while I prepare another patch (instead of
> deferring it to the next release, as I had initially suggested).
Please find attached the patch that should address the remaining issues
with the manual (in line with what was reported by Eli and Basil). Once
it is merged, I think the bug report can be closed.
Note that I did not correct "greyscale" to "grayscale" because there is
a symbol involved. This will definitely be changed ahead of the next
tagged release.
P.S. As always, feel free to amend the patch. Thanks again!
--
Protesilaos Stavrou
protesilaos.com
[-- Attachment #2: 0001-Fix-documentation-of-the-Modus-Themes.patch --]
[-- Type: text/x-patch, Size: 7801 bytes --]
From 69a207136090cd2d5e094be761bfc79fd0e21bb9 Mon Sep 17 00:00:00 2001
From: Protesilaos Stavrou <info@protesilaos.com>
Date: Mon, 19 Oct 2020 15:48:10 +0300
Subject: [PATCH] Fix documentation of the Modus Themes
* doc/misc/modus-themes.texi (Installation): Remove reference to MELPA.
(Top)
(Install from the archives, GNU Guix)
(Load at a given time or at sunset/sunrise)
(Configure options prior to loading, Command prompts)
(Headings' font, Will NOT be supported): Fix spelling, wording,
markup.
(Acknowledgements): Spell contributor's surname correctly.
---
doc/misc/modus-themes.texi | 51 ++++++++++++++++++--------------------
1 file changed, 24 insertions(+), 27 deletions(-)
diff --git a/doc/misc/modus-themes.texi b/doc/misc/modus-themes.texi
index c34ee15229..383073c00d 100644
--- a/doc/misc/modus-themes.texi
+++ b/doc/misc/modus-themes.texi
@@ -50,8 +50,8 @@ and with no Back-Cover Texts.
* Overview::
* Installation::
* Enable and load::
-* Customisation Options::
-* Advanced customisation (do-it-yourself)::
+* Customization Options::
+* Advanced customization (do-it-yourself)::
* Face coverage::
* Notes for individual packages::
* Contributing::
@@ -85,7 +85,7 @@ Enable and load
* Toggle between the themes on demand::
* Configure options prior to loading::
-Customisation Options
+Customization Options
* Bold constructs:: Toggle bold constructs in code
* Slanted constructs:: Toggle slanted constructs (italics) in code
@@ -108,7 +108,7 @@ Scaled headings
* Scaled heading sizes:: Specify rate of increase for scaled headings
-Advanced customisation (do-it-yourself)
+Advanced customization (do-it-yourself)
* Tweak colors (DIY):: Declare your own palette overrides
* Font configs (DIY):: Optimise for mixed typeface buffers
@@ -193,9 +193,8 @@ On older versions of Emacs, they can be installed using Emacs' package
manager or manually from their code repository.
Modus Operandi (light theme) and Modus Vivendi (dark) are normally
-distributed as standalone packages in Emacs-specific archives: GNU ELPA,
-MELPA, and MELPA Stable. There also exist packages for GNU/Linux
-distributions.
+distributed as standalone packages in Emacs-specific archives. There
+also exist packages for GNU/Linux distributions.
@menu
* Install from the archives::
@@ -206,14 +205,12 @@ distributions.
@section Install from the archives
@samp{modus-operandi-theme} and @samp{modus-vivendi-theme} are
-available from GNU ELPA.
+available from the GNU ELPA archive, which is configured by default.
Prior to querying any package archive, make sure to have updated the
index, with @samp{M-x package-refresh-contents}. Then all you need to do is
type @samp{M-x package-install} and specify the theme of your choice.
-GNU ELPA contains the last tagged release.
-
@node Install on GNU/Linux
@section Install on GNU/Linux
@@ -247,22 +244,22 @@ Users of either the Guix System (the distro) or just Guix (the package
manager) can get each theme as a standalone package.
@example
-guix package -i modus-operandi-theme
+guix package -i emacs-modus-operandi-theme
@end example
And/or:
@example
-guix package -i modus-vivendi-theme
+guix package -i emacs-modus-vivendi-theme
@end example
@node Enable and load
@chapter Enable and load
-This section documents how to load the theme of your
-choice and how to further control its initialization. It also includes
-some sample code snippets that could help you in the task, especially if
-you intend to use both Modus Operandi and Modus Vivendi.
+This section documents how to load the theme of your choice and how to
+further control its initialization. It also includes some sample code
+snippets that could help you in the task, especially if you intend to
+use both Modus Operandi and Modus Vivendi.
@menu
* Load automatically::
@@ -298,7 +295,7 @@ evaluate the expression:
@section Load at a given time or at sunset/sunrise
It is possible to schedule a time during the day at or after which a
-given theme will be loaded.@footnote{Contributed on Reddit by user b3n
+given theme will be loaded.@footnote{Contributed on Reddit by user @samp{b3n}
@uref{https://www.reddit.com/r/emacs/comments/gdtqov/weekly_tipstricketc_thread/fq9186h/}.}
@lisp
@@ -373,7 +370,7 @@ disabling a single target, but you get the idea.
@section Configure options prior to loading
If you plan to use both themes and wish to apply styles consistently
-(see @ref{Customisation Options}), you could define wrapper functions around
+(see @ref{Customization Options}), you could define wrapper functions around
the standard @samp{load-theme} command. These extend the simple function we
presented in @ref{Toggle between the themes on demand}.
@@ -427,8 +424,8 @@ method were contributed on Reddit by user @samp{b3n},
(modus-operandi-theme-load)))
@end lisp
-@node Customisation Options
-@chapter Customisation Options
+@node Customization Options
+@chapter Customization Options
The Modus themes are highly configurable, though they should work well
without any further tweaks.
@@ -639,7 +636,7 @@ background and foreground to the minibuffer and other REPL prompts (like
@samp{M-x shell} and @samp{M-x eshell}). The difference between the two is that the
latter has a more pronounced/noticeable effect than the former.
-The default is not to use any background for such prompts, while relying
+The default does not use any background for such prompts, while relying
exclusively on an accented foreground color.
@node Mode line
@@ -1182,13 +1179,13 @@ main font family.
@ref{Font configs (DIY), , Font configurations for Org (and others)}.
-@node Advanced customisation (do-it-yourself)
-@chapter Advanced customisation (do-it-yourself)
+@node Advanced customization (do-it-yourself)
+@chapter Advanced customization (do-it-yourself)
Unlike the predefined customization options which follow a
straightforward pattern of allowing the user to quickly specify their
preference, the themes also provide a more flexible, albeit difficult,
-mechanism to control things with precision (see @ref{Customisation Options}).
+mechanism to control things with precision (see @ref{Customization Options}).
This section is of interest only to users who are prepared to maintain
their own local tweaks and who are willing to deal with any possible
@@ -2043,7 +2040,7 @@ that secondary elements like sidebars can have the default (pure
white/black) background.
I will only cover this package if it ever supports the inverse effect:
-less intense colors (but still accessible) for supportive interfaces
+less intense colors (but still accessible) for ancillary interfaces
and the intended styles for the content you are actually working on.
@node Notes for individual packages
@@ -2302,13 +2299,13 @@ The Modus themes are a collective effort. Every contribution counts.
Protesilaos Stavrou.
@item Code contributions
-Anders Johansson, Basil L@. Contovounisios,
+Anders Johansson, Basil L@. Contovounesios,
Markus Beppler, Matthew Stevenson.
@item Ideas and user feedback
Aaron Jensen, Adam Spiers, Alex Griffin,
Alex Peitsinis, Alexey Shmalko, Anders Johansson, André Alexandre
-Gomes, Arif Rezai, Basil L@. Contovounisios, Damien Cassou, Dario
+Gomes, Arif Rezai, Basil L@. Contovounesios, Damien Cassou, Dario
Gjorgjevski, David Edmondson, Davor Rotim, Divan Santana, Gerry
Agbobada, Gianluca Recchia, Iris Garcia, Len Trigg, Manuel Uberti,
Mark Burton, Markus Beppler, Michael Goldenberg, Murilo Pereira,
--
2.28.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 12:57 ` Protesilaos Stavrou
@ 2020-10-19 15:42 ` Stefan Kangas
0 siblings, 0 replies; 24+ messages in thread
From: Stefan Kangas @ 2020-10-19 15:42 UTC (permalink / raw)
To: Protesilaos Stavrou; +Cc: 43944
close 43944 28.1
thanks
Protesilaos Stavrou <info@protesilaos.com> writes:
> Please find attached the patch that should address the remaining issues
> with the manual (in line with what was reported by Eli and Basil). Once
> it is merged, I think the bug report can be closed.
Thanks! Pushed to master as commit 4970e2c7ea.
I'm closing this bug report with this message.
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 8:08 ` Protesilaos Stavrou
@ 2020-10-19 16:34 ` Basil L. Contovounesios
2020-10-19 16:55 ` Protesilaos Stavrou
2020-10-19 16:59 ` Stefan Kangas
0 siblings, 2 replies; 24+ messages in thread
From: Basil L. Contovounesios @ 2020-10-19 16:34 UTC (permalink / raw)
To: Protesilaos Stavrou; +Cc: 43944
Protesilaos Stavrou <info@protesilaos.com> writes:
> Is it okay if I defer
> the submission of this change until mid-November, when the new version
> of the themes will be available? Otherwise feel free to fix it now.
AFAICT the Modus sources have since been updated in both Emacs and on
GitLab, so does this still apply?
I'm in no hurry - the only reason I asked you instead of fixing it
myself, is that I saw you were already in the process of applying
feedback, and I didn't have the time to look into regenerating the
Texinfo manual from Org.
Thanks,
--
Basil
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 16:34 ` Basil L. Contovounesios
@ 2020-10-19 16:55 ` Protesilaos Stavrou
2020-10-19 17:11 ` Basil L. Contovounesios
2020-10-19 16:59 ` Stefan Kangas
1 sibling, 1 reply; 24+ messages in thread
From: Protesilaos Stavrou @ 2020-10-19 16:55 UTC (permalink / raw)
To: Basil L. Contovounesios; +Cc: 43944
On 2020-10-19, 17:34 +0100, "Basil L. Contovounesios" <contovob@tcd.ie> wrote:
> Protesilaos Stavrou <info@protesilaos.com> writes:
>
>> Is it okay if I defer
>> the submission of this change until mid-November, when the new version
>> of the themes will be available? Otherwise feel free to fix it now.
>
> AFAICT the Modus sources have since been updated in both Emacs and on
> GitLab, so does this still apply?
>
> I'm in no hurry - the only reason I asked you instead of fixing it
> myself, is that I saw you were already in the process of applying
> feedback, and I didn't have the time to look into regenerating the
> Texinfo manual from Org.
>
> Thanks,
I changed my mind because I noticed some references that had to be
addressed in a timely fashion. So I also updated your name in the
process. Sorry for not notifying you in advance.
--
Protesilaos Stavrou
protesilaos.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 16:34 ` Basil L. Contovounesios
2020-10-19 16:55 ` Protesilaos Stavrou
@ 2020-10-19 16:59 ` Stefan Kangas
2020-10-19 17:12 ` Basil L. Contovounesios
1 sibling, 1 reply; 24+ messages in thread
From: Stefan Kangas @ 2020-10-19 16:59 UTC (permalink / raw)
To: Basil L. Contovounesios, Protesilaos Stavrou; +Cc: 43944
"Basil L. Contovounesios" <contovob@tcd.ie> writes:
> I'm in no hurry - the only reason I asked you instead of fixing it
> myself, is that I saw you were already in the process of applying
> feedback, and I didn't have the time to look into regenerating the
> Texinfo manual from Org.
This was fixed in Protesilaos' follow-up commit 4970e2c7ea.
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 16:55 ` Protesilaos Stavrou
@ 2020-10-19 17:11 ` Basil L. Contovounesios
0 siblings, 0 replies; 24+ messages in thread
From: Basil L. Contovounesios @ 2020-10-19 17:11 UTC (permalink / raw)
To: Protesilaos Stavrou; +Cc: 43944
Protesilaos Stavrou <info@protesilaos.com> writes:
> On 2020-10-19, 17:34 +0100, "Basil L. Contovounesios" <contovob@tcd.ie> wrote:
>
>> Protesilaos Stavrou <info@protesilaos.com> writes:
>>
>>> Is it okay if I defer
>>> the submission of this change until mid-November, when the new version
>>> of the themes will be available? Otherwise feel free to fix it now.
>>
>> AFAICT the Modus sources have since been updated in both Emacs and on
>> GitLab, so does this still apply?
>>
>> I'm in no hurry - the only reason I asked you instead of fixing it
>> myself, is that I saw you were already in the process of applying
>> feedback, and I didn't have the time to look into regenerating the
>> Texinfo manual from Org.
>>
>> Thanks,
>
> I changed my mind because I noticed some references that had to be
> addressed in a timely fashion. So I also updated your name in the
> process. Sorry for not notifying you in advance.
No need to apologise; I was just clarifying.
Thanks for working on this,
--
Basil
^ permalink raw reply [flat|nested] 24+ messages in thread
* bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0
2020-10-19 16:59 ` Stefan Kangas
@ 2020-10-19 17:12 ` Basil L. Contovounesios
0 siblings, 0 replies; 24+ messages in thread
From: Basil L. Contovounesios @ 2020-10-19 17:12 UTC (permalink / raw)
To: Stefan Kangas; +Cc: Protesilaos Stavrou, 43944
Stefan Kangas <stefankangas@gmail.com> writes:
> "Basil L. Contovounesios" <contovob@tcd.ie> writes:
>
>> I'm in no hurry - the only reason I asked you instead of fixing it
>> myself, is that I saw you were already in the process of applying
>> feedback, and I didn't have the time to look into regenerating the
>> Texinfo manual from Org.
>
> This was fixed in Protesilaos' follow-up commit 4970e2c7ea.
Yep, that's what my preceding paragraph was alluding to, thanks.
--
Basil
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2020-10-19 17:12 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-12 6:37 bug#43944: 28.0.50; Update modus-operandi, modus-vivendi themes to v0.13.0 Protesilaos Stavrou
2020-10-16 10:50 ` Stefan Kangas
2020-10-16 17:13 ` Stefan Kangas
2020-10-17 7:13 ` Protesilaos Stavrou
2020-10-17 16:23 ` Stefan Kangas
2020-10-19 8:12 ` Protesilaos Stavrou
2020-10-19 12:18 ` Stefan Kangas
2020-10-19 12:31 ` Protesilaos Stavrou
2020-10-19 12:57 ` Protesilaos Stavrou
2020-10-19 15:42 ` Stefan Kangas
[not found] <draft-87v9ffz1wx.fsf@stefankangas.se>
2020-10-16 13:46 ` Stefan Kangas
2020-10-16 15:30 ` Eli Zaretskii
2020-10-16 20:39 ` Protesilaos Stavrou
2020-10-17 0:07 ` Stefan Kangas
2020-10-17 7:15 ` Protesilaos Stavrou
2020-10-17 7:13 ` Eli Zaretskii
2020-10-17 8:09 ` Protesilaos Stavrou
2020-10-17 8:59 ` Basil L. Contovounesios
2020-10-19 8:08 ` Protesilaos Stavrou
2020-10-19 16:34 ` Basil L. Contovounesios
2020-10-19 16:55 ` Protesilaos Stavrou
2020-10-19 17:11 ` Basil L. Contovounesios
2020-10-19 16:59 ` Stefan Kangas
2020-10-19 17:12 ` Basil L. Contovounesios
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).