[elpa] externals/modus-operandi-theme 69a7210 107/153: Major review of Selectrum faces

[Stefan Monnier]

branch: externals/modus-operandi-theme
commit 69a7210b670da5b01c92ac5908e05be9eda9ebbe
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Major review of Selectrum faces
    
    * modus-operandi-theme.el, modus-vivendi-theme.el
    (custom-theme-set-faces): Use bespoke styles for Selectrum's current
    line to account for its design choice of always retaining the
    colouration of matching characters.[0] We want to avoid scenaria where
    matches are difficult to discern and the current line is not clear.
    
    Review the remaining faces in the interest of consistency, but also to
    align them with other pattern matching styles, like Orderless (which
    Selectrum can use).
    
    * modus-operandi-theme.el (modus-operandi-theme-completions)
    (modus-operandi-theme-standard-completions)
    (modus-operandi-theme-extra-completions): Tweak doc strings.
    
    * modus-vivendi-theme.el (modus-vivendi-theme-completions)
    (modus-vivendi-theme-standard-completions)
    (modus-vivendi-theme-extra-completions): Tweak doc strings.
    
    * doc/modus-themes.org (Option for completion framework aesthetics):
    Clarify that, in terms of aesthetics, Selectrum is using styles that are
    closer to Icomplete or Ido and, therefore, is not grouped together with
    Helm and Ivy.
    
    * doc/modus-themes.info: Recompile Info manual.
    
    [0]: https://github.com/raxod502/selectrum/issues/21
---
 doc/modus-themes.info   | 74 ++++++++++++++++++++++++-------------------------
 doc/modus-themes.org    |  6 ++--
 modus-operandi-theme.el | 44 ++++++++++++++---------------
 modus-vivendi-theme.el  | 44 ++++++++++++++---------------
 4 files changed, 82 insertions(+), 86 deletions(-)

diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index 89f0211..a788b97 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -690,9 +690,9 @@ completion UI.  The interfaces can be grouped in two 
categories, based
 on their default aesthetics: (i) those that only or mostly use
 foreground colours for their interaction model, and (ii) those that
 combine background and foreground values for some of their metaphors.
-The former category encompasses the built-in tools, namely, Icomplete
-and Ido, as well as third party packages like Orderless and Flx.  The
-latter covers Helm, Ivy, Selectrum, and similar.
+The former category encompasses Icomplete, Ido, Selectrum as well as
+pattern matching styles like Orderless and Flx.  The latter covers Helm,
+Ivy, and similar.
 
    A value of ‘nil’ will respect the metaphors of each completion
 framework.
@@ -2411,40 +2411,40 @@ Node: Link underline20915
 Node: Command prompts21397
 Node: Mode line22195
 Node: Completion UIs24632
-Node: Fringes26573
-Node: Line highlighting27337
-Node: Matching parentheses28005
-Node: Diffs28649
-Node: Org mode blocks30442
-Node: Heading styles31945
-Node: Scaled headings35334
-Node: Scaled heading sizes35951
-Node: Headings' font37910
-Node: Advanced customisation (do-it-yourself)38534
-Node: Tweak colours (DIY)39538
-Node: Font configs (DIY)43172
-Ref: Font configs (DIY)-Footnote-145752
-Ref: Font configs (DIY)-Footnote-245939
-Node: Org user faces (DIY)46161
-Node: Face coverage49382
-Node: Supported packages49884
-Node: Covered indirectly55843
-Node: Will NOT be supported56212
-Node: Notes for individual packages56930
-Node: Note for ERC escaped colour sequences57378
-Ref: Note for ERC escaped colour sequences-Footnote-158761
-Node: Note for powerline or spaceline58871
-Node: Note on shr colours59289
-Node: Note for Helm grep59702
-Node: Note on vc-annotate-background-mode61149
-Node: Contributing62003
-Node: Sources of the themes62422
-Node: Issues you can help with63184
-Node: Merge requests64371
-Node: Acknowledgements65453
-Node: Meta66717
-Node: External projects (ports)67909
-Node: GNU Free Documentation License68732
+Node: Fringes26544
+Node: Line highlighting27308
+Node: Matching parentheses27976
+Node: Diffs28620
+Node: Org mode blocks30413
+Node: Heading styles31916
+Node: Scaled headings35305
+Node: Scaled heading sizes35922
+Node: Headings' font37881
+Node: Advanced customisation (do-it-yourself)38505
+Node: Tweak colours (DIY)39509
+Node: Font configs (DIY)43143
+Ref: Font configs (DIY)-Footnote-145723
+Ref: Font configs (DIY)-Footnote-245910
+Node: Org user faces (DIY)46132
+Node: Face coverage49353
+Node: Supported packages49855
+Node: Covered indirectly55814
+Node: Will NOT be supported56183
+Node: Notes for individual packages56901
+Node: Note for ERC escaped colour sequences57349
+Ref: Note for ERC escaped colour sequences-Footnote-158732
+Node: Note for powerline or spaceline58842
+Node: Note on shr colours59260
+Node: Note for Helm grep59673
+Node: Note on vc-annotate-background-mode61120
+Node: Contributing61974
+Node: Sources of the themes62393
+Node: Issues you can help with63155
+Node: Merge requests64342
+Node: Acknowledgements65424
+Node: Meta66688
+Node: External projects (ports)67880
+Node: GNU Free Documentation License68703
 
 End Tag Table
 
