Merge pull request #1341 from wordpress-mobile/release/1.19.6

Release 1.19.6

Author: Gerardo Pacheco

Aztec.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		40A2986D1FD61B0C00AEDF3B /* ElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */; };
 		40A298711FD61B6F00AEDF3B /* ImageElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A298701FD61B6F00AEDF3B /* ImageElementConverter.swift */; };
 		40A298731FD61E1900AEDF3B /* VideoElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A298721FD61E1900AEDF3B /* VideoElementConverter.swift */; };
+		568FF25827552BFF0057B2E3 /* MarkFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 568FF25727552BFF0057B2E3 /* MarkFormatter.swift */; };
 		594C9D6F1D8BE61F00D74542 /* Aztec.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5951CB8E1D8BC93600E1866F /* Aztec.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		594C9D731D8BE6C300D74542 /* InAttributeConverterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FEA06B1D8BDFA700D138DF /* InAttributeConverterTests.swift */; };
 		594C9D741D8BE6C700D74542 /* InNodeConverterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59FEA06D1D8BDFA700D138DF /* InNodeConverterTests.swift */; };
@@ -287,6 +288,7 @@
 		40A298701FD61B6F00AEDF3B /* ImageElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageElementConverter.swift; sourceTree = "<group>"; };
 		40A298721FD61E1900AEDF3B /* VideoElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoElementConverter.swift; sourceTree = "<group>"; };
 		50A1CC6E250FEA93001D5517 /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = "<group>"; };
+		568FF25727552BFF0057B2E3 /* MarkFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkFormatter.swift; sourceTree = "<group>"; };
 		5951CB8E1D8BC93600E1866F /* Aztec.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Aztec.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5951CB921D8BC93600E1866F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		5951CB971D8BC93600E1866F /* AztecTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AztecTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1013,6 +1015,7 @@
 				FF949363245744560085ABB3 /* SubscriptFormatter.swift */,
 				FF61909D202481F4004BCD0A /* CodeFormatter.swift */,
 				FFB5D29620BEB21A0038DCFB /* CiteFormatter.swift */,
+				568FF25727552BFF0057B2E3 /* MarkFormatter.swift */,
 			);
 			path = Implementations;
 			sourceTree = "<group>";
@@ -1696,6 +1699,7 @@
 				F1079D67208F80FE009717FA /* EditorView.swift in Sources */,
 				F15A8B6520BED08900C57ED2 /* ParagraphPropertyConverter.swift in Sources */,
 				F1D7F525221CE2D20065555D /* HTMLStyleToggler.swift in Sources */,
+				568FF25827552BFF0057B2E3 /* MarkFormatter.swift in Sources */,
 				F1FA0E811E6EF514009D98EE /* Attribute.swift in Sources */,
 				F16A2ADD20CC503F00BF3A0A /* VideoAttachmentToElementConverter.swift in Sources */,
 			);

Aztec/Classes/Extensions/NSAttributedStringKey+Aztec.swift

@@ -61,4 +61,8 @@ public extension NSAttributedString.Key {
     /// Key used to store Sub Tag Metadata, by our SupFormatter.
     ///
     static let subHtmlRepresentation = NSAttributedString.Key("Sub.htmlRepresentation")
+
+    /// Key used to store Mark Tag Metadata, by our MarkFormatter.
+    ///
+    static let markHtmlRepresentation = NSAttributedString.Key("Mark.htmlRepresentation")
 }

Aztec/Classes/Formatters/Implementations/MarkFormatter.swift

@@ -0,0 +1,35 @@
+import Foundation
+import UIKit
+
+class MarkFormatter: AttributeFormatter {
+
+    var placeholderAttributes: [NSAttributedString.Key: Any]?
+
+    func applicationRange(for range: NSRange, in text: NSAttributedString) -> NSRange {
+        return range
+    }
+
+    func apply(to attributes: [NSAttributedString.Key: Any], andStore representation: HTMLRepresentation?) -> [NSAttributedString.Key: Any] {
+       var resultingAttributes = attributes
+
+        var representationToUse = HTMLRepresentation(for: .element(HTMLElementRepresentation.init(name: "mark", attributes: [])))
+        if let requestedRepresentation = representation {
+            representationToUse = requestedRepresentation
+        }
+        resultingAttributes[.markHtmlRepresentation] = representationToUse
+
+        return resultingAttributes
+    }
+
+    func remove(from attributes: [NSAttributedString.Key: Any]) -> [NSAttributedString.Key: Any] {
+        var resultingAttributes = attributes
+
+        resultingAttributes.removeValue(forKey: .markHtmlRepresentation)
+
+        return resultingAttributes
+    }
+
+    func present(in attributes: [NSAttributedString.Key: Any]) -> Bool {
+        return attributes[NSAttributedString.Key.markHtmlRepresentation] != nil
+    }
+}

Aztec/Classes/GUI/FormatBar/FormattingIdentifier.swift

@@ -36,4 +36,5 @@ extension FormattingIdentifier {
     public static let strikethrough = FormattingIdentifier("strikethrough")
     public static let underline = FormattingIdentifier("underline")
     public static let unorderedlist = FormattingIdentifier("unorderedlist")
+    public static let mark = FormattingIdentifier("mark")
 }

Aztec/Classes/TextKit/TextView.swift

@@ -853,7 +853,8 @@ open class TextView: UITextView {
         .header5: HeaderFormatter(headerLevel: .h5),
         .header6: HeaderFormatter(headerLevel: .h6),
         .p: HTMLParagraphFormatter(),
-        .code: CodeFormatter()
+        .code: CodeFormatter(),
+        .mark: MarkFormatter()
     ]
 
     /// Get a list of format identifiers spanning the specified range as a String array.
@@ -1137,6 +1138,16 @@ open class TextView: UITextView {
         forceRedrawCursorAfterDelay()
     }
 
+    /// Adds or removes a mark style from the specified range.
+    ///
+    /// - Parameter range: The NSRange to edit.
+    ///
+    open func toggleMark(range: NSRange) {
+        let formatter = MarkFormatter()
+        formatter.placeholderAttributes = self.defaultAttributes
+        toggle(formatter: formatter, atRange: range)
+    }
+
     /// Replaces with an horizontal ruler on the specified range
     ///
     /// - Parameter range: the range where the ruler will be inserted

CHANGELOG.md

@@ -1,6 +1,10 @@
+1.19.6
+-------
+* Add support for Mark inline formatting.
+
 1.19.5
 -------
-* Addd support for the Mark HTML tag.
+* Add support for the Mark HTML tag.
 
 1.19.4
 -------

WordPress-Aztec-iOS.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = 'WordPress-Aztec-iOS'
-  s.version       = '1.19.5'
+  s.version       = '1.19.6'
 
   s.summary       = 'The native HTML Editor.'
   s.description   = <<-DESC

WordPress-Editor-iOS.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = 'WordPress-Editor-iOS'
-  s.version       = '1.19.5'
+  s.version       = '1.19.6'
 
   s.summary       = 'The WordPress HTML Editor.'
   s.description   = <<-DESC