#44 Fixed base style render for font/size on StyleGroup

Author: malcommac

Sources/SwiftRichString/Style/StyleGroup.swift

@@ -180,13 +180,7 @@ public class StyleGroup: StyleProtocol {
 		let str = attrStr.string
 
 		// Apply default base style if specified
-		if let baseStyle = self.baseStyle {
-			if adding {
-				attrStr.addAttributes(baseStyle.attributes, range: NSMakeRange(0, attrStr.length))
-			} else {
-				attrStr.setAttributes(baseStyle.attributes, range: NSMakeRange(0, attrStr.length))
-			}
-		}
+		self.baseStyle?.set(to: attrStr, range: nil)
 
 		// Parse tags
 		if let regex = try? NSRegularExpression(pattern: tagRegex, options: .dotMatchesLineSeparators) {

Sources/SwiftRichString/Style/StyleProtocol.swift

@@ -41,8 +41,13 @@ public protocol StyleProtocol: class {
 	var fontData: FontData? { get }
 
 	func set(to source: String, range: NSRange?) -> AttributedString
+	
 	func add(to source: AttributedString, range: NSRange?) -> AttributedString
+	
+	@discardableResult
 	func set(to source: AttributedString, range: NSRange?) -> AttributedString
+	
+	@discardableResult
 	func remove(from source: AttributedString, range: NSRange?) -> AttributedString
 }
 
@@ -61,12 +66,14 @@ public extension StyleProtocol {
 		return source
 	}
 
+	@discardableResult
 	func set(to source: AttributedString, range: NSRange?) -> AttributedString {
 		self.fontData?.addAttributes(to: source, range: range)
 		source.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		return source
 	}
 
+	@discardableResult
 	func remove(from source: AttributedString, range: NSRange?) -> AttributedString {
 		self.attributes.keys.forEach({
 			source.removeAttribute($0, range: (range ?? NSMakeRange(0, source.length)))