Merge pull request #21 from ZhgChgLi/feature/support-new-tags

[Feat] add support s/blockquote/em/pre/code

Author: zhgchgli0718

Package.resolved

@@ -32,6 +32,8 @@ protocol MarkupVisitor {
     func visit(_ markup: ImageMarkup) -> Result
     func visit(_ markup: TableMarkup) -> Result
     func visit(_ markup: HeadMarkup) -> Result
+    func visit(_ markup: BlockQuoteMarkup) -> Result
+    func visit(_ markup: CodeMarkup) -> Result
 }
 
 extension MarkupVisitor {

Sources/ZMarkupParser/Core/Markup/MarkupVisitor.swift

@@ -0,0 +1,17 @@
+//
+//  BlockQuoteMarkup.swift
+//  
+//
+//  Created by zhgchgli on 2023/4/11.
+//
+
+import Foundation
+
+final class BlockQuoteMarkup: Markup {
+    weak var parentMarkup: Markup? = nil
+    var childMarkups: [Markup] = []
+    
+    func accept<V>(_ visitor: V) -> V.Result where V : MarkupVisitor {
+        return visitor.visit(self)
+    }
+}

Sources/ZMarkupParser/Core/Markup/Markups/BlockQuoteMarkup.swift

@@ -0,0 +1,17 @@
+//
+//  CodeMarkup.swift
+//  
+//
+//  Created by zhgchgli on 2023/4/11.
+//
+
+import Foundation
+
+final class CodeMarkup: Markup {
+    weak var parentMarkup: Markup? = nil
+    var childMarkups: [Markup] = []
+    
+    func accept<V>(_ visitor: V) -> V.Result where V : MarkupVisitor {
+        return visitor.visit(self)
+    }
+}

Sources/ZMarkupParser/Core/Markup/Markups/CodeMarkup.swift

@@ -20,4 +20,6 @@ public extension MarkupStyle {
     static let h4 = MarkupStyle(font: MarkupStyleFont(size: 18))
     static let h5 = MarkupStyle(font: MarkupStyleFont(size: 16))
     static let h6 = MarkupStyle(font: MarkupStyleFont(size: 14))
+    static let blockQuote = MarkupStyle(paragraphStyle: .init(headIndent: 10, firstLineHeadIndent: 10))
+    static let code = MarkupStyle(paragraphStyle: .init(lineSpacing: 0, headIndent: 10, firstLineHeadIndent: 10), backgroundColor: .init(color: .lightGray))
 }

Sources/ZMarkupParser/Core/MarkupStyle/MarkupStyle+Extension.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 struct MarkupNSAttributedStringVisitor: MarkupVisitor {
+    
     typealias Result = NSAttributedString
 
     let components: [MarkupStyleComponent]
@@ -155,6 +156,18 @@ struct MarkupNSAttributedStringVisitor: MarkupVisitor {
         attributedString.insert(NSAttributedString(attachment: markup.attachment), at: 0)
         return attributedString
     }
+    
+    func visit(_ markup: BlockQuoteMarkup) -> NSAttributedString {
+        let attributedString = collectAttributedString(markup)
+        attributedString.append(makeBreakLine(in: markup))
+        attributedString.insert(makeBreakLine(in: markup), at: 0)
+        return attributedString
+    }
+    
+    func visit(_ markup: CodeMarkup) -> NSAttributedString {
+        let attributedString = collectAttributedString(markup)
+        return attributedString
+    }
 }
 
 extension MarkupNSAttributedStringVisitor {

Sources/ZMarkupParser/Core/Processor/MarkupNSAttributedStringVisitor.swift

@@ -32,6 +32,11 @@ public protocol HTMLTagNameVisitor {
     func visit(_ tagName: TH_HTMLTagName) -> Result
     func visit(_ tagName: IMG_HTMLTagName) -> Result
     func visit(_ tagName: TABLE_HTMLTagName) -> Result
+    func visit(_ tagName: S_HTMLTagName) -> Result
+    func visit(_ tagName: PRE_HTMLTagName) -> Result
+    func visit(_ tagName: BLOCKQUOTE_HTMLTagName) -> Result
+    func visit(_ tagName: CODE_HTMLTagName) -> Result
+    func visit(_ tagName: EM_HTMLTagName) -> Result
 
     func visit(_ tagName: H1_HTMLTagName) -> Result
     func visit(_ tagName: H2_HTMLTagName) -> Result
@@ -74,6 +79,11 @@ public extension ZHTMLParserBuilder {
             H4_HTMLTagName(),
             H5_HTMLTagName(),
             H6_HTMLTagName(),
+            S_HTMLTagName(),
+            PRE_HTMLTagName(),
+            CODE_HTMLTagName(),
+            EM_HTMLTagName(),
+            BLOCKQUOTE_HTMLTagName(),
             IMG_HTMLTagName(handler: nil)
         ]
     }

Sources/ZMarkupParser/HTML/HTMLTag/HTMLTagNameVisitor.swift

@@ -0,0 +1,21 @@
+//
+//  BLOCKQUOTE_HTMLTagName.swift
+//  
+//
+//  Created by zhgchgli on 2023/4/11.
+//
+
+import Foundation
+
+public struct BLOCKQUOTE_HTMLTagName: HTMLTagName {
+    public let string: String = WC3HTMLTagName.blockquote.rawValue
+    
+    public init() {
+        
+    }
+    
+    public func accept<V>(_ visitor: V) -> V.Result where V : HTMLTagNameVisitor {
+        return visitor.visit(self)
+    }
+}
+

Sources/ZMarkupParser/HTML/HTMLTag/HTMLTagNames/BLOCKQUOTE_HTMLTagName.swift

@@ -0,0 +1,20 @@
+//
+//  CODE_HTMLTagName.swift
+//  
+//
+//  Created by zhgchgli on 2023/4/11.
+//
+
+import Foundation
+
+public struct CODE_HTMLTagName: HTMLTagName {
+    public let string: String = WC3HTMLTagName.code.rawValue
+    
+    public init() {
+        
+    }
+    
+    public func accept<V>(_ visitor: V) -> V.Result where V : HTMLTagNameVisitor {
+        return visitor.visit(self)
+    }
+}

Sources/ZMarkupParser/HTML/HTMLTag/HTMLTagNames/CODE_HTMLTagName.swift

@@ -0,0 +1,20 @@
+//
+//  EM_HTMLTagName.swift
+//  
+//
+//  Created by zhgchgli on 2023/4/11.
+//
+
+import Foundation
+
+public struct EM_HTMLTagName: HTMLTagName {
+    public let string: String = WC3HTMLTagName.em.rawValue
+    
+    public init() {
+        
+    }
+    
+    public func accept<V>(_ visitor: V) -> V.Result where V : HTMLTagNameVisitor {
+        return visitor.visit(self)
+    }
+}