Handle highlight value of none

mwilliamson · Jun 13, 2024 · 8f95839 · 8f95839
1 parent 5edcc79
commit 8f95839
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/StatefulBodyXmlReader.java
@@ -203,7 +203,8 @@ private Optional<HyperlinkComplexField> currentHyperlinkComplexField() {
     }
 
     private Optional<String> readHighlight(XmlElementLike properties) {
-        return readVal(properties, "w:highlight");
+        return readVal(properties, "w:highlight")
+            .filter(value -> !value.isEmpty() && !value.equals("none"));
     }
 
     private boolean isBold(XmlElementLike properties) {

diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -879,6 +879,17 @@ public void runHasHighlightReadFromProperties() {
         assertThat(result, hasProperty("highlight", equalTo(Optional.of("yellow"))));
     }
 
+    @Test
+    public void whenHighlightIsNoneThenRunhasNoHighlight() {
+        XmlElement element = runXmlWithProperties(
+            element("w:highlight", map("w:val", "none"))
+        );
+
+        DocumentElement result = readSuccess(bodyReader(), element);
+
+        assertThat(result, hasProperty("highlight", equalTo(Optional.empty())));
+    }
+
     @Test
     public void canReadTabElement() {
         XmlElement element = element("w:tab");