aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-05-02 12:14:52 +0100
committerMichael Williamson <mike@zwobble.org>2016-05-02 12:14:52 +0100
commitfd18fb68e65af28a0f65b1bd6ec4b1dec06f582f (patch)
tree38585c67267a8c5fcd889b24a13bf215635ff64d /src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java
parent90680b0208bba24a970f8b7fd6f9092f5ca90407 (diff)
Add support for table cells spanning multiple columns
Diffstat (limited to 'src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java')
-rw-r--r--src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java5
1 files changed, 4 insertions, 1 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 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<HtmlNode> visit(TableCell tableCell) {
- return list(Html.element("td",
+ Map<String, String> attributes = tableCell.getColspan() == 1
+ ? map()
+ : map("colspan", Integer.toString(tableCell.getColspan()));
+ return list(Html.element("td", attributes,
Lists.cons(Html.FORCE_WRITE, convertChildrenToHtml(tableCell))));
}