Merge pull request #65 from ZhgChgLi/fix/harry/list-item-and-stripper…

…-bug-fix Fix/harry/list item and stripper bug fix
ZhgChgLi · May 29, 2024 · b8086ba · b8086ba
2 parents ba02833 + 39531f5
commit b8086ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Sources/ZMarkupParser/HTML/Processor/HTMLElementMarkupComponentMarkupStyleVisitor.swift b/Sources/ZMarkupParser/HTML/Processor/HTMLElementMarkupComponentMarkupStyleVisitor.swift
@@ -82,19 +82,20 @@ struct HTMLElementMarkupComponentMarkupStyleVisitor: MarkupVisitor {
         let indent = (style.font.size ?? 16) * markup.styleList.indentMultiply
         let dotIndent: CGFloat = (markup.styleList.type.isOrder()) ? (indent) : (0) // for 1. -> "."
 
+        // Find Parent Indent if exists.
         var parentIndent: CGFloat = 0
         var parentMarkup: Markup? = markup.parentMarkup
         while (parentMarkup != nil) {
             if let thisParentMarkup = parentMarkup as? ListMarkup {
-                parentIndent += visit(markup: thisParentMarkup)?.paragraphStyle.headIndent ?? 0
+                parentIndent = visit(markup: thisParentMarkup)?.paragraphStyle.headIndent ?? 0
+                break
             }
             parentMarkup = parentMarkup?.parentMarkup
         }
 
         var tabStops: [NSTextTab] = [.init(textAlignment: .left, location: headIndent + parentIndent)]
         tabStops.append(.init(textAlignment: .left, location: headIndent + parentIndent + dotIndent + indent))
 
-
         style.paragraphStyle.tabStops = style.paragraphStyle.tabStops ?? tabStops
         style.paragraphStyle.headIndent = style.paragraphStyle.headIndent ?? style.paragraphStyle.tabStops?.last?.location
         return style

diff --git a/Sources/ZMarkupParser/HTML/ZHTMLParser.swift b/Sources/ZMarkupParser/HTML/ZHTMLParser.swift
@@ -96,11 +96,12 @@ public final class ZHTMLParser {
     }
 
     public func stripper(_ attributedString: NSAttributedString) -> NSAttributedString {
-        let items = process(attributedString)
+        let stripedAttributedString = decodeHTMLEntities(attributedString)
+        let items = process(stripedAttributedString)
         let reuslt = htmlParsedResultToHTMLElementWithRootMarkupProcessor.process(from: items)
-        let attributedString = markupStripperProcessor.process(from: reuslt.markup)
+        let resultAttributedString = markupStripperProcessor.process(from: reuslt.markup)
 
-        return attributedString
+        return resultAttributedString
     }
 
     //