#35 Fixes for font attributes

Author: malcommac

Sources/SwiftRichString/Attributes/FontData.swift

@@ -91,12 +91,19 @@ public class FontData {
 		#endif*/
 	}
 
+	/// Has font explicit value for font name or size
+	var explicitFont: Bool {
+		return (self.font != nil || self.size != nil)
+	}
 
 	/// Return a font with all attributes set.
 	///
 	/// - Parameter size: ignored. It will be overriden by `fontSize` property.
 	/// - Returns: instance of the font
 	var attributes: [NSAttributedStringKey:Any] {
+		guard !self.explicitFont else {
+			return [:]
+		}
 		return attributes(currentFont: self.font, size: self.size)
 	}
 
@@ -111,8 +118,7 @@ public class FontData {
 	internal func addAttributes(to source: AttributedString, range: NSRange?) {
 		// This method does nothing if a fixed value for font attributes is set.
 		// This becuause font attributes will be set along with the remaining attributes from `.attributes` dictionary.
-		let fixedFont = (self.font != nil || self.size != nil)
-		guard fixedFont else {
+		guard self.explicitFont else {
 			return
 		}
 

Sources/SwiftRichString/Style/Style.swift

@@ -128,7 +128,7 @@ public class Style: StyleProtocol {
 	/// of the font point size. Specify 0 (the default) for no additional changes.
 	/// Specify positive values to change the stroke width alone.
 	/// Specify negative values to stroke and fill the text. For example, a typical value for
-	/// outlined text would be 3.0.
+	/// outlined text would be -3.0.
 	public var stroke: (color: ColorConvertible?, width: Float?)? {
 		set {
 			self.set(attribute: newValue?.color?.color, forKey: .strokeColor)
@@ -602,7 +602,8 @@ public class Style: StyleProtocol {
 		}
 		// generate font from `fontInfo` attributes collection, then merge it with the inner attributes of the
 		// string to generate a single attributes dictionary for `NSAttributedString`.
-		self.cachedAttributes = self.innerAttributes.merging(self.fontData?.attributes ?? [:]) { (_, new) in return new }
+		let fontAttributes = self.fontData?.attributes ?? [:]
+		self.cachedAttributes = self.innerAttributes.merging(fontAttributes) { (_, new) in return new }
 		return self.cachedAttributes!
 	}
 

Sources/SwiftRichString/Style/StyleProtocol.swift

@@ -51,7 +51,7 @@ public extension StyleProtocol {
 	func set(to source: String, range: NSRange?) -> AttributedString {
 		let attributedText = NSMutableAttributedString(string: source)
 		self.fontData?.addAttributes(to: attributedText, range: nil)
-		attributedText.setAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.count)))
+		attributedText.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.count)))
 		return attributedText
 	}
 
@@ -63,7 +63,7 @@ public extension StyleProtocol {
 
 	func set(to source: AttributedString, range: NSRange?) -> AttributedString {
 		self.fontData?.addAttributes(to: source, range: range)
-		source.setAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.length)))
+		source.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		return source
 	}