From 29eb3f866e12b8c9bc0f03d84b42937263694285 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 13 Feb 2016 21:10:45 +0000 Subject: Warn on breaks that aren't line breaks --- src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java index e73f9d8..f2dac5b 100644 --- a/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java +++ b/src/main/java/org/zwobble/mammoth/docx/BodyXmlReader.java @@ -40,7 +40,7 @@ public class BodyXmlReader { case "w:tab": return success(Tab.TAB); case "w:br": - return success(LineBreak.LINE_BREAK); + return readBreak(element); case "w:tbl": return readElements(element.children()).map(Table::new); @@ -51,7 +51,6 @@ public class BodyXmlReader { case "w:hyperlink": return readHyperlink(element); - case "w:bookmarkStart": return readBookmark(element); @@ -162,6 +161,15 @@ public class BodyXmlReader { numbering::findLevel); } + private ReadResult readBreak(XmlElement element) { + String breakType = element.getAttributeOrNone("w:type").orElse(""); + if (breakType.equals("")) { + return success(LineBreak.LINE_BREAK); + } else { + return new ReadResult(list(), list(warning("Unsupported break type: " + breakType))); + } + } + private ReadResult readHyperlink(XmlElement element) { Optional relationshipId = element.getAttributeOrNone("r:id"); Optional anchor = element.getAttributeOrNone("w:anchor"); -- cgit v1.2.3