diff options
| author | Michael Williamson <mike@zwobble.org> | 2019-01-27 09:33:30 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2019-01-27 09:33:30 +0000 |
| commit | be4c4ff9b9efda68be93309ab7bad2c56e6880e9 (patch) | |
| tree | 2480e433ff1e5d453635cb6f402dbe6e2f1c6d35 /src | |
| parent | 2ac7403acdbaabcfe31b2239f46bf915707ceaf1 (diff) | |
Preserve empty table rows
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java index 8a48212..7276232 100644 --- a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java +++ b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java @@ -257,7 +257,7 @@ public class DocumentToHtml { @Override public List<HtmlNode> visit(TableRow tableRow, Context context) { - return list(Html.element("tr", convertChildrenToHtml(tableRow, context))); + return list(Html.element("tr", Lists.cons(Html.FORCE_WRITE, convertChildrenToHtml(tableRow, context)))); } @Override diff --git a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java index 4563572..47982ce 100644 --- a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java @@ -250,9 +250,11 @@ public class DocumentToHtmlTests { deepEquals(list(Html.element("table", list( Html.element("tr", list( + Html.FORCE_WRITE, Html.element("td", list(Html.FORCE_WRITE, Html.element("p", list(Html.text("Top left"))))), Html.element("td", list(Html.FORCE_WRITE, Html.element("p", list(Html.text("Top right"))))))), Html.element("tr", list( + Html.FORCE_WRITE, Html.element("td", list(Html.FORCE_WRITE, Html.element("p", list(Html.text("Bottom left"))))), Html.element("td", list(Html.FORCE_WRITE, Html.element("p", list(Html.text("Bottom right")))))))))))); } @@ -285,11 +287,11 @@ public class DocumentToHtmlTests { deepEquals(list(Html.element("table", list( Html.element("thead", list( - Html.element("tr", list(Html.element("th", list(Html.FORCE_WRITE)))), - Html.element("tr", list(Html.element("th", list(Html.FORCE_WRITE)))) + Html.element("tr", list(Html.FORCE_WRITE, Html.element("th", list(Html.FORCE_WRITE)))), + Html.element("tr", list(Html.FORCE_WRITE, Html.element("th", list(Html.FORCE_WRITE)))) )), Html.element("tbody", list( - Html.element("tr", list(Html.element("td", list(Html.FORCE_WRITE)))) + Html.element("tr", list(Html.FORCE_WRITE, Html.element("td", list(Html.FORCE_WRITE)))) )) )))) ); @@ -304,7 +306,7 @@ public class DocumentToHtmlTests { deepEquals(list(Html.element("table", list( Html.element("thead", list( - Html.element("tr", list(Html.element("th", list(Html.FORCE_WRITE)))) + Html.element("tr", list(Html.FORCE_WRITE, Html.element("th", list(Html.FORCE_WRITE)))) )) )))) ); @@ -323,6 +325,7 @@ public class DocumentToHtmlTests { deepEquals(list(Html.element("table", list( Html.element("tr", list( + Html.FORCE_WRITE, Html.element("td", map("colspan", "2"), list(Html.FORCE_WRITE, Html.element("p", list(Html.text("Top left"))))), Html.element("td", list(Html.FORCE_WRITE, Html.element("p", list(Html.text("Top right"))))) )) @@ -340,6 +343,7 @@ public class DocumentToHtmlTests { ))), deepEquals(list(Html.element("table", list( Html.element("tr", list( + Html.FORCE_WRITE, Html.element("td", map("rowspan", "2"), list(Html.FORCE_WRITE)) )) )))) |