Merge branch 'master' into hotfix/1.6.1.1

SergioEstevao · SergioEstevao · commit 6f91f8f06686 · 2019-05-24T17:57:42.000+01:00
# Conflicts:
#	WordPress-Aztec-iOS.podspec
#	WordPress-Editor-iOS.podspec
diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1A830346228583B200798076 /* NSBundle+AztecBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A830345228583B200798076 /* NSBundle+AztecBundle.swift */; };
 		40359F261FD88A5F00B1C1D2 /* HRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */; };
 		40359F281FD88A7900B1C1D2 /* BRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */; };
 		40A2986D1FD61B0C00AEDF3B /* ElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */; };
@@ -221,6 +222,7 @@
 		F9982CF621877663001E606B /* TextViewPasteboardDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9982CF521877663001E606B /* TextViewPasteboardDelegate.swift */; };
 		F99D5CF321B989FF0089314A /* StringRangeMultibyteConversionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F99D5CF221B989FF0089314A /* StringRangeMultibyteConversionTests.swift */; };
 		FF0714021EFD78AF00E50713 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FF0714001EFD78AF00E50713 /* Media.xcassets */; };
+		FF17B2D2227A589F0022AECE /* LIElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF17B2D1227A589F0022AECE /* LIElementConverter.swift */; };
 		FF20D6401EDC389A00294B78 /* ShortcodeAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF20D63D1EDC389A00294B78 /* ShortcodeAttribute.swift */; };
 		FF20D6411EDC389A00294B78 /* HTMLProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF20D63E1EDC389A00294B78 /* HTMLProcessor.swift */; };
 		FF20D6421EDC389A00294B78 /* Processor.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF20D63F1EDC389A00294B78 /* Processor.swift */; };
@@ -272,6 +274,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		1A830345228583B200798076 /* NSBundle+AztecBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSBundle+AztecBundle.swift"; sourceTree = "<group>"; };
 		40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HRElementConverter.swift; sourceTree = "<group>"; };
 		40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRElementConverter.swift; sourceTree = "<group>"; };
 		40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementConverter.swift; sourceTree = "<group>"; };
@@ -491,6 +494,7 @@
 		F9982CF521877663001E606B /* TextViewPasteboardDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewPasteboardDelegate.swift; sourceTree = "<group>"; };
 		F99D5CF221B989FF0089314A /* StringRangeMultibyteConversionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringRangeMultibyteConversionTests.swift; sourceTree = "<group>"; };
 		FF0714001EFD78AF00E50713 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
+		FF17B2D1227A589F0022AECE /* LIElementConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LIElementConverter.swift; sourceTree = "<group>"; };
 		FF20D63D1EDC389A00294B78 /* ShortcodeAttribute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShortcodeAttribute.swift; sourceTree = "<group>"; };
 		FF20D63E1EDC389A00294B78 /* HTMLProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLProcessor.swift; sourceTree = "<group>"; };
 		FF20D63F1EDC389A00294B78 /* Processor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Processor.swift; sourceTree = "<group>"; };
@@ -539,6 +543,7 @@
 			isa = PBXGroup;
 			children = (
 				40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */,
+				FF17B2D1227A589F0022AECE /* LIElementConverter.swift */,
 				F1E2323120C17F70008DA49F /* CiteElementConverter.swift */,
 				B5E94D0F1FE01334000E7C20 /* FigureElementConverter.swift */,
 				F1FF7DA0201A1D3E007B0B32 /* FigcaptionElementConverter.swift */,
@@ -733,6 +738,7 @@
 				F10BE6191EA7AE9D002E4625 /* NSAttributedString+ReplaceOcurrences.swift */,
 				F12328761FB638C6001E35EF /* NSAttributedStringKey+Aztec.swift */,
 				B574F4A31FB0CF3A0048F355 /* NSAttributedStringKey+Conversion.swift */,
+				1A830345228583B200798076 /* NSBundle+AztecBundle.swift */,
 				FFD0FEB61DAE59A700430586 /* NSLayoutManager+Attachments.swift */,
 				F1584795203C9B4C00EE05A1 /* NSMutableAttributedString+ParagraphProperty.swift */,
 				F10BE6171EA7ADA6002E4625 /* NSMutableAttributedString+ReplaceOcurrences.swift */,
