small code fixes

layout/cascadetile.lua

@@ -43,11 +43,7 @@ function cascadetile.arrange(p)
 
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
-    local useless_gap = tonumber(beautiful.useless_gap_width)
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
 
     -- Screen.
     local wa = p.workarea

layout/centerwork.lua

@@ -24,11 +24,7 @@ local centerwork =
 function centerwork.arrange(p)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
-    local useless_gap = tonumber(beautiful.useless_gap_width)
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
 
     -- Screen.
     local wa = p.workarea

layout/termfair.lua

@@ -14,15 +14,7 @@ local math      = { ceil  = math.ceil,
                     max   = math.max }
 local tonumber  = tonumber
 
-local termfair =
+local termfair  = { name = "termfair" }
-{
-    name    = "termfair",
-
-    -- You can set the number of columns and rows,
-    -- -- otherwise they are read from awful.tag
-    nmaster = 0, -- columns
-    ncol    = 0  -- rows
-}
 
 function termfair.arrange(p)
     -- Layout with fixed number of vertical columns (read from nmaster).
@@ -45,11 +37,7 @@ function termfair.arrange(p)
 
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
-    local useless_gap = tonumber(beautiful.useless_gap_width)
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
 
     -- Screen.
     local wa = p.workarea
@@ -57,22 +45,10 @@ function termfair.arrange(p)
 
     -- How many vertical columns?
     local t = tag.selected(p.screen)
-    local num_x
+    local num_x = termfair.nmaster or tag.getnmaster(t)
-    if termfair.nmaster ~= 0
-    then
-        num_x = termfair.nmaster
-    else
-        num_x = tag.getnmaster(t)
-    end
 
     -- Do at least "desired_y" rows.
-    local desired_y
+    local desired_y = termfair.ncol or tag.getncol(t)
-    if termfair.ncol ~= 0
-    then
-        desired_y = termfair.ncol
-    else
-        desired_y = tag.getncol(t)
-    end
 
     if #cls > 0
     then

layout/uselessfair.lua

@@ -18,11 +18,7 @@ local uselessfair = {}
 local function fair(p, orientation)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
-    local useless_gap = tonumber(beautiful.useless_gap_width)
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
 
     local wa = p.workarea
     local cls = p.clients

layout/uselesspiral.lua

@@ -17,11 +17,7 @@ local uselesspiral = {}
 local function spiral(p, spiral)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width.
-    local useless_gap = tonumber(beautiful.useless_gap_width)
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
 
     local wa = p.workarea
     local cls = p.clients
@@ -69,26 +65,26 @@ local function spiral(p, spiral)
             left = false
 
             if wa2.y == static_wa.y then
-                 top = true
+               top = true
             end
 
             if wa2.x == static_wa.x then
-                 left = true
+               left = true
             end
 
-	    if top then
+            if top then
-	          wa2.height = wa2.height - 2 * useless_gap
+                wa2.height = wa2.height - 2 * useless_gap
-                  wa2.y = wa2.y + useless_gap
+                wa2.y = wa2.y + useless_gap
             else
-	          wa2.height = wa2.height - useless_gap
+                wa2.height = wa2.height - useless_gap
-	    end
+            end
 
-	    if left then
+            if left then
-               	  wa2.width = wa2.width - 2 * useless_gap
+                wa2.width = wa2.width - 2 * useless_gap
-                  wa2.x = wa2.x + useless_gap
+                wa2.x = wa2.x + useless_gap
-	    else
+            else
-	          wa2.width = wa2.width - useless_gap
+                wa2.width = wa2.width - useless_gap
-	    end
+            end
         end
         -- End of useless gap.
 

layout/uselesstile.lua

@@ -21,11 +21,7 @@ local uselesstile = {}
 local function tile_group(cls, wa, orientation, fact, group)
     -- A useless gap (like the dwm patch) can be defined with
     -- beautiful.useless_gap_width .
-    local useless_gap = tonumber(beautiful.useless_gap_width)
+    local useless_gap = tonumber(beautiful.useless_gap_width) or 0
-    if useless_gap == nil
-    then
-        useless_gap = 0
-    end
 
     -- get our orientation right
     local height = "height"