#56 Fixed missing attributes in .attributes property of Style

Added .renderingAttributes for internal rendering.

Author: malcommac

.swift-version

@@ -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.length))
+		self.removeAttributes(Array(style.renderingAttributes.keys), range: NSMakeRange(0, self.length))
 		return self
 	}
 

Sources/SwiftRichString/Extensions/AttributedString+Ext.swift

@@ -605,8 +605,10 @@ public class Style: StyleProtocol {
 		return (self.innerAttributes[key] as? T)
 	}
 
-	/// Return all attributes defined by the style.
-	public var attributes: [NSAttributedString.Key : Any] {
+	/// Return attributes defined by the style.
+	/// Not all attributes are returned, fonts attributes may be omitted.
+	/// Refer to `attributes` to get the complete list.
+	public var renderingAttributes: [NSAttributedString.Key : Any] {
 		if let cachedAttributes = self.cachedAttributes {
 			return cachedAttributes
 		}
@@ -616,6 +618,15 @@ public class Style: StyleProtocol {
 		self.cachedAttributes = self.innerAttributes.merging(fontAttributes) { (_, new) in return new }
 		return self.cachedAttributes!
 	}
+
+	/// Return attributes defined by the style.
+	public var attributes: [NSAttributedString.Key : Any] {
+		var allAttributes = self.renderingAttributes
+		if let fontRawAttributes = self.fontData?.attributes(currentFont: self.fontData?.font, size: self.fontData?.size) {
+			allAttributes.merge(fontRawAttributes, uniquingKeysWith: { (_, new) in return new })
+		}
+		return allAttributes
+	}
 
 	/// Create a new style copy of `self` with the opportunity to configure it via configuration callback.
 	///

Sources/SwiftRichString/Style/Style.swift

@@ -83,12 +83,12 @@ public class StyleGroup: StyleProtocol {
 
 	/// Return all attributes merge of each single `Style` of the group.
 	/// Attributes are reported in order of the insertion regardeless the associated name.
-	public var attributes: [NSAttributedString.Key : Any] {
+	public var renderingAttributes: [NSAttributedString.Key : Any] {
 		var composedAttributes: [NSAttributedString.Key: Any] = [:]
 		self.styles.enumerated().forEach { (arg) in
 
 			let (_, style) = arg
-			composedAttributes.merge(style.attributes, uniquingKeysWith: { (_, new) in return new })
+			composedAttributes.merge(style.renderingAttributes, uniquingKeysWith: { (_, new) in return new })
 		}
 		return composedAttributes
 	}
@@ -240,7 +240,7 @@ public class StyleGroup: StyleProtocol {
 						let length = closingTag.range.location-location
 						let range = NSRange(location: location, length: length)
 						attribute.fontData?.addAttributes(to: attrStr, range: range)
-						attrStr.addAttributes(attribute.attributes, range: range)
+						attrStr.addAttributes(attribute.renderingAttributes, range: range)
 					}
 				}
 
@@ -260,7 +260,7 @@ public extension Array where Array.Element == StyleProtocol {
 	/// - Returns: merged style
 	public func mergeStyle() -> Style {
 		var attributes: [NSAttributedString.Key:Any] = [:]
-		self.forEach { attributes.merge($0.attributes, uniquingKeysWith: { (_, new) in return new }) }
+		self.forEach { attributes.merge($0.renderingAttributes, uniquingKeysWith: { (_, new) in return new }) }
 		return Style(dictionary: attributes)
 	}
 

Sources/SwiftRichString/Style/StyleGroup.swift

@@ -35,7 +35,7 @@ public typealias AttributedString = NSMutableAttributedString
 public protocol StyleProtocol: class {
 
 	/// Return the attributes of the style in form of dictionary `NSAttributedStringKey`/`Any`.
-	var attributes: [NSAttributedString.Key : Any] { get }
+	var renderingAttributes: [NSAttributedString.Key : Any] { get }
 
 	/// Font unique attributes dictionary.
 	var fontData: FontData? { get }
@@ -56,26 +56,26 @@ 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, attributedText.length)))
+		attributedText.addAttributes(self.renderingAttributes, range: (range ?? NSMakeRange(0, attributedText.length)))
 		return attributedText
 	}
 
 	func add(to source: AttributedString, range: NSRange?) -> AttributedString {
 		self.fontData?.addAttributes(to: source, range: range)
-		source.addAttributes(self.attributes, range: (range ?? NSMakeRange(0, source.length)))
+		source.addAttributes(self.renderingAttributes, range: (range ?? NSMakeRange(0, source.length)))
 		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)))
