Merge pull request #687 from wordpress-mobile/issue/681-citation-italic

Issue/681 citation italic

Author: hypest

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/GutenbergCompatTests.kt

@@ -277,6 +277,18 @@ class GutenbergCompatTests : BaseTest() {
                 .verifyHTML("")
     }
 
+    @Test
+    fun testRetainCitationInQuote() {
+        val htmlOriginal = "<!-- wp:quote --><blockquote class=\"wp-block-quote\"><p>quote</p><cite>this is a citation</cite></blockquote><!-- /wp:quote -->"
+
+        EditorPage()
+                .toggleHtml()
+                .insertHTML(htmlOriginal)
+                .toggleHtml()
+                .toggleHtml()
+                .verifyHTML(htmlOriginal)
+    }
+
     @Test
     fun testDeleteAllItemsFromFirstList() {
         val itemOnListTwo = "item 1 on list 2"

aztec/src/main/java/org/wordpress/aztec/Html.java

@@ -44,6 +44,7 @@
 import org.wordpress.aztec.spans.AztecRelativeSizeBigSpan;
 import org.wordpress.aztec.spans.AztecRelativeSizeSmallSpan;
 import org.wordpress.aztec.spans.AztecStyleBoldSpan;
+import org.wordpress.aztec.spans.AztecStyleCiteSpan;
 import org.wordpress.aztec.spans.AztecStyleItalicSpan;
 import org.wordpress.aztec.spans.AztecSubscriptSpan;
 import org.wordpress.aztec.spans.AztecSuperscriptSpan;
@@ -315,7 +316,7 @@ private void handleStartTag(String tag, Attributes attributes, int nestingLevel)
         } else if (tag.equalsIgnoreCase("em")) {
             start(spannableStringBuilder, AztecTextFormat.FORMAT_ITALIC, attributes);
         } else if (tag.equalsIgnoreCase("cite")) {
-            start(spannableStringBuilder, AztecTextFormat.FORMAT_ITALIC, attributes);
+            start(spannableStringBuilder, AztecTextFormat.FORMAT_CITE, attributes);
         } else if (tag.equalsIgnoreCase("dfn")) {
             start(spannableStringBuilder, AztecTextFormat.FORMAT_ITALIC, attributes);
         } else if (tag.equalsIgnoreCase("i")) {
@@ -408,7 +409,7 @@ private void handleEndTag(String tag, int nestingLevel) {
         } else if (tag.equalsIgnoreCase("em")) {
             end(spannableStringBuilder, AztecTextFormat.FORMAT_ITALIC);
         } else if (tag.equalsIgnoreCase("cite")) {
-            end(spannableStringBuilder, AztecTextFormat.FORMAT_ITALIC);
+            end(spannableStringBuilder, AztecTextFormat.FORMAT_CITE);
         } else if (tag.equalsIgnoreCase("dfn")) {
             end(spannableStringBuilder, AztecTextFormat.FORMAT_ITALIC);
         } else if (tag.equalsIgnoreCase("i")) {
@@ -490,6 +491,9 @@ private static void start(SpannableStringBuilder text, AztecTextFormat textForma
             case FORMAT_ITALIC:
                 newSpan = new AztecStyleItalicSpan(attributes);
                 break;
+            case FORMAT_CITE:
+                newSpan = new AztecStyleCiteSpan(attributes);
+                break;
             case FORMAT_UNDERLINE:
                 newSpan = new AztecUnderlineSpan(false, attributes);
                 break;
@@ -536,6 +540,9 @@ private static void end(SpannableStringBuilder text, AztecTextFormat textFormat)
             case FORMAT_ITALIC:
                 span = (AztecStyleItalicSpan) getLast(text, AztecStyleItalicSpan.class);
                 break;
+            case FORMAT_CITE:
+                span = (AztecStyleCiteSpan) getLast(text, AztecStyleCiteSpan.class);
+                break;
             case FORMAT_UNDERLINE:
                 span = (AztecUnderlineSpan) getLast(text, AztecUnderlineSpan.class);
                 break;

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

@@ -831,6 +831,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
             AztecTextFormat.FORMAT_PREFORMAT -> blockFormatter.toggleHeading(textFormat)
             AztecTextFormat.FORMAT_BOLD,
             AztecTextFormat.FORMAT_ITALIC,
+            AztecTextFormat.FORMAT_CITE,
             AztecTextFormat.FORMAT_UNDERLINE,
             AztecTextFormat.FORMAT_STRIKETHROUGH,
             AztecTextFormat.FORMAT_CODE -> inlineFormatter.toggle(textFormat)
@@ -859,6 +860,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
             AztecTextFormat.FORMAT_HEADING_6 -> return lineBlockFormatter.containsHeading(format, selStart, selEnd)
             AztecTextFormat.FORMAT_BOLD,
             AztecTextFormat.FORMAT_ITALIC,
+            AztecTextFormat.FORMAT_CITE,
             AztecTextFormat.FORMAT_UNDERLINE,
             AztecTextFormat.FORMAT_STRIKETHROUGH,
             AztecTextFormat.FORMAT_CODE -> return inlineFormatter.containsInlineStyle(format, selStart, selEnd)
@@ -1265,6 +1267,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     fun removeInlineStylesFromRange(start: Int, end: Int) {
         inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_BOLD, start, end)
         inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_ITALIC, start, end)
+        inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_CITE, start, end)
         inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_STRIKETHROUGH, start, end)
         inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_UNDERLINE, start, end)
         inlineFormatter.removeInlineStyle(AztecTextFormat.FORMAT_CODE, start, end)

