Allow "%()" property expansion in themes like with compile/run macros.

3 files changed, 71 insertions, 71 deletions

diff --git a/themes/dark.lua b/themes/dark.lua
index ca9a2275..b8ed32d5 100644
--- a/themes/dark.lua
+++ b/themes/dark.lua
@@ -61,33 +61,33 @@ end
 
 -- Token styles.
 property['style.nothing'] = ''
-property['style.class'] = 'fore:$(color.light_yellow)'
-property['style.comment'] = 'fore:$(color.dark_grey)'
-property['style.constant'] = 'fore:$(color.red)'
-property['style.error'] = 'fore:$(color.red),italics'
-property['style.function'] = 'fore:$(color.blue)'
-property['style.keyword'] = 'fore:$(color.dark_white)'
-property['style.label'] = 'fore:$(color.orange)'
-property['style.number'] = 'fore:$(color.teal)'
-property['style.operator'] = 'fore:$(color.yellow)'
-property['style.regex'] = 'fore:$(color.light_green)'
-property['style.string'] = 'fore:$(color.green)'
-property['style.preprocessor'] = 'fore:$(color.purple)'
-property['style.type'] = 'fore:$(color.lavender)'
-property['style.variable'] = 'fore:$(color.light_blue)'
+property['style.class'] = 'fore:%(color.light_yellow)'
+property['style.comment'] = 'fore:%(color.dark_grey)'
+property['style.constant'] = 'fore:%(color.red)'
+property['style.error'] = 'fore:%(color.red),italics'
+property['style.function'] = 'fore:%(color.blue)'
+property['style.keyword'] = 'fore:%(color.dark_white)'
+property['style.label'] = 'fore:%(color.orange)'
+property['style.number'] = 'fore:%(color.teal)'
+property['style.operator'] = 'fore:%(color.yellow)'
+property['style.regex'] = 'fore:%(color.light_green)'
+property['style.string'] = 'fore:%(color.green)'
+property['style.preprocessor'] = 'fore:%(color.purple)'
+property['style.type'] = 'fore:%(color.lavender)'
+property['style.variable'] = 'fore:%(color.light_blue)'
 property['style.whitespace'] = ''
-property['style.embedded'] = '$(style.tag),back:$(color.light_black)'
-property['style.identifier'] = '$(style.nothing)'
+property['style.embedded'] = '%(style.tag),back:%(color.light_black)'
+property['style.identifier'] = '%(style.nothing)'
 
 -- Predefined styles.
-property['style.default'] = 'font:$(font),size:$(fontsize),'..
-                            'fore:$(color.light_grey),back:$(color.black)'
-property['style.linenumber'] = 'fore:$(color.dark_grey),back:$(color.black)'
-property['style.bracelight'] = 'fore:$(color.light_blue)'
-property['style.bracebad'] = 'fore:$(color.light_red)'
-property['style.controlchar'] = '$(style.nothing)'
-property['style.indentguide'] = 'fore:$(color.light_black)'
-property['style.calltip'] = 'fore:$(color.light_grey),back:$(color.light_black)'
+property['style.default'] = 'font:%(font),size:%(fontsize),'..
+                            'fore:%(color.light_grey),back:%(color.black)'
+property['style.linenumber'] = 'fore:%(color.dark_grey),back:%(color.black)'
+property['style.bracelight'] = 'fore:%(color.light_blue)'
+property['style.bracebad'] = 'fore:%(color.light_red)'
+property['style.controlchar'] = '%(style.nothing)'
+property['style.indentguide'] = 'fore:%(color.light_black)'
+property['style.calltip'] = 'fore:%(color.light_grey),back:%(color.light_black)'
 
 -- Multiple Selection and Virtual Space
 --buffer.additional_sel_alpha =
diff --git a/themes/light.lua b/themes/light.lua
index ec4497d6..3e06e22d 100644
--- a/themes/light.lua
+++ b/themes/light.lua
@@ -61,33 +61,33 @@ end
 
 -- Token styles.
 property['style.nothing'] = ''
-property['style.class'] = 'fore:$(color.yellow)'
-property['style.comment'] = 'fore:$(color.grey)'
-property['style.constant'] = 'fore:$(color.red)'
-property['style.error'] = 'fore:$(color.red),italics'
-property['style.function'] = 'fore:$(color.dark_orange)'
-property['style.keyword'] = 'fore:$(color.dark_blue)'
-property['style.label'] = 'fore:$(color.dark_orange)'
-property['style.number'] = 'fore:$(color.teal)'
-property['style.operator'] = 'fore:$(color.purple)'
-property['style.regex'] = 'fore:$(color.dark_green)'
-property['style.string'] = 'fore:$(color.green)'
-property['style.preprocessor'] = 'fore:$(color.dark_yellow)'
-property['style.type'] = 'fore:$(color.lavender)'
-property['style.variable'] = 'fore:$(color.dark_lavender)'
+property['style.class'] = 'fore:%(color.yellow)'
+property['style.comment'] = 'fore:%(color.grey)'
+property['style.constant'] = 'fore:%(color.red)'
+property['style.error'] = 'fore:%(color.red),italics'
+property['style.function'] = 'fore:%(color.dark_orange)'
+property['style.keyword'] = 'fore:%(color.dark_blue)'
+property['style.label'] = 'fore:%(color.dark_orange)'
+property['style.number'] = 'fore:%(color.teal)'
+property['style.operator'] = 'fore:%(color.purple)'
+property['style.regex'] = 'fore:%(color.dark_green)'
+property['style.string'] = 'fore:%(color.green)'
+property['style.preprocessor'] = 'fore:%(color.dark_yellow)'
+property['style.type'] = 'fore:%(color.lavender)'
+property['style.variable'] = 'fore:%(color.dark_lavender)'
 property['style.whitespace'] = ''
