util.markup: fixed typos

diff --git a/util/markup.lua b/util/markup.lua
index 6d1331eb7672c1917d4877096058131c21602caf..63f94864da231fed330a7f6cdb268df1076f205c 100644 (file)
--- a/util/markup.lua
+++ b/util/markup.lua
@@ -25,37 +25,37 @@ function markup.small(text)     return format("<small>%s</small>", text) end
 
 -- Set the font
 function markup.font(font, text)
 
 -- Set the font
 function markup.font(font, text)

-  return format("<span font='%s'>%s</span>", font, text)
+    return format("<span font='%s'>%s</span>", font, text)

 end
 
 -- Set the foreground
 function markup.fg.color(color, text)
 end
 
 -- Set the foreground
 function markup.fg.color(color, text)

-  return format("<span foreground='%s'>%s</span>", fg, bg, text)
+    return format("<span foreground='%s'>%s</span>", color, text)

 end
 
 -- Set the background
 function markup.bg.color(color, text)
 end
 
 -- Set the background
 function markup.bg.color(color, text)

-  return format("<span background='%s'>%s</span>", fg, bg, text)
+    return format("<span background='%s'>%s</span>", color, text)

 end
 
 -- Set foreground and background
 function markup.color(fg, bg, text)
 end
 
 -- Set foreground and background
 function markup.color(fg, bg, text)

-  return format("<span foreground='%s' background='%s'>%s</span>", fg, bg, text)
+    return format("<span foreground='%s' background='%s'>%s</span>", fg, bg, text)

 end
 
 -- Set font and foreground
 function markup.fontfg(font, fg, text)
 end
 
 -- Set font and foreground
 function markup.fontfg(font, fg, text)

-  return format("<span font='%s' foreground='%s'>%s</span>", font, fg, text)
+    return format("<span font='%s' foreground='%s'>%s</span>", font, fg, text)

 end
 
 -- Set font and background
 function markup.fontbg(font, bg, text)
 end
 
 -- Set font and background
 function markup.fontbg(font, bg, text)

-  return format("<span font='%s' background='%s'>%s</span>", font, bg, text)
+    return format("<span font='%s' background='%s'>%s</span>", font, bg, text)

 end
 
 -- Set font, foreground and background
 function markup.fontcolor(font, fg, bg, text)
 end
 
 -- Set font, foreground and background
 function markup.fontcolor(font, fg, bg, text)

-  return format("<span font='%s' foreground='%s' background='%s'>%s</span>", font, fg, bg, text)
+    return 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(...)
 end
 
 -- link markup.{fg,bg}(...) calls to markup.{fg,bg}.color(...)

diff --git a/wiki b/wiki
index 0d9b19badf44b16c27663dd4dc7f49699a51be73..1acb69eb3cf431b9102978c6117144980e8a2939 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 0d9b19badf44b16c27663dd4dc7f49699a51be73
+Subproject commit 1acb69eb3cf431b9102978c6117144980e8a2939