Process corners of collapsed borders according to browsers

DEVSIX-5524

Author: ars18wrw

layout/src/main/java/com/itextpdf/layout/renderer/CollapsedTableBorders.java

@@ -64,12 +64,12 @@ public SeparatedTableBorders(List<CellRenderer[]> rows, int numberOfColumns, Bor
     }
 
     @Override
-    protected TableBorders drawHorizontalBorder(int i, float startX, float y1, PdfCanvas canvas, float[] countedColumnWidth) {
+    protected TableBorders drawHorizontalBorder(PdfCanvas canvas, TableBorderDescriptor borderDescriptor) {
         return this;
     }
 
     @Override
-    protected TableBorders drawVerticalBorder(int i, float startY, float x1, PdfCanvas canvas, List<Float> heights) {
+    protected TableBorders drawVerticalBorder(PdfCanvas canvas, TableBorderDescriptor borderDescriptor) {
         return this;
     }
 

layout/src/main/java/com/itextpdf/layout/renderer/SeparatedTableBorders.java

@@ -0,0 +1,83 @@
+/*
+
+    This file is part of the iText (R) project.
+    Copyright (c) 1998-2021 iText Group NV
+    Authors: Bruno Lowagie, Paulo Soares, et al.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License version 3
+    as published by the Free Software Foundation with the addition of the
+    following permission added to Section 15 as permitted in Section 7(a):
+    FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+    ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
+    OF THIRD PARTY RIGHTS
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU Affero General Public License for more details.
+    You should have received a copy of the GNU Affero General Public License
+    along with this program; if not, see http://www.gnu.org/licenses or write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA, 02110-1301 USA, or download the license from the following URL:
+    http://itextpdf.com/terms-of-use/
+
+    The interactive user interfaces in modified source and object code versions
+    of this program must display Appropriate Legal Notices, as required under
+    Section 5 of the GNU Affero General Public License.
+
+    In accordance with Section 7(b) of the GNU Affero General Public License,
+    a covered work must retain the producer line in every PDF that is created
+    or manipulated using iText.
+
+    You can be released from the requirements of the license by purchasing
+    a commercial license. Buying such a license is mandatory as soon as you
+    develop commercial activities involving the iText software without
+    disclosing the source code of your own applications.
+    These activities include: offering paid services to customers as an ASP,
+    serving PDFs on the fly in a web application, shipping iText with a closed
+    source product.
+
+    For more information, please contact iText Software Corp. at this
+    address: [email protected]
+ */
+package com.itextpdf.layout.renderer;
+
+class TableBorderDescriptor {
+    private int borderIndex;
+    private float mainCoordinateStart;
+    private float crossCoordinate;
+    private float[] mainCoordinateWidths;
+
+    /**
+     * Creates a table border descriptor which will be used while drawing the described border.
+     *
+     * @param borderIndex the index of the described border
+     * @param mainCoordinateStart the border's start main-axis coordinate
+     * @param crossCoordinate fixed cross-axis coordinate of the whole border
+     * @param mainCoordinateWidths the sizes (widths or heights) of rows or columns depending on the type of main axis
+     */
+    public TableBorderDescriptor(int borderIndex, float mainCoordinateStart, float crossCoordinate,
+            float[] mainCoordinateWidths) {
+        this.borderIndex = borderIndex;
+        this.mainCoordinateStart = mainCoordinateStart;
+        this.crossCoordinate = crossCoordinate;
+        this.mainCoordinateWidths = mainCoordinateWidths;
+    }
+
+    public int getBorderIndex() {
+        return borderIndex;
+    }
+
+    public float getMainCoordinateStart() {
+        return mainCoordinateStart;
+    }
+
+    public float getCrossCoordinate() {
+        return crossCoordinate;
+    }
+
+    public float[] getMainCoordinateWidths() {
+        return mainCoordinateWidths;
+    }
+}

layout/src/main/java/com/itextpdf/layout/renderer/TableBorderDescriptor.java

@@ -48,11 +48,11 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.layout.borders.Border;
 import com.itextpdf.layout.property.Property;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 abstract class TableBorders {
     /**
@@ -138,9 +138,9 @@ public TableBorders(List<CellRenderer[]> rows, int numberOfColumns, Border[] tab
     // region abstract
 
     // region draw
-    protected abstract TableBorders drawHorizontalBorder(int i, float startX, float y1, PdfCanvas canvas, float[] countedColumnWidth);
+    protected abstract TableBorders drawHorizontalBorder(PdfCanvas canvas, TableBorderDescriptor borderDescriptor);
 
-    protected abstract TableBorders drawVerticalBorder(int i, float startY, float x1, PdfCanvas canvas, List<Float> heights);
+    protected abstract TableBorders drawVerticalBorder(PdfCanvas canvas, TableBorderDescriptor borderDescriptor);
     // endregion
 
     // region area occupation

layout/src/main/java/com/itextpdf/layout/renderer/TableBorders.java

@@ -65,8 +65,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.layout.property.VerticalAlignment;
 import com.itextpdf.layout.tagging.LayoutTaggingHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -75,6 +73,8 @@ This file is part of the iText (R) project.
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class represents the {@link IRenderer renderer} object for a {@link Table}
@@ -781,7 +781,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
                     // And now, when we possess such knowledge, we are performing the second attempt, but we need to nullify results
                     // from the previous attempt
                     if (bordersHandler instanceof CollapsedTableBorders) {
-                        ((CollapsedTableBorders)bordersHandler).setBottomBorderCollapseWith(null);
+                        ((CollapsedTableBorders) bordersHandler).setBottomBorderCollapseWith(null, null);
                     }
                     bordersHandler.collapseTableWithFooter(footerRenderer.bordersHandler, hasContent || 0 != childRenderers.size());
 
@@ -1050,10 +1050,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
                 }
             }
         } else {
-            // the bottom border should be processed and placed lately
-            if (0 != heights.size()) {
-                heights.set(heights.size() - 1, heights.get(heights.size() - 1) - bottomTableBorderWidth / 2);
-            }
             if (null == footerRenderer) {
                 if (0 != childRenderers.size()) {
                     bordersHandler.applyBottomTableBorder(occupiedArea.getBBox(), layoutBox, 0 == childRenderers.size(), false, true);
@@ -1460,7 +1456,7 @@ private void drawBorders(DrawContext drawContext, boolean hasHeader, boolean has
         }
 
 
-        // process halves of the borders here
+        // process halves of horizontal bounding borders
         if (childRenderers.size() == 0) {
             Border[] borders = bordersHandler.tableBoundingBorders;
             if (null != borders[0]) {
@@ -1492,56 +1488,72 @@ private void drawBorders(DrawContext drawContext, boolean hasHeader, boolean has
 
         if (bordersHandler instanceof CollapsedTableBorders) {
             if (hasFooter) {
-                ((CollapsedTableBorders) bordersHandler).setBottomBorderCollapseWith(footerRenderer.bordersHandler.getFirstHorizontalBorder());
+                ((CollapsedTableBorders) bordersHandler).setBottomBorderCollapseWith(
+                        footerRenderer.bordersHandler.getFirstHorizontalBorder(),
+                        ((CollapsedTableBorders) footerRenderer.bordersHandler)
+                                .getVerticalBordersCrossingTopHorizontalBorder());
             } else if (isBottomTablePart) {
-                ((CollapsedTableBorders) bordersHandler).setBottomBorderCollapseWith(null);
+                ((CollapsedTableBorders) bordersHandler).setBottomBorderCollapseWith(null, null);
             }
         }
         // we do not need to fix top border, because either this is header or the top border has been already written
         float y1 = startY;
+
+        float[] heightsArray = new float[heights.size()];
+        for (int j = 0; j < heights.size(); j++) {
+            heightsArray[j] = heights.get(j);
+        }
+
+        // draw vertical borders
+        float x1 = startX;
+        for (int i = 0; i <= bordersHandler.getNumberOfColumns(); i++) {
+            bordersHandler.drawVerticalBorder(drawContext.getCanvas(),
+                    new TableBorderDescriptor(i, startY, x1, heightsArray));
+            if (i < countedColumnWidth.length) {
+                x1 += countedColumnWidth[i];
+            }
+        }
+
+        // draw horizontal borders
+
+        // draw top border
         if (isFooterRendererOfLargeTable) {
-            bordersHandler.drawHorizontalBorder(0, startX, y1, drawContext.getCanvas(), countedColumnWidth);
+            bordersHandler.drawHorizontalBorder(drawContext.getCanvas(), new TableBorderDescriptor(0, startX, y1,
+                    countedColumnWidth));
         }
-        if (0 != heights.size()) {
+        if (isTopTablePart) {
+            bordersHandler.drawHorizontalBorder(drawContext.getCanvas(), new TableBorderDescriptor(0, startX, startY,
+                    countedColumnWidth));
+        }
+
+        // draw inner borders
+        if (!heights.isEmpty()) {
             y1 -= (float) heights.get(0);
         }
         for (int i = 1; i < heights.size(); i++) {
-            bordersHandler.drawHorizontalBorder(i, startX, y1, drawContext.getCanvas(), countedColumnWidth);
+            bordersHandler.drawHorizontalBorder(drawContext.getCanvas(),
+                    new TableBorderDescriptor(i, startX, y1, countedColumnWidth));
             if (i < heights.size()) {
                 y1 -= (float) heights.get(i);
             }
         }
-        if (!isBottomTablePart && isComplete) {
-            bordersHandler.drawHorizontalBorder(heights.size(), startX, y1, drawContext.getCanvas(), countedColumnWidth);
-        }
 
-        float x1 = startX;
-        if (countedColumnWidth.length > 0) {
-            x1 += countedColumnWidth[0];
-        }
-        for (int i = 1; i < bordersHandler.getNumberOfColumns(); i++) {
-            bordersHandler.drawVerticalBorder(i, startY, x1, drawContext.getCanvas(), heights);
-            if (i < countedColumnWidth.length) {
-                x1 += countedColumnWidth[i];
-            }
+        // draw bottom border
+        // TODO DEVSIX-5867 Check hasFooter, so that two footers are not drawn
+        if (!isBottomTablePart && isComplete) {
+            bordersHandler.drawHorizontalBorder(drawContext.getCanvas(),
+                    new TableBorderDescriptor(heights.size(), startX, y1, countedColumnWidth));
         }
 
-        // Draw bounding borders. Vertical borders are the last to draw in order to collapse with header / footer
-        if (isTopTablePart) {
-            bordersHandler.drawHorizontalBorder(0, startX, startY, drawContext.getCanvas(), countedColumnWidth);
-        }
         //!isLastRendererForModelElement is a check that this is a split render. This is the case with the splitting of
         // one cell when part of the cell moves to the next page. Therefore, if such a splitting occurs, a bottom border
         // should be drawn. However, this should not be done for empty renderers that are also created during splitting,
         // but this splitting, if the table does not fit on the page and the next cell is added to the next page.
         // In this case, this code should not be processed, since the border in the above code has already been drawn.
         if (isBottomTablePart && (isComplete || (!isLastRendererForModelElement && !isEmptyTableRenderer()))) {
-            bordersHandler.drawHorizontalBorder(heights.size(), startX, y1, drawContext.getCanvas(), countedColumnWidth);
+            bordersHandler.drawHorizontalBorder(drawContext.getCanvas(), new TableBorderDescriptor(
+                    heights.size(), startX, y1, countedColumnWidth));
         }
-        // draw left
-        bordersHandler.drawVerticalBorder(0, startY, startX, drawContext.getCanvas(), heights);
-        // draw right
-        bordersHandler.drawVerticalBorder(bordersHandler.getNumberOfColumns(), startY, x1, drawContext.getCanvas(), heights);
 
         if (isTagged) {
             drawContext.getCanvas().closeTag();