Replace the main macro with a function (#23)

* Replace the main macro with a function This involves a number of steps where we end up transforming a sort of spec format into the same format used for faces in a theme. * Fix a bug with missing color replacements
tinted-theming · Aug 26, 2016 · 36cca7c · 36cca7c
1 parent 81327a6
commit 36cca7c
Show file tree

Hide file tree

Showing 60 changed files with 1,037 additions and 1,514 deletions.
diff --git a/base16-3024-theme.el b/base16-3024-theme.el
@@ -30,23 +30,14 @@
     :base0F "#cdab53")
   "All colors for Base16 3024 are defined here.")
 
-(base16-theme-define base16-3024
-                     (base00 "#090300")
-                     (base01 "#3a3432")
-                     (base02 "#4a4543")
-                     (base03 "#5c5855")
-                     (base04 "#807d7c")
-                     (base05 "#a5a2a2")
-                     (base06 "#d6d5d4")
-                     (base07 "#f7f7f7")
-                     (base08 "#db2d20")
-                     (base09 "#e8bbd0")
-                     (base0A "#fded02")
-                     (base0B "#01a252")
-                     (base0C "#b5e4f4")
-                     (base0D "#01a0e4")
-                     (base0E "#a16a94")
-                     (base0F "#cdab53"))
+;; Define the theme
+(deftheme base16-3024)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-3024 base16-3024-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-3024)
 
 (provide 'base16-3024-theme)
 

diff --git a/base16-apathy-theme.el b/base16-apathy-theme.el
@@ -30,23 +30,14 @@
     :base0F "#3E965B")
   "All colors for Base16 Apathy are defined here.")
 
-(base16-theme-define base16-apathy
-                     (base00 "#031A16")
-                     (base01 "#0B342D")
-                     (base02 "#184E45")
-                     (base03 "#2B685E")
-                     (base04 "#5F9C92")
-                     (base05 "#81B5AC")
-                     (base06 "#A7CEC8")
-                     (base07 "#D2E7E4")
-                     (base08 "#3E9688")
-                     (base09 "#3E7996")
-                     (base0A "#3E4C96")
-                     (base0B "#883E96")
-                     (base0C "#963E4C")
-                     (base0D "#96883E")
-                     (base0E "#4C963E")
-                     (base0F "#3E965B"))
+;; Define the theme
+(deftheme base16-apathy)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-apathy base16-apathy-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-apathy)
 
 (provide 'base16-apathy-theme)
 

diff --git a/base16-ashes-theme.el b/base16-ashes-theme.el
@@ -30,23 +30,14 @@
     :base0F "#C79595")
   "All colors for Base16 Ashes are defined here.")
 
-(base16-theme-define base16-ashes
-                     (base00 "#1C2023")
-                     (base01 "#393F45")
-                     (base02 "#565E65")
-                     (base03 "#747C84")
-                     (base04 "#ADB3BA")
-                     (base05 "#C7CCD1")
-                     (base06 "#DFE2E5")
-                     (base07 "#F3F4F5")
-                     (base08 "#C7AE95")
-                     (base09 "#C7C795")
-                     (base0A "#AEC795")
-                     (base0B "#95C7AE")
-                     (base0C "#95AEC7")
-                     (base0D "#AE95C7")
-                     (base0E "#C795AE")
-                     (base0F "#C79595"))
+;; Define the theme
+(deftheme base16-ashes)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-ashes base16-ashes-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-ashes)
 
 (provide 'base16-ashes-theme)
 

diff --git a/base16-atelier-cave-theme.el b/base16-atelier-cave-theme.el
@@ -30,23 +30,14 @@
     :base0F "#bf40bf")
   "All colors for Base16 Atelier Cave are defined here.")
 
-(base16-theme-define base16-atelier-cave
-                     (base00 "#19171c")
-                     (base01 "#26232a")
-                     (base02 "#585260")
-                     (base03 "#655f6d")
-                     (base04 "#7e7887")
-                     (base05 "#8b8792")
-                     (base06 "#e2dfe7")
-                     (base07 "#efecf4")
-                     (base08 "#be4678")
-                     (base09 "#aa573c")
-                     (base0A "#a06e3b")
-                     (base0B "#2a9292")
-                     (base0C "#398bc6")
-                     (base0D "#576ddb")
-                     (base0E "#955ae7")
-                     (base0F "#bf40bf"))
+;; Define the theme
+(deftheme base16-atelier-cave)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-cave base16-atelier-cave-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-cave)
 
 (provide 'base16-atelier-cave-theme)
 

diff --git a/base16-atelier-dune-theme.el b/base16-atelier-dune-theme.el
@@ -30,23 +30,14 @@
     :base0F "#d43552")
   "All colors for Base16 Atelier Dune are defined here.")
 