+		source.addAttributes(self.renderingAttributes, range: (range ?? NSMakeRange(0, source.length)))
 		return source
 	}
 
 	@discardableResult
 	func remove(from source: AttributedString, range: NSRange?) -> AttributedString {
-		self.attributes.keys.forEach({
+		self.renderingAttributes.keys.forEach({
 			source.removeAttribute($0, range: (range ?? NSMakeRange(0, source.length)))
 		})
 		return source

Sources/SwiftRichString/Style/StyleProtocol.swift

@@ -51,8 +51,8 @@ public class StyleRegEx: StyleProtocol {
 	private var style: StyleProtocol
 
 	/// Style attributes
-	public var attributes: [NSAttributedString.Key : Any] {
-		return self.style.attributes
+	public var renderingAttributes: [NSAttributedString.Key : Any] {
+		return self.style.renderingAttributes
 	}
 
 	/// Font attributes
@@ -84,20 +84,20 @@ public class StyleRegEx: StyleProtocol {
 	//MARK: - METHOD OVERRIDES
 
 	public func set(to source: String, range: NSRange?) -> AttributedString {
-		let attributed = NSMutableAttributedString(string: source, attributes: (self.baseStyle?.attributes ?? [:]))
+		let attributed = NSMutableAttributedString(string: source, attributes: (self.baseStyle?.renderingAttributes ?? [:]))
 		return self.applyStyle(to: attributed, add: false, range: range)
 	}
 
 	public func add(to source: AttributedString, range: NSRange?) -> AttributedString {
 		if let base = self.baseStyle {
-			source.addAttributes(base.attributes, range: (range ?? NSMakeRange(0, source.length)))
+			source.addAttributes(base.renderingAttributes, 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.length)))
+			source.setAttributes(base.renderingAttributes, range: (range ?? NSMakeRange(0, source.length)))
 		}
 		return self.applyStyle(to: source, add: false, range: range)
 	}
@@ -119,9 +119,9 @@ public class StyleRegEx: StyleProtocol {
 			(result : NSTextCheckingResult?, _, _) in
 			if let r = result {
 				if add {
-					str.addAttributes(self.attributes, range: r.range)
+					str.addAttributes(self.renderingAttributes, range: r.range)
 				} else {
-					str.setAttributes(self.attributes, range: r.range)
+					str.setAttributes(self.renderingAttributes, range: r.range)
 				}
 			}
 		}

Sources/SwiftRichString/Style/StyleRegEx.swift

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SwiftRichString"
-  s.version      = "2.0.6"
+  s.version      = "2.1.0"
   s.summary      = "Elegant Strings & Attributed Strings Toolkit for Swift"
   s.description  = <<-DESC
     SwiftRichString is the best toolkit to work easily with Strings and Attributed Strings.

SwiftRichString.podspec

@@ -10,13 +10,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Sources/SwiftRichString/Style/Style.swift"
-            timestampString = "548505331.301"
+            timestampString = "569605751.212633"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "300"
-            endingLineNumber = "300"
-            landmarkName = "baseWritingDirection"
-            landmarkType = "24">
+            startingLineNumber = "302"
+            endingLineNumber = "302"
+            landmarkName = "Style"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy

SwiftRichString.xcodeproj/xcuserdata/daniele.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -9,26 +9,51 @@
 			<key>orderHint</key>
 			<integer>5</integer>
 		</dict>
+		<key>ExampleMac.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
 		<key>ExampleTvOS.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>6</integer>
 		</dict>
+		<key>ExampleTvOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>6</integer>
+		</dict>
 		<key>ExampleWatchOS (Notification).xcscheme</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>8</integer>
 		</dict>
+		<key>ExampleWatchOS (Notification).xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>8</integer>
+		</dict>
 		<key>ExampleWatchOS.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>7</integer>
 		</dict>
+		<key>ExampleWatchOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>7</integer>
+		</dict>
 		<key>ExampleiOS.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>4</integer>
 		</dict>
+		<key>ExampleiOS.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>4</integer>
+		</dict>
 		<key>SwiftRichString-iOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>