From f33735eb241e0bd590036dcba4a084074a681543 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 14 Feb 2016 11:23:35 +0000 Subject: Wrap strikethough runs in by default --- src/main/java/org/zwobble/mammoth/DocumentConverter.java | 7 +++++-- .../java/org/zwobble/mammoth/tests/DocumentConverterTests.java | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/org/zwobble/mammoth/DocumentConverter.java b/src/main/java/org/zwobble/mammoth/DocumentConverter.java index 4efe497..583d8bd 100644 --- a/src/main/java/org/zwobble/mammoth/DocumentConverter.java +++ b/src/main/java/org/zwobble/mammoth/DocumentConverter.java @@ -35,12 +35,15 @@ public class DocumentConverter { @Override public List visit(Run run) { List nodes = convertChildrenToHtml(run); - if (run.isBold()) { - nodes = list(Html.element("strong", nodes)); + if (run.isStrikethrough()) { + nodes = list(Html.element("s", nodes)); } if (run.isItalic()) { nodes = list(Html.element("em", nodes)); } + if (run.isBold()) { + nodes = list(Html.element("strong", nodes)); + } return nodes; } diff --git a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java index f6125ed..a0c0a66 100644 --- a/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/DocumentConverterTests.java @@ -59,6 +59,13 @@ public class DocumentConverterTests { deepEquals(list(Html.text("Hello")))); } + @Test + public void struckthroughRunsAreWrappedInStrikethroughTagsByDefault() { + assertThat( + convertToHtml(make(a(RUN, with(STRIKETHROUGH, true), with(CHILDREN, list(new Text("Hello")))))), + deepEquals(list(Html.element("s", list(Html.text("Hello")))))); + } + private List convertToHtml(DocumentElement element) { return DocumentConverter.convertToHtml(element); -- cgit v1.2.3