diff options
Diffstat (limited to 'etc')
43 files changed, 15825 insertions, 14796 deletions
diff --git a/etc/HELLO b/etc/HELLO index 0cebb2bb7c2..577c2828ded 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -59,6 +59,7 @@ Italian (italiano) Ciao / Buon giorno Javanese (ꦧꦱꦗꦮꦶ) console.log("ꦲꦭꦺꦴ"); Kannada (ಕನ್ನಡ) ನಮಸ್ಕಾರ Khmer (ភាសាខ្មែរ) ជំរាបសួរ +Lakota (Lakȟotiyapi) Taŋyáŋ yahí! Lao (ພາສາລາວ) ສະບາຍດີ / ຂໍໃຫ້ໂຊກດີ Malayalam (മലയാളം) നമസ്കാരം Maldivian (ދިވެހި) އައްސަލާމު ޢަލައިކުމް / ކިހިނެހް؟ diff --git a/etc/HISTORY b/etc/HISTORY index a6b9f57814f..1d6425e9380 100644 --- a/etc/HISTORY +++ b/etc/HISTORY @@ -222,6 +222,8 @@ GNU Emacs 26.3 (2019-08-28) emacs-26.3 GNU Emacs 27.1 (2020-08-10) emacs-27.1 +GNU Emacs 27.2 (2021-03-25) emacs-27.2 + ---------------------------------------------------------------------- This file is part of GNU Emacs. @@ -24,7 +24,17 @@ applies, and please also update docstrings as needed. * Installation Changes in Emacs 28.1 -** Cairo graphics library is now used by default if found. +** Emacs now optionally supports native compilation of Lisp files. +To enable this, configure Emacs with the '--with-native-compilation' option. +This requires the libgccjit library to be installed and functional, +and also requires GCC and Binutils to be available when Lisp code is +natively compiled. See the Info node "(elisp) Native Compilation" for +more details. + +--- +** Support for building with Motif has been removed. + +** The Cairo graphics library is now used by default if present. '--with-cairo' is now the default, if the appropriate development files are found by 'configure'. Note that building with Cairo means using Pango instead of libXFT for font support. Since Pango 1.44 has @@ -64,6 +74,11 @@ shaping, so 'configure' now recommends that combination. It was declared obsolete in Emacs 27.1. --- +** The configure option '--without-makeinfo' has been removed. +This was only ever relevant when building from a repository checkout. +This now requires makeinfo, which is part of the texinfo package. + +--- ** Support for building with '-fcheck-pointer-bounds' has been removed. GCC has withdrawn the '-fcheck-pointer-bounds' option and support for its implementation has been removed from the Linux kernel. @@ -76,15 +91,82 @@ proper pty support that Emacs needs. * Startup Changes in Emacs 28.1 +--- +** File names given on the command line will now be pushed onto +'file-name-history'. + +--- +** In GTK builds, Emacs now supports startup notification. +This means that Emacs won't steal keyboard focus upon startup +(when started via the Desktop) if the user is typing into another +application. + ** Emacs can support 24-bit color TTY without terminfo database. If your text-mode terminal supports 24-bit true color, but your system lacks the terminfo database, you can instruct Emacs to support 24-bit true color by setting 'COLORTERM=truecolor' in the environment. This is useful on systems such as FreeBSD which ships only with "etc/termcap". +** Emacs now supports loading a Secure Computing filter. +This is supported only on capable GNU/Linux systems. To activate, +invoke Emacs with the '--seccomp=FILE' command-line option. FILE must +name a binary file containing an array of 'struct sock_filter' +structures. Emacs will then install that list of Secure Computing +filters into its own process early during the startup process. You +can use this functionality to put an Emacs process in a sandbox to +avoid security issues when executing untrusted code. See the manual +page for 'seccomp' system call, for details about Secure Computing +filters. + +** Setting 'fill-column' to nil is obsolete. +This undocumented use of 'fill-column' is now obsolete. To disable +auto filling, turn off 'auto-fill-mode' instead. + +For instance, you could add something like the following to your init +file: + + (add-hook 'foo-mode-hook (lambda () (auto-fill-mode -1)) + * Changes in Emacs 28.1 +** 'blink-cursor-mode' is now enabled by default regardless of the UI. +It used to be enabled when Emacs is started in GUI mode but not when started +in text mode. The cursor still only actually blinks in GUI frames. + +--- +** 'auto-composition-mode' can now be selectively disabled on some TTYs. +Some text-mode terminals produce display glitches trying to compose +characters. The 'auto-composition-mode' can now have a string value +that names a terminal type; if the value returned by the 'tty-type' +function compares equal with that string, automatic composition will +be disabled in windows shown on that terminal. The Linux terminal +sets this up by default. + ++++ +** Etags now supports the Mercury programming language. +See https://mercurylang.org. + ++++ +** Etags command line option '--declarations' now has Mercury-specific behavior. +All Mercury declarations are tagged by default. However, for +compatibility with 'etags' support for Prolog, predicates and +functions appearing first in clauses will also be tagged if 'etags' is +invoked with the '--declarations' command-line option. + ++++ +** New command 'font-lock-update', bound to 'C-x x f'. +This command updates the syntax highlighting in this buffer. + ++++ +** A new standard face 'font-lock-doc-markup-face'. +Intended for documentation mark-up syntax and tags inside text that +uses 'font-lock-doc-face', with which it should harmonise. It would +typically be used in structured documentation comments in program +source code by language-specific modes, for mark-up conventions like +Haddock, Javadoc or Doxygen. By default this face inherits from +'font-lock-constant-face'. + ** The new NonGNU ELPA archive is enabled by default alongside GNU ELPA. +++ @@ -115,6 +197,12 @@ behavior, which mixed these two, can be approximated by customizing nor t. +++ +** New user option 'read-minibuffer-restore-windows'. +When customized to nil, it uses 'minibuffer-restore-windows' in +'minibuffer-exit-hook' to remove only the window showing the +"*Completions*" buffer. + ++++ ** New system for displaying documentation for groups of functions. This can either be used by saying 'M-x shortdoc-display-group' and choosing a group, or clicking a button in the "*Help*" buffers when @@ -122,7 +210,7 @@ looking at the doc string of a function that belongs to one of these groups. --- -** Improved "find definition" feature of *Help* buffers. +** Improved "find definition" feature of "*Help*" buffers. Now clicking on the link to find the definition of functions generated by 'cl-defstruct', or variables generated by 'define-derived-mode', for example, will go to the exact place where they are defined. @@ -154,7 +242,7 @@ commands. ** Support for '(box . SIZE)' 'cursor-type'. By default, 'box' cursor always has a filled box shape. But if you specify 'cursor-type' to be '(box . SIZE)', the cursor becomes a hollow -box if the point is on an image larger than 'SIZE' pixels in any +box if the point is on an image larger than SIZE pixels in any dimension. +++ @@ -185,6 +273,12 @@ This works in text buffers and over images. Typing a numeric prefix arg The value is saved in the user option 'mouse-wheel-scroll-amount-horizontal'. --- +** New choice 'permanent' for 'shift-select-mode'. +When the mark was activated by shifted motion keys, +non-shifted motion keys don't deactivate the mark +after customizing 'shift-select-mode' to 'permanent'. + +--- ** The default value of 'frame-title-format' and 'icon-title-format' has changed. These variables are used to display the title bar of visible frames and the title bar of an iconified frame. They now show the name of @@ -240,14 +334,90 @@ search buffer due to too many matches being highlighted. +++ ** A new keymap for buffer actions has been added. The 'C-x x' keymap now holds keystrokes for various buffer-oriented -commands. The new keystrokes are 'C-x x g' ('revert-buffer'), +commands. The new keystrokes are 'C-x x g' ('revert-buffer-quick'), 'C-x x r' ('rename-buffer'), 'C-x x u' ('rename-uniquely'), 'C-x x n' -('clone-buffer'), 'C-x x i' ('insert-buffer') and 'C-x x t' -('toggle-truncate-lines'). +('clone-buffer'), 'C-x x i' ('insert-buffer'), 'C-x x t' +('toggle-truncate-lines') and 'C-x x f' ('font-lock-update'). + +--- +** Commands 'set-frame-width' and 'set-frame-height' can now get their +input using the minibuffer. + +--- +** New help window when Emacs prompts before opening a large file. +Commands like 'find-file' or 'visit-tags-table' ask to visit a file +normally or literally when the file is larger than a certain size (by +default, 9.5 MiB). Press '?' or 'C-h' in that prompt to read more +about the different options to visit a file, how you can disable the +prompt, and how you can tweak the file size threshold. + ++++ +** New user option 'query-about-changed-file'. +If non-nil (the default), users are prompted as before when +re-visiting a file that has changed externally after it was visited +the first time. If nil, the user is not prompted, but instead the +buffer is opened with its contents before the change, and the user is +given instructions how to revert the buffer. + ++++ +** Improved support for terminal emulators that encode the Meta flag. +Some terminal emulators set the 8th bit of Meta characters, and then +encode the resulting character code as if it were non-ASCII character +above codepoint 127. Previously, the only way of using these in Emacs +was to set up the terminal emulator to use the 'ESC' characters to send +Meta characters to Emacs, e.g., send "ESC x" when the user types +'M-x'. You can now avoid the need for this setup of such terminal +emulators by using the new input-meta-mode with the special value +'encoded' with these terminal emulators. + ++++ +** New frame parameter 'drag-with-tab-line'. +This parameter, similar to 'drag-with-header-line', allows moving frames +by dragging the tab lines of their topmost windows with the mouse. * Editing Changes in Emacs 28.1 +** New value 'save-some-buffers-root' of 'save-some-buffers-default-predicate'. +It allows to ask about saving only files under the project root +or in subdirectories of the directory that was default during +command invocation. + +--- +** Dragging a file to Emacs will now also push the name of the file +onto 'file-name-history'. + ++++ +** A prefix arg now causes 'delete-other-frames' to only iconify frames. + +** Menus + ++++ +*** New minor mode 'context-menu-mode' for context menus popped by 'mouse-3'. +When this mode is enabled, clicking 'down-mouse-3' anywhere in the buffer +pops up a menu whose contents depends on surrounding context near the +mouse click. You can change the order of the default sub-menus in the +context menu by customizing the user option 'context-menu-functions'. + ++++ +*** The "Edit => Clear" menu item now obeys a rectangular region. + ++++ +** New command 'execute-extended-command-for-buffer'. +This new command, bound to 'M-S-x', works like +'execute-extended-command', but limits the set of commands to the +commands that have been determined to be particularly useful with the +current mode. + ++++ +** New user option 'read-extended-command-predicate'. +This user option controls how 'M-x' performs completion of commands when +you type 'TAB'. By default, any command that matches what you have +typed is considered a completion candidate, but you can customize this +option to exclude commands that are not applicable to the current +buffer's major and minor modes, and respect the command's completion +predicate (if any). + --- ** 'eval-expression' now no longer signals an error on incomplete expressions. Previously, typing 'M-: ( RET' would result in Emacs saying "End of @@ -262,12 +432,14 @@ forms, but this command has now been changed to work more like 'eval-defun', and reset the values as specified. +++ -** Standalone 'M-y' uses the minibuffer to complete previous kills. -When 'M-y' is typed not after a yank command, it activates the minibuffer -where you can browse previous kills using the minibuffer history or -completion. In Isearch, you can bind 'C-s M-y' to the command -'isearch-yank-pop' that uses the minibuffer with completion on -previous kills to read a string and append it to the search string. +** Standalone 'M-y' allows interactive selection from previous kills. +'M-y' can now be typed after a command that is not a yank command. +When invoked like that, it prompts in the minibuffer for one of the +previous kills, offering completion and minibuffer-history navigation +through previous kills recorded in the kill ring. A similar feature +in Isearch can be invoked if you bind 'C-s M-y' to the command +'isearch-yank-pop'. When the user option 'yank-from-kill-ring-rotate' +is nil the kill ring is not rotated after 'yank-from-kill-ring'. --- ** New user options 'copy-region-blink-delay' and 'delete-pair-blink-delay'. @@ -286,10 +458,12 @@ Additionally, the function now accepts a HIST argument which can be used to specify a custom history variable. +++ -** Input history for 'goto-line' is now local to every buffer. -Each buffer will keep a separate history of line numbers used with -'goto-line'. This should help making faster the process of finding -line numbers that were previously jumped to. +** Input history for 'goto-line' can now be made local to every buffer. +In any event, line numbers used with 'goto-line' are kept in their own +history list. This should help make faster the process of finding +line numbers that were previously jumped to. By default, all buffers +share a single history list. To make every buffer have its own +history list, customize the user option 'goto-line-history-local'. +++ ** New command 'goto-line-relative' to use in a narrowed buffer. @@ -315,9 +489,10 @@ setting the variable 'auto-save-visited-mode' buffer-locally to nil. description of the properties. Likewise 'button-describe' does the same for a button. -** Obsolete commands are no longer hidden from command completion. +** Obsolete aliases are no longer hidden from command completion. Completion of command names now considers obsolete aliases as -candidates. Invoking a command via an obsolete alias now mentions the +candidates, if they were marked obsolete in the current major version +of Emacs. Invoking a command via an obsolete alias now mentions the obsolescence fact and shows the new name of the command. +++ @@ -333,29 +508,99 @@ trying to be non-destructive. This command opens a new buffer called "*Memory Report*" and gives a summary of where Emacs is using memory currently. ++++ +** New user option 'isearch-repeat-on-direction-change'. +When this option is set, direction changes in Isearch move to another +search match, if there is one, instead of moving point to the other +end of the current match. + ** Outline +++ *** New commands to cycle heading visibility. -Typing 'TAB' on a heading cycles the current section between "hide -all", "subheadings", and "show all" state. Typing 'S-TAB' anywhere in -the buffer cycles the whole buffer between "only top-level headings", -"all headings and subheadings", and "show all" states. +Typing 'TAB' on a heading line cycles the current section between +"hide all", "subheadings", and "show all" states. Typing 'S-TAB' +anywhere in the buffer cycles the whole buffer between "only top-level +headings", "all headings and subheadings", and "show all" states. + ++++ +*** New user option 'outline-minor-mode-cycle'. +This user option customizes 'outline-minor-mode', with the difference +that 'TAB' and 'S-TAB' on heading lines cycle heading visibility. +Typing 'TAB' on a heading line cycles the current section between +"hide all", "subheadings", and "show all" states. Typing 'S-TAB' on a +heading line cycles the whole buffer between "only top-level +headings", "all headings and subheadings", and "show all" states. + +--- +*** New user option 'outline-minor-mode-highlight'. +This user option customizes 'outline-minor-mode'. It puts +highlighting on heading lines using standard outline faces. This +works well only when there are no conflicts with faces used by the +major mode. + ++++ +** New commands 'copy-matching-lines' and 'kill-matching-lines'. +These commands are similar to the command 'flush-lines', +but add the matching lines to the kill ring as a single string, +including the newlines that separate the lines. * Changes in Specialized Modes and Packages in Emacs 28.1 -** 'blink-cursor-mode' is now enabled by default regardless of the UI. -It used to be enabled when Emacs is started in GUI mode but not when started -in text mode. The cursor still only actually blinks in GUI frames. +** Completion List Mode +New key bindings have been added: 'n' and 'p' to navigate completions, +and 'M-g M-c' to switch to the minibuffer, and you can also switch back +to the completion list buffer with 'M-g M-c'. + +** Benchmark +*** New function 'benchmark-call' to measure the execution time of a function. +Additionally, the number of repetitions can be expressed as a minimal duration +in seconds. + +** Macroexp +--- +*** New function 'macroexp-file-name' to know the name of the current file. +--- +*** New function 'macroexp-compiling-p' to know if we're compiling. +--- +*** New function 'macroexp-warn-and-return' to help emit warnings. +This used to be named 'macroexp--warn-and-return' and has proved useful +and well-behaved enough to lose the "internal" marker. + +** Bindat + ++++ +*** New 'Bindat type expression' description language. +This new system is provided by the new macro 'bindat-type' and +obsoletes the old data layout specifications. It supports +arbitrary-size integers, recursive types, and more. See the Info node +"(elisp) Byte Packing" in the ELisp manual for more details. ** pcase +++ +*** The 'or' pattern now binds the union of the vars of its sub-patterns. +If a variable is not bound by the subpattern that matched, it gets bound +to nil. This was already sometimes the case, but it is now guaranteed. + ++++ *** The 'pred' pattern can now take the form '(pred (not FUN))'. This is like '(pred (lambda (x) (not (FUN x))))' but results in better code. +--- +*** New function 'pcase-compile-patterns' to write other macros. + +*** Added 'cl-type' pattern. +The new 'cl-type' pattern compares types using 'cl-typep', which allows +comparing simple types like '(cl-type integer)', as well as forms like +'(cl-type (integer 0 10))'. + +*** New macro 'pcase-setq' +This macro is the 'setq' equivalent of 'pcase-let', which allows for +destructuring patterns in a 'setq' form. + +++ ** profiler.el The results displayed by 'profiler-report' now have the usage figures @@ -376,6 +621,21 @@ When emacsclient connects, Emacs will (by default) output a message about how to exit the client frame. If 'server-client-instructions' is set to nil, this message is inhibited. ++++ +*** New command 'server-edit-abort'. +This command (not bound to any key by default) can be used to abort +an edit instead of marking it as "Done" (which the 'C-x #' command +does). The 'emacsclient' program exits with an abnormal status as +result of this command. + ++++ +*** New desktop integration for connecting to the server. +If your operating system’s desktop environment is +freedesktop.org-compatible (which is true of most GNU/Linux and other +recent Unix-like GUIs), you may use the new "Emacs (Client)" desktop +menu entry to open files in an existing Emacs instance rather than +starting a new one. The daemon starts if not already running. + ** Perl mode --- @@ -384,8 +644,15 @@ This is used to fontify non-scalar variables. ** Python mode +--- +*** New user option 'python-forward-sexp-function'. +This allows the user to easier customize whether to use block-based +navigation or not. + +--- *** 'python-shell-interpreter' now defaults to python3 on systems with python3. +--- *** 'C-c C-r' can now be used on arbitrary regions. The command previously extended the start of the region to the start of the line, but will now actually send the marked region, as @@ -393,10 +660,40 @@ documented. ** Ruby mode +--- *** 'ruby-use-smie' is declared obsolete. SMIE is now always enabled and 'ruby-use-smie' only controls whether indentation is done using SMIE or with the old ad-hoc code. +** Icomplete + +--- +*** New user option 'icomplete-matches-format'. +This allows controlling the current/total number of matches for the +prompt prefix. + ++++ +*** New minor modes 'icomplete-vertical-mode' and 'fido-vertical-mode' +These modes modify Icomplete ('M-x icomplete-mode') and Fido ('M-x +fido-mode'), to display completions candidates vertically instead of +horizontally. In Icomplete, completions are rotated and selection +kept at the top. In Fido, completions scroll like a typical dropdown +widget. Both these new minor modes will first turn on their +non-vertical counterparts first, if they are not on already. + +--- +*** Default value of 'icomplete-compute-delay' has been changed to 0.15 s. + +--- +*** Default value of 'icomplete-max-delay-chars' has been changed to 2. + +--- +*** Reduced blinking while completing the next completions set. +Icomplete doesn't hide the hint with the previously computed +completions anymore when compute delay is in effect, or the previous +computation has been aborted by input. Instead it shows the previous +completions until the new ones are ready. + --- ** Specific warnings can now be disabled from the warning buffer. When a warning is displayed to the user, the resulting buffer now has @@ -410,9 +707,29 @@ disabled entirely. --- *** Autoload the main entry point 'mspool-show'. +** Windmove + ++++ +*** New user options to customize windmove keybindings. +These options include 'windmove-default-keybindings', +'windmove-display-default-keybindings', +'windmove-delete-default-keybindings', +'windmove-swap-states-default-keybindings'. + ** Windows +++ +*** New user option 'delete-window-choose-selected'. +This allows to choose a frame's selected window after deleting the +previously selected one. + ++++ +*** New argument NO-OTHER for some window functions. +'get-lru-window', ‘get-mru-window’ and 'get-largest-window' now accept a +new optional argument NO-OTHER which, if non-nil, avoids returning a +window whose 'no-other-window' parameter is non-nil. + ++++ *** New 'display-buffer' function 'display-buffer-use-least-recent-window'. This is like 'display-buffer-use-some-window', but won't reuse the current window, and when called repeatedly will try not to reuse a @@ -431,6 +748,7 @@ of the next command to be displayed in a new window. ** Frames ++++ *** The key prefix 'C-x 5 5' displays next command buffer in a new frame. It's bound to the command 'other-frame-prefix' that requests the buffer of the next command to be displayed in a new frame. @@ -455,9 +773,44 @@ It can be used to enable/disable the tab bar individually on each frame independently from the value of 'tab-bar-mode' and 'tab-bar-show'. --- +*** New user option 'tab-bar-format' defines a list of tab bar items. +When it contains 'tab-bar-format-global' (possibly appended after +'tab-bar-format-align-right'), then after enabling 'display-time-mode' +(or any other mode that uses 'global-mode-string') it displays time +aligned to the right on the tab bar instead of the mode line. +When 'tab-bar-format-tabs' is replaced with 'tab-bar-format-tabs-groups', +then the tab bar displays tab groups. + +--- +*** 'Mod-9' bound to 'tab-last' now switches to the last tab. +It also supports a negative argument. + +--- +*** New command 'tab-duplicate' bound to 'C-x t n'. + +--- +*** 'C-x t N' creates a new tab at the specified absolute position. +It also supports a negative argument. + +--- +*** 'C-x t M' moves the current tab to the specified absolute position. +It also supports a negative argument. + +--- +*** 'C-x t G' assigns a group name to the tab. +'tab-close-group' can close all tabs that belong to the selected group. +The user option 'tab-bar-new-tab-group' defines the default group of a +new tab. After customizing 'tab-bar-tab-post-change-group-functions' +to 'tab-bar-move-tab-to-group', changing the tab group will also move it +closer to other tabs in the same group. + +--- *** New user option 'tab-bar-tab-name-format-function'. --- +*** New user option 'tab-line-tab-name-format-function'. + +--- *** The tabs in the tab line can now be scrolled using horizontal scroll. If your mouse or trackpad supports it, you can now scroll tabs when the mouse pointer is in the tab line by scrolling left or right. @@ -482,6 +835,22 @@ faces in other ways. *** The new command 'recenter-current-error', bound to 'l' in Occur or compilation buffers, recenters the current displayed occurrence/error. +*** Matches in target buffers are now highlighted as in 'compilation-mode'. +The method of highlighting is specified by the user options +'next-error-highlight' and 'next-error-highlight-no-select'. + +--- +*** A fringe arrow in the "*Occur*" buffer indicates the selected match. + +--- +*** Occur mode may use a different type for 'occur-target' property values. +The value was previously always a marker set to the start of the first +match on the line but can now also be a list of '(BEGIN . END)' pairs +of markers delimiting each match on the line. +This is a fully compatible change to the internal occur-mode +implementation, and code creating their own occur-mode buffers will +work as before. + ** EIEIO +++ @@ -489,6 +858,11 @@ compilation buffers, recenters the current displayed occurrence/error. It is now defined as a generalized variable that can be used with 'setf' to modify the value stored in a given class slot. +--- +*** 'form' in '(eql form)' specializers in 'cl-defmethod' is now evaluated. +This corresponds to the behavior of defmethod in Common Lisp Object System. +For compatibility, '(eql SYMBOL)' does not evaluate SYMBOL, for now. + ** New minor mode 'cl-font-lock-built-in-mode' for 'lisp-mode'. The mode provides refined highlighting of built-in functions, types, and variables. @@ -529,6 +903,11 @@ time zones will use a form like "+0100" instead of "CET". ** Dired ++++ +*** New user option 'dired-kill-when-opening-new-dired-buffer'. +If non-nil, Dired will kill the current buffer when selecting a new +directory to display. + --- *** Behavior change on 'dired-clean-confirm-killing-deleted-buffers'. Previously, if 'dired-clean-up-buffers-too' was non-nil, and @@ -542,6 +921,18 @@ line, and allows truncating them (to preserve space on the mode line) or showing them literally, either instead of, or in addition to, displaying "by name" or "by date" sort order. ++++ +*** New user option 'dired-compress-directory-default-suffix'. +This user option controls default suffix for compressing a directory. +If it's nil, ".tar.gz" will be used. Refer to +'dired-compress-files-alist' for a list of supported suffixes. + ++++ +*** New user option 'dired-compress-file-default-suffix'. +This user option controls the default suffix for compressing files. +If it's nil, ".gz" will be used. Refer to 'dired-compress-file-alist' +for a list of supported suffixes. + --- *** Broken and circular links are shown with the 'dired-broken-symlink' face. @@ -565,6 +956,11 @@ If set to non-nil, Dired will dereference symbolic links when copying. This can be switched off on a per-usage basis by providing 'dired-do-copy' with a 'C-u' prefix. +*** New user option 'dired-do-revert-buffer'. +Non-nil reverts the destination Dired buffer after performing one +of these operations: 'dired-do-copy', 'dired-do-rename', +'dired-do-symlink', 'dired-do-hardlink'. + *** New user option 'dired-mark-region' affects all Dired commands that mark files. When non-nil and the region is active in Transient Mark mode, then Dired commands operate only on files in the active @@ -602,10 +998,11 @@ This is used when expanding commit messages from 'vc-print-root-log' and similar commands. --- -*** New faces for 'vc-dir' buffers and their Git VC backend. +*** New faces for 'vc-dir' buffers. Those are: 'vc-dir-header', 'vc-dir-header-value', 'vc-dir-directory', 'vc-dir-file', 'vc-dir-mark-indicator', 'vc-dir-status-warning', -'vc-dir-status-edited', 'vc-dir-status-up-to-date', 'vc-dir-ignored'. +'vc-dir-status-edited', 'vc-dir-status-up-to-date', +'vc-dir-status-ignored'. --- *** The responsible VC backend is now the most specific one. @@ -635,9 +1032,36 @@ If non-nil, only branches and remotes are considered when doing completion over Git branch names. The default is nil, which causes tags to be considered as well. +--- +*** New user option 'vc-git-log-switches'. +String or list of strings specifying switches for Git log under VC. + ** Gnus +++ +*** New user option 'gnus-topic-display-predicate'. +This can be used to inhibit the display of some topics completely. + ++++ +*** nnimap now supports the oauth2.el library. + ++++ +*** New Summary buffer sort options for extra headers. +The extra header sort option ('C-c C-s C-x') prompts for a header +and fails if no sort function has been defined. Sorting by +Newsgroups ('C-c C-s C-u') has been pre-defined. + ++++ +*** The '#' command in the Group and Summary buffer now toggles, +instead of sets, the process mark. + ++++ +*** New user option 'gnus-process-mark-toggle'. +If non-nil (the default), the '#' command in the Group and Summary +buffers will toggle, instead of set, the process mark. + + ++++ *** New user option 'gnus-registry-register-all'. If non-nil (the default), create registry entries for all messages. If nil, don't automatically create entries, they must be created @@ -785,10 +1209,13 @@ instances. Emacs can be defined as a handler for the "x-scheme-handler/mailto" MIME type with the following command: "emacs -f message-mailto %u". An "emacs-mail.desktop" file has been included, suitable for -installing in desktop directories like "/usr/share/applications". +installing in desktop directories like "/usr/share/applications" or +"~/.local/share/applications". Clicking on a 'mailto:' link in other applications will then open Emacs with headers filled out according to the link, e.g. -"mailto:larsi@gnus.org?subject=This+is+a+test". +"mailto:larsi@gnus.org?subject=This+is+a+test". If you prefer +emacsclient, use "emacsclient -e '(message-mailto "%u")'" +or "emacsclient-mail.desktop". --- *** Change to default value of 'message-draft-headers' user option. @@ -807,10 +1234,34 @@ take the actual screenshot, and defaults to "ImageMagick import". ** Smtpmail +++ +*** smtpmail now supports using the oauth2.el library. + ++++ +*** New user option 'smtpmail-store-queue-variables'. +If non-nil, SMTP variables will be stored together with the queued +messages, and will then be used when sending with +'M-x smtpmail-send-queued-mail'. + ++++ *** Allow direct selection of smtp authentication mechanism. A server entry retrieved by auth-source can request a desired smtp authentication mechanism by setting a value for the key 'smtp-auth'. +** Search and Replace + +*** New key 'M-s M-.' starts isearch with the thing found at point. +This key is bound to the new command 'isearch-forward-thing-at-point'. +The new user option 'isearch-forward-thing-at-point' defines +a list of symbols to try to get the "thing" at point. By default, +the first element of the list is 'region' that tries to yank +the currently active region to the search string. + +*** New user option 'isearch-wrap-pause' defines how to wrap the search. +There are choices to disable wrapping completely and to wrap immediately. +When wrapping immediately, it consistently handles the numeric arguments +of 'C-s' ('isearch-repeat-forward') and 'C-r' ('isearch-repeat-backward'), +continuing with the remaining count after wrapping. + ** Grep +++ @@ -826,17 +1277,76 @@ grep-like tools. On systems where the grep command supports it, directories will be skipped. +*** Commands that use 'grep-find' now follow symlinks for command-line args. +This is because the default value of 'grep-find-template' now includes +the 'find' option '-H'. Commands that use that variable, including +indirectly via a call to 'xref-matches-in-directory', might be +affected. In particular, there should be no need anymore to ensure +any directory names on the 'find' command lines end in a slash. +This change is for better compatibility with old versions of non-GNU +'find', such as the one used on macOS. + +--- +*** New utility function 'grep-file-at-point'. +This returns the name of the file at point (if any) in 'grep-mode' +buffers. + ** Help ++++ +*** New convenience commands with short keys in the Help buffer. +New command 'help-view-source' ('s') will view the source file (if +any) of the current help topic. New command 'help-goto-info' ('i') +will look up the current symbol (if any) in Info. New command +'help-customize' ('c') will customize the variable or the face +(if any) whose doc string is being shown in the Help buffer. + +--- +*** The 'help-for-help' ('C-h C-h') screen has been redesigned. + +--- +*** Keybindings in 'help-mode' use the new 'help-key-binding' face. +This face is added by 'substitute-command-keys' to any "\[command]" +substitution. The return value of that function should consequently +be assumed to be a propertized string. + +Note that the new face will also be used in tooltips. When using the +GTK toolkit, this is only true if 'x-gtk-use-system-tooltips' is t. + --- *** 'g' ('revert-buffer') in 'help-mode' no longer requires confirmation. +++ +*** New command 'describe-command' shows help for a command. +This can be used instead of 'describe-function' for interactive +commands and is globally bound to 'C-h x'. + ++++ *** New command 'describe-keymap' describes keybindings in a keymap. --- +*** New user option 'describe-bindings-outline'. +It enables outlines in the output buffer of 'describe-bindings' that +can provide a better overview in a long list of available bindings. + +--- *** New keybinding 'C-h R' prompts for a manual to display and displays it. +--- +*** Closing the "*Help*" buffer from the toolbar now buries the buffer. +In previous Emacs versions, the "*Help*" buffer was killed instead when +clicking the "X" icon in the tool bar. + +** Info + +--- +*** New user option 'Info-warn-on-index-alternatives-wrap'. +This option affects what happens when using the ',' command after +looking up an entry with 'i' in info buffers. If non-nil (the +default), the ',' command will now warn you when proceeding beyond the +final entry, and tapping ',' once more will then take you to the +first entry. + +++ ** New command 'lossage-size'. It allows users to set the maximum number of keystrokes and commands @@ -872,6 +1382,13 @@ so e.g. like 'C-x 8 [' inserts a left single quotation mark, 'C-x \ [' does the same. --- +*** New user option 'read-char-by-name-sort'. +It defines the sorting order of characters for completion of 'C-x 8 RET TAB' +and can be customized to sort them by codepoints instead of character names. +Additionally, you can group characters by Unicode blocks after customizing +'completions-group' and 'completions-group-sort'. + +--- *** Improved language transliteration in Malayalam input methods. Added a new Mozhi scheme. The inapplicable ITRANS scheme is now deprecated. Errors in the Inscript method were corrected. @@ -880,6 +1397,14 @@ deprecated. Errors in the Inscript method were corrected. *** New input method 'cham'. There's also a Cham greeting in "etc/HELLO". +--- +*** New input methods for Lakota language orthographies. +Two orthographies are represented here, the Suggested Lakota +Orthography and what is known as the White Hat Orthography. Input +methods 'lakota-slo-prefix', 'lakota-slo-postfix', and +'lakota-white-hat-postfix' have been added. There is also a Lakota +greeting in "etc/HELLO". + ** Ispell +++ @@ -893,16 +1418,6 @@ defaulting to active region when used interactively. ** The old non-SMIE indentation of 'sh-mode' has been removed. --- -** The 'list-bookmark' menu is now based on 'tabulated-list-mode'. -The interactive bookmark list will now benefit from features in -'tabulated-list-mode' like sorting columns or changing column width. - -Support for the optional "inline" header line, allowing for a header -without using 'header-line-format', has been dropped. Consequently, -the variables 'bookmark-bmenu-use-header-line' and -'bookmark-bmenu-inline-header-height' are now declared obsolete. - ---- ** The sb-image.el library is now marked obsolete. This file was a compatibility kludge which is no longer needed. @@ -913,31 +1428,87 @@ To revert to the previous behavior, ** Customize +--- +*** Customize buffers can now be reverted with 'C-x x g'. + *** Most customize commands now hide obsolete user options. Obsolete user options are no longer shown in the listings produced by the commands 'customize', 'customize-group', 'customize-apropos' and -'customize-changed-options'. +'customize-changed'. To customize obsolete user options, use 'customize-option' or 'customize-saved'. +*** New SVG icons for checkboxes and arrows. +They will be used automatically instead of the old icons. If Emacs is +built without SVG support, the old icons will be used instead. + +** Bookmarks + +*** Bookmarks can now be targets for new tabs. +When the bookmark.el library is loaded, a customize choice is added +to 'tab-bar-new-tab-choice' for new tabs to show the bookmark list. + +--- +*** The 'list-bookmarks' menu is now based on 'tabulated-list-mode'. +The interactive bookmark list will now benefit from features in +'tabulated-list-mode' like sorting columns or changing column width. + +Support for the optional "inline" header line, allowing for a header +without using 'header-line-format', has been dropped. Consequently, +the variables 'bookmark-bmenu-use-header-line' and +'bookmark-bmenu-inline-header-height' are now declared obsolete. + +--- +*** New user option 'bookmark-fontify'. +If non-nil, setting a bookmark will colorize the current line with +'bookmark-face'. + +--- +*** New user option 'bookmark-menu-confirm-deletion'. +In Bookmark Menu mode, Emacs by default does not prompt for +confirmation when you type 'x' to execute the deletion of bookmarks +that have been marked for deletion. However, if this new option is +non-nil then Emacs will require confirmation with 'yes-or-no-p' before +deleting. + ** Edebug +*** Obsoletions +--- +**** 'get-edebug-spec' is obsolete, replaced by 'edebug-get-spec'. ++++ +**** The spec operator ':name NAME' is obsolete, use '&name' instead. ++++ +**** The spec element 'function-form' is obsolete, use 'form' instead. + +++ -*** Edebug specification lists can use the new keyword '&error', which -unconditionally aborts the current edebug instrumentation with the -supplied error message. +*** New function 'def-edebug-elem-spec' to define Edebug spec elements. +These used to be defined with 'def-edebug-spec' thus conflating the +two name spaces, which lead to name collisions. +The use of 'def-edebug-spec' to define Edebug spec elements is +declared obsolete. -*** Edebug specification lists can use the new keyword ':unique', -which appends a unique suffix to the Edebug name of the current -definition. +*** Edebug specification lists can use some new keywords: + ++++ +**** '&interpose SPEC FUN ARGS..' lets FUN control parsing after SPEC. +More specifically, FUN is called with 'HEAD PF ARGS..' where +PF is a parsing function that expects a single argument (the specs to +use) and HEAD is the code that matched SPEC. + ++++ +**** '&error MSG' unconditionally aborts the current edebug instrumentation. + ++++ +**** '&name SPEC FUN' extracts the current name from the code matching SPEC. ** ElDoc +++ *** New user option 'eldoc-echo-area-display-truncation-message'. If non-nil (the default), eldoc will display a message saying -something like "(Documentation truncated. Use `M-x eldoc-doc-buffer' +something like "(Documentation truncated. Use `M-x eldoc-doc-buffer' to see rest)" when a message has been truncated. If nil, truncated messages will be marked with just "..." at the end. @@ -960,7 +1531,7 @@ separate buffer, or a tooltip. *** New user option 'eldoc-documentation-strategy'. The built-in choices available for this user option let users compose the results of 'eldoc-documentation-functions' in various ways, even -if some of those functions are sychronous and some asynchchronous. +if some of those functions are synchronous and some asynchronous. The user option replaces 'eldoc-documentation-function', which is now obsolete. @@ -977,6 +1548,16 @@ it when producing a doc string. This is bound to 'C-x n d' in 'shell-mode' buffers, and narrows to the command line under point (and any following output). +--- +*** New user option 'shell-has-auto-cd'. +If non-nil, 'shell-mode' handles implicit "cd" commands, changing the +directory if the command is a directory. Useful for shells like "zsh" +that has this feature. + ++++ +*** 'comint-delete-output' can now save deleted text in the kill-ring. +Interactively, 'C-u C-c C-o' triggers this new optional behavior. + ** Eshell --- @@ -984,7 +1565,8 @@ command line under point (and any following output). --- *** Environment variable 'INSIDE_EMACS' is now copied to subprocesses. -Its value equals the result of evaluating '(format "%s,eshell" emacs-version)'. +Its value contains the result of evaluating '(format "%s,eshell" +emacs-version)'. Other package names, like "tramp", could also be included. --- *** Eshell no longer re-initializes its keymap every call. @@ -1006,6 +1588,15 @@ preferred over the eudcb-mab.el backend. like cell phones, tablets or cameras. +++ +*** New connection method "sshfs", which allows accessing remote files +via a file system mounted with 'sshfs'. + ++++ +*** Tramp supports SSH authentication via a hardware security key now. +This requires at least OpenSSH 8.2, and a FIDO U2F compatible +security key, like yubikey, solokey, or nitrokey. + ++++ *** Trashed remote files are moved to the local trash directory. All remote files, which are trashed, are moved to the local trash directory. Except remote encrypted files, which are always deleted. @@ -1032,6 +1623,17 @@ When non-nil, this user option instructs Tramp to mirror the debug buffer to a file under the "/tmp/" directory. This is useful, if (in rare cases) Tramp blocks Emacs, and we need further debug information. ++++ +*** Tramp supports lock files now. +In order to deactivate this, set user option +'remote-file-name-inhibit-locks' to t. + ++++ +*** Writing sensitive auto-save, backup or lock files to the local +temporary directory must be confirmed. In order to suppress this +confirmation, set user option 'tramp-allow-unsafe-temporary-files' to +t. + ** Tempo --- @@ -1045,8 +1647,34 @@ effect. A pattern like '(map :sym)' binds the map's value for ':sym' to 'sym', equivalent to '(map (:sym sym))'. +--- +*** The function 'map-copy' now uses 'copy-alist' on alists. +This is a slightly deeper copy than the previous 'copy-sequence'. + +--- +*** The function 'map-contains-key' now supports plists. + +--- +*** More consistent duplicate key handling in 'map-merge-with'. +Until now, 'map-merge-with' promised to call its function argument +whenever multiple maps contained 'eql' keys. However, this did not +always coincide with the keys that were actually merged, which could +be 'equal' instead. The function argument is now called whenever keys +are merged, for greater consistency with 'map-merge' and 'map-elt'. + ** Package +--- +*** '/ s' ('package-menu-filter-by-status') changes parameter handling. +The command was documented to take a comma-separated list of statuses +to filter by, but instead it used the parameter as a regexp. The +command has been changed so that it now works as documented, and +checks statuses not as a regexp, but instead an exact match from the +comma-separated list. + ++++ +*** New command 'package-browse-url' and keystroke 'w'. + +++ *** New commands to filter the package list. The filter commands are bound to the following keys: @@ -1064,6 +1692,14 @@ key binding / u package-menu-filter-upgradable / / package-menu-filter-clear +*** Option to automatically native-compile packages upon installation. +Customize the user option 'package-native-compile' to enable automatic +native compilation of packages when they are installed. That option +is nil by default; if set non-nil, and if your Emacs was built with +native-compilation support, each package will be natively compiled +when it is installed, by invoking an asynchronous Emacs subprocess to +run the native-compilation of the package files. + --- *** Column widths in 'list-packages' display can now be customized. See the new user options 'package-name-column-width', @@ -1072,20 +1708,24 @@ See the new user options 'package-name-column-width', ** gdb-mi +*** New user option 'gdb-registers-enable-filter'. +If non-nil, apply a register filter based on +'gdb-registers-filter-pattern-list'. + +++ *** gdb-mi can now store and restore window configurations. Use 'gdb-save-window-configuration' to save window configuration to a file and 'gdb-load-window-configuration' to load from a file. These -commands can also be accessed through the menu bar under 'Gud -- -GDB-Windows'. 'gdb-default-window-configuration-file', when non-nil, +commands can also be accessed through the menu bar under "Gud => +GDB-Windows". 'gdb-default-window-configuration-file', when non-nil, is loaded when GDB starts up. +++ *** gdb-mi can now restore window configuration after quit. Set 'gdb-restore-window-configuration-after-quit' to non-nil and Emacs will remember the window configuration before GDB started and restore -it after GDB quits. A toggle button is also provided under 'Gud -- -GDB-Windows'. +it after GDB quits. A toggle button is also provided under "Gud => +GDB-Windows". +++ *** gdb-mi now has a better logic for displaying source buffers. @@ -1106,6 +1746,14 @@ Defaults to 'libravatar', with 'unicornify' and 'gravatar' as options. ** Compilation mode +--- +*** New function 'ansi-color-compilation-filter'. +This function is meant to be used in 'compilation-filter-hook'. + +--- +*** New user option 'ansi-color-for-compilation-mode'. +This controls what 'ansi-color-compilation-filter' does. + *** Regexp matching of messages is now case-sensitive by default. The variable 'compilation-error-case-fold-search' can be set for case-insensitive matching of messages when the old behavior is @@ -1113,6 +1761,14 @@ required, but the recommended solution is to use a correctly matching regexp instead. --- +*** New user option 'compilation-search-all-directories'. +When doing parallel builds, directories and compilation errors may +arrive in the "*compilation*" buffer out-of-order. If this variable is +non-nil (the default), Emacs will now search backwards in the buffer +for any directory the file with errors may be in. If nil, this won't +be done (and this restores how this previously worked). + +--- *** Messages from ShellCheck are now recognized. --- @@ -1177,6 +1833,40 @@ t, which preserves the original behavior. If set non-nil, showing an unseen message will set the Rmail buffer's modified flag. +--- +*** New faces for heading elements. +Those are 'shr-h1', 'shr-h2', 'shr-h3', 'shr-h4', 'shr-h5', 'shr-h6'. + +** MH-E mail handler for Emacs + +Functions and variables related to handling junk mail have been +renamed to not associate color with sender quality. + ++++ +*** New names for mh-junk interactive functions. +Function 'mh-junk-whitelist' is renamed 'mh-junk-allowlist'. +Function 'mh-junk-blacklist' is renamed 'mh-junk-blocklist'. + ++++ +*** New binding for 'mh-junk-allowlist'. +The key binding for 'mh-junk-allowlist' is changed from 'J w' to 'J a'. +The old binding is supported but warns that it is obsolete. + ++++ +*** New names for some hooks. +'mh-whitelist-msg-hook' is renamed 'mh-allowlist-msg-hook'. +'mh-blacklist-msg-hook' is renamed 'mh-blocklist-msg-hook'. + ++++ +*** New names for some variables. +Variable 'mh-whitelist-preserves-sequences-flag' is renamed +'mh-allowlist-preserves-sequences-flag'. + ++++ +*** New names for some faces. +Face 'mh-folder-blacklisted' is renamed 'mh-folder-blocklisted'. +Face 'mh-folder-whitelisted' is renamed 'mh-folder-allowlisted'. + ** Apropos *** New commands 'apropos-next-symbol' and 'apropos-previous-symbol'. @@ -1186,6 +1876,9 @@ These new navigation commands are bound to 'n' and 'p' in *** New command 'apropos-function'. This works like 'C-u M-x apropos-command' but is more discoverable. +*** New face 'apropos-button'. +Applies to buttons that indicate a face. + ** CC Mode *** Added support for Doxygen documentation style. @@ -1243,6 +1936,11 @@ symbol property to the browsing commands. With a new command 'browse-url-with-browser-kind', an URL can explicitly be browsed with either an internal or external browser. +--- +*** Support for browsing of remote files. +If a remote file is taken, a local temporary copy of that file is +passed to the browser. + *** Support for the conkeror browser is now obsolete. *** Support for the Mosaic browser has been removed. @@ -1294,9 +1992,9 @@ decaying average of delays, and if this number gets too high, the animation is stopped. +++ -*** The 'n' and 'p' commands (next/previous image) now respects dired order. +*** The 'n' and 'p' commands (next/previous image) now respect Dired order. These commands would previously display the next/previous image in -alphabetical order, but will now find the "parent" dired buffer and +lexicographic order, but will now find the "parent" Dired buffer and select the next/previous image file according to how the files are sorted there. The commands have also been extended to work when the "parent" buffer is an archive mode (i.e., zip file or the like) or tar @@ -1326,6 +2024,38 @@ To load images with the default frame colors use the ':foreground' and This change only affects image types that support foreground and background colors or transparency, such as xbm, pbm, svg, png and gif. ++++ +*** Image smoothing can now be explicitly enabled or disabled. +Smoothing applies a bilinear filter while scaling or rotating an image +to prevent aliasing and other unwanted effects. The new image +property ':transform-smoothing' can be set to t to force smoothing +and nil to disable smoothing. + +The default behavior of smoothing on down-scaling and not smoothing +on up-scaling remains unchanged. + ++++ +*** New user option 'image-transform-smoothing'. +This controls whether to use smoothing or not for an image. Values +include nil (no smoothing), t (do smoothing) or a predicate function +that's called with the image object and should return nil/t. + ++++ +*** SVG images now support user stylesheets. +The ':css' image attribute can be used to override the default CSS +stylesheet for an image. The default sets 'font-family' and +'font-size' to match the current face, so an image with 'height="1em"' +will match the font size in use where it is embedded. + +This feature relies on librsvg 2.48 or above being available. + ++++ +*** Image properties support 'em' sizes. +Size image properties, for example ':height', ':max-height', etc., can +be given a cons of the form '(SIZE . em)', where SIZE is an integer or +float which is multiplied by the font size to calculate the image +size, and 'em' is a symbol. + ** EWW +++ @@ -1390,6 +2120,18 @@ project's root directory, respectively. +++ *** New user option 'project-list-file'. ++++ +*** New command 'project-remove-known-project'. +This command lets you interactively remove an entry from the list of projects +in 'project-list-file'. + +*** 'project-find-file' now accepts non-existent file names. +This is to allow easy creation of files inside some nested +sub-directory. + +*** 'project-find-file' doesn't use the string at point as default input. +Now it's only suggested as part of the "future history". + ** xref --- @@ -1416,7 +2158,7 @@ have been renamed to have "proper" public names and documented 'xref-show-definitions-buffer-at-bottom'). *** New command 'xref-quit-and-pop-marker-stack' and a binding for it -in "*xref*" buffers ('M-,'). This combination is easy to press +in "*xref*" buffers ('M-,'). This combination is easy to press semi-accidentally if the user wants to go back in the middle of choosing the exact definition to go to, and this should do TRT. @@ -1425,6 +2167,13 @@ choosing the exact definition to go to, and this should do TRT. If chosen, file names in "*xref*" buffers will be displayed relative to the 'project-root' of the current project, when available. ++++ +*** The 'TAB' key binding in "*xref*" buffers is obsolete. +Use 'C-u RET' instead. The 'TAB' binding in "*xref*" buffers is still +supported, but we plan on removing it in a future version; at that +time, the command 'xref-quit-and-goto-xref' will no longer have a key +binding in 'xref--xref-buffer-mode-map'. + ** json.el --- @@ -1434,6 +2183,37 @@ component are now rejected by 'json-read' and friends. This makes them more compliant with the JSON specification and consistent with the native JSON parsing functions. +--- +*** Some JSON encoding functions are now obsolete. +The functions 'json-encode-number', 'json-encode-hash-table', +'json-encode-key', and 'json-encode-list' are now obsolete. + +The first two are kept as aliases of 'json-encode', which should be +used instead. Uses of 'json-encode-list' should be changed to call +one of 'json-encode', 'json-encode-alist', 'json-encode-plist', or +'json-encode-array' instead. + +** json.c + ++++ +*** New function 'json-available-p'. +This predicate returns non-nil if Emacs is built with libjansson +support, and it is available on the current system. + ++++ +*** Native JSON functions now signal an error if libjansson is unavailable. +This affects 'json-serialize', 'json-insert', 'json-parse-string', +and 'json-parse-buffer'. This can happen if Emacs was compiled with +libjansson, but the DLL cannot be found and/or loaded by Emacs at run +time. Previously, Emacs would display a message and return nil in +these cases. + +*** The JSON functions 'json-serialize', 'json-insert', +'json-parse-string', and 'json-parse-buffer' now implement some of the +semantics of RFC 8259 instead of the earlier RFC 4627. In particular, +these functions now accept top-level JSON values that are neither +arrays nor objects. + ** xml.el *** XML serialization functions now reject invalid characters. @@ -1476,6 +2256,16 @@ type for highlighting the entire message but not the sender's nick. The 'erc-status-sidebar' package which provides a HexChat-like activity overview sidebar for joined IRC channels is now part of ERC. ++++ +*** erc-tls now supports specifying a TLS client certificate. +The 'erc-tls' function has been updated to allow specifying a TLS +client certificate for authentication, as an alternative to NickServ +password-based authentication. This is referred to as "CertFP" (short +for Certificate Fingerprint) by several IRC networks. See the Info +node "(erc) Connecting" in the ERC manual for more details and +examples on how to specify and use TLS client certificates with +'erc-tls'. + ** Battery --- @@ -1585,6 +2375,11 @@ a list. ** Diff --- +*** New face 'diff-changed-unspecified'. +This is used to highlight "changed" lines (those marked with '!') in +context diffs, when 'diff-use-changed-face' is non-nil. + +--- *** New 'diff-mode' font locking face 'diff-error'. This face is used for error messages from 'diff'. @@ -1620,9 +2415,152 @@ that makes it a valid button. *** New variable 'thing-at-point-provider-alist'. This allows mode-specific alterations to how 'thing-at-point' works. +** Enriched mode + +--- +*** 'C-a' is by default no longer bound to 'beginning-of-line-text'. +This is so 'C-a' works as in other modes, and in particular holding +Shift while typing 'C-a', i.e. 'C-S-a', will now highlight the text. + +** ERT + ++++ +*** ERT can now output more verbose test failure reports. +If the 'EMACS_TEST_VERBOSE' environment variable is set, failure +summaries will include the failing condition. + +** File Locks + ++++ +*** New user option 'lock-file-name-transforms'. +This option allows controlling where lock files are written. It uses +the same syntax as 'auto-save-file-name-transforms'. + ++++ +*** New user option 'remote-file-name-inhibit-locks'. +When non-nil, this option suppresses lock files for remote files. + ++++ +*** New minor mode 'lock-file-mode'. +This command, called interactively, toggles the local value of +'create-lockfiles' in the current buffer. + +** image-dired + +--- +*** 'image-dired-mouse-toggle-mark' now toggles files in the active region. + ++++ +*** New user option 'image-dired-thumb-visible-marks'. +If non-nil (the default), use 'image-dired-thumb-mark' to say what +images are marked. + +--- +*** New command 'image-dired-delete-marked'. + ** Miscellaneous +++ +*** New function 'replace-regexp-in-region'. + ++++ +*** New function 'replace-string-in-region'. + +--- +*** New function 'mail-header-parse-addresses-lax'. +This takes a comma-separated string and returns a list of mail/name +pairs. + +--- +*** New function 'mail-header-parse-address-lax'. +Parse a string as a mail address-like string. + +--- +*** 'shell-script-mode' now supports 'outline-minor-mode'. +The outline headings have lines that start with "###". + ++++ +*** New command 'revert-buffer-quick'. +This is bound to 'C-x x g' and is like `revert-buffer', but prompts +less. + ++++ +*** New user option 'revert-buffer-quick-short-answers'. This +controls how the new 'revert-buffer-quick' (`C-x x g') command +prompts. + +--- +*** fileloop will now skip missing files instead of signalling an error. + ++++ +*** ".dir-locals.el" now supports setting 'auto-mode-alist'. +The new 'auto-mode-alist' specification in ".dir-locals.el" files can +now be used to override the global 'auto-mode-alist' in the current +directory tree. + +--- +*** New utility function 'make-separator-line'. + +--- +*** New face 'separator-line'. +This is used by 'make-separator-line'. + ++++ +*** New user option 'ignored-local-variable-values'. +This is the opposite of 'safe-local-variable-values' -- it's an alist +of variable-value pairs that are to be ignored when reading a +local-variables section of a file. + +--- +*** 'indent-tabs-mode' is now a global minor mode instead of just a variable. + +--- +*** New user option 'save-place-abbreviate-file-names'. + +--- +*** 'tabulated-list-mode' can now restore original display order. +Many commands (like 'C-x C-b') are derived from 'tabulated-list-mode', +and that mode allows the user to sort on any column. There was +previously no easy way to get back to the original displayed order +after sorting, but giving a -1 numerical prefix to the sorting command +will now restore the original order. + +--- +*** 'M-left' and 'M-right' now move between columns in 'tabulated-list-mode'. + ++++ +*** New utility function 'insert-into-buffer'. +This is like 'insert-buffer-substring', but works in the opposite +direction. + ++++ +*** New user option 'kill-transform-function'. +This can be used to transform (and suppress) strings from entering the +kill ring. + +--- +*** 'C-u M-x dig' will now prompt for a query type to use. + ++++ +*** rcirc now supports SASL authentication. + ++++ +*** 'save-interprogram-paste-before-kill' can now be a number. +In that case, it's interpreted as a limit on the size of the clipboard +data that will be saved to the 'kill-ring' prior to killing text: if +the size of the clipboard data is greater than or equal to the limit, +it will not be saved. + +--- +*** New variable 'hl-line-overlay-priority'. +This can be used to change the priority of the hl-line overlays. + ++++ +*** New command 'mailcap-view-file'. +This command will open a viewer based on the file type, as determined +by "~/.mailcap" and related files and variables. + ++++ *** New command 'C-x C-k Q' to force redisplay in keyboard macros. --- @@ -1648,6 +2586,10 @@ If this is bound to something non-nil, functions like This is a plain 2D button, but uses the background color instead of the foreground color. +--- +*** New face 'shortdoc-heading'. +Applies to headings of shortdoc sections. + +++ *** New predicate functions 'length<', 'length>' and 'length='. Using these functions may be more efficient than using 'length' (if @@ -1718,14 +2660,6 @@ doesn't turn on 'display-fill-column-indicator-mode' in special-mode buffers. This can be controlled by customizing the variable 'global-display-fill-column-indicator-modes'. ---- -*** New user option 'compilation-search-all-directories'. -When doing parallel builds, directories and compilation errors may -arrive in the "*compilation*" buffer out-of-order. If this variable is -non-nil (the default), Emacs will now search backwards in the buffer -for any directory the file with errors may be in. If nil, this won't -be done (and this restores how this previously worked). - +++ *** New user option 'next-error-message-highlight'. In addition to a fringe arrow, 'next-error' error may now optionally @@ -1733,6 +2667,12 @@ highlight the current error message in the 'next-error' buffer. This user option can be also customized to keep highlighting on all visited errors, so you can have an overview what errors were already visited. +--- +*** New choice 'next-error-quit-window' for 'next-error-found-function'. +When 'next-error-found-function' is customized to 'next-error-quit-window', +then typing the numeric prefix argument 0 before the command 'next-error' +will quit the source window after visiting the next occurrence. + +++ *** New user option 'tab-first-completion'. If 'tab-always-indent' is 'complete', this new user option can be used to @@ -1774,20 +2714,6 @@ point leaves the text. If nil, the text is not hidden again. Instead 'M-x reveal-hide-revealed' can be used to hide all the revealed text. +++ -*** New user options to control the look of line/column numbers in the mode line. -'mode-line-position-line-format' is the line number format (when -'line-number-mode' is on), 'mode-line-position-column-format' is -the column number format (when 'column-number-mode' is on), and -'mode-line-position-column-line-format' is the combined format (when -both modes are on). - -+++ -*** New user option 'mode-line-compact'. -If non-nil, repeating spaces are compressed into a single space. If -'long', this is only done when the mode line is longer than the -current window width (in characters). - -+++ *** New command 'submit-emacs-patch'. This works like 'report-emacs-bug', but is more geared towards sending patches to the Emacs issue tracker. @@ -1822,16 +2748,15 @@ leak information from the reporting user. The semantics are as with 'walk-windows'. --- -*** Killing virtual ido buffers interactively will make them go away. -Previously, killing a virtual ido buffer with 'ido-kill-buffer' didn't -do anything. This has now been changed, and killing virtual buffers -with that command will remove the buffer from recentf. - ---- *** New variable 'ffap-file-name-with-spaces'. If non-nil, 'find-file-at-point' and friends will try to guess more expansively to identify a file name with spaces. ++++ +*** New 'thing-at-point' target: 'existing-filename'. +This is like 'filename', but is a full path, and is nil if the file +doesn't exist. + --- *** Two new commands for centering in 'doc-view-mode'. The new commands 'doc-view-center-page-horizontally' (bound to 'c h') @@ -1852,10 +2777,6 @@ The width now depends of the width of the window, but will never be wider than the length of the longest buffer name, except that it will never be narrower than 19 characters. -*** Bookmarks can now be targets for new tabs. -When the bookmark.el library is loaded, a customize choice is added -to 'tab-bar-new-tab-choice' for new tabs to show the bookmark list. - --- *** Movement commands in 'gomoku-mode' are fixed. 'gomoku-move-sw' and 'gomoku-move-ne' now work correctly, and @@ -1905,6 +2826,17 @@ height of lines or width of chars. When non-nil, use a new xwidget webkit session after bookmark jump. Otherwise, it will use 'xwidget-webkit-last-session'. +** ido + +--- +*** Switching on 'ido-mode' now also overrides 'ffap-file-finder'. + +--- +*** Killing virtual ido buffers interactively will make them go away. +Previously, killing a virtual ido buffer with 'ido-kill-buffer' didn't +do anything. This has now been changed, and killing virtual buffers +with that command will remove the buffer from recentf. + ** Flymake mode +++ @@ -1955,6 +2887,10 @@ The following user options have been renamed: The old names are now obsolete. +--- +*** 'world-clock-mode' can no longer be turned on interactively. +Use 'world-clock' to turn on that mode. + ** D-Bus +++ @@ -1978,7 +2914,7 @@ messages, contain the error name of that message now. +++ *** D-Bus events have changed their internal structure. They carry now the destination and the error-name of an event. They -also keep the type information of their arguments. Use the +also keep the type information of their arguments. Use the 'dbus-event-*' accessor functions. ** CPerl Mode @@ -1986,6 +2922,15 @@ also keep the type information of their arguments. Use the --- *** New face 'perl-heredoc', used for heredoc elements. ++++ +** A function can now be thrown to the 'exit' label in addition to t or nil. +The command loop will call it with zero arguments before returning. + ++++ +** New error symbol 'minibuffer-quit'. +Signaling it has almost the same effect as 'quit' except that it +doesn't cause keyboard macro termination. + --- *** The command 'cperl-set-style' offers the new value "PBP". This value customizes Emacs to use the style recommended in Damian @@ -2002,6 +2947,67 @@ could have saved enough typing by using an abbrev, a hint will be displayed in the echo area, mentioning the abbrev that could have been used instead. +** Octave Mode + ++++ +*** Line continuations in double-quoted strings now use a backslash. +Typing 'C-M-j' (bound to 'octave-indent-new-comment-line') now follows +the behavior introduced in Octave 3.8 of using a backslash as a line +continuation marker within double-quoted strings, and an ellipsis +everywhere else. + +** Repeat + ++++ +*** New transient mode 'repeat-mode' to allow shorter key sequences. +You can type 'C-x u u' instead of 'C-x u C-x u' to undo many changes, +'C-x o o' instead of 'C-x o C-x o' to switch several windows, +'C-x { { } } ^ ^ v v' to resize the selected window interactively, +'M-g n n p p' to navigate next-error matches. Any other key exits +transient mode and then is executed normally. 'repeat-exit-key' +defines an additional key to exit mode like 'isearch-exit' ('RET'). +The user option 'repeat-exit-timeout' specifies the number of +seconds of idle time to break the repetition chain automatically. +With 'repeat-keep-prefix' you can keep the prefix arg of the previous +command. For example, this can help to reverse the window navigation +direction with e.g. 'C-x o M-- o o'. Also it can help to set a new +step with e.g. 'C-x { C-5 { { {', which will set the window resizing +step to 5 columns. + ++++ +** EasyPG +GPG key servers can now be queried for keys with the +'M-x epa-search-keys' command. Keys can then be added to your +personal key ring. + +** So Long + +--- +*** New 'so-long-predicate' function 'so-long-statistics-excessive-p' +efficiently detects the presence of a long line anywhere in the buffer +using 'buffer-line-statistics' (see above). This is now the default +predicate (replacing 'so-long-detected-long-line-p'). + +--- +*** 'so-long-threshold' and 'so-long-max-lines' have been raised to +10000 bytes and 500 lines respectively, to reduce the likelihood of +false-positives when 'global-so-long-mode' is enabled. The latter +value is now only used by the old predicate, as the new predicate +knows the longest line in the entire buffer. + +--- +*** 'so-long-target-modes' now includes 'fundamental-mode' by default, +meaning that 'global-so-long-mode' will also process files which were +not recognised. (This only has an effect if 'set-auto-mode' chooses +'fundamental-mode'; buffers which are simply in 'fundamental-mode' by +default are unaffected.) + +--- +*** New user options 'so-long-mode-preserved-minor-modes' and +'so-long-mode-preserved-variables' allow specified mode and variable +states to be maintained if 'so-long-mode' replaces the original major +mode. By default, these new options support 'view-mode'. + * New Modes and Packages in Emacs 28.1 @@ -2029,12 +3035,50 @@ This is a mode for searching a RFC 2229 dictionary server. the mouse in 'dictionary-tooltip-dictionary' (which must be customized first). +** transient.el + +This library implements support for powerful keyboard-driven menus. +Such menus can be used as simple visual command dispatchers. More +complex menus take advantage of infix arguments, which are somewhat +similar to prefix arguments, but are more flexible and discoverable. + * Incompatible Editing Changes in Emacs 28.1 +** 'electric-indent-mode' now also indents inside strings and comments, +(unless the indentation function doesn't, of course). +To recover the previous behavior you can use: + + (add-hook 'electric-indent-functions + (lambda (_) (if (nth 8 (syntax-ppss)) 'no-indent))) + +** The 'M-o' ('facemenu-keymap') global binding has been removed. +To restore the old binding, say something like: + + (require 'facemenu) + (define-key global-map "\M-o" 'facemenu-keymap) + (define-key facemenu-keymap "\es" 'center-line) + (define-key facemenu-keymap "\eS" 'center-paragraph) + +The last two lines are not strictly necessary if you don't care about +having those two commands on the 'M-o' keymap; see the next section. + +** The 'M-o M-s' and 'M-o M-S' global bindings have been removed. +Use 'M-x center-line' and 'M-x center-paragraph' instead. See the +previous section for how to get back the old bindings. Alternatively, +if you only want these two commands to have global bindings they had +before, you can add the following to your init file: + + (define-key global-map "\M-o\M-s" 'center-line) + (define-key global-map "\M-o\M-S" 'center-paragraph) + +** The 'M-o M-o' global binding has been removed. +Use 'M-x font-lock-fontify-block' instead, or the new 'C-x x f' +command, which updates the syntax highlighting in the current buffer. + ** In 'f90-mode', the backslash character ('\') no longer escapes. For about a decade, the backslash character has no longer had a -special escape syntax in Fortran F90. To get the old behaviour back, +special escape syntax in Fortran F90. To get the old behavior back, say something like: (modify-syntax-entry ?\\ "\\" f90-mode-syntax-table) @@ -2046,9 +3090,71 @@ since the latter uses 'M-s' as a prefix key of the search prefix map. ** 'vc-print-branch-log' shows the change log for BRANCH from its root directory instead of the default directory. +--- +** 'project-shell' and 'shell' now use 'pop-to-buffer-same-window'. +This is to keep the same behavior as Eshell. + * Incompatible Lisp Changes in Emacs 28.1 ++++ +** 'overlays-in' now handles zero-length overlays slightly differently. +Previosly, zero-length overlays at the end of the buffer were included +in the result (if the region queried for stopped at that position). +The same was not the case if the buffer had been narrowed to exclude +the real end of the buffer. This has now been changed, and +zero-length overlays at `point-max' are always included in the results. + +--- +** 'replace-match' now runs modification hooks slightly later. +The function is documented to leave point after the replacement text, +but this was not always the case if a modification hook inserted text +in front of the replaced text -- 'replace-match' would instead leave +point where the end of the inserted text would have been before the +hook ran. 'replace-match' now always leaves point after the +replacement text. + +--- +** 'kill-all-local-variables' has changed how it handles non-symbol hooks. +The function is documented to eliminate all buffer-local bindings +except variables with a 'permanent-local' property, or hooks that +have elements with a 'permanent-local-hook' property. In addition, it +would also keep lambda expressions in hooks sometimes. The latter has +now been changed: The function will now also remove these. + +--- +** Some floating-point numbers are now handled differently by the Lisp reader. +In previous versions of Emacs, numbers with a trailing dot and an exponent +were read as integers and the exponent ignored: 2.e6 was interpreted as the +integer 2. Such numerals are now read as floats with the exponent included: +2.e6 is now read as the floating-point value 2000000.0. +That is, '(read-from-string "1.e3")' => '(1000.0 . 4)' now. + ++++ +** The 'lexical-binding' local variable is always enabled. +Previously, if 'enable-local-variables' was nil, a 'lexical-binding' +local variable would not be heeded. This has now changed, and a file +with a 'lexical-binding' cookie is always heeded. To revert to the +old behavior, set 'permanently-enabled-local-variables' to nil. + ++++ +** 'completing-read-default' sets completion variables buffer-locally. +'minibuffer-completion-table' and related variables are now set buffer-locally +in the minibuffer instead of being set via a global let-binding. + ++++ +** The use of positional arguments in 'define-minor-mode' is obsolete. +These were actually rendered obsolete in Emacs 21 but were never +marked as such. + +** 'facemenu-color-alist' is now obsolete, and is not used. + +** 'facemenu.el' is no longer preloaded. +To use functions/variables from the package, you now have to say +'(require 'facemenu)' or similar. + +** 'pcomplete-ignore-case' is now an obsolete alias of 'completion-ignore-case'. + ** 'completions-annotations' face is not used when the caller puts own face. This affects the suffix specified by completion 'annotation-function'. @@ -2056,6 +3162,10 @@ This affects the suffix specified by completion 'annotation-function'. The mark will be set to point to the end of the new buffer. +++ +** An active minibuffer now has major mode 'minibuffer-mode', not the +erroneous 'minibuffer-inactive-mode' it formerly had. + ++++ ** Some properties from completion tables are now preserved. If 'minibuffer-allow-text-properties' is non-nil, doing completion over a table of strings with properties will no longer remove all the @@ -2115,7 +3225,10 @@ This is no longer supported, and setting this variable has no effect. Use macro 'with-current-buffer-window' with action alist entry 'body-function'. --- -** The metamail.el library is now marked obsolete. +** The inversion.el library is now obsolete. + +--- +** The metamail.el library is now obsolete. --- ** Some obsolete variable and function aliases in dbus.el have been removed. @@ -2145,24 +3258,27 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el. 'dirtrack-debug-toggle', 'dynamic-completion-table', 'easy-menu-precalculate-equivalent-keybindings', 'epa-display-verify-result', 'epg-passphrase-callback-function', -'eshell-report-bug', 'eval-next-after-load', 'exchange-dot-and-mark', -'ffap-bug', 'ffap-submit-bug', 'ffap-version', -'file-cache-choose-completion', 'forward-point', 'generic-char-p', -'global-highlight-changes', 'hi-lock-face-history', -'hi-lock-regexp-history', 'highlight-changes-active-string', -'highlight-changes-initial-state', 'highlight-changes-passive-string', -'image-mode-maybe', 'imenu-example--name-and-position', -'ispell-aspell-supports-utf8', 'lisp-mode-auto-fill', -'locate-file-completion', 'make-coding-system', -'minibuffer-local-must-match-filename-map', 'mouse-choose-completion', -'mouse-major-mode-menu', 'mouse-popup-menubar', -'mouse-popup-menubar-stuff', 'newsticker-groups-filename', -'non-iso-charset-alist', 'nonascii-insert-offset', -'nonascii-translation-table', 'password-read-and-add', -'pre-abbrev-expand-hook', 'princ-list', 'print-help-return-message', -'process-filter-multibyte-p', 'read-file-name-predicate', -'remember-buffer', 'rmail-highlight-face', 'rmail-message-filter', -'semantic-after-idle-scheduler-reparse-hooks', +'erc-announced-server-name', 'erc-default-coding-system', +'erc-process', 'erc-send-command', 'eshell-report-bug', +'eval-next-after-load', 'exchange-dot-and-mark', 'ffap-bug', +'ffap-submit-bug', 'ffap-version', 'file-cache-mouse-choose-completion', +'forward-point', 'generic-char-p', 'global-highlight-changes', +'hi-lock-face-history', 'hi-lock-regexp-history', +'highlight-changes-active-string', 'highlight-changes-initial-state', +'highlight-changes-passive-string', +'icalendar--datetime-to-noneuropean-date', 'image-mode-maybe', +'imenu-example--name-and-position', 'ispell-aspell-supports-utf8', +'lisp-mode-auto-fill', 'locate-file-completion', 'make-coding-system', +'menu-bar-files-menu', 'minibuffer-local-must-match-filename-map', +'mouse-choose-completion', 'mouse-major-mode-menu', +'mouse-popup-menubar', 'mouse-popup-menubar-stuff', +'newsticker-groups-filename', 'nnir-swish-e-index-file', +'nnmail-fix-eudora-headers', 'non-iso-charset-alist', +'nonascii-insert-offset', 'nonascii-translation-table', +'password-read-and-add', 'pre-abbrev-expand-hook', 'princ-list', +'print-help-return-message', 'process-filter-multibyte-p', +'read-file-name-predicate', 'remember-buffer', 'rmail-highlight-face', +'rmail-message-filter', 'semantic-after-idle-scheduler-reparse-hooks', 'semantic-after-toplevel-bovinate-hook', 'semantic-before-idle-scheduler-reparse-hooks', 'semantic-before-toplevel-bovination-hook', @@ -2189,7 +3305,8 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el. 'semantic-token-type-parent', 'semantic-toplevel-bovine-cache', 'semantic-toplevel-bovine-table', 'semanticdb-mode-hooks', 'set-coding-priority', 'set-process-filter-multibyte', -'shadows-compare-text-p', 'shell-dirtrack-toggle', 't-mouse-mode', +'shadows-compare-text-p', 'shell-dirtrack-toggle', +'speedbar-navigating-speed', 'speedbar-update-speed', 't-mouse-mode', 'term-dynamic-simple-complete', 'tooltip-hook', 'tpu-have-ispell', 'url-generate-unique-filename', 'url-temporary-directory', 'vc-arch-command', 'vc-default-working-revision' (variable), @@ -2197,6 +3314,12 @@ ledit.el, lmenu.el, lucid.el and old-whitespace.el. 'vcursor-toggle-vcursor-map', 'w32-focus-frame', 'w32-select-font', 'wisent-lex-make-token-table'. +--- +** Some functions and variables obsolete since Emacs 22 have been removed: +'gnus-article-hide-pgp-hook', 'gnus-inews-mark-gcc-as-read', +'gnus-treat-display-xface', 'gnus-treat-strip-pgp', +'nnmail-spool-file'. + ** The WHEN argument of 'make-obsolete' and related functions is mandatory. The use of those functions without a WHEN argument was marked obsolete back in Emacs 23.1. The affected functions are: 'make-obsolete', @@ -2205,9 +3328,118 @@ back in Emacs 23.1. The affected functions are: 'make-obsolete', ** The variable 'keyboard-type' is obsolete and not dynamically scoped any more. +** The 'values' variable is now obsolete. + ++++ +** The '&define' keyword in an Edebug specification now disables backtracking. +The implementation was buggy, and multiple '&define' forms in an '&or' +form should be exceedingly rare. See the Info node "(elisp) Backtracking" in +the Emacs Lisp reference manual for background. + +--- +** 'sql-*-statement-starters' are no longer user options. +These variables describe facts about the SQL standard and +product-specific additions. There should be no need for users to +customize them. + +--- +** Function 'lm-maintainer' is replaced with 'lm-maintainers'. +The former is now declared obsolete. + * Lisp Changes in Emacs 28.1 ++++ +*** New function 'file-name-concat'. +This appends file name components to a directory name and returns the +result. + ++++ +*** New function 'split-string-shell-command'. +This splits a shell command string into separate components, +respecting quoting with single ('like this') and double ("like this") +quotes, as well as backslash quoting (like\ this). + +--- +*** ':safe' settings in 'defcustom' are now propagated to the loaddefs files. + ++++ +** New function 'syntax-class-to-char'. +This does almost the opposite of 'string-to-syntax' -- it returns the +syntax descriptor (a character) given a raw syntax descriptor (an +integer). + ++++ +** New function 'buffer-local-boundp'. +This predicate says whether a symbol is bound in a specific buffer. + +--- +** Emacs now attempts to test for high-rate subprocess output more fairly. +When several subprocesses produce output simultaneously at high rate, +Emacs will now by default attempt to service them all in a round-robin +fashion. Set the new variable 'process-prioritize-lower-fds' to a +non-nil value to get back the old behavior, whereby after reading +from a subprocess, Emacs would check for output of other subprocesses +in a way that is likely to read from the same process again. + ++++ +** New function 'sxhash-equal-including-properties'. +This is identical to 'sxhash-equal' but accounting also for string +properties. + ++++ +** 'unlock-buffer' displays warnings instead of signaling. +Instead of signaling 'file-error' conditions for file system level +errors, the function now calls 'display-warning' and continues as if +the error did not occur. + ++++ +** New function 'always'. +This is identical to 'ignore', but returns t instead. + ++++ +** New forms to declare how completion should happen has been added. +'(declare (completion PREDICATE))' can be used as a general predicate +to say whether the command should be present when completing with +'M-x TAB'. '(declare (modes MODE...))' can be used as a short-hand +way of saying that the command should be present when completing from +buffers in major modes derived from MODE..., or, if it's a minor mode, +whether that minor mode is enabled in the current buffer. + ++++ +** The 'interactive' syntax has been extended to allow listing applicable modes. +Forms like '(interactive "p" dired-mode)' can be used to annotate the +commands as being applicable for modes derived from 'dired-mode', +or if the mode is a minor mode, that the current buffer has that +minor mode activated. Note that using this form will create byte code +that is not compatible with byte code in previous Emacs versions. + ++++ +** New buffer-local variable 'local-minor-modes'. +This permanently buffer-local variable holds a list of currently +enabled non-global minor modes in the current buffer (as a list of +symbols). + ++++ +** New variable 'global-minor-modes'. +This variable holds a list of currently enabled global minor modes (as +a list of symbols). + ++++ +** 'define-minor-mode' now takes an ':interactive' argument. +This can be used for specifying which modes this minor mode is meant +for, or to make the new minor mode non-interactive. The default value +is t. + ++++ +** 'define-derived-mode' now takes an ':interactive' argument. +This can be used to control whether the defined mode is a command +or not, and is useful when defining commands that aren't meant to be +used by users directly. + +--- +** The 'easymenu' library is now preloaded. + --- ** New variable 'indent-line-ignored-functions'. This allows modes to cycle through a set of indentation functions @@ -2227,6 +3459,10 @@ each element is a list with three elements: a completion, a prefix string, and a suffix string. +++ +** New completion function 'group-function' for grouping candidates. +It takes two arguments: a completion candidate and a 'transform' flag. + ++++ ** 'read-char-from-minibuffer' and 'y-or-n-p' support 'help-form'. If you bind 'help-form' to a non-nil value while calling these functions, then pressing 'C-h' ('help-char') causes the function to evaluate 'help-form' @@ -2237,10 +3473,19 @@ and display the result. When non-nil, then functions 'read-char-choice' and 'y-or-n-p' (respectively) use the function 'read-key' to read a character instead of using the minibuffer. +--- +** New user option 'use-short-answers'. +When non-nil, the function 'y-or-n-p' is used instead of +'yes-or-no-p'. This eliminates the need to define an alias that maps +one to another in the init file. The same user option also controls +whether the function 'read-answer' accepts short answers. + +++ -** 'set-window-configuration' now takes an optional 'dont-set-frame' -parameter which, when non-nil, instructs the function not to select -the frame recorded in the configuration. +** 'set-window-configuration' now takes two optional parameters, +'dont-set-frame' and 'dont-set-miniwindow'. The first of these, when +non-nil, instructs the function not to select the frame recorded in +the configuration. The second prevents the current minibuffer being +replaced by the one stored in the configuration. +++ ** 'define-globalized-minor-mode' now takes a ':predicate' parameter. @@ -2254,6 +3499,11 @@ argument ELLIPSIS, will now indicate truncation using '…' when the selected frame can display it, and using "..." otherwise. +++ +** 'string-width' now accepts two optional arguments FROM and TO. +This allows calculating the width of a substring without consing a +new string. + ++++ ** New command 'make-directory-autoloads'. This does the same as the old command 'update-directory-autoloads', but has different semantics: Instead of passing in the output file via @@ -2281,6 +3531,11 @@ been added, and takes a callback to handle the return status. ** 'ascii' is now a coding system alias for 'us-ascii'. +++ +** New function 'file-name-with-extension'. +This function allows a canonical way to set/replace the extension of a +file name. + ++++ ** New function 'file-backup-file-names'. This function returns the list of file names of all the backup files of its file argument. @@ -2313,6 +3568,12 @@ This function can be used by modes to add elements to the 'choice' customization type of a variable. +++ +** New function 'require-theme'. +This function is like 'require', but searches 'custom-theme-load-path' +instead of 'load-path'. It can be used by Custom themes to load +supporting Lisp files when 'require' is unsuitable. + ++++ ** New function 'file-modes-number-to-symbolic' to convert a numeric file mode specification into symbolic form. @@ -2321,6 +3582,27 @@ file mode specification into symbolic form. ** The variable 'force-new-style-backquotes' has been removed. This removes the final remaining trace of old-style backquotes. +** Mode Lines + ++++ +*** New user options to control the line/column numbers in the mode line. +'mode-line-position-line-format' is the line number format (when +'line-number-mode' is on), 'mode-line-position-column-format' is +the column number format (when 'column-number-mode' is on), and +'mode-line-position-column-line-format' is the combined format (when +both modes are on). + ++++ +*** New user option 'mode-line-compact'. +If non-nil, repeating spaces are compressed into a single space. If +'long', this is only done when the mode line is longer than the +current window width (in characters). + ++++ +*** 'global-mode-string' constructs should end with a space. +This was previously not formalized, which led to combinations of modes +displaying data "smushed together" on the mode line. + ** Changes in handling dynamic modules *** The module header 'emacs-module.h' now contains type aliases @@ -2431,7 +3713,7 @@ menu handling. It is meant as an (experimental) aid for converting Emacs Lisp code to lexical binding, where dynamic (special) variables bound in one file can affect code in another. For details, see the manual section -"(Elisp) Converting to Lexical Binding". +"(elisp) Converting to Lexical Binding". +++ *** 'byte-recompile-directory' can now compile symlinked ".el" files. @@ -2502,6 +3784,29 @@ locales. They are also available as aliases 'ebcdic-cp-*' (e.g., 'cp278' for 'ibm278'). There are also new charsets 'ibm2xx' to support these coding-systems. +--- +** 'while-no-input-ignore-events' accepts more special events. +The special events 'dbus-event' and 'file-notify' are now ignored in +'while-no-input' when added to this variable. + ++++ +** 'condition-case' now allows for a success handler. +It is written as '(:success BODY...)' where BODY is executed +whenever the protected form terminates without error, with the +specified variable bound to the the value of the protected form. + ++++ +** 'The 'uniquify' argument in 'auto-save-file-name-transforms' can be a symbol. +If this symbol is one of the members of 'secure-hash-algorithms', +Emacs constructs the nondirectory part of the auto-save file name by +applying that 'secure-hash' to the buffer file name. This avoids any +risk of excessively long file names. + +--- +** New user option 'etags-xref-prefer-current-file'. +When non-nil, matches for identifiers in the file visited by the +current buffer will be shown first in the "*xref*" buffer. + * Changes in Emacs 28.1 on Non-Free Operating Systems diff --git a/etc/NEWS.19 b/etc/NEWS.19 index f2cef62971b..fd91c0842f7 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -4011,6 +4011,7 @@ The third component is now determined on the basis of the names of the existing executable files. This means that version.el is not altered by building Emacs. +** New macro 'easy-menu-define' * Changes in 19.22. diff --git a/etc/NEWS.27 b/etc/NEWS.27 index 9232a308c57..e47f408be98 100644 --- a/etc/NEWS.27 +++ b/etc/NEWS.27 @@ -15,18 +15,6 @@ in older Emacs versions. You can narrow news to a specific version by calling 'view-emacs-news' with a prefix argument or by typing 'C-u C-h C-n'. -Temporary note: -+++ indicates that all relevant manuals in doc/ have been updated. ---- means no change in the manuals is needed. -When you add a new item, use the appropriate mark if you are sure it -applies, and please also update docstrings as needed. - - -* Installation Changes in Emacs 27.2 - - -* Startup Changes in Emacs 27.2 - * Changes in Emacs 27.2 @@ -40,24 +28,35 @@ If set to a non-nil value which isn't a function, resize the mini frame using the new function 'fit-mini-frame-to-buffer' which won't skip leading or trailing empty lines of the buffer. - -* Editing Changes in Emacs 27.2 ++++ +** Update IRC-related references to point to Libera.Chat. +In June 2021, the Free Software Foundation and the GNU Project moved +their official IRC channels from the Freenode network to Libera.Chat +in the aftermath of the changes in Freenode's governance structure and +policies in May and June 2021. The decision-making process took into +account the feedback received from the community against a set of +criteria devised by a working group drawn from both GNU and the FSF +to gauge a chat network's acceptability to software freedom activists. - -* Changes in Specialized Modes and Packages in Emacs 27.2 +For the original announcement and the follow-up update, including more +details, see: -** Tramp +https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html +https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html -*** The user option 'tramp-completion-reread-directory-timeout' is now obsolete. +Given the relocation of GNU and FSF's official IRC channels, as well +as #emacs and various other Emacs-themed channels (see the link below) +to Libera.Chat, IRC-related references in the Emacs repository have +now been updated to point to Libera.Chat. - -* New Modes and Packages in Emacs 27.2 +https://lists.gnu.org/archive/html/info-gnu-emacs/2021-06/msg00000.html -* Incompatible Lisp Changes in Emacs 27.2 +* Changes in Specialized Modes and Packages in Emacs 27.2 - -* Lisp Changes in Emacs 27.2 +** Tramp + +*** The user option 'tramp-completion-reread-directory-timeout' is now obsolete. * Changes in Emacs 27.2 on Non-Free Operating Systems @@ -990,7 +989,6 @@ the entire list as before. An integer value limits the list length *** 'vc-git-stash' is now bound to 'C' in the stash headers. --- *** Some stash keybindings are now available in the stash button. 'vc-git-stash' and 'vc-git-stash-snapshot' can now be run using 'C' and 'S' respectively, including when there are no stashes. @@ -2726,7 +2724,7 @@ days there are in a month in a specific year), 'date-ordinal-to-time' (that computes the date of an ordinal day), 'decoded-time-add' (for doing computations on a decoded time structure), 'make-decoded-time' (for making a decoded time structure with only the given keywords -filled out), and 'encoded-time-set-defaults' (which fills in nil +filled out), and 'decoded-time-set-defaults' (which fills in nil elements as if it's midnight January 1st, 1970) have been added. *** In the DST slot, 'encode-time' and 'parse-time-string' now return -1 diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 2cae8b92ace..2b9cbf37c45 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -747,7 +747,7 @@ removed. For those who hate breaking changes, even though the changes are made to clean things up; fear not. ATTACH_DIR will still continue to work. It's just not documented any longer. When you get the chance, run the -code above to clean things up anyways! +code above to clean things up anyway! **** New hooks Two hooks are added to org-attach: @@ -500,6 +500,13 @@ access in cases which need more than Lisp. ** Fix portable dumping so that you can redump without using -batch +*** Redumps and native compiler "preloaded" sub-folder. +In order to depose new .eln files being compiled into the "preloaded" +sub-folder the native compiler needs to know in advance if this file +will be preloaded or not. As .eln files are not moved afterwards +subsequent redumps might refer to .eln file out of the "preloaded" +sub-folder. + ** Imenu could be extended into a file-structure browsing mechanism This could use code like that of customize-groups. @@ -1756,8 +1763,17 @@ apparently loses under Solaris, at least. [fx has mostly done this.] (Obsolete, since gmalloc.c is nowadays only used on MS-DOS.) ** Rewrite make-docfile to be clean and maintainable -It might be better to replace it with Lisp, using the byte compiler. +It might be better to replace with Lisp the part of make-docfile that +produces the etc/DOC file by scanning *.el files, for example by +reusing the code in the byte compiler or in autoload.el that already +scans *.el files. https://lists.gnu.org/r/emacs-devel/2012-06/msg00037.html +https://lists.gnu.org/r/emacs-devel/2021-05/msg00235.html + +** Eliminate the etc/DOC file altogether +As an alternative to the previous item, we could try and eliminate the +DOC file altogether. See +https://lists.gnu.org/r/emacs-devel/2021-05/msg00237.html ** Add an inferior-comint-minor-mode The purpose is to have a mode to capture the common set of operations diff --git a/etc/compilation.txt b/etc/compilation.txt index e56d3b68476..01d4df1b09d 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -692,3 +692,11 @@ COPYING PERMISSIONS: You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. + + +;;; Local Variables: +;;; outline-regexp: "\\*\\_>" +;;; outline-minor-mode-cycle: t +;;; outline-minor-mode-highlight: t +;;; eval: (outline-minor-mode 1) +;;; End: diff --git a/etc/emacs-mail.desktop b/etc/emacs-mail.desktop index 3a96b9ec8c7..34680335848 100644 --- a/etc/emacs-mail.desktop +++ b/etc/emacs-mail.desktop @@ -5,6 +5,6 @@ Exec=emacs -f message-mailto %u Icon=emacs Name=Emacs (Mail) MimeType=x-scheme-handler/mailto; -NoDisplay=false +NoDisplay=true Terminal=false Type=Application diff --git a/etc/emacs.desktop b/etc/emacs.desktop index 2e6496e58c9..0d7cac14da5 100644 --- a/etc/emacs.desktop +++ b/etc/emacs.desktop @@ -8,5 +8,5 @@ Icon=emacs Type=Application Terminal=false Categories=Development;TextEditor; +StartupNotify=true StartupWMClass=Emacs -Keywords=Text;Editor; diff --git a/etc/emacs.appdata.xml b/etc/emacs.metainfo.xml index ca6233a59ae..7467b88e736 100644 --- a/etc/emacs.appdata.xml +++ b/etc/emacs.metainfo.xml @@ -3,9 +3,9 @@ <component type="desktop-application"> <id>org.gnu.emacs</id> <metadata_license>GFDL-1.3+</metadata_license> - <project_license>GPL-3.0+ and GFDL-1.3+</project_license> <name>GNU Emacs</name> <summary>An extensible text editor</summary> + <icon type="remote" width="128" height="128">https://www.gnu.org/software/emacs/images/emacs.png</icon> <description> <p> GNU Emacs is an extensible, customizable text editor - and more. @@ -23,13 +23,26 @@ interface, calendar, and more</li> </ul> </description> + <categories> + <category>Development</category> + <category>TextEditor</category> + </categories> + <url type="homepage">https://www.gnu.org/software/emacs</url> + <url type="bugtracker">https://debbugs.gnu.org/</url> + <url type="faq">https://www.gnu.org/software/emacs/manual/html_mono/efaq.html</url> + <url type="help">https://www.gnu.org/software/emacs/documentation.html</url> + <url type="donation">https://my.fsf.org/donate/</url> + <url type="contact">https://lists.gnu.org/mailman/listinfo/emacs-devel/</url> + <launchable type="desktop-id">emacs.desktop</launchable> + <launchable type="service">emacs.service</launchable> + <project_group>GNU</project_group> + <project_license>GPL-3.0+ and GFDL-1.3+</project_license> + <developer_name>Free Software Foundation</developer_name> <screenshots> <screenshot type="default"> - <image type="source" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata-26.png</image> - </screenshot> + <image type="source" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata-26.png</image> + <caption>Editing a Lisp program whilst viewing the Emacs manual.</caption> + </screenshot> </screenshots> - <launchable type="desktop-id">emacs</launchable> - <url type="homepage">https://www.gnu.org/software/emacs</url> <update_contact>emacs-devel_AT_gnu.org</update_contact> - <project_group>GNU</project_group> </component> diff --git a/etc/emacsclient-mail.desktop b/etc/emacsclient-mail.desktop new file mode 100644 index 00000000000..b575a41758a --- /dev/null +++ b/etc/emacsclient-mail.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Categories=Network;Email; +Comment=GNU Emacs is an extensible, customizable text editor - and more +Exec=sh -c "exec emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" --eval \\\\(message-mailto\\\\ \\\\\\"%u\\\\\\"\\\\)" +Icon=emacs +Name=Emacs (Mail, Client) +MimeType=x-scheme-handler/mailto; +NoDisplay=true +Terminal=false +Type=Application +Keywords=emacsclient; +Actions=new-window;new-instance; + +[Desktop Action new-window] +Name=New Window +Exec=emacsclient --alternate-editor= --create-frame --eval "(message-mailto \\"%u\\")" + +[Desktop Action new-instance] +Name=New Instance +Exec=emacs -f message-mailto %u diff --git a/etc/emacsclient.desktop b/etc/emacsclient.desktop index 3feb83c7290..1ecdecffafd 100644 --- a/etc/emacsclient.desktop +++ b/etc/emacsclient.desktop @@ -3,10 +3,20 @@ Name=Emacs (Client) GenericName=Text Editor Comment=Edit text MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=emacsclient -c %F +Exec=sh -c "if [ -n \\"\\$*\\" ]; then exec emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" \\"\\$@\\"; else exec emacsclient --alternate-editor= --create-frame; fi" placeholder %F Icon=emacs Type=Application Terminal=false Categories=Development;TextEditor; -StartupWMClass=Emacsd -Keywords=Text;Editor; +StartupNotify=true +StartupWMClass=Emacs +Keywords=emacsclient; +Actions=new-window;new-instance; + +[Desktop Action new-window] +Name=New Window +Exec=emacsclient --alternate-editor= --create-frame %F + +[Desktop Action new-instance] +Name=New Instance +Exec=emacs %F diff --git a/etc/grep.txt b/etc/grep.txt index b5b78459b5c..0370ae4e2c2 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -102,6 +102,7 @@ grep -nH -e "xyzxyz" ../info/* ../info/emacs-2 1205 inserts `xyzxyzxyzxyz' in the current buffer. +* Miscellaneous Copyright (C) 2005-2021 Free Software Foundation, Inc. @@ -124,4 +125,7 @@ COPYING PERMISSIONS: ;;; Local Variables: ;;; eval: (let ((inhibit-read-only t) (compilation-filter-start (point-min))) (save-excursion (goto-char (point-max)) (grep-filter) (set-buffer-modified-p nil))) ;;; buffer-read-only: t +;;; outline-minor-mode-cycle: t +;;; outline-minor-mode-highlight: t +;;; eval: (outline-minor-mode 1) ;;; End: diff --git a/etc/images/README b/etc/images/README index 00aac4f510a..9bbe796cc95 100644 --- a/etc/images/README +++ b/etc/images/README @@ -104,3 +104,30 @@ same conditions. The *.pbm files were generally converted from *.xpm by running GIMP or ImageMagick's 'convert'. + + +* The following icons are from the Adwaita Icon Theme (made by the +GNOME project). They are not part of Emacs, but are distributed and +used by Emacs. They are licensed under either the GNU LGPL v3 or the +Creative Commons Attribution-Share Alike 3.0 United States License. + +To view a copy of the CC-BY-SA licence, visit +http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative +Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. + +For more information see the adwaita-icon-theme repository at: + + https://gitlab.gnome.org/GNOME/adwaita-icon-theme + +Emacs images and their source in the Adwaita/scalable directory: + + checked.svg ui/checkbox-checked-symbolic.svg + unchecked.svg ui/checkbox-symbolic.svg + checkbox-mixed.svg ui/checkbox-mixed-symbolic.svg + radio.svg ui/radio-symbolic.svg + radio-mixed.svg ui/radio-mixed-symbolic.svg + radio-checked.svg ui/radio-checked-symbolic.svg + down.svg ui/pan-down-symbolic.svg + left.svg ui/pan-start-symbolic.svg + right.svg ui/pan-end-symbolic.svg + up.svg ui/pan-up-symbolic.svg diff --git a/etc/images/checkbox-mixed.svg b/etc/images/checkbox-mixed.svg new file mode 100644 index 00000000000..6e46b803c81 --- /dev/null +++ b/etc/images/checkbox-mixed.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 16 16"> + <g> + <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5 .66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z" overflow="visible" /> + <path d="M5 6a2 2 0 1 0 0 4h6a2 2 0 1 0 0 -4z" overflow="visible" /> + </g> +</svg> diff --git a/etc/images/checked.svg b/etc/images/checked.svg new file mode 100644 index 00000000000..4cbdef04f25 --- /dev/null +++ b/etc/images/checked.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 16 16"> + <g> + <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5 .66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z" overflow="visible" /> + <path d="M14.5 3l-.5-.5L7.5 9 5 6.5l-2 2L7.5 13l7-7z" overflow="visible" /> + </g> +</svg> diff --git a/etc/images/down.svg b/etc/images/down.svg new file mode 100644 index 00000000000..e2760427d73 --- /dev/null +++ b/etc/images/down.svg @@ -0,0 +1,40 @@ +<?xml version='1.0' encoding='UTF-8' standalone='no'?> +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='pan-down-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='1.0 (4035a4fb49, 2020-05-01)' width='16' xmlns='http://www.w3.org/2000/svg'> + <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#000000' borderlayer='false' borderopacity='0.50196078' inkscape:current-layer='layer10' inkscape:cx='-8.85234' inkscape:cy='7.9624984' inkscape:document-rotation='0' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:measure-end='0,0' inkscape:measure-start='0,0' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#e2e2e2' inkscape:pageopacity='0' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='false' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='false' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='1205' inkscape:window-maximized='0' inkscape:window-width='1553' inkscape:window-x='26' inkscape:window-y='23' inkscape:zoom='1'> + <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-152.00586' originy='-952' snapvisiblegridlinesonly='true' spacingx='1' spacingy='1' type='xygrid' visible='true'/> + <inkscape:grid dotted='true' empcolor='#3f3fff' empopacity='0' empspacing='4' id='grid3540' originx='-152.00586' originy='-952' spacingx='0.5' spacingy='0.5' type='xygrid'/> + </sodipodi:namedview> + <metadata id='metadata90'> + <rdf:RDF> + <cc:Work rdf:about=''> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/> + <dc:title>Gnome Symbolic Icons</dc:title> + <cc:license rdf:resource='http://creativecommons.org/licenses/by-sa/4.0/'/> + </cc:Work> + <cc:License rdf:about='http://creativecommons.org/licenses/by-sa/4.0/'> + <cc:permits rdf:resource='http://creativecommons.org/ns#Reproduction'/> + <cc:permits rdf:resource='http://creativecommons.org/ns#Distribution'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#Notice'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#Attribution'/> + <cc:permits rdf:resource='http://creativecommons.org/ns#DerivativeWorks'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#ShareAlike'/> + </cc:License> + </rdf:RDF> + </metadata> + <title id='title8473'>Gnome Symbolic Icons</title> + <defs id='defs7386'/> + <g inkscape:groupmode='layer' id='layer10' inkscape:label='ui' transform='translate(-152.00586,-952)'> + <path inkscape:connector-curvature='0' d='m 166,957 -5.99414,5.99999 L 154,957 Z' id='path6424' sodipodi:nodetypes='cccc' style='fill:#2e3436;fill-opacity:1;stroke:none'/> + </g> + <g inkscape:groupmode='layer' id='layer1' inkscape:label='status' transform='translate(-152.00586,-888)'/> + <g inkscape:groupmode='layer' id='layer11' inkscape:label='legacy' transform='translate(-152.00586,-952)'/> + <g inkscape:groupmode='layer' id='layer7' inkscape:label='places' transform='translate(-152.00586,-888)'/> + <g inkscape:groupmode='layer' id='layer6' inkscape:label='mimetypes' transform='translate(-152.00586,-888)'/> + <g inkscape:groupmode='layer' id='layer5' inkscape:label='emotes' transform='translate(-152.00586,-888)'/> + <g inkscape:groupmode='layer' id='layer9' inkscape:label='emblems' transform='translate(-152.00586,-888)'/> + <g inkscape:groupmode='layer' id='layer2' inkscape:label='devices' transform='translate(-152.00586,-888)'/> + <g inkscape:groupmode='layer' id='layer8' inkscape:label='categories' transform='translate(-152.00586,-888)'/> + <g inkscape:groupmode='layer' id='layer3' inkscape:label='apps' transform='translate(-152.00586,-888)'/> + <g inkscape:groupmode='layer' id='layer4' inkscape:label='actions' transform='translate(-152.00586,-888)'/> +</svg> diff --git a/etc/images/left.svg b/etc/images/left.svg new file mode 100644 index 00000000000..d6429bc4109 --- /dev/null +++ b/etc/images/left.svg @@ -0,0 +1,40 @@ +<?xml version='1.0' encoding='UTF-8' standalone='no'?> +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='pan-start-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='1.0 (4035a4fb49, 2020-05-01)' width='16' xmlns='http://www.w3.org/2000/svg'> + <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#000000' borderlayer='false' borderopacity='0.50196078' inkscape:current-layer='layer10' inkscape:cx='51.147672' inkscape:cy='7.96251' inkscape:document-rotation='0' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:measure-end='0,0' inkscape:measure-start='0,0' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#e2e2e2' inkscape:pageopacity='0' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='false' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='false' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='1205' inkscape:window-maximized='0' inkscape:window-width='1553' inkscape:window-x='26' inkscape:window-y='23' inkscape:zoom='1'> + <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-92.005848' originy='-951.99999' snapvisiblegridlinesonly='true' spacingx='1' spacingy='1' type='xygrid' visible='true'/> + <inkscape:grid dotted='true' empcolor='#3f3fff' empopacity='0' empspacing='4' id='grid3540' originx='-92.005848' originy='-951.99999' spacingx='0.5' spacingy='0.5' type='xygrid'/> + </sodipodi:namedview> + <metadata id='metadata90'> + <rdf:RDF> + <cc:Work rdf:about=''> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/> + <dc:title>Gnome Symbolic Icons</dc:title> + <cc:license rdf:resource='http://creativecommons.org/licenses/by-sa/4.0/'/> + </cc:Work> + <cc:License rdf:about='http://creativecommons.org/licenses/by-sa/4.0/'> + <cc:permits rdf:resource='http://creativecommons.org/ns#Reproduction'/> + <cc:permits rdf:resource='http://creativecommons.org/ns#Distribution'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#Notice'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#Attribution'/> + <cc:permits rdf:resource='http://creativecommons.org/ns#DerivativeWorks'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#ShareAlike'/> + </cc:License> + </rdf:RDF> + </metadata> + <title id='title8473'>Gnome Symbolic Icons</title> + <defs id='defs7386'/> + <g inkscape:groupmode='layer' id='layer10' inkscape:label='ui' transform='translate(-92.005848,-951.99999)'> + <path inkscape:connector-curvature='0' d='M 103,966 97.00585,959.99999 103,954 Z' id='path6400' sodipodi:nodetypes='cccc' style='fill:#2e3436;fill-opacity:1;stroke:none'/> + </g> + <g inkscape:groupmode='layer' id='layer1' inkscape:label='status' transform='translate(-92.005848,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer11' inkscape:label='legacy' transform='translate(-92.005848,-951.99999)'/> + <g inkscape:groupmode='layer' id='layer7' inkscape:label='places' transform='translate(-92.005848,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer6' inkscape:label='mimetypes' transform='translate(-92.005848,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer5' inkscape:label='emotes' transform='translate(-92.005848,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer9' inkscape:label='emblems' transform='translate(-92.005848,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer2' inkscape:label='devices' transform='translate(-92.005848,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer8' inkscape:label='categories' transform='translate(-92.005848,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer3' inkscape:label='apps' transform='translate(-92.005848,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer4' inkscape:label='actions' transform='translate(-92.005848,-887.99999)'/> +</svg> diff --git a/etc/images/radio-checked.svg b/etc/images/radio-checked.svg new file mode 100644 index 00000000000..8950b447a0b --- /dev/null +++ b/etc/images/radio-checked.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 16 16"> + <g> + <path d="M8 5a3.001 3.001 0 0 0 0 6 3.001 3.001 0 0 0 0 -6z" overflow="visible"/> + <path d="M8.004 1C4.144 1 1 4.144 1 8.004c0 3.86 3.144 7.006 7.004 7.006 3.86 0 7.006-3.146 7.006-7.006C15.01 4.144 11.864 1 8.004 1zm0 1a6.002 6.002 0 0 1 6.006 6.004 6.004 6.004 0 0 1 -6.006 6.006A6.002 6.002 0 0 1 2 8.004 6 6 0 0 1 8.004 2z" overflow="visible"/> + </g> +</svg> diff --git a/etc/images/radio-mixed.svg b/etc/images/radio-mixed.svg new file mode 100644 index 00000000000..1b3bfa78e9d --- /dev/null +++ b/etc/images/radio-mixed.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 16 16"> + <g> + <path d="M8 1C4.142 1 1 4.142 1 8s3.142 7 7 7 7-3.142 7-7-3.142-7-7-7zm0 1c3.316 0 6 2.684 6 6s-2.684 6-6 6-6-2.684-6-6 2.684-6 6-6z" overflow="visible" /> + <path d="M5 6a2 2 0 1 0 0 4h6a2 2 0 1 0 0 -4z" overflow="visible" /> + </g> +</svg> diff --git a/etc/images/radio.svg b/etc/images/radio.svg new file mode 100644 index 00000000000..2593a78610e --- /dev/null +++ b/etc/images/radio.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 16 16"> + <path d="M8 1C4.142 1 1 4.142 1 8s3.142 7 7 7 7-3.142 7-7-3.142-7-7-7zm0 1c3.316 0 6 2.684 6 6s-2.684 6-6 6-6-2.684-6-6 2.684-6 6-6z" overflow="visible" /> +</svg> diff --git a/etc/images/right.svg b/etc/images/right.svg new file mode 100644 index 00000000000..d58cd364359 --- /dev/null +++ b/etc/images/right.svg @@ -0,0 +1,40 @@ +<?xml version='1.0' encoding='UTF-8' standalone='no'?> +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='pan-end-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='1.0 (4035a4fb49, 2020-05-01)' width='16' xmlns='http://www.w3.org/2000/svg'> + <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#000000' borderlayer='false' borderopacity='0.50196078' inkscape:current-layer='layer10' inkscape:cx='31.147668' inkscape:cy='7.96251' inkscape:document-rotation='0' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:measure-end='0,0' inkscape:measure-start='0,0' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#e2e2e2' inkscape:pageopacity='0' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='false' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='false' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='1205' inkscape:window-maximized='0' inkscape:window-width='1553' inkscape:window-x='26' inkscape:window-y='23' inkscape:zoom='1'> + <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-112.00585' originy='-951.99999' snapvisiblegridlinesonly='true' spacingx='1' spacingy='1' type='xygrid' visible='true'/> + <inkscape:grid dotted='true' empcolor='#3f3fff' empopacity='0' empspacing='4' id='grid3540' originx='-112.00585' originy='-951.99999' spacingx='0.5' spacingy='0.5' type='xygrid'/> + </sodipodi:namedview> + <metadata id='metadata90'> + <rdf:RDF> + <cc:Work rdf:about=''> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/> + <dc:title>Gnome Symbolic Icons</dc:title> + <cc:license rdf:resource='http://creativecommons.org/licenses/by-sa/4.0/'/> + </cc:Work> + <cc:License rdf:about='http://creativecommons.org/licenses/by-sa/4.0/'> + <cc:permits rdf:resource='http://creativecommons.org/ns#Reproduction'/> + <cc:permits rdf:resource='http://creativecommons.org/ns#Distribution'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#Notice'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#Attribution'/> + <cc:permits rdf:resource='http://creativecommons.org/ns#DerivativeWorks'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#ShareAlike'/> + </cc:License> + </rdf:RDF> + </metadata> + <title id='title8473'>Gnome Symbolic Icons</title> + <defs id='defs7386'/> + <g inkscape:groupmode='layer' id='layer10' inkscape:label='ui' transform='translate(-112.00585,-951.99999)'> + <path inkscape:connector-curvature='0' d='m 117,966 6.00585,-6.00001 L 117,954 Z' id='path6412' sodipodi:nodetypes='cccc' style='fill:#2e3436;fill-opacity:1;stroke:none'/> + </g> + <g inkscape:groupmode='layer' id='layer1' inkscape:label='status' transform='translate(-112.00585,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer11' inkscape:label='legacy' transform='translate(-112.00585,-951.99999)'/> + <g inkscape:groupmode='layer' id='layer7' inkscape:label='places' transform='translate(-112.00585,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer6' inkscape:label='mimetypes' transform='translate(-112.00585,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer5' inkscape:label='emotes' transform='translate(-112.00585,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer9' inkscape:label='emblems' transform='translate(-112.00585,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer2' inkscape:label='devices' transform='translate(-112.00585,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer8' inkscape:label='categories' transform='translate(-112.00585,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer3' inkscape:label='apps' transform='translate(-112.00585,-887.99999)'/> + <g inkscape:groupmode='layer' id='layer4' inkscape:label='actions' transform='translate(-112.00585,-887.99999)'/> +</svg> diff --git a/etc/images/unchecked.svg b/etc/images/unchecked.svg new file mode 100644 index 00000000000..09bab8de95b --- /dev/null +++ b/etc/images/unchecked.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="1em" viewBox="0 0 16 16"> + <path d="M3.5 1A2.506 2.506 0 0 0 1 3.5v9C1 13.876 2.124 15 3.5 15h9c1.376 0 2.5-1.124 2.5-2.5v-9C15 2.124 13.876 1 12.5 1zm0 1h9c.84 0 1.5 .66 1.5 1.5v9c0 .84-.66 1.5-1.5 1.5h-9c-.84 0-1.5-.66-1.5-1.5v-9C2 2.66 2.66 2 3.5 2z" overflow="visible" /> +</svg> diff --git a/etc/images/up.svg b/etc/images/up.svg new file mode 100644 index 00000000000..9e1a245be74 --- /dev/null +++ b/etc/images/up.svg @@ -0,0 +1,40 @@ +<?xml version='1.0' encoding='UTF-8' standalone='no'?> +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='pan-up-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='1.0 (4035a4fb49, 2020-05-01)' width='16' xmlns='http://www.w3.org/2000/svg'> + <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#000000' borderlayer='false' borderopacity='0.50196078' inkscape:current-layer='layer10' inkscape:cx='11.14767' inkscape:cy='7.9625016' inkscape:document-rotation='0' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:measure-end='0,0' inkscape:measure-start='0,0' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#e2e2e2' inkscape:pageopacity='0' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='false' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='false' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='1205' inkscape:window-maximized='0' inkscape:window-width='1553' inkscape:window-x='26' inkscape:window-y='23' inkscape:zoom='1'> + <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-132.00585' originy='-952' snapvisiblegridlinesonly='true' spacingx='1' spacingy='1' type='xygrid' visible='true'/> + <inkscape:grid dotted='true' empcolor='#3f3fff' empopacity='0' empspacing='4' id='grid3540' originx='-132.00585' originy='-952' spacingx='0.5' spacingy='0.5' type='xygrid'/> + </sodipodi:namedview> + <metadata id='metadata90'> + <rdf:RDF> + <cc:Work rdf:about=''> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/> + <dc:title>Gnome Symbolic Icons</dc:title> + <cc:license rdf:resource='http://creativecommons.org/licenses/by-sa/4.0/'/> + </cc:Work> + <cc:License rdf:about='http://creativecommons.org/licenses/by-sa/4.0/'> + <cc:permits rdf:resource='http://creativecommons.org/ns#Reproduction'/> + <cc:permits rdf:resource='http://creativecommons.org/ns#Distribution'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#Notice'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#Attribution'/> + <cc:permits rdf:resource='http://creativecommons.org/ns#DerivativeWorks'/> + <cc:requires rdf:resource='http://creativecommons.org/ns#ShareAlike'/> + </cc:License> + </rdf:RDF> + </metadata> + <title id='title8473'>Gnome Symbolic Icons</title> + <defs id='defs7386'/> + <g inkscape:groupmode='layer' id='layer10' inkscape:label='ui' transform='translate(-132.00585,-952)'> + <path inkscape:connector-curvature='0' d='M 146,963 140.00585,956.99999 134,963 Z' id='path6418' sodipodi:nodetypes='cccc' style='fill:#2e3436;fill-opacity:1;stroke:none'/> + </g> + <g inkscape:groupmode='layer' id='layer1' inkscape:label='status' transform='translate(-132.00585,-888)'/> + <g inkscape:groupmode='layer' id='layer11' inkscape:label='legacy' transform='translate(-132.00585,-952)'/> + <g inkscape:groupmode='layer' id='layer7' inkscape:label='places' transform='translate(-132.00585,-888)'/> + <g inkscape:groupmode='layer' id='layer6' inkscape:label='mimetypes' transform='translate(-132.00585,-888)'/> + <g inkscape:groupmode='layer' id='layer5' inkscape:label='emotes' transform='translate(-132.00585,-888)'/> + <g inkscape:groupmode='layer' id='layer9' inkscape:label='emblems' transform='translate(-132.00585,-888)'/> + <g inkscape:groupmode='layer' id='layer2' inkscape:label='devices' transform='translate(-132.00585,-888)'/> + <g inkscape:groupmode='layer' id='layer8' inkscape:label='categories' transform='translate(-132.00585,-888)'/> + <g inkscape:groupmode='layer' id='layer3' inkscape:label='apps' transform='translate(-132.00585,-888)'/> + <g inkscape:groupmode='layer' id='layer4' inkscape:label='actions' transform='translate(-132.00585,-888)'/> +</svg> diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex index c890acb69f4..9cd0df7a5ed 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex @@ -443,8 +443,6 @@ einen Rahmen statt eines Fensters. \key{Spalte f\"ur Umbruch auf {\it Argument\/} setzen}{C-x f} \key{Pr\"afix f\"ur jede Zeile setzen}{C-x .} -\key{Face setzen}{M-o} - \section{Gro\ss{}- und Kleinschreibung} \key{Wort in Gro\ss{}buchstaben}{M-u} diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex index 34d7ebda19e..ad6db6340d4 100644 --- a/etc/refcards/fr-refcard.tex +++ b/etc/refcards/fr-refcard.tex @@ -446,8 +446,6 @@ pas les fen\^etres mais les cadres. \key{Placer la marge droite \`a {\it arg\/} colonnes}{C-u {\it arg\/} C-x f} \key{D\'efinir le pr\'efixe des lignes}{C-x .} -\key{D\'efinir la fonte}{M-o} - \section{Modifier la casse} \key{Mettre le mot en capitales}{M-u} diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index b31b4270ab4..c9d96788c5d 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -394,7 +394,7 @@ po polsku. \key{szukaj wstecz tekstu zgodnego z~wpisywanym wyra/zeniem regularnym}{C-M-r} %\key{select previous search string}{M-p} -%\key{select next later search string}{M-n} +%\key{select next search string}{M-n} %\key{exit incremental search}{RET} %\key{undo effect of last character}{DEL} %\key{abort current search}{C-g} diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex index 2d6680f7931..9226a6d8fba 100644 --- a/etc/refcards/pt-br-refcard.tex +++ b/etc/refcards/pt-br-refcard.tex @@ -452,8 +452,6 @@ para frame. \key{define a coluna limite de preenchimento}{C-x f} \key{define um prefixo para cada linha}{C-x .} -\key{formata fonte}{M-o} - \section{Mai{\'u}sculas e Min{\'u}sculas} \key{Palavra para mai{\'u}sculas}{M-u} diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index f7b5da40b05..ae39a4e9f76 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex @@ -322,7 +322,7 @@ the directions. If you are a first-time user, type \kbd{C-h t} for a \key{reverse regular expression search}{C-M-r} \key{select previous search string}{M-p} -\key{select next later search string}{M-n} +\key{select next search string}{M-n} \key{exit incremental search}{RET} \key{undo effect of last character}{DEL} \key{abort current search}{C-g} @@ -457,8 +457,6 @@ frame instead of a window. \key{set fill column to {\it arg}}{C-x f} \key{set prefix each line starts with}{C-x .} -\key{set face}{M-o} - \section{Case Change} \key{uppercase word}{M-u} diff --git a/etc/schema/OpenDocument-schema-v1.3+libreoffice.rnc b/etc/schema/OpenDocument-schema-v1.3+libreoffice.rnc new file mode 100644 index 00000000000..5239c84cb50 --- /dev/null +++ b/etc/schema/OpenDocument-schema-v1.3+libreoffice.rnc @@ -0,0 +1,892 @@ +# Open Document Format for Office Applications (OpenDocument) Version 1.3 +# OASIS Standard, In progress +# Relax-NG Schema +# Source: https://tools.oasis-open.org/version-control/svn/office/ +# Copyright (c) OASIS Open 2002-2015. All Rights Reserved. +# +# All capitalized terms in the following text have the meanings assigned to them +# in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The +# full Policy may be found at the OASIS website. +# +# This document and translations of it may be copied and furnished to others, and +# derivative works that comment on or otherwise explain it or assist in its +# implementation may be prepared, copied, published, and distributed, in whole or +# in part, without restriction of any kind, provided that the above copyright +# notice and this section are included on all such copies and derivative works. +# However, this document itself may not be modified in any way, including by +# removing the copyright notice or references to OASIS, except as needed for the +# purpose of developing any document or deliverable produced by an OASIS +# Technical Committee (in which case the rules applicable to copyrights, as set +# forth in the OASIS IPR Policy, must be followed) or as required to translate it +# into languages other than English. +# +# The limited permissions granted above are perpetual and will not be revoked by +# OASIS or its successors or assigns. +# +# This document and the information contained herein is provided on an "AS IS" +# basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT +# LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT +# INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR +# FITNESS FOR A PARTICULAR PURPOSE. + +namespace anim = "urn:oasis:names:tc:opendocument:xmlns:animation:1.0" +namespace calcext = + "urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" +namespace chart = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" +namespace chartooo = "http://openoffice.org/2010/chart" +namespace config = "urn:oasis:names:tc:opendocument:xmlns:config:1.0" +namespace css3t = "http://www.w3.org/TR/css3-text/" +namespace db = "urn:oasis:names:tc:opendocument:xmlns:database:1.0" +namespace dc = "http://purl.org/dc/elements/1.1/" +namespace dr3d = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" +namespace draw = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" +namespace drawooo = "http://openoffice.org/2010/draw" +namespace field = + "urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" +namespace fo = + "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" +namespace form = "urn:oasis:names:tc:opendocument:xmlns:form:1.0" +namespace grddl = "http://www.w3.org/2003/g/data-view#" +namespace loext = + "urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" +namespace math = "http://www.w3.org/1998/Math/MathML" +namespace meta = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0" +namespace number = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" +namespace office = "urn:oasis:names:tc:opendocument:xmlns:office:1.0" +namespace officeooo = "http://openoffice.org/2009/office" +namespace presentation = + "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" +namespace rng = "http://relaxng.org/ns/structure/1.0" +namespace script = "urn:oasis:names:tc:opendocument:xmlns:script:1.0" +namespace smil = + "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" +namespace style = "urn:oasis:names:tc:opendocument:xmlns:style:1.0" +namespace svg = + "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" +namespace table = "urn:oasis:names:tc:opendocument:xmlns:table:1.0" +namespace tableooo = "http://openoffice.org/2009/table" +namespace text = "urn:oasis:names:tc:opendocument:xmlns:text:1.0" +namespace xforms = "http://www.w3.org/2002/xforms" +namespace xhtml = "http://www.w3.org/1999/xhtml" +namespace xlink = "http://www.w3.org/1999/xlink" + +include "OpenDocument-schema-v1.3.rnc" { + office-document-common-attrs = + attribute office:version { + # FIXME remove this hack once we write 1.3 + "1.3" | "1.2" + } + & attribute grddl:transformation { + list { anyIRI* } + }? + style-graphic-properties-attlist = + attribute draw:stroke { "none" | "dash" | "solid" }? + & attribute draw:stroke-dash { styleNameRef }? + & attribute draw:stroke-dash-names { styleNameRefs }? + & attribute svg:stroke-width { length }? + & attribute svg:stroke-color { color }? + & attribute draw:marker-start { styleNameRef }? + & attribute draw:marker-end { styleNameRef }? + & attribute draw:marker-start-width { length }? + & attribute draw:marker-end-width { length }? + & attribute draw:marker-start-center { boolean }? + & attribute draw:marker-end-center { boolean }? + & attribute svg:stroke-opacity { + xsd:double { minInclusive = "0" maxInclusive = "1" } + | zeroToHundredPercent + }? + & attribute draw:stroke-linejoin { + "miter" | "round" | "bevel" | "middle" | "none" + }? + & attribute svg:stroke-linecap { "butt" | "square" | "round" }? + & attribute draw:symbol-color { color }? + & attribute text:animation { + "none" | "scroll" | "alternate" | "slide" + }? + & attribute text:animation-direction { + "left" | "right" | "up" | "down" + }? + & attribute text:animation-start-inside { boolean }? + & attribute text:animation-stop-inside { boolean }? + & attribute text:animation-repeat { nonNegativeInteger }? + & attribute text:animation-delay { duration }? + & attribute text:animation-steps { length }? + & attribute draw:auto-grow-width { boolean }? + & attribute draw:auto-grow-height { boolean }? + & # FIXME remove this once the export bug is fixed + attribute draw:fit-to-size { + "true" | "false" | "all" | "shrink-to-fit" + }? + & attribute draw:fit-to-contour { boolean }? + & attribute draw:textarea-vertical-align { + "top" | "middle" | "bottom" | "justify" + }? + & attribute draw:textarea-horizontal-align { + "left" | "center" | "right" | "justify" + }? + & attribute fo:wrap-option { "no-wrap" | "wrap" }? + & attribute style:shrink-to-fit { boolean }? + & attribute draw:color-mode { + "greyscale" | "mono" | "watermark" | "standard" + }? + & attribute draw:color-inversion { boolean }? + & attribute draw:luminance { signedZeroToHundredPercent } + # https://issues.oasis-open.org/browse/OFFICE-3821 + ? + & attribute draw:contrast { percent }? + & attribute draw:gamma { percent }? + & attribute draw:red { signedZeroToHundredPercent }? + & attribute draw:green { signedZeroToHundredPercent }? + & attribute draw:blue { signedZeroToHundredPercent }? + & attribute draw:image-opacity { zeroToHundredPercent }? + & attribute draw:shadow { "visible" | "hidden" }? + & attribute draw:shadow-offset-x { length }? + & attribute draw:shadow-offset-y { length }? + & attribute draw:shadow-color { color }? + & attribute draw:shadow-opacity { zeroToHundredPercent }? + & # TODO: no proposal for loext:shadow-blur + attribute loext:shadow-blur { length }? + & attribute draw:start-line-spacing-horizontal { distance }? + & attribute draw:start-line-spacing-vertical { distance }? + & attribute draw:end-line-spacing-horizontal { distance }? + & attribute draw:end-line-spacing-vertical { distance }? + & attribute draw:line-distance { distance }? + & attribute draw:guide-overhang { length }? + & attribute draw:guide-distance { distance }? + & attribute draw:start-guide { length }? + & attribute draw:end-guide { length }? + & attribute draw:placing { "below" | "above" }? + & attribute draw:parallel { boolean }? + & attribute draw:measure-align { + "automatic" | "left-outside" | "inside" | "right-outside" + }? + & attribute draw:measure-vertical-align { + "automatic" | "above" | "below" | "center" + }? + & attribute draw:unit { + "automatic" + | "mm" + | "cm" + | "m" + | "km" + | "pt" + | "pc" + | "inch" + | "ft" + | "mi" + }? + & attribute draw:show-unit { boolean }? + & attribute draw:decimal-places { nonNegativeInteger }? + & attribute draw:caption-type { + "straight-line" | "angled-line" | "angled-connector-line" + }? + & attribute draw:caption-angle-type { "fixed" | "free" }? + & attribute draw:caption-angle { angle }? + & attribute draw:caption-gap { distance }? + & attribute draw:caption-escape-direction { + "horizontal" | "vertical" | "auto" + }? + & attribute draw:caption-escape { length | percent }? + & attribute draw:caption-line-length { length }? + & attribute draw:caption-fit-line-length { boolean }? + & attribute dr3d:horizontal-segments { nonNegativeInteger }? + & attribute dr3d:vertical-segments { nonNegativeInteger }? + & attribute dr3d:edge-rounding { percent }? + & attribute dr3d:edge-rounding-mode { "correct" | "attractive" }? + & attribute dr3d:back-scale { percent }? + & attribute dr3d:depth { length }? + & attribute dr3d:backface-culling { "enabled" | "disabled" }? + & attribute dr3d:end-angle { angle }? + & attribute dr3d:close-front { boolean }? + & attribute dr3d:close-back { boolean }? + & attribute dr3d:lighting-mode { "standard" | "double-sided" }? + & attribute dr3d:normals-kind { "object" | "flat" | "sphere" }? + & attribute dr3d:normals-direction { "normal" | "inverse" }? + & attribute dr3d:texture-generation-mode-x { + "object" | "parallel" | "sphere" + }? + & attribute dr3d:texture-generation-mode-y { + "object" | "parallel" | "sphere" + }? + & attribute dr3d:texture-kind { + "luminance" | "intensity" | "color" + }? + & attribute dr3d:texture-filter { "enabled" | "disabled" }? + & attribute dr3d:texture-mode { "replace" | "modulate" | "blend" }? + & attribute dr3d:ambient-color { color }? + & attribute dr3d:emissive-color { color }? + & attribute dr3d:specular-color { color }? + & attribute dr3d:diffuse-color { color }? + & attribute dr3d:shininess { percent }? + & attribute dr3d:shadow { "visible" | "hidden" }? + & common-draw-rel-size-attlist + & attribute fo:min-width { length | percent }? + & attribute fo:min-height { length | percent }? + & attribute fo:max-height { length | percent }? + & attribute fo:max-width { length | percent }? + & common-horizontal-margin-attlist + & common-vertical-margin-attlist + & common-margin-attlist + & attribute style:print-content { boolean }? + & attribute style:protect { + "none" + | list { ("content" | "position" | "size")+ } + }? + & attribute style:horizontal-pos { + "left" + | "center" + | "right" + | "from-left" + | "inside" + | "outside" + | "from-inside" + }? + & attribute svg:x { coordinate }? + & attribute style:horizontal-rel { + "page" + | "page-content" + | "page-start-margin" + | "page-end-margin" + | "frame" + | "frame-content" + | "frame-start-margin" + | "frame-end-margin" + | "paragraph" + | "paragraph-content" + | "paragraph-start-margin" + | "paragraph-end-margin" + | "char" + }? + & common-vertical-pos-attlist + & common-vertical-rel-attlist + & common-text-anchor-attlist + & common-border-attlist + & common-border-line-width-attlist + & common-padding-attlist + & common-shadow-attlist + & common-background-color-attlist + & common-background-transparency-attlist + & common-editable-attlist + & attribute style:wrap { + "none" + | "left" + | "right" + | "parallel" + | "dynamic" + | "run-through" + | "biggest" + }? + & attribute style:wrap-dynamic-threshold { nonNegativeLength }? + & attribute style:number-wrapped-paragraphs { + "no-limit" | positiveInteger + }? + & attribute style:wrap-contour { boolean }? + & attribute style:wrap-contour-mode { "full" | "outside" }? + & attribute style:run-through { "foreground" | "background" }? + & attribute style:flow-with-text { boolean }? + & attribute style:overflow-behavior { + "clip" | "auto-create-new-frame" + }? + & attribute style:mirror { + "none" + | "vertical" + | horizontal-mirror + | list { "vertical", horizontal-mirror } + | list { horizontal-mirror, "vertical" } + }? + & attribute fo:clip { "auto" | clipShape }? + & attribute draw:wrap-influence-on-position { + "iterative" | "once-concurrent" | "once-successive" + }? + & common-writing-mode-attlist + & attribute draw:frame-display-scrollbar { boolean }? + & attribute draw:frame-display-border { boolean }? + & attribute draw:frame-margin-horizontal { nonNegativePixelLength }? + & attribute draw:frame-margin-vertical { nonNegativePixelLength }? + & attribute draw:visible-area-left { nonNegativeLength }? + & attribute draw:visible-area-top { nonNegativeLength }? + & attribute draw:visible-area-width { positiveLength }? + & attribute draw:visible-area-height { positiveLength }? + & attribute draw:draw-aspect { + "content" | "thumbnail" | "icon" | "print-view" + }? + & attribute draw:ole-draw-aspect { nonNegativeInteger }? + & # https://issues.oasis-open.org/browse/OFFICE-4047 + attribute loext:allow-overlap { boolean }? + & # TODO: no proposal for loext:glow* + attribute loext:glow-radius { length }? + & attribute loext:glow-color { color }? + & attribute loext:glow-transparency { zeroToHundredPercent }? + & # TODO: no proposal for loext:softedge-radius + attribute loext:softedge-radius { length }? + draw-text = + (text-p + | text-list + | # https://issues.oasis-open.org/browse/OFFICE-3761 + loext-table)* + office-annotation-attlist &= + attribute office:display { boolean }? + & common-office-annotation-name-attlist? + & attribute loext:resolved { boolean }? + style-style-content = + (attribute style:family { "text" }, + style-text-properties?) + | (attribute style:family { "paragraph" }, + # TODO no proposal + loext-graphic-properties?, + style-paragraph-properties?, + style-text-properties?) + | (attribute style:family { "section" }, + style-section-properties?) + | (attribute style:family { "ruby" }, + style-ruby-properties?) + | (attribute style:family { "table" }, + style-table-properties?) + | (attribute style:family { "table-column" }, + style-table-column-properties?) + | (attribute style:family { "table-row" }, + style-table-row-properties?) + | (attribute style:family { "table-cell" }, + # TODO no proposal + loext-graphic-properties?, + style-table-cell-properties?, + style-paragraph-properties?, + style-text-properties?) + | (attribute style:family { "graphic" | "presentation" }, + style-graphic-properties?, + style-paragraph-properties?, + style-text-properties?) + | (attribute style:family { "drawing-page" }, + style-drawing-page-properties?) + | (attribute style:family { "chart" }, + style-chart-properties?, + style-graphic-properties?, + style-paragraph-properties?, + style-text-properties?) + table-table-template = + element table:table-template { + table-table-template-attlist, + table-first-row?, + table-last-row?, + table-first-column?, + table-last-column?, + table-body, + table-even-rows?, + table-odd-rows?, + table-even-columns?, + table-odd-columns?, + table-background?, + # TODO no proposal + table-first-row-even-column?, + table-last-row-even-column?, + table-first-row-end-column?, + table-first-row-start-column?, + table-last-row-end-column?, + table-last-row-start-column? + } + draw-frame = + element draw:frame { + common-draw-shape-with-text-and-styles-attlist, + common-draw-position-attlist, + common-draw-rel-size-attlist, + common-draw-caption-id-attlist, + presentation-shape-attlist, + draw-frame-attlist, + (draw-text-box + | draw-image + | draw-object + | draw-object-ole + | draw-applet + | draw-floating-frame + | draw-plugin + | table-table)*, + office-event-listeners?, + draw-glue-point*, + draw-image-map?, + svg-title?, + svg-desc?, + (draw-contour-polygon | draw-contour-path)?, + # TODO no proposal + loext-signatureline?, + loext-qrcode? + } + common-value-and-type-attlist = + (attribute office:value-type { "float" }, + attribute calcext:value-type { "float" }?, + attribute office:value { double }) + | (attribute office:value-type { "percentage" }, + attribute calcext:value-type { "percentage" }?, + attribute office:value { double }) + | (attribute office:value-type { "currency" }, + attribute calcext:value-type { "currency" }?, + attribute office:value { double }, + attribute office:currency { \string }?) + | (attribute office:value-type { "date" }, + attribute calcext:value-type { "date" }?, + attribute office:date-value { dateOrDateTime }) + | (attribute office:value-type { "time" }, + attribute calcext:value-type { "time" }?, + attribute office:time-value { duration }) + | (attribute office:value-type { "boolean" }, + attribute calcext:value-type { "boolean" }?, + attribute office:boolean-value { boolean }) + | (attribute office:value-type { "string" }, + # OFFICE-3759 + attribute calcext:value-type { "string" | "error" }?, + attribute office:string-value { \string }?) + chart-axis = + element chart:axis { + chart-axis-attlist, + # OFFICE-2119 + ((attribute chartooo:axis-type { "auto" }, + chartooo-date-scale?) + | (attribute chartooo:axis-type { "date" }, + chartooo-date-scale) + | attribute chartooo:axis-type { "text" })?, + chart-title?, + chart-categories?, + chart-grid* + } + table-table = + element table:table { + table-table-attlist, + table-title?, + table-desc?, + # TODO add to proposal, OFFICE-2112 + table-table-protection?, + table-table-source?, + office-dde-source?, + table-scenario?, + office-forms?, + table-shapes?, + table-columns-and-groups, + table-rows-and-groups, + table-named-expressions?, + # TODO no proposal, this is wild guessing, OFFICE-3785 + element calcext:conditional-formats { + element calcext:conditional-format { + attribute calcext:target-range-address { cellRangeAddress }, + (element calcext:condition { + attribute calcext:apply-style-name { styleNameRef }, + attribute calcext:value { \string }, + attribute calcext:base-cell-address { cellAddress } + }+ + | element calcext:data-bar { + attribute calcext:max-length { \string }, + attribute calcext:negative-color { color }, + attribute calcext:positive-color { color }, + attribute calcext:axis-color { color }, + attribute calcext:axis-position { "middle" }?, + element calcext:formatting-entry { + attribute calcext:value { \string }, + attribute calcext:type { + "auto-minimum" + | "auto-maximum" + | "minimum" + | "maximum" + | "percent" + | "percentile" + | "number" + | "formula" + } + }, + element calcext:formatting-entry { + attribute calcext:value { \string }, + attribute calcext:type { + "auto-minimum" + | "auto-maximum" + | "minimum" + | "maximum" + | "percent" + | "percentile" + | "number" + | "formula" + } + } + } + | element calcext:color-scale { + element calcext:color-scale-entry { + attribute calcext:value { \string }, + attribute calcext:type { + "minimum" + | "maximum" + | "percent" + | "percentile" + | "number" + | "formula" + }, + attribute calcext:color { color } + }, + element calcext:color-scale-entry { + attribute calcext:value { \string }, + attribute calcext:type { + "minimum" + | "maximum" + | "percent" + | "percentile" + | "number" + | "formula" + }, + attribute calcext:color { color } + }, + element calcext:color-scale-entry { + attribute calcext:value { \string }, + attribute calcext:type { + "minimum" + | "maximum" + | "percent" + | "percentile" + | "number" + | "formula" + }, + attribute calcext:color { color } + }? + }) + }+ + }? + } + # TODO no proposal + draw-object = + element draw:object { + draw-object-attlist, + loext-text, + (common-draw-data-attlist | office-document | math-math) + } + draw-object-ole = + element draw:object-ole { + draw-object-ole-attlist, + loext-text, + (common-draw-data-attlist | office-binary-data) + } + # FIXME: one test exports 250 here, which is probably a bug + fontWeight = + "normal" + | "bold" + | "100" + | "200" + | "250" + | "300" + | "400" + | "500" + | "600" + | "700" + | "800" + | "900" +} +# TODO no proposal +loext-p = + element loext:p { paragraph-attrs, paragraph-content-or-hyperlink* } +loext-text = (loext-p | text-list | loext-table)* +# OFFICE-2119 +chartooo-date-scale = + element chartooo:date-scale { + attribute chart:base-time-unit { chart-time-unit }? + & (attribute chart:major-interval-value { positiveInteger }, + attribute chart:major-interval-unit { chart-time-unit })? + & (attribute chart:minor-interval-value { positiveInteger }, + attribute chart:minor-interval-unit { chart-time-unit })? + } +chart-time-unit = "days" | "months" | "years" +# TODO no proposal +loext-signatureline = + element loext:signatureline { + attribute loext:id { \string }, + attribute loext:suggested-signer-name { \string }, + attribute loext:suggested-signer-title { \string }, + attribute loext:suggested-signer-email { \string }, + attribute loext:signing-instructions { \string }, + attribute loext:show-sign-date { boolean }, + attribute loext:can-add-comment { boolean } + } +loext-qrcode = + element loext:qrcode { + attribute office:string-value { \string }, + attribute loext:qrcode-errorcorrection { + "low" | "medium" | "quartile" | "high" + }, + attribute loext:qrcode-border { nonNegativeInteger } + } +# https://issues.oasis-open.org/browse/OFFICE-3761 +loext-table = + element loext:table { + table-table-attlist, + table-title?, + table-desc?, + table-table-source?, + office-dde-source?, + table-scenario?, + office-forms?, + table-shapes?, + loext-columns-and-groups, + loext-rows-and-groups, + table-named-expressions? + } +loext-rows-and-groups = (table-table-row-group | loext-rows-no-group)+ +loext-rows-no-group = + (loext-rows, (table-table-header-rows, loext-rows?)?) + | (table-table-header-rows, loext-rows?) +loext-rows = + table-table-rows | (text-soft-page-break?, loext-table-row)+ +loext-table-row = + element loext:table-row { + table-table-row-attlist, + (loext-table-cell | loext-covered-table-cell)+ + } +loext-table-cell = + element loext:table-cell { + table-table-cell-attlist, + table-table-cell-attlist-extra, + table-table-cell-content + } +loext-covered-table-cell = + element loext:covered-table-cell { + table-table-cell-attlist, table-table-cell-content + } +loext-columns-and-groups = + (table-table-column-group | loext-columns-no-group)+ +loext-columns-no-group = + (loext-columns, (table-table-header-columns, loext-columns?)?) + | (table-table-header-columns, loext-columns?) +loext-columns = loext-table-columns | loext-table-column+ +loext-table-columns = + element loext:table-columns { loext-table-column+ } +loext-table-column = + element loext:table-column { table-table-column-attlist, empty } +loext-graphic-properties = + element loext:graphic-properties { + style-graphic-properties-content-strict + } +table-first-row-even-column = + element loext:first-row-even-column { + common-table-template-attlist, empty + } +table-last-row-even-column = + element loext:last-row-even-column { + common-table-template-attlist, empty + } +table-first-row-end-column = + element loext:first-row-end-column { + common-table-template-attlist, empty + } +table-first-row-start-column = + element loext:first-row-start-column { + common-table-template-attlist, empty + } +table-last-row-end-column = + element loext:last-row-end-column { + common-table-template-attlist, empty + } +table-last-row-start-column = + element loext:last-row-start-column { + common-table-template-attlist, empty + } +common-draw-rel-size-attlist &= + # OFFICE-3854 + attribute loext:rel-width-rel { + "page" + | [ + # TODO layout-environment ? + + ] + "paragraph" + }?, + attribute loext:rel-height-rel { "page" | "paragraph" }? +common-svg-font-face-xlink-attlist &= + # TODO no proposal + attribute loext:font-style { fontStyle }?, + attribute loext:font-weight { fontWeight }? +# TODO no proposal + +# there's no ref-attrs so add it here +text-common-ref-content &= + attribute loext:reference-language { language }? +style-list-level-label-alignment-attlist &= + # TODO no proposal + attribute loext:label-followed-by { + "listtab" | "space" | "nothing" | "newline" + }? +style-ruby-properties-attlist &= + # TODO proposal, OFFICE-3944 + attribute loext:ruby-position { + "above" | "below" | "inter-character" + }? +style-text-properties-attlist &= + # TODO no proposal + attribute officeooo:rsid { \string }?, + attribute officeooo:paragraph-rsid { \string }?, + # https://issues.oasis-open.org/browse/OFFICE-4049 + attribute loext:opacity { zeroToHundredPercent }? +style-text-properties-attlist &= + # OFFICE-3843 + attribute loext:padding { nonNegativeLength }?, + attribute loext:padding-left { nonNegativeLength }?, + attribute loext:padding-right { nonNegativeLength }?, + attribute loext:padding-top { nonNegativeLength }?, + attribute loext:padding-bottom { nonNegativeLength }?, + attribute loext:border { \string }?, + attribute loext:border-left { \string }?, + attribute loext:border-right { \string }?, + attribute loext:border-top { \string }?, + attribute loext:border-bottom { \string }?, + attribute loext:shadow { shadowType }? +# TODO no proposal +style-chart-properties-attlist &= + attribute loext:try-staggering-first { boolean }? +# TODO no proposal +style-chart-properties-attlist &= + attribute loext:std-weight { \string }? +# TODO no proposal +chart-series-attlist &= attribute loext:label-string { \string }? +# OFFICE-1148 +style-chart-properties-attlist &= + attribute loext:regression-max-degree { positiveInteger }?, + attribute loext:regression-force-intercept { boolean }?, + attribute loext:regression-intercept-value { double }?, + attribute loext:regression-name { \string }?, + attribute loext:regression-period { \string }?, + attribute loext:regression-extrapolate-forward { \string }?, + attribute loext:regression-extrapolate-backward { \string }? +# TODO no proposal +table-data-pilot-field-attlist &= + attribute tableooo:display-name { \string }? +# TODO no proposal, 9009663d +chart-chart-attlist &= attribute loext:data-pilot-source { \string }? +# OFFICE-2112, TODO half of this missing in proposal +table-table-protection = + element loext:table-protection { + attribute loext:select-protected-cells { boolean }?, + attribute loext:select-unprotected-cells { boolean }?, + attribute loext:insert-columns { boolean }?, + attribute loext:insert-rows { boolean }?, + attribute loext:delete-columns { boolean }?, + attribute loext:delete-rows { boolean }? + } +office-spreadsheet-attlist &= + attribute loext:protection-key-digest-algorithm-2 { anyURI }? +table-table-attlist &= + attribute loext:protection-key-digest-algorithm-2 { anyURI }? +# https://issues.oasis-open.org/browse/OFFICE-2317 +vertJustifyValues = "auto" | "distribute" +common-text-justify = + attribute css3t:text-justify { vertJustifyValues }? +style-vertical-justify = + attribute loext:vertical-justify { vertJustifyValues }?, + attribute style:vertical-justify { vertJustifyValues }? +style-paragraph-properties-attlist &= + (common-text-justify, style-vertical-justify)? +style-table-cell-properties-attlist &= + (common-text-justify, style-vertical-justify)? +number-fraction-attlist &= + # OFFICE-3695 + + # TODO no proposal, 1544a26ac9f7dd60605dd21e9cbe29d490aafdce + attribute loext:max-numerator-digits { positiveInteger }? +# TODO no proposal +table-data-pilot-level-attlist &= + attribute calcext:repeat-item-labels { boolean }? +# TODO no proposal +draw-enhanced-geometry-attlist &= + attribute drawooo:sub-view-size { \string }?, + attribute drawooo:enhanced-path { \string }? +# TODO no proposal +draw-custom-shape-attlist &= common-draw-rel-size-attlist +# TODO no proposal +style-page-layout-properties-attlist &= + style-graphic-fill-properties-attlist +style-header-footer-properties-attlist &= + style-graphic-fill-properties-attlist +# TODO no proposal +text-index-entry-tab-stop-attrs &= attribute style:with-tab { boolean }? +# TODO no proposal +style-text-properties-attlist &= + attribute loext:char-shading-value { \string }? +# TODO no proposal +text-bookmark-start-attlist &= + (attribute loext:hidden { boolean }, + attribute loext:condition { \string }?)? +# TODO no proposal; see 7a5d79f2297a43d0a854e304b0792164272edfe0 + +# FIXME this is almost certainly incomplete: need to figure out which elements can have this and which named pattern can be extended with it to get exactly these elements +form-checkbox-attlist &= attribute form:input-required { boolean }? +# https://issues.oasis-open.org/browse/OFFICE-4030 +common-writing-mode-attlist &= attribute loext:writing-mode { "bt-lr" }? +# https://issues.oasis-open.org/browse/OFFICE-4073 +common-vertical-rel-attlist &= + attribute loext:vertical-rel { + "page-content-top" | "page-content-bottom" + }? +# https://issues.oasis-open.org/browse/OFFICE-4105 +style-page-layout-properties-attlist &= + attribute loext:margin-gutter { length }? +# just a test-case for user-defined attributes, move along, nothing to see here... +style-table-cell-properties-attlist &= attribute proName { \string }? +# TODO no proposal +chart-data-point-attlist &= + attribute loext:custom-label-field { \string }? +# TODO no proposal +style-text-properties-attlist &= + attribute loext:hyphenation-no-caps { boolean }? +# TODO no proposal +chart-data-point-attlist &= + (attribute loext:custom-label-pos-x { double }, + attribute loext:custom-label-pos-y { double })? +# TODO no proposal +chart-legend-attlist &= attribute loext:overlay { boolean }? +# https://issues.oasis-open.org/browse/OFFICE-3936 +style-chart-properties-attlist &= + attribute loext:major-origin { double }? +# TODO no proposal +text-index-entry-chapter-attrs &= + attribute loext:outline-content-visible { boolean }? +# https://issues.oasis-open.org/browse/OFFICE-2096 +paragraph-content |= + element field:fieldmark-start { + attribute text:name { \string }, + attribute field:type { + # TODO <rng:ref name="namespacedToken"/> + \string + }, + element field:param { + attribute field:name { \string }, + attribute field:value { \string } + }* + } +paragraph-content |= element field:fieldmark-end { empty } +paragraph-content |= + element field:fieldmark { + attribute text:name { \string }, + attribute field:type { + # TODO <rng:ref name="namespacedToken"/> + \string + }, + element field:param { + attribute field:name { \string }, + attribute field:value { \string } + }* + } +# TODO no proposal +animation-element |= + element loext:animatePhysics { + common-anim-target-attlist, + common-timing-attlist, + animate-physics-attlist + } +animate-physics-attlist = + # default value: 0 + attribute loext:velocity-x { double }?, + # default value: 0 + attribute loext:velocity-y { double }?, + # default value: 0.1 + attribute loext:bounciness { + xsd:double { minInclusive = "0" maxInclusive = "1" } + }?, + # default value: 1 + attribute loext:density { + xsd:double { minInclusive = "0" } + }? +# TODO no proposal +style-chart-properties-attlist &= + attribute loext:custom-leader-lines { boolean }? +# TODO no proposal +style-chart-properties-attlist &= + attribute loext:external-data { \string }? diff --git a/etc/schema/od-schema-v1.2-os.rnc b/etc/schema/OpenDocument-schema-v1.3.rnc index 8d679d62e4e..2a7867998f1 100644 --- a/etc/schema/od-schema-v1.2-os.rnc +++ b/etc/schema/OpenDocument-schema-v1.3.rnc @@ -1,33 +1,16 @@ -# Open Document Format for Office Applications (OpenDocument) Version 1.2 -# OASIS Standard, 29 September 2011 -# Relax-NG Schema -# Source: http://docs.oasis-open.org/office/v1.2/os/ -# Copyright (c) OASIS Open 2002-2011, 2013. All Rights Reserved. +# Open Document Format for Office Applications (OpenDocument) Version 1.3 +# Committee Specification 02 +# 30 October 2020 +# Copyright (c) OASIS Open 2020. All Rights Reserved. +# Source: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs02/schemas/ +# Latest stage of specification: https://docs.oasis-open.org/office/OpenDocument/v1.3/OpenDocument-v1.3-part1-introduction.html +# TC IPR Statement: https://www.oasis-open.org/committees/office/ipr.php # -# All capitalized terms in the following text have the meanings assigned to them -# in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The -# full Policy may be found at the OASIS website. -# -# This document and translations of it may be copied and furnished to others, and -# derivative works that comment on or otherwise explain it or assist in its -# implementation may be prepared, copied, published, and distributed, in whole or -# in part, without restriction of any kind, provided that the above copyright -# notice and this section are included on all such copies and derivative works. -# However, this document itself may not be modified in any way, including by -# removing the copyright notice or references to OASIS, except as needed for the -# purpose of developing any document or deliverable produced by an OASIS -# Technical Committee (in which case the rules applicable to copyrights, as set -# forth in the OASIS IPR Policy, must be followed) or as required to translate it -# into languages other than English. -# -# The limited permissions granted above are perpetual and will not be revoked by -# OASIS or its successors or assigns. -# -# This document and the information contained herein is provided on an "AS IS" -# basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT -# LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT -# INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR -# FITNESS FOR A PARTICULAR PURPOSE. +# Open Document Format for Office Applications (OpenDocument) Version 1.3 +# Relax-NG Schema +# OpenDocument-v1.3-schema.rng + +# https://issues.oasis-open.org/browse/OFFICE-2153 namespace anim = "urn:oasis:names:tc:opendocument:xmlns:animation:1.0" namespace chart = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0" @@ -46,6 +29,7 @@ namespace number = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" namespace office = "urn:oasis:names:tc:opendocument:xmlns:office:1.0" namespace presentation = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" +namespace rng = "http://relaxng.org/ns/structure/1.0" namespace script = "urn:oasis:names:tc:opendocument:xmlns:script:1.0" namespace smil = "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" @@ -58,58 +42,2667 @@ namespace xforms = "http://www.w3.org/2002/xforms" namespace xhtml = "http://www.w3.org/1999/xhtml" namespace xlink = "http://www.w3.org/1999/xlink" -office-process-content = attribute office:process-content { boolean }? start = office-document | office-document-content | office-document-styles | office-document-meta | office-document-settings -office-document = - element office:document { - office-document-attrs, - office-document-common-attrs, - office-meta, - office-settings, - office-scripts, - office-font-face-decls, - office-styles, - office-automatic-styles, - office-master-styles, - office-body +CURIE = + xsd:string { pattern = "(([\i-[:]][\c-[:]]*)?:)?.+" minLength = "1" } +CURIEs = list { CURIE+ } +ID = xsd:ID +IDREF = xsd:IDREF +IDREFS = xsd:IDREFS +NCName = xsd:NCName +SafeCURIE = + xsd:string { + pattern = "\[(([\i-[:]][\c-[:]]*)?:)?.+\]" + minLength = "3" } -office-document-content = - element office:document-content { - office-document-common-attrs, - office-scripts, - office-font-face-decls, - office-automatic-styles, - office-body +URIorSafeCURIE = anyURI | SafeCURIE +angle = xsd:string +anim-animate-color-attlist = + attribute anim:color-interpolation { "rgb" | "hsl" }? + & attribute anim:color-interpolation-direction { + "clockwise" | "counter-clockwise" + }? +anim-animate-motion-attlist = + attribute svg:path { pathData }? + & attribute svg:origin { \string }? + & attribute smil:calcMode { + "discrete" | "linear" | "paced" | "spline" + }? +anim-animate-transform-attlist = + attribute svg:type { + "translate" | "scale" | "rotate" | "skewX" | "skewY" } -office-document-styles = - element office:document-styles { - office-document-common-attrs, - office-font-face-decls, - office-styles, - office-automatic-styles, - office-master-styles +anim-audio-attlist = + attribute xlink:href { anyIRI }? + & attribute anim:audio-level { double }? +anim-command-attlist = attribute anim:command { \string } +anim-iterate-attlist = + common-anim-target-attlist + & attribute anim:iterate-type { \string }? + & attribute anim:iterate-interval { duration }? +anim-transition-filter-attlist = + attribute smil:type { \string } + & attribute smil:subtype { \string }? + & attribute smil:direction { "forward" | "reverse" }? + & attribute smil:fadeColor { color }? + & attribute smil:mode { "in" | "out" }? +animation-element = + element anim:animate { + common-anim-target-attlist, + common-anim-named-target-attlist, + common-anim-values-attlist, + common-anim-spline-mode-attlist, + common-spline-anim-value-attlist, + common-timing-attlist, + common-anim-add-accum-attlist } -office-document-meta = - element office:document-meta { - office-document-common-attrs, office-meta + | element anim:set { + common-anim-target-attlist, + common-anim-named-target-attlist, + common-anim-set-values-attlist, + common-timing-attlist, + common-anim-add-accum-attlist + } + | element anim:animateMotion { + anim-animate-motion-attlist, + common-anim-target-attlist, + common-anim-named-target-attlist, + common-anim-add-accum-attlist, + common-anim-values-attlist, + common-timing-attlist, + common-spline-anim-value-attlist + } + | element anim:animateColor { + common-anim-target-attlist, + common-anim-named-target-attlist, + common-anim-add-accum-attlist, + common-anim-values-attlist, + common-anim-spline-mode-attlist, + common-spline-anim-value-attlist, + anim-animate-color-attlist, + common-timing-attlist + } + | element anim:animateTransform { + common-anim-target-attlist, + common-anim-named-target-attlist, + common-anim-add-accum-attlist, + common-anim-values-attlist, + anim-animate-transform-attlist, + common-timing-attlist + } + | element anim:transitionFilter { + common-anim-target-attlist, + common-anim-add-accum-attlist, + common-anim-values-attlist, + common-anim-spline-mode-attlist, + anim-transition-filter-attlist, + common-timing-attlist + } + | element anim:par { + common-anim-attlist, + common-timing-attlist, + common-endsync-timing-attlist, + animation-element* + } + | element anim:seq { + common-anim-attlist, + common-endsync-timing-attlist, + common-timing-attlist, + animation-element* + } + | element anim:iterate { + common-anim-attlist, + anim-iterate-attlist, + common-timing-attlist, + common-endsync-timing-attlist, + animation-element* + } + | element anim:audio { + common-anim-attlist, + anim-audio-attlist, + common-basic-timing-attlist + } + | element anim:command { + common-anim-attlist, + anim-command-attlist, + common-begin-end-timing-attlist, + common-anim-target-attlist, + element anim:param { + attribute anim:name { \string }, + attribute anim:value { \string } + }* + } +any-date = + number-day + | number-month + | number-year + | number-era + | number-day-of-week + | number-week-of-year + | number-quarter + | number-hours + | number-am-pm + | number-minutes + | number-seconds +any-number = number-number | number-scientific-number | number-fraction +any-time = number-hours | number-am-pm | number-minutes | number-seconds +anyAttListOrElements = + attribute * { text }*, + anyElements +anyElements = + element * { + mixed { anyAttListOrElements } + }* +anyIRI = + xsd:anyURI + >> dc:description [ + "An IRI-reference as defined in [RFC3987]. See ODF 1.3 Part 3 section 18.3." + ] +anyURI = xsd:anyURI +base64Binary = xsd:base64Binary +boolean = "true" | "false" +borderWidths = list { positiveLength, positiveLength, positiveLength } +bound-column = attribute form:bound-column { \string }? +button-type = attribute form:button-type { types }? +cellAddress = + xsd:string { + pattern = "($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+" } -office-document-settings = - element office:document-settings { - office-document-common-attrs, office-settings +cellRangeAddress = + xsd:string { + pattern = + "($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+)?" } -office-document-common-attrs = - attribute office:version { "1.2" } - & attribute grddl:transformation { - list { anyIRI* } + | xsd:string { + pattern = + "($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+:($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+" + } + | xsd:string { + pattern = + "($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+" + } +cellRangeAddressList = + xsd:string + >> dc:description [ + 'Value is a space separated list of "cellRangeAddress" patterns' + ] +change-mark-attr = attribute text:change-id { IDREF } +change-marks = + element text:change { change-mark-attr } + | element text:change-start { change-mark-attr } + | element text:change-end { change-mark-attr } +character = xsd:string { length = "1" } +chart-axis = + element chart:axis { + chart-axis-attlist, chart-title?, chart-categories?, chart-grid* + } +chart-axis-attlist = + attribute chart:dimension { chart-dimension } + & attribute chart:name { \string }? + & attribute chart:style-name { styleNameRef }? +chart-categories = + element chart:categories { + attribute table:cell-range-address { cellRangeAddressList }? + } +chart-chart = + element chart:chart { + chart-chart-attlist, + chart-title?, + chart-subtitle?, + chart-footer?, + chart-legend?, + chart-plot-area, + shape*, + # https://issues.oasis-open.org/browse/OFFICE-2123 + table-table? + } +chart-chart-attlist = + attribute chart:class { namespacedToken } + & common-draw-size-attlist + & attribute chart:column-mapping { \string }? + & attribute chart:row-mapping { \string }? + & attribute chart:style-name { styleNameRef }? + & (attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI })? + & xml-id? +chart-coordinate-region = + element chart:coordinate-region { + chart-coordinate-region-attlist, empty + } +chart-coordinate-region-attlist = + common-draw-position-attlist, common-draw-size-attlist +# https://issues.oasis-open.org/browse/OFFICE-3928 +chart-data-label = + element chart:data-label { chart-data-label-attlist, text-p? } +chart-data-label-attlist = + common-draw-position-attlist + & attribute chart:style-name { styleNameRef }? +chart-data-point = + element chart:data-point { + chart-data-point-attlist, chart-data-label? + } +chart-data-point-attlist = + attribute chart:repeated { positiveInteger }? + & attribute chart:style-name { styleNameRef }? + & xml-id? +chart-dimension = "x" | "y" | "z" +chart-domain = + element chart:domain { + attribute table:cell-range-address { cellRangeAddressList }? + } +chart-equation = + element chart:equation { chart-equation-attlist, text-p? } +chart-equation-attlist = + attribute chart:automatic-content { boolean }? + & attribute chart:display-r-square { boolean }? + & attribute chart:display-equation { boolean }? + & common-draw-position-attlist + & attribute chart:style-name { styleNameRef }? +chart-error-indicator = + element chart:error-indicator { chart-error-indicator-attlist, empty } +chart-error-indicator-attlist = + attribute chart:style-name { styleNameRef }? + & attribute chart:dimension { chart-dimension } +chart-floor = element chart:floor { chart-floor-attlist, empty } +chart-floor-attlist = + attribute svg:width { length }? + & attribute chart:style-name { styleNameRef }? +chart-footer = element chart:footer { chart-title-attlist, text-p? } +chart-grid = element chart:grid { chart-grid-attlist } +chart-grid-attlist = + attribute chart:class { "major" | "minor" }? + & attribute chart:style-name { styleNameRef }? +chart-legend = element chart:legend { chart-legend-attlist, text-p? } +chart-legend-attlist = + ((attribute chart:legend-position { + "start" | "end" | "top" | "bottom" + }, + attribute chart:legend-align { "start" | "center" | "end" }?) + | attribute chart:legend-position { + "top-start" | "bottom-start" | "top-end" | "bottom-end" + } + | empty) + & common-draw-position-attlist + & (attribute style:legend-expansion { "wide" | "high" | "balanced" } + | (attribute style:legend-expansion { "custom" }, + attribute style:legend-expansion-aspect-ratio { double }, + common-draw-size-attlist + # https://issues.oasis-open.org/browse/OFFICE-3883 + ) + | empty) + & attribute chart:style-name { styleNameRef }? +chart-mean-value = + element chart:mean-value { chart-mean-value-attlist, empty } +chart-mean-value-attlist = attribute chart:style-name { styleNameRef }? +chart-plot-area = + element chart:plot-area { + chart-plot-area-attlist, + # https://issues.oasis-open.org/browse/OFFICE-3928 + chart-coordinate-region?, + dr3d-light*, + chart-axis*, + chart-series*, + chart-stock-gain-marker?, + chart-stock-loss-marker?, + chart-stock-range-line?, + chart-wall?, + chart-floor? + } +chart-plot-area-attlist = + common-draw-position-attlist + & common-draw-size-attlist + & attribute chart:style-name { styleNameRef }? + & attribute table:cell-range-address { cellRangeAddressList }? + & attribute chart:data-source-has-labels { + "none" | "row" | "column" | "both" }? -office-document-attrs = attribute office:mimetype { \string } -office-meta = element office:meta { office-meta-content-strict }? -office-meta-content-strict = office-meta-data* + & dr3d-scene-attlist + & common-dr3d-transform-attlist + & xml-id? +chart-regression-curve = + element chart:regression-curve { + chart-regression-curve-attlist, chart-equation? + } +chart-regression-curve-attlist = + attribute chart:style-name { styleNameRef }? +chart-series = + element chart:series { + chart-series-attlist, + chart-domain*, + chart-mean-value?, + chart-regression-curve*, + chart-error-indicator*, + chart-data-point*, + chart-data-label? + } +chart-series-attlist = + attribute chart:values-cell-range-address { cellRangeAddressList }? + & attribute chart:label-cell-address { cellRangeAddressList }? + & attribute chart:class { namespacedToken }? + & attribute chart:attached-axis { \string }? + & attribute chart:style-name { styleNameRef }? + & xml-id? +chart-stock-gain-marker = + element chart:stock-gain-marker { common-stock-marker-attlist } +chart-stock-loss-marker = + element chart:stock-loss-marker { common-stock-marker-attlist } +chart-stock-range-line = + element chart:stock-range-line { common-stock-marker-attlist } +chart-subtitle = element chart:subtitle { chart-title-attlist, text-p? } +chart-title = element chart:title { chart-title-attlist, text-p? } +chart-title-attlist = + attribute table:cell-range { cellRangeAddressList }? + & common-draw-position-attlist + & attribute chart:style-name { styleNameRef }? +chart-wall = element chart:wall { chart-wall-attlist, empty } +chart-wall-attlist = + attribute svg:width { length }? + & attribute chart:style-name { styleNameRef }? +clipShape = + xsd:string { + pattern = + "rect\([ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)))|(auto))([ ]*,[ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))))|(auto)){3}[ ]*\)" + } +color = xsd:string { pattern = "#[0-9a-fA-F]{6}" } +column-controls = + element form:text { form-text-attlist, common-form-control-content } + | element form:textarea { + form-textarea-attlist, common-form-control-content, text-p* + } + | element form:formatted-text { + form-formatted-text-attlist, common-form-control-content + } + | element form:number { + form-number-attlist, + common-numeric-control-attlist, + common-form-control-content, + common-linked-cell, + common-spin-button, + common-repeat, + common-delay-for-repeat + } + | element form:date { + form-date-attlist, + common-numeric-control-attlist, + common-form-control-content, + common-linked-cell, + common-spin-button, + common-repeat, + common-delay-for-repeat + } + | element form:time { + form-time-attlist, + common-numeric-control-attlist, + common-form-control-content, + common-linked-cell, + common-spin-button, + common-repeat, + common-delay-for-repeat + } + | element form:combobox { + form-combobox-attlist, common-form-control-content, form-item* + } + | element form:listbox { + form-listbox-attlist, common-form-control-content, form-option* + } + | element form:checkbox { + form-checkbox-attlist, common-form-control-content + } +common-anim-add-accum-attlist = + attribute smil:accumulate { "none" | "sum" }? + & attribute smil:additive { "replace" | "sum" }? +common-anim-attlist = + attribute presentation:node-type { + "default" + | "on-click" + | "with-previous" + | "after-previous" + | "timing-root" + | "main-sequence" + | "interactive-sequence" + }? + & attribute presentation:preset-id { \string }? + & attribute presentation:preset-sub-type { \string }? + & attribute presentation:preset-class { + "custom" + | "entrance" + | "exit" + | "emphasis" + | "motion-path" + | "ole-action" + | "media-call" + }? + & attribute presentation:master-element { IDREF }? + & attribute presentation:group-id { \string }? + & (xml-id, + attribute anim:id { NCName }?)? +common-anim-named-target-attlist = + attribute smil:attributeName { \string } +common-anim-set-values-attlist = attribute smil:to { \string }? +common-anim-spline-mode-attlist = + attribute smil:calcMode { + "discrete" | "linear" | "paced" | "spline" + }? +common-anim-target-attlist = + attribute smil:targetElement { IDREF }? + & attribute anim:sub-item { \string }? +common-anim-values-attlist = + attribute smil:values { \string }? + & attribute anim:formula { \string }? + & common-anim-set-values-attlist + & attribute smil:from { \string }? + & attribute smil:by { \string }? +common-auto-reorder-attlist = + attribute number:automatic-order { boolean }? +common-background-color-attlist = + attribute fo:background-color { "transparent" | color }? +common-background-transparency-attlist = + attribute style:background-transparency { zeroToHundredPercent }? +common-basic-timing-attlist = + common-begin-end-timing-attlist, + common-dur-timing-attlist, + common-repeat-timing-attlist, + common-restart-timing-attlist, + common-restart-default-attlist, + common-fill-timing-attlist, + common-fill-default-attlist +common-begin-end-timing-attlist = + attribute smil:begin { \string }? + & attribute smil:end { \string }? +common-border-attlist = + attribute fo:border { \string }?, + attribute fo:border-top { \string }?, + attribute fo:border-bottom { \string }?, + attribute fo:border-left { \string }?, + attribute fo:border-right { \string }? +common-border-line-width-attlist = + attribute style:border-line-width { borderWidths }?, + attribute style:border-line-width-top { borderWidths }?, + attribute style:border-line-width-bottom { borderWidths }?, + attribute style:border-line-width-left { borderWidths }?, + attribute style:border-line-width-right { borderWidths }? +common-break-attlist = + attribute fo:break-before { "auto" | "column" | "page" }?, + attribute fo:break-after { "auto" | "column" | "page" }? +common-calendar-attlist = + attribute number:calendar { + "gregorian" + | "gengou" + | "ROC" + | "hanja_yoil" + | "hanja" + | "hijri" + | "jewish" + | "buddhist" + | \string + }? +common-contour-attlist = attribute draw:recreate-on-edit { boolean } +common-control-id-attlist = + xml-id, + attribute form:id { NCName }? +common-convert-empty-attlist = + attribute form:convert-empty-to-null { boolean }? +common-current-value-attlist = attribute form:current-value { \string }? +common-data-field-attlist = attribute form:data-field { \string }? +common-data-style-attlist = + attribute style:name { styleName } + & attribute style:display-name { \string }? + & attribute number:language { languageCode }? + & attribute number:country { countryCode }? + & attribute number:script { scriptCode }? + & attribute number:rfc-language-tag { language }? + & attribute number:title { \string }? + & attribute style:volatile { boolean }? + & attribute number:transliteration-format { \string }? + & attribute number:transliteration-language { countryCode }? + & attribute number:transliteration-country { countryCode }? + & attribute number:transliteration-style { + "short" | "medium" | "long" + }? +common-db-default-value = common-value-and-type-attlist? +common-db-object-description = attribute db:description { \string }? +common-db-object-name = attribute db:name { \string } +common-db-object-title = attribute db:title { \string }? +common-db-table-name-attlist = + attribute db:name { \string } + & attribute db:catalog-name { \string }? + & attribute db:schema-name { \string }? +common-db-table-style-name = + attribute db:style-name { styleNameRef }? + & attribute db:default-row-style-name { styleNameRef }? +common-dde-connection-decl-attlist = + attribute office:dde-application { \string } + & attribute office:dde-topic { \string } + & attribute office:dde-item { \string } + & attribute office:automatic-update { boolean }? +common-decimal-places-attlist = + attribute number:decimal-places { integer }?, + (attribute number:min-decimal-places { integer }?) + # https://issues.oasis-open.org/browse/OFFICE-3860 added number:min-decimal-places + +common-delay-for-repeat = attribute form:delay-for-repeat { duration }? +common-disabled-attlist = attribute form:disabled { boolean }? +common-dr3d-transform-attlist = attribute dr3d:transform { \string }? +common-draw-area-attlist = + (attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI }, + attribute office:target-frame-name { targetFrameName }?, + attribute xlink:show { "new" | "replace" }?)? + & attribute office:name { \string }? + & attribute draw:nohref { "nohref" }? +common-draw-caption-id-attlist = attribute draw:caption-id { IDREF }? +common-draw-circle-ellipse-attlist = + attribute draw:kind { "full" | "section" | "cut" | "arc" }? + & attribute draw:start-angle { angle }? + & attribute draw:end-angle { angle }? +common-draw-circle-ellipse-pos-attlist = + attribute svg:cx { coordinate }, + attribute svg:cy { coordinate } +common-draw-data-attlist = + attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI }, + attribute xlink:show { "embed" }?, + attribute xlink:actuate { "onLoad" }? +common-draw-gradient-attlist = + attribute draw:name { styleName }? + & attribute draw:display-name { \string }? + & attribute draw:style { gradient-style } + & attribute draw:cx { percent }? + & attribute draw:cy { percent }? + & attribute draw:angle { angle }? + & attribute draw:border { percent }? +common-draw-id-attlist = + (xml-id, + attribute draw:id { NCName }?)? +common-draw-layer-name-attlist = attribute draw:layer { \string }? +common-draw-mime-type-attlist = attribute draw:mime-type { \string }? +# https://issues.oasis-open.org/browse/OFFICE-3943 +common-draw-name-attlist = attribute draw:name { \string }? +common-draw-path-data-attlist = attribute svg:d { pathData } +common-draw-points-attlist = attribute draw:points { points } +common-draw-position-attlist = + attribute svg:x { coordinate }?, + attribute svg:y { coordinate }? +common-draw-rel-size-attlist = + common-draw-size-attlist, + attribute style:rel-width { percent | "scale" | "scale-min" }?, + attribute style:rel-height { percent | "scale" | "scale-min" }? +common-draw-shape-with-styles-attlist = + common-draw-z-index-attlist, + common-draw-id-attlist, + common-draw-layer-name-attlist, + common-draw-style-name-attlist, + common-draw-transform-attlist, + common-draw-name-attlist, + common-text-spreadsheet-shape-attlist +common-draw-shape-with-text-and-styles-attlist = + common-draw-shape-with-styles-attlist, + common-draw-text-style-name-attlist +common-draw-size-attlist = + attribute svg:width { length }?, + attribute svg:height { length }? +common-draw-style-name-attlist = + (attribute draw:style-name { styleNameRef }?, + attribute draw:class-names { styleNameRefs }?) + | (attribute presentation:style-name { styleNameRef }?, + attribute presentation:class-names { styleNameRefs }?) +common-draw-text-style-name-attlist = + attribute draw:text-style-name { styleNameRef }? +common-draw-transform-attlist = attribute draw:transform { \string }? +common-draw-viewbox-attlist = + attribute svg:viewBox { + list { integer, integer, integer, integer } + } +common-draw-z-index-attlist = + attribute draw:z-index { nonNegativeInteger }? +common-dur-timing-attlist = attribute smil:dur { \string }? +common-editable-attlist = attribute style:editable { boolean }? +common-endsync-timing-attlist = + attribute smil:endsync { "first" | "last" | "all" | "media" | IDREF }? +common-field-data-style-name-attlist = + attribute style:data-style-name { styleNameRef }? +common-field-database-name = + attribute text:database-name { \string }? + | form-connection-resource +common-field-database-table = + common-field-database-table-attlist, common-field-database-name +common-field-database-table-attlist = + attribute text:table-name { \string } + & attribute text:table-type { "table" | "query" | "command" }? +common-field-description-attlist = + attribute text:description { \string }? +common-field-display-value-formula-attlist = + attribute text:display { "value" | "formula" }? +common-field-display-value-formula-none-attlist = + attribute text:display { "value" | "formula" | "none" }? +common-field-display-value-none-attlist = + attribute text:display { "value" | "none" }? +common-field-fixed-attlist = attribute text:fixed { boolean }? +common-field-formula-attlist = attribute text:formula { \string }? +common-field-name-attlist = attribute text:name { variableName } +common-field-num-format-attlist = common-num-format-attlist? +common-fill-default-attlist = + attribute smil:fillDefault { + "remove" | "freeze" | "hold" | "transition" | "auto" | "inherit" + }? +common-fill-timing-attlist = + attribute smil:fill { + "remove" | "freeze" | "hold" | "auto" | "default" | "transition" + }? +common-form-control-attlist = + attribute form:name { \string }? + & attribute form:control-implementation { namespacedToken }? +common-form-control-content = form-properties?, office-event-listeners? +common-form-relative-image-position-attlist = + attribute form:image-position { "center" }? + | (attribute form:image-position { + "start" | "end" | "top" | "bottom" + }, + attribute form:image-align { "start" | "center" | "end" }?) +common-form-visual-effect-attlist = + attribute form:visual-effect { "flat" | "3d" }? +common-format-source-attlist = + attribute number:format-source { "fixed" | "language" }? +common-horizontal-margin-attlist = + attribute fo:margin-left { length | percent }?, + attribute fo:margin-right { length | percent }? +common-in-content-meta-attlist = + attribute xhtml:about { URIorSafeCURIE }, + attribute xhtml:property { CURIEs }, + common-meta-literal-attlist +common-keep-with-next-attlist = + attribute fo:keep-with-next { "auto" | "always" }? +common-linked-cell = + attribute form:linked-cell { cellAddress | \string }? +common-margin-attlist = + attribute fo:margin { nonNegativeLength | percent }? +common-maxlength-attlist = + attribute form:max-length { nonNegativeInteger }? +common-meta-literal-attlist = + attribute xhtml:datatype { CURIE }?, + attribute xhtml:content { \string }? +common-num-format-attlist = + attribute style:num-format { "1" | "i" | "I" | \string | empty } + | (attribute style:num-format { "a" | "A" }, + style-num-letter-sync-attlist) + | empty +common-num-format-prefix-suffix-attlist = + attribute style:num-prefix { \string }?, + attribute style:num-suffix { \string }? +common-number-attlist = + attribute number:min-integer-digits { integer }? + & attribute number:grouping { boolean }? +common-numeric-control-attlist = + form-control-attlist, + common-disabled-attlist, + common-maxlength-attlist, + common-printable-attlist, + common-readonly-attlist, + common-tab-attlist, + common-title-attlist, + common-convert-empty-attlist, + common-data-field-attlist +common-office-annotation-name-attlist = + attribute office:name { \string } +common-padding-attlist = + attribute fo:padding { nonNegativeLength }?, + attribute fo:padding-top { nonNegativeLength }?, + attribute fo:padding-bottom { nonNegativeLength }?, + attribute fo:padding-left { nonNegativeLength }?, + attribute fo:padding-right { nonNegativeLength }? +common-page-number-attlist = + attribute style:page-number { + (nonNegativeInteger | "auto") + # https://issues.oasis-open.org/browse/OFFICE-3923 + + }? +common-presentation-effect-attlist = + attribute draw:shape-id { IDREF } + & attribute presentation:effect { presentationEffects }? + & attribute presentation:direction { presentationEffectDirections }? + & attribute presentation:speed { presentationSpeeds }? + & attribute presentation:delay { duration }? + & attribute presentation:start-scale { percent }? + & attribute presentation:path-id { \string }? +common-presentation-header-footer-attlist = + attribute presentation:use-header-name { \string }? + & attribute presentation:use-footer-name { \string }? + & attribute presentation:use-date-time-name { \string }? +common-printable-attlist = attribute form:printable { boolean }? +common-readonly-attlist = attribute form:readonly { boolean }? +common-ref-format-values = "page" | "chapter" | "direction" | "text" +common-repeat = attribute form:repeat { boolean }? +common-repeat-timing-attlist = + attribute smil:repeatDur { \string }?, + attribute smil:repeatCount { nonNegativeDecimal | "indefinite" }? +common-restart-default-attlist = + attribute smil:restartDefault { + "never" | "always" | "whenNotActive" | "inherit" + }? +common-restart-timing-attlist = + attribute smil:restart { + "never" | "always" | "whenNotActive" | "default" + }? +common-rotation-angle-attlist = + attribute style:rotation-angle { angle }? +common-section-attlist = + attribute text:style-name { styleNameRef }? + & attribute text:name { \string } + & attribute text:protected { boolean }? + & attribute text:protection-key { \string }? + & attribute text:protection-key-digest-algorithm { anyIRI }? + & xml-id? +common-shadow-attlist = attribute style:shadow { shadowType }? +common-source-cell-range = + attribute form:source-cell-range { cellRangeAddress | \string }? +common-spin-button = attribute form:spin-button { boolean }? +common-spline-anim-value-attlist = + attribute smil:keyTimes { \string }? + & attribute smil:keySplines { \string }? +common-stock-marker-attlist = + attribute chart:style-name { styleNameRef }? +common-style-direction-attlist = + attribute style:direction { "ltr" | "ttb" }? +common-style-header-footer-attlist = + attribute style:display { boolean }? +common-svg-font-face-xlink-attlist = + attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI }, + attribute xlink:actuate { "onRequest" }? +common-svg-gradient-attlist = + attribute svg:gradientUnits { "objectBoundingBox" }? + & attribute svg:gradientTransform { \string }? + & attribute svg:spreadMethod { "pad" | "reflect" | "repeat" }? + & attribute draw:name { styleName } + & attribute draw:display-name { \string }? +common-tab-attlist = + attribute form:tab-index { nonNegativeInteger }? + & attribute form:tab-stop { boolean }? +common-table-cell-address-attlist = + attribute table:column { integer }, + attribute table:row { integer }, + attribute table:table { integer } +common-table-cell-range-address-attlist = + attribute table:start-column { integer }, + attribute table:start-row { integer }, + attribute table:start-table { integer }, + attribute table:end-column { integer }, + attribute table:end-row { integer }, + attribute table:end-table { integer } +common-table-change-attlist = + attribute table:id { \string } + & attribute table:acceptance-state { + "accepted" | "rejected" | "pending" + }? + & attribute table:rejecting-change-id { \string }? +common-table-range-attlist = + common-table-cell-address-attlist + | common-table-cell-range-address-attlist +common-table-template-attlist = + attribute table:style-name { styleNameRef }, + attribute table:paragraph-style-name { styleNameRef }? +common-text-align = + attribute fo:text-align { + "start" | "end" | "left" | "right" | "center" | "justify" + }? +common-text-anchor-attlist = + attribute text:anchor-type { + "page" | "frame" | "paragraph" | "char" | "as-char" + }? + & attribute text:anchor-page-number { positiveInteger }? +common-text-spreadsheet-shape-attlist = + attribute table:end-cell-address { cellAddress }? + & attribute table:end-x { coordinate }? + & attribute table:end-y { coordinate }? + & attribute table:table-background { boolean }? + & common-text-anchor-attlist +common-time-manip-attlist = + attribute smil:accelerate { zeroToOneDecimal }? + & attribute smil:decelerate { zeroToOneDecimal }? + & attribute smil:autoReverse { boolean }? +common-timing-attlist = + common-basic-timing-attlist, common-time-manip-attlist +common-title-attlist = attribute form:title { \string }? +common-value-and-type-attlist = + (attribute office:value-type { "float" }, + attribute office:value { double }) + | (attribute office:value-type { "percentage" }, + attribute office:value { double }) + | (attribute office:value-type { "currency" }, + attribute office:value { double }, + attribute office:currency { \string }?) + | (attribute office:value-type { "date" }, + attribute office:date-value { dateOrDateTime }) + | (attribute office:value-type { "time" }, + attribute office:time-value { duration }) + | (attribute office:value-type { "boolean" }, + attribute office:boolean-value { boolean }) + | (attribute office:value-type { "string" }, + attribute office:string-value { \string }?) +common-value-attlist = attribute form:value { \string }? +common-value-type-attlist = attribute office:value-type { valueType } +common-vertical-margin-attlist = + attribute fo:margin-top { nonNegativeLength | percent }?, + attribute fo:margin-bottom { nonNegativeLength | percent }? +common-vertical-pos-attlist = + attribute style:vertical-pos { + "top" | "middle" | "bottom" | "from-top" | "below" + }?, + attribute svg:y { coordinate }? +common-vertical-rel-attlist = + attribute style:vertical-rel { + "page" + | "page-content" + | "frame" + | "frame-content" + | "paragraph" + | "paragraph-content" + | "char" + | "line" + | "baseline" + | "text" + }? +common-writing-mode-attlist = + attribute style:writing-mode { + "lr-tb" | "rl-tb" | "tb-rl" | "tb-lr" | "lr" | "rl" | "tb" | "page" + }? +config-config-item = + element config:config-item { config-config-item-attlist, text } +config-config-item-attlist = + attribute config:name { \string } + & attribute config:type { + "boolean" + | "short" + | "int" + | "long" + | "double" + | "string" + | "datetime" + | "base64Binary" + } +config-config-item-map-entry = + element config:config-item-map-entry { + config-config-item-map-entry-attlist, config-items + } +config-config-item-map-entry-attlist = + attribute config:name { \string }? +config-config-item-map-indexed = + element config:config-item-map-indexed { + config-config-item-map-indexed-attlist, + config-config-item-map-entry+ + } +config-config-item-map-indexed-attlist = + attribute config:name { \string } +config-config-item-map-named = + element config:config-item-map-named { + config-config-item-map-named-attlist, config-config-item-map-entry+ + } +config-config-item-map-named-attlist = attribute config:name { \string } +config-config-item-set = + element config:config-item-set { + config-config-item-set-attlist, config-items + } +config-config-item-set-attlist = attribute config:name { \string } +config-items = + (config-config-item + | config-config-item-set + | config-config-item-map-named + | config-config-item-map-indexed)+ +controls = + column-controls + | element form:password { + form-password-attlist, common-form-control-content + } + | element form:file { form-file-attlist, common-form-control-content } + | element form:fixed-text { + form-fixed-text-attlist, common-form-control-content + } + | element form:button { + form-button-attlist, common-form-control-content + } + | element form:image { + form-image-attlist, common-form-control-content + } + | element form:radio { + form-radio-attlist, common-form-control-content + } + | element form:frame { + form-frame-attlist, common-form-control-content + } + | element form:image-frame { + form-image-frame-attlist, common-form-control-content + } + | element form:hidden { + form-hidden-attlist, common-form-control-content + } + | element form:grid { + form-grid-attlist, common-form-control-content, form-column* + } + | element form:value-range { + form-value-range-attlist, common-form-control-content + } + | element form:generic-control { + form-generic-control-attlist, common-form-control-content + } +coordinate = length +countryCode = xsd:token { pattern = "[A-Za-z0-9]{1,8}" } +currency-symbol-and-text = + number-currency-symbol, + number-text-with-fillchar + # https://issues.oasis-open.org/browse/OFFICE-3765 + ? +current-selected = attribute form:current-selected { boolean }? +custom-shape-type = "non-primitive" | \string +date = xsd:date +dateOrDateTime = xsd:date | xsd:dateTime +dateTime = xsd:dateTime +db-application-connection-settings = + element db:application-connection-settings { + db-application-connection-settings-attlist, + db-table-filter?, + db-table-type-filter?, + db-data-source-settings? + } +db-application-connection-settings-attlist = + attribute db:is-table-name-length-limited { boolean }? + & attribute db:enable-sql92-check { boolean }? + & attribute db:append-table-alias-name { boolean }? + & attribute db:ignore-driver-privileges { boolean }? + & attribute db:boolean-comparison-mode { + "equal-integer" + | "is-boolean" + | "equal-boolean" + | "equal-use-only-zero" + }? + & attribute db:use-catalog { boolean }? + & attribute db:max-row-count { integer }? + & attribute db:suppress-version-columns { boolean }? +db-apply-command = attribute db:apply-command { boolean }? +db-auto-increment = + element db:auto-increment { db-auto-increment-attlist, empty } +db-auto-increment-attlist = + attribute db:additional-column-statement { \string }? + & attribute db:row-retrieving-statement { \string }? +db-character-set = + element db:character-set { db-character-set-attlist, empty } +db-character-set-attlist = attribute db:encoding { textEncoding }? +db-column = + element db:column { + db-column-attlist, + common-db-object-name, + common-db-object-title, + common-db-object-description, + common-db-default-value + } +db-column-attlist = + attribute db:visible { boolean }? + & attribute db:style-name { styleNameRef }? + & attribute db:default-cell-style-name { styleNameRef }? +db-column-definition = + element db:column-definition { + db-column-definition-attlist, common-db-default-value + } +db-column-definition-attlist = + attribute db:name { \string } + & attribute db:data-type { db-data-types }? + & attribute db:type-name { \string }? + & attribute db:precision { positiveInteger }? + & attribute db:scale { positiveInteger }? + & attribute db:is-nullable { "no-nulls" | "nullable" }? + & attribute db:is-empty-allowed { boolean }? + & attribute db:is-autoincrement { boolean }? +db-column-definitions = + element db:column-definitions { + db-column-definitions-attlist, db-column-definition+ + } +db-column-definitions-attlist = empty +db-columns = element db:columns { db-columns-attlist, db-column+ } +db-columns-attlist = empty +db-command = attribute db:command { \string } +db-component = + element db:component { + db-component-attlist, + common-db-object-name, + common-db-object-title, + common-db-object-description, + (office-document | math-math)? + } +db-component-attlist = + (attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI }, + attribute xlink:show { "none" }?, + attribute xlink:actuate { "onRequest" }?)? + & attribute db:as-template { boolean }? +db-component-collection = + element db:component-collection { + db-component-collection-attlist, + common-db-object-name, + common-db-object-title, + common-db-object-description, + (db-component | db-component-collection)* + } +db-component-collection-attlist = empty +db-connection-data = + element db:connection-data { + db-connection-data-attlist, + (db-database-description | db-connection-resource), + db-login? + } +db-connection-data-attlist = empty +db-connection-resource = + element db:connection-resource { + db-connection-resource-attlist, empty + } +db-connection-resource-attlist = + attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI }, + attribute xlink:show { "none" }?, + attribute xlink:actuate { "onRequest" }? +db-data-source = + element db:data-source { + db-data-source-attlist, + db-connection-data, + db-driver-settings?, + db-application-connection-settings? + } +db-data-source-attlist = empty +db-data-source-setting = + element db:data-source-setting { + db-data-source-setting-attlist, db-data-source-setting-value+ + } +db-data-source-setting-attlist = + attribute db:data-source-setting-is-list { boolean }? + & attribute db:data-source-setting-name { \string } + & attribute db:data-source-setting-type { + db-data-source-setting-types + } +db-data-source-setting-types = + "boolean" | "short" | "int" | "long" | "double" | "string" +db-data-source-setting-value = + element db:data-source-setting-value { + db-data-source-setting-value-attlist, \string + } +db-data-source-setting-value-attlist = empty +db-data-source-settings = + element db:data-source-settings { + db-data-source-settings-attlist, db-data-source-setting+ + } +db-data-source-settings-attlist = empty +db-data-types = + "bit" + | "boolean" + | "tinyint" + | "smallint" + | "integer" + | "bigint" + | "float" + | "real" + | "double" + | "numeric" + | "decimal" + | "char" + | "varchar" + | "longvarchar" + | "date" + | "time" + | "timestmp" + | "binary" + | "varbinary" + | "longvarbinary" + | "sqlnull" + | "other" + | "object" + | "distinct" + | "struct" + | "array" + | "blob" + | "clob" + | "ref" +db-database-description = + element db:database-description { + db-database-description-attlist, + (db-file-based-database | db-server-database) + } +db-database-description-attlist = empty +db-delimiter = element db:delimiter { db-delimiter-attlist, empty } +db-delimiter-attlist = + attribute db:field { \string }? + & attribute db:string { \string }? + & attribute db:decimal { \string }? + & attribute db:thousand { \string }? +db-driver-settings = + element db:driver-settings { + db-driver-settings-attlist, + db-auto-increment?, + db-delimiter?, + db-character-set?, + db-table-settings? + } +db-driver-settings-attlist = + db-show-deleted + & attribute db:system-driver-settings { \string }? + & attribute db:base-dn { \string }? + & db-is-first-row-header-line + & attribute db:parameter-name-substitution { boolean }? +db-file-based-database = + element db:file-based-database { db-file-based-database-attlist } +db-file-based-database-attlist = + attribute xlink:type { "simple" } + & attribute xlink:href { anyIRI } + & attribute db:media-type { \string } + & attribute db:extension { \string }? +db-filter-statement = + element db:filter-statement { db-command, db-apply-command, empty } +db-forms = + element db:forms { + db-forms-attlist, (db-component | db-component-collection)* + } +db-forms-attlist = empty +db-host-and-port = + attribute db:hostname { \string }, + attribute db:port { positiveInteger }? +db-index = element db:index { db-index-attlist, db-index-columns+ } +db-index-attlist = + attribute db:name { \string } + & attribute db:catalog-name { \string }? + & attribute db:is-unique { boolean }? + & attribute db:is-clustered { boolean }? +db-index-column = + element db:index-column { db-index-column-attlist, empty } +db-index-column-attlist = + attribute db:name { \string } + & attribute db:is-ascending { boolean }? +db-index-columns = element db:index-columns { db-index-column+ } +db-indices = element db:indices { db-indices-attlist, db-index+ } +db-indices-attlist = empty +db-is-first-row-header-line = + attribute db:is-first-row-header-line { boolean }? +db-key = element db:key { db-key-attlist, db-key-columns+ } +db-key-attlist = + attribute db:name { \string }? + & attribute db:type { "primary" | "unique" | "foreign" } + & attribute db:referenced-table-name { \string }? + & attribute db:update-rule { + "cascade" | "restrict" | "set-null" | "no-action" | "set-default" + }? + & attribute db:delete-rule { + "cascade" | "restrict" | "set-null" | "no-action" | "set-default" + }? +db-key-column = element db:key-column { db-key-column-attlist, empty } +db-key-column-attlist = + attribute db:name { \string }? + & attribute db:related-column-name { \string }? +db-key-columns = + element db:key-columns { db-key-columns-attlist, db-key-column+ } +db-key-columns-attlist = empty +db-keys = element db:keys { db-keys-attlist, db-key+ } +db-keys-attlist = empty +db-local-socket-name = attribute db:local-socket { \string }? +db-login = element db:login { db-login-attlist, empty } +db-login-attlist = + (attribute db:user-name { \string } + | attribute db:use-system-user { boolean })? + & attribute db:is-password-required { boolean }? + & attribute db:login-timeout { positiveInteger }? +db-order-statement = + element db:order-statement { db-command, db-apply-command, empty } +db-queries = + element db:queries { + db-queries-attlist, (db-query | db-query-collection)* + } +db-queries-attlist = empty +db-query = + element db:query { + db-query-attlist, + common-db-object-name, + common-db-object-title, + common-db-object-description, + common-db-table-style-name, + db-order-statement?, + db-filter-statement?, + db-columns?, + db-update-table? + } +db-query-attlist = + attribute db:command { \string } + & attribute db:escape-processing { boolean }? +db-query-collection = + element db:query-collection { + db-query-collection-attlist, + common-db-object-name, + common-db-object-title, + common-db-object-description, + (db-query | db-query-collection)* + } +db-query-collection-attlist = empty +db-reports = + element db:reports { + db-reports-attlist, (db-component | db-component-collection)* + } +db-reports-attlist = empty +db-schema-definition = + element db:schema-definition { + db-schema-definition-attlist, db-table-definitions + } +db-schema-definition-attlist = empty +db-server-database = + element db:server-database { db-server-database-attlist, empty } +db-server-database-attlist = + attribute db:type { namespacedToken } + & (db-host-and-port | db-local-socket-name) + & attribute db:database-name { \string }? +db-show-deleted = attribute db:show-deleted { boolean }? +db-table-definition = + element db:table-definition { + common-db-table-name-attlist, + db-table-definition-attlist, + db-column-definitions, + db-keys?, + db-indices? + } +db-table-definition-attlist = attribute db:type { \string }? +db-table-definitions = + element db:table-definitions { + db-table-definitions-attlist, db-table-definition* + } +db-table-definitions-attlist = empty +db-table-exclude-filter = + element db:table-exclude-filter { + db-table-exclude-filter-attlist, db-table-filter-pattern+ + } +db-table-exclude-filter-attlist = empty +db-table-filter = + element db:table-filter { + db-table-filter-attlist, + db-table-include-filter?, + db-table-exclude-filter? + } +db-table-filter-attlist = empty +db-table-filter-pattern = + element db:table-filter-pattern { + db-table-filter-pattern-attlist, \string + } +db-table-filter-pattern-attlist = empty +db-table-include-filter = + element db:table-include-filter { + db-table-include-filter-attlist, db-table-filter-pattern+ + } +db-table-include-filter-attlist = empty +db-table-presentation = + element db:table-representation { + db-table-presentation-attlist, + common-db-table-name-attlist, + common-db-object-title, + common-db-object-description, + common-db-table-style-name, + db-order-statement?, + db-filter-statement?, + db-columns? + } +db-table-presentation-attlist = empty +db-table-presentations = + element db:table-representations { + db-table-presentations-attlist, db-table-presentation* + } +db-table-presentations-attlist = empty +db-table-setting = + element db:table-setting { + db-table-setting-attlist, db-delimiter?, db-character-set?, empty + } +db-table-setting-attlist = db-is-first-row-header-line, db-show-deleted +db-table-settings = element db:table-settings { db-table-setting* } +db-table-type = element db:table-type { db-table-type-attlist, \string } +db-table-type-attlist = empty +db-table-type-filter = + element db:table-type-filter { + db-table-type-filter-attlist, db-table-type* + } +db-table-type-filter-attlist = empty +db-update-table = + element db:update-table { common-db-table-name-attlist } +dc-creator = element dc:creator { \string } +dc-date = element dc:date { dateTime } +distance = length +double = xsd:double +dr3d-cube = + element dr3d:cube { + dr3d-cube-attlist, + common-draw-z-index-attlist, + common-draw-id-attlist, + common-draw-layer-name-attlist, + common-draw-style-name-attlist, + common-dr3d-transform-attlist, + empty + } +dr3d-cube-attlist = + attribute dr3d:min-edge { vector3D }?, + attribute dr3d:max-edge { vector3D }? +dr3d-extrude = + element dr3d:extrude { + common-draw-path-data-attlist, + common-draw-viewbox-attlist, + common-draw-id-attlist, + common-draw-z-index-attlist, + common-draw-layer-name-attlist, + common-draw-style-name-attlist, + common-dr3d-transform-attlist, + empty + } +dr3d-light = element dr3d:light { dr3d-light-attlist, empty } +dr3d-light-attlist = + attribute dr3d:diffuse-color { color }? + & attribute dr3d:direction { vector3D } + & attribute dr3d:enabled { boolean }? + & attribute dr3d:specular { boolean }? +dr3d-rotate = + element dr3d:rotate { + common-draw-viewbox-attlist, + common-draw-path-data-attlist, + common-draw-z-index-attlist, + common-draw-id-attlist, + common-draw-layer-name-attlist, + common-draw-style-name-attlist, + common-dr3d-transform-attlist, + empty + } +dr3d-scene = + element dr3d:scene { + dr3d-scene-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-style-name-attlist, + common-draw-z-index-attlist, + common-draw-id-attlist, + common-draw-layer-name-attlist, + common-text-spreadsheet-shape-attlist, + common-dr3d-transform-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + dr3d-light*, + shapes3d*, + draw-glue-point* + } +dr3d-scene-attlist = + attribute dr3d:vrp { vector3D }? + & attribute dr3d:vpn { vector3D }? + & attribute dr3d:vup { vector3D }? + & attribute dr3d:projection { "parallel" | "perspective" }? + & attribute dr3d:distance { length }? + & attribute dr3d:focal-length { length }? + & attribute dr3d:shadow-slant { angle }? + & attribute dr3d:shade-mode { + "flat" | "phong" | "gouraud" | "draft" + }? + & attribute dr3d:ambient-color { color }? + & attribute dr3d:lighting-mode { boolean }? +dr3d-sphere = + element dr3d:sphere { + dr3d-sphere-attlist, + common-draw-z-index-attlist, + common-draw-id-attlist, + common-draw-layer-name-attlist, + common-draw-style-name-attlist, + common-dr3d-transform-attlist, + empty + } +dr3d-sphere-attlist = + attribute dr3d:center { vector3D }? + & attribute dr3d:size { vector3D }? +draw-a = element draw:a { draw-a-attlist, shape-instance } +draw-a-attlist = + attribute xlink:type { "simple" } + & attribute xlink:href { anyIRI } + & attribute xlink:actuate { "onRequest" }? + & attribute office:target-frame-name { targetFrameName }? + & attribute xlink:show { "new" | "replace" }? + & attribute office:name { \string }? + & attribute office:title { \string }? + & attribute office:server-map { boolean }? + & xml-id? +draw-applet = + element draw:applet { + draw-applet-attlist, common-draw-data-attlist?, draw-param* + } +draw-applet-attlist = + attribute draw:code { \string }? + & attribute draw:object { \string }? + & attribute draw:archive { \string }? + & attribute draw:may-script { boolean }? + & xml-id? +draw-area-circle = + element draw:area-circle { + common-draw-area-attlist, + attribute svg:cx { coordinate }, + attribute svg:cy { coordinate }, + attribute svg:r { length }, + svg-title?, + svg-desc?, + office-event-listeners? + } +draw-area-polygon = + element draw:area-polygon { + common-draw-area-attlist, + attribute svg:x { coordinate }, + attribute svg:y { coordinate }, + attribute svg:width { length }, + attribute svg:height { length }, + common-draw-viewbox-attlist, + common-draw-points-attlist, + svg-title?, + svg-desc?, + office-event-listeners? + } +draw-area-rectangle = + element draw:area-rectangle { + common-draw-area-attlist, + attribute svg:x { coordinate }, + attribute svg:y { coordinate }, + attribute svg:width { length }, + attribute svg:height { length }, + svg-title?, + svg-desc?, + office-event-listeners? + } +draw-caption = + element draw:caption { + draw-caption-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-caption-attlist = + (attribute draw:caption-point-x { coordinate }, + attribute draw:caption-point-y { coordinate })? + & attribute draw:corner-radius { nonNegativeLength }? +draw-circle = + element draw:circle { + ((draw-circle-attlist, common-draw-circle-ellipse-pos-attlist) + | (common-draw-position-attlist, common-draw-size-attlist)), + common-draw-circle-ellipse-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-circle-attlist = attribute svg:r { length } +draw-connector = + element draw:connector { + draw-connector-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + common-draw-viewbox-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-connector-attlist = + attribute draw:type { "standard" | "lines" | "line" | "curve" }? + & (attribute svg:x1 { coordinate }, + attribute svg:y1 { coordinate })? + & attribute draw:start-shape { IDREF }? + & attribute draw:start-glue-point { nonNegativeInteger }? + & (attribute svg:x2 { coordinate }, + attribute svg:y2 { coordinate })? + & attribute draw:end-shape { IDREF }? + & attribute draw:end-glue-point { nonNegativeInteger }? + & attribute draw:line-skew { + list { length, (length, length?)? } + }? + & attribute svg:d { pathData }? +draw-contour-path = + element draw:contour-path { + common-contour-attlist, + common-draw-size-attlist, + common-draw-viewbox-attlist, + common-draw-path-data-attlist, + empty + } +draw-contour-polygon = + element draw:contour-polygon { + common-contour-attlist, + common-draw-size-attlist, + common-draw-viewbox-attlist, + common-draw-points-attlist, + empty + } +draw-control = + element draw:control { + draw-control-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + draw-glue-point* + } +draw-control-attlist = attribute draw:control { IDREF } +draw-custom-shape = + element draw:custom-shape { + draw-custom-shape-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text, + draw-enhanced-geometry? + } +draw-custom-shape-attlist = + attribute draw:engine { namespacedToken }? + & attribute draw:data { \string }? +draw-ellipse = + element draw:ellipse { + ((draw-ellipse-attlist, common-draw-circle-ellipse-pos-attlist) + | (common-draw-position-attlist, common-draw-size-attlist)), + common-draw-circle-ellipse-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-ellipse-attlist = + attribute svg:rx { length }, + attribute svg:ry { length } +draw-enhanced-geometry = + element draw:enhanced-geometry { + draw-enhanced-geometry-attlist, draw-equation*, draw-handle* + } +draw-enhanced-geometry-attlist = + attribute draw:type { custom-shape-type }? + & attribute svg:viewBox { + list { integer, integer, integer, integer } + }? + & attribute draw:mirror-vertical { boolean }? + & attribute draw:mirror-horizontal { boolean }? + & attribute draw:text-rotate-angle { angle }? + & attribute draw:extrusion-allowed { boolean }? + & attribute draw:text-path-allowed { boolean }? + & attribute draw:concentric-gradient-fill-allowed { boolean }? + & attribute draw:extrusion { boolean }? + & attribute draw:extrusion-brightness { zeroToHundredPercent }? + & attribute draw:extrusion-depth { + list { length, double } + }? + & attribute draw:extrusion-diffusion { percent }? + & attribute draw:extrusion-number-of-line-segments { integer }? + & attribute draw:extrusion-light-face { boolean }? + & attribute draw:extrusion-first-light-harsh { boolean }? + & attribute draw:extrusion-second-light-harsh { boolean }? + & attribute draw:extrusion-first-light-level { zeroToHundredPercent }? + & attribute draw:extrusion-second-light-level { + zeroToHundredPercent + }? + & attribute draw:extrusion-first-light-direction { vector3D }? + & attribute draw:extrusion-second-light-direction { vector3D }? + & attribute draw:extrusion-metal { boolean }? + & attribute dr3d:shade-mode { + "flat" | "phong" | "gouraud" | "draft" + }? + & attribute draw:extrusion-rotation-angle { + list { angle, angle } + }? + & attribute draw:extrusion-rotation-center { vector3D }? + & attribute draw:extrusion-shininess { zeroToHundredPercent }? + & attribute draw:extrusion-skew { + list { double, angle } + }? + & attribute draw:extrusion-specularity { zeroToHundredPercent }? + & attribute dr3d:projection { "parallel" | "perspective" }? + & attribute draw:extrusion-viewpoint { point3D }? + & attribute draw:extrusion-origin { + list { extrusionOrigin, extrusionOrigin } + }? + & attribute draw:extrusion-color { boolean }? + & attribute draw:enhanced-path { \string }? + & attribute draw:path-stretchpoint-x { double }? + & attribute draw:path-stretchpoint-y { double }? + & attribute draw:text-areas { \string }? + & attribute draw:glue-points { \string }? + & attribute draw:glue-point-type { + "none" | "segments" | "rectangle" + }? + & attribute draw:glue-point-leaving-directions { \string }? + & attribute draw:text-path { boolean }? + & attribute draw:text-path-mode { "normal" | "path" | "shape" }? + & attribute draw:text-path-scale { "path" | "shape" }? + & attribute draw:text-path-same-letter-heights { boolean }? + & attribute draw:modifiers { \string }? +draw-equation = element draw:equation { draw-equation-attlist, empty } +draw-equation-attlist = + attribute draw:name { \string }? + & attribute draw:formula { \string }? +draw-fill-image = + element draw:fill-image { + draw-fill-image-attlist, + # XLink duplicate declaration removed. see common-draw-data-attlist + ((common-draw-data-attlist, empty) | office-binary-data) + # https://issues.oasis-open.org/browse/OFFICE-3933 + + } +draw-fill-image-attlist = + attribute draw:name { styleName } + & attribute draw:display-name { \string }? + & attribute svg:width { length }? + & attribute svg:height { length }? +draw-floating-frame = + element draw:floating-frame { + draw-floating-frame-attlist, common-draw-data-attlist + } +draw-floating-frame-attlist = + attribute draw:frame-name { \string }? + & xml-id? +draw-frame = + element draw:frame { + common-draw-shape-with-text-and-styles-attlist, + common-draw-position-attlist, + common-draw-rel-size-attlist, + common-draw-caption-id-attlist, + presentation-shape-attlist, + draw-frame-attlist, + (draw-text-box + | draw-image + | draw-object + | draw-object-ole + | draw-applet + | draw-floating-frame + | draw-plugin + | table-table)*, + office-event-listeners?, + draw-glue-point*, + draw-image-map?, + svg-title?, + svg-desc?, + (draw-contour-polygon | draw-contour-path)? + } +draw-frame-attlist = attribute draw:copy-of { \string }? +draw-g = + element draw:g { + draw-g-attlist, + common-draw-z-index-attlist, + common-draw-name-attlist, + common-draw-id-attlist, + common-draw-style-name-attlist, + common-text-spreadsheet-shape-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + shape* + } +draw-g-attlist = attribute svg:y { coordinate }? +draw-glue-point = + element draw:glue-point { draw-glue-point-attlist, empty } +draw-glue-point-attlist = + attribute draw:id { nonNegativeInteger } + & attribute svg:x { distance | percent } + & attribute svg:y { distance | percent } + & attribute draw:align { + "top-left" + | "top" + | "top-right" + | "left" + | "center" + | "right" + | "bottom-left" + | "bottom-right" + }? + & attribute draw:escape-direction { + "auto" + | "left" + | "right" + | "up" + | "down" + | "horizontal" + | "vertical" + } +draw-gradient = + element draw:gradient { + common-draw-gradient-attlist, draw-gradient-attlist, empty + } +draw-gradient-attlist = + attribute draw:start-color { color }? + & attribute draw:end-color { color }? + & attribute draw:start-intensity { zeroToHundredPercent }? + & attribute draw:end-intensity { zeroToHundredPercent }? +draw-handle = element draw:handle { draw-handle-attlist, empty } +draw-handle-attlist = + attribute draw:handle-mirror-vertical { boolean }? + & attribute draw:handle-mirror-horizontal { boolean }? + & attribute draw:handle-switched { boolean }? + & attribute draw:handle-position { \string } + & attribute draw:handle-range-x-minimum { \string }? + & attribute draw:handle-range-x-maximum { \string }? + & attribute draw:handle-range-y-minimum { \string }? + & attribute draw:handle-range-y-maximum { \string }? + & attribute draw:handle-polar { \string }? + & attribute draw:handle-radius-range-minimum { \string }? + & attribute draw:handle-radius-range-maximum { \string }? +draw-hatch = element draw:hatch { draw-hatch-attlist, empty } +draw-hatch-attlist = + attribute draw:name { styleName } + & attribute draw:display-name { \string }? + & attribute draw:style { "single" | "double" | "triple" } + & attribute draw:color { color }? + & attribute draw:distance { length }? + & attribute draw:rotation { angle }? +draw-image = + element draw:image { + draw-image-attlist, + (common-draw-data-attlist | office-binary-data), + draw-text + } +draw-image-attlist = + attribute draw:filter-name { \string }? + & common-draw-mime-type-attlist + & # https://issues.oasis-open.org/browse/OFFICE-3943 + xml-id? +draw-image-map = + element draw:image-map { + (draw-area-rectangle | draw-area-circle | draw-area-polygon)* + } +draw-layer = + element draw:layer { draw-layer-attlist, svg-title?, svg-desc? } +draw-layer-attlist = + attribute draw:name { \string } + & attribute draw:protected { boolean }? + & attribute draw:display { "always" | "screen" | "printer" | "none" }? +draw-layer-set = element draw:layer-set { draw-layer* } +draw-line = + element draw:line { + draw-line-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-line-attlist = + attribute svg:x1 { coordinate } + & attribute svg:y1 { coordinate } + & attribute svg:x2 { coordinate } + & attribute svg:y2 { coordinate } +draw-marker = + element draw:marker { + draw-marker-attlist, + common-draw-viewbox-attlist, + common-draw-path-data-attlist, + empty + } +draw-marker-attlist = + attribute draw:name { styleName } + & attribute draw:display-name { \string }? +draw-measure = + element draw:measure { + draw-measure-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-measure-attlist = + attribute svg:x1 { coordinate } + & attribute svg:y1 { coordinate } + & attribute svg:x2 { coordinate } + & attribute svg:y2 { coordinate } +draw-object = + element draw:object { + draw-object-attlist, + (common-draw-data-attlist | office-document | math-math) + } +draw-object-attlist = + attribute draw:notify-on-update-of-ranges { + cellRangeAddressList | \string + }? + & xml-id? +draw-object-ole = + element draw:object-ole { + draw-object-ole-attlist, + (common-draw-data-attlist | office-binary-data) + } +draw-object-ole-attlist = + attribute draw:class-id { \string }? + & xml-id? +draw-opacity = + element draw:opacity { + common-draw-gradient-attlist, draw-opacity-attlist, empty + } +draw-opacity-attlist = + attribute draw:start { zeroToHundredPercent }?, + attribute draw:end { zeroToHundredPercent }? +draw-page = + element draw:page { + common-presentation-header-footer-attlist, + draw-page-attlist, + svg-title?, + svg-desc?, + draw-layer-set?, + office-forms?, + shape*, + (presentation-animations | animation-element)?, + presentation-notes? + } +draw-page-attlist = + attribute draw:name { \string }? + & attribute draw:style-name { styleNameRef }? + & attribute draw:master-page-name { styleNameRef } + & attribute presentation:presentation-page-layout-name { + styleNameRef + }? + & (xml-id, + attribute draw:id { NCName }?)? + & attribute draw:nav-order { IDREFS }? +draw-page-thumbnail = + element draw:page-thumbnail { + draw-page-thumbnail-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + presentation-shape-attlist, + common-draw-shape-with-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc? + } +draw-page-thumbnail-attlist = + attribute draw:page-number { positiveInteger }? +draw-param = element draw:param { draw-param-attlist, empty } +draw-param-attlist = + attribute draw:name { \string }? + & attribute draw:value { \string }? +draw-path = + element draw:path { + common-draw-path-data-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-viewbox-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-plugin = + element draw:plugin { + draw-plugin-attlist, common-draw-data-attlist, draw-param* + } +draw-plugin-attlist = common-draw-mime-type-attlist & xml-id? +# https://issues.oasis-open.org/browse/OFFICE-3943 +draw-polygon = + element draw:polygon { + common-draw-points-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-viewbox-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-polyline = + element draw:polyline { + common-draw-points-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-viewbox-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-rect = + element draw:rect { + draw-rect-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-rect-attlist = + attribute draw:corner-radius { nonNegativeLength }? + | (attribute svg:rx { nonNegativeLength }?, + attribute svg:ry { nonNegativeLength }?) +draw-regular-polygon = + element draw:regular-polygon { + draw-regular-polygon-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-shape-with-text-and-styles-attlist, + common-draw-caption-id-attlist, + svg-title?, + svg-desc?, + office-event-listeners?, + draw-glue-point*, + draw-text + } +draw-regular-polygon-attlist = + (attribute draw:concave { "false" } + | (attribute draw:concave { "true" }, + draw-regular-polygon-sharpness-attlist)) + & attribute draw:corners { positiveInteger } +draw-regular-polygon-sharpness-attlist = + attribute draw:sharpness { percent } +draw-stroke-dash = + element draw:stroke-dash { draw-stroke-dash-attlist, empty } +draw-stroke-dash-attlist = + attribute draw:name { styleName } + & attribute draw:display-name { \string }? + & attribute draw:style { "rect" | "round" }? + & attribute draw:dots1 { integer }? + & attribute draw:dots1-length { length | percent }? + & attribute draw:dots2 { integer }? + & attribute draw:dots2-length { length | percent }? + & attribute draw:distance { length | percent }? +draw-text = (text-p | text-list)* +draw-text-box = + element draw:text-box { draw-text-box-attlist, text-content* } +draw-text-box-attlist = + attribute draw:chain-next-name { \string }? + & attribute draw:corner-radius { nonNegativeLength }? + & attribute fo:min-height { length | percent }? + & attribute fo:min-width { length | percent }? + & attribute fo:max-height { length | percent }? + & attribute fo:max-width { length | percent }? + & (xml-id, + attribute text:id { NCName }?)? +dropdown = attribute form:dropdown { boolean }? +duration = xsd:duration +extrusionOrigin = + xsd:double { minInclusive = "-0.5" maxInclusive = "0.5" } +fontFamilyGeneric = + "roman" | "swiss" | "modern" | "decorative" | "script" | "system" +fontPitch = "fixed" | "variable" +fontStyle = "normal" | "italic" | "oblique" +fontVariant = "normal" | "small-caps" +fontWeight = + "normal" + | "bold" + | "100" + | "200" + | "300" + | "400" + | "500" + | "600" + | "700" + | "800" + | "900" +for = attribute form:for { \string }? +form-button-attlist = + form-control-attlist + & button-type + & common-disabled-attlist + & label + & image-data + & common-printable-attlist + & common-tab-attlist + & target-frame + & target-location + & common-title-attlist + & common-value-attlist + & common-form-relative-image-position-attlist + & common-repeat + & common-delay-for-repeat + & attribute form:default-button { boolean }? + & attribute form:toggle { boolean }? + & attribute form:focus-on-click { boolean }? + & attribute form:xforms-submission { \string }? +form-checkbox-attlist = + form-control-attlist + & common-disabled-attlist + & label + & common-printable-attlist + & common-tab-attlist + & common-title-attlist + & common-value-attlist + & common-data-field-attlist + & common-form-visual-effect-attlist + & common-form-relative-image-position-attlist + & common-linked-cell + & attribute form:current-state { states }? + & attribute form:is-tristate { boolean }? + & attribute form:state { states }? +form-column = + element form:column { form-column-attlist, column-controls+ } +form-column-attlist = + common-form-control-attlist, label, text-style-name +form-combobox-attlist = + form-control-attlist + & common-current-value-attlist + & common-disabled-attlist + & dropdown + & common-maxlength-attlist + & common-printable-attlist + & common-readonly-attlist + & size + & common-tab-attlist + & common-title-attlist + & common-value-attlist + & common-convert-empty-attlist + & common-data-field-attlist + & list-source + & list-source-type + & common-linked-cell + & common-source-cell-range + & attribute form:auto-complete { boolean }? +form-connection-resource = + element form:connection-resource { + attribute xlink:href { anyIRI }, + empty + } +form-control-attlist = + common-form-control-attlist, + common-control-id-attlist, + xforms-bind-attlist +form-date-attlist = + attribute form:value { date }? + & attribute form:current-value { date }? + & attribute form:min-value { date }? + & attribute form:max-value { date }? +form-file-attlist = + form-control-attlist, + common-current-value-attlist, + common-disabled-attlist, + common-maxlength-attlist, + common-printable-attlist, + common-readonly-attlist, + common-tab-attlist, + common-title-attlist, + common-value-attlist, + common-linked-cell +form-fixed-text-attlist = + form-control-attlist + & for + & common-disabled-attlist + & label + & common-printable-attlist + & common-title-attlist + & attribute form:multi-line { boolean }? +form-form = + element form:form { + common-form-control-attlist, + form-form-attlist, + form-properties?, + office-event-listeners?, + (controls | form-form)*, + form-connection-resource? + } +form-form-attlist = + (attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI }, + attribute xlink:actuate { "onRequest" }?)? + & attribute office:target-frame { targetFrameName }? + & attribute form:method { "get" | "post" | \string }? + & attribute form:enctype { \string }? + & attribute form:allow-deletes { boolean }? + & attribute form:allow-inserts { boolean }? + & attribute form:allow-updates { boolean }? + & attribute form:apply-filter { boolean }? + & attribute form:command-type { "table" | "query" | "command" }? + & attribute form:command { \string }? + & attribute form:datasource { anyIRI | \string }? + & attribute form:master-fields { \string }? + & attribute form:detail-fields { \string }? + & attribute form:escape-processing { boolean }? + & attribute form:filter { \string }? + & attribute form:ignore-result { boolean }? + & attribute form:navigation-mode { navigation }? + & attribute form:order { \string }? + & attribute form:tab-cycle { tab-cycles }? +form-formatted-text-attlist = + form-control-attlist + & common-current-value-attlist + & common-disabled-attlist + & common-maxlength-attlist + & common-printable-attlist + & common-readonly-attlist + & common-tab-attlist + & common-title-attlist + & common-value-attlist + & common-convert-empty-attlist + & common-data-field-attlist + & common-linked-cell + & common-spin-button + & common-repeat + & common-delay-for-repeat + & attribute form:max-value { \string }? + & attribute form:min-value { \string }? + & attribute form:validation { boolean }? +form-frame-attlist = + form-control-attlist, + common-disabled-attlist, + for, + label, + common-printable-attlist, + common-title-attlist +form-generic-control-attlist = form-control-attlist +form-grid-attlist = + form-control-attlist, + common-disabled-attlist, + common-printable-attlist, + common-tab-attlist, + common-title-attlist +form-hidden-attlist = form-control-attlist, common-value-attlist +form-image-attlist = + form-control-attlist, + button-type, + common-disabled-attlist, + image-data, + common-printable-attlist, + common-tab-attlist, + target-frame, + target-location, + common-title-attlist, + common-value-attlist +form-image-frame-attlist = + form-control-attlist, + common-disabled-attlist, + image-data, + common-printable-attlist, + common-readonly-attlist, + common-title-attlist, + common-data-field-attlist +form-item = element form:item { form-item-attlist, text } +form-item-attlist = label +form-listbox-attlist = + form-control-attlist + & common-disabled-attlist + & dropdown + & common-printable-attlist + & size + & common-tab-attlist + & common-title-attlist + & bound-column + & common-data-field-attlist + & list-source + & list-source-type + & common-linked-cell + & list-linkage-type + & common-source-cell-range + & attribute form:multiple { boolean }? + & attribute form:xforms-list-source { \string }? +form-number-attlist = + attribute form:value { double }? + & attribute form:current-value { double }? + & attribute form:min-value { double }? + & attribute form:max-value { double }? +form-option = element form:option { form-option-attlist, text } +form-option-attlist = + current-selected, selected, label, common-value-attlist +form-password-attlist = + form-control-attlist + & common-disabled-attlist + & common-maxlength-attlist + & common-printable-attlist + & common-tab-attlist + & common-title-attlist + & common-value-attlist + & common-convert-empty-attlist + & common-linked-cell + & attribute form:echo-char { character }? +form-properties = element form:properties { form-property+ } +form-property = + element form:property { + form-property-name, form-property-value-and-type-attlist + } + | element form:list-property { + form-property-name, form-property-type-and-value-list + } +form-property-name = attribute form:property-name { \string } +form-property-type-and-value-list = + (attribute office:value-type { "float" }, + element form:list-value { + attribute office:value { double } + }*) + | (attribute office:value-type { "percentage" }, + element form:list-value { + attribute office:value { double } + }*) + | (attribute office:value-type { "currency" }, + element form:list-value { + attribute office:value { double }, + attribute office:currency { \string }? + }*) + | (attribute office:value-type { "date" }, + element form:list-value { + attribute office:date-value { dateOrDateTime } + }*) + | (attribute office:value-type { "time" }, + element form:list-value { + attribute office:time-value { duration } + }*) + | (attribute office:value-type { "boolean" }, + element form:list-value { + attribute office:boolean-value { boolean } + }*) + | (attribute office:value-type { "string" }, + element form:list-value { + attribute office:string-value { \string } + }*) + | attribute office:value-type { "void" } +form-property-value-and-type-attlist = + common-value-and-type-attlist + | attribute office:value-type { "void" } +form-radio-attlist = + form-control-attlist, + current-selected, + common-disabled-attlist, + label, + common-printable-attlist, + selected, + common-tab-attlist, + common-title-attlist, + common-value-attlist, + common-data-field-attlist, + common-form-visual-effect-attlist, + common-form-relative-image-position-attlist, + common-linked-cell +form-text-attlist = + form-control-attlist, + common-current-value-attlist, + common-disabled-attlist, + common-maxlength-attlist, + common-printable-attlist, + common-readonly-attlist, + common-tab-attlist, + common-title-attlist, + common-value-attlist, + common-convert-empty-attlist, + common-data-field-attlist, + common-linked-cell +form-textarea-attlist = + form-control-attlist, + common-current-value-attlist, + common-disabled-attlist, + common-maxlength-attlist, + common-printable-attlist, + common-readonly-attlist, + common-tab-attlist, + common-title-attlist, + common-value-attlist, + common-convert-empty-attlist, + common-data-field-attlist, + common-linked-cell +form-time-attlist = + attribute form:value { time }? + & attribute form:current-value { time }? + & attribute form:min-value { time }? + & attribute form:max-value { time }? +form-value-range-attlist = + form-control-attlist + & common-disabled-attlist + & common-printable-attlist + & common-tab-attlist + & common-title-attlist + & common-value-attlist + & common-linked-cell + & common-repeat + & common-delay-for-repeat + & attribute form:max-value { integer }? + & attribute form:min-value { integer }? + & attribute form:step-size { positiveInteger }? + & attribute form:page-step-size { positiveInteger }? + & attribute form:orientation { "horizontal" | "vertical" }? +gradient-style = + "linear" | "axial" | "radial" | "ellipsoid" | "square" | "rectangular" +header-footer-content = + (text-tracked-changes, + text-decls, + (text-h + | text-p + | text-list + | table-table + | text-section + | text-table-of-content + | text-illustration-index + | text-table-index + | text-object-index + | text-user-index + | text-alphabetical-index + | text-bibliography + | text-index-title + | change-marks)*) + | (style-region-left?, style-region-center?, style-region-right?) +heading-attrs = + attribute text:outline-level { positiveInteger } + & attribute text:restart-numbering { boolean }? + & attribute text:start-value { nonNegativeInteger }? + & attribute text:is-list-header { boolean }? +horiBackPos = "left" | "center" | "right" +horizontal-mirror = + "horizontal" | "horizontal-on-odd" | "horizontal-on-even" +image-data = attribute form:image-data { anyIRI }? +index-content-main = text-content | text-index-title +integer = xsd:integer +label = attribute form:label { \string }? +labelPositions = + "avoid-overlap" + | "center" + | "top" + | "top-right" + | "right" + | "bottom-right" + | "bottom" + | "bottom-left" + | "left" + | "top-left" + | "inside" + | "outside" + | "near-origin" +language = xsd:language +languageCode = xsd:token { pattern = "[A-Za-z]{1,8}" } +length = + xsd:string { + pattern = + "-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))" + } +lineMode = "continuous" | "skip-white-space" +lineStyle = + "none" + | "solid" + | "dotted" + | "dash" + | "long-dash" + | "dot-dash" + | "dot-dot-dash" + | "wave" +lineType = "none" | "single" | "double" +lineWidth = + "auto" + | "normal" + | "bold" + | "thin" + | "medium" + | "thick" + | positiveInteger + | percent + | positiveLength +list-linkage-type = + attribute form:list-linkage-type { + "selection" | "selection-indices" + }? +list-source = attribute form:list-source { \string }? +list-source-type = + attribute form:list-source-type { + "table" + | "query" + | "sql" + | "sql-pass-through" + | "value-list" + | "table-fields" + }? +math-math = element math:math { mathMarkup } +[ + dc:description [ + "To avoid inclusion of the complete MathML schema, anything is allowed within a math:math top-level element" + ] +] +mathMarkup = + (attribute * { text } + | text + | element * { mathMarkup })* +meta-date-string = element meta:date-string { \string } +namespacedToken = xsd:QName { pattern = "[^:]+:[^:]+" } +navigation = "none" | "current" | "parent" +nonNegativeDecimal = xsd:decimal { minInclusive = "0.0" } +nonNegativeInteger = xsd:nonNegativeInteger +nonNegativeLength = + xsd:string { + pattern = + "([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))" + } +nonNegativePixelLength = + xsd:string { pattern = "([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)" } +number-am-pm = element number:am-pm { empty } +number-and-text = + number-number, + (number-text-with-fillchar?) + # https://issues.oasis-open.org/browse/OFFICE-3765 + +number-boolean = element number:boolean { empty } +number-boolean-style = + element number:boolean-style { + common-data-style-attlist, + style-text-properties?, + number-text?, + (number-boolean, number-text?)?, + style-map* + } +number-currency-style = + element number:currency-style { + common-data-style-attlist, + common-auto-reorder-attlist, + style-text-properties?, + number-text-with-fillchar?, + # https://issues.oasis-open.org/browse/OFFICE-3765 + ((number-and-text, currency-symbol-and-text?) + | (currency-symbol-and-text, number-and-text?))?, + style-map* + } +number-currency-symbol = + element number:currency-symbol { + number-currency-symbol-attlist, text + } +number-currency-symbol-attlist = + attribute number:language { languageCode }?, + attribute number:country { countryCode }?, + attribute number:script { scriptCode }?, + attribute number:rfc-language-tag { language }? +number-date-style = + element number:date-style { + common-data-style-attlist, + common-auto-reorder-attlist, + common-format-source-attlist, + style-text-properties?, + number-text-with-fillchar?, + # https://issues.oasis-open.org/browse/OFFICE-3765 + (any-date, + (number-text-with-fillchar?) + # https://issues.oasis-open.org/browse/OFFICE-3765 + )+, + style-map* + } +number-day = + element number:day { + number-day-attlist, common-calendar-attlist, empty + } +number-day-attlist = attribute number:style { "short" | "long" }? +number-day-of-week = + element number:day-of-week { + number-day-of-week-attlist, common-calendar-attlist, empty + } +number-day-of-week-attlist = + attribute number:style { "short" | "long" }? +number-embedded-text = + element number:embedded-text { number-embedded-text-attlist, text } +number-embedded-text-attlist = attribute number:position { integer } +number-era = + element number:era { + number-era-attlist, common-calendar-attlist, empty + } +number-era-attlist = attribute number:style { "short" | "long" }? +number-fill-character = element number:fill-character { text } +# https://issues.oasis-open.org/browse/OFFICE-3765 +number-fraction = + element number:fraction { + number-fraction-attlist, common-number-attlist, empty + } +number-fraction-attlist = + attribute number:min-numerator-digits { integer }? + & attribute number:min-denominator-digits { integer }? + & attribute number:denominator-value { integer }? + & (attribute number:max-denominator-value { positiveInteger }?) + # https://issues.oasis-open.org/browse/OFFICE-3695 max-denominator-value + +number-hours = element number:hours { number-hours-attlist, empty } +number-hours-attlist = attribute number:style { "short" | "long" }? +number-minutes = + element number:minutes { number-minutes-attlist, empty } +number-minutes-attlist = attribute number:style { "short" | "long" }? +number-month = + element number:month { + number-month-attlist, common-calendar-attlist, empty + } +number-month-attlist = + attribute number:textual { boolean }? + & attribute number:possessive-form { boolean }? + & attribute number:style { "short" | "long" }? +number-number = + element number:number { + number-number-attlist, + common-decimal-places-attlist, + common-number-attlist, + number-embedded-text* + } +number-number-attlist = + attribute number:decimal-replacement { \string }? + & attribute number:display-factor { double }? +number-number-style = + element number:number-style { + common-data-style-attlist, + style-text-properties?, + number-text-with-fillchar?, + # https://issues.oasis-open.org/browse/OFFICE-3765 + (any-number, number-text-with-fillchar?)?, + # https://issues.oasis-open.org/browse/OFFICE-3765 + style-map* + } +number-percentage-style = + element number:percentage-style { + common-data-style-attlist, + style-text-properties?, + number-text-with-fillchar?, + # https://issues.oasis-open.org/browse/OFFICE-3765 + number-and-text?, + style-map* + } +number-quarter = + element number:quarter { + number-quarter-attlist, common-calendar-attlist, empty + } +number-quarter-attlist = attribute number:style { "short" | "long" }? +number-scientific-number = + element number:scientific-number { + number-scientific-number-attlist, + common-decimal-places-attlist, + common-number-attlist, + empty + } +number-scientific-number-attlist = + attribute number:min-exponent-digits { integer }? + & attribute number:exponent-interval { positiveInteger }? + & # https://issues.oasis-open.org/browse/OFFICE-1828 exponent-interval + attribute number:forced-exponent-sign { boolean } + # https://issues.oasis-open.org/browse/OFFICE-3860 added number:forced-exponent-sign + ? +number-seconds = + element number:seconds { number-seconds-attlist, empty } +number-seconds-attlist = + attribute number:style { "short" | "long" }? + & attribute number:decimal-places { integer }? +number-text = element number:text { text } +number-text-content = element number:text-content { empty } +number-text-style = + element number:text-style { + common-data-style-attlist, + style-text-properties?, + number-text-with-fillchar?, + # https://issues.oasis-open.org/browse/OFFICE-3765 + (number-text-content, + (number-text-with-fillchar?) + # https://issues.oasis-open.org/browse/OFFICE-3765 + )*, + style-map* + } +number-text-with-fillchar = + number-text?, (number-fill-character, number-text?)? +# https://issues.oasis-open.org/browse/OFFICE-3765 +number-time-style = + element number:time-style { + number-time-style-attlist, + common-data-style-attlist, + common-format-source-attlist, + style-text-properties?, + number-text-with-fillchar?, + # https://issues.oasis-open.org/browse/OFFICE-3765 + (any-time, + (number-text-with-fillchar?) + # https://issues.oasis-open.org/browse/OFFICE-3765 + )+, + style-map* + } +number-time-style-attlist = + attribute number:truncate-on-overflow { boolean }? +number-week-of-year = + element number:week-of-year { common-calendar-attlist, empty } +number-year = + element number:year { + number-year-attlist, common-calendar-attlist, empty + } +number-year-attlist = attribute number:style { "short" | "long" }? +office-annotation = + element office:annotation { + office-annotation-attlist, + draw-caption-attlist, + common-draw-position-attlist, + common-draw-size-attlist, + common-draw-shape-with-text-and-styles-attlist, + dc-creator?, + dc-date?, + meta-date-string?, + element meta:creator-initials { text }?, + # https://issues.oasis-open.org/browse/OFFICE-3776 + (text-p | text-list)* + } +office-annotation-attlist = + attribute office:display { boolean }? + & common-office-annotation-name-attlist? +office-annotation-end = + element office:annotation-end { office-annotation-end-attlist } +office-annotation-end-attlist = common-office-annotation-name-attlist +office-automatic-styles = + element office:automatic-styles { styles & style-page-layout* }? +office-binary-data = element office:binary-data { base64Binary } office-body = element office:body { office-body-content } office-body-content = element office:text { @@ -149,153 +2742,102 @@ office-body-content = office-image-content-epilogue } | office-database -office-text-content-prelude = - office-forms, text-tracked-changes, text-decls, table-decls -office-text-content-main = - text-content* - | (text-page-sequence, (shape)*) -text-content = - text-h - | text-p - | text-list - | text-numbered-paragraph - | table-table - | text-section - | text-soft-page-break - | text-table-of-content - | text-illustration-index - | text-table-index - | text-object-index - | text-user-index - | text-alphabetical-index - | text-bibliography - | shape - | change-marks -office-text-content-epilogue = table-functions -office-text-attlist = - attribute text:global { boolean }? - & attribute text:use-soft-page-breaks { boolean }? -office-drawing-attlist = empty -office-drawing-content-prelude = text-decls, table-decls -office-drawing-content-main = draw-page* -office-drawing-content-epilogue = table-functions -office-presentation-attlist = empty -office-presentation-content-prelude = - text-decls, table-decls, presentation-decls -office-presentation-content-main = draw-page* -office-presentation-content-epilogue = - presentation-settings, table-functions -office-spreadsheet-content-prelude = - table-tracked-changes?, text-decls, table-decls -table-decls = - table-calculation-settings?, - table-content-validations?, - table-label-ranges? -office-spreadsheet-content-main = table-table* -office-spreadsheet-content-epilogue = table-functions -table-functions = - table-named-expressions?, - table-database-ranges?, - table-data-pilot-tables?, - table-consolidation?, - table-dde-links? +office-change-info = + element office:change-info { dc-creator, dc-date, text-p* } office-chart-attlist = empty -office-chart-content-prelude = text-decls, table-decls -office-chart-content-main = chart-chart office-chart-content-epilogue = table-functions -office-image-attlist = empty -office-image-content-prelude = empty -office-image-content-main = draw-frame -office-image-content-epilogue = empty -office-settings = element office:settings { config-config-item-set+ }? -config-config-item-set = - element config:config-item-set { - config-config-item-set-attlist, config-items +office-chart-content-main = chart-chart +office-chart-content-prelude = text-decls, table-decls +office-database = + element office:database { + db-data-source, + db-forms?, + db-reports?, + db-queries?, + db-table-presentations?, + db-schema-definition? } -config-items = - (config-config-item - | config-config-item-set - | config-config-item-map-named - | config-config-item-map-indexed)+ -config-config-item-set-attlist = attribute config:name { \string } -config-config-item = - element config:config-item { config-config-item-attlist, text } -config-config-item-attlist = - attribute config:name { \string } - & attribute config:type { - "boolean" - | "short" - | "int" - | "long" - | "double" - | "string" - | "datetime" - | "base64Binary" - } -config-config-item-map-indexed = - element config:config-item-map-indexed { - config-config-item-map-indexed-attlist, - config-config-item-map-entry+ +office-dde-source = + element office:dde-source { + office-dde-source-attlist, common-dde-connection-decl-attlist } -config-config-item-map-indexed-attlist = - attribute config:name { \string } -config-config-item-map-entry = - element config:config-item-map-entry { - config-config-item-map-entry-attlist, config-items +office-dde-source-attlist = + attribute office:name { \string }? + & attribute office:conversion-mode { + "into-default-style-data-style" + | "into-english-number" + | "keep-text" + }? +office-document = + element office:document { + office-document-attrs, + office-document-common-attrs, + office-meta, + office-settings, + office-scripts, + office-font-face-decls, + office-styles, + office-automatic-styles, + office-master-styles, + office-body } -config-config-item-map-entry-attlist = - attribute config:name { \string }? -config-config-item-map-named = - element config:config-item-map-named { - config-config-item-map-named-attlist, config-config-item-map-entry+ +office-document-attrs = attribute office:mimetype { \string } +office-document-common-attrs = + attribute office:version { "1.3" } + & attribute grddl:transformation { + list { anyIRI* } + }? +office-document-content = + element office:document-content { + office-document-common-attrs, + office-scripts, + office-font-face-decls, + office-automatic-styles, + office-body } -config-config-item-map-named-attlist = attribute config:name { \string } -office-scripts = - element office:scripts { office-script*, office-event-listeners? }? -office-script = - element office:script { - office-script-attlist, - mixed { anyElements } +office-document-meta = + element office:document-meta { + office-document-common-attrs, office-meta + } +office-document-settings = + element office:document-settings { + office-document-common-attrs, office-settings + } +office-document-styles = + element office:document-styles { + office-document-common-attrs, + office-font-face-decls, + office-styles, + office-automatic-styles, + office-master-styles + } +office-drawing-attlist = empty +office-drawing-content-epilogue = table-functions +office-drawing-content-main = draw-page* +office-drawing-content-prelude = text-decls, table-decls +office-event-listeners = + element office:event-listeners { + (script-event-listener | presentation-event-listener)* } -office-script-attlist = attribute script:language { \string } office-font-face-decls = element office:font-face-decls { style-font-face* }? -office-styles = - element office:styles { - styles - & style-default-style* - & style-default-page-layout? - & text-outline-style? - & text-notes-configuration* - & text-bibliography-configuration? - & text-linenumbering-configuration? - & draw-gradient* - & svg-linearGradient* - & svg-radialGradient* - & draw-hatch* - & draw-fill-image* - & draw-marker* - & draw-stroke-dash* - & draw-opacity* - & style-presentation-page-layout* - & table-table-template* +office-forms = + element office:forms { + office-forms-attlist, (form-form | xforms-model)* }? -office-automatic-styles = - element office:automatic-styles { styles & style-page-layout* }? +office-forms-attlist = + attribute form:automatic-focus { boolean }? + & attribute form:apply-design-mode { boolean }? +office-image-attlist = empty +office-image-content-epilogue = empty +office-image-content-main = draw-frame +office-image-content-prelude = empty office-master-styles = element office:master-styles { style-master-page* & style-handout-master? & draw-layer-set? }? -styles = - style-style* - & text-list-style* - & number-number-style* - & number-currency-style* - & number-percentage-style* - & number-date-style* - & number-time-style* - & number-boolean-style* - & number-text-style* +office-meta = element office:meta { office-meta-content-strict }? +office-meta-content-strict = office-meta-data* office-meta-data = element meta:generator { \string } | element dc:title { \string } @@ -362,23 +2904,66 @@ office-meta-data = \string) | text) } -dc-creator = element dc:creator { \string } -dc-date = element dc:date { dateTime } -text-h = - element text:h { - heading-attrs, - paragraph-attrs, - text-number?, - paragraph-content-or-hyperlink* +office-presentation-attlist = empty +office-presentation-content-epilogue = + presentation-settings, table-functions +office-presentation-content-main = draw-page* +office-presentation-content-prelude = + text-decls, table-decls, presentation-decls +# removed from text as well +# <rng:define name="office-process-content"> +# <rng:optional> +# <rng:attribute name="office:process-content"> +# <rng:ref name="boolean"/> +# </rng:attribute> +# </rng:optional> +# </rng:define> +office-script = + element office:script { + office-script-attlist, + mixed { anyElements } } -heading-attrs = - attribute text:outline-level { positiveInteger } - & attribute text:restart-numbering { boolean }? - & attribute text:start-value { nonNegativeInteger }? - & attribute text:is-list-header { boolean }? -text-number = element text:number { \string } -text-p = - element text:p { paragraph-attrs, paragraph-content-or-hyperlink* } +office-script-attlist = attribute script:language { \string } +office-scripts = + element office:scripts { office-script*, office-event-listeners? }? +office-settings = element office:settings { config-config-item-set+ }? +office-spreadsheet-attlist = + attribute table:structure-protected { boolean }?, + attribute table:protection-key { \string }?, + attribute table:protection-key-digest-algorithm { anyIRI }? +office-spreadsheet-content-epilogue = table-functions +office-spreadsheet-content-main = table-table* +office-spreadsheet-content-prelude = + table-tracked-changes?, text-decls, table-decls +office-styles = + element office:styles { + styles + & style-default-style* + & style-default-page-layout? + & text-outline-style? + & text-notes-configuration* + & text-bibliography-configuration? + & text-linenumbering-configuration? + & draw-gradient* + & svg-linearGradient* + & svg-radialGradient* + & draw-hatch* + & draw-fill-image* + & draw-marker* + & draw-stroke-dash* + & draw-opacity* + & style-presentation-page-layout* + & table-table-template* + }? +office-text-attlist = + attribute text:global { boolean }? + & attribute text:use-soft-page-breaks { boolean }? +office-text-content-epilogue = table-functions +office-text-content-main = + text-content* + | (text-page-sequence, (shape)*) +office-text-content-prelude = + office-forms, text-tracked-changes, text-decls, table-decls paragraph-attrs = attribute text:style-name { styleNameRef }? & attribute text:class-names { styleNameRefs }? @@ -386,99 +2971,6 @@ paragraph-attrs = & (xml-id, attribute text:id { NCName }?)? & common-in-content-meta-attlist? -text-page-sequence = element text:page-sequence { text-page+ } -text-page = element text:page { text-page-attlist, empty } -text-page-attlist = attribute text:master-page-name { styleNameRef } -text-list = - element text:list { - text-list-attr, text-list-header?, text-list-item* - } -text-list-attr = - attribute text:style-name { styleNameRef }? - & attribute text:continue-numbering { boolean }? - & attribute text:continue-list { IDREF }? - & xml-id? -text-list-item = - element text:list-item { text-list-item-attr, text-list-item-content } -text-list-item-content = - text-number?, (text-p | text-h | text-list | text-soft-page-break)* -text-list-item-attr = - attribute text:start-value { nonNegativeInteger }? - & attribute text:style-override { styleNameRef }? - & xml-id? -text-list-header = - element text:list-header { - text-list-header-attr, text-list-item-content - } -text-list-header-attr = xml-id? -text-numbered-paragraph = - element text:numbered-paragraph { - text-numbered-paragraph-attr, text-number?, (text-p | text-h) - } -text-numbered-paragraph-attr = - attribute text:list-id { NCName } - & attribute text:level { positiveInteger }? - & (attribute text:style-name { styleNameRef }, - attribute text:continue-numbering { boolean }, - attribute text:start-value { nonNegativeInteger })? - & xml-id? -text-section = - element text:section { - text-section-attlist, - (text-section-source | text-section-source-dde | empty), - text-content* - } -text-section-attlist = - common-section-attlist - & (attribute text:display { "true" | "none" } - | (attribute text:display { "condition" }, - attribute text:condition { \string }) - | empty) -common-section-attlist = - attribute text:style-name { styleNameRef }? - & attribute text:name { \string } - & attribute text:protected { boolean }? - & attribute text:protection-key { \string }? - & attribute text:protection-key-digest-algorithm { anyIRI }? - & xml-id? -text-section-source = - element text:section-source { text-section-source-attr } -text-section-source-attr = - (attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute xlink:show { "embed" }?)? - & attribute text:section-name { \string }? - & attribute text:filter-name { \string }? -text-section-source-dde = office-dde-source -text-tracked-changes = - element text:tracked-changes { - text-tracked-changes-attr, text-changed-region* - }? -text-tracked-changes-attr = attribute text:track-changes { boolean }? -text-changed-region = - element text:changed-region { - text-changed-region-attr, text-changed-region-content - } -text-changed-region-attr = - xml-id, - attribute text:id { NCName }? -text-changed-region-content = - element text:insertion { office-change-info } - | element text:deletion { office-change-info, text-content* } - | element text:format-change { office-change-info } -change-marks = - element text:change { change-mark-attr } - | element text:change-start { change-mark-attr } - | element text:change-end { change-mark-attr } -change-mark-attr = attribute text:change-id { IDREF } -text-soft-page-break = element text:soft-page-break { empty } -text-decls = - element text:variable-decls { text-variable-decl* }?, - element text:sequence-decls { text-sequence-decl* }?, - element text:user-field-decls { text-user-field-decl* }?, - element text:dde-connection-decls { text-dde-connection-decl* }?, - text-alphabetical-index-auto-mark-file? -paragraph-content-or-hyperlink = paragraph-content | text-a paragraph-content = text | element text:s { @@ -605,7 +3097,9 @@ paragraph-content = text } | element text:text-input { common-field-description-attlist, text } - | element text:initial-creator { common-field-fixed-attlist, text } + | text-drop-down + | # OFFICE-3881 + element text:initial-creator { common-field-fixed-attlist, text } | element text:creation-date { (common-field-fixed-attlist & common-field-data-style-name-attlist @@ -801,2062 +3295,37 @@ paragraph-content = | element presentation:header { empty } | element presentation:footer { empty } | element presentation:date-time { empty } -text-tab-attr = attribute text:tab-ref { nonNegativeInteger }? -text-a = - element text:a { - text-a-attlist, office-event-listeners?, paragraph-content* - } -text-a-attlist = - attribute office:name { \string }? - & attribute office:title { \string }? - & attribute xlink:type { "simple" } - & attribute xlink:href { anyIRI } - & attribute xlink:actuate { "onRequest" }? - & attribute office:target-frame-name { targetFrameName }? - & attribute xlink:show { "new" | "replace" }? - & attribute text:style-name { styleNameRef }? - & attribute text:visited-style-name { styleNameRef }? -text-meta-attlist = common-in-content-meta-attlist? & xml-id? -text-bookmark = element text:bookmark { text-bookmark-attlist, empty } -text-bookmark-start = - element text:bookmark-start { text-bookmark-start-attlist, empty } -text-bookmark-end = - element text:bookmark-end { text-bookmark-end-attlist, empty } -text-bookmark-attlist = - attribute text:name { \string } - & xml-id? -text-bookmark-start-attlist = - attribute text:name { \string } - & xml-id? - & common-in-content-meta-attlist? -text-bookmark-end-attlist = attribute text:name { \string } -text-note-class = attribute text:note-class { "footnote" | "endnote" } -text-date-attlist = - (common-field-fixed-attlist & common-field-data-style-name-attlist) - & attribute text:date-value { dateOrDateTime }? - & attribute text:date-adjust { duration }? -text-time-attlist = - (common-field-fixed-attlist & common-field-data-style-name-attlist) - & attribute text:time-value { timeOrDateTime }? - & attribute text:time-adjust { duration }? -text-page-number-attlist = - (common-field-num-format-attlist & common-field-fixed-attlist) - & attribute text:page-adjust { integer }? - & attribute text:select-page { "previous" | "current" | "next" }? -text-page-continuation-attlist = - attribute text:select-page { "previous" | "next" } - & attribute text:string-value { \string }? -text-chapter-attlist = - attribute text:display { - "name" - | "number" - | "number-and-name" - | "plain-number-and-name" - | "plain-number" - } - & attribute text:outline-level { nonNegativeInteger } -text-file-name-attlist = - attribute text:display { - "full" | "path" | "name" | "name-and-extension" - }? - & common-field-fixed-attlist -text-template-name-attlist = - attribute text:display { - "full" | "path" | "name" | "name-and-extension" | "area" | "title" - }? -text-variable-decl = - element text:variable-decl { - common-field-name-attlist, common-value-type-attlist - } -text-user-field-decl = - element text:user-field-decl { - common-field-name-attlist, - common-field-formula-attlist?, - common-value-and-type-attlist - } -text-sequence-decl = - element text:sequence-decl { text-sequence-decl-attlist } -text-sequence-decl-attlist = - common-field-name-attlist - & attribute text:display-outline-level { nonNegativeInteger } - & attribute text:separation-character { character }? -text-sequence-ref-name = attribute text:ref-name { \string }? -common-field-database-table = - common-field-database-table-attlist, common-field-database-name -common-field-database-name = - attribute text:database-name { \string }? - | form-connection-resource -common-field-database-table-attlist = - attribute text:table-name { \string } - & attribute text:table-type { "table" | "query" | "command" }? -text-database-display-attlist = - common-field-database-table - & common-field-data-style-name-attlist - & attribute text:column-name { \string } -text-database-next-attlist = - common-field-database-table - & attribute text:condition { \string }? -text-database-row-select-attlist = - common-field-database-table - & attribute text:condition { \string }? - & attribute text:row-number { nonNegativeInteger }? -text-set-page-variable-attlist = - attribute text:active { boolean }? - & attribute text:page-adjust { integer }? -text-get-page-variable-attlist = common-field-num-format-attlist -text-placeholder-attlist = - attribute text:placeholder-type { - "text" | "table" | "text-box" | "image" | "object" - } - & common-field-description-attlist -text-conditional-text-attlist = - attribute text:condition { \string } - & attribute text:string-value-if-true { \string } - & attribute text:string-value-if-false { \string } - & attribute text:current-value { boolean }? -text-hidden-text-attlist = - attribute text:condition { \string } - & attribute text:string-value { \string } - & attribute text:is-hidden { boolean }? -text-common-ref-content = - text - & attribute text:ref-name { \string }? -text-bookmark-ref-content = - attribute text:reference-format { - common-ref-format-values - | "number-no-superior" - | "number-all-superior" - | "number" - }? -text-note-ref-content = - attribute text:reference-format { common-ref-format-values }? - & text-note-class -text-sequence-ref-content = - attribute text:reference-format { - common-ref-format-values - | "category-and-value" - | "caption" - | "value" - }? -common-ref-format-values = "page" | "chapter" | "direction" | "text" -text-hidden-paragraph-attlist = - attribute text:condition { \string } - & attribute text:is-hidden { boolean }? -text-meta-field-attlist = xml-id & common-field-data-style-name-attlist -common-value-type-attlist = attribute office:value-type { valueType } -common-value-and-type-attlist = - (attribute office:value-type { "float" }, - attribute office:value { double }) - | (attribute office:value-type { "percentage" }, - attribute office:value { double }) - | (attribute office:value-type { "currency" }, - attribute office:value { double }, - attribute office:currency { \string }?) - | (attribute office:value-type { "date" }, - attribute office:date-value { dateOrDateTime }) - | (attribute office:value-type { "time" }, - attribute office:time-value { duration }) - | (attribute office:value-type { "boolean" }, - attribute office:boolean-value { boolean }) - | (attribute office:value-type { "string" }, - attribute office:string-value { \string }?) -common-field-fixed-attlist = attribute text:fixed { boolean }? -common-field-name-attlist = attribute text:name { variableName } -common-field-description-attlist = - attribute text:description { \string }? -common-field-display-value-none-attlist = - attribute text:display { "value" | "none" }? -common-field-display-value-formula-none-attlist = - attribute text:display { "value" | "formula" | "none" }? -common-field-display-value-formula-attlist = - attribute text:display { "value" | "formula" }? -common-field-formula-attlist = attribute text:formula { \string }? -common-field-data-style-name-attlist = - attribute style:data-style-name { styleNameRef }? -common-field-num-format-attlist = common-num-format-attlist? -text-toc-mark-start-attrs = text-id, text-outline-level -text-outline-level = attribute text:outline-level { positiveInteger }? -text-id = attribute text:id { \string } -text-index-name = attribute text:index-name { \string } -text-alphabetical-index-mark-attrs = - attribute text:key1 { \string }? - & attribute text:key2 { \string }? - & attribute text:string-value-phonetic { \string }? - & attribute text:key1-phonetic { \string }? - & attribute text:key2-phonetic { \string }? - & attribute text:main-entry { boolean }? -text-bibliography-types = - "article" - | "book" - | "booklet" - | "conference" - | "custom1" - | "custom2" - | "custom3" - | "custom4" - | "custom5" - | "email" - | "inbook" - | "incollection" - | "inproceedings" - | "journal" - | "manual" - | "mastersthesis" - | "misc" - | "phdthesis" - | "proceedings" - | "techreport" - | "unpublished" - | "www" -text-index-body = element text:index-body { index-content-main* } -index-content-main = text-content | text-index-title -text-index-title = - element text:index-title { - common-section-attlist, index-content-main* - } -text-table-of-content = - element text:table-of-content { - common-section-attlist, - text-table-of-content-source, - text-index-body - } -text-table-of-content-source = - element text:table-of-content-source { - text-table-of-content-source-attlist, - text-index-title-template?, - text-table-of-content-entry-template*, - text-index-source-styles* - } -text-table-of-content-source-attlist = - attribute text:outline-level { positiveInteger }? - & attribute text:use-outline-level { boolean }? - & attribute text:use-index-marks { boolean }? - & attribute text:use-index-source-styles { boolean }? - & attribute text:index-scope { "document" | "chapter" }? - & attribute text:relative-tab-stop-position { boolean }? -text-table-of-content-entry-template = - element text:table-of-content-entry-template { - text-table-of-content-entry-template-attlist, - text-table-of-content-children* - } -text-table-of-content-children = - text-index-entry-chapter - | text-index-entry-page-number - | text-index-entry-text - | text-index-entry-span - | text-index-entry-tab-stop - | text-index-entry-link-start - | text-index-entry-link-end -text-table-of-content-entry-template-attlist = - attribute text:outline-level { positiveInteger } - & attribute text:style-name { styleNameRef } -text-illustration-index = - element text:illustration-index { - common-section-attlist, - text-illustration-index-source, - text-index-body - } -text-illustration-index-source = - element text:illustration-index-source { - text-illustration-index-source-attrs, - text-index-title-template?, - text-illustration-index-entry-template? - } -text-illustration-index-source-attrs = - text-index-scope-attr - & text-relative-tab-stop-position-attr - & attribute text:use-caption { boolean }? - & attribute text:caption-sequence-name { \string }? - & attribute text:caption-sequence-format { - "text" | "category-and-value" | "caption" - }? -text-index-scope-attr = - attribute text:index-scope { "document" | "chapter" }? -text-relative-tab-stop-position-attr = - attribute text:relative-tab-stop-position { boolean }? -text-illustration-index-entry-template = - element text:illustration-index-entry-template { - text-illustration-index-entry-content - } -text-illustration-index-entry-content = - text-illustration-index-entry-template-attrs, - (text-index-entry-chapter - | text-index-entry-page-number - | text-index-entry-text - | text-index-entry-span - | text-index-entry-tab-stop)* -text-illustration-index-entry-template-attrs = - attribute text:style-name { styleNameRef } -text-table-index = - element text:table-index { - common-section-attlist, text-table-index-source, text-index-body - } -text-table-index-source = - element text:table-index-source { - text-illustration-index-source-attrs, - text-index-title-template?, - text-table-index-entry-template? - } -text-table-index-entry-template = - element text:table-index-entry-template { - text-illustration-index-entry-content - } -text-object-index = - element text:object-index { - common-section-attlist, text-object-index-source, text-index-body - } -text-object-index-source = - element text:object-index-source { - text-object-index-source-attrs, - text-index-title-template?, - text-object-index-entry-template? - } -text-object-index-source-attrs = - text-index-scope-attr - & text-relative-tab-stop-position-attr - & attribute text:use-spreadsheet-objects { boolean }? - & attribute text:use-math-objects { boolean }? - & attribute text:use-draw-objects { boolean }? - & attribute text:use-chart-objects { boolean }? - & attribute text:use-other-objects { boolean }? -text-object-index-entry-template = - element text:object-index-entry-template { - text-illustration-index-entry-content - } -text-user-index = - element text:user-index { - common-section-attlist, text-user-index-source, text-index-body - } -text-user-index-source = - element text:user-index-source { - text-user-index-source-attr, - text-index-title-template?, - text-user-index-entry-template*, - text-index-source-styles* - } -text-user-index-source-attr = - text-index-scope-attr - & text-relative-tab-stop-position-attr - & attribute text:use-index-marks { boolean }? - & attribute text:use-index-source-styles { boolean }? - & attribute text:use-graphics { boolean }? - & attribute text:use-tables { boolean }? - & attribute text:use-floating-frames { boolean }? - & attribute text:use-objects { boolean }? - & attribute text:copy-outline-levels { boolean }? - & attribute text:index-name { \string } -text-user-index-entry-template = - element text:user-index-entry-template { - text-user-index-entry-template-attrs, - (text-index-entry-chapter - | text-index-entry-page-number - | text-index-entry-text - | text-index-entry-span - | text-index-entry-tab-stop)* - } -text-user-index-entry-template-attrs = - attribute text:outline-level { positiveInteger } - & attribute text:style-name { styleNameRef } -text-alphabetical-index = - element text:alphabetical-index { - common-section-attlist, - text-alphabetical-index-source, - text-index-body - } -text-alphabetical-index-source = - element text:alphabetical-index-source { - text-alphabetical-index-source-attrs, - text-index-title-template?, - text-alphabetical-index-entry-template* - } -text-alphabetical-index-source-attrs = - text-index-scope-attr - & text-relative-tab-stop-position-attr - & attribute text:ignore-case { boolean }? - & attribute text:main-entry-style-name { styleNameRef }? - & attribute text:alphabetical-separators { boolean }? - & attribute text:combine-entries { boolean }? - & attribute text:combine-entries-with-dash { boolean }? - & attribute text:combine-entries-with-pp { boolean }? - & attribute text:use-keys-as-entries { boolean }? - & attribute text:capitalize-entries { boolean }? - & attribute text:comma-separated { boolean }? - & attribute fo:language { languageCode }? - & attribute fo:country { countryCode }? - & attribute fo:script { scriptCode }? - & attribute style:rfc-language-tag { language }? - & attribute text:sort-algorithm { \string }? -text-alphabetical-index-auto-mark-file = - element text:alphabetical-index-auto-mark-file { - attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI } - } -text-alphabetical-index-entry-template = - element text:alphabetical-index-entry-template { - text-alphabetical-index-entry-template-attrs, - (text-index-entry-chapter - | text-index-entry-page-number - | text-index-entry-text - | text-index-entry-span - | text-index-entry-tab-stop)* - } -text-alphabetical-index-entry-template-attrs = - attribute text:outline-level { "1" | "2" | "3" | "separator" } - & attribute text:style-name { styleNameRef } -text-bibliography = - element text:bibliography { - common-section-attlist, text-bibliography-source, text-index-body - } -text-bibliography-source = - element text:bibliography-source { - text-index-title-template?, text-bibliography-entry-template* - } -text-bibliography-entry-template = - element text:bibliography-entry-template { - text-bibliography-entry-template-attrs, - (text-index-entry-span - | text-index-entry-tab-stop - | text-index-entry-bibliography)* - } -text-bibliography-entry-template-attrs = - attribute text:bibliography-type { text-bibliography-types } - & attribute text:style-name { styleNameRef } -text-index-source-styles = - element text:index-source-styles { - attribute text:outline-level { positiveInteger }, - text-index-source-style* - } -text-index-source-style = - element text:index-source-style { - attribute text:style-name { styleName }, - empty - } -text-index-title-template = - element text:index-title-template { - attribute text:style-name { styleNameRef }?, - text - } -text-index-entry-chapter = - element text:index-entry-chapter { - attribute text:style-name { styleNameRef }?, - text-index-entry-chapter-attrs - } -text-index-entry-chapter-attrs = - attribute text:display { - "name" - | "number" - | "number-and-name" - | "plain-number" - | "plain-number-and-name" - }? - & attribute text:outline-level { positiveInteger }? -text-index-entry-text = - element text:index-entry-text { - attribute text:style-name { styleNameRef }? - } -text-index-entry-page-number = - element text:index-entry-page-number { - attribute text:style-name { styleNameRef }? - } -text-index-entry-span = - element text:index-entry-span { - attribute text:style-name { styleNameRef }?, - text - } -text-index-entry-bibliography = - element text:index-entry-bibliography { - text-index-entry-bibliography-attrs - } -text-index-entry-bibliography-attrs = - attribute text:style-name { styleNameRef }? - & attribute text:bibliography-data-field { - "address" - | "annote" - | "author" - | "bibliography-type" - | "booktitle" - | "chapter" - | "custom1" - | "custom2" - | "custom3" - | "custom4" - | "custom5" - | "edition" - | "editor" - | "howpublished" - | "identifier" - | "institution" - | "isbn" - | "issn" - | "journal" - | "month" - | "note" - | "number" - | "organizations" - | "pages" - | "publisher" - | "report-type" - | "school" - | "series" - | "title" - | "url" - | "volume" - | "year" - } -text-index-entry-tab-stop = - element text:index-entry-tab-stop { - attribute text:style-name { styleNameRef }?, - text-index-entry-tab-stop-attrs - } -text-index-entry-tab-stop-attrs = - attribute style:leader-char { character }? - & (attribute style:type { "right" } - | (attribute style:type { "left" }, - attribute style:position { length })) -text-index-entry-link-start = - element text:index-entry-link-start { - attribute text:style-name { styleNameRef }? - } -text-index-entry-link-end = - element text:index-entry-link-end { - attribute text:style-name { styleNameRef }? - } -table-table = - element table:table { - table-table-attlist, - table-title?, - table-desc?, - table-table-source?, - office-dde-source?, - table-scenario?, - office-forms?, - table-shapes?, - table-columns-and-groups, - table-rows-and-groups, - table-named-expressions? - } -table-columns-and-groups = - (table-table-column-group | table-columns-no-group)+ -table-columns-no-group = - (table-columns, (table-table-header-columns, table-columns?)?) - | (table-table-header-columns, table-columns?) -table-columns = table-table-columns | table-table-column+ -table-rows-and-groups = (table-table-row-group | table-rows-no-group)+ -table-rows-no-group = - (table-rows, (table-table-header-rows, table-rows?)?) - | (table-table-header-rows, table-rows?) -table-rows = - table-table-rows | (text-soft-page-break?, table-table-row)+ -table-table-attlist = - attribute table:name { \string }? - & attribute table:style-name { styleNameRef }? - & attribute table:template-name { \string }? - & attribute table:use-first-row-styles { boolean }? - & attribute table:use-last-row-styles { boolean }? - & attribute table:use-first-column-styles { boolean }? - & attribute table:use-last-column-styles { boolean }? - & attribute table:use-banding-rows-styles { boolean }? - & attribute table:use-banding-columns-styles { boolean }? - & attribute table:protected { boolean }? - & attribute table:protection-key { \string }? - & attribute table:protection-key-digest-algorithm { anyIRI }? - & attribute table:print { boolean }? - & attribute table:print-ranges { cellRangeAddressList }? - & xml-id? - & attribute table:is-sub-table { boolean }? -table-title = element table:title { text } -table-desc = element table:desc { text } -table-table-row = - element table:table-row { - table-table-row-attlist, - (table-table-cell | table-covered-table-cell)+ - } -table-table-row-attlist = - attribute table:number-rows-repeated { positiveInteger }? - & attribute table:style-name { styleNameRef }? - & attribute table:default-cell-style-name { styleNameRef }? - & attribute table:visibility { table-visibility-value }? - & xml-id? -table-visibility-value = "visible" | "collapse" | "filter" -table-table-cell = - element table:table-cell { - table-table-cell-attlist, - table-table-cell-attlist-extra, - table-table-cell-content - } -table-covered-table-cell = - element table:covered-table-cell { - table-table-cell-attlist, table-table-cell-content - } -table-table-cell-content = - table-cell-range-source?, - office-annotation?, - table-detective?, - text-content* -table-table-cell-attlist = - attribute table:number-columns-repeated { positiveInteger }? - & attribute table:style-name { styleNameRef }? - & attribute table:content-validation-name { \string }? - & attribute table:formula { \string }? - & common-value-and-type-attlist? - & attribute table:protect { boolean }? - & attribute table:protected { boolean }? - & xml-id? - & common-in-content-meta-attlist? -table-table-cell-attlist-extra = - attribute table:number-columns-spanned { positiveInteger }? - & attribute table:number-rows-spanned { positiveInteger }? - & attribute table:number-matrix-columns-spanned { positiveInteger }? - & attribute table:number-matrix-rows-spanned { positiveInteger }? -table-table-column = - element table:table-column { table-table-column-attlist, empty } -table-table-column-attlist = - attribute table:number-columns-repeated { positiveInteger }? - & attribute table:style-name { styleNameRef }? - & attribute table:visibility { table-visibility-value }? - & attribute table:default-cell-style-name { styleNameRef }? - & xml-id? -table-table-header-columns = - element table:table-header-columns { table-table-column+ } -table-table-columns = - element table:table-columns { table-table-column+ } -table-table-column-group = - element table:table-column-group { - table-table-column-group-attlist, table-columns-and-groups - } -table-table-column-group-attlist = attribute table:display { boolean }? -table-table-header-rows = - element table:table-header-rows { - (text-soft-page-break?, table-table-row)+ - } -table-table-rows = - element table:table-rows { (text-soft-page-break?, table-table-row)+ } -table-table-row-group = - element table:table-row-group { - table-table-row-group-attlist, table-rows-and-groups - } -table-table-row-group-attlist = attribute table:display { boolean }? -cellAddress = +paragraph-content-or-hyperlink = paragraph-content | text-a +pathData = xsd:string +percent = xsd:string { pattern = "-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%" } +point3D = xsd:string { - pattern = "($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+" + pattern = + "\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))){2}[ ]*\)" } -cellRangeAddress = +points = + xsd:string { pattern = "-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*" } +positiveInteger = xsd:positiveInteger +positiveLength = xsd:string { pattern = - "($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+)?" - } - | xsd:string { - pattern = - "($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+:($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+" - } - | xsd:string { - pattern = - "($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+" - } -cellRangeAddressList = - xsd:string - >> dc:description [ - 'Value is a space separated list of "cellRangeAddress" patterns' - ] -table-table-source = - element table:table-source { - table-table-source-attlist, table-linked-source-attlist, empty - } -table-table-source-attlist = - attribute table:mode { "copy-all" | "copy-results-only" }? - & attribute table:table-name { \string }? -table-linked-source-attlist = - attribute xlink:type { "simple" } - & attribute xlink:href { anyIRI } - & attribute xlink:actuate { "onRequest" }? - & attribute table:filter-name { \string }? - & attribute table:filter-options { \string }? - & attribute table:refresh-delay { duration }? -table-scenario = - element table:scenario { table-scenario-attlist, empty } -table-scenario-attlist = - attribute table:scenario-ranges { cellRangeAddressList } - & attribute table:is-active { boolean } - & attribute table:display-border { boolean }? - & attribute table:border-color { color }? - & attribute table:copy-back { boolean }? - & attribute table:copy-styles { boolean }? - & attribute table:copy-formulas { boolean }? - & attribute table:comment { \string }? - & attribute table:protected { boolean }? -table-shapes = element table:shapes { shape+ } -table-cell-range-source = - element table:cell-range-source { - table-table-cell-range-source-attlist, - table-linked-source-attlist, - empty - } -table-table-cell-range-source-attlist = - attribute table:name { \string } - & attribute table:last-column-spanned { positiveInteger } - & attribute table:last-row-spanned { positiveInteger } -table-detective = - element table:detective { table-highlighted-range*, table-operation* } -table-operation = - element table:operation { table-operation-attlist, empty } -table-operation-attlist = - attribute table:name { - "trace-dependents" - | "remove-dependents" - | "trace-precedents" - | "remove-precedents" - | "trace-errors" - } - & attribute table:index { nonNegativeInteger } -table-highlighted-range = - element table:highlighted-range { - (table-highlighted-range-attlist - | table-highlighted-range-attlist-invalid), - empty - } -table-highlighted-range-attlist = - attribute table:cell-range-address { cellRangeAddress }? - & attribute table:direction { - "from-another-table" | "to-another-table" | "from-same-table" - } - & attribute table:contains-error { boolean }? -table-highlighted-range-attlist-invalid = - attribute table:marked-invalid { boolean } -office-spreadsheet-attlist = - attribute table:structure-protected { boolean }?, - attribute table:protection-key { \string }?, - attribute table:protection-key-digest-algorithm { anyIRI }? -table-calculation-settings = - element table:calculation-settings { - table-calculation-setting-attlist, - table-null-date?, - table-iteration? - } -table-calculation-setting-attlist = - attribute table:case-sensitive { boolean }? - & attribute table:precision-as-shown { boolean }? - & attribute table:search-criteria-must-apply-to-whole-cell { - boolean - }? - & attribute table:automatic-find-labels { boolean }? - & attribute table:use-regular-expressions { boolean }? - & attribute table:use-wildcards { boolean }? - & attribute table:null-year { positiveInteger }? -table-null-date = - element table:null-date { - attribute table:value-type { "date" }?, - attribute table:date-value { date }?, - empty - } -table-iteration = - element table:iteration { - attribute table:status { "enable" | "disable" }?, - attribute table:steps { positiveInteger }?, - attribute table:maximum-difference { double }?, - empty - } -table-content-validations = - element table:content-validations { table-content-validation+ } -table-content-validation = - element table:content-validation { - table-validation-attlist, - table-help-message?, - (table-error-message | (table-error-macro, office-event-listeners))? - } -table-validation-attlist = - attribute table:name { \string } - & attribute table:condition { \string }? - & attribute table:base-cell-address { cellAddress }? - & attribute table:allow-empty-cell { boolean }? - & attribute table:display-list { - "none" | "unsorted" | "sort-ascending" - }? -table-help-message = - element table:help-message { - attribute table:title { \string }?, - attribute table:display { boolean }?, - text-p* - } -table-error-message = - element table:error-message { - attribute table:title { \string }?, - attribute table:display { boolean }?, - attribute table:message-type { - "stop" | "warning" | "information" - }?, - text-p* - } -table-error-macro = - element table:error-macro { - attribute table:execute { boolean }? - } -table-label-ranges = element table:label-ranges { table-label-range* } -table-label-range = - element table:label-range { table-label-range-attlist, empty } -table-label-range-attlist = - attribute table:label-cell-range-address { cellRangeAddress } - & attribute table:data-cell-range-address { cellRangeAddress } - & attribute table:orientation { "column" | "row" } -table-named-expressions = - element table:named-expressions { - (table-named-range | table-named-expression)* - } -table-named-range = - element table:named-range { table-named-range-attlist, empty } -table-named-range-attlist = - attribute table:name { \string }, - attribute table:cell-range-address { cellRangeAddress }, - attribute table:base-cell-address { cellAddress }?, - attribute table:range-usable-as { - "none" - | list { - ("print-range" | "filter" | "repeat-row" | "repeat-column")+ - } - }? -table-named-expression = - element table:named-expression { - table-named-expression-attlist, empty - } -table-named-expression-attlist = - attribute table:name { \string }, - attribute table:expression { \string }, - attribute table:base-cell-address { cellAddress }? -table-database-ranges = - element table:database-ranges { table-database-range* } -table-database-range = - element table:database-range { - table-database-range-attlist, - (table-database-source-sql - | table-database-source-table - | table-database-source-query)?, - table-filter?, - table-sort?, - table-subtotal-rules? - } -table-database-range-attlist = - attribute table:name { \string }? - & attribute table:is-selection { boolean }? - & attribute table:on-update-keep-styles { boolean }? - & attribute table:on-update-keep-size { boolean }? - & attribute table:has-persistent-data { boolean }? - & attribute table:orientation { "column" | "row" }? - & attribute table:contains-header { boolean }? - & attribute table:display-filter-buttons { boolean }? - & attribute table:target-range-address { cellRangeAddress } - & attribute table:refresh-delay { boolean }? -table-database-source-sql = - element table:database-source-sql { - table-database-source-sql-attlist, empty - } -table-database-source-sql-attlist = - attribute table:database-name { \string } - & attribute table:sql-statement { \string } - & attribute table:parse-sql-statement { boolean }? -table-database-source-query = - element table:database-source-table { - table-database-source-table-attlist, empty - } -table-database-source-table-attlist = - attribute table:database-name { \string } - & attribute table:database-table-name { \string } -table-database-source-table = - element table:database-source-query { - table-database-source-query-attlist, empty - } -table-database-source-query-attlist = - attribute table:database-name { \string } - & attribute table:query-name { \string } -table-sort = element table:sort { table-sort-attlist, table-sort-by+ } -table-sort-attlist = - attribute table:bind-styles-to-content { boolean }? - & attribute table:target-range-address { cellRangeAddress }? - & attribute table:case-sensitive { boolean }? - & attribute table:language { languageCode }? - & attribute table:country { countryCode }? - & attribute table:script { scriptCode }? - & attribute table:rfc-language-tag { language }? - & attribute table:algorithm { \string }? - & attribute table:embedded-number-behavior { - "alpha-numeric" | "integer" | "double" - }? -table-sort-by = element table:sort-by { table-sort-by-attlist, empty } -table-sort-by-attlist = - attribute table:field-number { nonNegativeInteger } - & attribute table:data-type { - "text" | "number" | "automatic" | \string - }? - & attribute table:order { "ascending" | "descending" }? -table-subtotal-rules = - element table:subtotal-rules { - table-subtotal-rules-attlist, - table-sort-groups?, - table-subtotal-rule* - } -table-subtotal-rules-attlist = - attribute table:bind-styles-to-content { boolean }? - & attribute table:case-sensitive { boolean }? - & attribute table:page-breaks-on-group-change { boolean }? -table-sort-groups = - element table:sort-groups { table-sort-groups-attlist, empty } -table-sort-groups-attlist = - attribute table:data-type { - "text" | "number" | "automatic" | \string - }? - & attribute table:order { "ascending" | "descending" }? -table-subtotal-rule = - element table:subtotal-rule { - table-subtotal-rule-attlist, table-subtotal-field* - } -table-subtotal-rule-attlist = - attribute table:group-by-field-number { nonNegativeInteger } -table-subtotal-field = - element table:subtotal-field { table-subtotal-field-attlist, empty } -table-subtotal-field-attlist = - attribute table:field-number { nonNegativeInteger } - & attribute table:function { - "average" - | "count" - | "countnums" - | "max" - | "min" - | "product" - | "stdev" - | "stdevp" - | "sum" - | "var" - | "varp" - | \string - } -table-filter = - element table:filter { - table-filter-attlist, - (table-filter-condition | table-filter-and | table-filter-or) - } -table-filter-attlist = - attribute table:target-range-address { cellRangeAddress }? - & attribute table:condition-source { "self" | "cell-range" }? - & attribute table:condition-source-range-address { cellRangeAddress }? - & attribute table:display-duplicates { boolean }? -table-filter-and = - element table:filter-and { - (table-filter-or | table-filter-condition)+ - } -table-filter-or = - element table:filter-or { - (table-filter-and | table-filter-condition)+ - } -table-filter-condition = - element table:filter-condition { - table-filter-condition-attlist, table-filter-set-item* - } -table-filter-condition-attlist = - attribute table:field-number { nonNegativeInteger } - & attribute table:value { \string | double } - & attribute table:operator { \string } - & attribute table:case-sensitive { \string }? - & attribute table:data-type { "text" | "number" }? -table-filter-set-item = - element table:filter-set-item { - attribute table:value { \string }, - empty - } -table-data-pilot-tables = - element table:data-pilot-tables { table-data-pilot-table* } -table-data-pilot-table = - element table:data-pilot-table { - table-data-pilot-table-attlist, - (table-database-source-sql - | table-database-source-table - | table-database-source-query - | table-source-service - | table-source-cell-range)?, - table-data-pilot-field+ - } -table-data-pilot-table-attlist = - attribute table:name { \string } - & attribute table:application-data { \string }? - & attribute table:grand-total { "none" | "row" | "column" | "both" }? - & attribute table:ignore-empty-rows { boolean }? - & attribute table:identify-categories { boolean }? - & attribute table:target-range-address { cellRangeAddress } - & attribute table:buttons { cellRangeAddressList }? - & attribute table:show-filter-button { boolean }? - & attribute table:drill-down-on-double-click { boolean }? -table-source-cell-range = - element table:source-cell-range { - table-source-cell-range-attlist, table-filter? - } -table-source-cell-range-attlist = - attribute table:cell-range-address { cellRangeAddress } -table-source-service = - element table:source-service { table-source-service-attlist, empty } -table-source-service-attlist = - attribute table:name { \string } - & attribute table:source-name { \string } - & attribute table:object-name { \string } - & attribute table:user-name { \string }? - & attribute table:password { \string }? -table-data-pilot-field = - element table:data-pilot-field { - table-data-pilot-field-attlist, - table-data-pilot-level?, - table-data-pilot-field-reference?, - table-data-pilot-groups? - } -table-data-pilot-field-attlist = - attribute table:source-field-name { \string } - & (attribute table:orientation { - "row" | "column" | "data" | "hidden" - } - | (attribute table:orientation { "page" }, - attribute table:selected-page { \string })) - & attribute table:is-data-layout-field { \string }? - & attribute table:function { - "auto" - | "average" - | "count" - | "countnums" - | "max" - | "min" - | "product" - | "stdev" - | "stdevp" - | "sum" - | "var" - | "varp" - | \string - }? - & attribute table:used-hierarchy { integer }? -table-data-pilot-level = - element table:data-pilot-level { - table-data-pilot-level-attlist, - table-data-pilot-subtotals?, - table-data-pilot-members?, - table-data-pilot-display-info?, - table-data-pilot-sort-info?, - table-data-pilot-layout-info? - } -table-data-pilot-level-attlist = attribute table:show-empty { boolean }? -table-data-pilot-subtotals = - element table:data-pilot-subtotals { table-data-pilot-subtotal* } -table-data-pilot-subtotal = - element table:data-pilot-subtotal { - table-data-pilot-subtotal-attlist, empty - } -table-data-pilot-subtotal-attlist = - attribute table:function { - "auto" - | "average" - | "count" - | "countnums" - | "max" - | "min" - | "product" - | "stdev" - | "stdevp" - | "sum" - | "var" - | "varp" - | \string - } -table-data-pilot-members = - element table:data-pilot-members { table-data-pilot-member* } -table-data-pilot-member = - element table:data-pilot-member { - table-data-pilot-member-attlist, empty - } -table-data-pilot-member-attlist = - attribute table:name { \string } - & attribute table:display { boolean }? - & attribute table:show-details { boolean }? -table-data-pilot-display-info = - element table:data-pilot-display-info { - table-data-pilot-display-info-attlist, empty - } -table-data-pilot-display-info-attlist = - attribute table:enabled { boolean } - & attribute table:data-field { \string } - & attribute table:member-count { nonNegativeInteger } - & attribute table:display-member-mode { "from-top" | "from-bottom" } -table-data-pilot-sort-info = - element table:data-pilot-sort-info { - table-data-pilot-sort-info-attlist, empty - } -table-data-pilot-sort-info-attlist = - ((attribute table:sort-mode { "data" }, - attribute table:data-field { \string }) - | attribute table:sort-mode { "none" | "manual" | "name" }) - & attribute table:order { "ascending" | "descending" } -table-data-pilot-layout-info = - element table:data-pilot-layout-info { - table-data-pilot-layout-info-attlist, empty - } -table-data-pilot-layout-info-attlist = - attribute table:layout-mode { - "tabular-layout" - | "outline-subtotals-top" - | "outline-subtotals-bottom" - } - & attribute table:add-empty-lines { boolean } -table-data-pilot-field-reference = - element table:data-pilot-field-reference { - table-data-pilot-field-reference-attlist - } -table-data-pilot-field-reference-attlist = - attribute table:field-name { \string } - & ((attribute table:member-type { "named" }, - attribute table:member-name { \string }) - | attribute table:member-type { "previous" | "next" }) - & attribute table:type { - "none" - | "member-difference" - | "member-percentage" - | "member-percentage-difference" - | "running-total" - | "row-percentage" - | "column-percentage" - | "total-percentage" - | "index" - } -table-data-pilot-groups = - element table:data-pilot-groups { - table-data-pilot-groups-attlist, table-data-pilot-group+ - } -table-data-pilot-groups-attlist = - attribute table:source-field-name { \string } - & (attribute table:date-start { dateOrDateTime | "auto" } - | attribute table:start { double | "auto" }) - & (attribute table:date-end { dateOrDateTime | "auto" } - | attribute table:end { double | "auto" }) - & attribute table:step { double } - & attribute table:grouped-by { - "seconds" - | "minutes" - | "hours" - | "days" - | "months" - | "quarters" - | "years" - } -table-data-pilot-group = - element table:data-pilot-group { - table-data-pilot-group-attlist, table-data-pilot-group-member+ - } -table-data-pilot-group-attlist = attribute table:name { \string } -table-data-pilot-group-member = - element table:data-pilot-group-member { - table-data-pilot-group-member-attlist - } -table-data-pilot-group-member-attlist = attribute table:name { \string } -table-consolidation = - element table:consolidation { table-consolidation-attlist, empty } -table-consolidation-attlist = - attribute table:function { - "average" - | "count" - | "countnums" - | "max" - | "min" - | "product" - | "stdev" - | "stdevp" - | "sum" - | "var" - | "varp" - | \string - } - & attribute table:source-cell-range-addresses { cellRangeAddressList } - & attribute table:target-cell-address { cellAddress } - & attribute table:use-labels { "none" | "row" | "column" | "both" }? - & attribute table:link-to-source-data { boolean }? -table-dde-links = element table:dde-links { table-dde-link+ } -table-tracked-changes = - element table:tracked-changes { - table-tracked-changes-attlist, - (table-cell-content-change - | table-insertion - | table-deletion - | table-movement)* - } -table-tracked-changes-attlist = - attribute table:track-changes { boolean }? -table-insertion = - element table:insertion { - table-insertion-attlist, - common-table-change-attlist, - office-change-info, - table-dependencies?, - table-deletions? - } -table-insertion-attlist = - attribute table:type { "row" | "column" | "table" } - & attribute table:position { integer } - & attribute table:count { positiveInteger }? - & attribute table:table { integer }? -table-dependencies = element table:dependencies { table-dependency+ } -table-dependency = - element table:dependency { - attribute table:id { \string }, - empty - } -table-deletions = - element table:deletions { - (table-cell-content-deletion | table-change-deletion)+ - } -table-cell-content-deletion = - element table:cell-content-deletion { - attribute table:id { \string }?, - table-cell-address?, - table-change-track-table-cell? - } -table-change-deletion = - element table:change-deletion { - attribute table:id { \string }?, - empty - } -table-deletion = - element table:deletion { - table-deletion-attlist, - common-table-change-attlist, - office-change-info, - table-dependencies?, - table-deletions?, - table-cut-offs? - } -table-deletion-attlist = - attribute table:type { "row" | "column" | "table" } - & attribute table:position { integer } - & attribute table:table { integer }? - & attribute table:multi-deletion-spanned { integer }? -table-cut-offs = - element table:cut-offs { - table-movement-cut-off+ - | (table-insertion-cut-off, table-movement-cut-off*) - } -table-insertion-cut-off = - element table:insertion-cut-off { - table-insertion-cut-off-attlist, empty - } -table-insertion-cut-off-attlist = - attribute table:id { \string } - & attribute table:position { integer } -table-movement-cut-off = - element table:movement-cut-off { - table-movement-cut-off-attlist, empty - } -table-movement-cut-off-attlist = - attribute table:position { integer } - | (attribute table:start-position { integer }, - attribute table:end-position { integer }) -table-movement = - element table:movement { - common-table-change-attlist, - table-source-range-address, - table-target-range-address, - office-change-info, - table-dependencies?, - table-deletions? - } -table-source-range-address = - element table:source-range-address { - common-table-range-attlist, empty - } -table-target-range-address = - element table:target-range-address { - common-table-range-attlist, empty - } -common-table-range-attlist = - common-table-cell-address-attlist - | common-table-cell-range-address-attlist -common-table-cell-address-attlist = - attribute table:column { integer }, - attribute table:row { integer }, - attribute table:table { integer } -common-table-cell-range-address-attlist = - attribute table:start-column { integer }, - attribute table:start-row { integer }, - attribute table:start-table { integer }, - attribute table:end-column { integer }, - attribute table:end-row { integer }, - attribute table:end-table { integer } -table-change-track-table-cell = - element table:change-track-table-cell { - table-change-track-table-cell-attlist, text-p* - } -table-change-track-table-cell-attlist = - attribute table:cell-address { cellAddress }? - & attribute table:matrix-covered { boolean }? - & attribute table:formula { \string }? - & attribute table:number-matrix-columns-spanned { positiveInteger }? - & attribute table:number-matrix-rows-spanned { positiveInteger }? - & common-value-and-type-attlist? -table-cell-content-change = - element table:cell-content-change { - common-table-change-attlist, - table-cell-address, - office-change-info, - table-dependencies?, - table-deletions?, - table-previous - } -table-cell-address = - element table:cell-address { - common-table-cell-address-attlist, empty - } -table-previous = - element table:previous { - attribute table:id { \string }?, - table-change-track-table-cell - } -common-table-change-attlist = - attribute table:id { \string } - & attribute table:acceptance-state { - "accepted" | "rejected" | "pending" - }? - & attribute table:rejecting-change-id { \string }? -style-handout-master = - element style:handout-master { - common-presentation-header-footer-attlist, - style-handout-master-attlist, - shape* - } -style-handout-master-attlist = - attribute presentation:presentation-page-layout-name { styleNameRef }? - & attribute style:page-layout-name { styleNameRef } - & attribute draw:style-name { styleNameRef }? -draw-layer-set = element draw:layer-set { draw-layer* } -draw-layer = - element draw:layer { draw-layer-attlist, svg-title?, svg-desc? } -draw-layer-attlist = - attribute draw:name { \string } - & attribute draw:protected { boolean }? - & attribute draw:display { "always" | "screen" | "printer" | "none" }? -draw-page = - element draw:page { - common-presentation-header-footer-attlist, - draw-page-attlist, - svg-title?, - svg-desc?, - draw-layer-set?, - office-forms?, - shape*, - (presentation-animations | animation-element)?, - presentation-notes? - } -draw-page-attlist = - attribute draw:name { \string }? - & attribute draw:style-name { styleNameRef }? - & attribute draw:master-page-name { styleNameRef } - & attribute presentation:presentation-page-layout-name { - styleNameRef - }? - & (xml-id, - attribute draw:id { NCName }?)? - & attribute draw:nav-order { IDREFS }? -common-presentation-header-footer-attlist = - attribute presentation:use-header-name { \string }? - & attribute presentation:use-footer-name { \string }? - & attribute presentation:use-date-time-name { \string }? -shape = shape-instance | draw-a -shape-instance = - draw-rect - | draw-line - | draw-polyline - | draw-polygon - | draw-regular-polygon - | draw-path - | draw-circle - | draw-ellipse - | draw-g - | draw-page-thumbnail - | draw-frame - | draw-measure - | draw-caption - | draw-connector - | draw-control - | dr3d-scene - | draw-custom-shape -draw-rect = - element draw:rect { - draw-rect-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -draw-rect-attlist = - attribute draw:corner-radius { nonNegativeLength }? - | (attribute svg:rx { nonNegativeLength }?, - attribute svg:ry { nonNegativeLength }?) -draw-line = - element draw:line { - draw-line-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -draw-line-attlist = - attribute svg:x1 { coordinate } - & attribute svg:y1 { coordinate } - & attribute svg:x2 { coordinate } - & attribute svg:y2 { coordinate } -draw-polyline = - element draw:polyline { - common-draw-points-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-viewbox-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -common-draw-points-attlist = attribute draw:points { points } -draw-polygon = - element draw:polygon { - common-draw-points-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-viewbox-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -draw-regular-polygon = - element draw:regular-polygon { - draw-regular-polygon-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -draw-regular-polygon-attlist = - (attribute draw:concave { "false" } - | (attribute draw:concave { "true" }, - draw-regular-polygon-sharpness-attlist)) - & attribute draw:corners { positiveInteger } -draw-regular-polygon-sharpness-attlist = - attribute draw:sharpness { percent } -draw-path = - element draw:path { - common-draw-path-data-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-viewbox-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -common-draw-path-data-attlist = attribute svg:d { pathData } -draw-circle = - element draw:circle { - ((draw-circle-attlist, common-draw-circle-ellipse-pos-attlist) - | (common-draw-position-attlist, common-draw-size-attlist)), - common-draw-circle-ellipse-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -common-draw-circle-ellipse-pos-attlist = - attribute svg:cx { coordinate }, - attribute svg:cy { coordinate } -draw-circle-attlist = attribute svg:r { length } -common-draw-circle-ellipse-attlist = - attribute draw:kind { "full" | "section" | "cut" | "arc" }? - & attribute draw:start-angle { angle }? - & attribute draw:end-angle { angle }? -draw-ellipse = - element draw:ellipse { - ((draw-ellipse-attlist, common-draw-circle-ellipse-pos-attlist) - | (common-draw-position-attlist, common-draw-size-attlist)), - common-draw-circle-ellipse-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -draw-ellipse-attlist = - attribute svg:rx { length }, - attribute svg:ry { length } -draw-connector = - element draw:connector { - draw-connector-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - common-draw-viewbox-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -draw-connector-attlist = - attribute draw:type { "standard" | "lines" | "line" | "curve" }? - & (attribute svg:x1 { coordinate }, - attribute svg:y1 { coordinate })? - & attribute draw:start-shape { IDREF }? - & attribute draw:start-glue-point { nonNegativeInteger }? - & (attribute svg:x2 { coordinate }, - attribute svg:y2 { coordinate })? - & attribute draw:end-shape { IDREF }? - & attribute draw:end-glue-point { nonNegativeInteger }? - & attribute draw:line-skew { - list { length, (length, length?)? } - }? - & attribute svg:d { pathData }? -draw-caption = - element draw:caption { - draw-caption-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -draw-caption-attlist = - (attribute draw:caption-point-x { coordinate }, - attribute draw:caption-point-y { coordinate })? - & attribute draw:corner-radius { nonNegativeLength }? -draw-measure = - element draw:measure { - draw-measure-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text - } -draw-measure-attlist = - attribute svg:x1 { coordinate } - & attribute svg:y1 { coordinate } - & attribute svg:x2 { coordinate } - & attribute svg:y2 { coordinate } -draw-control = - element draw:control { - draw-control-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - draw-glue-point* - } -draw-control-attlist = attribute draw:control { IDREF } -draw-page-thumbnail = - element draw:page-thumbnail { - draw-page-thumbnail-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - presentation-shape-attlist, - common-draw-shape-with-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc? - } -draw-page-thumbnail-attlist = - attribute draw:page-number { positiveInteger }? -draw-g = - element draw:g { - draw-g-attlist, - common-draw-z-index-attlist, - common-draw-name-attlist, - common-draw-id-attlist, - common-draw-style-name-attlist, - common-text-spreadsheet-shape-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - shape* - } -draw-g-attlist = attribute svg:y { coordinate }? -common-draw-name-attlist = attribute draw:name { \string }? -common-draw-caption-id-attlist = attribute draw:caption-id { IDREF }? -common-draw-position-attlist = - attribute svg:x { coordinate }?, - attribute svg:y { coordinate }? -common-draw-size-attlist = - attribute svg:width { length }?, - attribute svg:height { length }? -common-draw-transform-attlist = attribute draw:transform { \string }? -common-draw-viewbox-attlist = - attribute svg:viewBox { - list { integer, integer, integer, integer } - } -common-draw-style-name-attlist = - (attribute draw:style-name { styleNameRef }?, - attribute draw:class-names { styleNameRefs }?) - | (attribute presentation:style-name { styleNameRef }?, - attribute presentation:class-names { styleNameRefs }?) -common-draw-text-style-name-attlist = - attribute draw:text-style-name { styleNameRef }? -common-draw-layer-name-attlist = attribute draw:layer { \string }? -common-draw-id-attlist = - (xml-id, - attribute draw:id { NCName }?)? -common-draw-z-index-attlist = - attribute draw:z-index { nonNegativeInteger }? -common-text-spreadsheet-shape-attlist = - attribute table:end-cell-address { cellAddress }? - & attribute table:end-x { coordinate }? - & attribute table:end-y { coordinate }? - & attribute table:table-background { boolean }? - & common-text-anchor-attlist -common-text-anchor-attlist = - attribute text:anchor-type { - "page" | "frame" | "paragraph" | "char" | "as-char" - }? - & attribute text:anchor-page-number { positiveInteger }? -draw-text = (text-p | text-list)* -common-draw-shape-with-styles-attlist = - common-draw-z-index-attlist, - common-draw-id-attlist, - common-draw-layer-name-attlist, - common-draw-style-name-attlist, - common-draw-transform-attlist, - common-draw-name-attlist, - common-text-spreadsheet-shape-attlist -common-draw-shape-with-text-and-styles-attlist = - common-draw-shape-with-styles-attlist, - common-draw-text-style-name-attlist -draw-glue-point = - element draw:glue-point { draw-glue-point-attlist, empty } -draw-glue-point-attlist = - attribute draw:id { nonNegativeInteger } - & attribute svg:x { distance | percent } - & attribute svg:y { distance | percent } - & attribute draw:align { - "top-left" - | "top" - | "top-right" - | "left" - | "center" - | "right" - | "bottom-left" - | "bottom-right" - }? - & attribute draw:escape-direction { - "auto" - | "left" - | "right" - | "up" - | "down" - | "horizontal" - | "vertical" - } -svg-title = element svg:title { text } -svg-desc = element svg:desc { text } -draw-frame = - element draw:frame { - common-draw-shape-with-text-and-styles-attlist, - common-draw-position-attlist, - common-draw-rel-size-attlist, - common-draw-caption-id-attlist, - presentation-shape-attlist, - draw-frame-attlist, - (draw-text-box - | draw-image - | draw-object - | draw-object-ole - | draw-applet - | draw-floating-frame - | draw-plugin - | table-table)*, - office-event-listeners?, - draw-glue-point*, - draw-image-map?, - svg-title?, - svg-desc?, - (draw-contour-polygon | draw-contour-path)? - } -common-draw-rel-size-attlist = - common-draw-size-attlist, - attribute style:rel-width { percent | "scale" | "scale-min" }?, - attribute style:rel-height { percent | "scale" | "scale-min" }? -draw-frame-attlist = attribute draw:copy-of { \string }? -draw-text-box = - element draw:text-box { draw-text-box-attlist, text-content* } -draw-text-box-attlist = - attribute draw:chain-next-name { \string }? - & attribute draw:corner-radius { nonNegativeLength }? - & attribute fo:min-height { length | percent }? - & attribute fo:min-width { length | percent }? - & attribute fo:max-height { length | percent }? - & attribute fo:max-width { length | percent }? - & (xml-id, - attribute text:id { NCName }?)? -draw-image = - element draw:image { - draw-image-attlist, - (common-draw-data-attlist | office-binary-data), - draw-text - } -common-draw-data-attlist = - attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute xlink:show { "embed" }?, - attribute xlink:actuate { "onLoad" }? -office-binary-data = element office:binary-data { base64Binary } -draw-image-attlist = - attribute draw:filter-name { \string }? - & xml-id? -draw-object = - element draw:object { - draw-object-attlist, - (common-draw-data-attlist | office-document | math-math) - } -draw-object-ole = - element draw:object-ole { - draw-object-ole-attlist, - (common-draw-data-attlist | office-binary-data) - } -draw-object-attlist = - attribute draw:notify-on-update-of-ranges { - cellRangeAddressList | \string - }? - & xml-id? -draw-object-ole-attlist = - attribute draw:class-id { \string }? - & xml-id? -draw-applet = - element draw:applet { - draw-applet-attlist, common-draw-data-attlist?, draw-param* - } -draw-applet-attlist = - attribute draw:code { \string }? - & attribute draw:object { \string }? - & attribute draw:archive { \string }? - & attribute draw:may-script { boolean }? - & xml-id? -draw-plugin = - element draw:plugin { - draw-plugin-attlist, common-draw-data-attlist, draw-param* - } -draw-plugin-attlist = - attribute draw:mime-type { \string }? - & xml-id? -draw-param = element draw:param { draw-param-attlist, empty } -draw-param-attlist = - attribute draw:name { \string }? - & attribute draw:value { \string }? -draw-floating-frame = - element draw:floating-frame { - draw-floating-frame-attlist, common-draw-data-attlist - } -draw-floating-frame-attlist = - attribute draw:frame-name { \string }? - & xml-id? -draw-contour-polygon = - element draw:contour-polygon { - common-contour-attlist, - common-draw-size-attlist, - common-draw-viewbox-attlist, - common-draw-points-attlist, - empty - } -draw-contour-path = - element draw:contour-path { - common-contour-attlist, - common-draw-size-attlist, - common-draw-viewbox-attlist, - common-draw-path-data-attlist, - empty - } -common-contour-attlist = attribute draw:recreate-on-edit { boolean } -draw-a = element draw:a { draw-a-attlist, shape-instance } -draw-a-attlist = - attribute xlink:type { "simple" } - & attribute xlink:href { anyIRI } - & attribute xlink:actuate { "onRequest" }? - & attribute office:target-frame-name { targetFrameName }? - & attribute xlink:show { "new" | "replace" }? - & attribute office:name { \string }? - & attribute office:title { \string }? - & attribute office:server-map { boolean }? - & xml-id? -draw-image-map = - element draw:image-map { - (draw-area-rectangle | draw-area-circle | draw-area-polygon)* - } -draw-area-rectangle = - element draw:area-rectangle { - common-draw-area-attlist, - attribute svg:x { coordinate }, - attribute svg:y { coordinate }, - attribute svg:width { length }, - attribute svg:height { length }, - svg-title?, - svg-desc?, - office-event-listeners? - } -draw-area-circle = - element draw:area-circle { - common-draw-area-attlist, - attribute svg:cx { coordinate }, - attribute svg:cy { coordinate }, - attribute svg:r { length }, - svg-title?, - svg-desc?, - office-event-listeners? - } -draw-area-polygon = - element draw:area-polygon { - common-draw-area-attlist, - attribute svg:x { coordinate }, - attribute svg:y { coordinate }, - attribute svg:width { length }, - attribute svg:height { length }, - common-draw-viewbox-attlist, - common-draw-points-attlist, - svg-title?, - svg-desc?, - office-event-listeners? - } -common-draw-area-attlist = - (attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute office:target-frame-name { targetFrameName }?, - attribute xlink:show { "new" | "replace" }?)? - & attribute office:name { \string }? - & attribute draw:nohref { "nohref" }? -dr3d-scene = - element dr3d:scene { - dr3d-scene-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-style-name-attlist, - common-draw-z-index-attlist, - common-draw-id-attlist, - common-draw-layer-name-attlist, - common-text-spreadsheet-shape-attlist, - common-dr3d-transform-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - dr3d-light*, - shapes3d*, - draw-glue-point* - } -shapes3d = - dr3d-scene | dr3d-extrude | dr3d-sphere | dr3d-rotate | dr3d-cube -dr3d-scene-attlist = - attribute dr3d:vrp { vector3D }? - & attribute dr3d:vpn { vector3D }? - & attribute dr3d:vup { vector3D }? - & attribute dr3d:projection { "parallel" | "perspective" }? - & attribute dr3d:distance { length }? - & attribute dr3d:focal-length { length }? - & attribute dr3d:shadow-slant { angle }? - & attribute dr3d:shade-mode { - "flat" | "phong" | "gouraud" | "draft" - }? - & attribute dr3d:ambient-color { color }? - & attribute dr3d:lighting-mode { boolean }? -common-dr3d-transform-attlist = attribute dr3d:transform { \string }? -dr3d-light = element dr3d:light { dr3d-light-attlist, empty } -dr3d-light-attlist = - attribute dr3d:diffuse-color { color }? - & attribute dr3d:direction { vector3D } - & attribute dr3d:enabled { boolean }? - & attribute dr3d:specular { boolean }? -dr3d-cube = - element dr3d:cube { - dr3d-cube-attlist, - common-draw-z-index-attlist, - common-draw-id-attlist, - common-draw-layer-name-attlist, - common-draw-style-name-attlist, - common-dr3d-transform-attlist, - empty - } -dr3d-cube-attlist = - attribute dr3d:min-edge { vector3D }?, - attribute dr3d:max-edge { vector3D }? -dr3d-sphere = - element dr3d:sphere { - dr3d-sphere-attlist, - common-draw-z-index-attlist, - common-draw-id-attlist, - common-draw-layer-name-attlist, - common-draw-style-name-attlist, - common-dr3d-transform-attlist, - empty - } -dr3d-sphere-attlist = - attribute dr3d:center { vector3D }? - & attribute dr3d:size { vector3D }? -dr3d-extrude = - element dr3d:extrude { - common-draw-path-data-attlist, - common-draw-viewbox-attlist, - common-draw-id-attlist, - common-draw-z-index-attlist, - common-draw-layer-name-attlist, - common-draw-style-name-attlist, - common-dr3d-transform-attlist, - empty - } -dr3d-rotate = - element dr3d:rotate { - common-draw-viewbox-attlist, - common-draw-path-data-attlist, - common-draw-z-index-attlist, - common-draw-id-attlist, - common-draw-layer-name-attlist, - common-draw-style-name-attlist, - common-dr3d-transform-attlist, - empty - } -draw-custom-shape = - element draw:custom-shape { - draw-custom-shape-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-shape-with-text-and-styles-attlist, - common-draw-caption-id-attlist, - svg-title?, - svg-desc?, - office-event-listeners?, - draw-glue-point*, - draw-text, - draw-enhanced-geometry? + "([0-9]*[1-9][0-9]*(\.[0-9]*)?|0+\.[0-9]*[1-9][0-9]*|\.[0-9]*[1-9][0-9]*)((cm)|(mm)|(in)|(pt)|(pc)|(px))" } -draw-custom-shape-attlist = - attribute draw:engine { namespacedToken }? - & attribute draw:data { \string }? -draw-enhanced-geometry = - element draw:enhanced-geometry { - draw-enhanced-geometry-attlist, draw-equation*, draw-handle* +presentation-animation-elements = + presentation-show-shape + | presentation-show-text + | presentation-hide-shape + | presentation-hide-text + | presentation-dim + | presentation-play +presentation-animation-group = + element presentation:animation-group { + presentation-animation-elements* } -draw-enhanced-geometry-attlist = - attribute draw:type { custom-shape-type }? - & attribute svg:viewBox { - list { integer, integer, integer, integer } - }? - & attribute draw:mirror-vertical { boolean }? - & attribute draw:mirror-horizontal { boolean }? - & attribute draw:text-rotate-angle { angle }? - & attribute draw:extrusion-allowed { boolean }? - & attribute draw:text-path-allowed { boolean }? - & attribute draw:concentric-gradient-fill-allowed { boolean }? - & attribute draw:extrusion { boolean }? - & attribute draw:extrusion-brightness { zeroToHundredPercent }? - & attribute draw:extrusion-depth { - list { length, double } - }? - & attribute draw:extrusion-diffusion { percent }? - & attribute draw:extrusion-number-of-line-segments { integer }? - & attribute draw:extrusion-light-face { boolean }? - & attribute draw:extrusion-first-light-harsh { boolean }? - & attribute draw:extrusion-second-light-harsh { boolean }? - & attribute draw:extrusion-first-light-level { zeroToHundredPercent }? - & attribute draw:extrusion-second-light-level { - zeroToHundredPercent - }? - & attribute draw:extrusion-first-light-direction { vector3D }? - & attribute draw:extrusion-second-light-direction { vector3D }? - & attribute draw:extrusion-metal { boolean }? - & attribute dr3d:shade-mode { - "flat" | "phong" | "gouraud" | "draft" - }? - & attribute draw:extrusion-rotation-angle { - list { angle, angle } - }? - & attribute draw:extrusion-rotation-center { vector3D }? - & attribute draw:extrusion-shininess { zeroToHundredPercent }? - & attribute draw:extrusion-skew { - list { double, angle } - }? - & attribute draw:extrusion-specularity { zeroToHundredPercent }? - & attribute dr3d:projection { "parallel" | "perspective" }? - & attribute draw:extrusion-viewpoint { point3D }? - & attribute draw:extrusion-origin { - list { extrusionOrigin, extrusionOrigin } - }? - & attribute draw:extrusion-color { boolean }? - & attribute draw:enhanced-path { \string }? - & attribute draw:path-stretchpoint-x { double }? - & attribute draw:path-stretchpoint-y { double }? - & attribute draw:text-areas { \string }? - & attribute draw:glue-points { \string }? - & attribute draw:glue-point-type { - "none" | "segments" | "rectangle" - }? - & attribute draw:glue-point-leaving-directions { \string }? - & attribute draw:text-path { boolean }? - & attribute draw:text-path-mode { "normal" | "path" | "shape" }? - & attribute draw:text-path-scale { "path" | "shape" }? - & attribute draw:text-path-same-letter-heights { boolean }? - & attribute draw:modifiers { \string }? -custom-shape-type = "non-primitive" | \string -point3D = - xsd:string { - pattern = - "\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))){2}[ ]*\)" +presentation-animations = + element presentation:animations { + (presentation-animation-elements | presentation-animation-group)* } -extrusionOrigin = - xsd:double { minInclusive = "-0.5" maxInclusive = "0.5" } -draw-equation = element draw:equation { draw-equation-attlist, empty } -draw-equation-attlist = - attribute draw:name { \string }? - & attribute draw:formula { \string }? -draw-handle = element draw:handle { draw-handle-attlist, empty } -draw-handle-attlist = - attribute draw:handle-mirror-vertical { boolean }? - & attribute draw:handle-mirror-horizontal { boolean }? - & attribute draw:handle-switched { boolean }? - & attribute draw:handle-position { \string } - & attribute draw:handle-range-x-minimum { \string }? - & attribute draw:handle-range-x-maximum { \string }? - & attribute draw:handle-range-y-minimum { \string }? - & attribute draw:handle-range-y-maximum { \string }? - & attribute draw:handle-polar { \string }? - & attribute draw:handle-radius-range-minimum { \string }? - & attribute draw:handle-radius-range-maximum { \string }? -presentation-shape-attlist = - attribute presentation:class { presentation-classes }? - & attribute presentation:placeholder { boolean }? - & attribute presentation:user-transformed { boolean }? presentation-classes = "title" | "outline" @@ -2874,101 +3343,21 @@ presentation-classes = | "footer" | "date-time" | "page-number" -presentation-animations = - element presentation:animations { - (presentation-animation-elements | presentation-animation-group)* - } -presentation-animation-elements = - presentation-show-shape - | presentation-show-text - | presentation-hide-shape - | presentation-hide-text - | presentation-dim - | presentation-play -presentation-sound = - element presentation:sound { - presentation-sound-attlist, - attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute xlink:actuate { "onRequest" }?, - attribute xlink:show { "new" | "replace" }?, - empty - } -presentation-sound-attlist = - attribute presentation:play-full { boolean }? - & xml-id? -presentation-show-shape = - element presentation:show-shape { - common-presentation-effect-attlist, presentation-sound? - } -common-presentation-effect-attlist = - attribute draw:shape-id { IDREF } - & attribute presentation:effect { presentationEffects }? - & attribute presentation:direction { presentationEffectDirections }? - & attribute presentation:speed { presentationSpeeds }? - & attribute presentation:delay { duration }? - & attribute presentation:start-scale { percent }? - & attribute presentation:path-id { \string }? -presentationEffects = - "none" - | "fade" - | "move" - | "stripes" - | "open" - | "close" - | "dissolve" - | "wavyline" - | "random" - | "lines" - | "laser" - | "appear" - | "hide" - | "move-short" - | "checkerboard" - | "rotate" - | "stretch" -presentationEffectDirections = - "none" - | "from-left" - | "from-top" - | "from-right" - | "from-bottom" - | "from-center" - | "from-upper-left" - | "from-upper-right" - | "from-lower-left" - | "from-lower-right" - | "to-left" - | "to-top" - | "to-right" - | "to-bottom" - | "to-upper-left" - | "to-upper-right" - | "to-lower-right" - | "to-lower-left" - | "path" - | "spiral-inward-left" - | "spiral-inward-right" - | "spiral-outward-left" - | "spiral-outward-right" - | "vertical" - | "horizontal" - | "to-center" - | "clockwise" - | "counter-clockwise" -presentationSpeeds = "slow" | "medium" | "fast" -presentation-show-text = - element presentation:show-text { - common-presentation-effect-attlist, presentation-sound? - } -presentation-hide-shape = - element presentation:hide-shape { - common-presentation-effect-attlist, presentation-sound? - } -presentation-hide-text = - element presentation:hide-text { - common-presentation-effect-attlist, presentation-sound? +presentation-date-time-decl-attlist = + attribute presentation:name { \string } + & attribute presentation:source { "fixed" | "current-date" } + & attribute style:data-style-name { styleNameRef }? +presentation-decl = + element presentation:header-decl { + presentation-header-decl-attlist, text } + | element presentation:footer-decl { + presentation-footer-decl-attlist, text + } + | element presentation:date-time-decl { + presentation-date-time-decl-attlist, text + } +presentation-decls = presentation-decl* presentation-dim = element presentation:dim { presentation-dim-attlist, presentation-sound? @@ -2976,40 +3365,6 @@ presentation-dim = presentation-dim-attlist = attribute draw:shape-id { IDREF } & attribute draw:color { color } -presentation-play = - element presentation:play { presentation-play-attlist, empty } -presentation-play-attlist = - attribute draw:shape-id { IDREF }, - attribute presentation:speed { presentationSpeeds }? -presentation-animation-group = - element presentation:animation-group { - presentation-animation-elements* - } -common-anim-attlist = - attribute presentation:node-type { - "default" - | "on-click" - | "with-previous" - | "after-previous" - | "timing-root" - | "main-sequence" - | "interactive-sequence" - }? - & attribute presentation:preset-id { \string }? - & attribute presentation:preset-sub-type { \string }? - & attribute presentation:preset-class { - "custom" - | "entrance" - | "exit" - | "emphasis" - | "motion-path" - | "ole-action" - | "media-call" - }? - & attribute presentation:master-element { IDREF }? - & attribute presentation:group-id { \string }? - & (xml-id, - attribute anim:id { NCName }?)? presentation-event-listener = element presentation:event-listener { presentation-event-listener-attlist, presentation-sound? @@ -3040,25 +3395,42 @@ presentation-event-listener-attlist = attribute xlink:show { "embed" }?, attribute xlink:actuate { "onRequest" }?)? & attribute presentation:verb { nonNegativeInteger }? -presentation-decls = presentation-decl* -presentation-decl = - element presentation:header-decl { - presentation-header-decl-attlist, text - } - | element presentation:footer-decl { - presentation-footer-decl-attlist, text - } - | element presentation:date-time-decl { - presentation-date-time-decl-attlist, text - } -presentation-header-decl-attlist = - attribute presentation:name { \string } presentation-footer-decl-attlist = attribute presentation:name { \string } -presentation-date-time-decl-attlist = +presentation-header-decl-attlist = attribute presentation:name { \string } - & attribute presentation:source { "fixed" | "current-date" } - & attribute style:data-style-name { styleNameRef }? +presentation-hide-shape = + element presentation:hide-shape { + common-presentation-effect-attlist, presentation-sound? + } +presentation-hide-text = + element presentation:hide-text { + common-presentation-effect-attlist, presentation-sound? + } +presentation-notes = + element presentation:notes { + common-presentation-header-footer-attlist, + presentation-notes-attlist, + office-forms, + shape* + } +presentation-notes-attlist = + attribute style:page-layout-name { styleNameRef }? + & attribute draw:style-name { styleNameRef }? +presentation-placeholder = + element presentation:placeholder { + attribute presentation:object { presentation-classes }, + attribute svg:x { coordinate | percent }, + attribute svg:y { coordinate | percent }, + attribute svg:width { length | percent }, + attribute svg:height { length | percent }, + empty + } +presentation-play = + element presentation:play { presentation-play-attlist, empty } +presentation-play-attlist = + attribute draw:shape-id { IDREF }, + attribute presentation:speed { presentationSpeeds }? presentation-settings = element presentation:settings { presentation-settings-attlist, presentation-show* @@ -3080,1066 +3452,86 @@ presentation-settings-attlist = }? & attribute presentation:stay-on-top { boolean }? & attribute presentation:show-end-of-presentation-slide { boolean }? +presentation-shape-attlist = + attribute presentation:class { presentation-classes }? + & attribute presentation:placeholder { boolean }? + & attribute presentation:user-transformed { boolean }? presentation-show = element presentation:show { presentation-show-attlist, empty } presentation-show-attlist = attribute presentation:name { \string } & attribute presentation:pages { \string } -chart-chart = - element chart:chart { - chart-chart-attlist, - chart-title?, - chart-subtitle?, - chart-footer?, - chart-legend?, - chart-plot-area, - table-table? - } -chart-chart-attlist = - attribute chart:class { namespacedToken } - & common-draw-size-attlist - & attribute chart:column-mapping { \string }? - & attribute chart:row-mapping { \string }? - & attribute chart:style-name { styleNameRef }? - & (attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI })? - & xml-id? -chart-title = element chart:title { chart-title-attlist, text-p? } -chart-title-attlist = - attribute table:cell-range { cellRangeAddressList }? - & common-draw-position-attlist - & attribute chart:style-name { styleNameRef }? -chart-subtitle = element chart:subtitle { chart-title-attlist, text-p? } -chart-footer = element chart:footer { chart-title-attlist, text-p? } -chart-legend = element chart:legend { chart-legend-attlist, text-p? } -chart-legend-attlist = - ((attribute chart:legend-position { - "start" | "end" | "top" | "bottom" - }, - attribute chart:legend-align { "start" | "center" | "end" }?) - | attribute chart:legend-position { - "top-start" | "bottom-start" | "top-end" | "bottom-end" - } - | empty) - & common-draw-position-attlist - & (attribute style:legend-expansion { "wide" | "high" | "balanced" } - | (attribute style:legend-expansion { "custom" }, - attribute style:legend-expansion-aspect-ratio { double }) - | empty) - & attribute chart:style-name { styleNameRef }? -chart-plot-area = - element chart:plot-area { - chart-plot-area-attlist, - dr3d-light*, - chart-axis*, - chart-series*, - chart-stock-gain-marker?, - chart-stock-loss-marker?, - chart-stock-range-line?, - chart-wall?, - chart-floor? - } -chart-plot-area-attlist = - common-draw-position-attlist - & common-draw-size-attlist - & attribute chart:style-name { styleNameRef }? - & attribute table:cell-range-address { cellRangeAddressList }? - & attribute chart:data-source-has-labels { - "none" | "row" | "column" | "both" - }? - & dr3d-scene-attlist - & common-dr3d-transform-attlist - & xml-id? -chart-wall = element chart:wall { chart-wall-attlist, empty } -chart-wall-attlist = - attribute svg:width { length }? - & attribute chart:style-name { styleNameRef }? -chart-floor = element chart:floor { chart-floor-attlist, empty } -chart-floor-attlist = - attribute svg:width { length }? - & attribute chart:style-name { styleNameRef }? -chart-axis = - element chart:axis { - chart-axis-attlist, chart-title?, chart-categories?, chart-grid* - } -chart-axis-attlist = - attribute chart:dimension { chart-dimension } - & attribute chart:name { \string }? - & attribute chart:style-name { styleNameRef }? -chart-dimension = "x" | "y" | "z" -chart-categories = - element chart:categories { - attribute table:cell-range-address { cellRangeAddressList }? - } -chart-grid = element chart:grid { chart-grid-attlist } -chart-grid-attlist = - attribute chart:class { "major" | "minor" }? - & attribute chart:style-name { styleNameRef }? -chart-series = - element chart:series { - chart-series-attlist, - chart-domain*, - chart-mean-value?, - chart-regression-curve*, - chart-error-indicator*, - chart-data-point*, - chart-data-label? - } -chart-series-attlist = - attribute chart:values-cell-range-address { cellRangeAddressList }? - & attribute chart:label-cell-address { cellRangeAddressList }? - & attribute chart:class { namespacedToken }? - & attribute chart:attached-axis { \string }? - & attribute chart:style-name { styleNameRef }? - & xml-id? -chart-domain = - element chart:domain { - attribute table:cell-range-address { cellRangeAddressList }? - } -chart-data-point = - element chart:data-point { - chart-data-point-attlist, chart-data-label? - } -chart-data-point-attlist = - attribute chart:repeated { positiveInteger }? - & attribute chart:style-name { styleNameRef }? - & xml-id? -chart-data-label = - element chart:data-label { chart-data-label-attlist, text-p? } -chart-data-label-attlist = - common-draw-position-attlist - & attribute chart:style-name { styleNameRef }? -chart-mean-value = - element chart:mean-value { chart-mean-value-attlist, empty } -chart-mean-value-attlist = attribute chart:style-name { styleNameRef }? -chart-error-indicator = - element chart:error-indicator { chart-error-indicator-attlist, empty } -chart-error-indicator-attlist = - attribute chart:style-name { styleNameRef }? - & attribute chart:dimension { chart-dimension } -chart-regression-curve = - element chart:regression-curve { - chart-regression-curve-attlist, chart-equation? - } -chart-regression-curve-attlist = - attribute chart:style-name { styleNameRef }? -chart-equation = - element chart:equation { chart-equation-attlist, text-p? } -chart-equation-attlist = - attribute chart:automatic-content { boolean }? - & attribute chart:display-r-square { boolean }? - & attribute chart:display-equation { boolean }? - & common-draw-position-attlist - & attribute chart:style-name { styleNameRef }? -chart-stock-gain-marker = - element chart:stock-gain-marker { common-stock-marker-attlist } -chart-stock-loss-marker = - element chart:stock-loss-marker { common-stock-marker-attlist } -chart-stock-range-line = - element chart:stock-range-line { common-stock-marker-attlist } -common-stock-marker-attlist = - attribute chart:style-name { styleNameRef }? -office-database = - element office:database { - db-data-source, - db-forms?, - db-reports?, - db-queries?, - db-table-presentations?, - db-schema-definition? - } -db-data-source = - element db:data-source { - db-data-source-attlist, - db-connection-data, - db-driver-settings?, - db-application-connection-settings? - } -db-data-source-attlist = empty -db-connection-data = - element db:connection-data { - db-connection-data-attlist, - (db-database-description | db-connection-resource), - db-login? - } -db-connection-data-attlist = empty -db-database-description = - element db:database-description { - db-database-description-attlist, - (db-file-based-database | db-server-database) - } -db-database-description-attlist = empty -db-file-based-database = - element db:file-based-database { db-file-based-database-attlist } -db-file-based-database-attlist = - attribute xlink:type { "simple" } - & attribute xlink:href { anyIRI } - & attribute db:media-type { \string } - & attribute db:extension { \string }? -db-server-database = - element db:server-database { db-server-database-attlist, empty } -db-server-database-attlist = - attribute db:type { namespacedToken } - & (db-host-and-port | db-local-socket-name) - & attribute db:database-name { \string }? -db-host-and-port = - attribute db:hostname { \string }, - attribute db:port { positiveInteger }? -db-local-socket-name = attribute db:local-socket { \string }? -db-connection-resource = - element db:connection-resource { - db-connection-resource-attlist, empty - } -db-connection-resource-attlist = - attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute xlink:show { "none" }?, - attribute xlink:actuate { "onRequest" }? -db-login = element db:login { db-login-attlist, empty } -db-login-attlist = - (attribute db:user-name { \string } - | attribute db:use-system-user { boolean })? - & attribute db:is-password-required { boolean }? - & attribute db:login-timeout { positiveInteger }? -db-driver-settings = - element db:driver-settings { - db-driver-settings-attlist, - db-auto-increment?, - db-delimiter?, - db-character-set?, - db-table-settings? - } -db-driver-settings-attlist = - db-show-deleted - & attribute db:system-driver-settings { \string }? - & attribute db:base-dn { \string }? - & db-is-first-row-header-line - & attribute db:parameter-name-substitution { boolean }? -db-show-deleted = attribute db:show-deleted { boolean }? -db-is-first-row-header-line = - attribute db:is-first-row-header-line { boolean }? -db-auto-increment = - element db:auto-increment { db-auto-increment-attlist, empty } -db-auto-increment-attlist = - attribute db:additional-column-statement { \string }? - & attribute db:row-retrieving-statement { \string }? -db-delimiter = element db:delimiter { db-delimiter-attlist, empty } -db-delimiter-attlist = - attribute db:field { \string }? - & attribute db:string { \string }? - & attribute db:decimal { \string }? - & attribute db:thousand { \string }? -db-character-set = - element db:character-set { db-character-set-attlist, empty } -db-character-set-attlist = attribute db:encoding { textEncoding }? -db-table-settings = element db:table-settings { db-table-setting* } -db-table-setting = - element db:table-setting { - db-table-setting-attlist, db-delimiter?, db-character-set?, empty - } -db-table-setting-attlist = db-is-first-row-header-line, db-show-deleted -db-application-connection-settings = - element db:application-connection-settings { - db-application-connection-settings-attlist, - db-table-filter?, - db-table-type-filter?, - db-data-source-settings? - } -db-application-connection-settings-attlist = - attribute db:is-table-name-length-limited { boolean }? - & attribute db:enable-sql92-check { boolean }? - & attribute db:append-table-alias-name { boolean }? - & attribute db:ignore-driver-privileges { boolean }? - & attribute db:boolean-comparison-mode { - "equal-integer" - | "is-boolean" - | "equal-boolean" - | "equal-use-only-zero" - }? - & attribute db:use-catalog { boolean }? - & attribute db:max-row-count { integer }? - & attribute db:suppress-version-columns { boolean }? -db-table-filter = - element db:table-filter { - db-table-filter-attlist, - db-table-include-filter?, - db-table-exclude-filter? - } -db-table-filter-attlist = empty -db-table-include-filter = - element db:table-include-filter { - db-table-include-filter-attlist, db-table-filter-pattern+ - } -db-table-include-filter-attlist = empty -db-table-exclude-filter = - element db:table-exclude-filter { - db-table-exclude-filter-attlist, db-table-filter-pattern+ - } -db-table-exclude-filter-attlist = empty -db-table-filter-pattern = - element db:table-filter-pattern { - db-table-filter-pattern-attlist, \string - } -db-table-filter-pattern-attlist = empty -db-table-type-filter = - element db:table-type-filter { - db-table-type-filter-attlist, db-table-type* - } -db-table-type-filter-attlist = empty -db-table-type = element db:table-type { db-table-type-attlist, \string } -db-table-type-attlist = empty -db-data-source-settings = - element db:data-source-settings { - db-data-source-settings-attlist, db-data-source-setting+ - } -db-data-source-settings-attlist = empty -db-data-source-setting = - element db:data-source-setting { - db-data-source-setting-attlist, db-data-source-setting-value+ - } -db-data-source-setting-attlist = - attribute db:data-source-setting-is-list { boolean }? - & attribute db:data-source-setting-name { \string } - & attribute db:data-source-setting-type { - db-data-source-setting-types - } -db-data-source-setting-types = - "boolean" | "short" | "int" | "long" | "double" | "string" -db-data-source-setting-value = - element db:data-source-setting-value { - db-data-source-setting-value-attlist, \string - } -db-data-source-setting-value-attlist = empty -db-forms = - element db:forms { - db-forms-attlist, (db-component | db-component-collection)* - } -db-forms-attlist = empty -db-reports = - element db:reports { - db-reports-attlist, (db-component | db-component-collection)* - } -db-reports-attlist = empty -db-component-collection = - element db:component-collection { - db-component-collection-attlist, - common-db-object-name, - common-db-object-title, - common-db-object-description, - (db-component | db-component-collection)* - } -db-component-collection-attlist = empty -db-component = - element db:component { - db-component-attlist, - common-db-object-name, - common-db-object-title, - common-db-object-description, - (office-document | math-math)? - } -db-component-attlist = - (attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute xlink:show { "none" }?, - attribute xlink:actuate { "onRequest" }?)? - & attribute db:as-template { boolean }? -db-queries = - element db:queries { - db-queries-attlist, (db-query | db-query-collection)* - } -db-queries-attlist = empty -db-query-collection = - element db:query-collection { - db-query-collection-attlist, - common-db-object-name, - common-db-object-title, - common-db-object-description, - (db-query | db-query-collection)* - } -db-query-collection-attlist = empty -db-query = - element db:query { - db-query-attlist, - common-db-object-name, - common-db-object-title, - common-db-object-description, - common-db-table-style-name, - db-order-statement?, - db-filter-statement?, - db-columns?, - db-update-table? - } -db-query-attlist = - attribute db:command { \string } - & attribute db:escape-processing { boolean }? -db-order-statement = - element db:order-statement { db-command, db-apply-command, empty } -db-filter-statement = - element db:filter-statement { db-command, db-apply-command, empty } -db-update-table = - element db:update-table { common-db-table-name-attlist } -db-table-presentations = - element db:table-representations { - db-table-presentations-attlist, db-table-presentation* - } -db-table-presentations-attlist = empty -db-table-presentation = - element db:table-representation { - db-table-presentation-attlist, - common-db-table-name-attlist, - common-db-object-title, - common-db-object-description, - common-db-table-style-name, - db-order-statement?, - db-filter-statement?, - db-columns? - } -db-table-presentation-attlist = empty -db-columns = element db:columns { db-columns-attlist, db-column+ } -db-columns-attlist = empty -db-column = - element db:column { - db-column-attlist, - common-db-object-name, - common-db-object-title, - common-db-object-description, - common-db-default-value - } -db-column-attlist = - attribute db:visible { boolean }? - & attribute db:style-name { styleNameRef }? - & attribute db:default-cell-style-name { styleNameRef }? -db-command = attribute db:command { \string } -db-apply-command = attribute db:apply-command { boolean }? -common-db-table-name-attlist = - attribute db:name { \string } - & attribute db:catalog-name { \string }? - & attribute db:schema-name { \string }? -common-db-object-name = attribute db:name { \string } -common-db-object-title = attribute db:title { \string }? -common-db-object-description = attribute db:description { \string }? -common-db-table-style-name = - attribute db:style-name { styleNameRef }? - & attribute db:default-row-style-name { styleNameRef }? -common-db-default-value = common-value-and-type-attlist? -db-schema-definition = - element db:schema-definition { - db-schema-definition-attlist, db-table-definitions - } -db-schema-definition-attlist = empty -db-table-definitions = - element db:table-definitions { - db-table-definitions-attlist, db-table-definition* - } -db-table-definitions-attlist = empty -db-table-definition = - element db:table-definition { - common-db-table-name-attlist, - db-table-definition-attlist, - db-column-definitions, - db-keys?, - db-indices? - } -db-table-definition-attlist = attribute db:type { \string }? -db-column-definitions = - element db:column-definitions { - db-column-definitions-attlist, db-column-definition+ - } -db-column-definitions-attlist = empty -db-column-definition = - element db:column-definition { - db-column-definition-attlist, common-db-default-value +presentation-show-shape = + element presentation:show-shape { + common-presentation-effect-attlist, presentation-sound? } -db-column-definition-attlist = - attribute db:name { \string } - & attribute db:data-type { db-data-types }? - & attribute db:type-name { \string }? - & attribute db:precision { positiveInteger }? - & attribute db:scale { positiveInteger }? - & attribute db:is-nullable { "no-nulls" | "nullable" }? - & attribute db:is-empty-allowed { boolean }? - & attribute db:is-autoincrement { boolean }? -db-data-types = - "bit" - | "boolean" - | "tinyint" - | "smallint" - | "integer" - | "bigint" - | "float" - | "real" - | "double" - | "numeric" - | "decimal" - | "char" - | "varchar" - | "longvarchar" - | "date" - | "time" - | "timestmp" - | "binary" - | "varbinary" - | "longvarbinary" - | "sqlnull" - | "other" - | "object" - | "distinct" - | "struct" - | "array" - | "blob" - | "clob" - | "ref" -db-keys = element db:keys { db-keys-attlist, db-key+ } -db-keys-attlist = empty -db-key = element db:key { db-key-attlist, db-key-columns+ } -db-key-attlist = - attribute db:name { \string }? - & attribute db:type { "primary" | "unique" | "foreign" } - & attribute db:referenced-table-name { \string }? - & attribute db:update-rule { - "cascade" | "restrict" | "set-null" | "no-action" | "set-default" - }? - & attribute db:delete-rule { - "cascade" | "restrict" | "set-null" | "no-action" | "set-default" - }? -db-key-columns = - element db:key-columns { db-key-columns-attlist, db-key-column+ } -db-key-columns-attlist = empty -db-key-column = element db:key-column { db-key-column-attlist, empty } -db-key-column-attlist = - attribute db:name { \string }? - & attribute db:related-column-name { \string }? -db-indices = element db:indices { db-indices-attlist, db-index+ } -db-indices-attlist = empty -db-index = element db:index { db-index-attlist, db-index-columns+ } -db-index-attlist = - attribute db:name { \string } - & attribute db:catalog-name { \string }? - & attribute db:is-unique { boolean }? - & attribute db:is-clustered { boolean }? -db-index-columns = element db:index-columns { db-index-column+ } -db-index-column = - element db:index-column { db-index-column-attlist, empty } -db-index-column-attlist = - attribute db:name { \string } - & attribute db:is-ascending { boolean }? -office-forms = - element office:forms { - office-forms-attlist, (form-form | xforms-model)* - }? -office-forms-attlist = - attribute form:automatic-focus { boolean }? - & attribute form:apply-design-mode { boolean }? -form-form = - element form:form { - common-form-control-attlist, - form-form-attlist, - form-properties?, - office-event-listeners?, - (controls | form-form)*, - form-connection-resource? +presentation-show-text = + element presentation:show-text { + common-presentation-effect-attlist, presentation-sound? } -form-form-attlist = - (attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute xlink:actuate { "onRequest" }?)? - & attribute office:target-frame { targetFrameName }? - & attribute form:method { "get" | "post" | \string }? - & attribute form:enctype { \string }? - & attribute form:allow-deletes { boolean }? - & attribute form:allow-inserts { boolean }? - & attribute form:allow-updates { boolean }? - & attribute form:apply-filter { boolean }? - & attribute form:command-type { "table" | "query" | "command" }? - & attribute form:command { \string }? - & attribute form:datasource { anyIRI | \string }? - & attribute form:master-fields { \string }? - & attribute form:detail-fields { \string }? - & attribute form:escape-processing { boolean }? - & attribute form:filter { \string }? - & attribute form:ignore-result { boolean }? - & attribute form:navigation-mode { navigation }? - & attribute form:order { \string }? - & attribute form:tab-cycle { tab-cycles }? -navigation = "none" | "current" | "parent" -tab-cycles = "records" | "current" | "page" -form-connection-resource = - element form:connection-resource { +presentation-sound = + element presentation:sound { + presentation-sound-attlist, + attribute xlink:type { "simple" }, attribute xlink:href { anyIRI }, + attribute xlink:actuate { "onRequest" }?, + attribute xlink:show { "new" | "replace" }?, empty } -xforms-model = element xforms:model { anyAttListOrElements } -column-controls = - element form:text { form-text-attlist, common-form-control-content } - | element form:textarea { - form-textarea-attlist, common-form-control-content, text-p* - } - | element form:formatted-text { - form-formatted-text-attlist, common-form-control-content - } - | element form:number { - form-number-attlist, - common-numeric-control-attlist, - common-form-control-content, - common-linked-cell, - common-spin-button, - common-repeat, - common-delay-for-repeat - } - | element form:date { - form-date-attlist, - common-numeric-control-attlist, - common-form-control-content, - common-linked-cell, - common-spin-button, - common-repeat, - common-delay-for-repeat - } - | element form:time { - form-time-attlist, - common-numeric-control-attlist, - common-form-control-content, - common-linked-cell, - common-spin-button, - common-repeat, - common-delay-for-repeat - } - | element form:combobox { - form-combobox-attlist, common-form-control-content, form-item* - } - | element form:listbox { - form-listbox-attlist, common-form-control-content, form-option* - } - | element form:checkbox { - form-checkbox-attlist, common-form-control-content - } -controls = - column-controls - | element form:password { - form-password-attlist, common-form-control-content - } - | element form:file { form-file-attlist, common-form-control-content } - | element form:fixed-text { - form-fixed-text-attlist, common-form-control-content - } - | element form:button { - form-button-attlist, common-form-control-content - } - | element form:image { - form-image-attlist, common-form-control-content - } - | element form:radio { - form-radio-attlist, common-form-control-content - } - | element form:frame { - form-frame-attlist, common-form-control-content - } - | element form:image-frame { - form-image-frame-attlist, common-form-control-content - } - | element form:hidden { - form-hidden-attlist, common-form-control-content - } - | element form:grid { - form-grid-attlist, common-form-control-content, form-column* - } - | element form:value-range { - form-value-range-attlist, common-form-control-content - } - | element form:generic-control { - form-generic-control-attlist, common-form-control-content - } -form-text-attlist = - form-control-attlist, - common-current-value-attlist, - common-disabled-attlist, - common-maxlength-attlist, - common-printable-attlist, - common-readonly-attlist, - common-tab-attlist, - common-title-attlist, - common-value-attlist, - common-convert-empty-attlist, - common-data-field-attlist, - common-linked-cell -form-control-attlist = - common-form-control-attlist, - common-control-id-attlist, - xforms-bind-attlist -common-form-control-content = form-properties?, office-event-listeners? -form-textarea-attlist = - form-control-attlist, - common-current-value-attlist, - common-disabled-attlist, - common-maxlength-attlist, - common-printable-attlist, - common-readonly-attlist, - common-tab-attlist, - common-title-attlist, - common-value-attlist, - common-convert-empty-attlist, - common-data-field-attlist, - common-linked-cell -form-password-attlist = - form-control-attlist - & common-disabled-attlist - & common-maxlength-attlist - & common-printable-attlist - & common-tab-attlist - & common-title-attlist - & common-value-attlist - & common-convert-empty-attlist - & common-linked-cell - & attribute form:echo-char { character }? -form-file-attlist = - form-control-attlist, - common-current-value-attlist, - common-disabled-attlist, - common-maxlength-attlist, - common-printable-attlist, - common-readonly-attlist, - common-tab-attlist, - common-title-attlist, - common-value-attlist, - common-linked-cell -form-formatted-text-attlist = - form-control-attlist - & common-current-value-attlist - & common-disabled-attlist - & common-maxlength-attlist - & common-printable-attlist - & common-readonly-attlist - & common-tab-attlist - & common-title-attlist - & common-value-attlist - & common-convert-empty-attlist - & common-data-field-attlist - & common-linked-cell - & common-spin-button - & common-repeat - & common-delay-for-repeat - & attribute form:max-value { \string }? - & attribute form:min-value { \string }? - & attribute form:validation { boolean }? -common-numeric-control-attlist = - form-control-attlist, - common-disabled-attlist, - common-maxlength-attlist, - common-printable-attlist, - common-readonly-attlist, - common-tab-attlist, - common-title-attlist, - common-convert-empty-attlist, - common-data-field-attlist -form-number-attlist = - attribute form:value { double }? - & attribute form:current-value { double }? - & attribute form:min-value { double }? - & attribute form:max-value { double }? -form-date-attlist = - attribute form:value { date }? - & attribute form:current-value { date }? - & attribute form:min-value { date }? - & attribute form:max-value { date }? -form-time-attlist = - attribute form:value { time }? - & attribute form:current-value { time }? - & attribute form:min-value { time }? - & attribute form:max-value { time }? -form-fixed-text-attlist = - form-control-attlist - & for - & common-disabled-attlist - & label - & common-printable-attlist - & common-title-attlist - & attribute form:multi-line { boolean }? -form-combobox-attlist = - form-control-attlist - & common-current-value-attlist - & common-disabled-attlist - & dropdown - & common-maxlength-attlist - & common-printable-attlist - & common-readonly-attlist - & size - & common-tab-attlist - & common-title-attlist - & common-value-attlist - & common-convert-empty-attlist - & common-data-field-attlist - & list-source - & list-source-type - & common-linked-cell - & common-source-cell-range - & attribute form:auto-complete { boolean }? -form-item = element form:item { form-item-attlist, text } -form-item-attlist = label -form-listbox-attlist = - form-control-attlist - & common-disabled-attlist - & dropdown - & common-printable-attlist - & size - & common-tab-attlist - & common-title-attlist - & bound-column - & common-data-field-attlist - & list-source - & list-source-type - & common-linked-cell - & list-linkage-type - & common-source-cell-range - & attribute form:multiple { boolean }? - & attribute form:xforms-list-source { \string }? -list-linkage-type = - attribute form:list-linkage-type { - "selection" | "selection-indices" - }? -form-option = element form:option { form-option-attlist, text } -form-option-attlist = - current-selected, selected, label, common-value-attlist -form-button-attlist = - form-control-attlist - & button-type - & common-disabled-attlist - & label - & image-data - & common-printable-attlist - & common-tab-attlist - & target-frame - & target-location - & common-title-attlist - & common-value-attlist - & common-form-relative-image-position-attlist - & common-repeat - & common-delay-for-repeat - & attribute form:default-button { boolean }? - & attribute form:toggle { boolean }? - & attribute form:focus-on-click { boolean }? - & attribute form:xforms-submission { \string }? -form-image-attlist = - form-control-attlist, - button-type, - common-disabled-attlist, - image-data, - common-printable-attlist, - common-tab-attlist, - target-frame, - target-location, - common-title-attlist, - common-value-attlist -form-checkbox-attlist = - form-control-attlist - & common-disabled-attlist - & label - & common-printable-attlist - & common-tab-attlist - & common-title-attlist - & common-value-attlist - & common-data-field-attlist - & common-form-visual-effect-attlist - & common-form-relative-image-position-attlist - & common-linked-cell - & attribute form:current-state { states }? - & attribute form:is-tristate { boolean }? - & attribute form:state { states }? -states = "unchecked" | "checked" | "unknown" -form-radio-attlist = - form-control-attlist, - current-selected, - common-disabled-attlist, - label, - common-printable-attlist, - selected, - common-tab-attlist, - common-title-attlist, - common-value-attlist, - common-data-field-attlist, - common-form-visual-effect-attlist, - common-form-relative-image-position-attlist, - common-linked-cell -form-frame-attlist = - form-control-attlist, - common-disabled-attlist, - for, - label, - common-printable-attlist, - common-title-attlist -form-image-frame-attlist = - form-control-attlist, - common-disabled-attlist, - image-data, - common-printable-attlist, - common-readonly-attlist, - common-title-attlist, - common-data-field-attlist -form-hidden-attlist = form-control-attlist, common-value-attlist -form-grid-attlist = - form-control-attlist, - common-disabled-attlist, - common-printable-attlist, - common-tab-attlist, - common-title-attlist -form-column = - element form:column { form-column-attlist, column-controls+ } -form-column-attlist = - common-form-control-attlist, label, text-style-name -text-style-name = attribute form:text-style-name { styleNameRef }? -form-value-range-attlist = - form-control-attlist - & common-disabled-attlist - & common-printable-attlist - & common-tab-attlist - & common-title-attlist - & common-value-attlist - & common-linked-cell - & common-repeat - & common-delay-for-repeat - & attribute form:max-value { integer }? - & attribute form:min-value { integer }? - & attribute form:step-size { positiveInteger }? - & attribute form:page-step-size { positiveInteger }? - & attribute form:orientation { "horizontal" | "vertical" }? -form-generic-control-attlist = form-control-attlist -common-form-control-attlist = - attribute form:name { \string }? - & attribute form:control-implementation { namespacedToken }? -xforms-bind-attlist = attribute xforms:bind { \string }? -types = "submit" | "reset" | "push" | "url" -button-type = attribute form:button-type { types }? -common-control-id-attlist = - xml-id, - attribute form:id { NCName }? -current-selected = attribute form:current-selected { boolean }? -common-value-attlist = attribute form:value { \string }? -common-current-value-attlist = attribute form:current-value { \string }? -common-disabled-attlist = attribute form:disabled { boolean }? -dropdown = attribute form:dropdown { boolean }? -for = attribute form:for { \string }? -image-data = attribute form:image-data { anyIRI }? -label = attribute form:label { \string }? -common-maxlength-attlist = - attribute form:max-length { nonNegativeInteger }? -common-printable-attlist = attribute form:printable { boolean }? -common-readonly-attlist = attribute form:readonly { boolean }? -selected = attribute form:selected { boolean }? -size = attribute form:size { nonNegativeInteger }? -common-tab-attlist = - attribute form:tab-index { nonNegativeInteger }? - & attribute form:tab-stop { boolean }? -target-frame = attribute office:target-frame { targetFrameName }? -target-location = attribute xlink:href { anyIRI }? -common-title-attlist = attribute form:title { \string }? -common-form-visual-effect-attlist = - attribute form:visual-effect { "flat" | "3d" }? -common-form-relative-image-position-attlist = - attribute form:image-position { "center" }? - | (attribute form:image-position { - "start" | "end" | "top" | "bottom" - }, - attribute form:image-align { "start" | "center" | "end" }?) -bound-column = attribute form:bound-column { \string }? -common-convert-empty-attlist = - attribute form:convert-empty-to-null { boolean }? -common-data-field-attlist = attribute form:data-field { \string }? -list-source = attribute form:list-source { \string }? -list-source-type = - attribute form:list-source-type { - "table" - | "query" - | "sql" - | "sql-pass-through" - | "value-list" - | "table-fields" - }? -common-linked-cell = - attribute form:linked-cell { cellAddress | \string }? -common-source-cell-range = - attribute form:source-cell-range { cellRangeAddress | \string }? -common-spin-button = attribute form:spin-button { boolean }? -common-repeat = attribute form:repeat { boolean }? -common-delay-for-repeat = attribute form:delay-for-repeat { duration }? -form-properties = element form:properties { form-property+ } -form-property = - element form:property { - form-property-name, form-property-value-and-type-attlist - } - | element form:list-property { - form-property-name, form-property-type-and-value-list - } -form-property-name = attribute form:property-name { \string } -form-property-value-and-type-attlist = - common-value-and-type-attlist - | attribute office:value-type { "void" } -form-property-type-and-value-list = - (attribute office:value-type { "float" }, - element form:list-value { - attribute office:value { double } - }*) - | (attribute office:value-type { "percentage" }, - element form:list-value { - attribute office:value { double } - }*) - | (attribute office:value-type { "currency" }, - element form:list-value { - attribute office:value { double }, - attribute office:currency { \string }? - }*) - | (attribute office:value-type { "date" }, - element form:list-value { - attribute office:date-value { dateOrDateTime } - }*) - | (attribute office:value-type { "time" }, - element form:list-value { - attribute office:time-value { duration } - }*) - | (attribute office:value-type { "boolean" }, - element form:list-value { - attribute office:boolean-value { boolean } - }*) - | (attribute office:value-type { "string" }, - element form:list-value { - attribute office:string-value { \string } - }*) - | attribute office:value-type { "void" } -office-annotation = - element office:annotation { - office-annotation-attlist, - draw-caption-attlist, - common-draw-position-attlist, - common-draw-size-attlist, - common-draw-shape-with-text-and-styles-attlist, - dc-creator?, - dc-date?, - meta-date-string?, - (text-p | text-list)* - } -office-annotation-end = - element office:annotation-end { office-annotation-end-attlist } -office-annotation-attlist = - attribute office:display { boolean }? - & common-office-annotation-name-attlist? -office-annotation-end-attlist = common-office-annotation-name-attlist -common-office-annotation-name-attlist = - attribute office:name { \string } -meta-date-string = element meta:date-string { \string } -common-num-format-prefix-suffix-attlist = - attribute style:num-prefix { \string }?, - attribute style:num-suffix { \string }? -common-num-format-attlist = - attribute style:num-format { "1" | "i" | "I" | \string | empty } - | (attribute style:num-format { "a" | "A" }, - style-num-letter-sync-attlist) - | empty -style-num-letter-sync-attlist = - attribute style:num-letter-sync { boolean }? -office-change-info = - element office:change-info { dc-creator, dc-date, text-p* } -office-event-listeners = - element office:event-listeners { - (script-event-listener | presentation-event-listener)* - } +presentation-sound-attlist = + attribute presentation:play-full { boolean }? + & xml-id? +presentationEffectDirections = + "none" + | "from-left" + | "from-top" + | "from-right" + | "from-bottom" + | "from-center" + | "from-upper-left" + | "from-upper-right" + | "from-lower-left" + | "from-lower-right" + | "to-left" + | "to-top" + | "to-right" + | "to-bottom" + | "to-upper-left" + | "to-upper-right" + | "to-lower-right" + | "to-lower-left" + | "path" + | "spiral-inward-left" + | "spiral-inward-right" + | "spiral-outward-left" + | "spiral-outward-right" + | "vertical" + | "horizontal" + | "to-center" + | "clockwise" + | "counter-clockwise" +presentationEffects = + "none" + | "fade" + | "move" + | "stripes" + | "open" + | "close" + | "dissolve" + | "wavyline" + | "random" + | "lines" + | "laser" + | "appear" + | "hide" + | "move-short" + | "checkerboard" + | "rotate" + | "stretch" +presentationSpeeds = "slow" | "medium" | "fast" +region-content = text-p* +relativeLength = xsd:string { pattern = "[0-9]+\*" } +rowOrCol = "row" | "column" script-event-listener = element script:event-listener { script-event-listener-attlist, empty } script-event-listener-attlist = @@ -4149,379 +3541,336 @@ script-event-listener-attlist = | (attribute xlink:type { "simple" }, attribute xlink:href { anyIRI }, attribute xlink:actuate { "onRequest" }?)) -math-math = element math:math { mathMarkup } -[ - dc:description [ - "To avoid inclusion of the complete MathML schema, anything is allowed within a math:math top-level element" - ] -] -mathMarkup = - (attribute * { text } - | text - | element * { mathMarkup })* -text-dde-connection-decl = - element text:dde-connection-decl { - text-dde-connection-decl-attlist, common-dde-connection-decl-attlist - } -text-dde-connection-decl-attlist = attribute office:name { \string } -common-dde-connection-decl-attlist = - attribute office:dde-application { \string } - & attribute office:dde-topic { \string } - & attribute office:dde-item { \string } - & attribute office:automatic-update { boolean }? -table-dde-link = - element table:dde-link { office-dde-source, table-table } -office-dde-source = - element office:dde-source { - office-dde-source-attlist, common-dde-connection-decl-attlist +scriptCode = xsd:token { pattern = "[A-Za-z0-9]{1,8}" } +selected = attribute form:selected { boolean }? +shadowType = "none" | \string +shape = shape-instance | draw-a +shape-instance = + draw-rect + | draw-line + | draw-polyline + | draw-polygon + | draw-regular-polygon + | draw-path + | draw-circle + | draw-ellipse + | draw-g + | draw-page-thumbnail + | draw-frame + | draw-measure + | draw-caption + | draw-connector + | draw-control + | dr3d-scene + | draw-custom-shape +shapes3d = + dr3d-scene | dr3d-extrude | dr3d-sphere | dr3d-rotate | dr3d-cube +signedZeroToHundredPercent = + xsd:string { + pattern = "-?([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%" } -office-dde-source-attlist = - attribute office:name { \string }? - & attribute office:conversion-mode { - "into-default-style-data-style" - | "into-english-number" - | "keep-text" +size = attribute form:size { nonNegativeInteger }? +states = "unchecked" | "checked" | "unknown" +\string = xsd:string +style-background-image = + element style:background-image { + style-background-image-attlist, + (common-draw-data-attlist | office-binary-data | empty) + }? +style-background-image-attlist = + attribute style:repeat { "no-repeat" | "repeat" | "stretch" }? + & attribute style:position { + "left" + | "center" + | "right" + | "top" + | "bottom" + | list { horiBackPos, vertBackPos } + | list { vertBackPos, horiBackPos } }? -animation-element = - element anim:animate { - common-anim-target-attlist, - common-anim-named-target-attlist, - common-anim-values-attlist, - common-anim-spline-mode-attlist, - common-spline-anim-value-attlist, - common-timing-attlist, - common-anim-add-accum-attlist + & attribute style:filter-name { \string }? + & attribute draw:opacity { zeroToHundredPercent }? +style-chart-properties = + element style:chart-properties { + style-chart-properties-content-strict } - | element anim:set { - common-anim-target-attlist, - common-anim-named-target-attlist, - common-anim-set-values-attlist, - common-timing-attlist, - common-anim-add-accum-attlist - } - | element anim:animateMotion { - anim-animate-motion-attlist, - common-anim-target-attlist, - common-anim-named-target-attlist, - common-anim-add-accum-attlist, - common-anim-values-attlist, - common-timing-attlist, - common-spline-anim-value-attlist - } - | element anim:animateColor { - common-anim-target-attlist, - common-anim-named-target-attlist, - common-anim-add-accum-attlist, - common-anim-values-attlist, - common-anim-spline-mode-attlist, - common-spline-anim-value-attlist, - anim-animate-color-attlist, - common-timing-attlist - } - | element anim:animateTransform { - common-anim-target-attlist, - common-anim-named-target-attlist, - common-anim-add-accum-attlist, - common-anim-values-attlist, - anim-animate-transform-attlist, - common-timing-attlist - } - | element anim:transitionFilter { - common-anim-target-attlist, - common-anim-add-accum-attlist, - common-anim-values-attlist, - common-anim-spline-mode-attlist, - anim-transition-filter-attlist, - common-timing-attlist - } - | element anim:par { - common-anim-attlist, - common-timing-attlist, - common-endsync-timing-attlist, - animation-element* - } - | element anim:seq { - common-anim-attlist, - common-endsync-timing-attlist, - common-timing-attlist, - animation-element* - } - | element anim:iterate { - common-anim-attlist, - anim-iterate-attlist, - common-timing-attlist, - common-endsync-timing-attlist, - animation-element* - } - | element anim:audio { - common-anim-attlist, - anim-audio-attlist, - common-basic-timing-attlist - } - | element anim:command { - common-anim-attlist, - anim-command-attlist, - common-begin-end-timing-attlist, - common-anim-target-attlist, - element anim:param { - attribute anim:name { \string }, - attribute anim:value { \string } - }* - } -anim-animate-motion-attlist = - attribute svg:path { pathData }? - & attribute svg:origin { \string }? - & attribute smil:calcMode { - "discrete" | "linear" | "paced" | "spline" +style-chart-properties-attlist = + attribute chart:scale-text { boolean }? + & attribute chart:three-dimensional { boolean }? + & attribute chart:deep { boolean }? + & attribute chart:right-angled-axes { boolean }? + & (attribute chart:symbol-type { "none" } + | attribute chart:symbol-type { "automatic" } + | (attribute chart:symbol-type { "named-symbol" }, + attribute chart:symbol-name { + "square" + | "diamond" + | "arrow-down" + | "arrow-up" + | "arrow-right" + | "arrow-left" + | "bow-tie" + | "hourglass" + | "circle" + | "star" + | "x" + | "plus" + | "asterisk" + | "horizontal-bar" + | "vertical-bar" + }) + | (attribute chart:symbol-type { "image" }, + element chart:symbol-image { + attribute xlink:href { anyIRI } + }) + | empty) + & attribute chart:symbol-width { nonNegativeLength }? + & attribute chart:symbol-height { nonNegativeLength }? + & attribute chart:sort-by-x-values { boolean }? + & attribute chart:vertical { boolean }? + & attribute chart:connect-bars { boolean }? + & attribute chart:gap-width { integer }? + & attribute chart:overlap { integer }? + & attribute chart:group-bars-per-axis { boolean }? + & attribute chart:japanese-candle-stick { boolean }? + & attribute chart:interpolation { + "none" + | "cubic-spline" + | "b-spline" + | "step-start" + | "step-end" + | "step-center-x" + | "step-center-y" }? -anim-animate-color-attlist = - attribute anim:color-interpolation { "rgb" | "hsl" }? - & attribute anim:color-interpolation-direction { - "clockwise" | "counter-clockwise" + & attribute chart:spline-order { positiveInteger }? + & attribute chart:spline-resolution { positiveInteger }? + & attribute chart:pie-offset { nonNegativeInteger }? + & attribute chart:angle-offset { angle }? + & attribute chart:hole-size { percent }? + & attribute chart:lines { boolean }? + & attribute chart:solid-type { + "cuboid" | "cylinder" | "cone" | "pyramid" }? -anim-animate-transform-attlist = - attribute svg:type { - "translate" | "scale" | "rotate" | "skewX" | "skewY" - } -anim-transition-filter-attlist = - attribute smil:type { \string } - & attribute smil:subtype { \string }? - & attribute smil:direction { "forward" | "reverse" }? - & attribute smil:fadeColor { color }? - & attribute smil:mode { "in" | "out" }? -common-anim-target-attlist = - attribute smil:targetElement { IDREF }? - & attribute anim:sub-item { \string }? -common-anim-named-target-attlist = - attribute smil:attributeName { \string } -common-anim-values-attlist = - attribute smil:values { \string }? - & attribute anim:formula { \string }? - & common-anim-set-values-attlist - & attribute smil:from { \string }? - & attribute smil:by { \string }? -common-anim-spline-mode-attlist = - attribute smil:calcMode { - "discrete" | "linear" | "paced" | "spline" - }? -common-spline-anim-value-attlist = - attribute smil:keyTimes { \string }? - & attribute smil:keySplines { \string }? -common-anim-add-accum-attlist = - attribute smil:accumulate { "none" | "sum" }? - & attribute smil:additive { "replace" | "sum" }? -common-anim-set-values-attlist = attribute smil:to { \string }? -common-begin-end-timing-attlist = - attribute smil:begin { \string }? - & attribute smil:end { \string }? -common-dur-timing-attlist = attribute smil:dur { \string }? -common-endsync-timing-attlist = - attribute smil:endsync { "first" | "last" | "all" | "media" | IDREF }? -common-repeat-timing-attlist = - attribute smil:repeatDur { \string }?, - attribute smil:repeatCount { nonNegativeDecimal | "indefinite" }? -nonNegativeDecimal = xsd:decimal { minInclusive = "0.0" } -common-fill-timing-attlist = - attribute smil:fill { - "remove" | "freeze" | "hold" | "auto" | "default" | "transition" - }? -common-fill-default-attlist = - attribute smil:fillDefault { - "remove" | "freeze" | "hold" | "transition" | "auto" | "inherit" - }? -common-restart-timing-attlist = - attribute smil:restart { - "never" | "always" | "whenNotActive" | "default" + & attribute chart:stacked { boolean }? + & attribute chart:percentage { boolean }? + & attribute chart:treat-empty-cells { + "use-zero" | "leave-gap" | "ignore" + }? + & attribute chart:link-data-style-to-source { boolean }? + & attribute chart:logarithmic { boolean }? + & attribute chart:maximum { double }? + & attribute chart:minimum { double }? + & attribute chart:origin { double }? + & attribute chart:interval-major { double }? + & attribute chart:interval-minor-divisor { positiveInteger }? + & attribute chart:tick-marks-major-inner { boolean }? + & attribute chart:tick-marks-major-outer { boolean }? + & attribute chart:tick-marks-minor-inner { boolean }? + & attribute chart:tick-marks-minor-outer { boolean }? + & attribute chart:reverse-direction { boolean }? + & attribute chart:display-label { boolean }? + & attribute chart:text-overlap { boolean }? + & attribute text:line-break { boolean }? + & attribute chart:label-arrangement { + "side-by-side" | "stagger-even" | "stagger-odd" + }? + & common-style-direction-attlist + & common-rotation-angle-attlist + & attribute chart:data-label-number { + "none" | "value" | "percentage" | "value-and-percentage" + }? + & attribute chart:data-label-text { boolean }? + & attribute chart:data-label-symbol { boolean }? + & element chart:label-separator { text-p }? + & attribute chart:label-position { labelPositions }? + & attribute chart:label-position-negative { labelPositions }? + & attribute chart:visible { boolean }? + & attribute chart:auto-position { boolean }? + & attribute chart:auto-size { boolean }? + & attribute chart:mean-value { boolean }? + & attribute chart:error-category { + "none" + | "variance" + | "standard-deviation" + | "percentage" + | "error-margin" + | "constant" + | "standard-error" + | "cell-range" + }? + & attribute chart:error-percentage { double }? + & attribute chart:error-margin { double }? + & attribute chart:error-lower-limit { double }? + & attribute chart:error-upper-limit { double }? + & attribute chart:error-upper-indicator { boolean }? + & attribute chart:error-lower-indicator { boolean }? + & attribute chart:error-lower-range { cellRangeAddressList }? + & attribute chart:error-upper-range { cellRangeAddressList }? + & attribute chart:series-source { "columns" | "rows" }? + & attribute chart:regression-type { + "none" + | "linear" + | "logarithmic" + | "moving-average" + | "exponential" + | "power" + | "polynomial" + }? + & attribute chart:regression-max-degree { positiveInteger }? + & attribute chart:regression-force-intercept { boolean }? + & attribute chart:regression-intercept-value { double }? + & attribute chart:regression-name { \string }? + & # https://issues.oasis-open.org/browse/OFFICE-3958 + attribute chart:regression-period { positiveInteger }? + & attribute chart:regression-moving-type { + "prior" | "central" | "averaged-abscissa" + }? + & # https://issues.oasis-open.org/browse/OFFICE-3959 + attribute chart:axis-position { "start" | "end" | double }? + & attribute chart:axis-label-position { + "near-axis" + | "near-axis-other-side" + | "outside-start" + | "outside-end" + }? + & attribute chart:tick-mark-position { + "at-labels" | "at-axis" | "at-labels-and-axis" + }? + & attribute chart:include-hidden-cells { boolean }? + & (attribute chart:data-label-series { boolean }?) + # https://issues.oasis-open.org/browse/OFFICE-2117 + +style-chart-properties-content-strict = + style-chart-properties-attlist, style-chart-properties-elements +style-chart-properties-elements = empty +style-column = element style:column { style-column-attlist } +style-column-attlist = + attribute style:rel-width { relativeLength } + & attribute fo:start-indent { length }? + & attribute fo:end-indent { length }? + & attribute fo:space-before { length }? + & attribute fo:space-after { length }? +style-column-sep = element style:column-sep { style-column-sep-attlist } +style-column-sep-attlist = + attribute style:style { + "none" | "solid" | "dotted" | "dashed" | "dot-dashed" }? -common-restart-default-attlist = - attribute smil:restartDefault { - "never" | "always" | "whenNotActive" | "inherit" + & attribute style:width { length } + & attribute style:height { zeroToHundredPercent }? + & attribute style:vertical-align { "top" | "middle" | "bottom" }? + & attribute style:color { color }? +style-columns = + element style:columns { + style-columns-attlist, style-column-sep?, style-column* }? -common-time-manip-attlist = - attribute smil:accelerate { zeroToOneDecimal }? - & attribute smil:decelerate { zeroToOneDecimal }? - & attribute smil:autoReverse { boolean }? -zeroToOneDecimal = xsd:decimal { minInclusive = "0" maxInclusive = "1" } -common-basic-timing-attlist = - common-begin-end-timing-attlist, - common-dur-timing-attlist, - common-repeat-timing-attlist, - common-restart-timing-attlist, - common-restart-default-attlist, - common-fill-timing-attlist, - common-fill-default-attlist -common-timing-attlist = - common-basic-timing-attlist, common-time-manip-attlist -anim-iterate-attlist = - common-anim-target-attlist - & attribute anim:iterate-type { \string }? - & attribute anim:iterate-interval { duration }? -anim-audio-attlist = - attribute xlink:href { anyIRI }? - & attribute anim:audio-level { double }? -anim-command-attlist = attribute anim:command { \string } -style-style = - element style:style { - style-style-attlist, style-style-content, style-map* - } -common-in-content-meta-attlist = - attribute xhtml:about { URIorSafeCURIE }, - attribute xhtml:property { CURIEs }, - common-meta-literal-attlist -common-meta-literal-attlist = - attribute xhtml:datatype { CURIE }?, - attribute xhtml:content { \string }? -xml-id = attribute xml:id { ID } -style-style-attlist = - attribute style:name { styleName } - & attribute style:display-name { \string }? - & attribute style:parent-style-name { styleNameRef }? - & attribute style:next-style-name { styleNameRef }? - & attribute style:list-level { positiveInteger | empty }? - & attribute style:list-style-name { styleName | empty }? - & attribute style:master-page-name { styleNameRef }? - & attribute style:auto-update { boolean }? - & attribute style:data-style-name { styleNameRef }? - & attribute style:percentage-data-style-name { styleNameRef }? - & attribute style:class { \string }? - & attribute style:default-outline-level { positiveInteger | empty }? -style-map = element style:map { style-map-attlist, empty } -style-map-attlist = - attribute style:condition { \string } - & attribute style:apply-style-name { styleNameRef } - & attribute style:base-cell-address { cellAddress }? +style-columns-attlist = + attribute fo:column-count { positiveInteger } + & attribute fo:column-gap { length }? +style-default-page-layout = + element style:default-page-layout { style-page-layout-content } style-default-style = element style:default-style { style-style-content } -style-page-layout = - element style:page-layout { - style-page-layout-attlist, style-page-layout-content +style-drawing-page-properties = + element style:drawing-page-properties { + style-drawing-page-properties-content-strict } -style-page-layout-content = - style-page-layout-properties?, - style-header-style?, - style-footer-style? -style-page-layout-attlist = - attribute style:name { styleName } - & attribute style:page-usage { - "all" | "left" | "right" | "mirrored" +style-drawing-page-properties-attlist = + attribute presentation:transition-type { + "manual" | "automatic" | "semi-automatic" + }? + & attribute presentation:transition-style { + "none" + | "fade-from-left" + | "fade-from-top" + | "fade-from-right" + | "fade-from-bottom" + | "fade-from-upperleft" + | "fade-from-upperright" + | "fade-from-lowerleft" + | "fade-from-lowerright" + | "move-from-left" + | "move-from-top" + | "move-from-right" + | "move-from-bottom" + | "move-from-upperleft" + | "move-from-upperright" + | "move-from-lowerleft" + | "move-from-lowerright" + | "uncover-to-left" + | "uncover-to-top" + | "uncover-to-right" + | "uncover-to-bottom" + | "uncover-to-upperleft" + | "uncover-to-upperright" + | "uncover-to-lowerleft" + | "uncover-to-lowerright" + | "fade-to-center" + | "fade-from-center" + | "vertical-stripes" + | "horizontal-stripes" + | "clockwise" + | "counterclockwise" + | "open-vertical" + | "open-horizontal" + | "close-vertical" + | "close-horizontal" + | "wavyline-from-left" + | "wavyline-from-top" + | "wavyline-from-right" + | "wavyline-from-bottom" + | "spiralin-left" + | "spiralin-right" + | "spiralout-left" + | "spiralout-right" + | "roll-from-top" + | "roll-from-left" + | "roll-from-right" + | "roll-from-bottom" + | "stretch-from-left" + | "stretch-from-top" + | "stretch-from-right" + | "stretch-from-bottom" + | "vertical-lines" + | "horizontal-lines" + | "dissolve" + | "random" + | "vertical-checkerboard" + | "horizontal-checkerboard" + | "interlocking-horizontal-left" + | "interlocking-horizontal-right" + | "interlocking-vertical-top" + | "interlocking-vertical-bottom" + | "fly-away" + | "open" + | "close" + | "melt" }? -style-header-style = - element style:header-style { style-header-footer-properties? } -style-footer-style = - element style:footer-style { style-header-footer-properties? } -style-default-page-layout = - element style:default-page-layout { style-page-layout-content } -style-master-page = - element style:master-page { - style-master-page-attlist, - (style-header, style-header-left?)?, - (style-footer, style-footer-left?)?, - draw-layer-set?, - office-forms?, - shape*, - animation-element?, - presentation-notes? - } -style-master-page-attlist = - attribute style:name { styleName } - & attribute style:display-name { \string }? - & attribute style:page-layout-name { styleNameRef } - & attribute draw:style-name { styleNameRef }? - & attribute style:next-style-name { styleNameRef }? -style-header = - element style:header { - common-style-header-footer-attlist, header-footer-content - } -style-footer = - element style:footer { - common-style-header-footer-attlist, header-footer-content - } -style-header-left = - element style:header-left { - common-style-header-footer-attlist, header-footer-content - } -style-footer-left = - element style:footer-left { - common-style-header-footer-attlist, header-footer-content - } -header-footer-content = - (text-tracked-changes, - text-decls, - (text-h - | text-p - | text-list - | table-table - | text-section - | text-table-of-content - | text-illustration-index - | text-table-index - | text-object-index - | text-user-index - | text-alphabetical-index - | text-bibliography - | text-index-title - | change-marks)*) - | (style-region-left?, style-region-center?, style-region-right?) -common-style-header-footer-attlist = - attribute style:display { boolean }? -style-region-left = element style:region-left { region-content } -style-region-center = element style:region-center { region-content } -style-region-right = element style:region-right { region-content } -region-content = text-p* -presentation-notes = - element presentation:notes { - common-presentation-header-footer-attlist, - presentation-notes-attlist, - office-forms, - shape* - } -presentation-notes-attlist = - attribute style:page-layout-name { styleNameRef }? - & attribute draw:style-name { styleNameRef }? -table-table-template = - element table:table-template { - table-table-template-attlist, - table-first-row?, - table-last-row?, - table-first-column?, - table-last-column?, - table-body, - table-even-rows?, - table-odd-rows?, - table-even-columns?, - table-odd-columns?, - table-background? - } -table-table-template-attlist = - attribute table:name { \string } - & attribute table:first-row-start-column { rowOrCol } - & attribute table:first-row-end-column { rowOrCol } - & attribute table:last-row-start-column { rowOrCol } - & attribute table:last-row-end-column { rowOrCol } -rowOrCol = "row" | "column" -table-first-row = - element table:first-row { common-table-template-attlist, empty } -table-last-row = - element table:last-row { common-table-template-attlist, empty } -table-first-column = - element table:first-column { common-table-template-attlist, empty } -table-last-column = - element table:last-column { common-table-template-attlist, empty } -table-body = element table:body { common-table-template-attlist, empty } -table-even-rows = - element table:even-rows { common-table-template-attlist, empty } -table-odd-rows = - element table:odd-rows { common-table-template-attlist, empty } -table-even-columns = - element table:even-columns { common-table-template-attlist, empty } -table-odd-columns = - element table:odd-columns { common-table-template-attlist, empty } -common-table-template-attlist = - attribute table:style-name { styleNameRef }, - attribute table:paragraph-style-name { styleNameRef }? -table-background = - element table:background { table-background-attlist, empty } -table-background-attlist = attribute table:style-name { styleNameRef } + & attribute presentation:transition-speed { presentationSpeeds }? + & attribute smil:type { \string }? + & attribute smil:subtype { \string }? + & attribute smil:direction { "forward" | "reverse" }? + & attribute smil:fadeColor { color }? + & attribute presentation:duration { duration }? + & attribute presentation:visibility { "visible" | "hidden" }? + & attribute draw:background-size { "full" | "border" }? + & attribute presentation:background-objects-visible { boolean }? + & attribute presentation:background-visible { boolean }? + & attribute presentation:display-header { boolean }? + & attribute presentation:display-footer { boolean }? + & attribute presentation:display-page-number { boolean }? + & attribute presentation:display-date-time { boolean }? +style-drawing-page-properties-content-strict = + style-graphic-fill-properties-attlist, + style-drawing-page-properties-attlist, + style-drawing-page-properties-elements +style-drawing-page-properties-elements = presentation-sound? +style-drop-cap = + element style:drop-cap { style-drop-cap-attlist, empty }? +style-drop-cap-attlist = + attribute style:length { "word" | positiveInteger }? + & attribute style:lines { positiveInteger }? + & attribute style:distance { length }? + & attribute style:style-name { styleNameRef }? style-font-face = element style:font-face { style-font-face-attlist, svg-font-face-src?, svg-definition-src? @@ -4575,606 +3924,23 @@ style-font-face-attlist = & attribute style:font-family-generic { fontFamilyGeneric }? & attribute style:font-pitch { fontPitch }? & attribute style:font-charset { textEncoding }? -svg-font-face-src = - element svg:font-face-src { - (svg-font-face-uri | svg-font-face-name)+ - } -svg-font-face-uri = - element svg:font-face-uri { - common-svg-font-face-xlink-attlist, svg-font-face-format* - } -svg-font-face-format = - element svg:font-face-format { - attribute svg:string { \string }?, - empty - } -svg-font-face-name = - element svg:font-face-name { - attribute svg:name { \string }?, - empty - } -svg-definition-src = - element svg:definition-src { - common-svg-font-face-xlink-attlist, empty - } -common-svg-font-face-xlink-attlist = - attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute xlink:actuate { "onRequest" }? -number-number-style = - element number:number-style { - common-data-style-attlist, - style-text-properties?, - number-text?, - (any-number, number-text?)?, - style-map* - } -any-number = number-number | number-scientific-number | number-fraction -number-number = - element number:number { - number-number-attlist, - common-decimal-places-attlist, - common-number-attlist, - number-embedded-text* - } -number-number-attlist = - attribute number:decimal-replacement { \string }? - & attribute number:display-factor { double }? -number-embedded-text = - element number:embedded-text { number-embedded-text-attlist, text } -number-embedded-text-attlist = attribute number:position { integer } -number-scientific-number = - element number:scientific-number { - number-scientific-number-attlist, - common-decimal-places-attlist, - common-number-attlist, - empty - } -number-scientific-number-attlist = - attribute number:min-exponent-digits { integer }? -number-fraction = - element number:fraction { - number-fraction-attlist, common-number-attlist, empty - } -number-fraction-attlist = - attribute number:min-numerator-digits { integer }? - & attribute number:min-denominator-digits { integer }? - & attribute number:denominator-value { integer }? -number-currency-style = - element number:currency-style { - common-data-style-attlist, - common-auto-reorder-attlist, - style-text-properties?, - number-text?, - ((number-and-text, currency-symbol-and-text?) - | (currency-symbol-and-text, number-and-text?))?, - style-map* - } -currency-symbol-and-text = number-currency-symbol, number-text? -number-and-text = number-number, number-text? -number-currency-symbol = - element number:currency-symbol { - number-currency-symbol-attlist, text - } -number-currency-symbol-attlist = - attribute number:language { languageCode }?, - attribute number:country { countryCode }?, - attribute number:script { scriptCode }?, - attribute number:rfc-language-tag { language }? -number-percentage-style = - element number:percentage-style { - common-data-style-attlist, - style-text-properties?, - number-text?, - number-and-text?, - style-map* - } -number-date-style = - element number:date-style { - common-data-style-attlist, - common-auto-reorder-attlist, - common-format-source-attlist, - style-text-properties?, - number-text?, - (any-date, number-text?)+, - style-map* - } -any-date = - number-day - | number-month - | number-year - | number-era - | number-day-of-week - | number-week-of-year - | number-quarter - | number-hours - | number-am-pm - | number-minutes - | number-seconds -number-day = - element number:day { - number-day-attlist, common-calendar-attlist, empty - } -number-day-attlist = attribute number:style { "short" | "long" }? -number-month = - element number:month { - number-month-attlist, common-calendar-attlist, empty - } -number-month-attlist = - attribute number:textual { boolean }? - & attribute number:possessive-form { boolean }? - & attribute number:style { "short" | "long" }? -number-year = - element number:year { - number-year-attlist, common-calendar-attlist, empty - } -number-year-attlist = attribute number:style { "short" | "long" }? -number-era = - element number:era { - number-era-attlist, common-calendar-attlist, empty - } -number-era-attlist = attribute number:style { "short" | "long" }? -number-day-of-week = - element number:day-of-week { - number-day-of-week-attlist, common-calendar-attlist, empty - } -number-day-of-week-attlist = - attribute number:style { "short" | "long" }? -number-week-of-year = - element number:week-of-year { common-calendar-attlist, empty } -number-quarter = - element number:quarter { - number-quarter-attlist, common-calendar-attlist, empty - } -number-quarter-attlist = attribute number:style { "short" | "long" }? -number-time-style = - element number:time-style { - number-time-style-attlist, - common-data-style-attlist, - common-format-source-attlist, - style-text-properties?, - number-text?, - (any-time, number-text?)+, - style-map* - } -any-time = number-hours | number-am-pm | number-minutes | number-seconds -number-time-style-attlist = - attribute number:truncate-on-overflow { boolean }? -number-hours = element number:hours { number-hours-attlist, empty } -number-hours-attlist = attribute number:style { "short" | "long" }? -number-minutes = - element number:minutes { number-minutes-attlist, empty } -number-minutes-attlist = attribute number:style { "short" | "long" }? -number-seconds = - element number:seconds { number-seconds-attlist, empty } -number-seconds-attlist = - attribute number:style { "short" | "long" }? - & attribute number:decimal-places { integer }? -number-am-pm = element number:am-pm { empty } -number-boolean-style = - element number:boolean-style { - common-data-style-attlist, - style-text-properties?, - number-text?, - (number-boolean, number-text?)?, - style-map* - } -number-boolean = element number:boolean { empty } -number-text-style = - element number:text-style { - common-data-style-attlist, - style-text-properties?, - number-text?, - (number-text-content, number-text?)*, - style-map* - } -number-text = element number:text { text } -number-text-content = element number:text-content { empty } -common-data-style-attlist = - attribute style:name { styleName } - & attribute style:display-name { \string }? - & attribute number:language { languageCode }? - & attribute number:country { countryCode }? - & attribute number:script { scriptCode }? - & attribute number:rfc-language-tag { language }? - & attribute number:title { \string }? - & attribute style:volatile { boolean }? - & attribute number:transliteration-format { \string }? - & attribute number:transliteration-language { countryCode }? - & attribute number:transliteration-country { countryCode }? - & attribute number:transliteration-style { - "short" | "medium" | "long" - }? -common-auto-reorder-attlist = - attribute number:automatic-order { boolean }? -common-format-source-attlist = - attribute number:format-source { "fixed" | "language" }? -common-decimal-places-attlist = - attribute number:decimal-places { integer }? -common-number-attlist = - attribute number:min-integer-digits { integer }? - & attribute number:grouping { boolean }? -common-calendar-attlist = - attribute number:calendar { - "gregorian" - | "gengou" - | "ROC" - | "hanja_yoil" - | "hanja" - | "hijri" - | "jewish" - | "buddhist" - | \string - }? -style-style-content = - (attribute style:family { "text" }, - style-text-properties?) - | (attribute style:family { "paragraph" }, - style-paragraph-properties?, - style-text-properties?) - | (attribute style:family { "section" }, - style-section-properties?) - | (attribute style:family { "ruby" }, - style-ruby-properties?) - | (attribute style:family { "table" }, - style-table-properties?) - | (attribute style:family { "table-column" }, - style-table-column-properties?) - | (attribute style:family { "table-row" }, - style-table-row-properties?) - | (attribute style:family { "table-cell" }, - style-table-cell-properties?, - style-paragraph-properties?, - style-text-properties?) - | (attribute style:family { "graphic" | "presentation" }, - style-graphic-properties?, - style-paragraph-properties?, - style-text-properties?) - | (attribute style:family { "drawing-page" }, - style-drawing-page-properties?) - | (attribute style:family { "chart" }, - style-chart-properties?, - style-graphic-properties?, - style-paragraph-properties?, - style-text-properties?) -text-linenumbering-configuration = - element text:linenumbering-configuration { - text-linenumbering-configuration-attlist, - text-linenumbering-separator? - } -text-linenumbering-configuration-attlist = - attribute text:number-lines { boolean }? - & common-num-format-attlist? - & attribute text:style-name { styleNameRef }? - & attribute text:increment { nonNegativeInteger }? - & attribute text:number-position { - "left" | "right" | "inner" | "outer" - }? - & attribute text:offset { nonNegativeLength }? - & attribute text:count-empty-lines { boolean }? - & attribute text:count-in-text-boxes { boolean }? - & attribute text:restart-on-page { boolean }? -text-linenumbering-separator = - element text:linenumbering-separator { - attribute text:increment { nonNegativeInteger }?, - text - } -text-notes-configuration = - element text:notes-configuration { text-notes-configuration-content } -text-notes-configuration-content = - text-note-class - & attribute text:citation-style-name { styleNameRef }? - & attribute text:citation-body-style-name { styleNameRef }? - & attribute text:default-style-name { styleNameRef }? - & attribute text:master-page-name { styleNameRef }? - & attribute text:start-value { nonNegativeInteger }? - & common-num-format-prefix-suffix-attlist - & common-num-format-attlist? - & attribute text:start-numbering-at { - "document" | "chapter" | "page" - }? - & attribute text:footnotes-position { - "text" | "page" | "section" | "document" - }? - & element text:note-continuation-notice-forward { text }? - & element text:note-continuation-notice-backward { text }? -text-bibliography-configuration = - element text:bibliography-configuration { - text-bibliography-configuration-attlist, text-sort-key* - } -text-bibliography-configuration-attlist = - attribute text:prefix { \string }? - & attribute text:suffix { \string }? - & attribute text:numbered-entries { boolean }? - & attribute text:sort-by-position { boolean }? - & attribute fo:language { languageCode }? - & attribute fo:country { countryCode }? - & attribute fo:script { scriptCode }? - & attribute style:rfc-language-tag { language }? - & attribute text:sort-algorithm { \string }? -text-sort-key = element text:sort-key { text-sort-key-attlist, empty } -text-sort-key-attlist = - attribute text:key { - "address" - | "annote" - | "author" - | "bibliography-type" - | "booktitle" - | "chapter" - | "custom1" - | "custom2" - | "custom3" - | "custom4" - | "custom5" - | "edition" - | "editor" - | "howpublished" - | "identifier" - | "institution" - | "isbn" - | "issn" - | "journal" - | "month" - | "note" - | "number" - | "organizations" - | "pages" - | "publisher" - | "report-type" - | "school" - | "series" - | "title" - | "url" - | "volume" - | "year" - }, - attribute text:sort-ascending { boolean }? -text-list-style = - element text:list-style { - text-list-style-attr, text-list-style-content* - } -text-list-style-attr = - attribute style:name { styleName } - & attribute style:display-name { \string }? - & attribute text:consecutive-numbering { boolean }? -text-list-style-content = - element text:list-level-style-number { - text-list-level-style-attr, - text-list-level-style-number-attr, - style-list-level-properties?, - style-text-properties? - } - | element text:list-level-style-bullet { - text-list-level-style-attr, - text-list-level-style-bullet-attr, - style-list-level-properties?, - style-text-properties? - } - | element text:list-level-style-image { - text-list-level-style-attr, - text-list-level-style-image-attr, - style-list-level-properties? - } -text-list-level-style-number-attr = - attribute text:style-name { styleNameRef }? - & common-num-format-attlist - & common-num-format-prefix-suffix-attlist - & attribute text:display-levels { positiveInteger }? - & attribute text:start-value { positiveInteger }? -text-list-level-style-bullet-attr = - attribute text:style-name { styleNameRef }? - & attribute text:bullet-char { character } - & common-num-format-prefix-suffix-attlist - & attribute text:bullet-relative-size { percent }? -text-list-level-style-image-attr = - common-draw-data-attlist | office-binary-data -text-list-level-style-attr = attribute text:level { positiveInteger } -text-outline-style = - element text:outline-style { - text-outline-style-attr, text-outline-level-style+ - } -text-outline-style-attr = attribute style:name { styleName } -text-outline-level-style = - element text:outline-level-style { - text-outline-level-style-attlist, - style-list-level-properties?, - style-text-properties? - } -text-outline-level-style-attlist = - attribute text:level { positiveInteger } - & attribute text:style-name { styleNameRef }? - & common-num-format-attlist - & common-num-format-prefix-suffix-attlist - & attribute text:display-levels { positiveInteger }? - & attribute text:start-value { positiveInteger }? -style-graphic-properties = - element style:graphic-properties { - style-graphic-properties-content-strict - } -style-graphic-properties-content-strict = - style-graphic-properties-attlist, - style-graphic-fill-properties-attlist, - style-graphic-properties-elements -style-drawing-page-properties = - element style:drawing-page-properties { - style-drawing-page-properties-content-strict - } -style-drawing-page-properties-content-strict = - style-graphic-fill-properties-attlist, - style-drawing-page-properties-attlist, - style-drawing-page-properties-elements -draw-gradient = - element draw:gradient { - common-draw-gradient-attlist, draw-gradient-attlist, empty - } -common-draw-gradient-attlist = - attribute draw:name { styleName }? - & attribute draw:display-name { \string }? - & attribute draw:style { gradient-style } - & attribute draw:cx { percent }? - & attribute draw:cy { percent }? - & attribute draw:angle { angle }? - & attribute draw:border { percent }? -gradient-style = - "linear" | "axial" | "radial" | "ellipsoid" | "square" | "rectangular" -draw-gradient-attlist = - attribute draw:start-color { color }? - & attribute draw:end-color { color }? - & attribute draw:start-intensity { zeroToHundredPercent }? - & attribute draw:end-intensity { zeroToHundredPercent }? -svg-linearGradient = - element svg:linearGradient { - common-svg-gradient-attlist, - attribute svg:x1 { coordinate | percent }?, - attribute svg:y1 { coordinate | percent }?, - attribute svg:x2 { coordinate | percent }?, - attribute svg:y2 { coordinate | percent }?, - svg-stop* - } -svg-radialGradient = - element svg:radialGradient { - common-svg-gradient-attlist, - attribute svg:cx { coordinate | percent }?, - attribute svg:cy { coordinate | percent }?, - attribute svg:r { coordinate | percent }?, - attribute svg:fx { coordinate | percent }?, - attribute svg:fy { coordinate | percent }?, - svg-stop* - } -svg-stop = - element svg:stop { - attribute svg:offset { double | percent }, - attribute svg:stop-color { color }?, - attribute svg:stop-opacity { double }? - } -common-svg-gradient-attlist = - attribute svg:gradientUnits { "objectBoundingBox" }? - & attribute svg:gradientTransform { \string }? - & attribute svg:spreadMethod { "pad" | "reflect" | "repeat" }? - & attribute draw:name { styleName } - & attribute draw:display-name { \string }? -draw-hatch = element draw:hatch { draw-hatch-attlist, empty } -draw-hatch-attlist = - attribute draw:name { styleName } - & attribute draw:display-name { \string }? - & attribute draw:style { "single" | "double" | "triple" } - & attribute draw:color { color }? - & attribute draw:distance { length }? - & attribute draw:rotation { angle }? -draw-fill-image = - element draw:fill-image { - draw-fill-image-attlist, - attribute xlink:type { "simple" }, - attribute xlink:href { anyIRI }, - attribute xlink:show { "embed" }?, - attribute xlink:actuate { "onLoad" }?, - empty - } -draw-fill-image-attlist = - attribute draw:name { styleName } - & attribute draw:display-name { \string }? - & attribute svg:width { length }? - & attribute svg:height { length }? -draw-opacity = - element draw:opacity { - common-draw-gradient-attlist, draw-opacity-attlist, empty - } -draw-opacity-attlist = - attribute draw:start { zeroToHundredPercent }?, - attribute draw:end { zeroToHundredPercent }? -draw-marker = - element draw:marker { - draw-marker-attlist, - common-draw-viewbox-attlist, - common-draw-path-data-attlist, - empty - } -draw-marker-attlist = - attribute draw:name { styleName } - & attribute draw:display-name { \string }? -draw-stroke-dash = - element draw:stroke-dash { draw-stroke-dash-attlist, empty } -draw-stroke-dash-attlist = - attribute draw:name { styleName } - & attribute draw:display-name { \string }? - & attribute draw:style { "rect" | "round" }? - & attribute draw:dots1 { integer }? - & attribute draw:dots1-length { length | percent }? - & attribute draw:dots2 { integer }? - & attribute draw:dots2-length { length | percent }? - & attribute draw:distance { length | percent }? -style-presentation-page-layout = - element style:presentation-page-layout { - attribute style:name { styleName }, - attribute style:display-name { \string }?, - presentation-placeholder* +style-footer = + element style:footer { + common-style-header-footer-attlist, header-footer-content } -presentation-placeholder = - element presentation:placeholder { - attribute presentation:object { presentation-classes }, - attribute svg:x { coordinate | percent }, - attribute svg:y { coordinate | percent }, - attribute svg:width { length | percent }, - attribute svg:height { length | percent }, - empty +style-footer-first = + element style:footer-first { + common-style-header-footer-attlist, + header-footer-content + # https://issues.oasis-open.org/browse/OFFICE-3789 + } -style-page-layout-properties = - element style:page-layout-properties { - style-page-layout-properties-content-strict +style-footer-left = + element style:footer-left { + common-style-header-footer-attlist, header-footer-content } -style-page-layout-properties-content-strict = - style-page-layout-properties-attlist, - style-page-layout-properties-elements -style-page-layout-properties-attlist = - attribute fo:page-width { length }? - & attribute fo:page-height { length }? - & common-num-format-attlist? - & common-num-format-prefix-suffix-attlist - & attribute style:paper-tray-name { "default" | \string }? - & attribute style:print-orientation { "portrait" | "landscape" }? - & common-horizontal-margin-attlist - & common-vertical-margin-attlist - & common-margin-attlist - & common-border-attlist - & common-border-line-width-attlist - & common-padding-attlist - & common-shadow-attlist - & common-background-color-attlist - & attribute style:register-truth-ref-style-name { styleNameRef }? - & attribute style:print { - list { - ("headers" - | "grid" - | "annotations" - | "objects" - | "charts" - | "drawings" - | "formulas" - | "zero-values")* - } - }? - & attribute style:print-page-order { "ttb" | "ltr" }? - & attribute style:first-page-number { positiveInteger | "continue" }? - & attribute style:scale-to { percent }? - & attribute style:scale-to-pages { positiveInteger }? - & attribute style:table-centering { - "horizontal" | "vertical" | "both" | "none" - }? - & attribute style:footnote-max-height { length }? - & common-writing-mode-attlist - & attribute style:layout-grid-mode { "none" | "line" | "both" }? - & attribute style:layout-grid-standard-mode { boolean }? - & attribute style:layout-grid-base-height { length }? - & attribute style:layout-grid-ruby-height { length }? - & attribute style:layout-grid-lines { positiveInteger }? - & attribute style:layout-grid-base-width { length }? - & attribute style:layout-grid-color { color }? - & attribute style:layout-grid-ruby-below { boolean }? - & attribute style:layout-grid-print { boolean }? - & attribute style:layout-grid-display { boolean }? - & attribute style:layout-grid-snap-to { boolean }? -style-page-layout-properties-elements = - style-background-image & style-columns & style-footnote-sep +style-footer-style = + element style:footer-style { style-header-footer-properties? } style-footnote-sep = element style:footnote-sep { style-footnote-sep-attlist, empty }? style-footnote-sep-attlist = @@ -5185,490 +3951,43 @@ style-footnote-sep-attlist = attribute style:adjustment { "left" | "center" | "right" }?, attribute style:distance-before-sep { length }?, attribute style:distance-after-sep { length }? -style-header-footer-properties = - element style:header-footer-properties { - style-header-footer-properties-content-strict - } -style-header-footer-properties-content-strict = - style-header-footer-properties-attlist, - style-header-footer-properties-elements -style-header-footer-properties-attlist = - attribute svg:height { length }? - & attribute fo:min-height { length }? - & common-horizontal-margin-attlist - & common-vertical-margin-attlist - & common-margin-attlist - & common-border-attlist - & common-border-line-width-attlist - & common-padding-attlist - & common-background-color-attlist - & common-shadow-attlist - & attribute style:dynamic-spacing { boolean }? -style-header-footer-properties-elements = style-background-image -style-text-properties = - element style:text-properties { style-text-properties-content-strict } -style-text-properties-content-strict = - style-text-properties-attlist, style-text-properties-elements -style-text-properties-elements = empty -style-text-properties-attlist = - attribute fo:font-variant { fontVariant }? - & attribute fo:text-transform { - "none" | "lowercase" | "uppercase" | "capitalize" - }? - & attribute fo:color { color }? - & attribute style:use-window-font-color { boolean }? - & attribute style:text-outline { boolean }? - & attribute style:text-line-through-type { lineType }? - & attribute style:text-line-through-style { lineStyle }? - & attribute style:text-line-through-width { lineWidth }? - & attribute style:text-line-through-color { "font-color" | color }? - & attribute style:text-line-through-text { \string }? - & attribute style:text-line-through-text-style { styleNameRef }? - & attribute style:text-position { - list { (percent | "super" | "sub"), percent? } - }? - & attribute style:font-name { \string }? - & attribute style:font-name-asian { \string }? - & attribute style:font-name-complex { \string }? - & attribute fo:font-family { \string }? - & attribute style:font-family-asian { \string }? - & attribute style:font-family-complex { \string }? - & attribute style:font-family-generic { fontFamilyGeneric }? - & attribute style:font-family-generic-asian { fontFamilyGeneric }? - & attribute style:font-family-generic-complex { fontFamilyGeneric }? - & attribute style:font-style-name { \string }? - & attribute style:font-style-name-asian { \string }? - & attribute style:font-style-name-complex { \string }? - & attribute style:font-pitch { fontPitch }? - & attribute style:font-pitch-asian { fontPitch }? - & attribute style:font-pitch-complex { fontPitch }? - & attribute style:font-charset { textEncoding }? - & attribute style:font-charset-asian { textEncoding }? - & attribute style:font-charset-complex { textEncoding }? - & attribute fo:font-size { positiveLength | percent }? - & attribute style:font-size-asian { positiveLength | percent }? - & attribute style:font-size-complex { positiveLength | percent }? - & attribute style:font-size-rel { length }? - & attribute style:font-size-rel-asian { length }? - & attribute style:font-size-rel-complex { length }? - & attribute style:script-type { - "latin" | "asian" | "complex" | "ignore" - }? - & attribute fo:letter-spacing { length | "normal" }? - & attribute fo:language { languageCode }? - & attribute style:language-asian { languageCode }? - & attribute style:language-complex { languageCode }? - & attribute fo:country { countryCode }? - & attribute style:country-asian { countryCode }? - & attribute style:country-complex { countryCode }? - & attribute fo:script { scriptCode }? - & attribute style:script-asian { scriptCode }? - & attribute style:script-complex { scriptCode }? - & attribute style:rfc-language-tag { language }? - & attribute style:rfc-language-tag-asian { language }? - & attribute style:rfc-language-tag-complex { language }? - & attribute fo:font-style { fontStyle }? - & attribute style:font-style-asian { fontStyle }? - & attribute style:font-style-complex { fontStyle }? - & attribute style:font-relief { "none" | "embossed" | "engraved" }? - & attribute fo:text-shadow { shadowType }? - & attribute style:text-underline-type { lineType }? - & attribute style:text-underline-style { lineStyle }? - & attribute style:text-underline-width { lineWidth }? - & attribute style:text-underline-color { "font-color" | color }? - & attribute style:text-overline-type { lineType }? - & attribute style:text-overline-style { lineStyle }? - & attribute style:text-overline-width { lineWidth }? - & attribute style:text-overline-color { "font-color" | color }? - & attribute style:text-overline-mode { lineMode }? - & attribute fo:font-weight { fontWeight }? - & attribute style:font-weight-asian { fontWeight }? - & attribute style:font-weight-complex { fontWeight }? - & attribute style:text-underline-mode { lineMode }? - & attribute style:text-line-through-mode { lineMode }? - & attribute style:letter-kerning { boolean }? - & attribute style:text-blinking { boolean }? - & common-background-color-attlist - & attribute style:text-combine { "none" | "letters" | "lines" }? - & attribute style:text-combine-start-char { character }? - & attribute style:text-combine-end-char { character }? - & attribute style:text-emphasize { - "none" - | list { - ("none" | "accent" | "dot" | "circle" | "disc"), - ("above" | "below") - } - }? - & attribute style:text-scale { percent }? - & attribute style:text-rotation-angle { angle }? - & attribute style:text-rotation-scale { "fixed" | "line-height" }? - & attribute fo:hyphenate { boolean }? - & attribute fo:hyphenation-remain-char-count { positiveInteger }? - & attribute fo:hyphenation-push-char-count { positiveInteger }? - & (attribute text:display { "true" } - | attribute text:display { "none" } - | (attribute text:display { "condition" }, - attribute text:condition { "none" }) - | empty) -fontVariant = "normal" | "small-caps" -fontFamilyGeneric = - "roman" | "swiss" | "modern" | "decorative" | "script" | "system" -fontPitch = "fixed" | "variable" -textEncoding = xsd:string { pattern = "[A-Za-z][A-Za-z0-9._\-]*" } -fontStyle = "normal" | "italic" | "oblique" -shadowType = "none" | \string -lineType = "none" | "single" | "double" -lineStyle = - "none" - | "solid" - | "dotted" - | "dash" - | "long-dash" - | "dot-dash" - | "dot-dot-dash" - | "wave" -lineWidth = - "auto" - | "normal" - | "bold" - | "thin" - | "medium" - | "thick" - | positiveInteger - | percent - | positiveLength -fontWeight = - "normal" - | "bold" - | "100" - | "200" - | "300" - | "400" - | "500" - | "600" - | "700" - | "800" - | "900" -lineMode = "continuous" | "skip-white-space" -style-paragraph-properties = - element style:paragraph-properties { - style-paragraph-properties-content-strict - } -style-paragraph-properties-content-strict = - style-paragraph-properties-attlist, - style-paragraph-properties-elements -style-paragraph-properties-attlist = - attribute fo:line-height { "normal" | nonNegativeLength | percent }? - & attribute style:line-height-at-least { nonNegativeLength }? - & attribute style:line-spacing { length }? - & attribute style:font-independent-line-spacing { boolean }? - & common-text-align - & attribute fo:text-align-last { "start" | "center" | "justify" }? - & attribute style:justify-single-word { boolean }? - & attribute fo:keep-together { "auto" | "always" }? - & attribute fo:widows { nonNegativeInteger }? - & attribute fo:orphans { nonNegativeInteger }? - & attribute style:tab-stop-distance { nonNegativeLength }? - & attribute fo:hyphenation-keep { "auto" | "page" }? - & attribute fo:hyphenation-ladder-count { - "no-limit" | positiveInteger - }? - & attribute style:register-true { boolean }? - & common-horizontal-margin-attlist - & attribute fo:text-indent { length | percent }? - & attribute style:auto-text-indent { boolean }? - & common-vertical-margin-attlist - & common-margin-attlist - & common-break-attlist - & common-background-color-attlist - & common-border-attlist - & common-border-line-width-attlist - & attribute style:join-border { boolean }? - & common-padding-attlist - & common-shadow-attlist - & common-keep-with-next-attlist - & attribute text:number-lines { boolean }? - & attribute text:line-number { nonNegativeInteger }? - & attribute style:text-autospace { "none" | "ideograph-alpha" }? - & attribute style:punctuation-wrap { "simple" | "hanging" }? - & attribute style:line-break { "normal" | "strict" }? - & attribute style:vertical-align { - "top" | "middle" | "bottom" | "auto" | "baseline" - }? - & common-writing-mode-attlist - & attribute style:writing-mode-automatic { boolean }? - & attribute style:snap-to-layout-grid { boolean }? - & common-page-number-attlist - & common-background-transparency-attlist -common-text-align = - attribute fo:text-align { - "start" | "end" | "left" | "right" | "center" | "justify" - }? -style-paragraph-properties-elements = - style-tab-stops & style-drop-cap & style-background-image -style-tab-stops = element style:tab-stops { style-tab-stop* }? -style-tab-stop = - element style:tab-stop { style-tab-stop-attlist, empty } -style-tab-stop-attlist = - attribute style:position { length } - & (attribute style:type { "left" | "center" | "right" }? - | (attribute style:type { "char" }, - style-tab-stop-char-attlist)) - & attribute style:leader-type { lineType }? - & attribute style:leader-style { lineStyle }? - & attribute style:leader-width { lineWidth }? - & attribute style:leader-color { "font-color" | color }? - & attribute style:leader-text { character }? - & attribute style:leader-text-style { styleNameRef }? -style-tab-stop-char-attlist = attribute style:char { character } -style-drop-cap = - element style:drop-cap { style-drop-cap-attlist, empty }? -style-drop-cap-attlist = - attribute style:length { "word" | positiveInteger }? - & attribute style:lines { positiveInteger }? - & attribute style:distance { length }? - & attribute style:style-name { styleNameRef }? -common-horizontal-margin-attlist = - attribute fo:margin-left { length | percent }?, - attribute fo:margin-right { length | percent }? -common-vertical-margin-attlist = - attribute fo:margin-top { nonNegativeLength | percent }?, - attribute fo:margin-bottom { nonNegativeLength | percent }? -common-margin-attlist = - attribute fo:margin { nonNegativeLength | percent }? -common-break-attlist = - attribute fo:break-before { "auto" | "column" | "page" }?, - attribute fo:break-after { "auto" | "column" | "page" }? -common-background-color-attlist = - attribute fo:background-color { "transparent" | color }? -style-background-image = - element style:background-image { - style-background-image-attlist, - (common-draw-data-attlist | office-binary-data | empty) +style-graphic-fill-properties-attlist = + attribute draw:fill { + "none" | "solid" | "bitmap" | "gradient" | "hatch" }? -style-background-image-attlist = - attribute style:repeat { "no-repeat" | "repeat" | "stretch" }? - & attribute style:position { - "left" - | "center" - | "right" + & attribute draw:fill-color { color }? + & attribute draw:secondary-fill-color { color }? + & attribute draw:fill-gradient-name { styleNameRef }? + & attribute draw:gradient-step-count { nonNegativeInteger }? + & attribute draw:fill-hatch-name { styleNameRef }? + & attribute draw:fill-hatch-solid { boolean }? + & attribute draw:fill-image-name { styleNameRef }? + & attribute style:repeat { "no-repeat" | "repeat" | "stretch" }? + & attribute draw:fill-image-width { length | percent }? + & attribute draw:fill-image-height { length | percent }? + & attribute draw:fill-image-ref-point-x { percent }? + & attribute draw:fill-image-ref-point-y { percent }? + & attribute draw:fill-image-ref-point { + "top-left" | "top" - | "bottom" - | list { horiBackPos, vertBackPos } - | list { vertBackPos, horiBackPos } - }? - & attribute style:filter-name { \string }? - & attribute draw:opacity { zeroToHundredPercent }? -horiBackPos = "left" | "center" | "right" -vertBackPos = "top" | "center" | "bottom" -common-border-attlist = - attribute fo:border { \string }?, - attribute fo:border-top { \string }?, - attribute fo:border-bottom { \string }?, - attribute fo:border-left { \string }?, - attribute fo:border-right { \string }? -common-border-line-width-attlist = - attribute style:border-line-width { borderWidths }?, - attribute style:border-line-width-top { borderWidths }?, - attribute style:border-line-width-bottom { borderWidths }?, - attribute style:border-line-width-left { borderWidths }?, - attribute style:border-line-width-right { borderWidths }? -borderWidths = list { positiveLength, positiveLength, positiveLength } -common-padding-attlist = - attribute fo:padding { nonNegativeLength }?, - attribute fo:padding-top { nonNegativeLength }?, - attribute fo:padding-bottom { nonNegativeLength }?, - attribute fo:padding-left { nonNegativeLength }?, - attribute fo:padding-right { nonNegativeLength }? -common-shadow-attlist = attribute style:shadow { shadowType }? -common-keep-with-next-attlist = - attribute fo:keep-with-next { "auto" | "always" }? -common-writing-mode-attlist = - attribute style:writing-mode { - "lr-tb" | "rl-tb" | "tb-rl" | "tb-lr" | "lr" | "rl" | "tb" | "page" - }? -common-page-number-attlist = - attribute style:page-number { positiveInteger | "auto" }? -common-background-transparency-attlist = - attribute style:background-transparency { zeroToHundredPercent }? -style-ruby-properties = - element style:ruby-properties { style-ruby-properties-content-strict } -style-ruby-properties-content-strict = - style-ruby-properties-attlist, style-ruby-properties-elements -style-ruby-properties-elements = empty -style-ruby-properties-attlist = - attribute style:ruby-position { "above" | "below" }? - & attribute style:ruby-align { - "left" + | "top-right" + | "left" | "center" | "right" - | "distribute-letter" - | "distribute-space" - }? -style-section-properties = - element style:section-properties { - style-section-properties-content-strict - } -style-section-properties-content-strict = - style-section-properties-attlist, style-section-properties-elements -style-section-properties-attlist = - common-background-color-attlist - & common-horizontal-margin-attlist - & attribute style:protect { boolean }? - & common-editable-attlist - & attribute text:dont-balance-text-columns { boolean }? - & common-writing-mode-attlist -style-section-properties-elements = - style-background-image & style-columns & text-notes-configuration* -style-columns = - element style:columns { - style-columns-attlist, style-column-sep?, style-column* - }? -style-columns-attlist = - attribute fo:column-count { positiveInteger } - & attribute fo:column-gap { length }? -style-column = element style:column { style-column-attlist } -style-column-attlist = - attribute style:rel-width { relativeLength } - & attribute fo:start-indent { length }? - & attribute fo:end-indent { length }? - & attribute fo:space-before { length }? - & attribute fo:space-after { length }? -style-column-sep = element style:column-sep { style-column-sep-attlist } -style-column-sep-attlist = - attribute style:style { - "none" | "solid" | "dotted" | "dashed" | "dot-dashed" - }? - & attribute style:width { length } - & attribute style:height { zeroToHundredPercent }? - & attribute style:vertical-align { "top" | "middle" | "bottom" }? - & attribute style:color { color }? -style-table-properties = - element style:table-properties { - style-table-properties-content-strict - } -style-table-properties-content-strict = - style-table-properties-attlist, style-table-properties-elements -style-table-properties-attlist = - attribute style:width { positiveLength }? - & attribute style:rel-width { percent }? - & attribute table:align { "left" | "center" | "right" | "margins" }? - & common-horizontal-margin-attlist - & common-vertical-margin-attlist - & common-margin-attlist - & common-page-number-attlist - & common-break-attlist - & common-background-color-attlist - & common-shadow-attlist - & common-keep-with-next-attlist - & attribute style:may-break-between-rows { boolean }? - & attribute table:border-model { "collapsing" | "separating" }? - & common-writing-mode-attlist - & attribute table:display { boolean }? -style-table-properties-elements = style-background-image -style-table-column-properties = - element style:table-column-properties { - style-table-column-properties-content-strict - } -style-table-column-properties-content-strict = - style-table-column-properties-attlist, - style-table-column-properties-elements -style-table-column-properties-elements = empty -style-table-column-properties-attlist = - attribute style:column-width { positiveLength }? - & attribute style:rel-column-width { relativeLength }? - & attribute style:use-optimal-column-width { boolean }? - & common-break-attlist -style-table-row-properties = - element style:table-row-properties { - style-table-row-properties-content-strict - } -style-table-row-properties-content-strict = - style-table-row-properties-attlist, - style-table-row-properties-elements -style-table-row-properties-attlist = - attribute style:row-height { positiveLength }? - & attribute style:min-row-height { nonNegativeLength }? - & attribute style:use-optimal-row-height { boolean }? - & common-background-color-attlist - & common-break-attlist - & attribute fo:keep-together { "auto" | "always" }? -style-table-row-properties-elements = style-background-image -style-table-cell-properties = - element style:table-cell-properties { - style-table-cell-properties-content-strict - } -style-table-cell-properties-content-strict = - style-table-cell-properties-attlist, - style-table-cell-properties-elements -style-table-cell-properties-attlist = - attribute style:vertical-align { - "top" | "middle" | "bottom" | "automatic" - }? - & attribute style:text-align-source { "fix" | "value-type" }? - & common-style-direction-attlist - & attribute style:glyph-orientation-vertical { - "auto" | "0" | "0deg" | "0rad" | "0grad" - }? - & common-writing-mode-attlist - & common-shadow-attlist - & common-background-color-attlist - & common-border-attlist - & attribute style:diagonal-tl-br { \string }? - & attribute style:diagonal-tl-br-widths { borderWidths }? - & attribute style:diagonal-bl-tr { \string }? - & attribute style:diagonal-bl-tr-widths { borderWidths }? - & common-border-line-width-attlist - & common-padding-attlist - & attribute fo:wrap-option { "no-wrap" | "wrap" }? - & common-rotation-angle-attlist - & attribute style:rotation-align { - "none" | "bottom" | "top" | "center" + | "bottom-left" + | "bottom" + | "bottom-right" }? - & attribute style:cell-protect { - "none" - | "hidden-and-protected" - | list { ("protected" | "formula-hidden")+ } + & attribute draw:tile-repeat-offset { + list { zeroToHundredPercent, ("horizontal" | "vertical") } }? - & attribute style:print-content { boolean }? - & attribute style:decimal-places { nonNegativeInteger }? - & attribute style:repeat-content { boolean }? - & attribute style:shrink-to-fit { boolean }? -common-style-direction-attlist = - attribute style:direction { "ltr" | "ttb" }? -style-table-cell-properties-elements = style-background-image -common-rotation-angle-attlist = - attribute style:rotation-angle { angle }? -style-list-level-properties = - element style:list-level-properties { - style-list-level-properties-content-strict + & attribute draw:opacity { zeroToHundredPercent }? + & attribute draw:opacity-name { styleNameRef }? + & attribute svg:fill-rule { "nonzero" | "evenodd" }? +style-graphic-properties = + element style:graphic-properties { + style-graphic-properties-content-strict } -style-list-level-properties-content-strict = - style-list-level-properties-attlist, - style-list-level-properties-elements -style-list-level-properties-attlist = - common-text-align - & attribute text:space-before { length }? - & attribute text:min-label-width { nonNegativeLength }? - & attribute text:min-label-distance { nonNegativeLength }? - & attribute style:font-name { \string }? - & attribute fo:width { positiveLength }? - & attribute fo:height { positiveLength }? - & common-vertical-rel-attlist - & common-vertical-pos-attlist - & attribute text:list-level-position-and-space-mode { - "label-width-and-position" | "label-alignment" - }? -style-list-level-properties-elements = style-list-level-label-alignment -style-list-level-label-alignment = - element style:list-level-label-alignment { - style-list-level-label-alignment-attlist, empty - }? -style-list-level-label-alignment-attlist = - attribute text:label-followed-by { "listtab" | "space" | "nothing" } - & attribute text:list-tab-stop-position { length }? - & attribute fo:text-indent { length }? - & attribute fo:margin-left { length }? style-graphic-properties-attlist = attribute draw:stroke { "none" | "dash" | "solid" }? & attribute draw:stroke-dash { styleNameRef }? @@ -5717,7 +4036,9 @@ style-graphic-properties-attlist = "greyscale" | "mono" | "watermark" | "standard" }? & attribute draw:color-inversion { boolean }? - & attribute draw:luminance { zeroToHundredPercent }? + & attribute draw:luminance { signedZeroToHundredPercent } + # https://issues.oasis-open.org/browse/OFFICE-3821 + ? & attribute draw:contrast { percent }? & attribute draw:gamma { percent }? & attribute draw:red { signedZeroToHundredPercent }? @@ -5892,363 +4213,2182 @@ style-graphic-properties-attlist = "content" | "thumbnail" | "icon" | "print-view" }? & attribute draw:ole-draw-aspect { nonNegativeInteger }? -style-graphic-fill-properties-attlist = - attribute draw:fill { - "none" | "solid" | "bitmap" | "gradient" | "hatch" - }? - & attribute draw:fill-color { color }? - & attribute draw:secondary-fill-color { color }? - & attribute draw:fill-gradient-name { styleNameRef }? - & attribute draw:gradient-step-count { nonNegativeInteger }? - & attribute draw:fill-hatch-name { styleNameRef }? - & attribute draw:fill-hatch-solid { boolean }? - & attribute draw:fill-image-name { styleNameRef }? - & attribute style:repeat { "no-repeat" | "repeat" | "stretch" }? - & attribute draw:fill-image-width { length | percent }? - & attribute draw:fill-image-height { length | percent }? - & attribute draw:fill-image-ref-point-x { percent }? - & attribute draw:fill-image-ref-point-y { percent }? - & attribute draw:fill-image-ref-point { - "top-left" - | "top" - | "top-right" - | "left" - | "center" - | "right" - | "bottom-left" - | "bottom" - | "bottom-right" - }? - & attribute draw:tile-repeat-offset { - list { zeroToHundredPercent, ("horizontal" | "vertical") } - }? - & attribute draw:opacity { zeroToHundredPercent }? - & attribute draw:opacity-name { styleNameRef }? - & attribute svg:fill-rule { "nonzero" | "evenodd" }? +style-graphic-properties-content-strict = + style-graphic-properties-attlist, + style-graphic-fill-properties-attlist, + style-graphic-properties-elements style-graphic-properties-elements = text-list-style? & style-background-image & style-columns -common-vertical-pos-attlist = - attribute style:vertical-pos { - "top" | "middle" | "bottom" | "from-top" | "below" - }?, - attribute svg:y { coordinate }? -common-vertical-rel-attlist = - attribute style:vertical-rel { - "page" - | "page-content" - | "frame" - | "frame-content" - | "paragraph" - | "paragraph-content" - | "char" - | "line" - | "baseline" - | "text" +style-handout-master = + element style:handout-master { + common-presentation-header-footer-attlist, + style-handout-master-attlist, + shape* + } +style-handout-master-attlist = + attribute presentation:presentation-page-layout-name { styleNameRef }? + & attribute style:page-layout-name { styleNameRef } + & attribute draw:style-name { styleNameRef }? +style-header = + element style:header { + common-style-header-footer-attlist, header-footer-content + } +style-header-first = + element style:header-first { + common-style-header-footer-attlist, + header-footer-content + # https://issues.oasis-open.org/browse/OFFICE-3789 + + } +style-header-footer-properties = + element style:header-footer-properties { + style-header-footer-properties-content-strict + } +style-header-footer-properties-attlist = + attribute svg:height { length }? + & attribute fo:min-height { length }? + & common-horizontal-margin-attlist + & common-vertical-margin-attlist + & common-margin-attlist + & common-border-attlist + & common-border-line-width-attlist + & common-padding-attlist + & common-background-color-attlist + & common-shadow-attlist + & attribute style:dynamic-spacing { boolean }? +style-header-footer-properties-content-strict = + style-header-footer-properties-attlist, + style-header-footer-properties-elements +style-header-footer-properties-elements = style-background-image +style-header-left = + element style:header-left { + common-style-header-footer-attlist, header-footer-content + } +style-header-style = + element style:header-style { style-header-footer-properties? } +style-list-level-label-alignment = + element style:list-level-label-alignment { + style-list-level-label-alignment-attlist, empty }? -common-editable-attlist = attribute style:editable { boolean }? -horizontal-mirror = - "horizontal" | "horizontal-on-odd" | "horizontal-on-even" -clipShape = - xsd:string { - pattern = - "rect\([ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)))|(auto))([ ]*,[ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))))|(auto)){3}[ ]*\)" +style-list-level-label-alignment-attlist = + attribute text:label-followed-by { "listtab" | "space" | "nothing" } + & attribute text:list-tab-stop-position { length }? + & attribute fo:text-indent { length }? + & attribute fo:margin-left { length }? +style-list-level-properties = + element style:list-level-properties { + style-list-level-properties-content-strict } -nonNegativePixelLength = - xsd:string { pattern = "([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)" } -style-chart-properties = - element style:chart-properties { - style-chart-properties-content-strict +style-list-level-properties-attlist = + common-text-align + & attribute text:space-before { length }? + & attribute text:min-label-width { nonNegativeLength }? + & attribute text:min-label-distance { nonNegativeLength }? + & attribute style:font-name { \string }? + & attribute fo:width { positiveLength }? + & attribute fo:height { positiveLength }? + & common-vertical-rel-attlist + & common-vertical-pos-attlist + & attribute text:list-level-position-and-space-mode { + "label-width-and-position" | "label-alignment" + }? +style-list-level-properties-content-strict = + style-list-level-properties-attlist, + style-list-level-properties-elements +style-list-level-properties-elements = style-list-level-label-alignment +style-map = element style:map { style-map-attlist, empty } +style-map-attlist = + attribute style:condition { \string } + & attribute style:apply-style-name { styleNameRef } + & attribute style:base-cell-address { cellAddress }? +style-master-page = + element style:master-page { + style-master-page-attlist, + (style-header, + style-header-left?, + (style-header-first?) + # https://issues.oasis-open.org/browse/OFFICE-3789 + )?, + (style-footer, + style-footer-left?, + (style-footer-first?) + # https://issues.oasis-open.org/browse/OFFICE-3789 + )?, + draw-layer-set?, + office-forms?, + shape*, + animation-element?, + presentation-notes? } -style-chart-properties-content-strict = - style-chart-properties-attlist, style-chart-properties-elements -style-chart-properties-elements = empty -style-chart-properties-attlist = - attribute chart:scale-text { boolean }? - & attribute chart:three-dimensional { boolean }? - & attribute chart:deep { boolean }? - & attribute chart:right-angled-axes { boolean }? - & (attribute chart:symbol-type { "none" } - | attribute chart:symbol-type { "automatic" } - | (attribute chart:symbol-type { "named-symbol" }, - attribute chart:symbol-name { - "square" - | "diamond" - | "arrow-down" - | "arrow-up" - | "arrow-right" - | "arrow-left" - | "bow-tie" - | "hourglass" - | "circle" - | "star" - | "x" - | "plus" - | "asterisk" - | "horizontal-bar" - | "vertical-bar" - }) - | (attribute chart:symbol-type { "image" }, - element chart:symbol-image { - attribute xlink:href { anyIRI } - }) - | empty) - & attribute chart:symbol-width { nonNegativeLength }? - & attribute chart:symbol-height { nonNegativeLength }? - & attribute chart:sort-by-x-values { boolean }? - & attribute chart:vertical { boolean }? - & attribute chart:connect-bars { boolean }? - & attribute chart:gap-width { integer }? - & attribute chart:overlap { integer }? - & attribute chart:group-bars-per-axis { boolean }? - & attribute chart:japanese-candle-stick { boolean }? - & attribute chart:interpolation { - "none" | "cubic-spline" | "b-spline" +style-master-page-attlist = + attribute style:name { styleName } + & attribute style:display-name { \string }? + & attribute style:page-layout-name { styleNameRef } + & attribute draw:style-name { styleNameRef }? + & attribute style:next-style-name { styleNameRef }? +style-num-letter-sync-attlist = + attribute style:num-letter-sync { boolean }? +style-page-layout = + element style:page-layout { + style-page-layout-attlist, style-page-layout-content + } +style-page-layout-attlist = + attribute style:name { styleName } + & attribute style:page-usage { + "all" | "left" | "right" | "mirrored" }? - & attribute chart:spline-order { positiveInteger }? - & attribute chart:spline-resolution { positiveInteger }? - & attribute chart:pie-offset { nonNegativeInteger }? - & attribute chart:angle-offset { angle }? - & attribute chart:hole-size { percent }? - & attribute chart:lines { boolean }? - & attribute chart:solid-type { - "cuboid" | "cylinder" | "cone" | "pyramid" +style-page-layout-content = + style-page-layout-properties?, + style-header-style?, + style-footer-style? +style-page-layout-properties = + element style:page-layout-properties { + style-page-layout-properties-content-strict + } +style-page-layout-properties-attlist = + attribute fo:page-width { length }? + & attribute fo:page-height { length }? + & common-num-format-attlist? + & common-num-format-prefix-suffix-attlist + & attribute style:paper-tray-name { "default" | \string }? + & attribute style:print-orientation { "portrait" | "landscape" }? + & common-horizontal-margin-attlist + & common-vertical-margin-attlist + & common-margin-attlist + & common-border-attlist + & common-border-line-width-attlist + & common-padding-attlist + & common-shadow-attlist + & common-background-color-attlist + & attribute style:register-truth-ref-style-name { styleNameRef }? + & attribute style:print { + list { + ("headers" + | "grid" + | "annotations" + | "objects" + | "charts" + | "drawings" + | "formulas" + | "zero-values")* + } }? - & attribute chart:stacked { boolean }? - & attribute chart:percentage { boolean }? - & attribute chart:treat-empty-cells { - "use-zero" | "leave-gap" | "ignore" + & attribute style:print-page-order { "ttb" | "ltr" }? + & attribute style:first-page-number { positiveInteger | "continue" }? + & (attribute style:scale-to { percent }? + | attribute style:scale-to-pages { positiveInteger }? + | (attribute style:scale-to-X { positiveInteger }?, + attribute style:scale-to-Y { positiveInteger }?)) + & # https://issues.oasis-open.org/browse/OFFICE-3857 + attribute style:table-centering { + "horizontal" | "vertical" | "both" | "none" }? - & attribute chart:link-data-style-to-source { boolean }? - & attribute chart:logarithmic { boolean }? - & attribute chart:maximum { double }? - & attribute chart:minimum { double }? - & attribute chart:origin { double }? - & attribute chart:interval-major { double }? - & attribute chart:interval-minor-divisor { positiveInteger }? - & attribute chart:tick-marks-major-inner { boolean }? - & attribute chart:tick-marks-major-outer { boolean }? - & attribute chart:tick-marks-minor-inner { boolean }? - & attribute chart:tick-marks-minor-outer { boolean }? - & attribute chart:reverse-direction { boolean }? - & attribute chart:display-label { boolean }? - & attribute chart:text-overlap { boolean }? - & attribute text:line-break { boolean }? - & attribute chart:label-arrangement { - "side-by-side" | "stagger-even" | "stagger-odd" + & attribute style:footnote-max-height { length }? + & common-writing-mode-attlist + & attribute style:layout-grid-mode { "none" | "line" | "both" }? + & attribute style:layout-grid-standard-mode { boolean }? + & attribute style:layout-grid-base-height { length }? + & attribute style:layout-grid-ruby-height { length }? + & attribute style:layout-grid-lines { positiveInteger }? + & attribute style:layout-grid-base-width { length }? + & attribute style:layout-grid-color { color }? + & attribute style:layout-grid-ruby-below { boolean }? + & attribute style:layout-grid-print { boolean }? + & attribute style:layout-grid-display { boolean }? + & attribute style:layout-grid-snap-to { boolean }? +style-page-layout-properties-content-strict = + style-page-layout-properties-attlist, + style-page-layout-properties-elements +style-page-layout-properties-elements = + style-background-image & style-columns & style-footnote-sep +style-paragraph-properties = + element style:paragraph-properties { + style-paragraph-properties-content-strict + } +style-paragraph-properties-attlist = + attribute style:contextual-spacing { boolean }? + & # https://issues.oasis-open.org/browse/OFFICE-3767 + attribute fo:line-height { "normal" | nonNegativeLength | percent }? + & attribute style:line-height-at-least { nonNegativeLength }? + & attribute style:line-spacing { length }? + & attribute style:font-independent-line-spacing { boolean }? + & common-text-align + & attribute fo:text-align-last { "start" | "center" | "justify" }? + & attribute style:justify-single-word { boolean }? + & attribute fo:keep-together { "auto" | "always" }? + & attribute fo:widows { nonNegativeInteger }? + & attribute fo:orphans { nonNegativeInteger }? + & attribute style:tab-stop-distance { nonNegativeLength }? + & attribute fo:hyphenation-keep { "auto" | "page" }? + & attribute fo:hyphenation-ladder-count { + "no-limit" | positiveInteger + }? + & attribute style:register-true { boolean }? + & common-horizontal-margin-attlist + & attribute fo:text-indent { length | percent }? + & attribute style:auto-text-indent { boolean }? + & common-vertical-margin-attlist + & common-margin-attlist + & common-break-attlist + & common-background-color-attlist + & common-border-attlist + & common-border-line-width-attlist + & attribute style:join-border { boolean }? + & common-padding-attlist + & common-shadow-attlist + & common-keep-with-next-attlist + & attribute text:number-lines { boolean }? + & attribute text:line-number { nonNegativeInteger }? + & attribute style:text-autospace { "none" | "ideograph-alpha" }? + & attribute style:punctuation-wrap { "simple" | "hanging" }? + & attribute style:line-break { "normal" | "strict" }? + & attribute style:vertical-align { + "top" | "middle" | "bottom" | "auto" | "baseline" }? + & common-writing-mode-attlist + & attribute style:writing-mode-automatic { boolean }? + & attribute style:snap-to-layout-grid { boolean }? + & common-page-number-attlist + & common-background-transparency-attlist +style-paragraph-properties-content-strict = + style-paragraph-properties-attlist, + style-paragraph-properties-elements +style-paragraph-properties-elements = + style-tab-stops & style-drop-cap & style-background-image +style-presentation-page-layout = + element style:presentation-page-layout { + attribute style:name { styleName }, + attribute style:display-name { \string }?, + presentation-placeholder* + } +style-region-center = element style:region-center { region-content } +style-region-left = element style:region-left { region-content } +style-region-right = element style:region-right { region-content } +style-ruby-properties = + element style:ruby-properties { style-ruby-properties-content-strict } +style-ruby-properties-attlist = + attribute style:ruby-position { "above" | "below" }? + & attribute style:ruby-align { + "left" + | "center" + | "right" + | "distribute-letter" + | "distribute-space" + }? +style-ruby-properties-content-strict = + style-ruby-properties-attlist, style-ruby-properties-elements +style-ruby-properties-elements = empty +style-section-properties = + element style:section-properties { + style-section-properties-content-strict + } +style-section-properties-attlist = + common-background-color-attlist + & common-horizontal-margin-attlist + & attribute style:protect { boolean }? + & common-editable-attlist + & attribute text:dont-balance-text-columns { boolean }? + & common-writing-mode-attlist +style-section-properties-content-strict = + style-section-properties-attlist, style-section-properties-elements +style-section-properties-elements = + style-background-image & style-columns & text-notes-configuration* +style-style = + element style:style { + style-style-attlist, style-style-content, style-map* + } +style-style-attlist = + attribute style:name { styleName } + & attribute style:display-name { \string }? + & attribute style:parent-style-name { styleNameRef }? + & attribute style:next-style-name { styleNameRef }? + & attribute style:list-level { positiveInteger | empty }? + & attribute style:list-style-name { styleName | empty }? + & attribute style:master-page-name { styleNameRef }? + & attribute style:auto-update { boolean }? + & attribute style:data-style-name { styleNameRef }? + & attribute style:percentage-data-style-name { styleNameRef }? + & attribute style:class { \string }? + & attribute style:default-outline-level { positiveInteger | empty }? +style-style-content = + (attribute style:family { "text" }, + style-text-properties?) + | (attribute style:family { "paragraph" }, + style-paragraph-properties?, + style-text-properties?) + | (attribute style:family { "section" }, + style-section-properties?) + | (attribute style:family { "ruby" }, + style-ruby-properties?) + | (attribute style:family { "table" }, + style-table-properties?) + | (attribute style:family { "table-column" }, + style-table-column-properties?) + | (attribute style:family { "table-row" }, + style-table-row-properties?) + | (attribute style:family { "table-cell" }, + style-table-cell-properties?, + style-paragraph-properties?, + style-text-properties?) + | (attribute style:family { "graphic" | "presentation" }, + style-graphic-properties?, + style-paragraph-properties?, + style-text-properties?) + | (attribute style:family { "drawing-page" }, + style-drawing-page-properties?) + | (attribute style:family { "chart" }, + style-chart-properties?, + style-graphic-properties?, + style-paragraph-properties?, + style-text-properties?) +style-tab-stop = + element style:tab-stop { style-tab-stop-attlist, empty } +style-tab-stop-attlist = + attribute style:position { length } + & (attribute style:type { "left" | "center" | "right" }? + | (attribute style:type { "char" }, + style-tab-stop-char-attlist)) + & attribute style:leader-type { lineType }? + & attribute style:leader-style { lineStyle }? + & attribute style:leader-width { lineWidth }? + & attribute style:leader-color { "font-color" | color }? + & attribute style:leader-text { character }? + & attribute style:leader-text-style { styleNameRef }? +style-tab-stop-char-attlist = attribute style:char { character } +style-tab-stops = element style:tab-stops { style-tab-stop* }? +style-table-cell-properties = + element style:table-cell-properties { + style-table-cell-properties-content-strict + } +style-table-cell-properties-attlist = + attribute style:vertical-align { + "top" | "middle" | "bottom" | "automatic" + }? + & attribute style:text-align-source { "fix" | "value-type" }? & common-style-direction-attlist + & attribute style:glyph-orientation-vertical { + "auto" | "0" | "0deg" | "0rad" | "0grad" + }? + & common-writing-mode-attlist + & common-shadow-attlist + & common-background-color-attlist + & common-border-attlist + & attribute style:diagonal-tl-br { \string }? + & attribute style:diagonal-tl-br-widths { borderWidths }? + & attribute style:diagonal-bl-tr { \string }? + & attribute style:diagonal-bl-tr-widths { borderWidths }? + & common-border-line-width-attlist + & common-padding-attlist + & attribute fo:wrap-option { "no-wrap" | "wrap" }? & common-rotation-angle-attlist - & attribute chart:data-label-number { - "none" | "value" | "percentage" | "value-and-percentage" + & attribute style:rotation-align { + "none" | "bottom" | "top" | "center" }? - & attribute chart:data-label-text { boolean }? - & attribute chart:data-label-symbol { boolean }? - & element chart:label-separator { text-p }? - & attribute chart:label-position { labelPositions }? - & attribute chart:label-position-negative { labelPositions }? - & attribute chart:visible { boolean }? - & attribute chart:auto-position { boolean }? - & attribute chart:auto-size { boolean }? - & attribute chart:mean-value { boolean }? - & attribute chart:error-category { + & attribute style:cell-protect { "none" - | "variance" - | "standard-deviation" - | "percentage" - | "error-margin" - | "constant" - | "standard-error" - | "cell-range" + | "hidden-and-protected" + | list { ("protected" | "formula-hidden")+ } }? - & attribute chart:error-percentage { double }? - & attribute chart:error-margin { double }? - & attribute chart:error-lower-limit { double }? - & attribute chart:error-upper-limit { double }? - & attribute chart:error-upper-indicator { boolean }? - & attribute chart:error-lower-indicator { boolean }? - & attribute chart:error-lower-range { cellRangeAddressList }? - & attribute chart:error-upper-range { cellRangeAddressList }? - & attribute chart:series-source { "columns" | "rows" }? - & attribute chart:regression-type { - "none" | "linear" | "logarithmic" | "exponential" | "power" + & attribute style:print-content { boolean }? + & attribute style:decimal-places { nonNegativeInteger }? + & attribute style:repeat-content { boolean }? + & attribute style:shrink-to-fit { boolean }? +style-table-cell-properties-content-strict = + style-table-cell-properties-attlist, + style-table-cell-properties-elements +style-table-cell-properties-elements = style-background-image +style-table-column-properties = + element style:table-column-properties { + style-table-column-properties-content-strict + } +style-table-column-properties-attlist = + attribute style:column-width { positiveLength }? + & attribute style:rel-column-width { relativeLength }? + & attribute style:use-optimal-column-width { boolean }? + & common-break-attlist +style-table-column-properties-content-strict = + style-table-column-properties-attlist, + style-table-column-properties-elements +style-table-column-properties-elements = empty +style-table-properties = + element style:table-properties { + style-table-properties-content-strict + } +style-table-properties-attlist = + attribute style:width { positiveLength }? + & attribute style:rel-width { percent }? + & attribute table:align { "left" | "center" | "right" | "margins" }? + & common-horizontal-margin-attlist + & common-vertical-margin-attlist + & common-margin-attlist + & common-page-number-attlist + & common-break-attlist + & common-background-color-attlist + & common-shadow-attlist + & common-keep-with-next-attlist + & attribute style:may-break-between-rows { boolean }? + & attribute table:border-model { "collapsing" | "separating" }? + & common-writing-mode-attlist + & attribute table:display { boolean }? + & (attribute table:tab-color { color }?) + # https://issues.oasis-open.org/browse/OFFICE-2173 + +style-table-properties-content-strict = + style-table-properties-attlist, style-table-properties-elements +style-table-properties-elements = style-background-image +style-table-row-properties = + element style:table-row-properties { + style-table-row-properties-content-strict + } +style-table-row-properties-attlist = + attribute style:row-height { positiveLength }? + & attribute style:min-row-height { nonNegativeLength }? + & attribute style:use-optimal-row-height { boolean }? + & common-background-color-attlist + & common-break-attlist + & attribute fo:keep-together { "auto" | "always" }? +style-table-row-properties-content-strict = + style-table-row-properties-attlist, + style-table-row-properties-elements +style-table-row-properties-elements = style-background-image +style-text-properties = + element style:text-properties { style-text-properties-content-strict } +style-text-properties-attlist = + attribute fo:font-variant { fontVariant }? + & attribute fo:text-transform { + "none" | "lowercase" | "uppercase" | "capitalize" }? - & attribute chart:axis-position { "start" | "end" | double }? - & attribute chart:axis-label-position { - "near-axis" - | "near-axis-other-side" - | "outside-start" - | "outside-end" + & attribute fo:color { color }? + & attribute style:use-window-font-color { boolean }? + & attribute style:text-outline { boolean }? + & attribute style:text-line-through-type { lineType }? + & attribute style:text-line-through-style { lineStyle }? + & attribute style:text-line-through-width { lineWidth }? + & attribute style:text-line-through-color { "font-color" | color }? + & attribute style:text-line-through-text { \string }? + & attribute style:text-line-through-text-style { styleNameRef }? + & attribute style:text-position { + list { (percent | "super" | "sub"), percent? } }? - & attribute chart:tick-mark-position { - "at-labels" | "at-axis" | "at-labels-and-axis" + & attribute style:font-name { \string }? + & attribute style:font-name-asian { \string }? + & attribute style:font-name-complex { \string }? + & attribute fo:font-family { \string }? + & attribute style:font-family-asian { \string }? + & attribute style:font-family-complex { \string }? + & attribute style:font-family-generic { fontFamilyGeneric }? + & attribute style:font-family-generic-asian { fontFamilyGeneric }? + & attribute style:font-family-generic-complex { fontFamilyGeneric }? + & attribute style:font-style-name { \string }? + & attribute style:font-style-name-asian { \string }? + & attribute style:font-style-name-complex { \string }? + & attribute style:font-pitch { fontPitch }? + & attribute style:font-pitch-asian { fontPitch }? + & attribute style:font-pitch-complex { fontPitch }? + & attribute style:font-charset { textEncoding }? + & attribute style:font-charset-asian { textEncoding }? + & attribute style:font-charset-complex { textEncoding }? + & attribute fo:font-size { positiveLength | percent }? + & attribute style:font-size-asian { positiveLength | percent }? + & attribute style:font-size-complex { positiveLength | percent }? + & attribute style:font-size-rel { length }? + & attribute style:font-size-rel-asian { length }? + & attribute style:font-size-rel-complex { length }? + & attribute style:script-type { + "latin" | "asian" | "complex" | "ignore" }? - & attribute chart:include-hidden-cells { boolean }? -labelPositions = - "avoid-overlap" - | "center" - | "top" - | "top-right" - | "right" - | "bottom-right" - | "bottom" - | "bottom-left" - | "left" - | "top-left" - | "inside" - | "outside" - | "near-origin" -style-drawing-page-properties-attlist = - attribute presentation:transition-type { - "manual" | "automatic" | "semi-automatic" - }? - & attribute presentation:transition-style { + & attribute fo:letter-spacing { length | "normal" }? + & attribute fo:language { languageCode }? + & attribute style:language-asian { languageCode }? + & attribute style:language-complex { languageCode }? + & attribute fo:country { countryCode }? + & attribute style:country-asian { countryCode }? + & attribute style:country-complex { countryCode }? + & attribute fo:script { scriptCode }? + & attribute style:script-asian { scriptCode }? + & attribute style:script-complex { scriptCode }? + & attribute style:rfc-language-tag { language }? + & attribute style:rfc-language-tag-asian { language }? + & attribute style:rfc-language-tag-complex { language }? + & attribute fo:font-style { fontStyle }? + & attribute style:font-style-asian { fontStyle }? + & attribute style:font-style-complex { fontStyle }? + & attribute style:font-relief { "none" | "embossed" | "engraved" }? + & attribute fo:text-shadow { shadowType }? + & attribute style:text-underline-type { lineType }? + & attribute style:text-underline-style { lineStyle }? + & attribute style:text-underline-width { lineWidth }? + & attribute style:text-underline-color { "font-color" | color }? + & attribute style:text-overline-type { lineType }? + & attribute style:text-overline-style { lineStyle }? + & attribute style:text-overline-width { lineWidth }? + & attribute style:text-overline-color { "font-color" | color }? + & attribute style:text-overline-mode { lineMode }? + & attribute fo:font-weight { fontWeight }? + & attribute style:font-weight-asian { fontWeight }? + & attribute style:font-weight-complex { fontWeight }? + & attribute style:text-underline-mode { lineMode }? + & attribute style:text-line-through-mode { lineMode }? + & attribute style:letter-kerning { boolean }? + & attribute style:text-blinking { boolean }? + & common-background-color-attlist + & attribute style:text-combine { "none" | "letters" | "lines" }? + & attribute style:text-combine-start-char { character }? + & attribute style:text-combine-end-char { character }? + & attribute style:text-emphasize { "none" - | "fade-from-left" - | "fade-from-top" - | "fade-from-right" - | "fade-from-bottom" - | "fade-from-upperleft" - | "fade-from-upperright" - | "fade-from-lowerleft" - | "fade-from-lowerright" - | "move-from-left" - | "move-from-top" - | "move-from-right" - | "move-from-bottom" - | "move-from-upperleft" - | "move-from-upperright" - | "move-from-lowerleft" - | "move-from-lowerright" - | "uncover-to-left" - | "uncover-to-top" - | "uncover-to-right" - | "uncover-to-bottom" - | "uncover-to-upperleft" - | "uncover-to-upperright" - | "uncover-to-lowerleft" - | "uncover-to-lowerright" - | "fade-to-center" - | "fade-from-center" - | "vertical-stripes" - | "horizontal-stripes" - | "clockwise" - | "counterclockwise" - | "open-vertical" - | "open-horizontal" - | "close-vertical" - | "close-horizontal" - | "wavyline-from-left" - | "wavyline-from-top" - | "wavyline-from-right" - | "wavyline-from-bottom" - | "spiralin-left" - | "spiralin-right" - | "spiralout-left" - | "spiralout-right" - | "roll-from-top" - | "roll-from-left" - | "roll-from-right" - | "roll-from-bottom" - | "stretch-from-left" - | "stretch-from-top" - | "stretch-from-right" - | "stretch-from-bottom" - | "vertical-lines" - | "horizontal-lines" - | "dissolve" - | "random" - | "vertical-checkerboard" - | "horizontal-checkerboard" - | "interlocking-horizontal-left" - | "interlocking-horizontal-right" - | "interlocking-vertical-top" - | "interlocking-vertical-bottom" - | "fly-away" - | "open" - | "close" - | "melt" + | list { + ("none" | "accent" | "dot" | "circle" | "disc"), + ("above" | "below") + } }? - & attribute presentation:transition-speed { presentationSpeeds }? - & attribute smil:type { \string }? - & attribute smil:subtype { \string }? - & attribute smil:direction { "forward" | "reverse" }? - & attribute smil:fadeColor { color }? - & attribute presentation:duration { duration }? - & attribute presentation:visibility { "visible" | "hidden" }? - & attribute draw:background-size { "full" | "border" }? - & attribute presentation:background-objects-visible { boolean }? - & attribute presentation:background-visible { boolean }? - & attribute presentation:display-header { boolean }? - & attribute presentation:display-footer { boolean }? - & attribute presentation:display-page-number { boolean }? - & attribute presentation:display-date-time { boolean }? -style-drawing-page-properties-elements = presentation-sound? -\string = xsd:string -date = xsd:date -time = xsd:time -dateTime = xsd:dateTime -duration = xsd:duration -integer = xsd:integer -nonNegativeInteger = xsd:nonNegativeInteger -positiveInteger = xsd:positiveInteger -double = xsd:double -anyURI = xsd:anyURI -base64Binary = xsd:base64Binary -ID = xsd:ID -IDREF = xsd:IDREF -IDREFS = xsd:IDREFS -NCName = xsd:NCName -boolean = "true" | "false" -dateOrDateTime = xsd:date | xsd:dateTime -timeOrDateTime = xsd:time | xsd:dateTime -language = xsd:language -countryCode = xsd:token { pattern = "[A-Za-z0-9]{1,8}" } -languageCode = xsd:token { pattern = "[A-Za-z]{1,8}" } -scriptCode = xsd:token { pattern = "[A-Za-z0-9]{1,8}" } -character = xsd:string { length = "1" } -length = - xsd:string { - pattern = - "-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))" + & attribute style:text-scale { percent }? + & attribute style:text-rotation-angle { angle }? + & attribute style:text-rotation-scale { "fixed" | "line-height" }? + & attribute fo:hyphenate { boolean }? + & attribute fo:hyphenation-remain-char-count { positiveInteger }? + & attribute fo:hyphenation-push-char-count { positiveInteger }? + & (attribute text:display { "true" } + | attribute text:display { "none" } + | (attribute text:display { "condition" }, + attribute text:condition { "none" }) + | empty) +style-text-properties-content-strict = + style-text-properties-attlist, style-text-properties-elements +style-text-properties-elements = empty +styleName = xsd:NCName +styleNameRef = xsd:NCName | empty +styleNameRefs = list { xsd:NCName* } +styles = + style-style* + & text-list-style* + & number-number-style* + & number-currency-style* + & number-percentage-style* + & number-date-style* + & number-time-style* + & number-boolean-style* + & number-text-style* +svg-definition-src = + element svg:definition-src { + common-svg-font-face-xlink-attlist, empty } -nonNegativeLength = - xsd:string { - pattern = - "([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))" +svg-desc = element svg:desc { text } +svg-font-face-format = + element svg:font-face-format { + attribute svg:string { \string }?, + empty } -positiveLength = - xsd:string { - pattern = - "([0-9]*[1-9][0-9]*(\.[0-9]*)?|0+\.[0-9]*[1-9][0-9]*|\.[0-9]*[1-9][0-9]*)((cm)|(mm)|(in)|(pt)|(pc)|(px))" +svg-font-face-name = + element svg:font-face-name { + attribute svg:name { \string }?, + empty } -percent = xsd:string { pattern = "-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%" } -zeroToHundredPercent = - xsd:string { - pattern = "([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%" +svg-font-face-src = + element svg:font-face-src { + (svg-font-face-uri | svg-font-face-name)+ } -signedZeroToHundredPercent = - xsd:string { - pattern = "-?([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%" +svg-font-face-uri = + element svg:font-face-uri { + common-svg-font-face-xlink-attlist, svg-font-face-format* } -relativeLength = xsd:string { pattern = "[0-9]+\*" } -coordinate = length -distance = length -color = xsd:string { pattern = "#[0-9a-fA-F]{6}" } -angle = xsd:string -CURIE = - xsd:string { pattern = "(([\i-[:]][\c-[:]]*)?:)?.+" minLength = "1" } -CURIEs = list { CURIE+ } -SafeCURIE = - xsd:string { - pattern = "\[(([\i-[:]][\c-[:]]*)?:)?.+\]" - minLength = "3" +svg-linearGradient = + element svg:linearGradient { + common-svg-gradient-attlist, + attribute svg:x1 { coordinate | percent }?, + attribute svg:y1 { coordinate | percent }?, + attribute svg:x2 { coordinate | percent }?, + attribute svg:y2 { coordinate | percent }?, + svg-stop* } -URIorSafeCURIE = anyURI | SafeCURIE -styleName = xsd:NCName -styleNameRef = xsd:NCName | empty -styleNameRefs = list { xsd:NCName* } -variableName = xsd:string +svg-radialGradient = + element svg:radialGradient { + common-svg-gradient-attlist, + attribute svg:cx { coordinate | percent }?, + attribute svg:cy { coordinate | percent }?, + attribute svg:r { coordinate | percent }?, + attribute svg:fx { coordinate | percent }?, + attribute svg:fy { coordinate | percent }?, + svg-stop* + } +svg-stop = + element svg:stop { + attribute svg:offset { double | percent }, + attribute svg:stop-color { color }?, + attribute svg:stop-opacity { double }? + } +svg-title = element svg:title { text } +tab-cycles = "records" | "current" | "page" +table-background = + element table:background { table-background-attlist, empty } +table-background-attlist = attribute table:style-name { styleNameRef } +table-body = element table:body { common-table-template-attlist, empty } +table-calculation-setting-attlist = + attribute table:case-sensitive { boolean }? + & attribute table:precision-as-shown { boolean }? + & attribute table:search-criteria-must-apply-to-whole-cell { + boolean + }? + & attribute table:automatic-find-labels { boolean }? + & attribute table:use-regular-expressions { boolean }? + & attribute table:use-wildcards { boolean }? + & attribute table:null-year { positiveInteger }? +table-calculation-settings = + element table:calculation-settings { + table-calculation-setting-attlist, + table-null-date?, + table-iteration? + } +table-cell-address = + element table:cell-address { + common-table-cell-address-attlist, empty + } +table-cell-content-change = + element table:cell-content-change { + common-table-change-attlist, + table-cell-address, + office-change-info, + table-dependencies?, + table-deletions?, + table-previous + } +table-cell-content-deletion = + element table:cell-content-deletion { + attribute table:id { \string }?, + table-cell-address?, + table-change-track-table-cell? + } +table-cell-range-source = + element table:cell-range-source { + table-table-cell-range-source-attlist, + table-linked-source-attlist, + empty + } +table-change-deletion = + element table:change-deletion { + attribute table:id { \string }?, + empty + } +table-change-track-table-cell = + element table:change-track-table-cell { + table-change-track-table-cell-attlist, text-p* + } +table-change-track-table-cell-attlist = + attribute table:cell-address { cellAddress }? + & attribute table:matrix-covered { boolean }? + & attribute table:formula { \string }? + & attribute table:number-matrix-columns-spanned { positiveInteger }? + & attribute table:number-matrix-rows-spanned { positiveInteger }? + & common-value-and-type-attlist? +table-columns = table-table-columns | table-table-column+ +table-columns-and-groups = + (table-table-column-group | table-columns-no-group)+ +table-columns-no-group = + (table-columns, (table-table-header-columns, table-columns?)?) + | (table-table-header-columns, table-columns?) +table-consolidation = + element table:consolidation { table-consolidation-attlist, empty } +table-consolidation-attlist = + attribute table:function { + "average" + | "count" + | "countnums" + | "max" + | "min" + | "product" + | "stdev" + | "stdevp" + | "sum" + | "var" + | "varp" + | \string + } + & attribute table:source-cell-range-addresses { cellRangeAddressList } + & attribute table:target-cell-address { cellAddress } + & attribute table:use-labels { "none" | "row" | "column" | "both" }? + & attribute table:link-to-source-data { boolean }? +table-content-validation = + element table:content-validation { + table-validation-attlist, + table-help-message?, + (table-error-message | (table-error-macro, office-event-listeners))? + } +table-content-validations = + element table:content-validations { table-content-validation+ } +table-covered-table-cell = + element table:covered-table-cell { + table-table-cell-attlist, table-table-cell-content + } +table-cut-offs = + element table:cut-offs { + table-movement-cut-off+ + | (table-insertion-cut-off, table-movement-cut-off*) + } +table-data-pilot-display-info = + element table:data-pilot-display-info { + table-data-pilot-display-info-attlist, empty + } +table-data-pilot-display-info-attlist = + attribute table:enabled { boolean } + & attribute table:data-field { \string } + & attribute table:member-count { nonNegativeInteger } + & attribute table:display-member-mode { "from-top" | "from-bottom" } +table-data-pilot-field = + element table:data-pilot-field { + table-data-pilot-field-attlist, + table-data-pilot-level?, + table-data-pilot-field-reference?, + table-data-pilot-groups? + } +table-data-pilot-field-attlist = + attribute table:source-field-name { \string } + & (attribute table:orientation { + "row" | "column" | "data" | "hidden" + } + | (attribute table:orientation { "page" }, + attribute table:selected-page { \string })) + & attribute table:is-data-layout-field { \string }? + & attribute table:function { + "auto" + | "average" + | "count" + | "countnums" + | "max" + | "min" + | "product" + | "stdev" + | "stdevp" + | "sum" + | "var" + | "varp" + | \string + }? + & attribute table:used-hierarchy { integer }? +table-data-pilot-field-reference = + element table:data-pilot-field-reference { + table-data-pilot-field-reference-attlist + } +table-data-pilot-field-reference-attlist = + attribute table:field-name { \string } + & ((attribute table:member-type { "named" }, + attribute table:member-name { \string }) + | attribute table:member-type { "previous" | "next" }) + & attribute table:type { + "none" + | "member-difference" + | "member-percentage" + | "member-percentage-difference" + | "running-total" + | "row-percentage" + | "column-percentage" + | "total-percentage" + | "index" + } +table-data-pilot-group = + element table:data-pilot-group { + table-data-pilot-group-attlist, table-data-pilot-group-member+ + } +table-data-pilot-group-attlist = attribute table:name { \string } +table-data-pilot-group-member = + element table:data-pilot-group-member { + table-data-pilot-group-member-attlist + } +table-data-pilot-group-member-attlist = attribute table:name { \string } +table-data-pilot-groups = + element table:data-pilot-groups { + table-data-pilot-groups-attlist, table-data-pilot-group+ + } +table-data-pilot-groups-attlist = + attribute table:source-field-name { \string } + & (attribute table:date-start { dateOrDateTime | "auto" } + | attribute table:start { double | "auto" })? + & (attribute table:date-end { dateOrDateTime | "auto" } + | attribute table:end { double | "auto" })? + & attribute table:step { double }? + & attribute table:grouped-by { + "seconds" + | "minutes" + | "hours" + | "days" + | "months" + | "quarters" + | "years" + }? +# https://issues.oasis-open.org/browse/OFFICE-2118 +table-data-pilot-layout-info = + element table:data-pilot-layout-info { + table-data-pilot-layout-info-attlist, empty + } +table-data-pilot-layout-info-attlist = + attribute table:layout-mode { + "tabular-layout" + | "outline-subtotals-top" + | "outline-subtotals-bottom" + } + & attribute table:add-empty-lines { boolean } +table-data-pilot-level = + element table:data-pilot-level { + table-data-pilot-level-attlist, + table-data-pilot-subtotals?, + table-data-pilot-members?, + table-data-pilot-display-info?, + table-data-pilot-sort-info?, + table-data-pilot-layout-info? + } +table-data-pilot-level-attlist = attribute table:show-empty { boolean }? +table-data-pilot-member = + element table:data-pilot-member { + table-data-pilot-member-attlist, empty + } +table-data-pilot-member-attlist = + attribute table:name { \string } + & attribute table:display { boolean }? + & attribute table:show-details { boolean }? +table-data-pilot-members = + element table:data-pilot-members { table-data-pilot-member* } +table-data-pilot-sort-info = + element table:data-pilot-sort-info { + table-data-pilot-sort-info-attlist, empty + } +table-data-pilot-sort-info-attlist = + ((attribute table:sort-mode { "data" }, + attribute table:data-field { \string }) + | attribute table:sort-mode { "none" | "manual" | "name" }) + & attribute table:order { "ascending" | "descending" } +table-data-pilot-subtotal = + element table:data-pilot-subtotal { + table-data-pilot-subtotal-attlist, empty + } +table-data-pilot-subtotal-attlist = + attribute table:function { + "auto" + | "average" + | "count" + | "countnums" + | "max" + | "min" + | "product" + | "stdev" + | "stdevp" + | "sum" + | "var" + | "varp" + | \string + } +table-data-pilot-subtotals = + element table:data-pilot-subtotals { table-data-pilot-subtotal* } +table-data-pilot-table = + element table:data-pilot-table { + table-data-pilot-table-attlist, + (table-database-source-sql + | table-database-source-table + | table-database-source-query + | table-source-service + | table-source-cell-range)?, + table-data-pilot-field+ + } +table-data-pilot-table-attlist = + attribute table:name { \string } + & attribute table:application-data { \string }? + & attribute table:grand-total { "none" | "row" | "column" | "both" }? + & attribute table:ignore-empty-rows { boolean }? + & attribute table:identify-categories { boolean }? + & attribute table:target-range-address { cellRangeAddress } + & attribute table:buttons { cellRangeAddressList }? + & attribute table:show-filter-button { boolean }? + & attribute table:drill-down-on-double-click { boolean }? +table-data-pilot-tables = + element table:data-pilot-tables { table-data-pilot-table* } +table-database-range = + element table:database-range { + table-database-range-attlist, + (table-database-source-sql + | table-database-source-table + | table-database-source-query)?, + table-filter?, + table-sort?, + table-subtotal-rules? + } +table-database-range-attlist = + attribute table:name { \string }? + & attribute table:is-selection { boolean }? + & attribute table:on-update-keep-styles { boolean }? + & attribute table:on-update-keep-size { boolean }? + & attribute table:has-persistent-data { boolean }? + & attribute table:orientation { "column" | "row" }? + & attribute table:contains-header { boolean }? + & attribute table:display-filter-buttons { boolean }? + & attribute table:target-range-address { cellRangeAddress } + & attribute table:refresh-delay { boolean }? +table-database-ranges = + element table:database-ranges { table-database-range* } +table-database-source-query = + element table:database-source-table { + table-database-source-table-attlist, empty + } +table-database-source-query-attlist = + attribute table:database-name { \string } + & attribute table:query-name { \string } +table-database-source-sql = + element table:database-source-sql { + table-database-source-sql-attlist, empty + } +table-database-source-sql-attlist = + attribute table:database-name { \string } + & attribute table:sql-statement { \string } + & attribute table:parse-sql-statement { boolean }? +table-database-source-table = + element table:database-source-query { + table-database-source-query-attlist, empty + } +table-database-source-table-attlist = + attribute table:database-name { \string } + & attribute table:database-table-name { \string } +table-dde-link = + element table:dde-link { office-dde-source, table-table } +table-dde-links = element table:dde-links { table-dde-link+ } +table-decls = + table-calculation-settings?, + table-content-validations?, + table-label-ranges? +table-deletion = + element table:deletion { + table-deletion-attlist, + common-table-change-attlist, + office-change-info, + table-dependencies?, + table-deletions?, + table-cut-offs? + } +table-deletion-attlist = + attribute table:type { "row" | "column" | "table" } + & attribute table:position { integer } + & attribute table:table { integer }? + & attribute table:multi-deletion-spanned { integer }? +table-deletions = + element table:deletions { + (table-cell-content-deletion | table-change-deletion)+ + } +table-dependencies = element table:dependencies { table-dependency+ } +table-dependency = + element table:dependency { + attribute table:id { \string }, + empty + } +table-desc = element table:desc { text } +table-detective = + element table:detective { table-highlighted-range*, table-operation* } +table-error-macro = + element table:error-macro { + attribute table:execute { boolean }? + } +table-error-message = + element table:error-message { + attribute table:title { \string }?, + attribute table:display { boolean }?, + attribute table:message-type { + "stop" | "warning" | "information" + }?, + text-p* + } +table-even-columns = + element table:even-columns { common-table-template-attlist, empty } +table-even-rows = + element table:even-rows { common-table-template-attlist, empty } +table-filter = + element table:filter { + table-filter-attlist, + (table-filter-condition | table-filter-and | table-filter-or) + } +table-filter-and = + element table:filter-and { + (table-filter-or | table-filter-condition)+ + } +table-filter-attlist = + attribute table:target-range-address { cellRangeAddress }? + & attribute table:condition-source { "self" | "cell-range" }? + & attribute table:condition-source-range-address { cellRangeAddress }? + & attribute table:display-duplicates { boolean }? +table-filter-condition = + element table:filter-condition { + table-filter-condition-attlist, table-filter-set-item* + } +table-filter-condition-attlist = + attribute table:field-number { nonNegativeInteger } + & attribute table:value { \string | double } + & attribute table:operator { \string } + & attribute table:case-sensitive { \string }? + & attribute table:data-type { "text" | "number" }? +table-filter-or = + element table:filter-or { + (table-filter-and | table-filter-condition)+ + } +table-filter-set-item = + element table:filter-set-item { + attribute table:value { \string }, + empty + } +table-first-column = + element table:first-column { common-table-template-attlist, empty } +table-first-row = + element table:first-row { common-table-template-attlist, empty } +table-functions = + table-named-expressions?, + table-database-ranges?, + table-data-pilot-tables?, + table-consolidation?, + table-dde-links? +table-help-message = + element table:help-message { + attribute table:title { \string }?, + attribute table:display { boolean }?, + text-p* + } +table-highlighted-range = + element table:highlighted-range { + (table-highlighted-range-attlist + | table-highlighted-range-attlist-invalid), + empty + } +table-highlighted-range-attlist = + attribute table:cell-range-address { cellRangeAddress }? + & attribute table:direction { + "from-another-table" | "to-another-table" | "from-same-table" + } + & attribute table:contains-error { boolean }? +table-highlighted-range-attlist-invalid = + attribute table:marked-invalid { boolean } +table-insertion = + element table:insertion { + table-insertion-attlist, + common-table-change-attlist, + office-change-info, + table-dependencies?, + table-deletions? + } +table-insertion-attlist = + attribute table:type { "row" | "column" | "table" } + & attribute table:position { integer } + & attribute table:count { positiveInteger }? + & attribute table:table { integer }? +table-insertion-cut-off = + element table:insertion-cut-off { + table-insertion-cut-off-attlist, empty + } +table-insertion-cut-off-attlist = + attribute table:id { \string } + & attribute table:position { integer } +table-iteration = + element table:iteration { + attribute table:status { "enable" | "disable" }?, + attribute table:steps { positiveInteger }?, + attribute table:maximum-difference { double }?, + empty + } +table-label-range = + element table:label-range { table-label-range-attlist, empty } +table-label-range-attlist = + attribute table:label-cell-range-address { cellRangeAddress } + & attribute table:data-cell-range-address { cellRangeAddress } + & attribute table:orientation { "column" | "row" } +table-label-ranges = element table:label-ranges { table-label-range* } +table-last-column = + element table:last-column { common-table-template-attlist, empty } +table-last-row = + element table:last-row { common-table-template-attlist, empty } +table-linked-source-attlist = + attribute xlink:type { "simple" } + & attribute xlink:href { anyIRI } + & attribute xlink:actuate { "onRequest" }? + & attribute table:filter-name { \string }? + & attribute table:filter-options { \string }? + & attribute table:refresh-delay { duration }? +table-movement = + element table:movement { + common-table-change-attlist, + table-source-range-address, + table-target-range-address, + office-change-info, + table-dependencies?, + table-deletions? + } +table-movement-cut-off = + element table:movement-cut-off { + table-movement-cut-off-attlist, empty + } +table-movement-cut-off-attlist = + attribute table:position { integer } + | (attribute table:start-position { integer }, + attribute table:end-position { integer }) +table-named-expression = + element table:named-expression { + table-named-expression-attlist, empty + } +table-named-expression-attlist = + attribute table:name { \string }, + attribute table:expression { \string }, + attribute table:base-cell-address { cellAddress }? +table-named-expressions = + element table:named-expressions { + (table-named-range | table-named-expression)* + } +table-named-range = + element table:named-range { table-named-range-attlist, empty } +table-named-range-attlist = + attribute table:name { \string }, + attribute table:cell-range-address { cellRangeAddress }, + attribute table:base-cell-address { cellAddress }?, + attribute table:range-usable-as { + "none" + | list { + ("print-range" | "filter" | "repeat-row" | "repeat-column")+ + } + }? +table-null-date = + element table:null-date { + attribute table:value-type { "date" }?, + attribute table:date-value { date }?, + empty + } +table-odd-columns = + element table:odd-columns { common-table-template-attlist, empty } +table-odd-rows = + element table:odd-rows { common-table-template-attlist, empty } +table-operation = + element table:operation { table-operation-attlist, empty } +table-operation-attlist = + attribute table:name { + "trace-dependents" + | "remove-dependents" + | "trace-precedents" + | "remove-precedents" + | "trace-errors" + } + & attribute table:index { nonNegativeInteger } +table-previous = + element table:previous { + attribute table:id { \string }?, + table-change-track-table-cell + } +table-rows = + table-table-rows | (text-soft-page-break?, table-table-row)+ +table-rows-and-groups = (table-table-row-group | table-rows-no-group)+ +table-rows-no-group = + (table-rows, (table-table-header-rows, table-rows?)?) + | (table-table-header-rows, table-rows?) +table-scenario = + element table:scenario { table-scenario-attlist, empty } +table-scenario-attlist = + attribute table:scenario-ranges { cellRangeAddressList } + & attribute table:is-active { boolean } + & attribute table:display-border { boolean }? + & attribute table:border-color { color }? + & attribute table:copy-back { boolean }? + & attribute table:copy-styles { boolean }? + & attribute table:copy-formulas { boolean }? + & attribute table:comment { \string }? + & attribute table:protected { boolean }? +table-shapes = element table:shapes { shape+ } +table-sort = element table:sort { table-sort-attlist, table-sort-by+ } +table-sort-attlist = + attribute table:bind-styles-to-content { boolean }? + & attribute table:target-range-address { cellRangeAddress }? + & attribute table:case-sensitive { boolean }? + & attribute table:language { languageCode }? + & attribute table:country { countryCode }? + & attribute table:script { scriptCode }? + & attribute table:rfc-language-tag { language }? + & attribute table:algorithm { \string }? + & attribute table:embedded-number-behavior { + "alpha-numeric" | "integer" | "double" + }? +table-sort-by = element table:sort-by { table-sort-by-attlist, empty } +table-sort-by-attlist = + attribute table:field-number { nonNegativeInteger } + & attribute table:data-type { + "text" | "number" | "automatic" | \string + }? + & attribute table:order { "ascending" | "descending" }? +table-sort-groups = + element table:sort-groups { table-sort-groups-attlist, empty } +table-sort-groups-attlist = + attribute table:data-type { + "text" | "number" | "automatic" | \string + }? + & attribute table:order { "ascending" | "descending" }? +table-source-cell-range = + element table:source-cell-range { + table-source-cell-range-attlist, table-filter? + } +table-source-cell-range-attlist = + # OFFICE-3665 + (attribute table:cell-range-address { cellRangeAddress } + | (attribute table:name { \string }, + attribute table:cell-range-address { cellRangeAddress }?)) +table-source-range-address = + element table:source-range-address { + common-table-range-attlist, empty + } +table-source-service = + element table:source-service { table-source-service-attlist, empty } +table-source-service-attlist = + attribute table:name { \string } + & attribute table:source-name { \string } + & attribute table:object-name { \string } + & attribute table:user-name { \string }? + & attribute table:password { \string }? +table-subtotal-field = + element table:subtotal-field { table-subtotal-field-attlist, empty } +table-subtotal-field-attlist = + attribute table:field-number { nonNegativeInteger } + & attribute table:function { + "average" + | "count" + | "countnums" + | "max" + | "min" + | "product" + | "stdev" + | "stdevp" + | "sum" + | "var" + | "varp" + | \string + } +table-subtotal-rule = + element table:subtotal-rule { + table-subtotal-rule-attlist, table-subtotal-field* + } +table-subtotal-rule-attlist = + attribute table:group-by-field-number { nonNegativeInteger } +table-subtotal-rules = + element table:subtotal-rules { + table-subtotal-rules-attlist, + table-sort-groups?, + table-subtotal-rule* + } +table-subtotal-rules-attlist = + attribute table:bind-styles-to-content { boolean }? + & attribute table:case-sensitive { boolean }? + & attribute table:page-breaks-on-group-change { boolean }? +table-table = + element table:table { + table-table-attlist, + table-title?, + table-desc?, + table-table-source?, + office-dde-source?, + table-scenario?, + office-forms?, + table-shapes?, + table-columns-and-groups, + table-rows-and-groups, + table-named-expressions? + } +table-table-attlist = + attribute table:name { \string }? + & attribute table:style-name { styleNameRef }? + & attribute table:template-name { \string }? + & attribute table:use-first-row-styles { boolean }? + & attribute table:use-last-row-styles { boolean }? + & attribute table:use-first-column-styles { boolean }? + & attribute table:use-last-column-styles { boolean }? + & attribute table:use-banding-rows-styles { boolean }? + & attribute table:use-banding-columns-styles { boolean }? + & attribute table:protected { boolean }? + & attribute table:protection-key { \string }? + & attribute table:protection-key-digest-algorithm { anyIRI }? + & attribute table:print { boolean }? + & attribute table:print-ranges { cellRangeAddressList }? + & xml-id? + & attribute table:is-sub-table { boolean }? +table-table-cell = + element table:table-cell { + table-table-cell-attlist, + table-table-cell-attlist-extra, + table-table-cell-content + } +table-table-cell-attlist = + attribute table:number-columns-repeated { positiveInteger }? + & attribute table:style-name { styleNameRef }? + & attribute table:content-validation-name { \string }? + & attribute table:formula { \string }? + & common-value-and-type-attlist? + & attribute table:protect { boolean }? + & attribute table:protected { boolean }? + & xml-id? + & common-in-content-meta-attlist? +table-table-cell-attlist-extra = + attribute table:number-columns-spanned { positiveInteger }? + & attribute table:number-rows-spanned { positiveInteger }? + & attribute table:number-matrix-columns-spanned { positiveInteger }? + & attribute table:number-matrix-rows-spanned { positiveInteger }? +table-table-cell-content = + table-cell-range-source?, + office-annotation?, + table-detective?, + text-content* +table-table-cell-range-source-attlist = + attribute table:name { \string } + & attribute table:last-column-spanned { positiveInteger } + & attribute table:last-row-spanned { positiveInteger } +table-table-column = + element table:table-column { table-table-column-attlist, empty } +table-table-column-attlist = + attribute table:number-columns-repeated { positiveInteger }? + & attribute table:style-name { styleNameRef }? + & attribute table:visibility { table-visibility-value }? + & attribute table:default-cell-style-name { styleNameRef }? + & xml-id? +table-table-column-group = + element table:table-column-group { + table-table-column-group-attlist, table-columns-and-groups + } +table-table-column-group-attlist = attribute table:display { boolean }? +table-table-columns = + element table:table-columns { table-table-column+ } +table-table-header-columns = + element table:table-header-columns { table-table-column+ } +table-table-header-rows = + element table:table-header-rows { + (text-soft-page-break?, table-table-row)+ + } +table-table-row = + element table:table-row { + table-table-row-attlist, + (table-table-cell | table-covered-table-cell)+ + } +table-table-row-attlist = + attribute table:number-rows-repeated { positiveInteger }? + & attribute table:style-name { styleNameRef }? + & attribute table:default-cell-style-name { styleNameRef }? + & attribute table:visibility { table-visibility-value }? + & xml-id? +table-table-row-group = + element table:table-row-group { + table-table-row-group-attlist, table-rows-and-groups + } +table-table-row-group-attlist = attribute table:display { boolean }? +table-table-rows = + element table:table-rows { (text-soft-page-break?, table-table-row)+ } +table-table-source = + element table:table-source { + table-table-source-attlist, table-linked-source-attlist, empty + } +table-table-source-attlist = + attribute table:mode { "copy-all" | "copy-results-only" }? + & attribute table:table-name { \string }? +table-table-template = + element table:table-template { + table-table-template-attlist, + table-first-row?, + table-last-row?, + table-first-column?, + table-last-column?, + table-body, + table-even-rows?, + table-odd-rows?, + table-even-columns?, + table-odd-columns?, + table-background? + } +table-table-template-attlist = + attribute table:name { \string } + & attribute table:first-row-start-column { rowOrCol } + & attribute table:first-row-end-column { rowOrCol } + & attribute table:last-row-start-column { rowOrCol } + & attribute table:last-row-end-column { rowOrCol } +table-target-range-address = + element table:target-range-address { + common-table-range-attlist, empty + } +table-title = element table:title { text } +table-tracked-changes = + element table:tracked-changes { + table-tracked-changes-attlist, + (table-cell-content-change + | table-insertion + | table-deletion + | table-movement)* + } +table-tracked-changes-attlist = + attribute table:track-changes { boolean }? +table-validation-attlist = + attribute table:name { \string } + & attribute table:condition { \string }? + & attribute table:base-cell-address { cellAddress }? + & attribute table:allow-empty-cell { boolean }? + & attribute table:display-list { + "none" | "unsorted" | "sort-ascending" + }? +table-visibility-value = "visible" | "collapse" | "filter" +target-frame = attribute office:target-frame { targetFrameName }? +target-location = attribute xlink:href { anyIRI }? targetFrameName = "_self" | "_blank" | "_parent" | "_top" | \string +text-a = + element text:a { + text-a-attlist, office-event-listeners?, paragraph-content* + } +text-a-attlist = + attribute office:name { \string }? + & attribute office:title { \string }? + & attribute xlink:type { "simple" } + & attribute xlink:href { anyIRI } + & attribute xlink:actuate { "onRequest" }? + & attribute office:target-frame-name { targetFrameName }? + & attribute xlink:show { "new" | "replace" }? + & attribute text:style-name { styleNameRef }? + & attribute text:visited-style-name { styleNameRef }? +text-alphabetical-index = + element text:alphabetical-index { + common-section-attlist, + text-alphabetical-index-source, + text-index-body + } +text-alphabetical-index-auto-mark-file = + element text:alphabetical-index-auto-mark-file { + attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI } + } +text-alphabetical-index-entry-template = + element text:alphabetical-index-entry-template { + text-alphabetical-index-entry-template-attrs, + (text-index-entry-chapter + | text-index-entry-page-number + | text-index-entry-text + | text-index-entry-span + | text-index-entry-tab-stop)* + } +text-alphabetical-index-entry-template-attrs = + attribute text:outline-level { "1" | "2" | "3" | "separator" } + & attribute text:style-name { styleNameRef } +text-alphabetical-index-mark-attrs = + attribute text:key1 { \string }? + & attribute text:key2 { \string }? + & attribute text:string-value-phonetic { \string }? + & attribute text:key1-phonetic { \string }? + & attribute text:key2-phonetic { \string }? + & attribute text:main-entry { boolean }? +text-alphabetical-index-source = + element text:alphabetical-index-source { + text-alphabetical-index-source-attrs, + text-index-title-template?, + text-alphabetical-index-entry-template* + } +text-alphabetical-index-source-attrs = + text-index-scope-attr + & text-relative-tab-stop-position-attr + & attribute text:ignore-case { boolean }? + & attribute text:main-entry-style-name { styleNameRef }? + & attribute text:alphabetical-separators { boolean }? + & attribute text:combine-entries { boolean }? + & attribute text:combine-entries-with-dash { boolean }? + & attribute text:combine-entries-with-pp { boolean }? + & attribute text:use-keys-as-entries { boolean }? + & attribute text:capitalize-entries { boolean }? + & attribute text:comma-separated { boolean }? + & attribute fo:language { languageCode }? + & attribute fo:country { countryCode }? + & attribute fo:script { scriptCode }? + & attribute style:rfc-language-tag { language }? + & attribute text:sort-algorithm { \string }? +text-bibliography = + element text:bibliography { + common-section-attlist, text-bibliography-source, text-index-body + } +text-bibliography-configuration = + element text:bibliography-configuration { + text-bibliography-configuration-attlist, text-sort-key* + } +text-bibliography-configuration-attlist = + attribute text:prefix { \string }? + & attribute text:suffix { \string }? + & attribute text:numbered-entries { boolean }? + & attribute text:sort-by-position { boolean }? + & attribute fo:language { languageCode }? + & attribute fo:country { countryCode }? + & attribute fo:script { scriptCode }? + & attribute style:rfc-language-tag { language }? + & attribute text:sort-algorithm { \string }? +text-bibliography-entry-template = + element text:bibliography-entry-template { + text-bibliography-entry-template-attrs, + (text-index-entry-span + | text-index-entry-tab-stop + | text-index-entry-bibliography)* + } +text-bibliography-entry-template-attrs = + attribute text:bibliography-type { text-bibliography-types } + & attribute text:style-name { styleNameRef } +text-bibliography-source = + element text:bibliography-source { + text-index-title-template?, text-bibliography-entry-template* + } +text-bibliography-types = + "article" + | "book" + | "booklet" + | "conference" + | "custom1" + | "custom2" + | "custom3" + | "custom4" + | "custom5" + | "email" + | "inbook" + | "incollection" + | "inproceedings" + | "journal" + | "manual" + | "mastersthesis" + | "misc" + | "phdthesis" + | "proceedings" + | "techreport" + | "unpublished" + | "www" +text-bookmark = element text:bookmark { text-bookmark-attlist, empty } +text-bookmark-attlist = + attribute text:name { \string } + & xml-id? +text-bookmark-end = + element text:bookmark-end { text-bookmark-end-attlist, empty } +text-bookmark-end-attlist = attribute text:name { \string } +text-bookmark-ref-content = + attribute text:reference-format { + common-ref-format-values + | "number-no-superior" + | "number-all-superior" + | "number" + }? +text-bookmark-start = + element text:bookmark-start { text-bookmark-start-attlist, empty } +text-bookmark-start-attlist = + attribute text:name { \string } + & xml-id? + & common-in-content-meta-attlist? +text-changed-region = + element text:changed-region { + text-changed-region-attr, text-changed-region-content + } +text-changed-region-attr = + xml-id, + attribute text:id { NCName }? +text-changed-region-content = + element text:insertion { office-change-info } + | element text:deletion { office-change-info, text-content* } + | element text:format-change { office-change-info } +text-chapter-attlist = + attribute text:display { + "name" + | "number" + | "number-and-name" + | "plain-number-and-name" + | "plain-number" + } + & attribute text:outline-level { nonNegativeInteger } +text-common-ref-content = + text + & attribute text:ref-name { \string }? +text-conditional-text-attlist = + attribute text:condition { \string } + & attribute text:string-value-if-true { \string } + & attribute text:string-value-if-false { \string } + & attribute text:current-value { boolean }? +text-content = + text-h + | text-p + | text-list + | text-numbered-paragraph + | table-table + | text-section + | text-soft-page-break + | text-table-of-content + | text-illustration-index + | text-table-index + | text-object-index + | text-user-index + | text-alphabetical-index + | text-bibliography + | shape + | change-marks +text-database-display-attlist = + common-field-database-table + & common-field-data-style-name-attlist + & attribute text:column-name { \string } +text-database-next-attlist = + common-field-database-table + & attribute text:condition { \string }? +text-database-row-select-attlist = + common-field-database-table + & attribute text:condition { \string }? + & attribute text:row-number { nonNegativeInteger }? +text-date-attlist = + (common-field-fixed-attlist & common-field-data-style-name-attlist) + & attribute text:date-value { dateOrDateTime }? + & attribute text:date-adjust { duration }? +text-dde-connection-decl = + element text:dde-connection-decl { + text-dde-connection-decl-attlist, common-dde-connection-decl-attlist + } +text-dde-connection-decl-attlist = attribute office:name { \string } +text-decls = + element text:variable-decls { text-variable-decl* }?, + element text:sequence-decls { text-sequence-decl* }?, + element text:user-field-decls { text-user-field-decl* }?, + element text:dde-connection-decls { text-dde-connection-decl* }?, + text-alphabetical-index-auto-mark-file? +text-drop-down = + element text:drop-down { + attribute text:name { \string }, + element text:label { + attribute text:value { \string }?, + attribute text:current-selected { boolean }? + }*, + text + } +text-file-name-attlist = + attribute text:display { + "full" | "path" | "name" | "name-and-extension" + }? + & common-field-fixed-attlist +text-get-page-variable-attlist = common-field-num-format-attlist +text-h = + element text:h { + heading-attrs, + paragraph-attrs, + text-number?, + paragraph-content-or-hyperlink* + } +text-hidden-paragraph-attlist = + attribute text:condition { \string } + & attribute text:is-hidden { boolean }? +text-hidden-text-attlist = + attribute text:condition { \string } + & attribute text:string-value { \string } + & attribute text:is-hidden { boolean }? +text-id = attribute text:id { \string } +text-illustration-index = + element text:illustration-index { + common-section-attlist, + text-illustration-index-source, + text-index-body + } +text-illustration-index-entry-content = + text-illustration-index-entry-template-attrs, + (text-index-entry-chapter + | text-index-entry-page-number + | text-index-entry-text + | text-index-entry-span + | text-index-entry-tab-stop + | text-index-entry-link-start + | text-index-entry-link-end + # https://issues.oasis-open.org/browse/OFFICE-3941 + )* +text-illustration-index-entry-template = + element text:illustration-index-entry-template { + text-illustration-index-entry-content + } +text-illustration-index-entry-template-attrs = + attribute text:style-name { styleNameRef } +text-illustration-index-source = + element text:illustration-index-source { + text-illustration-index-source-attrs, + text-index-title-template?, + text-illustration-index-entry-template? + } +text-illustration-index-source-attrs = + text-index-scope-attr + & text-relative-tab-stop-position-attr + & attribute text:use-caption { boolean }? + & attribute text:caption-sequence-name { \string }? + & attribute text:caption-sequence-format { + "text" | "category-and-value" | "caption" + }? +text-index-body = element text:index-body { index-content-main* } +text-index-entry-bibliography = + element text:index-entry-bibliography { + text-index-entry-bibliography-attrs + } +text-index-entry-bibliography-attrs = + attribute text:style-name { styleNameRef }? + & attribute text:bibliography-data-field { + "address" + | "annote" + | "author" + | "bibliography-type" + | "booktitle" + | "chapter" + | "custom1" + | "custom2" + | "custom3" + | "custom4" + | "custom5" + | "edition" + | "editor" + | "howpublished" + | "identifier" + | "institution" + | "isbn" + | "issn" + | "journal" + | "month" + | "note" + | "number" + | "organizations" + | "pages" + | "publisher" + | "report-type" + | "school" + | "series" + | "title" + | "url" + | "volume" + | "year" + } +text-index-entry-chapter = + element text:index-entry-chapter { + attribute text:style-name { styleNameRef }?, + text-index-entry-chapter-attrs + } +text-index-entry-chapter-attrs = + attribute text:display { + "name" + | "number" + | "number-and-name" + | "plain-number" + | "plain-number-and-name" + }? + & attribute text:outline-level { positiveInteger }? +text-index-entry-link-end = + element text:index-entry-link-end { + attribute text:style-name { styleNameRef }? + } +text-index-entry-link-start = + element text:index-entry-link-start { + attribute text:style-name { styleNameRef }? + } +text-index-entry-page-number = + element text:index-entry-page-number { + attribute text:style-name { styleNameRef }? + } +text-index-entry-span = + element text:index-entry-span { + attribute text:style-name { styleNameRef }?, + text + } +text-index-entry-tab-stop = + element text:index-entry-tab-stop { + attribute text:style-name { styleNameRef }?, + text-index-entry-tab-stop-attrs + } +text-index-entry-tab-stop-attrs = + attribute style:leader-char { character }? + & (attribute style:type { "right" } + | (attribute style:type { "left" }, + attribute style:position { length })) +text-index-entry-text = + element text:index-entry-text { + attribute text:style-name { styleNameRef }? + } +text-index-name = attribute text:index-name { \string } +text-index-scope-attr = + attribute text:index-scope { "document" | "chapter" }? +text-index-source-style = + element text:index-source-style { + attribute text:style-name { styleNameRef }, + empty + } +# https://issues.oasis-open.org/browse/OFFICE-3675 +text-index-source-styles = + element text:index-source-styles { + attribute text:outline-level { positiveInteger }, + text-index-source-style* + } +text-index-title = + element text:index-title { + common-section-attlist, index-content-main* + } +text-index-title-template = + element text:index-title-template { + attribute text:style-name { styleNameRef }?, + text + } +text-linenumbering-configuration = + element text:linenumbering-configuration { + text-linenumbering-configuration-attlist, + text-linenumbering-separator? + } +text-linenumbering-configuration-attlist = + attribute text:number-lines { boolean }? + & common-num-format-attlist? + & attribute text:style-name { styleNameRef }? + & attribute text:increment { nonNegativeInteger }? + & attribute text:number-position { + "left" | "right" | "inner" | "outer" + }? + & attribute text:offset { nonNegativeLength }? + & attribute text:count-empty-lines { boolean }? + & attribute text:count-in-text-boxes { boolean }? + & attribute text:restart-on-page { boolean }? +text-linenumbering-separator = + element text:linenumbering-separator { + attribute text:increment { nonNegativeInteger }?, + text + } +text-list = + element text:list { + text-list-attr, text-list-header?, text-list-item* + } +text-list-attr = + attribute text:style-name { styleNameRef }? + & attribute text:continue-numbering { boolean }? + & attribute text:continue-list { IDREF }? + & xml-id? +text-list-header = + element text:list-header { + text-list-header-attr, text-list-item-content + } +text-list-header-attr = xml-id? +text-list-item = + element text:list-item { text-list-item-attr, text-list-item-content } +text-list-item-attr = + attribute text:start-value { nonNegativeInteger }? + & attribute text:style-override { styleNameRef }? + & xml-id? +text-list-item-content = + text-number?, (text-p | text-h | text-list | text-soft-page-break)* +text-list-level-style-attr = attribute text:level { positiveInteger } +text-list-level-style-bullet-attr = + attribute text:style-name { styleNameRef }? + & attribute text:bullet-char { character } + & common-num-format-prefix-suffix-attlist + & attribute text:bullet-relative-size { percent }? +text-list-level-style-image-attr = + common-draw-data-attlist | office-binary-data +text-list-level-style-number-attr = + attribute text:style-name { styleNameRef }? + & common-num-format-attlist + & common-num-format-prefix-suffix-attlist + & attribute text:display-levels { positiveInteger }? + & attribute text:start-value { positiveInteger }? +text-list-style = + element text:list-style { + text-list-style-attr, text-list-style-content* + } +text-list-style-attr = + attribute style:name { styleName } + & attribute style:display-name { \string }? + & attribute text:consecutive-numbering { boolean }? +text-list-style-content = + element text:list-level-style-number { + text-list-level-style-attr, + text-list-level-style-number-attr, + style-list-level-properties?, + style-text-properties? + } + | element text:list-level-style-bullet { + text-list-level-style-attr, + text-list-level-style-bullet-attr, + style-list-level-properties?, + style-text-properties? + } + | element text:list-level-style-image { + text-list-level-style-attr, + text-list-level-style-image-attr, + style-list-level-properties? + } +text-meta-attlist = common-in-content-meta-attlist? & xml-id? +text-meta-field-attlist = xml-id & common-field-data-style-name-attlist +text-note-class = attribute text:note-class { "footnote" | "endnote" } +text-note-ref-content = + attribute text:reference-format { common-ref-format-values }? + & text-note-class +text-notes-configuration = + element text:notes-configuration { text-notes-configuration-content } +text-notes-configuration-content = + text-note-class + & attribute text:citation-style-name { styleNameRef }? + & attribute text:citation-body-style-name { styleNameRef }? + & attribute text:default-style-name { styleNameRef }? + & attribute text:master-page-name { styleNameRef }? + & attribute text:start-value { nonNegativeInteger }? + & common-num-format-prefix-suffix-attlist + & common-num-format-attlist? + & attribute text:start-numbering-at { + "document" | "chapter" | "page" + }? + & attribute text:footnotes-position { + "text" | "page" | "section" | "document" + }? + & element text:note-continuation-notice-forward { text }? + & element text:note-continuation-notice-backward { text }? +text-number = element text:number { \string } +text-numbered-paragraph = + element text:numbered-paragraph { + text-numbered-paragraph-attr, text-number?, (text-p | text-h) + } +text-numbered-paragraph-attr = + attribute text:list-id { NCName } + & attribute text:level { positiveInteger }? + & (attribute text:style-name { styleNameRef }, + attribute text:continue-numbering { boolean }, + attribute text:start-value { nonNegativeInteger })? + & xml-id? +text-object-index = + element text:object-index { + common-section-attlist, text-object-index-source, text-index-body + } +text-object-index-entry-template = + element text:object-index-entry-template { + text-illustration-index-entry-content + } +text-object-index-source = + element text:object-index-source { + text-object-index-source-attrs, + text-index-title-template?, + text-object-index-entry-template? + } +text-object-index-source-attrs = + text-index-scope-attr + & text-relative-tab-stop-position-attr + & attribute text:use-spreadsheet-objects { boolean }? + & attribute text:use-math-objects { boolean }? + & attribute text:use-draw-objects { boolean }? + & attribute text:use-chart-objects { boolean }? + & attribute text:use-other-objects { boolean }? +text-outline-level = attribute text:outline-level { positiveInteger }? +text-outline-level-style = + element text:outline-level-style { + text-outline-level-style-attlist, + style-list-level-properties?, + style-text-properties? + } +text-outline-level-style-attlist = + attribute text:level { positiveInteger } + & attribute text:style-name { styleNameRef }? + & common-num-format-attlist + & common-num-format-prefix-suffix-attlist + & attribute text:display-levels { positiveInteger }? + & attribute text:start-value { positiveInteger }? +text-outline-style = + element text:outline-style { + text-outline-style-attr, text-outline-level-style+ + } +text-outline-style-attr = attribute style:name { styleName } +text-p = + element text:p { paragraph-attrs, paragraph-content-or-hyperlink* } +text-page = element text:page { text-page-attlist, empty } +text-page-attlist = attribute text:master-page-name { styleNameRef } +text-page-continuation-attlist = + attribute text:select-page { "previous" | "next" } + & attribute text:string-value { \string }? +text-page-number-attlist = + (common-field-num-format-attlist & common-field-fixed-attlist) + & attribute text:page-adjust { integer }? + & attribute text:select-page { "previous" | "current" | "next" }? +text-page-sequence = element text:page-sequence { text-page+ } +text-placeholder-attlist = + attribute text:placeholder-type { + "text" | "table" | "text-box" | "image" | "object" + } + & common-field-description-attlist +text-relative-tab-stop-position-attr = + attribute text:relative-tab-stop-position { boolean }? +text-section = + element text:section { + text-section-attlist, + (text-section-source | text-section-source-dde | empty), + text-content* + } +text-section-attlist = + common-section-attlist + & (attribute text:display { "true" | "none" } + | (attribute text:display { "condition" }, + attribute text:condition { \string }) + | empty) +text-section-source = + element text:section-source { text-section-source-attr } +text-section-source-attr = + (attribute xlink:type { "simple" }, + attribute xlink:href { anyIRI }, + attribute xlink:show { "embed" }?)? + & attribute text:section-name { \string }? + & attribute text:filter-name { \string }? +text-section-source-dde = office-dde-source +text-sequence-decl = + element text:sequence-decl { text-sequence-decl-attlist } +text-sequence-decl-attlist = + common-field-name-attlist + & attribute text:display-outline-level { nonNegativeInteger } + & attribute text:separation-character { character }? +text-sequence-ref-content = + attribute text:reference-format { + common-ref-format-values + | "category-and-value" + | "caption" + | "value" + }? +text-sequence-ref-name = attribute text:ref-name { \string }? +text-set-page-variable-attlist = + attribute text:active { boolean }? + & attribute text:page-adjust { integer }? +text-soft-page-break = element text:soft-page-break { empty } +text-sort-key = element text:sort-key { text-sort-key-attlist, empty } +text-sort-key-attlist = + attribute text:key { + "address" + | "annote" + | "author" + | "bibliography-type" + | "booktitle" + | "chapter" + | "custom1" + | "custom2" + | "custom3" + | "custom4" + | "custom5" + | "edition" + | "editor" + | "howpublished" + | "identifier" + | "institution" + | "isbn" + | "issn" + | "journal" + | "month" + | "note" + | "number" + | "organizations" + | "pages" + | "publisher" + | "report-type" + | "school" + | "series" + | "title" + | "url" + | "volume" + | "year" + }, + attribute text:sort-ascending { boolean }? +text-style-name = attribute form:text-style-name { styleNameRef }? +text-tab-attr = attribute text:tab-ref { nonNegativeInteger }? +text-table-index = + element text:table-index { + common-section-attlist, text-table-index-source, text-index-body + } +text-table-index-entry-template = + element text:table-index-entry-template { + text-illustration-index-entry-content + } +text-table-index-source = + element text:table-index-source { + text-illustration-index-source-attrs, + text-index-title-template?, + text-table-index-entry-template? + } +text-table-of-content = + element text:table-of-content { + common-section-attlist, + text-table-of-content-source, + text-index-body + } +text-table-of-content-children = + text-index-entry-chapter + | text-index-entry-page-number + | text-index-entry-text + | text-index-entry-span + | text-index-entry-tab-stop + | text-index-entry-link-start + | text-index-entry-link-end +text-table-of-content-entry-template = + element text:table-of-content-entry-template { + text-table-of-content-entry-template-attlist, + text-table-of-content-children* + } +text-table-of-content-entry-template-attlist = + attribute text:outline-level { positiveInteger } + & attribute text:style-name { styleNameRef } +text-table-of-content-source = + element text:table-of-content-source { + text-table-of-content-source-attlist, + text-index-title-template?, + text-table-of-content-entry-template*, + text-index-source-styles* + } +text-table-of-content-source-attlist = + attribute text:outline-level { positiveInteger }? + & attribute text:use-outline-level { boolean }? + & attribute text:use-index-marks { boolean }? + & attribute text:use-index-source-styles { boolean }? + & attribute text:index-scope { "document" | "chapter" }? + & attribute text:relative-tab-stop-position { boolean }? +text-template-name-attlist = + attribute text:display { + "full" | "path" | "name" | "name-and-extension" | "area" | "title" + }? +text-time-attlist = + (common-field-fixed-attlist & common-field-data-style-name-attlist) + & attribute text:time-value { timeOrDateTime }? + & attribute text:time-adjust { duration }? +text-toc-mark-start-attrs = text-id, text-outline-level +text-tracked-changes = + element text:tracked-changes { + text-tracked-changes-attr, text-changed-region* + }? +text-tracked-changes-attr = attribute text:track-changes { boolean }? +text-user-field-decl = + element text:user-field-decl { + common-field-name-attlist, + common-field-formula-attlist?, + common-value-and-type-attlist + } +text-user-index = + element text:user-index { + common-section-attlist, text-user-index-source, text-index-body + } +text-user-index-entry-template = + element text:user-index-entry-template { + text-user-index-entry-template-attrs, + (text-index-entry-chapter + | text-index-entry-page-number + | text-index-entry-text + | text-index-entry-span + | text-index-entry-tab-stop + | text-index-entry-link-start + | text-index-entry-link-end + # https://issues.oasis-open.org/browse/OFFICE-3941 + )* + } +text-user-index-entry-template-attrs = + attribute text:outline-level { positiveInteger } + & attribute text:style-name { styleNameRef } +text-user-index-source = + element text:user-index-source { + text-user-index-source-attr, + text-index-title-template?, + text-user-index-entry-template*, + text-index-source-styles* + } +text-user-index-source-attr = + text-index-scope-attr + & text-relative-tab-stop-position-attr + & attribute text:use-index-marks { boolean }? + & attribute text:use-index-source-styles { boolean }? + & attribute text:use-graphics { boolean }? + & attribute text:use-tables { boolean }? + & attribute text:use-floating-frames { boolean }? + & attribute text:use-objects { boolean }? + & attribute text:copy-outline-levels { boolean }? + & attribute text:index-name { \string } +text-variable-decl = + element text:variable-decl { + common-field-name-attlist, common-value-type-attlist + } +textEncoding = xsd:string { pattern = "[A-Za-z][A-Za-z0-9._\-]*" } +time = xsd:time +timeOrDateTime = xsd:time | xsd:dateTime +types = "submit" | "reset" | "push" | "url" valueType = "float" | "time" @@ -6257,24 +6397,18 @@ valueType = | "currency" | "boolean" | "string" -points = - xsd:string { pattern = "-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*" } -pathData = xsd:string +variableName = xsd:string vector3D = xsd:string { pattern = "\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)" } -namespacedToken = xsd:QName { pattern = "[^:]+:[^:]+" } -anyIRI = - xsd:anyURI - >> dc:description [ - "An IRI-reference as defined in [RFC3987]. See ODF 1.2 Part 1 section 18.3." - ] -anyAttListOrElements = - attribute * { text }*, - anyElements -anyElements = - element * { - mixed { anyAttListOrElements } - }* +vertBackPos = "top" | "center" | "bottom" +xforms-bind-attlist = attribute xforms:bind { \string }? +xforms-model = element xforms:model { anyAttListOrElements } +xml-id = attribute xml:id { ID } +zeroToHundredPercent = + xsd:string { + pattern = "([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%" + } +zeroToOneDecimal = xsd:decimal { minInclusive = "0" maxInclusive = "1" } diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml index 7fd91b8c72e..f8acb0d40ca 100644 --- a/etc/schema/schemas.xml +++ b/etc/schema/schemas.xml @@ -31,6 +31,10 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. --> <namespace ns="http://relaxng.org/ns/structure/1.0" typeId="RELAX NG"/> <namespace ns="http://thaiopensource.com/ns/locating-rules/1.0" uri="locate.rnc"/> + <namespace ns="urn:oasis:names:tc:opendocument:xmlns:office:1.0" typeId="LibreOffice"/> + <namespace ns="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" typeId="LibreOffice"/> + <namespace ns="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" typeId="LibreOffice"/> + <namespace ns="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" typeId="OpenDocument Manifest"/> <documentElement localName="stylesheet" typeId="XSLT"/> <documentElement prefix="xsl" localName="transform" typeId="XSLT"/> @@ -59,7 +63,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. --> <documentElement prefix="office" typeId="OpenDocument"/> <documentElement prefix="manifest" localName="manifest" typeId="OpenDocument Manifest"/> - <typeId id="OpenDocument" uri="od-schema-v1.2-os.rnc"/> + <typeId id="LibreOffice" uri="OpenDocument-schema-v1.3+libreoffice.rnc"/> <typeId id="OpenDocument Manifest" uri="od-manifest-schema-v1.2-os.rnc"/> </locatingRules> diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el index 1f4891c3168..5a527111d35 100644 --- a/etc/themes/manoj-dark-theme.el +++ b/etc/themes/manoj-dark-theme.el @@ -1,4 +1,4 @@ -;;; manoj-dark.el --- A dark theme from Manoj -*- lexical-binding:t -*- +;;; manoj-dark-theme.el --- A dark theme from Manoj -*- lexical-binding:t -*- ;; Copyright (C) 2011-2021 Free Software Foundation, Inc. diff --git a/etc/themes/modus-operandi-theme.el b/etc/themes/modus-operandi-theme.el index c7a0f72c103..a946d747e8e 100644 --- a/etc/themes/modus-operandi-theme.el +++ b/etc/themes/modus-operandi-theme.el @@ -1,4666 +1,72 @@ ;;; modus-operandi-theme.el --- Accessible light theme (WCAG AAA) -*- lexical-binding:t -*- -;; Copyright (C) 2019-2021 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Protesilaos Stavrou <info@protesilaos.com> ;; URL: https://gitlab.com/protesilaos/modus-themes -;; Version: 0.13.0 +;; Version: 1.5.0 ;; Package-Requires: ((emacs "26.1")) ;; Keywords: faces, theme, accessibility ;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or +;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. +;; the Free Software Foundation, either version 3 of the License, or (at +;; your option) any later version. ;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: ;; -;; This theme is designed for colour-contrast accessibility. +;; Modus Operandi is the light variant of the Modus themes (Modus +;; Vivendi is the dark one). The themes are designed for color-contrast +;; accessibility. More specifically: ;; -;; 1. Provide a consistent minimum contrast ratio between background and -;; foreground values of 7:1 or higher. This meets the highest such -;; accessibility criterion per the guidelines of the Worldwide Web -;; Consortium's Working Group on Accessibility (WCAG AAA standard). +;; 1. Provide a consistent minimum contrast ratio between background +;; and foreground values of 7:1 or higher. This meets the highest +;; such accessibility criterion per the guidelines of the Worldwide +;; Web Consortium's Working Group on Accessibility (WCAG AAA +;; standard). ;; -;; 2. Offer as close to full face coverage as possible. The list is -;; already quite long (see further below), with more additions to follow -;; as part of the ongoing development process. +;; 2. Offer as close to full face coverage as possible. The list is +;; already quite long, with more additions to follow as part of the +;; ongoing development process. ;; -;; The theme provides the following customisation options, all of which -;; are disabled by default: +;; For a complete view of the project, also refer to the following files +;; (should be distributed in the same repository/directory as the +;; current item): ;; -;; modus-operandi-theme-slanted-constructs (boolean) -;; modus-operandi-theme-bold-constructs (boolean) -;; modus-operandi-theme-variable-pitch-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-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) -;; -;; The default scale is as follows (it can be customised as well): -;; -;; 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 -;; -;; What follows is the list of explicitly supported packages or face -;; groups (there are implicitly supported packages as well, which -;; inherit from font-lock or some basic group). You are encouraged to -;; notify me of any missing package or change you would like to see. -;; -;; ace-window -;; ag -;; alert -;; all-the-icons -;; annotate -;; anzu -;; apropos -;; apt-sources-list -;; artbollocks-mode -;; auctex and TeX -;; auto-dim-other-buffers -;; avy -;; awesome-tray -;; binder -;; bm -;; bongo -;; boon -;; breakpoint (provided by built-in gdb-mi.el) -;; buffer-expose -;; calendar and diary -;; calfw -;; centaur-tabs -;; change-log and log-view (`vc-print-log' and `vc-print-root-log') -;; cider -;; circe -;; color-rg -;; column-enforce-mode -;; company-mode -;; company-posframe -;; compilation-mode -;; completions -;; counsel -;; counsel-css -;; counsel-notmuch -;; counsel-org-capture-string -;; cov -;; cperl-mode -;; csv-mode -;; ctrlf -;; custom (M-x customize) -;; dap-mode -;; dashboard (emacs-dashboard) -;; deadgrep -;; debbugs -;; define-word -;; deft -;; dictionary -;; diff-hl -;; diff-mode -;; dim-autoload -;; dir-treeview -;; dired -;; dired-async -;; dired-git -;; dired-git-info -;; dired-narrow -;; dired-subtree -;; diredfl -;; disk-usage -;; doom-modeline -;; dynamic-ruler -;; easy-jekyll -;; easy-kill -;; ebdb -;; ediff -;; eglot -;; el-search -;; eldoc -;; eldoc-box -;; elfeed -;; elfeed-score -;; emms -;; enhanced-ruby-mode -;; epa -;; equake -;; erc -;; eros -;; ert -;; eshell -;; eshell-fringe-status -;; eshell-git-prompt -;; eshell-prompt-extras (epe) -;; eshell-syntax-highlighting -;; evil (evil-mode) -;; evil-goggles -;; evil-visual-mark-mode -;; eww -;; eyebrowse -;; fancy-dabbrev -;; flycheck -;; flycheck-color-mode-line -;; flycheck-indicator -;; flycheck-posframe -;; flymake -;; flyspell -;; flyspell-correct -;; flx -;; freeze-it -;; frog-menu -;; focus -;; fold-this -;; font-lock (generic syntax highlighting) -;; forge -;; fountain (fountain-mode) -;; geiser -;; git-commit -;; git-gutter (and variants) -;; git-lens -;; git-rebase -;; git-timemachine -;; git-walktree -;; gnus -;; golden-ratio-scroll-screen -;; helm -;; helm-ls-git -;; helm-switch-shell -;; helm-xref -;; helpful -;; highlight-blocks -;; highlight-defined -;; highlight-escape-sequences (`hes-mode') -;; highlight-indentation -;; highlight-numbers -;; highlight-symbol -;; highlight-tail -;; highlight-thing -;; hl-defined -;; hl-fill-column -;; hl-line-mode -;; hl-todo -;; hydra -;; hyperlist -;; ibuffer -;; icomplete -;; ido-mode -;; iedit -;; iflipb -;; imenu-list -;; indium -;; info -;; info-colors -;; interaction-log -;; ioccur -;; isearch, occur, etc. -;; ivy -;; ivy-posframe -;; jira (org-jira) -;; journalctl-mode -;; js2-mode -;; julia -;; jupyter -;; kaocha-runner -;; keycast -;; line numbers (`display-line-numbers-mode' and global variant) -;; lsp-mode -;; lsp-ui -;; magit -;; magit-imerge -;; man -;; markdown-mode -;; markup-faces (`adoc-mode') -;; mentor -;; messages -;; minibuffer-line -;; minimap -;; modeline -;; mood-line -;; mpdel -;; mu4e -;; mu4e-conversation -;; multiple-cursors -;; neotree -;; no-emoji -;; notmuch -;; num3-mode -;; nxml-mode -;; objed -;; orderless -;; org -;; org-journal -;; org-noter -;; org-pomodoro -;; org-recur -;; org-roam -;; org-superstar -;; org-table-sticky-header -;; org-treescope -;; origami -;; outline-mode -;; outline-minor-faces -;; package (M-x list-packages) -;; page-break-lines -;; paradox -;; paren-face -;; parrot -;; pass -;; persp-mode -;; perspective -;; phi-grep -;; phi-search -;; pkgbuild-mode -;; pomidor -;; powerline -;; powerline-evil -;; proced -;; prodigy -;; racket-mode -;; rainbow-blocks -;; rainbow-identifiers -;; rainbow-delimiters -;; rcirc -;; regexp-builder (also known as `re-builder') -;; rg -;; ripgrep -;; rmail -;; ruler-mode -;; sallet -;; selectrum -;; semantic -;; sesman -;; shell-script-mode -;; show-paren-mode -;; side-notes -;; skewer-mode -;; smart-mode-line -;; smartparens -;; smerge -;; spaceline -;; speedbar -;; spell-fu -;; stripes -;; suggest -;; switch-window -;; swiper -;; swoop -;; sx -;; symbol-overlay -;; tab-bar-mode -;; tab-line-mode -;; syslog-mode -;; table (built-in table.el) -;; telephone-line -;; term -;; tomatinho -;; transient (pop-up windows like Magit's) -;; trashed -;; treemacs -;; tty-menu -;; tuareg -;; typescript -;; undo-tree -;; vc (built-in mode line status for version control) -;; vc-annotate (C-x v g) -;; vdiff -;; vimish-fold -;; visible-mark -;; visual-regexp -;; volatile-highlights -;; vterm -;; wcheck-mode -;; web-mode -;; wgrep -;; which-function-mode -;; which-key -;; whitespace-mode -;; window-divider-mode -;; winum -;; writegood-mode -;; woman -;; xah-elisp-mode -;; xref -;; xterm-color (and ansi-colors) -;; yaml-mode -;; yasnippet -;; ztree +;; - modus-themes.el (Main code shared between the themes) +;; - modus-vivendi-theme.el (Dark theme) ;;; Code: -(deftheme modus-operandi - "Light theme that conforms with the highest accessibility - standard for colour contrast between background and - foreground elements (WCAG AAA).") - -;;; Custom faces - -;; These faces will be inherited by actual constructs. They are meant -;; for those cases where a face needs to distinguish its output from -;; the rest of the text, such as `isearch' and `occur'… We define -;; these separately in order to combine each colour with its -;; appropriate foreground value. This is to ensure a consistent -;; contrast ratio of >= 7:1. -(defgroup modus-theme () - "Theme that ensures WCAG AAA accessibility (contrast ratio -between foreground and background is >= 7:1)." - :group 'faces - :prefix "modus-theme-" - :link '(url-link :tag "GitLab" "https://gitlab.com/protesilaos/modus-themes") - :tag "Modus Operandi") - -(defface modus-theme-subtle-red nil nil) -(defface modus-theme-subtle-green nil nil) -(defface modus-theme-subtle-yellow nil nil) -(defface modus-theme-subtle-blue nil nil) -(defface modus-theme-subtle-magenta nil nil) -(defface modus-theme-subtle-cyan nil nil) -(defface modus-theme-subtle-neutral nil nil) -(defface modus-theme-intense-red nil nil) -(defface modus-theme-intense-green nil nil) -(defface modus-theme-intense-yellow nil nil) -(defface modus-theme-intense-blue nil nil) -(defface modus-theme-intense-magenta nil nil) -(defface modus-theme-intense-cyan nil nil) -(defface modus-theme-intense-neutral nil nil) -(defface modus-theme-refine-red nil nil) -(defface modus-theme-refine-green nil nil) -(defface modus-theme-refine-yellow nil nil) -(defface modus-theme-refine-blue nil nil) -(defface modus-theme-refine-magenta nil nil) -(defface modus-theme-refine-cyan nil nil) -(defface modus-theme-active-red nil nil) -(defface modus-theme-active-green nil nil) -(defface modus-theme-active-yellow nil nil) -(defface modus-theme-active-blue nil nil) -(defface modus-theme-active-magenta nil nil) -(defface modus-theme-active-cyan nil nil) -(defface modus-theme-fringe-red nil nil) -(defface modus-theme-fringe-green nil nil) -(defface modus-theme-fringe-yellow nil nil) -(defface modus-theme-fringe-blue nil nil) -(defface modus-theme-fringe-magenta nil nil) -(defface modus-theme-fringe-cyan nil nil) -(defface modus-theme-nuanced-red nil nil) -(defface modus-theme-nuanced-green nil nil) -(defface modus-theme-nuanced-yellow nil nil) -(defface modus-theme-nuanced-blue nil nil) -(defface modus-theme-nuanced-magenta nil nil) -(defface modus-theme-nuanced-cyan nil nil) -(defface modus-theme-special-cold nil nil) -(defface modus-theme-special-mild nil nil) -(defface modus-theme-special-warm nil nil) -(defface modus-theme-special-calm nil nil) -(defface modus-theme-diff-added nil nil) -(defface modus-theme-diff-changed nil nil) -(defface modus-theme-diff-removed nil nil) -(defface modus-theme-diff-refine-added nil nil) -(defface modus-theme-diff-refine-changed nil nil) -(defface modus-theme-diff-refine-removed nil nil) -(defface modus-theme-diff-focus-added nil nil) -(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-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 - -;; User-facing customisation options. They are all deactivated by -;; default (users must opt in). -(defcustom modus-operandi-theme-slanted-constructs nil - "Use slanted text in more code constructs (italics or oblique)." - :type 'boolean) - -(defcustom modus-operandi-theme-bold-constructs nil - "Use bold text in more code constructs." - :type 'boolean) - -(define-obsolete-variable-alias 'modus-operandi-theme-proportional-fonts - 'modus-operandi-theme-variable-pitch-headings "`modus-operandi-theme' 0.11.0") - -(defcustom modus-operandi-theme-proportional-fonts nil - "Use proportional fonts (variable-pitch) in headings." - :type 'boolean) - -(defcustom modus-operandi-theme-variable-pitch-headings nil - "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) - -(defcustom modus-operandi-theme-scale-1 1.05 - "Font size that is slightly larger than the base value. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(defcustom modus-operandi-theme-scale-2 1.1 - "Font size slightly larger than `modus-operandi-theme-scale-1'. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(defcustom modus-operandi-theme-scale-3 1.15 - "Font size slightly larger than `modus-operandi-theme-scale-2'. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(defcustom modus-operandi-theme-scale-4 1.2 - "Font size slightly larger than `modus-operandi-theme-scale-3'. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(defcustom modus-operandi-theme-scale-5 1.3 - "Font size slightly larger than `modus-operandi-theme-scale-4'. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(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." - :type 'boolean) - -(defcustom modus-operandi-theme-fringes nil - "Define the visibility of fringes. - -Nil means the fringes have no background colour. Option `subtle' -will apply a greyscale value that is visible yet close to the -main buffer background colour. Option `intense' will use a more -pronounced greyscale value." - :type '(choice - (const :tag "No visible fringes (default)" nil) - (const :tag "Subtle greyscale background" subtle) - (const :tag "Intense greyscale background" intense))) - -(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) - -(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. -The colour in use depends on the language (send feedback to -include more languages)." - :type 'boolean) - -(defcustom modus-operandi-theme-org-blocks nil - "Use a subtle grey or colour-coded background for Org blocks. - -Nil means that the block will have no background of its own and -will use the default that applies to the rest of the buffer. - -Option `greyscale' will apply a subtle neutral grey background to -the block's contents. It also affects the begin and end lines of -the block: their background will be extended to the edge of the -window for Emacs version >= 27 where the ':extend' keyword is -recognised by `set-face-attribute'. - -Option `rainbow' will use an accented background for the contents -of the block. The exact colour will depend on the programming -language and is controlled by the `org-src-block-faces' -variable (refer to the theme's source code for the current -association list)." - :type '(choice - (const :tag "No Org block background (default)" nil) - (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) - -(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." - :type 'boolean) - -(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. - -Nil means to remain faithful to the metaphors that each UI -establishes. For example, Icomplete and Ido only use foreground -colours to style their matches, whereas Ivy or Helm rely on an -aesthetic that combines coloured backgrounds with appropriate -text colour. - -Option `moderate' will apply a combination of background and -foreground that is fairly subtle. For Icomplete and the like, -this constitutes a departure from their standard style. While -Ivy, Helm, and the others, will use less pronounced colours for -applicable contexts. - -Option `opinionated' will apply colour combinations that -refashion the completion UI. So Icomplete et al will now use -styles that resemble the defaults of Ivy and co., while the -latter group will revert to an even more nuanced aesthetic." - :type '(choice - (const :tag "Respect the framework's established aesthetic (default)" nil) - (const :tag "Subtle backgrounds for various elements" moderate) - (const :tag "Radical alternative to the framework's looks" opinionated))) - -(defcustom modus-operandi-theme-prompts nil - "Use subtle or intense styles for minibuffer and REPL prompts. - -Nil means to only use an accented foreground colour. - -Options `subtle' and `intense' will change both the background -and the foreground values. The latter has a more pronounced -effect than the former." - :type '(choice - (const :tag "No prompt background (default)" nil) - (const :tag "Subtle accented background for the prompt" subtle) - (const :tag "Intense background and foreground for the prompt" intense))) - -(defcustom modus-operandi-theme-intense-hl-line nil - "Use more prominent background for command `hl-line-mode'." - :type 'boolean) - -(defcustom modus-operandi-theme-intense-paren-match nil - "Use more prominent colour for parenthesis matching." - :type 'boolean) - -(defcustom modus-operandi-theme-faint-syntax nil - "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 -;; above customisation options. -(defun modus-operandi-theme-bold-weight () - "Conditional use of a heavier text weight." - (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 -more pronounced greyscale colour." - (pcase modus-operandi-theme-fringes - ('intense (list :background intensebg)) - ('subtle (list :background subtlebg)) - (_ (list :background nil)))) - -(defun modus-operandi-theme-prompt (mainfg subtlebg subtlefg intensebg intensefg) - "Conditional use of background colours for prompts. -MAINFG is the prompt's standard foreground. SUBTLEBG should be a -subtle accented background that works with SUBTLEFG. INTENSEBG -must be a more pronounced accented colour that should be -combinable with INTENSEFG." - (pcase modus-operandi-theme-prompts - ('intense (list :background intensebg :foreground intensefg)) - ('subtle (list :background subtlebg :foreground subtlefg)) - (_ (list :background nil :foreground mainfg)))) - -(defun modus-operandi-theme-paren (normalbg intensebg) - "Conditional use of intense colours for matching parentheses. -NORMALBG should the special palette colour 'bg-paren-match' or -something similar. INTENSEBG must be easier to discern next to -other backgrounds, such as the special palette colour -'bg-paren-match-intense'." - (if modus-operandi-theme-intense-paren-match - (list :background intensebg) - (list :background normalbg))) - -(defun modus-operandi-theme-syntax-foreground (normal faint) - "Apply foreground value to code syntax. -NORMAL is the more saturated colour, which should be the default. -FAINT is the less saturated colour." - (if modus-operandi-theme-faint-syntax - (list :foreground faint) - (list :foreground normal))) - -(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-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. -BGBLK applies to a distinct neutral background. Else blocks have -no background of their own (the default), so they look the same -as the rest of the buffer. - -`modus-operandi-theme-org-blocks' also accepts a `rainbow' option -which is applied conditionally to `org-src-block-faces' (see the -theme's source code)." - (if (eq modus-operandi-theme-org-blocks 'greyscale) - (append - (and (>= emacs-major-version 27) '(:extend t)) - (list :background bgblk)) - (list :background nil))) - -(defun modus-operandi-theme-org-block-delim (bgaccent fgaccent bg fg) - "Conditionally set the styles of Org block delimiters. -BG, FG, BGACCENT, FGACCENT apply a background and foreground -colour respectively. - -The former pair is a greyscale combination that should be more -distinct than the background of the block. It is applied to the -default styles or when `modus-operandi-theme-org-blocks' is set -to `greyscale'. - -The latter pair should be more subtle than the background of the -block, as it is used when `modus-operandi-theme-org-blocks' is -set to `rainbow'." - (pcase modus-operandi-theme-org-blocks - ('greyscale (append (and (>= emacs-major-version 27) '(:extend t)) - (list :background bg :foreground fg))) - ('rainbow (list :background bgaccent :foreground fgaccent)) - (_ (list :background bg :foreground 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'. - -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. - -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)) - (_ (list :foreground mainfg)))) - -(defun modus-operandi-theme-extra-completions (subtleface intenseface altface &optional altfg bold) - "Combinations for `modus-operandi-theme-completions'. - -SUBTLEFACE and INTENSEFACE are custom theme faces that combine a -background and foreground value. The difference between the two -is a matter of degree. - -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. - -These are intended for Helm, Ivy, etc." - (pcase modus-operandi-theme-completions - ('opinionated (list :inherit (list altface bold) - :foreground (or altfg 'unspecified))) - ('moderate (list :inherit (list subtleface bold))) - (_ (list :inherit (list intenseface bold))))) - -(defun modus-operandi-theme-scale (amount) - "Scale heading by AMOUNT. - -AMOUNT is a customisation option." - (when modus-operandi-theme-scale-headings - (list :height amount))) - -;;; Colour palette - -;; Define colour palette. Each colour must have a >= 7:1 contrast -;; ratio relative to the foreground/background colour it is rendered -;; against. -;; -;; The design of the colour palette as a macro that maps it to faces is -;; adapted from zenbern-theme.el, last seen at commit 7dd7968: -;; https://github.com/bbatsov/zenburn-emacs (eval-and-compile - (defconst modus-operandi-theme-default-colors-alist - '(;; base values - ("bg-main" . "#ffffff") ("fg-main" . "#000000") - ("bg-alt" . "#f0f0f0") ("fg-alt" . "#505050") - ("bg-dim" . "#f8f8f8") ("fg-dim" . "#282828") - ;; specifically for on/off states (e.g. `mode-line') - ;; - ;; must be combined with themselves - ("bg-active" . "#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} - ("bg-special-cold" . "#dde3f4") ("fg-special-cold" . "#093060") - ("bg-special-mild" . "#c4ede0") ("fg-special-mild" . "#184034") - ("bg-special-warm" . "#f0e0d4") ("fg-special-warm" . "#5d3026") - ("bg-special-calm" . "#f8ddea") ("fg-special-calm" . "#61284f") - ;; styles for the main constructs - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' - ("red" . "#a60000") ("green" . "#005e00") - ("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" . "#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" . "#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 - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' - ("red-faint" . "#7f1010") ("green-faint" . "#104410") - ("yellow-faint" . "#5f4400") ("blue-faint" . "#002f88") - ("magenta-faint" . "#752f50") ("cyan-faint" . "#12506f") - - ("red-alt-faint" . "#702f00") ("green-alt-faint" . "#30440f") - ("yellow-alt-faint" . "#5d5000") ("blue-alt-faint" . "#003f78") - ("magenta-alt-faint" . "#702565") ("cyan-alt-faint" . "#354f6f") - - ("red-alt-other-faint" . "#7f002f") ("green-alt-other-faint" . "#0f443f") - ("yellow-alt-other-faint" . "#5e3a20") ("blue-alt-other-faint" . "#1f2f6f") - ("magenta-alt-other-faint" . "#5f3f7f") ("cyan-alt-other-faint" . "#2e584f") - ;; styles for elements that should be very subtle, yet accented - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' or any of - ;; the "nuanced" backgrounds - ("red-nuanced" . "#5f0000") ("green-nuanced" . "#004000") - ("yellow-nuanced" . "#3f3000") ("blue-nuanced" . "#201f55") - ("magenta-nuanced" . "#541f4f") ("cyan-nuanced" . "#0f3360") - ;; styles for slightly accented background - ;; - ;; must be combined with any of the above foreground values - ("red-nuanced-bg" . "#fff1f0") ("green-nuanced-bg" . "#ecf7ed") - ("yellow-nuanced-bg" . "#fff3da") ("blue-nuanced-bg" . "#f3f3ff") - ("magenta-nuanced-bg" . "#fdf0ff") ("cyan-nuanced-bg" . "#ebf6fa") - ;; styles for elements that should draw attention to themselves - ;; - ;; must be combined with: `bg-main' - ("red-intense" . "#b60000") ("green-intense" . "#006800") - ("yellow-intense" . "#904200") ("blue-intense" . "#1111ee") - ("magenta-intense" . "#7000e0") ("cyan-intense" . "#205b93") - ;; styles for background elements that should be visible yet - ;; subtle - ;; - ;; must be combined with: `fg-dim' - ("red-subtle-bg" . "#f2b0a2") ("green-subtle-bg" . "#aecf90") - ("yellow-subtle-bg" . "#e4c340") ("blue-subtle-bg" . "#b5d0ff") - ("magenta-subtle-bg" . "#f0d3ff") ("cyan-subtle-bg" . "#c0efff") - ;; styles for background elements that should be visible and - ;; distinguishable - ;; - ;; must be combined with: `fg-main' - ("red-intense-bg" . "#ff8892") ("green-intense-bg" . "#5ada88") - ("yellow-intense-bg" . "#f5df23") ("blue-intense-bg" . "#6aaeff") - ("magenta-intense-bg" . "#d5baff") ("cyan-intense-bg" . "#42cbd4") - ;; styles for refined contexts where both the foreground and the - ;; background need to have the same/similar hue - ;; - ;; must be combined with themselves OR the foregrounds can be - ;; combined with any of the base backgrounds - ("red-refine-bg" . "#ffcccc") ("red-refine-fg" . "#780000") - ("green-refine-bg" . "#aceaac") ("green-refine-fg" . "#004c00") - ("yellow-refine-bg" . "#fff29a") ("yellow-refine-fg" . "#604000") - ("blue-refine-bg" . "#8ac7ff") ("blue-refine-fg" . "#002288") - ("magenta-refine-bg" . "#ffccff") ("magenta-refine-fg" . "#770077") - ("cyan-refine-bg" . "#8eecf4") ("cyan-refine-fg" . "#004850") - ;; styles that are meant exclusively for the mode line - ;; - ;; must be combined with: `bg-active', `bg-inactive' - ("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 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 - ;; - ;; `bg-paren-match', `bg-paren-match-intense', `bg-region' and - ;; `bg-tab-active' must be combined with `fg-main', while - ;; `bg-tab-inactive' should be combined with `fg-dim' - ;; - ;; `bg-tab-bar' is only intended for the bar that holds the tabs and - ;; can only be combined with `fg-main' - ;; - ;; `fg-tab-active' is meant to be combined with `bg-tab-active', - ;; though only for styling special elements, such as underlining - ;; the current tab - ;; - ;; `fg-escape-char-construct' and `fg-escape-char-backslash' can - ;; be combined `bg-main', `bg-dim', `bg-alt' - ;; - ;; `fg-lang-error', `fg-lang-warning', `fg-lang-note' can be - ;; combined with `bg-main', `bg-dim', `bg-alt' - ;; - ;; `fg-mark-sel', `fg-mark-del', `fg-mark-alt' can be combined - ;; with `bg-main', `bg-dim', `bg-alt', `bg-hl-line' - ;; - ;; `fg-unfocused' must be combined with `fg-main' - ;; - ;; the window divider colours apply to faces with just an fg value - ;; - ;; 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" . "#c488ff") - ("bg-region" . "#bcbcbc") - - ("bg-tab-bar" . "#d5d5d5") - ("bg-tab-active" . "#f6f6f6") - ("bg-tab-inactive" . "#bdbdbd") - ("fg-tab-active" . "#30169e") - - ("fg-escape-char-construct" . "#8b1030") - ("fg-escape-char-backslash" . "#654d0f") + (unless (and (fboundp 'require-theme) + load-file-name + (equal (file-name-directory load-file-name) + (expand-file-name "themes/" data-directory)) + (require-theme 'modus-themes t)) + (require 'modus-themes))) - ("fg-lang-error" . "#9f004f") - ("fg-lang-warning" . "#604f0f") - ("fg-lang-note" . "#4040ae") - - ("fg-window-divider-inner" . "#888888") - ("fg-window-divider-outer" . "#585858") - - ("fg-unfocused" . "#56576d") - - ("bg-header" . "#e5e5e5") ("fg-header" . "#2a2a2a") - - ("bg-whitespace" . "#fff8fc") ("fg-whitespace" . "#645060") - - ("bg-diff-heading" . "#b7c2dd") ("fg-diff-heading" . "#043355") - ("bg-diff-added" . "#d4fad4") ("fg-diff-added" . "#004500") - ("bg-diff-changed" . "#fcefcf") ("fg-diff-changed" . "#524200") - ("bg-diff-removed" . "#ffe8ef") ("fg-diff-removed" . "#691616") - - ("bg-diff-refine-added" . "#94cf94") ("fg-diff-refine-added" . "#002a00") - ("bg-diff-refine-changed" . "#cccf8f") ("fg-diff-refine-changed" . "#302010") - ("bg-diff-refine-removed" . "#daa2b0") ("fg-diff-refine-removed" . "#400000") - - ("bg-diff-focus-added" . "#bbeabb") ("fg-diff-focus-added" . "#002c00") - ("bg-diff-focus-changed" . "#ecdfbf") ("fg-diff-focus-changed" . "#392900") - ("bg-diff-focus-removed" . "#efcbcf") ("fg-diff-focus-removed" . "#4a0000") - - ("bg-diff-neutral-0" . "#979797") ("fg-diff-neutral-0" . "#040404") - ("bg-diff-neutral-1" . "#b0b0b0") ("fg-diff-neutral-1" . "#252525") - ("bg-diff-neutral-2" . "#cccccc") ("fg-diff-neutral-2" . "#3a3a3a") - - ("bg-mark-sel" . "#a0f0cf") ("fg-mark-sel" . "#005040") - ("bg-mark-del" . "#ffccbb") ("fg-mark-del" . "#840040") - ("bg-mark-alt" . "#f5d88f") ("fg-mark-alt" . "#782900")) - "The entire palette of `modus-operandi-theme'. -Each element has the form (NAME . HEX).") - - (defcustom modus-operandi-theme-override-colors-alist '() - "Association list of palette colour overrides. -Values can be mapped to variables, using the same syntax as the -one present in `modus-operandi-theme-default-colors-alist'. - -This is only meant for do-it-yourself usage, with the -understanding that the user is responsible for the resulting -contrast ratio between new and existing colours." - :type '(alist - :key-type (string :tag "Name") - :value-type (string :tag " Hex"))) - - (defmacro modus-operandi-theme-with-color-variables (&rest body) - "`let' bind all colours around BODY. -Also bind `class' to ((class color) (min-colors 89))." - (declare (indent 0)) - `(let ((class '((class color) (min-colors 89))) - ,@(mapcar (lambda (cons) - (list (intern (car cons)) (cdr cons))) - (append modus-operandi-theme-default-colors-alist - modus-operandi-theme-override-colors-alist)) - ;; simple conditional styles that evaluate user-facing - ;; customisation options - (modus-theme-slant - (if modus-operandi-theme-slanted-constructs 'italic 'normal)) - (modus-theme-variable-pitch - (if modus-operandi-theme-variable-pitch-headings 'variable-pitch 'default))) - ,@body))) - - - -;;; Faces - -(modus-operandi-theme-with-color-variables - (custom-theme-set-faces - 'modus-operandi -;;;; custom faces - ;; these bespoke faces are inherited by other constructs below -;;;;; subtle coloured backgrounds - `(modus-theme-subtle-red ((,class :background ,red-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-green ((,class :background ,green-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-yellow ((,class :background ,yellow-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-blue ((,class :background ,blue-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-magenta ((,class :background ,magenta-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-cyan ((,class :background ,cyan-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-neutral ((,class :background ,bg-inactive :foreground ,fg-inactive))) -;;;;; intense coloured backgrounds - `(modus-theme-intense-red ((,class :background ,red-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-green ((,class :background ,green-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-yellow ((,class :background ,yellow-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-blue ((,class :background ,blue-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-magenta ((,class :background ,magenta-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-cyan ((,class :background ,cyan-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-neutral ((,class :background ,bg-active :foreground ,fg-main))) -;;;;; refined background and foreground combinations - ;; general purpose styles that use an accented foreground against an - ;; accented background - `(modus-theme-refine-red ((,class :background ,red-refine-bg :foreground ,red-refine-fg))) - `(modus-theme-refine-green ((,class :background ,green-refine-bg :foreground ,green-refine-fg))) - `(modus-theme-refine-yellow ((,class :background ,yellow-refine-bg :foreground ,yellow-refine-fg))) - `(modus-theme-refine-blue ((,class :background ,blue-refine-bg :foreground ,blue-refine-fg))) - `(modus-theme-refine-magenta ((,class :background ,magenta-refine-bg :foreground ,magenta-refine-fg))) - `(modus-theme-refine-cyan ((,class :background ,cyan-refine-bg :foreground ,cyan-refine-fg))) -;;;;; "active" combinations, mostly for use on the mode line - `(modus-theme-active-red ((,class :background ,red-active :foreground ,bg-active))) - `(modus-theme-active-green ((,class :background ,green-active :foreground ,bg-active))) - `(modus-theme-active-yellow ((,class :background ,yellow-active :foreground ,bg-active))) - `(modus-theme-active-blue ((,class :background ,blue-active :foreground ,bg-active))) - `(modus-theme-active-magenta ((,class :background ,magenta-active :foreground ,bg-active))) - `(modus-theme-active-cyan ((,class :background ,cyan-active :foreground ,bg-active))) -;;;;; nuanced backgrounds - ;; useful for adding an accented background that is suitable for all - ;; main foreground colours (intended for use in Org source blocks) - `(modus-theme-nuanced-red ((,class :background ,red-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(modus-theme-nuanced-green ((,class :background ,green-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(modus-theme-nuanced-yellow ((,class :background ,yellow-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(modus-theme-nuanced-blue ((,class :background ,blue-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(modus-theme-nuanced-magenta ((,class :background ,magenta-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(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-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 - ;; a greyscale value than an accented one - `(modus-theme-special-cold ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) - `(modus-theme-special-mild ((,class :background ,bg-special-mild :foreground ,fg-special-mild))) - `(modus-theme-special-warm ((,class :background ,bg-special-warm :foreground ,fg-special-warm))) - `(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 ,@(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-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-hl-line-intense bg-hl-line) - (and (>= emacs-major-version 27) '(:extend t))))) -;;;; standard faces -;;;;; absolute essentials - `(default ((,class :background ,bg-main :foreground ,fg-main))) - `(cursor ((,class :background ,fg-main))) - `(fringe ((,class ,@(modus-operandi-theme-fringe bg-inactive bg-active) - :foreground ,fg-main))) - `(vertical-border ((,class :foreground ,fg-window-divider-inner))) -;;;;; basic and/or ungrouped styles - ;; Modify the `bold' face to change the weight of all "bold" elements - ;; defined by the theme. You need a typeface that supports a - ;; multitude of heavier weights than the regular one and then you - ;; must specify the exact name of the one you wish to apply. Example - ;; for your init.el: - ;; - ;; (set-face-attribute 'bold nil :weight 'semibold) - `(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)))) - `(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)))) - `(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))) - `(rectangle-preview ((,class :inherit modus-theme-special-mild))) - `(region ((,class :background ,bg-region :foreground ,fg-main))) - `(secondary-selection ((,class :inherit modus-theme-special-cold))) - `(shadow ((,class :foreground ,fg-alt))) - `(success ((,class :inherit bold :foreground ,green))) - `(trailing-whitespace ((,class :background ,red-intense-bg))) - `(warning ((,class :inherit bold :foreground ,yellow))) -;;;;; buttons, links, widgets - `(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))) - `(widget-documentation ((,class :foreground ,green))) - `(widget-field ((,class :background ,bg-alt :foreground ,fg-dim))) - `(widget-inactive ((,class :background ,bg-inactive :foreground ,fg-inactive))) - `(widget-single-line-field ((,class :inherit widget-field))) -;;;;; ag - `(ag-hit-face ((,class :foreground ,fg-special-cold))) - `(ag-match-face ((,class :inherit modus-theme-special-calm))) -;;;;; alert - `(alert-high-face ((,class :inherit bold :foreground ,red-alt))) - `(alert-low-face ((,class :foreground ,fg-special-mild))) - `(alert-moderate-face ((,class :inherit bold :foreground ,yellow))) - `(alert-trivial-face ((,class :foreground ,fg-special-calm))) - `(alert-urgent-face ((,class :inherit bold :foreground ,red-intense))) -;;;;; all-the-icons - `(all-the-icons-blue ((,class :foreground ,blue))) - `(all-the-icons-blue-alt ((,class :foreground ,blue-alt))) - `(all-the-icons-cyan ((,class :foreground ,cyan))) - `(all-the-icons-cyan-alt ((,class :foreground ,cyan-alt))) - `(all-the-icons-dblue ((,class :foreground ,blue-alt-other))) - `(all-the-icons-dcyan ((,class :foreground ,cyan-alt-other))) - `(all-the-icons-dgreen ((,class :foreground ,green-alt-other))) - `(all-the-icons-dired-dir-face ((,class :foreground ,blue))) - `(all-the-icons-dmaroon ((,class :foreground ,magenta-alt-other))) - `(all-the-icons-dorange ((,class :foreground ,red-alt-other))) - `(all-the-icons-dpink ((,class :foreground ,magenta))) - `(all-the-icons-dpurple ((,class :foreground ,magenta-alt))) - `(all-the-icons-dred ((,class :foreground ,red))) - `(all-the-icons-dsilver ((,class :foreground ,fg-special-cold))) - `(all-the-icons-dyellow ((,class :foreground ,yellow))) - `(all-the-icons-green ((,class :foreground ,green))) - `(all-the-icons-lblue ((,class :foreground ,blue-refine-fg))) - `(all-the-icons-lcyan ((,class :foreground ,cyan-refine-fg))) - `(all-the-icons-lgreen ((,class :foreground ,green-refine-fg))) - `(all-the-icons-lmaroon ((,class :foreground ,magenta-refine-fg))) - `(all-the-icons-lorange ((,class :foreground ,red-refine-fg))) - `(all-the-icons-lpink ((,class :foreground ,magenta-refine-fg))) - `(all-the-icons-lpurple ((,class :foreground ,magenta-refine-fg))) - `(all-the-icons-lred ((,class :foreground ,red-refine-fg))) - `(all-the-icons-lsilver ((,class :foreground ,fg-special-cold))) - `(all-the-icons-lyellow ((,class :foreground ,yellow-refine-fg))) - `(all-the-icons-maroon ((,class :foreground ,magenta))) - `(all-the-icons-orange ((,class :foreground ,red-alt))) - `(all-the-icons-pink ((,class :foreground ,magenta))) - `(all-the-icons-purple ((,class :foreground ,magenta-alt))) - `(all-the-icons-purple-alt ((,class :foreground ,magenta-alt-other))) - `(all-the-icons-red ((,class :foreground ,red))) - `(all-the-icons-red-alt ((,class :foreground ,red-alt))) - `(all-the-icons-silver ((,class :foreground ,fg-special-cold))) - `(all-the-icons-yellow ((,class :foreground ,yellow))) -;;;;; annotate - `(annotate-annotation ((,class :inherit modus-theme-subtle-blue))) - `(annotate-annotation-secondary ((,class :inherit modus-theme-subtle-green))) - `(annotate-highlight ((,class :background ,blue-nuanced-bg :underline ,blue-intense))) - `(annotate-highlight-secondary ((,class :background ,green-nuanced-bg :underline ,green-intense))) -;;;;; anzu - `(anzu-match-1 ((,class :inherit modus-theme-subtle-cyan))) - `(anzu-match-2 ((,class :inherit modus-theme-subtle-green))) - `(anzu-match-3 ((,class :inherit modus-theme-subtle-yellow))) - `(anzu-mode-line ((,class :inherit bold :foreground ,green-active))) - `(anzu-mode-line-no-match ((,class :inherit bold :foreground ,red-active))) - `(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 :inherit button :foreground ,magenta-alt-other))) - `(apropos-keybinding ((,class :inherit bold :foreground ,cyan))) - `(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-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))) - `(apt-sources-list-suite ((,class :foreground ,green))) - `(apt-sources-list-type ((,class :foreground ,magenta))) - `(apt-sources-list-uri ((,class :foreground ,blue))) -;;;;; artbollocks-mode - `(artbollocks-face ((,class :foreground ,cyan-nuanced :underline ,fg-lang-note))) - `(artbollocks-lexical-illusions-face ((,class :background ,bg-alt :foreground ,red-alt :underline t))) - `(artbollocks-passive-voice-face ((,class :foreground ,yellow-nuanced :underline ,fg-lang-warning))) - `(artbollocks-weasel-words-face ((,class :foreground ,red-nuanced :underline ,fg-lang-error))) -;;;;; auctex and Tex - `(font-latex-bold-face ((,class :inherit bold :foreground ,fg-special-calm))) - `(font-latex-doctex-documentation-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(font-latex-doctex-preprocessor-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,red-alt-other))) - `(font-latex-italic-face ((,class :foreground ,fg-special-calm :slant italic))) - `(font-latex-math-face ((,class :foreground ,cyan-alt-other))) - `(font-latex-script-char-face ((,class :foreground ,cyan-alt-other))) - `(font-latex-sectioning-0-face ((,class :inherit ,modus-theme-variable-pitch :foreground ,blue-nuanced))) - `(font-latex-sectioning-1-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,blue-nuanced))) - `(font-latex-sectioning-2-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,blue-nuanced))) - `(font-latex-sectioning-3-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,blue-nuanced))) - `(font-latex-sectioning-4-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,blue-nuanced))) - `(font-latex-sectioning-5-face ((,class :inherit ,modus-theme-variable-pitch :foreground ,blue-nuanced))) - `(font-latex-sedate-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-alt-other))) - `(font-latex-slide-title-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,cyan-nuanced - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))) - `(font-latex-string-face ((,class :foreground ,blue-alt))) - `(font-latex-subscript-face ((,class :height 0.95))) - `(font-latex-superscript-face ((,class :height 0.95))) - `(font-latex-verbatim-face ((,class :background ,bg-dim :foreground ,fg-special-mild))) - `(font-latex-warning-face ((,class :foreground ,yellow-alt-other))) - `(tex-match ((,class :foreground ,blue-alt-other))) - `(tex-verbatim ((,class :background ,bg-dim :foreground ,fg-special-mild))) - `(texinfo-heading ((,class :foreground ,magenta))) - `(TeX-error-description-error ((,class :inherit bold :foreground ,red))) - `(TeX-error-description-help ((,class :foreground ,blue))) - `(TeX-error-description-tex-said ((,class :foreground ,blue))) - `(TeX-error-description-warning ((,class :inherit bold :foreground ,yellow))) -;;;;; auto-dim-other-buffers - `(auto-dim-other-buffers-face ((,class :background ,bg-alt))) -;;;;; avy - `(avy-background-face ((,class :background ,bg-dim :foreground ,fg-dim))) - `(avy-goto-char-timer-face ((,class :inherit (modus-theme-intense-yellow bold)))) - `(avy-lead-face ((,class :inherit (modus-theme-intense-magenta bold)))) - `(avy-lead-face-0 ((,class :inherit (modus-theme-intense-blue bold)))) - `(avy-lead-face-1 ((,class :inherit (modus-theme-intense-red bold)))) - `(avy-lead-face-2 ((,class :inherit (modus-theme-intense-green bold)))) -;;;;; aw (ace-window) - `(aw-background-face ((,class :background ,bg-dim :foreground ,fg-dim))) - `(aw-key-face ((,class :inherit bold :foreground ,blue-intense))) - `(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))))) - `(bm-fringe-face ((,class :inherit modus-theme-fringe-yellow))) - `(bm-fringe-persistent-face ((,class :inherit modus-theme-fringe-blue))) - `(bm-persistent-face ((,class :inherit modus-theme-intense-blue - ,@(and (>= emacs-major-version 27) '(:extend t))))) -;;;;; bongo - `(bongo-album-title ((,class :foreground ,cyan-active))) - `(bongo-artist ((,class :foreground ,magenta-active))) - `(bongo-currently-playing-track ((,class :inherit bold))) - `(bongo-elapsed-track-part ((,class :inherit modus-theme-subtle-magenta :underline t))) - `(bongo-filled-seek-bar ((,class :background ,blue-subtle-bg :foreground ,fg-main))) - `(bongo-marked-track ((,class :foreground ,fg-mark-alt))) - `(bongo-marked-track-line ((,class :background ,bg-mark-alt))) - `(bongo-played-track ((,class :foreground ,fg-unfocused :strike-through t))) - `(bongo-track-length ((,class :foreground ,blue-alt-other))) - `(bongo-track-title ((,class :foreground ,blue-active))) - `(bongo-unfilled-seek-bar ((,class :background ,blue-nuanced-bg :foreground ,fg-main))) -;;;;; boon - `(boon-modeline-cmd ((,class :inherit modus-theme-active-blue))) - `(boon-modeline-ins ((,class :inherit modus-theme-active-red))) - `(boon-modeline-off ((,class :inherit modus-theme-active-yellow))) - `(boon-modeline-spc ((,class :inherit modus-theme-active-green))) -;;;;; breakpoint (built-in gdb-mi.el) - `(breakpoint-disabled ((,class :foreground ,fg-alt))) - `(breakpoint-enabled ((,class :inherit bold :foreground ,red))) -;;;;; buffer-expose - `(buffer-expose-ace-char-face ((,class :inherit bold :foreground ,red-active))) - `(buffer-expose-mode-line-face ((,class :foreground ,cyan-active))) - `(buffer-expose-selected-face ((,class :inherit modus-theme-special-mild))) -;;;;; calendar and diary - `(calendar-month-header ((,class :inherit bold :foreground ,fg-main))) - `(calendar-today ((,class :underline t))) - `(calendar-weekday-header ((,class :foreground ,fg-dim))) - `(calendar-weekend-header ((,class :foreground ,fg-alt))) - `(diary ((,class :foreground ,cyan-alt-other))) - `(diary-anniversary ((,class :foreground ,red-alt-other))) - `(diary-time ((,class :foreground ,blue-alt))) - `(holiday ((,class :foreground ,magenta-alt))) -;;;;; calfw - `(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 :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 :foreground ,cyan-alt-other))) - `(cfw:face-select ((,class :inherit modus-theme-intense-blue))) - `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other))) - `(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch - :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))) - `(centaur-tabs-close-selected ((,class :inherit centaur-tabs-selected))) - `(centaur-tabs-close-unselected ((,class :inherit centaur-tabs-unselected))) - `(centaur-tabs-modified-marker-selected ((,class :inherit centaur-tabs-selected))) - `(centaur-tabs-modified-marker-unselected ((,class :inherit centaur-tabs-unselected))) - `(centaur-tabs-default ((,class :background ,bg-main :foreground ,bg-main))) - `(centaur-tabs-selected ((,class :inherit bold :background ,bg-tab-active :foreground ,fg-main))) - `(centaur-tabs-selected-modified ((,class :background ,bg-tab-active :foreground ,fg-main :slant italic))) - `(centaur-tabs-unselected ((,class :background ,bg-tab-inactive :foreground ,fg-dim))) - `(centaur-tabs-unselected-modified ((,class :background ,bg-tab-inactive :foreground ,fg-dim :slant italic))) -;;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log') - `(change-log-acknowledgment ((,class :foreground ,fg-alt))) - `(change-log-conditionals ((,class :foreground ,magenta-alt))) - `(change-log-date ((,class :foreground ,cyan-alt-other))) - `(change-log-email ((,class :foreground ,cyan))) - `(change-log-file ((,class :foreground ,blue))) - `(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 :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))) -;;;;; cider - `(cider-debug-code-overlay-face ((,class :background ,bg-alt))) - `(cider-debug-prompt-face ((,class :foreground ,magenta-alt :underline t))) - `(cider-deprecated-face ((,class :inherit modus-theme-refine-yellow))) - `(cider-docview-emphasis-face ((,class :foreground ,fg-special-cold :slant italic))) - `(cider-docview-literal-face ((,class :foreground ,blue-alt))) - `(cider-docview-strong-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(cider-docview-table-border-face ((,class :foreground ,fg-alt))) - `(cider-enlightened-face ((,class :box (:line-width -1 :color ,yellow-alt :style nil) :background ,bg-dim))) - `(cider-enlightened-local-face ((,class :inherit bold :foreground ,yellow-alt-other))) - `(cider-error-highlight-face ((,class :foreground ,red :underline t))) - `(cider-fragile-button-face ((,class :box (:line-width 3 :color ,fg-alt :style released-button) :foreground ,yellow))) - `(cider-fringe-good-face ((,class :foreground ,green-active))) - `(cider-instrumented-face ((,class :box (:line-width -1 :color ,red :style nil) :background ,bg-dim))) - `(cider-reader-conditional-face ((,class :foreground ,fg-special-warm :slant italic))) - `(cider-repl-input-face ((,class :inherit bold))) - `(cider-repl-prompt-face ((,class :foreground ,cyan-alt-other))) - `(cider-repl-stderr-face ((,class :inherit bold :foreground ,red))) - `(cider-repl-stdout-face ((,class :foreground ,blue))) - `(cider-result-overlay-face ((,class :box (:line-width -1 :color ,blue :style nil) :background ,bg-dim))) - `(cider-stacktrace-error-class-face ((,class :inherit bold :foreground ,red))) - `(cider-stacktrace-error-message-face ((,class :foreground ,red-alt-other :slant italic))) - `(cider-stacktrace-face ((,class :foreground ,fg-main))) - `(cider-stacktrace-filter-active-face ((,class :foreground ,cyan-alt :underline t))) - `(cider-stacktrace-filter-inactive-face ((,class :foreground ,cyan-alt))) - `(cider-stacktrace-fn-face ((,class :inherit bold :foreground ,fg-main))) - `(cider-stacktrace-ns-face ((,class :foreground ,fg-alt :slant italic))) - `(cider-stacktrace-promoted-button-face ((,class :box (:line-width 3 :color ,fg-alt :style released-button) :foreground ,red))) - `(cider-stacktrace-suppressed-button-face ((,class :box (:line-width 3 :color ,fg-alt :style pressed-button) - :background ,bg-alt :foreground ,fg-alt))) - `(cider-test-error-face ((,class :inherit modus-theme-subtle-red))) - `(cider-test-failure-face ((,class :inherit (modus-theme-intense-red bold)))) - `(cider-test-success-face ((,class :inherit modus-theme-intense-green))) - `(cider-traced-face ((,class :box (:line-width -1 :color ,cyan :style nil) :background ,bg-dim))) - `(cider-warning-highlight-face ((,class :foreground ,yellow :underline t))) -;;;;; circe (and lui) - `(circe-fool-face ((,class :foreground ,fg-alt))) - `(circe-highlight-nick-face ((,class :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 :inherit button :foreground ,blue))) - `(lui-highlight-face ((,class :foreground ,magenta-alt))) - `(lui-time-stamp-face ((,class :foreground ,blue-nuanced))) -;;;;; color-rg - `(color-rg-font-lock-column-number ((,class :foreground ,magenta-alt-other))) - `(color-rg-font-lock-command ((,class :inherit bold :foreground ,fg-main))) - `(color-rg-font-lock-file ((,class :inherit bold :foreground ,fg-special-cold))) - `(color-rg-font-lock-flash ((,class :inherit modus-theme-intense-blue))) - `(color-rg-font-lock-function-location ((,class :inherit modus-theme-special-calm))) - `(color-rg-font-lock-header-line-directory ((,class :foreground ,blue-active))) - `(color-rg-font-lock-header-line-edit-mode ((,class :foreground ,magenta-active))) - `(color-rg-font-lock-header-line-keyword ((,class :foreground ,green-active))) - `(color-rg-font-lock-header-line-text ((,class :foreground ,fg-active))) - `(color-rg-font-lock-line-number ((,class :foreground ,fg-special-warm))) - `(color-rg-font-lock-mark-changed ((,class :inherit bold :foreground ,blue))) - `(color-rg-font-lock-mark-deleted ((,class :inherit bold :foreground ,red))) - `(color-rg-font-lock-match ((,class :inherit modus-theme-special-calm))) - `(color-rg-font-lock-position-splitter ((,class :foreground ,fg-alt))) -;;;;; column-enforce-mode - `(column-enforce-face ((,class :inherit modus-theme-refine-yellow))) -;;;;; company-mode - `(company-echo-common ((,class :foreground ,magenta-alt-other))) - `(company-preview ((,class :background ,bg-dim :foreground ,fg-dim))) - `(company-preview-common ((,class :foreground ,blue-alt))) - `(company-preview-search ((,class :inherit modus-theme-special-calm))) - `(company-scrollbar-bg ((,class :background ,bg-active))) - `(company-scrollbar-fg ((,class :background ,fg-active))) - `(company-template-field ((,class :inherit modus-theme-intense-magenta))) - `(company-tooltip ((,class :background ,bg-alt :foreground ,fg-alt))) - `(company-tooltip-annotation ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(company-tooltip-annotation-selection ((,class :inherit bold :foreground ,fg-main))) - `(company-tooltip-common ((,class :inherit bold :foreground ,blue-alt))) - `(company-tooltip-common-selection ((,class :foreground ,fg-main))) - `(company-tooltip-mouse ((,class :inherit modus-theme-intense-blue))) - `(company-tooltip-search ((,class :inherit (modus-theme-refine-cyan bold)))) - `(company-tooltip-search-selection ((,class :inherit (modus-theme-intense-green bold) :underline t))) - `(company-tooltip-selection ((,class :inherit (modus-theme-subtle-cyan bold)))) -;;;;; company-posframe - `(company-posframe-active-backend-name ((,class :inherit bold :background ,bg-active :foreground ,blue-active))) - `(company-posframe-inactive-backend-name ((,class :background ,bg-active :foreground ,fg-active))) - `(company-posframe-metadata ((,class :background ,bg-inactive :foreground ,fg-inactive))) -;;;;; compilation feedback - `(compilation-column-number ((,class :foreground ,magenta-alt-other))) - `(compilation-error ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,red))) - `(compilation-info ((,class :foreground ,fg-special-cold))) - `(compilation-line-number ((,class :foreground ,fg-special-warm))) - `(compilation-mode-line-exit ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,blue-active))) - `(compilation-mode-line-fail ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,red-active))) - `(compilation-mode-line-run ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-active))) - `(compilation-warning ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,yellow))) -;;;;; completions - `(completions-annotations ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(completions-common-part ((,class ,@(modus-operandi-theme-standard-completions - blue-alt blue-nuanced-bg - cyan-refine-bg cyan-refine-fg)))) - `(completions-first-difference ((,class :inherit bold - ,@(modus-operandi-theme-standard-completions - 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))) - `(counsel-key-binding ((,class :inherit bold :foreground ,blue-alt-other))) - `(counsel-outline-1 ((,class :inherit outline-1))) - `(counsel-outline-2 ((,class :inherit outline-2))) - `(counsel-outline-3 ((,class :inherit outline-3))) - `(counsel-outline-4 ((,class :inherit outline-4))) - `(counsel-outline-5 ((,class :inherit outline-5))) - `(counsel-outline-6 ((,class :inherit outline-6))) - `(counsel-outline-7 ((,class :inherit outline-7))) - `(counsel-outline-8 ((,class :inherit outline-8))) - `(counsel-outline-default ((,class :inherit bold :foreground ,green-alt-other))) - `(counsel-variable-documentation ((,class :foreground ,yellow-alt-other :slant ,modus-theme-slant))) -;;;;; counsel-css - `(counsel-css-selector-depth-face-1 ((,class :foreground ,blue))) - `(counsel-css-selector-depth-face-2 ((,class :foreground ,cyan))) - `(counsel-css-selector-depth-face-3 ((,class :foreground ,green))) - `(counsel-css-selector-depth-face-4 ((,class :foreground ,yellow))) - `(counsel-css-selector-depth-face-5 ((,class :foreground ,magenta))) - `(counsel-css-selector-depth-face-6 ((,class :foreground ,red))) -;;;;; counsel-notmuch - `(counsel-notmuch-count-face ((,class :foreground ,cyan))) - `(counsel-notmuch-date-face ((,class :foreground ,blue))) - `(counsel-notmuch-people-face ((,class :foreground ,magenta))) - `(counsel-notmuch-subject-face ((,class :foreground ,magenta-alt-other))) -;;;;; counsel-org-capture-string - `(counsel-org-capture-string-template-body-face ((,class :foreground ,fg-special-cold))) -;;;;; cov - `(cov-coverage-not-run-face ((,class :foreground ,red-intense))) - `(cov-coverage-run-face ((,class :foreground ,green-intense))) - `(cov-heavy-face ((,class :foreground ,magenta-intense))) - `(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 - `(ctrlf-highlight-active ((,class :inherit (modus-theme-intense-green bold)))) - `(ctrlf-highlight-line ((,class :inherit modus-theme-hl-line))) - `(ctrlf-highlight-passive ((,class :inherit modus-theme-refine-cyan))) -;;;;; custom (M-x customize) - `(custom-button ((,class :box (:line-width 2 :color nil :style released-button) - :background ,bg-active :foreground ,fg-main))) - `(custom-button-mouse ((,class :box (:line-width 2 :color nil :style released-button) - :background ,bg-active :foreground ,fg-active))) - `(custom-button-pressed ((,class :box (:line-width 2 :color nil :style pressed-button) - :background ,bg-active :foreground ,fg-main))) - `(custom-changed ((,class :inherit modus-theme-subtle-cyan))) - `(custom-comment ((,class :foreground ,fg-alt))) - `(custom-comment-tag ((,class :background ,bg-alt :foreground ,yellow-alt-other))) - `(custom-face-tag ((,class :inherit bold :foreground ,blue-intense))) - `(custom-group-tag ((,class :inherit bold :foreground ,green-intense))) - `(custom-group-tag-1 ((,class :inherit modus-theme-special-warm))) - `(custom-invalid ((,class :inherit (modus-theme-intense-red bold)))) - `(custom-modified ((,class :inherit modus-theme-subtle-cyan))) - `(custom-rogue ((,class :inherit modus-theme-refine-magenta))) - `(custom-set ((,class :foreground ,blue-alt))) - `(custom-state ((,class :foreground ,cyan-alt-other))) - `(custom-themed ((,class :inherit modus-theme-subtle-blue))) - `(custom-variable-tag ((,class :inherit bold :foreground ,cyan))) -;;;;; dap-mode - `(dap-mouse-eval-thing-face ((,class :box (:line-width -1 :color ,blue-active :style nil) - :background ,bg-active :foreground ,fg-main))) - `(dap-result-overlay-face ((,class :box (:line-width -1 :color ,bg-active :style nil) - :background ,bg-active :foreground ,fg-main))) - `(dap-ui-breakpoint-verified-fringe ((,class :inherit bold :foreground ,green-active))) - `(dap-ui-compile-errline ((,class :inherit bold :foreground ,red-intense))) - `(dap-ui-locals-scope-face ((,class :inherit bold :foreground ,magenta :underline t))) - `(dap-ui-locals-variable-face ((,class :inherit bold :foreground ,cyan))) - `(dap-ui-locals-variable-leaf-face ((,class :foreground ,cyan-alt-other :slant italic))) - `(dap-ui-marker-face ((,class :inherit modus-theme-subtle-blue))) - `(dap-ui-sessions-stack-frame-face ((,class :inherit bold :foreground ,magenta-alt))) - `(dap-ui-sessions-terminated-active-face ((,class :inherit bold :foreground ,fg-alt))) - `(dap-ui-sessions-terminated-face ((,class :foreground ,fg-alt))) -;;;;; dashboard (emacs-dashboard) - `(dashboard-banner-logo-title ((,class :inherit bold :foreground ,fg-special-cold))) - `(dashboard-footer ((,class :inherit bold :foreground ,fg-special-mild))) - `(dashboard-heading ((,class :inherit bold :foreground ,fg-special-warm))) - `(dashboard-navigator ((,class :foreground ,cyan-alt-other))) - `(dashboard-text-banner ((,class :foreground ,fg-dim))) -;;;;; deadgrep - `(deadgrep-filename-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(deadgrep-match-face ((,class :inherit modus-theme-special-calm))) - `(deadgrep-meta-face ((,class :foreground ,fg-alt))) - `(deadgrep-regexp-metachar-face ((,class :inherit bold :foreground ,yellow-intense))) - `(deadgrep-search-term-face ((,class :inherit bold :foreground ,green-intense))) -;;;;; debbugs - `(debbugs-gnu-archived ((,class :inverse-video t))) - `(debbugs-gnu-done ((,class :foreground ,fg-alt))) - `(debbugs-gnu-forwarded ((,class :foreground ,fg-special-warm))) - `(debbugs-gnu-handled ((,class :foreground ,green))) - `(debbugs-gnu-new ((,class :foreground ,red))) - `(debbugs-gnu-pending ((,class :foreground ,cyan))) - `(debbugs-gnu-stale-1 ((,class :foreground ,yellow-nuanced))) - `(debbugs-gnu-stale-2 ((,class :foreground ,yellow))) - `(debbugs-gnu-stale-3 ((,class :foreground ,yellow-alt))) - `(debbugs-gnu-stale-4 ((,class :foreground ,yellow-alt-other))) - `(debbugs-gnu-stale-5 ((,class :foreground ,red-alt))) - `(debbugs-gnu-tagged ((,class :foreground ,magenta-alt))) -;;;;; define-word - `(define-word-face-1 ((,class :foreground ,yellow))) - `(define-word-face-2 ((,class :foreground ,fg-main))) -;;;;; deft - `(deft-filter-string-error-face ((,class :inherit modus-theme-refine-red))) - `(deft-filter-string-face ((,class :foreground ,green-intense))) - `(deft-header-face ((,class :inherit bold :foreground ,fg-special-warm))) - `(deft-separator-face ((,class :foreground ,fg-alt))) - `(deft-summary-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(deft-time-face ((,class :foreground ,fg-special-cold))) - `(deft-title-face ((,class :inherit bold :foreground ,fg-main))) -;;;;; dictionary - `(dictionary-button-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(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 - `(diff-hl-change ((,class :inherit modus-theme-fringe-yellow))) - `(diff-hl-delete ((,class :inherit modus-theme-fringe-red))) - `(diff-hl-dired-change ((,class :inherit diff-hl-change))) - `(diff-hl-dired-delete ((,class :inherit diff-hl-delete))) - `(diff-hl-dired-ignored ((,class :inherit dired-ignored))) - `(diff-hl-dired-insert ((,class :inherit diff-hl-insert))) - `(diff-hl-dired-unknown ((,class :inherit dired-ignored))) - `(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 :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 :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 :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-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 :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))) - `(dired-async-message ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,green-active))) - `(dired-async-mode-message ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,cyan-active))) -;;;;; dired-git - `(dired-git-branch-else ((,class :inherit bold :foreground ,magenta-alt))) - `(dired-git-branch-master ((,class :inherit bold :foreground ,magenta-alt-other))) -;;;;; dired-git-info - `(dgi-commit-message-face ((,class :foreground ,fg-special-mild))) -;;;;; dired-narrow - `(dired-narrow-blink ((,class :inherit (modus-theme-subtle-cyan bold)))) -;;;;; dired-subtree - ;; remove background from dired-subtree, else it breaks - ;; dired-{flagged,marked} and any other face that sets a background - ;; such as hl-line - `(dired-subtree-depth-1-face ((,class :background nil))) - `(dired-subtree-depth-2-face ((,class :background nil))) - `(dired-subtree-depth-3-face ((,class :background nil))) - `(dired-subtree-depth-4-face ((,class :background nil))) - `(dired-subtree-depth-5-face ((,class :background nil))) - `(dired-subtree-depth-6-face ((,class :background nil))) -;;;;; diredfl - `(diredfl-autofile-name ((,class :inherit modus-theme-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-pseudo-header))) - `(diredfl-dir-name ((,class :inherit dired-directory))) - `(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 ,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-alt))) - `(diredfl-link-priv ((,class :foreground ,blue-alt-other))) - `(diredfl-no-priv ((,class :foreground ,fg-alt))) - `(diredfl-number ((,class :foreground ,cyan-alt))) - `(diredfl-other-priv ((,class :foreground ,yellow))) - `(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))) -;;;;; 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 :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 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))) - `(doom-modeline-buffer-file ((,class :inherit bold :foreground ,fg-active))) - `(doom-modeline-buffer-major-mode ((,class :inherit bold :foreground ,cyan-active))) - `(doom-modeline-buffer-minor-mode ((,class :foreground ,fg-inactive))) - `(doom-modeline-buffer-modified ((,class :inherit bold :foreground ,magenta-active))) - `(doom-modeline-buffer-path ((,class :inherit bold :foreground ,fg-active))) - `(doom-modeline-debug ((,class :inherit bold :foreground ,yellow-active))) - `(doom-modeline-debug-visual ((,class :inherit bold :foreground ,red-active))) - `(doom-modeline-evil-emacs-state ((,class :inherit bold :foreground ,magenta-active))) - `(doom-modeline-evil-insert-state ((,class :inherit bold :foreground ,green-active))) - `(doom-modeline-evil-motion-state ((,class :inherit bold :foreground ,fg-inactive))) - `(doom-modeline-evil-normal-state ((,class :inherit bold :foreground ,fg-active))) - `(doom-modeline-evil-operator-state ((,class :inherit bold :foreground ,blue-active))) - `(doom-modeline-evil-replace-state ((,class :inherit bold :foreground ,red-active))) - `(doom-modeline-evil-visual-state ((,class :inherit bold :foreground ,cyan-active))) - `(doom-modeline-highlight ((,class :inherit bold :foreground ,blue-active))) - `(doom-modeline-host ((,class :slant italic))) - `(doom-modeline-info ((,class :foreground ,green-active))) - `(doom-modeline-lsp-error ((,class :inherit bold :foreground ,red-active))) - `(doom-modeline-lsp-success ((,class :inherit bold :foreground ,green-active))) - `(doom-modeline-lsp-warning ((,class :inherit bold :foreground ,yellow-active))) - `(doom-modeline-panel ((,class :inherit modus-theme-active-blue))) - `(doom-modeline-persp-buffer-not-in-persp ((,class :foreground ,yellow-active :slant italic))) - `(doom-modeline-persp-name ((,class :foreground ,fg-active))) - `(doom-modeline-project-dir ((,class :inherit bold :foreground ,blue-active))) - `(doom-modeline-project-parent-dir ((,class :foreground ,blue-active))) - `(doom-modeline-project-root-dir ((,class :foreground ,fg-active))) - `(doom-modeline-unread-number ((,class :foreground ,fg-active :slant italic))) - `(doom-modeline-urgent ((,class :inherit bold :foreground ,red-active))) - `(doom-modeline-warning ((,class :inherit bold :foreground ,yellow-active))) -;;;;; dynamic-ruler - `(dynamic-ruler-negative-face ((,class :inherit modus-theme-intense-neutral))) - `(dynamic-ruler-positive-face ((,class :inherit modus-theme-intense-yellow))) -;;;;; easy-jekyll - `(easy-jekyll-help-face ((,class :background ,bg-dim :foreground ,cyan-alt-other))) -;;;;; easy-kill - `(easy-kill-origin ((,class :inherit modus-theme-subtle-red))) - `(easy-kill-selection ((,class :inherit modus-theme-subtle-yellow))) -;;;;; ebdb - `(ebdb-address-default ((,class :foreground ,fg-main))) - `(ebdb-db-char ((,class :foreground ,fg-special-cold))) - `(ebdb-defunct ((,class :foreground ,fg-alt))) - `(ebdb-field-hidden ((,class :foreground ,magenta))) - `(ebdb-field-url ((,class :foreground ,blue))) - `(ebdb-label ((,class :foreground ,cyan-alt-other))) - `(ebdb-mail-default ((,class :foreground ,fg-main))) - `(ebdb-mail-primary ((,class :foreground ,blue-alt))) - `(ebdb-marked ((,class :background ,cyan-intense-bg))) - `(ebdb-organization-name ((,class :foreground ,fg-special-calm))) - `(ebdb-person-name ((,class :foreground ,magenta-alt-other))) - `(ebdb-phone-default ((,class :foreground ,fg-special-warm))) - `(ebdb-role-defunct ((,class :foreground ,fg-alt))) - `(eieio-custom-slot-tag-face ((,class :foreground ,red-alt))) -;;;;; ediff - ;; 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))) - `(ediff-even-diff-C ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2))) - `(ediff-fine-diff-A ((,class :background ,bg-diff-focus-removed :foreground ,fg-diff-focus-removed))) - `(ediff-fine-diff-Ancestor ((,class :inherit modus-theme-refine-cyan))) - `(ediff-fine-diff-B ((,class :background ,bg-diff-focus-added :foreground ,fg-diff-focus-added))) - `(ediff-fine-diff-C ((,class :background ,bg-diff-focus-changed :foreground ,fg-diff-focus-changed))) - `(ediff-odd-diff-A ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2))) - `(ediff-odd-diff-Ancestor ((,class :background ,bg-diff-neutral-0 :foreground ,fg-diff-neutral-0))) - `(ediff-odd-diff-B ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2))) - `(ediff-odd-diff-C ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1))) -;;;;; eglot - `(eglot-mode-line ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-active))) -;;;;; el-search - `(el-search-highlight-in-prompt-face ((,class :inherit bold :foreground ,magenta-alt))) - `(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))) -;;;;; elfeed - `(elfeed-log-date-face ((,class :foreground ,cyan-alt))) - `(elfeed-log-debug-level-face ((,class :foreground ,magenta))) - `(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 ,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))) - `(elfeed-score-error-level-face ((,class :foreground ,red))) - `(elfeed-score-info-level-face ((,class :foreground ,cyan))) - `(elfeed-score-warn-level-face ((,class :foreground ,yellow))) -;;;;; emms - `(emms-playlist-track-face ((,class :foreground ,blue))) - `(emms-playlist-selected-face ((,class :inherit bold :foreground ,magenta))) -;;;;; enhanced-ruby-mode - `(enh-ruby-heredoc-delimiter-face ((,class :foreground ,blue-alt-other))) - `(enh-ruby-op-face ((,class :foreground ,fg-main))) - `(enh-ruby-regexp-delimiter-face ((,class :foreground ,green))) - `(enh-ruby-regexp-face ((,class :foreground ,magenta))) - `(enh-ruby-string-delimiter-face ((,class :foreground ,blue-alt))) - `(erm-syn-errline ((,class :foreground ,red :underline t))) - `(erm-syn-warnline ((,class :foreground ,yellow :underline t))) -;;;;; epa - `(epa-field-body ((,class :foreground ,fg-main))) - `(epa-field-name ((,class :inherit bold :foreground ,fg-dim))) - `(epa-mark ((,class :inherit bold :foreground ,magenta))) - `(epa-string ((,class :foreground ,blue-alt))) - `(epa-validity-disabled ((,class :inherit modus-theme-refine-red))) - `(epa-validity-high ((,class :inherit bold :foreground ,green-alt-other))) - `(epa-validity-low ((,class :foreground ,fg-alt))) - `(epa-validity-medium ((,class :foreground ,green-alt))) -;;;;; equake - `(equake-buffer-face ((,class :background ,bg-main :foreground ,fg-main))) - `(equake-shell-type-eshell ((,class :background ,bg-inactive :foreground ,green-active))) - `(equake-shell-type-rash ((,class :background ,bg-inactive :foreground ,red-active))) - `(equake-shell-type-shell ((,class :background ,bg-inactive :foreground ,cyan-active))) - `(equake-shell-type-term ((,class :background ,bg-inactive :foreground ,yellow-active))) - `(equake-shell-type-vterm ((,class :background ,bg-inactive :foreground ,magenta-active))) - `(equake-tab-active ((,class :background ,fg-alt :foreground ,bg-alt))) - `(equake-tab-inactive ((,class :foreground ,fg-inactive))) -;;;;; erc - `(erc-action-face ((,class :inherit bold :foreground ,cyan))) - `(erc-bold-face ((,class :inherit bold))) - `(erc-button ((,class :inherit button))) - `(erc-command-indicator-face ((,class :inherit bold :foreground ,cyan-alt))) - `(erc-current-nick-face ((,class :foreground ,magenta-alt-other))) - `(erc-dangerous-host-face ((,class :inherit modus-theme-intense-red))) - `(erc-direct-msg-face ((,class :foreground ,magenta))) - `(erc-error-face ((,class :inherit bold :foreground ,red))) - `(erc-fool-face ((,class :foreground ,fg-inactive))) - `(erc-header-line ((,class :background ,bg-header :foreground ,fg-header))) - `(erc-input-face ((,class :foreground ,fg-special-calm))) - `(erc-inverse-face ((,class :inherit erc-default-face :inverse-video t))) - `(erc-keyword-face ((,class :inherit bold :foreground ,magenta-alt))) - `(erc-my-nick-face ((,class :inherit bold :foreground ,magenta))) - `(erc-my-nick-prefix-face ((,class :inherit erc-my-nick-face))) - `(erc-nick-default-face ((,class :inherit bold :foreground ,blue))) - `(erc-nick-msg-face ((,class :inherit bold :foreground ,green))) - `(erc-nick-prefix-face ((,class :inherit erc-nick-default-face))) - `(erc-notice-face ((,class :foreground ,fg-unfocused))) - `(erc-pal-face ((,class :inherit bold :foreground ,red-alt))) - `(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))) -;;;;; ert - `(ert-test-result-expected ((,class :inherit modus-theme-intense-green))) - `(ert-test-result-unexpected ((,class :inherit modus-theme-intense-red))) -;;;;; eshell - `(eshell-ls-archive ((,class :inherit bold :foreground ,cyan-alt))) - `(eshell-ls-backup ((,class :foreground ,yellow-alt))) - `(eshell-ls-clutter ((,class :foreground ,red-alt))) - `(eshell-ls-directory ((,class :inherit bold :foreground ,blue-alt))) - `(eshell-ls-executable ((,class :foreground ,magenta-alt))) - `(eshell-ls-missing ((,class :inherit modus-theme-intense-red))) - `(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 :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)))) -;;;;; eshell-fringe-status - `(eshell-fringe-status-failure ((,class :foreground ,red))) - `(eshell-fringe-status-success ((,class :foreground ,green))) -;;;;; eshell-git-prompt - `(eshell-git-prompt-add-face ((,class :foreground ,fg-alt))) - `(eshell-git-prompt-branch-face ((,class :foreground ,fg-alt))) - `(eshell-git-prompt-directory-face ((,class :foreground ,cyan))) - `(eshell-git-prompt-exit-fail-face ((,class :foreground ,red))) - `(eshell-git-prompt-exit-success-face ((,class :foreground ,green))) - `(eshell-git-prompt-modified-face ((,class :foreground ,yellow))) - `(eshell-git-prompt-powerline-clean-face ((,class :background ,green-refine-bg))) - `(eshell-git-prompt-powerline-dir-face ((,class :background ,blue-refine-bg))) - `(eshell-git-prompt-powerline-not-clean-face ((,class :background ,magenta-refine-bg))) - `(eshell-git-prompt-robyrussell-branch-face ((,class :foreground ,red))) - `(eshell-git-prompt-robyrussell-git-dirty-face ((,class :foreground ,yellow))) - `(eshell-git-prompt-robyrussell-git-face ((,class :foreground ,blue))) -;;;;; eshell-prompt-extras (epe) - `(epe-dir-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,blue))) - `(epe-git-dir-face ((,class :foreground ,red-alt-other))) - `(epe-git-face ((,class :foreground ,cyan-alt))) - `(epe-pipeline-delimiter-face ((,class :foreground ,green-alt))) - `(epe-pipeline-host-face ((,class :foreground ,blue))) - `(epe-pipeline-time-face ((,class :foreground ,fg-special-warm))) - `(epe-pipeline-user-face ((,class :foreground ,magenta))) - `(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))) - `(evil-ex-lazy-highlight ((,class :inherit modus-theme-refine-cyan))) - `(evil-ex-search ((,class :inherit modus-theme-intense-green))) - `(evil-ex-substitute-matches ((,class :inherit modus-theme-refine-yellow :underline t))) - `(evil-ex-substitute-replacement ((,class :inherit (modus-theme-intense-green bold)))) -;;;;; evil-goggles - `(evil-goggles-change-face ((,class :inherit modus-theme-refine-yellow))) - `(evil-goggles-commentary-face ((,class :inherit modus-theme-subtle-neutral :slant ,modus-theme-slant))) - `(evil-goggles-default-face ((,class :inherit modus-theme-subtle-neutral))) - `(evil-goggles-delete-face ((,class :inherit modus-theme-refine-red))) - `(evil-goggles-fill-and-move-face ((,class :inherit evil-goggles-default-face))) - `(evil-goggles-indent-face ((,class :inherit evil-goggles-default-face))) - `(evil-goggles-join-face ((,class :inherit modus-theme-subtle-green))) - `(evil-goggles-nerd-commenter-face ((,class :inherit evil-goggles-commentary-face))) - `(evil-goggles-paste-face ((,class :inherit modus-theme-subtle-cyan))) - `(evil-goggles-record-macro-face ((,class :inherit modus-theme-special-cold))) - `(evil-goggles-replace-with-register-face ((,class :inherit modus-theme-refine-magenta))) - `(evil-goggles-set-marker-face ((,class :inherit modus-theme-intense-magenta))) - `(evil-goggles-shift-face ((,class :inherit evil-goggles-default-face))) - `(evil-goggles-surround-face ((,class :inherit evil-goggles-default-face))) - `(evil-goggles-yank-face ((,class :inherit modus-theme-subtle-blue))) -;;;;; evil-visual-mark-mode - `(evil-visual-mark-face ((,class :inherit modus-theme-intense-magenta))) -;;;;; eww - `(eww-invalid-certificate ((,class :foreground ,red-active))) - `(eww-valid-certificate ((,class :foreground ,green-active))) - `(eww-form-checkbox ((,class :box (:line-width 1 :color ,fg-inactive :style released-button) :background ,bg-inactive :foreground ,fg-main))) - `(eww-form-file ((,class :box (:line-width 1 :color ,fg-inactive :style released-button) :background ,bg-active :foreground ,fg-main))) - `(eww-form-select ((,class :inherit eww-form-checkbox))) - `(eww-form-submit ((,class :inherit eww-form-file))) - `(eww-form-text ((,class :box (:line-width 1 :color ,fg-inactive :style none) :background ,bg-active :foreground ,fg-active))) - `(eww-form-textarea ((,class :background ,bg-alt :foreground ,fg-main))) -;;;;; eyebrowse - `(eyebrowse-mode-line-active ((,class :inherit bold :foreground ,blue-active))) -;;;;; fancy-dabbrev - `(fancy-dabbrev-menu-face ((,class :background ,bg-alt :foreground ,fg-alt))) - `(fancy-dabbrev-preview-face ((,class :foreground ,fg-alt :underline t))) - `(fancy-dabbrev-selection-face ((,class :inherit (modus-theme-intense-cyan bold)))) -;;;;; flycheck - `(flycheck-error - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-error :style wave)) - (,class :foreground ,fg-lang-error :underline t))) - `(flycheck-error-list-checker-name ((,class :foreground ,magenta-active))) - `(flycheck-error-list-column-number ((,class :foreground ,fg-special-cold))) - `(flycheck-error-list-error ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,red))) - `(flycheck-error-list-filename ((,class :foreground ,blue))) - `(flycheck-error-list-highlight ((,class :inherit modus-theme-hl-line))) - `(flycheck-error-list-id ((,class :foreground ,magenta-alt-other))) - `(flycheck-error-list-id-with-explainer ((,class :inherit flycheck-error-list-id :box t))) - `(flycheck-error-list-info ((,class :foreground ,cyan))) - `(flycheck-error-list-line-number ((,class :foreground ,fg-special-warm))) - `(flycheck-error-list-warning ((,class :foreground ,yellow))) - `(flycheck-fringe-error ((,class :inherit modus-theme-fringe-red))) - `(flycheck-fringe-info ((,class :inherit modus-theme-fringe-cyan))) - `(flycheck-fringe-warning ((,class :inherit modus-theme-fringe-yellow))) - `(flycheck-info - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-note :style wave)) - (,class :foreground ,fg-lang-note :underline t))) - `(flycheck-verify-select-checker ((,class :box (:line-width 1 :color nil :style released-button)))) - `(flycheck-warning - ((,(append '((supports :underline (:style wave))) class) - :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))) - `(flycheck-indicator-info ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,blue-active))) - `(flycheck-indicator-running ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-active))) - `(flycheck-indicator-success ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,green-active))) - `(flycheck-indicator-warning ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,yellow-active))) -;;;;; flycheck-posframe - `(flycheck-posframe-background-face ((,class :background ,bg-alt))) - `(flycheck-posframe-border-face ((,class :foreground ,fg-alt))) - `(flycheck-posframe-error-face ((,class :inherit bold :foreground ,red))) - `(flycheck-posframe-face ((,class :foreground ,fg-main :slant ,modus-theme-slant))) - `(flycheck-posframe-info-face ((,class :inherit bold :foreground ,cyan))) - `(flycheck-posframe-warning-face ((,class :inherit bold :foreground ,yellow))) -;;;;; flymake - `(flymake-error - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-error :style wave)) - (,class :foreground ,fg-lang-error :underline t))) - `(flymake-note - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-note :style wave)) - (,class :foreground ,fg-lang-note :underline t))) - `(flymake-warning - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-warning :style wave)) - (,class :foreground ,fg-lang-warning :underline t))) -;;;;; flyspell - `(flyspell-duplicate - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-warning :style wave)) - (,class :foreground ,fg-lang-warning :underline t))) - `(flyspell-incorrect - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-error :style wave)) - (,class :foreground ,fg-lang-error :underline t))) -;;;;; flyspell-correct - `(flyspell-correct-highlight-face ((,class :inherit modus-theme-refine-green))) -;;;;; flx - `(flx-highlight-face ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-intense-magenta - 'modus-theme-nuanced-magenta - magenta-alt - 'bold)))) -;;;;; freeze-it - `(freeze-it-show ((,class :background ,bg-dim :foreground ,fg-special-warm))) -;;;;; frog-menu - `(frog-menu-action-keybinding-face ((,class :foreground ,blue-alt-other))) - `(frog-menu-actions-face ((,class :foreground ,magenta))) - `(frog-menu-border ((,class :background ,bg-active))) - `(frog-menu-candidates-face ((,class :foreground ,fg-main))) - `(frog-menu-posframe-background-face ((,class :background ,bg-dim))) - `(frog-menu-prompt-face ((,class :foreground ,cyan))) -;;;;; focus - `(focus-unfocused ((,class :foreground ,fg-unfocused))) -;;;;; fold-this - `(fold-this-overlay ((,class :inherit modus-theme-special-mild))) -;;;;; font-lock - `(font-lock-builtin-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(font-lock-comment-delimiter-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(font-lock-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(font-lock-constant-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(font-lock-doc-face ((,class ,@(modus-operandi-theme-syntax-foreground - fg-special-cold cyan-alt-other-faint) - :slant ,modus-theme-slant))) - `(font-lock-function-name-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(font-lock-keyword-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(font-lock-negation-char-face ((,class ,@(modus-operandi-theme-syntax-foreground - yellow yellow-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(font-lock-preprocessor-face ((,class ,@(modus-operandi-theme-syntax-foreground - red-alt-other red-alt-other-faint)))) - `(font-lock-regexp-grouping-backslash ((,class :inherit bold :foreground ,fg-escape-char-backslash))) - `(font-lock-regexp-grouping-construct ((,class :inherit bold :foreground ,fg-escape-char-construct))) - `(font-lock-string-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt blue-alt-faint)))) - `(font-lock-type-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint)))) - `(font-lock-variable-name-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan cyan-faint)))) - `(font-lock-warning-face ((,class ,@(modus-operandi-theme-syntax-foreground - yellow-active yellow-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) -;;;;; forge - `(forge-post-author ((,class :inherit bold :foreground ,fg-main))) - `(forge-post-date ((,class :foreground ,fg-special-cold))) - `(forge-topic-closed ((,class :foreground ,fg-alt))) - `(forge-topic-merged ((,class :foreground ,fg-alt))) - `(forge-topic-open ((,class :foreground ,fg-special-mild))) - `(forge-topic-unmerged ((,class :foreground ,magenta :slant ,modus-theme-slant))) - `(forge-topic-unread ((,class :inherit bold :foreground ,fg-main))) -;;;;; fountain-mode - `(fountain-character ((,class :foreground ,blue-alt-other))) - `(fountain-comment ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(fountain-dialog ((,class :foreground ,blue-alt))) - `(fountain-metadata-key ((,class :foreground ,green-alt-other))) - `(fountain-metadata-value ((,class :foreground ,blue))) - `(fountain-non-printing ((,class :foreground ,fg-alt))) - `(fountain-note ((,class :foreground ,yellow :slant ,modus-theme-slant))) - `(fountain-page-break ((,class :inherit bold :foreground ,red-alt))) - `(fountain-page-number ((,class :inherit bold :foreground ,red-alt-other))) - `(fountain-paren ((,class :foreground ,cyan))) - `(fountain-scene-heading ((,class :inherit bold :foreground ,blue-nuanced))) - `(fountain-section-heading ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))) - `(fountain-section-heading-1 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))) - `(fountain-section-heading-2 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-warm - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3)))) - `(fountain-section-heading-3 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-mild - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-2)))) - `(fountain-section-heading-4 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-calm - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-1)))) - `(fountain-section-heading-5 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-calm))) - `(fountain-synopsis ((,class :foreground ,cyan-alt))) - `(fountain-trans ((,class :foreground ,yellow-alt-other))) -;;;;; geiser - `(geiser-font-lock-autodoc-current-arg ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(geiser-font-lock-autodoc-identifier ((,class ,@(modus-operandi-theme-syntax-foreground - blue blue-faint)))) - `(geiser-font-lock-doc-button ((,class ,@(modus-operandi-theme-syntax-foreground - cyan-alt cyan-alt-faint) - :underline t))) - `(geiser-font-lock-doc-link ((,class :inherit link))) - `(geiser-font-lock-error-link ((,class ,@(modus-operandi-theme-syntax-foreground - red-alt red-alt-faint) - :underline t))) - `(geiser-font-lock-image-button ((,class ,@(modus-operandi-theme-syntax-foreground - green-alt green-alt-faint) - :underline t))) - `(geiser-font-lock-repl-input ((,class :inherit bold))) - `(geiser-font-lock-repl-output ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint)))) - `(geiser-font-lock-repl-prompt ((,class ,@(modus-operandi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(geiser-font-lock-xref-header ((,class :inherit bold))) - `(geiser-font-lock-xref-link ((,class :inherit link))) -;;;;; git-commit - `(git-commit-comment-action ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(git-commit-comment-branch-local ((,class :foreground ,blue-alt :slant ,modus-theme-slant))) - `(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-dim :slant ,modus-theme-slant))) - `(git-commit-keyword ((,class :foreground ,magenta))) - `(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 :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))) - `(git-gutter:modified ((,class :inherit modus-theme-fringe-yellow))) - `(git-gutter:separator ((,class :inherit modus-theme-fringe-cyan))) - `(git-gutter:unchanged ((,class :inherit modus-theme-fringe-magenta))) -;;;;; git-gutter-fr - `(git-gutter-fr:added ((,class :inherit modus-theme-fringe-green))) - `(git-gutter-fr:deleted ((,class :inherit modus-theme-fringe-red))) - `(git-gutter-fr:modified ((,class :inherit modus-theme-fringe-yellow))) -;;;;; git-{gutter,fringe}+ - `(git-gutter+-added ((,class :inherit modus-theme-fringe-green))) - `(git-gutter+-deleted ((,class :inherit modus-theme-fringe-red))) - `(git-gutter+-modified ((,class :inherit modus-theme-fringe-yellow))) - `(git-gutter+-separator ((,class :inherit modus-theme-fringe-cyan))) - `(git-gutter+-unchanged ((,class :inherit modus-theme-fringe-magenta))) - `(git-gutter-fr+-added ((,class :inherit modus-theme-fringe-green))) - `(git-gutter-fr+-deleted ((,class :inherit modus-theme-fringe-red))) - `(git-gutter-fr+-modified ((,class :inherit modus-theme-fringe-yellow))) -;;;;; git-lens - `(git-lens-added ((,class :inherit bold :foreground ,green))) - `(git-lens-deleted ((,class :inherit bold :foreground ,red))) - `(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 :inherit button :foreground ,cyan))) - `(git-walktree-tree-face ((,class :foreground ,magenta))) -;;;;; gnus - `(gnus-button ((,class :inherit button))) - `(gnus-cite-1 ((,class :foreground ,blue-alt))) - `(gnus-cite-10 ((,class :foreground ,magenta-alt-other))) - `(gnus-cite-11 ((,class :foreground ,yellow-alt-other))) - `(gnus-cite-2 ((,class :foreground ,red-alt))) - `(gnus-cite-3 ((,class :foreground ,green-alt))) - `(gnus-cite-4 ((,class :foreground ,magenta-alt))) - `(gnus-cite-5 ((,class :foreground ,yellow-alt))) - `(gnus-cite-6 ((,class :foreground ,cyan-alt))) - `(gnus-cite-7 ((,class :foreground ,blue-alt-other))) - `(gnus-cite-8 ((,class :foreground ,red-alt-other))) - `(gnus-cite-9 ((,class :foreground ,green-alt-other))) - `(gnus-cite-attribution ((,class :foreground ,fg-main :slant italic))) - `(gnus-emphasis-highlight-words ((,class :inherit modus-theme-refine-yellow))) - `(gnus-group-mail-1 ((,class :inherit bold :foreground ,magenta-alt))) - `(gnus-group-mail-1-empty ((,class :foreground ,magenta-alt))) - `(gnus-group-mail-2 ((,class :inherit bold :foreground ,magenta))) - `(gnus-group-mail-2-empty ((,class :foreground ,magenta))) - `(gnus-group-mail-3 ((,class :inherit bold :foreground ,magenta-alt-other))) - `(gnus-group-mail-3-empty ((,class :foreground ,magenta-alt-other))) - `(gnus-group-mail-low ((,class :inherit bold :foreground ,magenta-nuanced))) - `(gnus-group-mail-low-empty ((,class :foreground ,magenta-nuanced))) - `(gnus-group-news-1 ((,class :inherit bold :foreground ,green))) - `(gnus-group-news-1-empty ((,class :foreground ,green))) - `(gnus-group-news-2 ((,class :inherit bold :foreground ,cyan))) - `(gnus-group-news-2-empty ((,class :foreground ,cyan))) - `(gnus-group-news-3 ((,class :inherit bold :foreground ,yellow-nuanced))) - `(gnus-group-news-3-empty ((,class :foreground ,yellow-nuanced))) - `(gnus-group-news-4 ((,class :inherit bold :foreground ,cyan-nuanced))) - `(gnus-group-news-4-empty ((,class :foreground ,cyan-nuanced))) - `(gnus-group-news-5 ((,class :inherit bold :foreground ,red-nuanced))) - `(gnus-group-news-5-empty ((,class :foreground ,red-nuanced))) - `(gnus-group-news-6 ((,class :inherit bold :foreground ,fg-alt))) - `(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 ,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))) - `(gnus-server-closed ((,class :inherit bold :foreground ,magenta))) - `(gnus-server-cloud ((,class :inherit bold :foreground ,cyan-alt))) - `(gnus-server-cloud-host ((,class :inherit modus-theme-refine-cyan))) - `(gnus-server-denied ((,class :inherit bold :foreground ,red))) - `(gnus-server-offline ((,class :inherit bold :foreground ,yellow))) - `(gnus-server-opened ((,class :inherit bold :foreground ,green))) - `(gnus-signature ((,class :foreground ,fg-special-cold :slant italic))) - `(gnus-splash ((,class :foreground ,fg-alt))) - `(gnus-summary-cancelled ((,class :inherit modus-theme-mark-alt))) - `(gnus-summary-high-ancient ((,class :inherit bold :foreground ,fg-alt))) - `(gnus-summary-high-read ((,class :inherit bold :foreground ,fg-special-cold))) - `(gnus-summary-high-ticked ((,class :inherit bold :foreground ,red-alt-other))) - `(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-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-alt))) - `(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other))) - `(gnus-summary-normal-undownloaded ((,class :foreground ,yellow))) - `(gnus-summary-normal-unread ((,class :foreground ,fg-main))) - `(gnus-summary-selected ((,class :inherit modus-theme-subtle-blue))) -;;;;; golden-ratio-scroll-screen - `(golden-ratio-scroll-highlight-line-face ((,class :background ,cyan-subtle-bg :foreground ,fg-main))) -;;;;; helm - `(helm-M-x-key ((,class :inherit bold :foreground ,magenta-alt-other))) - `(helm-action ((,class :underline t))) - `(helm-bookmark-addressbook ((,class :foreground ,green-alt))) - `(helm-bookmark-directory ((,class :inherit bold :foreground ,blue))) - `(helm-bookmark-file ((,class :foreground ,fg-main))) - `(helm-bookmark-file-not-found ((,class :background ,bg-alt :foreground ,fg-alt))) - `(helm-bookmark-gnus ((,class :foreground ,magenta))) - `(helm-bookmark-info ((,class :foreground ,cyan-alt))) - `(helm-bookmark-man ((,class :foreground ,yellow-alt))) - `(helm-bookmark-w3m ((,class :foreground ,blue-alt))) - `(helm-buffer-archive ((,class :inherit bold :foreground ,cyan))) - `(helm-buffer-directory ((,class :inherit bold :foreground ,blue))) - `(helm-buffer-file ((,class :foreground ,fg-main))) - `(helm-buffer-modified ((,class :foreground ,yellow-alt))) - `(helm-buffer-not-saved ((,class :foreground ,red-alt))) - `(helm-buffer-process ((,class :foreground ,magenta))) - `(helm-buffer-saved-out ((,class :inherit bold :background ,bg-alt :foreground ,red))) - `(helm-buffer-size ((,class :foreground ,fg-alt))) - `(helm-candidate-number ((,class :foreground ,cyan-active))) - `(helm-candidate-number-suspended ((,class :foreground ,yellow-active))) - `(helm-comint-prompts-buffer-name ((,class :foreground ,green-active))) - `(helm-comint-prompts-promptidx ((,class :foreground ,cyan-active))) - `(helm-delete-async-message ((,class :inherit bold :foreground ,magenta-active))) - `(helm-eob-line ((,class :background ,bg-main :foreground ,fg-main))) - `(helm-eshell-prompts-buffer-name ((,class :foreground ,green-active))) - `(helm-eshell-prompts-promptidx ((,class :foreground ,cyan-active))) - `(helm-etags-file ((,class :foreground ,fg-dim :underline t))) - `(helm-ff-backup-file ((,class :foreground ,fg-alt))) - `(helm-ff-denied ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-red - 'modus-theme-intense-red - 'modus-theme-nuanced-red - red)))) - `(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 (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 :inherit button :foreground ,red))) - `(helm-ff-pipe ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-refine-magenta - 'modus-theme-subtle-magenta - 'modus-theme-nuanced-magenta - magenta)))) - `(helm-ff-prefix ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-refine-yellow - 'modus-theme-subtle-yellow - 'modus-theme-nuanced-yellow - yellow-alt-other)))) - `(helm-ff-socket ((,class :foreground ,red-alt-other))) - `(helm-ff-suid ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-red - 'modus-theme-refine-red - 'modus-theme-nuanced-yellow - red-alt)))) - `(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))) - `(helm-grep-finish ((,class :foreground ,green-active))) - `(helm-grep-lineno ((,class :foreground ,fg-special-warm))) - `(helm-grep-match ((,class :inherit modus-theme-special-calm))) - `(helm-header ((,class :inherit bold :foreground ,fg-special-cold))) - `(helm-header-line-left-margin ((,class :inherit bold :foreground ,yellow-intense))) - `(helm-history-deleted ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-red - 'modus-theme-intense-red - 'modus-theme-nuanced-red - red - 'bold)))) - `(helm-history-remote ((,class :foreground ,red-alt-other))) - `(helm-lisp-completion-info ((,class :foreground ,fg-special-warm))) - `(helm-lisp-show-completion ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-yellow - 'modus-theme-refine-yellow - 'modus-theme-nuanced-yellow - yellow - 'bold)))) - `(helm-locate-finish ((,class :foreground ,green-active))) - `(helm-match ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-cyan - 'modus-theme-refine-cyan - 'modus-theme-nuanced-cyan - cyan - 'bold)))) - `(helm-match-item ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-neutral - 'modus-theme-subtle-cyan - 'modus-theme-nuanced-cyan - cyan-alt-other)))) - `(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt))) - `(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 - 'modus-theme-nuanced-magenta - magenta-alt - 'bold)))) - `(helm-non-file-buffer ((,class :foreground ,fg-alt))) - `(helm-prefarg ((,class :foreground ,red-active))) - `(helm-resume-need-update ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-refine-magenta - 'modus-theme-nuanced-magenta - magenta-alt-other)))) - `(helm-selection ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-blue - 'modus-theme-refine-blue - 'modus-theme-special-cold - nil - 'bold)))) - `(helm-selection-line ((,class :inherit modus-theme-special-cold))) - `(helm-separator ((,class :foreground ,fg-special-mild))) - `(helm-time-zone-current ((,class :foreground ,green))) - `(helm-time-zone-home ((,class :foreground ,magenta))) - `(helm-source-header ((,class :inherit bold :foreground ,red-alt - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))) - `(helm-top-columns ((,class :inherit helm-header))) - `(helm-ucs-char ((,class :foreground ,yellow-alt-other))) - `(helm-visible-mark ((,class :inherit modus-theme-subtle-cyan))) -;;;;; helm-ls-git - `(helm-ls-git-added-copied-face ((,class :foreground ,green-intense))) - `(helm-ls-git-added-modified-face ((,class :foreground ,yellow-intense))) - `(helm-ls-git-conflict-face ((,class :inherit bold :foreground ,red-intense))) - `(helm-ls-git-deleted-and-staged-face ((,class :foreground ,red-nuanced))) - `(helm-ls-git-deleted-not-staged-face ((,class :foreground ,red))) - `(helm-ls-git-modified-and-staged-face ((,class :foreground ,yellow-nuanced))) - `(helm-ls-git-modified-not-staged-face ((,class :foreground ,yellow))) - `(helm-ls-git-renamed-modified-face ((,class :foreground ,magenta))) - `(helm-ls-git-untracked-face ((,class :foreground ,fg-special-cold))) -;;;;; helm-switch-shell - `(helm-switch-shell-new-shell-face ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-refine-magenta - 'modus-theme-nuanced-magenta - magenta-alt-other - 'bold)))) -;;;;; helm-xref - `(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 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))) - `(hi-blue-b ((,class :inherit modus-theme-intense-blue))) - `(hi-green ((,class :background ,bg-alt :foreground ,green :underline t))) - `(hi-green-b ((,class :inherit modus-theme-intense-green))) - `(hi-pink ((,class :background ,bg-alt :foreground ,magenta :underline t))) - `(hi-red-b ((,class :inherit modus-theme-intense-red))) - `(hi-yellow ((,class :background ,bg-alt :foreground ,yellow :underline t))) - `(highlight ((,class :inherit modus-theme-subtle-blue))) - `(highlight-changes ((,class :foreground ,yellow-alt-other))) - `(highlight-changes-delete ((,class :foreground ,red-alt-other :underline t))) - `(hl-line ((,class :inherit modus-theme-hl-line))) -;;;;; highlight-blocks - `(highlight-blocks-depth-1-face ((,class :background ,bg-dim :foreground ,fg-main))) - `(highlight-blocks-depth-2-face ((,class :background ,bg-alt :foreground ,fg-main))) - `(highlight-blocks-depth-3-face ((,class :background ,bg-special-cold :foreground ,fg-main))) - `(highlight-blocks-depth-4-face ((,class :background ,bg-special-calm :foreground ,fg-main))) - `(highlight-blocks-depth-5-face ((,class :background ,bg-special-warm :foreground ,fg-main))) - `(highlight-blocks-depth-6-face ((,class :background ,bg-special-mild :foreground ,fg-main))) - `(highlight-blocks-depth-7-face ((,class :background ,bg-inactive :foreground ,fg-main))) - `(highlight-blocks-depth-8-face ((,class :background ,bg-active :foreground ,fg-main))) - `(highlight-blocks-depth-9-face ((,class :background ,cyan-subtle-bg :foreground ,fg-main))) -;;;;; highlight-defined - `(highlight-defined-builtin-function-name-face ((,class :foreground ,magenta))) - `(highlight-defined-face-name-face ((,class :foreground ,fg-main))) - `(highlight-defined-function-name-face ((,class :foreground ,magenta))) - `(highlight-defined-macro-name-face ((,class :foreground ,magenta-alt))) - `(highlight-defined-special-form-name-face ((,class :foreground ,magenta-alt-other))) - `(highlight-defined-variable-name-face ((,class :foreground ,cyan))) -;;;;; highlight-escape-sequences (`hes-mode') - `(hes-escape-backslash-face ((,class :inherit bold :foreground ,fg-escape-char-construct))) - `(hes-escape-sequence-face ((,class :inherit bold :foreground ,fg-escape-char-backslash))) -;;;;; highlight-indentation - `(highlight-indentation-face ((,class :inherit modus-theme-hl-line))) - `(highlight-indentation-current-column-face ((,class :background ,bg-active))) -;;;;; highlight-numbers - `(highlight-numbers-number ((,class :foreground ,blue-alt-other))) -;;;;; highlight-symbol - `(highlight-symbol-face ((,class :inherit modus-theme-special-mild))) -;;;;; highlight-thing - `(highlight-thing ((,class :background ,bg-alt :foreground ,cyan))) -;;;;; hl-defined - `(hdefd-functions ((,class :foreground ,blue))) - `(hdefd-undefined ((,class :foreground ,red-alt))) - `(hdefd-variables ((,class :foreground ,cyan-alt))) -;;;;; hl-fill-column - `(hl-fill-column-face ((,class :background ,bg-active :foreground ,fg-active))) -;;;;; hl-todo - `(hl-todo ((,class :inherit bold :foreground ,red-alt-other :slant ,modus-theme-slant))) -;;;;; hydra - `(hydra-face-amaranth ((,class :inherit bold :foreground ,yellow))) - `(hydra-face-blue ((,class :inherit bold :foreground ,blue-alt))) - `(hydra-face-pink ((,class :inherit bold :foreground ,magenta-alt))) - `(hydra-face-red ((,class :inherit bold :foreground ,red))) - `(hydra-face-teal ((,class :inherit bold :foreground ,cyan))) -;;;;; hyperlist - `(hyperlist-condition ((,class :foreground ,green))) - `(hyperlist-hashtag ((,class :foreground ,yellow))) - `(hyperlist-operator ((,class :foreground ,blue-alt))) - `(hyperlist-paren ((,class :foreground ,cyan-alt-other))) - `(hyperlist-quote ((,class :foreground ,cyan-alt))) - `(hyperlist-ref ((,class :foreground ,magenta-alt-other))) - `(hyperlist-stars ((,class :foreground ,fg-alt))) - `(hyperlist-tag ((,class :foreground ,red))) - `(hyperlist-toplevel ((,class :inherit bold :foreground ,fg-main))) -;;;;; icomplete - `(icomplete-first-match ((,class :inherit bold - ,@(modus-operandi-theme-standard-completions - 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 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 - 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))) -;;;;; iflipb - `(iflipb-current-buffer-face ((,class :inherit bold :foreground ,cyan-alt))) - `(iflipb-other-buffer-face ((,class :foreground ,fg-alt))) -;;;;; imenu-list - `(imenu-list-entry-face-0 ((,class :foreground ,cyan))) - `(imenu-list-entry-face-1 ((,class :foreground ,blue))) - `(imenu-list-entry-face-2 ((,class :foreground ,cyan-alt-other))) - `(imenu-list-entry-face-3 ((,class :foreground ,blue-alt))) - `(imenu-list-entry-subalist-face-0 ((,class :inherit bold :foreground ,magenta-alt-other :underline t))) - `(imenu-list-entry-subalist-face-1 ((,class :inherit bold :foreground ,magenta :underline t))) - `(imenu-list-entry-subalist-face-2 ((,class :inherit bold :foreground ,green-alt-other :underline t))) - `(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 :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 ,@(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 modus-theme-heading-3))) - `(info-menu-star ((,class :foreground ,red))) - `(info-node ((,class :inherit bold))) - `(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))) - `(info-colors-ref-item-constant ((,class :foreground ,blue-alt-other))) - `(info-colors-ref-item-function ((,class :foreground ,magenta))) - `(info-colors-ref-item-macro ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-alt-other))) - `(info-colors-ref-item-other ((,class :foreground ,cyan))) - `(info-colors-ref-item-special-form ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-alt-other))) - `(info-colors-ref-item-syntax-class ((,class :foreground ,magenta))) - `(info-colors-ref-item-type ((,class :foreground ,magenta-alt))) - `(info-colors-ref-item-user-option ((,class :foreground ,cyan))) - `(info-colors-ref-item-variable ((,class :foreground ,cyan))) -;;;;; interaction-log - `(ilog-buffer-face ((,class :foreground ,magenta-alt-other))) - `(ilog-change-face ((,class :foreground ,magenta-alt))) - `(ilog-echo-face ((,class :foreground ,yellow-alt-other))) - `(ilog-load-face ((,class :foreground ,green))) - `(ilog-message-face ((,class :foreground ,fg-alt))) - `(ilog-non-change-face ((,class :foreground ,blue))) -;;;;; ioccur - `(ioccur-cursor ((,class :foreground ,fg-main))) - `(ioccur-invalid-regexp ((,class :foreground ,red))) - `(ioccur-match-face ((,class :inherit modus-theme-special-calm))) - `(ioccur-match-overlay-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t)) - :inherit modus-theme-special-cold))) - `(ioccur-num-line-face ((,class :foreground ,fg-special-warm))) - `(ioccur-overlay-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t)) - :inherit modus-theme-refine-blue))) - `(ioccur-regexp-face ((,class :inherit (modus-theme-intense-magenta bold)))) - `(ioccur-title-face ((,class :inherit bold :foreground ,red-alt - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))) -;;;;; isearch, occur, and the like - `(isearch ((,class :inherit (modus-theme-intense-green bold)))) - `(isearch-fail ((,class :inherit modus-theme-refine-red))) - `(lazy-highlight ((,class :inherit modus-theme-refine-cyan))) - `(match ((,class :inherit modus-theme-special-calm))) - `(query-replace ((,class :inherit (modus-theme-intense-yellow bold)))) -;;;;; ivy - `(ivy-action ((,class :inherit bold :foreground ,red-alt))) - `(ivy-completions-annotations ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(ivy-confirm-face ((,class :foreground ,cyan))) - `(ivy-current-match ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-refine-cyan - 'modus-theme-intense-cyan - 'modus-theme-special-warm - nil - 'bold)))) - `(ivy-cursor ((,class :background ,fg-main :foreground ,bg-main))) - `(ivy-grep-info ((,class :foreground ,cyan-alt))) - `(ivy-grep-line-number ((,class :foreground ,fg-special-warm))) - `(ivy-highlight-face ((,class :foreground ,magenta))) - `(ivy-match-required-face ((,class :inherit error))) - `(ivy-minibuffer-match-face-1 ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-neutral - 'modus-theme-intense-neutral - 'modus-theme-subtle-neutral - fg-alt)))) - `(ivy-minibuffer-match-face-2 ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-green - 'modus-theme-refine-green - 'modus-theme-nuanced-green - green-alt-other - 'bold)))) - `(ivy-minibuffer-match-face-3 ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-cyan - 'modus-theme-refine-cyan - 'modus-theme-nuanced-cyan - cyan-alt-other - 'bold)))) - `(ivy-minibuffer-match-face-4 ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-refine-magenta - 'modus-theme-nuanced-magenta - magenta-alt-other - 'bold)))) - `(ivy-minibuffer-match-highlight ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-blue - 'modus-theme-intense-blue - 'modus-theme-nuanced-blue - blue-alt-other - 'bold)))) - `(ivy-modified-buffer ((,class :foreground ,yellow :slant ,modus-theme-slant))) - `(ivy-modified-outside-buffer ((,class :foreground ,yellow-alt :slant ,modus-theme-slant))) - `(ivy-org ((,class :foreground ,cyan-alt-other))) - `(ivy-prompt-match ((,class :inherit ivy-current-match))) - `(ivy-remote ((,class :foreground ,magenta))) - `(ivy-separator ((,class :foreground ,fg-alt))) - `(ivy-subdir ((,class :foreground ,blue-alt-other))) - `(ivy-virtual ((,class :foreground ,magenta-alt-other))) - `(ivy-yanked-word ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-blue - 'modus-theme-refine-blue - 'modus-theme-nuanced-blue - blue-alt)))) -;;;;; ivy-posframe - `(ivy-posframe ((,class :background ,bg-dim :foreground ,fg-main))) - `(ivy-posframe-border ((,class :background ,bg-active))) - `(ivy-posframe-cursor ((,class :background ,fg-main :foreground ,bg-main))) -;;;;; jira (org-jira) - `(jiralib-comment-face ((,class :background ,bg-alt))) - `(jiralib-comment-header-face ((,class :inherit bold))) - `(jiralib-issue-info-face ((,class :inherit modus-theme-special-warm))) - `(jiralib-issue-info-header-face ((,class :inherit (modus-theme-special-warm bold)))) - `(jiralib-issue-summary-face ((,class :inherit bold))) - `(jiralib-link-filter-face ((,class :underline t))) - `(jiralib-link-issue-face ((,class :underline t))) - `(jiralib-link-project-face ((,class :underline t))) -;;;;; journalctl-mode - `(journalctl-error-face ((,class :inherit bold :foreground ,red))) - `(journalctl-finished-face ((,class :inherit bold :foreground ,green))) - `(journalctl-host-face ((,class :foreground ,blue))) - `(journalctl-process-face ((,class :foreground ,cyan-alt-other))) - `(journalctl-starting-face ((,class :foreground ,green))) - `(journalctl-timestamp-face ((,class :foreground ,fg-special-cold))) - `(journalctl-warning-face ((,class :inherit bold :foreground ,yellow))) -;;;;; js2-mode - `(js2-error ((,class :foreground ,red))) - `(js2-external-variable ((,class :foreground ,cyan-alt-other))) - `(js2-function-call ((,class :foreground ,magenta))) - `(js2-function-param ((,class :foreground ,blue))) - `(js2-instance-member ((,class :foreground ,magenta-alt-other))) - `(js2-jsdoc-html-tag-delimiter ((,class :foreground ,fg-main))) - `(js2-jsdoc-html-tag-name ((,class :foreground ,cyan))) - `(js2-jsdoc-tag ((,class :foreground ,fg-special-calm))) - `(js2-jsdoc-type ((,class :foreground ,fg-special-cold))) - `(js2-jsdoc-value ((,class :foreground ,fg-special-warm))) - `(js2-object-property ((,class :foreground ,fg-main))) - `(js2-object-property-access ((,class :foreground ,fg-main))) - `(js2-private-function-call ((,class :foreground ,green-alt-other))) - `(js2-private-member ((,class :foreground ,fg-special-mild))) - `(js2-warning ((,class :foreground ,yellow-alt :underline t))) -;;;;; julia - `(julia-macro-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta))) - `(julia-quoted-symbol-face ((,class :foreground ,blue-alt-other))) -;;;;; jupyter - `(jupyter-eval-overlay ((,class :inherit bold :foreground ,blue))) - `(jupyter-repl-input-prompt ((,class :foreground ,cyan-alt-other))) - `(jupyter-repl-output-prompt ((,class :foreground ,magenta-alt-other))) - `(jupyter-repl-traceback ((,class :inherit modus-theme-intense-red))) -;;;;; kaocha-runner - `(kaocha-runner-error-face ((,class :foreground ,red))) - `(kaocha-runner-success-face ((,class :foreground ,green))) - `(kaocha-runner-warning-face ((,class :foreground ,yellow))) -;;;;; keycast - `(keycast-command ((,class :inherit bold :foreground ,blue-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 :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))) - `(lsp-face-highlight-write ((,class :inherit (modus-theme-refine-blue bold)))) - `(lsp-face-semhl-constant ((,class :foreground ,blue-alt-other))) - `(lsp-face-semhl-deprecated - ((,(append '((supports :underline (:style wave))) class) - :foreground ,yellow :underline (:style wave)) - (,class :foreground ,yellow :underline t))) - `(lsp-face-semhl-enummember ((,class :foreground ,blue-alt-other))) - `(lsp-face-semhl-field ((,class :foreground ,cyan-alt))) - `(lsp-face-semhl-field-static ((,class :foreground ,cyan-alt :slant ,modus-theme-slant))) - `(lsp-face-semhl-function ((,class :foreground ,magenta))) - `(lsp-face-semhl-method ((,class :foreground ,magenta))) - `(lsp-face-semhl-namespace ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-alt))) - `(lsp-face-semhl-preprocessor ((,class :foreground ,red-alt-other))) - `(lsp-face-semhl-static-method ((,class :foreground ,magenta :slant ,modus-theme-slant))) - `(lsp-face-semhl-type-class ((,class :foreground ,magenta-alt))) - `(lsp-face-semhl-type-enum ((,class :foreground ,magenta-alt))) - `(lsp-face-semhl-type-primitive ((,class :foreground ,magenta-alt :slant ,modus-theme-slant))) - `(lsp-face-semhl-type-template ((,class :foreground ,magenta-alt :slant ,modus-theme-slant))) - `(lsp-face-semhl-type-typedef ((,class :foreground ,magenta-alt :slant ,modus-theme-slant))) - `(lsp-face-semhl-variable ((,class :foreground ,cyan))) - `(lsp-face-semhl-variable-local ((,class :foreground ,cyan))) - `(lsp-face-semhl-variable-parameter ((,class :foreground ,cyan-alt-other))) - `(lsp-lens-face ((,class :height 0.8 :foreground ,fg-alt))) - `(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 :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))) - `(lsp-ui-peek-highlight ((,class :inherit modus-theme-subtle-blue))) - `(lsp-ui-peek-line-number ((,class :foreground ,fg-alt))) - `(lsp-ui-peek-list ((,class :background ,bg-dim))) - `(lsp-ui-peek-peek ((,class :background ,bg-alt))) - `(lsp-ui-peek-selection ((,class :inherit modus-theme-subtle-cyan))) - `(lsp-ui-sideline-code-action ((,class :foreground ,yellow))) - `(lsp-ui-sideline-current-symbol ((,class :inherit bold :height 0.99 :box (:line-width -1 :style nil) :foreground ,fg-main))) - `(lsp-ui-sideline-symbol ((,class :inherit bold :height 0.99 :box (:line-width -1 :style nil) :foreground ,fg-alt))) - `(lsp-ui-sideline-symbol-info ((,class :height 0.99 :slant italic))) -;;;;; magit - `(magit-bisect-bad ((,class :foreground ,red-alt-other))) - `(magit-bisect-good ((,class :foreground ,green-alt-other))) - `(magit-bisect-skip ((,class :foreground ,yellow-alt-other))) - `(magit-blame-date ((,class :foreground ,blue))) - `(magit-blame-dimmed ((,class :foreground ,fg-alt))) - `(magit-blame-hash ((,class :foreground ,fg-special-warm))) - `(magit-blame-heading ((,class :background ,bg-alt))) - `(magit-blame-highlight ((,class :inherit modus-theme-nuanced-cyan))) - `(magit-blame-margin ((,class :inherit magit-blame-highlight))) - `(magit-blame-name ((,class :foreground ,magenta-alt-other))) - `(magit-blame-summary ((,class :foreground ,cyan-alt-other))) - `(magit-branch-current ((,class :foreground ,blue-alt-other :box t))) - `(magit-branch-local ((,class :foreground ,blue-alt))) - `(magit-branch-remote ((,class :foreground ,magenta-alt))) - `(magit-branch-remote-head ((,class :foreground ,magenta-alt-other :box t))) - `(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))) - ;; 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 - 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 - 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-diff - bg-dim fg-dim - 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 :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-diff - bg-main red - 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))) - `(magit-filename ((,class :foreground ,fg-special-cold))) - `(magit-hash ((,class :foreground ,fg-alt))) - `(magit-head ((,class :inherit magit-branch-local))) - `(magit-header-line ((,class :inherit bold :foreground ,magenta-active))) - `(magit-header-line-key ((,class :inherit bold :foreground ,red-active))) - `(magit-header-line-log-select ((,class :inherit bold :foreground ,fg-main))) - `(magit-keyword ((,class :foreground ,magenta))) - `(magit-keyword-squash ((,class :inherit bold :foreground ,yellow-alt-other))) - `(magit-log-author ((,class :foreground ,cyan))) - `(magit-log-date ((,class :foreground ,fg-alt))) - `(magit-log-graph ((,class :foreground ,fg-dim))) - `(magit-mode-line-process ((,class :inherit bold :foreground ,blue-active))) - `(magit-mode-line-process-error ((,class :inherit bold :foreground ,red-active))) - `(magit-process-ng ((,class :inherit error))) - `(magit-process-ok ((,class :inherit success))) - `(magit-reflog-amend ((,class :background ,bg-main :foreground ,magenta-intense))) - `(magit-reflog-checkout ((,class :background ,bg-main :foreground ,blue-intense))) - `(magit-reflog-cherry-pick ((,class :background ,bg-main :foreground ,green-intense))) - `(magit-reflog-commit ((,class :background ,bg-main :foreground ,green-intense))) - `(magit-reflog-merge ((,class :background ,bg-main :foreground ,green-intense))) - `(magit-reflog-other ((,class :background ,bg-main :foreground ,cyan-intense))) - `(magit-reflog-rebase ((,class :background ,bg-main :foreground ,magenta-intense))) - `(magit-reflog-remote ((,class :background ,bg-main :foreground ,cyan-intense))) - `(magit-reflog-reset ((,class :background ,bg-main :foreground ,red-intense))) - `(magit-refname ((,class :foreground ,fg-alt))) - `(magit-refname-pullreq ((,class :foreground ,fg-alt))) - `(magit-refname-stash ((,class :foreground ,fg-alt))) - `(magit-refname-wip ((,class :foreground ,fg-alt))) - `(magit-section ((,class :background ,bg-dim :foreground ,fg-main))) - `(magit-section-heading ((,class :inherit bold :foreground ,cyan))) - `(magit-section-heading-selection ((,class :inherit (modus-theme-refine-cyan bold)))) - `(magit-section-highlight ((,class :background ,bg-alt))) - `(magit-sequence-done ((,class :foreground ,green-alt))) - `(magit-sequence-drop ((,class :foreground ,red-alt))) - `(magit-sequence-exec ((,class :foreground ,magenta-alt))) - `(magit-sequence-head ((,class :foreground ,cyan-alt))) - `(magit-sequence-onto ((,class :foreground ,fg-alt))) - `(magit-sequence-part ((,class :foreground ,yellow-alt))) - `(magit-sequence-pick ((,class :foreground ,blue-alt))) - `(magit-sequence-stop ((,class :foreground ,red))) - `(magit-signature-bad ((,class :inherit bold :foreground ,red))) - `(magit-signature-error ((,class :foreground ,red-alt))) - `(magit-signature-expired ((,class :foreground ,yellow))) - `(magit-signature-expired-key ((,class :foreground ,yellow))) - `(magit-signature-good ((,class :foreground ,green))) - `(magit-signature-revoked ((,class :foreground ,magenta))) - `(magit-signature-untrusted ((,class :foreground ,cyan))) - `(magit-tag ((,class :foreground ,yellow-alt-other))) -;;;;; magit-imerge - `(magit-imerge-overriding-value ((,class :inherit bold :foreground ,red-alt))) -;;;;; man - `(Man-overstrike ((,class :inherit bold :foreground ,magenta))) - `(Man-reverse ((,class :inherit modus-theme-subtle-magenta))) - `(Man-underline ((,class :foreground ,cyan :underline t))) -;;;;; markdown-mode - `(markdown-blockquote-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(markdown-bold-face ((,class :inherit bold))) - `(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 ((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 ,@(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 ,@(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))) - `(markdown-list-face ((,class :foreground ,fg-dim))) - `(markdown-markup-face ((,class :foreground ,fg-alt))) - `(markdown-math-face ((,class :foreground ,magenta-alt-other))) - `(markdown-metadata-key-face ((,class :foreground ,cyan-alt-other))) - `(markdown-metadata-value-face ((,class :foreground ,blue-alt))) - `(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)) - ,@(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 ,@(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))) - `(markup-big-face ((,class :height 1.3 :foreground ,blue-nuanced))) - `(markup-bold-face ((,class :inherit bold :foreground ,red-nuanced))) - `(markup-code-face ((,class :inherit fixed-pitch :foreground ,magenta))) - `(markup-command-face ((,class :foreground ,fg-inactive))) - `(markup-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(markup-complex-replacement-face ((,class :box (:line-width 2 :color nil :style released-button) - :inherit modus-theme-refine-magenta))) - `(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 :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))) - `(markup-meta-hide-face ((,class :foreground ,fg-alt))) - `(markup-passthrough-face ((,class :inherit fixed-pitch :foreground ,cyan))) - `(markup-preprocessor-face ((,class :foreground ,red-alt-other))) - `(markup-replacement-face ((,class :foreground ,yellow-alt-other))) - `(markup-secondary-text-face ((,class :height 0.8 :foreground ,magenta-nuanced))) - `(markup-small-face ((,class :height 0.8 :foreground ,fg-main))) - `(markup-strong-face ((,class :inherit bold :foreground ,red-nuanced))) - `(markup-subscript-face ((,class :height 0.8 :foreground ,fg-special-cold))) - `(markup-superscript-face ((,class :height 0.8 :foreground ,fg-special-cold))) - `(markup-table-cell-face ((,class :inherit modus-theme-special-cold))) - `(markup-table-face ((,class :inherit modus-theme-subtle-cyan))) - `(markup-table-row-face ((,class :inherit modus-theme-subtle-cyan))) - `(markup-title-0-face ((,class :height 3.0 :foreground ,blue-nuanced))) - `(markup-title-1-face ((,class :height 2.4 :foreground ,blue-nuanced))) - `(markup-title-2-face ((,class :height 1.8 :foreground ,blue-nuanced))) - `(markup-title-3-face ((,class :height 1.4 :foreground ,blue-nuanced))) - `(markup-title-4-face ((,class :height 1.2 :foreground ,blue-nuanced))) - `(markup-title-5-face ((,class :height 1.2 :foreground ,blue-nuanced :underline t))) - `(markup-value-face ((,class :foreground ,fg-inactive))) - `(markup-verbatim-face ((,class :inherit modus-theme-special-mild))) -;;;;; mentor - `(mentor-download-message ((,class :foreground ,fg-special-warm))) - `(mentor-download-name ((,class :foreground ,fg-special-cold))) - `(mentor-download-progress ((,class :foreground ,blue-alt-other))) - `(mentor-download-size ((,class :foreground ,magenta-alt-other))) - `(mentor-download-speed-down ((,class :foreground ,cyan-alt))) - `(mentor-download-speed-up ((,class :foreground ,red-alt))) - `(mentor-download-state ((,class :foreground ,yellow-alt))) - `(mentor-highlight-face ((,class :inherit modus-theme-subtle-blue))) - `(mentor-tracker-name ((,class :foreground ,magenta-alt))) -;;;;; messages - `(message-cited-text-1 ((,class :foreground ,blue-alt))) - `(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 :inherit bold :foreground ,cyan-alt))) - `(message-header-name ((,class :foreground ,green-alt-other))) - `(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 ,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 ,@(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 ,@(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))) - `(mood-line-status-info ((,class :foreground ,cyan-active))) - `(mood-line-status-neutral ((,class :foreground ,blue-active))) - `(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))) - `(mu4e-cited-2-face ((,class :foreground ,red-alt))) - `(mu4e-cited-3-face ((,class :foreground ,green-alt))) - `(mu4e-cited-4-face ((,class :foreground ,magenta-alt))) - `(mu4e-cited-5-face ((,class :foreground ,yellow-alt))) - `(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 :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))) - `(mu4e-flagged-face ((,class :foreground ,red-alt))) - `(mu4e-footer-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(mu4e-forwarded-face ((,class :foreground ,magenta-alt-other))) - `(mu4e-header-face ((,class :foreground ,fg-alt))) - `(mu4e-header-highlight-face ((,class :inherit modus-theme-hl-line))) - `(mu4e-header-key-face ((,class :foreground ,cyan))) - `(mu4e-header-marks-face ((,class :inherit bold :foreground ,magenta-alt))) - `(mu4e-header-title-face ((,class :foreground ,fg-special-mild))) - `(mu4e-header-value-face ((,class :inherit bold :foreground ,magenta-alt-other))) - `(mu4e-highlight-face ((,class :inherit bold :foreground ,blue-alt-other))) - `(mu4e-link-face ((,class :inherit link))) - `(mu4e-modeline-face ((,class :foreground ,magenta-active))) - `(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 ,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))) - `(mu4e-trashed-face ((,class :foreground ,red))) - `(mu4e-unread-face ((,class :inherit bold :foreground ,fg-main))) - `(mu4e-url-number-face ((,class :inherit bold :foreground ,cyan-alt-other))) - `(mu4e-view-body-face ((,class :foreground ,fg-main))) - `(mu4e-warning-face ((,class :inherit warning))) -;;;;; mu4e-conversation - `(mu4e-conversation-header ((,class :inherit modus-theme-special-cold))) - `(mu4e-conversation-sender-1 ((,class :foreground ,fg-special-warm))) - `(mu4e-conversation-sender-2 ((,class :foreground ,fg-special-cold))) - `(mu4e-conversation-sender-3 ((,class :foreground ,fg-special-mild))) - `(mu4e-conversation-sender-4 ((,class :foreground ,fg-alt))) - `(mu4e-conversation-sender-5 ((,class :foreground ,yellow-refine-fg))) - `(mu4e-conversation-sender-6 ((,class :foreground ,cyan-refine-fg))) - `(mu4e-conversation-sender-7 ((,class :foreground ,green-refine-fg))) - `(mu4e-conversation-sender-8 ((,class :foreground ,blue-refine-fg))) - `(mu4e-conversation-sender-me ((,class :foreground ,fg-main))) - `(mu4e-conversation-unread ((,class :inherit bold))) -;;;;; multiple-cursors - `(mc/cursor-bar-face ((,class :height 1 :background ,fg-main))) - `(mc/cursor-face ((,class :inverse-video t))) - `(mc/region-face ((,class :inherit region))) -;;;;; neotree - `(neo-banner-face ((,class :foreground ,magenta))) - `(neo-button-face ((,class :inherit button))) - `(neo-dir-link-face ((,class :inherit bold :foreground ,blue))) - `(neo-expand-btn-face ((,class :foreground ,cyan))) - `(neo-file-link-face ((,class :foreground ,fg-main))) - `(neo-header-face ((,class :inherit bold :foreground ,fg-main))) - `(neo-root-dir-face ((,class :inherit bold :foreground ,cyan-alt))) - `(neo-vc-added-face ((,class :foreground ,green))) - `(neo-vc-conflict-face ((,class :inherit bold :foreground ,red))) - `(neo-vc-default-face ((,class :foreground ,fg-main))) - `(neo-vc-edited-face ((,class :foreground ,yellow))) - `(neo-vc-ignored-face ((,class :foreground ,fg-inactive))) - `(neo-vc-missing-face ((,class :foreground ,red-alt))) - `(neo-vc-needs-merge-face ((,class :foreground ,magenta-alt))) - `(neo-vc-needs-update-face ((,class :underline t))) - `(neo-vc-removed-face ((,class :strike-through t))) - `(neo-vc-unlocked-changes-face ((,class :inherit modus-theme-refine-blue))) - `(neo-vc-up-to-date-face ((,class :foreground ,fg-alt))) - `(neo-vc-user-face ((,class :foreground ,magenta))) -;;;;; no-emoji - `(no-emoji ((,class :foreground ,cyan))) -;;;;; notmuch - `(notmuch-crypto-decryption ((,class :inherit modus-theme-refine-magenta))) - `(notmuch-crypto-part-header ((,class :foreground ,magenta-alt-other))) - `(notmuch-crypto-signature-bad ((,class :inherit modus-theme-intense-red))) - `(notmuch-crypto-signature-good ((,class :inherit modus-theme-refine-green))) - `(notmuch-crypto-signature-good-key ((,class :inherit modus-theme-refine-yellow))) - `(notmuch-crypto-signature-unknown ((,class :inherit modus-theme-refine-red))) - `(notmuch-hello-logo-background ((,class :background ,bg-main))) - `(notmuch-message-summary-face ((,class :inherit modus-theme-nuanced-cyan))) - `(notmuch-search-flagged-face ((,class :foreground ,red-alt))) - `(notmuch-search-matching-authors ((,class :foreground ,fg-main))) - `(notmuch-search-non-matching-authors ((,class :foreground ,fg-alt))) - `(notmuch-search-unread-face ((,class :inherit bold))) - `(notmuch-tag-added - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,green :style wave)) - (,class :foreground ,green :underline t))) - `(notmuch-tag-deleted - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,red :style wave)) - (,class :foreground ,red :underline t))) - `(notmuch-tag-face ((,class :inherit bold :foreground ,blue-alt))) - `(notmuch-tag-flagged ((,class :foreground ,red-alt))) - `(notmuch-tag-unread ((,class :foreground ,magenta-alt))) - `(notmuch-tree-match-author-face ((,class :foreground ,fg-special-cold))) - `(notmuch-tree-match-face ((,class :foreground ,fg-main))) - `(notmuch-tree-match-tag-face ((,class :inherit bold :foreground ,blue-alt))) - `(notmuch-tree-no-match-face ((,class :foreground ,fg-alt))) - `(notmuch-wash-cited-text ((,class :foreground ,cyan))) - `(notmuch-wash-toggle-button ((,class :background ,bg-alt :foreground ,fg-alt))) -;;;;; num3-mode - `(num3-face-even ((,class :inherit bold :background ,bg-alt))) -;;;;; nxml-mode - `(nxml-attribute-colon ((,class :foreground ,fg-main))) - `(nxml-attribute-local-name ((,class ,@(modus-operandi-theme-syntax-foreground - cyan-alt cyan-alt-faint)))) - `(nxml-attribute-prefix ((,class ,@(modus-operandi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(nxml-attribute-value ((,class ,@(modus-operandi-theme-syntax-foreground - blue blue-faint)))) - `(nxml-cdata-section-CDATA ((,class ,@(modus-operandi-theme-syntax-foreground - red-alt red-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(nxml-cdata-section-delimiter ((,class ,@(modus-operandi-theme-syntax-foreground - red-alt red-alt-faint)))) - `(nxml-char-ref-delimiter ((,class ,@(modus-operandi-theme-syntax-foreground - green-alt-other green-alt-other-faint)))) - `(nxml-char-ref-number ((,class ,@(modus-operandi-theme-syntax-foreground - green-alt-other green-alt-other-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(nxml-delimited-data ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(nxml-delimiter ((,class :foreground ,fg-dim))) - `(nxml-element-colon ((,class :foreground ,fg-main))) - `(nxml-element-local-name ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(nxml-element-prefix ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(nxml-entity-ref-delimiter ((,class ,@(modus-operandi-theme-syntax-foreground - green-alt-other green-alt-other-faint)))) - `(nxml-entity-ref-name ((,class ,@(modus-operandi-theme-syntax-foreground - green-alt-other green-alt-other-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(nxml-glyph ((,class :inherit modus-theme-intense-neutral))) - `(nxml-hash ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt blue-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(nxml-heading ((,class :inherit bold))) - `(nxml-name ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(nxml-namespace-attribute-colon ((,class :foreground ,fg-main))) - `(nxml-namespace-attribute-prefix ((,class ,@(modus-operandi-theme-syntax-foreground - cyan cyan-faint)))) - `(nxml-processing-instruction-target ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(nxml-prolog-keyword ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(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-other blue-nuanced-bg - blue-refine-bg blue-refine-fg)))) - `(orderless-match-face-1 ((,class :inherit bold - ,@(modus-operandi-theme-standard-completions - magenta-alt magenta-nuanced-bg - magenta-refine-bg magenta-refine-fg)))) - `(orderless-match-face-2 ((,class :inherit bold - ,@(modus-operandi-theme-standard-completions - green green-nuanced-bg - green-refine-bg green-refine-fg)))) - `(orderless-match-face-3 ((,class :inherit bold - ,@(modus-operandi-theme-standard-completions - 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 - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(org-agenda-column-dateline ((,class :background ,bg-alt))) - `(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 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 :foreground ,blue-alt))) - `(org-archived ((,class :background ,bg-alt :foreground ,fg-alt))) - `(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)))) - `(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 :inherit org-done))) - `(org-checkbox-statistics-todo ((,class :inherit org-todo))) - `(org-clock-overlay ((,class :inherit modus-theme-special-cold))) - `(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 (button fixed-pitch) :foreground ,cyan-alt-other))) - `(org-date-selected ((,class :inherit bold :foreground ,blue-alt :inverse-video t))) - `(org-document-info ((,class :foreground ,fg-special-cold))) - `(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 :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 :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))) - `(org-habit-clear-future-face ((,class :inherit modus-theme-refine-magenta))) - `(org-habit-overdue-face ((,class :inherit modus-theme-intense-red))) - `(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 :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 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 :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 :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-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 :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 ,@(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 - `(org-journal-calendar-entry-face ((,class :foreground ,yellow-alt-other :slant ,modus-theme-slant))) - `(org-journal-calendar-scheduled-face ((,class :foreground ,red-alt-other :slant ,modus-theme-slant))) - `(org-journal-highlight ((,class :foreground ,magenta-alt))) -;;;;; org-noter - `(org-noter-no-notes-exist-face ((,class :inherit bold :foreground ,red-active))) - `(org-noter-notes-exist-face ((,class :inherit bold :foreground ,green-active))) -;;;;; org-pomodoro - `(org-pomodoro-mode-line ((,class :foreground ,red-active))) - `(org-pomodoro-mode-line-break ((,class :foreground ,cyan-active))) - `(org-pomodoro-mode-line-overtime ((,class :inherit bold :foreground ,red-active))) -;;;;; org-recur - `(org-recur ((,class :foreground ,magenta-active))) -;;;;; org-roam - `(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))) -;;;;; org-table-sticky-header - `(org-table-sticky-header-face ((,class :inherit modus-theme-intense-neutral))) -;;;;; org-treescope - `(org-treescope-faces--markerinternal-midday ((,class :inherit modus-theme-intense-blue))) - `(org-treescope-faces--markerinternal-range ((,class :inherit modus-theme-special-mild))) -;;;;; origami - `(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 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 nil))) -;;;;; package (M-x list-packages) - `(package-description ((,class :foreground ,fg-special-cold))) - `(package-help-section-name ((,class :inherit bold :foreground ,magenta-alt-other))) - `(package-name ((,class :inherit link))) - `(package-status-avail-obso ((,class :inherit bold :foreground ,red))) - `(package-status-available ((,class :foreground ,fg-special-mild))) - `(package-status-built-in ((,class :foreground ,magenta))) - `(package-status-dependency ((,class :foreground ,magenta-alt-other))) - `(package-status-disabled ((,class :inherit modus-theme-subtle-red))) - `(package-status-external ((,class :foreground ,cyan-alt-other))) - `(package-status-held ((,class :foreground ,yellow-alt))) - `(package-status-incompat ((,class :inherit bold :foreground ,yellow))) - `(package-status-installed ((,class :foreground ,fg-special-warm))) - `(package-status-new ((,class :inherit bold :foreground ,green))) - `(package-status-unsigned ((,class :inherit bold :foreground ,red-alt))) -;;;;; page-break-lines - `(page-break-lines ((,class :inherit default :foreground ,fg-window-divider-outer))) -;;;;; paradox - `(paradox-archive-face ((,class :foreground ,fg-special-mild))) - `(paradox-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(paradox-commit-tag-face ((,class :inherit modus-theme-refine-magenta :box t))) - `(paradox-description-face ((,class :foreground ,fg-special-cold))) - `(paradox-description-face-multiline ((,class :foreground ,fg-special-cold))) - `(paradox-download-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,blue-alt-other))) - `(paradox-highlight-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,cyan-alt-other))) - `(paradox-homepage-button-face ((,class :foreground ,magenta-alt-other :underline t))) - `(paradox-mode-line-face ((,class :inherit bold :foreground ,cyan-active))) - `(paradox-name-face ((,class :foreground ,blue :underline t))) - `(paradox-star-face ((,class :foreground ,magenta))) - `(paradox-starred-face ((,class :foreground ,magenta-alt))) -;;;;; paren-face - `(parenthesis ((,class :foreground ,fg-unfocused))) -;;;;; parrot - `(parrot-rotate-rotation-highlight-face ((,class :inherit modus-theme-refine-magenta))) -;;;;; pass - `(pass-mode-directory-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(pass-mode-entry-face ((,class :background ,bg-main :foreground ,fg-main))) - `(pass-mode-header-face ((,class :foreground ,fg-special-warm))) -;;;;; persp-mode - `(persp-face-lighter-buffer-not-in-persp ((,class :inherit modus-theme-intense-red))) - `(persp-face-lighter-default ((,class :inherit bold :foreground ,blue-active))) - `(persp-face-lighter-nil-persp ((,class :inherit bold :foreground ,fg-active))) -;;;;; perspective - `(persp-selected-face ((,class :inherit bold :foreground ,blue-active))) -;;;;; phi-grep - `(phi-grep-heading-face ((,class :inherit bold :foreground ,red-alt - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))) - `(phi-grep-line-number-face ((,class :foreground ,fg-special-warm))) - `(phi-grep-match-face ((,class :inherit modus-theme-special-calm))) - `(phi-grep-modified-face ((,class :inherit modus-theme-refine-yellow))) - `(phi-grep-overlay-face ((,class :inherit modus-theme-refine-blue))) -;;;;; phi-search - `(phi-replace-preview-face ((,class :inherit modus-theme-intense-magenta))) - `(phi-search-failpart-face ((,class :inherit modus-theme-refine-red))) - `(phi-search-match-face ((,class :inherit modus-theme-refine-cyan))) - `(phi-search-selection-face ((,class :inherit (modus-theme-intense-green bold)))) -;;;;; pkgbuild-mode - `(pkgbuild-error-face ((,class :underline ,fg-lang-error))) -;;;;; pomidor - `(pomidor-break-face ((,class :foreground ,blue-alt-other))) - `(pomidor-overwork-face ((,class :foreground ,red-alt-other))) - `(pomidor-skip-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(pomidor-work-face ((,class :foreground ,green-alt-other))) -;;;;; powerline - `(powerline-active0 ((,class :background ,bg-main :foreground ,blue-faint :inverse-video t))) - `(powerline-active1 ((,class :background ,blue-nuanced-bg :foreground ,blue-nuanced))) - `(powerline-active2 ((,class :background ,bg-active :foreground ,fg-active))) - `(powerline-inactive0 ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) - `(powerline-inactive1 ((,class :background ,bg-dim :foreground ,fg-inactive))) - `(powerline-inactive2 ((,class :background ,bg-inactive :foreground ,fg-inactive))) -;;;;; powerline-evil - `(powerline-evil-base-face ((,class :background ,fg-main :foreground ,bg-main))) - `(powerline-evil-emacs-face ((,class :inherit modus-theme-active-magenta))) - `(powerline-evil-insert-face ((,class :inherit modus-theme-active-green))) - `(powerline-evil-motion-face ((,class :inherit modus-theme-active-blue))) - `(powerline-evil-normal-face ((,class :background ,fg-alt :foreground ,bg-main))) - `(powerline-evil-operator-face ((,class :inherit modus-theme-active-yellow))) - `(powerline-evil-replace-face ((,class :inherit modus-theme-active-red))) - `(powerline-evil-visual-face ((,class :inherit modus-theme-active-cyan))) -;;;;; proced - `(proced-mark ((,class :inherit modus-theme-mark-symbol))) - `(proced-marked ((,class :inherit modus-theme-mark-alt))) - `(proced-sort-header ((,class :inherit bold :foreground ,fg-special-calm :underline t))) -;;;;; prodigy - `(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))) - `(rainbow-blocks-depth-3-face ((,class :foreground ,magenta-alt))) - `(rainbow-blocks-depth-4-face ((,class :foreground ,green))) - `(rainbow-blocks-depth-5-face ((,class :foreground ,magenta))) - `(rainbow-blocks-depth-6-face ((,class :foreground ,cyan))) - `(rainbow-blocks-depth-7-face ((,class :foreground ,yellow))) - `(rainbow-blocks-depth-8-face ((,class :foreground ,cyan-alt))) - `(rainbow-blocks-depth-9-face ((,class :foreground ,red-alt))) - `(rainbow-blocks-unmatched-face ((,class :foreground ,red))) -;;;;; rainbow-identifiers - `(rainbow-identifiers-identifier-1 ((,class :foreground ,green-alt-other))) - `(rainbow-identifiers-identifier-2 ((,class :foreground ,magenta-alt-other))) - `(rainbow-identifiers-identifier-3 ((,class :foreground ,cyan-alt-other))) - `(rainbow-identifiers-identifier-4 ((,class :foreground ,yellow-alt-other))) - `(rainbow-identifiers-identifier-5 ((,class :foreground ,blue-alt-other))) - `(rainbow-identifiers-identifier-6 ((,class :foreground ,green-alt))) - `(rainbow-identifiers-identifier-7 ((,class :foreground ,magenta-alt))) - `(rainbow-identifiers-identifier-8 ((,class :foreground ,cyan-alt))) - `(rainbow-identifiers-identifier-9 ((,class :foreground ,yellow-alt))) - `(rainbow-identifiers-identifier-10 ((,class :foreground ,green))) - `(rainbow-identifiers-identifier-11 ((,class :foreground ,magenta))) - `(rainbow-identifiers-identifier-12 ((,class :foreground ,cyan))) - `(rainbow-identifiers-identifier-13 ((,class :foreground ,yellow))) - `(rainbow-identifiers-identifier-14 ((,class :foreground ,blue-alt))) - `(rainbow-identifiers-identifier-15 ((,class :foreground ,red-alt))) -;;;;; rainbow-delimiters - `(rainbow-delimiters-base-face-error ((,class :foreground ,red))) - `(rainbow-delimiters-base-face ((,class :foreground ,fg-main))) - `(rainbow-delimiters-depth-1-face ((,class :foreground ,green-alt-other))) - `(rainbow-delimiters-depth-2-face ((,class :foreground ,magenta-alt-other))) - `(rainbow-delimiters-depth-3-face ((,class :foreground ,cyan-alt-other))) - `(rainbow-delimiters-depth-4-face ((,class :foreground ,yellow-alt-other))) - `(rainbow-delimiters-depth-5-face ((,class :foreground ,blue-alt-other))) - `(rainbow-delimiters-depth-6-face ((,class :foreground ,green-alt))) - `(rainbow-delimiters-depth-7-face ((,class :foreground ,magenta-alt))) - `(rainbow-delimiters-depth-8-face ((,class :foreground ,cyan-alt))) - `(rainbow-delimiters-depth-9-face ((,class :foreground ,yellow-alt))) - `(rainbow-delimiters-mismatched-face ((,class :inherit bold :foreground ,red-alt))) - `(rainbow-delimiters-unmatched-face ((,class :inherit bold :foreground ,red))) -;;;;; rcirc - `(rcirc-bright-nick ((,class :inherit bold :foreground ,magenta-alt))) - `(rcirc-dim-nick ((,class :foreground ,fg-alt))) - `(rcirc-my-nick ((,class :inherit bold :foreground ,magenta))) - `(rcirc-nick-in-message ((,class :foreground ,magenta-alt-other))) - `(rcirc-nick-in-message-full-line ((,class :inherit bold :foreground ,fg-special-mild))) - `(rcirc-other-nick ((,class :inherit bold :foreground ,fg-special-cold))) - `(rcirc-prompt ((,class :inherit bold :foreground ,cyan-alt-other))) - `(rcirc-server ((,class :foreground ,fg-unfocused))) - `(rcirc-timestamp ((,class :foreground ,blue-nuanced))) - `(rcirc-url ((,class :foreground ,blue :underline t))) -;;;;; regexp-builder (re-builder) - `(reb-match-0 ((,class :inherit modus-theme-intense-blue))) - `(reb-match-1 ((,class :inherit modus-theme-intense-magenta))) - `(reb-match-2 ((,class :inherit modus-theme-intense-green))) - `(reb-match-3 ((,class :inherit modus-theme-intense-red))) - `(reb-regexp-grouping-backslash ((,class :inherit bold :foreground ,fg-escape-char-backslash))) - `(reb-regexp-grouping-construct ((,class :inherit bold :foreground ,fg-escape-char-construct))) -;;;;; rg (rg.el) - `(rg-column-number-face ((,class :foreground ,magenta-alt-other))) - `(rg-context-face ((,class :foreground ,fg-unfocused))) - `(rg-error-face ((,class :inherit bold :foreground ,red))) - `(rg-file-tag-face ((,class :foreground ,fg-special-cold))) - `(rg-filename-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(rg-line-number-face ((,class :foreground ,fg-special-warm))) - `(rg-literal-face ((,class :foreground ,blue-alt))) - `(rg-match-face ((,class :inherit modus-theme-special-calm))) - `(rg-regexp-face ((,class :foreground ,magenta-active))) - `(rg-toggle-off-face ((,class :inherit bold :foreground ,fg-inactive))) - `(rg-toggle-on-face ((,class :inherit bold :foreground ,cyan-active))) - `(rg-warning-face ((,class :inherit bold :foreground ,yellow))) -;;;;; ripgrep - `(ripgrep-context-face ((,class :foreground ,fg-unfocused))) - `(ripgrep-error-face ((,class :inherit bold :foreground ,red))) - `(ripgrep-hit-face ((,class :foreground ,cyan))) - `(ripgrep-match-face ((,class :inherit modus-theme-special-calm))) -;;;;; rmail - `(rmail-header-name ((,class :foreground ,cyan-alt-other))) - `(rmail-highlight ((,class :inherit bold :foreground ,magenta-alt))) -;;;;; ruler-mode - `(ruler-mode-column-number ((,class :inherit (ruler-mode-default bold) :foreground ,fg-main))) - `(ruler-mode-comment-column ((,class :inherit ruler-mode-default :foreground ,red-active))) - `(ruler-mode-current-column ((,class :inherit ruler-mode-default :foreground ,cyan-active :box t))) - `(ruler-mode-default ((,class :background ,bg-inactive :foreground ,fg-inactive))) - `(ruler-mode-fill-column ((,class :inherit ruler-mode-default :foreground ,green-active))) - `(ruler-mode-fringes ((,class :inherit ruler-mode-default :foreground ,blue-active))) - `(ruler-mode-goal-column ((,class :inherit ruler-mode-default :foreground ,magenta-active))) - `(ruler-mode-margins ((,class :inherit ruler-mode-default :foreground ,bg-main))) - `(ruler-mode-pad ((,class :background ,bg-active :foreground ,fg-inactive))) - `(ruler-mode-tab-stop ((,class :inherit ruler-mode-default :foreground ,yellow-active))) -;;;;; sallet - `(sallet-buffer-compressed ((,class :foreground ,yellow-nuanced :slant italic))) - `(sallet-buffer-default-directory ((,class :foreground ,cyan-nuanced))) - `(sallet-buffer-directory ((,class :foreground ,blue-nuanced))) - `(sallet-buffer-help ((,class :foreground ,fg-special-cold))) - `(sallet-buffer-modified ((,class :foreground ,yellow-alt-other :slant italic))) - `(sallet-buffer-ordinary ((,class :foreground ,fg-main))) - `(sallet-buffer-read-only ((,class :foreground ,yellow-alt))) - `(sallet-buffer-size ((,class :foreground ,fg-special-calm))) - `(sallet-buffer-special ((,class :foreground ,magenta-alt-other))) - `(sallet-flx-match ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-cyan - 'modus-theme-refine-cyan - 'modus-theme-nuanced-cyan - cyan-alt-other)))) - `(sallet-recentf-buffer-name ((,class :foreground ,blue-nuanced))) - `(sallet-recentf-file-path ((,class :foreground ,fg-special-mild))) - `(sallet-regexp-match ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-refine-magenta - 'modus-theme-nuanced-magenta - magenta-alt-other)))) - `(sallet-source-header ((,class :inherit bold :foreground ,red-alt - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))) - `(sallet-substring-match ((,class ,@(modus-operandi-theme-extra-completions - 'modus-theme-subtle-blue - 'modus-theme-refine-blue - 'modus-theme-nuanced-blue - blue-alt-other)))) -;;;;; selectrum - `(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))) - `(semantic-decoration-on-protected-members-face ((,class :background ,bg-dim))) - `(semantic-highlight-edits-face ((,class :background ,bg-alt))) - `(semantic-highlight-func-current-tag-face ((,class :background ,bg-alt))) - `(semantic-idle-symbol-highlight ((,class :inherit modus-theme-special-mild))) - `(semantic-tag-boundary-face ((,class :overline ,blue-intense))) - `(semantic-unmatched-syntax-face ((,class :underline ,fg-lang-error))) -;;;;; sesman - `(sesman-browser-button-face ((,class :foreground ,blue-alt-other :underline t))) - `(sesman-browser-highligh-face ((,class :inherit modus-theme-subtle-blue))) - `(sesman-buffer-face ((,class :foreground ,magenta))) - `(sesman-directory-face ((,class :inherit bold :foreground ,blue))) - `(sesman-project-face ((,class :inherit bold :foreground ,magenta-alt-other))) -;;;;; shell-script-mode - `(sh-heredoc ((,class :foreground ,blue-alt))) - `(sh-quoted-exec ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-alt))) -;;;;; show-paren-mode - `(show-paren-match ((,class ,@(modus-operandi-theme-paren bg-paren-match - bg-paren-match-intense) - :foreground ,fg-main))) - `(show-paren-match-expression ((,class :inherit modus-theme-special-calm))) - `(show-paren-mismatch ((,class :inherit modus-theme-intense-red))) -;;;;; side-notes - `(side-notes ((,class :background ,bg-dim :foreground ,fg-dim))) -;;;;; skewer-mode - `(skewer-error-face ((,class :foreground ,red :underline t))) -;;;;; smart-mode-line - `(sml/charging ((,class :foreground ,green-active))) - `(sml/discharging ((,class :foreground ,red-active))) - `(sml/filename ((,class :inherit bold :foreground ,blue-active))) - `(sml/folder ((,class :foreground ,fg-active))) - `(sml/git ((,class :inherit bold :foreground ,green-active))) - `(sml/global ((,class :foreground ,fg-active))) - `(sml/line-number ((,class :inherit sml/global))) - `(sml/minor-modes ((,class :inherit sml/global))) - `(sml/modes ((,class :inherit bold :foreground ,fg-active))) - `(sml/modified ((,class :inherit bold :foreground ,magenta-active))) - `(sml/mule-info ((,class :inherit sml/global))) - `(sml/name-filling ((,class :foreground ,yellow-active))) - `(sml/not-modified ((,class :inherit sml/global))) - `(sml/numbers-separator ((,class :inherit sml/global))) - `(sml/outside-modified ((,class :inherit modus-theme-intense-red))) - `(sml/position-percentage ((,class :inherit sml/global))) - `(sml/prefix ((,class :foreground ,green-active))) - `(sml/process ((,class :inherit sml/prefix))) - `(sml/projectile ((,class :inherit sml/git))) - `(sml/read-only ((,class :inherit bold :foreground ,cyan-active))) - `(sml/remote ((,class :inherit sml/global))) - `(sml/sudo ((,class :inherit modus-theme-subtle-red))) - `(sml/time ((,class :inherit sml/global))) - `(sml/vc ((,class :inherit sml/git))) - `(sml/vc-edited ((,class :inherit bold :foreground ,yellow-active))) -;;;;; smartparens - `(sp-pair-overlay-face ((,class :inherit modus-theme-special-warm))) - `(sp-show-pair-enclosing ((,class :inherit modus-theme-special-mild))) - `(sp-show-pair-match-face ((,class ,@(modus-operandi-theme-paren bg-paren-match - bg-paren-match-intense) - :foreground ,fg-main))) - `(sp-show-pair-mismatch-face ((,class :inherit modus-theme-intense-red))) - `(sp-wrap-overlay-closing-pair ((,class :inherit sp-pair-overlay-face))) - `(sp-wrap-overlay-face ((,class :inherit sp-pair-overlay-face))) - `(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 :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 :inherit modus-theme-diff-refine-added))) - `(smerge-refined-changed ((,class))) - `(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))) - `(spaceline-evil-motion ((,class :inherit modus-theme-active-blue))) - `(spaceline-evil-normal ((,class :background ,fg-alt :foreground ,bg-alt))) - `(spaceline-evil-replace ((,class :inherit modus-theme-active-red))) - `(spaceline-evil-visual ((,class :inherit modus-theme-active-cyan))) - `(spaceline-flycheck-error ((,class :foreground ,red-active))) - `(spaceline-flycheck-info ((,class :foreground ,cyan-active))) - `(spaceline-flycheck-warning ((,class :foreground ,yellow-active))) - `(spaceline-highlight-face ((,class :inherit modus-theme-fringe-blue))) - `(spaceline-modified ((,class :inherit modus-theme-fringe-magenta))) - `(spaceline-python-venv ((,class :foreground ,magenta-active))) - `(spaceline-read-only ((,class :inherit modus-theme-fringe-red))) - `(spaceline-unmodified ((,class :inherit modus-theme-fringe-cyan))) -;;;;; speedbar - `(speedbar-button-face ((,class :inherit link))) - `(speedbar-directory-face ((,class :inherit bold :foreground ,blue))) - `(speedbar-file-face ((,class :foreground ,fg-main))) - `(speedbar-highlight-face ((,class :inherit modus-theme-subtle-blue))) - `(speedbar-selected-face ((,class :inherit bold :foreground ,cyan))) - `(speedbar-separator-face ((,class :inherit modus-theme-intense-neutral))) - `(speedbar-tag-face ((,class :foreground ,yellow-alt-other))) -;;;;; spell-fu - `(spell-fu-incorrect-face - ((,(append '((supports :underline (:style wave))) class) - :foreground ,fg-lang-error :underline (:style wave)) - (,class :foreground ,fg-lang-error :underline t))) -;;;;; stripes - `(stripes ((,class :inherit modus-theme-hl-line))) -;;;;; success - `(suggest-heading ((,class :inherit bold :foreground ,yellow-alt-other))) -;;;;; switch-window - `(switch-window-background ((,class :background ,bg-dim))) - `(switch-window-label ((,class :height 3.0 :foreground ,blue-intense))) -;;;;; swiper - `(swiper-background-match-face-1 ((,class :inherit modus-theme-subtle-neutral))) - `(swiper-background-match-face-2 ((,class :inherit modus-theme-subtle-cyan))) - `(swiper-background-match-face-3 ((,class :inherit modus-theme-subtle-magenta))) - `(swiper-background-match-face-4 ((,class :inherit modus-theme-subtle-green))) - `(swiper-line-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t)) - :inherit modus-theme-special-cold))) - `(swiper-match-face-1 ((,class :inherit swiper-line-face))) - `(swiper-match-face-2 ((,class :inherit swiper-line-face))) - `(swiper-match-face-3 ((,class :inherit swiper-line-face))) - `(swiper-match-face-4 ((,class :inherit swiper-line-face))) -;;;;; swoop - `(swoop-face-header-format-line ((,class :inherit bold :foreground ,red-alt - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-3)))) - `(swoop-face-line-buffer-name ((,class :inherit bold :foreground ,blue-alt - ,@(modus-operandi-theme-scale modus-operandi-theme-scale-4)))) - `(swoop-face-line-number ((,class :foreground ,fg-special-warm))) - `(swoop-face-target-line ((,class :inherit modus-theme-intense-blue - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(swoop-face-target-words ((,class :inherit modus-theme-refine-cyan))) -;;;;; sx - `(sx-inbox-item-type ((,class :foreground ,magenta-alt-other))) - `(sx-inbox-item-type-unread ((,class :inherit (sx-inbox-item-type bold)))) - `(sx-question-list-answers ((,class :foreground ,green))) - `(sx-question-list-answers-accepted ((,class :box t :foreground ,green))) - `(sx-question-list-bounty ((,class :inherit bold :background ,bg-alt :foreground ,yellow))) - `(sx-question-list-date ((,class :foreground ,fg-special-cold))) - `(sx-question-list-favorite ((,class :inherit bold :foreground ,fg-special-warm))) - `(sx-question-list-parent ((,class :foreground ,fg-main))) - `(sx-question-list-read-question ((,class :foreground ,fg-alt))) - `(sx-question-list-score ((,class :foreground ,fg-special-mild))) - `(sx-question-list-score-upvoted ((,class :inherit (sx-question-list-score bold)))) - `(sx-question-list-unread-question ((,class :inherit bold :foreground ,fg-main))) - `(sx-question-mode-accepted ((,class :inherit bold :height 1.3 :foreground ,green))) - `(sx-question-mode-closed ((,class :inherit modus-theme-active-yellow :box (:line-width 2 :color nil)))) - `(sx-question-mode-closed-reason ((,class :box (:line-width 2 :color nil) :foreground ,fg-main))) - `(sx-question-mode-content-face ((,class :background ,bg-dim))) - `(sx-question-mode-date ((,class :foreground ,blue))) - `(sx-question-mode-header ((,class :inherit bold :foreground ,cyan))) - `(sx-question-mode-kbd-tag ((,class :inherit bold :height 0.9 :box (:line-width 3 :color ,fg-main :style released-button) :foreground ,fg-main))) - `(sx-question-mode-score ((,class :foreground ,fg-dim))) - `(sx-question-mode-score-downvoted ((,class :foreground ,yellow))) - `(sx-question-mode-score-upvoted ((,class :inherit bold :foreground ,magenta))) - `(sx-question-mode-title ((,class :inherit bold :foreground ,fg-main))) - `(sx-question-mode-title-comments ((,class :inherit bold :foreground ,fg-alt))) - `(sx-tag ((,class :foreground ,magenta-alt))) - `(sx-user-name ((,class :foreground ,blue-alt))) - `(sx-user-reputation ((,class :foreground ,fg-alt))) -;;;;; symbol-overlay - `(symbol-overlay-default-face ((,class :inherit modus-theme-special-warm))) - `(symbol-overlay-face-1 ((,class :inherit modus-theme-intense-blue))) - `(symbol-overlay-face-2 ((,class :inherit modus-theme-refine-magenta))) - `(symbol-overlay-face-3 ((,class :inherit modus-theme-intense-yellow))) - `(symbol-overlay-face-4 ((,class :inherit modus-theme-intense-magenta))) - `(symbol-overlay-face-5 ((,class :inherit modus-theme-intense-red))) - `(symbol-overlay-face-6 ((,class :inherit modus-theme-refine-red))) - `(symbol-overlay-face-7 ((,class :inherit modus-theme-intense-cyan))) - `(symbol-overlay-face-8 ((,class :inherit modus-theme-refine-cyan))) -;;;;; syslog-mode - `(syslog-debug ((,class :inherit bold :foreground ,cyan-alt-other))) - `(syslog-error ((,class :inherit bold :foreground ,red))) - `(syslog-file ((,class :inherit bold :foreground ,fg-special-cold))) - `(syslog-hide ((,class :background ,bg-main :foreground ,fg-main))) - `(syslog-hour ((,class :inherit bold :foreground ,magenta-alt-other))) - `(syslog-info ((,class :inherit bold :foreground ,blue-alt-other))) - `(syslog-ip ((,class :inherit bold :foreground ,fg-special-mild :underline t))) - `(syslog-su ((,class :inherit bold :foreground ,red-alt))) - `(syslog-warn ((,class :inherit bold :foreground ,yellow))) -;;;;; table (built-in table.el) - `(table-cell ((,class :background ,blue-nuanced-bg))) -;;;;; telephone-line - `(telephone-line-accent-active ((,class :background ,fg-inactive :foreground ,bg-inactive))) - `(telephone-line-accent-inactive ((,class :background ,bg-active :foreground ,fg-active))) - `(telephone-line-error ((,class :inherit bold :foreground ,red-active))) - `(telephone-line-evil ((,class :foreground ,fg-main))) - `(telephone-line-evil-emacs ((,class :inherit telephone-line-evil :background ,magenta-intense-bg))) - `(telephone-line-evil-insert ((,class :inherit telephone-line-evil :background ,green-intense-bg))) - `(telephone-line-evil-motion ((,class :inherit telephone-line-evil :background ,yellow-intense-bg))) - `(telephone-line-evil-normal ((,class :inherit telephone-line-evil :background ,bg-alt))) - `(telephone-line-evil-operator ((,class :inherit telephone-line-evil :background ,yellow-subtle-bg))) - `(telephone-line-evil-replace ((,class :inherit telephone-line-evil :background ,red-intense-bg))) - `(telephone-line-evil-visual ((,class :inherit telephone-line-evil :background ,cyan-intense-bg))) - `(telephone-line-projectile ((,class :foreground ,cyan-active))) - `(telephone-line-unimportant ((,class :foreground ,fg-inactive))) - `(telephone-line-warning ((,class :inherit bold :foreground ,yellow-active))) -;;;;; term - `(term ((,class :background ,bg-main :foreground ,fg-main))) - `(term-bold ((,class :inherit bold))) - `(term-color-blue ((,class :background ,blue :foreground ,blue))) - `(term-color-cyan ((,class :background ,cyan :foreground ,cyan))) - `(term-color-green ((,class :background ,green :foreground ,green))) - `(term-color-magenta ((,class :background ,magenta :foreground ,magenta))) - `(term-color-red ((,class :background ,red :foreground ,red))) - `(term-color-yellow ((,class :background ,yellow :foreground ,yellow))) - `(term-underline ((,class :underline t))) -;;;;; tomatinho - `(tomatinho-ok-face ((,class :foreground ,blue-intense))) - `(tomatinho-pause-face ((,class :foreground ,yellow-intense))) - `(tomatinho-reset-face ((,class :foreground ,fg-alt))) -;;;;; transient - `(transient-active-infix ((,class :inherit modus-theme-special-mild))) - `(transient-amaranth ((,class :inherit bold :foreground ,yellow))) - `(transient-argument ((,class :inherit bold :foreground ,red-alt))) - `(transient-blue ((,class :inherit bold :foreground ,blue))) - `(transient-disabled-suffix ((,class :inherit modus-theme-intense-red))) - `(transient-enabled-suffix ((,class :inherit modus-theme-intense-green))) - `(transient-heading ((,class :inherit bold :foreground ,fg-main))) - `(transient-inactive-argument ((,class :foreground ,fg-alt))) - `(transient-inactive-value ((,class :foreground ,fg-alt))) - `(transient-key ((,class :inherit bold :foreground ,blue))) - `(transient-mismatched-key ((,class :underline t))) - `(transient-nonstandard-key ((,class :underline t))) - `(transient-pink ((,class :inherit bold :foreground ,magenta))) - `(transient-red ((,class :inherit bold :foreground ,red-intense))) - `(transient-teal ((,class :inherit bold :foreground ,cyan-alt-other))) - `(transient-unreachable ((,class :foreground ,fg-unfocused))) - `(transient-unreachable-key ((,class :foreground ,fg-unfocused))) - `(transient-value ((,class :foreground ,magenta-alt))) -;;;;; trashed - `(trashed-deleted ((,class :inherit modus-theme-mark-del))) - `(trashed-directory ((,class :foreground ,blue))) - `(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 :inherit button :foreground ,cyan-alt))) -;;;;; treemacs - `(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt))) - `(treemacs-directory-face ((,class :inherit dired-directory))) - `(treemacs-file-face ((,class :foreground ,fg-main))) - `(treemacs-fringe-indicator-face ((,class :foreground ,fg-main))) - `(treemacs-git-added-face ((,class :foreground ,green-intense))) - `(treemacs-git-conflict-face ((,class :inherit (modus-theme-intense-red bold)))) - `(treemacs-git-ignored-face ((,class :foreground ,fg-alt))) - `(treemacs-git-modified-face ((,class :foreground ,yellow-alt-other))) - `(treemacs-git-renamed-face ((,class :foreground ,cyan-alt-other))) - `(treemacs-git-unmodified-face ((,class :foreground ,fg-main))) - `(treemacs-git-untracked-face ((,class :foreground ,red-alt-other))) - `(treemacs-help-column-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,magenta-alt-other :underline t))) - `(treemacs-help-title-face ((,class :foreground ,blue-alt-other))) - `(treemacs-on-failure-pulse-face ((,class :inherit modus-theme-intense-red))) - `(treemacs-on-success-pulse-face ((,class :inherit modus-theme-intense-green))) - `(treemacs-root-face ((,class :inherit bold :foreground ,blue-alt-other :height 1.2 :underline t))) - `(treemacs-root-remote-disconnected-face ((,class :inherit treemacs-root-remote-face :foreground ,yellow))) - `(treemacs-root-remote-face ((,class :inherit treemacs-root-face :foreground ,magenta))) - `(treemacs-root-remote-unreadable-face ((,class :inherit treemacs-root-unreadable-face))) - `(treemacs-root-unreadable-face ((,class :inherit treemacs-root-face :strike-through t))) - `(treemacs-tags-face ((,class :foreground ,blue-alt))) - `(treemacs-tags-face ((,class :foreground ,magenta-alt))) -;;;;; tty-menu - `(tty-menu-disabled-face ((,class :background ,bg-alt :foreground ,fg-alt))) - `(tty-menu-enabled-face ((,class :inherit bold :background ,bg-alt :foreground ,fg-main))) - `(tty-menu-selected-face ((,class :inherit modus-theme-intense-blue))) -;;;;; tuareg - `(caml-types-def-face ((,class :inherit modus-theme-subtle-red))) - `(caml-types-expr-face ((,class :inherit modus-theme-subtle-green))) - `(caml-types-occ-face ((,class :inherit modus-theme-subtle-green))) - `(caml-types-scope-face ((,class :inherit modus-theme-subtle-blue))) - `(caml-types-typed-face ((,class :inherit modus-theme-subtle-magenta))) - `(tuareg-font-double-semicolon-face ((,class ,@(modus-operandi-theme-syntax-foreground - red-alt red-alt-faint)))) - `(tuareg-font-lock-attribute-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(tuareg-font-lock-constructor-face ((,class :foreground ,fg-main))) - `(tuareg-font-lock-error-face ((,class :inherit (modus-theme-intense-red bold)))) - `(tuareg-font-lock-extension-node-face ((,class :background ,bg-alt :foreground ,magenta))) - `(tuareg-font-lock-governing-face ((,class :inherit bold :foreground ,fg-main))) - `(tuareg-font-lock-infix-extension-node-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(tuareg-font-lock-interactive-directive-face ((,class :foreground ,fg-special-cold))) - `(tuareg-font-lock-interactive-error-face ((,class :inherit bold - ,@(modus-operandi-theme-syntax-foreground - red red-faint)))) - `(tuareg-font-lock-interactive-output-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(tuareg-font-lock-label-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(tuareg-font-lock-line-number-face ((,class :foreground ,fg-special-warm))) - `(tuareg-font-lock-module-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint)))) - `(tuareg-font-lock-multistage-face ((,class :inherit bold :background ,bg-alt - ,@(modus-operandi-theme-syntax-foreground - blue blue-faint)))) - `(tuareg-font-lock-operator-face ((,class ,@(modus-operandi-theme-syntax-foreground - red-alt red-alt-faint)))) - `(tuareg-opam-error-face ((,class :inherit bold - ,@(modus-operandi-theme-syntax-foreground - red red-faint)))) - `(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-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 :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 :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 :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))) - `(vimish-fold-mouse-face ((,class :inherit modus-theme-intense-blue))) - `(vimish-fold-overlay ((,class :background ,bg-alt :foreground ,fg-special-cold))) -;;;;; visible-mark - `(visible-mark-active ((,class :background ,blue-intense-bg))) - `(visible-mark-face1 ((,class :background ,cyan-intense-bg))) - `(visible-mark-face2 ((,class :background ,yellow-intense-bg))) - `(visible-mark-forward-face1 ((,class :background ,magenta-intense-bg))) - `(visible-mark-forward-face2 ((,class :background ,green-intense-bg))) -;;;;; visual-regexp - `(vr/group-0 ((,class :inherit modus-theme-intense-blue))) - `(vr/group-1 ((,class :inherit modus-theme-intense-magenta))) - `(vr/group-2 ((,class :inherit modus-theme-intense-green))) - `(vr/match-0 ((,class :inherit modus-theme-refine-yellow))) - `(vr/match-1 ((,class :inherit modus-theme-refine-yellow))) - `(vr/match-separator-face ((,class :inherit (modus-theme-intense-neutral bold)))) -;;;;; volatile-highlights - `(vhl/default-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t)) - :background ,bg-alt :foreground ,blue-nuanced))) -;;;;; vterm - `(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))) - `(vterm-color-green ((,class :background ,green :foreground ,green))) - `(vterm-color-inverse-video ((,class :background ,bg-main :inverse-video t))) - `(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 "gray65" :foreground "gray65"))) - `(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow))) -;;;;; wcheck-mode - `(wcheck-default-face ((,class :foreground ,red :underline t))) -;;;;; web-mode - `(web-mode-annotation-face ((,class :inherit web-mode-comment-face))) - `(web-mode-annotation-html-face ((,class :inherit web-mode-comment-face))) - `(web-mode-annotation-tag-face ((,class :inherit web-mode-comment-face :underline t))) - `(web-mode-block-attr-name-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue blue-faint)))) - `(web-mode-block-attr-value-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(web-mode-block-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-block-control-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(web-mode-block-delimiter-face ((,class :foreground ,fg-main))) - `(web-mode-block-face ((,class :background ,bg-dim))) - `(web-mode-block-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-bold-face ((,class :inherit bold))) - `(web-mode-builtin-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(web-mode-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(web-mode-comment-keyword-face ((,class :inherit bold :background ,bg-dim - ,@(modus-operandi-theme-syntax-foreground - yellow yellow-faint)))) - `(web-mode-constant-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(web-mode-css-at-rule-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(web-mode-css-color-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(web-mode-css-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-css-function-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(web-mode-css-priority-face ((,class ,@(modus-operandi-theme-syntax-foreground - yellow-alt yellow-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(web-mode-css-property-name-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan cyan-faint)))) - `(web-mode-css-pseudo-class-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(web-mode-css-selector-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(web-mode-css-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-css-variable-face ((,class :foreground ,fg-special-warm))) - `(web-mode-current-column-highlight-face ((,class :background ,bg-alt))) - `(web-mode-current-element-highlight-face ((,class :inherit modus-theme-special-mild))) - `(web-mode-doctype-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(web-mode-error-face ((,class :inherit modus-theme-intense-red))) - `(web-mode-filter-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-folded-face ((,class :underline t))) - `(web-mode-function-call-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-function-name-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-html-attr-custom-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan cyan-faint)))) - `(web-mode-html-attr-engine-face ((,class :foreground ,fg-main))) - `(web-mode-html-attr-equal-face ((,class :foreground ,fg-main))) - `(web-mode-html-attr-name-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan cyan-faint)))) - `(web-mode-html-attr-value-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(web-mode-html-entity-face ((,class ,@(modus-operandi-theme-syntax-foreground - yellow-alt-other yellow-alt-other-faint) - :slant ,modus-theme-slant))) - `(web-mode-html-tag-bracket-face ((,class :foreground ,fg-dim))) - `(web-mode-html-tag-custom-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-html-tag-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-html-tag-namespaced-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(web-mode-html-tag-unclosed-face ((,class ,@(modus-operandi-theme-syntax-foreground - red red-faint) - :underline t))) - `(web-mode-inlay-face ((,class :background ,bg-alt))) - `(web-mode-italic-face ((,class :slant italic))) - `(web-mode-javascript-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-javascript-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-json-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-json-context-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint)))) - `(web-mode-json-key-face ((,class :foreground ,blue-nuanced))) - `(web-mode-json-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-jsx-depth-1-face ((,class :background ,blue-intense-bg :foreground ,fg-main))) - `(web-mode-jsx-depth-2-face ((,class :background ,blue-subtle-bg :foreground ,fg-main))) - `(web-mode-jsx-depth-3-face ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) - `(web-mode-jsx-depth-4-face ((,class :background ,bg-alt :foreground ,blue-refine-fg))) - `(web-mode-jsx-depth-5-face ((,class :background ,bg-alt :foreground ,blue-nuanced))) - `(web-mode-keyword-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-operandi-theme-bold-weight)))) - `(web-mode-param-name-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-part-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-part-face ((,class :inherit web-mode-block-face))) - `(web-mode-part-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-preprocessor-face ((,class ,@(modus-operandi-theme-syntax-foreground - red-alt-other red-alt-other-faint)))) - `(web-mode-script-face ((,class :inherit web-mode-part-face))) - `(web-mode-sql-keyword-face ((,class :inherit bold - ,@(modus-operandi-theme-syntax-foreground - yellow yellow-faint)))) - `(web-mode-string-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt blue-alt-faint)))) - `(web-mode-style-face ((,class :inherit web-mode-part-face))) - `(web-mode-symbol-face ((,class ,@(modus-operandi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(web-mode-type-face ((,class ,@(modus-operandi-theme-syntax-foreground - magenta-alt magenta-alt-faint)))) - `(web-mode-underline-face ((,class :underline t))) - `(web-mode-variable-name-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan cyan-faint)))) - `(web-mode-warning-face ((,class :inherit bold :background ,bg-alt - ,@(modus-operandi-theme-syntax-foreground - yellow-alt-other yellow-alt-other-faint)))) - `(web-mode-whitespace-face ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) -;;;;; wgrep - `(wgrep-delete-face ((,class :inherit modus-theme-refine-yellow))) - `(wgrep-done-face ((,class :inherit modus-theme-refine-blue))) - `(wgrep-face ((,class :inherit modus-theme-refine-green))) - `(wgrep-file-face ((,class :foreground ,fg-special-warm))) - `(wgrep-reject-face ((,class :inherit (modus-theme-intense-red bold)))) -;;;;; which-function-mode - `(which-func ((,class :foreground ,magenta-active))) -;;;;; which-key - `(which-key-command-description-face ((,class :foreground ,cyan))) - `(which-key-group-description-face ((,class :foreground ,magenta-alt))) - `(which-key-highlighted-command-face ((,class :foreground ,cyan-alt :underline t))) - `(which-key-key-face ((,class :inherit bold :foreground ,blue-intense))) - `(which-key-local-map-description-face ((,class :foreground ,fg-main))) - `(which-key-note-face ((,class :background ,bg-dim :foreground ,fg-special-mild))) - `(which-key-separator-face ((,class :foreground ,fg-alt))) - `(which-key-special-key-face ((,class :inherit bold :foreground ,yellow-intense))) -;;;;; whitespace-mode - `(whitespace-big-indent ((,class :inherit modus-theme-subtle-red))) - `(whitespace-empty ((,class :inherit modus-theme-intense-magenta))) - `(whitespace-hspace ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-indentation ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-line ((,class :inherit modus-theme-special-warm))) - `(whitespace-newline ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-space ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-space-after-tab ((,class :inherit modus-theme-subtle-magenta))) - `(whitespace-space-before-tab ((,class :inherit modus-theme-subtle-cyan))) - `(whitespace-tab ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-trailing ((,class :inherit modus-theme-intense-red))) -;;;;; window-divider-mode - `(window-divider ((,class :foreground ,fg-window-divider-inner))) - `(window-divider-first-pixel ((,class :foreground ,fg-window-divider-outer))) - `(window-divider-last-pixel ((,class :foreground ,fg-window-divider-outer))) -;;;;; winum - `(winum-face ((,class ,@(modus-operandi-theme-bold-weight) :foreground ,cyan-active))) -;;;;; writegood-mode - `(writegood-duplicates-face ((,class :background ,bg-alt :foreground ,red-alt :underline t))) - `(writegood-passive-voice-face ((,class :foreground ,yellow-nuanced :underline ,fg-lang-warning))) - `(writegood-weasels-face ((,class :foreground ,red-nuanced :underline ,fg-lang-error))) -;;;;; woman - `(woman-addition ((,class :foreground ,magenta-alt-other))) - `(woman-bold ((,class :inherit bold :foreground ,magenta))) - `(woman-italic ((,class :foreground ,cyan :slant italic))) - `(woman-unknown ((,class :foreground ,yellow :slant italic))) -;;;;; xah-elisp-mode - `(xah-elisp-at-symbol ((,class :inherit bold - ,@(modus-operandi-theme-syntax-foreground - red-alt red-alt-faint)))) - `(xah-elisp-cap-variable ((,class ,@(modus-operandi-theme-syntax-foreground - red-alt-other red-alt-other-faint)))) - `(xah-elisp-command-face ((,class ,@(modus-operandi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(xah-elisp-dollar-symbol ((,class ,@(modus-operandi-theme-syntax-foreground - green green-faint)))) -;;;;; xref - `(xref-file-header ((,class :inherit bold :foreground ,fg-special-cold))) - `(xref-line-number ((,class :foreground ,fg-alt))) - `(xref-match ((,class :inherit match))) -;;;;; yaml-mode - `(yaml-tab-face ((,class :inherit modus-theme-intense-red))) -;;;;; yasnippet - `(yas-field-highlight-face ((,class :background ,bg-alt :foreground ,fg-main))) -;;;;; ztree - `(ztreep-arrow-face ((,class :foreground ,fg-inactive))) - `(ztreep-diff-header-face ((,class :inherit bold :height 1.2 :foreground ,fg-special-cold))) - `(ztreep-diff-header-small-face ((,class :inherit bold :foreground ,fg-special-mild))) - `(ztreep-diff-model-add-face ((,class :foreground ,green))) - `(ztreep-diff-model-diff-face ((,class :foreground ,red))) - `(ztreep-diff-model-ignored-face ((,class :foreground ,fg-alt :strike-through t))) - `(ztreep-diff-model-normal-face ((,class :foreground ,fg-alt))) - `(ztreep-expand-sign-face ((,class :foreground ,blue))) - `(ztreep-header-face ((,class :inherit bold :height 1.2 :foreground ,fg-special-cold))) - `(ztreep-leaf-face ((,class :foreground ,cyan))) - `(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm))) - `(ztreep-node-face ((,class :foreground ,fg-main)))) -;;;; Emacs 27+ - (when (>= emacs-major-version 27) - (custom-theme-set-faces - 'modus-operandi -;;;;; line numbers (`display-line-numbers-mode' and global variant) - ;; 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 :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) - :background ,bg-tab-active :foreground ,fg-main))) - `(tab-bar-tab-inactive ((,class :box (:line-width 2 :color ,bg-tab-inactive) - :background ,bg-tab-inactive :foreground ,fg-dim))) -;;;;; tab-line-mode - `(tab-line ((,class :height 0.95 :background ,bg-tab-bar :foreground ,fg-main))) - `(tab-line-close-highlight ((,class :foreground ,red))) - `(tab-line-highlight ((,class :background ,blue-subtle-bg :foreground ,fg-dim))) - `(tab-line-tab ((,class :inherit bold :box (:line-width 2 :color ,bg-tab-active) - :background ,bg-tab-active :foreground ,fg-main))) - `(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)) - `(flymake-note-bitmap '(exclamation-mark modus-theme-fringe-cyan)) -;;;; ibuffer - `(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-pseudo-header) -;;;; highlight-tail - `(highlight-tail-colors - '((,green-subtle-bg . 0) - (,cyan-subtle-bg . 20))) -;;;; hl-todo - `(hl-todo-keyword-faces - '(("HOLD" . ,yellow-alt) - ("TODO" . ,magenta) - ("NEXT" . ,magenta-alt-other) - ("THEM" . ,magenta-alt) - ("PROG" . ,cyan) - ("OKAY" . ,cyan-alt) - ("DONT" . ,green-alt) - ("FAIL" . ,red) - ("BUG" . ,red) - ("DONE" . ,green) - ("NOTE" . ,yellow-alt-other) - ("KLUDGE" . ,yellow) - ("HACK" . ,yellow) - ("TEMP" . ,red-nuanced) - ("FIXME" . ,red-alt-other) - ("XXX+" . ,red-alt) - ("REVIEW" . ,cyan-alt-other) - ("DEPRECATED" . ,blue-nuanced))) -;;;; vc-annotate (C-x v g) - `(vc-annotate-background nil) - `(vc-annotate-background-mode nil) - `(vc-annotate-color-map - '((20 . ,red) - (40 . ,magenta) - (60 . ,magenta-alt) - (80 . ,red-alt) - (100 . ,yellow) - (120 . ,yellow-alt) - (140 . ,fg-special-warm) - (160 . ,fg-special-mild) - (180 . ,green) - (200 . ,green-alt) - (220 . ,cyan-alt-other) - (240 . ,cyan-alt) - (260 . ,cyan) - (280 . ,fg-special-cold) - (300 . ,blue) - (320 . ,blue-alt) - (340 . ,blue-alt-other) - (360 . ,magenta-alt-other))) - `(vc-annotate-very-old-color nil) -;;;; xterm-color - `(xterm-color-names [,fg-main ,red ,green ,yellow ,blue ,magenta ,cyan ,bg-alt]) - `(xterm-color-names-bright [,fg-alt ,red-alt ,green-alt ,yellow-alt ,blue-alt ,magenta-alt ,cyan-alt ,bg-main])) -;;; Conditional theme variables -;;;; org-src-block-faces - ;; this is a user option to add a colour-coded background to source - ;; blocks for various programming languages - (when (eq modus-operandi-theme-org-blocks 'rainbow) - (custom-theme-set-variables - 'modus-operandi - `(org-src-block-faces ; TODO this list should be expanded - `(("emacs-lisp" modus-theme-nuanced-magenta) - ("elisp" modus-theme-nuanced-magenta) - ("clojure" modus-theme-nuanced-magenta) - ("clojurescript" modus-theme-nuanced-magenta) - ("c" modus-theme-nuanced-blue) - ("c++" modus-theme-nuanced-blue) - ("sh" modus-theme-nuanced-green) - ("shell" modus-theme-nuanced-green) - ("html" modus-theme-nuanced-yellow) - ("xml" modus-theme-nuanced-yellow) - ("css" modus-theme-nuanced-red) - ("scss" modus-theme-nuanced-red) - ("python" modus-theme-nuanced-green) - ("ipython" modus-theme-nuanced-magenta) - ("r" modus-theme-nuanced-cyan) - ("yaml" modus-theme-nuanced-cyan) - ("conf" modus-theme-nuanced-cyan) - ("docker" modus-theme-nuanced-cyan) - ("json" modus-theme-nuanced-cyan)))))) +(deftheme modus-operandi + "Accessible and customizable light theme (WCAG AAA standard). +Conforms with the highest legibility standard for color contrast +between background and foreground in any given piece of text, +which corresponds to a minimum contrast in relative luminance of +7:1.") -;;; library provides -;;;###autoload -(when load-file-name - (add-to-list 'custom-theme-load-path - (file-name-as-directory (file-name-directory load-file-name)))) +(modus-themes-theme modus-operandi) (provide-theme 'modus-operandi) -(provide 'modus-operandi-theme) - ;;; modus-operandi-theme.el ends here diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el new file mode 100644 index 00000000000..b9fe4a32729 --- /dev/null +++ b/etc/themes/modus-themes.el @@ -0,0 +1,7598 @@ +;;; modus-themes.el --- Highly accessible themes (WCAG AAA) -*- lexical-binding:t -*- + +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. + +;; Author: Protesilaos Stavrou <info@protesilaos.com> +;; URL: https://gitlab.com/protesilaos/modus-themes +;; Version: 1.5.0 +;; Last-Modified: <2021-07-15 13:21:55 +0300> +;; Package-Requires: ((emacs "26.1")) +;; Keywords: faces, theme, accessibility + +;; This file is part of GNU Emacs. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or (at +;; your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <https://www.gnu.org/licenses/>. + +;;; Commentary: +;; +;; The Modus themes conform with the highest standard for color-contrast +;; accessibility between background and foreground values (WCAG AAA). +;; This file contains all customization variables, helper functions, +;; interactive commands, and face specifications. Please refer to the +;; official Info manual for further documentation (distributed with the +;; themes, or available at: <https://protesilaos.com/modus-themes>). +;; +;; The themes share the following customization variables: +;; +;; modus-themes-inhibit-reload (boolean) +;; modus-themes-italic-constructs (boolean) +;; modus-themes-bold-constructs (boolean) +;; modus-themes-variable-pitch-headings (boolean) +;; modus-themes-variable-pitch-ui (boolean) +;; modus-themes-scale-headings (boolean) +;; modus-themes-subtle-line-numbers (boolean) +;; modus-themes-success-deuteranopia (boolean) +;; modus-themes-no-mixed-fonts (boolean) +;; modus-themes-headings (alist) +;; modus-themes-fringes (choice) +;; modus-themes-lang-checkers (choice) +;; modus-themes-org-agenda (alist) +;; modus-themes-org-blocks (choice) +;; modus-themes-prompts (choice) +;; modus-themes-mode-line (choice) +;; modus-themes-diffs (choice) +;; modus-themes-syntax (choice) +;; modus-themes-hl-line (choice) +;; modus-themes-paren-match (choice) +;; modus-themes-region (choice) +;; modus-themes-links (choice) +;; modus-themes-completions (choice) +;; modus-themes-mail-citations (choice) +;; +;; The default scale for headings is as follows (it can be customized as +;; well---remember, no scaling takes place by default): +;; +;; modus-themes-scale-1 1.05 +;; modus-themes-scale-2 1.1 +;; modus-themes-scale-3 1.15 +;; modus-themes-scale-4 1.2 +;; modus-themes-scale-title 1.3 +;; +;; There also exist two unique customization variables for overriding +;; color palette values. The specifics are documented in the manual. +;; The symbols are: +;; +;; modus-themes-operandi-color-overrides (alist) +;; modus-themes-vivendi-color-overrides (alist) +;; +;; Below is the list of explicitly supported packages or face groups +;; (there are implicitly supported packages as well, which inherit from +;; font-lock or some basic group). You are encouraged to report any +;; missing package or change you would like to see. +;; +;; ace-window +;; ag +;; alert +;; all-the-icons +;; annotate +;; anzu +;; apropos +;; apt-sources-list +;; artbollocks-mode +;; auctex and TeX +;; auto-dim-other-buffers +;; avy +;; awesome-tray +;; bbdb +;; binder +;; bm +;; bongo +;; boon +;; bookmark +;; breakpoint (provided by built-in gdb-mi.el) +;; buffer-expose +;; calendar and diary +;; calfw +;; centaur-tabs +;; cfrs +;; change-log and log-view (`vc-print-log' and `vc-print-root-log') +;; cider +;; circe +;; color-rg +;; column-enforce-mode +;; company-mode +;; company-posframe +;; compilation-mode +;; completions +;; consult +;; corfu +;; counsel +;; counsel-css +;; counsel-org-capture-string +;; cov +;; cperl-mode +;; css-mode +;; csv-mode +;; ctrlf +;; custom (M-x customize) +;; dap-mode +;; dashboard (emacs-dashboard) +;; deadgrep +;; debbugs +;; define-word +;; deft +;; dictionary +;; diff-hl +;; diff-mode +;; dim-autoload +;; dir-treeview +;; dired +;; dired-async +;; dired-git +;; dired-git-info +;; dired-narrow +;; dired-subtree +;; diredc +;; diredfl +;; diredp (dired+) +;; disk-usage +;; display-fill-column-indicator-mode +;; doom-modeline +;; dynamic-ruler +;; easy-jekyll +;; easy-kill +;; ebdb +;; ediff +;; eglot +;; el-search +;; eldoc +;; eldoc-box +;; elfeed +;; elfeed-score +;; embark +;; emms +;; enh-ruby-mode (enhanced-ruby-mode) +;; epa +;; equake +;; erc +;; eros +;; ert +;; eshell +;; eshell-fringe-status +;; eshell-git-prompt +;; eshell-prompt-extras (epe) +;; eshell-syntax-highlighting +;; evil (evil-mode) +;; evil-goggles +;; evil-snipe +;; evil-visual-mark-mode +;; eww +;; exwm +;; eyebrowse +;; fancy-dabbrev +;; flycheck +;; flycheck-color-mode-line +;; flycheck-indicator +;; flycheck-posframe +;; flymake +;; flyspell +;; flyspell-correct +;; flx +;; freeze-it +;; frog-menu +;; focus +;; fold-this +;; font-lock (generic syntax highlighting) +;; forge +;; fountain (fountain-mode) +;; geiser +;; git-commit +;; git-gutter (and variants) +;; git-lens +;; git-rebase +;; git-timemachine +;; git-walktree +;; gnus +;; gotest +;; golden-ratio-scroll-screen +;; helm +;; helm-ls-git +;; helm-switch-shell +;; helm-xref +;; helpful +;; highlight-blocks +;; highlight-defined +;; highlight-escape-sequences (`hes-mode') +;; highlight-indentation +;; highlight-numbers +;; highlight-symbol +;; highlight-tail +;; highlight-thing +;; hl-defined +;; hl-fill-column +;; hl-line-mode +;; hl-todo +;; hydra +;; hyperlist +;; ibuffer +;; icomplete +;; ido-mode +;; iedit +;; iflipb +;; imenu-list +;; indium +;; info +;; info-colors +;; interaction-log +;; ioccur +;; isearch, occur, etc. +;; isl (isearch-light) +;; ivy +;; ivy-posframe +;; jira (org-jira) +;; journalctl-mode +;; js2-mode +;; julia +;; jupyter +;; kaocha-runner +;; keycast +;; ledger-mode +;; line numbers (`display-line-numbers-mode' and global variant) +;; lsp-mode +;; lsp-ui +;; macrostep +;; magit +;; magit-imerge +;; make-mode +;; man +;; marginalia +;; markdown-mode +;; markup-faces (`adoc-mode') +;; mentor +;; messages +;; minibuffer-line +;; minimap +;; mmm-mode +;; mode-line +;; mood-line +;; mpdel +;; mu4e +;; mu4e-conversation +;; multiple-cursors +;; neotree +;; no-emoji +;; notmuch +;; num3-mode +;; nxml-mode +;; objed +;; orderless +;; org +;; org-journal +;; org-noter +;; org-pomodoro +;; org-recur +;; org-roam +;; org-superstar +;; org-table-sticky-header +;; org-tree-slide +;; org-treescope +;; origami +;; outline-mode +;; outline-minor-faces +;; package (M-x list-packages) +;; page-break-lines +;; pandoc-mode +;; paradox +;; paren-face +;; parrot +;; pass +;; pdf-tools +;; persp-mode +;; perspective +;; phi-grep +;; phi-search +;; pkgbuild-mode +;; pomidor +;; popup +;; powerline +;; powerline-evil +;; prism (see "Note for prism.el" in the manual) +;; proced +;; prodigy +;; pulse +;; quick-peek +;; racket-mode +;; rainbow-blocks +;; rainbow-identifiers +;; rainbow-delimiters +;; rcirc +;; recursion-indicator +;; regexp-builder (also known as `re-builder') +;; rg +;; ripgrep +;; rmail +;; ruler-mode +;; sallet +;; selectrum +;; selectrum-prescient +;; semantic +;; sesman +;; shell-script-mode +;; shortdoc +;; show-paren-mode +;; shr +;; side-notes +;; sieve-mode +;; skewer-mode +;; smart-mode-line +;; smartparens +;; smerge +;; spaceline +;; speedbar +;; spell-fu +;; spray +;; stripes +;; suggest +;; switch-window +;; swiper +;; swoop +;; sx +;; symbol-overlay +;; syslog-mode +;; tab-bar-groups +;; tab-bar-mode +;; tab-line-mode +;; table (built-in table.el) +;; telega +;; telephone-line +;; terraform-mode +;; term +;; tomatinho +;; transient (pop-up windows like Magit's) +;; trashed +;; treemacs +;; tty-menu +;; tuareg +;; typescript +;; undo-tree +;; vc (vc-dir.el, vc-hooks.el) +;; vc-annotate (C-x v g) +;; vdiff +;; vertico +;; vimish-fold +;; visible-mark +;; visual-regexp +;; volatile-highlights +;; vterm +;; wcheck-mode +;; web-mode +;; wgrep +;; which-function-mode +;; which-key +;; whitespace-mode +;; window-divider-mode +;; winum +;; writegood-mode +;; woman +;; xah-elisp-mode +;; xref +;; xterm-color (and ansi-colors) +;; yaml-mode +;; yasnippet +;; ztree +;; +;; For a complete view of the project, also refer to the following files +;; (should be distributed in the same repository/directory as the +;; current item): +;; +;; - modus-operandi-theme.el (Light theme) +;; - modus-vivendi-theme.el (Dark theme) + +;;; Code: + + + +(eval-when-compile (require 'cl-lib)) + +(defgroup modus-themes () + "Options for `modus-operandi', `modus-vivendi'. +The Modus themes conform with the WCAG AAA standard for color +contrast between background and foreground combinations (a +minimum contrast of 7:1---the highest standard of its kind). The +themes also strive to empower users with red-green color +deficiency: this is achieved through customization variables that +replace all relevant instances of green with blue, as well as the +overall design of the themes which relies mostly on colors that +cover the blue-cyan-magenta side of the spectrum." + :group 'faces + :link '(info-link "(modus-themes) Top") + :prefix "modus-themes-" + :tag "Modus Themes") + +(defgroup modus-themes-faces () + "Faces defined my `modus-operandi' and `modus-vivendi'." + :group 'modus-themes + :link '(info-link "(modus-themes) Top") + :prefix "modus-themes-" + :tag "Modus Themes Faces") + +;;; Variables for each theme variant + +;;;; Modus Operandi + +(defconst modus-themes-operandi-colors + '(;; base values + (bg-main . "#ffffff") (fg-main . "#000000") + (bg-dim . "#f8f8f8") (fg-dim . "#282828") + (bg-alt . "#f0f0f0") (fg-alt . "#505050") + ;; specifically for on/off states and must be combined with + ;; themselves, though the backgrounds are also meant to be used with + ;; other "active" values, defined further below; bg-active-accent + ;; can work as a substitute for bg-active + (bg-active . "#d7d7d7") (fg-active . "#0a0a0a") + (bg-inactive . "#efefef") (fg-inactive . "#404148") + (bg-active-accent . "#d0d6ff") + ;; these special values are intended as alternatives to the base + ;; values for cases where we need to avoid confusion between the + ;; highlighted constructs; they must either be used as pairs based + ;; on their name or each can be combined with {fg,bg}-{main,alt,dim} + ;; always in accordance with their role as background or foreground + (bg-special-cold . "#dde3f4") (fg-special-cold . "#093060") + (bg-special-mild . "#c4ede0") (fg-special-mild . "#184034") + (bg-special-warm . "#f0e0d4") (fg-special-warm . "#5d3026") + (bg-special-calm . "#f8ddea") (fg-special-calm . "#61284f") + ;; foregrounds that can be combined with bg-main, bg-dim, bg-alt + (red . "#a60000") + (red-alt . "#972500") + (red-alt-other . "#a0132f") + (red-faint . "#7f1010") + (red-alt-faint . "#702f00") + (red-alt-other-faint . "#7f002f") + (green . "#005e00") + (green-alt . "#315b00") + (green-alt-other . "#145c33") + (green-faint . "#104410") + (green-alt-faint . "#30440f") + (green-alt-other-faint . "#0f443f") + (yellow . "#813e00") + (yellow-alt . "#70480f") + (yellow-alt-other . "#863927") + (yellow-faint . "#5f4400") + (yellow-alt-faint . "#5d5000") + (yellow-alt-other-faint . "#5e3a20") + (blue . "#0031a9") + (blue-alt . "#2544bb") + (blue-alt-other . "#0000c0") + (blue-faint . "#003497") + (blue-alt-faint . "#0f3d8c") + (blue-alt-other-faint . "#001087") + (magenta . "#721045") + (magenta-alt . "#8f0075") + (magenta-alt-other . "#5317ac") + (magenta-faint . "#752f50") + (magenta-alt-faint . "#7b206f") + (magenta-alt-other-faint . "#55348e") + (cyan . "#00538b") + (cyan-alt . "#30517f") + (cyan-alt-other . "#005a5f") + (cyan-faint . "#005077") + (cyan-alt-faint . "#354f6f") + (cyan-alt-other-faint . "#125458") + ;; these foreground values can only be combined with bg-main and are + ;; thus not suitable for general purpose highlighting + (red-intense . "#b60000") + (orange-intense . "#904200") + (green-intense . "#006800") + (yellow-intense . "#605b00") + (blue-intense . "#1f1fce") + (magenta-intense . "#a8007f") + (purple-intense . "#7f10d0") + (cyan-intense . "#005f88") + ;; those foregrounds are meant exclusively for bg-active, bg-inactive + (red-active . "#8a0000") + (green-active . "#004c2e") + (yellow-active . "#702f00") + (blue-active . "#0030b4") + (magenta-active . "#5c2092") + (cyan-active . "#003f8a") + ;; the "subtle" values below be combined with fg-dim, while the + ;; "intense" should be paired with fg-main + (red-subtle-bg . "#f2b0a2") + (red-intense-bg . "#ff9f9f") + (green-subtle-bg . "#aecf90") + (green-intense-bg . "#5ada88") + (yellow-subtle-bg . "#e4c340") + (yellow-intense-bg . "#f5df23") + (blue-subtle-bg . "#b5d0ff") + (blue-intense-bg . "#77baff") + (magenta-subtle-bg . "#f0d3ff") + (magenta-intense-bg . "#d5baff") + (cyan-subtle-bg . "#c0efff") + (cyan-intense-bg . "#42cbd4") + ;; those background values must be combined with fg-main and should + ;; only be used for indicators that are placed on the fringes + (red-fringe-bg . "#f08290") + (green-fringe-bg . "#62c86a") + (yellow-fringe-bg . "#dbba3f") + (blue-fringe-bg . "#82afff") + (magenta-fringe-bg . "#e0a3ff") + (cyan-fringe-bg . "#2fcddf") + ;; those background values should only be used for graphs or similar + ;; applications where colored blocks are expected to be positioned + ;; next to each other + (red-graph-0-bg . "#ef6f79") + (red-graph-1-bg . "#ff9f9f") + (green-graph-0-bg . "#49d239") + (green-graph-1-bg . "#6dec6d") + (yellow-graph-0-bg . "#efec08") + (yellow-graph-1-bg . "#dbff4e") + (blue-graph-0-bg . "#55a2f0") + (blue-graph-1-bg . "#7fcfff") + (magenta-graph-0-bg . "#ba86ef") + (magenta-graph-1-bg . "#e7afff") + (cyan-graph-0-bg . "#30d3f0") + (cyan-graph-1-bg . "#6fefff") + ;; the following are for cases where both the foreground and the + ;; background need to have a similar hue and so must be combined + ;; with themselves, even though the foregrounds can be paired with + ;; any of the base backgrounds + (red-refine-bg . "#ffcccc") (red-refine-fg . "#780000") + (green-refine-bg . "#aceaac") (green-refine-fg . "#004c00") + (yellow-refine-bg . "#fff29a") (yellow-refine-fg . "#604000") + (blue-refine-bg . "#8fcfff") (blue-refine-fg . "#002f88") + (magenta-refine-bg . "#ffccff") (magenta-refine-fg . "#770077") + (cyan-refine-bg . "#8eecf4") (cyan-refine-fg . "#004850") + ;; the "nuanced" backgrounds can be combined with all of the above + ;; foregrounds, as well as those included here, while the "nuanced" + ;; foregrounds can in turn also be combined with bg-main, bg-dim, + ;; bg-alt + (red-nuanced-bg . "#fff1f0") (red-nuanced-fg . "#5f0000") + (green-nuanced-bg . "#ecf7ed") (green-nuanced-fg . "#004000") + (yellow-nuanced-bg . "#fff3da") (yellow-nuanced-fg . "#3f3000") + (blue-nuanced-bg . "#f3f3ff") (blue-nuanced-fg . "#201f55") + (magenta-nuanced-bg . "#fdf0ff") (magenta-nuanced-fg . "#541f4f") + (cyan-nuanced-bg . "#ebf6fa") (cyan-nuanced-fg . "#0f3360") + ;; the following are reserved for specific cases + ;; + ;; 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 grayscale 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 colors + ;; + ;; bg-paren-match, bg-paren-match-intense, bg-region, + ;; bg-region-accent and bg-tab-active must be combined with fg-main, + ;; while bg-tab-inactive should be combined with fg-dim, whereas + ;; bg-tab-inactive-alt goes together with fg-main + ;; + ;; bg-tab-bar is only intended for the bar that holds the tabs and + ;; can only be combined with fg-main + ;; + ;; fg-escape-char-construct and fg-escape-char-backslash can + ;; be combined bg-main, bg-dim, bg-alt + ;; + ;; fg-lang-error, fg-lang-warning, fg-lang-note can be + ;; combined with bg-main, bg-dim, bg-alt + ;; + ;; fg-mark-sel, fg-mark-del, fg-mark-alt can be combined + ;; with bg-main, bg-dim, bg-alt, bg-hl-line + ;; + ;; fg-unfocused must be combined with bg-main + ;; + ;; fg-docstring, fg-comment-yellow can be combined with + ;; bg-main, bg-dim, bg-alt + ;; + ;; the window divider colors apply to faces with just an fg value + ;; + ;; all pairs are combinable with themselves + (bg-hl-line . "#f2eff3") + (bg-hl-line-intense . "#e0e0e0") + (bg-hl-line-intense-accent . "#b9e1ef") + (bg-hl-alt . "#fbeee0") + (bg-hl-alt-intense . "#e8dfd1") + (bg-paren-match . "#e0af82") + (bg-paren-match-intense . "#c488ff") + (bg-paren-expression . "#dff0ff") + (bg-region . "#bcbcbc") + (bg-region-accent . "#afafef") + (bg-region-accent-subtle . "#efdfff") + + (bg-tab-bar . "#d5d5d5") + (bg-tab-active . "#f6f6f6") + (bg-tab-inactive . "#bdbdbd") + (bg-tab-inactive-alt . "#999999") + + (red-tab . "#680000") + (green-tab . "#003900") + (yellow-tab . "#393000") + (orange-tab . "#502300") + (blue-tab . "#000080") + (cyan-tab . "#052f60") + (magenta-tab . "#5f004d") + (purple-tab . "#400487") + + (fg-escape-char-construct . "#8b1030") + (fg-escape-char-backslash . "#654d0f") + + (fg-lang-error . "#9f004f") + (fg-lang-warning . "#604f0f") + (fg-lang-note . "#4040ae") + (fg-lang-underline-error . "#ef4f54") + (fg-lang-underline-warning . "#cf9f00") + (fg-lang-underline-note . "#3f6fef") + + (fg-window-divider-inner . "#888888") + (fg-window-divider-outer . "#585858") + + (fg-unfocused . "#56576d") + + (fg-docstring . "#2a486a") + (fg-comment-yellow . "#794319") + + (bg-header . "#e5e5e5") (fg-header . "#2a2a2a") + + (bg-whitespace . "#f5efef") (fg-whitespace . "#624956") + + (bg-diff-heading . "#b7cfe0") (fg-diff-heading . "#041645") + (bg-diff-added . "#d4fad4") (fg-diff-added . "#004500") + (bg-diff-added-deuteran . "#daefff") (fg-diff-added-deuteran . "#002044") + (bg-diff-changed . "#fcefcf") (fg-diff-changed . "#524200") + (bg-diff-removed . "#ffe8ef") (fg-diff-removed . "#691616") + + (bg-diff-refine-added . "#94cf94") (fg-diff-refine-added . "#002a00") + (bg-diff-refine-added-deuteran . "#77c0ef") (fg-diff-refine-added-deuteran . "#000035") + (bg-diff-refine-changed . "#cccf8f") (fg-diff-refine-changed . "#302010") + (bg-diff-refine-removed . "#daa2b0") (fg-diff-refine-removed . "#400000") + + (bg-diff-focus-added . "#bbeabb") (fg-diff-focus-added . "#002c00") + (bg-diff-focus-added-deuteran . "#bacfff") (fg-diff-focus-added-deuteran . "#001755") + (bg-diff-focus-changed . "#ecdfbf") (fg-diff-focus-changed . "#392900") + (bg-diff-focus-removed . "#efcbcf") (fg-diff-focus-removed . "#4a0000") + + (bg-mark-sel . "#a0f0cf") (fg-mark-sel . "#005040") + (bg-mark-del . "#ffccbb") (fg-mark-del . "#840040") + (bg-mark-alt . "#f5d88f") (fg-mark-alt . "#782900")) + "The entire palette of the `modus-operandi' theme. +Each element has the form (NAME . HEX) with the former as a +symbol and the latter as a string.") + +;;;; Modus Vivendi + +(defconst modus-themes-vivendi-colors + '(;; base values + (bg-main . "#000000") (fg-main . "#ffffff") + (bg-dim . "#100f10") (fg-dim . "#e0e6f0") + (bg-alt . "#191a1b") (fg-alt . "#a8a8a8") + ;; specifically for on/off states and must be combined with + ;; themselves, though the backgrounds are also meant to be used with + ;; other "active" values, defined further below; bg-active-accent + ;; can work as a substitute for bg-active + (bg-active . "#323232") (fg-active . "#f4f4f4") + (bg-inactive . "#1e1e1e") (fg-inactive . "#bfc0c4") + (bg-active-accent . "#2a2a66") + ;; these special values are intended as alternatives to the base + ;; values for cases where we need to avoid confusion between the + ;; highlighted constructs; they must either be used as pairs based + ;; on their name or each can be combined with {fg,bg}-{main,alt,dim} + ;; always in accordance with their role as background or foreground + (bg-special-cold . "#203448") (fg-special-cold . "#c6eaff") + (bg-special-mild . "#00322e") (fg-special-mild . "#bfebe0") + (bg-special-warm . "#382f27") (fg-special-warm . "#f8dec0") + (bg-special-calm . "#392a48") (fg-special-calm . "#fbd6f4") + ;; foregrounds that can be combined with bg-main, bg-dim, bg-alt + (red . "#ff8059") + (red-alt . "#ef8b50") + (red-alt-other . "#ff9077") + (red-faint . "#ffa0a0") + (red-alt-faint . "#f5aa80") + (red-alt-other-faint . "#ff9fbf") + (green . "#44bc44") + (green-alt . "#70b900") + (green-alt-other . "#00c06f") + (green-faint . "#78bf78") + (green-alt-faint . "#99b56f") + (green-alt-other-faint . "#88bf99") + (yellow . "#d0bc00") + (yellow-alt . "#c0c530") + (yellow-alt-other . "#d3b55f") + (yellow-faint . "#d2b580") + (yellow-alt-faint . "#cabf77") + (yellow-alt-other-faint . "#d0ba95") + (blue . "#2fafff") + (blue-alt . "#79a8ff" ) + (blue-alt-other . "#00bcff") + (blue-faint . "#82b0ec") + (blue-alt-faint . "#a0acef") + (blue-alt-other-faint . "#80b2f0") + (magenta . "#feacd0") + (magenta-alt . "#f78fe7") + (magenta-alt-other . "#b6a0ff") + (magenta-faint . "#e0b2d6") + (magenta-alt-faint . "#ef9fe4") + (magenta-alt-other-faint . "#cfa6ff") + (cyan . "#00d3d0") + (cyan-alt . "#4ae2f0") + (cyan-alt-other . "#6ae4b9") + (cyan-faint . "#90c4ed") + (cyan-alt-faint . "#a0bfdf") + (cyan-alt-other-faint . "#a4d0bb") + ;; these foreground values can only be combined with bg-main and are + ;; thus not suitable for general purpose highlighting + (red-intense . "#fe6060") + (orange-intense . "#fba849") + (green-intense . "#4fe42f") + (yellow-intense . "#f0dd60") + (blue-intense . "#4fafff") + (magenta-intense . "#ff62d4") + (purple-intense . "#9f80ff") + (cyan-intense . "#3fdfd0") + ;; those foregrounds are meant exclusively for bg-active, bg-inactive + (red-active . "#ffa7ba") + (green-active . "#70d73f") + (yellow-active . "#dbbe5f") + (blue-active . "#34cfff") + (magenta-active . "#d5b1ff") + (cyan-active . "#00d8b4") + ;; the "subtle" values below be combined with fg-dim, while the + ;; "intense" should be paired with fg-main + (red-subtle-bg . "#762422") + (red-intense-bg . "#a4202a") + (green-subtle-bg . "#2f4a00") + (green-intense-bg . "#006800") + (yellow-subtle-bg . "#604200") + (yellow-intense-bg . "#874900") + (blue-subtle-bg . "#10387c") + (blue-intense-bg . "#2a40b8") + (magenta-subtle-bg . "#49366e") + (magenta-intense-bg . "#7042a2") + (cyan-subtle-bg . "#00415e") + (cyan-intense-bg . "#005f88") + ;; those background values must be combined with fg-main and should + ;; only be used for indicators that are placed on the fringes + (red-fringe-bg . "#8f1f4b") + (green-fringe-bg . "#006700") + (yellow-fringe-bg . "#6f4f00") + (blue-fringe-bg . "#3f33af") + (magenta-fringe-bg . "#6f2f89") + (cyan-fringe-bg . "#004f8f") + ;; those background values should only be used for graphs or similar + ;; applications where colored blocks are expected to be positioned + ;; next to each other + (red-graph-0-bg . "#af0404") + (red-graph-1-bg . "#801f2f") + (green-graph-0-bg . "#24ba2f") + (green-graph-1-bg . "#0f8f07") + (yellow-graph-0-bg . "#ffd03e") + (yellow-graph-1-bg . "#d7d800") + (blue-graph-0-bg . "#406fff") + (blue-graph-1-bg . "#2f50c8") + (magenta-graph-0-bg . "#af7bee") + (magenta-graph-1-bg . "#7f59cf") + (cyan-graph-0-bg . "#47dcfa") + (cyan-graph-1-bg . "#0bc0df") + ;; the following are for cases where both the foreground and the + ;; background need to have a similar hue and so must be combined + ;; with themselves, even though the foregrounds can be paired with + ;; any of the base backgrounds + (red-refine-bg . "#77002a") (red-refine-fg . "#ffb9ab") + (green-refine-bg . "#00422a") (green-refine-fg . "#9ff0cf") + (yellow-refine-bg . "#693200") (yellow-refine-fg . "#e2d980") + (blue-refine-bg . "#242679") (blue-refine-fg . "#8ecfff") + (magenta-refine-bg . "#71206a") (magenta-refine-fg . "#ffcaf0") + (cyan-refine-bg . "#004065") (cyan-refine-fg . "#8ae4f2") + ;; the "nuanced" backgrounds can be combined with all of the above + ;; foregrounds, as well as those included here, while the "nuanced" + ;; foregrounds can in turn also be combined with bg-main, bg-dim, + ;; bg-alt + (red-nuanced-bg . "#2c0614") (red-nuanced-fg . "#ffcccc") + (green-nuanced-bg . "#001904") (green-nuanced-fg . "#b8e2b8") + (yellow-nuanced-bg . "#221000") (yellow-nuanced-fg . "#dfdfb0") + (blue-nuanced-bg . "#0f0e39") (blue-nuanced-fg . "#bfd9ff") + (magenta-nuanced-bg . "#230631") (magenta-nuanced-fg . "#e5cfef") + (cyan-nuanced-bg . "#041529") (cyan-nuanced-fg . "#a8e5e5") + ;; the following are reserved for specific cases + ;; + ;; 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 grayscale 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 colors + ;; + ;; bg-paren-match, bg-paren-match-intense, bg-region, + ;; bg-region-accent and bg-tab-active must be combined with fg-main, + ;; while bg-tab-inactive should be combined with fg-dim, whereas + ;; bg-tab-inactive-alt goes together with fg-main + ;; + ;; bg-tab-bar is only intended for the bar that holds the tabs and + ;; can only be combined with fg-main + ;; + ;; fg-escape-char-construct and fg-escape-char-backslash can + ;; be combined bg-main, bg-dim, bg-alt + ;; + ;; fg-lang-error, fg-lang-warning, fg-lang-note can be + ;; combined with bg-main, bg-dim, bg-alt + ;; + ;; fg-mark-sel, fg-mark-del, fg-mark-alt can be combined + ;; with bg-main, bg-dim, bg-alt, bg-hl-line + ;; + ;; fg-unfocused must be combined with bg-main + ;; + ;; fg-docstring, fg-comment-yellow can be combined with + ;; bg-main, bg-dim, bg-alt + ;; + ;; the window divider colors apply to faces with just an fg value + ;; + ;; all pairs are combinable with themselves + (bg-hl-line . "#151823") + (bg-hl-line-intense . "#292929") + (bg-hl-line-intense-accent . "#00353f") + (bg-hl-alt . "#181732") + (bg-hl-alt-intense . "#282e46") + (bg-paren-match . "#5f362f") + (bg-paren-match-intense . "#7416b5") + (bg-paren-expression . "#221044") + (bg-region . "#3c3c3c") + (bg-region-accent . "#4f3d88") + (bg-region-accent-subtle . "#240f55") + + (bg-tab-bar . "#2c2c2c") + (bg-tab-active . "#0e0e0e") + (bg-tab-inactive . "#3d3d3d") + (bg-tab-inactive-alt . "#595959") + + (red-tab . "#ffc0bf") + (green-tab . "#88ef88") + (yellow-tab . "#d2e580") + (orange-tab . "#f5ca80") + (blue-tab . "#92d9ff") + (cyan-tab . "#60e7e0") + (magenta-tab . "#ffb8ff") + (purple-tab . "#cfcaff") + + (fg-escape-char-construct . "#e7a59a") + (fg-escape-char-backslash . "#abab00") + + (fg-lang-error . "#ef8690") + (fg-lang-warning . "#b0aa00") + (fg-lang-note . "#9d9def") + (fg-lang-underline-error . "#ff4a6f") + (fg-lang-underline-warning . "#d0de00") + (fg-lang-underline-note . "#5f6fff") + + (fg-window-divider-inner . "#646464") + (fg-window-divider-outer . "#969696") + + (fg-unfocused . "#93959b") + + (fg-docstring . "#b0d6f5") + (fg-comment-yellow . "#d0a070") + + (bg-header . "#212121") (fg-header . "#dddddd") + + (bg-whitespace . "#101424") (fg-whitespace . "#aa9e9f") + + (bg-diff-heading . "#304466") (fg-diff-heading . "#dae7ff") + (bg-diff-added . "#0a280a") (fg-diff-added . "#94ba94") + (bg-diff-added-deuteran . "#001a3f") (fg-diff-added-deuteran . "#c4cdf2") + (bg-diff-changed . "#2a2000") (fg-diff-changed . "#b0ba9f") + (bg-diff-removed . "#40160f") (fg-diff-removed . "#c6adaa") + + (bg-diff-refine-added . "#005a36") (fg-diff-refine-added . "#e0f6e0") + (bg-diff-refine-added-deuteran . "#234f8f") (fg-diff-refine-added-deuteran . "#dde4ff") + (bg-diff-refine-changed . "#585800") (fg-diff-refine-changed . "#ffffcc") + (bg-diff-refine-removed . "#852828") (fg-diff-refine-removed . "#ffd9eb") + + (bg-diff-focus-added . "#203d20") (fg-diff-focus-added . "#b4ddb4") + (bg-diff-focus-added-deuteran . "#00405f") (fg-diff-focus-added-deuteran . "#bfe4ff") + (bg-diff-focus-changed . "#4a3a10") (fg-diff-focus-changed . "#d0daaf") + (bg-diff-focus-removed . "#5e2526") (fg-diff-focus-removed . "#eebdba") + + (bg-mark-sel . "#002f2f") (fg-mark-sel . "#60cfa2") + (bg-mark-del . "#5a0000") (fg-mark-del . "#ff99aa") + (bg-mark-alt . "#3f2210") (fg-mark-alt . "#f0aa20")) + "The entire palette of the `modus-vivendi' theme. +Each element has the form (NAME . HEX) with the former as a +symbol and the latter as a string.") + + + +;;; Custom faces + +;; These faces are used internally to ensure consistency between various +;; groups and to streamline the evaluation of relevant customization +;; options. +(defface modus-themes-subtle-red nil + "Subtle red background combined with a dimmed foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-subtle-green nil + "Subtle green background combined with a dimmed foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-subtle-yellow nil + "Subtle yellow background combined with a dimmed foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-subtle-blue nil + "Subtle blue background combined with a dimmed foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-subtle-magenta nil + "Subtle magenta background combined with a dimmed foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-subtle-cyan nil + "Subtle cyan background combined with a dimmed foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-subtle-neutral nil + "Subtle gray background combined with a dimmed foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-intense-red nil + "Intense red background combined with the main foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-intense-green nil + "Intense green background combined with the main foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-intense-yellow nil + "Intense yellow background combined with the main foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-intense-blue nil + "Intense blue background combined with the main foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-intense-magenta nil + "Intense magenta background combined with the main foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-intense-cyan nil + "Intense cyan background combined with the main foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-intense-neutral nil + "Intense gray background combined with the main foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-refine-red nil + "Combination of accented red background and foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-refine-green nil + "Combination of accented green background and foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-refine-yellow nil + "Combination of accented yellow background and foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-refine-blue nil + "Combination of accented blue background and foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-refine-magenta nil + "Combination of accented magenta background and foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-refine-cyan nil + "Combination of accented cyan background and foreground. +This is used for general purpose highlighting, mostly in buffers +or for completion interfaces. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-active-red nil + "A red background meant for use on the mode line or similar. +This is combined with the mode lines primary foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-active-green nil + "A green background meant for use on the mode line or similar. +This is combined with the mode lines primary foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-active-yellow nil + "A yellow background meant for use on the mode line or similar. +This is combined with the mode lines primary foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-active-blue nil + "A blue background meant for use on the mode line or similar. +This is combined with the mode lines primary foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-active-magenta nil + "A magenta background meant for use on the mode line or similar. +This is combined with the mode lines primary foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-active-cyan nil + "A cyan background meant for use on the mode line or similar. +This is combined with the mode lines primary foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-fringe-red nil + "A red background meant for use on the fringe or similar. +This is combined with the main foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-fringe-green nil + "A green background meant for use on the fringe or similar. +This is combined with the main foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-fringe-yellow nil + "A yellow background meant for use on the fringe or similar. +This is combined with the main foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-fringe-blue nil + "A blue background meant for use on the fringe or similar. +This is combined with the main foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-fringe-magenta nil + "A magenta background meant for use on the fringe or similar. +This is combined with the main foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-fringe-cyan nil + "A cyan background meant for use on the fringe or similar. +This is combined with the main foreground value. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-nuanced-red nil + "A nuanced red background. +This does not specify a foreground of its own. Instead it is +meant to serve as the backdrop for elements such as Org blocks, +headings, and any other surface that needs to retain the colors +on display. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-nuanced-green nil + "A nuanced green background. +This does not specify a foreground of its own. Instead it is +meant to serve as the backdrop for elements such as Org blocks, +headings, and any other surface that needs to retain the colors +on display. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-nuanced-yellow nil + "A nuanced yellow background. +This does not specify a foreground of its own. Instead it is +meant to serve as the backdrop for elements such as Org blocks, +headings, and any other surface that needs to retain the colors +on display. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-nuanced-blue nil + "A nuanced blue background. +This does not specify a foreground of its own. Instead it is +meant to serve as the backdrop for elements such as Org blocks, +headings, and any other surface that needs to retain the colors +on display. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-nuanced-magenta nil + "A nuanced magenta background. +This does not specify a foreground of its own. Instead it is +meant to serve as the backdrop for elements such as Org blocks, +headings, and any other surface that needs to retain the colors +on display. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-nuanced-cyan nil + "A nuanced cyan background. +This does not specify a foreground of its own. Instead it is +meant to serve as the backdrop for elements such as Org blocks, +headings, and any other surface that needs to retain the colors +on display. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-special-cold nil + "Combines the 'special cold' background and foreground values. +This is intended for cases when a neutral gray background is not +suitable and where a combination of more saturated colors would +not be appropriate. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-special-mild nil + "Combines the 'special mild' background and foreground values. +This is intended for cases when a neutral gray background is not +suitable and where a combination of more saturated colors would +not be appropriate. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-special-warm nil + "Combines the 'special warm' background and foreground values. +This is intended for cases when a neutral gray background is not +suitable and where a combination of more saturated colors would +not be appropriate. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-special-calm nil + "Combines the 'special calm' background and foreground values. +This is intended for cases when a neutral gray background is not +suitable and where a combination of more saturated colors would +not be appropriate. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-added nil + "Combines green colors for the 'added' state in diffs. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-changed nil + "Combines yellow colors for the 'changed' state in diffs. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-removed nil + "Combines red colors for the 'removed' state in diffs. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-refine-added nil + "Combines green colors for word-wise 'added' state in diffs. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-refine-changed nil + "Combines yellow colors for word-wise 'changed' state in diffs. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-refine-removed nil + "Combines red colors for word-wise 'removed' state in diffs. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-focus-added nil + "Combines green colors for the focused 'added' state in diffs. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-focus-changed nil + "Combines yellow colors for the focused 'changed' state in. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-focus-removed nil + "Combines red colors for the focused 'removed' state in diffs. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-diff-heading nil + "Combines blue colors for the diff hunk heading. +The applied colors are contingent on the value assigned to +`modus-themes-diffs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-pseudo-header nil + "Generic style for some elements that function like headings. +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-mark-alt nil + "Combines yellow colors for marking special lines. +This is intended for use in modes such as Dired, Ibuffer, Proced. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-mark-del nil + "Combines red colors for marking deletable lines. +This is intended for use in modes such as Dired, Ibuffer, Proced. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-mark-sel nil + "Combines green colors for marking lines. +This is intended for use in modes such as Dired, Ibuffer, Proced. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-mark-symbol nil + "Applies a blue color and other styles for mark indicators. +This is intended for use in modes such as Dired, Ibuffer, Proced. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-heading-1 nil + "General purpose face for use in headings level 1. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-headings' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-heading-2 nil + "General purpose face for use in headings level 2. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-headings' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-heading-3 nil + "General purpose face for use in headings level 3. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-headings' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-heading-4 nil + "General purpose face for use in headings level 4. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-headings' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-heading-5 nil + "General purpose face for use in headings level 5. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-headings' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-heading-6 nil + "General purpose face for use in headings level 6. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-headings' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-heading-7 nil + "General purpose face for use in headings level 7. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-headings' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-heading-8 nil + "General purpose face for use in headings level 8. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-headings' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-hl-line nil + "General purpose face for the current line. +The exact attributes assigned to this face are contingent on the +values assigned to the `modus-themes-hl-line' variable. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-bold nil + "Generic face for applying a conditional bold weight. +This behaves in accordance with `modus-themes-bold-constructs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-slant nil + "Generic face for applying a conditional slant (italics). +This behaves in accordance with `modus-themes-italic-constructs'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-variable-pitch nil + "Generic face for applying a conditional `variable-pitch'. +This behaves in accordance with `modus-themes-no-mixed-fonts', +`modus-themes-variable-pitch-headings' for all heading levels, +and `modus-themes-variable-pitch-ui'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-fixed-pitch nil + "Generic face for applying a conditional `fixed-pitch'. +This behaves in accordance with `modus-themes-no-mixed-fonts'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-red-0 nil + "Special subdued red face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-red-1 nil + "Special prominent red face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-green-0 nil + "Special subdued green face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-green-1 nil + "Special prominent green face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-yellow-0 nil + "Special subdued yellow face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-yellow-1 nil + "Special prominent yellow face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-blue-0 nil + "Special subdued blue face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-blue-1 nil + "Special prominent blue face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-magenta-0 nil + "Special subdued magenta face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-magenta-1 nil + "Special prominent magenta face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-cyan-0 nil + "Special subdued cyan face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-graph-cyan-1 nil + "Special prominent cyan face for use in graphs. +This is intended to be applied in contexts such as the Org agenda +habit graph where faithfulness to the semantics of a color value +is of paramount importance. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-lang-note nil + "Generic face for linter or spell checker notes. +The exact attributes and color combinations are controlled by +`modus-themes-lang-checkers'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-lang-warning nil + "Generic face for linter or spell checker warnings. +The exact attributes and color combinations are controlled by +`modus-themes-lang-checkers'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-lang-error nil + "Generic face for linter or spell checker errors. +The exact attributes and color combinations are controlled by +`modus-themes-lang-checkers'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-reset-soft nil + "Generic face to set most face properties to nil. + +This is intended to be inherited by faces that should not retain +properties from their context (e.g. an overlay over an underlined +text should not be underlined as well) yet still blend in. Also +see `modus-themes-reset-hard'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-reset-hard nil + "Generic face to set all face properties to nil. + +This is intended to be inherited by faces that should not retain +properties from their context (e.g. an overlay over an underlined +text should not be underlined as well) and not blend in. Also +see `modus-themes-reset-soft'. + +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-key-binding nil + "Generic face for key bindings. +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-search-success nil + "Generic face for successful search. +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-search-success-modeline nil + "Generic mode line indicator for successful search. +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-search-success-lazy nil + "Generic face for successful, lazily highlighted search. +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + +(defface modus-themes-prompt nil + "Generic face for command prompts. +The actual styling of the face is done by `modus-themes-faces'." + :group 'modus-theme-faces) + + + +;;; Customization variables + +(defcustom modus-themes-inhibit-reload t + "Control theme reload when setting options with Customize. + +By default, customizing a theme-related user option through the +Custom interfaces or with `customize-set-variable' will not +reload the currently active Modus theme. + +Enable this behaviour by setting this variable to nil." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type 'boolean + :link '(info-link "(modus-themes) Custom reload theme")) + +(defun modus-themes--set-option (sym val) + "Custom setter for theme related user options. +Will set SYM to VAL, and reload the current theme, unless +`modus-themes-inhibit-reload' is non-nil." + (set-default sym val) + (unless (or modus-themes-inhibit-reload + ;; Check if a theme is being loaded, in which case we + ;; don't want to reload a theme if the setter is + ;; invoked. `custom--inhibit-theme-enable' is set to nil + ;; by `enable-theme'. + (null (bound-and-true-p custom--inhibit-theme-enable))) + (let ((modus-themes-inhibit-reload t)) + (pcase (modus-themes--current-theme) + ('modus-operandi (modus-themes-load-operandi)) + ('modus-vivendi (modus-themes-load-vivendi)))))) + +(defcustom modus-themes-operandi-color-overrides nil + "Override colors in the Modus Operandi palette. + +For form, see `modus-themes-operandi-colors'." + :group 'modus-themes + :package-version '(modus-themes . "1.1.0") + :version "28.1" + :type '(alist :key-type symbol :value-type color) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Override colors (DIY)")) + +(defcustom modus-themes-vivendi-color-overrides nil + "Override colors in the Modus Vivendi palette. + +For form, see `modus-themes-vivendi-colors'." + :group 'modus-themes + :package-version '(modus-themes . "1.1.0") + :version "28.1" + :type '(alist :key-type symbol :value-type color) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Override colors (DIY)")) + +;; The byte compiler complains when a defcustom isn't a top level form +(let* ((names (mapcar (lambda (pair) + (symbol-name (car pair))) + modus-themes-operandi-colors)) + (colors (mapcar #'intern (sort names #'string<)))) + (put 'modus-themes-operandi-color-overrides + 'custom-options (copy-sequence colors)) + (put 'modus-themes-vivendi-color-overrides + 'custom-options (copy-sequence colors))) + +(defcustom modus-themes-slanted-constructs nil + "Use slanted text in more code constructs (italics or oblique)." + :group 'modus-themes + :package-version '(modus-themes . "1.0.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Slanted constructs")) + +(define-obsolete-variable-alias + 'modus-themes-slanted-constructs + 'modus-themes-italic-constructs + "1.5.0") + +(defcustom modus-themes-italic-constructs nil + "Use italic font forms in more code constructs." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Italic constructs")) + +(defcustom modus-themes-bold-constructs nil + "Use bold text in more code constructs." + :group 'modus-themes + :package-version '(modus-themes . "1.0.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Bold constructs")) + +(defcustom modus-themes-variable-pitch-headings nil + "Use proportional fonts (variable-pitch) in headings." + :group 'modus-themes + :package-version '(modus-themes . "1.0.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Headings' typeface")) + +(defcustom modus-themes-variable-pitch-ui nil + "Use proportional fonts (variable-pitch) in UI elements. +This includes the mode line, header line, tab bar, and tab line." + :group 'modus-themes + :package-version '(modus-themes . "1.1.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) UI typeface")) + +(defcustom modus-themes-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." + :group 'modus-themes + :package-version '(modus-themes . "1.0.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) No mixed fonts")) + +(defconst modus-themes--headings-choice + '(set :tag "Properties" :greedy t + (const :tag "Background color" background) + (const :tag "Overline" overline) + (const :tag "No bold weight" no-bold) + (choice :tag "Colors" + (const :tag "Subtle colors" nil) + (const :tag "Rainbow colors" rainbow) + (const :tag "Monochrome" monochrome))) + "Refer to the doc string of `modus-themes-headings'. +This is a helper variable intended for internal use.") + +(defcustom modus-themes-headings nil + "Heading styles with optional list of values for levels 1-8. + +This is an alist that accepts a (key . list-of-values) +combination. The key is either a number, representing the +heading's level or t, which pertains to the fallback style. The +list of values covers symbols that refer to properties, as +described below. Here is a sample, followed by a presentation of +all available properties: + + (setq modus-themes-headings + '((1 . (background overline)) + (2 . (overline rainbow)) + (t . (monochrome)))) + +By default (a nil value for this variable), all headings have a +bold typographic weight and use a desaturated text color. + +A `rainbow' property makes the text color more saturated. + +An `overline' property draws a line above the area of the +heading. + +A `background' property adds a subtle tinted color to the +background of the heading. + +A `no-bold' property removes the bold weight from the heading's +text. + +A `monochrome' property makes all headings the same base color, +which is that of the default for the active theme (black/white). +When `background' is also set, `monochrome' changes its color to +gray. If both `monochrome' and `rainbow' are set, the former +takes precedence. + +Combinations of any of those properties are expressed as a list, +like in these examples: + + (no-bold) + (rainbow background) + (overline monochrome no-bold) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-headings + '((1 . (background overline rainbow)) + (2 . (background overline)) + (t . (overline no-bold)))) + +When defining the styles per heading level, it is possible to +pass a non-nil value (t) instead of a list of properties. This +will retain the original aesthetic for that level. For example: + + (setq modus-themes-headings + '((1 . t) ; keep the default style + (2 . (background overline)) + (t . (rainbow)))) ; style for all other headings + + (setq modus-themes-headings + '((1 . (background overline)) + (2 . (rainbow no-bold)) + (t . t))) ; default style for all other levels + +For Org users, the extent of the heading depends on the variable +`org-fontify-whole-heading-line'. This affects the `overline' +and `background' properties. Depending on the version of Org, +there may be others, such as `org-fontify-done-headline'. + +Also read `modus-themes-scale-headings' to change the height of +headings and `modus-themes-variable-pitch-headings' to make them +use a proportionately spaced font." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type `(alist + :options ,(mapcar (lambda (el) + (list el modus-themes--headings-choice)) + '(1 2 3 4 5 6 7 8 t)) + :key-type symbol + :value-type ,modus-themes--headings-choice) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Heading styles")) + +(defcustom modus-themes-org-agenda nil + "Control the style of individual Org agenda constructs. + +This is an alist that accepts a (key . value) combination. Here +is a sample, followed by a description of all possible +combinations: + + (setq modus-themes-org-agenda + '((header-block . (variable-pitch scale-title)) + (header-date . (grayscale workaholic bold-today)) + (scheduled . uniform) + (habit . traffic-light))) + +A `header-block' key applies to elements that concern the +headings which demarcate blocks in the structure of the agenda. +By default (a nil value) those are rendered in a bold typographic +weight, plus a height that is slightly taller than the default +font size. Acceptable values come in the form of a list that can +include either or both of those properties: + +- `variable-pitch' to use a proportionately spaced typeface; +- `scale-title' to increase height to `modus-themes-scale-title' + OR `no-scale' to set the font to the same height as the rest of + the buffer. + +In case both `scale-title' and `no-scale' are in the list, the +latter takes precedence. + +Example usage: + + (header-block . nil) + (header-block . (scale-title)) + (header-block . (no-scale)) + (header-block . (variable-pitch scale-title)) + +A `header-date' key covers date headings. Dates use only a +foreground color by default (a nil value), with weekdays and +weekends having a slight difference in hueness. The current date +has an added gray background. This key accepts a list of values +that can include any of the following properties: + +- `grayscale' to make weekdays use the main foreground color and + weekends a more subtle gray; +- `workaholic' to make weekdays and weekends look the same in + terms of color; +- `bold-today' to apply a bold typographic weight to the current + date; +- `bold-all' to render all date headings in a bold weight. + +For example: + + (header-date . nil) + (header-date . (workaholic)) + (header-date . (grayscale bold-all)) + (header-date . (grayscale workaholic)) + (header-date . (grayscale workaholic bold-today)) + +A `scheduled' key applies to tasks with a scheduled date. By +default (a nil value), these use varying shades of yellow to +denote (i) a past or current date and (ii) a future date. Valid +values are symbols: + +- nil (default); +- `uniform' to make all scheduled dates the same color; +- `rainbow' to use contrasting colors for past, present, future + scheduled dates. + +For example: + + (scheduled . nil) + (scheduled . uniform) + (scheduled . rainbow) + +A `habit' key applies to the `org-habit' graph. All possible +value are passed as a symbol. Those are: + +- The default (nil) is meant to conform with the original + aesthetic of `org-habit'. It employs all four color codes that + correspond to the org-habit states---clear, ready, alert, and + overdue---while distinguishing between their present and future + variants. This results in a total of eight colors in use: red, + yellow, green, blue, in tinted and shaded versions. They cover + the full set of information provided by the `org-habit' + consistency graph. +- `simplified' is like the default except that it removes the + dichotomy between current and future variants by applying + uniform color-coded values. It applies a total of four colors: + red, yellow, green, blue. They produce a simplified + consistency graph that is more legible (or less \"busy\") than + the default. The intent is to shift focus towards the + distinction between the four states of a habit task, rather + than each state's present/future outlook. +- `traffic-light' further reduces the available colors to red, + yellow, and green. As in `simplified', present and future + variants appear uniformly, but differently from it, the 'clear' + state is rendered in a green hue, instead of the original blue. + This is meant to capture the use-case where a habit task being + \"too early\" is less important than it being \"too late\". + The difference between ready and clear states is attenuated by + painting both of them using shades of green. This option thus + highlights the alert and overdue states. +- `traffic-light-deuteranopia' is like the `traffic-light' except + its three colors are red, yellow, and blue to be suitable for + users with red-green color deficiency (deuteranopia). + +For example: + + (habit . nil) + (habit . simplified) + (habit . traffic-light)" + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set + (cons :tag "Block header" + (const header-block) + (set :tag "Header presentation" :greedy t + (choice :tag "Font style" + (const :tag "Use the original typeface (default)" nil) + (const :tag "Use `variable-pitch' font" variable-pitch)) + (choice :tag "Scaling" + (const :tag "Slight increase in height (default)" nil) + (const :tag "Do not scale" no-scale) + (const :tag "Scale to match `modus-themes-scale-title'" scale-title)))) + (cons :tag "Date header" :greedy t + (const header-date) + (set :tag "Header presentation" :greedy t + (const :tag "Use grayscale for date headers" grayscale) + (const :tag "Do not differentiate weekdays from weekends" workaholic) + (const :tag "Make today bold" bold-today) + (const :tag "Make all dates bold" bold-all))) + (cons :tag "Scheduled tasks" + (const scheduled) + (choice (const :tag "Yellow colors to distinguish current and future tasks (default)" nil) + (const :tag "Uniform subtle warm color for all scheduled tasks" uniform) + (const :tag "Rainbow-colored scheduled tasks" rainbow))) + (cons :tag "Habit graph" + (const habit) + (choice (const :tag "Follow the original design of `org-habit' (default)" nil) + (const :tag "Do not distinguish between present and future variants" simplified) + (const :tag "Use only red, yellow, green" traffic-light) + (const :tag "Use only red, yellow, blue" traffic-light-deuteranopia)))) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Org agenda")) + +(defcustom modus-themes-scale-headings nil + "Use font scaling for headings. + +For regular headings the scale is controlled by the variables +`modus-themes-scale-1' (smallest) and its variants all the way up +to `modus-themes-scale-4' (larger). + +While `modus-themes-scale-title' is reserved for special headings +that nominally are the largest on the scale (though that is not a +requirement). + +A special heading is, in this context, one that does not fit into +the syntax for heading levels that apply to the given mode. For +example, Org's #+title keyword lies outside the normal eight +levels of headings. Whereas, say, Markdown does not have such a +special heading." + :group 'modus-themes + :package-version '(modus-themes . "1.2.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Scaled headings")) + +(defcustom modus-themes-scale-1 1.05 + "Font size that is slightly larger than the base value. + +This size is used for level 4 headings, such as in Org and +Markdown files. + +The default value is a floating point that is interpreted as a +multiple of the base font size. It is recommended to use such a +value. + +However, the variable also accepts an integer, understood as an +absolute height that is 1/10 of the typeface's point size (e.g. a +value of 140 is the same as setting the font at 14 point size). +This will ignore the base font size and, thus, will not scale in +accordance with it in cases where it changes, such as while using +`text-scale-adjust'." + :group 'modus-themes + :package-version '(modus-themes . "1.2.0") + :version "28.1" + :type 'number + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Scaled heading sizes")) + +(defcustom modus-themes-scale-2 1.1 + "Font size slightly larger than `modus-themes-scale-1'. + +This size is used for level 3 headings, such as in Org and +Markdown files. + +The default value is a floating point that is interpreted as a +multiple of the base font size. It is recommended to use such a +value. + +However, the variable also accepts an integer, understood as an +absolute height that is 1/10 of the typeface's point size (e.g. a +value of 140 is the same as setting the font at 14 point size). +This will ignore the base font size and, thus, will not scale in +accordance with it in cases where it changes, such as while using +`text-scale-adjust'." + :group 'modus-themes + :package-version '(modus-themes . "1.2.0") + :version "28.1" + :type 'number + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Scaled heading sizes")) + +(defcustom modus-themes-scale-3 1.15 + "Font size slightly larger than `modus-themes-scale-2'. + +This size is used for level 2 headings, such as in Org and +Markdown files. + +The default value is a floating point that is interpreted as a +multiple of the base font size. It is recommended to use such a +value. + +However, the variable also accepts an integer, understood as an +absolute height that is 1/10 of the typeface's point size (e.g. a +value of 140 is the same as setting the font at 14 point size). +This will ignore the base font size and, thus, will not scale in +accordance with it in cases where it changes, such as while using +`text-scale-adjust'." + :group 'modus-themes + :package-version '(modus-themes . "1.2.0") + :version "28.1" + :type 'number + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Scaled heading sizes")) + +(defcustom modus-themes-scale-4 1.2 + "Font size slightly larger than `modus-themes-scale-3'. + +This size is used for level 1 headings, such as in Org and +Markdown files. + +The default value is a floating point that is interpreted as a +multiple of the base font size. It is recommended to use such a +value. + +However, the variable also accepts an integer, understood as an +absolute height that is 1/10 of the typeface's point size (e.g. a +value of 140 is the same as setting the font at 14 point size). +This will ignore the base font size and, thus, will not scale in +accordance with it in cases where it changes, such as while using +`text-scale-adjust'." + :group 'modus-themes + :package-version '(modus-themes . "1.2.0") + :version "28.1" + :type 'number + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Scaled heading sizes")) + +(defcustom modus-themes-scale-5 1.3 + "Font size slightly larger than `modus-themes-scale-4'. + +This size is only used for 'special' top level headings, such as +Org's file title heading, denoted by the #+title key word, and +the Org agenda structure headers. + +The default value is a floating point that is interpreted as a +multiple of the base font size. It is recommended to use such a +value. + +However, the variable also accepts an integer, understood as an +absolute height that is 1/10 of the typeface's point size (e.g. a +value of 140 is the same as setting the font at 14 point size). +This will ignore the base font size and, thus, will not scale in +accordance with it in cases where it changes, such as while using +`text-scale-adjust'." + :group 'modus-themes + :package-version '(modus-themes . "1.2.0") + :version "28.1" + :type 'number + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Scaled heading sizes")) + +(define-obsolete-variable-alias 'modus-themes-scale-5 'modus-themes-scale-title "1.5.0") + +(defcustom modus-themes-scale-title 1.3 + "Font size slightly larger than `modus-themes-scale-4'. + +This size is only used for 'special' top level headings, such as +Org's file title heading, denoted by the #+title key word, and +the Org agenda structure headers (see `modus-themes-org-agenda'). + +The default value is a floating point that is interpreted as a +multiple of the base font size. It is recommended to use such a +value. + +However, the variable also accepts an integer, understood as an +absolute height that is 1/10 of the typeface's point size (e.g. a +value of 140 is the same as setting the font at 14 point size). +This will ignore the base font size and, thus, will not scale in +accordance with it in cases where it changes, such as while using +`text-scale-adjust'." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type 'number + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Scaled heading sizes")) + +(defcustom modus-themes-fringes nil + "Define the visibility of fringes. + +Nil means the fringes have no background color. Option `subtle' +will apply a grayscale value that is visible yet close to the +main buffer background color. Option `intense' will use a more +pronounced grayscale value." + :group 'modus-themes + :package-version '(modus-themes . "1.0.0") + :version "28.1" + :type '(choice + (const :format "[%v] %t\n" :tag "No visible fringes (default)" nil) + (const :format "[%v] %t\n" :tag "Subtle grayscale background" subtle) + (const :format "[%v] %t\n" :tag "Intense grayscale background" intense)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Fringes")) + +(defcustom modus-themes-lang-checkers nil + "Control the style of spelling and code checkers/linters. + +The value is a list of properties, each designated by a symbol. +The default (nil) applies a color-coded underline to the affected +text, while it leaves the original foreground intact. If the +display spec of Emacs has support for it, the underline's style +is that of a wave, otherwise it is a straight line. + +The property `straight-underline' ensures that the underline +under the affected text is always drawn as a straight line. + +The property `text-also' applies the same color of the underline +to the affected text. + +The property `background' adds a color-coded background. + +The property `intense' amplifies the applicable colors if +`background' and/or `text-only' are set. If `intense' is set on +its own, then it implies `text-only'. + +To disable fringe indicators for Flymake or Flycheck, refer to +variables `flymake-fringe-indicator-position' and +`flycheck-indication-mode', respectively. + +Combinations of any of those properties can be expressed in a +list, as in those examples: + + (background) + (straight-underline intense) + (background text-also straight-underline) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-lang-checkers '(text-also background)) + +NOTE: The placement of the straight underline, though not the +wave style, is controlled by the built-in variables +`underline-minimum-offset', `x-underline-at-descent-line', +`x-use-underline-position-properties'." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set :tag "Properties" :greedy t + (const :tag "Straight underline" straight-underline) + (const :tag "Colorise text as well" text-also) + (const :tag "Increase color intensity" intense) + (const :tag "With background" background)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Language checkers")) + +(defcustom modus-themes-org-blocks nil + "Use a subtle gray or color-coded background for Org blocks. + +Nil (the default) means that the block has no distinct background +of its own and uses the one that applies to the rest of the +buffer. + +Option `gray-background' applies a subtle gray background to the +block's contents. It also affects the begin and end lines of the +block: their background extends to the edge of the window for +Emacs version >= 27 where the ':extend' keyword is recognized by +`set-face-attribute' (this is contingent on the variable +`org-fontify-whole-block-delimiter-line'). + +Option `tinted-background' uses a slightly colored background for +the contents of the block. The exact color will depend on the +programming language and is controlled by the variable +`org-src-block-faces' (refer to the theme's source code for the +current association list). For this to take effect, the Org +buffer needs to be restarted with `org-mode-restart'. + +Code blocks use their major mode's colors only when the variable +`org-src-fontify-natively' is non-nil. While quote/verse blocks +require setting `org-fontify-quote-and-verse-blocks' to a non-nil +value. + +Older versions of the themes provided options `grayscale' (or +`greyscale') and `rainbow'. Those will continue to work as they +are aliases for `gray-background' and `tinted-background', +respectively." + :group 'modus-themes + :package-version '(modus-themes . "1.4.0") + :version "28.1" + :type '(choice + (const :format "[%v] %t\n" :tag "No Org block background (default)" nil) + (const :format "[%v] %t\n" :tag "Subtle gray block background" gray-background) + (const :format "[%v] %t\n" :tag "Alias for `gray-background'" grayscale) ; for backward compatibility + (const :format "[%v] %t\n" :tag "Alias for `gray-background'" greyscale) + (const :format "[%v] %t\n" :tag "Color-coded background per programming language" tinted-background) + (const :format "[%v] %t\n" :tag "Alias for `tinted-background'" rainbow)) ; back compat + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Org mode blocks")) + +(defcustom modus-themes-org-habit nil + "Deprecated in version 1.5.0 favor of `modus-themes-org-agenda'. + +Control the presentation of the `org-habit' graph. + +The default is meant to conform with the original aesthetic of +`org-habit'. It employs all four color codes that correspond to +the org-habit states---clear, ready, alert, and overdue---while +distinguishing between their present and future variants. This +results in a total of eight colors in use: red, yellow, green, +blue, in tinted and shaded versions. They cover the full set of +information provided by the `org-habit' consistency graph. + +Option `simplified' is like the default except that it removes +the dichotomy between current and future variants by applying +uniform color-coded values. It applies a total of four colors: +red, yellow, green, blue. They produce a simplified consistency +graph that is more legible (or less \"busy\") than the default. +The intent is to shift focus towards the distinction between the +four states of a habit task, rather than each state's +present/future outlook. + +Option `traffic-light' further reduces the available colors to +red, yellow, and green. As in `simplified', present and future +variants appear uniformly, but differently from it, the 'clear' +state is rendered in a green hue, instead of the original blue. +This is meant to capture the use-case where a habit task being +\"too early\" is less important than it being \"too late\". The +difference between ready and clear states is attenuated by +painting both of them using shades of green. This option thus +highlights the alert and overdue states." + :group 'modus-themes + :package-version '(modus-themes . "1.1.0") + :version "28.1" + :type '(choice + (const :format "[%v] %t\n" :tag "Respect the original design of org-habit (default)" nil) + (const :format "[%v] %t\n" :tag "Like the default, but do not distinguish between present and future variants" simplified) + (const :format "[%v] %t\n" :tag "Like `simplified', but only use red, yellow, green" traffic-light)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Org agenda habits")) + +(make-obsolete 'modus-themes-org-habit 'modus-themes-org-agenda "1.5.0") + +(defcustom modus-themes-mode-line nil + "Control the overall style of the mode line. + +The value is a list of properties, each designated by a symbol. +The default (a nil value or an empty list) is a two-dimensional +rectangle with a border around it. The active and the inactive +mode lines use different shades of grayscale values for the +background, foreground, border. + +The `3d' property applies a three-dimensional effect to the +active mode line. The inactive mode lines remain two-dimensional +and are toned down a bit, relative to the default style. + +The `moody' property optimizes the mode line for use with the +library of the same name (hereinafter referred to as 'Moody'). +In practice, it removes the box effect and replaces it with +underline and overline properties. It also tones down the +inactive mode lines. Despite its intended purpose, this option +can also be used without the Moody library (please consult the +themes' manual on this point for more details). If both `3d' and +`moody' properties are set, the latter takes precedence. + +The `borderless' property removes the color of the borders. It +does not actually remove the borders, but only makes their color +the same as the background, effectively creating some padding. + +The `accented' property ensures that the active mode line uses a +colored background instead of the standard shade of gray. + +Combinations of any of those properties are expressed as a list, +like in these examples: + + (accented) + (borderless 3d) + (moody accented borderless) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-mode-line '(borderless accented)) + +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 `moody' property, which will come into effect +when the background of the mode line changes to something less +accessible, such as Moody ribbons (read the doc string of +`set-face-attribute', specifically `:distant-foreground'). This +fallback is activated when Emacs determines that the background +and foreground of the given construct are too close to each other +in terms of color distance. In practice, users will need to +experiment with the variable `face-near-same-color-threshold' to +trigger the effect. We find that a value of 45000 shall suffice, +contrary to the default 30000. Though for the combinations that +involve the `accented' and `moody' properties, as mentioned +above, that should be raised up to 70000. Do not set it too +high, because it has the adverse effect of always overriding the +default colors (which have been carefully designed to be highly +accessible). + +Furthermore, because Moody expects an underline and overline +instead of a box style, it is advised to set +`x-underline-at-descent-line' to a non-nil value." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set :tag "Properties" :greedy t + (choice :tag "Overall style" + (const :tag "Rectangular Border" nil) + (const :tag "3d borders" 3d) + (const :tag "No box effects (Moody-compatible)" moody)) + (const :tag "Colored background" accented) + (const :tag "Without border color" borderless)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Mode line")) + +(defcustom modus-themes-diffs nil + "Adjust the overall style of diffs. + +The default (nil) uses fairly intense color combinations for +diffs, by applying prominently colored backgrounds, with +appropriate foregrounds. + +Option `desaturated' follows the same principles as with the +default (nil), though it tones down all relevant colors. + +Option `bg-only' applies a background but does not override the +text's foreground. This makes it suitable for a non-nil value +passed to `diff-font-lock-syntax' (note: Magit does not support +syntax highlighting in diffs---last checked on 2021-04-21). + +Option `deuteranopia' is like the default (nil) in terms of using +prominently colored backgrounds, except that it also accounts for +red-green color defficiency by replacing all instances of green +with colors on the blue side of the spectrum. Other stylistic +changes are made in the interest of optimizing for such a +use-case. + +Option `fg-only-deuteranopia' removes all colored backgrounds, +except from word-wise or refined changes. Instead, it only uses +color-coded foreground values to differentiate between added, +removed, and changed lines. If a background is necessary to +denote context, a subtle grayscale value is applied. The color +used for added lines is a variant of blue to account for +red-green color defficiency but also because green text alone is +hard to discern in the diff's context (hard for our accessibility +purposes). The `fg-only' option that existed in older versions +of the themes is now an alias of `fg-only-deuteranopia', in the +interest of backward compatibility." + :group 'modus-themes + :package-version '(modus-themes . "1.4.0") + :version "28.1" + :type '(choice + (const :format "[%v] %t\n" :tag "Intensely colored backgrounds (default)" nil) + (const :format "[%v] %t\n" :tag "Slightly accented backgrounds with tinted text" desaturated) + (const :format "[%v] %t\n" :tag "Apply color-coded backgrounds; keep syntax colors intact" bg-only) + (const :format "[%v] %t\n" :tag "Like the default (nil), though optimized for red-green color defficiency" deuteranopia) + (const :format "[%v] %t\n" :tag "No backgrounds, except for refined diffs" fg-only-deuteranopia) + (const :format "[%v] %t\n" :tag "Alias of `fg-only-deuteranopia' for backward compatibility" fg-only)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Diffs")) + +(defcustom modus-themes-completions nil + "Control the style of the completion framework's interface. + +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 colors 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, Vertico, as well as pattern matching +styles like Orderless and Flx. The latter covers Helm, Ivy, and +Sallet. + +A value of nil (the default) will simply respect the metaphors of +each completion framework. + +Option `moderate' applies 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, Ivy et al appear slightly +different than their original looks, as they are toned down a +bit. + +Option `opinionated' uses color 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 Helm, Ivy and company 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 customization option, you should +spend some time with every one of the nil (default), `moderate', +and `opinionated' possibilities." + :group 'modus-themes + :package-version '(modus-themes . "1.0.0") + :version "28.1" + :type '(choice + (const :format "[%v] %t\n" :tag "Respect the framework's established aesthetic (default)" nil) + (const :format "[%v] %t\n" :tag "Subtle backgrounds for various elements" moderate) + (const :format "[%v] %t\n" :tag "Radical alternative to the framework's looks" opinionated)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Completion UIs")) + +(defcustom modus-themes-prompts nil + "Use subtle or intense styles for minibuffer and REPL prompts. + +The value is a list of properties, each designated by a symbol. +The default (a nil value or an empty list) means to only use a +subtle accented foreground color. + +The property `background' applies a background color to the +prompt's text. By default, this is a subtle accented value. + +The property `intense' makes the foreground color more prominent. +If the `background' property is also set, it amplifies the value +of the background as well. + +The property `gray' changes the prompt's colors to grayscale. +This affects the foreground and, if the `background' property is +also set, the background. Its effect is subtle, unless it is +combined with the `intense' property. + +The property `bold' makes the text use a bold typographic weight. +Similarly, `italic' adds a slant to the font's forms (italic or +oblique forms, depending on the typeface). + +Combinations of any of those properties are expressed as a list, +like in these examples: + + (intense) + (bold intense) + (intense bold gray) + (intense background gray bold) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-prompts '(background gray))" + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set :tag "Properties" :greedy t + (const :tag "With Background" background) + (const :tag "Intense" intense) + (const :tag "Grayscale" gray) + (const :tag "Bold font weight" bold) + (const :tag "Italic font slant" italic)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Command prompts")) + +(defcustom modus-themes-intense-hl-line nil + "Use a more prominent background for command `hl-line-mode'." + :group 'modus-themes + :package-version '(modus-themes . "1.0.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Line highlighting")) + +(make-obsolete 'modus-themes-intense-hl-line 'modus-themes-hl-line "1.3.0") + +(defcustom modus-themes-hl-line nil + "Control the current line highlight of HL-line mode. + +The value is a list of properties, each designated by a symbol. +The default (a nil value or an empty list) is a subtle gray +background color. + +The property `accented' changes the background to a colored +variant. + +An `underline' property draws a line below the highlighted area. +Its color is similar to the background, so gray by default or an +accent color when `accented' is also set. + +An `intense' property amplifies the colors in use, which may be +both the background and the underline. + +Combinations of any of those properties are expressed as a list, +like in these examples: + + (intense) + (underline intense) + (accented intense underline) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-hl-line '(underline accented)) + +Set `x-underline-at-descent-line' to a non-nil value for better +results with underlines." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set :tag "Properties" :greedy t + (const :tag "Colored background" accented) + (const :tag "Underline" underline) + (const :tag "Intense style" intense)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Line highlighting")) + +(defcustom modus-themes-subtle-line-numbers nil + "Use more subtle style for command `display-line-numbers-mode'." + :group 'modus-themes + :package-version '(modus-themes . "1.2.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Line numbers")) + +(defcustom modus-themes-paren-match nil + "Control the style of matching parentheses or delimiters. + +The value is a list of properties, each designated by a symbol. +The default (a nil value or an empty list) is a subtle background +color. + +The `bold' property adds a bold weight to the characters of the +matching delimiters. + +The `intense' property applies a more prominent background color +to the delimiters. + +The `underline' property draws a straight line under the affected +text. + +Combinations of any of those properties are expressed as a list, +like in these examples: + + (bold) + (underline intense) + (bold intense underline) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-paren-match '(bold intense))" + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set :tag "Properties" :greedy t + (const :tag "Bold weight" bold) + (const :tag "Intense background color" intense) + (const :tag "Underline" underline)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Matching parentheses")) + +(defcustom modus-themes-syntax nil + "Control the overall style of code syntax highlighting. + +The value is a list of properties, each designated by a symbol. +The default (a nil value or an empty list) is to use a balanced +combination of colors on the cyan-blue-magenta side of the +spectrum. There is little to no use of greens, yellows, and +reds. Comments are gray, strings are blue colored, doc strings +are a shade of cyan, while color combinations are designed to +avoid exaggerations. + +The property `faint' fades the saturation of all applicable +colors, where that is possible or appropriate. + +The property `yellow-comments' applies a yellow color to +comments. + +The property `green-strings' applies a green color to strings and +a green tint to doc strings. + +The property `alt-syntax' changes the combination of colors +beyond strings and comments, so that the effective palette is +broadened to provide greater variety relative to the default. + +Combinations of any of those properties are expressed as a list, +like in these examples: + + (faint) + (green-strings yellow-comments) + (alt-syntax green-strings yellow-comments) + (faint alt-syntax green-strings yellow-comments) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-syntax '(faint alt-syntax)) + +Independent of this variable, users may also control the use of a +bold weight or italic text: `modus-themes-bold-constructs' and +`modus-themes-italic-constructs'." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set :tag "Properties" :greedy t + (const :tag "Faint colors" faint) + (const :tag "Yellow comments" yellow-comments) + (const :tag "Green strings" green-strings) + (const :tag "Alternative set of colors" alt-syntax)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Syntax styles")) + +(defcustom modus-themes-links nil + "Set the style of links. + +The value is a list of properties, each designated by a symbol. +The default (a nil value or an empty list) is a prominent text +color, typically blue, with an underline of the same color. + +For the style of the underline, a `neutral-underline' property +turns the color of the line into a subtle gray, while the +`no-underline' property removes the line altogether. If both of +those are set, the latter takes precedence. + +For text coloration, a `faint' property desaturates the color of +the text and the underline, unless the underline is affected by +the aforementioned properties. While a `no-color' property +removes the color from the text. If both of those are set, the +latter takes precedence. + +A `bold' property applies a heavy typographic weight to the text +of the link. + +An `italic' property adds a slant to the link's text (italic or +oblique forms, depending on the typeface). + +A `background' property applies a subtle tinted background color. + +In case both `no-underline' and `no-color' are set, then a subtle +gray background is applied to all links. This can still be +combined with the `bold' and `italic' properties. + +Combinations of any of those properties are expressed as a list, +like in these examples: + + (faint) + (no-underline faint) + (no-color no-underline bold) + (italic bold background no-color no-underline) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-links '(neutral-underline background)) + +The placement of the underline, meaning its proximity to the +text, is controlled by `x-use-underline-position-properties', +`x-underline-at-descent-line', `underline-minimum-offset'. +Please refer to their documentation strings." + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set :tag "Properties" :greedy t + (choice :tag "Text coloration" + (const :tag "Saturared color (default)" nil) + (const :tag "Faint coloration" faint) + (const :tag "No color (use main black/white)" no-color)) + (choice :tag "Underline" + (const :tag "Same color as text (default)" nil) + (const :tag "Neutral (gray) underline color" neutral-underline) + (const :tag "No underline" no-underline)) + (const :tag "Bold font weight" bold) + (const :tag "Italic font slant" italic) + (const :tag "Subtle background color" background)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Link styles")) + +(defcustom modus-themes-region nil + "Control the overall style of the active region. + +The value is a list of properties, each designated by a symbol. +The default (a nil value or an empty list) is a prominent gray +background that overrides all foreground colors in the area it +encompasses. Its reach extends to the edge of the window. + +The `no-extend' property limits the region to the end of the +line, so that it does not reach the edge of the window. + +The `bg-only' property makes the region's background color more +subtle to allow the underlying text to retain its foreground +colors. + +The `accented' property applies a more colorful background to the +region. + +Combinations of any of those properties are expressed as a list, +like in these examples: + + (no-extend) + (bg-only accented) + (accented bg-only no-extend) + +The order in which the properties are set is not significant. + +In user configuration files the form may look like this: + + (setq modus-themes-region '(bg-only no-extend))" + :group 'modus-themes + :package-version '(modus-themes . "1.5.0") + :version "28.1" + :type '(set :tag "Properties" :greedy t + (const :tag "Do not extend to the edge of the window" no-extend) + (const :tag "Background only (preserve underlying colors)" bg-only) + (const :tag "Accented background" accented)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Active region")) + +(defcustom modus-themes-success-deuteranopia nil + "Color-code 'success' or 'done' as blue instead of green. + +This is to account for red-green color deficiency. + +The present customization option should apply to all contexts where +there can be a color-coded distinction between success and failure, +to-do and done, and so on. + +Diffs, which have a red/green dichotomy by default, can also be +configured to conform with deuteranopia: `modus-themes-diffs'." + :group 'modus-themes + :package-version '(modus-themes . "1.4.0") + :version "28.1" + :type 'boolean + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Success' color-code")) + +(defcustom modus-themes-mail-citations nil + "Control the color of citations in messages or email clients. + +Nil (the default) means to use a variety of contrasting hues to +denote depth in nested citations. Colors are fairly easy to tell +apart. + +Option `faint' maintains a color-based distinction between +citation levels but the colors it applies have very subtle +differences between them. + +Option `monochrome' turns all citations that would otherwise be +colored into a uniform shade of shade of gray." + :group 'modus-themes + :package-version '(modus-themes . "1.4.0") + :version "28.1" + :type '(choice + (const :format "[%v] %t\n" :tag "Colorful mail citations with contrasting hues (default)" nil) + (const :format "[%v] %t\n" :tag "Like the default, but with less saturated colors" faint) + (const :format "[%v] %t\n" :tag "Deprecated alias of `faint'" desaturated) + (const :format "[%v] %t\n" :tag "Uniformly gray mail citations" monochrome)) + :set #'modus-themes--set-option + :initialize #'custom-initialize-default + :link '(info-link "(modus-themes) Mail citations")) + + + +;;; Internal functions + +(defun modus-themes--palette (theme) + "Return color palette for Modus theme THEME. +THEME is a symbol, either `modus-operandi' or `modus-vivendi'." + (pcase theme + ('modus-operandi + (append modus-themes-operandi-color-overrides + modus-themes-operandi-colors)) + ('modus-vivendi + (append modus-themes-vivendi-color-overrides + modus-themes-vivendi-colors)) + (_theme + (error "'%s' is not a Modus theme" theme)))) + +(defvar modus-themes-faces) +(defvar modus-themes-custom-variables) + +(defmacro modus-themes-theme (name) + "Bind NAME's color palette around face specs and variables. + +NAME should be the proper name of a Modus theme, either +`modus-operandi' or `modus-vivendi'. + +Face specifications are passed to `custom-theme-set-faces'. +While variables are handled by `custom-theme-set-variables'. +Those are stored in `modus-themes-faces' and +`modus-themes-custom-variables' respectively." + (declare (indent 0)) + (let ((palette-sym (gensym)) + (colors (mapcar #'car modus-themes-operandi-colors))) + `(let* ((class '((class color) (min-colors 89))) + (,palette-sym (modus-themes--palette ',name)) + ,@(mapcar (lambda (color) + (list color `(alist-get ',color ,palette-sym))) + colors)) + (custom-theme-set-faces ',name ,@modus-themes-faces) + (custom-theme-set-variables ',name ,@modus-themes-custom-variables)))) + +(defun modus-themes--current-theme () + "Return current theme." + (car custom-enabled-themes)) + +;; Helper functions that are meant to ease the implementation of the +;; above customization variables. +(defun modus-themes--bold-weight () + "Conditional use of a heavier text weight." + (when modus-themes-bold-constructs + (list :inherit 'bold))) + +(defun modus-themes--slant () + "Conditional use of italics for slant attribute." + (if modus-themes-italic-constructs + (list 'italic) + (list 'normal))) + +(defun modus-themes--fixed-pitch () + "Conditional application of `fixed-pitch' inheritance." + (unless modus-themes-no-mixed-fonts + (list :inherit 'fixed-pitch))) + +(defun modus-themes--variable-pitch () + "Conditional use of `variable-pitch' in headings." + (when modus-themes-variable-pitch-headings + (list :inherit 'variable-pitch))) + +(defun modus-themes--variable-pitch-ui () + "Conditional use of `variable-pitch' in UI elements." + (when modus-themes-variable-pitch-ui + (list :inherit 'variable-pitch))) + +(defun modus-themes--fringe (mainbg subtlebg intensebg) + "Conditional use of background colors for fringes. +MAINBG is the default. SUBTLEBG should be a subtle grayscale +value. INTENSEBG must be a more pronounced grayscale color." + (pcase modus-themes-fringes + ('intense (list :background intensebg)) + ('subtle (list :background subtlebg)) + (_ (list :background mainbg)))) + +(defun modus-themes--line-numbers (mainfg mainbg altfg &optional altbg) + "Conditional use of colors for line numbers. +MAINBG and MAINFG are the default colors. ALTFG is a color that +combines with the theme's primary background (white/black)." + (if modus-themes-subtle-line-numbers + (list :background (or altbg 'unspecified) :foreground altfg) + (list :background mainbg :foreground mainfg))) + +(defun modus-themes--lang-check (underline subtlefg intensefg intensefg-alt subtlebg intensebg) + "Conditional use of foreground colors for language checkers. +UNDERLINE is a color-code value for the affected text's underline +property. SUBTLEFG and INTENSEFG follow the same color-coding +pattern and represent a value that is faint or vibrant +respectively. INTENSEFG-ALT is used when the intensity is high. +SUBTLEBG and INTENSEBG are color-coded background colors that +differ in overall intensity." + (let ((modus-themes-lang-checkers + (if (listp modus-themes-lang-checkers) + modus-themes-lang-checkers + (pcase modus-themes-lang-checkers + ('colored-background '(background intense)) + ('intense-foreground '(intense)) + ('intense-foreground-straight-underline '(intense straight-underline)) + ('subtle-foreground '(text-also)) + ('subtle-foreground-straight-underline '(text-also straight-underline)) + ('straight-underline '(straight-underline)))))) + (list :underline + (list :color + underline + :style + (if (memq 'straight-underline modus-themes-lang-checkers) + 'line 'wave)) + :background + (cond + ((and (memq 'background modus-themes-lang-checkers) + (memq 'intense modus-themes-lang-checkers)) + intensebg) + ((memq 'background modus-themes-lang-checkers) + subtlebg)) + :foreground + (cond + ((and (memq 'background modus-themes-lang-checkers) + (memq 'intense modus-themes-lang-checkers)) + intensefg-alt) + ((memq 'intense modus-themes-lang-checkers) + intensefg) + ((memq 'text-also modus-themes-lang-checkers) + subtlefg))))) + +(defun modus-themes--prompt (mainfg intensefg grayfg subtlebg intensebg intensebg-fg subtlebggray intensebggray) + "Conditional use of colors for prompts. +MAINFG is the prompt's standard foreground. INTENSEFG is a more +prominent alternative to the main foreground, while GRAYFG is a +less luminant shade of gray. + +SUBTLEBG is a subtle accented background that works with either +MAINFG or INTENSEFG. + +INTENSEBG is a more pronounced accented background color that +should be combinable with INTENSEBG-FG. + +SUBTLEBGGRAY and INTENSEBGGRAY are background values. The former +can be combined with GRAYFG, while the latter only works with the +theme's fallback text color." + (let ((modus-themes-prompts + (if (listp modus-themes-prompts) + modus-themes-prompts + ;; translation layer for legacy values + (pcase modus-themes-prompts + ;; `subtle' is the same as `subtle-accented', while `intense' is + ;; equal to `intense-accented' for backward compatibility + ('subtle '(background)) + ('subtle-accented '(background)) + ('subtle-gray '(background gray)) + ('intense '(background intense)) + ('intense-accented '(background intense)) + ('intense-gray '(background intense gray)))))) + (list :foreground + (cond + ((and (memq 'gray modus-themes-prompts) + (memq 'intense modus-themes-prompts)) + 'unspecified) + ((memq 'gray modus-themes-prompts) + grayfg) + ((and (memq 'background modus-themes-prompts) + (memq 'intense modus-themes-prompts)) + intensebg-fg) + ((memq 'intense modus-themes-prompts) + intensefg) + (mainfg)) + :background + (cond + ((and (memq 'gray modus-themes-prompts) + (memq 'background modus-themes-prompts) + (memq 'intense modus-themes-prompts)) + intensebggray) + ((and (memq 'gray modus-themes-prompts) + (memq 'background modus-themes-prompts)) + subtlebggray) + ((and (memq 'background modus-themes-prompts) + (memq 'intense modus-themes-prompts)) + intensebg) + ((memq 'background modus-themes-prompts) + subtlebg) + ('unspecified)) + :inherit + (cond + ((and (memq 'bold modus-themes-prompts) + (memq 'italic modus-themes-prompts)) + 'bold-italic) + ((memq 'italic modus-themes-prompts) + 'italic) + ((memq 'bold modus-themes-prompts) + 'bold) + ('unspecified))))) + +(defun modus-themes--paren (normalbg intensebg) + "Conditional use of intense colors for matching parentheses. +NORMALBG should be the special palette color 'bg-paren-match' or +something similar. INTENSEBG must be easier to discern next to +other backgrounds, such as the special palette color +'bg-paren-match-intense'." + (let ((modus-themes-paren-match + (if (listp modus-themes-paren-match) + modus-themes-paren-match + ;; translation layer for legacy values + (pcase modus-themes-paren-match + ;; `subtle' is the same as `subtle-accented', while `intense' is + ;; equal to `intense-accented' for backward compatibility + ('intense-bold '(intense bold)) + ('subtle-bold '(bold)) + ('intense '(intense)))))) + (list :inherit + (if (memq 'bold modus-themes-paren-match) + 'bold + 'unspecified) + :background + (if (memq 'intense modus-themes-paren-match) + intensebg + normalbg) + :underline + (if (memq 'underline modus-themes-paren-match) + t + nil)))) + +(defun modus-themes--syntax-foreground (fg faint) + "Apply foreground value to code syntax. +FG is the default. FAINT is typically the same color in its +desaturated version." + (let ((modus-themes-syntax + (if (listp modus-themes-syntax) + modus-themes-syntax + ;; translation layer for legacy values + (pcase modus-themes-syntax + ('faint '(faint)) + ('faint-yellow-comments '(faint yellow-comments)) + ('green-strings '(green-strings)) + ('yellow-comments '(yellow-comments)) + ('yellow-comments-green-strings '(green-strings yellow-comments)) + ('alt-syntax '(alt-syntax)) + ('alt-syntax-yellow-comments '(alt-syntax yellow-comments)))))) + (list :foreground + (cond + ((memq 'faint modus-themes-syntax) + faint) + (fg))))) + +(defun modus-themes--syntax-extra (fg faint alt &optional faint-alt) + "Apply foreground value to code syntax. +FG is the default. FAINT is typically the same color in its +desaturated version. ALT is another hue while optional FAINT-ALT +is its subtle alternative." + (let ((modus-themes-syntax + (if (listp modus-themes-syntax) + modus-themes-syntax + ;; translation layer for legacy values + (pcase modus-themes-syntax + ('faint '(faint)) + ('faint-yellow-comments '(faint yellow-comments)) + ('green-strings '(green-strings)) + ('yellow-comments '(yellow-comments)) + ('yellow-comments-green-strings '(green-strings yellow-comments)) + ('alt-syntax '(alt-syntax)) + ('alt-syntax-yellow-comments '(alt-syntax yellow-comments)))))) + (list :foreground + (cond + ((and (memq 'alt-syntax modus-themes-syntax) + (memq 'faint modus-themes-syntax)) + (or faint-alt alt)) + ((memq 'faint modus-themes-syntax) + faint) + ((memq 'alt-syntax modus-themes-syntax) + alt) + (fg))))) + +(defun modus-themes--syntax-string (fg faint green alt &optional faint-green faint-alt) + "Apply foreground value to strings in code syntax. +FG is the default. FAINT is typically the same color in its +desaturated version. GREEN is a color variant in that side of +the spectrum. ALT is another hue. Optional FAINT-GREEN is a +subtle alternative to GREEN. Optional FAINT-ALT is a subtle +alternative to ALT." + (let ((modus-themes-syntax + (if (listp modus-themes-syntax) + modus-themes-syntax + ;; translation layer for legacy values + (pcase modus-themes-syntax + ('faint '(faint)) + ('faint-yellow-comments '(faint yellow-comments)) + ('green-strings '(green-strings)) + ('yellow-comments '(yellow-comments)) + ('yellow-comments-green-strings '(green-strings yellow-comments)) + ('alt-syntax '(alt-syntax)) + ('alt-syntax-yellow-comments '(alt-syntax yellow-comments)))))) + (list :foreground + (cond + ((and (memq 'faint modus-themes-syntax) + (memq 'green-strings modus-themes-syntax)) + (or faint-green green)) + ((and (memq 'alt-syntax modus-themes-syntax) + (memq 'faint modus-themes-syntax)) + (or faint-alt faint)) + ((memq 'faint modus-themes-syntax) + faint) + ((memq 'green-strings modus-themes-syntax) + green) + ((memq 'alt-syntax modus-themes-syntax) + alt) + (fg))))) + +(defun modus-themes--syntax-comment (fg yellow &optional faint-yellow faint) + "Apply foreground value to strings in code syntax. +FG is the default. YELLOW is a color variant of that name while +optional FAINT-YELLOW is its subtle variant. Optional FAINT is +an alternative to the default value." + (let ((modus-themes-syntax + (if (listp modus-themes-syntax) + modus-themes-syntax + ;; translation layer for legacy values + (pcase modus-themes-syntax + ('faint '(faint)) + ('faint-yellow-comments '(faint yellow-comments)) + ('green-strings '(green-strings)) + ('yellow-comments '(yellow-comments)) + ('yellow-comments-green-strings '(green-strings yellow-comments)) + ('alt-syntax '(alt-syntax)) + ('alt-syntax-yellow-comments '(alt-syntax yellow-comments)))))) + (list :foreground + (cond + ((and (memq 'faint modus-themes-syntax) + (memq 'yellow-comments modus-themes-syntax)) + (or faint-yellow yellow)) + ((and (memq 'alt-syntax modus-themes-syntax) + (memq 'yellow-comments modus-themes-syntax) + (not (memq 'green-strings modus-themes-syntax))) + (or faint-yellow yellow)) + ((memq 'yellow-comments modus-themes-syntax) + yellow) + ((memq 'faint modus-themes-syntax) + (or faint fg)) + (fg))))) + +(defun modus-themes--key-cdr (key alist) + "Get cdr of KEY in ALIST." + (cdr (assoc key alist))) + +(defun modus-themes--heading (level fg fg-alt bg bg-gray border) + "Conditional styles for `modus-themes-headings'. + +LEVEL is the heading's position in their order. FG is the +default text color. 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. BG-GRAY is a gray background. BORDER is a color value +that combines well with the background and foreground." + (let* ((key (modus-themes--key-cdr level modus-themes-headings)) + (style (or key (modus-themes--key-cdr t modus-themes-headings))) + (modus-themes-headings + (if (listp style) + style + ;; translation layer for legacy values + (pcase style + ('highlight '(background)) + ('highlight-no-bold '(background no-bold)) + ('line '(overline)) + ('line-no-bold '(no-bold overline)) + ('no-bold '(no-bold)) + ('no-color '(monochrome)) + ('no-color-no-bold '(no-bold monochrome)) + ('rainbow '(rainbow)) + ('rainbow-highlight '(rainbow background)) + ('rainbow-highlight-no-bold '(no-bold rainbow background)) + ('rainbow-line '(rainbow overline)) + ('rainbow-no-bold '(no-bold rainbow)) + ('rainbow-line-no-bold '(rainbow overline no-bold)) + ('rainbow-section '(rainbow overline background)) + ('rainbow-section-no-bold '(no-bold rainbow background overline)) + ('section '(background overline)) + ('section-no-bold '(background overline no-bold))))) + (var (if modus-themes-variable-pitch-headings + 'variable-pitch + 'unspecified)) + (varbold (if var + (append (list 'bold) (list var)) + 'bold))) + (list :inherit + (cond + ((memq 'no-bold modus-themes-headings) + var) + (varbold)) + :background + (cond + ((and (memq 'monochrome modus-themes-headings) + (memq 'background modus-themes-headings)) + bg-gray) + ((memq 'background modus-themes-headings) + bg) + ('unspecified)) + :foreground + (cond + ((memq 'monochrome modus-themes-headings) + 'unspecified) + ((memq 'rainbow modus-themes-headings) + fg-alt) + (fg)) + :overline + (if (memq 'overline modus-themes-headings) + border + 'unspecified)))) + +(defun modus-themes--agenda-structure (fg) + "Control the style of the Org agenda structure. +FG is the foreground color to use." + (let* ((properties (modus-themes--key-cdr 'header-block modus-themes-org-agenda)) + (inherit (cond ((memq 'variable-pitch properties) + (list 'bold 'variable-pitch)) + ('bold))) + (height (cond ((memq 'no-scale properties) + 1.0) + ((memq 'scale-title properties) + modus-themes-scale-title) + (1.15)))) + (list :inherit inherit + :height height + :foreground fg))) + +(defun modus-themes--agenda-date (defaultfg grayscalefg &optional bold workaholicfg grayscaleworkaholicfg) + "Control the style of date headings in Org agenda buffers. +DEFAULTFG is the original accent color for the foreground. +GRAYSCALEFG is a neutral color. Optional BOLD applies a bold +weight. Optional WORKAHOLICFG and GRAYSCALEWORKAHOLICFG are +alternative foreground colors." + (let* ((properties (modus-themes--key-cdr 'header-date modus-themes-org-agenda)) + (weight (cond ((memq 'bold-all properties) + 'bold) + ((and bold (memq 'bold-today properties)) + 'bold) + (t + nil))) + (fg (cond ((and (memq 'grayscale properties) + (memq 'workaholic properties)) + (or grayscaleworkaholicfg grayscalefg)) + ((memq 'grayscale properties) + grayscalefg) + ((memq 'workaholic properties) + (or workaholicfg defaultfg)) + (t + defaultfg)))) + (list :inherit weight + :foreground fg))) + +(defun modus-themes--agenda-scheduled (defaultfg uniformfg rainbowfg) + "Control the style of the Org agenda scheduled tasks. +DEFAULTFG is an accented foreground color that is meant to +differentiate between past or present and future tasks. +UNIFORMFG is a more subtle color that eliminates the color coding +for scheduled tasks. RAINBOWFG is a prominent accent value that +clearly distinguishes past, present, future tasks." + (pcase (modus-themes--key-cdr 'scheduled modus-themes-org-agenda) + ('uniform (list :foreground uniformfg)) + ('rainbow (list :foreground rainbowfg)) + (_ (list :foreground defaultfg)))) + +(defun modus-themes--agenda-habit (default traffic simple &optional traffic-deuteran) + "Specify background values for `modus-themes-org-agenda' habits. +DEFAULT is the original foregrounc color. TRAFFIC is to be used +when the 'traffic-light' style is applied, while SIMPLE +corresponds to the 'simplified style'. Optional TRAFFIC-DEUTERAN +is an alternative to TRAFFIC, meant for deuteranopia." + (pcase (modus-themes--key-cdr 'habit modus-themes-org-agenda) + ('traffic-light (list :background traffic)) + ('traffic-light-deuteranopia (list :background (or traffic-deuteran traffic))) + ('simplified (list :background simple)) + (_ (list :background default)))) + +(defun modus-themes--org-block (bgblk fgdefault &optional fgblk) + "Conditionally set the background of Org blocks. +BGBLK applies to a distinct neutral background. Else blocks have +no background of their own (the default), so they look the same +as the rest of the buffer. FGDEFAULT is used when no distinct +background is present. While optional FGBLK specifies a +foreground value that can be combined with BGBLK. + +`modus-themes-org-blocks' also accepts `tinted-background' (alias +`rainbow') as a value which applies to `org-src-block-faces' (see +the theme's source code)." + (if (or (eq modus-themes-org-blocks 'gray-background) + (eq modus-themes-org-blocks 'grayscale) + (eq modus-themes-org-blocks 'greyscale)) + (list :background bgblk :foreground (or fgblk fgdefault) :extend t) + (list :background 'unspecified :foreground fgdefault))) + +(defun modus-themes--org-block-delim (bgaccent fgaccent bg fg) + "Conditionally set the styles of Org block delimiters. +BG, FG, BGACCENT, FGACCENT apply a background and foreground +color respectively. + +The former pair is a grayscale combination that should be more +distinct than the background of the block. It is applied to the +default styles or when `modus-themes-org-blocks' is set +to `grayscale' (or `greyscale'). + +The latter pair should be more subtle than the background of the +block, as it is used when `modus-themes-org-blocks' is +set to `rainbow'." + (pcase modus-themes-org-blocks + ('gray-background (list :background bg :foreground fg :extend t)) + ('grayscale (list :background bg :foreground fg :extend t)) + ('greyscale (list :background bg :foreground fg :extend t)) + ('rainbow (list :background bgaccent :foreground fgaccent)) + (_ (list :background bg :foreground fg)))) + +(defun modus-themes--mode-line-attrs + (fg bg fg-alt bg-alt fg-accent bg-accent border border-3d &optional alt-style border-width fg-distant) + "Color combinations for `modus-themes-mode-line'. + +FG and BG are the default colors. FG-ALT and BG-ALT are meant to +accommodate the options for a 3D mode line or a `moody' compliant +one. FG-ACCENT and BG-ACCENT are used for all variants. BORDER +applies to all permutations of the mode line, 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." + (let ((modus-themes-mode-line + (if (listp modus-themes-mode-line) + modus-themes-mode-line + ;; translation layer for legacy values + (alist-get modus-themes-mode-line + '((3d . (3d)) + (moody . (moody)) + (borderless . (borderless)) + (borderless-3d . (borderless 3d)) + (borderless-moody . (borderless moody)) + (accented . (accented)) + (accented-3d . (accented 3d)) + (accented-moody . (accented moody)) + (borderless-accented . (borderless accented)) + (borderless-accented-3d . (borderless accented 3d)) + (borderless-accented-moody . (borderless accented moody))))))) + (let ((base (cond ((memq 'accented modus-themes-mode-line) + (cons fg-accent bg-accent)) + ((and (or (memq 'moody modus-themes-mode-line) + (memq '3d modus-themes-mode-line)) + (not (memq 'borderless modus-themes-mode-line))) + (cons fg-alt bg-alt)) + ((cons fg bg)))) + (box (cond ((memq 'moody modus-themes-mode-line) + nil) + ((memq '3d modus-themes-mode-line) + (list :line-width (or border-width 1) + :color + (cond ((and (memq 'accented modus-themes-mode-line) + (memq 'borderless modus-themes-mode-line)) + bg-accent) + ((memq 'borderless modus-themes-mode-line) bg) + (border-3d)) + :style (and alt-style 'released-button))) + ((or (memq 'borderless modus-themes-mode-line) + (memq 'moody modus-themes-mode-line)) + bg) + (border))) + (line (cond ((not (memq 'moody modus-themes-mode-line)) + nil) + ((and (memq 'borderless modus-themes-mode-line) + (memq 'accented modus-themes-mode-line)) + bg-accent) + ((memq 'borderless modus-themes-mode-line) + bg) + (border)))) + (list :foreground (car base) + :background (cdr base) + :box box + :overline line + :underline line + :distant-foreground + (and (memq 'moody modus-themes-mode-line) + fg-distant))))) + +(defun modus-themes--diff + (fg-only-bg fg-only-fg mainbg mainfg altbg altfg &optional deuteranbg deuteranfg bg-only-fg) + "Color combinations for `modus-themes-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. + +DEUTERANBG and DEUTERANFG must be combinations of colors that account +for red-green color defficiency (deuteranopia). + +Optional BG-ONLY-FG applies ALTFG else leaves the foreground +unspecified." + (pcase modus-themes-diffs + ('fg-only (list :background fg-only-bg :foreground fg-only-fg)) + ('fg-only-deuteranopia (list :background fg-only-bg :foreground fg-only-fg)) + ('desaturated (list :background altbg :foreground altfg)) + ('deuteranopia (list :background (or deuteranbg mainbg) :foreground (or deuteranfg mainfg))) + ('bg-only (list :background altbg :foreground (if bg-only-fg altfg 'unspecified))) + (_ (list :background mainbg :foreground mainfg)))) + +(defun modus-themes--diff-deuteran (deuteran main) + "Determine whether the DEUTERAN or MAIN color should be used. +This is based on whether `modus-themes-diffs' has the value +`deuteranopia'." + (if (or (eq modus-themes-diffs 'deuteranopia) + (eq modus-themes-diffs 'fg-only-deuteranopia) + (eq modus-themes-diffs 'fg-only)) + (list deuteran) + (list main))) + +(defun modus-themes--success-deuteran (deuteran main) + "Determine whether to color-code success as DEUTERAN or MAIN." + (if modus-themes-success-deuteranopia + (list deuteran) + (list main))) + +(defun modus-themes--standard-completions (mainfg subtlebg intensebg intensefg) + "Combinations for `modus-themes-completions'. + +MAINFG is an accented foreground value. SUBTLEBG is an accented +background value that can be combined with MAINFG. INTENSEBG and +INTENSEFG are accented colors that are designed to be used in +tandem. + +These are intended for Icomplete, Ido, and related." + (pcase modus-themes-completions + ('opinionated (list :background intensebg :foreground intensefg)) + ('moderate (list :background subtlebg :foreground mainfg)) + (_ (list :foreground mainfg)))) + +(defun modus-themes--extra-completions (subtleface intenseface altface &optional altfg bold) + "Combinations for `modus-themes-completions'. + +SUBTLEFACE and INTENSEFACE are custom theme faces that combine a +background and foreground value. The difference between the two +is a matter of degree. + +ALTFACE is a combination of colors 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. + +These are intended for Helm, Ivy, etc." + (pcase modus-themes-completions + ('opinionated (list :inherit (list altface bold) + :foreground (or altfg 'unspecified))) + ('moderate (list :inherit (list subtleface bold))) + (_ (list :inherit (list intenseface bold))))) + +(defun modus-themes--link (fg fgfaint underline bg bgneutral) + "Conditional application of link styles. +FG is the link's default color for its text and underline +property. FGFAINT is a desaturated color for the text and +underline. UNDERLINE is a gray color only for the undeline. BG +is a background color and BGNEUTRAL is its fallback value." + (let ((modus-themes-links + (if (listp modus-themes-links) + modus-themes-links + ;; translation layer for legacy values + (pcase modus-themes-links + ('faint '(faint)) + ('neutral-underline '(neutral-underline)) + ('faint-neutral-underline '(neutral-underline faint)) + ('no-underline '(no-underline)) + ('underline-only '(no-color)) + ('neutral-underline-only '(no-color neutral-underline)))))) + (list :inherit + (cond + ((and (memq 'bold modus-themes-links) + (memq 'italic modus-themes-links)) + 'bold-italic) + ((memq 'italic modus-themes-links) + 'italic) + ((memq 'bold modus-themes-links) + 'bold) + ('unspecified)) + :background + (cond + ((and (memq 'no-color modus-themes-links) + (memq 'no-underline modus-themes-links)) + bgneutral) + ((memq 'background modus-themes-links) + bg) + ('unspecified)) + :foreground + (cond + ((memq 'no-color modus-themes-links) + 'unspecified) + ((memq 'faint modus-themes-links) + fgfaint) + (fg)) + :underline + (cond + ((memq 'no-underline modus-themes-links) + 'unspecified) + ((memq 'neutral-underline modus-themes-links) + underline) + (t))))) + +(defun modus-themes--link-color (fg fgfaint &optional neutralfg) + "Extends `modus-themes--link'. +FG is the main accented foreground. FGFAINT is also accented, +yet desaturated. Optional NEUTRALFG is a gray value." + (let ((modus-themes-links + (if (listp modus-themes-links) + modus-themes-links + ;; translation layer for legacy values + (pcase modus-themes-links + ('faint '(faint)) + ('neutral-underline '(neutral-underline)) + ('faint-neutral-underline '(neutral-underline faint)) + ('no-underline '(no-underline)) + ('underline-only '(no-color)) + ('neutral-underline-only '(no-color neutral-underline)))))) + (list :foreground + (cond + ((memq 'no-color modus-themes-links) + (or neutralfg 'unspecified)) + ((memq 'faint modus-themes-links) + fgfaint) + (fg)) + :underline + (cond + ((memq 'no-underline modus-themes-links) + 'unspecified) + ((memq 'neutral-underline modus-themes-links) + (or neutralfg 'unspecified)) + (t))))) + +(defun modus-themes--scale (amount) + "Scale heading by AMOUNT. +AMOUNT is a customization option." + (when modus-themes-scale-headings + (list :height amount))) + +(defun modus-themes--region (bg fg bgsubtle bgaccent bgaccentsubtle) + "Apply `modus-themes-region' styles. + +BG and FG are the main values that are used by default. BGSUBTLE +is a subtle background value that can be combined with all colors +used to fontify text and code syntax. BGACCENT is a colored +background that combines well with FG. BGACCENTSUBTLE can be +combined with all colors used to fontify text." + (let ((modus-themes-region + (if (listp modus-themes-region) + modus-themes-region + ;; translation layer for legacy values + (pcase modus-themes-region + ('bg-only '(bg-only)) + ('bg-only-no-extend '(bg-only no-extend)) + ('accent '(accented)) + ('accent-no-extend '(accented no-extend)) + ('no-extend '(no-extend)))))) + (list :background + (cond + ((and (memq 'accented modus-themes-region) + (memq 'bg-only modus-themes-region)) + bgaccentsubtle) + ((memq 'accented modus-themes-region) + bgaccent) + ((memq 'bg-only modus-themes-region) + bgsubtle) + (bg)) + :foreground + (cond + ((and (memq 'accented modus-themes-region) + (memq 'bg-only modus-themes-region)) + 'unspecified) + ((memq 'bg-only modus-themes-region) + 'unspecified) + (fg)) + :extend + (cond + ((memq 'no-extend modus-themes-region) + nil) + (t))))) + +(defun modus-themes--hl-line + (bgdefault bgintense bgaccent bgaccentsubtle lineneutral lineaccent lineneutralintense lineaccentintense) + "Apply `modus-themes-hl-line' styles. + +BGDEFAULT is a subtle neutral background. BGINTENSE is like the +default, but more prominent. BGACCENT is a prominent accented +background, while BGACCENTSUBTLE is more subtle. LINENEUTRAL and +LINEACCENT are color values that can remain distinct against the +buffer's possible backgrounds: the former is neutral, the latter +is accented. LINENEUTRALINTENSE and LINEACCENTINTENSE are their +more prominent alternatives." + (let ((modus-themes-hl-line + (if (listp modus-themes-hl-line) + modus-themes-hl-line + ;; translation layer for legacy values + (pcase modus-themes-hl-line + ('intense-background '(intense)) + ('accented-background '(accented)) + ('underline-neutral '(underline)) + ('underline-accented '(underline accented)) + ('underline-only-neutral '(underline)) ; only underline styles have been removed + ('underline-only-accented '(underline accented)))))) + (list :background + (cond + ((and (memq 'intense modus-themes-hl-line) + (memq 'accented modus-themes-hl-line)) + bgaccent) + ((memq 'accented modus-themes-hl-line) + bgaccentsubtle) + ((memq 'intense modus-themes-hl-line) + bgintense) + (bgdefault)) + :underline + (cond + ((and (memq 'intense modus-themes-hl-line) + (memq 'accented modus-themes-hl-line) + (memq 'underline modus-themes-hl-line)) + lineaccentintense) + ((and (memq 'accented modus-themes-hl-line) + (memq 'underline modus-themes-hl-line)) + lineaccent) + ((and (memq 'intense modus-themes-hl-line) + (memq 'underline modus-themes-hl-line)) + lineneutralintense) + ((or (memq 'no-background modus-themes-hl-line) + (memq 'underline modus-themes-hl-line)) + lineneutral) + ('unspecified))))) + +(defun modus-themes--mail-cite (mainfg subtlefg) + "Combinations for `modus-themes-mail-citations'. + +MAINFG is an accented foreground value. SUBTLEFG is its +desaturated counterpart." + (pcase modus-themes-mail-citations + ('monochrome (list :inherit 'shadow)) + ('faint (list :foreground subtlefg)) + ('desaturated (list :foreground subtlefg)) + (_ (list :foreground mainfg)))) + + + +;;;; Utilities for DIY users + +;; This is the WCAG formula: https://www.w3.org/TR/WCAG20-TECHS/G18.html +(defun modus-themes-wcag-formula (hex) + "Get WCAG value of color value HEX. +The value is defined in hexadecimal RGB notation, such as those in +`modus-themes-operandi-colors' and `modus-themes-vivendi-colors'." + (cl-loop for k in '(0.2126 0.7152 0.0722) + for x in (color-name-to-rgb hex) + sum (* k (if (<= x 0.03928) + (/ x 12.92) + (expt (/ (+ x 0.055) 1.055) 2.4))))) + +;;;###autoload +(defun modus-themes-contrast (c1 c2) + "Measure WCAG contrast ratio between C1 and C2. +C1 and C2 are color values written in hexadecimal RGB." + (let ((ct (/ (+ (modus-themes-wcag-formula c1) 0.05) + (+ (modus-themes-wcag-formula c2) 0.05)))) + (max ct (/ ct)))) + +(defun modus-themes-current-palette () + "Return current color palette." + (modus-themes--palette (modus-themes--current-theme))) + +;;;###autoload +(defun modus-themes-color (color) + "Return color value for COLOR from current palette. +COLOR is a key in `modus-themes-operandi-colors' or +`modus-themes-vivendi-colors'." + (alist-get color (modus-themes-current-palette))) + +;;;###autoload +(defun modus-themes-color-alts (light-color dark-color) + "Return color value from current palette. +When Modus Operandi is enabled, return color value for color +LIGHT-COLOR. When Modus Vivendi is enabled, return color value +for DARK-COLOR. LIGHT-COLOR and DARK-COLOR are keys in +`modus-themes-operandi-colors' or `modus-themes-vivendi-colors'." + (let* ((theme (modus-themes--current-theme)) + (color (pcase theme + ('modus-operandi light-color) + ('modus-vivendi dark-color) + (_theme + (error "'%s' is not a Modus theme" theme))))) + (alist-get color (modus-themes--palette theme)))) + +(defmacro modus-themes-with-colors (&rest body) + "Evaluate BODY with colors from current palette bound. +For colors bound, see `modus-themes-operandi-colors' or +`modus-themes-vivendi-colors'." + (declare (indent 0)) + (let ((palette-sym (gensym)) + (colors (mapcar #'car modus-themes-operandi-colors))) + `(let* ((class '((class color) (min-colors 89))) + (,palette-sym (modus-themes-current-palette)) + ,@(mapcar (lambda (color) + (list color `(alist-get ',color ,palette-sym))) + colors)) + (ignore class ,@colors) ; Silence unused variable warnings + ,@body))) + + + +;;;; Commands + +;;;###autoload +(defun modus-themes-load-themes () + "Ensure that the Modus themes are in `custom-enabled-themes'. + +This function is intended for use in package declarations such as +those defined with the help of `use-package'. The idea is to add +this function to the `:init' stage of the package's loading, so +that subsequent calls that assume the presence of a loaded theme, +like `modus-themes-toggle' or `modus-themes-load-operandi', will +continue to work as intended even if they are lazy-loaded (such +as when they are declared in the `:config' phase)." + (unless (or (custom-theme-p 'modus-operandi) + (custom-theme-p 'modus-vivendi)) + (load-theme 'modus-operandi t t) + (load-theme 'modus-vivendi t t))) + +(defvar modus-themes-after-load-theme-hook nil + "Hook that runs after the `modus-themes-toggle' routines.") + +;; The reason we use `load-theme' instead of `enable-theme' is that the +;; former does a kind of "reset" on the face specs. So it plays nicely +;; with `custom-set-faces', as well as defcustom user customizations, +;; including the likes of `modus-themes-operandi-color-overrides'. +;; +;; Tests show that `enable-theme' does not re-read those variables, so +;; it might appear to the unsuspecting user that the themes are somehow +;; broken. +;; +;; This "reset", however, comes at the cost of being a bit slower than +;; `enable-theme'. User who have a stable setup and seldom update their +;; variables during a given Emacs session, are better off using +;; something like this: +;; +;; (defun modus-themes-toggle-enabled () +;; "Toggle between `modus-operandi' and `modus-vivendi' themes." +;; (interactive) +;; (pcase (modus-themes--current-theme) +;; ('modus-operandi (progn (enable-theme 'modus-vivendi) +;; (disable-theme 'modus-operandi))) +;; ('modus-vivendi (progn (enable-theme 'modus-operandi) +;; (disable-theme 'modus-vivendi))) +;; (_ (error "No Modus theme is loaded; evaluate `modus-themes-load-themes' first")))) + +;;;###autoload +(defun modus-themes-load-operandi () + "Load `modus-operandi' and disable `modus-vivendi'. +Also run `modus-themes-after-load-theme-hook'." + (disable-theme 'modus-vivendi) + (load-theme 'modus-operandi t) + (run-hooks 'modus-themes-after-load-theme-hook)) + +;;;###autoload +(defun modus-themes-load-vivendi () + "Load `modus-vivendi' and disable `modus-operandi'. +Also run `modus-themes-after-load-theme-hook'." + (disable-theme 'modus-operandi) + (load-theme 'modus-vivendi t) + (run-hooks 'modus-themes-after-load-theme-hook)) + +(defun modus-themes--load-prompt () + "Helper for `modus-themes-toggle'." + (let ((theme + (intern + (completing-read "Load Modus theme (will disable all others): " + '(modus-operandi modus-vivendi) nil t)))) + (mapc #'disable-theme custom-enabled-themes) + (pcase theme + ('modus-operandi (modus-themes-load-operandi)) + ('modus-vivendi (modus-themes-load-vivendi))))) + +;;;###autoload +(defun modus-themes-toggle () + "Toggle between `modus-operandi' and `modus-vivendi' themes. +Also runs `modus-themes-after-load-theme-hook' at its last stage +by virtue of calling either of `modus-themes-load-operandi' and +`modus-themes-load-vivendi' functions." + (interactive) + (modus-themes-load-themes) + (pcase (modus-themes--current-theme) + ('modus-operandi (modus-themes-load-vivendi)) + ('modus-vivendi (modus-themes-load-operandi)) + (_ (modus-themes--load-prompt)))) + + + +;;;; Face specifications + +(defconst modus-themes-faces + '( +;;;; custom faces + ;; these bespoke faces are inherited by other constructs below +;;;;; subtle colored backgrounds + `(modus-themes-subtle-red ((,class :background ,red-subtle-bg :foreground ,fg-dim))) + `(modus-themes-subtle-green ((,class :background ,green-subtle-bg :foreground ,fg-dim))) + `(modus-themes-subtle-yellow ((,class :background ,yellow-subtle-bg :foreground ,fg-dim))) + `(modus-themes-subtle-blue ((,class :background ,blue-subtle-bg :foreground ,fg-dim))) + `(modus-themes-subtle-magenta ((,class :background ,magenta-subtle-bg :foreground ,fg-dim))) + `(modus-themes-subtle-cyan ((,class :background ,cyan-subtle-bg :foreground ,fg-dim))) + `(modus-themes-subtle-neutral ((,class :background ,bg-inactive :foreground ,fg-inactive))) +;;;;; intense colored backgrounds + `(modus-themes-intense-red ((,class :background ,red-intense-bg :foreground ,fg-main))) + `(modus-themes-intense-green ((,class :background ,green-intense-bg :foreground ,fg-main))) + `(modus-themes-intense-yellow ((,class :background ,yellow-intense-bg :foreground ,fg-main))) + `(modus-themes-intense-blue ((,class :background ,blue-intense-bg :foreground ,fg-main))) + `(modus-themes-intense-magenta ((,class :background ,magenta-intense-bg :foreground ,fg-main))) + `(modus-themes-intense-cyan ((,class :background ,cyan-intense-bg :foreground ,fg-main))) + `(modus-themes-intense-neutral ((,class :background ,bg-active :foreground ,fg-main))) +;;;;; refined background and foreground combinations + ;; general purpose styles that use an accented foreground against an + ;; accented background + `(modus-themes-refine-red ((,class :background ,red-refine-bg :foreground ,red-refine-fg))) + `(modus-themes-refine-green ((,class :background ,green-refine-bg :foreground ,green-refine-fg))) + `(modus-themes-refine-yellow ((,class :background ,yellow-refine-bg :foreground ,yellow-refine-fg))) + `(modus-themes-refine-blue ((,class :background ,blue-refine-bg :foreground ,blue-refine-fg))) + `(modus-themes-refine-magenta ((,class :background ,magenta-refine-bg :foreground ,magenta-refine-fg))) + `(modus-themes-refine-cyan ((,class :background ,cyan-refine-bg :foreground ,cyan-refine-fg))) +;;;;; "active" combinations, mostly for use on the mode line + `(modus-themes-active-red ((,class :background ,red-active :foreground ,bg-active))) + `(modus-themes-active-green ((,class :background ,green-active :foreground ,bg-active))) + `(modus-themes-active-yellow ((,class :background ,yellow-active :foreground ,bg-active))) + `(modus-themes-active-blue ((,class :background ,blue-active :foreground ,bg-active))) + `(modus-themes-active-magenta ((,class :background ,magenta-active :foreground ,bg-active))) + `(modus-themes-active-cyan ((,class :background ,cyan-active :foreground ,bg-active))) +;;;;; nuanced backgrounds + ;; useful for adding an accented background that is suitable for all + ;; main foreground colors (intended for use in Org source blocks) + `(modus-themes-nuanced-red ((,class :background ,red-nuanced-bg :extend t))) + `(modus-themes-nuanced-green ((,class :background ,green-nuanced-bg :extend t))) + `(modus-themes-nuanced-yellow ((,class :background ,yellow-nuanced-bg :extend t))) + `(modus-themes-nuanced-blue ((,class :background ,blue-nuanced-bg :extend t))) + `(modus-themes-nuanced-magenta ((,class :background ,magenta-nuanced-bg :extend t))) + `(modus-themes-nuanced-cyan ((,class :background ,cyan-nuanced-bg :extend t))) +;;;;; fringe-specific combinations + `(modus-themes-fringe-red ((,class :background ,red-fringe-bg :foreground ,fg-main))) + `(modus-themes-fringe-green ((,class :background ,green-fringe-bg :foreground ,fg-main))) + `(modus-themes-fringe-yellow ((,class :background ,yellow-fringe-bg :foreground ,fg-main))) + `(modus-themes-fringe-blue ((,class :background ,blue-fringe-bg :foreground ,fg-main))) + `(modus-themes-fringe-magenta ((,class :background ,magenta-fringe-bg :foreground ,fg-main))) + `(modus-themes-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 + ;; a grayscale value than an accented one + `(modus-themes-special-cold ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) + `(modus-themes-special-mild ((,class :background ,bg-special-mild :foreground ,fg-special-mild))) + `(modus-themes-special-warm ((,class :background ,bg-special-warm :foreground ,fg-special-warm))) + `(modus-themes-special-calm ((,class :background ,bg-special-calm :foreground ,fg-special-calm))) +;;;;; diff-specific combinations + ;; intended for `diff-mode' or equivalent + `(modus-themes-diff-added + ((,class ,@(modus-themes--diff + bg-main blue-alt-other + bg-diff-focus-added fg-diff-focus-added + green-nuanced-bg fg-diff-added + bg-diff-focus-added-deuteran fg-diff-focus-added-deuteran)))) + `(modus-themes-diff-changed + ((,class ,@(modus-themes--diff + bg-main yellow + bg-diff-focus-changed fg-diff-focus-changed + yellow-nuanced-bg fg-diff-changed)))) + `(modus-themes-diff-removed + ((,class ,@(modus-themes--diff + bg-main red + bg-diff-focus-removed fg-diff-focus-removed + red-nuanced-bg fg-diff-removed)))) + `(modus-themes-diff-refine-added + ((,class ,@(modus-themes--diff + bg-diff-added-deuteran fg-diff-added-deuteran + bg-diff-refine-added fg-diff-refine-added + bg-diff-focus-added fg-diff-focus-added + bg-diff-refine-added-deuteran fg-diff-refine-added-deuteran)))) + `(modus-themes-diff-refine-changed + ((,class ,@(modus-themes--diff + bg-diff-changed fg-diff-changed + bg-diff-refine-changed fg-diff-refine-changed + bg-diff-focus-changed fg-diff-focus-changed)))) + `(modus-themes-diff-refine-removed + ((,class ,@(modus-themes--diff + bg-diff-removed fg-diff-removed + bg-diff-refine-removed fg-diff-refine-removed + bg-diff-focus-removed fg-diff-focus-removed)))) + `(modus-themes-diff-focus-added + ((,class ,@(modus-themes--diff + bg-dim blue-alt-other + bg-diff-focus-added fg-diff-focus-added + bg-diff-added fg-diff-added + bg-diff-focus-added-deuteran fg-diff-focus-added-deuteran)))) + `(modus-themes-diff-focus-changed + ((,class ,@(modus-themes--diff + bg-dim yellow + bg-diff-focus-changed fg-diff-focus-changed + bg-diff-changed fg-diff-changed)))) + `(modus-themes-diff-focus-removed + ((,class ,@(modus-themes--diff + bg-dim red + bg-diff-focus-removed fg-diff-focus-removed + bg-diff-removed fg-diff-removed)))) + `(modus-themes-diff-heading + ((,class ,@(modus-themes--diff + bg-alt fg-main + bg-diff-heading fg-diff-heading + cyan-nuanced-bg cyan-nuanced-fg + bg-header fg-main + t)))) +;;;;; mark indicators + ;; color combinations intended for Dired, Ibuffer, or equivalent + `(modus-themes-pseudo-header ((,class :inherit bold :foreground ,fg-main))) + `(modus-themes-mark-alt ((,class :inherit bold :background ,bg-mark-alt :foreground ,fg-mark-alt))) + `(modus-themes-mark-del ((,class :inherit bold :background ,bg-mark-del :foreground ,fg-mark-del))) + `(modus-themes-mark-sel ((,class :inherit bold :background ,bg-mark-sel :foreground ,fg-mark-sel))) + `(modus-themes-mark-symbol ((,class :inherit bold :foreground ,blue-alt))) +;;;;; heading levels + ;; styles for regular headings used in Org, Markdown, Info, etc. + `(modus-themes-heading-1 + ((,class ,@(modus-themes--heading + 1 fg-main magenta-alt-other + magenta-nuanced-bg bg-alt bg-region) + ,@(modus-themes--scale modus-themes-scale-4)))) + `(modus-themes-heading-2 + ((,class ,@(modus-themes--heading + 2 fg-special-warm magenta-alt + red-nuanced-bg bg-alt bg-region) + ,@(modus-themes--scale modus-themes-scale-3)))) + `(modus-themes-heading-3 + ((,class ,@(modus-themes--heading + 3 fg-special-cold blue + blue-nuanced-bg bg-alt bg-region) + ,@(modus-themes--scale modus-themes-scale-2)))) + `(modus-themes-heading-4 + ((,class ,@(modus-themes--heading + 4 fg-special-mild cyan + cyan-nuanced-bg bg-alt bg-region) + ,@(modus-themes--scale modus-themes-scale-1)))) + `(modus-themes-heading-5 + ((,class ,@(modus-themes--heading + 5 fg-special-calm green-alt-other + green-nuanced-bg bg-alt bg-region)))) + `(modus-themes-heading-6 + ((,class ,@(modus-themes--heading + 6 yellow-nuanced-fg yellow-alt-other + yellow-nuanced-bg bg-alt bg-region)))) + `(modus-themes-heading-7 + ((,class ,@(modus-themes--heading + 7 red-nuanced-fg red-alt + red-nuanced-bg bg-alt bg-region)))) + `(modus-themes-heading-8 + ((,class ,@(modus-themes--heading + 8 magenta-nuanced-fg magenta + bg-alt bg-alt bg-region)))) +;;;;; graph-specific faces + `(modus-themes-graph-red-0 ((,class :background ,red-graph-0-bg))) + `(modus-themes-graph-red-1 ((,class :background ,red-graph-1-bg))) + `(modus-themes-graph-green-0 ((,class :background ,green-graph-0-bg))) + `(modus-themes-graph-green-1 ((,class :background ,green-graph-1-bg))) + `(modus-themes-graph-yellow-0 ((,class :background ,yellow-graph-0-bg))) + `(modus-themes-graph-yellow-1 ((,class :background ,yellow-graph-1-bg))) + `(modus-themes-graph-blue-0 ((,class :background ,blue-graph-0-bg))) + `(modus-themes-graph-blue-1 ((,class :background ,blue-graph-1-bg))) + `(modus-themes-graph-magenta-0 ((,class :background ,magenta-graph-0-bg))) + `(modus-themes-graph-magenta-1 ((,class :background ,magenta-graph-1-bg))) + `(modus-themes-graph-cyan-0 ((,class :background ,cyan-graph-0-bg))) + `(modus-themes-graph-cyan-1 ((,class :background ,cyan-graph-1-bg))) +;;;;; language checkers + `(modus-themes-lang-error ((,class ,@(modus-themes--lang-check + fg-lang-underline-error fg-lang-error + red red-refine-fg red-nuanced-bg red-refine-bg)))) + `(modus-themes-lang-note ((,class ,@(modus-themes--lang-check + fg-lang-underline-note fg-lang-note + blue-alt blue-refine-fg blue-nuanced-bg blue-refine-bg)))) + `(modus-themes-lang-warning ((,class ,@(modus-themes--lang-check + fg-lang-underline-warning fg-lang-warning + yellow yellow-refine-fg yellow-nuanced-bg yellow-refine-bg)))) +;;;;; other custom faces + `(modus-themes-bold ((,class ,@(modus-themes--bold-weight)))) + `(modus-themes-hl-line ((,class ,@(modus-themes--hl-line + bg-hl-line bg-hl-line-intense + bg-hl-line-intense-accent blue-nuanced-bg + bg-region blue-intense-bg + fg-alt cyan-intense) + :extend t))) + `(modus-themes-key-binding ((,class :inherit bold :foreground ,blue-alt-other))) + `(modus-themes-prompt ((,class ,@(modus-themes--prompt + cyan-alt-other blue-alt-other fg-alt + cyan-nuanced-bg blue-refine-bg fg-main + bg-alt bg-active)))) + `(modus-themes-reset-hard ((,class :inherit (fixed-pitch modus-themes-reset-soft)))) + `(modus-themes-reset-soft ((,class :background ,bg-main :foreground ,fg-main + :weight normal :slant normal :strike-through nil + :box nil :underline nil :overline nil :extend nil))) + `(modus-themes-search-success ((,class :inherit ,@(modus-themes--success-deuteran + 'modus-themes-intense-blue + 'modus-themes-intense-green)))) + `(modus-themes-search-success-lazy ((,class :inherit ,@(modus-themes--success-deuteran + 'modus-themes-special-mild + 'modus-themes-refine-cyan)))) + `(modus-themes-search-success-modeline ((,class :foreground ,@(modus-themes--success-deuteran + blue-active + green-active)))) + `(modus-themes-slant ((,class :inherit italic :slant ,@(modus-themes--slant)))) + `(modus-themes-variable-pitch ((,class ,@(modus-themes--variable-pitch)))) + `(modus-themes-fixed-pitch ((,class ,@(modus-themes--fixed-pitch)))) +;;;; standard faces +;;;;; absolute essentials + `(default ((,class :background ,bg-main :foreground ,fg-main))) + `(cursor ((,class :background ,fg-main))) + `(fringe ((,class ,@(modus-themes--fringe bg-main bg-inactive bg-active) + :foreground ,fg-main))) + `(vertical-border ((,class :foreground ,fg-window-divider-inner))) +;;;;; basic and/or ungrouped styles + `(bold ((,class :weight bold))) + `(bold-italic ((,class :inherit (bold italic)))) + `(buffer-menu-buffer ((,class :inherit bold))) + `(comint-highlight-input ((,class :inherit bold))) + `(comint-highlight-prompt ((,class :inherit modus-themes-prompt))) + `(error ((,class :inherit bold :foreground ,red))) + `(escape-glyph ((,class :foreground ,fg-escape-char-construct))) + `(file-name-shadow ((,class :foreground ,fg-unfocused))) + `(header-line ((,class ,@(modus-themes--variable-pitch-ui) + :background ,bg-header :foreground ,fg-header))) + `(header-line-highlight ((,class :inherit modus-themes-active-blue))) + `(help-argument-name ((,class :inherit modus-themes-slant :foreground ,cyan))) + `(help-key-binding ((,class :box (:line-width (1 . -1) :color ,bg-region) ; NOTE: box syntax is for Emacs28 + :background ,bg-inactive))) + `(homoglyph ((,class :foreground ,red-alt-faint))) + `(ibuffer-locked-buffer ((,class :foreground ,yellow-alt-other-faint))) + `(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 :inherit modus-themes-prompt))) + `(mm-command-output ((,class :foreground ,red-alt-other))) + `(mm-uu-extract ((,class :background ,bg-dim :foreground ,fg-special-mild))) + `(next-error ((,class :inherit modus-themes-subtle-red :extend t))) + `(rectangle-preview ((,class :inherit modus-themes-special-mild))) + `(region ((,class ,@(modus-themes--region bg-region fg-main + bg-hl-alt-intense bg-region-accent + bg-region-accent-subtle)))) + `(secondary-selection ((,class :inherit modus-themes-special-cold))) + `(shadow ((,class :foreground ,fg-alt))) + `(success ((,class :inherit bold :foreground ,@(modus-themes--success-deuteran blue green)))) + `(trailing-whitespace ((,class :background ,red-intense-bg))) + `(warning ((,class :inherit bold :foreground ,yellow))) +;;;;; buttons, links, widgets + `(button ((,class ,@(modus-themes--link + blue-alt-other blue-alt-other-faint + bg-region blue-nuanced-bg bg-alt)))) + `(link ((,class :inherit button))) + `(link-visited ((,class :inherit button + ,@(modus-themes--link-color + magenta-alt-other magenta-alt-other-faint fg-alt)))) + `(tooltip ((,class :background ,bg-special-cold :foreground ,fg-main))) + `(widget-button ((,class :inherit bold :foreground ,blue-alt))) + `(widget-button-pressed ((,class :inherit widget-button :foreground ,magenta))) + `(widget-documentation ((,class :foreground ,green))) + `(widget-field ((,class :background ,bg-alt :foreground ,fg-dim))) + `(widget-inactive ((,class :foreground ,fg-alt))) + `(widget-single-line-field ((,class :inherit widget-field))) +;;;;; ag + `(ag-hit-face ((,class :foreground ,fg-special-cold))) + `(ag-match-face ((,class :inherit modus-themes-special-calm))) +;;;;; alert + `(alert-high-face ((,class :inherit bold :foreground ,red-alt))) + `(alert-low-face ((,class :foreground ,fg-special-mild))) + `(alert-moderate-face ((,class :inherit bold :foreground ,yellow))) + `(alert-trivial-face ((,class :foreground ,fg-special-calm))) + `(alert-urgent-face ((,class :inherit bold :foreground ,red-intense))) +;;;;; all-the-icons + `(all-the-icons-blue ((,class :foreground ,blue))) + `(all-the-icons-blue-alt ((,class :foreground ,blue-alt))) + `(all-the-icons-cyan ((,class :foreground ,cyan))) + `(all-the-icons-cyan-alt ((,class :foreground ,cyan-alt))) + `(all-the-icons-dblue ((,class :foreground ,blue-alt-other))) + `(all-the-icons-dcyan ((,class :foreground ,cyan-alt-other))) + `(all-the-icons-dgreen ((,class :foreground ,green-alt-other))) + `(all-the-icons-dired-dir-face ((,class :foreground ,blue))) + `(all-the-icons-dmaroon ((,class :foreground ,magenta-alt-other))) + `(all-the-icons-dorange ((,class :foreground ,red-alt-other))) + `(all-the-icons-dpink ((,class :foreground ,magenta))) + `(all-the-icons-dpurple ((,class :foreground ,magenta-alt))) + `(all-the-icons-dred ((,class :foreground ,red))) + `(all-the-icons-dsilver ((,class :foreground ,fg-special-cold))) + `(all-the-icons-dyellow ((,class :foreground ,yellow))) + `(all-the-icons-green ((,class :foreground ,green))) + `(all-the-icons-lblue ((,class :foreground ,blue-refine-fg))) + `(all-the-icons-lcyan ((,class :foreground ,cyan-refine-fg))) + `(all-the-icons-lgreen ((,class :foreground ,green-refine-fg))) + `(all-the-icons-lmaroon ((,class :foreground ,magenta-refine-fg))) + `(all-the-icons-lorange ((,class :foreground ,red-refine-fg))) + `(all-the-icons-lpink ((,class :foreground ,magenta-refine-fg))) + `(all-the-icons-lpurple ((,class :foreground ,magenta-refine-fg))) + `(all-the-icons-lred ((,class :foreground ,red-refine-fg))) + `(all-the-icons-lsilver ((,class :foreground ,fg-special-cold))) + `(all-the-icons-lyellow ((,class :foreground ,yellow-refine-fg))) + `(all-the-icons-maroon ((,class :foreground ,magenta))) + `(all-the-icons-orange ((,class :foreground ,red-alt))) + `(all-the-icons-pink ((,class :foreground ,magenta))) + `(all-the-icons-purple ((,class :foreground ,magenta-alt))) + `(all-the-icons-purple-alt ((,class :foreground ,magenta-alt-other))) + `(all-the-icons-red ((,class :foreground ,red))) + `(all-the-icons-red-alt ((,class :foreground ,red-alt))) + `(all-the-icons-silver ((,class :foreground ,fg-special-cold))) + `(all-the-icons-yellow ((,class :foreground ,yellow))) +;;;;; annotate + `(annotate-annotation ((,class :inherit modus-themes-subtle-blue))) + `(annotate-annotation-secondary ((,class :inherit modus-themes-subtle-green))) + `(annotate-highlight ((,class :background ,blue-nuanced-bg :underline ,blue-intense))) + `(annotate-highlight-secondary ((,class :background ,green-nuanced-bg :underline ,green-intense))) +;;;;; anzu + `(anzu-match-1 ((,class :inherit modus-themes-subtle-cyan))) + `(anzu-match-2 ((,class :inherit modus-themes-search-success))) + `(anzu-match-3 ((,class :inherit modus-themes-subtle-yellow))) + `(anzu-mode-line ((,class :inherit (bold modus-themes-search-success-modeline)))) + `(anzu-mode-line-no-match ((,class :inherit bold :foreground ,red-active))) + `(anzu-replace-highlight ((,class :inherit modus-themes-refine-yellow :underline t))) + `(anzu-replace-to ((,class :inherit (modus-themes-search-success bold)))) +;;;;; apropos + `(apropos-button ((,class :inherit button + ,@(modus-themes--link-color + magenta-alt-other magenta-alt-other-faint)))) + `(apropos-function-button ((,class :inherit button + ,@(modus-themes--link-color + magenta magenta-faint)))) + `(apropos-keybinding ((,class :inherit modus-themes-key-binding))) + `(apropos-misc-button ((,class :inherit button + ,@(modus-themes--link-color + cyan-alt-other cyan-alt-other-faint)))) + `(apropos-property ((,class :inherit modus-themes-bold :foreground ,magenta-alt))) + `(apropos-symbol ((,class :inherit modus-themes-pseudo-header))) + `(apropos-user-option-button ((,class :inherit button + ,@(modus-themes--link-color + cyan cyan-faint)))) + `(apropos-variable-button ((,class :inherit button + ,@(modus-themes--link-color + blue-alt blue-alt-faint)))) +;;;;; apt-sources-list + `(apt-sources-list-components ((,class :foreground ,cyan))) + `(apt-sources-list-options ((,class :foreground ,yellow))) + `(apt-sources-list-suite ((,class :foreground ,green))) + `(apt-sources-list-type ((,class :foreground ,magenta))) + `(apt-sources-list-uri ((,class :foreground ,blue))) +;;;;; artbollocks-mode + `(artbollocks-face ((,class :inherit modus-themes-lang-note))) + `(artbollocks-lexical-illusions-face ((,class :background ,bg-alt :foreground ,red-alt :underline t))) + `(artbollocks-passive-voice-face ((,class :inherit modus-themes-lang-warning))) + `(artbollocks-weasel-words-face ((,class :inherit modus-themes-lang-error))) +;;;;; auctex and Tex + `(font-latex-bold-face ((,class :inherit bold :foreground ,fg-special-calm))) + `(font-latex-doctex-documentation-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold))) + `(font-latex-doctex-preprocessor-face ((,class :inherit modus-themes-bold :foreground ,red-alt-other))) + `(font-latex-italic-face ((,class :inherit italic :foreground ,fg-special-calm))) + `(font-latex-math-face ((,class :foreground ,cyan-alt-other))) + `(font-latex-script-char-face ((,class :foreground ,cyan-alt-other))) + `(font-latex-sectioning-0-face ((,class :inherit modus-themes-variable-pitch :foreground ,blue-nuanced-fg))) + `(font-latex-sectioning-1-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,blue-nuanced-fg))) + `(font-latex-sectioning-2-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,blue-nuanced-fg))) + `(font-latex-sectioning-3-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,blue-nuanced-fg))) + `(font-latex-sectioning-4-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,blue-nuanced-fg))) + `(font-latex-sectioning-5-face ((,class :inherit modus-themes-variable-pitch :foreground ,blue-nuanced-fg))) + `(font-latex-sedate-face ((,class :inherit modus-themes-bold :foreground ,magenta-alt-other))) + `(font-latex-slide-title-face ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,cyan-nuanced-fg + ,@(modus-themes--scale modus-themes-scale-4)))) + `(font-latex-string-face ((,class :inherit font-lock-string-face))) + `(font-latex-subscript-face ((,class :height 0.95))) + `(font-latex-superscript-face ((,class :height 0.95))) + `(font-latex-verbatim-face ((,class :background ,bg-dim :foreground ,fg-special-mild))) + `(font-latex-warning-face ((,class :inherit font-lock-warning-face))) + `(tex-match ((,class :foreground ,blue-alt-other))) + `(tex-verbatim ((,class :background ,bg-dim :foreground ,fg-special-mild))) + `(texinfo-heading ((,class :foreground ,magenta))) + `(TeX-error-description-error ((,class :inherit error))) + `(TeX-error-description-help ((,class :foreground ,blue))) + `(TeX-error-description-tex-said ((,class :foreground ,blue))) + `(TeX-error-description-warning ((,class :inherit warning))) +;;;;; auto-dim-other-buffers + `(auto-dim-other-buffers-face ((,class :background ,bg-alt))) +;;;;; avy + `(avy-background-face ((,class :background ,bg-dim :foreground ,fg-dim :extend t))) + `(avy-goto-char-timer-face ((,class :inherit (modus-themes-intense-yellow bold)))) + `(avy-lead-face ((,class :inherit (modus-themes-intense-magenta bold modus-themes-reset-soft)))) + `(avy-lead-face-0 ((,class :inherit (modus-themes-refine-cyan bold modus-themes-reset-soft)))) + `(avy-lead-face-1 ((,class :inherit (modus-themes-intense-neutral bold modus-themes-reset-soft)))) + `(avy-lead-face-2 ((,class :inherit (modus-themes-refine-red bold modus-themes-reset-soft)))) +;;;;; aw (ace-window) + `(aw-background-face ((,class :foreground ,fg-unfocused))) + `(aw-key-face ((,class :inherit modus-themes-key-binding))) + `(aw-leading-char-face ((,class :inherit (bold modus-themes-reset-soft) :height 1.5 + :foreground ,red-intense))) + `(aw-minibuffer-leading-char-face ((,class :inherit (modus-themes-intense-red bold)))) + `(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))) +;;;;; bbdb + `(bbdb-name ((,class :foreground ,magenta-alt-other))) + `(bbdb-organization ((,class :foreground ,red-alt-other))) + `(bbdb-field-name ((,class :foreground ,cyan-alt-other))) +;;;;; binder + `(binder-sidebar-highlight ((,class :inherit modus-themes-subtle-cyan))) + `(binder-sidebar-marked ((,class :inherit modus-themes-mark-sel))) + `(binder-sidebar-missing ((,class :inherit modus-themes-subtle-red))) + `(binder-sidebar-tags ((,class :foreground ,cyan))) +;;;;; bm + `(bm-face ((,class :inherit modus-themes-subtle-yellow :extend t))) + `(bm-fringe-face ((,class :inherit modus-themes-fringe-yellow))) + `(bm-fringe-persistent-face ((,class :inherit modus-themes-fringe-blue))) + `(bm-persistent-face ((,class :inherit modus-themes-intense-blue :extend t))) +;;;;; bongo + `(bongo-album-title ((,class :foreground ,fg-active))) + `(bongo-artist ((,class :foreground ,magenta-active))) + `(bongo-currently-playing-track ((,class :inherit bold))) + `(bongo-elapsed-track-part ((,class :inherit modus-themes-subtle-magenta :underline t))) + `(bongo-filled-seek-bar ((,class :background ,blue-intense-bg :foreground ,fg-main))) + `(bongo-marked-track ((,class :foreground ,fg-mark-alt))) + `(bongo-marked-track-line ((,class :background ,bg-mark-alt))) + `(bongo-played-track ((,class :foreground ,fg-unfocused :strike-through t))) + `(bongo-track-length ((,class :foreground ,fg-alt))) + `(bongo-track-title ((,class :foreground ,blue-active))) + `(bongo-unfilled-seek-bar ((,class :background ,bg-special-cold :foreground ,fg-main))) +;;;;; boon + `(boon-modeline-cmd ((,class :inherit modus-themes-active-blue))) + `(boon-modeline-ins ((,class :inherit modus-themes-active-red))) + `(boon-modeline-off ((,class :inherit modus-themes-active-yellow))) + `(boon-modeline-spc ((,class :inherit modus-themes-active-green))) +;;;;; bookmark + `(bookmark-face ((,class :inherit modus-themes-special-warm :extend t))) +;;;;; breakpoint (built-in gdb-mi.el) + `(breakpoint-disabled ((,class :inherit shadow))) + `(breakpoint-enabled ((,class :inherit bold :foreground ,red))) +;;;;; buffer-expose + `(buffer-expose-ace-char-face ((,class :inherit bold :foreground ,red-active))) + `(buffer-expose-mode-line-face ((,class :foreground ,cyan-active))) + `(buffer-expose-selected-face ((,class :inherit modus-themes-special-mild))) +;;;;; calendar and diary + `(calendar-month-header ((,class :inherit modus-themes-pseudo-header))) + `(calendar-today ((,class :inherit bold :underline t))) + `(calendar-weekday-header ((,class :foreground ,fg-unfocused))) + `(calendar-weekend-header ((,class :foreground ,red-faint))) + `(diary ((,class :background ,blue-nuanced-bg :foreground ,blue-alt-other))) + `(diary-anniversary ((,class :foreground ,red-alt-other))) + `(diary-time ((,class :foreground ,cyan))) + `(holiday ((,class :background ,magenta-nuanced-bg :foreground ,magenta-alt))) +;;;;; calfw + `(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 :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 :foreground ,cyan-alt-other))) + `(cfw:face-select ((,class :inherit modus-themes-intense-blue))) + `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other))) + `(cfw:face-title ((,class :inherit modus-themes-variable-pitch + :foreground ,fg-special-cold + ,@(modus-themes--scale modus-themes-scale-title)))) + `(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 :inherit shadow))) + `(cfw:face-toolbar-button-on ((,class :inherit bold :background ,blue-nuanced-bg + :foreground ,blue-alt))) +;;;;; centaur-tabs + `(centaur-tabs-active-bar-face ((,class :background ,blue-active))) + `(centaur-tabs-close-mouse-face ((,class :inherit bold :foreground ,red-active :underline t))) + `(centaur-tabs-close-selected ((,class :inherit centaur-tabs-selected))) + `(centaur-tabs-close-unselected ((,class :inherit centaur-tabs-unselected))) + `(centaur-tabs-modified-marker-selected ((,class :inherit centaur-tabs-selected))) + `(centaur-tabs-modified-marker-unselected ((,class :inherit centaur-tabs-unselected))) + `(centaur-tabs-default ((,class :background ,bg-main :foreground ,bg-main))) + `(centaur-tabs-selected ((,class :inherit bold :background ,bg-tab-active :foreground ,fg-main))) + `(centaur-tabs-selected-modified ((,class :inherit italic :background ,bg-tab-active :foreground ,fg-main))) + `(centaur-tabs-unselected ((,class :background ,bg-tab-inactive :foreground ,fg-dim))) + `(centaur-tabs-unselected-modified ((,class :inherit italic :background ,bg-tab-inactive :foreground ,fg-dim))) +;;;;; cfrs + `(cfrs-border-color ((,class :background ,fg-window-divider-inner))) +;;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log') + `(change-log-acknowledgment ((,class :foreground ,fg-alt))) + `(change-log-conditionals ((,class :foreground ,yellow))) + `(change-log-date ((,class :foreground ,cyan))) + `(change-log-email ((,class :foreground ,cyan-alt-other))) + `(change-log-file ((,class :inherit bold :foreground ,fg-special-cold))) + `(change-log-function ((,class :foreground ,green-alt-other))) + `(change-log-list ((,class :foreground ,magenta-alt))) + `(change-log-name ((,class :foreground ,magenta-alt-other))) + `(log-edit-header ((,class :foreground ,fg-special-warm))) + `(log-edit-summary ((,class :inherit bold :foreground ,blue))) + `(log-edit-unknown-header ((,class :inherit shadow))) + `(log-view-commit-body ((,class :foreground ,blue-nuanced-fg))) + `(log-view-file ((,class :inherit bold :foreground ,fg-special-cold))) + `(log-view-message ((,class :background ,bg-alt :foreground ,fg-alt))) +;;;;; cider + `(cider-debug-code-overlay-face ((,class :background ,bg-alt))) + `(cider-debug-prompt-face ((,class :foreground ,magenta-alt :underline t))) + `(cider-deprecated-face ((,class :inherit modus-themes-refine-yellow))) + `(cider-docview-emphasis-face ((,class :inherit italic :foreground ,fg-special-cold))) + `(cider-docview-literal-face ((,class :foreground ,blue-alt))) + `(cider-docview-strong-face ((,class :inherit bold :foreground ,fg-special-cold))) + `(cider-docview-table-border-face ((,class :inherit shadow))) + `(cider-enlightened-face ((,class :box (:line-width -1 :color ,yellow-alt :style nil) :background ,bg-dim))) + `(cider-enlightened-local-face ((,class :inherit bold :foreground ,yellow-alt-other))) + `(cider-error-highlight-face ((,class :foreground ,red :underline t))) + `(cider-fragile-button-face ((,class :box (:line-width 3 :color ,fg-alt :style released-button) :foreground ,yellow))) + `(cider-fringe-good-face ((,class :foreground ,green-active))) + `(cider-instrumented-face ((,class :box (:line-width -1 :color ,red :style nil) :background ,bg-dim))) + `(cider-reader-conditional-face ((,class :inherit italic :foreground ,fg-special-warm))) + `(cider-repl-input-face ((,class :inherit bold))) + `(cider-repl-prompt-face ((,class :inherit modus-themes-prompt))) + `(cider-repl-stderr-face ((,class :inherit bold :foreground ,red))) + `(cider-repl-stdout-face ((,class :foreground ,blue))) + `(cider-result-overlay-face ((,class :box (:line-width -1 :color ,blue :style nil) :background ,bg-dim))) + `(cider-stacktrace-error-class-face ((,class :inherit bold :foreground ,red))) + `(cider-stacktrace-error-message-face ((,class :inherit italic :foreground ,red-alt-other))) + `(cider-stacktrace-face ((,class :foreground ,fg-main))) + `(cider-stacktrace-filter-active-face ((,class :foreground ,cyan-alt :underline t))) + `(cider-stacktrace-filter-inactive-face ((,class :foreground ,cyan-alt))) + `(cider-stacktrace-fn-face ((,class :inherit bold :foreground ,fg-main))) + `(cider-stacktrace-ns-face ((,class :inherit italic :foreground ,fg-alt))) + `(cider-stacktrace-promoted-button-face ((,class :box (:line-width 3 :color ,fg-alt :style released-button) :foreground ,red))) + `(cider-stacktrace-suppressed-button-face ((,class :box (:line-width 3 :color ,fg-alt :style pressed-button) + :background ,bg-alt :foreground ,fg-alt))) + `(cider-test-error-face ((,class :inherit modus-themes-subtle-red))) + `(cider-test-failure-face ((,class :inherit (modus-themes-intense-red bold)))) + `(cider-test-success-face ((,class :inherit ,@(modus-themes--success-deuteran + 'modus-themes-intense-blue + 'modus-themes-intense-green)))) + `(cider-traced-face ((,class :box (:line-width -1 :color ,cyan :style nil) :background ,bg-dim))) + `(cider-warning-highlight-face ((,class :foreground ,yellow :underline t))) +;;;;; circe (and lui) + `(circe-fool-face ((,class :inherit shadow))) + `(circe-highlight-nick-face ((,class :inherit bold :foreground ,blue))) + `(circe-prompt-face ((,class :inherit modus-themes-prompt))) + `(circe-server-face ((,class :foreground ,fg-unfocused))) + `(lui-button-face ((,class :inherit button))) + `(lui-highlight-face ((,class :foreground ,magenta-alt))) + `(lui-time-stamp-face ((,class :foreground ,blue-nuanced-fg))) +;;;;; color-rg + `(color-rg-font-lock-column-number ((,class :foreground ,magenta-alt-other))) + `(color-rg-font-lock-command ((,class :inherit bold :foreground ,fg-main))) + `(color-rg-font-lock-file ((,class :inherit bold :foreground ,fg-special-cold))) + `(color-rg-font-lock-flash ((,class :inherit modus-themes-intense-blue))) + `(color-rg-font-lock-function-location ((,class :inherit modus-themes-special-calm))) + `(color-rg-font-lock-header-line-directory ((,class :foreground ,blue-active))) + `(color-rg-font-lock-header-line-edit-mode ((,class :foreground ,magenta-active))) + `(color-rg-font-lock-header-line-keyword ((,class :foreground ,green-active))) + `(color-rg-font-lock-header-line-text ((,class :foreground ,fg-active))) + `(color-rg-font-lock-line-number ((,class :foreground ,fg-special-warm))) + `(color-rg-font-lock-mark-changed ((,class :inherit bold :foreground ,blue))) + `(color-rg-font-lock-mark-deleted ((,class :inherit bold :foreground ,red))) + `(color-rg-font-lock-match ((,class :inherit modus-themes-special-calm))) + `(color-rg-font-lock-position-splitter ((,class :inherit shadow))) +;;;;; column-enforce-mode + `(column-enforce-face ((,class :inherit modus-themes-refine-yellow))) +;;;;; company-mode + `(company-echo-common ((,class :foreground ,magenta-alt-other))) + `(company-preview ((,class :background ,bg-dim :foreground ,fg-dim))) + `(company-preview-common ((,class :foreground ,blue-alt))) + `(company-preview-search ((,class :inherit modus-themes-special-calm))) + `(company-scrollbar-bg ((,class :background ,bg-active))) + `(company-scrollbar-fg ((,class :background ,fg-active))) + `(company-template-field ((,class :inherit modus-themes-intense-magenta))) + `(company-tooltip ((,class :background ,bg-alt :foreground ,fg-alt))) + `(company-tooltip-annotation ((,class :inherit modus-themes-slant :foreground ,fg-special-cold))) + `(company-tooltip-annotation-selection ((,class :inherit bold :foreground ,fg-main))) + `(company-tooltip-common ((,class :inherit bold :foreground ,blue-alt))) + `(company-tooltip-common-selection ((,class :foreground ,fg-main))) + `(company-tooltip-mouse ((,class :inherit modus-themes-intense-blue))) + `(company-tooltip-search ((,class :inherit (modus-themes-search-success-lazy bold)))) + `(company-tooltip-search-selection ((,class :inherit (modus-themes-search-success bold) :underline t))) + `(company-tooltip-selection ((,class :inherit (modus-themes-subtle-cyan bold)))) +;;;;; company-posframe + `(company-posframe-active-backend-name ((,class :inherit bold :background ,bg-active :foreground ,blue-active))) + `(company-posframe-inactive-backend-name ((,class :background ,bg-active :foreground ,fg-active))) + `(company-posframe-metadata ((,class :background ,bg-inactive :foreground ,fg-inactive))) +;;;;; compilation feedback + `(compilation-column-number ((,class :foreground ,magenta-alt-other))) + `(compilation-error ((,class :inherit modus-themes-bold :foreground ,red))) + `(compilation-info ((,class :inherit modus-themes-bold :foreground ,fg-special-cold))) + `(compilation-line-number ((,class :foreground ,fg-special-warm))) + `(compilation-mode-line-exit ((,class :inherit modus-themes-bold :foreground ,blue-active))) + `(compilation-mode-line-fail ((,class :inherit modus-themes-bold :foreground ,red-active))) + `(compilation-mode-line-run ((,class :inherit modus-themes-bold :foreground ,magenta-active))) + `(compilation-warning ((,class :inherit modus-themes-bold :foreground ,yellow))) +;;;;; completions + `(completions-annotations ((,class :inherit modus-themes-slant :foreground ,cyan-faint))) + `(completions-common-part ((,class ,@(modus-themes--standard-completions + blue-alt blue-nuanced-bg + cyan-refine-bg cyan-refine-fg)))) + `(completions-first-difference ((,class :inherit bold + ,@(modus-themes--standard-completions + magenta-alt blue-nuanced-bg + magenta-intense-bg fg-main)))) +;;;;; consult + `(consult-async-running ((,class :inherit bold :foreground ,blue))) + `(consult-async-split ((,class :foreground ,magenta-alt))) + `(consult-bookmark ((,class :foreground ,blue))) + `(consult-file ((,class :foreground ,fg-special-cold))) + `(consult-imenu-prefix ((,class :inherit shadow))) + `(consult-key ((,class :inherit modus-themes-key-binding))) + `(consult-line-number ((,class :foreground ,fg-special-warm))) + `(consult-line-number-prefix ((,class :foreground ,fg-unfocused))) + `(consult-narrow-indicator ((,class :foreground ,magenta-alt))) + `(consult-preview-cursor ((,class :inherit modus-themes-intense-blue))) + `(consult-preview-error ((,class :inherit modus-themes-intense-red))) + `(consult-preview-line ((,class :background ,bg-hl-alt-intense))) +;;;;; corfu + `(corfu-background ((,class :background ,bg-alt))) + `(corfu-current ((,class :inherit bold :background ,cyan-subtle-bg))) + `(corfu-bar ((,class :background ,fg-alt))) + `(corfu-border ((,class :background ,bg-active))) +;;;;; counsel + `(counsel-active-mode ((,class :foreground ,magenta-alt-other))) + `(counsel-application-name ((,class :foreground ,red-alt-other))) + `(counsel-key-binding ((,class :inherit modus-themes-key-binding))) + `(counsel-outline-1 ((,class :inherit org-level-1))) + `(counsel-outline-2 ((,class :inherit org-level-2))) + `(counsel-outline-3 ((,class :inherit org-level-3))) + `(counsel-outline-4 ((,class :inherit org-level-4))) + `(counsel-outline-5 ((,class :inherit org-level-5))) + `(counsel-outline-6 ((,class :inherit org-level-6))) + `(counsel-outline-7 ((,class :inherit org-level-7))) + `(counsel-outline-8 ((,class :inherit org-level-8))) + `(counsel-outline-default ((,class :foreground ,fg-main))) + `(counsel-variable-documentation ((,class :inherit modus-themes-slant :foreground ,yellow-alt-other))) +;;;;; counsel-css + `(counsel-css-selector-depth-face-1 ((,class :foreground ,blue))) + `(counsel-css-selector-depth-face-2 ((,class :foreground ,cyan))) + `(counsel-css-selector-depth-face-3 ((,class :foreground ,green))) + `(counsel-css-selector-depth-face-4 ((,class :foreground ,yellow))) + `(counsel-css-selector-depth-face-5 ((,class :foreground ,magenta))) + `(counsel-css-selector-depth-face-6 ((,class :foreground ,red))) +;;;;; counsel-org-capture-string + `(counsel-org-capture-string-template-body-face ((,class :foreground ,fg-special-cold))) +;;;;; cov + `(cov-coverage-not-run-face ((,class :foreground ,red-intense))) + `(cov-coverage-run-face ((,class :foreground ,green-intense))) + `(cov-heavy-face ((,class :foreground ,magenta-intense))) + `(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 unspecified))) + `(cperl-array-face ((,class :inherit font-lock-keyword-face))) + `(cperl-hash-face ((,class :inherit font-lock-variable-name-face))) +;;;;; css-mode + `(css-property ((,class :inherit font-lock-type-face))) + `(css-selector ((,class :inherit font-lock-keyword-face))) +;;;;; csv-mode + `(csv-separator-face ((,class :foreground ,red-intense))) +;;;;; ctrlf + `(ctrlf-highlight-active ((,class :inherit (modus-themes-search-success bold)))) + `(ctrlf-highlight-line ((,class :inherit modus-themes-hl-line))) + `(ctrlf-highlight-passive ((,class :inherit modus-themes-search-success-lazy))) +;;;;; custom (M-x customize) + `(custom-button ((,class :box (:line-width 2 :color nil :style released-button) + :background ,bg-active :foreground ,fg-main))) + `(custom-button-mouse ((,class :box (:line-width 2 :color nil :style released-button) + :background ,bg-active :foreground ,fg-active))) + `(custom-button-pressed ((,class :box (:line-width 2 :color nil :style pressed-button) + :background ,bg-active :foreground ,fg-main))) + `(custom-changed ((,class :inherit modus-themes-subtle-cyan))) + `(custom-comment ((,class :inherit shadow))) + `(custom-comment-tag ((,class :background ,bg-alt :foreground ,yellow-alt-other))) + `(custom-face-tag ((,class :inherit bold :foreground ,blue-intense))) + `(custom-group-tag ((,class :inherit bold :foreground ,green-intense))) + `(custom-group-tag-1 ((,class :inherit modus-themes-special-warm))) + `(custom-invalid ((,class :inherit (modus-themes-intense-red bold)))) + `(custom-modified ((,class :inherit modus-themes-subtle-cyan))) + `(custom-rogue ((,class :inherit modus-themes-refine-magenta))) + `(custom-set ((,class :foreground ,blue-alt))) + `(custom-state ((,class :foreground ,cyan-alt-other))) + `(custom-themed ((,class :inherit modus-themes-subtle-blue))) + `(custom-variable-tag ((,class :inherit bold :foreground ,cyan))) +;;;;; dap-mode + `(dap-mouse-eval-thing-face ((,class :box (:line-width -1 :color ,blue-active :style nil) + :background ,bg-active :foreground ,fg-main))) + `(dap-result-overlay-face ((,class :box (:line-width -1 :color ,bg-active :style nil) + :background ,bg-active :foreground ,fg-main))) + `(dap-ui-breakpoint-verified-fringe ((,class :inherit bold :foreground ,green-active))) + `(dap-ui-compile-errline ((,class :inherit bold :foreground ,red-intense))) + `(dap-ui-locals-scope-face ((,class :inherit bold :foreground ,magenta :underline t))) + `(dap-ui-locals-variable-face ((,class :inherit bold :foreground ,cyan))) + `(dap-ui-locals-variable-leaf-face ((,class :inherit italic :foreground ,cyan-alt-other))) + `(dap-ui-marker-face ((,class :inherit modus-themes-subtle-blue))) + `(dap-ui-sessions-stack-frame-face ((,class :inherit bold :foreground ,magenta-alt))) + `(dap-ui-sessions-terminated-active-face ((,class :inherit bold :foreground ,fg-alt))) + `(dap-ui-sessions-terminated-face ((,class :inherit shadow))) +;;;;; dashboard (emacs-dashboard) + `(dashboard-banner-logo-title ((,class :inherit bold :foreground ,fg-special-cold))) + `(dashboard-footer ((,class :inherit bold :foreground ,fg-special-mild))) + `(dashboard-heading ((,class :inherit bold :foreground ,fg-special-warm))) + `(dashboard-navigator ((,class :foreground ,cyan-alt-other))) + `(dashboard-text-banner ((,class :foreground ,fg-dim))) +;;;;; deadgrep + `(deadgrep-filename-face ((,class :inherit bold :foreground ,fg-special-cold))) + `(deadgrep-match-face ((,class :inherit modus-themes-special-calm))) + `(deadgrep-meta-face ((,class :inherit shadow))) + `(deadgrep-regexp-metachar-face ((,class :inherit bold :foreground ,yellow-intense))) + `(deadgrep-search-term-face ((,class :inherit bold :foreground ,green-intense))) +;;;;; debbugs + `(debbugs-gnu-archived ((,class :inverse-video t))) + `(debbugs-gnu-done ((,class :inherit shadow))) + `(debbugs-gnu-forwarded ((,class :foreground ,fg-special-warm))) + `(debbugs-gnu-handled ((,class :foreground ,blue))) + `(debbugs-gnu-new ((,class :foreground ,red))) + `(debbugs-gnu-pending ((,class :foreground ,cyan))) + `(debbugs-gnu-stale-1 ((,class :foreground ,yellow-nuanced-fg))) + `(debbugs-gnu-stale-2 ((,class :foreground ,yellow))) + `(debbugs-gnu-stale-3 ((,class :foreground ,yellow-alt))) + `(debbugs-gnu-stale-4 ((,class :foreground ,yellow-alt-other))) + `(debbugs-gnu-stale-5 ((,class :foreground ,red-alt))) + `(debbugs-gnu-tagged ((,class :foreground ,magenta-alt))) +;;;;; define-word + `(define-word-face-1 ((,class :foreground ,yellow))) + `(define-word-face-2 ((,class :foreground ,fg-main))) +;;;;; deft + `(deft-filter-string-error-face ((,class :inherit modus-themes-refine-red))) + `(deft-filter-string-face ((,class :foreground ,green-intense))) + `(deft-header-face ((,class :inherit bold :foreground ,fg-special-warm))) + `(deft-separator-face ((,class :inherit shadow))) + `(deft-summary-face ((,class :inherit modus-themes-slant :foreground ,fg-alt))) + `(deft-time-face ((,class :foreground ,fg-special-cold))) + `(deft-title-face ((,class :inherit bold :foreground ,fg-main))) +;;;;; dictionary + `(dictionary-button-face ((,class :inherit bold :foreground ,fg-special-cold))) + `(dictionary-reference-face ((,class :inherit button))) + `(dictionary-word-definition-face (())) + `(dictionary-word-entry-face ((,class :inherit font-lock-comment-face))) +;;;;; diff-hl + `(diff-hl-change ((,class :inherit modus-themes-fringe-yellow))) + `(diff-hl-delete ((,class :inherit modus-themes-fringe-red))) + `(diff-hl-dired-change ((,class :inherit diff-hl-change))) + `(diff-hl-dired-delete ((,class :inherit diff-hl-delete))) + `(diff-hl-dired-ignored ((,class :inherit dired-ignored))) + `(diff-hl-dired-insert ((,class :inherit diff-hl-insert))) + `(diff-hl-dired-unknown ((,class :inherit dired-ignored))) + `(diff-hl-insert ((,class :inherit ,@(modus-themes--diff-deuteran + 'modus-themes-fringe-blue + 'modus-themes-fringe-green)))) + `(diff-hl-reverted-hunk-highlight ((,class :background ,fg-main :foreground ,bg-main))) +;;;;; diff-mode + `(diff-added ((,class :inherit modus-themes-diff-added))) + `(diff-changed ((,class :inherit modus-themes-diff-changed :extend t))) + `(diff-context ((,class ,@(unless (eq modus-themes-diffs 'bg-only) (list :foreground fg-unfocused))))) + `(diff-error ((,class :inherit modus-themes-intense-red))) + `(diff-file-header ((,class :inherit (bold diff-header)))) + `(diff-function ((,class :inherit modus-themes-diff-heading))) + `(diff-header ((,class :foreground ,fg-main))) + `(diff-hunk-header ((,class :inherit (bold modus-themes-diff-heading)))) + `(diff-index ((,class :inherit bold :foreground ,blue-alt))) + `(diff-indicator-added ((,class :inherit (diff-added bold) + :foreground ,@(modus-themes--diff-deuteran blue green)))) + `(diff-indicator-changed ((,class :inherit (diff-changed bold) :foreground ,yellow))) + `(diff-indicator-removed ((,class :inherit (diff-removed bold) :foreground ,red))) + `(diff-nonexistent ((,class :inherit (modus-themes-neutral bold)))) + `(diff-refine-added ((,class :inherit modus-themes-diff-refine-added))) + `(diff-refine-changed ((,class :inherit modus-themes-diff-refine-changed))) + `(diff-refine-removed ((,class :inherit modus-themes-diff-refine-removed))) + `(diff-removed ((,class :inherit modus-themes-diff-removed))) +;;;;; dim-autoload + `(dim-autoload-cookie-line ((,class :inherit font-lock-comment-face))) +;;;;; 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 :inherit shadow))) + `(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 :inherit shadow))) + `(dir-treeview-label-mouse-face ((,class :inherit highlight))) + `(dir-treeview-start-dir-face ((,class :inherit modus-themes-pseudo-header))) + `(dir-treeview-symlink-face ((,class :inherit button + ,@(modus-themes--link-color + cyan cyan-faint)))) + `(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-broken-symlink ((,class :inherit button :foreground ,red))) + `(dired-directory ((,class :foreground ,blue))) + `(dired-flagged ((,class :inherit modus-themes-mark-del))) + `(dired-header ((,class :inherit modus-themes-pseudo-header))) + `(dired-ignored ((,class :inherit shadow))) + `(dired-mark ((,class :inherit modus-themes-mark-symbol))) + `(dired-marked ((,class :inherit modus-themes-mark-sel))) + `(dired-perm-write ((,class :foreground ,fg-special-warm))) + `(dired-symlink ((,class :inherit button + ,@(modus-themes--link-color + cyan-alt cyan-alt-faint)))) + `(dired-warning ((,class :inherit bold :foreground ,yellow))) +;;;;; dired-async + `(dired-async-failures ((,class :inherit bold :foreground ,red-active))) + `(dired-async-message ((,class :inherit bold :foreground ,blue-active))) + `(dired-async-mode-message ((,class :inherit bold :foreground ,cyan-active))) +;;;;; dired-git + `(dired-git-branch-else ((,class :inherit bold :foreground ,magenta-alt))) + `(dired-git-branch-master ((,class :inherit bold :foreground ,magenta-alt-other))) +;;;;; dired-git-info + `(dgi-commit-message-face ((,class :foreground ,fg-special-mild))) +;;;;; dired-narrow + `(dired-narrow-blink ((,class :inherit (modus-themes-subtle-cyan bold)))) +;;;;; dired-subtree + ;; remove backgrounds from dired-subtree faces, else they break + ;; dired-{flagged,marked} and any other face that sets a background + ;; such as hl-line. Also, denoting depth by varying shades of gray + ;; is not good for accessibility. + `(dired-subtree-depth-1-face (())) + `(dired-subtree-depth-2-face (())) + `(dired-subtree-depth-3-face (())) + `(dired-subtree-depth-4-face (())) + `(dired-subtree-depth-5-face (())) + `(dired-subtree-depth-6-face (())) +;;;;; diredc + `(diredc-face-chmod-font-lock-dir ((,class :foreground ,blue-alt))) + `(diredc-face-chmod-font-lock-exec ((,class :foreground ,magenta))) + `(diredc-face-chmod-font-lock-read ((,class :foreground ,fg-main))) + `(diredc-face-chmod-font-lock-write ((,class :foreground ,cyan))) +;;;;; diredfl + `(diredfl-autofile-name ((,class :inherit modus-themes-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-themes-mark-del))) + `(diredfl-deletion-file-name ((,class :inherit modus-themes-mark-del))) + `(diredfl-dir-heading ((,class :inherit modus-themes-pseudo-header))) + `(diredfl-dir-name ((,class :inherit dired-directory))) + `(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 ,cyan))) + `(diredfl-flag-mark ((,class :inherit modus-themes-mark-sel))) + `(diredfl-flag-mark-line ((,class :inherit modus-themes-mark-sel))) + `(diredfl-ignored-file-name ((,class :inherit shadow))) + `(diredfl-link-priv ((,class :foreground ,blue-alt-other))) + `(diredfl-no-priv ((,class :inherit shadow))) + `(diredfl-number ((,class :foreground ,cyan-alt))) + `(diredfl-other-priv ((,class :foreground ,yellow))) + `(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-themes-refine-magenta))) + `(diredfl-write-priv ((,class :foreground ,cyan))) +;;;;; dired+ + `(diredp-autofile-name ((,class :inherit modus-themes-special-cold))) + `(diredp-compressed-file-name ((,class :foreground ,fg-special-warm))) + `(diredp-compressed-file-suffix ((,class :foreground ,red-alt))) + `(diredp-date-time ((,class :foreground ,cyan-alt-other))) + `(diredp-deletion ((,class :inherit modus-themes-mark-del))) + `(diredp-deletion-file-name ((,class :inherit modus-themes-mark-del))) + `(diredp-dir-heading ((,class :inherit modus-themes-pseudo-header))) + `(diredp-dir-name ((,class :inherit dired-directory))) + `(diredp-dir-priv ((,class :foreground ,blue-alt))) + `(diredp-exec-priv ((,class :foreground ,magenta))) + `(diredp-executable-tag ((,class :foreground ,magenta-alt))) + `(diredp-file-name ((,class :foreground ,fg-main))) + `(diredp-file-suffix ((,class :foreground ,cyan))) + `(diredp-flag-mark ((,class :inherit modus-themes-mark-sel))) + `(diredp-flag-mark-line ((,class :inherit modus-themes-mark-sel))) + `(diredp-ignored-file-name ((,class :inherit shadow))) + `(diredp-link-priv ((,class :foreground ,blue-alt-other))) + `(diredp-mode-line-flagged ((,class :foreground ,red-active))) + `(diredp-mode-line-marked ((,class :foreground ,green-active))) + `(diredp-no-priv ((,class :inherit shadow))) + `(diredp-number ((,class :foreground ,cyan-alt))) + `(diredp-omit-file-name ((,class :inherit shadow :strike-through t))) + `(diredp-other-priv ((,class :foreground ,yellow))) + `(diredp-rare-priv ((,class :foreground ,red-alt))) + `(diredp-read-priv ((,class :foreground ,fg-main))) + `(diredp-symlink ((,class :inherit dired-symlink))) + `(diredp-tagged-autofile-name ((,class :inherit modus-themes-refine-magenta))) + `(diredp-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 :inherit button))) + `(disk-usage-symlink-directory ((,class :inherit bold :foreground ,blue-alt))) +;;;;; display-fill-column-indicator-mode + `(fill-column-indicator ((,class :foreground ,bg-active))) +;;;;; doom-modeline + `(doom-modeline-bar ((,class :inherit modus-themes-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 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))) + `(doom-modeline-buffer-file ((,class :inherit bold :foreground ,fg-active))) + `(doom-modeline-buffer-major-mode ((,class :inherit bold :foreground ,cyan-active))) + `(doom-modeline-buffer-minor-mode ((,class :foreground ,fg-inactive))) + `(doom-modeline-buffer-modified ((,class :inherit bold :foreground ,magenta-active))) + `(doom-modeline-buffer-path ((,class :inherit bold :foreground ,fg-active))) + `(doom-modeline-debug ((,class :inherit bold :foreground ,yellow-active))) + `(doom-modeline-debug-visual ((,class :inherit bold :foreground ,red-active))) + `(doom-modeline-evil-emacs-state ((,class :inherit bold :foreground ,magenta-active))) + `(doom-modeline-evil-insert-state ((,class :inherit bold :foreground ,green-active))) + `(doom-modeline-evil-motion-state ((,class :inherit bold :foreground ,fg-inactive))) + `(doom-modeline-evil-normal-state ((,class :inherit bold :foreground ,fg-active))) + `(doom-modeline-evil-operator-state ((,class :inherit bold :foreground ,blue-active))) + `(doom-modeline-evil-replace-state ((,class :inherit bold :foreground ,red-active))) + `(doom-modeline-evil-visual-state ((,class :inherit bold :foreground ,cyan-active))) + `(doom-modeline-highlight ((,class :inherit bold :foreground ,blue-active))) + `(doom-modeline-host ((,class :inherit italic))) + `(doom-modeline-info ((,class :foreground ,green-active))) + `(doom-modeline-lsp-error ((,class :inherit bold :foreground ,red-active))) + `(doom-modeline-lsp-success ((,class :inherit bold :foreground ,@(modus-themes--success-deuteran + blue-active + green-active)))) + `(doom-modeline-lsp-warning ((,class :inherit bold :foreground ,yellow-active))) + `(doom-modeline-panel ((,class :inherit modus-themes-active-blue))) + `(doom-modeline-persp-buffer-not-in-persp ((,class :inherit italic :foreground ,yellow-active))) + `(doom-modeline-persp-name ((,class :foreground ,fg-active))) + `(doom-modeline-project-dir ((,class :inherit bold :foreground ,blue-active))) + `(doom-modeline-project-parent-dir ((,class :foreground ,blue-active))) + `(doom-modeline-project-root-dir ((,class :foreground ,fg-active))) + `(doom-modeline-unread-number ((,class :inherit italic :foreground ,fg-active))) + `(doom-modeline-urgent ((,class :inherit bold :foreground ,red-active))) + `(doom-modeline-warning ((,class :inherit bold :foreground ,yellow-active))) +;;;;; dynamic-ruler + `(dynamic-ruler-negative-face ((,class :inherit modus-themes-intense-neutral))) + `(dynamic-ruler-positive-face ((,class :inherit modus-themes-intense-yellow))) +;;;;; easy-jekyll + `(easy-jekyll-help-face ((,class :background ,bg-dim :foreground ,cyan-alt-other))) +;;;;; easy-kill + `(easy-kill-origin ((,class :inherit modus-themes-subtle-red))) + `(easy-kill-selection ((,class :inherit modus-themes-subtle-yellow))) +;;;;; ebdb + `(ebdb-address-default ((,class :foreground ,fg-special-calm))) + `(ebdb-defunct ((,class :inherit shadow))) + `(ebdb-field-hidden ((,class :foreground ,magenta))) + `(ebdb-label ((,class :foreground ,cyan-alt-other))) + `(ebdb-mail-default ((,class :foreground ,fg-main))) + `(ebdb-mail-primary ((,class :foreground ,magenta-alt))) + `(ebdb-marked ((,class :background ,cyan-intense-bg))) + `(ebdb-organization-name ((,class :foreground ,red-alt-other))) + `(ebdb-person-name ((,class :foreground ,magenta-alt-other))) + `(ebdb-phone-default ((,class :foreground ,cyan))) + `(eieio-custom-slot-tag-face ((,class :foreground ,red-alt))) +;;;;; ediff + `(ediff-current-diff-A ((,class :inherit modus-themes-diff-focus-removed))) + `(ediff-current-diff-Ancestor ((,class ,@(modus-themes--diff + bg-alt fg-special-cold + bg-special-cold fg-special-cold + blue-nuanced-bg blue)))) + `(ediff-current-diff-B ((,class :inherit modus-themes-diff-focus-added))) + `(ediff-current-diff-C ((,class :inherit modus-themes-diff-focus-changed))) + `(ediff-even-diff-A ((,class :background ,bg-alt))) + `(ediff-even-diff-Ancestor ((,class :background ,bg-alt))) + `(ediff-even-diff-B ((,class :background ,bg-alt))) + `(ediff-even-diff-C ((,class :background ,bg-alt))) + `(ediff-fine-diff-A ((,class :inherit modus-themes-diff-refine-removed))) + `(ediff-fine-diff-Ancestor ((,class :inherit modus-themes-refine-cyan))) + `(ediff-fine-diff-B ((,class :inherit modus-themes-diff-refine-added))) + `(ediff-fine-diff-C ((,class :inherit modus-themes-diff-refine-changed))) + `(ediff-odd-diff-A ((,class :inherit ediff-even-diff-A))) + `(ediff-odd-diff-Ancestor ((,class :inherit ediff-even-diff-Ancestor))) + `(ediff-odd-diff-B ((,class :inherit ediff-even-diff-B))) + `(ediff-odd-diff-C ((,class :inherit ediff-even-diff-C))) +;;;;; eglot + `(eglot-mode-line ((,class :inherit modus-themes-bold :foreground ,magenta-active))) +;;;;; el-search + `(el-search-highlight-in-prompt-face ((,class :inherit bold :foreground ,magenta-alt))) + `(el-search-match ((,class :inherit modus-themes-search-success))) + `(el-search-other-match ((,class :inherit modus-themes-special-mild))) + `(el-search-occur-match ((,class :inherit modus-themes-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))) +;;;;; elfeed + `(elfeed-log-date-face ((,class :inherit elfeed-search-date-face))) + `(elfeed-log-debug-level-face ((,class :inherit elfeed-search-filter-face))) + `(elfeed-log-error-level-face ((,class :inherit error))) + `(elfeed-log-info-level-face ((,class :inherit success))) + `(elfeed-log-warn-level-face ((,class :inherit warning))) + `(elfeed-search-date-face ((,class :foreground ,cyan))) + `(elfeed-search-feed-face ((,class :foreground ,blue-faint))) + `(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 ,cyan-alt-other))) + `(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))) + `(elfeed-score-error-level-face ((,class :foreground ,red))) + `(elfeed-score-info-level-face ((,class :foreground ,cyan))) + `(elfeed-score-warn-level-face ((,class :foreground ,yellow))) +;;;;; embark + `(embark-keybinding ((,class :inherit modus-themes-key-binding))) +;;;;; emms + `(emms-playlist-track-face ((,class :foreground ,blue-alt))) + `(emms-playlist-selected-face ((,class :inherit bold :foreground ,blue-alt-other))) + `(emms-metaplaylist-mode-current-face ((,class :inherit emms-playlist-selected-face))) + `(emms-metaplaylist-mode-face ((,class :foreground ,cyan))) +;;;;; enh-ruby-mode (enhanced-ruby-mode) + `(enh-ruby-heredoc-delimiter-face ((,class :inherit font-lock-constant-face))) + `(enh-ruby-op-face ((,class :foreground ,fg-main))) + `(enh-ruby-regexp-delimiter-face ((,class :inherit font-lock-regexp-grouping-construct))) + `(enh-ruby-regexp-face ((,class :inherit font-lock-string-face))) + `(enh-ruby-string-delimiter-face ((,class :inherit font-lock-string-face))) + `(erm-syn-errline ((,class :inherit modus-themes-lang-error))) + `(erm-syn-warnline ((,class :inherit modus-themes-lang-warning))) +;;;;; epa + `(epa-field-body ((,class :foreground ,fg-main))) + `(epa-field-name ((,class :inherit bold :foreground ,fg-dim))) + `(epa-mark ((,class :inherit bold :foreground ,magenta))) + `(epa-string ((,class :foreground ,blue-alt))) + `(epa-validity-disabled ((,class :foreground ,red))) + `(epa-validity-high ((,class :inherit bold :foreground ,cyan))) + `(epa-validity-low ((,class :inherit shadow))) + `(epa-validity-medium ((,class :foreground ,green-alt))) +;;;;; equake + `(equake-buffer-face ((,class :background ,bg-main :foreground ,fg-main))) + `(equake-shell-type-eshell ((,class :background ,bg-inactive :foreground ,blue-active))) + `(equake-shell-type-rash ((,class :background ,bg-inactive :foreground ,red-active))) + `(equake-shell-type-shell ((,class :background ,bg-inactive :foreground ,cyan-active))) + `(equake-shell-type-term ((,class :background ,bg-inactive :foreground ,yellow-active))) + `(equake-shell-type-vterm ((,class :background ,bg-inactive :foreground ,magenta-active))) + `(equake-tab-active ((,class :background ,fg-alt :foreground ,bg-alt))) + `(equake-tab-inactive ((,class :foreground ,fg-inactive))) +;;;;; erc + `(erc-action-face ((,class :inherit bold :foreground ,cyan))) + `(erc-bold-face ((,class :inherit bold))) + `(erc-button ((,class :inherit button))) + `(erc-command-indicator-face ((,class :inherit bold :foreground ,cyan-alt))) + `(erc-current-nick-face ((,class :foreground ,magenta-alt-other))) + `(erc-dangerous-host-face ((,class :inherit modus-themes-intense-red))) + `(erc-direct-msg-face ((,class :foreground ,magenta))) + `(erc-error-face ((,class :inherit bold :foreground ,red))) + `(erc-fool-face ((,class :foreground ,fg-inactive))) + `(erc-header-line ((,class :background ,bg-header :foreground ,fg-header))) + `(erc-input-face ((,class :foreground ,fg-special-calm))) + `(erc-inverse-face ((,class :inherit erc-default-face :inverse-video t))) + `(erc-keyword-face ((,class :inherit bold :foreground ,magenta-alt))) + `(erc-my-nick-face ((,class :inherit bold :foreground ,magenta))) + `(erc-my-nick-prefix-face ((,class :inherit erc-my-nick-face))) + `(erc-nick-default-face ((,class :inherit bold :foreground ,blue))) + `(erc-nick-msg-face ((,class :inherit bold :foreground ,green))) + `(erc-nick-prefix-face ((,class :inherit erc-nick-default-face))) + `(erc-notice-face ((,class :foreground ,fg-unfocused))) + `(erc-pal-face ((,class :inherit bold :foreground ,red-alt))) + `(erc-prompt-face ((,class :inherit modus-themes-prompt))) + `(erc-timestamp-face ((,class :foreground ,blue-nuanced-fg))) + `(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))) +;;;;; ert + `(ert-test-result-expected ((,class :inherit modus-themes-intense-green))) + `(ert-test-result-unexpected ((,class :inherit modus-themes-intense-red))) +;;;;; eshell + `(eshell-ls-archive ((,class :foreground ,cyan-alt))) + `(eshell-ls-backup ((,class :inherit shadow))) + `(eshell-ls-clutter ((,class :foreground ,red-alt))) + `(eshell-ls-directory ((,class :foreground ,blue-alt))) + `(eshell-ls-executable ((,class :foreground ,magenta-alt))) + `(eshell-ls-missing ((,class :inherit modus-themes-intense-red))) + `(eshell-ls-product ((,class :inherit shadow))) + `(eshell-ls-readonly ((,class :foreground ,yellow-faint))) + `(eshell-ls-special ((,class :foreground ,magenta))) + `(eshell-ls-symlink ((,class :foreground ,cyan))) + `(eshell-ls-unreadable ((,class :background ,bg-inactive :foreground ,fg-inactive))) + `(eshell-prompt ((,class :inherit modus-themes-prompt))) +;;;;; eshell-fringe-status + `(eshell-fringe-status-failure ((,class :inherit error))) + `(eshell-fringe-status-success ((,class :inherit success))) +;;;;; eshell-git-prompt + `(eshell-git-prompt-add-face ((,class :foreground ,magenta-alt-other))) + `(eshell-git-prompt-branch-face ((,class :foreground ,magenta-alt))) + `(eshell-git-prompt-directory-face ((,class :inherit bold :foreground ,blue))) + `(eshell-git-prompt-exit-fail-face ((,class :inherit error))) + `(eshell-git-prompt-exit-success-face ((,class :inherit success))) + `(eshell-git-prompt-modified-face ((,class :foreground ,yellow))) + `(eshell-git-prompt-powerline-clean-face ((,class :background ,green-refine-bg))) + `(eshell-git-prompt-powerline-dir-face ((,class :background ,blue-refine-bg))) + `(eshell-git-prompt-powerline-not-clean-face ((,class :background ,yellow-fringe-bg))) + `(eshell-git-prompt-robyrussell-branch-face ((,class :foreground ,magenta-alt))) + `(eshell-git-prompt-robyrussell-git-dirty-face ((,class :foreground ,yellow))) + `(eshell-git-prompt-robyrussell-git-face ((,class :foreground ,magenta-alt-other))) +;;;;; eshell-prompt-extras (epe) + `(epe-dir-face ((,class :inherit bold :foreground ,blue))) + `(epe-git-dir-face ((,class :foreground ,red-alt-other))) + `(epe-git-face ((,class :foreground ,magenta-alt))) + `(epe-pipeline-delimiter-face ((,class :inherit shadow))) + `(epe-pipeline-host-face ((,class :foreground ,fg-main))) + `(epe-pipeline-time-face ((,class :foreground ,fg-main))) + `(epe-pipeline-user-face ((,class :foreground ,magenta-alt-other))) + `(epe-remote-face ((,class :inherit (shadow modus-themes-slant)))) + `(epe-status-face ((,class :foreground ,magenta-alt-other))) + `(epe-venv-face ((,class :inherit (shadow modus-themes-slant)))) +;;;;; eshell-syntax-highlighting + `(eshell-syntax-highlighting-directory-face ((,class :inherit eshell-ls-directory))) + `(eshell-syntax-highlighting-invalid-face ((,class :foreground ,red))) + `(eshell-syntax-highlighting-shell-command-face ((,class :foreground ,fg-main))) +;;;;; evil-mode + `(evil-ex-commands ((,class :foreground ,magenta-alt-other))) + `(evil-ex-info ((,class :foreground ,cyan-alt-other))) + `(evil-ex-lazy-highlight ((,class :inherit modus-themes-search-success-lazy))) + `(evil-ex-search ((,class :inherit modus-themes-search-success))) + `(evil-ex-substitute-matches ((,class :inherit modus-themes-refine-yellow :underline t))) + `(evil-ex-substitute-replacement ((,class :inherit (modus-themes-search-success bold)))) +;;;;; evil-goggles + `(evil-goggles-change-face ((,class :inherit modus-themes-refine-yellow))) + `(evil-goggles-commentary-face ((,class :inherit (modus-themes-subtle-neutral modus-themes-slant)))) + `(evil-goggles-default-face ((,class :inherit modus-themes-subtle-neutral))) + `(evil-goggles-delete-face ((,class :inherit modus-themes-refine-red))) + `(evil-goggles-fill-and-move-face ((,class :inherit evil-goggles-default-face))) + `(evil-goggles-indent-face ((,class :inherit evil-goggles-default-face))) + `(evil-goggles-join-face ((,class :inherit modus-themes-subtle-green))) + `(evil-goggles-nerd-commenter-face ((,class :inherit evil-goggles-commentary-face))) + `(evil-goggles-paste-face ((,class :inherit modus-themes-subtle-cyan))) + `(evil-goggles-record-macro-face ((,class :inherit modus-themes-special-cold))) + `(evil-goggles-replace-with-register-face ((,class :inherit modus-themes-refine-magenta))) + `(evil-goggles-set-marker-face ((,class :inherit modus-themes-intense-magenta))) + `(evil-goggles-shift-face ((,class :inherit evil-goggles-default-face))) + `(evil-goggles-surround-face ((,class :inherit evil-goggles-default-face))) + `(evil-goggles-yank-face ((,class :inherit modus-themes-subtle-blue))) +;;;;; evil-snipe + `(evil-snipe-first-match-face ((,class :inherit (bold modus-themes-intense-blue)))) + `(evil-snipe-matches-face ((,class :inherit modus-themes-refine-magenta))) +;;;;; evil-visual-mark-mode + `(evil-visual-mark-face ((,class :inherit modus-themes-intense-magenta))) +;;;;; eww + `(eww-invalid-certificate ((,class :foreground ,red-faint))) + `(eww-valid-certificate ((,class :foreground ,blue-faint))) + `(eww-form-checkbox ((,class :inherit eww-form-text))) + `(eww-form-file ((,class :inherit eww-form-submit))) + `(eww-form-select ((,class :inherit eww-form-submit))) + `(eww-form-submit ((,class :box (:line-width 2 :style released-button) + :background ,bg-active))) + `(eww-form-text ((,class :box ,bg-active :background ,bg-alt))) + `(eww-form-textarea ((,class :background ,bg-alt))) +;;;;; eyebrowse + `(eyebrowse-mode-line-active ((,class :inherit bold :foreground ,blue-active))) +;;;;; fancy-dabbrev + `(fancy-dabbrev-menu-face ((,class :background ,bg-alt :foreground ,fg-alt))) + `(fancy-dabbrev-preview-face ((,class :inherit shadow :underline t))) + `(fancy-dabbrev-selection-face ((,class :inherit (modus-themes-intense-cyan bold)))) +;;;;; flycheck + `(flycheck-error ((,class :inherit modus-themes-lang-error))) + `(flycheck-error-list-checker-name ((,class :foreground ,magenta-active))) + `(flycheck-error-list-column-number ((,class :foreground ,fg-special-cold))) + `(flycheck-error-list-error ((,class :inherit modus-themes-bold :foreground ,red))) + `(flycheck-error-list-filename ((,class :foreground ,blue))) + `(flycheck-error-list-highlight ((,class :inherit modus-themes-hl-line))) + `(flycheck-error-list-id ((,class :foreground ,magenta-alt-other))) + `(flycheck-error-list-id-with-explainer ((,class :inherit flycheck-error-list-id :box t))) + `(flycheck-error-list-info ((,class :foreground ,cyan))) + `(flycheck-error-list-line-number ((,class :foreground ,fg-special-warm))) + `(flycheck-error-list-warning ((,class :foreground ,yellow))) + `(flycheck-fringe-error ((,class :inherit modus-themes-fringe-red))) + `(flycheck-fringe-info ((,class :inherit modus-themes-fringe-cyan))) + `(flycheck-fringe-warning ((,class :inherit modus-themes-fringe-yellow))) + `(flycheck-info ((,class :inherit modus-themes-lang-note))) + `(flycheck-verify-select-checker ((,class :box (:line-width 1 :color nil :style released-button)))) + `(flycheck-warning ((,class :inherit modus-themes-lang-warning))) +;;;;; 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 :inherit italic :foreground ,fg-inactive))) + `(flycheck-color-mode-line-info-face ((,class :inherit flycheck-fringe-warning))) +;;;;; flycheck-indicator + `(flycheck-indicator-disabled ((,class :inherit modus-themes-slant :foreground ,fg-inactive))) + `(flycheck-indicator-error ((,class :inherit modus-themes-bold :foreground ,red-active))) + `(flycheck-indicator-info ((,class :inherit modus-themes-bold :foreground ,blue-active))) + `(flycheck-indicator-running ((,class :inherit modus-themes-bold :foreground ,magenta-active))) + `(flycheck-indicator-success ((,class :inherit modus-themes-bold + :foreground ,@(modus-themes--success-deuteran + blue-active + green-active)))) + `(flycheck-indicator-warning ((,class :inherit modus-themes-bold :foreground ,yellow-active))) +;;;;; flycheck-posframe + `(flycheck-posframe-background-face ((,class :background ,bg-alt))) + `(flycheck-posframe-border-face ((,class :inherit shadow))) + `(flycheck-posframe-error-face ((,class :inherit bold :foreground ,red))) + `(flycheck-posframe-face ((,class :inherit modus-themes-slant :foreground ,fg-main))) + `(flycheck-posframe-info-face ((,class :inherit bold :foreground ,cyan))) + `(flycheck-posframe-warning-face ((,class :inherit bold :foreground ,yellow))) +;;;;; flymake + `(flymake-error ((,class :inherit modus-themes-lang-error))) + `(flymake-note ((,class :inherit modus-themes-lang-note))) + `(flymake-warning ((,class :inherit modus-themes-lang-warning))) +;;;;; flyspell + `(flyspell-duplicate ((,class :inherit modus-themes-lang-warning))) + `(flyspell-incorrect ((,class :inherit modus-themes-lang-error))) +;;;;; flyspell-correct + `(flyspell-correct-highlight-face ((,class :inherit modus-themes-refine-green))) +;;;;; flx + `(flx-highlight-face ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-magenta + 'modus-themes-intense-magenta + 'modus-themes-nuanced-magenta + magenta-alt + 'bold)))) +;;;;; freeze-it + `(freeze-it-show ((,class :background ,bg-dim :foreground ,fg-special-warm))) +;;;;; frog-menu + `(frog-menu-action-keybinding-face ((,class :inherit modus-themes-key-binding))) + `(frog-menu-actions-face ((,class :foreground ,magenta))) + `(frog-menu-border ((,class :background ,bg-active))) + `(frog-menu-candidates-face ((,class :foreground ,fg-main))) + `(frog-menu-posframe-background-face ((,class :background ,bg-dim))) + `(frog-menu-prompt-face ((,class :foreground ,cyan))) +;;;;; focus + `(focus-unfocused ((,class :foreground ,fg-unfocused))) +;;;;; fold-this + `(fold-this-overlay ((,class :inherit modus-themes-special-mild))) +;;;;; font-lock + `(font-lock-builtin-face ((,class :inherit modus-themes-bold + ,@(modus-themes--syntax-extra + magenta-alt magenta-alt-faint + magenta magenta-faint)))) + `(font-lock-comment-delimiter-face ((,class :inherit font-lock-comment-face))) + `(font-lock-comment-face ((,class :inherit modus-themes-slant + ,@(modus-themes--syntax-comment + fg-alt fg-comment-yellow yellow-alt-other-faint)))) + `(font-lock-constant-face ((,class ,@(modus-themes--syntax-extra + blue-alt-other blue-alt-other-faint + magenta-alt-other magenta-alt-other-faint)))) + `(font-lock-doc-face ((,class :inherit modus-themes-slant + ,@(modus-themes--syntax-string + fg-docstring fg-special-cold + fg-special-mild magenta-nuanced-fg + fg-special-mild magenta-nuanced-fg)))) + `(font-lock-function-name-face ((,class ,@(modus-themes--syntax-extra + magenta magenta-faint + magenta-alt magenta-alt-faint)))) + `(font-lock-keyword-face ((,class :inherit modus-themes-bold + ,@(modus-themes--syntax-extra + magenta-alt-other magenta-alt-other-faint + cyan cyan-faint)))) + `(font-lock-negation-char-face ((,class :inherit modus-themes-bold + ,@(modus-themes--syntax-foreground + yellow yellow-faint)))) + `(font-lock-preprocessor-face ((,class ,@(modus-themes--syntax-extra + red-alt-other red-alt-other-faint + blue-alt blue-alt-faint)))) + `(font-lock-regexp-grouping-backslash ((,class :inherit bold + ,@(modus-themes--syntax-string + fg-escape-char-backslash yellow-alt-faint + yellow magenta-alt + yellow-faint red-faint)))) + `(font-lock-regexp-grouping-construct ((,class :inherit bold + ,@(modus-themes--syntax-string + fg-escape-char-construct red-alt-other-faint + blue blue-alt-other + blue-faint blue-alt-other-faint)))) + `(font-lock-string-face ((,class ,@(modus-themes--syntax-string + blue-alt blue-alt-faint + green red + green-faint red-faint)))) + `(font-lock-type-face ((,class :inherit modus-themes-bold + ,@(modus-themes--syntax-foreground + cyan-alt-other cyan-alt-faint)))) + `(font-lock-variable-name-face ((,class ,@(modus-themes--syntax-extra + cyan cyan-faint + blue-alt-other blue-alt-other-faint)))) + `(font-lock-warning-face ((,class :inherit modus-themes-bold + ,@(modus-themes--syntax-comment + yellow-active red-active red-faint yellow-faint)))) +;;;;; forge + `(forge-post-author ((,class :inherit bold :foreground ,fg-main))) + `(forge-post-date ((,class :foreground ,fg-special-cold))) + `(forge-topic-closed ((,class :inherit shadow))) + `(forge-topic-merged ((,class :inherit shadow))) + `(forge-topic-open ((,class :foreground ,fg-special-mild))) + `(forge-topic-unmerged ((,class :inherit modus-themes-slant :foreground ,magenta))) + `(forge-topic-unread ((,class :inherit bold :foreground ,fg-main))) +;;;;; fountain-mode + `(fountain-character ((,class :foreground ,blue-alt-other))) + `(fountain-comment ((,class :inherit modus-themes-slant :foreground ,fg-alt))) + `(fountain-dialog ((,class :foreground ,blue-alt))) + `(fountain-metadata-key ((,class :foreground ,green-alt-other))) + `(fountain-metadata-value ((,class :foreground ,blue))) + `(fountain-non-printing ((,class :inherit shadow))) + `(fountain-note ((,class :inherit modus-themes-slant :foreground ,yellow))) + `(fountain-page-break ((,class :inherit bold :foreground ,red-alt))) + `(fountain-page-number ((,class :inherit bold :foreground ,red-alt-other))) + `(fountain-paren ((,class :foreground ,cyan))) + `(fountain-scene-heading ((,class :inherit bold :foreground ,blue-nuanced-fg))) + `(fountain-section-heading ((,class :inherit modus-themes-heading-1))) + `(fountain-section-heading-1 ((,class :inherit modus-themes-heading-1))) + `(fountain-section-heading-2 ((,class :inherit modus-themes-heading-2))) + `(fountain-section-heading-3 ((,class :inherit modus-themes-heading-3))) + `(fountain-section-heading-4 ((,class :inherit modus-themes-heading-4))) + `(fountain-section-heading-5 ((,class :inherit modus-themes-heading-5))) + `(fountain-synopsis ((,class :foreground ,cyan-alt))) + `(fountain-trans ((,class :foreground ,yellow-alt-other))) +;;;;; geiser + `(geiser-font-lock-autodoc-current-arg ((,class :inherit font-lock-function-name-face))) + `(geiser-font-lock-autodoc-identifier ((,class :inherit font-lock-constant-face))) + `(geiser-font-lock-doc-button ((,class :inherit button :foreground ,fg-docstring))) + `(geiser-font-lock-doc-link ((,class :inherit button))) + `(geiser-font-lock-error-link ((,class :inherit button :foreground ,red))) + `(geiser-font-lock-image-button ((,class :inherit button :foreground ,green-alt))) + `(geiser-font-lock-repl-input ((,class :inherit bold))) + `(geiser-font-lock-repl-output ((,class :inherit font-lock-keyword-face))) + `(geiser-font-lock-repl-prompt ((,class :inherit modus-themes-prompt))) + `(geiser-font-lock-xref-header ((,class :inherit bold))) + `(geiser-font-lock-xref-link ((,class :inherit button))) +;;;;; git-commit + `(git-commit-comment-action ((,class :inherit font-lock-comment-face))) + `(git-commit-comment-branch-local ((,class :inherit modus-themes-slant :foreground ,blue-alt))) + `(git-commit-comment-branch-remote ((,class :inherit modus-themes-slant :foreground ,magenta-alt))) + `(git-commit-comment-detached ((,class :inherit modus-themes-slant :foreground ,cyan-alt))) + `(git-commit-comment-file ((,class :inherit modus-themes-slant + ,@(modus-themes--syntax-comment + fg-special-cold red-nuanced-fg)))) + `(git-commit-comment-heading ((,class :inherit (bold modus-themes-slant) + ,@(modus-themes--syntax-comment + fg-dim fg-special-warm)))) + `(git-commit-keyword ((,class :foreground ,magenta))) + `(git-commit-known-pseudo-header ((,class :foreground ,cyan-alt-other))) + `(git-commit-nonempty-second-line ((,class :inherit modus-themes-refine-yellow))) + `(git-commit-overlong-summary ((,class :inherit modus-themes-refine-yellow))) + `(git-commit-pseudo-header ((,class :foreground ,blue))) + `(git-commit-summary ((,class :inherit bold :foreground ,cyan))) +;;;;; git-gutter + `(git-gutter:added ((,class :inherit ,@(modus-themes--diff-deuteran + 'modus-themes-fringe-blue + 'modus-themes-fringe-green)))) + `(git-gutter:deleted ((,class :inherit modus-themes-fringe-red))) + `(git-gutter:modified ((,class :inherit modus-themes-fringe-yellow))) + `(git-gutter:separator ((,class :inherit modus-themes-fringe-cyan))) + `(git-gutter:unchanged ((,class :inherit modus-themes-fringe-magenta))) +;;;;; git-gutter-fr + `(git-gutter-fr:added ((,class :inherit ,@(modus-themes--diff-deuteran + 'modus-themes-fringe-blue + 'modus-themes-fringe-green)))) + `(git-gutter-fr:deleted ((,class :inherit modus-themes-fringe-red))) + `(git-gutter-fr:modified ((,class :inherit modus-themes-fringe-yellow))) +;;;;; git-{gutter,fringe}+ + `(git-gutter+-added ((,class :inherit ,@(modus-themes--diff-deuteran + 'modus-themes-fringe-blue + 'modus-themes-fringe-green)))) + `(git-gutter+-deleted ((,class :inherit modus-themes-fringe-red))) + `(git-gutter+-modified ((,class :inherit modus-themes-fringe-yellow))) + `(git-gutter+-separator ((,class :inherit modus-themes-fringe-cyan))) + `(git-gutter+-unchanged ((,class :inherit modus-themes-fringe-magenta))) + `(git-gutter-fr+-added ((,class :inherit modus-themes-fringe-green))) + `(git-gutter-fr+-deleted ((,class :inherit modus-themes-fringe-red))) + `(git-gutter-fr+-modified ((,class :inherit modus-themes-fringe-yellow))) +;;;;; git-lens + `(git-lens-added ((,class :inherit bold :foreground ,@(modus-themes--diff-deuteran blue green)))) + `(git-lens-deleted ((,class :inherit bold :foreground ,red))) + `(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 :inherit modus-themes-slant + ,@(modus-themes--syntax-comment + fg-special-cold red-nuanced-fg)))) + `(git-rebase-comment-heading ((,class :inherit (bold modus-themes-slant) + ,@(modus-themes--syntax-comment + fg-dim fg-special-warm)))) + `(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 :inherit button))) + `(git-walktree-tree-face ((,class :foreground ,magenta))) +;;;;; gnus + `(gnus-button ((,class :inherit button))) + `(gnus-cite-1 ((,class :inherit message-cited-text-1))) + `(gnus-cite-2 ((,class :inherit message-cited-text-2))) + `(gnus-cite-3 ((,class :inherit message-cited-text-3))) + `(gnus-cite-4 ((,class :inherit message-cited-text-4))) + `(gnus-cite-5 ((,class :inherit gnus-cite-1))) + `(gnus-cite-6 ((,class :inherit gnus-cite-2))) + `(gnus-cite-7 ((,class :inherit gnus-cite-3))) + `(gnus-cite-8 ((,class :inherit gnus-cite-4))) + `(gnus-cite-9 ((,class :inherit gnus-cite-1))) + `(gnus-cite-10 ((,class :inherit gnus-cite-2))) + `(gnus-cite-11 ((,class :inherit gnus-cite-3))) + `(gnus-cite-attribution ((,class :inherit italic :foreground ,fg-main))) + `(gnus-emphasis-bold ((,class :inherit bold))) + `(gnus-emphasis-bold-italic ((,class :inherit bold-italic))) + `(gnus-emphasis-highlight-words ((,class :inherit modus-themes-refine-yellow))) + `(gnus-emphasis-italic ((,class :inherit italic))) + `(gnus-emphasis-underline-bold ((,class :inherit gnus-emphasis-bold :underline t))) + `(gnus-emphasis-underline-bold-italic ((,class :inherit gnus-emphasis-bold-italic :underline t))) + `(gnus-emphasis-underline-italic ((,class :inherit gnus-emphasis-italic :underline t))) + `(gnus-group-mail-1 ((,class :inherit bold :foreground ,magenta-alt))) + `(gnus-group-mail-1-empty ((,class :foreground ,magenta-alt))) + `(gnus-group-mail-2 ((,class :inherit bold :foreground ,magenta))) + `(gnus-group-mail-2-empty ((,class :foreground ,magenta))) + `(gnus-group-mail-3 ((,class :inherit bold :foreground ,magenta-alt-other))) + `(gnus-group-mail-3-empty ((,class :foreground ,magenta-alt-other))) + `(gnus-group-mail-low ((,class :inherit bold :foreground ,magenta-nuanced-fg))) + `(gnus-group-mail-low-empty ((,class :foreground ,magenta-nuanced-fg))) + `(gnus-group-news-1 ((,class :inherit bold :foreground ,green))) + `(gnus-group-news-1-empty ((,class :foreground ,green))) + `(gnus-group-news-2 ((,class :inherit bold :foreground ,cyan))) + `(gnus-group-news-2-empty ((,class :foreground ,cyan))) + `(gnus-group-news-3 ((,class :inherit bold :foreground ,yellow-nuanced-fg))) + `(gnus-group-news-3-empty ((,class :foreground ,yellow-nuanced-fg))) + `(gnus-group-news-4 ((,class :inherit bold :foreground ,cyan-nuanced-fg))) + `(gnus-group-news-4-empty ((,class :foreground ,cyan-nuanced-fg))) + `(gnus-group-news-5 ((,class :inherit bold :foreground ,red-nuanced-fg))) + `(gnus-group-news-5-empty ((,class :foreground ,red-nuanced-fg))) + `(gnus-group-news-6 ((,class :inherit bold :foreground ,fg-unfocused))) + `(gnus-group-news-6-empty ((,class :foreground ,fg-unfocused))) + `(gnus-group-news-low ((,class :inherit bold :foreground ,green-nuanced-fg))) + `(gnus-group-news-low-empty ((,class :foreground ,green-nuanced-fg))) + `(gnus-header-content ((,class :inherit message-header-other))) + `(gnus-header-from ((,class :inherit message-header-to :underline nil))) + `(gnus-header-name ((,class :inherit message-header-name))) + `(gnus-header-newsgroups ((,class :inherit message-header-newsgroups))) + `(gnus-header-subject ((,class :inherit message-header-subject))) + `(gnus-server-agent ((,class :inherit bold :foreground ,cyan))) + `(gnus-server-closed ((,class :inherit bold :foreground ,magenta))) + `(gnus-server-cloud ((,class :inherit bold :foreground ,cyan-alt))) + `(gnus-server-cloud-host ((,class :inherit modus-themes-refine-cyan))) + `(gnus-server-denied ((,class :inherit bold :foreground ,red))) + `(gnus-server-offline ((,class :inherit bold :foreground ,yellow))) + `(gnus-server-opened ((,class :inherit bold :foreground ,green))) + `(gnus-signature ((,class :inherit italic :foreground ,fg-special-cold))) + `(gnus-splash ((,class :inherit shadow))) + `(gnus-summary-cancelled ((,class :inherit modus-themes-mark-alt :extend t))) + `(gnus-summary-high-ancient ((,class :inherit bold :foreground ,fg-alt))) + `(gnus-summary-high-read ((,class :inherit bold :foreground ,fg-special-cold))) + `(gnus-summary-high-ticked ((,class :inherit bold :foreground ,red-alt-other))) + `(gnus-summary-high-undownloaded ((,class :inherit bold :foreground ,yellow))) + `(gnus-summary-high-unread ((,class :inherit bold :foreground ,fg-main))) + `(gnus-summary-low-ancient ((,class :inherit italic :foreground ,fg-alt))) + `(gnus-summary-low-read ((,class :inherit italic :foreground ,fg-alt))) + `(gnus-summary-low-ticked ((,class :inherit italic :foreground ,red-refine-fg))) + `(gnus-summary-low-undownloaded ((,class :inherit italic :foreground ,yellow-refine-fg))) + `(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 :inherit shadow))) + `(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other))) + `(gnus-summary-normal-undownloaded ((,class :foreground ,yellow))) + `(gnus-summary-normal-unread ((,class :foreground ,fg-main))) + `(gnus-summary-selected ((,class :inherit highlight :extend t))) +;;;;; gotest + `(go-test--ok-face ((,class :inherit success))) + `(go-test--error-face ((,class :inherit error))) + `(go-test--warning-face ((,class :inherit warning))) + `(go-test--pointer-face ((,class :foreground ,magenta-alt-other))) + `(go-test--standard-face ((,class :foreground ,fg-special-cold))) +;;;;; golden-ratio-scroll-screen + `(golden-ratio-scroll-highlight-line-face ((,class :background ,cyan-subtle-bg :foreground ,fg-main))) +;;;;; helm + `(helm-M-x-key ((,class :inherit modus-themes-key-binding))) + `(helm-action ((,class :underline t))) + `(helm-bookmark-addressbook ((,class :foreground ,green-alt))) + `(helm-bookmark-directory ((,class :inherit bold :foreground ,blue))) + `(helm-bookmark-file ((,class :foreground ,fg-main))) + `(helm-bookmark-file-not-found ((,class :background ,bg-alt :foreground ,fg-alt))) + `(helm-bookmark-gnus ((,class :foreground ,magenta))) + `(helm-bookmark-info ((,class :foreground ,cyan-alt))) + `(helm-bookmark-man ((,class :foreground ,yellow-alt))) + `(helm-bookmark-w3m ((,class :foreground ,blue-alt))) + `(helm-buffer-archive ((,class :inherit bold :foreground ,cyan))) + `(helm-buffer-directory ((,class :inherit bold :foreground ,blue))) + `(helm-buffer-file ((,class :foreground ,fg-main))) + `(helm-buffer-modified ((,class :foreground ,yellow-alt))) + `(helm-buffer-not-saved ((,class :foreground ,red-alt))) + `(helm-buffer-process ((,class :foreground ,magenta))) + `(helm-buffer-saved-out ((,class :inherit bold :background ,bg-alt :foreground ,red))) + `(helm-buffer-size ((,class :inherit shadow))) + `(helm-candidate-number ((,class :foreground ,cyan-active))) + `(helm-candidate-number-suspended ((,class :foreground ,yellow-active))) + `(helm-comint-prompts-buffer-name ((,class :foreground ,green-active))) + `(helm-comint-prompts-promptidx ((,class :foreground ,cyan-active))) + `(helm-delete-async-message ((,class :inherit bold :foreground ,magenta-active))) + `(helm-eob-line ((,class :background ,bg-main :foreground ,fg-main))) + `(helm-eshell-prompts-buffer-name ((,class :foreground ,green-active))) + `(helm-eshell-prompts-promptidx ((,class :foreground ,cyan-active))) + `(helm-etags-file ((,class :foreground ,fg-dim :underline t))) + `(helm-ff-backup-file ((,class :inherit shadow))) + `(helm-ff-denied ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-red + 'modus-themes-intense-red + 'modus-themes-nuanced-red + red)))) + `(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 (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 :inherit button + ,@(modus-themes--link-color + red red-faint)))) + `(helm-ff-pipe ((,class ,@(modus-themes--extra-completions + 'modus-themes-refine-magenta + 'modus-themes-subtle-magenta + 'modus-themes-nuanced-magenta + magenta)))) + `(helm-ff-prefix ((,class ,@(modus-themes--extra-completions + 'modus-themes-refine-yellow + 'modus-themes-subtle-yellow + 'modus-themes-nuanced-yellow + yellow-alt-other)))) + `(helm-ff-socket ((,class :foreground ,red-alt-other))) + `(helm-ff-suid ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-red + 'modus-themes-refine-red + 'modus-themes-nuanced-yellow + red-alt)))) + `(helm-ff-symlink ((,class :inherit button + ,@(modus-themes--link-color + cyan cyan-faint)))) + `(helm-ff-truename ((,class :foreground ,blue-alt-other))) + `(helm-fd-finish ((,class :foreground ,green-active))) + `(helm-grep-cmd-line ((,class :foreground ,yellow-alt-other))) + `(helm-grep-file ((,class :inherit bold :foreground ,fg-special-cold))) + `(helm-grep-finish ((,class :foreground ,green-active))) + `(helm-grep-lineno ((,class :foreground ,fg-special-warm))) + `(helm-grep-match ((,class :inherit modus-themes-special-calm))) + `(helm-header ((,class :inherit bold :foreground ,fg-special-cold))) + `(helm-header-line-left-margin ((,class :inherit bold :foreground ,yellow-intense))) + `(helm-history-deleted ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-red + 'modus-themes-intense-red + 'modus-themes-nuanced-red + red + 'bold)))) + `(helm-history-remote ((,class :foreground ,red-alt-other))) + `(helm-lisp-completion-info ((,class :foreground ,fg-special-warm))) + `(helm-lisp-show-completion ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-yellow + 'modus-themes-refine-yellow + 'modus-themes-nuanced-yellow + yellow + 'bold)))) + `(helm-locate-finish ((,class :foreground ,green-active))) + `(helm-match ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-cyan + 'modus-themes-refine-cyan + 'modus-themes-nuanced-cyan + cyan + 'bold)))) + `(helm-match-item ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-neutral + 'modus-themes-subtle-cyan + 'modus-themes-nuanced-cyan + cyan-alt-other)))) + `(helm-minibuffer-prompt ((,class :inherit modus-themes-prompt))) + `(helm-moccur-buffer ((,class :inherit button + ,@(modus-themes--link-color + cyan-alt-other cyan-alt-other-faint)))) + `(helm-mode-prefix ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-magenta + 'modus-themes-intense-magenta + 'modus-themes-nuanced-magenta + magenta-alt + 'bold)))) + `(helm-non-file-buffer ((,class :inherit shadow))) + `(helm-prefarg ((,class :foreground ,red-active))) + `(helm-resume-need-update ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-magenta + 'modus-themes-refine-magenta + 'modus-themes-nuanced-magenta + magenta-alt-other)))) + `(helm-selection ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-blue + 'modus-themes-refine-blue + 'modus-themes-special-cold + nil + 'bold)))) + `(helm-selection-line ((,class :inherit modus-themes-special-cold))) + `(helm-separator ((,class :foreground ,fg-special-mild))) + `(helm-time-zone-current ((,class :foreground ,green))) + `(helm-time-zone-home ((,class :foreground ,magenta))) + `(helm-source-header ((,class :inherit bold :foreground ,red-alt + ,@(modus-themes--scale modus-themes-scale-4)))) + `(helm-top-columns ((,class :inherit helm-header))) + `(helm-ucs-char ((,class :foreground ,yellow-alt-other))) + `(helm-visible-mark ((,class :inherit modus-themes-subtle-cyan))) +;;;;; helm-ls-git + `(helm-ls-git-added-copied-face ((,class :foreground ,green-intense))) + `(helm-ls-git-added-modified-face ((,class :foreground ,yellow-intense))) + `(helm-ls-git-conflict-face ((,class :inherit bold :foreground ,red-intense))) + `(helm-ls-git-deleted-and-staged-face ((,class :foreground ,red-nuanced-fg))) + `(helm-ls-git-deleted-not-staged-face ((,class :foreground ,red))) + `(helm-ls-git-modified-and-staged-face ((,class :foreground ,yellow-nuanced-fg))) + `(helm-ls-git-modified-not-staged-face ((,class :foreground ,yellow))) + `(helm-ls-git-renamed-modified-face ((,class :foreground ,magenta))) + `(helm-ls-git-untracked-face ((,class :foreground ,fg-special-cold))) +;;;;; helm-switch-shell + `(helm-switch-shell-new-shell-face ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-magenta + 'modus-themes-refine-magenta + 'modus-themes-nuanced-magenta + magenta-alt-other + 'bold)))) +;;;;; helm-xref + `(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 modus-themes-heading-1))) +;;;;; highlight region or ad-hoc regexp + `(hi-aquamarine ((,class :background ,cyan-subtle-bg :foreground ,fg-main))) + `(hi-black-b ((,class :inherit bold :background ,fg-main :foreground ,bg-main))) + `(hi-black-hb ((,class :inherit bold :background ,fg-alt :foreground ,bg-main))) + `(hi-blue ((,class :background ,blue-subtle-bg :foreground ,fg-main))) + `(hi-blue-b ((,class :inherit (bold hi-blue)))) + `(hi-green ((,class :background ,green-subtle-bg :foreground ,fg-main))) + `(hi-green-b ((,class :inherit (bold hi-green)))) + `(hi-pink ((,class :background ,magenta-subtle-bg :foreground ,fg-main))) + `(hi-pink-b ((,class :inherit (bold hi-pink)))) + `(hi-red-b ((,class :inherit bold :background ,red-intense-bg :foreground ,fg-main))) + `(hi-salmon ((,class :background ,red-subtle-bg :foreground ,fg-main))) + `(hi-yellow ((,class :background ,yellow-subtle-bg :foreground ,fg-main))) + `(highlight ((,class :background ,blue-subtle-bg :foreground ,fg-main))) + `(highlight-changes ((,class :foreground ,red-alt :underline nil))) + `(highlight-changes-delete ((,class :background ,red-nuanced-bg + :foreground ,red :underline t))) + `(hl-line ((,class :inherit modus-themes-hl-line))) +;;;;; highlight-blocks + `(highlight-blocks-depth-1-face ((,class :background ,bg-dim :foreground ,fg-main))) + `(highlight-blocks-depth-2-face ((,class :background ,bg-alt :foreground ,fg-main))) + `(highlight-blocks-depth-3-face ((,class :background ,bg-special-cold :foreground ,fg-main))) + `(highlight-blocks-depth-4-face ((,class :background ,bg-special-calm :foreground ,fg-main))) + `(highlight-blocks-depth-5-face ((,class :background ,bg-special-warm :foreground ,fg-main))) + `(highlight-blocks-depth-6-face ((,class :background ,bg-special-mild :foreground ,fg-main))) + `(highlight-blocks-depth-7-face ((,class :background ,bg-inactive :foreground ,fg-main))) + `(highlight-blocks-depth-8-face ((,class :background ,bg-active :foreground ,fg-main))) + `(highlight-blocks-depth-9-face ((,class :background ,cyan-subtle-bg :foreground ,fg-main))) +;;;;; highlight-defined + `(highlight-defined-builtin-function-name-face ((,class :foreground ,magenta))) + `(highlight-defined-face-name-face ((,class :foreground ,fg-main))) + `(highlight-defined-function-name-face ((,class :foreground ,magenta))) + `(highlight-defined-macro-name-face ((,class :foreground ,magenta-alt))) + `(highlight-defined-special-form-name-face ((,class :foreground ,magenta-alt-other))) + `(highlight-defined-variable-name-face ((,class :foreground ,cyan))) +;;;;; highlight-escape-sequences (`hes-mode') + `(hes-escape-backslash-face ((,class :inherit font-lock-regexp-grouping-construct))) + `(hes-escape-sequence-face ((,class :inherit font-lock-regexp-grouping-backslash))) +;;;;; highlight-indentation + `(highlight-indentation-face ((,class :inherit modus-themes-hl-line))) + `(highlight-indentation-current-column-face ((,class :background ,bg-active))) +;;;;; highlight-numbers + `(highlight-numbers-number ((,class :foreground ,blue-alt-other))) +;;;;; highlight-symbol + `(highlight-symbol-face ((,class :inherit modus-themes-special-mild))) +;;;;; highlight-thing + `(highlight-thing ((,class :background ,bg-alt :foreground ,cyan))) +;;;;; hl-defined + `(hdefd-functions ((,class :foreground ,blue))) + `(hdefd-undefined ((,class :foreground ,red-alt))) + `(hdefd-variables ((,class :foreground ,cyan-alt))) +;;;;; hl-fill-column + `(hl-fill-column-face ((,class :background ,bg-active :foreground ,fg-active))) +;;;;; hl-todo + `(hl-todo ((,class :inherit (bold modus-themes-slant) :foreground ,red-alt-other))) +;;;;; hydra + `(hydra-face-amaranth ((,class :inherit bold :foreground ,yellow-alt))) + `(hydra-face-blue ((,class :inherit bold :foreground ,blue))) + `(hydra-face-pink ((,class :inherit bold :foreground ,magenta-alt-faint))) + `(hydra-face-red ((,class :inherit bold :foreground ,red-faint))) + `(hydra-face-teal ((,class :inherit bold :foreground ,cyan-alt-other))) +;;;;; hyperlist + `(hyperlist-condition ((,class :foreground ,green))) + `(hyperlist-hashtag ((,class :foreground ,yellow))) + `(hyperlist-operator ((,class :foreground ,blue-alt))) + `(hyperlist-paren ((,class :foreground ,cyan-alt-other))) + `(hyperlist-quote ((,class :foreground ,cyan-alt))) + `(hyperlist-ref ((,class :foreground ,magenta-alt-other))) + `(hyperlist-stars ((,class :inherit shadow))) + `(hyperlist-tag ((,class :foreground ,red))) + `(hyperlist-toplevel ((,class :inherit bold :foreground ,fg-main))) +;;;;; icomplete + `(icomplete-first-match ((,class :inherit bold + ,@(modus-themes--standard-completions + magenta bg-alt + bg-active fg-main)))) +;;;;; icomplete-vertical + `(icomplete-vertical-separator ((,class :inherit shadow))) +;;;;; ido-mode + `(ido-first-match ((,class :inherit bold + ,@(modus-themes--standard-completions + magenta bg-alt + bg-active fg-main)))) + `(ido-incomplete-regexp ((,class :inherit error))) + `(ido-indicator ((,class :inherit modus-themes-subtle-yellow))) + `(ido-only-match ((,class :inherit bold + ,@(modus-themes--standard-completions + 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-themes-refine-blue))) + `(iedit-read-only-occurrence ((,class :inherit modus-themes-intense-yellow))) +;;;;; iflipb + `(iflipb-current-buffer-face ((,class :inherit bold :foreground ,cyan-alt))) + `(iflipb-other-buffer-face ((,class :inherit shadow))) +;;;;; imenu-list + `(imenu-list-entry-face-0 ((,class :foreground ,cyan))) + `(imenu-list-entry-face-1 ((,class :foreground ,blue))) + `(imenu-list-entry-face-2 ((,class :foreground ,cyan-alt-other))) + `(imenu-list-entry-face-3 ((,class :foreground ,blue-alt))) + `(imenu-list-entry-subalist-face-0 ((,class :inherit bold :foreground ,magenta-alt-other :underline t))) + `(imenu-list-entry-subalist-face-1 ((,class :inherit bold :foreground ,magenta :underline t))) + `(imenu-list-entry-subalist-face-2 ((,class :inherit bold :foreground ,green-alt-other :underline t))) + `(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 :inherit button :foreground ,fg-alt))) + `(indium-keyword-face ((,class :inherit font-lock-keyword-face))) + `(indium-litable-face ((,class :inherit modus-themes-slant :foreground ,fg-special-warm))) + `(indium-repl-error-face ((,class :inherit error))) + `(indium-repl-prompt-face ((,class :inherit modus-themes-prompt))) + `(indium-repl-stdout-face ((,class :foreground ,fg-main))) +;;;;; info + `(Info-quoted ((,class :inherit modus-themes-fixed-pitch ; the capitalization is canonical + :background ,bg-alt :foreground ,fg-special-calm))) + `(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 modus-themes-heading-3))) + `(info-menu-star ((,class :foreground ,red))) + `(info-node ((,class :inherit bold))) + `(info-title-1 ((,class :inherit modus-themes-heading-1))) + `(info-title-2 ((,class :inherit modus-themes-heading-2))) + `(info-title-3 ((,class :inherit modus-themes-heading-3))) + `(info-title-4 ((,class :inherit modus-themes-heading-4))) +;;;;; info-colors + `(info-colors-lisp-code-block ((,class :inherit fixed-pitch))) + `(info-colors-ref-item-command ((,class :inherit font-lock-function-name-face))) + `(info-colors-ref-item-constant ((,class :inherit font-lock-constant-face))) + `(info-colors-ref-item-function ((,class :inherit font-lock-function-name-face))) + `(info-colors-ref-item-macro ((,class :inherit font-lock-keyword-face))) + `(info-colors-ref-item-other ((,class :inherit font-lock-doc-face))) + `(info-colors-ref-item-special-form ((,class :inherit font-lock-keyword-face))) + `(info-colors-ref-item-syntax-class ((,class :inherit font-lock-builtin-face))) + `(info-colors-ref-item-type ((,class :inherit font-lock-type-face))) + `(info-colors-ref-item-user-option ((,class :inherit font-lock-variable-name-face))) + `(info-colors-ref-item-variable ((,class :inherit font-lock-variable-name-face))) +;;;;; interaction-log + `(ilog-buffer-face ((,class :foreground ,magenta-alt-other))) + `(ilog-change-face ((,class :foreground ,magenta-alt))) + `(ilog-echo-face ((,class :foreground ,yellow-alt-other))) + `(ilog-load-face ((,class :foreground ,green))) + `(ilog-message-face ((,class :inherit shadow))) + `(ilog-non-change-face ((,class :foreground ,blue))) +;;;;; ioccur + `(ioccur-cursor ((,class :foreground ,fg-main))) + `(ioccur-invalid-regexp ((,class :foreground ,red))) + `(ioccur-match-face ((,class :inherit modus-themes-special-calm))) + `(ioccur-match-overlay-face ((,class :inherit modus-themes-special-cold :extend t))) + `(ioccur-num-line-face ((,class :foreground ,fg-special-warm))) + `(ioccur-overlay-face ((,class :inherit modus-themes-refine-blue :extend t))) + `(ioccur-regexp-face ((,class :inherit (modus-themes-intense-magenta bold)))) + `(ioccur-title-face ((,class :inherit bold :foreground ,red-alt + ,@(modus-themes--scale modus-themes-scale-4)))) +;;;;; isearch, occur, and the like + `(isearch ((,class :inherit (modus-themes-search-success bold)))) + `(isearch-fail ((,class :inherit modus-themes-refine-red))) + `(isearch-group-1 ((,class :inherit modus-themes-refine-blue))) + `(isearch-group-2 ((,class :inherit modus-themes-refine-magenta))) + `(lazy-highlight ((,class :inherit modus-themes-search-success-lazy))) + `(match ((,class :inherit modus-themes-special-calm))) + `(query-replace ((,class :inherit (modus-themes-intense-yellow bold)))) +;;;;; isl (isearch-light) + `(isl-line ((,class :inherit ,@(modus-themes--success-deuteran + 'modus-themes-subtle-blue + 'modus-themes-subtle-green)))) + `(isl-match ((,class :inherit modus-themes-search-success-lazy))) + `(isl-number ((,class :inherit (modus-themes-bold modus-themes-search-success-modeline)))) + `(isl-on ((,class :inherit (bold modus-themes-search-success)))) + `(isl-string ((,class :inherit modus-themes-bold :foreground ,cyan-active))) +;;;;; ivy + `(ivy-action ((,class :inherit bold :foreground ,red-alt))) + `(ivy-completions-annotations ((,class :inherit completions-annotations))) + `(ivy-confirm-face ((,class :foreground ,cyan))) + `(ivy-current-match ((,class ,@(modus-themes--extra-completions + 'modus-themes-refine-cyan + 'modus-themes-intense-cyan + 'modus-themes-special-cold + nil + 'bold)))) + `(ivy-cursor ((,class :background ,fg-main :foreground ,bg-main))) + `(ivy-grep-info ((,class :foreground ,cyan-alt))) + `(ivy-grep-line-number ((,class :foreground ,fg-special-warm))) + `(ivy-highlight-face ((,class :foreground ,magenta))) + `(ivy-match-required-face ((,class :inherit error))) + `(ivy-minibuffer-match-face-1 ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-neutral + 'modus-themes-intense-neutral + 'modus-themes-nuanced-cyan + fg-alt)))) + `(ivy-minibuffer-match-face-2 ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-green + 'modus-themes-refine-green + 'modus-themes-nuanced-green + green-alt-other + 'bold)))) + `(ivy-minibuffer-match-face-3 ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-blue + 'modus-themes-refine-blue + 'modus-themes-nuanced-blue + blue-alt-other + 'bold)))) + `(ivy-minibuffer-match-face-4 ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-magenta + 'modus-themes-refine-magenta + 'modus-themes-nuanced-magenta + magenta-alt-other + 'bold)))) + `(ivy-minibuffer-match-highlight ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-cyan + 'modus-themes-intense-cyan + 'modus-themes-nuanced-cyan + cyan-alt-other + 'bold)))) + `(ivy-modified-buffer ((,class :inherit modus-themes-slant :foreground ,yellow))) + `(ivy-modified-outside-buffer ((,class :inherit modus-themes-slant :foreground ,yellow-alt))) + `(ivy-org ((,class :foreground ,cyan-alt-other))) + `(ivy-prompt-match ((,class :inherit ivy-current-match))) + `(ivy-remote ((,class :foreground ,magenta))) + `(ivy-separator ((,class :inherit shadow))) + `(ivy-subdir ((,class :foreground ,blue-alt-other))) + `(ivy-virtual ((,class :foreground ,magenta-alt-other))) + `(ivy-yanked-word ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-blue + 'modus-themes-refine-blue + 'modus-themes-nuanced-blue + blue-alt)))) +;;;;; ivy-posframe + `(ivy-posframe ((,class :background ,bg-dim :foreground ,fg-main))) + `(ivy-posframe-border ((,class :background ,fg-window-divider-inner))) + `(ivy-posframe-cursor ((,class :background ,fg-main :foreground ,bg-main))) +;;;;; jira (org-jira) + `(jiralib-comment-face ((,class :background ,bg-alt))) + `(jiralib-comment-header-face ((,class :inherit bold))) + `(jiralib-issue-info-face ((,class :inherit modus-themes-special-warm))) + `(jiralib-issue-info-header-face ((,class :inherit (modus-themes-special-warm bold)))) + `(jiralib-issue-summary-face ((,class :inherit bold))) + `(jiralib-link-filter-face ((,class :underline t))) + `(jiralib-link-issue-face ((,class :underline t))) + `(jiralib-link-project-face ((,class :underline t))) +;;;;; journalctl-mode + `(journalctl-error-face ((,class :inherit error))) + `(journalctl-finished-face ((,class :inherit success))) + `(journalctl-host-face ((,class :foreground ,blue))) + `(journalctl-process-face ((,class :foreground ,cyan-alt-other))) + `(journalctl-starting-face ((,class :foreground ,green))) + `(journalctl-timestamp-face ((,class :foreground ,fg-special-cold))) + `(journalctl-warning-face ((,class :inherit warning))) +;;;;; js2-mode + `(js2-error ((,class :inherit modus-themes-lang-error))) + `(js2-external-variable ((,class :inherit font-lock-variable-name-face))) + `(js2-function-call ((,class :inherit font-lock-function-name-face))) + `(js2-function-param ((,class :inherit font-lock-constant-face))) + `(js2-instance-member ((,class :inherit font-lock-keyword-face))) + `(js2-jsdoc-html-tag-delimiter ((,class :foreground ,fg-main))) + `(js2-jsdoc-html-tag-name ((,class :inherit font-lock-function-name-face))) + `(js2-jsdoc-tag ((,class :inherit (font-lock-builtin-face font-lock-comment-face) :weight normal))) + `(js2-jsdoc-type ((,class :inherit (font-lock-type-face font-lock-comment-face) :weight normal))) + `(js2-jsdoc-value ((,class :inherit (font-lock-constant-face font-lock-comment-face) :weight normal))) + `(js2-object-property ((,class :foreground ,fg-main))) + `(js2-object-property-access ((,class :foreground ,fg-main))) + `(js2-private-function-call ((,class :inherit font-lock-preprocessor-face))) + `(js2-private-member ((,class :inherit font-lock-warning-face))) + `(js2-warning ((,class :inherit modus-themes-lang-warning))) +;;;;; julia + `(julia-macro-face ((,class :inherit font-lock-builtin-face))) + `(julia-quoted-symbol-face ((,class :inherit font-lock-constant-face))) +;;;;; jupyter + `(jupyter-eval-overlay ((,class :inherit bold :foreground ,blue))) + `(jupyter-repl-input-prompt ((,class :foreground ,cyan-alt-other))) + `(jupyter-repl-output-prompt ((,class :foreground ,magenta-alt-other))) + `(jupyter-repl-traceback ((,class :inherit modus-themes-intense-red))) +;;;;; kaocha-runner + `(kaocha-runner-error-face ((,class :inherit error))) + `(kaocha-runner-success-face ((,class :inherit success))) + `(kaocha-runner-warning-face ((,class :inherit warning))) +;;;;; keycast + `(keycast-command ((,class :inherit bold :foreground ,blue-active))) + `(keycast-key ((,class :background ,blue-active :foreground ,bg-main))) +;;;;; ledger-mode + `(ledger-font-auto-xact-face ((,class :foreground ,magenta))) + `(ledger-font-account-name-face ((,class :foreground ,fg-special-cold))) + `(ledger-font-directive-face ((,class :foreground ,magenta-alt-other))) + `(ledger-font-posting-date-face ((,class :inherit bold :foreground ,fg-main))) + `(ledger-font-periodic-xact-face ((,class :foreground ,cyan-alt-other))) + `(ledger-font-posting-amount-face ((,class :foreground ,fg-special-mild))) + `(ledger-font-payee-cleared-face ((,class :foreground ,blue-alt))) + `(ledger-font-payee-pending-face ((,class :foreground ,yellow))) + `(ledger-font-payee-uncleared-face ((,class :foreground ,red-alt-other))) + `(ledger-font-xact-highlight-face ((,class :background ,bg-hl-alt))) +;;;;; line numbers (display-line-numbers-mode and global variant) + `(line-number + ((,class :inherit default + ,@(modus-themes--line-numbers + fg-alt bg-dim + fg-unfocused)))) + `(line-number-current-line + ((,class :inherit (bold default) + ,@(modus-themes--line-numbers + fg-main bg-active + blue-alt-other)))) + `(line-number-major-tick + ((,class :inherit (bold default) + ,@(modus-themes--line-numbers + yellow-nuanced-fg yellow-nuanced-bg + red-alt)))) + `(line-number-minor-tick + ((,class :inherit (bold default) + ,@(modus-themes--line-numbers + fg-alt bg-inactive + fg-inactive)))) +;;;;; lsp-mode + `(lsp-face-highlight-read ((,class :inherit modus-themes-subtle-blue :underline t))) + `(lsp-face-highlight-textual ((,class :inherit modus-themes-subtle-blue))) + `(lsp-face-highlight-write ((,class :inherit (modus-themes-refine-blue bold)))) + `(lsp-face-semhl-constant ((,class :foreground ,blue-alt-other))) + `(lsp-face-semhl-deprecated ((,class :inherit modus-themes-lang-warning))) + `(lsp-face-semhl-enummember ((,class :foreground ,blue-alt-other))) + `(lsp-face-semhl-field ((,class :foreground ,cyan-alt))) + `(lsp-face-semhl-field-static ((,class :inherit modus-themes-slant :foreground ,cyan-alt))) + `(lsp-face-semhl-function ((,class :foreground ,magenta))) + `(lsp-face-semhl-method ((,class :foreground ,magenta))) + `(lsp-face-semhl-namespace ((,class :inherit modus-themes-bold :foreground ,magenta-alt))) + `(lsp-face-semhl-preprocessor ((,class :foreground ,red-alt-other))) + `(lsp-face-semhl-static-method ((,class :inherit modus-themes-slant :foreground ,magenta))) + `(lsp-face-semhl-type-class ((,class :foreground ,magenta-alt))) + `(lsp-face-semhl-type-enum ((,class :foreground ,magenta-alt))) + `(lsp-face-semhl-type-primitive ((,class :inherit modus-themes-slant :foreground ,magenta-alt))) + `(lsp-face-semhl-type-template ((,class :inherit modus-themes-slant :foreground ,magenta-alt))) + `(lsp-face-semhl-type-typedef ((,class :inherit modus-themes-slant :foreground ,magenta-alt))) + `(lsp-face-semhl-variable ((,class :foreground ,cyan))) + `(lsp-face-semhl-variable-local ((,class :foreground ,cyan))) + `(lsp-face-semhl-variable-parameter ((,class :foreground ,cyan-alt-other))) + `(lsp-lens-face ((,class :height 0.8 :foreground ,fg-alt))) + `(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 :inherit button))) + `(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))) + `(lsp-ui-peek-highlight ((,class :inherit modus-themes-subtle-blue))) + `(lsp-ui-peek-line-number ((,class :inherit shadow))) + `(lsp-ui-peek-list ((,class :background ,bg-dim))) + `(lsp-ui-peek-peek ((,class :background ,bg-alt))) + `(lsp-ui-peek-selection ((,class :inherit modus-themes-subtle-cyan))) + `(lsp-ui-sideline-code-action ((,class :foreground ,yellow))) + `(lsp-ui-sideline-current-symbol ((,class :inherit bold :height 0.99 :box (:line-width -1 :style nil) :foreground ,fg-main))) + `(lsp-ui-sideline-symbol ((,class :inherit bold :height 0.99 :box (:line-width -1 :style nil) :foreground ,fg-alt))) + `(lsp-ui-sideline-symbol-info ((,class :inherit italic :height 0.99))) +;;;;; macrostep + `(macrostep-compiler-macro-face ((,class :inherit italic))) + `(macrostep-expansion-highlight-face ((,class :background ,blue-nuanced-bg))) + `(macrostep-gensym-1 ((,class :inherit bold :foreground ,blue :box t))) + `(macrostep-gensym-2 ((,class :inherit bold :foreground ,green :box t))) + `(macrostep-gensym-3 ((,class :inherit bold :foreground ,yellow :box t))) + `(macrostep-gensym-4 ((,class :inherit bold :foreground ,red :box t))) + `(macrostep-gensym-5 ((,class :inherit bold :foreground ,magenta :box t))) + `(macrostep-macro-face ((,class :inherit button :foreground ,green-alt))) +;;;;; magit + `(magit-bisect-bad ((,class :foreground ,red-alt-other))) + `(magit-bisect-good ((,class :foreground ,green-alt-other))) + `(magit-bisect-skip ((,class :foreground ,yellow-alt-other))) + `(magit-blame-date ((,class :foreground ,blue))) + `(magit-blame-dimmed ((,class :inherit (shadow modus-themes-reset-hard)))) + `(magit-blame-hash ((,class :foreground ,fg-special-warm))) + `(magit-blame-heading ((,class :inherit modus-themes-reset-hard :background ,bg-alt :extend t))) + `(magit-blame-highlight ((,class :inherit modus-themes-nuanced-cyan))) + `(magit-blame-margin ((,class :inherit (magit-blame-highlight modus-themes-reset-hard)))) + `(magit-blame-name ((,class :foreground ,magenta-alt-other))) + `(magit-blame-summary ((,class :foreground ,cyan-alt-other))) + `(magit-branch-current ((,class :foreground ,blue-alt-other :box t))) + `(magit-branch-local ((,class :foreground ,blue-alt))) + `(magit-branch-remote ((,class :foreground ,magenta-alt))) + `(magit-branch-remote-head ((,class :foreground ,magenta-alt-other :box t))) + `(magit-branch-upstream ((,class :inherit italic))) + `(magit-cherry-equivalent ((,class :background ,bg-main :foreground ,magenta-intense))) + `(magit-cherry-unmatched ((,class :background ,bg-main :foreground ,cyan-intense))) + ;; NOTE: here we break from the pattern of inheriting from the + ;; modus-themes-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-themes--diff + bg-main blue-alt-other + bg-diff-added fg-diff-added + green-nuanced-bg fg-diff-added + bg-diff-added-deuteran fg-diff-added-deuteran)))) + `(magit-diff-added-highlight ((,class :inherit modus-themes-diff-focus-added))) + `(magit-diff-base ((,class ,@(modus-themes--diff + bg-main yellow + bg-diff-changed fg-diff-changed + yellow-nuanced-bg fg-diff-changed)))) + `(magit-diff-base-highlight ((,class :inherit modus-themes-diff-focus-changed))) + `(magit-diff-context ((,class ,@(unless (eq modus-themes-diffs 'bg-only) (list :foreground fg-unfocused))))) + `(magit-diff-context-highlight ((,class ,@(modus-themes--diff + bg-dim fg-dim + bg-inactive fg-inactive + bg-dim fg-alt + bg-dim fg-alt)))) + `(magit-diff-file-heading ((,class :inherit bold :foreground ,fg-special-cold))) + `(magit-diff-file-heading-highlight ((,class :inherit (modus-themes-special-cold bold)))) + `(magit-diff-file-heading-selection ((,class :inherit modus-themes-refine-cyan))) + ;; NOTE: here we break from the pattern of inheriting from the + ;; modus-themes-diff-* faces. + `(magit-diff-hunk-heading ((,class :inherit bold + ,@(modus-themes--diff + bg-alt fg-alt + bg-active fg-inactive + bg-inactive fg-inactive + bg-inactive fg-inactive + t)))) + `(magit-diff-hunk-heading-highlight + ((,class :inherit bold + :background ,@(modus-themes--diff-deuteran bg-active bg-diff-heading) + :foreground ,@(modus-themes--diff-deuteran fg-main fg-diff-heading)))) + `(magit-diff-hunk-heading-selection ((,class :inherit modus-themes-refine-blue))) + `(magit-diff-hunk-region ((,class :inherit bold))) + `(magit-diff-lines-boundary ((,class :background ,fg-main))) + `(magit-diff-lines-heading ((,class :inherit modus-themes-refine-magenta))) + `(magit-diff-removed ((,class ,@(modus-themes--diff + bg-main red + bg-diff-removed fg-diff-removed + red-nuanced-bg fg-diff-removed)))) + `(magit-diff-removed-highlight ((,class :inherit modus-themes-diff-focus-removed))) + `(magit-diffstat-added ((,class :foreground ,@(modus-themes--diff-deuteran blue green)))) + `(magit-diffstat-removed ((,class :foreground ,red))) + `(magit-dimmed ((,class :foreground ,fg-unfocused))) + `(magit-filename ((,class :foreground ,fg-special-cold))) + `(magit-hash ((,class :inherit shadow))) + `(magit-head ((,class :inherit magit-branch-local))) + `(magit-header-line ((,class :inherit bold :foreground ,magenta-active))) + `(magit-header-line-key ((,class :inherit modus-themes-key-binding))) + `(magit-header-line-log-select ((,class :inherit bold :foreground ,fg-main))) + `(magit-keyword ((,class :foreground ,magenta))) + `(magit-keyword-squash ((,class :inherit bold :foreground ,yellow-alt-other))) + `(magit-log-author ((,class :foreground ,cyan))) + `(magit-log-date ((,class :inherit shadow))) + `(magit-log-graph ((,class :foreground ,fg-dim))) + `(magit-mode-line-process ((,class :inherit bold :foreground ,blue-active))) + `(magit-mode-line-process-error ((,class :inherit bold :foreground ,red-active))) + `(magit-process-ng ((,class :inherit error))) + `(magit-process-ok ((,class :inherit success))) + `(magit-reflog-amend ((,class :background ,bg-main :foreground ,magenta-intense))) + `(magit-reflog-checkout ((,class :background ,bg-main :foreground ,blue-intense))) + `(magit-reflog-cherry-pick ((,class :background ,bg-main :foreground ,green-intense))) + `(magit-reflog-commit ((,class :background ,bg-main :foreground ,green-intense))) + `(magit-reflog-merge ((,class :background ,bg-main :foreground ,green-intense))) + `(magit-reflog-other ((,class :background ,bg-main :foreground ,cyan-intense))) + `(magit-reflog-rebase ((,class :background ,bg-main :foreground ,magenta-intense))) + `(magit-reflog-remote ((,class :background ,bg-main :foreground ,cyan-intense))) + `(magit-reflog-reset ((,class :background ,bg-main :foreground ,red-intense))) + `(magit-refname ((,class :inherit shadow))) + `(magit-refname-pullreq ((,class :inherit shadow))) + `(magit-refname-stash ((,class :inherit shadow))) + `(magit-refname-wip ((,class :inherit shadow))) + `(magit-section ((,class :background ,bg-dim :foreground ,fg-main))) + `(magit-section-heading ((,class :inherit bold :foreground ,cyan))) + `(magit-section-heading-selection ((,class :inherit (modus-themes-refine-cyan bold)))) + `(magit-section-highlight ((,class :background ,bg-alt))) + `(magit-sequence-done ((,class :foreground ,@(modus-themes--success-deuteran + blue + green)))) + `(magit-sequence-drop ((,class :foreground ,red-alt))) + `(magit-sequence-exec ((,class :foreground ,magenta-alt))) + `(magit-sequence-head ((,class :foreground ,cyan-alt))) + `(magit-sequence-onto ((,class :inherit shadow))) + `(magit-sequence-part ((,class :foreground ,yellow-alt))) + `(magit-sequence-pick ((,class :foreground ,blue-alt))) + `(magit-sequence-stop ((,class :foreground ,red))) + `(magit-signature-bad ((,class :inherit bold :foreground ,red))) + `(magit-signature-error ((,class :foreground ,red-alt))) + `(magit-signature-expired ((,class :foreground ,yellow))) + `(magit-signature-expired-key ((,class :foreground ,yellow))) + `(magit-signature-good ((,class :foreground ,@(modus-themes--success-deuteran + blue + green)))) + `(magit-signature-revoked ((,class :foreground ,magenta))) + `(magit-signature-untrusted ((,class :foreground ,cyan))) + `(magit-tag ((,class :foreground ,yellow-alt-other))) +;;;;; magit-imerge + `(magit-imerge-overriding-value ((,class :inherit bold :foreground ,red-alt))) +;;;;; make-mode (makefiles) + `(makefile-makepp-perl ((,class :background ,cyan-nuanced-bg))) + `(makefile-space ((,class :background ,magenta-nuanced-bg))) +;;;;; man + `(Man-overstrike ((,class :inherit bold :foreground ,magenta))) + `(Man-reverse ((,class :inherit modus-themes-subtle-magenta))) + `(Man-underline ((,class :foreground ,cyan :underline t))) +;;;;; marginalia + `(marginalia-archive ((,class :foreground ,green-nuanced-fg))) + `(marginalia-date ((,class :foreground ,blue-nuanced-fg))) + `(marginalia-char ((,class :foreground ,red-active))) + `(marginalia-documentation ((,class :foreground ,fg-special-cold :inherit modus-themes-slant))) + `(marginalia-file-modes ((,class :inherit shadow))) + `(marginalia-file-name ((,class :foreground ,fg-special-mild))) + `(marginalia-file-owner ((,class :foreground ,red-nuanced-fg))) + ;; Here we make an exception of not applying the bespoke + ;; `modus-themes-key-binding' for two reasons: (1) completion + ;; highlights can be fairly intense, so we do not want more + ;; components to compete with them for attention, (2) the + ;; `marginalia-key' may not be used for key bindings specifically, + ;; so we might end up applying styles in places we should not. + `(marginalia-key ((,class :foreground ,magenta-active))) + `(marginalia-mode ((,class :foreground ,cyan-active))) + `(marginalia-modified ((,class :foreground ,yellow-active))) + `(marginalia-number ((,class :foreground ,blue-active))) + `(marginalia-size ((,class :foreground ,green-active))) + `(marginalia-type ((,class :foreground ,fg-special-warm))) + `(marginalia-variable ((,class :foreground ,yellow-nuanced-fg))) + `(marginalia-version ((,class :foreground ,cyan-active))) +;;;;; markdown-mode + `(markdown-blockquote-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold))) + `(markdown-bold-face ((,class :inherit bold))) + `(markdown-code-face ((,class :inherit modus-themes-fixed-pitch :background ,bg-dim :extend t))) + `(markdown-comment-face ((,class :inherit font-lock-comment-face))) + `(markdown-footnote-marker-face ((,class :inherit bold :foreground ,cyan-alt))) + `(markdown-footnote-text-face ((,class :inherit modus-themes-slant :foreground ,fg-main))) + `(markdown-gfm-checkbox-face ((,class :foreground ,cyan-alt-other))) + `(markdown-header-delimiter-face ((,class :inherit modus-themes-bold :foreground ,fg-dim))) + `(markdown-header-face ((t nil))) + `(markdown-header-face-1 ((,class :inherit modus-themes-heading-1))) + `(markdown-header-face-2 ((,class :inherit modus-themes-heading-2))) + `(markdown-header-face-3 ((,class :inherit modus-themes-heading-3))) + `(markdown-header-face-4 ((,class :inherit modus-themes-heading-4))) + `(markdown-header-face-5 ((,class :inherit modus-themes-heading-5))) + `(markdown-header-face-6 ((,class :inherit modus-themes-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 modus-themes-fixed-pitch + :foreground ,cyan))) + `(markdown-html-attr-value-face ((,class :inherit modus-themes-fixed-pitch + :foreground ,blue))) + `(markdown-html-entity-face ((,class :inherit modus-themes-fixed-pitch + :foreground ,cyan))) + `(markdown-html-tag-delimiter-face ((,class :inherit modus-themes-fixed-pitch + :foreground ,fg-special-mild))) + `(markdown-html-tag-name-face ((,class :inherit modus-themes-fixed-pitch + :foreground ,magenta-alt))) + `(markdown-inline-code-face ((,class :inherit modus-themes-fixed-pitch + :background ,bg-alt :foreground ,fg-special-calm))) + `(markdown-italic-face ((,class :inherit italic :foreground ,fg-special-cold))) + `(markdown-language-info-face ((,class :inherit modus-themes-fixed-pitch + :foreground ,fg-special-cold))) + `(markdown-language-keyword-face ((,class :inherit modus-themes-fixed-pitch + :background ,bg-alt + :foreground ,fg-alt))) + `(markdown-line-break-face ((,class :inherit modus-themes-refine-cyan :underline t))) + `(markdown-link-face ((,class :inherit button))) + `(markdown-link-title-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold))) + `(markdown-list-face ((,class :foreground ,fg-dim))) + `(markdown-markup-face ((,class :inherit shadow))) + `(markdown-math-face ((,class :foreground ,magenta-alt-other))) + `(markdown-metadata-key-face ((,class :foreground ,cyan-alt-other))) + `(markdown-metadata-value-face ((,class :foreground ,blue-alt))) + `(markdown-missing-link-face ((,class :inherit bold :foreground ,yellow))) + `(markdown-plain-url-face ((,class :inherit markdown-link-face))) + `(markdown-pre-face ((,class :inherit markdown-code-face :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 modus-themes-fixed-pitch + :foreground ,fg-special-cold))) + `(markdown-url-face ((,class :foreground ,blue-alt))) +;;;;; markup-faces (`adoc-mode') + `(markup-attribute-face ((,class :inherit (italic markup-meta-face)))) + `(markup-bold-face ((,class :inherit bold :foreground ,red-nuanced-fg))) + `(markup-code-face ((,class :foreground ,magenta))) + `(markup-comment-face ((,class :inherit font-lock-comment-face))) + `(markup-complex-replacement-face ((,class :background ,magenta-nuanced-bg + :foreground ,magenta-alt-other + :underline ,magenta-alt-other))) + `(markup-emphasis-face ((,class :inherit markup-italic-face))) + `(markup-error-face ((,class :inherit error))) + `(markup-gen-face ((,class :foreground ,magenta-alt))) + `(markup-internal-reference-face ((,class :foreground ,fg-alt :underline ,bg-region))) + `(markup-italic-face ((,class :inherit italic :foreground ,fg-special-cold))) + `(markup-list-face ((,class :inherit modus-themes-special-cold))) + `(markup-meta-face ((,class :inherit shadow))) + `(markup-meta-hide-face ((,class :foreground "gray50"))) + `(markup-reference-face ((,class :foreground ,blue-alt :underline ,bg-region))) + `(markup-replacement-face ((,class :inherit fixed-pitch :foreground ,red-alt))) + `(markup-secondary-text-face ((,class :height 0.9 :foreground ,cyan-alt-other))) + `(markup-small-face ((,class :inherit markup-gen-face :height 0.9))) + `(markup-strong-face ((,class :inherit markup-bold-face))) + `(markup-subscript-face ((,class :height 0.9 :foreground ,magenta-alt-other))) + `(markup-superscript-face ((,class :height 0.9 :foreground ,magenta-alt-other))) + `(markup-table-cell-face ((,class :inherit modus-themes-subtle-neutral))) + `(markup-table-face ((,class :inherit modus-themes-subtle-neutral))) + `(markup-table-row-face ((,class :inherit modus-themes-special-cold))) + `(markup-title-0-face ((,class :inherit (bold modus-themes-variable-pitch) + :foreground ,blue-nuanced-fg + ,@(modus-themes--scale modus-themes-scale-title)))) + `(markup-title-1-face ((,class :inherit (bold modus-themes-variable-pitch) + :foreground ,blue-nuanced-fg + ,@(modus-themes--scale modus-themes-scale-1)))) + `(markup-title-2-face ((,class :inherit (bold modus-themes-variable-pitch) + :foreground ,blue-nuanced-fg + ,@(modus-themes--scale modus-themes-scale-2)))) + `(markup-title-3-face ((,class :inherit (bold modus-themes-variable-pitch) + :foreground ,blue-nuanced-fg + ,@(modus-themes--scale modus-themes-scale-3)))) + `(markup-title-4-face ((,class :inherit (bold modus-themes-variable-pitch) + :foreground ,blue-nuanced-fg + ,@(modus-themes--scale modus-themes-scale-4)))) + `(markup-title-5-face ((,class :inherit (bold modus-themes-variable-pitch) + :foreground ,blue-nuanced-fg))) + `(markup-verbatim-face ((,class :background ,bg-alt))) +;;;;; mentor + `(mentor-download-message ((,class :foreground ,fg-special-warm))) + `(mentor-download-name ((,class :foreground ,fg-special-cold))) + `(mentor-download-progress ((,class :foreground ,blue-alt-other))) + `(mentor-download-size ((,class :foreground ,magenta-alt-other))) + `(mentor-download-speed-down ((,class :foreground ,cyan-alt))) + `(mentor-download-speed-up ((,class :foreground ,red-alt))) + `(mentor-download-state ((,class :foreground ,yellow-alt))) + `(mentor-highlight-face ((,class :inherit modus-themes-subtle-blue))) + `(mentor-tracker-name ((,class :foreground ,magenta-alt))) +;;;;; messages + `(message-cited-text-1 ((,class ,@(modus-themes--mail-cite blue-faint fg-alt)))) + `(message-cited-text-2 ((,class ,@(modus-themes--mail-cite green-faint fg-comment-yellow)))) + `(message-cited-text-3 ((,class ,@(modus-themes--mail-cite red-faint fg-special-cold)))) + `(message-cited-text-4 ((,class ,@(modus-themes--mail-cite yellow-faint fg-special-calm)))) + `(message-header-cc ((,class :foreground ,blue-alt-other))) + `(message-header-name ((,class :inherit bold :foreground ,cyan))) + `(message-header-newsgroups ((,class :inherit message-header-other))) + `(message-header-other ((,class :foreground ,fg-special-calm))) + `(message-header-subject ((,class :inherit bold :foreground ,magenta-alt))) + `(message-header-to ((,class :inherit bold :foreground ,magenta-alt-other))) + `(message-header-xheader ((,class :foreground ,blue-alt))) + `(message-mml ((,class :foreground ,cyan-alt-other))) + `(message-separator ((,class :inherit modus-themes-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))) +;;;;; mmm-mode + `(mmm-cleanup-submode-face ((,class :background ,yellow-nuanced-bg))) + `(mmm-code-submode-face ((,class :background ,bg-alt))) + `(mmm-comment-submode-face ((,class :background ,blue-nuanced-bg))) + `(mmm-declaration-submode-face ((,class :background ,cyan-nuanced-bg))) + `(mmm-default-submode-face ((,class :background ,bg-dim))) + `(mmm-init-submode-face ((,class :background ,magenta-nuanced-bg))) + `(mmm-output-submode-face ((,class :background ,red-nuanced-bg))) + `(mmm-special-submode-face ((,class :background ,green-nuanced-bg))) +;;;;; mode-line + `(mode-line ((,class ,@(modus-themes--variable-pitch-ui) + ,@(modus-themes--mode-line-attrs + fg-active bg-active + fg-dim bg-active + fg-main bg-active-accent + 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-themes-active-blue :box (:line-width -1 :style pressed-button)))) + `(mode-line-inactive ((,class ,@(modus-themes--variable-pitch-ui) + ,@(modus-themes--mode-line-attrs + fg-inactive bg-inactive + fg-alt bg-dim + fg-inactive bg-inactive + bg-region bg-active)))) +;;;;; mood-line + `(mood-line-modified ((,class :foreground ,magenta-active))) + `(mood-line-status-error ((,class :inherit bold :foreground ,red-active))) + `(mood-line-status-info ((,class :foreground ,cyan-active))) + `(mood-line-status-neutral ((,class :foreground ,blue-active))) + `(mood-line-status-success ((,class :foreground ,@(modus-themes--success-deuteran + blue-active + 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 ,fg-dim))) + `(mu4e-cited-1-face ((,class :inherit message-cited-text-1))) + `(mu4e-cited-2-face ((,class :inherit message-cited-text-2))) + `(mu4e-cited-3-face ((,class :inherit message-cited-text-3))) + `(mu4e-cited-4-face ((,class :inherit message-cited-text-4))) + `(mu4e-cited-5-face ((,class :inherit message-cited-text-1))) + `(mu4e-cited-6-face ((,class :inherit message-cited-text-2))) + `(mu4e-cited-7-face ((,class :inherit message-cited-text-3))) + `(mu4e-compose-header-face ((,class :inherit mu4e-compose-separator-face))) + `(mu4e-compose-separator-face ((,class :inherit modus-themes-intense-neutral))) + `(mu4e-contact-face ((,class :inherit message-header-to))) + `(mu4e-context-face ((,class :foreground ,blue-active))) + `(mu4e-draft-face ((,class :foreground ,magenta-alt))) + `(mu4e-flagged-face ((,class :foreground ,red-alt))) + `(mu4e-footer-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold))) + `(mu4e-forwarded-face ((,class :foreground ,magenta-alt-other))) + `(mu4e-header-face ((,class :inherit shadow))) + `(mu4e-header-highlight-face ((,class :inherit modus-themes-hl-line))) + `(mu4e-header-key-face ((,class :inherit message-header-name))) + `(mu4e-header-marks-face ((,class :inherit mu4e-special-header-value-face))) + `(mu4e-header-title-face ((,class :foreground ,fg-special-mild))) + `(mu4e-header-value-face ((,class :inherit message-header-other))) + `(mu4e-highlight-face ((,class :inherit modus-themes-key-binding))) + `(mu4e-link-face ((,class :inherit button))) + `(mu4e-modeline-face ((,class :foreground ,magenta-active))) + `(mu4e-moved-face ((,class :inherit modus-themes-slant :foreground ,yellow))) + `(mu4e-ok-face ((,class :inherit bold :foreground ,green))) + `(mu4e-region-code ((,class :inherit modus-themes-special-calm))) + `(mu4e-replied-face ((,class :foreground ,blue))) + `(mu4e-special-header-value-face ((,class :inherit message-header-subject))) + `(mu4e-system-face ((,class :inherit modus-themes-slant :foreground ,fg-mark-del))) + `(mu4e-title-face ((,class :foreground ,fg-main))) + `(mu4e-trashed-face ((,class :foreground ,red))) + `(mu4e-unread-face ((,class :inherit bold))) + `(mu4e-url-number-face ((,class :foreground ,fg-alt))) + `(mu4e-view-body-face ((,class :foreground ,fg-main))) + `(mu4e-warning-face ((,class :inherit warning))) +;;;;; mu4e-conversation + `(mu4e-conversation-header ((,class :inherit modus-themes-special-cold))) + `(mu4e-conversation-sender-1 ((,class :foreground ,fg-special-warm))) + `(mu4e-conversation-sender-2 ((,class :foreground ,fg-special-cold))) + `(mu4e-conversation-sender-3 ((,class :foreground ,fg-special-mild))) + `(mu4e-conversation-sender-4 ((,class :inherit shadow))) + `(mu4e-conversation-sender-5 ((,class :foreground ,yellow-refine-fg))) + `(mu4e-conversation-sender-6 ((,class :foreground ,cyan-refine-fg))) + `(mu4e-conversation-sender-7 ((,class :foreground ,green-refine-fg))) + `(mu4e-conversation-sender-8 ((,class :foreground ,blue-refine-fg))) + `(mu4e-conversation-sender-me ((,class :foreground ,fg-main))) + `(mu4e-conversation-unread ((,class :inherit bold))) +;;;;; multiple-cursors + `(mc/cursor-bar-face ((,class :height 1 :background ,fg-main))) + `(mc/cursor-face ((,class :inverse-video t))) + `(mc/region-face ((,class :inherit region))) +;;;;; neotree + `(neo-banner-face ((,class :foreground ,magenta))) + `(neo-button-face ((,class :inherit button))) + `(neo-dir-link-face ((,class :inherit bold :foreground ,blue))) + `(neo-expand-btn-face ((,class :foreground ,cyan))) + `(neo-file-link-face ((,class :foreground ,fg-main))) + `(neo-header-face ((,class :inherit bold :foreground ,fg-main))) + `(neo-root-dir-face ((,class :inherit bold :foreground ,cyan-alt))) + `(neo-vc-added-face ((,class :foreground ,@(modus-themes--diff-deuteran blue green)))) + `(neo-vc-conflict-face ((,class :inherit bold :foreground ,red))) + `(neo-vc-default-face ((,class :foreground ,fg-main))) + `(neo-vc-edited-face ((,class :foreground ,yellow))) + `(neo-vc-ignored-face ((,class :foreground ,fg-inactive))) + `(neo-vc-missing-face ((,class :foreground ,red-alt))) + `(neo-vc-needs-merge-face ((,class :foreground ,magenta-alt))) + `(neo-vc-needs-update-face ((,class :underline t))) + `(neo-vc-removed-face ((,class :strike-through t))) + `(neo-vc-unlocked-changes-face ((,class :inherit modus-themes-refine-blue))) + `(neo-vc-up-to-date-face ((,class :inherit shadow))) + `(neo-vc-user-face ((,class :foreground ,magenta))) +;;;;; no-emoji + `(no-emoji ((,class :foreground ,cyan))) +;;;;; notmuch + `(notmuch-crypto-decryption ((,class :inherit (shadow bold)))) + `(notmuch-crypto-part-header ((,class :foreground ,magenta-alt-other))) + `(notmuch-crypto-signature-bad ((,class :inherit error))) + `(notmuch-crypto-signature-good ((,class :inherit success))) + `(notmuch-crypto-signature-good-key ((,class :inherit bold :foreground ,cyan))) + `(notmuch-crypto-signature-unknown ((,class :inherit warning))) + `(notmuch-hello-logo-background ((,class :background "gray50"))) + `(notmuch-message-summary-face ((,class :inherit (bold modus-themes-nuanced-cyan)))) + `(notmuch-search-count ((,class :inherit shadow))) + `(notmuch-search-date ((,class :foreground ,cyan))) + `(notmuch-search-flagged-face ((,class :foreground ,red-alt))) + `(notmuch-search-matching-authors ((,class :foreground ,fg-special-cold))) + `(notmuch-search-non-matching-authors ((,class :inherit shadow))) + `(notmuch-search-subject ((,class :foreground ,fg-main))) + `(notmuch-search-unread-face ((,class :inherit bold))) + `(notmuch-tag-added ((,class :underline ,blue))) + `(notmuch-tag-deleted ((,class :strike-through ,red))) + `(notmuch-tag-face ((,class :foreground ,blue))) + `(notmuch-tag-flagged ((,class :foreground ,red-alt))) + `(notmuch-tag-unread ((,class :foreground ,magenta-alt))) + `(notmuch-tree-match-author-face ((,class :inherit notmuch-search-matching-authors))) + `(notmuch-tree-match-date-face ((,class :inherit notmuch-search-date))) + `(notmuch-tree-match-face ((,class :foreground ,fg-main))) + `(notmuch-tree-match-tag-face ((,class :inherit notmuch-tag-face))) + `(notmuch-tree-no-match-face ((,class :inherit shadow))) + `(notmuch-tree-no-match-date-face ((,class :inherit shadow))) + `(notmuch-wash-cited-text ((,class :inherit message-cited-text-1))) + `(notmuch-wash-toggle-button ((,class :background ,bg-alt :foreground ,fg-alt))) +;;;;; num3-mode + `(num3-face-even ((,class :inherit bold :background ,bg-alt))) +;;;;; nxml-mode + `(nxml-attribute-colon ((,class :foreground ,fg-main))) + `(nxml-attribute-local-name ((,class :inherit font-lock-variable-name-face))) + `(nxml-attribute-prefix ((,class :inherit font-lock-type-face))) + `(nxml-attribute-value ((,class :inherit font-lock-constant-face))) + `(nxml-cdata-section-CDATA ((,class :inherit error))) + `(nxml-cdata-section-delimiter ((,class :inherit error))) + `(nxml-char-ref-delimiter ((,class :foreground ,fg-special-mild))) + `(nxml-char-ref-number ((,class :inherit modus-themes-bold :foreground ,fg-special-mild))) + `(nxml-delimited-data ((,class :inherit modus-themes-slant :foreground ,fg-special-cold))) + `(nxml-delimiter ((,class :foreground ,fg-dim))) + `(nxml-element-colon ((,class :foreground ,fg-main))) + `(nxml-element-local-name ((,class :inherit font-lock-function-name-face))) + `(nxml-element-prefix ((,class :inherit font-lock-builtin-face))) + `(nxml-entity-ref-delimiter ((,class :foreground ,fg-special-mild))) + `(nxml-entity-ref-name ((,class :inherit modus-themes-bold :foreground ,fg-special-mild))) + `(nxml-glyph ((,class :inherit modus-themes-intense-neutral))) + `(nxml-hash ((,class :inherit (bold font-lock-string-face)))) + `(nxml-heading ((,class :inherit bold))) + `(nxml-name ((,class :inherit font-lock-builtin-face))) + `(nxml-namespace-attribute-colon ((,class :foreground ,fg-main))) + `(nxml-namespace-attribute-prefix ((,class :inherit font-lock-variable-name-face))) + `(nxml-processing-instruction-target ((,class :inherit font-lock-keyword-face))) + `(nxml-prolog-keyword ((,class :inherit font-lock-keyword-face))) + `(nxml-ref ((,class :inherit modus-themes-bold :foreground ,fg-special-mild))) + `(rng-error ((,class :inherit error))) +;;;;; objed + `(objed-hl ((,class :background ,(if modus-themes-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-themes--standard-completions + blue-alt-other blue-nuanced-bg + blue-refine-bg blue-refine-fg)))) + `(orderless-match-face-1 ((,class :inherit bold + ,@(modus-themes--standard-completions + magenta-alt magenta-nuanced-bg + magenta-refine-bg magenta-refine-fg)))) + `(orderless-match-face-2 ((,class :inherit bold + ,@(modus-themes--standard-completions + green green-nuanced-bg + green-refine-bg green-refine-fg)))) + `(orderless-match-face-3 ((,class :inherit bold + ,@(modus-themes--standard-completions + yellow yellow-nuanced-bg + yellow-refine-bg yellow-refine-fg)))) +;;;;; org + `(org-agenda-calendar-event ((,class :inherit shadow))) + `(org-agenda-calendar-sexp ((,class :inherit (modus-themes-slant shadow)))) + `(org-agenda-clocking ((,class :inherit modus-themes-special-cold :extend t))) + `(org-agenda-column-dateline ((,class :background ,bg-alt))) + `(org-agenda-current-time ((,class :foreground ,blue-alt-other-faint))) + `(org-agenda-date ((,class ,@(modus-themes--agenda-date cyan fg-main nil)))) + `(org-agenda-date-today ((,class :background ,bg-active + ,@(modus-themes--agenda-date blue-active fg-main t cyan-active)))) + `(org-agenda-date-weekend ((,class ,@(modus-themes--agenda-date cyan-alt-other fg-alt nil cyan fg-main)))) + `(org-agenda-diary ((,class :inherit shadow))) + `(org-agenda-dimmed-todo-face ((,class :inherit shadow))) + `(org-agenda-done ((,class :foreground ,@(modus-themes--success-deuteran + blue-nuanced-fg + green-nuanced-fg)))) + `(org-agenda-filter-category ((,class :inherit bold :foreground ,cyan-active))) + `(org-agenda-filter-effort ((,class :inherit bold :foreground ,cyan-active))) + `(org-agenda-filter-regexp ((,class :inherit bold :foreground ,cyan-active))) + `(org-agenda-filter-tags ((,class :inherit bold :foreground ,cyan-active))) + `(org-agenda-restriction-lock ((,class :background ,bg-dim :foreground ,fg-dim))) + `(org-agenda-structure ((,class ,@(modus-themes--agenda-structure blue-alt)))) + `(org-archived ((,class :background ,bg-alt :foreground ,fg-alt))) + `(org-block ((,class :inherit modus-themes-fixed-pitch + ,@(modus-themes--org-block bg-dim fg-main)))) + `(org-block-begin-line ((,class :inherit modus-themes-fixed-pitch + ,@(modus-themes--org-block-delim + bg-dim fg-special-cold + bg-alt fg-alt)))) + `(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 :inherit org-done))) + `(org-checkbox-statistics-todo ((,class :inherit org-todo))) + `(org-clock-overlay ((,class :inherit modus-themes-special-cold))) + `(org-code ((,class :inherit modus-themes-fixed-pitch + :background ,bg-alt :foreground ,fg-special-mild))) + `(org-column ((,class :background ,bg-alt))) + `(org-column-title ((,class :inherit bold :underline t :background ,bg-alt))) + `(org-date ((,class :inherit ,(if modus-themes-no-mixed-fonts + 'button + '(button fixed-pitch)) + ,@(modus-themes--link-color + cyan cyan-faint)))) + `(org-date-selected ((,class :inherit bold :foreground ,blue-alt :inverse-video t))) + `(org-dispatcher-highlight ((,class :inherit (bold modus-themes-mark-alt)))) + `(org-document-info ((,class :foreground ,fg-special-cold))) + `(org-document-info-keyword ((,class :inherit modus-themes-fixed-pitch :foreground ,fg-alt))) + `(org-document-title ((,class :inherit (bold modus-themes-variable-pitch) :foreground ,fg-special-cold + ,@(modus-themes--scale modus-themes-scale-title)))) + `(org-done ((,class :foreground ,@(modus-themes--success-deuteran blue green)))) + `(org-drawer ((,class :inherit modus-themes-fixed-pitch :foreground ,fg-alt))) + `(org-ellipsis (())) ; inherits from the heading's color + `(org-footnote ((,class :inherit button + ,@(modus-themes--link-color + blue-alt blue-alt-faint)))) + `(org-formula ((,class :inherit modus-themes-fixed-pitch :foreground ,red-alt))) + `(org-habit-alert-face ((,class ,@(modus-themes--agenda-habit + yellow-graph-0-bg + yellow-graph-0-bg + yellow-graph-1-bg)))) + `(org-habit-alert-future-face ((,class ,@(modus-themes--agenda-habit + yellow-graph-1-bg + yellow-graph-0-bg + yellow-graph-1-bg)))) + `(org-habit-clear-face ((,class ,@(modus-themes--agenda-habit + blue-graph-0-bg + green-graph-1-bg + blue-graph-1-bg + blue-graph-1-bg)))) + `(org-habit-clear-future-face ((,class ,@(modus-themes--agenda-habit + blue-graph-1-bg + green-graph-1-bg + blue-graph-1-bg + blue-graph-1-bg)))) + `(org-habit-overdue-face ((,class ,@(modus-themes--agenda-habit + red-graph-0-bg + red-graph-0-bg + red-graph-1-bg)))) + `(org-habit-overdue-future-face ((,class ,@(modus-themes--agenda-habit + red-graph-1-bg + red-graph-0-bg + red-graph-1-bg)))) + `(org-habit-ready-face ((,class ,@(modus-themes--agenda-habit + green-graph-0-bg + green-graph-0-bg + green-graph-1-bg + blue-graph-0-bg)))) + `(org-habit-ready-future-face ((,class ,@(modus-themes--agenda-habit + green-graph-1-bg + green-graph-0-bg + green-graph-1-bg + blue-graph-0-bg)))) + `(org-headline-done ((,class :inherit modus-themes-variable-pitch + :foreground ,@(modus-themes--success-deuteran + blue-nuanced-fg + green-nuanced-fg)))) + `(org-headline-todo ((,class :inherit modus-themes-variable-pitch :foreground ,red-nuanced-fg))) + `(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 modus-themes-heading-1))) + `(org-level-2 ((,class :inherit modus-themes-heading-2))) + `(org-level-3 ((,class :inherit modus-themes-heading-3))) + `(org-level-4 ((,class :inherit modus-themes-heading-4))) + `(org-level-5 ((,class :inherit modus-themes-heading-5))) + `(org-level-6 ((,class :inherit modus-themes-heading-6))) + `(org-level-7 ((,class :inherit modus-themes-heading-7))) + `(org-level-8 ((,class :inherit modus-themes-heading-8))) + `(org-link ((,class :inherit button))) + `(org-list-dt ((,class :inherit bold))) + `(org-macro ((,class :inherit modus-themes-fixed-pitch + :background ,cyan-nuanced-bg :foreground ,cyan-nuanced-fg))) + `(org-meta-line ((,class :inherit modus-themes-fixed-pitch :foreground ,fg-alt))) + `(org-mode-line-clock ((,class :foreground ,fg-main))) + `(org-mode-line-clock-overrun ((,class :inherit bold :foreground ,red-active))) + `(org-priority ((,class :foreground ,magenta))) + `(org-property-value ((,class :inherit modus-themes-fixed-pitch :foreground ,fg-special-cold))) + `(org-quote ((,class ,@(modus-themes--org-block bg-dim fg-special-cold fg-main)))) + `(org-scheduled ((,class ,@(modus-themes--agenda-scheduled yellow-faint fg-special-warm magenta-alt)))) + `(org-scheduled-previously ((,class ,@(modus-themes--agenda-scheduled yellow fg-special-warm yellow-alt-other)))) + `(org-scheduled-today ((,class ,@(modus-themes--agenda-scheduled yellow fg-special-warm magenta-alt-other)))) + `(org-sexp-date ((,class :inherit org-date))) + `(org-special-keyword ((,class :inherit modus-themes-fixed-pitch :foreground ,fg-alt))) + `(org-table ((,class :inherit modus-themes-fixed-pitch :foreground ,fg-special-cold))) + `(org-table-header ((,class :inherit (fixed-pitch modus-themes-intense-neutral)))) + `(org-tag ((,class :foreground ,magenta-nuanced-fg))) + `(org-tag-group ((,class :inherit bold :foreground ,cyan-nuanced-fg))) + `(org-target ((,class :underline t))) + `(org-time-grid ((,class :foreground ,fg-unfocused))) + `(org-todo ((,class :foreground ,red))) + `(org-upcoming-deadline ((,class :foreground ,red-alt-other))) + `(org-upcoming-distant-deadline ((,class :foreground ,red-faint))) + `(org-verbatim ((,class :inherit modus-themes-fixed-pitch + :background ,bg-alt :foreground ,fg-special-calm))) + `(org-verse ((,class :inherit org-quote))) + `(org-warning ((,class :inherit bold :foreground ,red-alt-other))) +;;;;; org-journal + `(org-journal-calendar-entry-face ((,class :inherit modus-themes-slant :foreground ,yellow-alt-other))) + `(org-journal-calendar-scheduled-face ((,class :inherit modus-themes-slant :foreground ,red-alt-other))) + `(org-journal-highlight ((,class :foreground ,magenta-alt))) +;;;;; org-noter + `(org-noter-no-notes-exist-face ((,class :inherit bold :foreground ,red-active))) + `(org-noter-notes-exist-face ((,class :inherit bold :foreground ,green-active))) +;;;;; org-pomodoro + `(org-pomodoro-mode-line ((,class :foreground ,red-active))) + `(org-pomodoro-mode-line-break ((,class :foreground ,cyan-active))) + `(org-pomodoro-mode-line-overtime ((,class :inherit bold :foreground ,red-active))) +;;;;; org-recur + `(org-recur ((,class :foreground ,magenta-active))) +;;;;; org-roam + `(org-roam-link ((,class :inherit button + ,@(modus-themes--link-color + green green-faint)))) + `(org-roam-link-current ((,class :inherit button + ,@(modus-themes--link-color + green-alt green-alt-faint)))) + `(org-roam-link-invalid ((,class :inherit button + ,@(modus-themes--link-color + red red-faint)))) + `(org-roam-link-shielded ((,class :inherit button + ,@(modus-themes--link-color + yellow yellow-faint)))) + `(org-roam-tag ((,class :inherit italic :foreground ,fg-alt))) +;;;;; org-superstar + `(org-superstar-item ((,class :foreground ,fg-main))) + `(org-superstar-leading ((,class :foreground ,fg-whitespace))) +;;;;; org-table-sticky-header + `(org-table-sticky-header-face ((,class :inherit modus-themes-intense-neutral))) +;;;;; org-tree-slide + `(org-tree-slide-header-overlay-face + ((,class :inherit (bold modus-themes-variable-pitch) :background ,bg-main + :foreground ,fg-special-cold :overline nil + ,@(modus-themes--scale modus-themes-scale-title)))) +;;;;; org-treescope + `(org-treescope-faces--markerinternal-midday ((,class :inherit modus-themes-intense-blue))) + `(org-treescope-faces--markerinternal-range ((,class :inherit modus-themes-special-mild))) +;;;;; origami + `(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 modus-themes-heading-1))) + `(outline-2 ((,class :inherit modus-themes-heading-2))) + `(outline-3 ((,class :inherit modus-themes-heading-3))) + `(outline-4 ((,class :inherit modus-themes-heading-4))) + `(outline-5 ((,class :inherit modus-themes-heading-5))) + `(outline-6 ((,class :inherit modus-themes-heading-6))) + `(outline-7 ((,class :inherit modus-themes-heading-7))) + `(outline-8 ((,class :inherit modus-themes-heading-8))) +;;;;; outline-minor-faces + `(outline-minor-0 (())) +;;;;; package (M-x list-packages) + `(package-description ((,class :foreground ,fg-special-cold))) + `(package-help-section-name ((,class :inherit bold :foreground ,magenta-alt-other))) + `(package-name ((,class :inherit button))) + `(package-status-avail-obso ((,class :inherit bold :foreground ,red))) + `(package-status-available ((,class :foreground ,fg-special-mild))) + `(package-status-built-in ((,class :foreground ,magenta))) + `(package-status-dependency ((,class :foreground ,magenta-alt-other))) + `(package-status-disabled ((,class :inherit modus-themes-subtle-red))) + `(package-status-external ((,class :foreground ,cyan-alt-other))) + `(package-status-held ((,class :foreground ,yellow-alt))) + `(package-status-incompat ((,class :inherit bold :foreground ,yellow))) + `(package-status-installed ((,class :foreground ,fg-special-warm))) + `(package-status-new ((,class :inherit bold :foreground ,green))) + `(package-status-unsigned ((,class :inherit bold :foreground ,red-alt))) +;;;;; page-break-lines + `(page-break-lines ((,class :inherit default :foreground ,fg-window-divider-outer))) +;;;;; pandoc-mode + `(pandoc-citation-key-face ((,class :background ,bg-dim :foreground ,magenta-alt))) + `(pandoc-directive-@@-face ((,class :background ,bg-dim :foreground ,blue-alt-other))) + `(pandoc-directive-braces-face ((,class :foreground ,blue-alt-other))) + `(pandoc-directive-contents-face ((,class :foreground ,cyan-alt-other))) + `(pandoc-directive-type-face ((,class :foreground ,magenta))) +;;;;; paradox + `(paradox-archive-face ((,class :foreground ,fg-special-mild))) + `(paradox-comment-face ((,class :inherit font-lock-comment-face))) + `(paradox-commit-tag-face ((,class :inherit modus-themes-refine-magenta :box t))) + `(paradox-description-face ((,class :foreground ,fg-special-cold))) + `(paradox-description-face-multiline ((,class :foreground ,fg-special-cold))) + `(paradox-download-face ((,class :inherit modus-themes-bold :foreground ,blue-alt-other))) + `(paradox-highlight-face ((,class :inherit modus-themes-bold :foreground ,cyan-alt-other))) + `(paradox-homepage-button-face ((,class :foreground ,magenta-alt-other :underline t))) + `(paradox-mode-line-face ((,class :inherit bold :foreground ,cyan-active))) + `(paradox-name-face ((,class :foreground ,blue :underline t))) + `(paradox-star-face ((,class :foreground ,magenta))) + `(paradox-starred-face ((,class :foreground ,magenta-alt))) +;;;;; paren-face + `(parenthesis ((,class :foreground ,fg-unfocused))) +;;;;; parrot + `(parrot-rotate-rotation-highlight-face ((,class :inherit modus-themes-refine-magenta))) +;;;;; pass + `(pass-mode-directory-face ((,class :inherit bold :foreground ,fg-special-cold))) + `(pass-mode-entry-face ((,class :background ,bg-main :foreground ,fg-main))) + `(pass-mode-header-face ((,class :foreground ,fg-special-warm))) +;;;;; pdf-tools + `(pdf-links-read-link ((,class :background ,fg-main :foreground ,magenta-intense-bg :inherit bold))) ; Foreground is background and vice versa + `(pdf-occur-document-face ((,class :inherit shadow))) + `(pdf-occur-page-face ((,class :inherit shadow))) +;;;;; persp-mode + `(persp-face-lighter-buffer-not-in-persp ((,class :inherit modus-themes-intense-red))) + `(persp-face-lighter-default ((,class :inherit bold :foreground ,blue-active))) + `(persp-face-lighter-nil-persp ((,class :inherit bold :foreground ,fg-active))) +;;;;; perspective + `(persp-selected-face ((,class :inherit bold :foreground ,blue-active))) +;;;;; phi-grep + `(phi-grep-heading-face ((,class :inherit bold :foreground ,red-alt + ,@(modus-themes--scale modus-themes-scale-4)))) + `(phi-grep-line-number-face ((,class :foreground ,fg-special-warm))) + `(phi-grep-match-face ((,class :inherit modus-themes-special-calm))) + `(phi-grep-modified-face ((,class :inherit modus-themes-refine-yellow))) + `(phi-grep-overlay-face ((,class :inherit modus-themes-refine-blue))) +;;;;; phi-search + `(phi-replace-preview-face ((,class :inherit modus-themes-intense-magenta))) + `(phi-search-failpart-face ((,class :inherit modus-themes-refine-red))) + `(phi-search-match-face ((,class :inherit modus-themes-search-success-lazy))) + `(phi-search-selection-face ((,class :inherit (modus-themes-search-success bold)))) +;;;;; pkgbuild-mode + `(pkgbuild-error-face ((,class :inherit modus-themes-lang-error))) +;;;;; pomidor + `(pomidor-break-face ((,class :foreground ,blue-alt-other))) + `(pomidor-overwork-face ((,class :foreground ,red-alt-other))) + `(pomidor-skip-face ((,class :inherit modus-themes-slant :foreground ,fg-alt))) + `(pomidor-work-face ((,class :foreground ,@(modus-themes--success-deuteran + blue-alt + green-alt-other)))) +;;;;; popup + `(popup-face ((,class :background ,bg-alt :foreground ,fg-main))) + `(popup-isearch-match ((,class :inherit (modus-themes-refine-cyan bold)))) + `(popup-menu-mouse-face ((,class :inherit modus-themes-intense-blue))) + `(popup-menu-selection-face ((,class :inherit (modus-themes-subtle-cyan bold)))) + `(popup-scroll-bar-background-face ((,class :background ,bg-active))) + `(popup-scroll-bar-foreground-face ((,class :foreground ,fg-active))) + `(popup-summary-face ((,class :background ,bg-active :foreground ,fg-inactive))) + `(popup-tip-face ((,class :inherit modus-themes-refine-yellow))) +;;;;; powerline + `(powerline-active0 ((,class :background ,bg-main :foreground ,blue-faint :inverse-video t))) + `(powerline-active1 ((,class :background ,blue-nuanced-bg :foreground ,blue-nuanced-fg))) + `(powerline-active2 ((,class :background ,bg-active :foreground ,fg-active))) + `(powerline-inactive0 ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) + `(powerline-inactive1 ((,class :background ,bg-dim :foreground ,fg-inactive))) + `(powerline-inactive2 ((,class :background ,bg-inactive :foreground ,fg-inactive))) +;;;;; powerline-evil + `(powerline-evil-base-face ((,class :background ,fg-main :foreground ,bg-main))) + `(powerline-evil-emacs-face ((,class :inherit modus-themes-active-magenta))) + `(powerline-evil-insert-face ((,class :inherit modus-themes-active-green))) + `(powerline-evil-motion-face ((,class :inherit modus-themes-active-blue))) + `(powerline-evil-normal-face ((,class :background ,fg-alt :foreground ,bg-main))) + `(powerline-evil-operator-face ((,class :inherit modus-themes-active-yellow))) + `(powerline-evil-replace-face ((,class :inherit modus-themes-active-red))) + `(powerline-evil-visual-face ((,class :inherit modus-themes-active-cyan))) +;;;;; proced + `(proced-mark ((,class :inherit modus-themes-mark-symbol))) + `(proced-marked ((,class :inherit modus-themes-mark-alt))) + `(proced-sort-header ((,class :inherit bold :foreground ,fg-special-calm :underline t))) +;;;;; prodigy + `(prodigy-green-face ((,class :foreground ,green))) + `(prodigy-red-face ((,class :foreground ,red))) + `(prodigy-yellow-face ((,class :foreground ,yellow))) +;;;;; pulse + `(pulse-highlight-start-face ((,class :background ,bg-active-accent :extend t))) +;;;;; quick-peek + `(quick-peek-background-face ((,class :background ,bg-alt))) + `(quick-peek-border-face ((,class :background ,fg-window-divider-inner :height 1))) + `(quick-peek-padding-face ((,class :background ,bg-alt :height 0.15))) +;;;;; racket-mode + `(racket-debug-break-face ((,class :inherit modus-themes-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 :inherit modus-themes-slant :foreground ,fg-alt))) + `(racket-logger-debug-face ((,class :foreground ,blue-alt-other))) + `(racket-logger-info-face ((,class :foreground ,fg-lang-note))) + `(racket-logger-topic-face ((,class :inherit modus-themes-slant :foreground ,magenta))) + `(racket-selfeval-face ((,class :foreground ,green-alt))) + `(racket-xp-error-face ((,class :inherit modus-themes-lang-error))) +;;;;; rainbow-blocks + `(rainbow-blocks-depth-1-face ((,class :foreground ,magenta-alt-other))) + `(rainbow-blocks-depth-2-face ((,class :foreground ,blue))) + `(rainbow-blocks-depth-3-face ((,class :foreground ,magenta-alt))) + `(rainbow-blocks-depth-4-face ((,class :foreground ,green))) + `(rainbow-blocks-depth-5-face ((,class :foreground ,magenta))) + `(rainbow-blocks-depth-6-face ((,class :foreground ,cyan))) + `(rainbow-blocks-depth-7-face ((,class :foreground ,yellow))) + `(rainbow-blocks-depth-8-face ((,class :foreground ,cyan-alt))) + `(rainbow-blocks-depth-9-face ((,class :foreground ,red-alt))) + `(rainbow-blocks-unmatched-face ((,class :foreground ,red))) +;;;;; rainbow-identifiers + `(rainbow-identifiers-identifier-1 ((,class :foreground ,green-alt-other))) + `(rainbow-identifiers-identifier-2 ((,class :foreground ,magenta-alt-other))) + `(rainbow-identifiers-identifier-3 ((,class :foreground ,cyan-alt-other))) + `(rainbow-identifiers-identifier-4 ((,class :foreground ,yellow-alt-other))) + `(rainbow-identifiers-identifier-5 ((,class :foreground ,blue-alt-other))) + `(rainbow-identifiers-identifier-6 ((,class :foreground ,green-alt))) + `(rainbow-identifiers-identifier-7 ((,class :foreground ,magenta-alt))) + `(rainbow-identifiers-identifier-8 ((,class :foreground ,cyan-alt))) + `(rainbow-identifiers-identifier-9 ((,class :foreground ,yellow-alt))) + `(rainbow-identifiers-identifier-10 ((,class :foreground ,green))) + `(rainbow-identifiers-identifier-11 ((,class :foreground ,magenta))) + `(rainbow-identifiers-identifier-12 ((,class :foreground ,cyan))) + `(rainbow-identifiers-identifier-13 ((,class :foreground ,yellow))) + `(rainbow-identifiers-identifier-14 ((,class :foreground ,blue-alt))) + `(rainbow-identifiers-identifier-15 ((,class :foreground ,red-alt))) +;;;;; rainbow-delimiters + `(rainbow-delimiters-base-error-face ((,class :background ,red-subtle-bg :foreground ,fg-main))) + `(rainbow-delimiters-base-face ((,class :foreground ,fg-main))) + `(rainbow-delimiters-depth-1-face ((,class :foreground ,fg-main))) + `(rainbow-delimiters-depth-2-face ((,class :foreground ,magenta-intense))) + `(rainbow-delimiters-depth-3-face ((,class :foreground ,cyan-intense))) + `(rainbow-delimiters-depth-4-face ((,class :foreground ,orange-intense))) + `(rainbow-delimiters-depth-5-face ((,class :foreground ,purple-intense))) + `(rainbow-delimiters-depth-6-face ((,class :foreground ,green-intense))) + `(rainbow-delimiters-depth-7-face ((,class :foreground ,red-intense))) + `(rainbow-delimiters-depth-8-face ((,class :foreground ,blue-intense))) + `(rainbow-delimiters-depth-9-face ((,class :foreground ,yellow-intense))) + `(rainbow-delimiters-mismatched-face ((,class :inherit (bold modus-themes-refine-yellow)))) + `(rainbow-delimiters-unmatched-face ((,class :inherit (bold modus-themes-refine-red)))) +;;;;; rcirc + `(rcirc-bright-nick ((,class :inherit bold :foreground ,magenta-alt))) + `(rcirc-dim-nick ((,class :inherit shadow))) + `(rcirc-my-nick ((,class :inherit bold :foreground ,magenta))) + `(rcirc-nick-in-message ((,class :foreground ,magenta-alt-other))) + `(rcirc-nick-in-message-full-line ((,class :inherit bold :foreground ,fg-special-mild))) + `(rcirc-other-nick ((,class :inherit bold :foreground ,fg-special-cold))) + `(rcirc-prompt ((,class :inherit modus-themes-prompt))) + `(rcirc-server ((,class :foreground ,fg-unfocused))) + `(rcirc-timestamp ((,class :foreground ,blue-nuanced-fg))) + `(rcirc-url ((,class :foreground ,blue :underline t))) +;;;;; recursion-indicator + `(recursion-indicator-general ((,class :foreground ,blue-active))) + `(recursion-indicator-minibuffer ((,class :foreground ,red-active))) +;;;;; regexp-builder (re-builder) + `(reb-match-0 ((,class :inherit modus-themes-refine-cyan))) + `(reb-match-1 ((,class :inherit modus-themes-subtle-magenta))) + `(reb-match-2 ((,class :inherit modus-themes-subtle-green))) + `(reb-match-3 ((,class :inherit modus-themes-refine-yellow))) + `(reb-regexp-grouping-backslash ((,class :inherit font-lock-regexp-grouping-backslash))) + `(reb-regexp-grouping-construct ((,class :inherit font-lock-regexp-grouping-construct))) +;;;;; rg (rg.el) + `(rg-column-number-face ((,class :foreground ,magenta-alt-other))) + `(rg-context-face ((,class :foreground ,fg-unfocused))) + `(rg-error-face ((,class :inherit bold :foreground ,red))) + `(rg-file-tag-face ((,class :foreground ,fg-special-cold))) + `(rg-filename-face ((,class :inherit bold :foreground ,fg-special-cold))) + `(rg-line-number-face ((,class :foreground ,fg-special-warm))) + `(rg-literal-face ((,class :foreground ,blue-alt))) + `(rg-match-face ((,class :inherit modus-themes-special-calm))) + `(rg-regexp-face ((,class :foreground ,magenta-active))) + `(rg-toggle-off-face ((,class :inherit bold :foreground ,fg-inactive))) + `(rg-toggle-on-face ((,class :inherit bold :foreground ,cyan-active))) + `(rg-warning-face ((,class :inherit bold :foreground ,yellow))) +;;;;; ripgrep + `(ripgrep-context-face ((,class :foreground ,fg-unfocused))) + `(ripgrep-error-face ((,class :inherit bold :foreground ,red))) + `(ripgrep-hit-face ((,class :foreground ,cyan))) + `(ripgrep-match-face ((,class :inherit modus-themes-special-calm))) +;;;;; rmail + `(rmail-header-name ((,class :foreground ,cyan-alt-other))) + `(rmail-highlight ((,class :inherit bold :foreground ,magenta-alt))) +;;;;; ruler-mode + `(ruler-mode-column-number ((,class :inherit ruler-mode-default :foreground ,fg-main))) + `(ruler-mode-comment-column ((,class :inherit ruler-mode-default :foreground ,red))) + `(ruler-mode-current-column ((,class :inherit ruler-mode-default :background ,blue-subtle-bg :foreground ,fg-main))) + `(ruler-mode-default ((,class :inherit default :background ,bg-alt :foreground ,fg-unfocused))) + `(ruler-mode-fill-column ((,class :inherit ruler-mode-default :foreground ,green))) + `(ruler-mode-fringes ((,class :inherit ruler-mode-default :foreground ,cyan))) + `(ruler-mode-goal-column ((,class :inherit ruler-mode-default :foreground ,blue))) + `(ruler-mode-margins ((,class :inherit ruler-mode-default :foreground ,bg-main))) + `(ruler-mode-pad ((,class :inherit ruler-mode-default :background ,bg-active :foreground ,fg-inactive))) + `(ruler-mode-tab-stop ((,class :inherit ruler-mode-default :foreground ,fg-special-warm))) +;;;;; sallet + `(sallet-buffer-compressed ((,class :inherit italic :foreground ,yellow-nuanced-fg))) + `(sallet-buffer-default-directory ((,class :foreground ,cyan-nuanced-fg))) + `(sallet-buffer-directory ((,class :foreground ,blue-nuanced-fg))) + `(sallet-buffer-help ((,class :foreground ,fg-special-cold))) + `(sallet-buffer-modified ((,class :inherit italic :foreground ,yellow-alt-other))) + `(sallet-buffer-ordinary ((,class :foreground ,fg-main))) + `(sallet-buffer-read-only ((,class :foreground ,yellow-alt))) + `(sallet-buffer-size ((,class :foreground ,fg-special-calm))) + `(sallet-buffer-special ((,class :foreground ,magenta-alt-other))) + `(sallet-flx-match ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-cyan + 'modus-themes-refine-cyan + 'modus-themes-nuanced-cyan + cyan-alt-other)))) + `(sallet-recentf-buffer-name ((,class :foreground ,blue-nuanced-fg))) + `(sallet-recentf-file-path ((,class :foreground ,fg-special-mild))) + `(sallet-regexp-match ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-magenta + 'modus-themes-refine-magenta + 'modus-themes-nuanced-magenta + magenta-alt-other)))) + `(sallet-source-header ((,class :inherit bold :foreground ,red-alt + ,@(modus-themes--scale modus-themes-scale-4)))) + `(sallet-substring-match ((,class ,@(modus-themes--extra-completions + 'modus-themes-subtle-blue + 'modus-themes-refine-blue + 'modus-themes-nuanced-blue + blue-alt-other)))) +;;;;; selectrum + ;; NOTE 2021-02-22: The `selectrum-primary-highlight' and + ;; `selectrum-secondary-highlight' are deprecated upstream in favour + ;; of their selectrum-prescient counterparts. We shall remove those + ;; faces from the themes once we are certain that they are no longer + ;; relevant. + `(selectrum-current-candidate + ((,class :inherit bold :foreground ,fg-main + :background ,@(pcase modus-themes-completions + ('opinionated (list bg-active)) + (_ (list bg-inactive)))))) + `(selectrum-mouse-highlight ((,class :inherit highlight))) + `(selectrum-primary-highlight + ((,class :inherit bold + ,@(modus-themes--standard-completions + magenta-alt magenta-nuanced-bg + magenta-refine-bg magenta-refine-fg)))) + `(selectrum-secondary-highlight + ((,class :inherit bold + ,@(modus-themes--standard-completions + cyan-alt-other cyan-nuanced-bg + cyan-refine-bg cyan-refine-fg)))) + `(selectrum-quick-keys-highlight + ((,class :inherit modus-themes-refine-red))) + `(selectrum-quick-keys-match + ((,class :inherit (bold modus-themes-search-success)))) +;;;;; selectrum-prescient + `(selectrum-prescient-primary-highlight + ((,class :inherit bold + ,@(modus-themes--standard-completions + magenta-alt magenta-nuanced-bg + magenta-refine-bg magenta-refine-fg)))) + `(selectrum-prescient-secondary-highlight + ((,class :inherit bold + ,@(modus-themes--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-fileless-includes ((,class :inherit modus-themes-refine-green))) + `(semantic-decoration-on-private-members-face ((,class :inherit modus-themes-refine-cyan))) + `(semantic-decoration-on-protected-members-face ((,class :background ,bg-dim))) + `(semantic-decoration-on-unknown-includes ((,class :inherit modus-themes-refine-red))) + `(semantic-decoration-on-unparsed-includes ((,class :inherit modus-themes-refine-yellow))) + `(semantic-highlight-edits-face ((,class :background ,bg-alt))) + `(semantic-highlight-func-current-tag-face ((,class :background ,bg-alt))) + `(semantic-idle-symbol-highlight ((,class :inherit modus-themes-special-mild))) + `(semantic-tag-boundary-face ((,class :overline ,blue-intense))) + `(semantic-unmatched-syntax-face ((,class :underline ,fg-lang-error))) +;;;;; sesman + `(sesman-browser-button-face ((,class :foreground ,blue-alt-other :underline t))) + `(sesman-browser-highligh-face ((,class :inherit modus-themes-subtle-blue))) + `(sesman-buffer-face ((,class :foreground ,magenta))) + `(sesman-directory-face ((,class :inherit bold :foreground ,blue))) + `(sesman-project-face ((,class :inherit bold :foreground ,magenta-alt-other))) +;;;;; shell-script-mode + `(sh-heredoc ((,class :foreground ,blue-alt))) + `(sh-quoted-exec ((,class :inherit modus-themes-bold :foreground ,magenta-alt))) +;;;;; shortdoc + `(shortdoc-heading ((,class :inherit modus-themes-pseudo-header))) + `(shortdoc-section (())) ; remove the default's variable-pitch style +;;;;; show-paren-mode + `(show-paren-match ((,class ,@(modus-themes--paren bg-paren-match + bg-paren-match-intense) + :foreground ,fg-main))) + `(show-paren-match-expression ((,class :background ,bg-paren-expression))) + `(show-paren-mismatch ((,class :inherit modus-themes-intense-red))) +;;;;; shr + `(shr-h1 ((,class :inherit modus-themes-heading-1))) + `(shr-h2 ((,class :inherit modus-themes-heading-2))) + `(shr-h3 ((,class :inherit modus-themes-heading-3))) + `(shr-h4 ((,class :inherit modus-themes-heading-4))) + `(shr-h5 ((,class :inherit modus-themes-heading-5))) + `(shr-h6 ((,class :inherit modus-themes-heading-6))) + `(shr-abbreviation ((,class :inherit modus-themes-lang-note))) + `(shr-selected-link ((,class :inherit modus-themes-subtle-red))) +;;;;; side-notes + `(side-notes ((,class :background ,bg-dim :foreground ,fg-dim))) +;;;;; sieve-mode + `(sieve-action-commands ((,class :inherit font-lock-builtin-face))) + `(sieve-control-commands ((,class :inherit font-lock-keyword-face))) + `(sieve-tagged-arguments ((,class :inherit font-lock-type-face))) + `(sieve-test-commands ((,class :inherit font-lock-function-name-face))) +;;;;; skewer-mode + `(skewer-error-face ((,class :foreground ,red :underline t))) +;;;;; smart-mode-line + `(sml/charging ((,class :foreground ,green-active))) + `(sml/discharging ((,class :foreground ,red-active))) + `(sml/filename ((,class :inherit bold :foreground ,blue-active))) + `(sml/folder ((,class :foreground ,fg-active))) + `(sml/git ((,class :inherit bold :foreground ,green-active))) + `(sml/global ((,class :foreground ,fg-active))) + `(sml/line-number ((,class :inherit sml/global))) + `(sml/minor-modes ((,class :inherit sml/global))) + `(sml/modes ((,class :inherit bold :foreground ,fg-active))) + `(sml/modified ((,class :inherit bold :foreground ,magenta-active))) + `(sml/mule-info ((,class :inherit sml/global))) + `(sml/name-filling ((,class :foreground ,yellow-active))) + `(sml/not-modified ((,class :inherit sml/global))) + `(sml/numbers-separator ((,class :inherit sml/global))) + `(sml/outside-modified ((,class :inherit modus-themes-intense-red))) + `(sml/position-percentage ((,class :inherit sml/global))) + `(sml/prefix ((,class :foreground ,green-active))) + `(sml/process ((,class :inherit sml/prefix))) + `(sml/projectile ((,class :inherit sml/git))) + `(sml/read-only ((,class :inherit bold :foreground ,cyan-active))) + `(sml/remote ((,class :inherit sml/global))) + `(sml/sudo ((,class :inherit modus-themes-subtle-red))) + `(sml/time ((,class :inherit sml/global))) + `(sml/vc ((,class :inherit sml/git))) + `(sml/vc-edited ((,class :inherit bold :foreground ,yellow-active))) +;;;;; smartparens + `(sp-pair-overlay-face ((,class :inherit modus-themes-special-warm))) + `(sp-show-pair-enclosing ((,class :inherit modus-themes-special-mild))) + `(sp-show-pair-match-face ((,class ,@(modus-themes--paren bg-paren-match + bg-paren-match-intense) + :foreground ,fg-main))) + `(sp-show-pair-mismatch-face ((,class :inherit modus-themes-intense-red))) + `(sp-wrap-overlay-closing-pair ((,class :inherit sp-pair-overlay-face))) + `(sp-wrap-overlay-face ((,class :inherit sp-pair-overlay-face))) + `(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 :inherit modus-themes-diff-changed))) + `(smerge-lower ((,class :inherit modus-themes-diff-added))) + `(smerge-markers ((,class :inherit modus-themes-diff-heading))) + `(smerge-refined-added ((,class :inherit modus-themes-diff-refine-added))) + `(smerge-refined-changed (())) + `(smerge-refined-removed ((,class :inherit modus-themes-diff-refine-removed))) + `(smerge-upper ((,class :inherit modus-themes-diff-removed))) +;;;;; solaire + `(solaire-default-face ((,class :inherit default :background ,bg-alt :foreground ,fg-dim))) + `(solaire-line-number-face ((,class :inherit solaire-default-face :foreground ,fg-unfocused))) + `(solaire-hl-line-face ((,class :background ,bg-active))) + `(solaire-org-hide-face ((,class :background ,bg-alt :foreground ,bg-alt))) +;;;;; spaceline + `(spaceline-evil-emacs ((,class :inherit modus-themes-active-magenta))) + `(spaceline-evil-insert ((,class :inherit modus-themes-active-green))) + `(spaceline-evil-motion ((,class :inherit modus-themes-active-blue))) + `(spaceline-evil-normal ((,class :background ,fg-alt :foreground ,bg-alt))) + `(spaceline-evil-replace ((,class :inherit modus-themes-active-red))) + `(spaceline-evil-visual ((,class :inherit modus-themes-active-cyan))) + `(spaceline-flycheck-error ((,class :foreground ,red-active))) + `(spaceline-flycheck-info ((,class :foreground ,cyan-active))) + `(spaceline-flycheck-warning ((,class :foreground ,yellow-active))) + `(spaceline-highlight-face ((,class :inherit modus-themes-fringe-blue))) + `(spaceline-modified ((,class :inherit modus-themes-fringe-magenta))) + `(spaceline-python-venv ((,class :foreground ,magenta-active))) + `(spaceline-read-only ((,class :inherit modus-themes-fringe-red))) + `(spaceline-unmodified ((,class :inherit modus-themes-fringe-cyan))) +;;;;; speedbar + `(speedbar-button-face ((,class :inherit button))) + `(speedbar-directory-face ((,class :inherit bold :foreground ,blue))) + `(speedbar-file-face ((,class :foreground ,fg-main))) + `(speedbar-highlight-face ((,class :inherit modus-themes-subtle-blue))) + `(speedbar-selected-face ((,class :inherit bold :foreground ,cyan))) + `(speedbar-separator-face ((,class :inherit modus-themes-intense-neutral))) + `(speedbar-tag-face ((,class :foreground ,yellow-alt-other))) +;;;;; spell-fu + `(spell-fu-incorrect-face ((,class :inherit modus-themes-lang-error))) +;;;;; spray + `(spray-accent-face ((,class :foreground ,red-intense))) + `(spray-base-face ((,class :inherit default :foreground ,fg-special-cold))) +;;;;; stripes + `(stripes ((,class :inherit modus-themes-hl-line))) +;;;;; success + `(suggest-heading ((,class :inherit bold :foreground ,yellow-alt-other))) +;;;;; switch-window + `(switch-window-background ((,class :background ,bg-dim))) + `(switch-window-label ((,class :height 3.0 :foreground ,blue-intense))) +;;;;; swiper + `(swiper-background-match-face-1 ((,class :inherit modus-themes-subtle-neutral))) + `(swiper-background-match-face-2 ((,class :inherit modus-themes-refine-cyan))) + `(swiper-background-match-face-3 ((,class :inherit modus-themes-refine-magenta))) + `(swiper-background-match-face-4 ((,class :inherit modus-themes-refine-yellow))) + `(swiper-line-face ((,class :inherit modus-themes-special-cold))) + `(swiper-match-face-1 ((,class :inherit (bold modus-themes-intense-neutral)))) + `(swiper-match-face-2 ((,class :inherit (bold modus-themes-intense-green)))) + `(swiper-match-face-3 ((,class :inherit (bold modus-themes-intense-blue)))) + `(swiper-match-face-4 ((,class :inherit (bold modus-themes-intense-red)))) +;;;;; swoop + `(swoop-face-header-format-line ((,class :inherit bold :foreground ,red-alt + ,@(modus-themes--scale modus-themes-scale-3)))) + `(swoop-face-line-buffer-name ((,class :inherit bold :foreground ,blue-alt + ,@(modus-themes--scale modus-themes-scale-4)))) + `(swoop-face-line-number ((,class :foreground ,fg-special-warm))) + `(swoop-face-target-line ((,class :inherit modus-themes-intense-blue :extend t))) + `(swoop-face-target-words ((,class :inherit modus-themes-refine-cyan))) +;;;;; sx + `(sx-inbox-item-type ((,class :foreground ,magenta-alt-other))) + `(sx-inbox-item-type-unread ((,class :inherit (sx-inbox-item-type bold)))) + `(sx-question-list-answers ((,class :foreground ,green))) + `(sx-question-list-answers-accepted ((,class :box t :foreground ,green))) + `(sx-question-list-bounty ((,class :inherit bold :background ,bg-alt :foreground ,yellow))) + `(sx-question-list-date ((,class :foreground ,fg-special-cold))) + `(sx-question-list-favorite ((,class :inherit bold :foreground ,fg-special-warm))) + `(sx-question-list-parent ((,class :foreground ,fg-main))) + `(sx-question-list-read-question ((,class :inherit shadow))) + `(sx-question-list-score ((,class :foreground ,fg-special-mild))) + `(sx-question-list-score-upvoted ((,class :inherit (sx-question-list-score bold)))) + `(sx-question-list-unread-question ((,class :inherit bold :foreground ,fg-main))) + `(sx-question-mode-accepted ((,class :inherit bold :height 1.3 :foreground ,green))) + `(sx-question-mode-closed ((,class :inherit modus-themes-active-yellow :box (:line-width 2 :color nil)))) + `(sx-question-mode-closed-reason ((,class :box (:line-width 2 :color nil) :foreground ,fg-main))) + `(sx-question-mode-content-face ((,class :background ,bg-dim))) + `(sx-question-mode-date ((,class :foreground ,blue))) + `(sx-question-mode-header ((,class :inherit bold :foreground ,cyan))) + `(sx-question-mode-kbd-tag ((,class :inherit bold :height 0.9 :box (:line-width 3 :color ,fg-main :style released-button) :foreground ,fg-main))) + `(sx-question-mode-score ((,class :foreground ,fg-dim))) + `(sx-question-mode-score-downvoted ((,class :foreground ,yellow))) + `(sx-question-mode-score-upvoted ((,class :inherit bold :foreground ,magenta))) + `(sx-question-mode-title ((,class :inherit bold :foreground ,fg-main))) + `(sx-question-mode-title-comments ((,class :inherit bold :foreground ,fg-alt))) + `(sx-tag ((,class :foreground ,magenta-alt))) + `(sx-user-name ((,class :foreground ,blue-alt))) + `(sx-user-reputation ((,class :inherit shadow))) +;;;;; symbol-overlay + `(symbol-overlay-default-face ((,class :inherit modus-themes-special-warm))) + `(symbol-overlay-face-1 ((,class :inherit modus-themes-intense-blue))) + `(symbol-overlay-face-2 ((,class :inherit modus-themes-refine-magenta))) + `(symbol-overlay-face-3 ((,class :inherit modus-themes-intense-yellow))) + `(symbol-overlay-face-4 ((,class :inherit modus-themes-intense-magenta))) + `(symbol-overlay-face-5 ((,class :inherit modus-themes-intense-red))) + `(symbol-overlay-face-6 ((,class :inherit modus-themes-refine-red))) + `(symbol-overlay-face-7 ((,class :inherit modus-themes-intense-cyan))) + `(symbol-overlay-face-8 ((,class :inherit modus-themes-refine-cyan))) +;;;;; syslog-mode + `(syslog-debug ((,class :inherit bold :foreground ,cyan-alt-other))) + `(syslog-error ((,class :inherit bold :foreground ,red))) + `(syslog-file ((,class :inherit bold :foreground ,fg-special-cold))) + `(syslog-hide ((,class :background ,bg-main :foreground ,fg-main))) + `(syslog-hour ((,class :inherit bold :foreground ,magenta-alt-other))) + `(syslog-info ((,class :inherit bold :foreground ,blue-alt-other))) + `(syslog-ip ((,class :inherit bold :foreground ,fg-special-mild :underline t))) + `(syslog-su ((,class :inherit bold :foreground ,red-alt))) + `(syslog-warn ((,class :inherit bold :foreground ,yellow))) +;;;;; tab-bar-groups + `(tab-bar-groups-tab-1 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,blue-tab))) + `(tab-bar-groups-tab-2 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,red-tab))) + `(tab-bar-groups-tab-3 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,green-tab))) + `(tab-bar-groups-tab-4 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,orange-tab))) + `(tab-bar-groups-tab-5 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,purple-tab))) + `(tab-bar-groups-tab-6 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,cyan-tab))) + `(tab-bar-groups-tab-7 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,yellow-tab))) + `(tab-bar-groups-tab-8 ((,class ,@(modus-themes--variable-pitch-ui) :foreground ,magenta-tab))) +;;;;; tab-bar-mode + `(tab-bar ((,class ,@(modus-themes--variable-pitch-ui) + :background ,bg-tab-bar :foreground ,fg-main))) + `(tab-bar-tab ((,class :inherit bold :box (:line-width 2 :color ,bg-tab-active) + :background ,bg-tab-active :foreground ,fg-main))) + `(tab-bar-tab-inactive ((,class :box (:line-width 2 :color ,bg-tab-inactive) + :background ,bg-tab-inactive :foreground ,fg-dim))) +;;;;; tab-line-mode + `(tab-line ((,class ,@(modus-themes--variable-pitch-ui) + :height 0.95 :background ,bg-tab-bar :foreground ,fg-main))) + `(tab-line-close-highlight ((,class :foreground ,red))) + `(tab-line-highlight ((,class :background ,blue-subtle-bg :foreground ,fg-dim))) + `(tab-line-tab ((,class :inherit bold :box (:line-width 2 :color ,bg-tab-active) + :background ,bg-tab-active :foreground ,fg-main))) + `(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))) + `(tab-line-tab-inactive-alternate ((,class :box (:line-width 2 :color ,bg-tab-inactive-alt) + :background ,bg-tab-inactive-alt :foreground ,fg-main))) +;;;;; table (built-in table.el) + `(table-cell ((,class :background ,blue-nuanced-bg))) +;;;;; telega + ;; FIXME 2021-03-28: Some aspects of `telega' are not fully + ;; supported or have not been tested thoroughly. Please understand + ;; that I do not use that service because it requires a smartphone + ;; and I have none. Help with testing is appreciated. + `(telega-button ((,class :box t :foreground ,blue))) + `(telega-button-active ((,class :box ,blue-intense-bg :background ,blue-intense-bg :foreground ,fg-main))) + `(telega-button-highlight ((,class :inherit modus-themes-subtle-magenta))) + `(telega-chat-prompt ((,class :inherit bold))) + `(telega-entity-type-code ((,class :inherit fixed-pitch))) + `(telega-entity-type-mention ((,class :foreground ,cyan))) + `(telega-entity-type-pre ((,class :inherit fixed-pitch))) + `(telega-msg-heading ((,class :background ,bg-alt))) + `(telega-msg-self-title ((,class :inherit bold))) + `(telega-root-heading ((,class :inherit modus-themes-subtle-neutral))) + `(telega-secret-title ((,class :foreground ,magenta-alt))) + `(telega-unmuted-count ((,class :foreground ,blue-alt-other))) + `(telega-user-online-status ((,class :foreground ,cyan-active))) + `(telega-username ((,class :foreground ,cyan-alt-other))) + `(telega-webpage-chat-link ((,class :background ,bg-alt))) + `(telega-webpage-fixed ((,class :inherit fixed-pitch :height 0.85))) + `(telega-webpage-header ((,class :inherit modus-themes-variable-pitch :height 1.3))) + `(telega-webpage-preformatted ((,class :inherit fixed-pitch :background ,bg-alt))) + `(telega-webpage-subheader ((,class :inherit modus-themes-variable-pitch :height 1.15))) +;;;;; telephone-line + `(telephone-line-accent-active ((,class :background ,fg-inactive :foreground ,bg-inactive))) + `(telephone-line-accent-inactive ((,class :background ,bg-active :foreground ,fg-active))) + `(telephone-line-error ((,class :inherit bold :foreground ,red-active))) + `(telephone-line-evil ((,class :foreground ,fg-main))) + `(telephone-line-evil-emacs ((,class :inherit telephone-line-evil :background ,magenta-intense-bg))) + `(telephone-line-evil-insert ((,class :inherit telephone-line-evil :background ,green-intense-bg))) + `(telephone-line-evil-motion ((,class :inherit telephone-line-evil :background ,yellow-intense-bg))) + `(telephone-line-evil-normal ((,class :inherit telephone-line-evil :background ,bg-alt))) + `(telephone-line-evil-operator ((,class :inherit telephone-line-evil :background ,yellow-subtle-bg))) + `(telephone-line-evil-replace ((,class :inherit telephone-line-evil :background ,red-intense-bg))) + `(telephone-line-evil-visual ((,class :inherit telephone-line-evil :background ,cyan-intense-bg))) + `(telephone-line-projectile ((,class :foreground ,cyan-active))) + `(telephone-line-unimportant ((,class :foreground ,fg-inactive))) + `(telephone-line-warning ((,class :inherit bold :foreground ,yellow-active))) +;;;;; terraform-mode + `(terraform--resource-name-face ((,class ,@(modus-themes--syntax-string + magenta-alt-other magenta-alt-other-faint + red-alt red-alt)))) + `(terraform--resource-type-face ((,class ,@(modus-themes--syntax-string + green green-faint + blue-alt magenta-alt)))) +;;;;; term + `(term ((,class :background ,bg-main :foreground ,fg-main))) + `(term-bold ((,class :inherit bold))) + `(term-color-black ((,class :background "gray35" :foreground "gray35"))) + `(term-color-blue ((,class :background ,blue :foreground ,blue))) + `(term-color-cyan ((,class :background ,cyan :foreground ,cyan))) + `(term-color-green ((,class :background ,green :foreground ,green))) + `(term-color-magenta ((,class :background ,magenta :foreground ,magenta))) + `(term-color-red ((,class :background ,red :foreground ,red))) + `(term-color-white ((,class :background "gray65" :foreground "gray65"))) + `(term-color-yellow ((,class :background ,yellow :foreground ,yellow))) + `(term-underline ((,class :underline t))) +;;;;; tomatinho + `(tomatinho-ok-face ((,class :foreground ,blue-intense))) + `(tomatinho-pause-face ((,class :foreground ,yellow-intense))) + `(tomatinho-reset-face ((,class :inherit shadow))) +;;;;; transient + `(transient-active-infix ((,class :inherit modus-themes-special-mild))) + `(transient-amaranth ((,class :inherit bold :foreground ,yellow-alt))) + `(transient-argument ((,class :inherit bold :foreground ,green))) + `(transient-blue ((,class :inherit bold :foreground ,blue))) + `(transient-disabled-suffix ((,class :inherit modus-themes-intense-red))) + `(transient-enabled-suffix ((,class :inherit ,@(modus-themes--success-deuteran + 'modus-themes-subtle-blue + 'modus-themes-subtle-green)))) + `(transient-heading ((,class :inherit bold :foreground ,fg-main))) + `(transient-inactive-argument ((,class :inherit shadow))) + `(transient-inactive-value ((,class :inherit shadow))) + `(transient-key ((,class :inherit modus-themes-key-binding))) + `(transient-mismatched-key ((,class :underline t))) + `(transient-nonstandard-key ((,class :underline t))) + `(transient-pink ((,class :inherit bold :foreground ,magenta-alt-faint))) + `(transient-red ((,class :inherit bold :foreground ,red-faint))) + `(transient-teal ((,class :inherit bold :foreground ,cyan-alt-other))) + `(transient-unreachable ((,class :foreground ,fg-unfocused))) + `(transient-unreachable-key ((,class :foreground ,fg-unfocused))) + `(transient-value ((,class :inherit bold :foreground ,magenta-alt-other))) +;;;;; trashed + `(trashed-deleted ((,class :inherit modus-themes-mark-del))) + `(trashed-directory ((,class :foreground ,blue))) + `(trashed-mark ((,class :inherit modus-themes-mark-symbol))) + `(trashed-marked ((,class :inherit modus-themes-mark-alt))) + `(trashed-restored ((,class :inherit modus-themes-mark-sel))) + `(trashed-symlink ((,class :inherit button + ,@(modus-themes--link-color + cyan-alt cyan-alt-faint)))) +;;;;; treemacs + `(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt))) + `(treemacs-directory-face ((,class :inherit dired-directory))) + `(treemacs-file-face ((,class :foreground ,fg-main))) + `(treemacs-fringe-indicator-face ((,class :foreground ,fg-main))) + `(treemacs-git-added-face ((,class :foreground ,green-intense))) + `(treemacs-git-conflict-face ((,class :inherit (modus-themes-intense-red bold)))) + `(treemacs-git-ignored-face ((,class :inherit shadow))) + `(treemacs-git-modified-face ((,class :foreground ,yellow-alt-other))) + `(treemacs-git-renamed-face ((,class :foreground ,cyan-alt-other))) + `(treemacs-git-unmodified-face ((,class :foreground ,fg-main))) + `(treemacs-git-untracked-face ((,class :foreground ,red-alt-other))) + `(treemacs-help-column-face ((,class :inherit modus-themes-bold :foreground ,magenta-alt-other :underline t))) + `(treemacs-help-title-face ((,class :foreground ,blue-alt-other))) + `(treemacs-on-failure-pulse-face ((,class :inherit modus-themes-intense-red))) + `(treemacs-on-success-pulse-face ((,class :inherit ,@(modus-themes--success-deuteran + 'modus-themes-intense-blue + 'modus-themes-intense-green)))) + `(treemacs-root-face ((,class :inherit bold :foreground ,blue-alt-other :height 1.2 :underline t))) + `(treemacs-root-remote-disconnected-face ((,class :inherit treemacs-root-remote-face :foreground ,yellow))) + `(treemacs-root-remote-face ((,class :inherit treemacs-root-face :foreground ,magenta))) + `(treemacs-root-remote-unreadable-face ((,class :inherit treemacs-root-unreadable-face))) + `(treemacs-root-unreadable-face ((,class :inherit treemacs-root-face :strike-through t))) + `(treemacs-tags-face ((,class :foreground ,blue-alt))) + `(treemacs-tags-face ((,class :foreground ,magenta-alt))) +;;;;; tty-menu + `(tty-menu-disabled-face ((,class :background ,bg-alt :foreground ,fg-alt))) + `(tty-menu-enabled-face ((,class :inherit bold :background ,bg-alt :foreground ,fg-main))) + `(tty-menu-selected-face ((,class :inherit modus-themes-intense-blue))) +;;;;; tuareg + `(caml-types-def-face ((,class :inherit modus-themes-subtle-red))) + `(caml-types-expr-face ((,class :inherit modus-themes-subtle-green))) + `(caml-types-occ-face ((,class :inherit modus-themes-subtle-green))) + `(caml-types-scope-face ((,class :inherit modus-themes-subtle-blue))) + `(caml-types-typed-face ((,class :inherit modus-themes-subtle-magenta))) + `(tuareg-font-double-semicolon-face ((,class :inherit font-lock-preprocessor-face))) + `(tuareg-font-lock-attribute-face ((,class :inherit font-lock-function-name-face))) + `(tuareg-font-lock-constructor-face ((,class :foreground ,fg-main))) + `(tuareg-font-lock-error-face ((,class :inherit (modus-themes-intense-red bold)))) + `(tuareg-font-lock-extension-node-face ((,class :background ,bg-alt :foreground ,magenta))) + `(tuareg-font-lock-governing-face ((,class :inherit bold :foreground ,fg-main))) + `(tuareg-font-lock-infix-extension-node-face ((,class :inherit font-lock-function-name-face))) + `(tuareg-font-lock-interactive-directive-face ((,class :foreground ,fg-special-cold))) + `(tuareg-font-lock-interactive-error-face ((,class :inherit error))) + `(tuareg-font-lock-interactive-output-face ((,class :inherit font-lock-constant-face))) + `(tuareg-font-lock-label-face ((,class :inherit font-lock-type-face))) + `(tuareg-font-lock-line-number-face ((,class :foreground ,fg-special-warm))) + `(tuareg-font-lock-module-face ((,class :inherit font-lock-builtin-face))) + `(tuareg-font-lock-multistage-face ((,class :inherit bold :background ,bg-alt :foreground ,blue))) + `(tuareg-font-lock-operator-face ((,class :inherit font-lock-preprocessor-face))) + `(tuareg-opam-error-face ((,class :inherit error))) + `(tuareg-opam-pkg-variable-name-face ((,class :inherit font-lock-variable-name-face))) +;;;;; typescript + `(typescript-jsdoc-tag ((,class :inherit (font-lock-builtin-face font-lock-comment-face) :weight normal))) + `(typescript-jsdoc-type ((,class :inherit (font-lock-type-face font-lock-comment-face) :weight normal))) + `(typescript-jsdoc-value ((,class :inherit (font-lock-constant-face font-lock-comment-face) :weight normal))) +;;;;; 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 :inherit shadow))) + `(undo-tree-visualizer-register-face ((,class :foreground ,magenta-intense))) + `(undo-tree-visualizer-unmodified-face ((,class :foreground ,green-intense))) +;;;;; vc (vc-dir.el, vc-hooks.el) + `(vc-dir-directory ((,class :foreground ,blue))) + `(vc-dir-file ((,class :foreground ,fg-main))) + `(vc-dir-header ((,class :foreground ,cyan-alt-other))) + `(vc-dir-header-value ((,class :foreground ,magenta-alt-other))) + `(vc-dir-mark-indicator ((,class :foreground ,blue-alt-other))) + `(vc-dir-status-edited ((,class :foreground ,yellow))) + `(vc-dir-status-ignored ((,class :foreground ,fg-unfocused))) + `(vc-dir-status-up-to-date ((,class :foreground ,cyan))) + `(vc-dir-status-warning ((,class :foreground ,red))) + `(vc-conflict-state ((,class :inherit modus-themes-slant :foreground ,red-active))) + `(vc-edited-state ((,class :foreground ,yellow-active))) + `(vc-locally-added-state ((,class :foreground ,cyan-active))) + `(vc-locked-state ((,class :foreground ,blue-active))) + `(vc-missing-state ((,class :inherit modus-themes-slant :foreground ,magenta-active))) + `(vc-needs-update-state ((,class :inherit modus-themes-slant :foreground ,green-active))) + `(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 :inherit modus-themes-diff-added))) + `(vdiff-change-face ((,class :inherit modus-themes-diff-changed))) + `(vdiff-closed-fold-face ((,class :inherit modus-themes-diff-heading))) + `(vdiff-refine-added ((,class :inherit modus-themes-diff-refine-added))) + `(vdiff-refine-changed ((,class :inherit modus-themes-diff-refine-changed))) + `(vdiff-subtraction-face ((,class :inherit modus-themes-diff-removed))) + `(vdiff-target-face ((,class :inherit modus-themes-intense-blue))) +;;;;; vertico + `(vertico-current ((,class :inherit bold :foreground ,fg-main + :background ,@(pcase modus-themes-completions + ('opinionated (list bg-active)) + (_ (list bg-inactive)))))) +;;;;; vimish-fold + `(vimish-fold-fringe ((,class :foreground ,cyan-active))) + `(vimish-fold-mouse-face ((,class :inherit modus-themes-intense-blue))) + `(vimish-fold-overlay ((,class :background ,bg-alt :foreground ,fg-special-cold))) +;;;;; visible-mark + `(visible-mark-active ((,class :background ,blue-intense-bg))) + `(visible-mark-face1 ((,class :background ,cyan-intense-bg))) + `(visible-mark-face2 ((,class :background ,yellow-intense-bg))) + `(visible-mark-forward-face1 ((,class :background ,magenta-intense-bg))) + `(visible-mark-forward-face2 ((,class :background ,green-intense-bg))) +;;;;; visual-regexp + `(vr/group-0 ((,class :inherit modus-themes-intense-blue))) + `(vr/group-1 ((,class :inherit modus-themes-intense-magenta))) + `(vr/group-2 ((,class :inherit modus-themes-intense-green))) + `(vr/match-0 ((,class :inherit modus-themes-refine-yellow))) + `(vr/match-1 ((,class :inherit modus-themes-refine-yellow))) + `(vr/match-separator-face ((,class :inherit (modus-themes-intense-neutral bold)))) +;;;;; volatile-highlights + `(vhl/default-face ((,class :background ,bg-alt :foreground ,blue-nuanced-fg :extend t))) +;;;;; vterm + `(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))) + `(vterm-color-green ((,class :background ,green :foreground ,green))) + `(vterm-color-inverse-video ((,class :background ,bg-main :inverse-video t))) + `(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 "gray65" :foreground "gray65"))) + `(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow))) +;;;;; wcheck-mode + `(wcheck-default-face ((,class :foreground ,red :underline t))) +;;;;; web-mode + `(web-mode-annotation-face ((,class :inherit web-mode-comment-face))) + `(web-mode-annotation-html-face ((,class :inherit web-mode-comment-face))) + `(web-mode-annotation-tag-face ((,class :inherit web-mode-comment-face :underline t))) + `(web-mode-block-attr-name-face ((,class :inherit font-lock-constant-face))) + `(web-mode-block-attr-value-face ((,class :inherit font-lock-type-face))) + `(web-mode-block-comment-face ((,class :inherit web-mode-comment-face))) + `(web-mode-block-control-face ((,class :inherit font-lock-builtin-face))) + `(web-mode-block-delimiter-face ((,class :foreground ,fg-main))) + `(web-mode-block-face ((,class :background ,bg-dim))) + `(web-mode-block-string-face ((,class :inherit web-mode-string-face))) + `(web-mode-bold-face ((,class :inherit bold))) + `(web-mode-builtin-face ((,class :inherit font-lock-builtin-face))) + `(web-mode-comment-face ((,class :inherit font-lock-comment-face))) + `(web-mode-comment-keyword-face ((,class :inherit font-lock-warning-face))) + `(web-mode-constant-face ((,class :inherit font-lock-constant-face))) + `(web-mode-css-at-rule-face ((,class :inherit font-lock-constant-face))) + `(web-mode-css-color-face ((,class :inherit font-lock-builtin-face))) + `(web-mode-css-comment-face ((,class :inherit web-mode-comment-face))) + `(web-mode-css-function-face ((,class :inherit font-lock-builtin-face))) + `(web-mode-css-priority-face ((,class :inherit font-lock-warning-face))) + `(web-mode-css-property-name-face ((,class :inherit font-lock-keyword-face))) + `(web-mode-css-pseudo-class-face ((,class :inherit font-lock-doc-face))) + `(web-mode-css-selector-face ((,class :inherit font-lock-keyword-face))) + `(web-mode-css-string-face ((,class :inherit web-mode-string-face))) + `(web-mode-css-variable-face ((,class :foreground ,fg-special-warm))) + `(web-mode-current-column-highlight-face ((,class :background ,bg-alt))) + `(web-mode-current-element-highlight-face ((,class :inherit modus-themes-special-mild))) + `(web-mode-doctype-face ((,class :inherit modus-themes-slant :foreground ,fg-special-cold))) + `(web-mode-error-face ((,class :inherit modus-themes-intense-red))) + `(web-mode-filter-face ((,class :inherit font-lock-function-name-face))) + `(web-mode-folded-face ((,class :underline t))) + `(web-mode-function-call-face ((,class :inherit font-lock-function-name-face))) + `(web-mode-function-name-face ((,class :inherit font-lock-function-name-face))) + `(web-mode-html-attr-custom-face ((,class :inherit font-lock-variable-name-face))) + `(web-mode-html-attr-engine-face ((,class :foreground ,fg-main))) + `(web-mode-html-attr-equal-face ((,class :foreground ,fg-main))) + `(web-mode-html-attr-name-face ((,class :inherit font-lock-variable-name-face))) + `(web-mode-html-attr-value-face ((,class :inherit font-lock-constant-face))) + `(web-mode-html-entity-face ((,class :inherit font-lock-negation-char-face))) + `(web-mode-html-tag-bracket-face ((,class :foreground ,fg-dim))) + `(web-mode-html-tag-custom-face ((,class :inherit font-lock-function-name-face))) + `(web-mode-html-tag-face ((,class :inherit font-lock-function-name-face))) + `(web-mode-html-tag-namespaced-face ((,class :inherit font-lock-builtin-face))) + `(web-mode-html-tag-unclosed-face ((,class :inherit error :underline t))) + `(web-mode-inlay-face ((,class :background ,bg-alt))) + `(web-mode-italic-face ((,class :inherit italic))) + `(web-mode-javascript-comment-face ((,class :inherit web-mode-comment-face))) + `(web-mode-javascript-string-face ((,class :inherit web-mode-string-face))) + `(web-mode-json-comment-face ((,class :inherit web-mode-comment-face))) + `(web-mode-json-context-face ((,class :inherit font-lock-builtin-face))) + `(web-mode-json-key-face ((,class :foreground ,blue-nuanced-fg))) + `(web-mode-json-string-face ((,class :inherit web-mode-string-face))) + `(web-mode-jsx-depth-1-face ((,class :background ,blue-intense-bg :foreground ,fg-main))) + `(web-mode-jsx-depth-2-face ((,class :background ,blue-subtle-bg :foreground ,fg-main))) + `(web-mode-jsx-depth-3-face ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) + `(web-mode-jsx-depth-4-face ((,class :background ,bg-alt :foreground ,blue-refine-fg))) + `(web-mode-jsx-depth-5-face ((,class :background ,bg-alt :foreground ,blue-nuanced-fg))) + `(web-mode-keyword-face ((,class :inherit :inherit font-lock-keyword-face))) + `(web-mode-param-name-face ((,class :inherit font-lock-function-name-face))) + `(web-mode-part-comment-face ((,class :inherit web-mode-comment-face))) + `(web-mode-part-face ((,class :inherit web-mode-block-face))) + `(web-mode-part-string-face ((,class :inherit web-mode-string-face))) + `(web-mode-preprocessor-face ((,class :inherit font-lock-preprocessor-face))) + `(web-mode-script-face ((,class :inherit web-mode-part-face))) + `(web-mode-sql-keyword-face ((,class :inherit font-lock-negation-char-face))) + `(web-mode-string-face ((,class :inherit font-lock-string-face))) + `(web-mode-style-face ((,class :inherit web-mode-part-face))) + `(web-mode-symbol-face ((,class :inherit font-lock-constant-face))) + `(web-mode-type-face ((,class :inherit font-lock-builtin-face))) + `(web-mode-underline-face ((,class :underline t))) + `(web-mode-variable-name-face ((,class :inherit font-lock-variable-name-face))) + `(web-mode-warning-face ((,class :inherit font-lock-warning-face))) + `(web-mode-whitespace-face ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) +;;;;; wgrep + `(wgrep-delete-face ((,class :inherit modus-themes-refine-yellow))) + `(wgrep-done-face ((,class :inherit modus-themes-refine-blue))) + `(wgrep-face ((,class :inherit modus-themes-refine-green))) + `(wgrep-file-face ((,class :foreground ,fg-special-warm))) + `(wgrep-reject-face ((,class :inherit (modus-themes-intense-red bold)))) +;;;;; which-function-mode + `(which-func ((,class :foreground ,magenta-active))) +;;;;; which-key + `(which-key-command-description-face ((,class :foreground ,fg-main))) + `(which-key-group-description-face ((,class :foreground ,magenta-alt))) + `(which-key-highlighted-command-face ((,class :foreground ,yellow :underline t))) + `(which-key-key-face ((,class :inherit modus-themes-key-binding))) + `(which-key-local-map-description-face ((,class :foreground ,fg-main))) + `(which-key-note-face ((,class :foreground ,fg-special-warm))) + `(which-key-separator-face ((,class :inherit shadow))) + `(which-key-special-key-face ((,class :inherit bold :foreground ,orange-intense))) +;;;;; whitespace-mode + `(whitespace-big-indent ((,class :inherit modus-themes-subtle-red))) + `(whitespace-empty ((,class :inherit modus-themes-intense-magenta))) + `(whitespace-hspace ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) + `(whitespace-indentation ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) + `(whitespace-line ((,class :inherit modus-themes-subtle-yellow))) + `(whitespace-newline ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) + `(whitespace-space ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) + `(whitespace-space-after-tab ((,class :inherit modus-themes-subtle-magenta))) + `(whitespace-space-before-tab ((,class :inherit modus-themes-subtle-cyan))) + `(whitespace-tab ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) + `(whitespace-trailing ((,class :inherit modus-themes-intense-red))) +;;;;; window-divider-mode + `(window-divider ((,class :foreground ,fg-window-divider-inner))) + `(window-divider-first-pixel ((,class :foreground ,fg-window-divider-outer))) + `(window-divider-last-pixel ((,class :foreground ,fg-window-divider-outer))) +;;;;; winum + `(winum-face ((,class :inherit modus-themes-bold :foreground ,cyan-active))) +;;;;; writegood-mode + `(writegood-duplicates-face ((,class :background ,bg-alt :foreground ,red-alt :underline t))) + `(writegood-passive-voice-face ((,class :inherit modus-themes-lang-warning))) + `(writegood-weasels-face ((,class :inherit modus-themes-lang-error))) +;;;;; woman + `(woman-addition ((,class :foreground ,magenta-alt-other))) + `(woman-bold ((,class :inherit bold :foreground ,magenta))) + `(woman-italic ((,class :inherit italic :foreground ,cyan))) + `(woman-unknown ((,class :inherit italic :foreground ,yellow))) +;;;;; xah-elisp-mode + `(xah-elisp-at-symbol ((,class :inherit font-lock-warning-face))) + `(xah-elisp-cap-variable ((,class :inherit font-lock-preprocessor-face))) + `(xah-elisp-command-face ((,class :inherit font-lock-type-face))) + `(xah-elisp-dollar-symbol ((,class :inherit font-lock-variable-name-face))) +;;;;; xref + `(xref-file-header ((,class :inherit bold :foreground ,fg-special-cold))) + `(xref-line-number ((,class :inherit shadow))) + `(xref-match ((,class :inherit match))) +;;;;; yaml-mode + `(yaml-tab-face ((,class :inherit modus-themes-intense-red))) +;;;;; yasnippet + `(yas-field-highlight-face ((,class :background ,bg-hl-alt-intense))) +;;;;; ztree + `(ztreep-arrow-face ((,class :foreground ,fg-inactive))) + `(ztreep-diff-header-face ((,class :inherit bold :height 1.2 :foreground ,fg-special-cold))) + `(ztreep-diff-header-small-face ((,class :foreground ,fg-main))) + `(ztreep-diff-model-add-face ((,class :foreground ,@(modus-themes--diff-deuteran blue green)))) + `(ztreep-diff-model-diff-face ((,class :foreground ,red))) + `(ztreep-diff-model-ignored-face ((,class :inherit shadow :strike-through t))) + `(ztreep-diff-model-normal-face ((,class :inherit shadow))) + `(ztreep-expand-sign-face ((,class :inherit ztreep-arrow-face))) + `(ztreep-header-face ((,class :inherit bold :height 1.2 :foreground ,fg-special-cold))) + `(ztreep-leaf-face ((,class :foreground ,cyan))) + `(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm))) + `(ztreep-node-face ((,class :foreground ,fg-main)))) + "Face specs for use with `modus-themes-theme'.") + +(defconst modus-themes-custom-variables + '( +;;;; ansi-colors + `(ansi-color-faces-vector [default bold shadow italic underline success warning error]) + `(ansi-color-names-vector ["gray35" ,red ,green ,yellow ,blue ,magenta ,cyan "gray65"]) +;;;; awesome-tray + `(awesome-tray-mode-line-active-color ,blue) + `(awesome-tray-mode-line-inactive-color ,bg-active) +;;;; exwm + `(exwm-floating-border-color ,fg-window-divider-inner) +;;;; flymake fringe indicators + `(flymake-error-bitmap '(flymake-double-exclamation-mark modus-themes-fringe-red)) + `(flymake-warning-bitmap '(exclamation-mark modus-themes-fringe-yellow)) + `(flymake-note-bitmap '(exclamation-mark modus-themes-fringe-cyan)) +;;;; ibuffer + `(ibuffer-deletion-face 'modus-themes-mark-del) + `(ibuffer-filter-group-name-face 'modus-themes-pseudo-header) + `(ibuffer-marked-face 'modus-themes-mark-sel) + `(ibuffer-title-face 'default) +;;;; highlight-tail + `(highlight-tail-colors + '((,green-subtle-bg . 0) + (,cyan-subtle-bg . 20))) +;;;; hl-todo + `(hl-todo-keyword-faces + '(("HOLD" . ,yellow-alt) + ("TODO" . ,magenta) + ("NEXT" . ,magenta-alt-other) + ("THEM" . ,magenta-alt) + ("PROG" . ,cyan) + ("OKAY" . ,cyan-alt) + ("DONT" . ,green-alt) + ("FAIL" . ,red) + ("BUG" . ,red) + ("DONE" . ,green) + ("NOTE" . ,yellow-alt-other) + ("KLUDGE" . ,yellow) + ("HACK" . ,yellow) + ("TEMP" . ,red-nuanced-fg) + ("FIXME" . ,red-alt-other) + ("XXX+" . ,red-alt) + ("REVIEW" . ,cyan-alt-other) + ("DEPRECATED" . ,blue-nuanced-fg))) +;;;; pdf-tools + `(pdf-view-midnight-colors + '(,fg-main . ,bg-dim)) +;;;; vc-annotate (C-x v g) + `(vc-annotate-background nil) + `(vc-annotate-background-mode nil) + `(vc-annotate-color-map + '((20 . ,red) + (40 . ,magenta) + (60 . ,magenta-alt) + (80 . ,red-alt) + (100 . ,yellow) + (120 . ,yellow-alt) + (140 . ,fg-special-warm) + (160 . ,fg-special-mild) + (180 . ,green) + (200 . ,green-alt) + (220 . ,cyan-alt-other) + (240 . ,cyan-alt) + (260 . ,cyan) + (280 . ,fg-special-cold) + (300 . ,blue) + (320 . ,blue-alt) + (340 . ,blue-alt-other) + (360 . ,magenta-alt-other))) + `(vc-annotate-very-old-color nil) +;;;; xterm-color + `(xterm-color-names ["black" ,red ,green ,yellow ,blue ,magenta ,cyan "gray65"]) + `(xterm-color-names-bright ["gray35" ,red-alt ,green-alt ,yellow-alt ,blue-alt ,magenta-alt ,cyan-alt "white"]) + (if (or (eq modus-themes-org-blocks 'tinted-background) + (eq modus-themes-org-blocks 'rainbow)) + `(org-src-block-faces ; TODO this list should be expanded + `(("emacs-lisp" modus-themes-nuanced-magenta) + ("elisp" modus-themes-nuanced-magenta) + ("clojure" modus-themes-nuanced-magenta) + ("clojurescript" modus-themes-nuanced-magenta) + ("c" modus-themes-nuanced-blue) + ("c++" modus-themes-nuanced-blue) + ("sh" modus-themes-nuanced-green) + ("shell" modus-themes-nuanced-green) + ("html" modus-themes-nuanced-yellow) + ("xml" modus-themes-nuanced-yellow) + ("css" modus-themes-nuanced-red) + ("scss" modus-themes-nuanced-red) + ("python" modus-themes-nuanced-green) + ("ipython" modus-themes-nuanced-magenta) + ("r" modus-themes-nuanced-cyan) + ("yaml" modus-themes-nuanced-cyan) + ("conf" modus-themes-nuanced-cyan) + ("docker" modus-themes-nuanced-cyan))) + `(org-src-block-faces '()))) + "Custom variables for `modus-themes-theme'.") + +;;;###autoload +(when load-file-name + (let ((dir (file-name-directory load-file-name))) + (unless (equal dir (expand-file-name "themes/" data-directory)) + (add-to-list 'custom-theme-load-path dir)))) + +(provide 'modus-themes) + +;; Local Variables: +;; time-stamp-start: "Last-Modified:[ \t]+\\\\?[\"<]" +;; time-stamp-end: "\\\\?[\">]" +;; time-stamp-format: "%Y-%02m-%02d %02H:%02M:%02S %5z" +;; End: + +;;; modus-themes.el ends here diff --git a/etc/themes/modus-vivendi-theme.el b/etc/themes/modus-vivendi-theme.el index 6e71e8d8e3a..6ff359d341b 100644 --- a/etc/themes/modus-vivendi-theme.el +++ b/etc/themes/modus-vivendi-theme.el @@ -1,4666 +1,72 @@ ;;; modus-vivendi-theme.el --- Accessible dark theme (WCAG AAA) -*- lexical-binding:t -*- -;; Copyright (C) 2019-2021 Free Software Foundation, Inc. +;; Copyright (C) 2019-2021 Free Software Foundation, Inc. ;; Author: Protesilaos Stavrou <info@protesilaos.com> ;; URL: https://gitlab.com/protesilaos/modus-themes -;; Version: 0.13.0 +;; Version: 1.5.0 ;; Package-Requires: ((emacs "26.1")) ;; Keywords: faces, theme, accessibility ;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or +;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. +;; the Free Software Foundation, either version 3 of the License, or (at +;; your option) any later version. ;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: ;; -;; This theme is designed for colour-contrast accessibility. +;; Modus Vivendi is the dark variant of the Modus themes (Modus Operandi +;; is the light one). The themes are designed for color-contrast +;; accessibility. More specifically: ;; -;; 1. Provide a consistent minimum contrast ratio between background and -;; foreground values of 7:1 or higher. This meets the highest such -;; accessibility criterion per the guidelines of the Worldwide Web -;; Consortium's Working Group on Accessibility (WCAG AAA standard). +;; 1. Provide a consistent minimum contrast ratio between background +;; and foreground values of 7:1 or higher. This meets the highest +;; such accessibility criterion per the guidelines of the Worldwide +;; Web Consortium's Working Group on Accessibility (WCAG AAA +;; standard). ;; -;; 2. Offer as close to full face coverage as possible. The list is -;; already quite long (see further below), with more additions to follow -;; as part of the ongoing development process. +;; 2. Offer as close to full face coverage as possible. The list is +;; already quite long, with more additions to follow as part of the +;; ongoing development process. ;; -;; The theme provides the following customisation options, all of which -;; are disabled by default: +;; For a complete view of the project, also refer to the following files +;; (should be distributed in the same repository/directory as the +;; current item): ;; -;; modus-vivendi-theme-slanted-constructs (boolean) -;; modus-vivendi-theme-bold-constructs (boolean) -;; modus-vivendi-theme-variable-pitch-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-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) -;; -;; The default scale is as follows (it can be customised as well): -;; -;; 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 -;; -;; What follows is the list of explicitly supported packages or face -;; groups (there are implicitly supported packages as well, which -;; inherit from font-lock or some basic group). You are encouraged to -;; notify me of any missing package or change you would like to see. -;; -;; ace-window -;; ag -;; alert -;; all-the-icons -;; annotate -;; anzu -;; apropos -;; apt-sources-list -;; artbollocks-mode -;; auctex and TeX -;; auto-dim-other-buffers -;; avy -;; awesome-tray -;; binder -;; bm -;; bongo -;; boon -;; breakpoint (provided by built-in gdb-mi.el) -;; buffer-expose -;; calendar and diary -;; calfw -;; centaur-tabs -;; change-log and log-view (`vc-print-log' and `vc-print-root-log') -;; cider -;; circe -;; color-rg -;; column-enforce-mode -;; company-mode -;; company-posframe -;; compilation-mode -;; completions -;; counsel -;; counsel-css -;; counsel-notmuch -;; counsel-org-capture-string -;; cov -;; cperl-mode -;; csv-mode -;; ctrlf -;; custom (M-x customize) -;; dap-mode -;; dashboard (emacs-dashboard) -;; deadgrep -;; debbugs -;; define-word -;; deft -;; dictionary -;; diff-hl -;; diff-mode -;; dim-autoload -;; dir-treeview -;; dired -;; dired-async -;; dired-git -;; dired-git-info -;; dired-narrow -;; dired-subtree -;; diredfl -;; disk-usage -;; doom-modeline -;; dynamic-ruler -;; easy-jekyll -;; easy-kill -;; ebdb -;; ediff -;; eglot -;; el-search -;; eldoc -;; eldoc-box -;; elfeed -;; elfeed-score -;; emms -;; enhanced-ruby-mode -;; epa -;; equake -;; erc -;; eros -;; ert -;; eshell -;; eshell-fringe-status -;; eshell-git-prompt -;; eshell-prompt-extras (epe) -;; eshell-syntax-highlighting -;; evil (evil-mode) -;; evil-goggles -;; evil-visual-mark-mode -;; eww -;; eyebrowse -;; fancy-dabbrev -;; flycheck -;; flycheck-color-mode-line -;; flycheck-indicator -;; flycheck-posframe -;; flymake -;; flyspell -;; flyspell-correct -;; flx -;; freeze-it -;; frog-menu -;; focus -;; fold-this -;; font-lock (generic syntax highlighting) -;; forge -;; fountain (fountain-mode) -;; geiser -;; git-commit -;; git-gutter (and variants) -;; git-lens -;; git-rebase -;; git-timemachine -;; git-walktree -;; gnus -;; golden-ratio-scroll-screen -;; helm -;; helm-ls-git -;; helm-switch-shell -;; helm-xref -;; helpful -;; highlight-blocks -;; highlight-defined -;; highlight-escape-sequences (`hes-mode') -;; highlight-indentation -;; highlight-numbers -;; highlight-symbol -;; highlight-tail -;; highlight-thing -;; hl-defined -;; hl-fill-column -;; hl-line-mode -;; hl-todo -;; hydra -;; hyperlist -;; ibuffer -;; icomplete -;; ido-mode -;; iedit -;; iflipb -;; imenu-list -;; indium -;; info -;; info-colors -;; interaction-log -;; ioccur -;; isearch, occur, etc. -;; ivy -;; ivy-posframe -;; jira (org-jira) -;; journalctl-mode -;; js2-mode -;; julia -;; jupyter -;; kaocha-runner -;; keycast -;; line numbers (`display-line-numbers-mode' and global variant) -;; lsp-mode -;; lsp-ui -;; magit -;; magit-imerge -;; man -;; markdown-mode -;; markup-faces (`adoc-mode') -;; mentor -;; messages -;; minibuffer-line -;; minimap -;; modeline -;; mood-line -;; mpdel -;; mu4e -;; mu4e-conversation -;; multiple-cursors -;; neotree -;; no-emoji -;; notmuch -;; num3-mode -;; nxml-mode -;; objed -;; orderless -;; org -;; org-journal -;; org-noter -;; org-pomodoro -;; org-recur -;; org-roam -;; org-superstar -;; org-table-sticky-header -;; org-treescope -;; origami -;; outline-mode -;; outline-minor-faces -;; package (M-x list-packages) -;; page-break-lines -;; paradox -;; paren-face -;; parrot -;; pass -;; persp-mode -;; perspective -;; phi-grep -;; phi-search -;; pkgbuild-mode -;; pomidor -;; powerline -;; powerline-evil -;; proced -;; prodigy -;; racket-mode -;; rainbow-blocks -;; rainbow-identifiers -;; rainbow-delimiters -;; rcirc -;; regexp-builder (also known as `re-builder') -;; rg -;; ripgrep -;; rmail -;; ruler-mode -;; sallet -;; selectrum -;; semantic -;; sesman -;; shell-script-mode -;; show-paren-mode -;; side-notes -;; skewer-mode -;; smart-mode-line -;; smartparens -;; smerge -;; spaceline -;; speedbar -;; spell-fu -;; stripes -;; suggest -;; switch-window -;; swiper -;; swoop -;; sx -;; symbol-overlay -;; tab-bar-mode -;; tab-line-mode -;; syslog-mode -;; table (built-in table.el) -;; telephone-line -;; term -;; tomatinho -;; transient (pop-up windows like Magit's) -;; trashed -;; treemacs -;; tty-menu -;; tuareg -;; typescript -;; undo-tree -;; vc (built-in mode line status for version control) -;; vc-annotate (C-x v g) -;; vdiff -;; vimish-fold -;; visible-mark -;; visual-regexp -;; volatile-highlights -;; vterm -;; wcheck-mode -;; web-mode -;; wgrep -;; which-function-mode -;; which-key -;; whitespace-mode -;; window-divider-mode -;; winum -;; writegood-mode -;; woman -;; xah-elisp-mode -;; xref -;; xterm-color (and ansi-colors) -;; yaml-mode -;; yasnippet -;; ztree +;; - modus-themes.el (Main code shared between the themes) +;; - modus-operandi-theme.el (Light theme) ;;; Code: -(deftheme modus-vivendi - "Dark theme that conforms with the highest accessibility - standard for colour contrast between background and - foreground elements (WCAG AAA).") - -;;; Custom faces - -;; These faces will be inherited by actual constructs. They are meant -;; for those cases where a face needs to distinguish its output from -;; the rest of the text, such as `isearch' and `occur'… We define -;; these separately in order to combine each colour with its -;; appropriate foreground value. This is to ensure a consistent -;; contrast ratio of >= 7:1. -(defgroup modus-theme () - "Theme that ensures WCAG AAA accessibility (contrast ratio -between foreground and background is >= 7:1)." - :group 'faces - :prefix "modus-theme-" - :link '(url-link :tag "GitLab" "https://gitlab.com/protesilaos/modus-themes") - :tag "Modus Vivendi") - -(defface modus-theme-subtle-red nil nil) -(defface modus-theme-subtle-green nil nil) -(defface modus-theme-subtle-yellow nil nil) -(defface modus-theme-subtle-blue nil nil) -(defface modus-theme-subtle-magenta nil nil) -(defface modus-theme-subtle-cyan nil nil) -(defface modus-theme-subtle-neutral nil nil) -(defface modus-theme-intense-red nil nil) -(defface modus-theme-intense-green nil nil) -(defface modus-theme-intense-yellow nil nil) -(defface modus-theme-intense-blue nil nil) -(defface modus-theme-intense-magenta nil nil) -(defface modus-theme-intense-cyan nil nil) -(defface modus-theme-intense-neutral nil nil) -(defface modus-theme-refine-red nil nil) -(defface modus-theme-refine-green nil nil) -(defface modus-theme-refine-yellow nil nil) -(defface modus-theme-refine-blue nil nil) -(defface modus-theme-refine-magenta nil nil) -(defface modus-theme-refine-cyan nil nil) -(defface modus-theme-active-red nil nil) -(defface modus-theme-active-green nil nil) -(defface modus-theme-active-yellow nil nil) -(defface modus-theme-active-blue nil nil) -(defface modus-theme-active-magenta nil nil) -(defface modus-theme-active-cyan nil nil) -(defface modus-theme-fringe-red nil nil) -(defface modus-theme-fringe-green nil nil) -(defface modus-theme-fringe-yellow nil nil) -(defface modus-theme-fringe-blue nil nil) -(defface modus-theme-fringe-magenta nil nil) -(defface modus-theme-fringe-cyan nil nil) -(defface modus-theme-nuanced-red nil nil) -(defface modus-theme-nuanced-green nil nil) -(defface modus-theme-nuanced-yellow nil nil) -(defface modus-theme-nuanced-blue nil nil) -(defface modus-theme-nuanced-magenta nil nil) -(defface modus-theme-nuanced-cyan nil nil) -(defface modus-theme-special-cold nil nil) -(defface modus-theme-special-mild nil nil) -(defface modus-theme-special-warm nil nil) -(defface modus-theme-special-calm nil nil) -(defface modus-theme-diff-added nil nil) -(defface modus-theme-diff-changed nil nil) -(defface modus-theme-diff-removed nil nil) -(defface modus-theme-diff-refine-added nil nil) -(defface modus-theme-diff-refine-changed nil nil) -(defface modus-theme-diff-refine-removed nil nil) -(defface modus-theme-diff-focus-added nil nil) -(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-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 - -;; User-facing customisation options. They are all deactivated by -;; default (users must opt in). -(defcustom modus-vivendi-theme-slanted-constructs nil - "Use slanted text in more code constructs (italics or oblique)." - :type 'boolean) - -(defcustom modus-vivendi-theme-bold-constructs nil - "Use bold text in more code constructs." - :type 'boolean) - -(define-obsolete-variable-alias 'modus-vivendi-theme-proportional-fonts - 'modus-vivendi-theme-variable-pitch-headings "`modus-vivendi-theme' 0.11.0") - -(defcustom modus-vivendi-theme-proportional-fonts nil - "Use proportional fonts (variable-pitch) in headings." - :type 'boolean) - -(defcustom modus-vivendi-theme-variable-pitch-headings nil - "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) - -(defcustom modus-vivendi-theme-scale-1 1.05 - "Font size that is slightly larger than the base value. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(defcustom modus-vivendi-theme-scale-2 1.1 - "Font size slightly larger than `modus-vivendi-theme-scale-1'. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(defcustom modus-vivendi-theme-scale-3 1.15 - "Font size slightly larger than `modus-vivendi-theme-scale-2'. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(defcustom modus-vivendi-theme-scale-4 1.2 - "Font size slightly larger than `modus-vivendi-theme-scale-3'. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(defcustom modus-vivendi-theme-scale-5 1.3 - "Font size slightly larger than `modus-vivendi-theme-scale-4'. -The default is a floating point that is interpreted as a multiple -of the base font size. However, the variable also accepts an -integer, understood as an absolute height (e.g. a value of 140 is -the same as setting the font at 14 point size). - -For more on the matter, read the documentation of -`set-face-attribute', specifically the ':height' section." - :type 'number) - -(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." - :type 'boolean) - -(defcustom modus-vivendi-theme-fringes nil - "Define the visibility of fringes. - -Nil means the fringes have no background colour. Option `subtle' -will apply a greyscale value that is visible yet close to the -main buffer background colour. Option `intense' will use a more -pronounced greyscale value." - :type '(choice - (const :tag "No visible fringes (default)" nil) - (const :tag "Subtle greyscale background" subtle) - (const :tag "Intense greyscale background" intense))) - -(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) - -(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. -The colour in use depends on the language (send feedback to -include more languages)." - :type 'boolean) - -(defcustom modus-vivendi-theme-org-blocks nil - "Use a subtle grey or colour-coded background for Org blocks. - -Nil means that the block will have no background of its own and -will use the default that applies to the rest of the buffer. - -Option `greyscale' will apply a subtle neutral grey background to -the block's contents. It also affects the begin and end lines of -the block: their background will be extended to the edge of the -window for Emacs version >= 27 where the ':extend' keyword is -recognised by `set-face-attribute'. - -Option `rainbow' will use an accented background for the contents -of the block. The exact colour will depend on the programming -language and is controlled by the `org-src-block-faces' -variable (refer to the theme's source code for the current -association list)." - :type '(choice - (const :tag "No Org block background (default)" nil) - (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) - -(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." - :type 'boolean) - -(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. - -Nil means to remain faithful to the metaphors that each UI -establishes. For example, Icomplete and Ido only use foreground -colours to style their matches, whereas Ivy or Helm rely on an -aesthetic that combines coloured backgrounds with appropriate -text colour. - -Option `moderate' will apply a combination of background and -foreground that is fairly subtle. For Icomplete and the like, -this constitutes a departure from their standard style. While -Ivy, Helm, and the others, will use less pronounced colours for -applicable contexts. - -Option `opinionated' will apply colour combinations that -refashion the completion UI. So Icomplete et al will now use -styles that resemble the defaults of Ivy and co., while the -latter group will revert to an even more nuanced aesthetic." - :type '(choice - (const :tag "Respect the framework's established aesthetic (default)" nil) - (const :tag "Subtle backgrounds for various elements" moderate) - (const :tag "Radical alternative to the framework's looks" opinionated))) - -(defcustom modus-vivendi-theme-prompts nil - "Use subtle or intense styles for minibuffer and REPL prompts. - -Nil means to only use an accented foreground colour. - -Options `subtle' and `intense' will change both the background -and the foreground values. The latter has a more pronounced -effect than the former." - :type '(choice - (const :tag "No prompt background (default)" nil) - (const :tag "Subtle accented background for the prompt" subtle) - (const :tag "Intense background and foreground for the prompt" intense))) - -(defcustom modus-vivendi-theme-intense-hl-line nil - "Use more prominent background for command `hl-line-mode'." - :type 'boolean) - -(defcustom modus-vivendi-theme-intense-paren-match nil - "Use more prominent colour for parenthesis matching." - :type 'boolean) - -(defcustom modus-vivendi-theme-faint-syntax nil - "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 -;; above customisation options. -(defun modus-vivendi-theme-bold-weight () - "Conditional use of a heavier text weight." - (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 -more pronounced greyscale colour." - (pcase modus-vivendi-theme-fringes - ('intense (list :background intensebg)) - ('subtle (list :background subtlebg)) - (_ (list :background nil)))) - -(defun modus-vivendi-theme-prompt (mainfg subtlebg subtlefg intensebg intensefg) - "Conditional use of background colours for prompts. -MAINFG is the prompt's standard foreground. SUBTLEBG should be a -subtle accented background that works with SUBTLEFG. INTENSEBG -must be a more pronounced accented colour that should be -combinable with INTENSEFG." - (pcase modus-vivendi-theme-prompts - ('intense (list :background intensebg :foreground intensefg)) - ('subtle (list :background subtlebg :foreground subtlefg)) - (_ (list :background nil :foreground mainfg)))) - -(defun modus-vivendi-theme-paren (normalbg intensebg) - "Conditional use of intense colours for matching parentheses. -NORMALBG should the special palette colour 'bg-paren-match' or -something similar. INTENSEBG must be easier to discern next to -other backgrounds, such as the special palette colour -'bg-paren-match-intense'." - (if modus-vivendi-theme-intense-paren-match - (list :background intensebg) - (list :background normalbg))) - -(defun modus-vivendi-theme-syntax-foreground (normal faint) - "Apply foreground value to code syntax. -NORMAL is the more saturated colour, which should be the default. -FAINT is the less saturated colour." - (if modus-vivendi-theme-faint-syntax - (list :foreground faint) - (list :foreground normal))) - -(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'. - -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. -BGBLK applies to a distinct neutral background. Else blocks have -no background of their own (the default), so they look the same -as the rest of the buffer. - -`modus-vivendi-theme-org-blocks' also accepts a `rainbow' option -which is applied conditionally to `org-src-block-faces' (see the -theme's source code)." - (if (eq modus-vivendi-theme-org-blocks 'greyscale) - (append - (and (>= emacs-major-version 27) '(:extend t)) - (list :background bgblk)) - (list :background nil))) - -(defun modus-vivendi-theme-org-block-delim (bgaccent fgaccent bg fg) - "Conditionally set the styles of Org block delimiters. -BG, FG, BGACCENT, FGACCENT apply a background and foreground -colour respectively. - -The former pair is a greyscale combination that should be more -distinct than the background of the block. It is applied to the -default styles or when `modus-vivendi-theme-org-blocks' is set -to `greyscale'. - -The latter pair should be more subtle than the background of the -block, as it is used when `modus-vivendi-theme-org-blocks' is -set to `rainbow'." - (pcase modus-vivendi-theme-org-blocks - ('greyscale (append (and (>= emacs-major-version 27) '(:extend t)) - (list :background bg :foreground fg))) - ('rainbow (list :background bgaccent :foreground fgaccent)) - (_ (list :background bg :foreground 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'. - -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. - -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)) - (_ (list :foreground mainfg)))) - -(defun modus-vivendi-theme-extra-completions (subtleface intenseface altface &optional altfg bold) - "Combinations for `modus-vivendi-theme-completions'. - -SUBTLEFACE and INTENSEFACE are custom theme faces that combine a -background and foreground value. The difference between the two -is a matter of degree. - -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. - -These are intended for Helm, Ivy, etc." - (pcase modus-vivendi-theme-completions - ('opinionated (list :inherit (list altface bold) - :foreground (or altfg 'unspecified))) - ('moderate (list :inherit (list subtleface bold))) - (_ (list :inherit (list intenseface bold))))) - -(defun modus-vivendi-theme-scale (amount) - "Scale heading by AMOUNT. - -AMOUNT is a customisation option." - (when modus-vivendi-theme-scale-headings - (list :height amount))) - -;;; Colour palette - -;; Define colour palette. Each colour must have a >= 7:1 contrast -;; ratio relative to the foreground/background colour it is rendered -;; against. -;; -;; The design of the colour palette as a macro that maps it to faces is -;; adapted from zenbern-theme.el, last seen at commit 7dd7968: -;; https://github.com/bbatsov/zenburn-emacs (eval-and-compile - (defconst modus-vivendi-theme-default-colors-alist - '(;; base values - ("bg-main" . "#000000") ("fg-main" . "#ffffff") - ("bg-alt" . "#181a20") ("fg-alt" . "#a8a8a8") - ("bg-dim" . "#110b11") ("fg-dim" . "#e0e6f0") - ;; specifically for on/off states (e.g. `mode-line') - ;; - ;; must be combined with themselves - ("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} - ("bg-special-cold" . "#203448") ("fg-special-cold" . "#c6eaff") - ("bg-special-mild" . "#00322e") ("fg-special-mild" . "#bfebe0") - ("bg-special-warm" . "#382f27") ("fg-special-warm" . "#f8dec0") - ("bg-special-calm" . "#392a48") ("fg-special-calm" . "#fbd6f4") - ;; styles for the main constructs - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' - ("red" . "#ff8059") ("green" . "#44bc44") - ("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" . "#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" . "#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 - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' - ("red-faint" . "#ffa0a0") ("green-faint" . "#88cf88") - ("yellow-faint" . "#d2b580") ("blue-faint" . "#92baff") - ("magenta-faint" . "#e0b2d6") ("cyan-faint" . "#a0bfdf") - - ("red-alt-faint" . "#f5aa80") ("green-alt-faint" . "#a8cf88") - ("yellow-alt-faint" . "#cabf77") ("blue-alt-faint" . "#a4b0ff") - ("magenta-alt-faint" . "#ef9fe4") ("cyan-alt-faint" . "#90c4ed") - - ("red-alt-other-faint" . "#ff9fbf") ("green-alt-other-faint" . "#88cfaf") - ("yellow-alt-other-faint" . "#d0ba95") ("blue-alt-other-faint" . "#8fc5ff") - ("magenta-alt-other-faint" . "#d0b4ff") ("cyan-alt-other-faint" . "#a4d0bb") - ;; styles for elements that should be very subtle, yet accented - ;; - ;; must be combined with: `bg-main', `bg-alt', `bg-dim' or any of - ;; the "nuanced" backgrounds - ("red-nuanced" . "#ffcccc") ("green-nuanced" . "#b8e2b8") - ("yellow-nuanced" . "#dfdfb0") ("blue-nuanced" . "#bfd9ff") - ("magenta-nuanced" . "#e5cfef") ("cyan-nuanced" . "#a8e5e5") - ;; styles for slightly accented background - ;; - ;; must be combined with any of the above foreground values - ("red-nuanced-bg" . "#2c0614") ("green-nuanced-bg" . "#001904") - ("yellow-nuanced-bg" . "#221000") ("blue-nuanced-bg" . "#0f0e39") - ("magenta-nuanced-bg" . "#230631") ("cyan-nuanced-bg" . "#041529") - ;; styles for elements that should draw attention to themselves - ;; - ;; must be combined with: `bg-main' - ("red-intense" . "#fb6859") ("green-intense" . "#00fc50") - ("yellow-intense" . "#ffdd00") ("blue-intense" . "#00a2ff") - ("magenta-intense" . "#ff8bd4") ("cyan-intense" . "#30ffc0") - ;; styles for background elements that should be visible yet - ;; subtle - ;; - ;; must be combined with: `fg-dim' - ("red-subtle-bg" . "#762422") ("green-subtle-bg" . "#2f4a00") - ("yellow-subtle-bg" . "#604200") ("blue-subtle-bg" . "#10387c") - ("magenta-subtle-bg" . "#49366e") ("cyan-subtle-bg" . "#00415e") - ;; styles for background elements that should be visible and - ;; distinguishable - ;; - ;; must be combined with: `fg-main' - ("red-intense-bg" . "#a4202a") ("green-intense-bg" . "#006800") - ("yellow-intense-bg" . "#874900") ("blue-intense-bg" . "#2a40b8") - ("magenta-intense-bg" . "#7042a2") ("cyan-intense-bg" . "#005f88") - ;; styles for refined contexts where both the foreground and the - ;; background need to have the same/similar hue - ;; - ;; must be combined with themselves OR the foregrounds can be - ;; combined with any of the base backgrounds - ("red-refine-bg" . "#77002a") ("red-refine-fg" . "#ffb9ab") - ("green-refine-bg" . "#00422a") ("green-refine-fg" . "#9ff0cf") - ("yellow-refine-bg" . "#693200") ("yellow-refine-fg" . "#e2d980") - ("blue-refine-bg" . "#242679") ("blue-refine-fg" . "#8ec6ff") - ("magenta-refine-bg" . "#71206a") ("magenta-refine-fg" . "#ffcaf0") - ("cyan-refine-bg" . "#004065") ("cyan-refine-fg" . "#8ae4f2") - ;; styles that are meant exclusively for the mode line - ;; - ;; must be combined with: `bg-active', `bg-inactive' - ("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 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 - ;; - ;; `bg-paren-match', `bg-paren-match-intense', `bg-region' and - ;; `bg-tab-active' must be combined with `fg-main', while - ;; `bg-tab-inactive' should be combined with `fg-dim' - ;; - ;; `bg-tab-bar' is only intended for the bar that holds the tabs and - ;; can only be combined with `fg-main' - ;; - ;; `fg-tab-active' is meant to be combined with `bg-tab-active', - ;; though only for styling special elements, such as underlining - ;; the current tab - ;; - ;; `fg-escape-char-construct' and `fg-escape-char-backslash' can - ;; be combined `bg-main', `bg-dim', `bg-alt' - ;; - ;; `fg-lang-error', `fg-lang-warning', `fg-lang-note' can be - ;; combined with `bg-main', `bg-dim', `bg-alt' - ;; - ;; `fg-mark-sel', `fg-mark-del', `fg-mark-alt' can be combined - ;; with `bg-main', `bg-dim', `bg-alt', `bg-hl-line' - ;; - ;; `fg-unfocused' must be combined with `fg-main' - ;; - ;; the window divider colours apply to faces with just an fg value - ;; - ;; 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" . "#7416b5") - ("bg-region" . "#3c3c3c") - - ("bg-tab-bar" . "#2c2c2c") - ("bg-tab-active" . "#0e0e0e") - ("bg-tab-inactive" . "#3d3d3d") - ("fg-tab-active" . "#5ac3cf") - - ("fg-escape-char-construct" . "#e7a59a") - ("fg-escape-char-backslash" . "#abab00") + (unless (and (fboundp 'require-theme) + load-file-name + (equal (file-name-directory load-file-name) + (expand-file-name "themes/" data-directory)) + (require-theme 'modus-themes t)) + (require 'modus-themes))) - ("fg-lang-error" . "#ef8690") - ("fg-lang-warning" . "#b0aa00") - ("fg-lang-note" . "#9d9def") - - ("fg-window-divider-inner" . "#646464") - ("fg-window-divider-outer" . "#969696") - - ("fg-unfocused" . "#93959b") - - ("bg-header" . "#212121") ("fg-header" . "#dddddd") - - ("bg-whitespace" . "#170016") ("fg-whitespace" . "#a4959f") - - ("bg-diff-heading" . "#304466") ("fg-diff-heading" . "#dadffe") - ("bg-diff-added" . "#0a280a") ("fg-diff-added" . "#94ba94") - ("bg-diff-changed" . "#2a2000") ("fg-diff-changed" . "#b0ba9f") - ("bg-diff-removed" . "#40160f") ("fg-diff-removed" . "#c6adaa") - - ("bg-diff-refine-added" . "#005a36") ("fg-diff-refine-added" . "#e0f6e0") - ("bg-diff-refine-changed" . "#585800") ("fg-diff-refine-changed" . "#ffffcc") - ("bg-diff-refine-removed" . "#852828") ("fg-diff-refine-removed" . "#ffd9eb") - - ("bg-diff-focus-added" . "#203d20") ("fg-diff-focus-added" . "#b4ddb4") - ("bg-diff-focus-changed" . "#4a3a10") ("fg-diff-focus-changed" . "#d0daaf") - ("bg-diff-focus-removed" . "#5e2526") ("fg-diff-focus-removed" . "#eebdba") - - ("bg-diff-neutral-0" . "#575757") ("fg-diff-neutral-0" . "#fcfcfc") - ("bg-diff-neutral-1" . "#454545") ("fg-diff-neutral-1" . "#dddddd") - ("bg-diff-neutral-2" . "#313131") ("fg-diff-neutral-2" . "#bfbfbf") - - ("bg-mark-sel" . "#002f2f") ("fg-mark-sel" . "#60cfa2") - ("bg-mark-del" . "#5a0000") ("fg-mark-del" . "#ff99aa") - ("bg-mark-alt" . "#3f2210") ("fg-mark-alt" . "#f0aa20")) - "The entire palette of `modus-vivendi-theme'. -Each element has the form (NAME . HEX).") - - (defcustom modus-vivendi-theme-override-colors-alist '() - "Association list of palette colour overrides. -Values can be mapped to variables, using the same syntax as the -one present in `modus-vivendi-theme-default-colors-alist'. - -This is only meant for do-it-yourself usage, with the -understanding that the user is responsible for the resulting -contrast ratio between new and existing colours." - :type '(alist - :key-type (string :tag "Name") - :value-type (string :tag " Hex"))) - - (defmacro modus-vivendi-theme-with-color-variables (&rest body) - "`let' bind all colours around BODY. -Also bind `class' to ((class color) (min-colors 89))." - (declare (indent 0)) - `(let ((class '((class color) (min-colors 89))) - ,@(mapcar (lambda (cons) - (list (intern (car cons)) (cdr cons))) - (append modus-vivendi-theme-default-colors-alist - modus-vivendi-theme-override-colors-alist)) - ;; simple conditional styles that evaluate user-facing - ;; customisation options - (modus-theme-slant - (if modus-vivendi-theme-slanted-constructs 'italic 'normal)) - (modus-theme-variable-pitch - (if modus-vivendi-theme-variable-pitch-headings 'variable-pitch 'default))) - ,@body))) - - - -;;; Faces - -(modus-vivendi-theme-with-color-variables - (custom-theme-set-faces - 'modus-vivendi -;;;; custom faces - ;; these bespoke faces are inherited by other constructs below -;;;;; subtle coloured backgrounds - `(modus-theme-subtle-red ((,class :background ,red-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-green ((,class :background ,green-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-yellow ((,class :background ,yellow-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-blue ((,class :background ,blue-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-magenta ((,class :background ,magenta-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-cyan ((,class :background ,cyan-subtle-bg :foreground ,fg-dim))) - `(modus-theme-subtle-neutral ((,class :background ,bg-inactive :foreground ,fg-inactive))) -;;;;; intense coloured backgrounds - `(modus-theme-intense-red ((,class :background ,red-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-green ((,class :background ,green-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-yellow ((,class :background ,yellow-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-blue ((,class :background ,blue-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-magenta ((,class :background ,magenta-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-cyan ((,class :background ,cyan-intense-bg :foreground ,fg-main))) - `(modus-theme-intense-neutral ((,class :background ,bg-active :foreground ,fg-main))) -;;;;; refined background and foreground combinations - ;; general purpose styles that use an accented foreground against an - ;; accented background - `(modus-theme-refine-red ((,class :background ,red-refine-bg :foreground ,red-refine-fg))) - `(modus-theme-refine-green ((,class :background ,green-refine-bg :foreground ,green-refine-fg))) - `(modus-theme-refine-yellow ((,class :background ,yellow-refine-bg :foreground ,yellow-refine-fg))) - `(modus-theme-refine-blue ((,class :background ,blue-refine-bg :foreground ,blue-refine-fg))) - `(modus-theme-refine-magenta ((,class :background ,magenta-refine-bg :foreground ,magenta-refine-fg))) - `(modus-theme-refine-cyan ((,class :background ,cyan-refine-bg :foreground ,cyan-refine-fg))) -;;;;; "active" combinations, mostly for use on the mode line - `(modus-theme-active-red ((,class :background ,red-active :foreground ,bg-active))) - `(modus-theme-active-green ((,class :background ,green-active :foreground ,bg-active))) - `(modus-theme-active-yellow ((,class :background ,yellow-active :foreground ,bg-active))) - `(modus-theme-active-blue ((,class :background ,blue-active :foreground ,bg-active))) - `(modus-theme-active-magenta ((,class :background ,magenta-active :foreground ,bg-active))) - `(modus-theme-active-cyan ((,class :background ,cyan-active :foreground ,bg-active))) -;;;;; nuanced backgrounds - ;; useful for adding an accented background that is suitable for all - ;; main foreground colours (intended for use in Org source blocks) - `(modus-theme-nuanced-red ((,class :background ,red-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(modus-theme-nuanced-green ((,class :background ,green-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(modus-theme-nuanced-yellow ((,class :background ,yellow-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(modus-theme-nuanced-blue ((,class :background ,blue-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(modus-theme-nuanced-magenta ((,class :background ,magenta-nuanced-bg - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(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-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 - ;; a greyscale value than an accented one - `(modus-theme-special-cold ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) - `(modus-theme-special-mild ((,class :background ,bg-special-mild :foreground ,fg-special-mild))) - `(modus-theme-special-warm ((,class :background ,bg-special-warm :foreground ,fg-special-warm))) - `(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 ,@(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-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-hl-line-intense bg-hl-line) - (and (>= emacs-major-version 27) '(:extend t))))) -;;;; standard faces -;;;;; absolute essentials - `(default ((,class :background ,bg-main :foreground ,fg-main))) - `(cursor ((,class :background ,fg-main))) - `(fringe ((,class ,@(modus-vivendi-theme-fringe bg-inactive bg-active) - :foreground ,fg-main))) - `(vertical-border ((,class :foreground ,fg-window-divider-inner))) -;;;;; basic and/or ungrouped styles - ;; Modify the `bold' face to change the weight of all "bold" elements - ;; defined by the theme. You need a typeface that supports a - ;; multitude of heavier weights than the regular one and then you - ;; must specify the exact name of the one you wish to apply. Example - ;; for your init.el: - ;; - ;; (set-face-attribute 'bold nil :weight 'semibold) - `(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)))) - `(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)))) - `(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))) - `(rectangle-preview ((,class :inherit modus-theme-special-mild))) - `(region ((,class :background ,bg-region :foreground ,fg-main))) - `(secondary-selection ((,class :inherit modus-theme-special-cold))) - `(shadow ((,class :foreground ,fg-alt))) - `(success ((,class :inherit bold :foreground ,green))) - `(trailing-whitespace ((,class :background ,red-intense-bg))) - `(warning ((,class :inherit bold :foreground ,yellow))) -;;;;; buttons, links, widgets - `(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))) - `(widget-documentation ((,class :foreground ,green))) - `(widget-field ((,class :background ,bg-alt :foreground ,fg-dim))) - `(widget-inactive ((,class :background ,bg-inactive :foreground ,fg-inactive))) - `(widget-single-line-field ((,class :inherit widget-field))) -;;;;; ag - `(ag-hit-face ((,class :foreground ,fg-special-cold))) - `(ag-match-face ((,class :inherit modus-theme-special-calm))) -;;;;; alert - `(alert-high-face ((,class :inherit bold :foreground ,red-alt))) - `(alert-low-face ((,class :foreground ,fg-special-mild))) - `(alert-moderate-face ((,class :inherit bold :foreground ,yellow))) - `(alert-trivial-face ((,class :foreground ,fg-special-calm))) - `(alert-urgent-face ((,class :inherit bold :foreground ,red-intense))) -;;;;; all-the-icons - `(all-the-icons-blue ((,class :foreground ,blue))) - `(all-the-icons-blue-alt ((,class :foreground ,blue-alt))) - `(all-the-icons-cyan ((,class :foreground ,cyan))) - `(all-the-icons-cyan-alt ((,class :foreground ,cyan-alt))) - `(all-the-icons-dblue ((,class :foreground ,blue-alt-other))) - `(all-the-icons-dcyan ((,class :foreground ,cyan-alt-other))) - `(all-the-icons-dgreen ((,class :foreground ,green-alt-other))) - `(all-the-icons-dired-dir-face ((,class :foreground ,blue))) - `(all-the-icons-dmaroon ((,class :foreground ,magenta-alt-other))) - `(all-the-icons-dorange ((,class :foreground ,red-alt-other))) - `(all-the-icons-dpink ((,class :foreground ,magenta))) - `(all-the-icons-dpurple ((,class :foreground ,magenta-alt))) - `(all-the-icons-dred ((,class :foreground ,red))) - `(all-the-icons-dsilver ((,class :foreground ,fg-special-cold))) - `(all-the-icons-dyellow ((,class :foreground ,yellow))) - `(all-the-icons-green ((,class :foreground ,green))) - `(all-the-icons-lblue ((,class :foreground ,blue-refine-fg))) - `(all-the-icons-lcyan ((,class :foreground ,cyan-refine-fg))) - `(all-the-icons-lgreen ((,class :foreground ,green-refine-fg))) - `(all-the-icons-lmaroon ((,class :foreground ,magenta-refine-fg))) - `(all-the-icons-lorange ((,class :foreground ,red-refine-fg))) - `(all-the-icons-lpink ((,class :foreground ,magenta-refine-fg))) - `(all-the-icons-lpurple ((,class :foreground ,magenta-refine-fg))) - `(all-the-icons-lred ((,class :foreground ,red-refine-fg))) - `(all-the-icons-lsilver ((,class :foreground ,fg-special-cold))) - `(all-the-icons-lyellow ((,class :foreground ,yellow-refine-fg))) - `(all-the-icons-maroon ((,class :foreground ,magenta))) - `(all-the-icons-orange ((,class :foreground ,red-alt))) - `(all-the-icons-pink ((,class :foreground ,magenta))) - `(all-the-icons-purple ((,class :foreground ,magenta-alt))) - `(all-the-icons-purple-alt ((,class :foreground ,magenta-alt-other))) - `(all-the-icons-red ((,class :foreground ,red))) - `(all-the-icons-red-alt ((,class :foreground ,red-alt))) - `(all-the-icons-silver ((,class :foreground ,fg-special-cold))) - `(all-the-icons-yellow ((,class :foreground ,yellow))) -;;;;; annotate - `(annotate-annotation ((,class :inherit modus-theme-subtle-blue))) - `(annotate-annotation-secondary ((,class :inherit modus-theme-subtle-green))) - `(annotate-highlight ((,class :background ,blue-nuanced-bg :underline ,blue-intense))) - `(annotate-highlight-secondary ((,class :background ,green-nuanced-bg :underline ,green-intense))) -;;;;; anzu - `(anzu-match-1 ((,class :inherit modus-theme-subtle-cyan))) - `(anzu-match-2 ((,class :inherit modus-theme-subtle-green))) - `(anzu-match-3 ((,class :inherit modus-theme-subtle-yellow))) - `(anzu-mode-line ((,class :inherit bold :foreground ,green-active))) - `(anzu-mode-line-no-match ((,class :inherit bold :foreground ,red-active))) - `(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 :inherit button :foreground ,magenta-alt-other))) - `(apropos-keybinding ((,class :inherit bold :foreground ,cyan))) - `(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-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))) - `(apt-sources-list-suite ((,class :foreground ,green))) - `(apt-sources-list-type ((,class :foreground ,magenta))) - `(apt-sources-list-uri ((,class :foreground ,blue))) -;;;;; artbollocks-mode - `(artbollocks-face ((,class :foreground ,cyan-nuanced :underline ,fg-lang-note))) - `(artbollocks-lexical-illusions-face ((,class :background ,bg-alt :foreground ,red-alt :underline t))) - `(artbollocks-passive-voice-face ((,class :foreground ,yellow-nuanced :underline ,fg-lang-warning))) - `(artbollocks-weasel-words-face ((,class :foreground ,red-nuanced :underline ,fg-lang-error))) -;;;;; auctex and Tex - `(font-latex-bold-face ((,class :inherit bold :foreground ,fg-special-calm))) - `(font-latex-doctex-documentation-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(font-latex-doctex-preprocessor-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,red-alt-other))) - `(font-latex-italic-face ((,class :foreground ,fg-special-calm :slant italic))) - `(font-latex-math-face ((,class :foreground ,cyan-alt-other))) - `(font-latex-script-char-face ((,class :foreground ,cyan-alt-other))) - `(font-latex-sectioning-0-face ((,class :inherit ,modus-theme-variable-pitch :foreground ,blue-nuanced))) - `(font-latex-sectioning-1-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,blue-nuanced))) - `(font-latex-sectioning-2-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,blue-nuanced))) - `(font-latex-sectioning-3-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,blue-nuanced))) - `(font-latex-sectioning-4-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,blue-nuanced))) - `(font-latex-sectioning-5-face ((,class :inherit ,modus-theme-variable-pitch :foreground ,blue-nuanced))) - `(font-latex-sedate-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-alt-other))) - `(font-latex-slide-title-face ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,cyan-nuanced - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))) - `(font-latex-string-face ((,class :foreground ,blue-alt))) - `(font-latex-subscript-face ((,class :height 0.95))) - `(font-latex-superscript-face ((,class :height 0.95))) - `(font-latex-verbatim-face ((,class :background ,bg-dim :foreground ,fg-special-mild))) - `(font-latex-warning-face ((,class :foreground ,yellow-alt-other))) - `(tex-match ((,class :foreground ,blue-alt-other))) - `(tex-verbatim ((,class :background ,bg-dim :foreground ,fg-special-mild))) - `(texinfo-heading ((,class :foreground ,magenta))) - `(TeX-error-description-error ((,class :inherit bold :foreground ,red))) - `(TeX-error-description-help ((,class :foreground ,blue))) - `(TeX-error-description-tex-said ((,class :foreground ,blue))) - `(TeX-error-description-warning ((,class :inherit bold :foreground ,yellow))) -;;;;; auto-dim-other-buffers - `(auto-dim-other-buffers-face ((,class :background ,bg-alt))) -;;;;; avy - `(avy-background-face ((,class :background ,bg-dim :foreground ,fg-dim))) - `(avy-goto-char-timer-face ((,class :inherit (modus-theme-intense-yellow bold)))) - `(avy-lead-face ((,class :inherit (modus-theme-intense-magenta bold)))) - `(avy-lead-face-0 ((,class :inherit (modus-theme-intense-blue bold)))) - `(avy-lead-face-1 ((,class :inherit (modus-theme-intense-red bold)))) - `(avy-lead-face-2 ((,class :inherit (modus-theme-intense-green bold)))) -;;;;; aw (ace-window) - `(aw-background-face ((,class :background ,bg-dim :foreground ,fg-dim))) - `(aw-key-face ((,class :inherit bold :foreground ,blue-intense))) - `(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))))) - `(bm-fringe-face ((,class :inherit modus-theme-fringe-yellow))) - `(bm-fringe-persistent-face ((,class :inherit modus-theme-fringe-blue))) - `(bm-persistent-face ((,class :inherit modus-theme-intense-blue - ,@(and (>= emacs-major-version 27) '(:extend t))))) -;;;;; bongo - `(bongo-album-title ((,class :foreground ,cyan-active))) - `(bongo-artist ((,class :foreground ,magenta-active))) - `(bongo-currently-playing-track ((,class :inherit bold))) - `(bongo-elapsed-track-part ((,class :inherit modus-theme-subtle-magenta :underline t))) - `(bongo-filled-seek-bar ((,class :background ,blue-subtle-bg :foreground ,fg-main))) - `(bongo-marked-track ((,class :foreground ,fg-mark-alt))) - `(bongo-marked-track-line ((,class :background ,bg-mark-alt))) - `(bongo-played-track ((,class :foreground ,fg-unfocused :strike-through t))) - `(bongo-track-length ((,class :foreground ,blue-alt-other))) - `(bongo-track-title ((,class :foreground ,blue-active))) - `(bongo-unfilled-seek-bar ((,class :background ,blue-nuanced-bg :foreground ,fg-main))) -;;;;; boon - `(boon-modeline-cmd ((,class :inherit modus-theme-active-blue))) - `(boon-modeline-ins ((,class :inherit modus-theme-active-red))) - `(boon-modeline-off ((,class :inherit modus-theme-active-yellow))) - `(boon-modeline-spc ((,class :inherit modus-theme-active-green))) -;;;;; breakpoint (built-in gdb-mi.el) - `(breakpoint-disabled ((,class :foreground ,fg-alt))) - `(breakpoint-enabled ((,class :inherit bold :foreground ,red))) -;;;;; buffer-expose - `(buffer-expose-ace-char-face ((,class :inherit bold :foreground ,red-active))) - `(buffer-expose-mode-line-face ((,class :foreground ,cyan-active))) - `(buffer-expose-selected-face ((,class :inherit modus-theme-special-mild))) -;;;;; calendar and diary - `(calendar-month-header ((,class :inherit bold :foreground ,fg-main))) - `(calendar-today ((,class :underline t))) - `(calendar-weekday-header ((,class :foreground ,fg-dim))) - `(calendar-weekend-header ((,class :foreground ,fg-alt))) - `(diary ((,class :foreground ,cyan-alt-other))) - `(diary-anniversary ((,class :foreground ,red-alt-other))) - `(diary-time ((,class :foreground ,blue-alt))) - `(holiday ((,class :foreground ,magenta-alt))) -;;;;; calfw - `(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 :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 :foreground ,cyan-alt-other))) - `(cfw:face-select ((,class :inherit modus-theme-intense-blue))) - `(cfw:face-sunday ((,class :inherit bold :foreground ,cyan-alt-other))) - `(cfw:face-title ((,class :inherit ,modus-theme-variable-pitch - :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))) - `(centaur-tabs-close-selected ((,class :inherit centaur-tabs-selected))) - `(centaur-tabs-close-unselected ((,class :inherit centaur-tabs-unselected))) - `(centaur-tabs-modified-marker-selected ((,class :inherit centaur-tabs-selected))) - `(centaur-tabs-modified-marker-unselected ((,class :inherit centaur-tabs-unselected))) - `(centaur-tabs-default ((,class :background ,bg-main :foreground ,bg-main))) - `(centaur-tabs-selected ((,class :inherit bold :background ,bg-tab-active :foreground ,fg-main))) - `(centaur-tabs-selected-modified ((,class :background ,bg-tab-active :foreground ,fg-main :slant italic))) - `(centaur-tabs-unselected ((,class :background ,bg-tab-inactive :foreground ,fg-dim))) - `(centaur-tabs-unselected-modified ((,class :background ,bg-tab-inactive :foreground ,fg-dim :slant italic))) -;;;;; change-log and log-view (`vc-print-log' and `vc-print-root-log') - `(change-log-acknowledgment ((,class :foreground ,fg-alt))) - `(change-log-conditionals ((,class :foreground ,magenta-alt))) - `(change-log-date ((,class :foreground ,cyan-alt-other))) - `(change-log-email ((,class :foreground ,cyan))) - `(change-log-file ((,class :foreground ,blue))) - `(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 :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))) -;;;;; cider - `(cider-debug-code-overlay-face ((,class :background ,bg-alt))) - `(cider-debug-prompt-face ((,class :foreground ,magenta-alt :underline t))) - `(cider-deprecated-face ((,class :inherit modus-theme-refine-yellow))) - `(cider-docview-emphasis-face ((,class :foreground ,fg-special-cold :slant italic))) - `(cider-docview-literal-face ((,class :foreground ,blue-alt))) - `(cider-docview-strong-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(cider-docview-table-border-face ((,class :foreground ,fg-alt))) - `(cider-enlightened-face ((,class :box (:line-width -1 :color ,yellow-alt :style nil) :background ,bg-dim))) - `(cider-enlightened-local-face ((,class :inherit bold :foreground ,yellow-alt-other))) - `(cider-error-highlight-face ((,class :foreground ,red :underline t))) - `(cider-fragile-button-face ((,class :box (:line-width 3 :color ,fg-alt :style released-button) :foreground ,yellow))) - `(cider-fringe-good-face ((,class :foreground ,green-active))) - `(cider-instrumented-face ((,class :box (:line-width -1 :color ,red :style nil) :background ,bg-dim))) - `(cider-reader-conditional-face ((,class :foreground ,fg-special-warm :slant italic))) - `(cider-repl-input-face ((,class :inherit bold))) - `(cider-repl-prompt-face ((,class :foreground ,cyan-alt-other))) - `(cider-repl-stderr-face ((,class :inherit bold :foreground ,red))) - `(cider-repl-stdout-face ((,class :foreground ,blue))) - `(cider-result-overlay-face ((,class :box (:line-width -1 :color ,blue :style nil) :background ,bg-dim))) - `(cider-stacktrace-error-class-face ((,class :inherit bold :foreground ,red))) - `(cider-stacktrace-error-message-face ((,class :foreground ,red-alt-other :slant italic))) - `(cider-stacktrace-face ((,class :foreground ,fg-main))) - `(cider-stacktrace-filter-active-face ((,class :foreground ,cyan-alt :underline t))) - `(cider-stacktrace-filter-inactive-face ((,class :foreground ,cyan-alt))) - `(cider-stacktrace-fn-face ((,class :inherit bold :foreground ,fg-main))) - `(cider-stacktrace-ns-face ((,class :foreground ,fg-alt :slant italic))) - `(cider-stacktrace-promoted-button-face ((,class :box (:line-width 3 :color ,fg-alt :style released-button) :foreground ,red))) - `(cider-stacktrace-suppressed-button-face ((,class :box (:line-width 3 :color ,fg-alt :style pressed-button) - :background ,bg-alt :foreground ,fg-alt))) - `(cider-test-error-face ((,class :inherit modus-theme-subtle-red))) - `(cider-test-failure-face ((,class :inherit (modus-theme-intense-red bold)))) - `(cider-test-success-face ((,class :inherit modus-theme-intense-green))) - `(cider-traced-face ((,class :box (:line-width -1 :color ,cyan :style nil) :background ,bg-dim))) - `(cider-warning-highlight-face ((,class :foreground ,yellow :underline t))) -;;;;; circe (and lui) - `(circe-fool-face ((,class :foreground ,fg-alt))) - `(circe-highlight-nick-face ((,class :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 :inherit button :foreground ,blue))) - `(lui-highlight-face ((,class :foreground ,magenta-alt))) - `(lui-time-stamp-face ((,class :foreground ,blue-nuanced))) -;;;;; color-rg - `(color-rg-font-lock-column-number ((,class :foreground ,magenta-alt-other))) - `(color-rg-font-lock-command ((,class :inherit bold :foreground ,fg-main))) - `(color-rg-font-lock-file ((,class :inherit bold :foreground ,fg-special-cold))) - `(color-rg-font-lock-flash ((,class :inherit modus-theme-intense-blue))) - `(color-rg-font-lock-function-location ((,class :inherit modus-theme-special-calm))) - `(color-rg-font-lock-header-line-directory ((,class :foreground ,blue-active))) - `(color-rg-font-lock-header-line-edit-mode ((,class :foreground ,magenta-active))) - `(color-rg-font-lock-header-line-keyword ((,class :foreground ,green-active))) - `(color-rg-font-lock-header-line-text ((,class :foreground ,fg-active))) - `(color-rg-font-lock-line-number ((,class :foreground ,fg-special-warm))) - `(color-rg-font-lock-mark-changed ((,class :inherit bold :foreground ,blue))) - `(color-rg-font-lock-mark-deleted ((,class :inherit bold :foreground ,red))) - `(color-rg-font-lock-match ((,class :inherit modus-theme-special-calm))) - `(color-rg-font-lock-position-splitter ((,class :foreground ,fg-alt))) -;;;;; column-enforce-mode - `(column-enforce-face ((,class :inherit modus-theme-refine-yellow))) -;;;;; company-mode - `(company-echo-common ((,class :foreground ,magenta-alt-other))) - `(company-preview ((,class :background ,bg-dim :foreground ,fg-dim))) - `(company-preview-common ((,class :foreground ,blue-alt))) - `(company-preview-search ((,class :inherit modus-theme-special-calm))) - `(company-scrollbar-bg ((,class :background ,bg-active))) - `(company-scrollbar-fg ((,class :background ,fg-active))) - `(company-template-field ((,class :inherit modus-theme-intense-magenta))) - `(company-tooltip ((,class :background ,bg-alt :foreground ,fg-alt))) - `(company-tooltip-annotation ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(company-tooltip-annotation-selection ((,class :inherit bold :foreground ,fg-main))) - `(company-tooltip-common ((,class :inherit bold :foreground ,blue-alt))) - `(company-tooltip-common-selection ((,class :foreground ,fg-main))) - `(company-tooltip-mouse ((,class :inherit modus-theme-intense-blue))) - `(company-tooltip-search ((,class :inherit (modus-theme-refine-cyan bold)))) - `(company-tooltip-search-selection ((,class :inherit (modus-theme-intense-green bold) :underline t))) - `(company-tooltip-selection ((,class :inherit (modus-theme-subtle-cyan bold)))) -;;;;; company-posframe - `(company-posframe-active-backend-name ((,class :inherit bold :background ,bg-active :foreground ,blue-active))) - `(company-posframe-inactive-backend-name ((,class :background ,bg-active :foreground ,fg-active))) - `(company-posframe-metadata ((,class :background ,bg-inactive :foreground ,fg-inactive))) -;;;;; compilation feedback - `(compilation-column-number ((,class :foreground ,magenta-alt-other))) - `(compilation-error ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,red))) - `(compilation-info ((,class :foreground ,fg-special-cold))) - `(compilation-line-number ((,class :foreground ,fg-special-warm))) - `(compilation-mode-line-exit ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,blue-active))) - `(compilation-mode-line-fail ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,red-active))) - `(compilation-mode-line-run ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-active))) - `(compilation-warning ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,yellow))) -;;;;; completions - `(completions-annotations ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(completions-common-part ((,class ,@(modus-vivendi-theme-standard-completions - blue-alt blue-nuanced-bg - cyan-refine-bg cyan-refine-fg)))) - `(completions-first-difference ((,class :inherit bold - ,@(modus-vivendi-theme-standard-completions - 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))) - `(counsel-key-binding ((,class :inherit bold :foreground ,blue-alt-other))) - `(counsel-outline-1 ((,class :inherit outline-1))) - `(counsel-outline-2 ((,class :inherit outline-2))) - `(counsel-outline-3 ((,class :inherit outline-3))) - `(counsel-outline-4 ((,class :inherit outline-4))) - `(counsel-outline-5 ((,class :inherit outline-5))) - `(counsel-outline-6 ((,class :inherit outline-6))) - `(counsel-outline-7 ((,class :inherit outline-7))) - `(counsel-outline-8 ((,class :inherit outline-8))) - `(counsel-outline-default ((,class :inherit bold :foreground ,green-alt-other))) - `(counsel-variable-documentation ((,class :foreground ,yellow-alt-other :slant ,modus-theme-slant))) -;;;;; counsel-css - `(counsel-css-selector-depth-face-1 ((,class :foreground ,blue))) - `(counsel-css-selector-depth-face-2 ((,class :foreground ,cyan))) - `(counsel-css-selector-depth-face-3 ((,class :foreground ,green))) - `(counsel-css-selector-depth-face-4 ((,class :foreground ,yellow))) - `(counsel-css-selector-depth-face-5 ((,class :foreground ,magenta))) - `(counsel-css-selector-depth-face-6 ((,class :foreground ,red))) -;;;;; counsel-notmuch - `(counsel-notmuch-count-face ((,class :foreground ,cyan))) - `(counsel-notmuch-date-face ((,class :foreground ,blue))) - `(counsel-notmuch-people-face ((,class :foreground ,magenta))) - `(counsel-notmuch-subject-face ((,class :foreground ,magenta-alt-other))) -;;;;; counsel-org-capture-string - `(counsel-org-capture-string-template-body-face ((,class :foreground ,fg-special-cold))) -;;;;; cov - `(cov-coverage-not-run-face ((,class :foreground ,red-intense))) - `(cov-coverage-run-face ((,class :foreground ,green-intense))) - `(cov-heavy-face ((,class :foreground ,magenta-intense))) - `(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 - `(ctrlf-highlight-active ((,class :inherit (modus-theme-intense-green bold)))) - `(ctrlf-highlight-line ((,class :inherit modus-theme-hl-line))) - `(ctrlf-highlight-passive ((,class :inherit modus-theme-refine-cyan))) -;;;;; custom (M-x customize) - `(custom-button ((,class :box (:line-width 2 :color nil :style released-button) - :background ,bg-active :foreground ,fg-main))) - `(custom-button-mouse ((,class :box (:line-width 2 :color nil :style released-button) - :background ,bg-active :foreground ,fg-active))) - `(custom-button-pressed ((,class :box (:line-width 2 :color nil :style pressed-button) - :background ,bg-active :foreground ,fg-main))) - `(custom-changed ((,class :inherit modus-theme-subtle-cyan))) - `(custom-comment ((,class :foreground ,fg-alt))) - `(custom-comment-tag ((,class :background ,bg-alt :foreground ,yellow-alt-other))) - `(custom-face-tag ((,class :inherit bold :foreground ,blue-intense))) - `(custom-group-tag ((,class :inherit bold :foreground ,green-intense))) - `(custom-group-tag-1 ((,class :inherit modus-theme-special-warm))) - `(custom-invalid ((,class :inherit (modus-theme-intense-red bold)))) - `(custom-modified ((,class :inherit modus-theme-subtle-cyan))) - `(custom-rogue ((,class :inherit modus-theme-refine-magenta))) - `(custom-set ((,class :foreground ,blue-alt))) - `(custom-state ((,class :foreground ,cyan-alt-other))) - `(custom-themed ((,class :inherit modus-theme-subtle-blue))) - `(custom-variable-tag ((,class :inherit bold :foreground ,cyan))) -;;;;; dap-mode - `(dap-mouse-eval-thing-face ((,class :box (:line-width -1 :color ,blue-active :style nil) - :background ,bg-active :foreground ,fg-main))) - `(dap-result-overlay-face ((,class :box (:line-width -1 :color ,bg-active :style nil) - :background ,bg-active :foreground ,fg-main))) - `(dap-ui-breakpoint-verified-fringe ((,class :inherit bold :foreground ,green-active))) - `(dap-ui-compile-errline ((,class :inherit bold :foreground ,red-intense))) - `(dap-ui-locals-scope-face ((,class :inherit bold :foreground ,magenta :underline t))) - `(dap-ui-locals-variable-face ((,class :inherit bold :foreground ,cyan))) - `(dap-ui-locals-variable-leaf-face ((,class :foreground ,cyan-alt-other :slant italic))) - `(dap-ui-marker-face ((,class :inherit modus-theme-subtle-blue))) - `(dap-ui-sessions-stack-frame-face ((,class :inherit bold :foreground ,magenta-alt))) - `(dap-ui-sessions-terminated-active-face ((,class :inherit bold :foreground ,fg-alt))) - `(dap-ui-sessions-terminated-face ((,class :foreground ,fg-alt))) -;;;;; dashboard (emacs-dashboard) - `(dashboard-banner-logo-title ((,class :inherit bold :foreground ,fg-special-cold))) - `(dashboard-footer ((,class :inherit bold :foreground ,fg-special-mild))) - `(dashboard-heading ((,class :inherit bold :foreground ,fg-special-warm))) - `(dashboard-navigator ((,class :foreground ,cyan-alt-other))) - `(dashboard-text-banner ((,class :foreground ,fg-dim))) -;;;;; deadgrep - `(deadgrep-filename-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(deadgrep-match-face ((,class :inherit modus-theme-special-calm))) - `(deadgrep-meta-face ((,class :foreground ,fg-alt))) - `(deadgrep-regexp-metachar-face ((,class :inherit bold :foreground ,yellow-intense))) - `(deadgrep-search-term-face ((,class :inherit bold :foreground ,green-intense))) -;;;;; debbugs - `(debbugs-gnu-archived ((,class :inverse-video t))) - `(debbugs-gnu-done ((,class :foreground ,fg-alt))) - `(debbugs-gnu-forwarded ((,class :foreground ,fg-special-warm))) - `(debbugs-gnu-handled ((,class :foreground ,green))) - `(debbugs-gnu-new ((,class :foreground ,red))) - `(debbugs-gnu-pending ((,class :foreground ,cyan))) - `(debbugs-gnu-stale-1 ((,class :foreground ,yellow-nuanced))) - `(debbugs-gnu-stale-2 ((,class :foreground ,yellow))) - `(debbugs-gnu-stale-3 ((,class :foreground ,yellow-alt))) - `(debbugs-gnu-stale-4 ((,class :foreground ,yellow-alt-other))) - `(debbugs-gnu-stale-5 ((,class :foreground ,red-alt))) - `(debbugs-gnu-tagged ((,class :foreground ,magenta-alt))) -;;;;; define-word - `(define-word-face-1 ((,class :foreground ,yellow))) - `(define-word-face-2 ((,class :foreground ,fg-main))) -;;;;; deft - `(deft-filter-string-error-face ((,class :inherit modus-theme-refine-red))) - `(deft-filter-string-face ((,class :foreground ,green-intense))) - `(deft-header-face ((,class :inherit bold :foreground ,fg-special-warm))) - `(deft-separator-face ((,class :foreground ,fg-alt))) - `(deft-summary-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(deft-time-face ((,class :foreground ,fg-special-cold))) - `(deft-title-face ((,class :inherit bold :foreground ,fg-main))) -;;;;; dictionary - `(dictionary-button-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(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 - `(diff-hl-change ((,class :inherit modus-theme-fringe-yellow))) - `(diff-hl-delete ((,class :inherit modus-theme-fringe-red))) - `(diff-hl-dired-change ((,class :inherit diff-hl-change))) - `(diff-hl-dired-delete ((,class :inherit diff-hl-delete))) - `(diff-hl-dired-ignored ((,class :inherit dired-ignored))) - `(diff-hl-dired-insert ((,class :inherit diff-hl-insert))) - `(diff-hl-dired-unknown ((,class :inherit dired-ignored))) - `(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 :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 :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 :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-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 :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))) - `(dired-async-message ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,green-active))) - `(dired-async-mode-message ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,cyan-active))) -;;;;; dired-git - `(dired-git-branch-else ((,class :inherit bold :foreground ,magenta-alt))) - `(dired-git-branch-master ((,class :inherit bold :foreground ,magenta-alt-other))) -;;;;; dired-git-info - `(dgi-commit-message-face ((,class :foreground ,fg-special-mild))) -;;;;; dired-narrow - `(dired-narrow-blink ((,class :inherit (modus-theme-subtle-cyan bold)))) -;;;;; dired-subtree - ;; remove background from dired-subtree, else it breaks - ;; dired-{flagged,marked} and any other face that sets a background - ;; such as hl-line - `(dired-subtree-depth-1-face ((,class :background nil))) - `(dired-subtree-depth-2-face ((,class :background nil))) - `(dired-subtree-depth-3-face ((,class :background nil))) - `(dired-subtree-depth-4-face ((,class :background nil))) - `(dired-subtree-depth-5-face ((,class :background nil))) - `(dired-subtree-depth-6-face ((,class :background nil))) -;;;;; diredfl - `(diredfl-autofile-name ((,class :inherit modus-theme-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-pseudo-header))) - `(diredfl-dir-name ((,class :inherit dired-directory))) - `(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 ,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-alt))) - `(diredfl-link-priv ((,class :foreground ,blue-alt-other))) - `(diredfl-no-priv ((,class :foreground ,fg-alt))) - `(diredfl-number ((,class :foreground ,cyan-alt))) - `(diredfl-other-priv ((,class :foreground ,yellow))) - `(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))) -;;;;; 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 :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 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))) - `(doom-modeline-buffer-file ((,class :inherit bold :foreground ,fg-active))) - `(doom-modeline-buffer-major-mode ((,class :inherit bold :foreground ,cyan-active))) - `(doom-modeline-buffer-minor-mode ((,class :foreground ,fg-inactive))) - `(doom-modeline-buffer-modified ((,class :inherit bold :foreground ,magenta-active))) - `(doom-modeline-buffer-path ((,class :inherit bold :foreground ,fg-active))) - `(doom-modeline-debug ((,class :inherit bold :foreground ,yellow-active))) - `(doom-modeline-debug-visual ((,class :inherit bold :foreground ,red-active))) - `(doom-modeline-evil-emacs-state ((,class :inherit bold :foreground ,magenta-active))) - `(doom-modeline-evil-insert-state ((,class :inherit bold :foreground ,green-active))) - `(doom-modeline-evil-motion-state ((,class :inherit bold :foreground ,fg-inactive))) - `(doom-modeline-evil-normal-state ((,class :inherit bold :foreground ,fg-active))) - `(doom-modeline-evil-operator-state ((,class :inherit bold :foreground ,blue-active))) - `(doom-modeline-evil-replace-state ((,class :inherit bold :foreground ,red-active))) - `(doom-modeline-evil-visual-state ((,class :inherit bold :foreground ,cyan-active))) - `(doom-modeline-highlight ((,class :inherit bold :foreground ,blue-active))) - `(doom-modeline-host ((,class :slant italic))) - `(doom-modeline-info ((,class :foreground ,green-active))) - `(doom-modeline-lsp-error ((,class :inherit bold :foreground ,red-active))) - `(doom-modeline-lsp-success ((,class :inherit bold :foreground ,green-active))) - `(doom-modeline-lsp-warning ((,class :inherit bold :foreground ,yellow-active))) - `(doom-modeline-panel ((,class :inherit modus-theme-active-blue))) - `(doom-modeline-persp-buffer-not-in-persp ((,class :foreground ,yellow-active :slant italic))) - `(doom-modeline-persp-name ((,class :foreground ,fg-active))) - `(doom-modeline-project-dir ((,class :inherit bold :foreground ,blue-active))) - `(doom-modeline-project-parent-dir ((,class :foreground ,blue-active))) - `(doom-modeline-project-root-dir ((,class :foreground ,fg-active))) - `(doom-modeline-unread-number ((,class :foreground ,fg-active :slant italic))) - `(doom-modeline-urgent ((,class :inherit bold :foreground ,red-active))) - `(doom-modeline-warning ((,class :inherit bold :foreground ,yellow-active))) -;;;;; dynamic-ruler - `(dynamic-ruler-negative-face ((,class :inherit modus-theme-intense-neutral))) - `(dynamic-ruler-positive-face ((,class :inherit modus-theme-intense-yellow))) -;;;;; easy-jekyll - `(easy-jekyll-help-face ((,class :background ,bg-dim :foreground ,cyan-alt-other))) -;;;;; easy-kill - `(easy-kill-origin ((,class :inherit modus-theme-subtle-red))) - `(easy-kill-selection ((,class :inherit modus-theme-subtle-yellow))) -;;;;; ebdb - `(ebdb-address-default ((,class :foreground ,fg-main))) - `(ebdb-db-char ((,class :foreground ,fg-special-cold))) - `(ebdb-defunct ((,class :foreground ,fg-alt))) - `(ebdb-field-hidden ((,class :foreground ,magenta))) - `(ebdb-field-url ((,class :foreground ,blue))) - `(ebdb-label ((,class :foreground ,cyan-alt-other))) - `(ebdb-mail-default ((,class :foreground ,fg-main))) - `(ebdb-mail-primary ((,class :foreground ,blue-alt))) - `(ebdb-marked ((,class :background ,cyan-intense-bg))) - `(ebdb-organization-name ((,class :foreground ,fg-special-calm))) - `(ebdb-person-name ((,class :foreground ,magenta-alt-other))) - `(ebdb-phone-default ((,class :foreground ,fg-special-warm))) - `(ebdb-role-defunct ((,class :foreground ,fg-alt))) - `(eieio-custom-slot-tag-face ((,class :foreground ,red-alt))) -;;;;; ediff - ;; 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))) - `(ediff-even-diff-C ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2))) - `(ediff-fine-diff-A ((,class :background ,bg-diff-focus-removed :foreground ,fg-diff-focus-removed))) - `(ediff-fine-diff-Ancestor ((,class :inherit modus-theme-refine-cyan))) - `(ediff-fine-diff-B ((,class :background ,bg-diff-focus-added :foreground ,fg-diff-focus-added))) - `(ediff-fine-diff-C ((,class :background ,bg-diff-focus-changed :foreground ,fg-diff-focus-changed))) - `(ediff-odd-diff-A ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2))) - `(ediff-odd-diff-Ancestor ((,class :background ,bg-diff-neutral-0 :foreground ,fg-diff-neutral-0))) - `(ediff-odd-diff-B ((,class :background ,bg-diff-neutral-2 :foreground ,fg-diff-neutral-2))) - `(ediff-odd-diff-C ((,class :background ,bg-diff-neutral-1 :foreground ,fg-diff-neutral-1))) -;;;;; eglot - `(eglot-mode-line ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-active))) -;;;;; el-search - `(el-search-highlight-in-prompt-face ((,class :inherit bold :foreground ,magenta-alt))) - `(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))) -;;;;; elfeed - `(elfeed-log-date-face ((,class :foreground ,cyan-alt))) - `(elfeed-log-debug-level-face ((,class :foreground ,magenta))) - `(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 ,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))) - `(elfeed-score-error-level-face ((,class :foreground ,red))) - `(elfeed-score-info-level-face ((,class :foreground ,cyan))) - `(elfeed-score-warn-level-face ((,class :foreground ,yellow))) -;;;;; emms - `(emms-playlist-track-face ((,class :foreground ,blue))) - `(emms-playlist-selected-face ((,class :inherit bold :foreground ,magenta))) -;;;;; enhanced-ruby-mode - `(enh-ruby-heredoc-delimiter-face ((,class :foreground ,blue-alt-other))) - `(enh-ruby-op-face ((,class :foreground ,fg-main))) - `(enh-ruby-regexp-delimiter-face ((,class :foreground ,green))) - `(enh-ruby-regexp-face ((,class :foreground ,magenta))) - `(enh-ruby-string-delimiter-face ((,class :foreground ,blue-alt))) - `(erm-syn-errline ((,class :foreground ,red :underline t))) - `(erm-syn-warnline ((,class :foreground ,yellow :underline t))) -;;;;; epa - `(epa-field-body ((,class :foreground ,fg-main))) - `(epa-field-name ((,class :inherit bold :foreground ,fg-dim))) - `(epa-mark ((,class :inherit bold :foreground ,magenta))) - `(epa-string ((,class :foreground ,blue-alt))) - `(epa-validity-disabled ((,class :inherit modus-theme-refine-red))) - `(epa-validity-high ((,class :inherit bold :foreground ,green-alt-other))) - `(epa-validity-low ((,class :foreground ,fg-alt))) - `(epa-validity-medium ((,class :foreground ,green-alt))) -;;;;; equake - `(equake-buffer-face ((,class :background ,bg-main :foreground ,fg-main))) - `(equake-shell-type-eshell ((,class :background ,bg-inactive :foreground ,green-active))) - `(equake-shell-type-rash ((,class :background ,bg-inactive :foreground ,red-active))) - `(equake-shell-type-shell ((,class :background ,bg-inactive :foreground ,cyan-active))) - `(equake-shell-type-term ((,class :background ,bg-inactive :foreground ,yellow-active))) - `(equake-shell-type-vterm ((,class :background ,bg-inactive :foreground ,magenta-active))) - `(equake-tab-active ((,class :background ,fg-alt :foreground ,bg-alt))) - `(equake-tab-inactive ((,class :foreground ,fg-inactive))) -;;;;; erc - `(erc-action-face ((,class :inherit bold :foreground ,cyan))) - `(erc-bold-face ((,class :inherit bold))) - `(erc-button ((,class :inherit button))) - `(erc-command-indicator-face ((,class :inherit bold :foreground ,cyan-alt))) - `(erc-current-nick-face ((,class :foreground ,magenta-alt-other))) - `(erc-dangerous-host-face ((,class :inherit modus-theme-intense-red))) - `(erc-direct-msg-face ((,class :foreground ,magenta))) - `(erc-error-face ((,class :inherit bold :foreground ,red))) - `(erc-fool-face ((,class :foreground ,fg-inactive))) - `(erc-header-line ((,class :background ,bg-header :foreground ,fg-header))) - `(erc-input-face ((,class :foreground ,fg-special-calm))) - `(erc-inverse-face ((,class :inherit erc-default-face :inverse-video t))) - `(erc-keyword-face ((,class :inherit bold :foreground ,magenta-alt))) - `(erc-my-nick-face ((,class :inherit bold :foreground ,magenta))) - `(erc-my-nick-prefix-face ((,class :inherit erc-my-nick-face))) - `(erc-nick-default-face ((,class :inherit bold :foreground ,blue))) - `(erc-nick-msg-face ((,class :inherit bold :foreground ,green))) - `(erc-nick-prefix-face ((,class :inherit erc-nick-default-face))) - `(erc-notice-face ((,class :foreground ,fg-unfocused))) - `(erc-pal-face ((,class :inherit bold :foreground ,red-alt))) - `(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))) -;;;;; ert - `(ert-test-result-expected ((,class :inherit modus-theme-intense-green))) - `(ert-test-result-unexpected ((,class :inherit modus-theme-intense-red))) -;;;;; eshell - `(eshell-ls-archive ((,class :inherit bold :foreground ,cyan-alt))) - `(eshell-ls-backup ((,class :foreground ,yellow-alt))) - `(eshell-ls-clutter ((,class :foreground ,red-alt))) - `(eshell-ls-directory ((,class :inherit bold :foreground ,blue-alt))) - `(eshell-ls-executable ((,class :foreground ,magenta-alt))) - `(eshell-ls-missing ((,class :inherit modus-theme-intense-red))) - `(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 :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)))) -;;;;; eshell-fringe-status - `(eshell-fringe-status-failure ((,class :foreground ,red))) - `(eshell-fringe-status-success ((,class :foreground ,green))) -;;;;; eshell-git-prompt - `(eshell-git-prompt-add-face ((,class :foreground ,fg-alt))) - `(eshell-git-prompt-branch-face ((,class :foreground ,fg-alt))) - `(eshell-git-prompt-directory-face ((,class :foreground ,cyan))) - `(eshell-git-prompt-exit-fail-face ((,class :foreground ,red))) - `(eshell-git-prompt-exit-success-face ((,class :foreground ,green))) - `(eshell-git-prompt-modified-face ((,class :foreground ,yellow))) - `(eshell-git-prompt-powerline-clean-face ((,class :background ,green-refine-bg))) - `(eshell-git-prompt-powerline-dir-face ((,class :background ,blue-refine-bg))) - `(eshell-git-prompt-powerline-not-clean-face ((,class :background ,magenta-refine-bg))) - `(eshell-git-prompt-robyrussell-branch-face ((,class :foreground ,red))) - `(eshell-git-prompt-robyrussell-git-dirty-face ((,class :foreground ,yellow))) - `(eshell-git-prompt-robyrussell-git-face ((,class :foreground ,blue))) -;;;;; eshell-prompt-extras (epe) - `(epe-dir-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,blue))) - `(epe-git-dir-face ((,class :foreground ,red-alt-other))) - `(epe-git-face ((,class :foreground ,cyan-alt))) - `(epe-pipeline-delimiter-face ((,class :foreground ,green-alt))) - `(epe-pipeline-host-face ((,class :foreground ,blue))) - `(epe-pipeline-time-face ((,class :foreground ,fg-special-warm))) - `(epe-pipeline-user-face ((,class :foreground ,magenta))) - `(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))) - `(evil-ex-lazy-highlight ((,class :inherit modus-theme-refine-cyan))) - `(evil-ex-search ((,class :inherit modus-theme-intense-green))) - `(evil-ex-substitute-matches ((,class :inherit modus-theme-refine-yellow :underline t))) - `(evil-ex-substitute-replacement ((,class :inherit (modus-theme-intense-green bold)))) -;;;;; evil-goggles - `(evil-goggles-change-face ((,class :inherit modus-theme-refine-yellow))) - `(evil-goggles-commentary-face ((,class :inherit modus-theme-subtle-neutral :slant ,modus-theme-slant))) - `(evil-goggles-default-face ((,class :inherit modus-theme-subtle-neutral))) - `(evil-goggles-delete-face ((,class :inherit modus-theme-refine-red))) - `(evil-goggles-fill-and-move-face ((,class :inherit evil-goggles-default-face))) - `(evil-goggles-indent-face ((,class :inherit evil-goggles-default-face))) - `(evil-goggles-join-face ((,class :inherit modus-theme-subtle-green))) - `(evil-goggles-nerd-commenter-face ((,class :inherit evil-goggles-commentary-face))) - `(evil-goggles-paste-face ((,class :inherit modus-theme-subtle-cyan))) - `(evil-goggles-record-macro-face ((,class :inherit modus-theme-special-cold))) - `(evil-goggles-replace-with-register-face ((,class :inherit modus-theme-refine-magenta))) - `(evil-goggles-set-marker-face ((,class :inherit modus-theme-intense-magenta))) - `(evil-goggles-shift-face ((,class :inherit evil-goggles-default-face))) - `(evil-goggles-surround-face ((,class :inherit evil-goggles-default-face))) - `(evil-goggles-yank-face ((,class :inherit modus-theme-subtle-blue))) -;;;;; evil-visual-mark-mode - `(evil-visual-mark-face ((,class :inherit modus-theme-intense-magenta))) -;;;;; eww - `(eww-invalid-certificate ((,class :foreground ,red-active))) - `(eww-valid-certificate ((,class :foreground ,green-active))) - `(eww-form-checkbox ((,class :box (:line-width 1 :color ,fg-inactive :style released-button) :background ,bg-inactive :foreground ,fg-main))) - `(eww-form-file ((,class :box (:line-width 1 :color ,fg-inactive :style released-button) :background ,bg-active :foreground ,fg-main))) - `(eww-form-select ((,class :inherit eww-form-checkbox))) - `(eww-form-submit ((,class :inherit eww-form-file))) - `(eww-form-text ((,class :box (:line-width 1 :color ,fg-inactive :style none) :background ,bg-active :foreground ,fg-active))) - `(eww-form-textarea ((,class :background ,bg-alt :foreground ,fg-main))) -;;;;; eyebrowse - `(eyebrowse-mode-line-active ((,class :inherit bold :foreground ,blue-active))) -;;;;; fancy-dabbrev - `(fancy-dabbrev-menu-face ((,class :background ,bg-alt :foreground ,fg-alt))) - `(fancy-dabbrev-preview-face ((,class :foreground ,fg-alt :underline t))) - `(fancy-dabbrev-selection-face ((,class :inherit (modus-theme-intense-cyan bold)))) -;;;;; flycheck - `(flycheck-error - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-error :style wave)) - (,class :foreground ,fg-lang-error :underline t))) - `(flycheck-error-list-checker-name ((,class :foreground ,magenta-active))) - `(flycheck-error-list-column-number ((,class :foreground ,fg-special-cold))) - `(flycheck-error-list-error ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,red))) - `(flycheck-error-list-filename ((,class :foreground ,blue))) - `(flycheck-error-list-highlight ((,class :inherit modus-theme-hl-line))) - `(flycheck-error-list-id ((,class :foreground ,magenta-alt-other))) - `(flycheck-error-list-id-with-explainer ((,class :inherit flycheck-error-list-id :box t))) - `(flycheck-error-list-info ((,class :foreground ,cyan))) - `(flycheck-error-list-line-number ((,class :foreground ,fg-special-warm))) - `(flycheck-error-list-warning ((,class :foreground ,yellow))) - `(flycheck-fringe-error ((,class :inherit modus-theme-fringe-red))) - `(flycheck-fringe-info ((,class :inherit modus-theme-fringe-cyan))) - `(flycheck-fringe-warning ((,class :inherit modus-theme-fringe-yellow))) - `(flycheck-info - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-note :style wave)) - (,class :foreground ,fg-lang-note :underline t))) - `(flycheck-verify-select-checker ((,class :box (:line-width 1 :color nil :style released-button)))) - `(flycheck-warning - ((,(append '((supports :underline (:style wave))) class) - :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))) - `(flycheck-indicator-info ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,blue-active))) - `(flycheck-indicator-running ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-active))) - `(flycheck-indicator-success ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,green-active))) - `(flycheck-indicator-warning ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,yellow-active))) -;;;;; flycheck-posframe - `(flycheck-posframe-background-face ((,class :background ,bg-alt))) - `(flycheck-posframe-border-face ((,class :foreground ,fg-alt))) - `(flycheck-posframe-error-face ((,class :inherit bold :foreground ,red))) - `(flycheck-posframe-face ((,class :foreground ,fg-main :slant ,modus-theme-slant))) - `(flycheck-posframe-info-face ((,class :inherit bold :foreground ,cyan))) - `(flycheck-posframe-warning-face ((,class :inherit bold :foreground ,yellow))) -;;;;; flymake - `(flymake-error - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-error :style wave)) - (,class :foreground ,fg-lang-error :underline t))) - `(flymake-note - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-note :style wave)) - (,class :foreground ,fg-lang-note :underline t))) - `(flymake-warning - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-warning :style wave)) - (,class :foreground ,fg-lang-warning :underline t))) -;;;;; flyspell - `(flyspell-duplicate - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-warning :style wave)) - (,class :foreground ,fg-lang-warning :underline t))) - `(flyspell-incorrect - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,fg-lang-error :style wave)) - (,class :foreground ,fg-lang-error :underline t))) -;;;;; flyspell-correct - `(flyspell-correct-highlight-face ((,class :inherit modus-theme-refine-green))) -;;;;; flx - `(flx-highlight-face ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-intense-magenta - 'modus-theme-nuanced-magenta - magenta-alt - 'bold)))) -;;;;; freeze-it - `(freeze-it-show ((,class :background ,bg-dim :foreground ,fg-special-warm))) -;;;;; frog-menu - `(frog-menu-action-keybinding-face ((,class :foreground ,blue-alt-other))) - `(frog-menu-actions-face ((,class :foreground ,magenta))) - `(frog-menu-border ((,class :background ,bg-active))) - `(frog-menu-candidates-face ((,class :foreground ,fg-main))) - `(frog-menu-posframe-background-face ((,class :background ,bg-dim))) - `(frog-menu-prompt-face ((,class :foreground ,cyan))) -;;;;; focus - `(focus-unfocused ((,class :foreground ,fg-unfocused))) -;;;;; fold-this - `(fold-this-overlay ((,class :inherit modus-theme-special-mild))) -;;;;; font-lock - `(font-lock-builtin-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(font-lock-comment-delimiter-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(font-lock-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(font-lock-constant-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(font-lock-doc-face ((,class ,@(modus-vivendi-theme-syntax-foreground - fg-special-cold cyan-alt-other-faint) - :slant ,modus-theme-slant))) - `(font-lock-function-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(font-lock-keyword-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(font-lock-negation-char-face ((,class ,@(modus-vivendi-theme-syntax-foreground - yellow yellow-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(font-lock-preprocessor-face ((,class ,@(modus-vivendi-theme-syntax-foreground - red-alt-other red-alt-other-faint)))) - `(font-lock-regexp-grouping-backslash ((,class :inherit bold :foreground ,fg-escape-char-backslash))) - `(font-lock-regexp-grouping-construct ((,class :inherit bold :foreground ,fg-escape-char-construct))) - `(font-lock-string-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt blue-alt-faint)))) - `(font-lock-type-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint)))) - `(font-lock-variable-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan cyan-faint)))) - `(font-lock-warning-face ((,class ,@(modus-vivendi-theme-syntax-foreground - yellow-active yellow-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) -;;;;; forge - `(forge-post-author ((,class :inherit bold :foreground ,fg-main))) - `(forge-post-date ((,class :foreground ,fg-special-cold))) - `(forge-topic-closed ((,class :foreground ,fg-alt))) - `(forge-topic-merged ((,class :foreground ,fg-alt))) - `(forge-topic-open ((,class :foreground ,fg-special-mild))) - `(forge-topic-unmerged ((,class :foreground ,magenta :slant ,modus-theme-slant))) - `(forge-topic-unread ((,class :inherit bold :foreground ,fg-main))) -;;;;; fountain-mode - `(fountain-character ((,class :foreground ,blue-alt-other))) - `(fountain-comment ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(fountain-dialog ((,class :foreground ,blue-alt))) - `(fountain-metadata-key ((,class :foreground ,green-alt-other))) - `(fountain-metadata-value ((,class :foreground ,blue))) - `(fountain-non-printing ((,class :foreground ,fg-alt))) - `(fountain-note ((,class :foreground ,yellow :slant ,modus-theme-slant))) - `(fountain-page-break ((,class :inherit bold :foreground ,red-alt))) - `(fountain-page-number ((,class :inherit bold :foreground ,red-alt-other))) - `(fountain-paren ((,class :foreground ,cyan))) - `(fountain-scene-heading ((,class :inherit bold :foreground ,blue-nuanced))) - `(fountain-section-heading ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))) - `(fountain-section-heading-1 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-main - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))) - `(fountain-section-heading-2 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-warm - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3)))) - `(fountain-section-heading-3 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-mild - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-2)))) - `(fountain-section-heading-4 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-calm - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-1)))) - `(fountain-section-heading-5 ((,class :inherit (bold ,modus-theme-variable-pitch) :foreground ,fg-special-calm))) - `(fountain-synopsis ((,class :foreground ,cyan-alt))) - `(fountain-trans ((,class :foreground ,yellow-alt-other))) -;;;;; geiser - `(geiser-font-lock-autodoc-current-arg ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(geiser-font-lock-autodoc-identifier ((,class ,@(modus-vivendi-theme-syntax-foreground - blue blue-faint)))) - `(geiser-font-lock-doc-button ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan-alt cyan-alt-faint) - :underline t))) - `(geiser-font-lock-doc-link ((,class :inherit link))) - `(geiser-font-lock-error-link ((,class ,@(modus-vivendi-theme-syntax-foreground - red-alt red-alt-faint) - :underline t))) - `(geiser-font-lock-image-button ((,class ,@(modus-vivendi-theme-syntax-foreground - green-alt green-alt-faint) - :underline t))) - `(geiser-font-lock-repl-input ((,class :inherit bold))) - `(geiser-font-lock-repl-output ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint)))) - `(geiser-font-lock-repl-prompt ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(geiser-font-lock-xref-header ((,class :inherit bold))) - `(geiser-font-lock-xref-link ((,class :inherit link))) -;;;;; git-commit - `(git-commit-comment-action ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(git-commit-comment-branch-local ((,class :foreground ,blue-alt :slant ,modus-theme-slant))) - `(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-dim :slant ,modus-theme-slant))) - `(git-commit-keyword ((,class :foreground ,magenta))) - `(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 :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))) - `(git-gutter:modified ((,class :inherit modus-theme-fringe-yellow))) - `(git-gutter:separator ((,class :inherit modus-theme-fringe-cyan))) - `(git-gutter:unchanged ((,class :inherit modus-theme-fringe-magenta))) -;;;;; git-gutter-fr - `(git-gutter-fr:added ((,class :inherit modus-theme-fringe-green))) - `(git-gutter-fr:deleted ((,class :inherit modus-theme-fringe-red))) - `(git-gutter-fr:modified ((,class :inherit modus-theme-fringe-yellow))) -;;;;; git-{gutter,fringe}+ - `(git-gutter+-added ((,class :inherit modus-theme-fringe-green))) - `(git-gutter+-deleted ((,class :inherit modus-theme-fringe-red))) - `(git-gutter+-modified ((,class :inherit modus-theme-fringe-yellow))) - `(git-gutter+-separator ((,class :inherit modus-theme-fringe-cyan))) - `(git-gutter+-unchanged ((,class :inherit modus-theme-fringe-magenta))) - `(git-gutter-fr+-added ((,class :inherit modus-theme-fringe-green))) - `(git-gutter-fr+-deleted ((,class :inherit modus-theme-fringe-red))) - `(git-gutter-fr+-modified ((,class :inherit modus-theme-fringe-yellow))) -;;;;; git-lens - `(git-lens-added ((,class :inherit bold :foreground ,green))) - `(git-lens-deleted ((,class :inherit bold :foreground ,red))) - `(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 :inherit button :foreground ,cyan))) - `(git-walktree-tree-face ((,class :foreground ,magenta))) -;;;;; gnus - `(gnus-button ((,class :inherit button))) - `(gnus-cite-1 ((,class :foreground ,blue-alt))) - `(gnus-cite-10 ((,class :foreground ,magenta-alt-other))) - `(gnus-cite-11 ((,class :foreground ,yellow-alt-other))) - `(gnus-cite-2 ((,class :foreground ,red-alt))) - `(gnus-cite-3 ((,class :foreground ,green-alt))) - `(gnus-cite-4 ((,class :foreground ,magenta-alt))) - `(gnus-cite-5 ((,class :foreground ,yellow-alt))) - `(gnus-cite-6 ((,class :foreground ,cyan-alt))) - `(gnus-cite-7 ((,class :foreground ,blue-alt-other))) - `(gnus-cite-8 ((,class :foreground ,red-alt-other))) - `(gnus-cite-9 ((,class :foreground ,green-alt-other))) - `(gnus-cite-attribution ((,class :foreground ,fg-main :slant italic))) - `(gnus-emphasis-highlight-words ((,class :inherit modus-theme-refine-yellow))) - `(gnus-group-mail-1 ((,class :inherit bold :foreground ,magenta-alt))) - `(gnus-group-mail-1-empty ((,class :foreground ,magenta-alt))) - `(gnus-group-mail-2 ((,class :inherit bold :foreground ,magenta))) - `(gnus-group-mail-2-empty ((,class :foreground ,magenta))) - `(gnus-group-mail-3 ((,class :inherit bold :foreground ,magenta-alt-other))) - `(gnus-group-mail-3-empty ((,class :foreground ,magenta-alt-other))) - `(gnus-group-mail-low ((,class :inherit bold :foreground ,magenta-nuanced))) - `(gnus-group-mail-low-empty ((,class :foreground ,magenta-nuanced))) - `(gnus-group-news-1 ((,class :inherit bold :foreground ,green))) - `(gnus-group-news-1-empty ((,class :foreground ,green))) - `(gnus-group-news-2 ((,class :inherit bold :foreground ,cyan))) - `(gnus-group-news-2-empty ((,class :foreground ,cyan))) - `(gnus-group-news-3 ((,class :inherit bold :foreground ,yellow-nuanced))) - `(gnus-group-news-3-empty ((,class :foreground ,yellow-nuanced))) - `(gnus-group-news-4 ((,class :inherit bold :foreground ,cyan-nuanced))) - `(gnus-group-news-4-empty ((,class :foreground ,cyan-nuanced))) - `(gnus-group-news-5 ((,class :inherit bold :foreground ,red-nuanced))) - `(gnus-group-news-5-empty ((,class :foreground ,red-nuanced))) - `(gnus-group-news-6 ((,class :inherit bold :foreground ,fg-alt))) - `(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 ,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))) - `(gnus-server-closed ((,class :inherit bold :foreground ,magenta))) - `(gnus-server-cloud ((,class :inherit bold :foreground ,cyan-alt))) - `(gnus-server-cloud-host ((,class :inherit modus-theme-refine-cyan))) - `(gnus-server-denied ((,class :inherit bold :foreground ,red))) - `(gnus-server-offline ((,class :inherit bold :foreground ,yellow))) - `(gnus-server-opened ((,class :inherit bold :foreground ,green))) - `(gnus-signature ((,class :foreground ,fg-special-cold :slant italic))) - `(gnus-splash ((,class :foreground ,fg-alt))) - `(gnus-summary-cancelled ((,class :inherit modus-theme-mark-alt))) - `(gnus-summary-high-ancient ((,class :inherit bold :foreground ,fg-alt))) - `(gnus-summary-high-read ((,class :inherit bold :foreground ,fg-special-cold))) - `(gnus-summary-high-ticked ((,class :inherit bold :foreground ,red-alt-other))) - `(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-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-alt))) - `(gnus-summary-normal-ticked ((,class :foreground ,red-alt-other))) - `(gnus-summary-normal-undownloaded ((,class :foreground ,yellow))) - `(gnus-summary-normal-unread ((,class :foreground ,fg-main))) - `(gnus-summary-selected ((,class :inherit modus-theme-subtle-blue))) -;;;;; golden-ratio-scroll-screen - `(golden-ratio-scroll-highlight-line-face ((,class :background ,cyan-subtle-bg :foreground ,fg-main))) -;;;;; helm - `(helm-M-x-key ((,class :inherit bold :foreground ,magenta-alt-other))) - `(helm-action ((,class :underline t))) - `(helm-bookmark-addressbook ((,class :foreground ,green-alt))) - `(helm-bookmark-directory ((,class :inherit bold :foreground ,blue))) - `(helm-bookmark-file ((,class :foreground ,fg-main))) - `(helm-bookmark-file-not-found ((,class :background ,bg-alt :foreground ,fg-alt))) - `(helm-bookmark-gnus ((,class :foreground ,magenta))) - `(helm-bookmark-info ((,class :foreground ,cyan-alt))) - `(helm-bookmark-man ((,class :foreground ,yellow-alt))) - `(helm-bookmark-w3m ((,class :foreground ,blue-alt))) - `(helm-buffer-archive ((,class :inherit bold :foreground ,cyan))) - `(helm-buffer-directory ((,class :inherit bold :foreground ,blue))) - `(helm-buffer-file ((,class :foreground ,fg-main))) - `(helm-buffer-modified ((,class :foreground ,yellow-alt))) - `(helm-buffer-not-saved ((,class :foreground ,red-alt))) - `(helm-buffer-process ((,class :foreground ,magenta))) - `(helm-buffer-saved-out ((,class :inherit bold :background ,bg-alt :foreground ,red))) - `(helm-buffer-size ((,class :foreground ,fg-alt))) - `(helm-candidate-number ((,class :foreground ,cyan-active))) - `(helm-candidate-number-suspended ((,class :foreground ,yellow-active))) - `(helm-comint-prompts-buffer-name ((,class :foreground ,green-active))) - `(helm-comint-prompts-promptidx ((,class :foreground ,cyan-active))) - `(helm-delete-async-message ((,class :inherit bold :foreground ,magenta-active))) - `(helm-eob-line ((,class :background ,bg-main :foreground ,fg-main))) - `(helm-eshell-prompts-buffer-name ((,class :foreground ,green-active))) - `(helm-eshell-prompts-promptidx ((,class :foreground ,cyan-active))) - `(helm-etags-file ((,class :foreground ,fg-dim :underline t))) - `(helm-ff-backup-file ((,class :foreground ,fg-alt))) - `(helm-ff-denied ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-red - 'modus-theme-intense-red - 'modus-theme-nuanced-red - red)))) - `(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 (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 :inherit button :foreground ,red))) - `(helm-ff-pipe ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-refine-magenta - 'modus-theme-subtle-magenta - 'modus-theme-nuanced-magenta - magenta)))) - `(helm-ff-prefix ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-refine-yellow - 'modus-theme-subtle-yellow - 'modus-theme-nuanced-yellow - yellow-alt-other)))) - `(helm-ff-socket ((,class :foreground ,red-alt-other))) - `(helm-ff-suid ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-red - 'modus-theme-refine-red - 'modus-theme-nuanced-yellow - red-alt)))) - `(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))) - `(helm-grep-finish ((,class :foreground ,green-active))) - `(helm-grep-lineno ((,class :foreground ,fg-special-warm))) - `(helm-grep-match ((,class :inherit modus-theme-special-calm))) - `(helm-header ((,class :inherit bold :foreground ,fg-special-cold))) - `(helm-header-line-left-margin ((,class :inherit bold :foreground ,yellow-intense))) - `(helm-history-deleted ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-red - 'modus-theme-intense-red - 'modus-theme-nuanced-red - red - 'bold)))) - `(helm-history-remote ((,class :foreground ,red-alt-other))) - `(helm-lisp-completion-info ((,class :foreground ,fg-special-warm))) - `(helm-lisp-show-completion ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-yellow - 'modus-theme-refine-yellow - 'modus-theme-nuanced-yellow - yellow - 'bold)))) - `(helm-locate-finish ((,class :foreground ,green-active))) - `(helm-match ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-cyan - 'modus-theme-refine-cyan - 'modus-theme-nuanced-cyan - cyan - 'bold)))) - `(helm-match-item ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-neutral - 'modus-theme-subtle-cyan - 'modus-theme-nuanced-cyan - cyan-alt-other)))) - `(helm-minibuffer-prompt ((,class :inherit minibuffer-prompt))) - `(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 - 'modus-theme-nuanced-magenta - magenta-alt - 'bold)))) - `(helm-non-file-buffer ((,class :foreground ,fg-alt))) - `(helm-prefarg ((,class :foreground ,red-active))) - `(helm-resume-need-update ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-refine-magenta - 'modus-theme-nuanced-magenta - magenta-alt-other)))) - `(helm-selection ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-blue - 'modus-theme-refine-blue - 'modus-theme-special-cold - nil - 'bold)))) - `(helm-selection-line ((,class :inherit modus-theme-special-cold))) - `(helm-separator ((,class :foreground ,fg-special-mild))) - `(helm-time-zone-current ((,class :foreground ,green))) - `(helm-time-zone-home ((,class :foreground ,magenta))) - `(helm-source-header ((,class :inherit bold :foreground ,red-alt - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))) - `(helm-top-columns ((,class :inherit helm-header))) - `(helm-ucs-char ((,class :foreground ,yellow-alt-other))) - `(helm-visible-mark ((,class :inherit modus-theme-subtle-cyan))) -;;;;; helm-ls-git - `(helm-ls-git-added-copied-face ((,class :foreground ,green-intense))) - `(helm-ls-git-added-modified-face ((,class :foreground ,yellow-intense))) - `(helm-ls-git-conflict-face ((,class :inherit bold :foreground ,red-intense))) - `(helm-ls-git-deleted-and-staged-face ((,class :foreground ,red-nuanced))) - `(helm-ls-git-deleted-not-staged-face ((,class :foreground ,red))) - `(helm-ls-git-modified-and-staged-face ((,class :foreground ,yellow-nuanced))) - `(helm-ls-git-modified-not-staged-face ((,class :foreground ,yellow))) - `(helm-ls-git-renamed-modified-face ((,class :foreground ,magenta))) - `(helm-ls-git-untracked-face ((,class :foreground ,fg-special-cold))) -;;;;; helm-switch-shell - `(helm-switch-shell-new-shell-face ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-refine-magenta - 'modus-theme-nuanced-magenta - magenta-alt-other - 'bold)))) -;;;;; helm-xref - `(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 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))) - `(hi-blue-b ((,class :inherit modus-theme-intense-blue))) - `(hi-green ((,class :background ,bg-alt :foreground ,green :underline t))) - `(hi-green-b ((,class :inherit modus-theme-intense-green))) - `(hi-pink ((,class :background ,bg-alt :foreground ,magenta :underline t))) - `(hi-red-b ((,class :inherit modus-theme-intense-red))) - `(hi-yellow ((,class :background ,bg-alt :foreground ,yellow :underline t))) - `(highlight ((,class :inherit modus-theme-subtle-blue))) - `(highlight-changes ((,class :foreground ,yellow-alt-other))) - `(highlight-changes-delete ((,class :foreground ,red-alt-other :underline t))) - `(hl-line ((,class :inherit modus-theme-hl-line))) -;;;;; highlight-blocks - `(highlight-blocks-depth-1-face ((,class :background ,bg-dim :foreground ,fg-main))) - `(highlight-blocks-depth-2-face ((,class :background ,bg-alt :foreground ,fg-main))) - `(highlight-blocks-depth-3-face ((,class :background ,bg-special-cold :foreground ,fg-main))) - `(highlight-blocks-depth-4-face ((,class :background ,bg-special-calm :foreground ,fg-main))) - `(highlight-blocks-depth-5-face ((,class :background ,bg-special-warm :foreground ,fg-main))) - `(highlight-blocks-depth-6-face ((,class :background ,bg-special-mild :foreground ,fg-main))) - `(highlight-blocks-depth-7-face ((,class :background ,bg-inactive :foreground ,fg-main))) - `(highlight-blocks-depth-8-face ((,class :background ,bg-active :foreground ,fg-main))) - `(highlight-blocks-depth-9-face ((,class :background ,cyan-subtle-bg :foreground ,fg-main))) -;;;;; highlight-defined - `(highlight-defined-builtin-function-name-face ((,class :foreground ,magenta))) - `(highlight-defined-face-name-face ((,class :foreground ,fg-main))) - `(highlight-defined-function-name-face ((,class :foreground ,magenta))) - `(highlight-defined-macro-name-face ((,class :foreground ,magenta-alt))) - `(highlight-defined-special-form-name-face ((,class :foreground ,magenta-alt-other))) - `(highlight-defined-variable-name-face ((,class :foreground ,cyan))) -;;;;; highlight-escape-sequences (`hes-mode') - `(hes-escape-backslash-face ((,class :inherit bold :foreground ,fg-escape-char-construct))) - `(hes-escape-sequence-face ((,class :inherit bold :foreground ,fg-escape-char-backslash))) -;;;;; highlight-indentation - `(highlight-indentation-face ((,class :inherit modus-theme-hl-line))) - `(highlight-indentation-current-column-face ((,class :background ,bg-active))) -;;;;; highlight-numbers - `(highlight-numbers-number ((,class :foreground ,blue-alt-other))) -;;;;; highlight-symbol - `(highlight-symbol-face ((,class :inherit modus-theme-special-mild))) -;;;;; highlight-thing - `(highlight-thing ((,class :background ,bg-alt :foreground ,cyan))) -;;;;; hl-defined - `(hdefd-functions ((,class :foreground ,blue))) - `(hdefd-undefined ((,class :foreground ,red-alt))) - `(hdefd-variables ((,class :foreground ,cyan-alt))) -;;;;; hl-fill-column - `(hl-fill-column-face ((,class :background ,bg-active :foreground ,fg-active))) -;;;;; hl-todo - `(hl-todo ((,class :inherit bold :foreground ,red-alt-other :slant ,modus-theme-slant))) -;;;;; hydra - `(hydra-face-amaranth ((,class :inherit bold :foreground ,yellow))) - `(hydra-face-blue ((,class :inherit bold :foreground ,blue-alt))) - `(hydra-face-pink ((,class :inherit bold :foreground ,magenta-alt))) - `(hydra-face-red ((,class :inherit bold :foreground ,red))) - `(hydra-face-teal ((,class :inherit bold :foreground ,cyan))) -;;;;; hyperlist - `(hyperlist-condition ((,class :foreground ,green))) - `(hyperlist-hashtag ((,class :foreground ,yellow))) - `(hyperlist-operator ((,class :foreground ,blue-alt))) - `(hyperlist-paren ((,class :foreground ,cyan-alt-other))) - `(hyperlist-quote ((,class :foreground ,cyan-alt))) - `(hyperlist-ref ((,class :foreground ,magenta-alt-other))) - `(hyperlist-stars ((,class :foreground ,fg-alt))) - `(hyperlist-tag ((,class :foreground ,red))) - `(hyperlist-toplevel ((,class :inherit bold :foreground ,fg-main))) -;;;;; icomplete - `(icomplete-first-match ((,class :inherit bold - ,@(modus-vivendi-theme-standard-completions - 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 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 - 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))) -;;;;; iflipb - `(iflipb-current-buffer-face ((,class :inherit bold :foreground ,cyan-alt))) - `(iflipb-other-buffer-face ((,class :foreground ,fg-alt))) -;;;;; imenu-list - `(imenu-list-entry-face-0 ((,class :foreground ,cyan))) - `(imenu-list-entry-face-1 ((,class :foreground ,blue))) - `(imenu-list-entry-face-2 ((,class :foreground ,cyan-alt-other))) - `(imenu-list-entry-face-3 ((,class :foreground ,blue-alt))) - `(imenu-list-entry-subalist-face-0 ((,class :inherit bold :foreground ,magenta-alt-other :underline t))) - `(imenu-list-entry-subalist-face-1 ((,class :inherit bold :foreground ,magenta :underline t))) - `(imenu-list-entry-subalist-face-2 ((,class :inherit bold :foreground ,green-alt-other :underline t))) - `(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 :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 ,@(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 modus-theme-heading-3))) - `(info-menu-star ((,class :foreground ,red))) - `(info-node ((,class :inherit bold))) - `(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))) - `(info-colors-ref-item-constant ((,class :foreground ,blue-alt-other))) - `(info-colors-ref-item-function ((,class :foreground ,magenta))) - `(info-colors-ref-item-macro ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-alt-other))) - `(info-colors-ref-item-other ((,class :foreground ,cyan))) - `(info-colors-ref-item-special-form ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-alt-other))) - `(info-colors-ref-item-syntax-class ((,class :foreground ,magenta))) - `(info-colors-ref-item-type ((,class :foreground ,magenta-alt))) - `(info-colors-ref-item-user-option ((,class :foreground ,cyan))) - `(info-colors-ref-item-variable ((,class :foreground ,cyan))) -;;;;; interaction-log - `(ilog-buffer-face ((,class :foreground ,magenta-alt-other))) - `(ilog-change-face ((,class :foreground ,magenta-alt))) - `(ilog-echo-face ((,class :foreground ,yellow-alt-other))) - `(ilog-load-face ((,class :foreground ,green))) - `(ilog-message-face ((,class :foreground ,fg-alt))) - `(ilog-non-change-face ((,class :foreground ,blue))) -;;;;; ioccur - `(ioccur-cursor ((,class :foreground ,fg-main))) - `(ioccur-invalid-regexp ((,class :foreground ,red))) - `(ioccur-match-face ((,class :inherit modus-theme-special-calm))) - `(ioccur-match-overlay-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t)) - :inherit modus-theme-special-cold))) - `(ioccur-num-line-face ((,class :foreground ,fg-special-warm))) - `(ioccur-overlay-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t)) - :inherit modus-theme-refine-blue))) - `(ioccur-regexp-face ((,class :inherit (modus-theme-intense-magenta bold)))) - `(ioccur-title-face ((,class :inherit bold :foreground ,red-alt - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))) -;;;;; isearch, occur, and the like - `(isearch ((,class :inherit (modus-theme-intense-green bold)))) - `(isearch-fail ((,class :inherit modus-theme-refine-red))) - `(lazy-highlight ((,class :inherit modus-theme-refine-cyan))) - `(match ((,class :inherit modus-theme-special-calm))) - `(query-replace ((,class :inherit (modus-theme-intense-yellow bold)))) -;;;;; ivy - `(ivy-action ((,class :inherit bold :foreground ,red-alt))) - `(ivy-completions-annotations ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(ivy-confirm-face ((,class :foreground ,cyan))) - `(ivy-current-match ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-refine-cyan - 'modus-theme-intense-cyan - 'modus-theme-special-warm - nil - 'bold)))) - `(ivy-cursor ((,class :background ,fg-main :foreground ,bg-main))) - `(ivy-grep-info ((,class :foreground ,cyan-alt))) - `(ivy-grep-line-number ((,class :foreground ,fg-special-warm))) - `(ivy-highlight-face ((,class :foreground ,magenta))) - `(ivy-match-required-face ((,class :inherit error))) - `(ivy-minibuffer-match-face-1 ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-neutral - 'modus-theme-intense-neutral - 'modus-theme-subtle-neutral - fg-alt)))) - `(ivy-minibuffer-match-face-2 ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-green - 'modus-theme-refine-green - 'modus-theme-nuanced-green - green-alt-other - 'bold)))) - `(ivy-minibuffer-match-face-3 ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-cyan - 'modus-theme-refine-cyan - 'modus-theme-nuanced-cyan - cyan-alt-other - 'bold)))) - `(ivy-minibuffer-match-face-4 ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-refine-magenta - 'modus-theme-nuanced-magenta - magenta-alt-other - 'bold)))) - `(ivy-minibuffer-match-highlight ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-blue - 'modus-theme-intense-blue - 'modus-theme-nuanced-blue - blue-alt-other - 'bold)))) - `(ivy-modified-buffer ((,class :foreground ,yellow :slant ,modus-theme-slant))) - `(ivy-modified-outside-buffer ((,class :foreground ,yellow-alt :slant ,modus-theme-slant))) - `(ivy-org ((,class :foreground ,cyan-alt-other))) - `(ivy-prompt-match ((,class :inherit ivy-current-match))) - `(ivy-remote ((,class :foreground ,magenta))) - `(ivy-separator ((,class :foreground ,fg-alt))) - `(ivy-subdir ((,class :foreground ,blue-alt-other))) - `(ivy-virtual ((,class :foreground ,magenta-alt-other))) - `(ivy-yanked-word ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-blue - 'modus-theme-refine-blue - 'modus-theme-nuanced-blue - blue-alt)))) -;;;;; ivy-posframe - `(ivy-posframe ((,class :background ,bg-dim :foreground ,fg-main))) - `(ivy-posframe-border ((,class :background ,bg-active))) - `(ivy-posframe-cursor ((,class :background ,fg-main :foreground ,bg-main))) -;;;;; jira (org-jira) - `(jiralib-comment-face ((,class :background ,bg-alt))) - `(jiralib-comment-header-face ((,class :inherit bold))) - `(jiralib-issue-info-face ((,class :inherit modus-theme-special-warm))) - `(jiralib-issue-info-header-face ((,class :inherit (modus-theme-special-warm bold)))) - `(jiralib-issue-summary-face ((,class :inherit bold))) - `(jiralib-link-filter-face ((,class :underline t))) - `(jiralib-link-issue-face ((,class :underline t))) - `(jiralib-link-project-face ((,class :underline t))) -;;;;; journalctl-mode - `(journalctl-error-face ((,class :inherit bold :foreground ,red))) - `(journalctl-finished-face ((,class :inherit bold :foreground ,green))) - `(journalctl-host-face ((,class :foreground ,blue))) - `(journalctl-process-face ((,class :foreground ,cyan-alt-other))) - `(journalctl-starting-face ((,class :foreground ,green))) - `(journalctl-timestamp-face ((,class :foreground ,fg-special-cold))) - `(journalctl-warning-face ((,class :inherit bold :foreground ,yellow))) -;;;;; js2-mode - `(js2-error ((,class :foreground ,red))) - `(js2-external-variable ((,class :foreground ,cyan-alt-other))) - `(js2-function-call ((,class :foreground ,magenta))) - `(js2-function-param ((,class :foreground ,blue))) - `(js2-instance-member ((,class :foreground ,magenta-alt-other))) - `(js2-jsdoc-html-tag-delimiter ((,class :foreground ,fg-main))) - `(js2-jsdoc-html-tag-name ((,class :foreground ,cyan))) - `(js2-jsdoc-tag ((,class :foreground ,fg-special-calm))) - `(js2-jsdoc-type ((,class :foreground ,fg-special-cold))) - `(js2-jsdoc-value ((,class :foreground ,fg-special-warm))) - `(js2-object-property ((,class :foreground ,fg-main))) - `(js2-object-property-access ((,class :foreground ,fg-main))) - `(js2-private-function-call ((,class :foreground ,green-alt-other))) - `(js2-private-member ((,class :foreground ,fg-special-mild))) - `(js2-warning ((,class :foreground ,yellow-alt :underline t))) -;;;;; julia - `(julia-macro-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta))) - `(julia-quoted-symbol-face ((,class :foreground ,blue-alt-other))) -;;;;; jupyter - `(jupyter-eval-overlay ((,class :inherit bold :foreground ,blue))) - `(jupyter-repl-input-prompt ((,class :foreground ,cyan-alt-other))) - `(jupyter-repl-output-prompt ((,class :foreground ,magenta-alt-other))) - `(jupyter-repl-traceback ((,class :inherit modus-theme-intense-red))) -;;;;; kaocha-runner - `(kaocha-runner-error-face ((,class :foreground ,red))) - `(kaocha-runner-success-face ((,class :foreground ,green))) - `(kaocha-runner-warning-face ((,class :foreground ,yellow))) -;;;;; keycast - `(keycast-command ((,class :inherit bold :foreground ,blue-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 :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))) - `(lsp-face-highlight-write ((,class :inherit (modus-theme-refine-blue bold)))) - `(lsp-face-semhl-constant ((,class :foreground ,blue-alt-other))) - `(lsp-face-semhl-deprecated - ((,(append '((supports :underline (:style wave))) class) - :foreground ,yellow :underline (:style wave)) - (,class :foreground ,yellow :underline t))) - `(lsp-face-semhl-enummember ((,class :foreground ,blue-alt-other))) - `(lsp-face-semhl-field ((,class :foreground ,cyan-alt))) - `(lsp-face-semhl-field-static ((,class :foreground ,cyan-alt :slant ,modus-theme-slant))) - `(lsp-face-semhl-function ((,class :foreground ,magenta))) - `(lsp-face-semhl-method ((,class :foreground ,magenta))) - `(lsp-face-semhl-namespace ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-alt))) - `(lsp-face-semhl-preprocessor ((,class :foreground ,red-alt-other))) - `(lsp-face-semhl-static-method ((,class :foreground ,magenta :slant ,modus-theme-slant))) - `(lsp-face-semhl-type-class ((,class :foreground ,magenta-alt))) - `(lsp-face-semhl-type-enum ((,class :foreground ,magenta-alt))) - `(lsp-face-semhl-type-primitive ((,class :foreground ,magenta-alt :slant ,modus-theme-slant))) - `(lsp-face-semhl-type-template ((,class :foreground ,magenta-alt :slant ,modus-theme-slant))) - `(lsp-face-semhl-type-typedef ((,class :foreground ,magenta-alt :slant ,modus-theme-slant))) - `(lsp-face-semhl-variable ((,class :foreground ,cyan))) - `(lsp-face-semhl-variable-local ((,class :foreground ,cyan))) - `(lsp-face-semhl-variable-parameter ((,class :foreground ,cyan-alt-other))) - `(lsp-lens-face ((,class :height 0.8 :foreground ,fg-alt))) - `(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 :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))) - `(lsp-ui-peek-highlight ((,class :inherit modus-theme-subtle-blue))) - `(lsp-ui-peek-line-number ((,class :foreground ,fg-alt))) - `(lsp-ui-peek-list ((,class :background ,bg-dim))) - `(lsp-ui-peek-peek ((,class :background ,bg-alt))) - `(lsp-ui-peek-selection ((,class :inherit modus-theme-subtle-cyan))) - `(lsp-ui-sideline-code-action ((,class :foreground ,yellow))) - `(lsp-ui-sideline-current-symbol ((,class :inherit bold :height 0.99 :box (:line-width -1 :style nil) :foreground ,fg-main))) - `(lsp-ui-sideline-symbol ((,class :inherit bold :height 0.99 :box (:line-width -1 :style nil) :foreground ,fg-alt))) - `(lsp-ui-sideline-symbol-info ((,class :height 0.99 :slant italic))) -;;;;; magit - `(magit-bisect-bad ((,class :foreground ,red-alt-other))) - `(magit-bisect-good ((,class :foreground ,green-alt-other))) - `(magit-bisect-skip ((,class :foreground ,yellow-alt-other))) - `(magit-blame-date ((,class :foreground ,blue))) - `(magit-blame-dimmed ((,class :foreground ,fg-alt))) - `(magit-blame-hash ((,class :foreground ,fg-special-warm))) - `(magit-blame-heading ((,class :background ,bg-alt))) - `(magit-blame-highlight ((,class :inherit modus-theme-nuanced-cyan))) - `(magit-blame-margin ((,class :inherit magit-blame-highlight))) - `(magit-blame-name ((,class :foreground ,magenta-alt-other))) - `(magit-blame-summary ((,class :foreground ,cyan-alt-other))) - `(magit-branch-current ((,class :foreground ,blue-alt-other :box t))) - `(magit-branch-local ((,class :foreground ,blue-alt))) - `(magit-branch-remote ((,class :foreground ,magenta-alt))) - `(magit-branch-remote-head ((,class :foreground ,magenta-alt-other :box t))) - `(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))) - ;; 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 - 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 - 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-diff - bg-dim fg-dim - 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 :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-diff - bg-main red - 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))) - `(magit-filename ((,class :foreground ,fg-special-cold))) - `(magit-hash ((,class :foreground ,fg-alt))) - `(magit-head ((,class :inherit magit-branch-local))) - `(magit-header-line ((,class :inherit bold :foreground ,magenta-active))) - `(magit-header-line-key ((,class :inherit bold :foreground ,red-active))) - `(magit-header-line-log-select ((,class :inherit bold :foreground ,fg-main))) - `(magit-keyword ((,class :foreground ,magenta))) - `(magit-keyword-squash ((,class :inherit bold :foreground ,yellow-alt-other))) - `(magit-log-author ((,class :foreground ,cyan))) - `(magit-log-date ((,class :foreground ,fg-alt))) - `(magit-log-graph ((,class :foreground ,fg-dim))) - `(magit-mode-line-process ((,class :inherit bold :foreground ,blue-active))) - `(magit-mode-line-process-error ((,class :inherit bold :foreground ,red-active))) - `(magit-process-ng ((,class :inherit error))) - `(magit-process-ok ((,class :inherit success))) - `(magit-reflog-amend ((,class :background ,bg-main :foreground ,magenta-intense))) - `(magit-reflog-checkout ((,class :background ,bg-main :foreground ,blue-intense))) - `(magit-reflog-cherry-pick ((,class :background ,bg-main :foreground ,green-intense))) - `(magit-reflog-commit ((,class :background ,bg-main :foreground ,green-intense))) - `(magit-reflog-merge ((,class :background ,bg-main :foreground ,green-intense))) - `(magit-reflog-other ((,class :background ,bg-main :foreground ,cyan-intense))) - `(magit-reflog-rebase ((,class :background ,bg-main :foreground ,magenta-intense))) - `(magit-reflog-remote ((,class :background ,bg-main :foreground ,cyan-intense))) - `(magit-reflog-reset ((,class :background ,bg-main :foreground ,red-intense))) - `(magit-refname ((,class :foreground ,fg-alt))) - `(magit-refname-pullreq ((,class :foreground ,fg-alt))) - `(magit-refname-stash ((,class :foreground ,fg-alt))) - `(magit-refname-wip ((,class :foreground ,fg-alt))) - `(magit-section ((,class :background ,bg-dim :foreground ,fg-main))) - `(magit-section-heading ((,class :inherit bold :foreground ,cyan))) - `(magit-section-heading-selection ((,class :inherit (modus-theme-refine-cyan bold)))) - `(magit-section-highlight ((,class :background ,bg-alt))) - `(magit-sequence-done ((,class :foreground ,green-alt))) - `(magit-sequence-drop ((,class :foreground ,red-alt))) - `(magit-sequence-exec ((,class :foreground ,magenta-alt))) - `(magit-sequence-head ((,class :foreground ,cyan-alt))) - `(magit-sequence-onto ((,class :foreground ,fg-alt))) - `(magit-sequence-part ((,class :foreground ,yellow-alt))) - `(magit-sequence-pick ((,class :foreground ,blue-alt))) - `(magit-sequence-stop ((,class :foreground ,red))) - `(magit-signature-bad ((,class :inherit bold :foreground ,red))) - `(magit-signature-error ((,class :foreground ,red-alt))) - `(magit-signature-expired ((,class :foreground ,yellow))) - `(magit-signature-expired-key ((,class :foreground ,yellow))) - `(magit-signature-good ((,class :foreground ,green))) - `(magit-signature-revoked ((,class :foreground ,magenta))) - `(magit-signature-untrusted ((,class :foreground ,cyan))) - `(magit-tag ((,class :foreground ,yellow-alt-other))) -;;;;; magit-imerge - `(magit-imerge-overriding-value ((,class :inherit bold :foreground ,red-alt))) -;;;;; man - `(Man-overstrike ((,class :inherit bold :foreground ,magenta))) - `(Man-reverse ((,class :inherit modus-theme-subtle-magenta))) - `(Man-underline ((,class :foreground ,cyan :underline t))) -;;;;; markdown-mode - `(markdown-blockquote-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(markdown-bold-face ((,class :inherit bold))) - `(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 ((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 ,@(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 ,@(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))) - `(markdown-list-face ((,class :foreground ,fg-dim))) - `(markdown-markup-face ((,class :foreground ,fg-alt))) - `(markdown-math-face ((,class :foreground ,magenta-alt-other))) - `(markdown-metadata-key-face ((,class :foreground ,cyan-alt-other))) - `(markdown-metadata-value-face ((,class :foreground ,blue-alt))) - `(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)) - ,@(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 ,@(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))) - `(markup-big-face ((,class :height 1.3 :foreground ,blue-nuanced))) - `(markup-bold-face ((,class :inherit bold :foreground ,red-nuanced))) - `(markup-code-face ((,class :inherit fixed-pitch :foreground ,magenta))) - `(markup-command-face ((,class :foreground ,fg-inactive))) - `(markup-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(markup-complex-replacement-face ((,class :box (:line-width 2 :color nil :style released-button) - :inherit modus-theme-refine-magenta))) - `(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 :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))) - `(markup-meta-hide-face ((,class :foreground ,fg-alt))) - `(markup-passthrough-face ((,class :inherit fixed-pitch :foreground ,cyan))) - `(markup-preprocessor-face ((,class :foreground ,red-alt-other))) - `(markup-replacement-face ((,class :foreground ,yellow-alt-other))) - `(markup-secondary-text-face ((,class :height 0.8 :foreground ,magenta-nuanced))) - `(markup-small-face ((,class :height 0.8 :foreground ,fg-main))) - `(markup-strong-face ((,class :inherit bold :foreground ,red-nuanced))) - `(markup-subscript-face ((,class :height 0.8 :foreground ,fg-special-cold))) - `(markup-superscript-face ((,class :height 0.8 :foreground ,fg-special-cold))) - `(markup-table-cell-face ((,class :inherit modus-theme-special-cold))) - `(markup-table-face ((,class :inherit modus-theme-subtle-cyan))) - `(markup-table-row-face ((,class :inherit modus-theme-subtle-cyan))) - `(markup-title-0-face ((,class :height 3.0 :foreground ,blue-nuanced))) - `(markup-title-1-face ((,class :height 2.4 :foreground ,blue-nuanced))) - `(markup-title-2-face ((,class :height 1.8 :foreground ,blue-nuanced))) - `(markup-title-3-face ((,class :height 1.4 :foreground ,blue-nuanced))) - `(markup-title-4-face ((,class :height 1.2 :foreground ,blue-nuanced))) - `(markup-title-5-face ((,class :height 1.2 :foreground ,blue-nuanced :underline t))) - `(markup-value-face ((,class :foreground ,fg-inactive))) - `(markup-verbatim-face ((,class :inherit modus-theme-special-mild))) -;;;;; mentor - `(mentor-download-message ((,class :foreground ,fg-special-warm))) - `(mentor-download-name ((,class :foreground ,fg-special-cold))) - `(mentor-download-progress ((,class :foreground ,blue-alt-other))) - `(mentor-download-size ((,class :foreground ,magenta-alt-other))) - `(mentor-download-speed-down ((,class :foreground ,cyan-alt))) - `(mentor-download-speed-up ((,class :foreground ,red-alt))) - `(mentor-download-state ((,class :foreground ,yellow-alt))) - `(mentor-highlight-face ((,class :inherit modus-theme-subtle-blue))) - `(mentor-tracker-name ((,class :foreground ,magenta-alt))) -;;;;; messages - `(message-cited-text-1 ((,class :foreground ,blue-alt))) - `(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 :inherit bold :foreground ,cyan-alt))) - `(message-header-name ((,class :foreground ,green-alt-other))) - `(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 ,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 ,@(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 ,@(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))) - `(mood-line-status-info ((,class :foreground ,cyan-active))) - `(mood-line-status-neutral ((,class :foreground ,blue-active))) - `(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))) - `(mu4e-cited-2-face ((,class :foreground ,red-alt))) - `(mu4e-cited-3-face ((,class :foreground ,green-alt))) - `(mu4e-cited-4-face ((,class :foreground ,magenta-alt))) - `(mu4e-cited-5-face ((,class :foreground ,yellow-alt))) - `(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 :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))) - `(mu4e-flagged-face ((,class :foreground ,red-alt))) - `(mu4e-footer-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(mu4e-forwarded-face ((,class :foreground ,magenta-alt-other))) - `(mu4e-header-face ((,class :foreground ,fg-alt))) - `(mu4e-header-highlight-face ((,class :inherit modus-theme-hl-line))) - `(mu4e-header-key-face ((,class :foreground ,cyan))) - `(mu4e-header-marks-face ((,class :inherit bold :foreground ,magenta-alt))) - `(mu4e-header-title-face ((,class :foreground ,fg-special-mild))) - `(mu4e-header-value-face ((,class :inherit bold :foreground ,magenta-alt-other))) - `(mu4e-highlight-face ((,class :inherit bold :foreground ,blue-alt-other))) - `(mu4e-link-face ((,class :inherit link))) - `(mu4e-modeline-face ((,class :foreground ,magenta-active))) - `(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 ,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))) - `(mu4e-trashed-face ((,class :foreground ,red))) - `(mu4e-unread-face ((,class :inherit bold :foreground ,fg-main))) - `(mu4e-url-number-face ((,class :inherit bold :foreground ,cyan-alt-other))) - `(mu4e-view-body-face ((,class :foreground ,fg-main))) - `(mu4e-warning-face ((,class :inherit warning))) -;;;;; mu4e-conversation - `(mu4e-conversation-header ((,class :inherit modus-theme-special-cold))) - `(mu4e-conversation-sender-1 ((,class :foreground ,fg-special-warm))) - `(mu4e-conversation-sender-2 ((,class :foreground ,fg-special-cold))) - `(mu4e-conversation-sender-3 ((,class :foreground ,fg-special-mild))) - `(mu4e-conversation-sender-4 ((,class :foreground ,fg-alt))) - `(mu4e-conversation-sender-5 ((,class :foreground ,yellow-refine-fg))) - `(mu4e-conversation-sender-6 ((,class :foreground ,cyan-refine-fg))) - `(mu4e-conversation-sender-7 ((,class :foreground ,green-refine-fg))) - `(mu4e-conversation-sender-8 ((,class :foreground ,blue-refine-fg))) - `(mu4e-conversation-sender-me ((,class :foreground ,fg-main))) - `(mu4e-conversation-unread ((,class :inherit bold))) -;;;;; multiple-cursors - `(mc/cursor-bar-face ((,class :height 1 :background ,fg-main))) - `(mc/cursor-face ((,class :inverse-video t))) - `(mc/region-face ((,class :inherit region))) -;;;;; neotree - `(neo-banner-face ((,class :foreground ,magenta))) - `(neo-button-face ((,class :inherit button))) - `(neo-dir-link-face ((,class :inherit bold :foreground ,blue))) - `(neo-expand-btn-face ((,class :foreground ,cyan))) - `(neo-file-link-face ((,class :foreground ,fg-main))) - `(neo-header-face ((,class :inherit bold :foreground ,fg-main))) - `(neo-root-dir-face ((,class :inherit bold :foreground ,cyan-alt))) - `(neo-vc-added-face ((,class :foreground ,green))) - `(neo-vc-conflict-face ((,class :inherit bold :foreground ,red))) - `(neo-vc-default-face ((,class :foreground ,fg-main))) - `(neo-vc-edited-face ((,class :foreground ,yellow))) - `(neo-vc-ignored-face ((,class :foreground ,fg-inactive))) - `(neo-vc-missing-face ((,class :foreground ,red-alt))) - `(neo-vc-needs-merge-face ((,class :foreground ,magenta-alt))) - `(neo-vc-needs-update-face ((,class :underline t))) - `(neo-vc-removed-face ((,class :strike-through t))) - `(neo-vc-unlocked-changes-face ((,class :inherit modus-theme-refine-blue))) - `(neo-vc-up-to-date-face ((,class :foreground ,fg-alt))) - `(neo-vc-user-face ((,class :foreground ,magenta))) -;;;;; no-emoji - `(no-emoji ((,class :foreground ,cyan))) -;;;;; notmuch - `(notmuch-crypto-decryption ((,class :inherit modus-theme-refine-magenta))) - `(notmuch-crypto-part-header ((,class :foreground ,magenta-alt-other))) - `(notmuch-crypto-signature-bad ((,class :inherit modus-theme-intense-red))) - `(notmuch-crypto-signature-good ((,class :inherit modus-theme-refine-green))) - `(notmuch-crypto-signature-good-key ((,class :inherit modus-theme-refine-yellow))) - `(notmuch-crypto-signature-unknown ((,class :inherit modus-theme-refine-red))) - `(notmuch-hello-logo-background ((,class :background ,bg-main))) - `(notmuch-message-summary-face ((,class :inherit modus-theme-nuanced-cyan))) - `(notmuch-search-flagged-face ((,class :foreground ,red-alt))) - `(notmuch-search-matching-authors ((,class :foreground ,fg-main))) - `(notmuch-search-non-matching-authors ((,class :foreground ,fg-alt))) - `(notmuch-search-unread-face ((,class :inherit bold))) - `(notmuch-tag-added - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,green :style wave)) - (,class :foreground ,green :underline t))) - `(notmuch-tag-deleted - ((,(append '((supports :underline (:style wave))) class) - :underline (:color ,red :style wave)) - (,class :foreground ,red :underline t))) - `(notmuch-tag-face ((,class :inherit bold :foreground ,blue-alt))) - `(notmuch-tag-flagged ((,class :foreground ,red-alt))) - `(notmuch-tag-unread ((,class :foreground ,magenta-alt))) - `(notmuch-tree-match-author-face ((,class :foreground ,fg-special-cold))) - `(notmuch-tree-match-face ((,class :foreground ,fg-main))) - `(notmuch-tree-match-tag-face ((,class :inherit bold :foreground ,blue-alt))) - `(notmuch-tree-no-match-face ((,class :foreground ,fg-alt))) - `(notmuch-wash-cited-text ((,class :foreground ,cyan))) - `(notmuch-wash-toggle-button ((,class :background ,bg-alt :foreground ,fg-alt))) -;;;;; num3-mode - `(num3-face-even ((,class :inherit bold :background ,bg-alt))) -;;;;; nxml-mode - `(nxml-attribute-colon ((,class :foreground ,fg-main))) - `(nxml-attribute-local-name ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan-alt cyan-alt-faint)))) - `(nxml-attribute-prefix ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(nxml-attribute-value ((,class ,@(modus-vivendi-theme-syntax-foreground - blue blue-faint)))) - `(nxml-cdata-section-CDATA ((,class ,@(modus-vivendi-theme-syntax-foreground - red-alt red-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(nxml-cdata-section-delimiter ((,class ,@(modus-vivendi-theme-syntax-foreground - red-alt red-alt-faint)))) - `(nxml-char-ref-delimiter ((,class ,@(modus-vivendi-theme-syntax-foreground - green-alt-other green-alt-other-faint)))) - `(nxml-char-ref-number ((,class ,@(modus-vivendi-theme-syntax-foreground - green-alt-other green-alt-other-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(nxml-delimited-data ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(nxml-delimiter ((,class :foreground ,fg-dim))) - `(nxml-element-colon ((,class :foreground ,fg-main))) - `(nxml-element-local-name ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(nxml-element-prefix ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(nxml-entity-ref-delimiter ((,class ,@(modus-vivendi-theme-syntax-foreground - green-alt-other green-alt-other-faint)))) - `(nxml-entity-ref-name ((,class ,@(modus-vivendi-theme-syntax-foreground - green-alt-other green-alt-other-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(nxml-glyph ((,class :inherit modus-theme-intense-neutral))) - `(nxml-hash ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt blue-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(nxml-heading ((,class :inherit bold))) - `(nxml-name ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(nxml-namespace-attribute-colon ((,class :foreground ,fg-main))) - `(nxml-namespace-attribute-prefix ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan cyan-faint)))) - `(nxml-processing-instruction-target ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(nxml-prolog-keyword ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(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-other blue-nuanced-bg - blue-refine-bg blue-refine-fg)))) - `(orderless-match-face-1 ((,class :inherit bold - ,@(modus-vivendi-theme-standard-completions - magenta-alt magenta-nuanced-bg - magenta-refine-bg magenta-refine-fg)))) - `(orderless-match-face-2 ((,class :inherit bold - ,@(modus-vivendi-theme-standard-completions - green green-nuanced-bg - green-refine-bg green-refine-fg)))) - `(orderless-match-face-3 ((,class :inherit bold - ,@(modus-vivendi-theme-standard-completions - 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 - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(org-agenda-column-dateline ((,class :background ,bg-alt))) - `(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 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 :foreground ,blue-alt))) - `(org-archived ((,class :background ,bg-alt :foreground ,fg-alt))) - `(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)))) - `(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 :inherit org-done))) - `(org-checkbox-statistics-todo ((,class :inherit org-todo))) - `(org-clock-overlay ((,class :inherit modus-theme-special-cold))) - `(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 (button fixed-pitch) :foreground ,cyan-alt-other))) - `(org-date-selected ((,class :inherit bold :foreground ,blue-alt :inverse-video t))) - `(org-document-info ((,class :foreground ,fg-special-cold))) - `(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 :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 :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))) - `(org-habit-clear-future-face ((,class :inherit modus-theme-refine-magenta))) - `(org-habit-overdue-face ((,class :inherit modus-theme-intense-red))) - `(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 :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 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 :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 :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-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 :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 ,@(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 - `(org-journal-calendar-entry-face ((,class :foreground ,yellow-alt-other :slant ,modus-theme-slant))) - `(org-journal-calendar-scheduled-face ((,class :foreground ,red-alt-other :slant ,modus-theme-slant))) - `(org-journal-highlight ((,class :foreground ,magenta-alt))) -;;;;; org-noter - `(org-noter-no-notes-exist-face ((,class :inherit bold :foreground ,red-active))) - `(org-noter-notes-exist-face ((,class :inherit bold :foreground ,green-active))) -;;;;; org-pomodoro - `(org-pomodoro-mode-line ((,class :foreground ,red-active))) - `(org-pomodoro-mode-line-break ((,class :foreground ,cyan-active))) - `(org-pomodoro-mode-line-overtime ((,class :inherit bold :foreground ,red-active))) -;;;;; org-recur - `(org-recur ((,class :foreground ,magenta-active))) -;;;;; org-roam - `(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))) -;;;;; org-table-sticky-header - `(org-table-sticky-header-face ((,class :inherit modus-theme-intense-neutral))) -;;;;; org-treescope - `(org-treescope-faces--markerinternal-midday ((,class :inherit modus-theme-intense-blue))) - `(org-treescope-faces--markerinternal-range ((,class :inherit modus-theme-special-mild))) -;;;;; origami - `(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 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 nil))) -;;;;; package (M-x list-packages) - `(package-description ((,class :foreground ,fg-special-cold))) - `(package-help-section-name ((,class :inherit bold :foreground ,magenta-alt-other))) - `(package-name ((,class :inherit link))) - `(package-status-avail-obso ((,class :inherit bold :foreground ,red))) - `(package-status-available ((,class :foreground ,fg-special-mild))) - `(package-status-built-in ((,class :foreground ,magenta))) - `(package-status-dependency ((,class :foreground ,magenta-alt-other))) - `(package-status-disabled ((,class :inherit modus-theme-subtle-red))) - `(package-status-external ((,class :foreground ,cyan-alt-other))) - `(package-status-held ((,class :foreground ,yellow-alt))) - `(package-status-incompat ((,class :inherit bold :foreground ,yellow))) - `(package-status-installed ((,class :foreground ,fg-special-warm))) - `(package-status-new ((,class :inherit bold :foreground ,green))) - `(package-status-unsigned ((,class :inherit bold :foreground ,red-alt))) -;;;;; page-break-lines - `(page-break-lines ((,class :inherit default :foreground ,fg-window-divider-outer))) -;;;;; paradox - `(paradox-archive-face ((,class :foreground ,fg-special-mild))) - `(paradox-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(paradox-commit-tag-face ((,class :inherit modus-theme-refine-magenta :box t))) - `(paradox-description-face ((,class :foreground ,fg-special-cold))) - `(paradox-description-face-multiline ((,class :foreground ,fg-special-cold))) - `(paradox-download-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,blue-alt-other))) - `(paradox-highlight-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,cyan-alt-other))) - `(paradox-homepage-button-face ((,class :foreground ,magenta-alt-other :underline t))) - `(paradox-mode-line-face ((,class :inherit bold :foreground ,cyan-active))) - `(paradox-name-face ((,class :foreground ,blue :underline t))) - `(paradox-star-face ((,class :foreground ,magenta))) - `(paradox-starred-face ((,class :foreground ,magenta-alt))) -;;;;; paren-face - `(parenthesis ((,class :foreground ,fg-unfocused))) -;;;;; parrot - `(parrot-rotate-rotation-highlight-face ((,class :inherit modus-theme-refine-magenta))) -;;;;; pass - `(pass-mode-directory-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(pass-mode-entry-face ((,class :background ,bg-main :foreground ,fg-main))) - `(pass-mode-header-face ((,class :foreground ,fg-special-warm))) -;;;;; persp-mode - `(persp-face-lighter-buffer-not-in-persp ((,class :inherit modus-theme-intense-red))) - `(persp-face-lighter-default ((,class :inherit bold :foreground ,blue-active))) - `(persp-face-lighter-nil-persp ((,class :inherit bold :foreground ,fg-active))) -;;;;; perspective - `(persp-selected-face ((,class :inherit bold :foreground ,blue-active))) -;;;;; phi-grep - `(phi-grep-heading-face ((,class :inherit bold :foreground ,red-alt - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))) - `(phi-grep-line-number-face ((,class :foreground ,fg-special-warm))) - `(phi-grep-match-face ((,class :inherit modus-theme-special-calm))) - `(phi-grep-modified-face ((,class :inherit modus-theme-refine-yellow))) - `(phi-grep-overlay-face ((,class :inherit modus-theme-refine-blue))) -;;;;; phi-search - `(phi-replace-preview-face ((,class :inherit modus-theme-intense-magenta))) - `(phi-search-failpart-face ((,class :inherit modus-theme-refine-red))) - `(phi-search-match-face ((,class :inherit modus-theme-refine-cyan))) - `(phi-search-selection-face ((,class :inherit (modus-theme-intense-green bold)))) -;;;;; pkgbuild-mode - `(pkgbuild-error-face ((,class :underline ,fg-lang-error))) -;;;;; pomidor - `(pomidor-break-face ((,class :foreground ,blue-alt-other))) - `(pomidor-overwork-face ((,class :foreground ,red-alt-other))) - `(pomidor-skip-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(pomidor-work-face ((,class :foreground ,green-alt-other))) -;;;;; powerline - `(powerline-active0 ((,class :background ,bg-main :foreground ,blue-faint :inverse-video t))) - `(powerline-active1 ((,class :background ,blue-nuanced-bg :foreground ,blue-nuanced))) - `(powerline-active2 ((,class :background ,bg-active :foreground ,fg-active))) - `(powerline-inactive0 ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) - `(powerline-inactive1 ((,class :background ,bg-dim :foreground ,fg-inactive))) - `(powerline-inactive2 ((,class :background ,bg-inactive :foreground ,fg-inactive))) -;;;;; powerline-evil - `(powerline-evil-base-face ((,class :background ,fg-main :foreground ,bg-main))) - `(powerline-evil-emacs-face ((,class :inherit modus-theme-active-magenta))) - `(powerline-evil-insert-face ((,class :inherit modus-theme-active-green))) - `(powerline-evil-motion-face ((,class :inherit modus-theme-active-blue))) - `(powerline-evil-normal-face ((,class :background ,fg-alt :foreground ,bg-main))) - `(powerline-evil-operator-face ((,class :inherit modus-theme-active-yellow))) - `(powerline-evil-replace-face ((,class :inherit modus-theme-active-red))) - `(powerline-evil-visual-face ((,class :inherit modus-theme-active-cyan))) -;;;;; proced - `(proced-mark ((,class :inherit modus-theme-mark-symbol))) - `(proced-marked ((,class :inherit modus-theme-mark-alt))) - `(proced-sort-header ((,class :inherit bold :foreground ,fg-special-calm :underline t))) -;;;;; prodigy - `(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))) - `(rainbow-blocks-depth-3-face ((,class :foreground ,magenta-alt))) - `(rainbow-blocks-depth-4-face ((,class :foreground ,green))) - `(rainbow-blocks-depth-5-face ((,class :foreground ,magenta))) - `(rainbow-blocks-depth-6-face ((,class :foreground ,cyan))) - `(rainbow-blocks-depth-7-face ((,class :foreground ,yellow))) - `(rainbow-blocks-depth-8-face ((,class :foreground ,cyan-alt))) - `(rainbow-blocks-depth-9-face ((,class :foreground ,red-alt))) - `(rainbow-blocks-unmatched-face ((,class :foreground ,red))) -;;;;; rainbow-identifiers - `(rainbow-identifiers-identifier-1 ((,class :foreground ,green-alt-other))) - `(rainbow-identifiers-identifier-2 ((,class :foreground ,magenta-alt-other))) - `(rainbow-identifiers-identifier-3 ((,class :foreground ,cyan-alt-other))) - `(rainbow-identifiers-identifier-4 ((,class :foreground ,yellow-alt-other))) - `(rainbow-identifiers-identifier-5 ((,class :foreground ,blue-alt-other))) - `(rainbow-identifiers-identifier-6 ((,class :foreground ,green-alt))) - `(rainbow-identifiers-identifier-7 ((,class :foreground ,magenta-alt))) - `(rainbow-identifiers-identifier-8 ((,class :foreground ,cyan-alt))) - `(rainbow-identifiers-identifier-9 ((,class :foreground ,yellow-alt))) - `(rainbow-identifiers-identifier-10 ((,class :foreground ,green))) - `(rainbow-identifiers-identifier-11 ((,class :foreground ,magenta))) - `(rainbow-identifiers-identifier-12 ((,class :foreground ,cyan))) - `(rainbow-identifiers-identifier-13 ((,class :foreground ,yellow))) - `(rainbow-identifiers-identifier-14 ((,class :foreground ,blue-alt))) - `(rainbow-identifiers-identifier-15 ((,class :foreground ,red-alt))) -;;;;; rainbow-delimiters - `(rainbow-delimiters-base-face-error ((,class :foreground ,red))) - `(rainbow-delimiters-base-face ((,class :foreground ,fg-main))) - `(rainbow-delimiters-depth-1-face ((,class :foreground ,green-alt-other))) - `(rainbow-delimiters-depth-2-face ((,class :foreground ,magenta-alt-other))) - `(rainbow-delimiters-depth-3-face ((,class :foreground ,cyan-alt-other))) - `(rainbow-delimiters-depth-4-face ((,class :foreground ,yellow-alt-other))) - `(rainbow-delimiters-depth-5-face ((,class :foreground ,blue-alt-other))) - `(rainbow-delimiters-depth-6-face ((,class :foreground ,green-alt))) - `(rainbow-delimiters-depth-7-face ((,class :foreground ,magenta-alt))) - `(rainbow-delimiters-depth-8-face ((,class :foreground ,cyan-alt))) - `(rainbow-delimiters-depth-9-face ((,class :foreground ,yellow-alt))) - `(rainbow-delimiters-mismatched-face ((,class :inherit bold :foreground ,red-alt))) - `(rainbow-delimiters-unmatched-face ((,class :inherit bold :foreground ,red))) -;;;;; rcirc - `(rcirc-bright-nick ((,class :inherit bold :foreground ,magenta-alt))) - `(rcirc-dim-nick ((,class :foreground ,fg-alt))) - `(rcirc-my-nick ((,class :inherit bold :foreground ,magenta))) - `(rcirc-nick-in-message ((,class :foreground ,magenta-alt-other))) - `(rcirc-nick-in-message-full-line ((,class :inherit bold :foreground ,fg-special-mild))) - `(rcirc-other-nick ((,class :inherit bold :foreground ,fg-special-cold))) - `(rcirc-prompt ((,class :inherit bold :foreground ,cyan-alt-other))) - `(rcirc-server ((,class :foreground ,fg-unfocused))) - `(rcirc-timestamp ((,class :foreground ,blue-nuanced))) - `(rcirc-url ((,class :foreground ,blue :underline t))) -;;;;; regexp-builder (re-builder) - `(reb-match-0 ((,class :inherit modus-theme-intense-blue))) - `(reb-match-1 ((,class :inherit modus-theme-intense-magenta))) - `(reb-match-2 ((,class :inherit modus-theme-intense-green))) - `(reb-match-3 ((,class :inherit modus-theme-intense-red))) - `(reb-regexp-grouping-backslash ((,class :inherit bold :foreground ,fg-escape-char-backslash))) - `(reb-regexp-grouping-construct ((,class :inherit bold :foreground ,fg-escape-char-construct))) -;;;;; rg (rg.el) - `(rg-column-number-face ((,class :foreground ,magenta-alt-other))) - `(rg-context-face ((,class :foreground ,fg-unfocused))) - `(rg-error-face ((,class :inherit bold :foreground ,red))) - `(rg-file-tag-face ((,class :foreground ,fg-special-cold))) - `(rg-filename-face ((,class :inherit bold :foreground ,fg-special-cold))) - `(rg-line-number-face ((,class :foreground ,fg-special-warm))) - `(rg-literal-face ((,class :foreground ,blue-alt))) - `(rg-match-face ((,class :inherit modus-theme-special-calm))) - `(rg-regexp-face ((,class :foreground ,magenta-active))) - `(rg-toggle-off-face ((,class :inherit bold :foreground ,fg-inactive))) - `(rg-toggle-on-face ((,class :inherit bold :foreground ,cyan-active))) - `(rg-warning-face ((,class :inherit bold :foreground ,yellow))) -;;;;; ripgrep - `(ripgrep-context-face ((,class :foreground ,fg-unfocused))) - `(ripgrep-error-face ((,class :inherit bold :foreground ,red))) - `(ripgrep-hit-face ((,class :foreground ,cyan))) - `(ripgrep-match-face ((,class :inherit modus-theme-special-calm))) -;;;;; rmail - `(rmail-header-name ((,class :foreground ,cyan-alt-other))) - `(rmail-highlight ((,class :inherit bold :foreground ,magenta-alt))) -;;;;; ruler-mode - `(ruler-mode-column-number ((,class :inherit (ruler-mode-default bold) :foreground ,fg-main))) - `(ruler-mode-comment-column ((,class :inherit ruler-mode-default :foreground ,red-active))) - `(ruler-mode-current-column ((,class :inherit ruler-mode-default :foreground ,cyan-active :box t))) - `(ruler-mode-default ((,class :background ,bg-inactive :foreground ,fg-inactive))) - `(ruler-mode-fill-column ((,class :inherit ruler-mode-default :foreground ,green-active))) - `(ruler-mode-fringes ((,class :inherit ruler-mode-default :foreground ,blue-active))) - `(ruler-mode-goal-column ((,class :inherit ruler-mode-default :foreground ,magenta-active))) - `(ruler-mode-margins ((,class :inherit ruler-mode-default :foreground ,bg-main))) - `(ruler-mode-pad ((,class :background ,bg-active :foreground ,fg-inactive))) - `(ruler-mode-tab-stop ((,class :inherit ruler-mode-default :foreground ,yellow-active))) -;;;;; sallet - `(sallet-buffer-compressed ((,class :foreground ,yellow-nuanced :slant italic))) - `(sallet-buffer-default-directory ((,class :foreground ,cyan-nuanced))) - `(sallet-buffer-directory ((,class :foreground ,blue-nuanced))) - `(sallet-buffer-help ((,class :foreground ,fg-special-cold))) - `(sallet-buffer-modified ((,class :foreground ,yellow-alt-other :slant italic))) - `(sallet-buffer-ordinary ((,class :foreground ,fg-main))) - `(sallet-buffer-read-only ((,class :foreground ,yellow-alt))) - `(sallet-buffer-size ((,class :foreground ,fg-special-calm))) - `(sallet-buffer-special ((,class :foreground ,magenta-alt-other))) - `(sallet-flx-match ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-cyan - 'modus-theme-refine-cyan - 'modus-theme-nuanced-cyan - cyan-alt-other)))) - `(sallet-recentf-buffer-name ((,class :foreground ,blue-nuanced))) - `(sallet-recentf-file-path ((,class :foreground ,fg-special-mild))) - `(sallet-regexp-match ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-magenta - 'modus-theme-refine-magenta - 'modus-theme-nuanced-magenta - magenta-alt-other)))) - `(sallet-source-header ((,class :inherit bold :foreground ,red-alt - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))) - `(sallet-substring-match ((,class ,@(modus-vivendi-theme-extra-completions - 'modus-theme-subtle-blue - 'modus-theme-refine-blue - 'modus-theme-nuanced-blue - blue-alt-other)))) -;;;;; selectrum - `(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))) - `(semantic-decoration-on-protected-members-face ((,class :background ,bg-dim))) - `(semantic-highlight-edits-face ((,class :background ,bg-alt))) - `(semantic-highlight-func-current-tag-face ((,class :background ,bg-alt))) - `(semantic-idle-symbol-highlight ((,class :inherit modus-theme-special-mild))) - `(semantic-tag-boundary-face ((,class :overline ,blue-intense))) - `(semantic-unmatched-syntax-face ((,class :underline ,fg-lang-error))) -;;;;; sesman - `(sesman-browser-button-face ((,class :foreground ,blue-alt-other :underline t))) - `(sesman-browser-highligh-face ((,class :inherit modus-theme-subtle-blue))) - `(sesman-buffer-face ((,class :foreground ,magenta))) - `(sesman-directory-face ((,class :inherit bold :foreground ,blue))) - `(sesman-project-face ((,class :inherit bold :foreground ,magenta-alt-other))) -;;;;; shell-script-mode - `(sh-heredoc ((,class :foreground ,blue-alt))) - `(sh-quoted-exec ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-alt))) -;;;;; show-paren-mode - `(show-paren-match ((,class ,@(modus-vivendi-theme-paren bg-paren-match - bg-paren-match-intense) - :foreground ,fg-main))) - `(show-paren-match-expression ((,class :inherit modus-theme-special-calm))) - `(show-paren-mismatch ((,class :inherit modus-theme-intense-red))) -;;;;; side-notes - `(side-notes ((,class :background ,bg-dim :foreground ,fg-dim))) -;;;;; skewer-mode - `(skewer-error-face ((,class :foreground ,red :underline t))) -;;;;; smart-mode-line - `(sml/charging ((,class :foreground ,green-active))) - `(sml/discharging ((,class :foreground ,red-active))) - `(sml/filename ((,class :inherit bold :foreground ,blue-active))) - `(sml/folder ((,class :foreground ,fg-active))) - `(sml/git ((,class :inherit bold :foreground ,green-active))) - `(sml/global ((,class :foreground ,fg-active))) - `(sml/line-number ((,class :inherit sml/global))) - `(sml/minor-modes ((,class :inherit sml/global))) - `(sml/modes ((,class :inherit bold :foreground ,fg-active))) - `(sml/modified ((,class :inherit bold :foreground ,magenta-active))) - `(sml/mule-info ((,class :inherit sml/global))) - `(sml/name-filling ((,class :foreground ,yellow-active))) - `(sml/not-modified ((,class :inherit sml/global))) - `(sml/numbers-separator ((,class :inherit sml/global))) - `(sml/outside-modified ((,class :inherit modus-theme-intense-red))) - `(sml/position-percentage ((,class :inherit sml/global))) - `(sml/prefix ((,class :foreground ,green-active))) - `(sml/process ((,class :inherit sml/prefix))) - `(sml/projectile ((,class :inherit sml/git))) - `(sml/read-only ((,class :inherit bold :foreground ,cyan-active))) - `(sml/remote ((,class :inherit sml/global))) - `(sml/sudo ((,class :inherit modus-theme-subtle-red))) - `(sml/time ((,class :inherit sml/global))) - `(sml/vc ((,class :inherit sml/git))) - `(sml/vc-edited ((,class :inherit bold :foreground ,yellow-active))) -;;;;; smartparens - `(sp-pair-overlay-face ((,class :inherit modus-theme-special-warm))) - `(sp-show-pair-enclosing ((,class :inherit modus-theme-special-mild))) - `(sp-show-pair-match-face ((,class ,@(modus-vivendi-theme-paren bg-paren-match - bg-paren-match-intense) - :foreground ,fg-main))) - `(sp-show-pair-mismatch-face ((,class :inherit modus-theme-intense-red))) - `(sp-wrap-overlay-closing-pair ((,class :inherit sp-pair-overlay-face))) - `(sp-wrap-overlay-face ((,class :inherit sp-pair-overlay-face))) - `(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 :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 :inherit modus-theme-diff-refine-added))) - `(smerge-refined-changed ((,class))) - `(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))) - `(spaceline-evil-motion ((,class :inherit modus-theme-active-blue))) - `(spaceline-evil-normal ((,class :background ,fg-alt :foreground ,bg-alt))) - `(spaceline-evil-replace ((,class :inherit modus-theme-active-red))) - `(spaceline-evil-visual ((,class :inherit modus-theme-active-cyan))) - `(spaceline-flycheck-error ((,class :foreground ,red-active))) - `(spaceline-flycheck-info ((,class :foreground ,cyan-active))) - `(spaceline-flycheck-warning ((,class :foreground ,yellow-active))) - `(spaceline-highlight-face ((,class :inherit modus-theme-fringe-blue))) - `(spaceline-modified ((,class :inherit modus-theme-fringe-magenta))) - `(spaceline-python-venv ((,class :foreground ,magenta-active))) - `(spaceline-read-only ((,class :inherit modus-theme-fringe-red))) - `(spaceline-unmodified ((,class :inherit modus-theme-fringe-cyan))) -;;;;; speedbar - `(speedbar-button-face ((,class :inherit link))) - `(speedbar-directory-face ((,class :inherit bold :foreground ,blue))) - `(speedbar-file-face ((,class :foreground ,fg-main))) - `(speedbar-highlight-face ((,class :inherit modus-theme-subtle-blue))) - `(speedbar-selected-face ((,class :inherit bold :foreground ,cyan))) - `(speedbar-separator-face ((,class :inherit modus-theme-intense-neutral))) - `(speedbar-tag-face ((,class :foreground ,yellow-alt-other))) -;;;;; spell-fu - `(spell-fu-incorrect-face - ((,(append '((supports :underline (:style wave))) class) - :foreground ,fg-lang-error :underline (:style wave)) - (,class :foreground ,fg-lang-error :underline t))) -;;;;; stripes - `(stripes ((,class :inherit modus-theme-hl-line))) -;;;;; success - `(suggest-heading ((,class :inherit bold :foreground ,yellow-alt-other))) -;;;;; switch-window - `(switch-window-background ((,class :background ,bg-dim))) - `(switch-window-label ((,class :height 3.0 :foreground ,blue-intense))) -;;;;; swiper - `(swiper-background-match-face-1 ((,class :inherit modus-theme-subtle-neutral))) - `(swiper-background-match-face-2 ((,class :inherit modus-theme-subtle-cyan))) - `(swiper-background-match-face-3 ((,class :inherit modus-theme-subtle-magenta))) - `(swiper-background-match-face-4 ((,class :inherit modus-theme-subtle-green))) - `(swiper-line-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t)) - :inherit modus-theme-special-cold))) - `(swiper-match-face-1 ((,class :inherit swiper-line-face))) - `(swiper-match-face-2 ((,class :inherit swiper-line-face))) - `(swiper-match-face-3 ((,class :inherit swiper-line-face))) - `(swiper-match-face-4 ((,class :inherit swiper-line-face))) -;;;;; swoop - `(swoop-face-header-format-line ((,class :inherit bold :foreground ,red-alt - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-3)))) - `(swoop-face-line-buffer-name ((,class :inherit bold :foreground ,blue-alt - ,@(modus-vivendi-theme-scale modus-vivendi-theme-scale-4)))) - `(swoop-face-line-number ((,class :foreground ,fg-special-warm))) - `(swoop-face-target-line ((,class :inherit modus-theme-intense-blue - ,@(and (>= emacs-major-version 27) '(:extend t))))) - `(swoop-face-target-words ((,class :inherit modus-theme-refine-cyan))) -;;;;; sx - `(sx-inbox-item-type ((,class :foreground ,magenta-alt-other))) - `(sx-inbox-item-type-unread ((,class :inherit (sx-inbox-item-type bold)))) - `(sx-question-list-answers ((,class :foreground ,green))) - `(sx-question-list-answers-accepted ((,class :box t :foreground ,green))) - `(sx-question-list-bounty ((,class :inherit bold :background ,bg-alt :foreground ,yellow))) - `(sx-question-list-date ((,class :foreground ,fg-special-cold))) - `(sx-question-list-favorite ((,class :inherit bold :foreground ,fg-special-warm))) - `(sx-question-list-parent ((,class :foreground ,fg-main))) - `(sx-question-list-read-question ((,class :foreground ,fg-alt))) - `(sx-question-list-score ((,class :foreground ,fg-special-mild))) - `(sx-question-list-score-upvoted ((,class :inherit (sx-question-list-score bold)))) - `(sx-question-list-unread-question ((,class :inherit bold :foreground ,fg-main))) - `(sx-question-mode-accepted ((,class :inherit bold :height 1.3 :foreground ,green))) - `(sx-question-mode-closed ((,class :inherit modus-theme-active-yellow :box (:line-width 2 :color nil)))) - `(sx-question-mode-closed-reason ((,class :box (:line-width 2 :color nil) :foreground ,fg-main))) - `(sx-question-mode-content-face ((,class :background ,bg-dim))) - `(sx-question-mode-date ((,class :foreground ,blue))) - `(sx-question-mode-header ((,class :inherit bold :foreground ,cyan))) - `(sx-question-mode-kbd-tag ((,class :inherit bold :height 0.9 :box (:line-width 3 :color ,fg-main :style released-button) :foreground ,fg-main))) - `(sx-question-mode-score ((,class :foreground ,fg-dim))) - `(sx-question-mode-score-downvoted ((,class :foreground ,yellow))) - `(sx-question-mode-score-upvoted ((,class :inherit bold :foreground ,magenta))) - `(sx-question-mode-title ((,class :inherit bold :foreground ,fg-main))) - `(sx-question-mode-title-comments ((,class :inherit bold :foreground ,fg-alt))) - `(sx-tag ((,class :foreground ,magenta-alt))) - `(sx-user-name ((,class :foreground ,blue-alt))) - `(sx-user-reputation ((,class :foreground ,fg-alt))) -;;;;; symbol-overlay - `(symbol-overlay-default-face ((,class :inherit modus-theme-special-warm))) - `(symbol-overlay-face-1 ((,class :inherit modus-theme-intense-blue))) - `(symbol-overlay-face-2 ((,class :inherit modus-theme-refine-magenta))) - `(symbol-overlay-face-3 ((,class :inherit modus-theme-intense-yellow))) - `(symbol-overlay-face-4 ((,class :inherit modus-theme-intense-magenta))) - `(symbol-overlay-face-5 ((,class :inherit modus-theme-intense-red))) - `(symbol-overlay-face-6 ((,class :inherit modus-theme-refine-red))) - `(symbol-overlay-face-7 ((,class :inherit modus-theme-intense-cyan))) - `(symbol-overlay-face-8 ((,class :inherit modus-theme-refine-cyan))) -;;;;; syslog-mode - `(syslog-debug ((,class :inherit bold :foreground ,cyan-alt-other))) - `(syslog-error ((,class :inherit bold :foreground ,red))) - `(syslog-file ((,class :inherit bold :foreground ,fg-special-cold))) - `(syslog-hide ((,class :background ,bg-main :foreground ,fg-main))) - `(syslog-hour ((,class :inherit bold :foreground ,magenta-alt-other))) - `(syslog-info ((,class :inherit bold :foreground ,blue-alt-other))) - `(syslog-ip ((,class :inherit bold :foreground ,fg-special-mild :underline t))) - `(syslog-su ((,class :inherit bold :foreground ,red-alt))) - `(syslog-warn ((,class :inherit bold :foreground ,yellow))) -;;;;; table (built-in table.el) - `(table-cell ((,class :background ,blue-nuanced-bg))) -;;;;; telephone-line - `(telephone-line-accent-active ((,class :background ,fg-inactive :foreground ,bg-inactive))) - `(telephone-line-accent-inactive ((,class :background ,bg-active :foreground ,fg-active))) - `(telephone-line-error ((,class :inherit bold :foreground ,red-active))) - `(telephone-line-evil ((,class :foreground ,fg-main))) - `(telephone-line-evil-emacs ((,class :inherit telephone-line-evil :background ,magenta-intense-bg))) - `(telephone-line-evil-insert ((,class :inherit telephone-line-evil :background ,green-intense-bg))) - `(telephone-line-evil-motion ((,class :inherit telephone-line-evil :background ,yellow-intense-bg))) - `(telephone-line-evil-normal ((,class :inherit telephone-line-evil :background ,bg-alt))) - `(telephone-line-evil-operator ((,class :inherit telephone-line-evil :background ,yellow-subtle-bg))) - `(telephone-line-evil-replace ((,class :inherit telephone-line-evil :background ,red-intense-bg))) - `(telephone-line-evil-visual ((,class :inherit telephone-line-evil :background ,cyan-intense-bg))) - `(telephone-line-projectile ((,class :foreground ,cyan-active))) - `(telephone-line-unimportant ((,class :foreground ,fg-inactive))) - `(telephone-line-warning ((,class :inherit bold :foreground ,yellow-active))) -;;;;; term - `(term ((,class :background ,bg-main :foreground ,fg-main))) - `(term-bold ((,class :inherit bold))) - `(term-color-blue ((,class :background ,blue :foreground ,blue))) - `(term-color-cyan ((,class :background ,cyan :foreground ,cyan))) - `(term-color-green ((,class :background ,green :foreground ,green))) - `(term-color-magenta ((,class :background ,magenta :foreground ,magenta))) - `(term-color-red ((,class :background ,red :foreground ,red))) - `(term-color-yellow ((,class :background ,yellow :foreground ,yellow))) - `(term-underline ((,class :underline t))) -;;;;; tomatinho - `(tomatinho-ok-face ((,class :foreground ,blue-intense))) - `(tomatinho-pause-face ((,class :foreground ,yellow-intense))) - `(tomatinho-reset-face ((,class :foreground ,fg-alt))) -;;;;; transient - `(transient-active-infix ((,class :inherit modus-theme-special-mild))) - `(transient-amaranth ((,class :inherit bold :foreground ,yellow))) - `(transient-argument ((,class :inherit bold :foreground ,red-alt))) - `(transient-blue ((,class :inherit bold :foreground ,blue))) - `(transient-disabled-suffix ((,class :inherit modus-theme-intense-red))) - `(transient-enabled-suffix ((,class :inherit modus-theme-intense-green))) - `(transient-heading ((,class :inherit bold :foreground ,fg-main))) - `(transient-inactive-argument ((,class :foreground ,fg-alt))) - `(transient-inactive-value ((,class :foreground ,fg-alt))) - `(transient-key ((,class :inherit bold :foreground ,blue))) - `(transient-mismatched-key ((,class :underline t))) - `(transient-nonstandard-key ((,class :underline t))) - `(transient-pink ((,class :inherit bold :foreground ,magenta))) - `(transient-red ((,class :inherit bold :foreground ,red-intense))) - `(transient-teal ((,class :inherit bold :foreground ,cyan-alt-other))) - `(transient-unreachable ((,class :foreground ,fg-unfocused))) - `(transient-unreachable-key ((,class :foreground ,fg-unfocused))) - `(transient-value ((,class :foreground ,magenta-alt))) -;;;;; trashed - `(trashed-deleted ((,class :inherit modus-theme-mark-del))) - `(trashed-directory ((,class :foreground ,blue))) - `(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 :inherit button :foreground ,cyan-alt))) -;;;;; treemacs - `(treemacs-directory-collapsed-face ((,class :foreground ,magenta-alt))) - `(treemacs-directory-face ((,class :inherit dired-directory))) - `(treemacs-file-face ((,class :foreground ,fg-main))) - `(treemacs-fringe-indicator-face ((,class :foreground ,fg-main))) - `(treemacs-git-added-face ((,class :foreground ,green-intense))) - `(treemacs-git-conflict-face ((,class :inherit (modus-theme-intense-red bold)))) - `(treemacs-git-ignored-face ((,class :foreground ,fg-alt))) - `(treemacs-git-modified-face ((,class :foreground ,yellow-alt-other))) - `(treemacs-git-renamed-face ((,class :foreground ,cyan-alt-other))) - `(treemacs-git-unmodified-face ((,class :foreground ,fg-main))) - `(treemacs-git-untracked-face ((,class :foreground ,red-alt-other))) - `(treemacs-help-column-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,magenta-alt-other :underline t))) - `(treemacs-help-title-face ((,class :foreground ,blue-alt-other))) - `(treemacs-on-failure-pulse-face ((,class :inherit modus-theme-intense-red))) - `(treemacs-on-success-pulse-face ((,class :inherit modus-theme-intense-green))) - `(treemacs-root-face ((,class :inherit bold :foreground ,blue-alt-other :height 1.2 :underline t))) - `(treemacs-root-remote-disconnected-face ((,class :inherit treemacs-root-remote-face :foreground ,yellow))) - `(treemacs-root-remote-face ((,class :inherit treemacs-root-face :foreground ,magenta))) - `(treemacs-root-remote-unreadable-face ((,class :inherit treemacs-root-unreadable-face))) - `(treemacs-root-unreadable-face ((,class :inherit treemacs-root-face :strike-through t))) - `(treemacs-tags-face ((,class :foreground ,blue-alt))) - `(treemacs-tags-face ((,class :foreground ,magenta-alt))) -;;;;; tty-menu - `(tty-menu-disabled-face ((,class :background ,bg-alt :foreground ,fg-alt))) - `(tty-menu-enabled-face ((,class :inherit bold :background ,bg-alt :foreground ,fg-main))) - `(tty-menu-selected-face ((,class :inherit modus-theme-intense-blue))) -;;;;; tuareg - `(caml-types-def-face ((,class :inherit modus-theme-subtle-red))) - `(caml-types-expr-face ((,class :inherit modus-theme-subtle-green))) - `(caml-types-occ-face ((,class :inherit modus-theme-subtle-green))) - `(caml-types-scope-face ((,class :inherit modus-theme-subtle-blue))) - `(caml-types-typed-face ((,class :inherit modus-theme-subtle-magenta))) - `(tuareg-font-double-semicolon-face ((,class ,@(modus-vivendi-theme-syntax-foreground - red-alt red-alt-faint)))) - `(tuareg-font-lock-attribute-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(tuareg-font-lock-constructor-face ((,class :foreground ,fg-main))) - `(tuareg-font-lock-error-face ((,class :inherit (modus-theme-intense-red bold)))) - `(tuareg-font-lock-extension-node-face ((,class :background ,bg-alt :foreground ,magenta))) - `(tuareg-font-lock-governing-face ((,class :inherit bold :foreground ,fg-main))) - `(tuareg-font-lock-infix-extension-node-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(tuareg-font-lock-interactive-directive-face ((,class :foreground ,fg-special-cold))) - `(tuareg-font-lock-interactive-error-face ((,class :inherit bold - ,@(modus-vivendi-theme-syntax-foreground - red red-faint)))) - `(tuareg-font-lock-interactive-output-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(tuareg-font-lock-label-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(tuareg-font-lock-line-number-face ((,class :foreground ,fg-special-warm))) - `(tuareg-font-lock-module-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint)))) - `(tuareg-font-lock-multistage-face ((,class :inherit bold :background ,bg-alt - ,@(modus-vivendi-theme-syntax-foreground - blue blue-faint)))) - `(tuareg-font-lock-operator-face ((,class ,@(modus-vivendi-theme-syntax-foreground - red-alt red-alt-faint)))) - `(tuareg-opam-error-face ((,class :inherit bold - ,@(modus-vivendi-theme-syntax-foreground - red red-faint)))) - `(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-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 :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 :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 :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))) - `(vimish-fold-mouse-face ((,class :inherit modus-theme-intense-blue))) - `(vimish-fold-overlay ((,class :background ,bg-alt :foreground ,fg-special-cold))) -;;;;; visible-mark - `(visible-mark-active ((,class :background ,blue-intense-bg))) - `(visible-mark-face1 ((,class :background ,cyan-intense-bg))) - `(visible-mark-face2 ((,class :background ,yellow-intense-bg))) - `(visible-mark-forward-face1 ((,class :background ,magenta-intense-bg))) - `(visible-mark-forward-face2 ((,class :background ,green-intense-bg))) -;;;;; visual-regexp - `(vr/group-0 ((,class :inherit modus-theme-intense-blue))) - `(vr/group-1 ((,class :inherit modus-theme-intense-magenta))) - `(vr/group-2 ((,class :inherit modus-theme-intense-green))) - `(vr/match-0 ((,class :inherit modus-theme-refine-yellow))) - `(vr/match-1 ((,class :inherit modus-theme-refine-yellow))) - `(vr/match-separator-face ((,class :inherit (modus-theme-intense-neutral bold)))) -;;;;; volatile-highlights - `(vhl/default-face ((,class ,@(and (>= emacs-major-version 27) '(:extend t)) - :background ,bg-alt :foreground ,blue-nuanced))) -;;;;; vterm - `(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))) - `(vterm-color-green ((,class :background ,green :foreground ,green))) - `(vterm-color-inverse-video ((,class :background ,bg-main :inverse-video t))) - `(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 "gray65" :foreground "gray65"))) - `(vterm-color-yellow ((,class :background ,yellow :foreground ,yellow))) -;;;;; wcheck-mode - `(wcheck-default-face ((,class :foreground ,red :underline t))) -;;;;; web-mode - `(web-mode-annotation-face ((,class :inherit web-mode-comment-face))) - `(web-mode-annotation-html-face ((,class :inherit web-mode-comment-face))) - `(web-mode-annotation-tag-face ((,class :inherit web-mode-comment-face :underline t))) - `(web-mode-block-attr-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue blue-faint)))) - `(web-mode-block-attr-value-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(web-mode-block-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-block-control-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(web-mode-block-delimiter-face ((,class :foreground ,fg-main))) - `(web-mode-block-face ((,class :background ,bg-dim))) - `(web-mode-block-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-bold-face ((,class :inherit bold))) - `(web-mode-builtin-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(web-mode-comment-face ((,class :foreground ,fg-alt :slant ,modus-theme-slant))) - `(web-mode-comment-keyword-face ((,class :inherit bold :background ,bg-dim - ,@(modus-vivendi-theme-syntax-foreground - yellow yellow-faint)))) - `(web-mode-constant-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(web-mode-css-at-rule-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(web-mode-css-color-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(web-mode-css-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-css-function-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(web-mode-css-priority-face ((,class ,@(modus-vivendi-theme-syntax-foreground - yellow-alt yellow-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(web-mode-css-property-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan cyan-faint)))) - `(web-mode-css-pseudo-class-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(web-mode-css-selector-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(web-mode-css-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-css-variable-face ((,class :foreground ,fg-special-warm))) - `(web-mode-current-column-highlight-face ((,class :background ,bg-alt))) - `(web-mode-current-element-highlight-face ((,class :inherit modus-theme-special-mild))) - `(web-mode-doctype-face ((,class :foreground ,fg-special-cold :slant ,modus-theme-slant))) - `(web-mode-error-face ((,class :inherit modus-theme-intense-red))) - `(web-mode-filter-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-folded-face ((,class :underline t))) - `(web-mode-function-call-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-function-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-html-attr-custom-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan cyan-faint)))) - `(web-mode-html-attr-engine-face ((,class :foreground ,fg-main))) - `(web-mode-html-attr-equal-face ((,class :foreground ,fg-main))) - `(web-mode-html-attr-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan cyan-faint)))) - `(web-mode-html-attr-value-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(web-mode-html-entity-face ((,class ,@(modus-vivendi-theme-syntax-foreground - yellow-alt-other yellow-alt-other-faint) - :slant ,modus-theme-slant))) - `(web-mode-html-tag-bracket-face ((,class :foreground ,fg-dim))) - `(web-mode-html-tag-custom-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-html-tag-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-html-tag-namespaced-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(web-mode-html-tag-unclosed-face ((,class ,@(modus-vivendi-theme-syntax-foreground - red red-faint) - :underline t))) - `(web-mode-inlay-face ((,class :background ,bg-alt))) - `(web-mode-italic-face ((,class :slant italic))) - `(web-mode-javascript-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-javascript-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-json-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-json-context-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint)))) - `(web-mode-json-key-face ((,class :foreground ,blue-nuanced))) - `(web-mode-json-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-jsx-depth-1-face ((,class :background ,blue-intense-bg :foreground ,fg-main))) - `(web-mode-jsx-depth-2-face ((,class :background ,blue-subtle-bg :foreground ,fg-main))) - `(web-mode-jsx-depth-3-face ((,class :background ,bg-special-cold :foreground ,fg-special-cold))) - `(web-mode-jsx-depth-4-face ((,class :background ,bg-alt :foreground ,blue-refine-fg))) - `(web-mode-jsx-depth-5-face ((,class :background ,bg-alt :foreground ,blue-nuanced))) - `(web-mode-keyword-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt-other magenta-alt-other-faint) - ,@(modus-vivendi-theme-bold-weight)))) - `(web-mode-param-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta magenta-faint)))) - `(web-mode-part-comment-face ((,class :inherit web-mode-comment-face))) - `(web-mode-part-face ((,class :inherit web-mode-block-face))) - `(web-mode-part-string-face ((,class :inherit web-mode-string-face))) - `(web-mode-preprocessor-face ((,class ,@(modus-vivendi-theme-syntax-foreground - red-alt-other red-alt-other-faint)))) - `(web-mode-script-face ((,class :inherit web-mode-part-face))) - `(web-mode-sql-keyword-face ((,class :inherit bold - ,@(modus-vivendi-theme-syntax-foreground - yellow yellow-faint)))) - `(web-mode-string-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt blue-alt-faint)))) - `(web-mode-style-face ((,class :inherit web-mode-part-face))) - `(web-mode-symbol-face ((,class ,@(modus-vivendi-theme-syntax-foreground - blue-alt-other blue-alt-other-faint)))) - `(web-mode-type-face ((,class ,@(modus-vivendi-theme-syntax-foreground - magenta-alt magenta-alt-faint)))) - `(web-mode-underline-face ((,class :underline t))) - `(web-mode-variable-name-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan cyan-faint)))) - `(web-mode-warning-face ((,class :inherit bold :background ,bg-alt - ,@(modus-vivendi-theme-syntax-foreground - yellow-alt-other yellow-alt-other-faint)))) - `(web-mode-whitespace-face ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) -;;;;; wgrep - `(wgrep-delete-face ((,class :inherit modus-theme-refine-yellow))) - `(wgrep-done-face ((,class :inherit modus-theme-refine-blue))) - `(wgrep-face ((,class :inherit modus-theme-refine-green))) - `(wgrep-file-face ((,class :foreground ,fg-special-warm))) - `(wgrep-reject-face ((,class :inherit (modus-theme-intense-red bold)))) -;;;;; which-function-mode - `(which-func ((,class :foreground ,magenta-active))) -;;;;; which-key - `(which-key-command-description-face ((,class :foreground ,cyan))) - `(which-key-group-description-face ((,class :foreground ,magenta-alt))) - `(which-key-highlighted-command-face ((,class :foreground ,cyan-alt :underline t))) - `(which-key-key-face ((,class :inherit bold :foreground ,blue-intense))) - `(which-key-local-map-description-face ((,class :foreground ,fg-main))) - `(which-key-note-face ((,class :background ,bg-dim :foreground ,fg-special-mild))) - `(which-key-separator-face ((,class :foreground ,fg-alt))) - `(which-key-special-key-face ((,class :inherit bold :foreground ,yellow-intense))) -;;;;; whitespace-mode - `(whitespace-big-indent ((,class :inherit modus-theme-subtle-red))) - `(whitespace-empty ((,class :inherit modus-theme-intense-magenta))) - `(whitespace-hspace ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-indentation ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-line ((,class :inherit modus-theme-special-warm))) - `(whitespace-newline ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-space ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-space-after-tab ((,class :inherit modus-theme-subtle-magenta))) - `(whitespace-space-before-tab ((,class :inherit modus-theme-subtle-cyan))) - `(whitespace-tab ((,class :background ,bg-whitespace :foreground ,fg-whitespace))) - `(whitespace-trailing ((,class :inherit modus-theme-intense-red))) -;;;;; window-divider-mode - `(window-divider ((,class :foreground ,fg-window-divider-inner))) - `(window-divider-first-pixel ((,class :foreground ,fg-window-divider-outer))) - `(window-divider-last-pixel ((,class :foreground ,fg-window-divider-outer))) -;;;;; winum - `(winum-face ((,class ,@(modus-vivendi-theme-bold-weight) :foreground ,cyan-active))) -;;;;; writegood-mode - `(writegood-duplicates-face ((,class :background ,bg-alt :foreground ,red-alt :underline t))) - `(writegood-passive-voice-face ((,class :foreground ,yellow-nuanced :underline ,fg-lang-warning))) - `(writegood-weasels-face ((,class :foreground ,red-nuanced :underline ,fg-lang-error))) -;;;;; woman - `(woman-addition ((,class :foreground ,magenta-alt-other))) - `(woman-bold ((,class :inherit bold :foreground ,magenta))) - `(woman-italic ((,class :foreground ,cyan :slant italic))) - `(woman-unknown ((,class :foreground ,yellow :slant italic))) -;;;;; xah-elisp-mode - `(xah-elisp-at-symbol ((,class :inherit bold - ,@(modus-vivendi-theme-syntax-foreground - red-alt red-alt-faint)))) - `(xah-elisp-cap-variable ((,class ,@(modus-vivendi-theme-syntax-foreground - red-alt-other red-alt-other-faint)))) - `(xah-elisp-command-face ((,class ,@(modus-vivendi-theme-syntax-foreground - cyan-alt-other cyan-alt-other-faint)))) - `(xah-elisp-dollar-symbol ((,class ,@(modus-vivendi-theme-syntax-foreground - green green-faint)))) -;;;;; xref - `(xref-file-header ((,class :inherit bold :foreground ,fg-special-cold))) - `(xref-line-number ((,class :foreground ,fg-alt))) - `(xref-match ((,class :inherit match))) -;;;;; yaml-mode - `(yaml-tab-face ((,class :inherit modus-theme-intense-red))) -;;;;; yasnippet - `(yas-field-highlight-face ((,class :background ,bg-alt :foreground ,fg-main))) -;;;;; ztree - `(ztreep-arrow-face ((,class :foreground ,fg-inactive))) - `(ztreep-diff-header-face ((,class :inherit bold :height 1.2 :foreground ,fg-special-cold))) - `(ztreep-diff-header-small-face ((,class :inherit bold :foreground ,fg-special-mild))) - `(ztreep-diff-model-add-face ((,class :foreground ,green))) - `(ztreep-diff-model-diff-face ((,class :foreground ,red))) - `(ztreep-diff-model-ignored-face ((,class :foreground ,fg-alt :strike-through t))) - `(ztreep-diff-model-normal-face ((,class :foreground ,fg-alt))) - `(ztreep-expand-sign-face ((,class :foreground ,blue))) - `(ztreep-header-face ((,class :inherit bold :height 1.2 :foreground ,fg-special-cold))) - `(ztreep-leaf-face ((,class :foreground ,cyan))) - `(ztreep-node-count-children-face ((,class :foreground ,fg-special-warm))) - `(ztreep-node-face ((,class :foreground ,fg-main)))) -;;;; Emacs 27+ - (when (>= emacs-major-version 27) - (custom-theme-set-faces - 'modus-vivendi -;;;;; line numbers (`display-line-numbers-mode' and global variant) - ;; 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 :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) - :background ,bg-tab-active :foreground ,fg-main))) - `(tab-bar-tab-inactive ((,class :box (:line-width 2 :color ,bg-tab-inactive) - :background ,bg-tab-inactive :foreground ,fg-dim))) -;;;;; tab-line-mode - `(tab-line ((,class :height 0.95 :background ,bg-tab-bar :foreground ,fg-main))) - `(tab-line-close-highlight ((,class :foreground ,red))) - `(tab-line-highlight ((,class :background ,blue-subtle-bg :foreground ,fg-dim))) - `(tab-line-tab ((,class :inherit bold :box (:line-width 2 :color ,bg-tab-active) - :background ,bg-tab-active :foreground ,fg-main))) - `(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)) - `(flymake-note-bitmap '(exclamation-mark modus-theme-fringe-cyan)) -;;;; ibuffer - `(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-pseudo-header) -;;;; highlight-tail - `(highlight-tail-colors - '((,green-subtle-bg . 0) - (,cyan-subtle-bg . 20))) -;;;; hl-todo - `(hl-todo-keyword-faces - '(("HOLD" . ,yellow-alt) - ("TODO" . ,magenta) - ("NEXT" . ,magenta-alt-other) - ("THEM" . ,magenta-alt) - ("PROG" . ,cyan) - ("OKAY" . ,cyan-alt) - ("DONT" . ,green-alt) - ("FAIL" . ,red) - ("BUG" . ,red) - ("DONE" . ,green) - ("NOTE" . ,yellow-alt-other) - ("KLUDGE" . ,yellow) - ("HACK" . ,yellow) - ("TEMP" . ,red-nuanced) - ("FIXME" . ,red-alt-other) - ("XXX+" . ,red-alt) - ("REVIEW" . ,cyan-alt-other) - ("DEPRECATED" . ,blue-nuanced))) -;;;; vc-annotate (C-x v g) - `(vc-annotate-background nil) - `(vc-annotate-background-mode nil) - `(vc-annotate-color-map - '((20 . ,red) - (40 . ,magenta) - (60 . ,magenta-alt) - (80 . ,red-alt) - (100 . ,yellow) - (120 . ,yellow-alt) - (140 . ,fg-special-warm) - (160 . ,fg-special-mild) - (180 . ,green) - (200 . ,green-alt) - (220 . ,cyan-alt-other) - (240 . ,cyan-alt) - (260 . ,cyan) - (280 . ,fg-special-cold) - (300 . ,blue) - (320 . ,blue-alt) - (340 . ,blue-alt-other) - (360 . ,magenta-alt-other))) - `(vc-annotate-very-old-color nil) -;;;; xterm-color - `(xterm-color-names [,bg-main ,red ,green ,yellow ,blue ,magenta ,cyan ,fg-alt]) - `(xterm-color-names-bright [,bg-alt ,red-alt ,green-alt ,yellow-alt ,blue-alt ,magenta-alt ,cyan-alt ,fg-main])) -;;; Conditional theme variables -;;;; org-src-block-faces - ;; this is a user option to add a colour-coded background to source - ;; blocks for various programming languages - (when (eq modus-vivendi-theme-org-blocks 'rainbow) - (custom-theme-set-variables - 'modus-vivendi - `(org-src-block-faces ; TODO this list should be expanded - `(("emacs-lisp" modus-theme-nuanced-magenta) - ("elisp" modus-theme-nuanced-magenta) - ("clojure" modus-theme-nuanced-magenta) - ("clojurescript" modus-theme-nuanced-magenta) - ("c" modus-theme-nuanced-blue) - ("c++" modus-theme-nuanced-blue) - ("sh" modus-theme-nuanced-green) - ("shell" modus-theme-nuanced-green) - ("html" modus-theme-nuanced-yellow) - ("xml" modus-theme-nuanced-yellow) - ("css" modus-theme-nuanced-red) - ("scss" modus-theme-nuanced-red) - ("python" modus-theme-nuanced-green) - ("ipython" modus-theme-nuanced-magenta) - ("r" modus-theme-nuanced-cyan) - ("yaml" modus-theme-nuanced-cyan) - ("conf" modus-theme-nuanced-cyan) - ("docker" modus-theme-nuanced-cyan) - ("json" modus-theme-nuanced-cyan)))))) +(deftheme modus-vivendi + "Accessible and customizable dark theme (WCAG AAA standard). +Conforms with the highest legibility standard for color contrast +between background and foreground in any given piece of text, +which corresponds to a minimum contrast in relative luminance of +7:1.") -;;; library provides -;;;###autoload -(when load-file-name - (add-to-list 'custom-theme-load-path - (file-name-as-directory (file-name-directory load-file-name)))) +(modus-themes-theme modus-vivendi) (provide-theme 'modus-vivendi) -(provide 'modus-vivendi-theme) - ;;; modus-vivendi-theme.el ends here diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el index aaa7cceaf68..922114fb64a 100644 --- a/etc/themes/wombat-theme.el +++ b/etc/themes/wombat-theme.el @@ -36,7 +36,7 @@ are included.") `(fringe ((,class (:background "#303030")))) `(highlight ((,class (:background "#454545" :foreground "#ffffff" :underline t)))) - `(region ((,class (:background "#444444" :foreground "#f6f3e8")))) + `(region ((,class (:background "#444444")))) `(secondary-selection ((,class (:background "#333366" :foreground "#f6f3e8")))) `(isearch ((,class (:background "#343434" :foreground "#857b6f")))) `(lazy-highlight ((,class (:background "#384048" :foreground "#a0a8b0")))) @@ -57,6 +57,8 @@ are included.") `(font-lock-type-face ((,class (:foreground "#92a65e" :weight bold)))) `(font-lock-variable-name-face ((,class (:foreground "#cae682")))) `(font-lock-warning-face ((,class (:foreground "#ccaa8f")))) + ;; Help faces + `(help-key-binding ((,class (:background "#333333" :foreground "#f6f3e8")))) ;; Button and link faces `(link ((,class (:foreground "#8ac6f2" :underline t)))) `(link-visited ((,class (:foreground "#e5786d" :underline t)))) diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index 6194e55ea35..dcdb61f23ec 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL @@ -1038,10 +1038,10 @@ then type C-x 1. Here are some other useful C-h options: - C-h f Describe a function. You type in the name of the - function. + C-h x Describe a command. You type in the name of the + command. ->> Try typing C-h f previous-line <Return>. +>> Try typing C-h x previous-line <Return>. This displays all the information Emacs has about the function which implements the C-p command. diff --git a/etc/tutorials/TUTORIAL.es b/etc/tutorials/TUTORIAL.es index 786a9f4130d..a92604ccb9e 100644 --- a/etc/tutorials/TUTORIAL.es +++ b/etc/tutorials/TUTORIAL.es @@ -1091,10 +1091,10 @@ ayuda, y entonces teclear C-x 1. Aquí hay algunas otras opciones útiles de C-h: - C-h f Describe una función. Usted teclea el nombre de la - función. + C-h x Describe un comando. Usted teclea el nombre del + comando. ->> Intente teclear C-h f previous-line <Return>. +>> Intente teclear C-h x previous-line <Return>. Esto muestra toda la información que Emacs tiene sobre la función que implementa el comando C-p diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he index 5cd1cac8fd1..2ee4f74c324 100644 --- a/etc/tutorials/TUTORIAL.he +++ b/etc/tutorials/TUTORIAL.he @@ -931,9 +931,9 @@ M-x help <Return> כתחליף.) הנה עוד כמה פקודות עזרה שימושיות: - C-h f תן הסבר על פונקציה. יש להקיש את שם הפונקציה. + C-h x תן הסבר על פקודה. יש להקיש את שם הפקודה. ->> נסו להקיש C-h f previous-line <Return>. +>> נסו להקיש C-h x previous-line <Return>. כתוצאה, יוצג תיעוד מלא של הפונקציה המממשת את הפקודה C-p כפי שהוא ידוע ל־Emacs. diff --git a/etc/tutorials/TUTORIAL.it b/etc/tutorials/TUTORIAL.it index ac5937930bf..68bf40332ef 100644 --- a/etc/tutorials/TUTORIAL.it +++ b/etc/tutorials/TUTORIAL.it @@ -578,7 +578,7 @@ originale in modo da conservarlo. Il nuovo nome è ottenuto aggiungendo un carattere "~" alla fine del nome originale. Quando il salvataggio termina, Emacs mostra il nome del file scritto. ->> Premi C-x C-s TUTORIAL<Invio>. +>> Premi C-x C-s TUTORIAL <Invio>. Questo dovrebbe salvare questa esercitazione in un file chiamato “TUTORIAL” e mostrare “Wrote ...TUTORIAL nella parte bassa dello schermo. @@ -623,8 +623,8 @@ file, puoi farlo visitando di nuovo quel file usando C-x C-f. Ma c'è un modo più semplice: usa il comando C-x b. Questo comando richiede il nome del buffer. ->> Crea un file chiamato “pippo” con C-x C-f pippo<Invio>. - Torna poi a questa esercitazione con C-x b TUTORIAL<Invio>. +>> Crea un file chiamato “pippo” con C-x C-f pippo <Invio>. + Torna poi a questa esercitazione con C-x b TUTORIAL <Invio>. La maggior parte delle volte, il nome del buffer corrisponde al nome del file (senza la parte relativa alla directory). Questo non è @@ -641,8 +641,8 @@ Anche il buffer chiamato “*Messages* non è associato ad alcun file. Quel buffer contiene tutti i messaggi che sono apparsi nella parte bassa dello schermo durante la sessione di Emacs. ->> Passa al buffer con i messaggi con C-x b *Messages*<Invio>. - Torna poi a questa esercitazione con C-x b TUTORIAL<Invio>. +>> Passa al buffer con i messaggi con C-x b *Messages* <Invio>. + Torna poi a questa esercitazione con C-x b TUTORIAL <Invio>. Se si modifica in qualche modo il testo di un file e poi si visita un altro file questo non comporta il salvataggio del primo. Le modifiche @@ -752,7 +752,7 @@ salvataggio automatico. Se il computer si blocca si può recuperare il file salvato automaticamente aprendo il file in modo normale (il file che si stava scrivendo, non quello di salvataggio automatico) e usando poi M-x -recover-this-file<Invio>. Quando viene chiesta la conferma si risponda +recover-this-file <Invio>. Quando viene chiesta la conferma si risponda con yes<Invio> per procedere con il recupero dei dati salvati automaticamente. @@ -818,7 +818,7 @@ fundamental-mode è il comando per attivare la modalità primaria Se si vuole inserire del testo in italiano, come questo file, probabilmente è più adeguata la modalità testo. ->> Inserisci M-x text-mode<Invio>. +>> Inserisci M-x text-mode <Invio>. Non preoccuparti, nessuno dei comandi che hai imparato verrà modificato in modo sostanziale. Tuttavia adesso puoi osservare come @@ -853,14 +853,14 @@ testo, è la modalità “Auto Fill” (riempimento automatico). Quando questa modalità è attiva, Emacs interrompe la riga tra due parole ogni volta che, nel corso dell'inserimento, essa diventa troppo lunga. -Si può attivare il modo “Auto Fill” con M-x auto-fill-mode<Invio>. +Si può attivare il modo “Auto Fill” con M-x auto-fill-mode <Invio>. Quando la modalità suddetta è attiva può essere disattivata eseguendo -di nuovo M-x auto-fill-mode<Invio>. Se la modalità è disattivata +di nuovo M-x auto-fill-mode <Invio>. Se la modalità è disattivata questo comando la attiva, viceversa se è già attiva. Un comando che funziona così si comporta come un interruttore, attiva o disattiva qualcosa ogni volta che viene premuto. ->> Usa M-x auto fill mode<Invio> adesso. Inserisci una riga di “asdf ” +>> Usa M-x auto fill mode <Invio> adesso. Inserisci una riga di “asdf ” ripetuti fino a quando non la vedi dividersi in due righe. Devi interporre degli spazi perché la modalità Auto Fill spezza le righe solo in corrispondenza di uno spazio. @@ -1021,13 +1021,13 @@ chiamano “finestra”, ed è possibile mostrarne più di uno contemporaneamente. Su un terminale testuale, è possibile mostrare un solo frame alla volta. ->> Usa M-x make-frame<Invio>. +>> Usa M-x make-frame <Invio>. Un nuovo frame dovrebbe apparire sullo schermo. In questo nuovo frame puoi svolgere qualsiasi cosa come nel frame originale. Non c'è nulla di speciale nel primo frame. ->> Usa M-x delete-frame<Invio>. +>> Usa M-x delete-frame <Invio>. Questo rimuove il frame selezionato. Puoi anche eliminare un frame usando i metodi offerti dal sistema @@ -1076,7 +1076,7 @@ aiuto che può fornire. Se si è attivato l'aiuto con C-h e si decide che non serve più si può annullare la richiesta con C-g. (Se C-h non mostra un messaggio relativo all'aiuto nella parte bassa -dello schermo, prova ad usare il tasto F1 oppure con M-x help<Invio>.) +dello schermo, prova ad usare il tasto F1 oppure con M-x help <Invio>.) La forma base di aiuto è data da C-h c. Si inserisce C-h, il carattere c e poi un carattere o una sequenza di caratteri; Emacs @@ -1110,9 +1110,9 @@ mentre fai riferimento al testo di aiuto e poi usare un C-x 1. Ecco altre utili opzioni di C-h: - C-h f Descrive una funzione. Inserisci il nome della funzione. + C-h x Descrive un comando. Inserisci il nome della comando. ->> Prova con C-h f previous-line<Invio>. +>> Prova con C-h x previous-line <Invio>. Questo mostrerà tutte le informazioni che Emacs possiede sulla funzione che implementa il comando C-p. @@ -1128,7 +1128,7 @@ variabile quando Emacs lo richiede. una sequenza di uno o due caratteri che serve a far partire il comando senza doverlo inserire per esteso. ->> Prova C-h a file<Invio> +>> Prova C-h a file <Invio> Questo mostrerà in un'altra finestra una lista di tutti i comandi che contengono la parola “file” nel nome. Nella lista si vedranno @@ -1143,7 +1143,7 @@ esteso come find-file. C-h i Leggi la documentazione. Questo comando apre un buffer speciale chiamato “*info*” in cui puoi leggere i manuali on-line dei pacchetti installati sul tuo - sistema. Batti m emacs<Invio> per leggere il manuale + sistema. Batti m emacs <Invio> per leggere il manuale di Emacs. Se non hai mai usato il sistema Info prima d'ora premi ? ed Emacs ti guiderà nell'uso delle opzioni del modo Info. Una volta terminata questa diff --git a/etc/tutorials/TUTORIAL.sv b/etc/tutorials/TUTORIAL.sv index 1eab2670795..dacc66d916f 100644 --- a/etc/tutorials/TUTORIAL.sv +++ b/etc/tutorials/TUTORIAL.sv @@ -1056,10 +1056,10 @@ att först senare ta bort fönstret med C-x 1. Här är fler varianter på C-h: - C-h f Beskriv en funktion. Du skriver in funktionsnamnet. + C-h x Beskriv ett kommando. Du skriver in kommandots namn. ->> Prova att skriva C-h f previous-line<Return>. - Detta ger den information Emacs har om funktionen +>> Prova att skriva C-h x previous-line <Return>. + Detta visar den information Emacs har om den funktion som implementerar kommandot C-p. Ett liknande kommando, C-h v, visar dokumentationen för de variabler |
