From fd18fb68e65af28a0f65b1bd6ec4b1dec06f582f Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 2 May 2016 12:14:52 +0100 Subject: Add support for table cells spanning multiple columns --- .../java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/zwobble') 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 19af0bc..b8df5f2 100644 --- a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java +++ b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java @@ -163,7 +163,10 @@ public class DocumentToHtml { @Override public List visit(TableCell tableCell) { - return list(Html.element("td", + Map attributes = tableCell.getColspan() == 1 + ? map() + : map("colspan", Integer.toString(tableCell.getColspan())); + return list(Html.element("td", attributes, Lists.cons(Html.FORCE_WRITE, convertChildrenToHtml(tableCell)))); } -- cgit v1.2.3