From 56cb9da5bfd621ffa49f82c525d0f5172ff8a2f0 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 13 Feb 2016 19:12:25 +0000
Subject: Read struckthrough runs

---
 src/main/java/org/zwobble/mammoth/documents/Run.java   |  7 +++++++
 .../java/org/zwobble/mammoth/docx/BodyXmlReader.java   |  5 +++++
 .../mammoth/tests/documents/DocumentElementMakers.java |  1 +
 .../org/zwobble/mammoth/tests/docx/BodyXmlTests.java   | 18 ++++++++++++++++++
 4 files changed, 31 insertions(+)

diff --git a/src/main/java/org/zwobble/mammoth/documents/Run.java b/src/main/java/org/zwobble/mammoth/documents/Run.java
index 73349ba..d903546 100644
--- a/src/main/java/org/zwobble/mammoth/documents/Run.java
+++ b/src/main/java/org/zwobble/mammoth/documents/Run.java
@@ -7,6 +7,7 @@ public class Run implements DocumentElement, HasChildren {
     private final boolean isBold;
     private final boolean isItalic;
     private final boolean isUnderline;
+    private final boolean isStrikethrough;
     private final Optional<Style> style;
     private final List<DocumentElement> children;
 
@@ -14,12 +15,14 @@ public class Run implements DocumentElement, HasChildren {
         boolean isBold,
         boolean isItalic,
         boolean isUnderline,
+        boolean isStrikethrough,
         Optional<Style> style,
         List<DocumentElement> children)
     {
         this.isBold = isBold;
         this.isItalic = isItalic;
         this.isUnderline = isUnderline;
+        this.isStrikethrough = isStrikethrough;
         this.style = style;
         this.children = children;
     }
@@ -36,6 +39,10 @@ public class Run implements DocumentElement, HasChildren {
         return isUnderline;
     }
 
+    public boolean isStrikethrough() {
+        return isStrikethrough;
+    }
+
     public Optional<Style> getStyle() {
         return style;
     }
diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
index 1cc7a34..7885c3f 100644
--- a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
+++ b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java
@@ -53,6 +53,7 @@ public class BodyXmlReader {
                 isBold(properties),
                 isItalic(properties),
                 isUnderline(properties),
+                isStrikethrough(properties),
                 style,
                 children));
     }
@@ -69,6 +70,10 @@ public class BodyXmlReader {
         return properties.hasChild("w:u");
     }
 
+    private boolean isStrikethrough(XmlElementLike properties) {
+        return properties.hasChild("w:strike");
+    }
+
     private Result<Optional<Style>> readRunStyle(XmlElementLike properties) {
         return readStyle(properties, "w:rStyle", "Run", styles::findCharacterStyleById);
     }
diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
index 78ab06e..93d7f6a 100644
--- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
+++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java
@@ -27,6 +27,7 @@ public class DocumentElementMakers {
             false,
             false,
             false,
+            false,
             Optional.empty(),
             propertyLookup.valueOf(CHILDREN, list()));
 }
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
index 0d99525..6f4b977 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -233,6 +233,24 @@ public class BodyXmlTests {
             hasProperty("underline", equalTo(true)));
     }
 
+    @Test
+    public void runIsNotStruckthroughIfStrikethroughElementIsNotPresent() {
+        XmlElement element = runXmlWithProperties();
+
+        assertThat(
+            readSuccess(a(bodyReader), element),
+            hasProperty("strikethrough", equalTo(false)));
+    }
+
+    @Test
+    public void runIsStruckthroughIfStrikethroughElementIsPresent() {
+        XmlElement element = runXmlWithProperties(element("w:strike"));
+
+        assertThat(
+            readSuccess(a(bodyReader), element),
+            hasProperty("strikethrough", equalTo(true)));
+    }
+
     private static DocumentElement readSuccess(Maker<BodyXmlReader> reader, XmlElement element) {
         Result<DocumentElement> result = read(reader, element);
         assertThat(result.getWarnings(), deepEquals(list()));
-- 
cgit v1.2.3