-(base16-theme-define base16-atelier-dune
-                     (base00 "#20201d")
-                     (base01 "#292824")
-                     (base02 "#6e6b5e")
-                     (base03 "#7d7a68")
-                     (base04 "#999580")
-                     (base05 "#a6a28c")
-                     (base06 "#e8e4cf")
-                     (base07 "#fefbec")
-                     (base08 "#d73737")
-                     (base09 "#b65611")
-                     (base0A "#ae9513")
-                     (base0B "#60ac39")
-                     (base0C "#1fad83")
-                     (base0D "#6684e1")
-                     (base0E "#b854d4")
-                     (base0F "#d43552"))
+;; Define the theme
+(deftheme base16-atelier-dune)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-dune base16-atelier-dune-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-dune)
 
 (provide 'base16-atelier-dune-theme)
 

diff --git a/base16-atelier-estuary-theme.el b/base16-atelier-estuary-theme.el
@@ -30,23 +30,14 @@
     :base0F "#9d6c7c")
   "All colors for Base16 Atelier Estuary are defined here.")
 
-(base16-theme-define base16-atelier-estuary
-                     (base00 "#22221b")
-                     (base01 "#302f27")
-                     (base02 "#5f5e4e")
-                     (base03 "#6c6b5a")
-                     (base04 "#878573")
-                     (base05 "#929181")
-                     (base06 "#e7e6df")
-                     (base07 "#f4f3ec")
-                     (base08 "#ba6236")
-                     (base09 "#ae7313")
-                     (base0A "#a5980d")
-                     (base0B "#7d9726")
-                     (base0C "#5b9d48")
-                     (base0D "#36a166")
-                     (base0E "#5f9182")
-                     (base0F "#9d6c7c"))
+;; Define the theme
+(deftheme base16-atelier-estuary)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-estuary base16-atelier-estuary-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-estuary)
 
 (provide 'base16-atelier-estuary-theme)
 

diff --git a/base16-atelier-forest-theme.el b/base16-atelier-forest-theme.el
@@ -30,23 +30,14 @@
     :base0F "#c33ff3")
   "All colors for Base16 Atelier Forest are defined here.")
 
-(base16-theme-define base16-atelier-forest
-                     (base00 "#1b1918")
-                     (base01 "#2c2421")
-                     (base02 "#68615e")
-                     (base03 "#766e6b")
-                     (base04 "#9c9491")
-                     (base05 "#a8a19f")
-                     (base06 "#e6e2e0")
-                     (base07 "#f1efee")
-                     (base08 "#f22c40")
-                     (base09 "#df5320")
-                     (base0A "#c38418")
-                     (base0B "#7b9726")
-                     (base0C "#3d97b8")
-                     (base0D "#407ee7")
-                     (base0E "#6666ea")
-                     (base0F "#c33ff3"))
+;; Define the theme
+(deftheme base16-atelier-forest)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-forest base16-atelier-forest-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-forest)
 
 (provide 'base16-atelier-forest-theme)
 

diff --git a/base16-atelier-heath-theme.el b/base16-atelier-heath-theme.el
@@ -30,23 +30,14 @@
     :base0F "#cc33cc")
   "All colors for Base16 Atelier Heath are defined here.")
 
-(base16-theme-define base16-atelier-heath
-                     (base00 "#1b181b")
-                     (base01 "#292329")
-                     (base02 "#695d69")
-                     (base03 "#776977")
-                     (base04 "#9e8f9e")
-                     (base05 "#ab9bab")
-                     (base06 "#d8cad8")
-                     (base07 "#f7f3f7")
-                     (base08 "#ca402b")
-                     (base09 "#a65926")
-                     (base0A "#bb8a35")
-                     (base0B "#918b3b")
-                     (base0C "#159393")
-                     (base0D "#516aec")
-                     (base0E "#7b59c0")
-                     (base0F "#cc33cc"))
+;; Define the theme
+(deftheme base16-atelier-heath)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-heath base16-atelier-heath-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-heath)
 
 (provide 'base16-atelier-heath-theme)
 

diff --git a/base16-atelier-lakeside-theme.el b/base16-atelier-lakeside-theme.el
@@ -30,23 +30,14 @@
     :base0F "#b72dd2")
   "All colors for Base16 Atelier Lakeside are defined here.")
 
