Preserve attributes with custom font

bmoliveira · Aug 20, 2021 · d95f931 · d95f931
1 parent 761a30e
commit d95f931
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 14 deletions.
diff --git a/MarkdownKit/Sources/AppKit/Extensions/MarkdownFont+Traits.swift b/MarkdownKit/Sources/AppKit/Extensions/MarkdownFont+Traits.swift
@@ -17,6 +17,14 @@ public extension MarkdownFont {
   func bold() -> MarkdownFont {
     return NSFontManager().convert(self, toHaveTrait: NSFontTraitMask.boldFontMask)
   }
+
+  func isItalic() -> Bool {
+    return NSFontManager().traits(of: self).contains(.italicFontMask)
+  }
+
+  func isBold() -> Bool {
+    return NSFontManager().traits(of: self).contains(.boldFontMask)
+  }
 
   func withSize(_ size: CGFloat) -> NSFont {
     return NSFontManager().convert(self, toSize: size)

diff --git a/MarkdownKit/Sources/Common/Elements/Bold/MarkdownBold.swift b/MarkdownKit/Sources/Common/Elements/Bold/MarkdownBold.swift
@@ -19,15 +19,18 @@ open class MarkdownBold: MarkdownCommonElement {
   }
 
   public init(font: MarkdownFont? = nil, color: MarkdownColor? = nil) {
-    self.font = font?.bold()
+    self.font = font
     self.color = color
   }
 
   public func match(_ match: NSTextCheckingResult, attributedString: NSMutableAttributedString) {
     attributedString.deleteCharacters(in: match.range(at: 4))
 
     attributedString.enumerateAttribute(.font, in: match.range(at: 3)) { value, range, stop in
-      if let font = value as? MarkdownFont {
+      guard let font = value as? MarkdownFont else { return }
+      if let customFont = self.font {
+        self.font = font.isItalic() ? customFont.bold().italic() : customFont.bold()
+      } else {
         attributedString.addAttribute(
           NSAttributedString.Key.font,
           value: font.bold(),
@@ -36,6 +39,8 @@ open class MarkdownBold: MarkdownCommonElement {
       }
     }
 
+    addAttributes(attributedString, range: match.range(at: 3))
+
     attributedString.deleteCharacters(in: match.range(at: 2))
   }
 }
diff --git a/MarkdownKit/Sources/Common/Elements/Italic/MarkdownItalic.swift b/MarkdownKit/Sources/Common/Elements/Italic/MarkdownItalic.swift
@@ -18,16 +18,19 @@ open class MarkdownItalic: MarkdownCommonElement {
     return MarkdownItalic.regex
   }
 
-  public init(font: MarkdownFont?, color: MarkdownColor? = nil) {
-    self.font = font?.italic()
+  public init(font: MarkdownFont? = nil, color: MarkdownColor? = nil) {
+    self.font = font
     self.color = color
   }
 
   public func match(_ match: NSTextCheckingResult, attributedString: NSMutableAttributedString) {
     attributedString.deleteCharacters(in: match.range(at: 4))
 
     attributedString.enumerateAttribute(.font, in: match.range(at: 3)) { value, range, stop in
-      if let font = value as? MarkdownFont {
+      guard let font = value as? MarkdownFont else { return }
+      if let customFont = self.font {
+        self.font = font.isBold() ? customFont.bold().italic() : customFont.italic()
+      } else {
         attributedString.addAttribute(
           NSAttributedString.Key.font,
           value: font.italic(),
@@ -36,6 +39,8 @@ open class MarkdownItalic: MarkdownCommonElement {
       }
     }
 
+    addAttributes(attributedString, range: match.range(at: 3))
+
     attributedString.deleteCharacters(in: match.range(at: 2))
   }
 }
diff --git a/MarkdownKit/Sources/Common/MarkdownParser.swift b/MarkdownKit/Sources/Common/MarkdownParser.swift
@@ -94,15 +94,15 @@ open class MarkdownParser {
     self.font = font
     self.color = color
 
-    self.header = MarkdownHeader(font: font)
-    self.list = MarkdownList(font: font)
-    self.quote = MarkdownQuote(font: font)
-    self.link = MarkdownLink(font: font)
-    self.automaticLink = MarkdownAutomaticLink(font: font)
-    self.bold = MarkdownBold(font: font)
-    self.italic = MarkdownItalic(font: font)
-    self.code = MarkdownCode(font: font)
-    self.strikethrough = MarkdownStrikethrough(font: font)
+    self.header = MarkdownHeader()
+    self.list = MarkdownList()
+    self.quote = MarkdownQuote()
+    self.link = MarkdownLink()
+    self.automaticLink = MarkdownAutomaticLink()
+    self.bold = MarkdownBold()
+    self.italic = MarkdownItalic()
+    self.code = MarkdownCode()
+    self.strikethrough = MarkdownStrikethrough()
 
     self.escapingElements = [codeEscaping, escaping]
     self.unescapingElements = [code, unescaping]

diff --git a/MarkdownKit/Sources/UIKit/Extensions/UIFont+Traits.swift b/MarkdownKit/Sources/UIKit/Extensions/UIFont+Traits.swift
@@ -26,6 +26,14 @@ extension UIFont {
   func italic() -> UIFont {
     return withTraits(fontDescriptor.symbolicTraits, .traitItalic) ?? self
   }
+
+  func isItalic() -> Bool {
+    return fontDescriptor.symbolicTraits.contains(.traitItalic)
+  }
+
+  func isBold() -> Bool {
+    return fontDescriptor.symbolicTraits.contains(.traitBold)
+  }
 }
 
 #endif