Add 'intense' style to modus-themes-mail-citations

2026-09-10 07:16:30 -04:00 · 2022-01-22 08:14:33 +02:00 · 2022-01-22 08:14:33 +02:00 · 8396118da7
parent b4cd5f7205
commit 8396118da7
4 changed files with 142 additions and 129 deletions
--- a/README.md
+++ b/README.md
@ -128,7 +128,7 @@ demonstration:

      modus-themes-completions 'moderate ; {nil,'moderate,'opinionated}

-      modus-themes-mail-citations nil ; {nil,'faint,'monochrome}
+      modus-themes-mail-citations nil ; {nil,'intense,'faint,'monochrome}

      ;; Options for `modus-themes-region' are either nil (the default),
      ;; or a list of properties that may include any of those symbols:
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@ -607,7 +607,7 @@ of this manual.

           modus-themes-completions 'moderate ; {nil,'moderate,'opinionated}

-           modus-themes-mail-citations nil ; {nil,'faint,'monochrome}
+           modus-themes-mail-citations nil ; {nil,'intense,'faint,'monochrome}

           ;; Options for `modus-themes-region' are either nil (the default),
           ;; or a list of properties that may include any of those symbols:
@ -1162,19 +1162,22 @@ Brief: Set the overall style of citations/quotes when composing emails.
   Possible values:

  1. ‘nil’ (default)
-  2. ‘faint’
-  3. ‘monochrome’
+  2. ‘intense’ [ Introduced as part of 2.1.0-dev.  ]
+  3. ‘faint’
+  4. ‘monochrome’

-   By default, citations in email-related buffers apply contrasting hues
-to different levels of depth in cited text.  The colors are fairly easy
-to tell apart.
+   By default (a nil value) citations are styled with contrasting hues
+to denote their depth.  Colors are easy to tell apart because they
+complement each other, but they otherwise are not very prominent.

-   A value of ‘faint’ makes all citation levels less intense, while
-retaining the default style of contrasting hues (albeit very subtle
-ones).
+   Option ‘intense’ is similar to the default in terms of using
+contrasting and complementary hues, but applies more saturated colors.

-   Option ‘monochrome’ turns all citations in to a uniform shade of
-gray.
+   Option ‘faint’ maintains the same color-based distinction between
+citation levels though the colors it uses have subtle differences
+between them.
+
+   Option ‘monochrome’ turns all quotes into a shade of gray.

   Whatever the value assigned to this variable, citations in emails are
 controlled by typographic elements or indentation, which the themes do
@ -5746,95 +5749,95 @@ Node: Enable and load13118
 Node: Sample configuration with and without use-package16065
 Node: Differences between loading and enabling18017
 Node: Customization Options19972
-Node: Custom reload theme26430
-Node: Deuteranopia style27220
-Node: Bold constructs28651
-Node: Italic constructs29485
-Node: Syntax styles30252
-Node: Mixed fonts32384
-Node: Link styles33648
-Node: Command prompts36126
-Node: Mode line37947
-Node: Tab style42438
-Node: Completion UIs43101
-Node: Mail citations45052
-Node: Fringes46001
-Node: Language checkers46741
-Node: Line highlighting49183
-Node: Line numbers50780
-Node: Markup51848
-Node: Matching parentheses53506
-Node: Active region54883
-Node: Diffs56296
-Node: Org mode blocks57902
-Node: Org agenda60292
-Node: Heading styles68752
-Node: UI typeface73177
-Node: Advanced customization74076
-Node: Visualize the active Modus theme's palette75540
-Node: Per-theme customization settings76489
-Node: Case-by-case face specs using the themes' palette77845
-Node: Face specs at scale using the themes' palette82393
-Node: Remap face with local value87194
-Node: Cycle through arbitrary colors89619
-Node: Override colors96047
-Node: Override color saturation100912
-Node: Override colors through blending106591
-Node: Font configurations for Org and others109446
-Ref: Font configurations for Org and others-Footnote-1112273
-Node: Configure bold and italic faces112460
-Node: Custom Org todo keyword and priority faces116608
-Node: Custom Org emphasis faces120281
-Node: Update Org block delimiter fontification125082
-Node: Measure color contrast126999
-Node: Load theme depending on time of day129722
-Node: Backdrop for pdf-tools130715
-Node: Decrease mode line height133410
-Node: A theme-agnostic hook for theme loading137535
-Node: Diffs with only the foreground139926
-Node: Face coverage143000
-Node: Supported packages143452
-Node: Indirectly covered packages149888
-Node: Notes on individual packages150890
-Node: Note on avy hints151930
-Node: Note on calendarel weekday and weekend colors153098
-Node: Note on underlines in compilation buffers154281
-Node: Note on inline Latex in Org buffers155093
-Node: Note on dimmerel155703
-Node: Note on display-fill-column-indicator-mode157188
-Node: Note on highlight-parenthesesel158751
-Node: Note on mmm-modeel background colors164740
-Node: Note for prism167055
-Node: Note for god-mode170209
-Node: Note on company-mode overlay pop-up171813
-Ref: Note on company-mode overlay pop-up-Footnote-1172503
-Ref: Note on company-mode overlay pop-up-Footnote-2172570
-Node: Note on ERC escaped color sequences172625
-Ref: Note on ERC escaped color sequences-Footnote-1174053
-Node: Note on powerline or spaceline174163
-Node: Note on SHR colors174577
-Node: Note on EWW and Elfeed fonts175000
-Node: Note on Helm grep175665
-Node: Note on vc-annotate-background-mode177140
-Node: Note on pdf-tools link hints178025
-Node: Frequently Asked Questions180457
-Node: Is the contrast ratio about adjacent colors?181088
-Node: What does it mean to avoid exaggerations?182595
-Node: Why are colors mostly variants of blue magenta cyan?184424
-Node: What is the best setup for legibility?188737
-Node: Are these color schemes?191382
-Node: Port the Modus themes to other platforms?195105
-Node: Contributing197889
-Node: Sources of the themes198286
-Node: Issues you can help with198922
-Node: Patches require copyright assignment to the FSF200122
-Node: Acknowledgements202417
-Node: Meta205262
-Node: GNU Free Documentation License207741
-Node: Indices233093
-Node: Function index233272
-Node: Variable index234795
-Node: Concept index236936
+Node: Custom reload theme26439
+Node: Deuteranopia style27229
+Node: Bold constructs28660
+Node: Italic constructs29494
+Node: Syntax styles30261
+Node: Mixed fonts32393
+Node: Link styles33657
+Node: Command prompts36135
+Node: Mode line37956
+Node: Tab style42447
+Node: Completion UIs43110
+Node: Mail citations45061
+Node: Fringes46245
+Node: Language checkers46985
+Node: Line highlighting49427
+Node: Line numbers51024
+Node: Markup52092
+Node: Matching parentheses53750
+Node: Active region55127
+Node: Diffs56540
+Node: Org mode blocks58146
+Node: Org agenda60536
+Node: Heading styles68996
+Node: UI typeface73421
+Node: Advanced customization74320
+Node: Visualize the active Modus theme's palette75784
+Node: Per-theme customization settings76733
+Node: Case-by-case face specs using the themes' palette78089
+Node: Face specs at scale using the themes' palette82637
+Node: Remap face with local value87438
+Node: Cycle through arbitrary colors89863
+Node: Override colors96291
+Node: Override color saturation101156
+Node: Override colors through blending106835
+Node: Font configurations for Org and others109690
+Ref: Font configurations for Org and others-Footnote-1112517
+Node: Configure bold and italic faces112704
+Node: Custom Org todo keyword and priority faces116852
+Node: Custom Org emphasis faces120525
+Node: Update Org block delimiter fontification125326
+Node: Measure color contrast127243
+Node: Load theme depending on time of day129966
+Node: Backdrop for pdf-tools130959
+Node: Decrease mode line height133654
+Node: A theme-agnostic hook for theme loading137779
+Node: Diffs with only the foreground140170
+Node: Face coverage143244
+Node: Supported packages143696
+Node: Indirectly covered packages150132
+Node: Notes on individual packages151134
+Node: Note on avy hints152174
+Node: Note on calendarel weekday and weekend colors153342
+Node: Note on underlines in compilation buffers154525
+Node: Note on inline Latex in Org buffers155337
+Node: Note on dimmerel155947
+Node: Note on display-fill-column-indicator-mode157432
+Node: Note on highlight-parenthesesel158995
+Node: Note on mmm-modeel background colors164984
+Node: Note for prism167299
+Node: Note for god-mode170453
+Node: Note on company-mode overlay pop-up172057
+Ref: Note on company-mode overlay pop-up-Footnote-1172747
+Ref: Note on company-mode overlay pop-up-Footnote-2172814
+Node: Note on ERC escaped color sequences172869
+Ref: Note on ERC escaped color sequences-Footnote-1174297
+Node: Note on powerline or spaceline174407
+Node: Note on SHR colors174821
+Node: Note on EWW and Elfeed fonts175244
+Node: Note on Helm grep175909
+Node: Note on vc-annotate-background-mode177384
+Node: Note on pdf-tools link hints178269
+Node: Frequently Asked Questions180701
+Node: Is the contrast ratio about adjacent colors?181332
+Node: What does it mean to avoid exaggerations?182839
+Node: Why are colors mostly variants of blue magenta cyan?184668
+Node: What is the best setup for legibility?188981
+Node: Are these color schemes?191626
+Node: Port the Modus themes to other platforms?195349
+Node: Contributing198133
+Node: Sources of the themes198530
+Node: Issues you can help with199166
+Node: Patches require copyright assignment to the FSF200366
+Node: Acknowledgements202661
+Node: Meta205506
+Node: GNU Free Documentation License207985
+Node: Indices233337
+Node: Function index233516
+Node: Variable index235039
+Node: Concept index237180

 End Tag Table

--- a/doc/modus-themes.org
+++ b/doc/modus-themes.org
@ -467,7 +467,7 @@ this manual.

      modus-themes-completions 'moderate ; {nil,'moderate,'opinionated}

-      modus-themes-mail-citations nil ; {nil,'faint,'monochrome}
+      modus-themes-mail-citations nil ; {nil,'intense,'faint,'monochrome}

      ;; Options for `modus-themes-region' are either nil (the default),
      ;; or a list of properties that may include any of those symbols:
@ -1028,17 +1028,21 @@ Symbol: ~modus-themes-mail-citations~ (=choice= type)
 Possible values:

 1. ~nil~ (default)
-2. ~faint~
-3. ~monochrome~
+2. ~intense~ [ Introduced as part of {{{development-version}}}. ]
+3. ~faint~
+4. ~monochrome~

-By default, citations in email-related buffers apply contrasting hues to
-different levels of depth in cited text.  The colors are fairly easy to
-tell apart.
+By default (a nil value) citations are styled with contrasting hues to
+denote their depth.  Colors are easy to tell apart because they
+complement each other, but they otherwise are not very prominent.

-A value of ~faint~ makes all citation levels less intense, while retaining
-the default style of contrasting hues (albeit very subtle ones).
+Option ~intense~ is similar to the default in terms of using contrasting
+and complementary hues, but applies more saturated colors.

-Option ~monochrome~ turns all citations in to a uniform shade of gray.
+Option ~faint~ maintains the same color-based distinction between citation
+levels though the colors it uses have subtle differences between them.
+
+Option ~monochrome~ turns all quotes into a shade of gray.

 Whatever the value assigned to this variable, citations in emails are
 controlled by typographic elements or indentation, which the themes do
--- a/modus-themes.el
+++ b/modus-themes.el
@ -5,7 +5,7 @@
 ;; Author: Protesilaos Stavrou <info@protesilaos.com>
 ;; URL: https://gitlab.com/protesilaos/modus-themes
 ;; Version: 2.0.0
-;; Last-Modified: <2022-01-21 22:12:20 +0200>
+;; Last-Modified: <2022-01-22 08:08:13 +0200>
 ;; Package-Requires: ((emacs "27.1"))
 ;; Keywords: faces, theme, accessibility

@ -2841,23 +2841,28 @@ the spectrum."
  :link '(info-link "(modus-themes) Deuteranopia style"))

 (defcustom modus-themes-mail-citations nil
-  "Control the color of citations in messages or email clients.
+  "Control the color of citations/quotes in messages or emails.

-Nil (the default) means to use a variety of contrasting hues to
-denote depth in nested citations.  Colors are fairly easy to tell
-apart.
+By default (a nil value) citations are styled with contrasting
+hues to denote their depth.  Colors are easy to tell apart
+because they complement each other, but they otherwise are not
+very prominent.

-Option `faint' maintains a color-based distinction between
-citation levels but the colors it applies have very subtle
-differences between them.
+Option `intense' is similar to the default in terms of using
+contrasting and complementary hues, but applies more saturated
+colors.

-Option `monochrome' turns all citations that would otherwise be
-colored into a uniform shade of shade of gray."
+Option `faint' maintains the same color-based distinction between
+citation levels though the colors it uses have subtle differences
+between them.
+
+Option `monochrome' turns all quotes into a shade of gray."
  :group 'modus-themes
-  :package-version '(modus-themes . "1.4.0")
-  :version "28.1"
+  :package-version '(modus-themes . "2.1.0")
+  :version "29.1"
  :type '(choice
-          (const :format "[%v] %t\n" :tag "Colorful mail citations with contrasting hues (default)" nil)
+          (const :format "[%v] %t\n" :tag "Colorful email citations with contrasting hues (default)" nil)
+          (const :format "[%v] %t\n" :tag "Like the default, but with more saturated colors" intense)
          (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))
@ -3845,13 +3850,14 @@ more prominent alternatives."
            lineneutral)
           ('unspecified)))))

-(defun modus-themes--mail-cite (mainfg subtlefg)
+(defun modus-themes--mail-cite (mainfg intensefg subtlefg)
  "Combinations for `modus-themes-mail-citations'.

 MAINFG is an accented foreground value.  SUBTLEFG is its
-desaturated counterpart."
+desaturated counterpart.  INTENSEFG is a more saturated variant."
  (pcase modus-themes-mail-citations
    ('monochrome (list :inherit 'shadow))
+    ('intense (list :foreground intensefg))
    ('faint (list :foreground subtlefg))
    ('desaturated (list :foreground subtlefg))
    (_ (list :foreground mainfg))))
@ -6296,10 +6302,10 @@ by virtue of calling either of `modus-themes-load-operandi' and
    `(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-cited-text-1 ((,class ,@(modus-themes--mail-cite blue-faint blue fg-special-cold))))
+    `(message-cited-text-2 ((,class ,@(modus-themes--mail-cite yellow-faint yellow yellow-alt-faint))))
+    `(message-cited-text-3 ((,class ,@(modus-themes--mail-cite magenta-alt-faint magenta-alt fg-special-calm))))
+    `(message-cited-text-4 ((,class ,@(modus-themes--mail-cite cyan-alt-other-faint cyan-alt-other fg-special-mild))))
    `(message-header-cc ((,class :foreground ,blue-alt-other)))
    `(message-header-name ((,class :inherit bold :foreground ,cyan)))
    `(message-header-newsgroups ((,class :inherit message-header-other)))