Support tables in DOCX renderer (part 2)

Author: manfromarce

documentation/Supported_features.MD

@@ -101,9 +101,9 @@ However, some charts may already be OLE objects (Excel/MS Graph object; usually
 ⌛ Work in progress
 
 - ✅ Character formatting
-    - Not supported: small caps, text effects, font spacing, horizontal font scaling, borders around text runs, dash-dot/dash-dot-dot/double wavy underline types
+    - Not supported: small caps, text effects, letters spacing, horizontal font scaling, FitText, borders around text runs, dash-dot/dash-dot-dot/double wavy underline types
 - ✅ Paragraph formatting
-    - Not supported: hanging indentation (negative first line indentation, blocked by lack of support in QuestPDF), paragraph borders, KeepNext, some advanced position properties
+    - Not supported: hanging indentation (negative first line indentation, blocked by lack of support in QuestPDF), custom tab stops, some options such as KeepNext, some advanced text wrapping / position properties
     - Limitation: the paragraph border (if present) has the same color for top/bottom/left/right due to a limitation in the QuestPDF API
 - ✅ Section properties
     - Supported: page size, orientation, margins, background color color, multi-column layout
@@ -118,8 +118,8 @@ However, some charts may already be OLE objects (Excel/MS Graph object; usually
 - ⌛ Pictures
 - ⌛ Math formulas
 - ✅ Tables
-    - Not supported: external spacing between cells; cell border styles (double, dashed, shadow, ...); diagonal internal borders; fit text, no wrap and other properties; vertical text
-    - Limitation: the border color is the same for top/bottom/left/right of each cell due to a limitation in the QuestPDF API
+    - Not supported: external spacing between cells; cell border styles (double, dashed, shadow, ...); diagonal internal borders; vertical text; some options such as CantSplit, NoWrap, TableCellFitText; some advanced text wrapping / position properties; some types of cell/row width (percentage, or TableLayout set to Auto); space before/after single row (different from table)
+    - Limitations: the border color is the same for top/bottom/left/right of each cell due to a limitation in the QuestPDF API  
 - ✅ Fields, page numbers, table of contents
     - Limitations: 
         - Field values are not updated in some cases, we need to re-calculate at least page numbers
@@ -131,7 +131,6 @@ However, some charts may already be OLE objects (Excel/MS Graph object; usually
         - footnotes are always rendered at page bottom, which is the default in DOCX, but can be changed to *below text* or *end of section*. This is currently ignored by the renderer, while the setting *end of section*/*end of document* for endnotes is implemented.
         - footnotes and endnotes IDs are always rendered as arabic numbers and roman numbers respectively. The number format can be customized in DOCX, but is not implemented yet in the renderer.
 
-
 ## XLSX to QuestPDF renderer
 
 ⌛ Work in progress

src/DocSharp.Docx/DocxToHtml/DocxToHtmlConverter.Table.cs

@@ -170,8 +170,8 @@ internal void ProcessTableRow(TableRow row, HtmlTextWriter sb, int rowNumber, in
         //var tj = row.GetEffectiveProperty<TableJustification>();
         // Not supported for individual rows in HTML
 
-        ProcessTableWidthType(row.GetEffectiveProperty<WidthBeforeTableRow>(), ref rowStyles, "margin-top");
-        ProcessTableWidthType(row.GetEffectiveProperty<WidthAfterTableRow>(), ref rowStyles, "margin-bottom");
+        ProcessTableWidthType(row.GetEffectiveProperty<WidthBeforeTableRow>(), ref rowStyles, "margin-left");
+        ProcessTableWidthType(row.GetEffectiveProperty<WidthAfterTableRow>(), ref rowStyles, "margin-right");
 
         ProcessTableWidthType(row.GetEffectiveMargin<TopMargin>(), ref defaultCellStyles, "padding-top");
         ProcessTableWidthType(row.GetEffectiveMargin<BottomMargin>(), ref defaultCellStyles, "padding-bottom");
@@ -229,47 +229,10 @@ internal bool ProcessTableCellProperties(TableCell cell, ref List<string> cellSt
         bool isFirstColumn = columnNumber == 1;
         bool isLastRow = rowNumber == rowCount;
         bool isLastColumn = columnNumber == columnCount;
-        rowSpan = 1;
-        columnSpan = 1;
-        var vMerge = cell.TableCellProperties?.VerticalMerge;
-        if (vMerge != null)
-        {
-            if (vMerge.Val != null && vMerge.Val == MergedCellValues.Restart)
-            {
-                rowSpan = CalculateRowSpan(cell);
-            }
-            else
-            {
-                // If the val attribute is omitted, its value should be assumed as "continue"
-                // (https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.wordprocessing.verticalmerge.val)
-                // Don't generate a new <td> in this case.
-                return false;
-            }
-        }
-
-        var gridSpan = cell.TableCellProperties?.GridSpan;
-        if (gridSpan?.Val != null)
-        {
-            columnSpan = gridSpan.Val.Value;
-        }
-        else
-        {
-            var hMerge = cell.TableCellProperties?.HorizontalMerge;
-            if (hMerge != null)
-            {
-                if (hMerge?.Val != null && hMerge.Val == MergedCellValues.Restart)
-                {
-                    columnSpan = CalculateColumnSpan(cell);
-                }
-                else
-                {
-                    // If the val attribute is omitted, its value should be assumed as "continue"
-                    // (https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.wordprocessing.horizontalmerge.val)
-                    // Don't generate a new <td> in this case.
-                    return false;
-                }
-            }
-        }
+        rowSpan = cell.GetRowSpan();
+        columnSpan = cell.GetColumnSpan();
+        if (cell.IsInMergedRangeNotFirst())
+            return false; // Don't generate a new <td> in this case
 
         if (cell.GetEffectiveProperty<NoWrap>().ToBool() || cell.GetEffectiveProperty<TableCellFitText>().ToBool())
         {
@@ -448,48 +411,6 @@ internal bool ProcessTableCellProperties(TableCell cell, ref List<string> cellSt
         return true;
     }
 
-    private int CalculateRowSpan(TableCell cell)
-    {
-        var row = cell.Ancestors<TableRow>().FirstOrDefault();
-        if (row == null)
-        {
-            return 1;
-        }
-        int cellIndex = row.Elements<TableCell>().ToList().IndexOf(cell);
-
-        int rowSpan = 1;
-        // While the next row has a cell at the same index with a vertical merge, increment the row span
-        var nextRow = row.NextSibling<TableRow>();
-        while (nextRow != null)
-        {
-            var nextCell = nextRow.Elements<TableCell>().ElementAtOrDefault(cellIndex);
-            if (nextCell?.TableCellProperties?.VerticalMerge is VerticalMerge vMerge &&
-                (vMerge.Val == null || vMerge.Val == MergedCellValues.Continue))
-            {
-                rowSpan++;
-                nextRow = nextRow.NextSibling<TableRow>();
-            }
-            else
-            {
-                break;
-            }
-        }
-        return rowSpan;
-    }
-
-    private int CalculateColumnSpan(TableCell cell)
-    {
-        int colSpan = 1;
-        var currentCell = cell;
-        while (currentCell?.NextSibling<TableCell>()?.TableCellProperties?.HorizontalMerge is HorizontalMerge hMerge &&
-               (hMerge.Val == null || hMerge.Val == MergedCellValues.Continue))
-        {
-            colSpan++;
-            currentCell = currentCell.NextSibling<TableCell>();
-        }
-        return colSpan;
-    }
-
     public void RemoveStyleIfPresent(ref List<string> styles, string style)
     {
         for (int i = styles.Count - 1; i >= 0; --i)

src/DocSharp.Docx/Helpers/TableHelpers.cs

@@ -63,10 +63,61 @@ public static int GetGridSpan(this TableCell cell)
 
     public static int GetColumnSpan(this TableCell cell)
     {
-        return cell.TableCellProperties?.GridSpan?.Val ?? GetHorizontalMargeSpan(cell);
+        return cell.TableCellProperties?.GridSpan?.Val ?? GetHorizontalMergeSpan(cell);
     }
 
-    private static int GetHorizontalMargeSpan(this TableCell cell)
+    public static int GetColumnCount(this Table table)
+    {
+        int maxCellsPerRow = 0;
+        foreach (var row in table.Elements<TableRow>())
+        {
+            int cellsPerRow = 0;
+            foreach (var cell in row.Elements<TableCell>())
+            {
+                cellsPerRow += cell.GetColumnSpan();
+            }
+            maxCellsPerRow = Math.Max(maxCellsPerRow, cellsPerRow);
+        }
+        return maxCellsPerRow;
+    }
+
+    public static float GetCellWidthInPoints(this TableCell cell)
+    {
+        var cellWidth = cell.GetEffectiveProperty<TableCellWidth>();
+        if (cellWidth?.Type != null && cellWidth.Type.Value == TableWidthUnitValues.Dxa && 
+            cellWidth.Width != null && cellWidth.Width.ToLong() is long width)
+        {
+            return width / 20f; // convert twips to points
+        }
+        return 0; // Auto, Pct, Nil or unspecified width; should be handled depending on the context
+    }
+
+    public static List<float> GetColumnsWidth(this Table table)
+    {
+        var columnWidths = new List<float>();
+        foreach (var row in table.Elements<TableRow>())
+        {
+            int cellIndex = 0;
+            foreach (var cell in row.Elements<TableCell>())
+            {
+                var gridSpan = cell.GetGridSpan();
+                float width = cell.GetCellWidthInPoints() / gridSpan;
+
+                for (int i = 0; i < gridSpan; i++)
+                {
+                    if (columnWidths.Count > cellIndex)
+                        columnWidths[cellIndex] = Math.Max(columnWidths[cellIndex], width);
+                    else
+                        columnWidths.Add(width);                    
+                    
+                    ++cellIndex;
+                }
+            }
+        }
+        return columnWidths;
+    }
+
+    internal static int GetHorizontalMergeSpan(this TableCell cell)
     {
         int columnSpan = 1;
         if (cell.TableCellProperties?.HorizontalMerge?.Val != null && 

src/WIP/DocSharp.Renderer/DocxRenderer.Tables.cs

@@ -22,9 +22,20 @@ internal override void ProcessTable(Table table, QuestPdfModel output)
         // Process table properties and create a new QuestPdfTable object
         var t = new QuestPdfTable()
         {
-            ColumnsCount = table.Elements<TableRow>().Max(c => c.Elements<TableCell>().Count())
+            ColumnsWidth = table.GetColumnsWidth(),
             // TODO: check SdtRow/CustomXmlRow and SdtCell/CustomXmlCell too.
         };
+        if (table.GetEffectiveProperty<TableJustification>() is TableJustification jc && jc.Val != null)
+        {   
+            if (jc.Val == TableRowAlignmentValues.Center)
+                t.Alignment = HorizontalAlignment.Center;
+            else if (jc.Val == TableRowAlignmentValues.Right)
+                t.Alignment = HorizontalAlignment.Right;
+            else
+                t.Alignment = HorizontalAlignment.Left;
+        }
+
+
         // Add table to the current container.
         if (currentContainer.Count > 0)
             currentContainer.Peek().Content.Add(t);
@@ -70,7 +81,12 @@ internal override void ProcessTableCell(TableCell tableCell, QuestPdfModel outpu
         {
             cell.ColumnSpan = (uint)columnSpan;
         }
-        var rowSpan = tableCell.GetRowSpan();
+        var rowSpan = tableCell.GetRowSpan(); 
+        // The sum of GridSpans can exceed the total number of cells in DOCX, 
+        // while in QuestPDF this causes an exception. 
+        // So, it is ignored and only the cell width is used; 
+        // while HorizontalMerge/VerticalMerge are handled normally.
+        // var rowSpan = tableCell.GetHorizontalMergeSpan();
         if (rowSpan > 1)
         {
             cell.RowSpan = (uint)rowSpan;
@@ -81,6 +97,7 @@ internal override void ProcessTableCell(TableCell tableCell, QuestPdfModel outpu
             return;
         else 
             cell.ColumnNumber = (uint)columnNumber;
+        
         var rowNumber = tableCell.GetRowNumber();
         if (rowNumber < 1)
             return;
@@ -144,69 +161,45 @@ internal override void ProcessTableCell(TableCell tableCell, QuestPdfModel outpu
         if (topMargin?.Type != null)
         {
             if (topMargin.Type.Value == TableWidthUnitValues.Nil)
-            {
                 cell.PaddingTop = 0;
-            }
             else if (topMargin.Type.Value == TableWidthUnitValues.Dxa && topMargin.Width.ToLong() is long top)
-            {
                 cell.PaddingTop = top / 20f; // convert twips to points
-            }
             // TODO: Auto and Pct types
         }
         if (bottomMargin?.Type != null)
         {
             if (bottomMargin.Type.Value == TableWidthUnitValues.Nil)
-            {
                 cell.PaddingBottom = 0;
-            }
             else if (bottomMargin.Type.Value == TableWidthUnitValues.Dxa && bottomMargin.Width.ToLong() is long bottom)
-            {
                 cell.PaddingBottom = bottom / 20f;
-            }
         }
         if (leftMargin is TableWidthType twt1 && twt1?.Type != null)
         {
             if (twt1.Type.Value == TableWidthUnitValues.Nil)
-            {
                 cell.PaddingLeft = 0;
-            }
             else if (twt1.Type.Value == TableWidthUnitValues.Dxa && twt1.Width.ToLong() is long left)
-            {
                 cell.PaddingLeft = left / 20f;
-            }
         }
         else if (leftMargin is TableWidthDxaNilType dxaNilType1 && dxaNilType1?.Type != null)
         {
             if (dxaNilType1.Type.Value == TableWidthValues.Nil)
-            {
                 cell.PaddingLeft = 0;
-            }
             else if (dxaNilType1.Type.Value == TableWidthValues.Dxa && dxaNilType1.Width != null)
-            {
                 cell.PaddingLeft = dxaNilType1.Width.Value / 20f;
-            }
         }
         if (rightMargin is TableWidthType twt2 && twt2?.Type != null)
         {
             if (twt2.Type.Value == TableWidthUnitValues.Nil)
-            {
                 cell.PaddingRight = 0;
-            }
             else if (twt2.Type.Value == TableWidthUnitValues.Dxa && twt2.Width.ToLong() is long right)
-            {
                 cell.PaddingRight = right / 20f;
-            }
         }
         else if (rightMargin is TableWidthDxaNilType dxaNilType2 && dxaNilType2?.Type != null)
         {
             if (dxaNilType2.Type.Value == TableWidthValues.Nil)
-            {
                 cell.PaddingRight = 0;
-            }
             else if (dxaNilType2.Type.Value == TableWidthValues.Dxa && dxaNilType2.Width != null)
-            {
                 cell.PaddingRight = dxaNilType2.Width.Value / 20f;
-            }
         }
 
         var verticalAlignment = tableCell.GetEffectiveProperty<TableCellVerticalAlignment>();
@@ -220,6 +213,37 @@ internal override void ProcessTableCell(TableCell tableCell, QuestPdfModel outpu
                 cell.VertAlignment = VerticalAlignment.Bottom;
         }
 
+        // Calculate cell height considering row height and rowSpan
+        if (row != null)
+        {
+            int rowSpanCounter = rowSpan;
+            TableRow? currentRow = row;
+            while (rowSpanCounter > 0 && currentRow != null)
+            {
+                var height = currentRow.GetEffectiveProperty<TableRowHeight>();
+                if (height != null &&
+                    height.Val != null &&
+                    (height.HeightType == null || // if HeightType is not specified but a value is present, assume it means "Exact"
+                    height.HeightType.Value == HeightRuleValues.AtLeast ||
+                    height.HeightType.Value == HeightRuleValues.Exact))
+                    // if HeightType is "Auto" instead, the row should automatically resize to fit the content, 
+                    // so don't set an height in QuestPdf
+                {
+                    if (height.HeightType != null && height.HeightType.Value == HeightRuleValues.AtLeast)
+                    {
+                        cell.MinHeight += height.Val.Value / 20f; // Convert twips to points                        
+                    }
+                    else
+                    {
+                        cell.Height += height.Val.Value / 20f;                        
+                        cell.MinHeight += height.Val.Value / 20f;
+                    }
+                }
+                currentRow = currentRow.NextSibling<TableRow>();
+                --rowSpanCounter;                    
+            }
+        }
+
         // Add cell to the row model.
         if (currentRow.Count > 0)
             currentRow.Peek().Cells.Add(cell);

src/WIP/DocSharp.Renderer/Model/Enums.cs

@@ -41,6 +41,13 @@ internal enum StrikethroughStyle
     Double
 }
 
+internal enum HorizontalAlignment
+{
+    Left,
+    Center,
+    Right
+}
+
 internal enum VerticalAlignment
 {
     Top,