X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/fadc722655b2ba4ebe98eece3498da3c88f8b6fc..71ca1bd76739f5d4f11cc065f2943f1cb87627ab:/util/markup.lua?ds=sidebyside
diff --git a/util/markup.lua b/util/markup.lua
index 346cfe1..63f9486 100644
--- a/util/markup.lua
+++ b/util/markup.lua
@@ -1,52 +1,61 @@
-
--[[
-
- Licensed under MIT License
- * (c) 2013, Luke Bonham
- * (c) 2009, Uli Schlachter
- * (c) 2009, Majic
-
+
+ Licensed under MIT License
+ * (c) 2013, Luca CPZ
+ * (c) 2009, Uli Schlachter
+ * (c) 2009, Majic
+
--]]
-local string = { format = string.format }
+local format = string.format
local setmetatable = setmetatable
-- Lain markup util submodule
-- lain.util.markup
local markup = { fg = {}, bg = {} }
--- Convenience tags.
-function markup.bold(text) return '' .. text .. '' end
-function markup.italic(text) return '' .. text .. '' end
-function markup.strike(text) return '' .. text .. '' end
-function markup.underline(text) return '' .. text .. '' end
-function markup.monospace(text) return '' .. text .. '' end
-function markup.big(text) return '' .. text .. '' end
-function markup.small(text) return '' .. text .. '' end
+-- Convenience tags
+function markup.bold(text) return format("%s", text) end
+function markup.italic(text) return format("%s", text) end
+function markup.strike(text) return format("%s", text) end
+function markup.underline(text) return format("%s", text) end
+function markup.monospace(text) return format("%s", text) end
+function markup.big(text) return format("%s", text) end
+function markup.small(text) return format("%s", text) end
--- Set the font.
+-- Set the font
function markup.font(font, text)
- return '' .. text ..''
+ return format("%s", font, text)
end
--- Set the foreground.
+-- Set the foreground
function markup.fg.color(color, text)
- return '' .. text .. ''
+ return format("%s", color, text)
end
--- Set the background.
+-- Set the background
function markup.bg.color(color, text)
- return '' .. text .. ''
+ return format("%s", color, text)
end
--- Set foreground and background.
+-- Set foreground and background
function markup.color(fg, bg, text)
- return string.format('%s', fg, bg, text)
+ return format("%s", fg, bg, text)
+end
+
+-- Set font and foreground
+function markup.fontfg(font, fg, text)
+ return format("%s", font, fg, text)
+end
+
+-- Set font and background
+function markup.fontbg(font, bg, text)
+ return format("%s", font, bg, text)
end
--- Set font, foreground and background.
+-- Set font, foreground and background
function markup.fontcolor(font, fg, bg, text)
- return string.format('%s', font, fg, bg, text)
+ return format("%s", font, fg, bg, text)
end
-- link markup.{fg,bg}(...) calls to markup.{fg,bg}.color(...)