From 4eb50a3705cdc3be0ea31acd1a78830fefcba124 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 28 Nov 2016 16:59:13 +0000 Subject: Read explicit break type of textWrapping --- .../java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java | 4 ++-- src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java index 35f4aa1..89d739a 100644 --- a/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/internal/docx/BodyXmlReader.java @@ -241,8 +241,8 @@ public class BodyXmlReader { } private ReadResult readBreak(XmlElement element) { - String breakType = element.getAttributeOrNone("w:type").orElse(""); - if (breakType.equals("")) { + String breakType = element.getAttributeOrNone("w:type").orElse("textWrapping"); + if (breakType.equals("textWrapping")) { return success(Break.LINE_BREAK); } else if (breakType.equals("page")) { return success(Break.PAGE_BREAK); 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 1206c41..4c6f46a 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -356,6 +356,16 @@ public class BodyXmlTests { equalTo(Break.LINE_BREAK)); } + @Test + public void brWithTextWrappingTypeIsReadAsLineBreak() { + XmlElement element = element("w:br", map("w:type", "textWrapping")); + + assertThat( + readSuccess(bodyReader(), element), + equalTo(Break.LINE_BREAK) + ); + } + @Test public void brWithPageTypeIsReadAsPageBreak() { XmlElement element = element("w:br", map("w:type", "page")); -- cgit v1.2.3