From b67455341838b1a05cd5d4c42824f8ed14d94cdc Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 14 Feb 2016 19:16:26 +0000
Subject: Use collapsible nodes for run properties

---
 src/main/java/org/zwobble/mammoth/DocumentConverter.java       | 10 +++++-----
 .../java/org/zwobble/mammoth/tests/DocumentConverterTests.java | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/DocumentConverter.java
index 71fdaeb..32b649a 100644
--- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java
+++ b/src/main/java/org/zwobble/mammoth/DocumentConverter.java
@@ -90,19 +90,19 @@ public class DocumentConverter {
             public List<HtmlNode> visit(Run run) {
                 List<HtmlNode> nodes = convertChildrenToHtml(run);
                 if (run.isStrikethrough()) {
-                    nodes = list(Html.element("s", nodes));
+                    nodes = list(Html.collapsibleElement("s", nodes));
                 }
                 if (run.getVerticalAlignment() == VerticalAlignment.SUBSCRIPT) {
-                    nodes = list(Html.element("sub", nodes));
+                    nodes = list(Html.collapsibleElement("sub", nodes));
                 }
                 if (run.getVerticalAlignment() == VerticalAlignment.SUPERSCRIPT) {
-                    nodes = list(Html.element("sup", nodes));
+                    nodes = list(Html.collapsibleElement("sup", nodes));
                 }
                 if (run.isItalic()) {
-                    nodes = list(Html.element("em", nodes));
+                    nodes = list(Html.collapsibleElement("em", nodes));
                 }
                 if (run.isBold()) {
-                    nodes = list(Html.element("strong", nodes));
+                    nodes = list(Html.collapsibleElement("strong", nodes));
                 }
                 return nodes;
             }
diff --git a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
index c23623d..d1ae6a3 100644
--- a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java
@@ -48,14 +48,14 @@ public class DocumentConverterTests {
     public void boldRunsAreWrappedInStrongTags() {
         assertThat(
             convertToHtml(make(a(RUN, with(BOLD, true), with(CHILDREN, list(new Text("Hello")))))),
-            deepEquals(list(Html.element("strong", list(Html.text("Hello"))))));
+            deepEquals(list(Html.collapsibleElement("strong", list(Html.text("Hello"))))));
     }
 
     @Test
     public void italicRunsAreWrappedInEmphasisTags() {
         assertThat(
             convertToHtml(make(a(RUN, with(ITALIC, true), with(CHILDREN, list(new Text("Hello")))))),
-            deepEquals(list(Html.element("em", list(Html.text("Hello"))))));
+            deepEquals(list(Html.collapsibleElement("em", list(Html.text("Hello"))))));
     }
 
     @Test
@@ -69,21 +69,21 @@ public class DocumentConverterTests {
     public void struckthroughRunsAreWrappedInStrikethroughTagsByDefault() {
         assertThat(
             convertToHtml(make(a(RUN, with(STRIKETHROUGH, true), with(CHILDREN, list(new Text("Hello")))))),
-            deepEquals(list(Html.element("s", list(Html.text("Hello"))))));
+            deepEquals(list(Html.collapsibleElement("s", list(Html.text("Hello"))))));
     }
 
     @Test
     public void superscriptRunsAreWrappedInSuperscriptTags() {
         assertThat(
             convertToHtml(make(a(RUN, with(VERTICAL_ALIGNMENT, SUPERSCRIPT), with(CHILDREN, list(new Text("Hello")))))),
-            deepEquals(list(Html.element("sup", list(Html.text("Hello"))))));
+            deepEquals(list(Html.collapsibleElement("sup", list(Html.text("Hello"))))));
     }
 
     @Test
     public void subscriptRunsAreWrappedInSubscriptTags() {
         assertThat(
             convertToHtml(make(a(RUN, with(VERTICAL_ALIGNMENT, SUBSCRIPT), with(CHILDREN, list(new Text("Hello")))))),
-            deepEquals(list(Html.element("sub", list(Html.text("Hello"))))));
+            deepEquals(list(Html.collapsibleElement("sub", list(Html.text("Hello"))))));
     }
 
     @Test
-- 
cgit v1.2.3