From 1ab4dfd3bf1e0a7a814854a46b87d63d1fea99e1 Mon Sep 17 00:00:00 2001
From: Aurelius Prochazka <aurephd@gmail.com>
Date: Sun, 19 Aug 2018 17:46:44 -0700
Subject: [PATCH 1/2] Moved lowercasing as to not be destructive
---
Source/render/RenderUtils.swift | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Source/render/RenderUtils.swift b/Source/render/RenderUtils.swift
index df60ad30..8e2a2978 100644
--- a/Source/render/RenderUtils.swift
+++ b/Source/render/RenderUtils.swift
@@ -61,9 +61,10 @@ 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) {
+ if availableFonts.contains(font.lowercased()) {
fontName = font
}
From be9cec1bcf20d6c65abda1c6c0588288ba26a3f2 Mon Sep 17 00:00:00 2001
From: Aurelius Prochazka <aurephd@gmail.com>
Date: Mon, 20 Aug 2018 01:37:51 -0700
Subject: [PATCH 2/2] Store a lowercased font for multiple checks
---
Source/render/RenderUtils.swift | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Source/render/RenderUtils.swift b/Source/render/RenderUtils.swift
index 8e2a2978..f50f8309 100644
--- a/Source/render/RenderUtils.swift
+++ b/Source/render/RenderUtils.swift
@@ -64,17 +64,19 @@ class RenderUtils {
let fontPriorities = name.split(separator: ",").map { String($0).trimmingCharacters(in: CharacterSet(charactersIn: " '")) }
for font in fontPriorities {
- if availableFonts.contains(font.lowercased()) {
+ 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"
}
}