Merge branch 'develop' into release/1.10.0

Author: SergioEstevao

Aztec/Classes/Formatters/Implementations/UnderlineFormatter.swift

@@ -8,3 +8,15 @@ class UnderlineFormatter: StandardAttributeFormatter {
                    htmlRepresentationKey: .underlineHtmlRepresentation)
     }
 }
+
+class SpanUnderlineFormatter: UnderlineFormatter {
+
+    override func apply(to attributes: [NSAttributedString.Key : Any], andStore representation: HTMLRepresentation?) -> [NSAttributedString.Key : Any] {
+
+        let cssAttribute = CSSAttribute.underline
+        let underlineStyleAttribute = Attribute(type: .style, value: .inlineCss([cssAttribute]))
+        let spanRepresentation = HTMLElementRepresentation(ElementNode.init(type: .span, attributes: [underlineStyleAttribute], children: []))
+
+        return super.apply(to: attributes, andStore: HTMLRepresentation(for: .element(spanRepresentation)))        
+    }
+}

Aztec/Classes/TextKit/TextView.swift

@@ -747,7 +747,7 @@ open class TextView: UITextView {
     private static let formatterMap: [FormattingIdentifier: AttributeFormatter] = [
         .bold: BoldFormatter(),
         .italic: ItalicFormatter(),
-        .underline: UnderlineFormatter(),
+        .underline: SpanUnderlineFormatter(),
         .strikethrough: StrikethroughFormatter(),
         .link: LinkFormatter(),
         .orderedlist: TextListFormatter(style: .ordered),
@@ -935,7 +935,7 @@ open class TextView: UITextView {
     /// - Parameter range: The NSRange to edit.
     ///
     open func toggleUnderline(range: NSRange) {
-        let formatter = UnderlineFormatter()
+        let formatter = SpanUnderlineFormatter()
         toggle(formatter: formatter, atRange: range)
     }