Merge branch 'release/3.0.4'

malcommac · Dec 11, 2019 · d87ed23 · d87ed23
2 parents 434b753 + 20d0df9
commit d87ed23
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Sources/SwiftRichString/Style/Style.swift b/Sources/SwiftRichString/Style/Style.swift
@@ -616,6 +616,9 @@ public class Style: StyleProtocol {
 		// string to generate a single attributes dictionary for `NSAttributedString`.
 		let fontAttributes = self.fontData?.attributes ?? [:]
 		self.cachedAttributes = self.innerAttributes.merging(fontAttributes) { (_, new) in return new }
+        if let font = self.fontData?.font {
+            self.cachedAttributes?[.font] = font
+        }
 		return self.cachedAttributes!
 	}
 

diff --git a/SwiftRichString.podspec b/SwiftRichString.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SwiftRichString"
-  s.version      = "3.0.3"
+  s.version      = "3.0.4"
   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.

diff --git a/SwiftRichString.xcodeproj/project.pbxproj b/SwiftRichString.xcodeproj/project.pbxproj
@@ -1699,7 +1699,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.0.3;
+				MARKETING_VERSION = 3.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-macOS";
 				PRODUCT_NAME = SwiftRichString;
 				SDKROOT = macosx;
@@ -1725,7 +1725,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MARKETING_VERSION = 3.0.3;
+				MARKETING_VERSION = 3.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SwiftRichString.SwiftRichString-macOS";
 				PRODUCT_NAME = SwiftRichString;
 				SDKROOT = macosx;