diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-02-20 15:39:19 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-02-20 15:39:19 +0000 |
| commit | f61e177abb96034353572e5c32df0a8ae671a4d5 (patch) | |
| tree | 79a22edadba693c3c931535af8938056ac658b78 /src/main/java/org/zwobble/mammoth/DocumentConverter.java | |
| parent | 7ecf37adc3faff67781bdf46e624b54a35da9a54 (diff) | |
Produce warnings for unrecognised styles
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/DocumentConverter.java')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/DocumentConverter.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/DocumentConverter.java index 294e403..5cf8c9d 100644 --- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java +++ b/src/main/java/org/zwobble/mammoth/DocumentConverter.java @@ -9,6 +9,7 @@ import org.zwobble.mammoth.html.Html; import org.zwobble.mammoth.html.HtmlNode; import org.zwobble.mammoth.results.Result; import org.zwobble.mammoth.results.Warning; +import org.zwobble.mammoth.styles.HtmlPath; import org.zwobble.mammoth.styles.StyleMap; import org.zwobble.mammoth.util.MammothLists; @@ -18,6 +19,7 @@ import java.util.Base64; import java.util.List; import java.util.Map; +import static org.zwobble.mammoth.results.Warning.warning; import static org.zwobble.mammoth.util.MammothLists.*; import static org.zwobble.mammoth.util.MammothMaps.map; @@ -98,7 +100,14 @@ public class DocumentConverter { public List<HtmlNode> visit(Paragraph paragraph) { List<HtmlNode> content = convertChildrenToHtml(paragraph); List<HtmlNode> children = preserveEmptyParagraphs ? cons(Html.FORCE_WRITE, content) : content; - return styleMap.getParagraphStyleMapping(paragraph).wrap(children); + HtmlPath mapping = styleMap.getParagraphHtmlPath(paragraph) + .orElseGet(() -> { + if (paragraph.getStyle().isPresent()) { + warnings.add(warning("Unrecognised paragraph style: " + paragraph.getStyle().get().describe())); + } + return HtmlPath.element("p"); + }); + return mapping.wrap(children); } @Override |