@@ -1561,6 +1567,7 @@
 				F177FF751FB6404D00CBBE35 /* UILayoutPriority+Swift4.swift in Sources */,
 				F1C05B9D1E37FA77007510EA /* String+CharacterName.swift in Sources */,
 				F1FF7D9F201A1D24007B0B32 /* Figcaption.swift in Sources */,
+				FF17B2D2227A589F0022AECE /* LIElementConverter.swift in Sources */,
 				FF437B6620D7CB83000D9666 /* LiFormatter.swift in Sources */,
 				FFFEC7DB1EA7698900F4210F /* VideoAttachment.swift in Sources */,
 				F12F58671EF20394008AE298 /* BlockquoteFormatter.swift in Sources */,
@@ -1576,6 +1583,7 @@
 				F15BA60D215159A600424120 /* ItalicStringAttributeConverter.swift in Sources */,
 				F1656FDC2152A00E009C7E3A /* ConditionalStringAttributeConverter.swift in Sources */,
 				599F25541D8BC9A1002871D6 /* TextView.swift in Sources */,
+				1A830346228583B200798076 /* NSBundle+AztecBundle.swift in Sources */,
 				F1E1D5801FEC44B30086B339 /* AttachmentElementConverter.swift in Sources */,
 				F1BDDDE520603C18000714E1 /* FigcaptionFormatter.swift in Sources */,
 				B524228D1F30C039002E7C6C /* HTMLDiv.swift in Sources */,
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Base/ElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Base/ElementConverter.swift
@@ -5,7 +5,7 @@ import UIKit
 ///
 public protocol ElementConverter {
     
-    typealias ContentSerializer = (_ elementNode: ElementNode, _ intrinsicRepresentation: NSAttributedString?, _ inheriting: [NSAttributedString.Key:Any]) -> NSAttributedString
+    typealias ContentSerializer = (_ elementNode: ElementNode, _ intrinsicRepresentation: NSAttributedString?, _ inheriting: [NSAttributedString.Key:Any], _ implicitRepresentationBeforeChildren: Bool) -> NSAttributedString
     
     /// Converts an instance of ElementNode into a NSAttributedString.
     ///
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/BRElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/BRElementConverter.swift
@@ -16,6 +16,6 @@ class BRElementConverter: ElementConverter {
         
         let intrinsicRepresentation = NSAttributedString(.lineSeparator, attributes: attributes)
         
-        return serialize(element, intrinsicRepresentation, attributes)
+        return serialize(element, intrinsicRepresentation, attributes, false)
     }
 }
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/CiteElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/CiteElementConverter.swift
@@ -16,7 +16,7 @@ class CiteElementConverter: FormatterElementConverter {
         
         let childrenAttributes = attributes(for: element, inheriting: inheritedAttributes)
         
-        return serialize(element, nil, childrenAttributes)
+        return serialize(element, nil, childrenAttributes, false)
     }
     
     // MARK: - FormatterElementConverter
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/FigcaptionElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/FigcaptionElementConverter.swift
@@ -18,7 +18,7 @@ class FigcaptionElementConverter: ElementConverter {
         
         let attributes = self.attributes(for: element, inheriting: attributes)
         
-        return serialize(element, nil, attributes)
+        return serialize(element, nil, attributes, false)
     }
     
     private func attributes(for element: ElementNode, inheriting attributes: [NSAttributedString.Key: Any]) -> [NSAttributedString.Key: Any] {
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/FigureElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/FigureElementConverter.swift
@@ -16,7 +16,7 @@ class FigureElementConverter: ElementConverter {
        
         let attributes = self.attributes(for: element, inheriting: attributes)
         
-        return serialize(element, nil, attributes)
+        return serialize(element, nil, attributes, false)
     }
     
     private func attributes(for element: ElementNode, inheriting attributes: [NSAttributedString.Key: Any]) -> [NSAttributedString.Key: Any] {
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/GenericElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/GenericElementConverter.swift
@@ -113,7 +113,7 @@ class GenericElementConverter: ElementConverter {
         
         let childrenAttributes = attributes(for: element, inheriting: inheritedAttributes)
         
-        return serialize(element, nil, childrenAttributes)
+        return serialize(element, nil, childrenAttributes, false)
     }
 }
 
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/HRElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/HRElementConverter.swift
@@ -23,7 +23,7 @@ class HRElementConverter: AttachmentElementConverter {
         let attachment = self.attachment(for: element)
         
         let intrinsicRepresentation = NSAttributedString(attachment: attachment, attributes: attributes)
-        let serialization = serialize(element, intrinsicRepresentation, attributes)
+        let serialization = serialize(element, intrinsicRepresentation, attributes, false)
         
         return (attachment, serialization)
     }
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/ImageElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/ImageElementConverter.swift
@@ -16,7 +16,7 @@ class ImageElementConverter: AttachmentElementConverter {
         
         let attachment = self.attachment(for: element)
         let intrinsicRepresentation = NSAttributedString(attachment: attachment, attributes: attributes)
-        let serialization = serialize(element, intrinsicRepresentation, attributes)
+        let serialization = serialize(element, intrinsicRepresentation, attributes, false)
         
         return (attachment, serialization)
     }
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/LIElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/LIElementConverter.swift
@@ -0,0 +1,55 @@
+import UIKit
+
+
+/// Converts `<li>` elements into a `String(.lineSeparator)`.
+///
+class LIElementConverter: ElementConverter {
+    
+    // MARK: - ElementConverter
+    
+    func convert(
+        _ element: ElementNode,
+        inheriting attributes: [NSAttributedString.Key: Any],
+        contentSerializer serialize: ContentSerializer) -> NSAttributedString {
+        
+        precondition(element.type == .li)
+
+        var intrinsicRepresentation: NSAttributedString?
+        let intrisicRepresentationBeforeChildren = !hasNonEmptyTextChildren(node: element) && hasNestedList(node: element)
+
+        let elementRepresentation = HTMLElementRepresentation(element)
+        let representation = HTMLRepresentation(for: .element(elementRepresentation))
+        let formatter = LiFormatter(placeholderAttributes: nil)
+        let finalAttributes = formatter.apply(to: attributes, andStore: representation)
+
+        if intrisicRepresentationBeforeChildren {
+            intrinsicRepresentation = NSAttributedString(string: String(.paragraphSeparator), attributes: finalAttributes)
+        }
+
+        return serialize(element, intrinsicRepresentation, finalAttributes, intrisicRepresentationBeforeChildren)
+    }
+
+    private func hasNonEmptyTextChildren(node: ElementNode) -> Bool {
+        var result = false
+        var whiteSpaces = CharacterSet.whitespacesAndNewlines
+        whiteSpaces.remove(charactersIn: String(.paragraphSeparator))
+        for node in node.children {
+            if let text = node as? TextNode, !text.contents.trimmingCharacters(in: whiteSpaces).isEmpty {
+                return true
+            }
+            if let element = node as? ElementNode, !element.isNodeType(.ol) && !element.isNodeType(.ul) {
+                result = result || hasNonEmptyTextChildren(node: element)
+            }
+        }
+        return result
+    }
+
+    private func hasNestedList(node: ElementNode) -> Bool {
+        for node in node.children {
+            if let element = node as? ElementNode, element.isNodeType(.ol) || element.isNodeType(.ul) {
+                return true
+            }
+        }
+        return false
+    }
+}
diff --git a/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/VideoElementConverter.swift b/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/VideoElementConverter.swift
@@ -16,7 +16,7 @@ class VideoElementConverter: AttachmentElementConverter {
         
         let attachment = self.attachment(for: element)
         let intrinsicRepresentation = NSAttributedString(attachment: attachment, attributes: attributes)
-        let serialization = serialize(element, intrinsicRepresentation, attributes)
+        let serialization = serialize(element, intrinsicRepresentation, attributes, false)
         
         return (attachment, serialization)
     }
diff --git a/Aztec/Classes/Extensions/NSBundle+AztecBundle.swift b/Aztec/Classes/Extensions/NSBundle+AztecBundle.swift
@@ -0,0 +1,14 @@
+import Foundation
+
+extension Bundle {
+    @objc public class var aztecBundle: Bundle {
+        let defaultBundle = Bundle(for: EditorView.self)
+        // If installed with CocoaPods, resources will be in WordPress-Aztec-iOS.bundle
+        if let bundleURL = defaultBundle.resourceURL,
+            let resourceBundle = Bundle(url: bundleURL.appendingPathComponent("WordPress-Aztec-iOS.bundle")) {
+            return resourceBundle
+        }
+        // Otherwise, the default bundle is used for resources
+        return defaultBundle
+    }
+}
diff --git a/Aztec/Classes/Extensions/String+Paragraph.swift b/Aztec/Classes/Extensions/String+Paragraph.swift
@@ -3,7 +3,7 @@ import Foundation
 
 // MARK: - Paragraph Analysis Helpers
 //
-extension String {
+public extension String {
 
     /// This methods verifies if the receiver string contains a new paragraph at the specified index.
     ///
diff --git a/Aztec/Classes/GUI/Assets.swift b/Aztec/Classes/GUI/Assets.swift
@@ -4,13 +4,13 @@ import UIKit
 class Assets {
 
     public static var playIcon: UIImage {
-        let bundle = Bundle(for: self)
+        let bundle = Bundle.aztecBundle
         let playImage = UIImage(named: "play", in: bundle, compatibleWith: nil)!
         return playImage
     }
 
     public static var imageIcon: UIImage {
-        let bundle = Bundle(for: self)
+        let bundle = Bundle.aztecBundle
         let playImage = UIImage(named: "image", in: bundle, compatibleWith: nil)!
         return playImage
     }
diff --git a/Aztec/Classes/Libxml2/DOM/Data/TextNode.swift b/Aztec/Classes/Libxml2/DOM/Data/TextNode.swift
@@ -92,7 +92,7 @@ extension TextNode {
         // U+000A, which is non-breaking space.  We need to maintain it.
         //
         let whitespace = CharacterSet.whitespacesAndNewlines
-        let whitespaceToKeep = CharacterSet(charactersIn: String(.nonBreakingSpace))
+        let whitespaceToKeep = CharacterSet(charactersIn: String(.nonBreakingSpace)+String(.lineSeparator))
         let whitespaceToRemove = whitespace.subtracting(whitespaceToKeep)
         
         let trimmedText = text.trimmingCharacters(in: whitespaceToRemove)
diff --git a/Aztec/Classes/NSAttributedString/Conversions/AttributedStringParser.swift b/Aztec/Classes/NSAttributedString/Conversions/AttributedStringParser.swift
@@ -899,7 +899,7 @@ private extension AttributedStringParser {
             return representationElement.toElementNode()
         }
 
-        return ElementNode(type: .strike)
+        return ElementNode(type: .s)
     }
 
     /// Extracts all of the Code Elements contained within a collection of Attributes.
diff --git a/Aztec/Classes/NSAttributedString/Conversions/AttributedStringSerializer.swift b/Aztec/Classes/NSAttributedString/Conversions/AttributedStringSerializer.swift
@@ -19,7 +19,8 @@ class AttributedStringSerializer {
         .figure: FigureElementConverter(),
         .hr: HRElementConverter(),
         .img: ImageElementConverter(),
-        .video: VideoElementConverter()
+        .video: VideoElementConverter(),
+        .li: LIElementConverter()
     ]
     
     // MARK: - Attributes Converter
@@ -158,15 +159,19 @@ class AttributedStringSerializer {
     //
     private(set) lazy var genericElementConverter = GenericElementConverter()
     
-    lazy var contentSerializer: ElementConverter.ContentSerializer = { [unowned self] (elementNode, intrinsicRepresentation, attributes) in
+    lazy var contentSerializer: ElementConverter.ContentSerializer = { [unowned self] (elementNode, intrinsicRepresentation, attributes, intrinsicRepresentationBeforeChildren) in
         let content = NSMutableAttributedString()
-        
+
+        if let intrinsicRepresentation = intrinsicRepresentation, intrinsicRepresentationBeforeChildren {
+            content.append(intrinsicRepresentation)
+        }
+
         for child in elementNode.children {
             let nodeString = self.serialize(child, inheriting: attributes)
             content.append(nodeString)
         }
         
-        if let intrinsicRepresentation = intrinsicRepresentation {
+        if let intrinsicRepresentation = intrinsicRepresentation, !intrinsicRepresentationBeforeChildren {
             content.append(intrinsicRepresentation)
         }
         
diff --git a/AztecTests/NSAttributedString/Conversions/AttributedStringParserTests.swift b/AztecTests/NSAttributedString/Conversions/AttributedStringParserTests.swift
@@ -134,7 +134,7 @@ class AttributedStringParserTests: XCTestCase {
             XCTFail()
             return
         }
-        XCTAssertEqual(strike.name, Element.strike.rawValue)
+        XCTAssertEqual(strike.name, Element.s.rawValue)
         XCTAssertEqual(strike.children.count, 1)
 
         guard let text = strike.children.first as? TextNode else {
diff --git a/AztecTests/New Group/ElementToAttributedString/GenericElementConverterTests.swift b/AztecTests/New Group/ElementToAttributedString/GenericElementConverterTests.swift
@@ -4,7 +4,7 @@ import XCTest
 class GenericElementConverterTests: XCTestCase {
 
     let converter = GenericElementConverter()
-    let contentSerializer: ElementConverter.ContentSerializer = { elementNode, implicitRepresentation, attributes in
+    let contentSerializer: ElementConverter.ContentSerializer = { elementNode, implicitRepresentation, attributes, intrinsicRepresentationBeforeChildren in
         return NSAttributedString()
     }
 
diff --git a/AztecTests/TextKit/TextStorageTests.swift b/AztecTests/TextKit/TextStorageTests.swift
@@ -480,4 +480,18 @@ class TextStorageTests: XCTestCase {
 
         XCTAssertEqual(html, outputHTML)
     }
+
+    func testListWithNestedLists() {
+        let initialHTML = "<ul><li>One</li><li><ul><li>Two</li></ul></li></ul>"
+
+        // Setup
+        let defaultAttributes: [NSAttributedString.Key: Any] = [.font: UIFont.systemFont(ofSize: 14),
+                                                                .paragraphStyle: ParagraphStyle.default]
+
+        storage.setHTML(initialHTML, defaultAttributes: defaultAttributes)
+        let expectedResult = "One"+String(.paragraphSeparator)+String(.paragraphSeparator)+"Two"
+        let result = String(storage.mutableString)
+
+        XCTAssertEqual(expectedResult, result)
+    }
 }
diff --git a/Example/Cartfile.private b/Example/Cartfile.private
@@ -1 +1 @@
-github "Automattic/Gridicons-iOS" "0.16"
+github "Automattic/Gridicons-iOS" "0.18"
diff --git a/Example/Cartfile.resolved b/Example/Cartfile.resolved
@@ -1 +1 @@
-github "Automattic/Gridicons-iOS" "0.16"
+github "Automattic/Gridicons-iOS" "0.18"
diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Aztec-iOS'
-  s.version          = '1.6.1.1'
+  s.version          = '1.6.4'
   s.summary          = 'The native HTML Editor.'
 
 # This description is used to generate tags and improve search results.
@@ -32,7 +32,11 @@ Pod::Spec.new do |s|
 
   s.module_name = "Aztec"
   s.source_files = 'Aztec/Classes/**/*'
-  s.resources = 'Aztec/Assets/**/*'
+  s.resource_bundles = {
+    'WordPress-Aztec-iOS': [
+      "Aztec/Assets/**/*"
+    ]
+  }
 
   s.xcconfig = {'OTHER_LDFLAGS' => '-lxml2',
   				'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'WordPress-Editor-iOS'
-  s.version          = '1.6.1.1'
+  s.version          = '1.6.4'
   s.summary          = 'The WordPress HTML Editor.'
 
 # This description is used to generate tags and improve search results.
diff --git a/WordPressEditor/WordPressEditor/Classes/Plugins/WordPressPlugin/Gutenberg/GutenblockConverter.swift b/WordPressEditor/WordPressEditor/Classes/Plugins/WordPressPlugin/Gutenberg/GutenblockConverter.swift
@@ -18,7 +18,7 @@ class GutenblockConverter: ElementConverter {
         
         let attributes = self.attributes(for: element, inheriting: attributes)
     
-        return serialize(element, nil, attributes)
+        return serialize(element, nil, attributes, false)
     }
     
     private func attributes(for element: ElementNode, inheriting attributes: [NSAttributedString.Key: Any]) -> [NSAttributedString.Key: Any] {
diff --git a/WordPressEditor/WordPressEditor/Classes/Plugins/WordPressPlugin/Gutenberg/GutenpackConverter.swift b/WordPressEditor/WordPressEditor/Classes/Plugins/WordPressPlugin/Gutenberg/GutenpackConverter.swift
@@ -27,7 +27,7 @@ public class GutenpackConverter: ElementConverter {
             
             let representation = NSAttributedString(attachment: attachment, attributes: attributes)
             
-            return serialize(element, representation, attributes)
+            return serialize(element, representation, attributes, false)
         }
 
         let blockContent = String(content[content.startIndex ..< content.index(before: content.endIndex)])
@@ -37,7 +37,7 @@ public class GutenpackConverter: ElementConverter {
         let attachment = GutenpackAttachment(name: blockName, content: blockContent)
         let representation = NSAttributedString(attachment: attachment, attributes: attributes)
         
-        return serialize(element, representation, attributes)
+        return serialize(element, representation, attributes, false)
     }
         
 }
diff --git a/WordPressEditor/WordPressEditorTests/WordPressPlugin/Calypso/GalleryShortcode/GalleryElementConverterTests.swift b/WordPressEditor/WordPressEditorTests/WordPressPlugin/Calypso/GalleryShortcode/GalleryElementConverterTests.swift

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ class BRElementConverter: ElementConverter {`
`16`	`16`
`17`	`17`	`let intrinsicRepresentation = NSAttributedString(.lineSeparator, attributes: attributes)`
`18`	`18`
`19`		`- return serialize(element, intrinsicRepresentation, attributes)`
	`19`	`+ return serialize(element, intrinsicRepresentation, attributes, false)`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class CiteElementConverter: FormatterElementConverter {`
`16`	`16`
`17`	`17`	`let childrenAttributes = attributes(for: element, inheriting: inheritedAttributes)`
`18`	`18`
`19`		`- return serialize(element, nil, childrenAttributes)`
	`19`	`+ return serialize(element, nil, childrenAttributes, false)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// MARK: - FormatterElementConverter`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class FigcaptionElementConverter: ElementConverter {`
`18`	`18`
`19`	`19`	`let attributes = self.attributes(for: element, inheriting: attributes)`
`20`	`20`
`21`		`- return serialize(element, nil, attributes)`
	`21`	`+ return serialize(element, nil, attributes, false)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`private func attributes(for element: ElementNode, inheriting attributes: [NSAttributedString.Key: Any]) -> [NSAttributedString.Key: Any] {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class FigureElementConverter: ElementConverter {`
`16`	`16`
`17`	`17`	`let attributes = self.attributes(for: element, inheriting: attributes)`
`18`	`18`
`19`		`- return serialize(element, nil, attributes)`
	`19`	`+ return serialize(element, nil, attributes, false)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`private func attributes(for element: ElementNode, inheriting attributes: [NSAttributedString.Key: Any]) -> [NSAttributedString.Key: Any] {`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ class GenericElementConverter: ElementConverter {`
`113`	`113`
`114`	`114`	`let childrenAttributes = attributes(for: element, inheriting: inheritedAttributes)`
`115`	`115`
`116`		`- return serialize(element, nil, childrenAttributes)`
	`116`	`+ return serialize(element, nil, childrenAttributes, false)`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class HRElementConverter: AttachmentElementConverter {`
`23`	`23`	`let attachment = self.attachment(for: element)`
`24`	`24`
`25`	`25`	`let intrinsicRepresentation = NSAttributedString(attachment: attachment, attributes: attributes)`
`26`		`- let serialization = serialize(element, intrinsicRepresentation, attributes)`
	`26`	`+ let serialization = serialize(element, intrinsicRepresentation, attributes, false)`
`27`	`27`
`28`	`28`	`return (attachment, serialization)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class ImageElementConverter: AttachmentElementConverter {`
`16`	`16`
`17`	`17`	`let attachment = self.attachment(for: element)`
`18`	`18`	`let intrinsicRepresentation = NSAttributedString(attachment: attachment, attributes: attributes)`
`19`		`- let serialization = serialize(element, intrinsicRepresentation, attributes)`
	`19`	`+ let serialization = serialize(element, intrinsicRepresentation, attributes, false)`
`20`	`20`
`21`	`21`	`return (attachment, serialization)`
`22`	`22`	`}`