Merge branch 'master' of http://github.com/copycat-killer/lain into fix/pulse-sink

[etc/awesome.git] / util / markup.lua

diff --git a/util/markup.lua b/util/markup.lua
index 0fc6ef6f37e88c0ccb11dbba5fe9236b95f9d019..0eb9bfa4f84233fcaca41c94127f5237527d5595 100644 (file)
--- a/util/markup.lua
+++ b/util/markup.lua
@@ -1,11 +1,10 @@
-

 --[[
 --[[

-                                 
-     Licensed under MIT License  
-      * (c) 2013, Luke Bonham    
-      * (c) 2009, Uli Schlachter 
-      * (c) 2009, Majic          
-                                 
+
+     Licensed under MIT License
+      * (c) 2013, Luke Bonham
+      * (c) 2009, Uli Schlachter
+      * (c) 2009, Majic
+

 --]]
 
 local string       = { format = string.format }
 --]]
 
 local string       = { format = string.format }


@@ -13,7 +12,7 @@ local setmetatable = setmetatable
 
 -- Lain markup util submodule
 -- lain.util.markup
 
 -- Lain markup util submodule
 -- lain.util.markup

-local markup = {}
+local markup = { fg = {}, bg = {} }

 
 -- Convenience tags.
 function markup.bold(text)      return '<b>'     .. text .. '</b>'     end
 
 -- Convenience tags.
 function markup.bold(text)      return '<b>'     .. text .. '</b>'     end


@@ -30,12 +29,12 @@ function markup.font(font, text)
 end
 
 -- Set the foreground.
 end
 
 -- Set the foreground.

-function markup.fgcolor(color, text)
+function markup.fg.color(color, text)

   return '<span foreground="' .. color .. '">' .. text .. '</span>'
 end
 
 -- Set the background.
   return '<span foreground="' .. color .. '">' .. text .. '</span>'
 end
 
 -- Set the background.

-function markup.bgcolor(color, text)
+function markup.bg.color(color, text)

   return '<span background="' .. color .. '">' .. text .. '</span>'
 end
 
   return '<span background="' .. color .. '">' .. text .. '</span>'
 end
 


@@ -44,10 +43,24 @@ function markup.color(fg, bg, text)
   return string.format('<span foreground="%s" background="%s">%s</span>', fg, bg, text)
 end
 
   return string.format('<span foreground="%s" background="%s">%s</span>', fg, bg, text)
 end
 

+-- Set font and foreground.
+function markup.fontfg(font, fg, text)
+  return string.format('<span font="%s" foreground="%s">%s</span>', font, fg, text)
+end
+
+-- Set font and background.
+function markup.fontbg(font, bg, text)
+  return string.format('<span font="%s" background="%s">%s</span>', font, bg, text)
+end
+

 -- Set font, foreground and background.
 function markup.fontcolor(font, fg, bg, text)
   return string.format('<span font="%s" foreground="%s" background="%s">%s</span>', font, fg, bg, text)
 end
 
 -- Set font, foreground and background.
 function markup.fontcolor(font, fg, bg, text)
   return string.format('<span font="%s" foreground="%s" background="%s">%s</span>', font, fg, bg, text)
 end
 

+-- link markup.{fg,bg}(...) calls to markup.{fg,bg}.color(...)
+setmetatable(markup.fg, { __call = function(_, ...) return markup.fg.color(...) end })
+setmetatable(markup.bg, { __call = function(_, ...) return markup.bg.color(...) end })
+

 -- link markup(...) calls to markup.fg.color(...)
 return setmetatable(markup, { __call = function(_, ...) return markup.fg.color(...) end })
 -- link markup(...) calls to markup.fg.color(...)
 return setmetatable(markup, { __call = function(_, ...) return markup.fg.color(...) end })