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 346cfe173ff1e55d09d3424a23fce024cd9887b5..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 }
@@ -44,6 +43,16 @@ function markup.color(fg, bg, text)
   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)