-(base16-theme-define base16-atelier-lakeside
-                     (base00 "#161b1d")
-                     (base01 "#1f292e")
-                     (base02 "#516d7b")
-                     (base03 "#5a7b8c")
-                     (base04 "#7195a8")
-                     (base05 "#7ea2b4")
-                     (base06 "#c1e4f6")
-                     (base07 "#ebf8ff")
-                     (base08 "#d22d72")
-                     (base09 "#935c25")
-                     (base0A "#8a8a0f")
-                     (base0B "#568c3b")
-                     (base0C "#2d8f6f")
-                     (base0D "#257fad")
-                     (base0E "#6b6bb8")
-                     (base0F "#b72dd2"))
+;; Define the theme
+(deftheme base16-atelier-lakeside)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-lakeside base16-atelier-lakeside-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-lakeside)
 
 (provide 'base16-atelier-lakeside-theme)
 

diff --git a/base16-atelier-plateau-theme.el b/base16-atelier-plateau-theme.el
@@ -30,23 +30,14 @@
     :base0F "#bd5187")
   "All colors for Base16 Atelier Plateau are defined here.")
 
-(base16-theme-define base16-atelier-plateau
-                     (base00 "#1b1818")
-                     (base01 "#292424")
-                     (base02 "#585050")
-                     (base03 "#655d5d")
-                     (base04 "#7e7777")
-                     (base05 "#8a8585")
-                     (base06 "#e7dfdf")
-                     (base07 "#f4ecec")
-                     (base08 "#ca4949")
-                     (base09 "#b45a3c")
-                     (base0A "#a06e3b")
-                     (base0B "#4b8b8b")
-                     (base0C "#5485b6")
-                     (base0D "#7272ca")
-                     (base0E "#8464c4")
-                     (base0F "#bd5187"))
+;; Define the theme
+(deftheme base16-atelier-plateau)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-plateau base16-atelier-plateau-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-plateau)
 
 (provide 'base16-atelier-plateau-theme)
 

diff --git a/base16-atelier-savanna-theme.el b/base16-atelier-savanna-theme.el
@@ -30,23 +30,14 @@
     :base0F "#867469")
   "All colors for Base16 Atelier Savanna are defined here.")
 
-(base16-theme-define base16-atelier-savanna
-                     (base00 "#171c19")
-                     (base01 "#232a25")
-                     (base02 "#526057")
-                     (base03 "#5f6d64")
-                     (base04 "#78877d")
-                     (base05 "#87928a")
-                     (base06 "#dfe7e2")
-                     (base07 "#ecf4ee")
-                     (base08 "#b16139")
-                     (base09 "#9f713c")
-                     (base0A "#a07e3b")
-                     (base0B "#489963")
-                     (base0C "#1c9aa0")
-                     (base0D "#478c90")
-                     (base0E "#55859b")
-                     (base0F "#867469"))
+;; Define the theme
+(deftheme base16-atelier-savanna)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-savanna base16-atelier-savanna-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-savanna)
 
 (provide 'base16-atelier-savanna-theme)
 

diff --git a/base16-atelier-seaside-theme.el b/base16-atelier-seaside-theme.el
@@ -30,23 +30,14 @@
     :base0F "#e619c3")
   "All colors for Base16 Atelier Seaside are defined here.")
 
-(base16-theme-define base16-atelier-seaside
-                     (base00 "#131513")
-                     (base01 "#242924")
-                     (base02 "#5e6e5e")
-                     (base03 "#687d68")
-                     (base04 "#809980")
-                     (base05 "#8ca68c")
-                     (base06 "#cfe8cf")
-                     (base07 "#f4fbf4")
-                     (base08 "#e6193c")
-                     (base09 "#87711d")
-                     (base0A "#98981b")
-                     (base0B "#29a329")
-                     (base0C "#1999b3")
-                     (base0D "#3d62f5")
-                     (base0E "#ad2bee")
-                     (base0F "#e619c3"))
+;; Define the theme
+(deftheme base16-atelier-seaside)
+
+;; Add all the faces to the theme
+(base16-theme-define 'base16-atelier-seaside base16-atelier-seaside-colors)
+
+;; Mark the theme as provided
+(provide-theme 'base16-atelier-seaside)
 
 (provide 'base16-atelier-seaside-theme)