diff --git a/doc/modus-themes.org b/doc/modus-themes.org
index e3be2b9..da4b1a7 100644
--- a/doc/modus-themes.org
+++ b/doc/modus-themes.org
@@ -561,9 +561,9 @@ completion UI.  The interfaces can be grouped in two 
categories, based
 on their default aesthetics: (i) those that only or mostly use
 foreground colours for their interaction model, and (ii) those that
 combine background and foreground values for some of their metaphors.
-The former category encompasses the built-in tools, namely, Icomplete
-and Ido, as well as third party packages like Orderless and Flx.  The
-latter covers Helm, Ivy, Selectrum, and similar.
+The former category encompasses Icomplete, Ido, Selectrum as well as
+pattern matching styles like Orderless and Flx.  The latter covers Helm,
+Ivy, and similar.
 
 A value of =nil= will respect the metaphors of each completion framework.
 
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 3ab1bd7..4b59451 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -765,6 +765,7 @@ greyscale value is used."
 
 (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.
@@ -1016,12 +1017,13 @@ and MAINFG respectively."
 
 (defun modus-operandi-theme-standard-completions (mainfg subtlebg intensebg 
intensefg)
   "Combinations for `modus-operandi-theme-completions'.
-These are intended for Icomplete, Ido, and related.
 
 MAINFG is an accented foreground value.  SUBTLEBG is an accented
 background value that can be combined with MAINFG.  INTENSEBG and
 INTENSEFG are accented colours that are designed to be used in
-tandem."
+tandem.
+
+These are intended for Icomplete, Ido, and related."
   (pcase modus-operandi-theme-completions
     ('opinionated (list :background intensebg :foreground intensefg))
     ('moderate (list :background subtlebg :foreground mainfg))
@@ -1029,7 +1031,6 @@ tandem."
 
 (defun modus-operandi-theme-extra-completions (subtleface intenseface altface 
&optional altfg bold)
   "Combinations for `modus-operandi-theme-completions'.
-These are intended for Helm, Ivy, Selectrum, etc.
 
 SUBTLEFACE and INTENSEFACE are custom theme faces that combine a
 background and foreground value.  The difference between the two
@@ -1039,10 +1040,12 @@ ALTFACE is a combination of colours that represents a 
departure
 from the UI's default aesthetics.  Optional ALTFG is meant to be
 used in tandem with it.
 
-Optional BOLD will apply a heavier weight to the text."
+Optional BOLD will apply a heavier weight to the text.
+
+These are intended for Helm, Ivy, etc."
   (pcase modus-operandi-theme-completions
     ('opinionated (list :inherit (list altface bold)
-                        :foreground (if altfg altfg 'unspecified)))
+                        :foreground (or altfg 'unspecified)))
     ('moderate (list :inherit (list subtleface bold)))
     (_ (list :inherit (list intenseface bold)))))
 
@@ -3929,24 +3932,19 @@ Also bind `class' to ((class color) (min-colors 89))."
                                         'modus-theme-nuanced-blue
                                         blue-alt-other))))
 ;;;;; selectrum
-   `(selectrum-current-candidate ((,class 
,@(modus-operandi-theme-extra-completions
-                                             'modus-theme-refine-magenta
-                                             'modus-theme-intense-magenta
-                                             'modus-theme-nuanced-magenta
-                                             magenta
-                                             'bold))))
-   `(selectrum-primary-highlight ((,class 
,@(modus-operandi-theme-extra-completions
-                                             'modus-theme-refine-blue
-                                             'modus-theme-intense-blue
-                                             'modus-theme-nuanced-blue
-                                             blue
-                                             'bold))))
-   `(selectrum-secondary-highlight ((,class 
,@(modus-operandi-theme-extra-completions
-                                               'modus-theme-refine-cyan
-                                               'modus-theme-intense-cyan
-                                               'modus-theme-nuanced-cyan
-                                               cyan
-                                               'bold))))
+   `(selectrum-current-candidate
+     ((,class :inherit bold :foreground ,fg-main :underline ,fg-main
+              :background ,@(pcase modus-operandi-theme-completions
+                              ('opinionated (list bg-active))
+                              (_ (list bg-inactive))))))
+   `(selectrum-primary-highlight ((,class :inherit bold
+                                          
,@(modus-operandi-theme-standard-completions
+                                             magenta-alt magenta-nuanced-bg
+                                             magenta-refine-bg 
magenta-refine-fg))))
+   `(selectrum-secondary-highlight ((,class :inherit bold
+                                            
,@(modus-operandi-theme-standard-completions
+                                               cyan-alt-other cyan-nuanced-bg
+                                               cyan-refine-bg 
cyan-refine-fg))))
 ;;;;; semantic
    `(semantic-complete-inline-face ((,class :foreground ,fg-special-warm 
:underline t)))
    `(semantic-decoration-on-private-members-face ((,class :inherit 
modus-theme-refine-cyan)))
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 352165f..d9c8a41 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -765,6 +765,7 @@ greyscale value is used."
 
 (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.
@@ -1016,12 +1017,13 @@ and MAINFG respectively."
 
 (defun modus-vivendi-theme-standard-completions (mainfg subtlebg intensebg 
intensefg)
   "Combinations for `modus-vivendi-theme-completions'.
-These are intended for Icomplete, Ido, and related.
 
 MAINFG is an accented foreground value.  SUBTLEBG is an accented
 background value that can be combined with MAINFG.  INTENSEBG and
 INTENSEFG are accented colours that are designed to be used in
-tandem."
+tandem.
+
+These are intended for Icomplete, Ido, and related."
   (pcase modus-vivendi-theme-completions
     ('opinionated (list :background intensebg :foreground intensefg))
     ('moderate (list :background subtlebg :foreground mainfg))
@@ -1029,7 +1031,6 @@ tandem."
 
 (defun modus-vivendi-theme-extra-completions (subtleface intenseface altface 
&optional altfg bold)
   "Combinations for `modus-vivendi-theme-completions'.
-These are intended for Helm, Ivy, Selectrum, etc.
 
 SUBTLEFACE and INTENSEFACE are custom theme faces that combine a
 background and foreground value.  The difference between the two
@@ -1039,10 +1040,12 @@ ALTFACE is a combination of colours that represents a 
departure
 from the UI's default aesthetics.  Optional ALTFG is meant to be
 used in tandem with it.
 
-Optional BOLD will apply a heavier weight to the text."
+Optional BOLD will apply a heavier weight to the text.
+
+These are intended for Helm, Ivy, etc."
   (pcase modus-vivendi-theme-completions
     ('opinionated (list :inherit (list altface bold)
-                        :foreground (if altfg altfg 'unspecified)))
+                        :foreground (or altfg 'unspecified)))
     ('moderate (list :inherit (list subtleface bold)))
     (_ (list :inherit (list intenseface bold)))))
 
@@ -3929,24 +3932,19 @@ Also bind `class' to ((class color) (min-colors 89))."
                                         'modus-theme-nuanced-blue
                                         blue-alt-other))))
 ;;;;; selectrum
-   `(selectrum-current-candidate ((,class 
,@(modus-vivendi-theme-extra-completions
-                                             'modus-theme-refine-magenta
-                                             'modus-theme-intense-magenta
-                                             'modus-theme-nuanced-magenta
-                                             magenta
-                                             'bold))))
-   `(selectrum-primary-highlight ((,class 
,@(modus-vivendi-theme-extra-completions
-                                             'modus-theme-refine-blue
-                                             'modus-theme-intense-blue
-                                             'modus-theme-nuanced-blue
-                                             blue
-                                             'bold))))
-   `(selectrum-secondary-highlight ((,class 
,@(modus-vivendi-theme-extra-completions
-                                               'modus-theme-refine-cyan
-                                               'modus-theme-intense-cyan
-                                               'modus-theme-nuanced-cyan
-                                               cyan
-                                               'bold))))
+   `(selectrum-current-candidate
+     ((,class :inherit bold :foreground ,fg-main :underline ,fg-main
+              :background ,@(pcase modus-vivendi-theme-completions
+                              ('opinionated (list bg-active))
+                              (_ (list bg-inactive))))))
+   `(selectrum-primary-highlight ((,class :inherit bold
+                                          
,@(modus-vivendi-theme-standard-completions
+                                             magenta-alt magenta-nuanced-bg
+                                             magenta-refine-bg 
magenta-refine-fg))))
+   `(selectrum-secondary-highlight ((,class :inherit bold
+                                            
,@(modus-vivendi-theme-standard-completions
+                                               cyan-alt-other cyan-nuanced-bg
+                                               cyan-refine-bg 
cyan-refine-fg))))
 ;;;;; semantic
    `(semantic-complete-inline-face ((,class :foreground ,fg-special-warm 
:underline t)))
    `(semantic-decoration-on-private-members-face ((,class :inherit 
modus-theme-refine-cyan)))