aztec/src/main/kotlin/org/wordpress/aztec/AztecTextFormat.kt

@@ -15,6 +15,7 @@ enum class AztecTextFormat : ITextFormat {
     FORMAT_ORDERED_LIST,
     FORMAT_BOLD,
     FORMAT_ITALIC,
+    FORMAT_CITE,
     FORMAT_UNDERLINE,
     FORMAT_STRIKETHROUGH,
     FORMAT_ALIGN_LEFT,

aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt

@@ -14,6 +14,7 @@ import org.wordpress.aztec.ITextFormat
 import org.wordpress.aztec.spans.AztecCodeSpan
 import org.wordpress.aztec.spans.AztecStrikethroughSpan
 import org.wordpress.aztec.spans.AztecStyleBoldSpan
+import org.wordpress.aztec.spans.AztecStyleCiteSpan
 import org.wordpress.aztec.spans.AztecStyleItalicSpan
 import org.wordpress.aztec.spans.AztecStyleSpan
 import org.wordpress.aztec.spans.AztecUnderlineSpan
@@ -51,6 +52,7 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
                 when (item) {
                     AztecTextFormat.FORMAT_BOLD,
                     AztecTextFormat.FORMAT_ITALIC,
+                    AztecTextFormat.FORMAT_CITE,
                     AztecTextFormat.FORMAT_STRIKETHROUGH,
                     AztecTextFormat.FORMAT_UNDERLINE,
                     AztecTextFormat.FORMAT_CODE -> {
@@ -183,6 +185,7 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
         when (span::class.java) {
             AztecStyleBoldSpan::class.java -> return AztecTextFormat.FORMAT_BOLD
             AztecStyleItalicSpan::class.java -> return AztecTextFormat.FORMAT_ITALIC
+            AztecStyleCiteSpan::class.java -> return AztecTextFormat.FORMAT_CITE
             AztecStrikethroughSpan::class.java -> return AztecTextFormat.FORMAT_STRIKETHROUGH
             AztecUnderlineSpan::class.java -> return AztecTextFormat.FORMAT_UNDERLINE
             AztecCodeSpan::class.java -> return AztecTextFormat.FORMAT_CODE
@@ -328,6 +331,7 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
         when (textFormat) {
             AztecTextFormat.FORMAT_BOLD -> return AztecStyleBoldSpan()
             AztecTextFormat.FORMAT_ITALIC -> return AztecStyleItalicSpan()
+            AztecTextFormat.FORMAT_CITE -> return AztecStyleCiteSpan()
             AztecTextFormat.FORMAT_STRIKETHROUGH -> return AztecStrikethroughSpan()
             AztecTextFormat.FORMAT_UNDERLINE -> return AztecUnderlineSpan()
             AztecTextFormat.FORMAT_CODE -> return AztecCodeSpan(codeStyle)

aztec/src/main/kotlin/org/wordpress/aztec/spans/AztecStyleCiteSpan.kt

@@ -0,0 +1,17 @@
+package org.wordpress.aztec.spans
+
+import android.graphics.Typeface
+import org.wordpress.aztec.AztecAttributes
+
+class AztecStyleCiteSpan(attributes: AztecAttributes = AztecAttributes())
+    : AztecStyleSpan(Typeface.ITALIC, attributes) {
+
+    override val TAG by lazy {
+        when (style) {
+            Typeface.ITALIC -> {
+                return@lazy "cite"
+            }
+        }
+        throw IllegalArgumentException()
+    }
+}