Skip to content

Commit 8eba375

Browse files
committed
[Chore] remove no need ParagraphSpacingPolicy
1 parent 8470e24 commit 8eba375

File tree

3 files changed

+5
-38
lines changed

3 files changed

+5
-38
lines changed

Sources/ZMarkupParser/Core/Processor/MarkupRenderProcessor.swift

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,20 @@
77

88
import Foundation
99

10-
public enum ParagraphSpacingPolicy {
11-
///
12-
/// In this mode, line break will be used to create spacing between paragraphs
13-
///
14-
/// For example
15-
/// Line 1
16-
///
17-
/// Line 2
18-
case lineBreaks
19-
///
20-
/// In this mode new additional line breaks are added.
21-
///
22-
/// Instead the MarkupStyleParagraphStyle.paragraphSpacing will create spacing between paragraphs.
23-
///
24-
/// For example
25-
/// Line 1
26-
/// Line 2
27-
///
28-
case paragraphSpacing
29-
}
30-
31-
3210
final class MarkupRenderProcessor: ParserProcessor {
3311
typealias From = (Markup, [MarkupStyleComponent])
3412
typealias To = NSAttributedString
3513

3614
let rootStyle: MarkupStyle?
37-
let paragraphSpacingPolicy: ParagraphSpacingPolicy
3815

39-
init(rootStyle: MarkupStyle?, paragraphSpacingPolicy: ParagraphSpacingPolicy = .lineBreaks) {
16+
init(rootStyle: MarkupStyle?) {
4017
self.rootStyle = rootStyle
41-
self.paragraphSpacingPolicy = paragraphSpacingPolicy
4218
}
4319

4420
func process(from: From) -> To {
4521
let visitor = MarkupNSAttributedStringVisitor(
4622
components: from.1,
47-
rootStyle: rootStyle,
48-
paragraphSpacingPolicy: paragraphSpacingPolicy
23+
rootStyle: rootStyle
4924
)
5025
return visitor.visit(markup: from.0)
5126
}

Sources/ZMarkupParser/HTML/ZHTMLParser.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ public final class ZHTMLParser {
2424
htmlTags: [HTMLTag],
2525
styleAttributes: [HTMLTagStyleAttribute],
2626
policy: MarkupStylePolicy,
27-
rootStyle: MarkupStyle?,
28-
paragraphSpacingPolicy: ParagraphSpacingPolicy = .lineBreaks
27+
rootStyle: MarkupStyle?
2928
) {
3029
self.htmlTags = htmlTags
3130
self.styleAttributes = styleAttributes
3231
self.rootStyle = rootStyle
3332

34-
self.markupRenderProcessor = MarkupRenderProcessor(rootStyle: rootStyle, paragraphSpacingPolicy: paragraphSpacingPolicy)
33+
self.markupRenderProcessor = MarkupRenderProcessor(rootStyle: rootStyle)
3534

3635
self.htmlParsedResultToHTMLElementWithRootMarkupProcessor = HTMLParsedResultToHTMLElementWithRootMarkupProcessor(htmlTags: htmlTags)
3736
self.htmlElementWithMarkupToMarkupStyleProcessor = HTMLElementWithMarkupToMarkupStyleProcessor(styleAttributes: styleAttributes, policy: policy)

Sources/ZMarkupParser/HTML/ZHTMLParserBuilder.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public final class ZHTMLParserBuilder {
1313
private(set) var styleAttributes: [HTMLTagStyleAttribute] = []
1414
private(set) var rootStyle: MarkupStyle? = .default
1515
private(set) var policy: MarkupStylePolicy = .respectMarkupStyleFromHTMLStyleAttribute
16-
private(set) var paragraphSpacingPolicy: ParagraphSpacingPolicy = .lineBreaks
1716

1817
public init() {
1918

@@ -64,18 +63,12 @@ public final class ZHTMLParserBuilder {
6463
return self
6564
}
6665

67-
public func set(spacingPolicy: ParagraphSpacingPolicy) -> Self {
68-
self.paragraphSpacingPolicy = spacingPolicy
69-
return self
70-
}
71-
7266
public func build() -> ZHTMLParser {
7367
return ZHTMLParser(
7468
htmlTags: htmlTags,
7569
styleAttributes: styleAttributes,
7670
policy: policy,
77-
rootStyle: rootStyle,
78-
paragraphSpacingPolicy: paragraphSpacingPolicy
71+
rootStyle: rootStyle
7972
)
8073
}
8174
}

0 commit comments

Comments
 (0)