#48 Fixed unicode rendering

Author: malcommac

Sources/SwiftRichString/Extensions/AttributedString+Ext.swift

@@ -156,7 +156,7 @@ public extension AttributedString {
 	/// - Parameter style: style to use.
 	/// - Returns: 	same instance of the receiver with - eventually - modified attributes.
 	public func remove(_ style: StyleProtocol) -> Self {
-		self.removeAttributes(Array(style.attributes.keys), range: NSMakeRange(0, self.string.count))
+		self.removeAttributes(Array(style.attributes.keys), range: NSMakeRange(0, self.length))
 		return self
 	}
 

Sources/SwiftRichString/Style/StyleProtocol.swift

@@ -56,7 +56,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.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.count)))
+		attributedText.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, attributedText.length)))
 		return attributedText
 	}
 

Sources/SwiftRichString/Style/StyleRegEx.swift

@@ -90,14 +90,14 @@ public class StyleRegEx: StyleProtocol {
 
 	public func add(to source: AttributedString, range: NSRange?) -> AttributedString {
 		if let base = self.baseStyle {
-			source.addAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.string.count)))
+			source.addAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		}
 		return self.applyStyle(to: source, add: true, range: range)
 	}
 
 	public func set(to source: AttributedString, range: NSRange?) -> AttributedString {
 		if let base = self.baseStyle {
-			source.setAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.string.count)))
+			source.setAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))
 		}
 		return self.applyStyle(to: source, add: false, range: range)
 	}
@@ -112,7 +112,7 @@ public class StyleRegEx: StyleProtocol {
 	///   - range: range, `nil` to apply the style to entire string.
 	/// - Returns: modified attributed string
 	private func applyStyle(to str: AttributedString, add: Bool, range: NSRange?) -> AttributedString {
-		let rangeValue = (range ?? NSMakeRange(0, str.string.count))
+		let rangeValue = (range ?? NSMakeRange(0, str.length))
 
 		let matchOpts = NSRegularExpression.MatchingOptions(rawValue: 0)
 		self.regex.enumerateMatches(in: str.string, options: matchOpts, range: rangeValue) {