-property['style.embedded'] = '$(style.tag),back:$(color.dark_white)'
-property['style.identifier'] = '$(style.nothing)'
+property['style.embedded'] = '%(style.tag),back:%(color.dark_white)'
+property['style.identifier'] = '%(style.nothing)'
 
 -- Predefined styles.
-property['style.default'] = 'font:$(font),size:$(fontsize),'..
-                            'fore:$(color.light_black),back:$(color.white)'
-property['style.linenumber'] = 'fore:$(color.grey),back:$(color.white)'
-property['style.bracelight'] = 'fore:$(color.light_blue)'
-property['style.bracebad'] = 'fore:$(color.light_red)'
-property['style.controlchar'] = '$(style.nothing)'
-property['style.indentguide'] = 'fore:$(color.dark_white)'
-property['style.calltip'] = 'fore:$(color.light_black),back:$(color.dark_white)'
+property['style.default'] = 'font:%(font),size:%(fontsize),'..
+                            'fore:%(color.light_black),back:%(color.white)'
+property['style.linenumber'] = 'fore:%(color.grey),back:%(color.white)'
+property['style.bracelight'] = 'fore:%(color.light_blue)'
+property['style.bracebad'] = 'fore:%(color.light_red)'
+property['style.controlchar'] = '%(style.nothing)'
+property['style.indentguide'] = 'fore:%(color.dark_white)'
+property['style.calltip'] = 'fore:%(color.light_black),back:%(color.dark_white)'
 
 -- Multiple Selection and Virtual Space
 --buffer.additional_sel_alpha =
diff --git a/themes/term.lua b/themes/term.lua
index 43c6cbdc..fde41f16 100644
--- a/themes/term.lua
+++ b/themes/term.lua
@@ -29,32 +29,32 @@ property['color.light_white'] = 0xFFFFFF
 
 -- Token styles.
 property['style.nothing'] = ''
-property['style.class'] = 'fore:$(color.yellow)'
-property['style.comment'] = 'fore:$(color.black),bold'
-property['style.constant'] = 'fore:$(color.red)'
-property['style.error'] = 'fore:$(color.red),bold'
-property['style.function'] = 'fore:$(color.blue)'
-property['style.keyword'] = 'fore:$(color.white),bold'
-property['style.label'] = 'fore:$(color.red),bold'
-property['style.number'] = 'fore:$(color.cyan)'
-property['style.operator'] = 'fore:$(color.yellow)'
-property['style.regex'] = 'fore:$(color.green),bold'
-property['style.string'] = 'fore:$(color.green)'
-property['style.preprocessor'] = 'fore:$(color.magenta)'
-property['style.type'] = 'fore:$(color.magenta),bold'
-property['style.variable'] = 'fore:$(color.blue),bold'
+property['style.class'] = 'fore:%(color.yellow)'
+property['style.comment'] = 'fore:%(color.black),bold'
+property['style.constant'] = 'fore:%(color.red)'
+property['style.error'] = 'fore:%(color.red),bold'
+property['style.function'] = 'fore:%(color.blue)'
+property['style.keyword'] = 'fore:%(color.white),bold'
+property['style.label'] = 'fore:%(color.red),bold'
+property['style.number'] = 'fore:%(color.cyan)'
+property['style.operator'] = 'fore:%(color.yellow)'
+property['style.regex'] = 'fore:%(color.green),bold'
+property['style.string'] = 'fore:%(color.green)'
+property['style.preprocessor'] = 'fore:%(color.magenta)'
+property['style.type'] = 'fore:%(color.magenta),bold'
+property['style.variable'] = 'fore:%(color.blue),bold'
 property['style.whitespace'] = ''
-property['style.embedded'] = '$(style.tag),back:$(color.black),bold'
-property['style.identifier'] = '$(style.nothing)'
+property['style.embedded'] = '%(style.tag),back:%(color.black),bold'
+property['style.identifier'] = '%(style.nothing)'
 
 -- Predefined styles.
-property['style.default'] = 'fore:$(color.white),back:$(color.black)'
-property['style.linenumber'] = '$(style.default)'
-property['style.bracelight'] = 'fore:$(color.black),back:$(color.white)'
-property['style.bracebad'] = 'fore:$(color.red),bold'
-property['style.controlchar'] = '$(style.nothing)'
-property['style.indentguide'] = '$(style.nothing)'
-property['style.calltip'] = '$(style.default)'
+property['style.default'] = 'fore:%(color.white),back:%(color.black)'
+property['style.linenumber'] = '%(style.default)'
+property['style.bracelight'] = 'fore:%(color.black),back:%(color.white)'
+property['style.bracebad'] = 'fore:%(color.red),bold'
+property['style.controlchar'] = '%(style.nothing)'
+property['style.indentguide'] = '%(style.nothing)'
+property['style.calltip'] = '%(style.default)'
 
 -- Multiple Selection and Virtual Space
 --buffer.additional_sel_alpha =