Merge pull request #461 from aure/master

Moved lowercasing as to not be destructive
exyte · Aug 20, 2018 · e188751 · e188751
2 parents 5c1ae4e + be9cec1
commit e188751
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Source/render/RenderUtils.swift b/Source/render/RenderUtils.swift
@@ -61,19 +61,22 @@ class RenderUtils {
     class func loadFont(name: String, size: Int, weight: String?) -> MFont? {
 
         var fontName = ""
-        let fontPriorities = name.split(separator: ",").map { String($0).trimmingCharacters(in: CharacterSet(charactersIn: " '")).lowercased() }
+        let fontPriorities = name.split(separator: ",").map { String($0).trimmingCharacters(in: CharacterSet(charactersIn: " '")) }
+
         for font in fontPriorities {
-            if availableFonts.contains(font) {
+            let lowercasedFont = font.lowercased()
+
+            if availableFonts.contains(lowercasedFont) {
                 fontName = font
             }
 
-            if font == "serif" {
+            if lowercasedFont == "serif" {
                 fontName = "Georgia"
             }
-            if font == "sans-serif" {
+            if lowercasedFont == "sans-serif" {
                 fontName = "Arial"
             }
-            if font == "monospace" {
+            if lowercasedFont == "monospace" {
                 fontName = "Courier"
             }
         }