branch: externals/modus-themes
commit 1fe0a3c9c46e66e6634e0ed23f2b5450497f618d
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
Introduce 'property' mapping
Thanks to Alexandr Semenov for requesting this in issue 141:
<https://github.com/protesilaos/modus-themes/issues/141>.
---
doc/modus-themes.info | 77 ++++++++++++++++++------------------
doc/modus-themes.org | 67 +++++++++++++++----------------
modus-operandi-deuteranopia-theme.el | 1 +
modus-operandi-theme.el | 1 +
modus-operandi-tinted-theme.el | 1 +
modus-operandi-tritanopia-theme.el | 1 +
modus-themes.el | 1 +
modus-vivendi-deuteranopia-theme.el | 1 +
modus-vivendi-theme.el | 1 +
modus-vivendi-tinted-theme.el | 1 +
modus-vivendi-tritanopia-theme.el | 1 +
11 files changed, 82 insertions(+), 71 deletions(-)
diff --git a/doc/modus-themes.info b/doc/modus-themes.info
index c2d294bbd0..950cc4fc3b 100644
--- a/doc/modus-themes.info
+++ b/doc/modus-themes.info
@@ -5915,39 +5915,40 @@ Contributions to code or documentation
Ideas and user feedback
Aaron Jensen, Adam Porter, Adam Spiers, Adrian Manea, Aleksei
- Pirogov, Alex Griffin, Alex Koen, Alex Peitsinis, Alexey Shmalko,
- Alok Singh, Anders Johansson, André Alexandre Gomes, Andrew Tropin,
- Antonio Hernández Blas, Arif Rezai, Augusto Stoffel, Basil L.
- Contovounesios, Bernd Rellermeyer, Burgess Chang, Charlotte Van
- Petegem, Christian Tietze, Christopher Dimech, Christopher League,
- Damien Cassou, Daniel Mendler, Dario Gjorgjevski, David Edmondson,
- Davor Rotim, Divan Santana, Eliraz Kedmi, Emanuele Michele Alberto
- Monterosso, Farasha Euker, Feng Shu, Filippo Argiolas, Gautier
- Ponsinet, Gerry Agbobada, Gianluca Recchia, Gonçalo Marrafa,
- Guilherme Semente, Gustavo Barros, Hörmetjan Yiltiz, Ilja Kocken,
- Imran Khan, Iris Garcia, Ivan Popovych, Jabir Ali Ouassou, James
- Ferguson, Jeremy Friesen, Jerry Zhang, Johannes Grødem, John Haman,
- John Wick, Jonas Collberg, Jorge Morais, Joshua O’Connor, Julio C.
- Villasante, Kenta Usami, Kevin Fleming, Kévin Le Gouguec, Kevin
- Kainan Li, Kostadin Ninev, Laith Bahodi, Lasse Lindner, Len Trigg,
- Lennart C. Karssen, Luis Miguel Castañeda, Magne Hov, Manuel
- Giraud, Manuel Uberti, Mark Bestley, Mark Burton, Mark Simpson,
- Marko Kocic, Markus Beppler, Matt Armstrong, Matthias Fuchs,
- Mattias Engdegård, Mauro Aranda, Maxime Tréca, Michael Goldenberg,
- Morgan Smith, Morgan Willcock, Murilo Pereira, Nicky van Foreest,
- Nicolas De Jaeghere, Nicolas Semrau, Olaf Meeuwissen, Oliver Epper,
- Pablo Stafforini, Paul Poloskov, Pengji Zhang, Pete Kazmier, Peter
- Wu, Philip Kaludercic, Pierre Téchoueyres, Przemysław Kryger,
- Robert Hepple, Roman Rudakov, Russell Sim, Ryan Phillips, Rytis
- Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel Culpepper, Saša
- Janiška, Shreyas Ragavan, Simon Pugnet, Steve Downey, Tassilo Horn,
- Thanos Apollo, Thibaut Verron, Thomas Heartman, Togan Muftuoglu,
- Tony Zorman, Trey Merkley, Tomasz Hołubowicz, Toon Claes, Uri
- Sharf, Utkarsh Singh, Vincent Foley, Zoltan Kiraly. As well as
- users: Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux,
- Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, TitusMu, Trey,
- ZharMeny, bepolymathe, bit9tream, bangedorrunt, derek-upham,
- doolio, fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn,
+ Pirogov, Alex Griffin, Alex Koen, Alex Peitsinis, Alexandr Semenov,
+ Alexey Shmalko, Alok Singh, Anders Johansson, André Alexandre
+ Gomes, Andrew Tropin, Antonio Hernández Blas, Arif Rezai, Augusto
+ Stoffel, Basil L. Contovounesios, Bernd Rellermeyer, Burgess Chang,
+ Charlotte Van Petegem, Christian Tietze, Christopher Dimech,
+ Christopher League, Damien Cassou, Daniel Mendler, Dario
+ Gjorgjevski, David Edmondson, Davor Rotim, Divan Santana, Eliraz
+ Kedmi, Emanuele Michele Alberto Monterosso, Farasha Euker, Feng
+ Shu, Filippo Argiolas, Gautier Ponsinet, Gerry Agbobada, Gianluca
+ Recchia, Gonçalo Marrafa, Guilherme Semente, Gustavo Barros,
+ Hörmetjan Yiltiz, Ilja Kocken, Imran Khan, Iris Garcia, Ivan
+ Popovych, Jabir Ali Ouassou, James Ferguson, Jeremy Friesen, Jerry
+ Zhang, Johannes Grødem, John Haman, John Wick, Jonas Collberg,
+ Jorge Morais, Joshua O’Connor, Julio C. Villasante, Kenta Usami,
+ Kevin Fleming, Kévin Le Gouguec, Kevin Kainan Li, Kostadin Ninev,
+ Laith Bahodi, Lasse Lindner, Len Trigg, Lennart C. Karssen, Luis
+ Miguel Castañeda, Magne Hov, Manuel Giraud, Manuel Uberti, Mark
+ Bestley, Mark Burton, Mark Simpson, Marko Kocic, Markus Beppler,
+ Matt Armstrong, Matthias Fuchs, Mattias Engdegård, Mauro Aranda,
+ Maxime Tréca, Michael Goldenberg, Morgan Smith, Morgan Willcock,
+ Murilo Pereira, Nicky van Foreest, Nicolas De Jaeghere, Nicolas
+ Semrau, Olaf Meeuwissen, Oliver Epper, Pablo Stafforini, Paul
+ Poloskov, Pengji Zhang, Pete Kazmier, Peter Wu, Philip Kaludercic,
+ Pierre Téchoueyres, Przemysław Kryger, Robert Hepple, Roman
+ Rudakov, Russell Sim, Ryan Phillips, Rytis Paškauskas, Rudolf
+ Adamkovič, Sam Kleinman, Samuel Culpepper, Saša Janiška, Shreyas
+ Ragavan, Simon Pugnet, Steve Downey, Tassilo Horn, Thanos Apollo,
+ Thibaut Verron, Thomas Heartman, Togan Muftuoglu, Tony Zorman, Trey
+ Merkley, Tomasz Hołubowicz, Toon Claes, Uri Sharf, Utkarsh Singh,
+ Vincent Foley, Zoltan Kiraly. As well as users: Ben,
+ CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux, Fredrik, Moesasji,
+ Nick, Summer Emacs, TheBlob42, TitusMu, Trey, ZharMeny,
+ bepolymathe, bit9tream, bangedorrunt, derek-upham, doolio,
+ fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn,
pedro-nonfree, pRot0ta1p, shipmints, soaringbird, tumashu,
wakamenod.
@@ -6739,11 +6740,11 @@ Node: Sources of the themes246963
Node: Issues you can help with247859
Node: Patches require copyright assignment to the FSF249299
Node: Acknowledgements251521
-Node: GNU Free Documentation License255854
-Node: Indices281218
-Node: Function index281397
-Node: Variable index282993
-Node: Concept index286493
+Node: GNU Free Documentation License255878
+Node: Indices281242
+Node: Function index281421
+Node: Variable index283017
+Node: Concept index286517
End Tag Table
diff --git a/doc/modus-themes.org b/doc/modus-themes.org
index 8aff347aca..1709ffd5af 100644
--- a/doc/modus-themes.org
+++ b/doc/modus-themes.org
@@ -5708,39 +5708,40 @@ The Modus themes are a collective effort. Every bit of
work matters.
+ Ideas and user feedback :: Aaron Jensen, Adam Porter, Adam Spiers,
Adrian Manea, Aleksei Pirogov, Alex Griffin, Alex Koen, Alex
- Peitsinis, Alexey Shmalko, Alok Singh, Anders Johansson, André
- Alexandre Gomes, Andrew Tropin, Antonio Hernández Blas, Arif Rezai,
- Augusto Stoffel, Basil L.{{{space()}}} Contovounesios, Bernd
- Rellermeyer, Burgess Chang, Charlotte Van Petegem, Christian Tietze,
- Christopher Dimech, Christopher League, Damien Cassou, Daniel
- Mendler, Dario Gjorgjevski, David Edmondson, Davor Rotim, Divan
- Santana, Eliraz Kedmi, Emanuele Michele Alberto Monterosso, Farasha
- Euker, Feng Shu, Filippo Argiolas, Gautier Ponsinet, Gerry Agbobada,
- Gianluca Recchia, Gonçalo Marrafa, Guilherme Semente, Gustavo
- Barros, Hörmetjan Yiltiz, Ilja Kocken, Imran Khan, Iris Garcia, Ivan
- Popovych, Jabir Ali Ouassou, James Ferguson, Jeremy Friesen, Jerry
- Zhang, Johannes Grødem, John Haman, John Wick, Jonas Collberg, Jorge
- Morais, Joshua O'Connor, Julio C. Villasante, Kenta Usami, Kevin
- Fleming, Kévin Le Gouguec, Kevin Kainan Li, Kostadin Ninev, Laith
- Bahodi, Lasse Lindner, Len Trigg, Lennart C.{{{space()}}} Karssen,
- Luis Miguel Castañeda, Magne Hov, Manuel Giraud, Manuel Uberti, Mark
- Bestley, Mark Burton, Mark Simpson, Marko Kocic, Markus Beppler,
- Matt Armstrong, Matthias Fuchs, Mattias Engdegård, Mauro Aranda,
- Maxime Tréca, Michael Goldenberg, Morgan Smith, Morgan Willcock,
- Murilo Pereira, Nicky van Foreest, Nicolas De Jaeghere, Nicolas
- Semrau, Olaf Meeuwissen, Oliver Epper, Pablo Stafforini, Paul
- Poloskov, Pengji Zhang, Pete Kazmier, Peter Wu, Philip Kaludercic,
- Pierre Téchoueyres, Przemysław Kryger, Robert Hepple, Roman Rudakov,
- Russell Sim, Ryan Phillips, Rytis Paškauskas, Rudolf Adamkovič, Sam
- Kleinman, Samuel Culpepper, Saša Janiška, Shreyas Ragavan, Simon
- Pugnet, Steve Downey, Tassilo Horn, Thanos Apollo, Thibaut Verron,
- Thomas Heartman, Togan Muftuoglu, Tony Zorman, Trey Merkley, Tomasz
- Hołubowicz, Toon Claes, Uri Sharf, Utkarsh Singh, Vincent Foley,
- Zoltan Kiraly. As well as users: Ben, CsBigDataHub1, Emacs Contrib,
- Eugene, Fourchaux, Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42,
- TitusMu, Trey, ZharMeny, bepolymathe, bit9tream, bangedorrunt,
- derek-upham, doolio, fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag,
- okamsn, pedro-nonfree, pRot0ta1p, shipmints, soaringbird, tumashu,
+ Peitsinis, Alexandr Semenov, Alexey Shmalko, Alok Singh, Anders
+ Johansson, André Alexandre Gomes, Andrew Tropin, Antonio Hernández
+ Blas, Arif Rezai, Augusto Stoffel, Basil L.{{{space()}}}
+ Contovounesios, Bernd Rellermeyer, Burgess Chang, Charlotte Van
+ Petegem, Christian Tietze, Christopher Dimech, Christopher League,
+ Damien Cassou, Daniel Mendler, Dario Gjorgjevski, David Edmondson,
+ Davor Rotim, Divan Santana, Eliraz Kedmi, Emanuele Michele Alberto
+ Monterosso, Farasha Euker, Feng Shu, Filippo Argiolas, Gautier
+ Ponsinet, Gerry Agbobada, Gianluca Recchia, Gonçalo Marrafa,
+ Guilherme Semente, Gustavo Barros, Hörmetjan Yiltiz, Ilja Kocken,
+ Imran Khan, Iris Garcia, Ivan Popovych, Jabir Ali Ouassou, James
+ Ferguson, Jeremy Friesen, Jerry Zhang, Johannes Grødem, John Haman,
+ John Wick, Jonas Collberg, Jorge Morais, Joshua O'Connor, Julio C.
+ Villasante, Kenta Usami, Kevin Fleming, Kévin Le Gouguec, Kevin
+ Kainan Li, Kostadin Ninev, Laith Bahodi, Lasse Lindner, Len Trigg,
+ Lennart C.{{{space()}}} Karssen, Luis Miguel Castañeda, Magne Hov,
+ Manuel Giraud, Manuel Uberti, Mark Bestley, Mark Burton, Mark
+ Simpson, Marko Kocic, Markus Beppler, Matt Armstrong, Matthias
+ Fuchs, Mattias Engdegård, Mauro Aranda, Maxime Tréca, Michael
+ Goldenberg, Morgan Smith, Morgan Willcock, Murilo Pereira, Nicky van
+ Foreest, Nicolas De Jaeghere, Nicolas Semrau, Olaf Meeuwissen,
+ Oliver Epper, Pablo Stafforini, Paul Poloskov, Pengji Zhang, Pete
+ Kazmier, Peter Wu, Philip Kaludercic, Pierre Téchoueyres, Przemysław
+ Kryger, Robert Hepple, Roman Rudakov, Russell Sim, Ryan Phillips,
+ Rytis Paškauskas, Rudolf Adamkovič, Sam Kleinman, Samuel Culpepper,
+ Saša Janiška, Shreyas Ragavan, Simon Pugnet, Steve Downey, Tassilo
+ Horn, Thanos Apollo, Thibaut Verron, Thomas Heartman, Togan
+ Muftuoglu, Tony Zorman, Trey Merkley, Tomasz Hołubowicz, Toon Claes,
+ Uri Sharf, Utkarsh Singh, Vincent Foley, Zoltan Kiraly. As well as
+ users: Ben, CsBigDataHub1, Emacs Contrib, Eugene, Fourchaux,
+ Fredrik, Moesasji, Nick, Summer Emacs, TheBlob42, TitusMu, Trey,
+ ZharMeny, bepolymathe, bit9tream, bangedorrunt, derek-upham, doolio,
+ fleimgruber, gitrj95, iSeeU, jixiuf, ltmsyvag, okamsn,
+ pedro-nonfree, pRot0ta1p, shipmints, soaringbird, tumashu,
wakamenod.
+ Packaging :: Basil L.{{{space()}}} Contovounesios, Eli Zaretskii,
diff --git a/modus-operandi-deuteranopia-theme.el
b/modus-operandi-deuteranopia-theme.el
index 3e464b44fb..2d6d4120f7 100644
--- a/modus-operandi-deuteranopia-theme.el
+++ b/modus-operandi-deuteranopia-theme.el
@@ -264,6 +264,7 @@ standard)."
(number fg-main)
(operator fg-main)
(preprocessor magenta-cooler)
+ (property cyan)
(punctuation fg-main)
(rx-backslash blue-cooler)
(rx-construct yellow-cooler)
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 0f0bc643e4..2de59012e4 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -262,6 +262,7 @@ which corresponds to a minimum contrast in relative
luminance of
(number fg-main)
(operator fg-main)
(preprocessor red-cooler)
+ (property cyan)
(punctuation fg-main)
(rx-backslash magenta)
(rx-construct green-cooler)
diff --git a/modus-operandi-tinted-theme.el b/modus-operandi-tinted-theme.el
index c3acb935e7..297b9784ca 100644
--- a/modus-operandi-tinted-theme.el
+++ b/modus-operandi-tinted-theme.el
@@ -262,6 +262,7 @@ which corresponds to a minimum contrast in relative
luminance of
(number fg-main)
(operator fg-main)
(preprocessor yellow-warmer)
+ (property green-cooler)
(punctuation fg-main)
(rx-backslash magenta-warmer)
(rx-construct magenta-cooler)
diff --git a/modus-operandi-tritanopia-theme.el
b/modus-operandi-tritanopia-theme.el
index 7161d71082..fd256ea351 100644
--- a/modus-operandi-tritanopia-theme.el
+++ b/modus-operandi-tritanopia-theme.el
@@ -264,6 +264,7 @@ standard)."
(number fg-main)
(operator fg-main)
(preprocessor red-warmer)
+ (property cyan-cooler)
(punctuation fg-main)
(rx-backslash magenta)
(rx-construct red)
diff --git a/modus-themes.el b/modus-themes.el
index 945d7b5585..00d918f713 100644
--- a/modus-themes.el
+++ b/modus-themes.el
@@ -2504,6 +2504,7 @@ FG and BG are the main colors."
`(font-lock-number-face ((,c :foreground ,number)))
`(font-lock-operator-face ((,c :foreground ,operator)))
`(font-lock-preprocessor-face ((,c :foreground ,preprocessor)))
+ `(font-lock-property-name-face ((,c :foreground ,property)))
`(font-lock-punctuation-face ((,c :foreground ,punctuation)))
`(font-lock-regexp-grouping-backslash ((,c :inherit modus-themes-bold
:foreground ,rx-backslash)))
`(font-lock-regexp-grouping-construct ((,c :inherit modus-themes-bold
:foreground ,rx-construct)))
diff --git a/modus-vivendi-deuteranopia-theme.el
b/modus-vivendi-deuteranopia-theme.el
index 6f4878395d..e9e617ccab 100644
--- a/modus-vivendi-deuteranopia-theme.el
+++ b/modus-vivendi-deuteranopia-theme.el
@@ -264,6 +264,7 @@ standard)."
(number fg-main)
(operator fg-main)
(preprocessor magenta-cooler)
+ (property cyan)
(punctuation fg-main)
(rx-backslash blue-cooler)
(rx-construct yellow-cooler)
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 8966a70d0b..10b95ec9c4 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -262,6 +262,7 @@ which corresponds to a minimum contrast in relative
luminance of
(number fg-main)
(operator fg-main)
(preprocessor red-cooler)
+ (property cyan)
(punctuation fg-main)
(rx-backslash magenta)
(rx-construct green-cooler)
diff --git a/modus-vivendi-tinted-theme.el b/modus-vivendi-tinted-theme.el
index 5c7920b5e4..f5e6d1d958 100644
--- a/modus-vivendi-tinted-theme.el
+++ b/modus-vivendi-tinted-theme.el
@@ -262,6 +262,7 @@ which corresponds to a minimum contrast in relative
luminance of
(number fg-main)
(operator fg-main)
(preprocessor red-cooler)
+ (property cyan-warmer)
(punctuation fg-main)
(rx-backslash magenta-warmer)
(rx-construct magenta-cooler)
diff --git a/modus-vivendi-tritanopia-theme.el
b/modus-vivendi-tritanopia-theme.el
index 3afd318130..d802736884 100644
--- a/modus-vivendi-tritanopia-theme.el
+++ b/modus-vivendi-tritanopia-theme.el
@@ -264,6 +264,7 @@ standard)."
(number fg-main)
(operator fg-main)
(preprocessor red-warmer)
+ (property cyan-cooler)
(punctuation fg-main)
(rx-backslash magenta)
(rx-construct red)
