Add variable to control the collapse of whitespaces in HTML

Author: SergioEstevao

Aztec/Classes/Libxml2/Converters/In/HTMLParser.swift

@@ -8,6 +8,8 @@ open class HTMLParser {
         case NoRootNode = "No root node"
     }
 
+    var shouldCollapseSpaces: Bool = true
+
     /// Public initializer
     ///
     public init() { }
@@ -71,7 +73,7 @@ open class HTMLParser {
 
         let rootNodePtr = xmlDocGetRootElement(document)
         let nodeConverter = InNodeConverter()
-
+        nodeConverter.shouldCollapseSpaces = shouldCollapseSpaces
         guard let rootNode = rootNodePtr?.pointee,
             let node = nodeConverter.convert(rootNode) as? RootNode else {
                 return RootNode(children: [TextNode(text: "")])

Aztec/Classes/Libxml2/Converters/In/InNodeConverter.swift

@@ -3,6 +3,7 @@ import libxml2
 
 class InNodeConverter: SafeConverter {
 
+    var shouldCollapseSpaces: Bool = true
     /// Converts a single node (from libxml2) into an HTML.Node.
     ///
     /// - Parameters:
@@ -105,7 +106,7 @@ class InNodeConverter: SafeConverter {
     fileprivate func createTextNode(_ rawNode: xmlNode) -> TextNode {
         let text = String(cString: rawNode.content)
         let node = TextNode(text: text)
-
+        node.shouldCollapseSpaces = shouldCollapseSpaces
         return node
     }
 

Aztec/Classes/Libxml2/DOM/Data/TextNode.swift

@@ -7,7 +7,7 @@ public class TextNode: Node {
 
     let contents: String
 
-    let shouldRemoveExtraSpaces: Bool = false
+    var shouldCollapseSpaces: Bool = true
 
     // MARK: - CustomReflectable
 
@@ -95,12 +95,12 @@ extension TextNode {
         //
         let whitespace = CharacterSet.whitespacesAndNewlines
         var whitespaceToKeep = CharacterSet(charactersIn: String(.nonBreakingSpace)+String(.lineSeparator))
-        if ( !shouldRemoveExtraSpaces ) {
+        if ( !shouldCollapseSpaces ) {
             whitespaceToKeep.insert(charactersIn: String(.space))
         }
         let whitespaceToRemove = whitespace.subtracting(whitespaceToKeep)
         let trimmedText = text.trimmingCharacters(in: whitespaceToRemove)
-        if ( !shouldRemoveExtraSpaces ) {
+        if ( !shouldCollapseSpaces ) {
             return trimmedText
         }
         var singleSpaceText = trimmedText

Aztec/Classes/NSAttributedString/Conversions/HTMLConverter.swift

@@ -25,6 +25,10 @@ public class HTMLConverter {
     ///
     open var characterToReplaceLastEmptyLine: Character?
 
+    /// If this value is set the converter will behave like a browser and collapse extra white spaces
+    ///
+    open var shouldCollapseSpaces: Bool = true
+
     let htmlToTree = HTMLParser()
 
     private(set) lazy var treeToAttributedString: AttributedStringSerializer = {
@@ -53,6 +57,7 @@ public class HTMLConverter {
     ///
     func attributedString(from html: String, defaultAttributes: [NSAttributedString.Key: Any]? = [:]) -> NSAttributedString {
         let processedHTML = pluginManager.process(html: html)
+        htmlToTree.shouldCollapseSpaces = shouldCollapseSpaces
         let rootNode = htmlToTree.parse(processedHTML)
 
         pluginManager.process(htmlTree: rootNode)