From b5a83b1cb96d410e325ff8b733d550295376d8c7 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 4 Jun 2016 15:57:22 +0100 Subject: Write rowspan attribute to HTML --- .../zwobble/mammoth/internal/conversion/DocumentToHtml.java | 10 +++++++--- .../java/org/zwobble/mammoth/internal/documents/TableCell.java | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java') 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 b8df5f2..75a1b1d 100644 --- a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java +++ b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java @@ -163,9 +163,13 @@ public class DocumentToHtml { @Override public List visit(TableCell tableCell) { - Map attributes = tableCell.getColspan() == 1 - ? map() - : map("colspan", Integer.toString(tableCell.getColspan())); + Map attributes = new HashMap<>(); + if (tableCell.getColspan() != 1) { + attributes.put("colspan", Integer.toString(tableCell.getColspan())); + } + if (tableCell.getRowspan() != 1) { + attributes.put("rowspan", Integer.toString(tableCell.getRowspan())); + } return list(Html.element("td", attributes, Lists.cons(Html.FORCE_WRITE, convertChildrenToHtml(tableCell)))); } diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/TableCell.java b/src/main/java/org/zwobble/mammoth/internal/documents/TableCell.java index b108de8..0874109 100644 --- a/src/main/java/org/zwobble/mammoth/internal/documents/TableCell.java +++ b/src/main/java/org/zwobble/mammoth/internal/documents/TableCell.java @@ -17,6 +17,10 @@ public class TableCell implements DocumentElement, HasChildren { return colspan; } + public int getRowspan() { + return rowspan; + } + @Override public List getChildren() { return children; -- cgit v1.2.3