From ff4caa01b7f89fbc7fbc196c6c5215876847b09f Mon Sep 17 00:00:00 2001
From: Luca CPZ <luca.cpz@gmail.com>
Date: Fri, 14 Sep 2018 10:53:39 +0200
Subject: [PATCH] fix font names; closes #237

---
 lain                     |  2 +-
 themes/copland/theme.lua | 24 ++++++++++++------------
 themes/vertex/theme.lua  |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lain b/lain
index 53ebca2..4073bd7 160000
--- a/lain
+++ b/lain
@@ -1 +1 @@
-Subproject commit 53ebca2867c5d9c9ab7c5d3f37ccc91784322cd7
+Subproject commit 4073bd7cdf79e118e97c0b0f7dba08927bc31d46
diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua
index f11ac4b..cac30b7 100644
--- a/themes/copland/theme.lua
+++ b/themes/copland/theme.lua
@@ -17,7 +17,7 @@ local my_table = awful.util.table or gears.table -- 4.{0,1} compatibility
 local theme                                     = {}
 theme.dir                                       = os.getenv("HOME") .. "/.config/awesome/themes/copland"
 theme.wallpaper                                 = theme.dir .. "/wall.png"
-theme.font                                      = "Tamzen 10.5"
+theme.font                                      = "Misc Tamzen 10.5"
 theme.fg_normal                                 = "#BBBBBB"
 theme.fg_focus                                  = "#78A4FF"
 theme.bg_normal                                 = "#111111"
@@ -95,18 +95,18 @@ local green  = "#8FEB8F"
 
 -- Textclock
 --os.setlocale(os.getenv("LANG")) -- to localize the clock
-local mytextclock = wibox.widget.textclock("<span font='Tamzen 5'> </span>%H:%M ")
+local mytextclock = wibox.widget.textclock("<span font='Misc Tamzen 5'> </span>%H:%M ")
 mytextclock.font = theme.font
 
 -- Calendar
-lain.widget.calendar({
+lain.widget.calendar {
     attach_to = { mytextclock },
     notification_preset = {
-        font = "Tamzen 11",
+        font = "Misc Tamzen 11",
         fg   = theme.fg_normal,
         bg   = theme.bg_normal
     }
-})
+}
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use
@@ -120,7 +120,7 @@ local mail = lain.widget.imap({
         count = ""
 
         if mailcount > 0 then
-            mail = "<span font='Tamzen 5'> </span>Mail "
+            mail = "<span font='Misc Tamzen 5'> </span>Mail "
             count = mailcount .. " "
         end
 
@@ -135,11 +135,11 @@ theme.mpd = lain.widget.mpd({
     settings = function()
         if mpd_now.state == "play" then
             title = mpd_now.title
-            artist  = " " .. mpd_now.artist  .. markup("#777777", " <span font='Tamzen 2'> </span>|<span font='Tamzen 5'> </span>")
+            artist  = " " .. mpd_now.artist  .. markup("#777777", " <span font='Misc Tamzen 2'> </span>|<span font='Misc Tamzen 5'> </span>")
             mpdicon:set_image(theme.play)
         elseif mpd_now.state == "pause" then
             title = "mpd "
-            artist  = "paused" .. markup("#777777", " |<span font='Tamzen 5'> </span>")
+            artist  = "paused" .. markup("#777777", " |<span font='Misc Tamzen 5'> </span>")
             mpdicon:set_image(theme.pause)
         else
             title  = ""
@@ -215,7 +215,7 @@ local fsbar = wibox.widget {
     widget           = wibox.widget.progressbar,
 }
 theme.fs = lain.widget.fs {
-    notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Tamzen 10.5" },
+    notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Misc Tamzen 10.5" },
     settings  = function()
         if fs_now["/home"].percentage < 90 then
             fsbar:set_color(theme.fg_normal)
@@ -282,10 +282,10 @@ theme.weather = lain.widget.weather({
 })
 
 -- Separators
-local first     = wibox.widget.textbox(markup.font("Tamzen 3", " "))
+local first     = wibox.widget.textbox(markup.font("Misc Tamzen 3", " "))
 local spr       = wibox.widget.textbox(' ')
-local small_spr = wibox.widget.textbox(markup.font("Tamzen 4", " "))
-local bar_spr   = wibox.widget.textbox(markup.font("Tamzen 3", " ") .. markup.fontfg(theme.font, "#777777", "|") .. markup.font("Tamzen 5", " "))
+local small_spr = wibox.widget.textbox(markup.font("Misc Tamzen 4", " "))
+local bar_spr   = wibox.widget.textbox(markup.font("Misc Tamzen 3", " ") .. markup.fontfg(theme.font, "#777777", "|") .. markup.font("Misc Tamzen 5", " "))
 
 -- Eminent-like task filtering
 local orig_filter = awful.widget.taglist.filter.all
diff --git a/themes/vertex/theme.lua b/themes/vertex/theme.lua
index 38b3c46..858fbe4 100644
--- a/themes/vertex/theme.lua
+++ b/themes/vertex/theme.lua
@@ -248,12 +248,12 @@ local mywifisig = awful.widget.watch(
     function(widget, stdout)
         local carrier, perc = stdout:match("(%d)-(%d+)")
         local tiptext = stdout:gsub("(%d)-(%d+)", ""):gsub("%s+$", "")
+        perc = tonumber(perc)
 
-        if carrier == "1" then
+        if carrier == "1" or not perc then
             wificon:set_image(theme.wifidisc)
             wifitooltip:set_markup("No carrier")
         else
-            perc = tonumber(perc)
             if perc <= 5 then
                 wificon:set_image(theme.wifinone)
             elseif perc <= 25 then